mandrel 2.36.0 → 2.38.0

package/.agents/scripts/single-story-close.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 /**
- * single-story-close.js — Close a Story against `main` (v2 `/deliver` path).
+ * single-story-close.js — Close a Story against `main` (v2 `/mandrel-deliver` path).
  *
- * Thin CLI entry for `/deliver` / `helpers/deliver-story`. Opens a PR from
+ * Thin CLI entry for `/mandrel-deliver` / `helpers/deliver-story`. Opens a PR from
  * `story-<id>` to `project.baseBranch`, runs Story-scope review, and arms
  * auto-merge. There is no Epic parent, epic-merge-lock, or wave merge.
  *
@@ -237,8 +237,6 @@ runAsCli(import.meta.url, main, {
         // the point of this flag is that arming stays on the one code path.
         'Land despite a Story-scope code-review CRITICAL blocker you have reviewed and judged wrong. The reason is mandatory (≥12 chars) and is recorded on the Story, on the PR, and as a `review-block-overridden` friction signal; the terminal envelope reports `gates.codeReview: "overridden"`. Use this instead of merging the PR by hand with the GitHub CLI — a hand-merge bypasses the gate with no record at all.',
       ],
-      ['--no-evidence', 'Do not reuse or write gate evidence stamps.'],
-      ['--dry-run', 'Report the plan; mutate nothing.'],
     ],
     notes: [
       'Exit codes:\n  0  landed\n  1  blocked or failed\n  3  pending (resumable — run the envelope’s nextCommand)',

package/.agents/scripts/single-story-init.js

@@ -2,7 +2,7 @@
 /* node:coverage ignore file */
 
 /**
- * single-story-init.js — Initialize a Story for v2 `/deliver`.
+ * single-story-init.js — Initialize a Story for v2 `/mandrel-deliver`.
  *
  * Seeds `story-<id>` from `project.baseBranch` (default `main`), materialises
  * the per-Story worktree when isolation is enabled, upserts a `story-init`
@@ -73,6 +73,7 @@ import {
 } from './lib/orchestration/ticketing.js';
 import { createProvider } from './lib/provider-factory.js';
 import { buildProtectionCtx } from './lib/single-story-sweep/protection-ctx.js';
+import { resolveSweepLockPath } from './lib/single-story-sweep/sweep-lock.js';
 // `sweepMergedStoryBranches` is imported dynamically below — its transitive
 // graph reaches `picomatch` (via `git-cleanup.js`). Loading it statically
 // would crash module resolution before `assertDepsInstalled()` can emit a
@@ -121,7 +122,7 @@ export function assertDeliverableStory(story, storyId) {
   if (!story.labels.includes(TYPE_LABELS.STORY)) {
     throw new Error(
       `Issue #${storyId} is not a Story (labels: ${story.labels.join(', ')}). ` +
-        'v2 /deliver accepts type::story tickets only.',
+        'v2 /mandrel-deliver accepts type::story tickets only.',
     );
   }
   if (story.state === 'closed') {
@@ -131,7 +132,7 @@ export function assertDeliverableStory(story, storyId) {
   if (/\b(?:Epic|Parent):\s*#\d+/i.test(body)) {
     throw new Error(
       `Story #${storyId} still declares an Epic/Parent footer. ` +
-        'v2 delivery is Story-only — re-plan as a standalone Story before /deliver.',
+        'v2 delivery is Story-only — re-plan as a standalone Story before /mandrel-deliver.',
     );
   }
 }
@@ -188,7 +189,7 @@ export async function assertNotForeignExecuting({
       (lease.previousOwner
         ? ` (assignee @${lease.previousOwner})`
         : ' with no assignee') +
-      '. Another /deliver run may already own it. Confirm that run is dead, ' +
+      '. Another /mandrel-deliver run may already own it. Confirm that run is dead, ' +
       'then re-run with --steal to take it.',
   );
 }
@@ -292,6 +293,9 @@ export function decideStoryBranchSeed({ localHas, remoteHas }) {
  *     in `sweep.protected` for the operator).
  *   - Cross-session lock: a single lockfile under `tempRoot` prevents
  *     two concurrent `/single-story-deliver` invocations from racing.
+ *     Story #5112 made that lockfile shared with `boot-sweep.js` — the
+ *     other entry point into the same merged-branch reap — by routing
+ *     both through `resolveSweepLockPath`.
  *
  * Exported for testing.
  */
