The publisher commits in a worktree of its own - #4500
Merged
Merged
Conversation
#4338 passed every required check and could not merge: CONFLICT (add/add) in tools/queen/publish.py. Its issue's boundary named one spec. The publisher had run from a checkout carrying its own copy of publish.py, `git checkout -B` switched branches in place, and the file travelled into the bee's branch. It now cuts a fresh worktree from the bee's branch, writes the entry there, commits and pushes from there, and removes it. Verified on the next real publish (#4498): the diff is the bee's one file and the entry, and the checkout the publisher ran from was untouched. That publish found the next trap: the branch adds a workflow, which moves the census and the gate-topology ledger - both have turned master red before (#4303, #4319). The publisher now refuses such a branch and says why. Closes #4499 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Contributor
|
📓 NotebookLM Notebook linked to this PR
This notebook contains session context, decisions, and artifacts for this work. |
gHashTag
enabled auto-merge (squash)
September 21, 2026 05:09
Contributor
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
2 participants
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.
Closes #4499
#4338 passed every required check and could not merge —
CONFLICT (add/add)intools/queen/publish.py, a file its boundary never named. The publisher had switched branches in place from a checkout carrying its own copy.It now cuts a fresh worktree from the bee's branch, commits and pushes from there, and removes it. Verified on #4498: the diff is the bee's one file plus the entry, and the calling checkout is untouched.
That same publish found the next trap — a bee branch that adds a workflow moves the census and the gate-topology ledger, both of which have turned master red before (#4303, #4319). The publisher now refuses such a branch and says why.
🤖 Generated with Claude Code