mandrel 2.36.0 → 2.38.0

package/.agents/workflows/helpers/deliver-reference.md

@@ -1,21 +1,21 @@
 ---
 description:
-  On-demand reference appendix for /deliver — the sequencing edge cases,
+  On-demand reference appendix for /mandrel-deliver — the sequencing edge cases,
   role-scoped dispatch mechanics, lite-route inline execution, checklist
   threading, and the per-run epilogue. Read it when the matching lever is in
   play; the lean spine in deliver.md links here.
 ---
 
-# /deliver — reference appendix (on-demand)
+# /mandrel-deliver — reference appendix (on-demand)
 
-Reference-only detail split out of [`deliver.md`](../deliver.md) so the
+Reference-only detail split out of [`mandrel-deliver.md`](../mandrel-deliver.md) so the
 always-resident spine stays lean. Nothing here is a new MUST —
 it is the mechanics an operator consults when the matching lever is engaged.
 
 ## Ranges (`4922 - 4926`) {#ranges}
 
 A contiguous span is how an operator reads a plan run, so the dash range is a
-first-class id shape rather than prose to interpret — `/deliver 4922 - 4926`
+first-class id shape rather than prose to interpret — `/mandrel-deliver 4922 - 4926`
 means exactly the five ids in it.
 
 **Pass the span through; never expand it by hand.** Every id-list flag on the
@@ -49,6 +49,14 @@ issue state rather than against anything you hand it. That is why there is no
 batch label to pass and why a blocker that landed in an unrelated run is simply
 seen as done.
 
+**The non-zero exit codes.** **2** — `cycleError`: the graph is
+self-referential; fix `depends_on`, do not retry. **3** — `wedged`: nothing
+dispatchable and nothing in flight, with the undone Stories and their unmet
+blockers named; land a blocker or add it to `--ids`. **4** — `blocked`: a Story
+carries `agent::blocked` with `blockedReason`, the protocol's HITL pause
+([`instructions.md` § 1.J](../../instructions.md)). Blocked outranks a wedge,
+but not a cycle.
+
 **Resuming an exit-4 `blocked`.** Read the friction comment with
 `gh issue view <id> --comments`, and resume only once the operator has
 unblocked it:
@@ -184,7 +192,7 @@ exposes agent dispatch, spawn each ready Story as its own
 `CLAUDE.md` @-closure) carrying the load-bearing delivery MUSTs standalone. The
 sub-agent executes [`deliver-story.md`](deliver-story.md) Steps 0–2.5
 (init → implement → acceptance self-eval → **push**) and stops there; **you**
-own Step 3, serialized — see `/deliver` § Closing what the workers hand back.
+own Step 3, serialized — see `/mandrel-deliver` § Closing what the workers hand back.
 Thread into its prompt: `storyId`; `docsDigestPath` (the per-run docs digest, null when
 `project.docsContextFiles` is unset); `checklistPath` (the footprint-matched
 write-time audit checklist, produced at dispatch, below); and the
@@ -225,7 +233,7 @@ terminal envelope are identical either way — only the isolation differs.
 
 ## Intent phrases (what replaced the flag table)
 
-`/deliver` has no operator-facing flags. The scripts still take every flag they
+`/mandrel-deliver` has no operator-facing flags. The scripts still take every flag they
 always did — the workflow fills them in from what the operator said, the same
 derive-then-announce contract `/git-deliver` uses for its terminal level.
 
