diff --git a/assets/AGENTS.md b/assets/AGENTS.md index e1def410..7333d0fa 100644 --- a/assets/AGENTS.md +++ b/assets/AGENTS.md @@ -95,8 +95,8 @@ Search the tree and git history first before making a new quest. Split independently completable work into separate quests. A suggested follow-up becomes a quest only through `/quest-plan`, never as an agent-session task or a GitHub issue. -Plan recommended follow-ups without offering first: run `/quest-plan` on each one in turn, one follow-up per run. -A background agent that cannot prompt reports them for its caller to plan. +Plan recommended follow-ups without offering first: run `/quest-plan` on each one in turn, one follow-up per run; its interview lets the user drop it. +A background agent that cannot prompt reports them, and its caller plans them the same way. Group related quests in an epic; its README holds the work no child owns. A release or pin bump that unblocks work is its own quest. diff --git a/assets/skills/complete.md b/assets/skills/complete.md index ab7ecaaf..c9bc556e 100644 --- a/assets/skills/complete.md +++ b/assets/skills/complete.md @@ -47,7 +47,7 @@ Keep going until all PRs have been decided, then wait for all spawned sub-agents Refresh the open PR list whenever a sub-agent reports, and once more before finishing; ask about each new PR in scope the same way. As each sub-agent reports, include a summary and interactively prompt the user for any outstanding decisions. -Collect each queued PR's suggested follow-ups, and once every sub-agent has finished, plan them as the guide describes; each interview lets the user drop its follow-up. +Collect each queued PR's suggested follow-ups, and once every sub-agent has finished, plan them as the guide describes. Dispatch already selected actions before asking the next question; background work can continue while the foreground waits. Once every sub-agent has finished, remove local worktrees and branches whose tip is the head of a merged PR; squash merges leave that tip off the base branch. diff --git a/quest/m0/helpers/README.md b/quest/m0/helpers/README.md index 59cb4fa5..1ec206a2 100644 --- a/quest/m0/helpers/README.md +++ b/quest/m0/helpers/README.md @@ -71,7 +71,6 @@ commands from Sep-Oct. Session counts in each child come from that window. ## Required - [quest merge --land gaps](/quest/m0/helpers/merge-land.md) - squash on squash-only repositories, PR URLs outside a checkout, labels released after direct merges, and a warning when auto-merge outlives its head -- [Plan delegated follow-ups](/quest/m0/helpers/follow-up-plan.md) - a caller plans a background merge's follow-ups without asking - [Drop review-rounds](/quest/m0/helpers/review-rounds.md) - `quest status` stops counting GitHub reviews now that `quest review` numbers rounds - [Headless agents](/quest/m0/helpers/headless-agents.md) - `/quest-spawn api` launches, resumes, and stops billed agents through one command auto mode allows - [Sibling PRs through a server-side merge](/quest/m0/helpers/queue-siblings.md) - children of one epic land back to back through a merge queue without conflicting on its link list diff --git a/quest/m0/helpers/follow-up-plan.md b/quest/m0/helpers/follow-up-plan.md deleted file mode 100644 index 0c60647b..00000000 --- a/quest/m0/helpers/follow-up-plan.md +++ /dev/null @@ -1,26 +0,0 @@ -# [XS] Plan a delegated merge's follow-ups - -## Goal - -A caller that receives a merged PR's suggested follow-ups from a sub-agent, -such as a background `/quest-merge`, runs `/quest-plan` on them without -asking first, and its interview lets the user drop any. One rule in the -guide says this, replacing the copies in `complete.md` and `spawn.md`. - -## Plan - -Decided 2026-10-28 (user, /quest-plan of the follow-ups from [moq-dev/quest#271](https://github.com/moq-dev/quest/pull/271)). - -- [moq-dev/quest#266](https://github.com/moq-dev/quest/pull/266) made a - foreground `/quest-merge`, `/quest-complete`, and `/quest-spawn` plan - follow-ups without asking. A single `/quest-merge` run as a background - agent only lists them in its report, and no rule told the caller to plan - them: #271's follow-ups waited for the user to ask. -- The rule belongs in the guide, beside "A suggested follow-up becomes a quest - only through `/quest-plan`", so it covers any skill that delegates a merge. - `complete.md` and `spawn.md` keep only what is specific to them, such as - waiting until every sub-agent has finished. -- `/quest-afk` still holds follow-ups for the user, since it runs no - interview. -- Also update the guide's "`/quest-merge` decides which to plan", which - predates #266.