Worktree branch check (spawn-time guard)

Canonical, fail-closed, verify-only guard embedded into every worktree sub-agent prompt at dispatch. This is the single source of truth for the worktree_branch_check block — do not inline a copy elsewhere. History of coordinated edits: #2924, #2015, #3174, #48.

Contract for orchestrators: before dispatch, capture EXPECTED_BASE=$(git rev-parse HEAD), then embed the block below into the sub-agent prompt verbatim, substituting {EXPECTED_BASE} with that captured SHA. Orchestrators that intentionally create a docs-only pre-dispatch plan commit may also substitute {EXPECTED_BASE_ALTERNATE} with that commit's immediate parent so runtimes that fork from either side of the docs-only commit pass the same fail-closed guard (#1265). Otherwise substitute {EXPECTED_BASE_ALTERNATE} with an empty string. The sub-agent only verifies and fails closed; the orchestrator (the worktree lifecycle owner) performs any base recovery — the sub-agent never rewrites a worktree it did not create (#48).

<worktree_branch_check> FIRST ACTION: HEAD assertion MUST run before anything else, and this block is VERIFY-ONLY. Worktrees spawned by Claude Code's isolation="worktree" use the worktree-agent-<id> namespace. The orchestrator owns this worktree's lifecycle; a sub-agent MUST NOT hold state-correction primitives (hard-reset, update-ref, force-move, index-discard) on a worktree it did not create (#48, #2924). If ANY assertion below fails, HALT immediately — print the FATAL line, exit 42, and let the orchestrator (the lifecycle owner) decide recovery. Do NOT self-recover, do NOT commit.

HEAD_REF=$(git symbolic-ref --quiet HEAD || echo "DETACHED")
ACTUAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [ "$HEAD_REF" = "DETACHED" ] || echo "$ACTUAL_BRANCH" | grep -Eq '^(main|master|develop|trunk|release/.*)$'; then
  echo "FATAL: worktree HEAD on '$ACTUAL_BRANCH' (expected worktree-agent-*); refusing to commit or self-recover via 'git update-ref' (#2924)." >&2
  exit 42
fi
if ! echo "$ACTUAL_BRANCH" | grep -Eq '^worktree-agent-[A-Za-z0-9._/-]+$'; then
  echo "FATAL: worktree HEAD '$ACTUAL_BRANCH' is not in the worktree-agent-* namespace; refusing to commit (#2924)." >&2
  exit 42
fi
ACTUAL_BASE=$(git rev-parse HEAD)
EXPECTED_BASE_ALTERNATE="{EXPECTED_BASE_ALTERNATE}"
if [ "$ACTUAL_BASE" != "{EXPECTED_BASE}" ] && { [ -z "$EXPECTED_BASE_ALTERNATE" ] || [ "$ACTUAL_BASE" != "$EXPECTED_BASE_ALTERNATE" ]; }; then
  echo "FATAL: worktree base mismatch — HEAD is $ACTUAL_BASE, expected {EXPECTED_BASE}${EXPECTED_BASE_ALTERNATE:+ or $EXPECTED_BASE_ALTERNATE}. Orchestrator owns recovery; sub-agent refuses to rewrite the worktree (#48)." >&2
  exit 42
fi

</worktree_branch_check>

2.7 KiB Raw Blame History

Worktree branch check (spawn-time guard)

2.7 KiB

Raw Blame History