mandrel 2.37.0 → 2.38.0

package/.agents/scripts/lib/orchestration/plan-persist/story-ops.js

@@ -1,7 +1,7 @@
 /**
  * story-ops.js — flat Story creation for v2 plan-persist (Stage 3).
  *
- * Under the Story collapse (`docs/roadmap.md` § Stage 3), `/plan` persists
+ * Under the Story collapse (`docs/roadmap.md` § Stage 3), `/mandrel-plan` persists
  * zero-or-more Story issues directly — no Epic parent, no reconciler tree,
  * no `deliveryShape` mode matrix. Default is **one Story**; N>1 is gated by
  * the Stage-1 split-policy validator (`assertAcceptancePartition`).
@@ -44,7 +44,7 @@ import {
  *
  * Reintroduced (Story #4692) after Story #4540 retired it: #4540 was right
  * that batch identity is the wrong axis for *ordering delivery across runs*
- * (`/deliver` takes ids and resolves the graph from live state — that stays),
+ * (`/mandrel-deliver` takes ids and resolves the graph from live state — that stays),
  * but it is the correct axis for *grouping the Stories one plan run created*
  * so a cohort is filterable and traceable in the GitHub UI. The label is
  * metadata only; nothing in persist or delivery reads it as a
@@ -57,7 +57,7 @@ const PLAN_RUN_LABEL_COLOR = '#C5DEF5';
 
 /**
  * Stable color for the `route::lite` ceremony-route hint (Story #4707;
- * hint-only since Story #4722 — `/deliver` re-derives the route from the
+ * hint-only since Story #4722 — `/mandrel-deliver` re-derives the route from the
  * Story body's shape).
  */
 const LITE_ROUTE_LABEL_COLOR = '#D4C5F9';
