> Everything is still either magnetic- or inertial confinement-based, right?

Pretty much, but there are some that are kinda-sorta both (General Fusion's approach is "magneto-inertial"), and also a lot of variety within each bucket. Like, Zap Energy's approach is magnetic, but involves no external magnets, whereas developing the fancy magnets is a key operational challenge for CFS.