[JacobStephens2]

Summary

Bug Continuations can already contain the fix from a failed Ticket run. Diagnosis previously probed that fixed checkout and handed the issue back as needs-info. The Session prompt now supplies the merge-base commit when the Issue branch has commits beyond the Base branch, and the Factory skill owns the diagnosis outcomes.

 bug Continuation with existing commits
-  reproduce on the Issue branch
+  reproduce at the supplied merge base
+  confirm or finish the fix on the Issue branch
   review → pull request

Fresh Ticket runs and Continuations with no additional commits keep their existing diagnosis flow. The generated prompts, Factory skill and hand-written site pages describe the new behavior. The trusted issue update assigns Claim survival to #1376 after the operator confirmed the disputed relabel was manual.

Closes #1373

Evidence

• Before: At merge base 7f9adb3e, with this branch's tests/bug_run.rs copied into an isolated checkout, cargo test --test bug_run a_continuation_reproduces_at_the_merge_base_and_delivers_the_existing_fix -- --exact --nocapture failed with exit 101: expected https://github.com/acme/widgets/pull/1, received https://github.com/acme/widgets/issues/7#issuecomment-42, and logged bug not reproduced.
  After: The same regression passed on a clean build of the Issue branch. It checks delivery of the existing fix, retained branch history, review reports and absence of Triage Notes or needs-info.
• cargo test --test bug_run: 12 passed, 1 subprocess entry point ignored. Covers an existing fix, an unfinished fix, a bug absent at the merge base, a fresh Ticket run, and a Continuation without additional commits.
• UPDATE_PROMPTS=1 cargo test prompts_page and cargo test prompts_page: 13 prompt tests passed; cargo fmt --check passed.
• /usr/bin/time -p scripts/affected-tests main: all 50 site tests passed. The Rust run stopped after 755 passes and one timing failure in otlp_endpoint::a_stalled_receiver_cannot_delay_a_session_by_its_span_count: baseline 4.09s, stalled receiver 6.18s, narrowly exceeding its baseline-plus-2s assertion. The command took 1125.67s including site checks and cached Rust compilation (0.94s); Rust execution took 972.587s. The fail-fast stop left 2347 tests unrun.
• cargo test --test otlp_endpoint a_stalled_receiver_cannot_delay_a_session_by_its_span_count -- --exact --nocapture: passed in isolation without changing its test or production code.
• CI run 40370621592 passed on exact head 19eb1047: 3103 Rust tests passed, 69 skipped, with 690.776s execution and 49.81s compilation. Formatting, clippy, workflow generation, site/Console browser checks and the macOS gate also passed. The duplicate local continuation was deliberately interrupted after this successful full-suite result, following the repository's instruction to reuse successful CI for the same head.
• Test seams: the Ticket run CLI with real Git repositories and fake GitHub/Harness commands; generated Session prompts and the prompts/skills page.

Unaddressed findings

• Standards: None. The single finding about duplicated diagnosis instructions was addressed by keeping outcome rules in the Factory skill.
• Spec: None; zero findings.
• Security: None; zero introduced findings. Guidance-mode review of the merge-base prompt/worktree change with local injection probes and targeted tests; no failing proof-of-concept, so nothing to fix or leave unaddressed.

Both reviewers read all 14 changed files, including generated output. No changed file was left unread or excluded. Reports and counts are retained in .thirdshift-review-RTwAyZ/.

Security review outcome

No unaddressed introduced findings.

Merge Danger

Door: two-way

The prompt and Factory skill changes can be reverted.

Blast Radius: Diagnosis

Bug Ticket runs select their reproduction checkout before proceeding to implementation and delivery.

Built with codex codex-cli 0.164.0 · gpt-6.1-sol · xhigh