From 755ded48dc2f88b64afd543b172cef69d117513e Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 30 Oct 2026 07:31:45 -0700 Subject: [PATCH 1/2] feat(skills): plan reviews before ready; merge and review reuse a record naming the head quest-plan now opens its PR as a draft and runs /quest-review, like quest-start. quest-merge reviews the head locally when no ## Review record names it, and /quest-review (which quest-iterate ends with) runs no new round when the record already names the committed head. Co-Authored-By: Claude Opus 5.5 --- assets/skills/merge.md | 1 + assets/skills/plan.md | 5 ++--- assets/skills/review.md | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/assets/skills/merge.md b/assets/skills/merge.md index 4387c03d..2ca0a694 100644 --- a/assets/skills/merge.md +++ b/assets/skills/merge.md @@ -47,6 +47,7 @@ A stale local base can predate the quest and skip the check. On a finding, fix the branch: delete the finished quest with `quest rm`, or rewrite it to the remainder the PR body names. Then push, re-check, and continue; ask the user only when what remains is unclear. Land only a head named by a `## Review` record the guide counts, or one the guide's review exemptions cover. +When the record is missing or names another head, review the checked-out head locally as the guide's Reviews section describes and rewrite the record before landing; when it names this head, trust it and run no new round. Leave a summary of the changes and decisions made, then land the head you checked with `quest merge --land `. It makes a merge commit; add `--squash` or `--rebase` when the repository's root instructions name that method for the PR's base. On a base that requires the `quest land` check, it queues the PR for `quest land`, whose chain merges and tests against the current base; do not merge the base or rerun checks per PR just to queue it. diff --git a/assets/skills/plan.md b/assets/skills/plan.md index 2586bf48..84df9fc9 100644 --- a/assets/skills/plan.md +++ b/assets/skills/plan.md @@ -25,6 +25,5 @@ Once complete, create, update, or delete the relevant quests and epics. Record each settled decision and its reason in the quest's Plan, so later sessions don't ask it again, and the decision prompts in the PR. New work joins the milestone the user picked, at its rank; an epic groups related quests, and its README holds the work no child owns (the end-to-end test, the docs page). -When done, commit, open the PR ready for review, and run `/quest-merge` on it. -Quests planned as follow-ups of an open PR may be committed to that PR instead. -The quest should be reviewed before it is merged. +When done, commit, open the PR as a draft, and run `/quest-review` on it, which reviews the branch, records the `## Review` section, and marks the PR ready. +Quests planned as follow-ups of an open PR may be committed to that PR instead, whose next push is reviewed as the guide's Reviews section describes. diff --git a/assets/skills/review.md b/assets/skills/review.md index 69b2c4eb..97a933ff 100644 --- a/assets/skills/review.md +++ b/assets/skills/review.md @@ -14,7 +14,8 @@ A draft you started in this session has no `## Decisions needed` section, so it Work in a checkout of the PR's head branch, checking out the head first when someone else opened it. Commit everything, then run the repository's local checks, unless the guide's Reviews section says to run no code from the head, and fix any failure. -Review the committed branch with `quest review`, as the guide's Reviews section describes; `quest review --help` explains the round. +If the PR body's `## Review` section already names the committed head, with no finding left unrefuted, run no new round and go on to pushing and marking it ready below. +Otherwise, review the committed branch with `quest review`, as the guide's Reviews section describes; `quest review --help` explains the round. Run it in the foreground; a round takes minutes. Pass `--deep` for a high-stakes change, such as security, a wire format or public API, or a risk of data loss; never for routine work. Fix each finding you agree with, or refute it with evidence the reviewer can check. From 025224daaf2d9186558831590a218637e6876f0b Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 30 Oct 2026 07:33:10 -0700 Subject: [PATCH 2/2] fix(skills): reuse only a review record the guide counts Co-Authored-By: Claude Opus 5.5 --- assets/skills/merge.md | 2 +- assets/skills/review.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/skills/merge.md b/assets/skills/merge.md index 2ca0a694..9ac301cd 100644 --- a/assets/skills/merge.md +++ b/assets/skills/merge.md @@ -47,7 +47,7 @@ A stale local base can predate the quest and skip the check. On a finding, fix the branch: delete the finished quest with `quest rm`, or rewrite it to the remainder the PR body names. Then push, re-check, and continue; ask the user only when what remains is unclear. Land only a head named by a `## Review` record the guide counts, or one the guide's review exemptions cover. -When the record is missing or names another head, review the checked-out head locally as the guide's Reviews section describes and rewrite the record before landing; when it names this head, trust it and run no new round. +When no record the guide counts names the head (none, one naming another head, or one the guide does not count, such as an author without write access), review the checked-out head locally as the guide's Reviews section describes and rewrite the record before landing; when a counted record names this head, run no new round. Leave a summary of the changes and decisions made, then land the head you checked with `quest merge --land `. It makes a merge commit; add `--squash` or `--rebase` when the repository's root instructions name that method for the PR's base. On a base that requires the `quest land` check, it queues the PR for `quest land`, whose chain merges and tests against the current base; do not merge the base or rerun checks per PR just to queue it. diff --git a/assets/skills/review.md b/assets/skills/review.md index 97a933ff..542c26c4 100644 --- a/assets/skills/review.md +++ b/assets/skills/review.md @@ -14,7 +14,7 @@ A draft you started in this session has no `## Decisions needed` section, so it Work in a checkout of the PR's head branch, checking out the head first when someone else opened it. Commit everything, then run the repository's local checks, unless the guide's Reviews section says to run no code from the head, and fix any failure. -If the PR body's `## Review` section already names the committed head, with no finding left unrefuted, run no new round and go on to pushing and marking it ready below. +If the PR body's `## Review` section is a record the guide counts, naming the committed head with no finding left unrefuted, run no new round and go on to pushing and marking it ready below. Otherwise, review the committed branch with `quest review`, as the guide's Reviews section describes; `quest review --help` explains the round. Run it in the foreground; a round takes minutes. Pass `--deep` for a high-stakes change, such as security, a wire format or public API, or a risk of data loss; never for routine work.