> a battery that has 20h+ capacity and can be swapped with a second one to double the capacity in seconds
Any computer that can be charged with a usb-c connection doesn't need additional proprietary external batteries, you can just use a generic battery pack, which is why the T480 was the last TP with an external battery.