mandrel 1.59.0 → 1.60.0

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 (not 20+ shallow ones); 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.
-- Phase 3 emits a markdown one-pager with the canonical five Epic headings exactly: `## Context`, `## Goal`, `## Non-Goals`, `## Scope`, `## Acceptance Criteria` (plus optional `## Open Questions`). No alternate heading text — the `/epic-plan` clarity gate depends on this verbatim.
+- Phase 3 emits a markdown one-pager with the canonical five Epic 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.
 - 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.
@@ -35,7 +35,7 @@ structured divergent and convergent thinking.
 
 ## Activation
 
-Called from `/epic-plan` Phase 1 (ideation entry, when no `<epic#>` is
+Called from `/plan` Phase 1 (ideation entry, when no `<epic#>` is
 supplied or `--idea "<seed>"` is passed) and Phase 6 (Epic Clarity Gate,
 when an existing Epic body fails the section-presence rubric). In Phase 6
 the skill is seeded from the **current Epic body** — not a blank seed —
@@ -73,7 +73,7 @@ The final output is a markdown one-pager saved to `docs/ideas/[idea-name].md`
 
 Assumptions and open questions are recorded in the body of the relevant
 section (typically under Context or Scope) rather than carved into their
-own headings — the canonical five drive the `/epic-plan` clarity gate.
+own headings — the canonical five drive the `/plan` clarity gate.
 
 ## Detailed Instructions
 
@@ -213,7 +213,7 @@ it inside the grill loop, not after the one-pager is already written.
 
 Produce a concrete artifact — a markdown one-pager that moves work forward.
 The five canonical headings below match `.agents/templates/epic-from-idea.md`
-and the `/epic-plan` clarity gate; emit them verbatim so the renderer can
+and the `/plan` clarity gate; emit them verbatim so the renderer can
 substitute the body into a new Epic without translation.
 
 ```markdown

package/.agents/skills/core/knowledge-transfer/SKILL.md

@@ -152,9 +152,9 @@ This skill is the engine behind two operator-facing entry points:
 
 - [`/explain`](../../../workflows/explain.md) — runs the loop over a realized
   change (a PR, branch, or diff).
-- [`/epic-plan`](../../../workflows/epic-plan.md) **Phase 11 — Plan
+- [`/plan`](../../../workflows/helpers/plan-epic.md) **Phase 11 — Plan
   Comprehension Gate** — runs the loop over a freshly planned backlog before
-  the operator hands off to `/epic-deliver`. That phase decides *whether* to
+  the operator hands off to `/deliver`. That phase decides *whether* to
   run via an LM-judgment predicate; this skill owns *how* it runs once
   invoked.
 

package/.agents/skills/core/planning-and-task-breakdown/SKILL.md

@@ -13,7 +13,7 @@ description:
 > teaches how to slice and order work into verifiable units, independent
 > of any particular ticket hierarchy. The word "task" below refers to a
 > generic unit of work, not specifically to a Mandrel ticket. Under
-> Mandrel's 3-tier hierarchy (Epic → Feature → Story), these units map
+> Mandrel's 2-tier hierarchy (Epic → Story), these units map
 > onto acceptance/verification bullets inlined on the Story body, or
 > onto sequential sibling Stories. The principles — vertical slicing,
 > dependency ordering, sizing caps, explicit acceptance and

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

@@ -4,7 +4,7 @@ description:
   Judge whether a piece of planned work is epic-sized or story-sized before the
   planning ceremony is paid for. Emits one of three verdicts —
   `epic` | `story` | `borderline` — over any planning artifact (a one-pager, an
-  Epic body, or a Story draft). Use from `/epic-plan` Phase 1.5 and any other
+  Epic body, or a Story draft). Use from `/plan` Phase 1.5 and any other
   planning gate that needs the canonical story-vs-epic rubric.
 ---
 
@@ -32,9 +32,8 @@ description:
   wrong in the `epic` direction is cheap — the Phase 8.3 consolidation pass and
   the sizing validator catch an over-planned Story later. Being wrong in the
   `story` direction is expensive — a story-sized scope pushed through the full
-  Epic ceremony pays a PRD + Tech Spec + Acceptance Spec + Feature/Story tree +
-  `epic/<id>` integration-branch tax for a degenerate one-Feature-one-Story
-  output.
+  Epic ceremony pays a PRD + Tech Spec + Acceptance Spec + Story backlog +
+  `epic/<id>` integration-branch tax for a degenerate one-Story output.
 - Keep the rubric prose **artifact-agnostic**. The thing under judgment may be a
   sharpened one-pager, an existing Epic body, or a draft Story — the rubric
   reads the same against all three so every consumer reuses it verbatim.
@@ -62,7 +61,7 @@ The work is a single shippable capability. Signals:
   architectural decision and matches none of the `planning.riskHeuristics` in
   `.agentrc.json` (destructive/irreversible changes, shared auth/security,
   CI/CD gate changes, monorepo-wide rewrites, destructive migrations).
-- **Decomposition would degenerate.** Running it through `/epic-plan` would
+- **Decomposition would degenerate.** Running it through `/plan` would
   plausibly yield exactly **one Feature with one Story** — the shape the Phase
   8.3 consolidation skill flags only after all the spec authoring is already
   sunk cost.
@@ -90,18 +89,18 @@ option; a borderline scope surfaced as borderline is the correct output.
 A workflow entered via a scope-triage **handoff** MUST NOT re-triage. A handoff
 *is* a triage decision already made — re-running this gate on the receiving side
 would re-litigate a settled call and risk a ping-pong between two planning
-workflows. Handoff invocations identify themselves as such (e.g. `/epic-plan`
-entered via a `/story-plan` scope-triage escalation, or `/story-plan` entered
-via an `/epic-plan` Phase 1.5 handoff), and the receiving workflow skips its own
+workflows. Handoff invocations identify themselves as such (e.g. `/plan`
+entered via a `/plan` scope-triage escalation, or `/plan` entered
+via an `/plan` Phase 1.5 handoff), and the receiving workflow skips its own
 scope-triage gate when it detects the handoff marker.
 
 ## When to use
 
-- **`/epic-plan` Phase 1.5** (ideation path only) — judge the sharpened
+- **`/plan` Phase 1.5** (ideation path only) — judge the sharpened
   one-pager Phase 1 produced before the Epic ceremony is paid for. The verdict
   folds into the existing Phase 1 HITL stop; on a `story` / `borderline`
   verdict the operator may hand off to
-  [`/story-plan --from-notes`](../../../workflows/story-plan.md).
+  [`/plan --from-notes`](../../../workflows/helpers/plan-story.md).
 - Any other planning gate that needs the canonical story-vs-epic rubric. Keep
   the rubric here as the SSOT; consumers reference this file rather than
   forking the prose.

package/.agents/skills/core/using-agent-skills/SKILL.md

@@ -101,7 +101,7 @@ In that context:
 2. If you genuinely cannot proceed, transition to `agent::blocked`, post a
    `friction` structured comment naming the decision required and the
    default assumption you would have made, and exit non-zero. The parent
-   `/epic-deliver` aggregator will surface the block.
+   `/deliver` aggregator will surface the block.
 3. **Never** stall waiting for input that will never arrive.
 
 This is the only documented exception to the "Manage Confusion Actively"

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

@@ -1,5 +1,5 @@
 {
-  "generatedAt": "2026-06-10T15:27:53.874Z",
+  "generatedAt": "2026-06-11T19:47:29.752Z",
   "generator": "generate-skills-index.js@1",
   "skills": [
     {
@@ -7,7 +7,7 @@
       "tier": "core",
       "category": "core",
       "path": ".agents/skills/core/analyze-execution/SKILL.md",
-      "description": "Aggregate per-Story or per-Epic execution signals into a structured perf-summary or perf-report and upsert it onto the corresponding GitHub ticket. Use after a Story closes (Story mode) or as part of `/epic-deliver` Phase 6 (Epic mode). Reads NDJSON via `lib/signals/read` and writes a single structured comment.",
+      "description": "Aggregate per-Story or per-Epic execution signals into a structured perf-summary or perf-report and upsert it onto the corresponding GitHub ticket. Use after a Story closes (Story mode) or as part of `/deliver` Phase 6 (Epic mode). Reads NDJSON via `lib/signals/read` and writes a single structured comment.",
       "policyCapsuleBullets": 8,
       "allowedTools": ["Read", "Bash"],
       "vendor": null
@@ -127,8 +127,8 @@
       "tier": "core",
       "category": "core",
       "path": ".agents/skills/core/epic-plan-consolidate/SKILL.md",
-      "description": "Run a holistic, pre-persist consolidation pass over the draft Feature/Story ticket array an Epic's decompose phase produced. Use during Phase 8 of `/epic-plan`, after `epic-plan-decompose-author` writes `temp/epic-<Epic_ID>/tickets.json` and before `epic-plan-decompose.js` validates and persists it. Reconciles the draft against the Tech Spec \"Delivery Slicing\" target via scope-preserving operations only.",
-      "policyCapsuleBullets": 9,
+      "description": "Run a holistic, pre-persist consolidation pass over the draft Story ticket array an Epic's decompose phase produced. Use during Phase 8 of `/plan`, after `epic-plan-decompose-author` writes `temp/epic-<Epic_ID>/tickets.json` and before `epic-plan-decompose.js` validates and persists it. Reconciles the draft against the Tech Spec \"Delivery Slicing\" target via scope-preserving operations only.",
+      "policyCapsuleBullets": 8,
       "allowedTools": ["Read", "Write", "Bash"],
       "vendor": null
     },
@@ -137,7 +137,7 @@
       "tier": "core",
       "category": "core",
       "path": ".agents/skills/core/epic-plan-decompose-author/SKILL.md",
-      "description": "Author the Feature/Story ticket JSON for an Epic from the decomposer authoring context emitted by `epic-plan-decompose.js --emit-context`. Use during Phase 8 of `/epic-plan` when the host LLM needs to write the ticket array before `epic-plan-decompose.js` validates and persists it.",
+      "description": "Author the Story ticket JSON for an Epic from the decomposer authoring context emitted by `epic-plan-decompose.js --emit-context`. Use during Phase 8 of `/plan` when the host LLM needs to write the ticket array before `epic-plan-decompose.js` validates and persists it.",
       "policyCapsuleBullets": 12,
       "allowedTools": ["Read", "Write", "Bash"],
       "vendor": null
@@ -147,7 +147,7 @@
       "tier": "core",
       "category": "core",
       "path": ".agents/skills/core/epic-plan-spec-author/SKILL.md",
-      "description": "Author the PRD, Tech Spec, Acceptance Spec markdown, and risk-verdict JSON for an Epic from the planner authoring context emitted by `epic-plan-spec.js --emit-context`. Use during Phase 7 of `/epic-plan` when the host LLM needs to write the four artifacts before `epic-plan-spec.js` persists them.",
+      "description": "Author the PRD, Tech Spec, Acceptance Spec markdown, and risk-verdict JSON for an Epic from the planner authoring context emitted by `epic-plan-spec.js --emit-context`. Use during Phase 7 of `/plan` when the host LLM needs to write the four artifacts before `epic-plan-spec.js` persists them.",
       "policyCapsuleBullets": 12,
       "allowedTools": ["Read", "Write", "Bash"],
       "vendor": null
@@ -287,7 +287,7 @@
       "tier": "core",
       "category": "core",
       "path": ".agents/skills/core/scope-triage/SKILL.md",
-      "description": "Judge whether a piece of planned work is epic-sized or story-sized before the planning ceremony is paid for. Emits one of three verdicts — `epic` | `story` | `borderline` — over any planning artifact (a one-pager, an Epic body, or a Story draft). Use from `/epic-plan` Phase 1.5 and any other planning gate that needs the canonical story-vs-epic rubric.",
+      "description": "Judge whether a piece of planned work is epic-sized or story-sized before the planning ceremony is paid for. Emits one of three verdicts — `epic` | `story` | `borderline` — over any planning artifact (a one-pager, an Epic body, or a Story draft). Use from `/plan` Phase 1.5 and any other planning gate that needs the canonical story-vs-epic rubric.",
       "policyCapsuleBullets": 1,
       "allowedTools": null,
       "vendor": null

package/.agents/templates/agent-protocol.md

@@ -5,8 +5,8 @@ Version: {{PROTOCOL_VERSION}}
 You are an AI coding assistant. This protocol governs your execution of the
 current work unit. You must follow these rules strictly.
 
-> **Hierarchy shape.** Mandrel uses a **3-tier hierarchy**
-> (Epic → Feature → Story). The work unit is the `type::story` issue
+> **Hierarchy shape.** Mandrel uses a **2-tier hierarchy**
+> (Epic → Story). The work unit is the `type::story` issue
 > itself, with acceptance criteria and verification inlined on the
 > Story body. There is no per-Task sub-loop; the agent authors commit
 > subjects directly per `.agents/rules/git-conventions.md` and

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

@@ -222,7 +222,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 +246,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.
 

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]