fix(agent-branch-start): verify worktree exists before printing Ready:#577
Merged
Conversation
`git worktree add` has been observed to return exit code 0 with the target directory missing on disk. The script then ran OpenSpec / dependency-symlink init against the phantom path, eventually printing "[agent-branch-start] Ready:" and returning success. Callers cd into the vanished directory, claim file locks against it, and silently lose every subsequent edit until the next finish step complains about a missing tree. Two defensive checks added: 1. Right after `git worktree add` returns 0 — fail fast before the init phase touches anything in the phantom path. 2. At the top of `print_agent_next_steps` — covers the case where the dir gets cleaned up by something during init (less likely, but cheap to verify). Both report the branch name and expected path, and tell the operator to run `git worktree prune` before retry.
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
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.
Summary
git worktree addhas been observed (twice in one Claude session on a downstream consumer of this template) to return exit code 0 with the target directory missing on disk. The script then ran OpenSpec / dependency-symlink init against the phantom path, eventually printing `[agent-branch-start] Ready:` and returning success. Callers cd into the vanished directory, claim file locks against it, and silently lose every subsequent edit until `gx branch finish` later complains about a missing tree.Changes
Two defensive checks in
templates/scripts/agent-branch-start.sh:git worktree addreturns 0 — fail fast before the init phase runs against a phantom path.print_agent_next_steps— covers the case where the dir disappears during init (rare, but cheap to verify).Both report the branch name + expected path and instruct the operator to run `git worktree prune` before retry.
Test plan
🤖 Generated with Claude Code