Skip to content

Merge picks offer "Explain it first" and "Is this the best approach?" - #768

Merged
moq-bot[bot] merged 5 commits into
mainfrom
quest/m0/pick-options
Nov 17, 2026
Merged

moq-bot[bot] merged 5 commits into
mainfrom
quest/m0/pick-options

Conversation

@kixelated

@kixelated kixelated commented Nov 17, 2026 •

Copy link
Copy Markdown
Collaborator

Finishes quest/m0/pick-options.md (deleted here).

Summary

The merge pick question, now written once in assets/skills/merge.md (/quest-run, /quest-complete, and /quest-review's closing question point to it), asks each merge pick with these options:

  • the recommended action among /quest-merge, /quest-iterate, skip, and /quest-delete, plus /quest-merge when something else is recommended (so the common 84% pick is never typed under Other);
  • "Explain it first": walks through the change and open choices, then asks again without that option;
  • "Rethink it": a fresh background sub-agent, given the PR, reviews, threads, and the quest's Goal, Plan, and evidence but not the coordinator's recommendation, starts from scratch, brainstorms other approaches to the problem, and decides whether this PR is the best path forward, recommending to merge it, iterate toward a named alternative, or drop it; the PR is asked again with its recommendation beside the coordinator's, saying where they differ.

Skip and delete are options only as the recommendation. That is at most 4 options (merge, recommended, explain, rethink), within the harness's limit.

Public API

No CLI or wire change; skill wording only.

Validation

No behavior to exercise: a shipped skill's wording. just check and just test pass (1424 tests passed, 5 skipped); quest check ok.

Decisions

Settled by the maintainer in this comment:

  • Does the best-approach sub-agent also get the quest? ✅ yes: its Goal, Plan, and the evidence behind them, so it judges the underlying need and tells settled decisions from recommendations; the quest file is deleted by this PR, so it reads it on the PR's base or in git history (rejected: the PR, reviews, and threads alone).
  • Does /quest-review's closing question offer the same options? ✅ yes, said once in assets/skills/merge.md, which /quest-run and /quest-review build on, and /quest-review points to it (rejected: restating the options in review.md, a skills: run dependency, which pushes review past the 30,000-character inline limit).

Settled by the maintainer in this comment:

  • What is the second option called, and what does it do? ✅ "Rethink it": the fresh sub-agent starts from scratch, brainstorms other approaches, and determines whether this PR is the best path forward, recommending to merge, iterate toward a named alternative, or drop it; it keeps the quest's Goal, Plan, and evidence as input (rejected: "Is this the best approach?", which only compared the PR with one approach the sub-agent worked out; "Are you sure?", rejected earlier).

Models

Size: S
Implementer: Claude Code, claude-sonnet-5-5, high effort (arm B)
Implementer: Claude Code, claude-sonnet-5-5, low effort (iterate, XS, arm B)
Implementer: Claude Code, claude-sonnet-5-5, low effort (iterate, XS, arm B)

(Written by Claude Sonnet 5.5 with high effort)

Review

Rewritten by quest review after each round.

  • Head: 32a8a87

  • Base: origin/main at 4249857

  • Risk: high, Changes to shared agent skills alter how agents obtain and interpret merge picks across consuming repositories, potentially causing unintended merges or releases whose effects persist after reverting the skills.

  • Classified: high by Codex, gpt-6.1-sol, low effort, session 01a1e8ef-29a9-73b2-918f-fd29aa8710d6

  • Reviewer: Codex, gpt-6.1-sol, medium effort

  • Session: 01a1e8d1-8816-73a0-b4a3-30a0549b1923, round 3

  • Score: 10/10, The incremental change clarifies the independent reassessment option and its expected recommendation without introducing actionable issues.

  • Rounds: 3; first round 0; findings 0: fixed 0, refuted 0, open 0

  • Findings: none

  • Reviewer: Codex, gpt-6.1-sol, low effort, shadow

  • Session: 01a1e8d1-8816-7352-b308-d6213253a46e

  • Rounds: 1; first round 0; findings 0: fixed 0, refuted 0, open 0

kixelated and others added 2 commits November 17, 2026 01:20
Quest-Claim: 3533a183ca04f20c
… picks

Skip and delete become options only as the recommendation.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@kixelated
kixelated marked this pull request as ready for review November 17, 2026 09:23
@coderabbitai

coderabbitai Bot commented Nov 17, 2026 •

Copy link
Copy Markdown

Explain Change →

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 27 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

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: 43624fe4-33b6-412c-9788-b4f1d44be2d1
Commits

Reviewing files that changed from the base of the PR and between 72cbd0f and 32a8a87.

Files selected for processing: 4

  • assets/skills/merge.md
  • assets/skills/review.md
  • assets/skills/run.md
  • quest/m0/pick-options.md

No actionable comments were generated in the recent review.

Walkthrough

The PR question guidance now offers “Explain it first” and “Is this the best approach?” options, then requires asking again without the selected option. Skip and delete are options only when recommended. The planning document about proposed merge-pick options and follow-up flows was deleted.

Merge Risk: Minimal · previous review 72cbd

This change updates the wording of merge-pick question options in the skill guidance and removes a planning document. It does not change code behavior, so merge risk is minimal.

Pre-merge checks: Passed 4

Check name Status Explanation
Title check Passed The title states the main change: merge-pick prompts now offer "Explain it first" and "Is this the best approach?" options. The raw summary and objectives confirm that the Pull requests section of ass…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Description check Passed The description is specific and related to the changeset. It names the merge-pick question moved into assets/skills/merge.md and the deleted quest/m0/pick-options.md. It lists the options: the recomme…
Full details: Title check

Explanation

The title states the main change: merge-pick prompts now offer "Explain it first" and "Is this the best approach?" options. The raw summary and objectives confirm that the Pull requests section of assets/skills/run.md now offers these options, with skip and delete limited to the recommendation.

Full details: Description check

Explanation

The description is specific and related to the changeset. It names the merge-pick question moved into assets/skills/merge.md and the deleted quest/m0/pick-options.md. It lists the options: the recommended action, /quest-merge when another action is recommended, "Explain it first", and "Rethink it". It also states that skip and delete appear only as the recommendation, and it gives validation results and design decisions.

Finishing Touches

Simplify code

  • Commit to this branch
  • Create a new PR
  • 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

Recent review info

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: d8072287-b2d7-460b-9dc6-ed0e08acbdf1
Commits

Reviewing files that changed from the base of the PR and between ae12957 and 72cbd0f.

Files selected for processing: 2

  • assets/skills/run.md
  • quest/m0/pick-options.md
Files with no reviewable changes: 1

  • quest/m0/pick-options.md

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

@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 head 72cbd0f64882db2f39916eab0aae6d244898a5f9.

Go for the scoped prompt change. The option budget works even when the recommendation is skip or delete, and neither explanation choice grants a merge pick. One worthwhile guard: when the independent assessment returns, refresh the head and readiness before re-asking. If a fixer pushed while the agent was working, the verdict is about the old diff and should be rerun or clearly marked stale, not presented as the verdict for the new head. No CLI or wire concern here; static review.

pullfrog[bot]
pullfrog Bot previously approved these changes Nov 17, 2026

@pullfrog pullfrog Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ No new issues found.

Reviewed changes: the skill wording edit in assets/skills/run.md and the deletion of the completed quest file.

  • Merge pick options: the per-PR question now offers the recommended action, /quest-merge when something else is recommended, "Explain it first", and "Is this the best approach?". That is at most 4 options, which fits the harness limit.
  • Follow-up behavior: "Explain it first" re-asks without that option. "Is this the best approach?" dispatches a background sub-agent that isn't given the recommendation, then re-asks with its verdict beside the recommendation.
  • Quest cleanup: quest/m0/pick-options.md is removed, since this PR finishes it.

Pullfrog  | View workflow run | Using claude-sonnet-5-5 | 𝕏

@kixelated

Copy link
Copy Markdown
Collaborator Author

Maintainer decision (from the maintainer's /quest-run pick round, 2026-11-17, after a fresh Codex Sol agent answered "Is this the best approach?" on this PR):

  • Merge pick: ✅ /quest-merge once both changes below are in (rejected: merging with only the review.md change).
  • The "Is this the best approach?" agent also gets the quest's Goal, Plan, and the evidence behind them, not only the PR, its reviews, and its threads, so it judges the underlying need and tells settled decisions from recommendations.
  • /quest-review's own closing question in assets/skills/review.md offers the same options as the merge pick in run.md, folded into this PR (rejected: a separate quest; leaving review.md as is).

(Written by Claude Opus 5.5 with high effort)

kixelated and others added 2 commits November 17, 2026 01:29
… options with /quest-review

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

Copy link
Copy Markdown
Collaborator Author

Applied the decision above on head 7acd753: the best-approach sub-agent now also gets the implementing quest's Goal, Plan, and evidence (read from the PR's base or git history, since this PR deletes the file), and the pick question is written once in assets/skills/merge.md, which /quest-run, /quest-complete, and /quest-review use. Recorded in ## Decisions; the review.md follow-up is dropped. A local review of this head found no findings.

(Written by Claude Sonnet 5.5)

@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 head 7acd753e975e00d2ae7cd2ed65bb95f8068db745.

No new blocker in this round. Having /quest-run and /quest-review use the same pick instructions in merge.md prevents their option sets drifting. Giving the independent reviewer the quest at the base supplies the missing context without giving it the coordinator's recommendation. Keep both the quest and the assessed PR revision explicit when dispatching, so a later push can't make an old assessment look current. Static review.

pullfrog[bot]
pullfrog Bot previously approved these changes Nov 17, 2026

@pullfrog pullfrog Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ No new issues found.

Reviewed changes: the commits since 72cbd0f move the merge pick options into one shared place.

  • Shared pick options: assets/skills/merge.md now states the pick question once: the recommended action, /quest-merge when another is recommended, "Explain it first", and "Is this the best approach?". It keeps the 4-option cap.
  • Quest context for the sub-agent: the best-approach agent gets the quest's Goal, Plan, and evidence, read from the deleted file on the base, but not the recommendation.
  • Callers point to it: assets/skills/run.md and assets/skills/review.md now refer to /quest-merge's pick options instead of restating them, so the option sets can't drift.

Pullfrog  | View workflow run | Using claude-sonnet-5-5 | 𝕏

@kixelated

Copy link
Copy Markdown
Collaborator Author

Maintainer decision (2026-11-17, /quest-run):

  • Rename the "Is this the best approach?" option to ✅ "Rethink it" (rejected: "Is this the best approach?"). Same idea, broader: the fresh sub-agent starts from scratch, brainstorms other approaches to the problem, and determines whether this PR is the best path forward, recommending to merge, iterate toward a named alternative, or drop it.
  • Merge pick: ✅ /quest-merge once the rename is in.

(Written by Claude Opus 5.5 with high effort)

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

@pullfrog pullfrog Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ No new issues found.

Reviewed changes

Since the prior review, one commit reworded the merge pick's second option in assets/skills/merge.md.

  • Renamed option — "Is this the best approach?" is now "Rethink it".
  • Clarified sub-agent task — the fresh sub-agent starts from scratch, brainstorms alternatives, and recommends merging, iterating toward a named alternative, or dropping the PR.
  • Re-ask wording — the follow-up shows its recommendation beside the coordinator's, with where they differ.

Pullfrog  | View workflow run | Using claude-sonnet-5-5 | 𝕏

@moq-bot
moq-bot Bot added this pull request to the merge queue Nov 17, 2026
Merged via the queue into main with commit 662806d Nov 17, 2026
17 checks passed
@moq-bot
moq-bot Bot deleted the quest/m0/pick-options branch November 17, 2026 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant