Conversation
Stale __source-probe worktrees were being reused as if they were the branch's real worktree, which let leaked probes block finish and surface as fake repos in editor repo scans. This patch removes stale probes before finish, treats probe paths as temporary during prune even when they track agent branches, and rewrites doctor conflict guidance so operators rebase the real branch in a normal worktree. Constraint: gx doctor and gx branch finish still need a temporary probe when no live branch worktree exists Rejected: Keep telling users to continue rebases inside __source-probe worktrees | conflicts with the cleanup contract and leaves fake repos behind Confidence: high Scope-risk: moderate Reversibility: clean Directive: Treat __source-probe-* paths as disposable plumbing; do not promote them to operator-facing workflow state again Tested: bash -n scripts/agent-branch-finish.sh scripts/agent-worktree-prune.sh templates/scripts/agent-branch-finish.sh templates/scripts/agent-worktree-prune.sh; node --test test/doctor.test.js test/worktree.test.js test/finish.test.js Not-tested: gx branch finish --via-pr --wait-for-merge against live GitHub
NagyVikt
deleted the
agent/codex/fix-doctor-source-probe-stale-worktree-2026-04-22-15-33
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated by gx branch finish (PR flow).