Skip to content

quest: plan landing through a merge state GitHub is still computing - #231

Merged
kixelated merged 1 commit into
mainfrom
quest-plan/merge-state-race
Oct 26, 2026
Merged

kixelated merged 1 commit into
mainfrom
quest-plan/merge-state-race

Conversation

@kixelated

Copy link
Copy Markdown
Collaborator

Plans Land through a merge state GitHub is still computing, first in the m0 helpers epic.

While kixelated/quest#222 was merging, its first quest merge --land failed with "Pull request is in clean status". Re-running the same command merged it. Both land() in src/cli/hold.ts and the Worker's landPullRequest decide between merging at once and enabling auto-merge from a single read of mergeStateStatus. When GitHub hasn't computed that state yet it reads UNKNOWN, so the code enables auto-merge, and GitHub refuses that for a clean PR.

Decision prompts from the /quest-complete run on 2026-10-26:

  • Goal: land on the first try while the merge state is UNKNOWN, labels out of scope / ✅ also clear quest:merge once a PR merges / not worth a quest
  • How to handle UNKNOWN: ✅ try auto-merge, and on GitHub's "clean status" refusal re-read once and merge immediately (pinned to the head) / re-read until computed (timed poll) / call mergePullRequest first (rejected: an admin token merges past required checks)
  • Fix the Worker's copy too: ✅ CLI and Worker / CLI only
  • What removes quest:merge once a PR merges: Worker webhook + CLI / Worker webhook only / CLI immediate merges only / Actions workflow / ✅ (other) "who really cares, leave it". This reversed the goal's label cleanup, so labels are out of scope.
  • Backfill labels on PRs chore(deps): bump the bun group with 7 updates #204-docs(guide): name quest wait for PR waits #230: remove them now / ✅ leave them
  • Placement: ✅ m0 helpers, ranked first / m0 helpers, last / m1

just check and just test pass.

(Written by Claude Opus 5.5)

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 26, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-26T17:23:32.606033Z 09e4253 PR opened
🔒 Security Review ✅ Completed 2026-10-26T17:24:47.467175Z 09e4253 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@kixelated kixelated left a comment

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated review by review (OpenAI)

Reviewed commit: 09e42538a7c101002a4560db7428993aa36d6ae3.

No actionable defects found in this plan-only diff. The narrow clean-status fallback is a sensible direction: one fresh read, the original requested head pinned, and other refusals preserved, rather than polling or trying an unconditional immediate merge. During implementation, retain the existing merge-queue exclusion as well as the gated-base exclusion from #229; sharing a small decision helper is preferable to coupling the CLI and Worker clients.

Verification: inspected both changed Markdown files, the CLI/Worker landing paths, existing CLI tests, and #229's overlapping changes. No local tests or live GitHub race reproduction run; this PR does not implement the fix. Rechecked that the PR is open, ready, and still at this SHA, with no prior review submissions.

(written by review (OpenAI))

@kixelated

Copy link
Copy Markdown
Collaborator Author

Landing 09e42538a7c101002a4560db7428993aa36d6ae3 with a squash merge, as the repository's AGENTS.md requires.

  • Review: Codex finished its code and security reviews of this head with no findings (👍). The automated review posted from the maintainer's account found nothing actionable either.
  • Checks: 4 passed, none failing. quest check --base origin/main --branch quest-plan/merge-state-race on this head reports 55 documents ok.
  • No changes made during the merge; the user's ✅ decisions stand as written.
  • When implementing, keep the merge-queue exclusion and the gated-base exclusion from kixelated/quest#229, as the automated review noted. The quest's Plan already says to merge feat(land): batched merge gate, quest land #229's gated branch in.

(written by Claude Opus 5.5)

@kixelated
kixelated merged commit 6c64d77 into main Oct 26, 2026
4 checks passed
@kixelated
kixelated deleted the quest-plan/merge-state-race branch October 26, 2026 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant