[JacobStephens2]

Summary

Keep synchronization facts inside Worktree and carry sampled commits through Delivery.

sample refs/remotes/origin/<branch> → upstream label + commit ID
Base branch merge → selected commit → CI watch / Check re-run
Foreign observation → spend budget → consume pinned batch
                    → conflict Repair + validation → review from observed local head

Closes #492

Evidence

• Before: Real-Git regressions failed when the Base tracking ref rewound after merging, the Issue tracking ref advanced after observation, and a local origin/main branch hid Base branch movement. A worktree recreated at the same path also accepted an earlier observation.
  After: All 16 Worktree synchronization tests and 28 Repair-loop tests pass. All 105 existing merge, CI and Spec integration tests pass. cargo fmt --check, cargo clippy --all-targets -- -D warnings, and the complete suite (cargo test -- --test-threads=1) pass, with one existing ignored test.

Two default-parallel full-suite attempts hit OS ETXTBSY (Text file busy) while starting unchanged child-run temporary executable fixtures. All 20 child-run execution tests passed in isolation; final full-suite validation uses cargo test -- --test-threads=1.

Test seams

• Worktree's public synchronization interface, exercised with real local Git and a bare origin: sampled merge facts, Foreign commit observation and consumption, Base branch movement, Spec catch-up, and conflict completion.
• Repair loop's existing Delivery boundary: the Base branch commit passed to CI watch and Check re-run, the Foreign commit review fixed point, and budget refusal before mutation.

Unaddressed findings

Standards

None. The Data Clumps finding was addressed by carrying OriginCommit intact through merging; the follow-up review found no new concerns.

Spec

None. The review found no missing requirements, incorrect behavior, or scope creep.

Merge Danger

Door: two-way

Blast Radius: Delivery

Issue branch synchronization, CI comparison, Foreign commit review and Spec catch-up.

Built with codex · gpt-6.1-sol · xhigh