Skip to content

The fake's merge queue merges on its required checks alone, as GitHub's does (#677) - #683

Merged
don-petry merged 8 commits into
mainfrom
sim/queue-merges-677
Nov 9, 2026
Merged

don-petry merged 8 commits into
mainfrom
sim/queue-merges-677

Conversation

@don-petry

@don-petry don-petry commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Closes #677, "The fake's merge queue merges on its required checks alone, as GitHub's does (a_pass_comes_before_the_merge)". Stacked on #682, the P-2 no-pass trial, whose fixture trials/P-2.no-pass.json grounds it. The sim/ edits are pre-approved by the Maintainer 2026-11-08, ruled by the Factory Builder.

What changes

  • The fake's queue (sim/world.py, platform()) merges a queued item once its required checks pass, with no pass read between, as GitHub's did in P-2's run (and for the queue App's enqueue in trials/P-2.queue-app.json).
    • Where the last pass read the item as it is at the merge, the merge is still held to what a pass would take it out for (L-19).
    • What came after the last read is merged over and noted, merged before a pass read …, never asserted.
  • The Factory's own enqueue now holds whatever the item may not merge over: objections(), which covers the approval of this content by an approver who can write, a writer's thread or request for changes, a Hold, a failed check, an impostor check, the contract, its evidence and an unread description edit. I-37 and I-45 are held there too. This is where the guarantee the old merge gave now lives.
  • At every merge, I-37 and I-45 are still asserted: a push takes the item out of the queue, and run records only grow. NFR-4 and I-29/I-31 are asserted at the merge only where a pass read the item as it was merged.
  • Grounding: a_pass_comes_before_the_merge, which the fake contradicted, becomes the_queue_merges_on_its_required_checks, grounded on trials/P-2.no-pass.json and trials/P-2.queue-app.json. The port's contract lists it in NOT_READ as shape: the trial read it by REST lists and a timeline query, not the facts port's rollup.
  • L-19 and sim/AGENTS.md now say what the Factory holds: nothing enters the queue without an approval of exactly the content queued, and one that loses it leaves at the next pass. L-19's Check names the new enqueue test.
  • P-2's row in section 6 says the fake was changed.
  • Tests and mutants:
    • The two queue tests now show the merge over a change with no pass read between, the dequeue when a pass reads first, and the Broken when a pass had read it.
    • test_the_factorys_own_enqueue_holds_what_the_queue_merges_on_alone forces each bad enqueue: no approval, a thread, a failed check, an unapproved contract, no review. It pins each one's reason.
    • Eight new mutants, all killed.
    • The two tests keep their names, because five decisions cite them for the dequeue part, which they still hold.

For the Factory Builder: NFR-4 has a window on GitHub

GitHub merges on required checks alone. A dismissal, Hold or thread made while an item is queued is honoured only if a pass dequeues it before the queue merges, which may be up to one poll interval later. So "every merge carries a standing approval" (NFR-4) cannot be met in full. L-19 now says so plainly.

Closing the window would need a required check of a Factory App on the merge group. Your ruling on #659 said that breaks §9.1's recovery rule, so this PR does not do it.

The first 40 seeds

SIM_SEEDS=40: every path is still reached, and test_invariants_hold_under_faults and the seed-coverage tests pass. Over the first 40 seeds at 250 steps, before the fix round, 5 merged: 1 after a pass read it and 4 with no read between, 2 of them over something unread.

Checks

Check Result
SIM_SEEDS=40 make verify OK, 1727 tests (at 53a5127)
Mutants, filtered 9 of 9 queue mutants killed (8 new) at 53a5127
gitleaks No leaks
Argon (ad2580f), 2 parts Clean
Muse (ad2580f) 2 major, 1 minor, all fixed: sim/AGENTS.md stated the old rule; the enqueue checks had no test or mutant; stale test comments
Claude review (ad2580f) 3 major, all fixed: the enqueue checked less than the old merge did (measured on planted Kernel bugs; now it checks every objection); L-19 and sim/AGENTS.md; no tests for the new checks. Minor and nits fixed: grounding names P-2.queue-app; a mutant drops the success-only condition; I-37 and I-45 held at every merge
Claude security (ad2580f) Nothing for security. The medium L-19 finding and the two low findings are the same as above, fixed
Astra Only where Muse gives no read

Labelled factory:hands-off. Enqueue waits for the Factory Builder's all-clear. No record is added.

🤖 Generated with Claude Code

View guided diff Turn on auto-fix

don-petry and others added 7 commits November 9, 2026 07:51
… alone, with no pass read

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ide the pass condition

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… merge, the ruling as the fixture's answer

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…'s does (#677)

GitHub's queue merged a queued pull request once its merge group's required check passed, with no pass of
the Factory's read between (trials/P-2.no-pass.json). The fake now does the same: the rule
a_pass_comes_before_the_merge, which it contradicted, becomes the_queue_merges_on_its_required_checks,
grounded on that fixture. What a merge must carry (NFR-4, I-29/I-31, I-37, I-45) is held at the Factory's
own enqueue, and at the merge only where a pass read the item as it was merged; a merge over what came
after the last read is noted, never asserted.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ad in another shape (#677)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…d L-19 says what holds (#677)

The reads of the fake's queue merging on its checks alone: the enqueue now checks every objection a pass
would take a queued item out for, not only the approval, contract and review; I-37 and I-45 stay held at
every merge, since a push takes the item out; a test forces each bad enqueue and mutants hold both sides.
L-19 and sim/AGENTS.md say what the Factory holds: no enqueue without an approval of the content queued,
and a pass that takes out one that lost it. The rule names P-2.queue-app for "whoever enqueued it".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A pass that reads the queued item still takes it out before it merges, which is what each row cites.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@don-petry don-petry added the factory:hands-off A person's mark: the Factory writes nothing on this pull request (kernel/terms.py LABEL_HANDS_OFF) label Nov 9, 2026
@don-petry
don-petry requested a review from a team as a code owner November 9, 2026 16:07
@don-petry don-petry added the factory:hands-off A person's mark: the Factory writes nothing on this pull request (kernel/terms.py LABEL_HANDS_OFF) label Nov 9, 2026
@chatgpt-codex-connector

Copy link
Copy Markdown
Codex Review Summary: ❌ Failed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ❌ Failed 2026-11-09T16:07:05.458432Z
We couldn’t complete this review. Comment @codex review to try again.
53a5127 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@coderabbitai

coderabbitai Bot commented Nov 9, 2026 •

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

Run configuration

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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.

Share

@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, you can upgrade your account or add credits to your account and enable them for code reviews in your settings.

Base automatically changed from trial/p2-no-pass to main November 9, 2026 21:12
# Conflicts:
#	docs/architecture/software-factory-design.md
#	sim/grounding.py
@sonarqubecloud

sonarqubecloud Bot commented Nov 9, 2026

Copy link
Copy Markdown

@don-petry
don-petry added this pull request to the merge queue Nov 9, 2026
Merged via the queue into main with commit a941921 Nov 9, 2026
27 checks passed
@don-petry
don-petry deleted the sim/queue-merges-677 branch November 9, 2026 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

factory:hands-off A person's mark: the Factory writes nothing on this pull request (kernel/terms.py LABEL_HANDS_OFF)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

The fake's merge queue merges on its required checks alone, as GitHub's does (a_pass_comes_before_the_merge)

1 participant