[JacobStephens2]

Summary

Base branch validation and optional Launch directory pulling now share one immutable origin sample.

prepare_base_branch → BaseBranch
  sample qualified origin and local commits
  reject unpushed local work
BaseBranch.name()
BaseBranch.pull()
  recheck the checked-out branch
  fast-forward toward the sampled origin commit

Run and Spec run preparation includes the requested pull before Claim. Architect retains the value until after its gates, Harness check and start record. Pickup updates through its dispatched Run; Worktree acquisition samples independently.

Closes #499

Evidence

• Before: Real Git regression probes failed: a main tag hid unpushed work, a rewound tracking ref changed the pull target, and a deferred pull updated a switched checkout.
  After: All 18 Launch directory tests pass, covering shadow refs, tracking-ref advance/rewind/replacement/deletion, unchanged branches/index/files, fast-forward-only updates and recorded interruption.
• Existing startup command tests: 156 passed across preflight, launch pulling, Architect and Pickup. Run/Spec execution tests preserve preparation and pull before Claim, including Continuation's open PR Base branch precedence.
• Required checks pass: cargo fmt --check, cargo clippy --all-targets -- -D warnings, and cargo test. cargo check --all-targets also passes.

Test seams

• Launch directory preparation and the prepared Base branch's name/pull interface, using real Git and an isolated bare origin.
• Existing Run and Pass execution seams for startup, selection, Claim timing, and Architect/Pickup gates.
• Existing command interface for preflight, Continuation precedence, and warning-only checkout updates.

Unaddressed findings

Standards

None; the review against main reported no findings.

Spec

None; the review against main reported no findings.

Merge Danger

Door: two-way

Reversible code and glossary changes; checkout updates remain fast-forward only and preserve local work on failure.

Blast Radius: startup

Base branch preflight and optional Launch directory updates for Runs, Spec runs and passes.

Built with codex · gpt-6.1-sol · xhigh