I created a cli called spotlight-testing to solve this pitfall with worktrees. I hope it helps! https://github.com/mblode/spotlight-testing