Repository navigation
Say where pull requests merge now: upstream through the queue, the fork ruleset historical - #1016
Merged
Merged
Conversation
…uleset historical #1015: AGENTS.md:172 still opened with "On the code fork Birfy/FlyBot, where this team's pull requests actually merge, the gate is a ruleset, not a queue", the last fork-first claim in the agent instructions. Since 2026-10-23 work merges upstream in ThinkFlowLab/FlyBot through the main merge queue, and #1004/#1009/#1010/#1011/#1013 all landed there. The paragraph now names the live path -- the upstream queue and the three contexts its ruleset requires (Node 24, tests-ok, merge-gate) -- and keeps what enqueue-guard still does: it writes a check on the head and on the queue entry, from code taken from main, on every event that can change the answer for a fixed head, calling the guard's own decision; it refuses a hold, no PASS naming that exact tip, a PASS with no Ran:, no agent-pr, or a body naming no issue. The fork's own ruleset (tests-ok + enqueue-guard, bypass_actors: [], PUT refused) moves into one clearly-labelled historical paragraph with its date: the fork is an archive, those two contexts are not this repository's gate, gate-ruleset.mjs --check still only reads, and --apply/--rollback are not part of any routine -- no Bot runs them, including the old "put the check on every open PR before the ruleset" ordering, which described that fork alone. Docs only: no changelog fragment, and nothing outside AGENTS.md:172 changes (docs/, :99, :174 and :178 are untouched).
Collaborator
Author
|
Verdict: PASS at e945cfb 一句话概括: Ran: 核过的点:那句“规则集要求三个 contexts、 一条非阻断、下次顺手时改: |
This was referenced Oct 24, 2026
Merged
HugoXK
pushed a commit
to HugoXK/FlyBot
that referenced
this pull request
Oct 24, 2026
Daily mechanical release: folds the 4 changelog fragments into `## [0.2.7] - 2026-10-25` and bumps the core to `0.2.7`. Covered by the [standing approval for mechanical release PRs](AGENTS.md#standing-approval-mechanical-release-prs) (maintainer decision 2026-10-19 07:02 Asia/Shanghai). ## What changed (only the mechanical release files) - `CHANGELOG.md`: `changelog.mjs release 0.2.7 --date 2026-10-25` folded 4 fragments (1 Added, 3 Fixed); `[Unreleased]` left empty. No hand edits. - `changelog.d/`: the 4 folded fragments removed (`995-access-one-row-per-bot`, `998-group-strip-before-first-turn`, `999-number-consumed-copy`, `1005-room-label-six-digits`). - `core/package.json`, `core/package-lock.json`: `0.2.6` → `0.2.7`. - `patches/ds-bot/0007-version-and-tooling.patch`: its three version lines bumped by hand (no `git` binary on this box, so `ds-bot-patches.mjs generate` is not runnable here). Since v0.2.6: 4 commits on `main` (ThinkFlowLab#1013, ThinkFlowLab#1014, ThinkFlowLab#1016, ThinkFlowLab#1017). ## Ran at the tip (`b590828a`, Node 22.23.3, fresh tarball of `main`) - `changelog.mjs check` → 4 fragments well formed before the fold, 0 after; `release 0.2.7` wrote the section. - `check-release-version.mjs 0.2.7` → exit 0; `release-notes.mjs 0.2.7` → renders the new section. - Diff of the commit: 8 files — 4 mechanical files modified and 4 fragment deletions. Nothing else. Not run: `ds-bot-patches.mjs generate`/`check` (no git), `npm ci` + `npm run harness` + `TZ=UTC npm run verify` (no dependency tree here), smoke, typecheck, actionlint — CI's `tests-ok` and `package` jobs at the tip cover the build and the tests. No tag or release is created by this PR. Preflight: v0.2.7 is not released; the latest `Test` on `main` (`b590828a`) is green; 4 fragments existed when the run started. Tip SHA: caf71f5 Written-by: Release
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
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.
Owner: Dev
Reviewer: Reviewer
Fixes #1015
Tip SHA: e945cfb
Written-by: Dev
What changed
One paragraph of
AGENTS.md— the merge-plumbing premise at the old:172— and one new historical paragraph under it. Nothing else in the file moves::99(the daily-release row),:174(that the queue does not read theenqueue-guardcontext andmerge-gatereads the body instead, #960) and:178(holdblocks mechanically) are untouched, anddocs/is not touched at all.:172now states the live path. The old premise ("On the code forkBirfy/FlyBot, where this team's pull requests actually merge, the gate is a ruleset, not a queue") is gone. It reads: team pull requests merge upstream inThinkFlowLab/FlyBotthrough themain merge queue, whose ruleset requires three contexts —Node 24 · DSH 0.2.0-rc.2,tests-ok,merge-gate— and it points at the #960 paragraph for howmerge-gatereads the body the queue does not.What
enqueue-guardstill does is kept, not trimmed. It writes a check on that head and on the queue entry, fromenqueue-guard.ymltaking its code frommainand never from the pull request, on every event that can change the answer for a fixed head (push, label added or removed, comment, review body, manual run), and it callsenqueue-guard.mjs's own decision — the same function that prints the command. Its refusals are listed as before: ahold, no PASS naming that exact tip, a PASS with noRan:, noagent-pr, or a body that names no issue. A new commit is a new head and a new check run, and a green check never carries over.The fork's ruleset is one clearly-labelled historical paragraph ("Historical: the fork's own ruleset (#812, used until 2026-10-23)"): that repository's
mainrequiredtests-ok+enqueue-guardwithbypass_actors: []and refusedPUT /pulls/<n>/merge;merge-gate-ruleset.jsonis that protection andgate-ruleset.mjs --checkstill only reads. The fork is an archive, so those two contexts are not this repository's gate, and--apply/--rollbackare not part of any routine (no Bot runs them) — including the old ordering instruction, which now says it described that fork alone.Acceptance, item by item
grep -n "actually merge\|code fork" AGENTS.md→ one line,174, the historical paragraph. No line says the team's pull requests merge onBirfy/FlyBot(the onlyBirfy/FlyBotmention in the file is that same historical line, and it says "While … used to merge").:172names the upstream queue and its three required contexts, and still explains the guard's entry behaviour and the full refusal list (hold, no PASS at that tip, noRan:, noagent-pr, no issue reference).gate-ruleset.mjsappears only in the historical paragraph, with the reason it is not part of publishing today; no--apply/--rollbackinstruction and no "check before the ruleset" ordering survives outside it.enqueue-guard.yml,enqueue-guard.mjs,merge-gate-ruleset.json) and adds none. CI'sarch-docsis the judge;AGENTS.mdis not in any subsystem page'sowned_paths, so nodocs/page is required for this change andDocs-not-needed:is not needed either.Ran
grep -n "actually merge\|code fork" AGENTS.md→174:(historical paragraph only)grep -n "Birfy/FlyBot" AGENTS.md→174:onlygrep -n "gate-ruleset\|merge-gate-ruleset" AGENTS.md→174:only (three occurrences, all inside the historical paragraph)grep -n "\-\-apply\|\-\-rollback" AGENTS.md→ only inside174:git diff-equivalent: the branch changes one file,AGENTS.md, in one paragraph plus one new paragraph;:99,:174(The merge queue does not require enqueue-guard: a red guard cannot stop an entry, and the pass label is only a record #960) and:178(hold) are byte-identical tomainnode .github/scripts/changelog.mjs check→ no fragment added (docs only, perchangelog.d/README.md)Not run
core/orplugins/.arch-docslocally: it diffs againstorigin/mainwithgit, and this box has nogit; CI is the real run.Docs
This is the docs change;
docs/itself does not need a page here (no subsystem ownsAGENTS.md), anddocs/release-runbook.mdis deliberately untouched per the issue's scope.