@@ -475,7 +475,7 @@ function assembleOnePlanStory(ticket, opts) {
   const serialized = serializeStoryBody({ ...folded, depends_on });
   // Carry audit dedup provenance into the persisted body (Story #4877). The
   // audit sweep's Single-plan path stamps the `audit-fingerprints` /
-  // `audit-semantic-keys` footers into the seed it hands `/plan`; without this
+  // `audit-semantic-keys` footers into the seed it hands `/mandrel-plan`; without this
   // the persisted Story carries no provenance and the next sweep re-files work
   // it already planned. Mechanical on purpose — the authoring agent is not
   // asked to notice HTML comments in a one-pager. A non-audit seed carries no
@@ -529,7 +529,7 @@ function assertSharedSpecAllowed(tickets, sharedSpec) {
  * @param {object} [opts]
  * @param {string|null} [opts.sharedSpec]
  * @param {string[]} [opts.planAcceptance]
- * @param {number[]} [opts.sourceTicketIds] Ids passed to `/plan --tickets`.
+ * @param {number[]} [opts.sourceTicketIds] Ids passed to `/mandrel-plan --tickets`.
  * @returns {{ stories: Array<{ slug: string, title: string, body: string, acceptance: string[], depends_on: string[], supersedes: Array<{ id: number, note: string|null }> }> }}
  */
 export function assemblePlanStories(tickets, opts = {}) {
@@ -756,14 +756,14 @@ function renderStoryBodyForCreate(story, idBySlug) {
  *
  * Ordering is authored as slugs and, until now, survived persist only as
  * `blocked by #N` prose in the body footer. That footer stays — it is what
- * `/deliver`'s resolver falls back on — but a native edge is the durable,
+ * `/mandrel-deliver`'s resolver falls back on — but a native edge is the durable,
  * machine-readable form: visible in the GitHub UI, readable without parsing
  * markdown, and settable by an operator later for cross-run order.
  *
  * **Non-fatal by design, and deliberately asymmetric with the read path.** A
  * missing native edge is cosmetic here: `renderStoryBodyForCreate` has already
  * written the footer, so ordering is not lost when the dependencies API says
- * no. `/deliver`'s *read* of these edges is a real dispatch gate, which is why
+ * no. `/mandrel-deliver`'s *read* of these edges is a real dispatch gate, which is why
  * that side fails loud. Persist reports the failure and completes.
  *
  * Two shape hazards this crossing has to get right, both silent if missed:
@@ -839,7 +839,7 @@ async function mirrorNativeDependencyEdges({ provider, stories, idBySlug }) {
  *
  * **Non-fatal by design**, matching the native-blocked_by mirroring posture:
  * neither label is load-bearing for correctness (grouping is cosmetic, and
- * the route label is a human-visible hint only — `/deliver` re-derives the
+ * the route label is a human-visible hint only — `/mandrel-deliver` re-derives the
  * route from the Story body's shape, Story #4722), so it is never a reason
  * to fail persist. On an ensure
  * failure (throw, or the label reported `missing` by the post-loop
@@ -920,7 +920,7 @@ async function ensurePersistLabel({
  * create — no relabel call is needed on the resume path, and the cohort is
  * never split across two labels. The label is ensured to exist before the
  * first POST, **non-fatally**: grouping is cosmetic and never fails the run
- * (see `ensureCohortLabel`). `/deliver` never reads it — delivery stays
+ * (see `ensureCohortLabel`). `/mandrel-deliver` never reads it — delivery stays
  * ids-only over live state (Story #4540's actual point).
  *
  * **The create loop stays serial and dependency-ordered** — deliberately, and
@@ -940,7 +940,7 @@ async function ensurePersistLabel({
  * effective complexity route to `lite` (the planner's recorded verdict,
  * upheld by the shape backstop), it passes the label via `opts.routeLabel`
  * and every created Story carries it — a **human-visible hint only**, never
- * the control signal: `/deliver` re-derives the route from each Story body's
+ * the control signal: `/mandrel-deliver` re-derives the route from each Story body's
  * own shape (`resolveStoryDispatchMode`), so a lost or failed label write
  * cannot misroute delivery. A full-routed plan passes nothing and its
  * Stories carry **no** route label. Like the cohort label, the ensure is
@@ -1000,8 +1000,8 @@ export async function createStoryIssues({ provider, stories, opts = {} }) {
     label: cohortLabel,
     color: PLAN_RUN_LABEL_COLOR,
     description:
-      'Groups the Stories one /plan persist run authored (metadata ' +
-      'only — /deliver stays ids-only).',
+      'Groups the Stories one /mandrel-plan persist run authored (metadata ' +
+      'only — /mandrel-deliver stays ids-only).',
     role: 'cohort',
   });
   const applyRouteLabel =
@@ -1011,7 +1011,7 @@ export async function createStoryIssues({ provider, stories, opts = {} }) {
       label: routeLabel,
       color: LITE_ROUTE_LABEL_COLOR,
       description:
-        'Ceremony-lite hint (human-visible only): /deliver re-derives the ' +
+        'Ceremony-lite hint (human-visible only): /mandrel-deliver re-derives the ' +
         'route from the Story body shape; every close gate runs unchanged.',
       role: 'route-marker',
     }));
@@ -1101,9 +1101,9 @@ export async function createStoryIssues({ provider, stories, opts = {} }) {
  *
  * This is what makes `agent::ready` *mean* "fully persisted": by the time it
  * lands, the Story's `story-plan-state` checkpoint is already on the ticket, so
- * a `/deliver` that picks it up cannot read a null checkpoint.
+ * a `/mandrel-deliver` that picks it up cannot read a null checkpoint.
  *
- * Fails closed: an un-flipped Story is invisible to `/deliver`, which is the
+ * Fails closed: an un-flipped Story is invisible to `/mandrel-deliver`, which is the
  * safe direction — the operator is told exactly which ids need the label.
  *
  * **Collect failures, never fast-fail** (preserved verbatim under the
@@ -1159,7 +1159,7 @@ export async function markStoriesReady({ provider, created }) {
       `[plan-persist] ${failed.length} Story(ies) were created with their ` +
         'checkpoints but could not be flipped to agent::ready:\n' +
         `${failed.map((f) => `  - ${f}`).join('\n')}\n` +
-        'They are invisible to /deliver until the label lands. Re-run persist ' +
+        'They are invisible to /mandrel-deliver until the label lands. Re-run persist ' +
         '(it resumes rather than duplicating) or add the label by hand.',
     );
   }

package/.agents/scripts/lib/orchestration/plan-persist/summary.js

@@ -163,8 +163,8 @@ export function buildPlanSummaryCommentBody({
   // must name real ids, not a batch token that no longer exists.
   const deliverCommand =
     Array.isArray(stories) && stories.length > 0
-      ? `/deliver ${stories.map((s) => s.id).join(' ')}`
-      : '/deliver <storyId> [<storyId> ...]';
+      ? `/mandrel-deliver ${stories.map((s) => s.id).join(' ')}`
+      : '/mandrel-deliver <storyId> [<storyId> ...]';
 
   return [
     `### 📋 Plan Summary — Story #${epicId} is \`agent::ready\``,
@@ -182,6 +182,6 @@ export function buildPlanSummaryCommentBody({
     ...renderWaveTableLines(waveTable),
     ...renderSharedEditorLines(conflictFindings),
     '',
-    `_Deliver with \`${deliverCommand}\` — \`/deliver\` resolves the dependency graph from live state, so edges may point at Stories from earlier plan runs._`,
+    `_Deliver with \`${deliverCommand}\` — \`/mandrel-deliver\` resolves the dependency graph from live state, so edges may point at Stories from earlier plan runs._`,
   ].join('\n');
 }

package/.agents/scripts/lib/orchestration/plan-persist/supersede-ops.js

@@ -1,11 +1,11 @@
 /**
- * supersede-ops.js — close the `/plan --tickets` source issues that the
+ * supersede-ops.js — close the `/mandrel-plan --tickets` source issues that the
  * authored Stories supersede (Story #4535).
  *
  * `plan-context.js` fetches the source issues, emits `sourceTickets[]` on the
- * `/plan` envelope, and (with `--out`) writes that envelope to disk.
+ * `/mandrel-plan` envelope, and (with `--out`) writes that envelope to disk.
  * `resolveSourceTicketIds` below reads the id set back off it, so the normal
- * `/plan --tickets` path needs no flag; an explicit `--source-tickets` still
+ * `/mandrel-plan --tickets` path needs no flag; an explicit `--source-tickets` still
  * wins when passed, as the override for hand-driven runs (Story #4554).
  * Before that thread existed the ids reached
  * this module *solely* via the hand-passed flag, so a forgotten flag left
@@ -187,7 +187,7 @@ function sameIdSet(a, b) {
  *      loudly (the operator is overriding what the run actually fetched)
  *      but honoured.
  *   2. otherwise the envelope's `sourceTickets[]` — so the common
- *      `/plan --tickets` path needs no flag at all.
+ *      `/mandrel-plan --tickets` path needs no flag at all.
  *   3. otherwise empty, reported as `origin: 'none'`.
  *
  * `origin` is surfaced on the persist envelope so a run that superseded
@@ -240,7 +240,7 @@ function describeStoryIds(entries) {
  * live against an inconsistent tracker.
  *
  * @param {Array<{ slug: string, supersedes: Array<{ id: number }> }>} stories
- * @param {number[]} sourceTicketIds Ids passed to `/plan --tickets`.
+ * @param {number[]} sourceTicketIds Ids passed to `/mandrel-plan --tickets`.
  */
 export function assertSupersedePartition(stories, sourceTicketIds = []) {
   const list = Array.isArray(stories) ? stories : [];
@@ -313,7 +313,7 @@ export function buildSupersedeCommentBody({
   const lines = [
     `**Superseded by #${story.id}** — *${story.title}* (${labels.join(', ')}).`,
     '',
-    `Planned via \`/plan --tickets ${sourceTicketIds.join(',')}\`.`,
+    `Planned via \`/mandrel-plan --tickets ${sourceTicketIds.join(',')}\`.`,
   ];
   if (note) {
     lines.push('', note);

package/.agents/scripts/lib/orchestration/planning/authoring-context.js

@@ -2,7 +2,7 @@
  * phases/authoring-context.js — emit-context phase.
  *
  * Builds the authoring context the host LLM (or the
- * `/plan` author step) needs to write the Tech Spec.
+ * `/mandrel-plan` author step) needs to write the Tech Spec.
  * Returns a plain JSON-serialisable object; never hits the network beyond
  * the provider call needed to load the Epic.
  */
@@ -31,12 +31,12 @@ import { buildMemoryPoolAdvisory } from './memory-pool-advisory.js';
  * pull-on-demand, mirroring the Story #4324 delivery-children cutover).
  *
  * Ensures a docs digest exists at the **same** per-Epic temp path the
- * `/deliver` story sub-agents already consume
+ * `/mandrel-deliver` story sub-agents already consume
  * (`<tempRoot>/epic-<seedIssueId>/docs-digest.md`) via the shared
  * `ensureDocsDigest` export in `docs-digest.js` — one generator, one file,
  * reused across the planning and delivery surfaces for the same Epic. The
  * envelope carries only the digest path, not embedded doc content; the
- * planner (host LLM driving the `/plan` author step) reads the digest
+ * planner (host LLM driving the `/mandrel-plan` author step) reads the digest
  * and pulls a full file/section on demand when it bears on the decision.
  *
  * Returns `null` — a silent no-op — when `project.docsContextFiles` is not
@@ -80,7 +80,7 @@ async function buildPlanningDocsContext({ seedIssueId, settings, cwd }) {
  * Story #4977 — the scan itself stays uncapped (a faithful `.feature`
  * index), but the envelope-bound result is truncated to
  * `BDD_SCENARIOS_BYTE_BUDGET` via `capBddScenarios` so a mature Gherkin
- * corpus cannot alone consume the `/plan` context-envelope ceiling. Callers
+ * corpus cannot alone consume the `/mandrel-plan` context-envelope ceiling. Callers
  * needing the raw count read `totalScenarios` vs `includedScenarios`.
  *
  * @returns {ReturnType<typeof capBddScenarios>}
@@ -97,7 +97,7 @@ function scanBddScenariosBestEffort() {
 
 /**
  * Build the authoring context the host LLM (or the
- * `/plan` author step) needs to write the Tech Spec.
+ * `/mandrel-plan` author step) needs to write the Tech Spec.
  *
  * `docsContext` is digest-first (Story #4433): a pointer at the per-Epic
  * docs digest rather than embedded doc content, `null` when
@@ -133,7 +133,7 @@ export async function buildAuthoringContext(
   const githubCfg = opts.github ?? null;
 
   // Story #4952 — these five gathers share no data, so they run under bounded
-  // concurrency instead of five sequential awaits on the interactive `/plan`
+  // concurrency instead of five sequential awaits on the interactive `/mandrel-plan`
   // path. `concurrentMap` preserves input order, so the destructuring is
   // positional and the produced context is identical to the serial build:
   //
@@ -149,7 +149,7 @@ export async function buildAuthoringContext(
   //      memory corpus is delivery retrospectives whose subject IS a delivered
   //      Story — and its directory (`~/.claude/projects/<repo>/memory/`) never
   //      resolved, because harness project dirs are cwd-slugs. This renders no
-  //      per-entry verdict at all: it stats and counts, and the `/plan` spine
+  //      per-entry verdict at all: it stats and counts, and the `/mandrel-plan` spine
   //      surfaces `recommend` at Gate #1. Filesystem-only and total;
   //   5. Story #2554 — open meta feedback issues, so retro signals are routed
   //      into durable substrates rather than lost in chat. Best-effort:

package/.agents/scripts/lib/orchestration/planning/decomposer-context.js

@@ -1,5 +1,5 @@
 /**
- * decomposer-context.js — system-prompt builder for the `/plan` authoring
+ * decomposer-context.js — system-prompt builder for the `/mandrel-plan` authoring
  * pass (Story #2466; v2 keeps the prompt helper, drops the Epic-fetch
  * decomposition envelope).
  *

package/.agents/scripts/lib/orchestration/planning/memory-pool-advisory.js

@@ -1,5 +1,5 @@
 /**
- * memory-pool-advisory.js — the `/plan` Phase 0 memory-hygiene advisory.
+ * memory-pool-advisory.js — the `/mandrel-plan` Phase 0 memory-hygiene advisory.
  *
  * Replaces the retired memory-freshness pre-flight (Story #2557 / #4414) in
  * the same slot, fixing both of that design's defects:
@@ -10,7 +10,7 @@
  *      replaced by `-` — so the old path never resolved in any consumer and
  *      the scan was a silent no-op everywhere.
  *   2. **A named consumer.** The retired scanner emitted a per-entry staleness
- *      verdict nothing read. This emits one advisory the `/plan` spine
+ *      verdict nothing read. This emits one advisory the `/mandrel-plan` spine
  *      surfaces at Gate #1, recommending `/memory-consolidate`.
  *
  * It also drops the semantic that made the old scanner unfixable: it renders
@@ -131,7 +131,7 @@ function countEntries({ poolDir, fsImpl }) {
  * Build the `memoryPoolAdvisory` envelope field.
  *
  * Advisory only — it carries **no routing authority**, mirroring
- * `deliverLightSuggestion`. The `/plan` spine surfaces `recommend` at Gate #1;
+ * `deliverLightSuggestion`. The `/mandrel-plan` spine surfaces `recommend` at Gate #1;
  * nothing auto-runs, and nothing here mutates the operator's memory store.
  *
  * @param {object} [opts]

package/.agents/scripts/lib/orchestration/remote-verifier.js

@@ -3,11 +3,11 @@
  * remote-verifier.js — deterministic "is there a live, pushable remote?"
  * evidence for the delivery entry seams. Issue #4483.
  *
- * `/deliver` could silently shortcut the entire orchestration — building
+ * `/mandrel-deliver` could silently shortcut the entire orchestration — building
  * the delivery inline and committing to local `main` without pushing —
  * when the driving agent *perceived* the environment had no live GitHub
  * remote. The judgment was vibes, not fact. This module gives the entry
- * seams (`single-story-init.js` for v2 `/deliver`) a verified
+ * seams (`single-story-init.js` for v2 `/mandrel-deliver`) a verified
  * probe result to record in their envelopes so the workflow can branch on
  * `remoteVerified: true|false` deterministically: use the remote, or
  * transition to `agent::blocked` quoting the probe output — never a

package/.agents/scripts/lib/orchestration/resolve-stories.js

@@ -2,7 +2,7 @@
  * lib/orchestration/resolve-stories.js — resolve a set of Story ids into the
  * `{ stories, dag, done }` envelope the delivery scheduler consumes.
  *
- * This is the ONE resolution step for `/deliver`. It generalizes the
+ * This is the ONE resolution step for `/mandrel-deliver`. It generalizes the
  * envelope shaping proven by the retired `resolve-plan-run.js` and fixes the
  * two defects that shipped with it:
  *
@@ -77,7 +77,7 @@ export function toStoryRecord(issue, requestedId) {
   if (!labels.includes(TYPE_LABELS.STORY)) {
     throw new Error(
       `[resolve-stories] Issue #${id} is not a Story (labels: ${labels.join(', ') || 'none'}). ` +
-        `/deliver accepts ${TYPE_LABELS.STORY} tickets only — close it or re-plan it as a v2 Story.`,
+        `/mandrel-deliver accepts ${TYPE_LABELS.STORY} tickets only — close it or re-plan it as a v2 Story.`,
     );
   }
   const body = String(issue?.body ?? '');
@@ -351,7 +351,7 @@ export function buildStoriesEnvelope({
   return {
     kind: 'stories',
     // `dispatchMode` (Story #4722, #4736, #4829): the resolver reports the
-    // per-Story execution mode so `/deliver` reads one field — `inline` (run
+    // per-Story execution mode so `/mandrel-deliver` reads one field — `inline` (run
     // deliver-story in the router's own session: no story-worker /
     // acceptance-critic sub-agent boots) or `subagent` (the conservative
     // default). Model-side fan-out only; close gates are untouched.
@@ -385,7 +385,7 @@ export function buildStoriesEnvelope({
 /**
  * Parse and validate the `--ids` list, expanding any `A-B` dash range.
  *
- * A contiguous span is how an operator names a plan run — `/deliver 4922 -
+ * A contiguous span is how an operator names a plan run — `/mandrel-deliver 4922 -
  * 4926` — so the range is expanded here rather than transcribed by the host.
  * `stories-wave-tick.js --stories` reads through this same function, which is
  * what keeps the sequencing set identical to the resolved one.

package/.agents/scripts/lib/orchestration/run-epilogue.js

@@ -1,5 +1,5 @@
 /**
- * run-epilogue.js — real per-run closeout for `/deliver --run`.
+ * run-epilogue.js — real per-run closeout for `/mandrel-deliver --run`.
  *
  * After the last Story in a multi-Story plan-run lands, this module:
  *   1. Selects the cross-Story audit lens roster over the combined landed
@@ -100,7 +100,7 @@ export function planRunEpilogue({ planRunId, stories } = {}) {
     };
   }
 
-  // Positional `/deliver 101 102` has no plan-run label. Synthesize a
+  // Positional `/mandrel-deliver 101 102` has no plan-run label. Synthesize a
   // stable adhoc id from the sorted Story set so the epilogue still
   // anchors comments / audit roster without requiring `--run`.
   const effectiveRunId =

package/.agents/scripts/lib/orchestration/single-story-close/phases/base-sync.js

@@ -83,7 +83,7 @@ export async function runBaseSyncPhase({
           : syncResult.stderr
             ? `: ${syncResult.stderr.slice(0, 200)}`
             : '') +
-        `. Story transitioned to ${AGENT_LABELS.BLOCKED}; resolve in ${syncCwd} and re-run \`/deliver ${storyId}\`.`,
+        `. Story transitioned to ${AGENT_LABELS.BLOCKED}; resolve in ${syncCwd} and re-run \`/mandrel-deliver ${storyId}\`.`,
     );
   }
   progress('SYNC', `✅ Synced from origin/${baseBranch} (${syncResult.kind}).`);
@@ -182,7 +182,7 @@ export function buildSyncFailureCommentBody({
   const lines = [
     `### ${heading}`,
     '',
-    '`/deliver` close-validation passed, but the pre-push',
+    '`/mandrel-deliver` close-validation passed, but the pre-push',
     `sync against \`origin/${baseBranch}\` could not complete. The Story has`,
     `been transitioned to \`agent::blocked\`. To resume:`,
     '',

package/.agents/scripts/lib/orchestration/single-story-close/phases/conventional-subject.js

@@ -343,7 +343,7 @@ function scanForBreaking(text, readHeaderBang) {
  *     writing the commit that does the breaking.
  *   - **The Story body** — the same footer, written as its own line anywhere
  *     in the Story issue (the `## Spec` block is the natural home). This is
- *     the declarative path: `/plan` can state the break up front and close
+ *     the declarative path: `/mandrel-plan` can state the break up front and close
  *     propagates it even when no individual commit remembered the footer.
  *     Only the footer form counts; prose describing a break does not, because
  *     a keyword-free sentence is exactly what release-please cannot parse.

package/.agents/scripts/lib/orchestration/single-story-close/phases/normalize-pr-title.js

@@ -191,7 +191,11 @@ function synthesizeSubject({ description, storyId, commitMessages }) {
  * @returns {string}
  */
 function buildPrBody({ storyId, breakingNotes }) {
-  const lines = [`Closes #${storyId}`, '', '_Auto-opened by `/deliver`._'];
+  const lines = [
+    `Closes #${storyId}`,
+    '',
+    '_Auto-opened by `/mandrel-deliver`._',
+  ];
   if (breakingNotes.length > 0) {
     lines.push('', `BREAKING CHANGE: ${breakingNotes.join(' ')}`);
   }

package/.agents/scripts/lib/orchestration/single-story-close/phases/review-block.js

@@ -19,7 +19,7 @@ export async function handleCriticalReviewBlock({
     '### Code review blocked delivery',
     '',
     `The Story-scope review reported **${criticalCount} critical blocker(s)** on ${prUrl}.`,
-    'Remediate the posted findings, then re-run `/deliver`.',
+    'Remediate the posted findings, then re-run `/mandrel-deliver`.',
     '',
     'If you have reviewed a finding and judged it wrong, re-run close with',
     '`--override-review-block "<reason>"` rather than merging by hand — see',

package/.agents/scripts/lib/orchestration/single-story-close/phases/wrong-tree-guard.js

@@ -1,7 +1,7 @@
 /**
  * phases/wrong-tree-guard.js — detect worktree/main-checkout edit divergence.
  *
- * Story #3364 — `/single-story-deliver` (and `/deliver`) materializes a
+ * Story #3364 — `/single-story-deliver` (and `/mandrel-deliver`) materializes a
  * per-Story worktree and instructs the agent to `cd` into it before editing.
  * On Windows that guidance is silently insufficient: `cd <workCwd>` steers the
  * Bash tool's working directory, but the path-based Edit/Write tools operate on
@@ -232,7 +232,7 @@ export function formatWrongTreeFinding({ storyId, strayFiles, worktreePath }) {
     `**Recovery:** relocate these edits into the worktree (re-apply them under ` +
     `\`${worktreePath}\`), restore the main checkout ` +
     `(\`git -C <main-repo> checkout -- <files>\`), then re-run ` +
-    `\`/deliver ${storyId}\`.`
+    `\`/mandrel-deliver ${storyId}\`.`
   );
 }
 
@@ -307,7 +307,7 @@ async function abortWrongTree({
       `diff-path set while the worktree (${worktreePath}) is the active work ` +
       `tree. Close aborted to avoid an empty-diff PR. Stray files: ` +
       `${strayFiles.join(', ')}. Relocate the edits into the worktree, ` +
-      `restore the main checkout, then re-run /deliver ${storyId}.`,
+      `restore the main checkout, then re-run /mandrel-deliver ${storyId}.`,
   );
 }
 

package/.agents/scripts/lib/orchestration/single-story-close/runner.js

@@ -84,7 +84,7 @@ async function emitTerminal({ terminal, result, config }) {
  * issue as `completed` (the `Closes #<id>` footer firing on merge — the work
  * IS on the base branch) or as `not_planned` (superseded by a re-plan,
  * abandoned — nothing ever merged). Reporting the second as `landed` told
- * `/deliver` that work had reached `main` when no PR ever merged, which would
+ * `/mandrel-deliver` that work had reached `main` when no PR ever merged, which would
  * also satisfy any dependent Story waiting on it. Fail loudly instead: being
  * handed an abandoned Story is an input error only the operator can resolve.
  *
@@ -283,7 +283,7 @@ async function openAndReviewPr({
     });
     throw new Error(
       `[single-story-close] Story-scope review reported ${criticalCount} critical blocker(s) on PR ${prUrl}. ` +
-        'Auto-merge was not enabled. Remediate the findings posted to the PR and re-run `/deliver`. ' +
+        'Auto-merge was not enabled. Remediate the findings posted to the PR and re-run `/mandrel-deliver`. ' +
         'If you have reviewed a finding and judged it wrong, re-run with ' +
         '`--override-review-block "<reason>"` rather than merging by hand.',
     );

package/.agents/scripts/lib/orchestration/single-story-lease-guard.js

@@ -105,7 +105,7 @@ export async function acquireStoryLease({
     steal,
     renderRefusal: (result) =>
       `single-story lease: Story #${storyId} is currently held by @${result.owner}. ` +
-      'Another /deliver run owns this Story. Coordinate with that ' +
+      'Another /mandrel-deliver run owns this Story. Coordinate with that ' +
       'operator, or re-run with --steal to forcibly transfer the claim once you ' +
       'have confirmed the other run is dead. (A foreign assignee always ' +
       'blocks unless stolen.)',

package/.agents/scripts/lib/orchestration/story-deliver-terminal.js

@@ -47,7 +47,7 @@ export const TERMINAL_ENVELOPE_KIND = 'story-deliver-terminal';
  * `pending` is **3**, not 0 and not 1. Zero would tell a headless caller the
  * Story landed when it did not; one would conflate a resumable slow-CI wait
  * with a hard block and send the operator to diagnose branch protection that
- * is working fine. A distinct code is what lets `/deliver` resume without
+ * is working fine. A distinct code is what lets `/mandrel-deliver` resume without
  * classifying.
  */
 export const TERMINAL_EXIT_CODES = Object.freeze({
@@ -61,7 +61,7 @@ export const TERMINAL_EXIT_CODES = Object.freeze({
    * terminal, not a new one, so giving it a fresh code would fork a vocabulary
    * callers already branch on. It stays distinct from `landed` (nothing was
    * delivered) and from `blocked`/`failed` (nothing is wrong — the work simply
-   * belongs to `/plan`).
+   * belongs to `/mandrel-plan`).
    */
   escalated: 2,
 });
@@ -74,12 +74,12 @@ export const TERMINAL_STATUSES = Object.freeze([
   'escalated',
 ]);
 
-/** Cap on the prompt echoed into an escalation's `/plan` next command. */
+/** Cap on the prompt echoed into an escalation's `/mandrel-plan` next command. */
 const PLAN_PROMPT_MAX = 200;
 
 /**
  * Render an operator prompt safe to sit inside the double quotes of the
- * `/plan "<prompt>"` next command: collapse newlines (a next command is one
+ * `/mandrel-plan "<prompt>"` next command: collapse newlines (a next command is one
  * line by contract), escape backslashes and double quotes so the quoting
  * cannot be broken out of, and cap the length so a long prompt does not turn
  * the envelope into a transcript. Total — a non-string yields the empty
@@ -133,7 +133,7 @@ export const NEXT_COMMANDS = Object.freeze({
   recover: (storyId) =>
     `node .agents/scripts/deliver-recover.js --story ${storyId}`,
   /**
-   * Hand over-scope work to `/plan` — the next command of an `escalated`
+   * Hand over-scope work to `/mandrel-plan` — the next command of an `escalated`
    * terminal (Story #4746).
    *
    * The only entry here that is a slash command rather than a script, and
@@ -143,7 +143,7 @@ export const NEXT_COMMANDS = Object.freeze({
    * the workflow's escalation section for why running it in the escalating
    * session is forbidden.
    */
-  escalateToPlan: (prompt) => `/plan "${quoteForPlan(prompt)}"`,
+  escalateToPlan: (prompt) => `/mandrel-plan "${quoteForPlan(prompt)}"`,
 });
 
 /**
@@ -260,15 +260,15 @@ export function buildTerminalEnvelope({
  * `/deliver-light`'s suitability gate already decided correctly when it
  * overrode a `lite` self-verdict on shape; what it lacked was an outcome a
  * session could not walk past. A mandrel-bench 2.13.0 light-arm run did
- * exactly that — it read the gate's `escalate-plan`, then invoked `/plan`
+ * exactly that — it read the gate's `escalate-plan`, then invoked `/mandrel-plan`
  * in the same session and delivered. The continuation was not harmless:
  * planning inside a session already framed as small work authored ONE Story
- * against the scenario's 3-5 contract, where a fresh `/plan` session on the
+ * against the scenario's 3-5 contract, where a fresh `/mandrel-plan` session on the
  * identical seed authored four. Escalation silently produced the very
  * under-decomposition the guard exists to prevent.
  *
  * So the outcome is a validated envelope with its own exit code, naming the
- * `/plan` command that owns the work, and asserting per artifact that nothing
+ * `/mandrel-plan` command that owns the work, and asserting per artifact that nothing
  * was started. Every guarantee here is enforced by the schema rather than by
  * prose: `storyId` must be null, `escalation.created.*` are pinned `false`.
  *
@@ -288,10 +288,10 @@ export function buildEscalationTerminal({
 }) {
   const quoted = quoteForPlan(prompt);
   if (quoted === '') {
-    // An escalation whose next command is `/plan ""` hands the operator
+    // An escalation whose next command is `/mandrel-plan ""` hands the operator
     // nothing — the same walk-past-able non-outcome in envelope clothing.
     throw new TypeError(
-      'buildEscalationTerminal: a non-empty prompt is required — the escalated terminal exists to name the /plan invocation that owns the work',
+      'buildEscalationTerminal: a non-empty prompt is required — the escalated terminal exists to name the /mandrel-plan invocation that owns the work',
     );
   }
   const recorded = (Array.isArray(reasons) ? reasons : []).filter(
@@ -305,7 +305,9 @@ export function buildEscalationTerminal({
       reasons:
         recorded.length > 0
           ? recorded
-          : ['predicted scope exceeds the light ceilings — escalate to /plan'],
+          : [
+              'predicted scope exceeds the light ceilings — escalate to /mandrel-plan',
+            ],
       // Not computed from anything: the escalation path returns before the
       // receipt/init call sites, so these are the assertion that it did.
       created: { receiptStory: false, storyBranch: false, worktree: false },

package/.agents/scripts/lib/orchestration/ticket-validator.js

@@ -421,7 +421,7 @@ function renderMissLine({ slug, path }) {
  * The returned tickets array carries two extra non-array properties:
  *   - `findings` — structured sizing findings (hard + soft) keyed by the
  *     three-layer sizing model. The bounded re-decomposition loop in
- *     `/plan` reads `findings.filter(f => f.severity === 'hard')` to decide
+ *     `/mandrel-plan` reads `findings.filter(f => f.severity === 'hard')` to decide
  *     whether to re-prompt.
  *   - `errors`   — human-readable strings, one per hard finding. Non-empty
  *     `errors[]` is the AC-visible "block normalization" signal; the legacy

package/.agents/scripts/lib/orchestration/ticketing/reads.js

@@ -120,7 +120,7 @@ export const STRUCTURED_COMMENT_TYPES = Object.freeze([
   'epic-handoff',
   // Story #2899 (Epic #2880, F13) — the deleted `epic-deliver-preflight.js`
   // upserted a `delivery-preflight` comment on the Epic at the start of
-  // pre-v2 Epic `/deliver` Phase 1, surfacing estimated story count, install cost,
+  // pre-v2 Epic `/mandrel-deliver` Phase 1, surfacing estimated story count, install cost,
   // wave count, GitHub API request volume, Claude quota burn, and any
   // threshold breaches against `delivery.preflight.max*`. One entry per
   // Epic; re-runs replace prior content.
@@ -131,7 +131,7 @@ export const STRUCTURED_COMMENT_TYPES = Object.freeze([
   // `close-validate.end`. One entry per Epic; re-ticks with the same
   // findings upsert in place (`upsertStructuredComment` diffs by body).
   'recurring-failure-class',
-  // Story #3061 (Epic #3051) — the pre-v2 `/deliver` idle-watchdog prose
+  // Story #3061 (Epic #3051) — the pre-v2 `/mandrel-deliver` idle-watchdog prose
   // instructed the parent host LLM to upsert a `wave-stall` comment on the
   // Epic whenever an in-flight Story had been silent for longer than the
   // configured cadence. The deleted `wave-tick.js --check-idle` CLI emitted
@@ -166,7 +166,7 @@ export const STRUCTURED_COMMENT_TYPES = Object.freeze([
   // (replaces epic-plan-state for new plans). plan-summary stays primary-only.
   'story-plan-state',
   // Story #4535 — `plan-persist.js` upserts a `superseded-by` comment on
-  // each `/plan --tickets` source issue at persist time, naming the single
+  // each `/mandrel-plan --tickets` source issue at persist time, naming the single
   // Story that claims it (plus any per-supersede note the plan authored),
   // immediately before closing the issue as `not_planned`. Keying off this
   // marker rather than a bare `postComment` is what makes a re-run

package/.agents/scripts/lib/plan-phase-cleanup.js

@@ -1,5 +1,5 @@
 /**
- * plan-phase-cleanup.js — Post-phase temp-file cleanup for `/plan`.
+ * plan-phase-cleanup.js — Post-phase temp-file cleanup for `/mandrel-plan`.
  *
  * The spec and decompose phases write several run-scoped temp files under
  * the per-run tree (`temp/run-<id>/planner-context.json`,

package/.agents/scripts/lib/signals/schema.js

@@ -91,7 +91,7 @@ export const EVENT_KINDS = Object.freeze({
   // Story #3819 — per-criterion acceptance self-eval signal emitted by
   // acceptance-eval.js. One record per Story per eval-loop terminus,
   // carrying which acceptance items needed rework and the round count, so
-  // the retro and /plan Phase 0 feedback fetch can see acceptance
+  // the retro and /mandrel-plan Phase 0 feedback fetch can see acceptance
   // churn alongside friction/hotspot data.
   ACCEPTANCE_EVAL: 'acceptance-eval',
   // Forensic breadcrumb appended to the per-Epic stream by the notify

package/.agents/scripts/lib/story-adjacency.js

@@ -1,7 +1,7 @@
 /**
  * lib/story-adjacency.js — the single story-level adjacency builder.
  *
- * Both pre-v2 Epic wave wrappers and the v2 `/deliver` ready-set path bottom out in the shared
+ * Both pre-v2 Epic wave wrappers and the v2 `/mandrel-deliver` ready-set path bottom out in the shared
  * `lib/Graph.js` kernel (`detectCycle` / `assignLayers` / `computeWaves`),
  * but each historically re-implemented the step that turns a list of Story
  * records into the `Map<storyId, number[]>` adjacency the kernel consumes.
@@ -43,7 +43,7 @@ import { parseBlockedBy } from './dependency-parser.js';
  *   DAG nodes).
  * @param {object} [opts]
  * @param {boolean} [opts.dropForeign=false] When `false` (the v2 default,
- *   matching the `/deliver` path — `stories-wave-tick.js` and the
+ *   matching the `/mandrel-deliver` path — `stories-wave-tick.js` and the
  *   `planReadySet` core), the operator-DAG contract is preserved: a
  *   dependency on an id absent from the input is treated as not-yet-done
  *   and withholds the dependent until it completes. When `true` (the

package/.agents/scripts/lib/templates/decomposer-prompts.js

@@ -21,7 +21,7 @@ import { BODY_FORMAT_LINTS } from '../story-body/body-format-lints.js';
  *
  * **Single source of the prompt body (Story #4162).** This module is the sole
  * carrier of the full decomposer system-prompt body, delivered to the host
- * LLM in the `systemPrompts.decompose` field of the `/plan` context envelope
+ * LLM in the `systemPrompts.decompose` field of the `/mandrel-plan` context envelope
  * (via `lib/orchestration/planning/decomposer-context.js`), so no second
  * verbatim copy can drift.
  */