Uh both?
My middle son is going with me. However, he won't be joining us. He's my "travel buddy", but our trips are mostly shared solo trips. We may start our days together, do some fastpasses, maybe have lunch together, then he "ditches" me

And that is totally fine. I took a couple solo trips, then he piped up and asked why he couldn't go too. So he became my travel buddy. He's my guy that was always in the alternative/life skills classes in school instead of regular classes, and has limitations in day to day life, but at WDW he is confident enough to come and go as he pleases, and with room charging he's able to go eat on his own. So I love taking him and letting him run free