Repository navigation
Merged-worktree cleanup skips worktrees whose branch was renamed #16559
Description
Activity
Note
Grok responding on behalf of Julius.
Confirmed. Delete merged worktrees skips a worktree when its branch is renamed after T3 records it. The sweep finishes successfully and removes nothing.
thread.branchis written when the worktree is created and when T3 renames its own temporary branch. A latergit branch -min the worktree updatesHEAD, and local status reports that new name (symbolic-ref --short HEAD). Cleanup bails out first:const status = yield* git.statusDetailsLocal(worktreePath); if (!status.isRepo || status.branch !== thread.branch || status.hasWorkingTreeChanges) return;
The same check runs again on the final status. The merged-PR lookup also uses the recorded name (
gitManager.branchPullRequest({ branch: thread.branch })), so it looks forrefs/heads/<old>andrefs/remotes/<remote>/<old>, neither of which exists after the rename.V2 never adopts the checkout. After a turn,
RunFinalizationObserverrefreshes status and returns whenthread.branch !== local.refNameinstead of updating the thread. The client helper that would sync a drifted branch (resolveLiveThreadBranchUpdate) is skipped for server threads. That follow behavior used to live in V1CheckpointReactor(#5159); it was not ported.The equality check should stay. It is what prevents cleanup from deleting a worktree that was switched onto a different, already-merged branch. The fix is to adopt the checked-out branch when the worktree belongs to exactly one thread, then let the existing guard and PR lookup run against that name.
Not the same as #14742 / #14847 (squash merges; that PR still keys the PR read on
thread.branch) or #15146 / #15208 (settled-thread eligibility). #4831 was the PR-badge symptom of this stale branch name.
Summary
The "Delete merged worktrees" cleanup rule never removes a worktree when the thread's branch is renamed after T3 Code creates it. A common case is an agent that renames the generated
t3code/...branch to a ticket branch name before it opens the PR.Steps to reproduce
t3code/revert-login-screen.git branch -m feature/ABC-123-remove-login-theme.Expected result
The cleanup sweep removes the worktree, because its PR is merged and its commits are in the default branch.
Actual result
The worktree stays.
StorageCleanup.cleanWorktreesruns and exits with success, but it removes nothing.Cause
The thread projection keeps the original branch name (
thread.branch = "t3code/revert-login-screen"). It does not update after the rename.cleanWorktreesthen exits early on this check:The same mismatch also makes
gitManager.branchPullRequestlook up the PR for the old branch name. That lookup cannot find the merged PR either.Suggested fix
Update
thread.branchwhen the branch checked out in the thread's worktree changes. Or, in cleanup, use the branch that is checked out in the worktree when it differs from the recorded branch.Environment