@@ -252,7 +260,7 @@ Two rules keep this honest:
 operator expresses; it is a runner asserting *nobody is at the keyboard*, and
 it changes fail-closed behavior (it is what turns the unplanned path's
 over-scope stop into an `escalated` terminal envelope, and what auto-proceeds
-`/plan`'s gates). Cron, `/loop`, and headless dispatch set it. An attended run
+`/mandrel-plan`'s gates). Cron, `/loop`, and headless dispatch set it. An attended run
 never does, however the operator phrases their impatience.
 
 ## Operator-merge implies no-wait

package/.agents/workflows/helpers/deliver-story-reference.md

@@ -33,7 +33,7 @@ Epic-scoped dispatch manifest to serialise two operators driving the same
 Story, so this lease is the only guard against a concurrent
 `single-story-init` clobbering an in-flight run.
 
-**Fail-closed.** Unlike `/deliver`, the standalone path
+**Fail-closed.** Unlike `/mandrel-deliver`, the standalone path
 has **no Epic-scoped lifecycle ledger** to read a per-owner
 `story.heartbeat` from, so there is no live-heartbeat source to decide
 whether a foreign claim is stale. Rather than silently reclaim every
@@ -131,7 +131,7 @@ The v2 engine's trait table:
 | Ceremony      | Per-Story, routed off the derived change level via `ceremony-routing.js` |
 
 **Ceremony-lite Stories still land through this engine unchanged.** A
-lite-routed Story collapses only the _advisory_ plan/deliver
+lite-routed Story collapses only the _advisory_ plan/mandrel-deliver
 ceremony — the fresh-critic / Tech-Spec authoring a one-artifact scope does
 not earn. It does **not** get a cheaper landing: the close-validation gates
 (lint / test / format / coverage / CRAP / maintainability), the PR to `main`,
@@ -231,7 +231,7 @@ demand. See [`.agents/instructions.md` § 3](../../instructions.md).
 write and self-check as you author. When absent, lens-aware coverage still
 runs maker-blind at Story-scope review inside the close subprocess. The
 dispatch step produces `checklistPath` from the Story's predicted footprint
-before it spawns the worker — see [`/deliver`](../deliver.md).
+before it spawns the worker — see [`/mandrel-deliver`](../mandrel-deliver.md).
 
 **Pre-eval full-suite discipline (spine step 1.3).** Repo-invariant guards —
 drift-guard and schema tests living outside the Story's scoped greps — are
@@ -542,7 +542,7 @@ The `single-story-close.js` script, in order:
    `gh pr merge <prNumber> --auto --squash --delete-branch`. Once CI's
    required checks turn green, GitHub squash-merges the PR and deletes
    the source branch — the operator does not need to babysit the merge
-   button. Mirrors the `/deliver` finalize path. Failure is
+   button. Mirrors the `/mandrel-deliver` finalize path. Failure is
    non-fatal: the operator retains the manual merge surface in the
    GitHub UI. Pass `--no-auto-merge` to opt out when the PR needs a
    pre-merge eyeball.
@@ -909,6 +909,11 @@ up").
 
 ## Idempotence and the standing constraints
 
+**Why a no-envelope hand-off must never be re-dispatched.** Only Step 3 mints a
+terminal envelope, so a sub-agent returning without one is the normal shape. The
+branch already exists, and re-running Step 0 underneath live work is how one
+Story ends up with two closes — resume per the spine's § Recovery instead.
+
 Every script in the chain no-ops safely on re-run: `single-story-init.js`
 re-prints `workCwd` for an already-initialized Story; `single-story-close.js`
 and `single-story-confirm-merge.js` short-circuit on a closed or `agent::done`

package/.agents/workflows/helpers/deliver-story.md

@@ -9,7 +9,7 @@ mandatoryReads: [deliver-digest.md]
 
 > **Lean spine.** Happy path + gate list; edge-case, recovery and reference
 > detail lives in [`deliver-story-reference.md`](deliver-story-reference.md)
-> ("reference" below). Invoked by [`/deliver`](../deliver.md).
+> ("reference" below). Invoked by [`/mandrel-deliver`](../mandrel-deliver.md).
 > **Read [`deliver-digest.md`](deliver-digest.md) once, first** — the one
 > bundled read every delivery needs. Steps cite it as "digest § N".
 
@@ -34,14 +34,13 @@ that dispatched the work**, never to a spawned worker.
 - **Inline dispatch** (a one-Story run — digest § 1): one session is both
   roles and walks Steps 0→7, no hand-off.
 - **Sub-agent dispatch**: the `story-worker` stops at Step 2.5 with the branch
-  pushed and returns a hand-off; the dispatching `/deliver` session runs Step 3
+  pushed and returns a hand-off; the dispatching `/mandrel-deliver` session runs Step 3
   **in its own turn** and **serializes the tail — one close at a time across
   the run**, even though implementation ran in parallel (reference § Step 3).
 
-**A worker returning no terminal envelope is expected, not a failure.** Only
-Step 3 mints one, so a hand-off is the normal sub-agent return. Never
-re-dispatch the Story on it — the branch exists, and re-running Step 0 under
-live work is how one Story gets two closes. Resume per § Recovery instead.
+**A worker returning no terminal envelope is expected, not a failure** — only
+Step 3 mints one. Never re-dispatch the Story on it; resume per § Recovery
+(reference § Idempotence and the standing constraints).
 
 ## Step 0 — Initialize (`single-story-init.js`)
 
@@ -162,5 +161,5 @@ not process. Drive `agent::*` through
 
 ## See also
 
-[`deliver-digest.md`](deliver-digest.md), [`/deliver`](../deliver.md),
+[`deliver-digest.md`](deliver-digest.md), [`/mandrel-deliver`](../mandrel-deliver.md),
 [`deliver-story-reference.md`](deliver-story-reference.md).

package/.agents/workflows/helpers/diagnose.md

@@ -9,7 +9,7 @@ description: >-
 
 > **Helper, not a slash command.** Files under `workflows/helpers/` are not
 > projected into the mandrel plugin command tree. The same `lib/checks/` registry runs
-> automatically as preflight inside `/deliver`, `single-story-close`, and
+> automatically as preflight inside `/mandrel-deliver`, `single-story-close`, and
 > `npm test` — this viewer exists only for ad-hoc inspection. Invoke the
 > backing script directly: `node .agents/scripts/diagnose.js [args]`.
 
@@ -18,7 +18,7 @@ description: >-
 `diagnose.js` runs the checks registry assembled under
 `.agents/scripts/lib/checks/` in read-only mode and surfaces every
 finding declared on the requested scope. It is the operator-facing read
-of the same registry that preflight guards (`/deliver`,
+of the same registry that preflight guards (`/mandrel-deliver`,
 `single-story-close`), the retro hook, and `npm test` consult — but with
 `autoFix: false` always, no remote GitHub writes, and no commits.
 

package/.agents/workflows/helpers/parallel-tooling.md

@@ -58,7 +58,7 @@ the same shape as Rule 1 but at the sub-agent layer.
 
 - **Tool primitives:** `Agent` (one call per independent unit, all in one
   turn).
-- **When:** wave-level Story fan-out from `/deliver`, per-dimension
+- **When:** wave-level Story fan-out from `/mandrel-deliver`, per-dimension
   audit dispatch, any "for each X in Xs run /Y X" loop where the Xs do not
   share write paths.
 - **Anti-pattern:** serial `Agent` calls (`Agent` → wait → `Agent` → wait)

package/.agents/workflows/helpers/plan-reference.md

@@ -1,6 +1,6 @@
-# /plan — on-demand reference appendix
+# /mandrel-plan — on-demand reference appendix
 
-> **Applies when:** you are executing [`/plan`](../plan.md) and hit one of the
+> **Applies when:** you are executing [`/mandrel-plan`](../mandrel-plan.md) and hit one of the
 > situations below — input-mode derivation, the Gate #1 light handoff,
 > shape-derived complexity routing, tickets-mode supersede authoring, critic
 > dispatch detail, a failed persist, or source-id resolution. The spine stays
@@ -8,7 +8,7 @@
 
 ## Deriving the input mode
 
-`/plan` has no operator-facing flags; the CLIs below still take every flag they
+`/mandrel-plan` has no operator-facing flags; the CLIs below still take every flag they
 always did. Read the invocation, **announce what you derived**, then fill in
 the flag — the same derive-then-announce contract `/git-deliver` uses for its
 terminal level.
@@ -94,7 +94,7 @@ not re-deriving which assumptions were really the agent's to make.
 
 ## Gate #1 → the light path (in-session handoff)
 
-On a confirmed `deliverLightSuggestion`, `/plan` routes into
+On a confirmed `deliverLightSuggestion`, `/mandrel-plan` routes into
 [`deliver-light.md`](deliver-light.md) **without ending the session**. Two
 things make that safe, and both are worth understanding before changing it:
 
@@ -110,7 +110,7 @@ things make that safe, and both are worth understanding before changing it:
    span). Two different checks on purpose, so a confirm is not a bypass.
 
 **When the light gate answers `ask-operator`**, the two ceiling sets disagreed.
-Resume `/plan` at step 2 (Author) **in this same session** — the interrogation
+Resume `/mandrel-plan` at step 2 (Author) **in this same session** — the interrogation
 is still valid and re-paying for it buys nothing. This bounce-back is not an
 escalation.
 
@@ -138,7 +138,7 @@ in `audit-rules.json`. There is no configuration key to set: a project with no
 rendered frontend resolves falsey and the offer never fires.
 
 When it does fire, **name [`/prototype`](../prototype.md) and stop there.**
-`/plan` must never invoke it — operator invocation is the entire design, because
+`/mandrel-plan` must never invoke it — operator invocation is the entire design, because
 the value is a human looking at a layout before its UI acceptance criteria are
 frozen.
 
@@ -182,7 +182,7 @@ decision:
 
 **The label is a hint; deliver re-derives.** Persist labels a
 lite cohort's Stories with **`route::lite`** as a *human-visible hint only* —
-`/deliver` computes the route from each fetched Story body via the same shape
+`/mandrel-deliver` computes the route from each fetched Story body via the same shape
 function at dispatch, so neither a lost label nor an unread marker can
 misroute delivery: a lite-shaped Story derives `lite` even with the label
 absent, and a sensitive-footprint Story routes `full` and keeps its fresh
@@ -421,7 +421,7 @@ The order is: create unlabelled → upsert `story-plan-state` on
 every Story → upsert `plan-summary` on the primary → flip every Story to
 `agent::ready`.
 
-This is what lets `/deliver` trust the label: a Story carrying
+This is what lets `/mandrel-deliver` trust the label: a Story carrying
 `agent::ready` always has its persist receipt on the ticket, so nothing can
 pick it up mid-write and read a half-persisted plan.
 
@@ -436,7 +436,7 @@ So if a transient GitHub failure strands the run at Story `k` of `N`:
 
 | | Behaviour |
 | --- | --- |
-| The `1..k-1` Stories | Live, but **not** `agent::ready` — invisible to `/deliver`, not half-delivered. |
+| The `1..k-1` Stories | Live, but **not** `agent::ready` — invisible to `/mandrel-deliver`, not half-delivered. |
 | Re-running persist | Adopts them by fingerprint, creates only the missing ones, then flips the whole cohort ready. |
 | Editing `stories.json` first | Changing a slug or title changes the fingerprint — the old issue is orphaned rather than adopted. Close it by hand. |
 

package/.agents/workflows/helpers/qa-core.md

@@ -115,7 +115,7 @@ is no per-workflow finding schema.
 Route the ledger through the shared classify/route/dedup/promote core. The
 outcome is that **every ledger item carries a class, a route decision, and an
 operator-confirmed disposition**, with each `file` item promoted via
-`promote-finding.js` into `/plan` — verified by the cluster's fingerprint
+`promote-finding.js` into `/mandrel-plan` — verified by the cluster's fingerprint
 footer landing in each seed body. For each untriaged item:
 
 1. **Classify** via
@@ -140,7 +140,7 @@ footer landing in each seed body. For each untriaged item:
    against it.
 3. **Decide the disposition** with the operator (`file` / `defer` / `dismiss`)
    and record it back onto the ledger item.
-4. **Promote the `file`-dispositioned findings through `/plan`** via
+4. **Promote the `file`-dispositioned findings through `/mandrel-plan`** via
    [`promote-finding.js`](../../scripts/lib/findings/promote-finding.js) — the
    same cluster/size/route/file path `audit-to-stories` consumes. Never
    hand-roll the clustering, sizing, or promotion in prose:
@@ -149,8 +149,8 @@ footer landing in each seed body. For each untriaged item:
    import { promoteFindings } from '../scripts/lib/findings/promote-finding.js';
    const { promotions } = await promoteFindings(ledgerItems, {
      searchIssues, // GitHub provider, open + closed
-     createStory, // tight cluster (≤2 surfaces): seed → /plan --seed-file
-     createPlanSeed, // broad cluster (>2 surfaces): same /plan --seed-file path (may N>1)
+     createStory, // tight cluster (≤2 surfaces): seed → /mandrel-plan --seed-file
+     createPlanSeed, // broad cluster (>2 surfaces): same /mandrel-plan --seed-file path (may N>1)
    });
    ```
 
@@ -159,16 +159,16 @@ footer landing in each seed body. For each untriaged item:
    `createPlanSeed` — neither opens an Epic; both render a **redacted** plan
    seed (redaction already ran at capture), **stamp the cluster's
    `fingerprintFooter(sha)` verbatim into the seed body**, and chain
-   `/plan --seed-file <seed>`. Prefer one Story; split only under the
+   `/mandrel-plan --seed-file <seed>`. Prefer one Story; split only under the
    default-single policy. A `file` disposition **never** opens a raw GitHub
-   Issue; only `defer` and `dismiss` skip the `/plan` handoff.
+   Issue; only `defer` and `dismiss` skip the `/mandrel-plan` handoff.
 
 ## The HITL write gate
 
 Capture stays read-only precisely so every state change lands in Triage,
-deliberately and confirmed. Any ticket-filing, seed write, `/plan` invocation,
+deliberately and confirmed. Any ticket-filing, seed write, `/mandrel-plan` invocation,
 or label mutation is a **write** — present the artifact, confirm each one with
 the operator, and wait before it happens. The agent never files tickets,
 promotes findings, or mutates a label autonomously. The plan→deliver hard stop
-is preserved: each `/plan` chain pauses at its own HITL gates and never
+is preserved: each `/mandrel-plan` chain pauses at its own HITL gates and never
 auto-delivers.

package/.agents/workflows/helpers/worktree-lifecycle.md

@@ -14,7 +14,7 @@ into the wrong commit. Each Story runs in its own `git worktree` at
 isolated per-Story. The main checkout stays quiet.
 
 This document is the operator and reviewer reference. See
-[`/deliver`](../deliver.md) and [`helpers/deliver-story`](deliver-story.md)
+[`/mandrel-deliver`](../mandrel-deliver.md) and [`helpers/deliver-story`](deliver-story.md)
 for the broader execution flow.
 
 ## Configuration
@@ -50,7 +50,7 @@ root, and shell-metacharacter injection in `root`.
 | **Sweep**       | Operator-driven (`WorktreeManager.sweepStaleLocks`)                           | Stale `*.lock` files under `.git/` (older than 5 min) are removed before GC.                                                                                |
 | **GC**          | Operator-driven (`WorktreeManager.gc`)                                        | Orphan `.worktrees/story-*` whose Stories are closed are reaped if clean.                                                                                   |
 | **Force-drain** | Operator-driven (`drain-pending-cleanup.js`)                                  | Retries `.worktrees/.pending-cleanup.json` (`git worktree remove` then `fs.rm`); Windows-only escalation enumerates user-mode handle holders and `taskkill`s them before re-trying. |
-| **Ensure**      | `single-story-init.js` (entry for `/deliver`)                                 | `git worktree add .worktrees/story-<id>/` on the `story-<id>` branch.                                                                                       |
+| **Ensure**      | `single-story-init.js` (entry for `/mandrel-deliver`)                                 | `git worktree add .worktrees/story-<id>/` on the `story-<id>` branch.                                                                                       |
 | **Run**         | During Story execution                                                        | Agent runs inside the worktree; HEAD/reflog activity is isolated.                                                                                           |
 | **Reap**        | After successful Story merge (in `single-story-close`)                        | `git worktree remove` — refuses to delete dirty trees or unmerged branches.                                                                                 |
 
@@ -85,13 +85,13 @@ epic-runner. The lifecycle surfaces that do run automatically are:
 
 | Entry point                       | Script / caller                                                      | What it cleans                                                                                                          |
 | --------------------------------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ |
-| Story init (`/deliver <storyId>`) | `single-story-init.js` boot sweep (`sweepMergedStoryBranches`)        | Merged/closed `story-*` branches (local + origin) from prior runs; it then creates only its own worktree.                 |
-| Story close (`/deliver` close)    | `single-story-close.js` worktree-reap phase (`WorktreeManager.reap`)  | The per-Story worktree; on a Windows EBUSY-class lock the entry is deferred into `.worktrees/.pending-cleanup.json`.       |
+| Story init (`/mandrel-deliver <storyId>`) | `single-story-init.js` boot sweep (`sweepMergedStoryBranches`)        | Merged/closed `story-*` branches (local + origin) from prior runs; it then creates only its own worktree.                 |
+| Story close (`/mandrel-deliver` close)    | `single-story-close.js` worktree-reap phase (`WorktreeManager.reap`)  | The per-Story worktree; on a Windows EBUSY-class lock the entry is deferred into `.worktrees/.pending-cleanup.json`.       |
 | Drain pending-cleanup (operator)  | `drain-pending-cleanup.js` (run directly — see below)                 | The pending-cleanup ledger, with optional Windows handle-holder escalation. This is the only path that drains the ledger. |
 
 Operator takeaway: if worktrees or stale locks accumulate, run
 `node .agents/scripts/drain-pending-cleanup.js` — nothing in the
-`/plan` → `/deliver` loop force-sweeps or GCs on your behalf.
+`/mandrel-plan` → `/mandrel-deliver` loop force-sweeps or GCs on your behalf.
 
 ## Draining the pending-cleanup ledger
 
@@ -297,6 +297,6 @@ Human reviewers should **keep using the main checkout** — not a worktree:
   `git worktree remove --force <path>`. Confirm there is no uncommitted work
   first.
 - **Disable temporarily**: flip `enabled: false` in `.agentrc.json`. The next
-  `/deliver` skips worktree creation entirely.
+  `/mandrel-deliver` skips worktree creation entirely.
 - **Inspect live worktrees**: `git worktree list --porcelain` on the main
   checkout. Each block shows `worktree <path>` / `branch refs/heads/story-<id>`.

package/.agents/workflows/{deliver.md → mandrel-deliver.md}

@@ -5,7 +5,7 @@ description:
   deliver-story engine — story-<id> → PR → main.
 ---
 
-# /deliver
+# /mandrel-deliver
 
 > **Lean spine.** Happy path + gate list. Sequencing, dispatch mechanics,
 > intent phrases, ceremony and the epilogue live in on-demand
@@ -16,7 +16,7 @@ description:
 
 ## Role
 
-One delivery door. `/deliver` owns input resolution, sequencing and the
+One delivery door. `/mandrel-deliver` owns input resolution, sequencing and the
 close-and-land tail; Stories are implemented via
 [`helpers/deliver-story.md`](helpers/deliver-story.md).
 
@@ -32,11 +32,11 @@ you read:
 
 | Invocation | Shape | Behavior |
 | --- | --- | --- |
-| `/deliver` | bare | List the open `agent::ready` Stories and ask which to deliver. Deliver nothing until answered. |
-| `/deliver 4712` | ids | One Story via `helpers/deliver-story.md`, **inline in this session** — no `story-worker` spawn. |
-| `/deliver 4712 4713 …` | ids | Resolve the set, sequence by the discovered graph via `stories-wave-tick.js`, dispatch sub-agents. |
-| `/deliver 4712 - 4716` | ids | A **range** — every id in the inclusive span. |
-| `/deliver add a --json flag to doctor` | prompt | Unplanned work: gate, author a receipt Story, land it — [`helpers/deliver-light.md`](helpers/deliver-light.md). |
+| `/mandrel-deliver` | bare | List the open `agent::ready` Stories and ask which to deliver. Deliver nothing until answered. |
+| `/mandrel-deliver 4712` | ids | One Story via `helpers/deliver-story.md`, **inline in this session** — no `story-worker` spawn. |
+| `/mandrel-deliver 4712 4713 …` | ids | Resolve the set, sequence by the discovered graph via `stories-wave-tick.js`, dispatch sub-agents. |
+| `/mandrel-deliver 4712 - 4716` | ids | A **range** — every id in the inclusive span. |
+| `/mandrel-deliver add a --json flag to doctor` | prompt | Unplanned work: gate, author a receipt Story, land it — [`helpers/deliver-light.md`](helpers/deliver-light.md). |
 
 **The discriminator is lexical and total.** An argument matching `^#?\d+$` is an
 id, and `^#?\d+\s*[-–—]\s*#?\d+$` an inclusive **range** — pass one on as a
@@ -92,14 +92,10 @@ it to an operator or add it to an attended run.
    - **0** — dispatch each `ready` id (already capped and overlap-free); an
      empty `ready` with work in flight means "waiting", so keep looping;
      `epilogueDue: true` means every Story is done — step 4.
-   - **2** — `cycleError`: the graph is self-referential; fix `depends_on`, do
-     not retry. **3** — `wedged`: nothing dispatchable, nothing in flight, the
-     undone Stories and their unmet blockers named; land a blocker or add it to
-     `--ids`. **4** — `blocked`: a Story carries `agent::blocked` with
-     `blockedReason`, the protocol's HITL pause
-     ([`instructions.md` § 1.J](../instructions.md)) — **stop the loop and
-     surface it; do not poll**, resuming once the operator unblocks it. Blocked
-     outranks a wedge, not a cycle.
+   - **2 / 3 / 4** — `cycleError` / `wedged` / `blocked`: stop the loop and
+     route per reference § Sequencing edge cases. **4** is the protocol's HITL
+     pause ([`instructions.md` § 1.J](../instructions.md)) — surface it and
+     wait for the operator; never poll.
 
 4. **Close each hand-off** (§ Closing what the workers hand back), then, with
    every Story landed, run the **per-run epilogue (N>1)**:
@@ -143,13 +139,13 @@ it): reference § Ceremony.
 - **Land or block — never a silent local build** (digest § 2). Attended delivers
   default to close-and-land (`delivery.routing.closeAndLand: true`); rest at
   `agent::closing` only when a human owns it.
