President-elect Barack Obama is completing his national security team by announcing his unusual choices for CIA director and a national intelligence director who may face tough Senate confirmation questioning over how he confronted the Indonesian military when civilian massacres were occurring in East Timor.

Obama was to introduce the two men today, four days after their names leaked to reporters. That gave official Washington time to vent its surprise that Leon Panetta, a former White House chief of staff with no direct intelligence experience, had been tapped to head the CIA.