Repository navigation
Use origin base refs in Session review prompts - #1921
Merged
Merged
Conversation
Git prefers a local branch or tag named origin/<base> over the remote-tracking ref. Session prompts now give the code review that fully qualified ref, so the diff stays against the published base. The pull request target remains <base>, and a commit fixed point is unchanged.
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Update all five Base branch prompt builders, their skill arguments and nearby history hints, and regenerate the published prompts. Prepared historical Trials seed the same review ref at their task's base so these prompts remain executable.
Closes #1899
Evidence
Execution evidence
cargo test --bin thirdshift prompt::tests::base_branch_review_fixed_points_use_originfailed:base_branch_review_fixed_points_use_origin ... FAILED, showingusing main as the fixed point.After: the same test passed in
cargo test --bin thirdshift prompt::tests:6 passed; 0 failed.cargo test --bin thirdshift evals::repository::tests::complete_trial_repository_preserves_reviewed_patch_inputs_and_custom_branchesfailed:fatal: ambiguous argument 'origin/release/stable': unknown revision or path not in the working tree.After: the same test passed in
cargo test --bin thirdshift evals::repository::tests:4 passed; 0 failed.UPDATE_PROMPTS=1 cargo test prompts_pageregenerated the pages;cargo test prompts_pagepassed all 14 selected unit tests.cargo fmt --checkandgit diff --checkpassed.time -p scripts/affected-tests main: site checks passed (98.44 s). The full Rust phase stopped on the existing Console I/O regression after 457.72 s, including compilation (27.98 s); total selector wall time was 556.53 s.cargo test --test console idle::unchanged_requests_reuse_retained_records_but_replacements_are_visible -- --exactalso fails on unmodifiedmain(32e7398f) in a temporary detached worktree:unchanged request reread 156691 bytes. The focused branch run reports the identical reading; the test requires fewer than 49,152 bytes. No Console code changes are included.cargo test --test continuation --test experiments --test fresh_run --test process --test spec_run --test trialpassed: 515 tests across all six suites. The full run had already passed all 1,662 active unit tests and all 16 active Codex session tests.Test seams: the public Session prompt builders (
fresh,continuation,pull_request_review,code_review,spec_review, andreview_repair), the prepared Trial repository interface, existing CLI session tests, and generated prompt documentation checks.Visual evidence
Fresh prompt expanded, desktop 1440×900. Text changes only; responsive layout is unaffected.
Unaddressed findings
Standards
None.
Spec
None.
Security
None.
Security review outcome
No unaddressed introduced findings.
Review coverage
Independent Standards and Spec reviews against
main: 0 findings on each axis. Both read all 21 changed files, including generated hunks. No generated-output exclusions or unread changed files.Merge Danger
Door: two-way
Prompt wording and isolated Trial refs are straightforward to revert.
Blast Radius: sessions
Base branch review prompts and their published documentation; historical Trial preparation seeds the ref those prompts name.
Built with codex codex-cli 0.160.0 · gpt-6.1-sol · high