Skip to content

fix(branch-finish): rephrase pending-PR cleanup message so claude doesn't claim the worktree is on disk#445

Merged
NagyVikt merged 1 commit intomainfrom
agent/claude/branch-finish-cleanup-message-2026-04-28-02-42
Apr 28, 2026
Merged

fix(branch-finish): rephrase pending-PR cleanup message so claude doesn't claim the worktree is on disk#445
NagyVikt merged 1 commit intomainfrom
agent/claude/branch-finish-cleanup-message-2026-04-28-02-42

Conversation

@NagyVikt
Copy link
Copy Markdown
Collaborator

Automated by gx branch finish (PR flow).

…sn't claim the worktree is on disk

The old message read "Branch cleanup skipped for now." That sounded like
a present-tense fact ("worktree still here"), but in practice the
autofinish watcher (or `gx worktree prune --include-pr-merged`) prunes
the worktree shortly after the PR merges — so the worktree may be
*gone* by the time the agent reads the line.

The new message:

  PR pending review/check policy. Worktree retained for now; the
  autofinish watcher (or 'gx worktree prune --include-pr-merged
  --delete-branches') will prune it after merge. Verify with
  'git worktree list' before claiming the worktree is still on disk.

Why: agents (Claude in particular) were reading "skipped for now" as
proof of presence and recommending a follow-up `gx branch finish ...
--cleanup` to users whose worktree had already been pruned — confusing
output and wasted turns.

Updates the matching regex in `src/doctor/index.js#doctorFinishFlowIsPending`
to anchor on "PR pending review/check policy." so doctor still
recognises this state. The same string lives in
`templates/scripts/agent-branch-finish.sh` (the canonical script
templated into managed repos) and is updated alongside.
@NagyVikt NagyVikt merged commit 029daa5 into main Apr 28, 2026
@NagyVikt NagyVikt deleted the agent/claude/branch-finish-cleanup-message-2026-04-28-02-42 branch April 28, 2026 00:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant