Skip to content

feat(skills): /quest-merge queues inline or sends the PR to /quest-iterate - #292

Merged
moq-bot[bot] merged 1 commit into
mainfrom
quest/m0/host-land/inline-merge
Oct 30, 2026
Merged

moq-bot[bot] merged 1 commit into
mainfrom
quest/m0/host-land/inline-merge

Conversation

@kixelated

@kixelated kixelated commented Oct 30, 2026 •

Copy link
Copy Markdown
Collaborator

Finishes inline-merge from the host-land epic. Picking a PR to merge no longer starts a sub-agent that fixes the PR, waits on CI, and lands it.

Behavior

  • /quest-merge runs inline. It takes the hold, reads quest status once, and queues the head with quest merge --land when all of these hold:

    • a counted ## Review record names the head, or the guide's exemptions cover the changes since it;
    • no posted finding still needs a change, and no decision is open;
    • its required checks passed, other than the gate's own quest land check;
    • it has no conflict with its base;
    • quest check --base passes on the fetched head.

    Otherwise it releases the hold and recommends /quest-iterate, saying what's missing. It never fixes, pushes, or waits. While checks are only pending, it reports that the pick stands.

  • /quest-complete: runs /quest-merge inline, and runs only /quest-review and /quest-iterate in sub-agents.

    • It recommends /quest-iterate for any PR whose head has no counted review.
    • For a picked PR, it dispatches /quest-iterate without asking, then merges inline when it reports. That includes after a merge_conflict or failed_checks ejection.
    • After checks_pending, it merges again on a later refresh.
  • /quest-spawn: offers the same options and runs merges inline the same way.

  • Follow-ups (user, 2026-10-30): /quest-merge plans a PR's suggested follow-ups as soon as it's queued, as if the PR lands, without waiting for the merge. /quest-complete and /quest-spawn batch them at the end. The guide now says to plan recommended follow-ups without offering first, one /quest-plan run per follow-up.

  • The README skill table and getting-started describe the new /quest-merge.

Choices made without asking

  • quest check --base stays in /quest-merge. The plan said the gate's check covers it, but CI runs quest check without --base, so the gate would miss a PR that leaves its quest stale. On a finding, merge now recommends /quest-iterate instead of fixing the PR itself.
  • Pending checks don't queue. Today's gate ejects them as checks_pending, so /quest-merge reports that the pick stands, and /quest-complete retries on a later refresh. The host daemon can drop this requirement, since it runs the check itself.

Overlaps

#288 and #276 edit the same skills. Whichever lands second reconciles.

Checks

just check passed. just test passed: 626 + 426 tests. It was run with CLAUDE_CONFIG_DIR/QUEST_WORKTREE_HOME unset and GIT_CONFIG_GLOBAL=/dev/null. On this host, test/review.test.ts otherwise fails: its fixture commits under my global SSH commit signing without ssh-keygen on its PATH. That's an environment gap, not caused by this change.

Review

  • Reviewer: Codex gpt-6.1-sol, medium, quest review --base origin/main, round 3 of session 01a18d98
  • Head: 49f47d6
  • Findings: none in round 3, which covers the follow-up planning change.
    • Round 1 found one (high, merge.md:21): requiring every required check would block on the gate's unreported quest land check. Fixed.
    • An earlier session on the pre-claim branch found two issues: the hold wasn't released on handoffs, and there was no fetch before quest check. Both fixed.

Suggested follow-ups

  • test/review.test.ts (and agent.test.ts) should isolate themselves from the caller's global git and Claude config.

🤖 Generated with Claude Code

(written by Claude Opus 5.5)

@kixelated kixelated changed the title Merge inline from the coordinator feat(skills): /quest-merge queues inline or sends the PR to /quest-iterate Oct 30, 2026
@kixelated
kixelated marked this pull request as ready for review October 30, 2026 16:16
@coderabbitai

coderabbitai Bot commented Oct 30, 2026 •

Copy link
Copy Markdown

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 1b03da8d-1ae9-43e4-9a6a-9badfb2c1b44
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…erate (#292)

* quest: plan merging through a host gate

Inline merge picks, small batches landed from the maintainer's host, and an
asynchronous Codex fixer for ejected batches instead of bisection.

* feat(skills): /quest-merge queues inline or sends the PR to /quest-iterate

/quest-merge no longer runs in a sub-agent that fixes, waits, and lands. It
checks that a counted review names the head, with no open findings, passing
checks, and no conflict, then queues it with `quest merge --land`; otherwise
it recommends /quest-iterate. /quest-complete and /quest-spawn run it inline
and recommend /quest-iterate for PRs whose head has no counted review.

* fix(skills): merge releases its hold on every handoff and fetches before quest check

* chore(quest): claim quest/m0/host-land/inline-merge.md

Quest-Claim: 72896b8d938dce87

* quest: finish inline-merge

* fix(skills): merge ignores the gate's own quest land check

* feat(skills): plan follow-ups at queue time, one /quest-plan per follow-up

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@moq-bot
moq-bot Bot force-pushed the quest/m0/host-land/inline-merge branch from 49f47d6 to 46472ba Compare October 30, 2026 16:51
@moq-bot
moq-bot Bot merged commit 46472ba into main Oct 30, 2026
@moq-bot
moq-bot Bot deleted the quest/m0/host-land/inline-merge branch October 30, 2026 16:51
kixelated added a commit that referenced this pull request Nov 1, 2026
The guide's follow-up rule now says the interview lets the user drop a
follow-up and that the caller plans a background agent's follow-ups the same
way, so complete.md no longer repeats it. #292 already made merge, complete,
and spawn plan follow-ups without offering; this finishes the quest.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
moq-bot Bot pushed a commit that referenced this pull request Nov 1, 2026
* chore(quest): claim quest/m0/helpers/follow-up-plan.md

Quest-Claim: 30da3116cb3d0191

* docs(guide): one rule for planning a delegated agent's follow-ups

The guide's follow-up rule now says the interview lets the user drop a
follow-up and that the caller plans a background agent's follow-ups the same
way, so complete.md no longer repeats it. #292 already made merge, complete,
and spawn plan follow-ups without offering; this finishes the quest.

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: moq-bot <moq-bot@users.noreply.github.com>
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