mandrel 1.59.0 → 1.61.0

package/.agents/workflows/agents-update.md

@@ -1,7 +1,7 @@
 ---
 description: >-
   npm-era upgrade wraparound for a Mandrel consumer. Runs `mandrel update`
-  (resolve newest non-major version → install → re-materialize `.agents/` →
+  (resolve newest published version → install → re-materialize `.agents/` →
   migrate → doctor → surface changelog) as the single mechanical step, then
   walks the operator through the judgment wraparound the CLI deliberately
   leaves unowned: reconcile `.agentrc.json`, install the Epic #1386
@@ -23,7 +23,7 @@ description: >-
 
 ## Overview
 
-`/agents-update` advances the consumer repo to the newest non-major
+`/agents-update` advances the consumer repo to the newest published
 `mandrel` release, re-materializes `.agents/`, and regenerates the
 flat `.claude/commands/` tree (invoked as `/<name>`) against the new workflow
 set — then reconciles the consumer's own config, harness allowlist, and
@@ -40,11 +40,10 @@ The upgrade contract:
 - **CI honours the committed lockfile.** Consumer CI runs `npm ci` against
   the committed `package-lock.json`, so it installs exactly the version the
   lockfile pins — never "whatever the registry's newest is today."
-- **The major axis is gated.** `mandrel update` refuses to cross a major
-  boundary (e.g. `1.x → 2.0`) without an explicit `--major`, printing a
-  pointer to `docs/upgrade-major.md` and exiting non-zero without touching
-  anything. Routine minor/patch bumps within the current major are never
-  gated.
+- **Majors apply like any other bump.** Mandrel ships hard cutovers
+  (`.agents/rules/git-conventions.md` § Contract Cutovers), so a major
+  crossing is applied directly — the surfaced changelog is the migration
+  guide.
 - **The CLI never commits.** The npm bump rewrites `package.json` /
   `package-lock.json` and leaves them **staged on disk** for operator review;
   `mandrel update` performs no `git add` / `git commit`. Staging and
@@ -55,8 +54,7 @@ The upgrade contract:
   authoritative writer of the generated flat command tree
   (`.claude/commands/`) is
   [`sync-claude-commands.js`](../scripts/sync-claude-commands.js), which
-  prepends the `<!-- AUTO-GENERATED -->` header that
-  `/agents-bootstrap-project` parity-checks. Nothing else copies workflow
+  prepends the `<!-- AUTO-GENERATED -->` header. Nothing else copies workflow
   files.
 
 > **Persona**: `devops-engineer` · **Skills**:
@@ -71,7 +69,7 @@ mandrel update --dry-run
 mandrel update
 ```
 
-`mandrel update --dry-run` resolves the newest non-major version and prints
+`mandrel update --dry-run` resolves the newest published version and prints
 the ordered step plan (`npm-update → runSync → runMigrations → doctor →
 surface changelog`) without invoking any effectful seam — no dependency bump,
 no sync, no migrations, no doctor, nothing written. Read the planned target
@@ -82,23 +80,19 @@ version before applying.
 1. **Resolve target** — the newest published `mandrel` version (via
    the daily freshness cache in `temp/version-check.json`) and the currently
    installed version.
-2. **Major gate** — if the newest version crosses a major boundary, the run
-   declines, prints the `docs/upgrade-major.md` pointer, and exits non-zero
-   without touching anything. Re-run with `--major` only after reviewing that
-   runbook.
-3. **No-op short-circuit** — already on the newest version ⇒ prints
+2. **No-op short-circuit** — already on the newest version ⇒ prints
    `Already up to date` and exits 0.
-4. **Install** — bumps the dependency (default
+3. **Install** — bumps the dependency (default
    `npm install mandrel@<target>`; pass
    `--install-cmd "<pm> <args>"` for a pnpm/yarn workspace). The lockfile
    change is left **staged** for review; the CLI never commits.
-5. **runSync** — re-materializes `.agents/` from the freshly installed
+4. **runSync** — re-materializes `.agents/` from the freshly installed
    payload, which also regenerates the flat `.claude/commands/` tree via
    `sync-claude-commands.js`.
-6. **runMigrations** — applies any version-keyed migration steps for the
+5. **runMigrations** — applies any version-keyed migration steps for the
    crossed range.
-7. **doctor** — runs the check registry to verify the resulting install.
-8. **Surface changelog** — prints the `docs/CHANGELOG.md` section(s) covering
+6. **doctor** — runs the check registry to verify the resulting install.
+7. **Surface changelog** — prints the `docs/CHANGELOG.md` section(s) covering
    the applied range `(current, target]`. Capture this output — Step 4
    reconciles the consumer's own instructions against it.
 
@@ -222,7 +216,7 @@ The four `quality-bootstrap` outcomes:
 
 The `baselines-layout-migration` step relocates per-Epic snapshots
 into the `temp/epic/<id>/baselines/` namespace (Story #1467: ephemeral
-scratch state, not committed, reaped on `/epic-deliver` merge with the
+scratch state, not committed, reaped on `/deliver` merge with the
 rest of the per-Epic temp tree):
 
 - Loose `baselines/epic-<id>-{maintainability,crap}.json` files →
@@ -246,7 +240,7 @@ guarantee `agents-update`'s idempotence contract requires.
 A framework bump frequently introduces new helper scripts and `node
 .agents/scripts/<name>.js` invocations the consumer's
 `.claude/settings.json` allowlist has never seen. Left alone, the next
-`/story-deliver` or `/epic-deliver` run trips a fresh wave of
+`/deliver` or `/deliver` run trips a fresh wave of
 permission prompts that operators answer by hand — and those hand-tuned
 allowlists drift across projects.
 
@@ -371,12 +365,6 @@ no-op.
 
 ## Troubleshooting
 
-- **`a newer MAJOR version (X.0.0) is available`** — `mandrel update`
-  hit the major gate and exited non-zero without touching anything. A
-  major crossing is a breaking upgrade. Read `docs/upgrade-major.md`,
-  then re-run `mandrel update --major` only after you have absorbed the
-  migration steps that runbook describes.
-
 - **`doctor reported failures: …`** — the dependency bumped and `.agents/`
   re-materialized, but a doctor check failed (and the run exited
   non-zero). Run `mandrel doctor` for the per-check remedies. The lockfile
@@ -402,9 +390,6 @@ no-op.
 - **Idempotent.** A second `mandrel update` immediately after a successful
   run resolves the same newest version, hits the no-op short-circuit, and
   prints `Already up to date` — exit 0, nothing bumped.
-- **Non-major only by default.** The major axis is gated behind an explicit
-  `--major`; routine minor/patch bumps within the current major apply
-  without a gate.
 - **No auto-commit.** `mandrel update` leaves the lockfile bump staged on
   disk and never runs git. The operator reviews the surfaced changelog and
   writes the commit message (Step 5) — the CLI does not know whether the

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

@@ -19,7 +19,7 @@ existing external APIs or business logic.
 ## Execution strategy (dual-path)
 
 This lens runs along one of two execution paths. Both emit the **identical**
-report contract (Step 3); downstream consumers (`/epic-deliver` Phase 4
+report contract (Step 3); downstream consumers (`/deliver` Phase 4
 epic-audit, `audit-to-stories`) are agnostic to which path produced it.
 
 - **Orchestrated (dynamic-workflow) path.** When Claude Code's
@@ -72,7 +72,7 @@ degrade to the sequential path.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no

package/.agents/workflows/audit-clean-code.md

@@ -17,7 +17,7 @@ velocity.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no
@@ -39,7 +39,7 @@ before this section existed.
 ## Execution strategy (dual-path)
 
 This lens runs along one of two execution paths. Both emit the **identical**
-report contract (Step 3); downstream consumers (`/epic-deliver` Phase 4
+report contract (Step 3); downstream consumers (`/deliver` Phase 4
 epic-audit, `audit-to-stories`) are agnostic to which path produced it.
 
 - **Orchestrated (dynamic-workflow) path.** When Claude Code's

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

@@ -16,7 +16,7 @@ system stability.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no

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

@@ -17,7 +17,7 @@ without making any immediate changes.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no

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

@@ -49,7 +49,7 @@ semantic review beyond Step 1's deterministic checks.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no
@@ -71,7 +71,7 @@ before this section existed.
 ## Execution strategy (dual-path)
 
 This lens runs along one of two execution paths. Both emit the **identical**
-report contract (Step 3); downstream consumers (`/epic-deliver` Phase 4
+report contract (Step 3); downstream consumers (`/deliver` Phase 4
 epic-audit, `audit-to-stories`) are agnostic to which path produced it.
 
 - **Orchestrated (dynamic-workflow) path.** When Claude Code's

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

@@ -31,7 +31,7 @@ inflate Performance scores misleadingly.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no

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

@@ -16,7 +16,7 @@ load.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no
@@ -38,7 +38,7 @@ before this section existed.
 ## Execution strategy (dual-path)
 
 This lens runs along one of two execution paths. Both emit the **identical**
-report contract (Step 3); downstream consumers (`/epic-deliver` Phase 4
+report contract (Step 3); downstream consumers (`/deliver` Phase 4
 epic-audit, `audit-to-stories`) are agnostic to which path produced it.
 
 - **Orchestrated (dynamic-workflow) path.** When Claude Code's

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

@@ -17,7 +17,7 @@ insecure storage, or unnecessary collection of sensitive data.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no

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

@@ -26,7 +26,7 @@ integrations, and test environment stability.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no
@@ -48,7 +48,7 @@ before this section existed.
 ## Execution strategy (dual-path)
 
 This lens runs along one of two execution paths. Both emit the **identical**
-report contract (Step 3); downstream consumers (`/epic-deliver` Phase 4
+report contract (Step 3); downstream consumers (`/deliver` Phase 4
 epic-audit, `audit-to-stories`) are agnostic to which path produced it.
 
 - **Orchestrated (dynamic-workflow) path.** When Claude Code's

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

@@ -16,7 +16,7 @@ potential attack vectors.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no
@@ -38,7 +38,7 @@ before this section existed.
 ## Execution strategy (dual-path)
 
 This lens runs along one of two execution paths. Both emit the **identical**
-report contract (Step 3); downstream consumers (`/epic-deliver` Phase 4
+report contract (Step 3); downstream consumers (`/deliver` Phase 4
 epic-audit, `audit-to-stories`) are agnostic to which path produced it.
 
 - **Orchestrated (dynamic-workflow) path.** When Claude Code's

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

@@ -20,7 +20,7 @@ indexes and AI-powered answer engines — without making any immediate changes.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no

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

@@ -17,7 +17,7 @@ actionable report that can be handed off for remediation before deployment.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no

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 /epic-plan --idea or opens standalone Stories.
+  either chains into /plan --idea or opens standalone Stories.
 ---
 
 # /audit-to-stories [audit-file-or-glob]
@@ -22,7 +22,7 @@ Dimension / Category, Current State, Recommendation, Agent Prompt).
 `/audit-to-stories` closes the loop: it parses those reports, groups
 related findings (including across audit dimensions), classifies each
 group as eligible-to-create or already-tracked, and — at the operator's
-choice — either chains into `/epic-plan --idea` for a single planned
+choice — either chains into `/plan --idea` for a single planned
 Epic or opens standalone Stories directly.
 
 The audit producers themselves are **not modified** by this workflow.
@@ -117,8 +117,8 @@ Ask:
 
 > How would you like these `<M>` Stories created?
 >
-> - **Single Epic via `/epic-plan`** **[Recommended]** — opens one Epic,
->   then chains into `/epic-plan --idea` so the standard PRD / Tech Spec
+> - **Single Epic via `/plan`** **[Recommended]** — opens one Epic,
+>   then chains into `/plan --idea` so the standard PRD / Tech Spec
 >   / WBS authoring handles decomposition. Grouped Stories become the
 >   seed for Phase 7 decomposition.
 > - **Individual standalone Stories** — opens one GitHub Issue per
@@ -128,7 +128,7 @@ Ask:
 
 ## Phase 5a — Single-Epic path
 
-Build the `/epic-plan` idea seed from the filtered plan envelope:
+Build the `/plan` idea seed from the filtered plan envelope:
 
 ```bash
 node .agents/scripts/audit-to-stories.js --emit-epic-seed \
@@ -138,16 +138,16 @@ node .agents/scripts/audit-to-stories.js --emit-epic-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 `/epic-plan`
+report), MVP Scope (the M proposed Stories), Key Files (so `/plan`
 Phase 7 decompose has concrete anchors), Not Doing.
 
 Chain into the existing planning entrypoint:
 
 ```text
-/epic-plan --idea "<path-to-seed>"
+/plan --idea "<path-to-seed>"
 ```
 
-`/epic-plan` then runs ideation → duplicate-search → render Epic body
+`/plan` then runs ideation → duplicate-search → render Epic body
 → open Epic → Phase 7 / 8 decompose, as documented in its workflow.
 Each Story it spawns from the seed carries `context::audit:
 <reportLink>` and `audit-fingerprint: <sha>` in its body so future
@@ -225,7 +225,7 @@ summarising the run:
 - Final tally: `"<M> groups planned · <K> created · <J> skipped (open)
   · <L> skipped (re-occurring)"`.
 
-When the Single-Epic path ran, link the Epic the chained `/epic-plan`
+When the Single-Epic path ran, link the Epic the chained `/plan`
 opened. When the Standalone-Stories path ran, list every Issue URL.
 
 ## Constraints
@@ -250,7 +250,7 @@ opened. When the Standalone-Stories path ran, list every Issue URL.
 
 ## See also
 
-- [`/epic-plan`](epic-plan.md) — the planning pipeline `/audit-to-stories`
+- [`/plan`](helpers/plan-epic.md) — the planning pipeline `/audit-to-stories`
   chains into for the Single-Epic grouping mode.
 - [`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/audit-ux-ui.md

@@ -16,7 +16,7 @@ and cohesive.
 
 ## Scope (Epic mode)
 
-When this lens is invoked from `/epic-deliver` Phase 4 (epic-audit), the
+When this lens is invoked from `/deliver` Phase 4 (epic-audit), the
 following block is populated with the Epic's change-set file list.
 Otherwise — for any manual `/audit-<dimension>` invocation — the block
 renders the literal substitution token and you MUST treat it as **no

package/.agents/workflows/deliver.md

@@ -0,0 +1,85 @@
+---
+description:
+  Unified delivery entry point. Inspects the ticket type(s) and
+  Epic-reference state of the supplied IDs, then routes to the Epic wave
+  loop or the standalone multi-Story fan-out — preserving every flag and
+  the parallel-delivery contract of the retired commands.
+---
+
+# /deliver [Epic ID] | [Story IDs...]
+
+## Role
+
+Router. `/deliver` owns input classification and path selection only — all
+phase content lives in the two path helpers:
+
+- [`helpers/deliver-epic.md`](helpers/deliver-epic.md) — the full Epic
+  delivery loop (preflight, wave loop fanning out
+  [`helpers/epic-deliver-story`](helpers/epic-deliver-story.md),
+  close-validation, epic-audit, code-review, retro, finalize, watch,
+  auto-merge gate, cleanup).
+- [`helpers/deliver-stories.md`](helpers/deliver-stories.md) — the
+  standalone multi-Story path (`stories-wave-tick.js` wave plan, operator
+  confirmation, parallel fan-out to
+  [`helpers/single-story-deliver`](helpers/single-story-deliver.md)).
+
+## Input matrix (authoritative)
+
+Fetch each supplied ID's labels and body (`type::*` label, `Epic: #N`
+reference) before routing:
+
+| Input | Route |
+| --- | --- |
+| Exactly one `type::epic` ID | **Epic path** — run [`helpers/deliver-epic.md`](helpers/deliver-epic.md) Phases 1–9 unchanged. |
+| One or more `type::story` IDs, none carrying an `Epic: #N` reference | **Standalone path** — run [`helpers/deliver-stories.md`](helpers/deliver-stories.md) Phases 0–3. |
+| Any Story carrying an `Epic: #N` reference | **Error**, naming the fix: `Story #<id> belongs to Epic #<n> — run /deliver <n>`. |
+| Mixed Epic + Story IDs, or more than one Epic | **Error**: separate invocations — one `/deliver <epicId>` per Epic, one `/deliver <id> [<id>...]` for the standalone set. |
+
+## Flags (forwarded per path)
+
+| Path | Flags |
+| --- | --- |
+| Epic | `--skip-epic-audit`, `--skip-code-review`, `--skip-retro`, `--full-retro`, `--steal`, `--as <handle>` |
+| Story | `--dep <from>:<to>`, `--yes`, `--concurrency <n>` |
+
+A flag passed to the wrong path is reported once as a no-op warning and
+ignored — never an error.
+
+**Multi-Story parallel contract (preserved verbatim).**
+
+```text
+/deliver <id> <id> … --dep <from>:<to> --concurrency <n> --yes
+```
+
+behaves exactly as the retired multi-Story command did: the same
+`stories-wave-tick.js` wave plan, the same operator confirmation gate
+(suppressed by `--yes`), and the same parallel fan-out — one Agent call per
+Story per wave, capped by the resolved `concurrencyCap` — to
+[`helpers/single-story-deliver`](helpers/single-story-deliver.md).
+
+## Procedure
+
+1. **Parse args.** At least one positive-integer ID is required.
+2. **Classify.** Fetch each ticket's labels + body and apply the input
+   matrix above. Refuse ambiguous input with the matrix's error messages —
+   never guess a route.
+3. **Delegate.** Read the selected path helper **in full** and execute it
+   from its entry phase, forwarding the absorbed flags. The helper's phase
+   numbering, watchdogs, gates, and scripts are unchanged — this router
+   adds no phase content.
+
+## Constraints
+
+- `/deliver` requires a planned ticket: an Epic at `agent::ready` (the
+  Epic helper's preflight enforces this) or well-formed standalone Stories.
+  Planning happens in [`/plan`](plan.md); the plan-review gate between the
+  two commands is a hard boundary.
+- The router performs no git or label mutations itself; the path helpers
+  own every script invocation.
+
+## See also
+
+- [`/plan`](plan.md) — the unified planning entry point.
+- [`helpers/deliver-epic.md`](helpers/deliver-epic.md) /
+  [`helpers/deliver-stories.md`](helpers/deliver-stories.md) — the path
+  helpers.

package/.agents/workflows/explain.md

@@ -14,7 +14,7 @@ description:
 landed (or is about to) and you want to be sure you actually understand it —
 the problem it solves, why it was solved this way, the design decisions, the
 edge cases, and the blast radius. It is the after-the-fact counterpart to
-[`/epic-plan`](epic-plan.md) Phase 11 (which walks the operator through a
+[`/plan`](helpers/plan-epic.md) Phase 11 (which walks the operator through a
 *plan* before delivery); both drive the same engine.
 
 ```text
@@ -39,7 +39,7 @@ contract.
 | Understand a change that already merged | `/explain <PR#>` |
 | Understand a branch before merging it | `/explain <branch>` |
 | Understand what you are about to commit | `/explain --staged` |
-| Understand a freshly planned Epic backlog | `/epic-plan` Phase 11 (automatic) |
+| Understand a freshly planned Epic backlog | `/plan` Phase 11 (automatic) |
 
 ## Step 1 — Resolve the subject
 
@@ -111,7 +111,7 @@ structured-question mechanism when it sharpens understanding.
 
 - [`core/knowledge-transfer`](../skills/core/knowledge-transfer/SKILL.md) —
   the comprehension engine this command drives.
-- [`/epic-plan`](epic-plan.md) — Phase 11 runs the same engine over a plan
+- [`/plan`](helpers/plan-epic.md) — Phase 11 runs the same engine over a plan
   before delivery.
 - `/code-review` (Claude Code built-in) — correctness review of a diff. A
   different concern: `/explain` builds *operator* understanding, not a defect

package/.agents/workflows/git-merge-pr.md

@@ -235,7 +235,7 @@ Merge the PR as a squash commit and delete the head branch. Call
 
 After the merge command returns, perform a conflict marker scan to confirm no
 stray markers entered the base branch. Delegate to `detect-merges.js` — it
-owns the scan logic and is the same script used by `/epic-deliver` Phase 5.3.
+owns the scan logic and is the same script used by `/deliver` Phase 5.3.
 
 ```powershell
 git checkout [BASE_BRANCH]

package/.agents/workflows/git-pr-all.md

@@ -7,7 +7,7 @@ description: >-
 # /git-pr-all [Message] [--draft] [--no-auto-merge] [--branch <name>] [--base <branch>]
 
 This workflow is the **ad-hoc PR ergonomics** counterpart to the heavyweight
-`/epic-deliver` pipeline. Use it when you have outstanding changes that do not
+`/deliver` pipeline. Use it when you have outstanding changes that do not
 belong to a planned Epic (typo fixes, file deletions, doc tweaks, dependency
 bumps, operator housekeeping) and you want a single command to take them from
 the working tree to a PR queued for auto-merge.
@@ -19,7 +19,7 @@ names. Quality gates remain enforced by the existing pre-push hook; this
 workflow does not bypass them.
 
 > **When to run**: After making changes on `main` (or any base branch) that
-> are too small or too out-of-band for `/epic-plan` + `/epic-deliver` but
+> are too small or too out-of-band for `/plan` + `/deliver` but
 > still need to land via the PR-required flow.
 >
 > **Persona**: `devops-engineer` · **Skills**:
@@ -123,7 +123,7 @@ git add -A
 
 > **Why `-A` and not explicit paths?** `/git-pr-all` is operator-driven
 > (not parallel-agent-driven), so the single-tree assumption that
-> blocks `git add .` inside `/story-deliver` does not apply here. See
+> blocks `git add .` inside `/deliver` does not apply here. See
 > the parallel-execution warning at the bottom of this file.
 
 Commit:
@@ -210,7 +210,7 @@ Print a single block to the operator:
    auto-merge: <enabled | draft | disabled>
 ```
 
-Do **not** poll CI. That is the `/epic-deliver` Phase 7 job and is
+Do **not** poll CI. That is the `/deliver` Phase 7 job and is
 overkill for ad-hoc changes. The operator (or GitHub's email
 notification) is the next watcher.
 
@@ -253,13 +253,13 @@ notification) is the next watcher.
 - **Never** force-push from `/git-pr-all`. This workflow is for opening
   new PRs, not for rewriting history. Force-pushes belong to
   `/git-merge-pr` (with `--force-with-lease` after a rebase) and
-  `/epic-deliver` Phase 7 (with the operator's explicit context).
+  `/deliver` Phase 7 (with the operator's explicit context).
 - **Always** delete the head branch on merge (Step 6's
   `--delete-branch` flag handles this for `--auto` mode; for
   `--no-auto-merge` PRs the operator is responsible for the cleanup).
 - **Always** prefer `--auto --squash --delete-branch` unless the
   operator explicitly opts out. The squash + auto-merge default gives
-  the same merge ergonomics `/epic-deliver` produces, so main's commit
+  the same merge ergonomics `/deliver` produces, so main's commit
   history stays uniform across both surfaces.
 
 ---
@@ -267,11 +267,14 @@ notification) is the next watcher.
 ## ⚠️ Parallel Story Execution
 
 Do **not** use this workflow from inside a parallel story-execution
-context (`/story-deliver #<storyId>`, `/epic-deliver` wave dispatch).
+context (`/deliver #<storyId>`, `/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. Use the
-explicit-staging + branch-guard pattern documented in
-`story-deliver.md` Step 1 in those contexts.
+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
+before committing — see
+[`helpers/worktree-lifecycle.md`](helpers/worktree-lifecycle.md) for the
+shared-tree hazard and the worktree-isolation model that contains it.
 
 The same warning applies to any workflow that calls `git add .` or
 `git add -A`; this is not unique to `/git-pr-all` (see

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

@@ -54,7 +54,10 @@ attempting to commit or push again.
 ## ⚠️ Parallel Story Execution
 
 Do **not** use this workflow from inside a parallel story-execution context
-(`/story-deliver #<storyId>`). `git add .` sweeps any untracked files in the
+(`/deliver #<storyId>`). `git add .` sweeps any untracked files in the
 working tree, which in a shared working directory may belong to another agent.
-In that context, follow the explicit-staging + branch-guard pattern documented
-in `story-deliver.md` Step 1.
+In that context, stage explicit paths only and confirm
+`git branch --show-current` reports the expected `story-<id>` branch before
+committing — see
+[`helpers/worktree-lifecycle.md`](helpers/worktree-lifecycle.md) for the
+shared-tree hazard and the worktree-isolation model that contains it.

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 `git-merge-pr.md`, `story-deliver.md`, and `epic-deliver.md`.
+Referenced by `git-merge-pr.md`, `deliver-stories.md`, and `deliver-epic.md`.
 
 ## Procedure
 

package/.agents/workflows/helpers/acceptance-self-eval.md

@@ -26,7 +26,7 @@ The loop is **always on** (a hard cutover — there is no flag to disable it) an
 **bounded** by `delivery.acceptanceEval.maxRounds` (default 2), which the
 resolver clamps into `[1, hard ceiling]` so the cap can never be switched off or
 run unbounded. It is **distinct from** the Epic-level acceptance-spec
-reconciliation in `/epic-deliver` Phase 7.1 (which fires once at finalize and
+reconciliation in `/deliver` Phase 7.1 (which fires once at finalize and
 only checks `@ac-*` Gherkin tag presence): this loop is per-Story,
 per-criterion, mid-delivery, and evaluates the actual work product.
 

package/.agents/workflows/helpers/agents-sync-config.md

@@ -68,8 +68,9 @@ node .agents/scripts/sync-agentrc.js
 The script:
 
 1. Reads `.agentrc.json` from the working directory (`--cwd <path>` to
-   override). When the file is missing, prints a pointer to
-   `/agents-bootstrap-project` and exits 1.
+   override). When the file is missing, prints an error asking the
+   operator to run `mandrel init` (new project) or
+   `node .agents/scripts/bootstrap.js` (existing project) and exits 1.
 2. Validates the parsed config against the framework AJV schema
    (`getAgentrcValidator()`). On any failure, prints a single-line error
    list and exits 1 — the operator must fix the typo / missing required