Repository navigation
feat(merge): enqueue picks into GitHub's merge queue - #385
Merged
Merged
Conversation
Quest-Claim: da6234678647cffa
On a base with a merge queue, `quest merge --land` now comments the pick (`<!-- quest pick: <sha> -->`) for the queue watcher, then enqueues the pinned head with `enqueuePullRequest`, or arms auto-merge bound to it while required checks may be pending. It no longer refuses a head behind the base there, since the queue builds each PR on the current base. A pick GitHub refuses to enqueue stays recorded, and the command warns that the watcher fixes it instead of failing. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kixelated
marked this pull request as ready for review
November 2, 2026 01:30
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars.
|
Merges #347's merge-method changes into land, and applies the 2026-11-02 design change: drop the pick comment and src/cli/pick.ts. On a merge-queue base, a head GitHub refuses to enqueue now fails quest merge with a refusal that says to fix the PR (for example with /quest-iterate) and land it again. Queue removals reconciles picks from merge-queue timeline events and auto-merge state, trusting the enqueuer or enabler; Bad picks narrows to enqueueing armed picks GitHub never queued. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Collaborator
Author
|
Design change: picks are recorded only in GitHub's own records (maintainer, 2026-11-02, /quest-plan).
Reasons:
This replaces the 2026-11-01 epic decision "Picks GitHub refuses to enqueue: ✅ The watcher fixes them". The review session restarts with (Written by Claude Opus 5.5) |
kixelated
enabled auto-merge (squash)
November 2, 2026 03:04
kixelated
added a commit
to moq-dev/moq
that referenced
this pull request
Nov 2, 2026
Bump quest to a main whose quest merge --land enqueues into GitHub's merge queue (moq-dev/quest#385), so Dependabot requests landing with the one-step command, and describe the merge queue, its self-hosted Queue build, and moq-dev/quest's queue watcher in place of the batched host gate. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.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
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.
Finishes
quest/m0/queue-watcher/pick.md: on a base with GitHub's merge queue,quest merge <pr> --land <sha>enqueues the pinned head into the queue. GitHub's own records of the pick are what the queue watcher reads.Summary
land(src/cli/hold.ts) hands off topick:BLOCKED,UNKNOWN), it arms auto-merge bound to the head. If anUNKNOWNPR turns out ready ("clean status"), it falls back to enqueueing.enqueuePullRequestwithexpectedHeadOid.enqueuePullRequestjoins the GitHub client's confirmable pull-request mutations, so a dropped response is confirmed frommergeQueueEntryinstead of being repeated blindly.quest landcheck keep it./quest-mergechecked it),quest mergeexits 3 with "GitHub refused to enqueue<sha>(…); fix the PR, for example with /quest-iterate, and land it again".FORBIDDEN,NOT_FOUND,INSUFFICIENT_SCOPES,INTERNAL, or any HTTP failure) pass through unchanged. To tell these apart, GraphQL errors now throwGitHubGraphQLErrorwith theirtypes. The message is unchanged.AddedToMergeQueueEvent/RemovedFromMergeQueueEventtimeline items andautoMergeRequest, reading many PRs per GraphQL query. Its trust signal is theenqueuerorenabledBy, which GitHub limits to writers.[S]: the watcher enqueues a pick whose auto-merge is armed on a ready PR that GitHub never queued (community#209348), at the headenabledHead(src/cli/status.ts) says auto-merge was armed on. It drops the local driver merge and the CI-failure parking it had absorbed. Its Required is now Queue removals.pick.mdis deleted. The epic README's Plan records the new decision prompt in place of "Picks GitHub refuses to enqueue".land-fixer/README.mdandland-fixer/pr-signal.mdno longer say Bad picks handles refused picks.quest merge --helpdescribe the queue path and the refusal.named ?? "merge"for armed auto-merge and warns only for an explicit non-merge method, as feat(merge): close quest merge --land's gaps #347 does.Design change
Decided by the maintainer on 2026-11-02 through /quest-plan, and recorded in this comment and the epic:
pick.ts. The watcher reads queue events and auto-merge state. A pick GitHub refuses fails the command, and /quest-merge recommends /quest-iterate as it does today.bad-picks.mdshrinks to enqueueing PRs with auto-merge armed that GitHub never queued (community#209348).This supersedes the brief's 2026-11-01 "the watcher fixes refused picks", and with it this PR's earlier pick comment, its warn-and-exit-0 path, and choices 1, 4 (as a warning), and 5 from the first round.
Choices made without asking
quest:mergerelease bullet is moot. Since moq-dev/quest#326, nothing releases a label when the queue drops a PR (dequeuedis gone), so there is nothing left to change.mergeStateStatus. OnlyBLOCKED/UNKNOWNarm auto-merge.BEHINDandDIRTYgo straight toenqueuePullRequest: auto-merge can't reliably be armed on a conflicting PR, and an explicit refusal now fails the command with a next step. GitHub also often fails to move auto-merge PRs into the queue (community#209348), another reason to enqueue directly when the PR is ready.assets/skills/merge.md(two lines). I re-checked the earlier phrase edit against the command, and it is still accurate: a queue base skips the behind check. The line before it ("On an ungated base with auto-merge disabled, it refuses") was also wrong for queue bases, since feat(merge): close quest merge --land's gaps #347 checks the setting only without a queue, so both now say "without a merge queue". I also added a line for the design decision: on a queue base, a head GitHub refuses fails, so recommend/quest-iterate. AGENTS.md reserves skill edits for user requests; revert these if the design change didn't mean to cover them.bad-picks.mdsays so: such a PR needs/quest-iterateand a new pick.Checks
nix develop -c just check: passed.nix develop -c just test: passed (880 passed, 2 skipped; Worker 432 passed).quest check --base origin/main: passed (85 documents ok).Suggested follow-ups
landPullRequest(cloudflare/src/github/service.ts) still lands a merge-queue base by arming auto-merge, even on a ready PR. It never callsenqueuePullRequest, so it relies on the watcher's armed-but-never-queued fallback (community#209348). Worth a quest to sharequest merge's queue path.Review
gpt-6.1-sol, medium effort (quest review --new --base origin/main, session01a19a1f-d346-7712-a351-bab893639c84, round 1 after the design change).cfb2ba3d875468a3bb517e10c784e4c12701e878.🤖 Generated with Claude Code
(Written by Claude Opus 5.5)