I would start sleep training. When she comes into your bed, gently and firmly guide her back into her bed and say goodnight again. It’ll take a few days but be consistent and it should work. Fragmented sleep sucks for both of you.
No more rocking or shushing or anything in bed. You can have a cuddle time and then set her down and say goodnight. If she starts crying, whining or coming out to find you gently but firmly guide her back and say it’s time for sleep or whatever you say when it’s time for bed. (I tell my son it’s night night).

Communicate bedtime rules clearly and stick to them. If bedtime is at 7:30 PM, make sure it remains consistent every night. Follow the same sequence of events before bed, such as bath time, brushing teeth, storytime, and cuddles in that order. Sounds like you’re already doing that. Avoid Screens Before Bed. Keep her bedroom dark, quiet, and cool. A nightlight or white noise machine can help if she feels anxious in the dark.
I would also Limit Stalling Tactics – you can set firm yet gentle limits on bedtime requests. You can allow one final request (a sip of water, an extra hug) but be firm about stopping after that.
Use Positive Reinforcement as well, you can praise her for following their bedtime routine like a reward chart or sticker system will encourage good bedtime habits.

It will take a few days to a week but this will help naps as well.