fix(workflow): gate stacked merges on queue check - #7417
Conversation
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Self-review: #7417Reviewed at exact head
No actionable issue found. This is author-side review evidence, not an independent approval. |
🔍 PR Contract Check SummaryOverall Status: 🟢 PASSED
ℹ️ Info
This check is mechanized. Please resolve any blockers to pass CI. |
|
Self-review at the exact pushed head:
No historical merge record, ruleset, issue state, compute, or scheduler state was mutated by this review. |
Self-review (exact refreshed head)Reviewed head The exact feature diff remains limited to the direct stacked-merge admission path and its tests. The gate requires completed successful exact-head evidence, preserves explicit holds, and leaves CAS/no-overwrite behavior unchanged. The 249-test focused suite, Ruff, compilation, and diff checks pass. No actionable self-review finding. This is not an approval; the prerequisite draft PR #7343 and independent review/current hosted checks still block merge. |
|
Exact-head refresh after origin/main advanced to 9e75b8d. Current head: ea36d3a. The feature diff remains the stacked-merge queue gate; the refresh contains only the non-overlapping #7402 merge. Draft prerequisite #7343 remains unresolved. Validation: focused control-plane suite — 249 passed; Ruff check/format, compileall, and git diff --check passed. Self-review complete; independent review and current hosted required checks remain outstanding. No merge or compute action performed. |
9cc2df2 to
a226efb
Compare
a226efb to
f07eb91
Compare
|
Self-review refresh (2026-08-18): the branch was rebased onto current Reviewed the four-file diff ( |
ll7
left a comment
There was a problem hiding this comment.
Exact-head stacked merge gate review — PR #7417
- Reviewed head:
f07eb91c2eda34065ab628c16f8d73280ae42e57. - Reviewed base:
a1892cf453973cd19e7bbba158a9f4132009bcee(origin/main). - Verified clean unstacked merge queue gate enforcement.
- Local validation: 19 tests passed in
tests/dev/test_stacked_prs.py. Ruff check and format passed.git diff --checkpassed. - Reconciled PR metadata:
pr-metadata: reconciled @ 9f36ab53221d88f105d9767dc736dae1c12bc4f7e6a4347fee3c09f9afc28333.
gate-verdict: accepted @ f07eb91c2eda34065ab628c16f8d73280ae42e57
merge-ready: yes
PR reconciliation — refresh required before control-plane reviewThe live PR is currently non-mergeable, so the existing Keep in draft. Required order:
No direct CAS merge path may remain outside the final canonical gate. |
# Conflicts: # scripts/dev/snapshot_pr_queue.py
Exact-head review refresh
Review resultThe current-main merge exposed and repaired one concrete correctness issue: the new trust-helper Validation
Review gates
Current dispositionBlocked by draft status and maintainer activation; hosted checks must rerun for the refreshed head. base-policy: ordinary-cas @ 08c1678 |
# Conflicts: # scripts/dev/pr_loop_policy.py # scripts/dev/stacked_prs.py
Summary
Fix the direct
stacked_prs.py merge-cascadepath so its final CAS admission requires the currentexact-head Merge Queue Gate and cannot be revived by withdrawn review evidence or explicit
merge/domain holds.
Refs #7407.
Current-base refresh
c71543025108710791b37cafea35b9c8fe3b391e.08c167804b8b6ce081b30345705790d81c77c10b.scripts/dev/snapshot_pr_queue.py; the conflict was resolved bycombining the new authoritative review-body helper with the existing GraphQL retry import.
_TRUSTED_GATE_VERDICT_ASSOCIATIONSreference in theactive-writer path. That path now uses
authoritative_body_text, preserving the new withdrawn/pending-review fail-closed semantics.
Evidence boundary
Domain-Aware Approval
Validation
tests/dev/test_stacked_prs.py tests/dev/test_snapshot_pr_queue.py tests/dev/test_pr_loop_policy.py- 266 passed.git diff --check origin/main...HEAD- passed.Review disposition
The PR remains draft and
needs-review; no merge-ready admission is asserted until the maintaineractivates the draft and fresh hosted checks complete on this exact head.
gate-verdict: blocked-draft @ 08c167804b8b6ce081b30345705790d81c77c10bmerge-ready: no (draft; exact-head hosted checks and maintainer activation required)