-- **`/deliver` never plans.** Planned tickets come from [`/plan`](plan.md), and
-  an over-scope prompt **escalates and ends** — never invoke `/plan` in this
+- **`/mandrel-deliver` never plans.** Planned tickets come from [`/mandrel-plan`](mandrel-plan.md), and
+  an over-scope prompt **escalates and ends** — never invoke `/mandrel-plan` in this
   session to rescue it ([`helpers/deliver-light.md`](helpers/deliver-light.md)
   § Escalation is terminal).
 
 ## See also
 
-[`/plan`](plan.md), [`helpers/deliver-story.md`](helpers/deliver-story.md) (the
+[`/mandrel-plan`](mandrel-plan.md), [`helpers/deliver-story.md`](helpers/deliver-story.md) (the
 engine), [`helpers/deliver-light.md`](helpers/deliver-light.md) (the unplanned
-prompt path, shared with `/plan` Gate #1).
+prompt path, shared with `/mandrel-plan` Gate #1).

package/.agents/workflows/{plan.md → mandrel-plan.md}

@@ -5,7 +5,7 @@ description:
   policy.
 ---
 
-# /plan
+# /mandrel-plan
 
 > **Lean spine.** Happy path + gate list; edge-case detail lives on demand in
 > [`helpers/plan-reference.md`](helpers/plan-reference.md).
@@ -18,11 +18,11 @@ it, act**:
 
 | Invocation | Mode | Behavior |
 | --- | --- | --- |
-| `/plan` | ask | Ask what to plan; nothing runs first. |
-| `/plan add a --json flag to doctor` | seed | Ideation from prose: interrogate → author **one Story by default** → persist. |
-| `/plan temp/notes/idea.md` | seed-file | Same, from notes. An existing file is a path, not prose. |
-| `/plan 4712[,4713…]` | tickets | Fetch issue(s), analyze into proper Stories (prefer N=1 rewrite). |
-| `/plan 4712`, already delivered | amends | Amend a shipped Story from a **delta envelope**, not a re-interrogation. |
+| `/mandrel-plan` | ask | Ask what to plan; nothing runs first. |
+| `/mandrel-plan add a --json flag to doctor` | seed | Ideation from prose: interrogate → author **one Story by default** → persist. |
+| `/mandrel-plan temp/notes/idea.md` | seed-file | Same, from notes. An existing file is a path, not prose. |
+| `/mandrel-plan 4712[,4713…]` | tickets | Fetch issue(s), analyze into proper Stories (prefer N=1 rewrite). |
+| `/mandrel-plan 4712`, already delivered | amends | Amend a shipped Story from a **delta envelope**, not a re-interrogation. |
 
 **Resolving a bare id.** Read live state rather than asking: `agent::done` can
 only be amended, an open unplanned issue can only be planned. **Announce the
@@ -156,14 +156,14 @@ JSON. Tickets mode also comments on and closes each source id
 
 ## Constraints
 
-- `/plan` starts delivery **only** through a confirmed Gate #1 light route —
-  never off its own authored Stories, which land via [`/deliver`](deliver.md).
+- `/mandrel-plan` starts delivery **only** through a confirmed Gate #1 light route —
+  never off its own authored Stories, which land via [`/mandrel-deliver`](mandrel-deliver.md).
 - Duplicate search targets open Stories (`type::story`), not Epics; and
   deterministic gates still fail closed under `--yes`.
 
 ## See also
 
-[`/deliver`](deliver.md), [`/audit-to-stories`](audit-to-stories.md),
+[`/mandrel-deliver`](mandrel-deliver.md), [`/audit-to-stories`](audit-to-stories.md),
 [`helpers/plan-reference.md`](helpers/plan-reference.md) (on-demand detail),
 [`core/scope-triage`](../skills/core/scope-triage/SKILL.md) — optional
 split-advisory notes only (no routing verdict).

package/.agents/workflows/memory-consolidate.md

@@ -2,7 +2,7 @@
 description: >-
   Attended consolidation pass over this project's agent memory pool — merge
   duplicates, verify claims against the current tree, prune with operator
-  confirmation, rewrite the index, and stamp the pool so the /plan advisory
+  confirmation, rewrite the index, and stamp the pool so the /mandrel-plan advisory
   goes quiet.
 ---
 
@@ -96,7 +96,7 @@ Then write the receipt to `.consolidation-stamp.json` in the pool root:
 { "lastConsolidatedAt": "<ISO-8601 timestamp>" }
 ```
 
-The `/plan` Phase 0 advisory reads this file; until it is written, the nudge
+The `/mandrel-plan` Phase 0 advisory reads this file; until it is written, the nudge
 keeps firing. Write it **only** after Gate #2 — the stamp asserts an operator
 reviewed the pass, so writing it early makes it a lie.
 
@@ -112,5 +112,5 @@ Close with counts: entries read, corrected, merged, pruned, and the new total.
 
 ## See also
 
-[`/plan`](plan.md) (surfaces the advisory at its Gate #1),
-[`/deliver`](deliver.md) (point-of-write corrections as work lands).
+[`/mandrel-plan`](mandrel-plan.md) (surfaces the advisory at its Gate #1),
+[`/mandrel-deliver`](mandrel-deliver.md) (point-of-write corrections as work lands).

package/.agents/workflows/prototype.md

@@ -13,7 +13,7 @@ active runs" says nothing about layout, density, or interaction, so delivery
 resolves those by taste. `/prototype` puts a reviewable artifact in front of the
 operator before the criteria are written.
 
-**Operator-invoked only.** `/plan` may report that a plan touches UI and that
+**Operator-invoked only.** `/mandrel-plan` may report that a plan touches UI and that
 this command exists; it must never run it. No workflow, gate, or script invokes
 `/prototype` — the whole design rests on the operator asking for it.
 
@@ -89,7 +89,7 @@ documentation-freshness gate already carries that failure mode.
 - **One file, under the temp tree.** Never a second artifact, never outside the
   gitignored workspace-root temp tree, and never a committed prototype
   directory by default.
-- **Never invoked automatically.** `/plan` records the offer and proceeds with
+- **Never invoked automatically.** `/mandrel-plan` records the offer and proceeds with
   planning; no workflow, gate, or script may call this command.
 - **Read-only over the codebase.** The prototype file is the only write. Do not
   edit application source, tokens, or components to make a prototype render.
@@ -100,5 +100,5 @@ documentation-freshness gate already carries that failure mode.
 
 - [`/audit-ux-ui`](audit-ux-ui.md) — the same design-system SSOT discovery,
   applied as a review lens after the UI ships.
-- [`/plan`](plan.md) — where the advisory `complexitySignals.uiSurface` offer
+- [`/mandrel-plan`](mandrel-plan.md) — where the advisory `complexitySignals.uiSurface` offer
   surfaces. It names this command; it never runs it.

package/.agents/workflows/qa-assist.md

@@ -1,5 +1,5 @@
 ---
-description: Human-led QA assist loop — set up, then ride a rolling multi-observation intake session. The operator reports observations in any order; the agent enriches each (repro + root-cause file:line + coverage verdict for bugs; analysis + options + recommendation for enhancements), asks clarifying questions only when ambiguous, and appends a redacted ledger item — recording, never planning — to a persistent, resumable session under temp/qa/. Only when the operator says they are done does it review the full ledger and hand off to /plan.
+description: Human-led QA assist loop — set up, then ride a rolling multi-observation intake session. The operator reports observations in any order; the agent enriches each (repro + root-cause file:line + coverage verdict for bugs; analysis + options + recommendation for enhancements), asks clarifying questions only when ambiguous, and appends a redacted ledger item — recording, never planning — to a persistent, resumable session under temp/qa/. Only when the operator says they are done does it review the full ledger and hand off to /mandrel-plan.
 ---
 
 # /qa-assist
@@ -21,7 +21,7 @@ high-quality, triage-ready ledger. The session has four movements:
    a final review of the **entire** ledger and asks any last clarifying
    questions.
 4. **Triage & Plan** (Phase 4) — only then does it route the full ledger through
-   [`/plan`](plan.md) to generate Stories.
+   [`/mandrel-plan`](mandrel-plan.md) to generate Stories.
 
 Unlike [`/qa-explore`](qa-explore.md) (where the *agent* drives open-ended
 exploration of a named surface), `/qa-assist` is **human-led**: the human owns
@@ -89,12 +89,12 @@ rolling loop stays fluid:
   to **ask clarifying questions when the observation is ambiguous**. After each
   append it **echoes the recorded item** for correction, then **loops back** for
   the next observation. It does **not** triage, route, file tickets, or invoke
-  `/plan` during intake.
+  `/mandrel-plan` during intake.
 - **Two things always require explicit operator confirmation** (the HITL write
   gate in [`helpers/qa-core.md`](helpers/qa-core.md)). First, the session-level
   transition into **Phase 4 — Triage & Plan** — the operator must say they are
   done. Second, **every write that leaves the local ledger** — filing a ticket,
-  invoking `/plan`, or mutating a label. Present the artifact, ask, and wait.
+  invoking `/mandrel-plan`, or mutating a label. Present the artifact, ask, and wait.
 
 In short: appending to the rolling ledger is the natural product of intake and
 needs no gate beyond the echo-back; **planning and anything that leaves the
@@ -198,7 +198,7 @@ every decision to the shared helpers; never re-derive them in prose.
 ## Phase 3 — Record (per observation), then loop
 
 Goal: persist the enriched finding to the rolling ledger and **return to
-intake**. **No triage, routing, ticket-filing, or `/plan` happens here** — that
+intake**. **No triage, routing, ticket-filing, or `/mandrel-plan` happens here** — that
 is Phase 4, and only after the operator says they are done.
 
 1. **Append a `QaLedgerItem`** to the ledger (shape per
@@ -232,17 +232,17 @@ its transition is **explicitly operator-gated**.
 2. **Triage the ledger** through the shared classify → route → disposition →
    promote procedure in [`helpers/qa-core.md`](helpers/qa-core.md): dedup/route
    each `file` finding against open + closed Issues, then promote the
-   `file`-dispositioned findings through `promoteFindings` → `/plan` (never a raw
+   `file`-dispositioned findings through `promoteFindings` → `/mandrel-plan` (never a raw
    Issue), stamping each cluster's `fingerprintFooter(sha)` into the seed.
    `defer` carries an item forward as backlog; `dismiss` marks it non-actionable.
 3. **Gate:** the move into this phase, and every write inside it (seed write,
-   `/plan` invocation, ticket-filing, label mutation), is **operator-gated** —
+   `/mandrel-plan` invocation, ticket-filing, label mutation), is **operator-gated** —
    confirm each one. The plan→deliver hard stop is preserved; redaction has
    already run, so nothing unredacted reaches disk or GitHub.
 
 After planning, summarize: the findings recorded, the route/promotion decisions
 (`new`/`update-existing`/`duplicate`/`regression-of-closed`), whether each
-cluster became a Story via `/plan --seed-file`, and any `defer` backlog a
+cluster became a Story via `/mandrel-plan --seed-file`, and any `defer` backlog a
 resumed session will pick up.
 
 ---
@@ -259,7 +259,7 @@ the `/qa-assist`-specific deltas are:
   records each. **Never invent an observation**; ask clarifying questions only
   when one is ambiguous, batched across the dump.
 - **Record during intake; plan only on "done".** Phases 1–3 enrich, append, and
-  loop — never triage, route, file, or invoke `/plan`. All of that is Phase 4,
+  loop — never triage, route, file, or invoke `/mandrel-plan`. All of that is Phase 4,
   entered only on explicit operator confirmation that testing is done.
 - **Light intake gate, firm boundary gate.** Intake → Enrich → Record is fluid
   (echo-back, no ceremony); the move into Phase 4 and every write that leaves the
@@ -275,11 +275,11 @@ the `/qa-assist`-specific deltas are:
 
 ## See also
 
-- [`/plan`](plan.md) — the planning pipeline `/qa-assist` chains into in Phase 4.
+- [`/mandrel-plan`](mandrel-plan.md) — the planning pipeline `/qa-assist` chains into in Phase 4.
   The plan→deliver hard stop is preserved across the handoff.
 - [`/qa-explore`](qa-explore.md) — the agent-led sibling that drives a named
-  surface and triages through the same `/plan` handoff.
+  surface and triages through the same `/mandrel-plan` handoff.
 - [`/audit-to-stories`](audit-to-stories.md) — the precedent for the
-  findings → `/plan` handoff and the shared fingerprint-footer dedup contract.
+  findings → `/mandrel-plan` handoff and the shared fingerprint-footer dedup contract.
 - [`helpers/qa-core.md`](helpers/qa-core.md) — the shared contract/session/
   redaction/QaLedgerItem/triage/HITL core.