[JacobStephens2]

Summary

Repeated Architect runs preserve review work retained by failed acquisition. Successfully acquired detached scratch remains recoverable after process death, including edits and detached commits.

review acquisition (one repository worktree lock)
  inspect stale checkout
    matching successful-acquisition evidence + pinned ownership → remove
    missing, replaced or uncertain evidence → retain with path, HEAD and reason
  add detached checkout and capture ownership
  prepare excluded checkout token + private administrative record
  publish record without replacement → acquisition succeeds

Closes #505

Evidence

• Before: a_review_retry_preserves_work_retained_after_a_failed_hook failed: retry removed retained staged, untracked and ignored work, then returned success.
  After: That regression passes. Focused checks pass: 108 Worktree tests and 80 Architect lifecycle tests, including process death before publication, disposable detached commits, interruption, damaged evidence, substitutions and publication faults.
• Git 2.55 initially pruned damaged registrations during fetch and optional launch fast-forward. The acquisition and command regressions failed before the fix and pass after it. Origin fetches and launch fast-forward now suppress implicit maintenance; the command regression also passes with Git 2.43.
• Final validation: cargo fmt --check, cargo clippy --all-targets -- -D warnings, and RUST_TEST_THREADS=2 cargo test with Git 2.55 passed (1421 tests passed, 1 ignored).
• CI passed: Linux and macOS tests, plus release builds and Rocky Linux/WSL smoke checks.
• Two default-concurrency attempts hit existing interruption fixtures: the Spec-run start barrier and harness catalog signal check. Both passed in isolation; the complete suite passed with two workers, both before and after the Git maintenance fix. Linux CI also passes with the default test concurrency.

Reviewed against main (a2faf4f): one Standards finding and one Spec finding, both addressed. Both reviewers checked the Git maintenance fix and reported no additional findings.

Test seams

• ReviewWorktree::create and scope-exit cleanup with real local Git: repeated acquisition, preserved work, disposable scratch, ownership substitution, publication failure and interruption. Existing Worktree interfaces verify fresh Run and Continuation behavior.
• thirdshift architect --plan-only: process-death recovery and refusal before an agent session, including Base branch preparation with and without launch.pull.

Merge Danger

Door: two-way

Blast Radius: Worktrees

Unmarked legacy review paths and repository rules that negate token exclusion require Day shift resolution. The shared ownership inspector also rejects symlinked administrative Git backlinks. Durable eligibility applies only to detached Architecture reviews.

Unaddressed findings

Standards

None. The naming finding was addressed by renaming the destructive closure to inspect_and_remove.

Spec

None. The marker-exclusion finding was addressed by verifying effective Git exclusion before marker creation; the Spec reviewer confirmed the fix.

Built with codex · gpt-6.1-sol · xhigh