Skip to content

spec(queen): a conflicting bee PR is updated or redone, never stranded (Closes #7571) - #7572

Merged
gHashTag merged 1 commit into
masterfrom
claude/queen-conflict-valve
Oct 7, 2026
Merged

gHashTag merged 1 commit into
masterfrom
claude/queen-conflict-valve

Conversation

@gHashTag

@gHashTag gHashTag commented Oct 7, 2026

Copy link
Copy Markdown
Owner

Closes #7571

Adds conflict_step to specs/queen/review_valve.t27. A Queen PR that conflicts with master gets GitHub's update-branch when the Actions queue has room (no force-push), waits up to 48 h when it does not, and is redone from fresh master after a 422, a third conflict or a spent wait. It closes once its releases are spent.

At 15:51Z, 94 of 213 open PRs conflicted, 67 of them on queen- branches; GitHub runs no required check on those heads.

  • 3 new tests, 14 total, 0 vacuous; the zig and C backends pass.
  • 21 hand mutants (the local tri lacks mutate spec): 20 killed. The survivor is pinned by the_conflict_codes_never_move.
  • Wiring into the publisher and supervisor is a separate issue.

🤖 Generated with Claude Code

Closes #7571)

conflict_step: update-branch when the Actions queue has room, wait up to
48 h when it does not, redo from fresh master after a 422, a third
conflict or a spent wait; close once releases are spent.
Hand mutants 21: 20 killed; the survivor (C_UPDATE code) is now pinned
by an invariant and its negative control fails.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@gHashTag
gHashTag enabled auto-merge (squash) October 7, 2026 15:57
@gHashTag
gHashTag merged commit cfc97d2 into master Oct 7, 2026
27 of 29 checks passed
@github-actions

github-actions Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

PR Dashboard

Generated at: 2026-10-07 17:49:49 UTC

Summary

Status Count
Total Open PRs 50
PRs with Failing Checks 36
PRs with All Checks Green 14
READY 1
FAILING 36
PENDING 0
NO CHECKS YET 0

These columns do not partition: 1 + 36 + 0 + 0 = 37, and there are 50 open PRs. A PR is being counted twice or not at all.

Seal Status

  • ⚠️ STALE -- sha256(compiler.rs)=66b6e1375e37 != manifest seal=87e5cbd3ad94.
    The committed NMSE numbers were certified against an older compiler.rs.
    Run scripts/reseal-check.sh locally for the two-step reseal command (advisory; not a merge gate).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

spec(queen): a conflicting bee PR is updated or redone, never stranded

1 participant