Skip to content

YOK-2793: merge queue landing - #856

Merged
beebauman merged 1 commit into
mainfrom
YOK-2793
Sep 3, 2026
Merged

YOK-2793: merge queue landing#856
beebauman merged 1 commit into
mainfrom
YOK-2793

Conversation

@beebauman

Copy link
Copy Markdown
Contributor

Item branch for YOK-2793; lands through the merge queue's merge_group integration gate.

The enqueue-and-re-enter handoff needs a session that can be prompted
again on the landing-complete message. A launched worker cannot be: it
is a headless command, so ending its pass on landing_pending=true left
the branch landed and the item at reviewing-implementation with nobody
to close it out — seven times in one night, each recovered by hand or
by an improvised poll loop.

Route the landing by whether the session can be re-entered. An
operator-opened session keeps the two-call handoff. A launched worker
passes --wait and holds its turn on the merge watcher wrapper, which
polls the same four-fact landing readback (armed, queued, eligible,
required checks) the handoff observer reads. Every way that wait ends
is named: merged closes the item out in the same turn, a stopped
landing rebases and re-gates, a red required check is terminal, and
only the poll budget running out ends the turn — parked, with a
HUMAN_GATE naming the reading and the resume command. None of them is
silence.

The blanket "Claude never passes --wait" is gone from every surface
that taught it; what remains is the real constraint, that no session
blocks a bare foreground call on the full wait.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@beebauman
beebauman enabled auto-merge September 3, 2026 06:10
@beebauman
beebauman added this pull request to the merge queue Sep 3, 2026
Merged via the queue into main with commit f2aa3b9 Sep 3, 2026
24 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Sep 3, 2026
@beebauman
beebauman deleted the YOK-2793 branch September 3, 2026 06:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant