Both of the above. Documentation is not up to date with the IDE. Under "Tools" menu I have:
Upload Mode: UART0/Hardware CDC
USB Mode: Hardware CDC and JTAG
JTAG Adapter: ESP USB Bridge
USB CDC on Boot: Enabled
and many other settings (again, can't find documentation on how to choose them).