@@ -307,7 +311,7 @@ export async function reapMergedStoryBranches({
     injectedSweep ??
     (await import('./lib/single-story-sweep.js')).sweepMergedStoryBranches;
   const tempRoot = config?.project?.paths?.tempRoot ?? 'temp';
-  const lockPath = path.resolve(cwd, tempRoot, 'single-story-sweep.lock');
+  const lockPath = resolveSweepLockPath({ cwd, tempRoot });
   const lockTimeoutMs =
     config.delivery?.worktreeIsolation?.sweepLockMs ?? 60_000;
   try {
@@ -603,7 +607,7 @@ export async function runSingleStoryInit({
   );
   progress('INIT', `Initializing standalone Story #${storyId}...`);
 
-  // Issue #4483 — deterministic remote evidence at the v2 `/deliver` entry
+  // Issue #4483 — deterministic remote evidence at the v2 `/mandrel-deliver` entry
   // seam (`single-story-init.js`). The
   // probe is read-only, so it runs under --dry-run too. The CLI records
   // the fact; the workflow owns the `agent::blocked` transition on

package/.agents/scripts/stories-wave-tick.js

@@ -2,7 +2,7 @@
 
 /**
  * stories-wave-tick.js — continuous ready-set planner for the standalone
- * `/deliver` story-list path.
+ * `/mandrel-deliver` story-list path.
  *
  * Thin **adapter** over the path-agnostic ready-set scheduling core
  * (`lib/wave-runner/ready-set.js#planReadySet`). It emits the set of
@@ -21,7 +21,7 @@
  * **Two modes, one kernel.**
  *
  *   - **Probe mode** (`--stories <csv> --probe-live [--dispatched <csv>]`) is
- *     the canonical `/deliver` beat: the graph, the done set, and the in-flight
+ *     the canonical `/mandrel-deliver` beat: the graph, the done set, and the in-flight
  *     count are resolved from **live state** via `lib/wave-runner/live-probe.js`.
  *     The caller supplies ids, so there is no accounting to hand-maintain
  *     across beats — the seed-the-first-beat's-`--done` footgun the workflow
@@ -97,14 +97,14 @@
  * `--done` and `ready` is empty.
  *
  * The per-beat concurrency cap is resolved from the same config seam
- * `/deliver` uses — `resolveConfig` + `getRunners` reading
+ * `/mandrel-deliver` uses — `resolveConfig` + `getRunners` reading
  * `delivery.deliverRunner.concurrencyCap` (default 3) — so a
  * `.agentrc.local.json` override is honored. A `--concurrency <n>` CLI flag
  * overrides the config-resolved value for that run only, and the envelope's
  * `capPrecedence` names which source won so the override is never silent
  * (Story #4875). This shares one
  * deterministic config source (`delivery.deliverRunner.concurrencyCap`) and
- * one scheduling kernel with every `/deliver` multi-Story invocation.
+ * one scheduling kernel with every `/mandrel-deliver` multi-Story invocation.
  *
  * Exit codes: 0 ok · 1 input error · 2 dependency cycle (`cycleError`) ·
  * 3 wedged (`wedged`) — ready is empty, nothing is in flight, and undone
@@ -170,7 +170,7 @@ and the same file-overlap guard as planReadySet.
 
 Two modes:
   --probe-live  Resolve the graph and derive done / in-flight from LIVE state
-                (the canonical /deliver beat). Nothing is hand-maintained
+                (the canonical /mandrel-deliver beat). Nothing is hand-maintained
                 across beats. Mutually exclusive with --dag/--dag-file/--done/
                 --in-flight. Adds "done" and "epilogueDue" to the envelope.
   --dag         Legacy flag mode: the caller supplies the graph and the run
@@ -662,7 +662,7 @@ export function parseConcurrencyOverride(raw) {
 /**
  * Resolve the per-beat concurrency cap.
  *
- * Mirrors the `/deliver` multi-Story seam (`helpers/deliver-story.md`): resolve the
+ * Mirrors the `/mandrel-deliver` multi-Story seam (`helpers/deliver-story.md`): resolve the
  * project config (which deep-merges `.agentrc.local.json` over `.agentrc.json`)
  * then read `delivery.deliverRunner.concurrencyCap` via `getRunners` (default
  * 3). An explicit `override` (the `--concurrency <n>` CLI flag) wins over
@@ -855,7 +855,7 @@ export function buildReadySetEnvelope(
     return {
       envelope: {
         ...base,
-        cycleError: `Dependency cycle detected: ${cycle.join(' → ')}. Fix the depends_on declarations before running /deliver.`,
+        cycleError: `Dependency cycle detected: ${cycle.join(' → ')}. Fix the depends_on declarations before running /mandrel-deliver.`,
       },
       exitCode: 2,
     };
@@ -1087,7 +1087,7 @@ export function runStoriesWaveTick({
  *
  * This is the flag-free beat. The caller supplies only the Story ids it was
  * asked to deliver; `done` and `inFlight` are probed rather than transcribed,
- * which is what makes the `/deliver` loop's old seed-the-first-beat footgun
+ * which is what makes the `/mandrel-deliver` loop's old seed-the-first-beat footgun
  * structurally impossible instead of merely documented.
  *
  * The envelope is the flag mode's, plus three probe-only fields the caller can

package/.agents/skills/core/idea-refinement/SKILL.md

@@ -13,7 +13,7 @@ description:
 - Phase 1 MUST restate the idea as a "How Might We" statement, ask 3–5 sharpening questions via `AskUserQuestion`, and generate 5–8 variations (never 20+ shallow ones) — each carrying a reason it exists, told as a short story, not a bare bullet. Do not proceed until target user and success criteria are explicit.
 - Phase 2 grill loop poses **one** question at a time, each with a recommended answer + one-line rationale grounded in user input / codebase / first principles; never batch questions and never omit the recommendation.
 - Re-enumerate open branches after every grill answer; stop only when no unresolved decisions remain. Take the off-ramp directly to Phase 3 when the idea is already crisply scoped. A branch consciously deferred rather than resolved records its deferral reason.
-- Phase 3 emits a markdown one-pager with the canonical five planning headings exactly: `## Context`, `## Goal`, `## Non-Goals`, `## Scope`, `## Acceptance Criteria` (plus optional `## Open Questions`). No alternate heading text — the `/plan` clarity gate depends on this verbatim.
+- Phase 3 emits a markdown one-pager with the canonical five planning headings exactly: `## Context`, `## Goal`, `## Non-Goals`, `## Scope`, `## Acceptance Criteria` (plus optional `## Open Questions`). No alternate heading text — the `/mandrel-plan` clarity gate depends on this verbatim.
 - Surface every key assumption inside `## Context` (or `## Scope`); assumptions do not get their own heading. Unresolved decisions MUST NOT carry into the one-pager.
 - The `## Non-Goals` list is mandatory and each entry includes a reason — focus is created by explicit exclusion.
 - Be honest, not supportive: push back on weak ideas with kindness; never function as a yes-machine.
@@ -22,10 +22,10 @@ description:
 
 ## Activation
 
-Called from [`/plan`](../../../workflows/plan.md) during ideation when the
+Called from [`/mandrel-plan`](../../../workflows/mandrel-plan.md) during ideation when the
 operator supplies `--seed "<text>"` (or runs ideation with no seed and the host
 collects one interactively). The skill sharpens freeform intent into the
-canonical planning sections that `/plan` then folds into a Story. There is no
+canonical planning sections that `/mandrel-plan` then folds into a Story. There is no
 separate Epic Clarity Gate path in v2 — N=1 Story authoring with a folded
 `## Spec` is the lean default.
 
@@ -134,9 +134,9 @@ clothes — inside the grill loop, not after the one-pager is written.
 #### Phase 3: Sharpen & Ship
 
 Produce a markdown one-pager that moves work forward. The five canonical
-headings below match `.agents/templates/epic-from-idea.md` and the `/plan`
+headings below match `.agents/templates/epic-from-idea.md` and the `/mandrel-plan`
 clarity gate; emit them verbatim so the renderer can substitute the body into a
-`/plan` Story seed without translation.
+`/mandrel-plan` Story seed without translation.
 
 ```markdown
 # [Idea Name]

package/.agents/skills/core/scope-triage/SKILL.md

@@ -1,8 +1,8 @@
 ---
 name: scope-triage
 description:
-  Optional split-advisory for `/plan`. Under v2 there is no epic|story routing
-  verdict — `/plan` always authors Stories. Use this skill only when judging
+  Optional split-advisory for `/mandrel-plan`. Under v2 there is no epic|story routing
+  verdict — `/mandrel-plan` always authors Stories. Use this skill only when judging
   whether a draft should stay one Story or legitimately split (near-zero
   overlap or an architectural seam).
 ---
@@ -11,7 +11,7 @@ description:
 
 ## Policy Capsule
 
-- There is **no** `epic | story | borderline` routing verdict in v2. `/plan`
+- There is **no** `epic | story | borderline` routing verdict in v2. `/mandrel-plan`
   is a single path that emits **one Story by default**.
 - This skill is an optional **split advisory**: should the author keep one
   Story, or does the seed clear the default-single split policy?

package/.agents/skills/skills.index.json

@@ -97,7 +97,7 @@
       "tier": "core",
       "category": "core",
       "path": ".agents/skills/core/scope-triage/SKILL.md",
-      "description": "Optional split-advisory for `/plan`. Under v2 there is no epic|story routing verdict — `/plan` always authors Stories. Use this skill only when judging whether a draft should stay one Story or legitimately split (near-zero overlap or an architectural seam).",
+      "description": "Optional split-advisory for `/mandrel-plan`. Under v2 there is no epic|story routing verdict — `/mandrel-plan` always authors Stories. Use this skill only when judging whether a draft should stay one Story or legitimately split (near-zero overlap or an architectural seam).",
       "policyCapsuleBullets": 5,
       "allowedTools": null,
       "vendor": null

package/.agents/skills/stack/qa/qa-harness/SKILL.md

@@ -170,7 +170,7 @@ Record each `F#` finding as a `QaLedgerItem` on the shared session ledger under
 `temp/qa/`, then route the ledger through the shared classify → route →
 disposition → promote core — both stated once in
 [`qa-core.md`](../../../../workflows/helpers/qa-core.md). The harness **MUST
-NOT** create tickets autonomously: findings are promoted through `/plan` only
+NOT** create tickets autonomously: findings are promoted through `/mandrel-plan` only
 after the operator confirms each disposition at the HITL write gate. That gate
 is the safety boundary against spurious filing.
 

package/.agents/workflows/audit-data-model.md

@@ -27,7 +27,7 @@ than empty findings. The applicability probe (`hasPersistenceLayer` in
 [`lib/audit-suite/selector.js`](../scripts/lib/audit-suite/selector.js), gated
 by `target: "data-model"` in
 [`schemas/audit-rules.json`](../schemas/audit-rules.json)) makes this decision
-automatically in `/deliver` and plan-run modes; in a manual invocation you MUST
+automatically in `/mandrel-deliver` and plan-run modes; in a manual invocation you MUST
 make the same determination yourself before reading anything else.
 
 ## Scope

package/.agents/workflows/audit-documentation.md

@@ -188,7 +188,7 @@ auditable.
 ## Periodic full-scope sweep
 
 Context Economy findings accrete slowly — a doc that is lean today grows a
-bloated tail over many deliveries, and no single change-set-scoped `/deliver`
+bloated tail over many deliveries, and no single change-set-scoped `/mandrel-deliver`
 run sees the whole picture. Run this lens **full-scope** on a
 recurring cadence so the drift is caught before it compounds:
 
@@ -202,7 +202,7 @@ recurring cadence so the drift is caught before it compounds:
 Route the resulting `audit-documentation-results.md` through
 [`/audit-to-stories`](audit-to-stories.md), which groups the findings,
 deduplicates them against existing Issues by fingerprint, and opens
-remediation Stories (or chains into `/plan --seed`) so the Context-Economy
+remediation Stories (or chains into `/mandrel-plan --seed`) so the Context-Economy
 findings land as actionable, tracked work rather than a report nobody reads.
 
 ## Constraint (lens-specific carve-out)

package/.agents/workflows/audit-to-stories.md

@@ -3,7 +3,7 @@ description:
   Convert findings produced by the audit-* workflows into actionable
   GitHub Stories. Reads temp/audits/audit-*-results.md, groups findings
   cross-audit, deduplicates against existing Issues by fingerprint, and
-  either chains into /plan --seed-file or opens standalone Stories.
+  either chains into /mandrel-plan --seed-file or opens standalone Stories.
 ---
 
 # /audit-to-stories [audit-file-or-glob]
@@ -111,8 +111,8 @@ Ask:
 
 > How would you like these `<M>` Stories created?
 >
-> - **Single plan via `/plan`** **[Recommended]** — chains into
->   `/plan --seed-file <emitted.md>` so the standard Story authoring
+> - **Single plan via `/mandrel-plan`** **[Recommended]** — chains into
+>   `/mandrel-plan --seed-file <emitted.md>` so the standard Story authoring
 >   handles the seed. Prefer one Story; split only under the
 >   default-single policy.
 > - **Individual standalone Stories** — opens one GitHub Issue per
@@ -122,7 +122,7 @@ Ask:
 
 ## Phase 5a — Single-plan path
 
-Build the `/plan` seed from the filtered plan envelope:
+Build the `/mandrel-plan` seed from the filtered plan envelope:
 
 ```bash
 node .agents/scripts/audit-to-stories.js --emit-plan-seed \
@@ -132,16 +132,16 @@ node .agents/scripts/audit-to-stories.js --emit-plan-seed \
 
 The seed renders the canonical one-pager sections — Problem Statement,
 Recommended Direction, Key Assumptions (with links to every source
-report), MVP Scope (the M proposed Stories), Key Files (so `/plan`'s
+report), MVP Scope (the M proposed Stories), Key Files (so `/mandrel-plan`'s
 authoring step has concrete anchors), Not Doing.
 
 Chain into the existing planning entrypoint:
 
 ```text
-/plan --seed-file <path-to-seed>
+/mandrel-plan --seed-file <path-to-seed>
 ```
 
-(`/plan --seed "$(cat <path>)"` also works for small seeds). `/plan`
+(`/mandrel-plan --seed "$(cat <path>)"` also works for small seeds). `/mandrel-plan`
 then runs its author → persist path, as documented in its workflow.
 
 **Dedup provenance is carried mechanically — do not hand-copy it.** The seed's
@@ -210,9 +210,9 @@ every Story that has a resolvable blocker with a canonical
 GitHub `blocked_by` relations. An edge whose target was never opened (deduped,
 ledger-suppressed) drops rather than becoming a `blocked by #undefined`.
 
-**Do not skip this.** `/deliver` has no other source for this cohort's order:
+**Do not skip this.** `/mandrel-deliver` has no other source for this cohort's order:
 its footprint guard ignores the shared provenance footers, so an unwired cohort
-is genuinely unordered and `/deliver` will co-dispatch Stories the edges say
+is genuinely unordered and `/mandrel-deliver` will co-dispatch Stories the edges say
 must follow one another.
 
 ## Phase 6 — Idempotency (folded into Phase 1 scan)
@@ -288,7 +288,7 @@ summarising the run:
   · <L> skipped (re-occurring)"`.
 
 When the single-plan path ran, link the Story (or plan-run) the chained
-`/plan` opened. When the Standalone-Stories path ran, list every Issue URL.
+`/mandrel-plan` opened. When the Standalone-Stories path ran, list every Issue URL.
 
 ## Constraints
 
@@ -345,7 +345,7 @@ scheduler owns the cadence; this workflow owns the routing.
 
 ## See also
 
-- [`/plan`](plan.md) — the planning pipeline `/audit-to-stories`
+- [`/mandrel-plan`](mandrel-plan.md) — the planning pipeline `/audit-to-stories`
   chains into for Story creation.
 - [`lib/findings/route-finding.js`](../scripts/lib/findings/route-finding.js) —
   the shared fingerprint/dedup/route helper this workflow and `qa-explore`

package/.agents/workflows/git-deliver.md

@@ -13,7 +13,7 @@ The **single source of truth** for getting outstanding working-tree changes
 out the door when they do not belong to a planned Story (typo fixes, doc
 tweaks, dependency bumps, operator housekeeping, benchmark result commits
 from mandrel-bench's `/benchmark` Step 4). It is the ad-hoc counterpart to
-the heavyweight `/deliver` pipeline: one command that **detects the git
+the heavyweight `/mandrel-deliver` pipeline: one command that **detects the git
 setup** and escalates to the correct terminal step. Flags pin any level
 explicitly; the interactive choice prompt fires **only** when the detected
 state is genuinely ambiguous, so the common path stays non-interactive and
@@ -133,7 +133,7 @@ directly, honoring these contracts:
 Stop at the resolved level and print a one-block summary naming the branch,
 subject, and (pr level) PR URL + auto-merge state.
 
-Do **not** poll CI — that is the `/deliver` Phase 7 job and is overkill for
+Do **not** poll CI — that is the `/mandrel-deliver` Phase 7 job and is overkill for
 ad-hoc changes. The local feature branch left behind at the pr level is
 reaped by the next run's Boot sweep — see
 [`.agents/rules/git-conventions.md` § Local checkout hygiene](../rules/git-conventions.md).
@@ -151,14 +151,14 @@ reaped by the next run's Boot sweep — see
   does not rewrite history.
 - **Always** prefer `--auto --squash --delete-branch` at the pr level unless
   the operator opts out, so `main`'s history stays uniform across the
-  `/git-deliver` and `/deliver` surfaces.
+  `/git-deliver` and `/mandrel-deliver` surfaces.
 
 ---
 
 ## ⚠️ Parallel Story Execution
 
 Do **not** use this workflow from inside a parallel story-execution context
-(`/deliver #<storyId>`, `/deliver` wave dispatch). `git add -A` sweeps any
+(`/mandrel-deliver #<storyId>`, `/mandrel-deliver` wave dispatch). `git add -A` sweeps any
 untracked files in the working tree, which in a shared working directory may
 belong to another agent. In those contexts stage explicit paths only and
 confirm `git branch --show-current` reports the expected `story-<id>` branch

package/.agents/workflows/helpers/_merge-conflict-template.md

@@ -1,7 +1,7 @@
 # Merge Conflict Resolution — Shared Procedure
 
 Canonical, workflow-agnostic procedure for resolving merge / rebase conflicts.
-Referenced by `deliver.md` and `helpers/deliver-story.md`.
+Referenced by `mandrel-deliver.md` and `helpers/deliver-story.md`.
 
 ## Procedure
 

package/.agents/workflows/helpers/audit-lens-core.md

@@ -30,7 +30,7 @@ constraint for that lens only.
 Each lens carries its own `{{changedFiles}}` fence — the substitution anchor
 consumed by `.agents/scripts/lib/audit-suite/` — and reads it as follows:
 
-- When this lens is invoked from `/deliver` close lenses (or a plan-run audit),
+- When this lens is invoked from `/mandrel-deliver` close lenses (or a plan-run audit),
   the fence is populated with the Story (or plan-run) change-set file list.
   **Restrict analysis to those files** (and their direct dependencies when the
   lens explicitly calls for cross-file reasoning).

package/.agents/workflows/helpers/code-review.md

@@ -1,13 +1,13 @@
 ---
 description: >-
   Perform a comprehensive code review of a Story change set against main
-  before `/deliver` opens or merges the Story PR
+  before `/mandrel-deliver` opens or merges the Story PR
 ---
 
 # Code Review (helper)
 
 > **Helper module.** Not a slash command. Invoked automatically from
-> `/deliver` via `single-story-close.js`. To run a review directly, invoke
+> `/mandrel-deliver` via `single-story-close.js`. To run a review directly, invoke
 > the parent workflow — operators do not call this helper by hand.
 
 This helper performs a comprehensive code review of a change set before it
@@ -36,7 +36,7 @@ child.
 
 ## Argument contract
 
-The caller passes the following arguments (`/deliver` passes
+The caller passes the following arguments (`/mandrel-deliver` passes
 `scope: story`):
 
 | Argument    | Type                                  | Required | Meaning                                                                                          |
@@ -61,7 +61,7 @@ It is an **input-only** signal: it changes *how thorough* the review is, never
 the findings envelope (`{ status, severity, posted, report, halted,
 blockerReason }`) nor the posted `verification-results` structured-comment body. An
 absent or malformed `depth` is treated as `standard`, so a Story that skipped
-`/plan` still gets a passing review with no new failure mode.
+`/mandrel-plan` still gets a passing review with no new failure mode.
 
 How each tier changes the review protocol:
 

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

@@ -1,6 +1,6 @@
 ---
 description:
-  The unplanned prompt path shared by /deliver and /plan Gate #1. Judges a
+  The unplanned prompt path shared by /mandrel-deliver and /mandrel-plan Gate #1. Judges a
   prompt's predicted footprint, authors a receipt Story, then lands it through
   the same single-story-init / single-story-close engine — every close gate
   unchanged.
@@ -9,8 +9,8 @@ description:
 # Unplanned delivery (the prompt path)
 
 > **A path, not a command.** There is no `/deliver-light` to type. This file is
-> reached two ways — `/deliver "<prompt>"` (an operator describing small work)
-> and `/plan` Gate #1 (a seed the suggestion says fits the light ceilings, once
+> reached two ways — `/mandrel-deliver "<prompt>"` (an operator describing small work)
+> and `/mandrel-plan` Gate #1 (a seed the suggestion says fits the light ceilings, once
 > the operator confirms). Read
 > [`deliver-digest.md`](deliver-digest.md) once first — the engine invariants,
 > gates, and terminal-envelope contract below are its.
@@ -25,7 +25,7 @@ It never relaxes a close gate, never bypasses the PR to `main`, and never lands
 over-scope work silently.
 
 Two callers, one gate: whichever door you arrived through, the suitability gate
-below is the decision. A `/plan` Gate #1 suggestion is a *suggestion* — it is
+below is the decision. A `/mandrel-plan` Gate #1 suggestion is a *suggestion* — it is
 read against seed-time signals (`DELIVER_LIGHT_SUGGESTION_CEILINGS`: artifacts,
 risk hits, sensitive-path classes), while the gate here is read against the
 predicted work's *effort and risk* (`STORY_SHAPE_CEILINGS`: change kinds,
@@ -39,7 +39,7 @@ across three files is trivial work with a high count; a 200-line rewrite of one
 module is a single change. The axes are therefore effort and risk: distinct
 change **kinds** (N instances of one mechanical edit is one kind at N sites), a
 coarse **magnitude** bucket, and **uncertainty** — is the shape determined by
-the request, or does it still need the design decisions `/plan` exists to
+the request, or does it still need the design decisions `/mandrel-plan` exists to
 resolve?
 
 Because the predicted footprint is a *declaration* — a guess, and a gameable one
@@ -65,7 +65,7 @@ answer).
    **and** a ledgered model verdict with a recorded reason. Both must agree on
    `lite`.
 2. **Over-scope stops — it never hard-fails.** An over-ceiling prompt STOPS and
-   asks the operator to escalate to `/plan` or proceed light. **Both answers
+   asks the operator to escalate to `/mandrel-plan` or proceed light. **Both answers
    are executable** — `--operator-proceed-light` records the second one
    (§ Recording a proceed-light answer). Under `--yes` it fails closed to an
    **`escalated` terminal envelope** that ends the session (§ Escalation is
@@ -97,9 +97,9 @@ answer).
    - **`proceed-light`** — the receipt Story is authored; read `storyId` and
      `nextCommands`. Continue to step 2.
    - **`ask-operator`** — predicted scope exceeds the light ceilings. STOP and
-     ask the operator to escalate to `/plan` or proceed light. Do not proceed
+     ask the operator to escalate to `/mandrel-plan` or proceed light. Do not proceed
      on your own. This is a **question, not a terminal** — wait for the answer,
-     then act on it: *escalate* leaves for `/plan`, *proceed light* re-runs the
+     then act on it: *escalate* leaves for `/mandrel-plan`, *proceed light* re-runs the
      same command with `--operator-proceed-light "<their reason>"`
      (§ Recording a proceed-light answer).
    - **over-scope under `--yes`** — no `action` to branch on: the gate emits an
@@ -107,14 +107,14 @@ answer).
      terminal governs; you are finished.
 
    `--amends '#<id>'` is the canonical light case — shape-checked identically; a
-   heavy amendment escalates to `/plan` like any other over-scope prompt.
+   heavy amendment escalates to `/mandrel-plan` like any other over-scope prompt.
 
-   **Entered from `/plan` Gate #1?** Fill `--creates` / `--refactors` /
+   **Entered from `/mandrel-plan` Gate #1?** Fill `--creates` / `--refactors` /
    `--acceptance` / `--reason` from the plan-context envelope's codebase
    snapshot and `complexitySignals` rather than re-deriving them from the seed
    text — Gate #1 has already done that work, and re-deriving throws away the
    better signal. An `ask-operator` verdict here means the two ceiling sets
-   disagreed: **return to [`../plan.md`](../plan.md) step 2 (Author) in the same
+   disagreed: **return to [`../mandrel-plan.md`](../mandrel-plan.md) step 2 (Author) in the same
    session**, carrying the interrogation you already paid for. That bounce-back
    is not an escalation and does not need a fresh session (§ Why the two
    directions differ).
@@ -127,7 +127,7 @@ answer).
    ```
 
    Capture `workCwd`; `remoteVerified: false` → flip `agent::blocked` and stop.
-   This is [`/deliver`](../deliver.md)'s worktree/branch/lease/label engine,
+   This is [`/mandrel-deliver`](../mandrel-deliver.md)'s worktree/branch/lease/label engine,
    invoked, not reimplemented.
 
 3. **Implement + self-eval.** `cd` into `workCwd`, implement the change, run
@@ -155,13 +155,13 @@ answer).
 
    Exit `3` (`blocked: true`) means the diff exceeds a light ceiling or touches a
    sensitive-path class. STOP, flip `agent::blocked`, and **recycle the receipt**
-   through the envelope's `nextCommand` (`/plan <storyId>`) — tickets mode
+   through the envelope's `nextCommand` (`/mandrel-plan <storyId>`) — tickets mode
    rewrites it into properly-planned Stories and closes it as superseded. Do not
    land, and do not leave the receipt open with no successor: it already carries
    the branch, the worktree, and the implementation, all of which are evidence
    the plan should read.
 
-5. **Close and land (same engine).** Exactly [`/deliver`](../deliver.md)'s close:
+5. **Close and land (same engine).** Exactly [`/mandrel-deliver`](../mandrel-deliver.md)'s close:
 
    ```bash
    node .agents/scripts/single-story-close.js --story <storyId> --cwd <main-repo>
@@ -208,19 +208,19 @@ diff backstop, which re-checks the actual change set against ground truth.
 
 Over-scope under `--yes` emits a schema-validated `story-deliver-terminal`
 envelope with **`status: "escalated"`**, `storyId: null`, and a `nextCommand`
-naming the `/plan` invocation that owns the work.
+naming the `/mandrel-plan` invocation that owns the work.
 
 **That envelope IS this session's terminal output.** Relay it and stop. There is
 no remaining step, no degraded fallback, and no smaller version of the work to
 attempt.
 
-**Invoking `/plan` in this same session is forbidden.** Hand the operator the
-`nextCommand`; `/plan` runs in a **fresh** session.
+**Invoking `/mandrel-plan` in this same session is forbidden.** Hand the operator the
+`nextCommand`; `/mandrel-plan` runs in a **fresh** session.
 
 This is not style — it is the empirical finding that motivated the envelope.
 A mandrel-bench 2.13.0 light-arm run read the escalation and continued anyway:
-it invoked `/plan` in-session and delivered. The in-session plan authored **one**
-Story against the scenario's 3–5 contract, where a fresh `/plan` session on the
+it invoked `/mandrel-plan` in-session and delivered. The in-session plan authored **one**
+Story against the scenario's 3–5 contract, where a fresh `/mandrel-plan` session on the
 identical seed authored **four**. Planning inside a session already framed as
 small work under-decomposes, so walking past the escalation silently produced
 the very outcome the guard exists to prevent. The gate's decision was right both
@@ -233,29 +233,29 @@ in a shape the schema pins, so a later run finds nothing to trip over.
 
 ## Why the two directions differ {#why-the-two-directions-differ}
 
-Traffic runs both ways between this path and `/plan`, and the two directions
+Traffic runs both ways between this path and `/mandrel-plan`, and the two directions
 have **deliberately different session rules**. It reads like an inconsistency;
 it is not. The rule:
 
 > **The direction whose guard is model judgment must break the session. The
 > direction whose guard is mechanical need not.**
 
-**Light → `/plan` must be a fresh session.** What is being protected is
+**Light → `/mandrel-plan` must be a fresh session.** What is being protected is
 *authoring judgment*, and the empirical finding above is that a session already
 framed as small work under-decomposes — one Story against a 3–5 contract where
 a fresh session on the identical seed authored four. The frame is the hazard,
 so only a new session removes it.
 
-**`/plan` → light may stay in-session.** Gate #1 fires **before** authoring, so
+**`/mandrel-plan` → light may stay in-session.** Gate #1 fires **before** authoring, so
 there is no authoring to corrupt, and the frame at that point is "plan this
 seed" — the neutral one, not the small one. Everything on the receiving side is
 mechanical: `STORY_SHAPE_CEILINGS`, the ledgered verdict, the diff backstop.
 None of them degrade because the context is large, so nothing is gained by
 paying for a fresh session.
 
-Do not "fix" this into symmetry in either direction. Making `/plan` → light
+Do not "fix" this into symmetry in either direction. Making `/mandrel-plan` → light
 require a fresh session throws away a paid-for interrogation for no guard.
-Letting light → `/plan` run in-session reintroduces the exact failure the
+Letting light → `/mandrel-plan` run in-session reintroduces the exact failure the
 `escalated` envelope exists to prevent.
 
 ## Constraints
@@ -272,9 +272,9 @@ Letting light → `/plan` run in-session reintroduces the exact failure the
 
 ## See also
 
-- [`/deliver`](../deliver.md) — the delivery entry point; routes here on a
+- [`/mandrel-deliver`](../mandrel-deliver.md) — the delivery entry point; routes here on a
   free-text prompt.
-- [`/plan`](../plan.md) — routes here from Gate #1 on a confirmed suggestion,
+- [`/mandrel-plan`](../mandrel-plan.md) — routes here from Gate #1 on a confirmed suggestion,
   and owns the work an over-scope prompt escalates to.
 - [`deliver-story.md`](deliver-story.md) — the one Story delivery engine every
   path shares.