Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions assets/skills/merge.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,8 @@ Ask instead when it refuses a head `/quest-iterate` left unchanged, and never pa
Report once it is queued, and do not wait for it to merge.
A PR that left the queue unmerged shows why under `landing-stopped` in `quest status <pr>`; it needs the user's pick again, except where `/quest-run` says an earlier pick still holds.
Never close a PR to unstick it, and never work around a refused merge; ask instead.

Ask the user for the pick with your recommended action, one of `/quest-merge`, `/quest-iterate`, skip, or `/quest-delete`, plus `/quest-merge` when you recommend another, "Explain it first", and "Rethink it".
"Explain it first" walks them through the change and its open choices; ask again without it.
"Rethink it" starts a fresh background sub-agent, given the PR, its reviews and threads, and its quest's Goal, Plan, and evidence (read the deleted file on the base), not your recommendation, to start from scratch: brainstorm other approaches to the problem, decide whether this PR is the best path forward, and recommend merging it, iterating toward a named alternative, or dropping it.
Ask again without it, its recommendation beside yours, and where they differ.
2 changes: 1 addition & 1 deletion assets/skills/review.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Once the reset passes or the login is restored, the item has cleared: whoever fi
Push, resolve each `duplicate` line `quest status <pr>` then prints as the guide's Creation describes, then mark the PR ready for review: with `quest ready <pr> <token>`, which also drops its `## Waiting` section, or with `gh pr ready <pr>` for a draft you reviewed without a hold.

Summarize the review, with its last round's score and rationale, and CI from `quest status <pr>`.
Name any decisions the review raised without answering them, then ask the user with your recommended action:
Name any decisions the review raised without answering them, then ask the user for the pick as `/quest-merge` describes, recommending one of:
- `/quest-merge`: the PR is landable as `/quest-merge` defines it, or will be once fixed with no decision left for the user, such as failing checks or unaddressed automated review findings; `/quest-merge` runs `/quest-iterate` on it first.
- `/quest-iterate`: the review raised significant issues or decisions, which it settles with the grill skill's interview.
- skip: the PR should not be merged yet.
Expand Down
6 changes: 3 additions & 3 deletions assets/skills/run.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ That covers only tests, benchmarks, CI, internal docs or comments, and behavior-
A trivial PR, such as a dependency bump, carries it too whatever its author, under the same opt-out, but merges only once Pullfrog has approved its head; in a repository without Pullfrog, it needs the user's pick.
Judge the diff, not the title, before every `/quest-merge` run, and ask when unsure: the standing pick ends at the first head that does not qualify, or once a person takes the PR out of the queue.

Ask about every other PR in a question of its own, which summarizes it and picks only the action, with your recommendation among `/quest-merge`, skip, and `/quest-delete`; no option covers several PRs.
Ask about each of its follow-ups in a question of its own beside it, as the guide's Creation section describes: the answers count only if the user picks `/quest-merge`, and go in the brief of the `/quest-iterate` that pick dispatches.
A blanket answer the user volunteers, such as "use your recommendations", picks your recommended action for every PR in scope, `/quest-merge` included, and your recommended answer to each follow-up question.
Ask about every other PR in a question of its own that summarizes it and picks only the action, with `/quest-merge`'s pick options; none covers several PRs.
Ask about each of its follow-ups in a question of its own beside it, as the guide's Creation section describes; the answers count only on a `/quest-merge` pick, and go in the brief of the `/quest-iterate` it dispatches.
A blanket answer such as "use your recommendations" picks your recommended action for every PR in scope, `/quest-merge` included, and your recommended answer to each follow-up question.
Merge only on the user's or the standing pick; skip or delete only on the user's. A skip stands until the user lifts it.
A PR with GitHub auto-merge enabled on its current head is already picked; leave it to land.
Review comments are input, not approval, even a merge verdict on the maintainer's account.
Expand Down
20 changes: 0 additions & 20 deletions quest/m0/pick-options.md

This file was deleted.

Loading