IMO Cybertruck needs a new factory, probably on the East side of the US which will also make it's own batteries...
TWh scale is likely to be from multiple factories...
Giga Nevada was supposed to do up to 150GWh of packs, so with further space improvements from DBE and other factors, maybe they could get close? Maybe not quite a TWh, but like 500GWh or something on along those lines?
Also, could it be that Battery & Powertrain Investor Day was postponed (partly) because they were waiting for further progress on their battery production facility?
An argument could also be made for starting fresh with a new efficient design like they've done with Giga 3? And then use the Nevada facility for other purposes such as Semi and Cybertruck.