Skip to content

fix(agent-branch-start): verify worktree exists before printing Ready: #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NagyVikt merged 1 commit into from
May 14, 2026
+21 −0
Merged

fix(agent-branch-start): verify worktree exists before printing Ready: #577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions templates/scripts/agent-branch-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,20 @@ print_agent_next_steps() {
base_branch="main"
fi

# Pre-`Ready:` post-condition check. `git worktree add` has been observed
# to return 0 with the worktree dir still missing on disk (race condition
# during the OpenSpec / dependency-symlink phase between `worktree add`
# and now). If we print `Ready:` in that state, callers cd into a
# vanished directory and lose subsequent edits silently. Surface it as
# an exit-1 error instead — operator can retry + `git worktree prune`.
if [[ ! -d "$worktree_path" || ! -e "$worktree_path/.git" ]]; then
printf '[agent-branch-start] ERROR: worktree did not materialize on disk before Ready:\n' >&2
printf '[agent-branch-start] branch: %s\n' "$branch_name" >&2
printf '[agent-branch-start] expected: %s\n' "$worktree_path" >&2
printf '[agent-branch-start] Run `git worktree prune` to clear ghost entries, then retry.\n' >&2
exit 1
fi

echo "[agent-branch-start] Ready:"
echo " branch: ${branch_name}"
echo " worktree: ${worktree_path}"
Expand Down Expand Up @@ -864,6 +878,13 @@ if ! worktree_add_output="$(git -C "$repo_root" worktree add -b "$branch_name" "
printf '%s\n' "$worktree_add_output" >&2
exit 1
fi
# git worktree add has been observed to exit 0 while the target dir is
# missing — verify before downstream init runs against a phantom path.
if [[ ! -d "$worktree_path" || ! -e "$worktree_path/.git" ]]; then
printf '[agent-branch-start] ERROR: git worktree add reported success but %s is not a valid worktree.\n' "$worktree_path" >&2
printf '%s\n' "$worktree_add_output" >&2
exit 1
fi
git -C "$repo_root" config "branch.${branch_name}.guardexBase" "$BASE_BRANCH" >/dev/null 2>&1 || true
git -C "$repo_root" config "branch.${branch_name}.guardexWorktreeRoot" "$WORKTREE_ROOT_REL" >/dev/null 2>&1 || true
# Fresh agent branches should start unpublished; clear any inherited base-branch tracking.
Expand Down
Loading