I want to freshen this topic up because i'm right on the edge of buying a 2006, but don't want to jump too fast if there will be sunroofs as a factory option come October. I'm a sunroof maniac, but would rather avoid the whole aftermarket leak potential issue if at all possible.

So does anyone have any reliable, traceable information on whether the 2007 models will/won't have sunroof option packages?
(Hello again, Mr/Ms "Sunroofs in 2007"; are you out there?)

And yes, i've seen the Geneva autoshow video. But the fact that that Prius didn't have a sunroof and it wasn't discussed doesn't eliminate the possibility, i would think.