In your mind, does "FSD" mean the car can drive itself "in almost all circumstances" (as the current description says) without a human paying attention and being ready to take over at any moment? Or even without a human in the car at all, as would be required for the Tesla Network ride sharing service?
I define "FSD" as the software package that was on the website and that many paid for that when enabled will be a self-driving version of AP. I believe the first public release of "FSD" will be the first option you mention, where the car can drive itself in most circumstances without the human needing to pay attention and being ready to take over at any moment. And just like with AP, I am assuming "FSD" will improve with software updates over time. Eventually, I believe "FSD" will improve with software updates to become the version with the Tesla Network where you can summon your car without a driver in it. But that will come much later.
Basically, I think "FSD" will start around the first option you mention when it is first released to the public and eventually become the second option where you can summon your car driverless.