carry forward: the work on queen-1310 that conflicted with the base - #330
Merged
Merged
Conversation
…eros-ai#1310) Carried forward from origin/queen-1310 (d7d29c9), which was written against 20f8858 and can no longer merge: the base has since rewritten this route's skipSummary to publish issue numbers with a cap. Carried, because the base genuinely lacks all of it - there is no `queue` key, no QueueState, no staleness rule and no capacity dep anywhere in origin/feat/queen-supervisor: - `queue: { state, observedAt }` on GET /queen/status, from the three rows the route already reads plus configuredWorkerCapacity - the same single authority /queen/public-research reads, already exported from services/queen-dispatch.ts. No fourth query, pinned by a test that counts the statements the pool saw. - The closed QueueState set (capacity-full, work-dispatched, no-eligible-work, unknown) and its precedence: the table describes this instant and outranks a tick that describes a past round. - TICK_STALENESS_INTERVALS: a decision older than two tick intervals explains a scheduler that stopped, not an empty queue, so it reads unknown rather than no-eligible-work. - workerCapacity and now deps, so freshness is a property of the fixtures rather than of when the suite runs. - Two more leak probes (an issue body, a transcript excerpt) planted where a scheduler would hold them, proving the new field opens no new channel. Dropped as superseded - the branch's diff carried these only because it was cut before the base changed, and re-applying them would revert the base: - swarmState 'waiting_for_review' in the first fixture. The base now ranks healthy_idle above waiting_for_review when the tick refused with 'nothing to choose' (classifySwarmState, rule 2), and asserts 'healthy_idle' for exactly these rows. The base expectation is kept. - The old skipSummary shape (bare counts). The base publishes { count, issues, more } per category plus skipIssueListCap; those assertions are kept as the base has them. Verified: bun test apps/server/tests/api/queen-public-status.test.ts - 22 pass, 0 fail, 115 expect() calls. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This was referenced Sep 4, 2026
❌ Tests failed — 13/2026 failed
Failed tests
|
gHashTag
added a commit
that referenced
this pull request
Sep 4, 2026
…, and close-done kept its own copy of the rule (#360) `tri why` warned ahead: all nine remaining accepted branches conflict, so nothing can land, close-done will close nothing, and the pipeline stops as soon as those boundaries are all that is left. Four of the nine were finished work. THE ROUTE NO COMPARISON OF BYTES CAN TAKE. `isLanded` had four routes - ancestry, an identical merged tree, a patch-id match, and a hand-applied change. Every one of them compares CONTENT. They are all blind to the thing this loop does constantly: when a bee's branch goes stale, I re-cut its change against the current base and squash-merge THAT. The carry is a new commit with a new tree and a new patch-id, so nothing content-shaped connects it back, and the bee's original branch becomes permanent debt - re-offered every round, conflicting every round, holding its boundary fenced for ever. So read the message. L1 of this repository is "no code merged without `Closes #N`", which makes the message a load-bearing record and not a courtesy: browseros-ai#1310 landed as PR #330 browseros-ai#1308 landed as PR #331 browseros-ai#1362 `Closes browseros-ai#1362` in a base commit browseros-ai#1421 carried by a commit that says "Carries the browseros-ai#1421 work it belongs with" Nine conflicting branches became six. The matching is done in JavaScript rather than in git's regex, because two rounds ago a BRE read as a JavaScript regex convicted a bee - the dialect belongs somewhere it is known. AND THE TIGHTENING BROKE THE CASE IT WAS WRITTEN FOR. I required `(#N)` to end the line, to reject "unlike (browseros-ai#1421), this does X". One minute later browseros-ai#1310 stopped being recognised: a squash subject here reads `feat(queen): explain idle paid slots (browseros-ai#1310) (#330)` - the issue first, then the pull request. A trailing CHAIN of references is a subject; a parenthesis in the middle of a sentence is not. CLOSE-DONE KEPT ITS OWN COPY OF THE RULE. It had the tree test and nothing else, for weeks, while `land.mjs` grew four more routes it never learned. A rule transcribed twice is two rules that agree until somebody edits one - which is L2 of this repository, and it had happened here in the file that decides whether an issue may be closed. It asks `land.mjs` now. What remains is real debt and is reported as such: browseros-ai#1387, browseros-ai#1302 and browseros-ai#1303 carry 880 insertions of finished work outside the base, all three with their issues already CLOSED - the inverse of the false statement close-done exists to prevent. A conflict is still reported for a person and never resolved by guessing. selftest 144 pass 0 fail. Co-authored-by: Dmitrii Vasilev <trackgmedernj@hotmail.com>
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
1 participant
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.
Carried forward from
origin/queen-1310onto a fresh branch off the current base. No force-push, no branch deletion — the original branch is the evidence that the work happened and is untouched.Only what the base genuinely lacks was carried; hunks whose substance the base already has by another route were dropped, because re-applying superseded work is how a fix gets reverted by a merge.
Three independent refuters were pointed at this carry — did it re-apply something the base already had, did it drop something the base lacks, does the quoted verification actually prove anything. At least two failed to break it. Merges cleanly against the current base, checked with
git merge-treebefore this PR was opened.