chore: merge main and preserve worktree deletion guards