mandrel 1.59.0 → 1.60.0

package/.agents/schemas/lifecycle/story.dispatch.end.schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/dsj1984/mandrel/blob/main/.agents/schemas/lifecycle/story.dispatch.end.schema.json",
   "title": "story.dispatch.end",
-  "description": "Appended to the Epic ledger by emit-story-dispatch-end.js when a child story sub-agent returns, so /epic-deliver's idle watchdog can subtract completed Stories from the in-flight set. Subscribed by CheckpointPointerWriter via SUBSCRIBED_END_EVENTS. Sibling ordering within a wave is not guaranteed; ordering between waves is.",
+  "description": "Appended to the Epic ledger by emit-story-dispatch-end.js when a child story sub-agent returns, so /deliver's idle watchdog can subtract completed Stories from the in-flight set. Subscribed by CheckpointPointerWriter via SUBSCRIBED_END_EVENTS. Sibling ordering within a wave is not guaranteed; ordering between waves is.",
   "type": "object",
   "required": ["storyId", "outcome", "durationMs"],
   "properties": {

package/.agents/schemas/lifecycle/story.dispatch.start.schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/dsj1984/mandrel/blob/main/.agents/schemas/lifecycle/story.dispatch.start.schema.json",
   "title": "story.dispatch.start",
-  "description": "Emitted before a story is handed to the host-LLM for Agent-tool fanout. lifecycle-emit-story-dispatch.js appends the {storyId, waveIndex, dispatchedAt, attempt} shape to the Epic ledger so /epic-deliver's host loop can durably ledger every dispatch attempt for in-flight reconciliation (Story #2891).",
+  "description": "Emitted before a story is handed to the host-LLM for Agent-tool fanout. lifecycle-emit-story-dispatch.js appends the {storyId, waveIndex, dispatchedAt, attempt} shape to the Epic ledger so /deliver's host loop can durably ledger every dispatch attempt for in-flight reconciliation (Story #2891).",
   "type": "object",
   "required": ["storyId", "waveIndex"],
   "properties": {

package/.agents/schemas/lifecycle/story.heartbeat.schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/dsj1984/mandrel/blob/main/.agents/schemas/lifecycle/story.heartbeat.schema.json",
   "title": "story.heartbeat",
-  "description": "Emitted by story-phase.js inside a Story's implementation loop. Surfaces the in-progress Story as an inspectable ledger event so /epic-deliver's host-loop reconciler can confirm a long Story is still making forward progress between dispatch and merge — distinct from story.dispatch.start (one per Story per attempt) and story.merged (one per Story per close). The 3-tier hierarchy has no child Task tickets, so the heartbeat carries phase info only. The optional operator field (Story #3480) records the handle holding the assignee-as-lease claim on the Story so the ticket-lease primitive can decide claim liveness from the most-recent heartbeat for a given owner.",
+  "description": "Emitted by story-phase.js inside a Story's implementation loop. Surfaces the in-progress Story as an inspectable ledger event so /deliver's host-loop reconciler can confirm a long Story is still making forward progress between dispatch and merge — distinct from story.dispatch.start (one per Story per attempt) and story.merged (one per Story per close). The 2-tier hierarchy has no child Task tickets, so the heartbeat carries phase info only. The optional operator field (Story #3480) records the handle holding the assignee-as-lease claim on the Story so the ticket-lease primitive can decide claim liveness from the most-recent heartbeat for a given owner.",
   "type": "object",
   "required": ["event", "storyId", "epicId", "phase", "timestamp"],
   "properties": {

package/.agents/schemas/validation-evidence.schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "validation-evidence",
   "title": "Validation Evidence",
-  "description": "Per-scope record of which validation gates have passed against which commit SHA. Written by lib/validation-evidence.js under the per-Epic temp tree at temp/epic-<epicId>/validation-evidence.json (Epic-scoped) or temp/epic-<epicId>/stories/story-<storyId>/validation-evidence.json (Story-scoped); both are gitignored via temp/. Consumed by close-validation, epic-code-review, and /epic-deliver Phase 3 (close-validation) to skip identical re-runs against an already-validated tree. The `storyId` field carries the scope id and equals the epic id for Epic-scoped records.",
+  "description": "Per-scope record of which validation gates have passed against which commit SHA. Written by lib/validation-evidence.js under the per-Epic temp tree at temp/epic-<epicId>/validation-evidence.json (Epic-scoped) or temp/epic-<epicId>/stories/story-<storyId>/validation-evidence.json (Story-scoped); both are gitignored via temp/. Consumed by close-validation, epic-code-review, and /deliver Phase 3 (close-validation) to skip identical re-runs against an already-validated tree. The `storyId` field carries the scope id and equals the epic id for Epic-scoped records.",
   "type": "object",
   "required": ["storyId", "schemaVersion", "records"],
   "properties": {

package/.agents/scripts/README.md

@@ -49,7 +49,7 @@ that the file was meaningfully updated during this Epic's lifecycle
 
 **When to run.** Optional. Useful as a pre-merge spot check when an
 Epic should have produced documentation updates; the standard
-`/epic-deliver` flow does **not** invoke this gate today.
+`/deliver` flow does **not** invoke this gate today.
 
 **Usage.**
 

package/.agents/scripts/acceptance-eval.js

@@ -16,7 +16,7 @@
  *      and the resolved, undisableable round cap
  *      (`delivery.acceptanceEval.maxRounds`, clamped to `[1, ceiling]`).
  *   3. Emit one per-criterion `acceptance-eval` signal into the retro /
- *      feedback substrate so the retro and `/epic-plan` Phase 0 feedback
+ *      feedback substrate so the retro and `/plan` Phase 0 feedback
  *      fetch can see which acceptance items needed rework and the round
  *      count.
  *   4. Print a single JSON envelope and exit:

package/.agents/scripts/acceptance-spec-reconciler.js

@@ -301,7 +301,7 @@ export function renderBlockerMessage({
     lines.push(`  Pending (@pending-only coverage): ${pending.join(', ')}`);
   }
   lines.push(
-    `Author or de-pend scenarios under tests/features/** tagged @epic-${epicId}-ac-<n> so every AC ID is satisfied, then re-run /epic-deliver.`,
+    `Author or de-pend scenarios under tests/features/** tagged @epic-${epicId}-ac-<n> so every AC ID is satisfied, then re-run /deliver.`,
   );
   return lines.join('\n');
 }
@@ -420,7 +420,7 @@ export async function reconcileAcceptanceSpec({
     }
     // Defence in depth — the start gate would normally catch this.
     throw new Error(
-      `[acceptance-spec-reconciler] Epic #${epicId} has no linked context::acceptance-spec ticket and no acceptance::n-a waiver label. Re-run /epic-plan Phase 7 or apply the waiver.`,
+      `[acceptance-spec-reconciler] Epic #${epicId} has no linked context::acceptance-spec ticket and no acceptance::n-a waiver label. Re-run /plan Phase 7 or apply the waiver.`,
     );
   }
 

package/.agents/scripts/analyze-execution.js

@@ -18,7 +18,7 @@
  *     fetching each `story-perf-summary` structured comment from the
  *     ticketing provider. Posts the
  *     `<!-- structured:epic-perf-report -->` comment on the Epic ticket.
- *     Run from the retro composer / `/epic-deliver` Phase 6.0.
+ *     Run from the retro composer / `/deliver` Phase 6.0.
  *
  * Both modes are idempotent: `upsertStructuredComment` deletes the prior
  * marker before posting the new one.
@@ -27,7 +27,7 @@
  * NDJSON for a Story, no children for an Epic) so the close pipelines
  * never block on observability output. Hard failures (bad CLI args,
  * provider error, schema-violating payload) exit non-zero — the call
- * sites in post-merge-pipeline / `/epic-deliver` Phase 5 treat that
+ * sites in post-merge-pipeline / `/deliver` Phase 5 treat that
  * as a non-fatal warning.
  *
  * This file is a thin CLI: it wires the I/O readers from

package/.agents/scripts/audit-to-stories.js

@@ -13,7 +13,7 @@
  *     stdout when --json is set).
  *
  *   --emit-epic-seed --plan <plan.json> --out <path>
- *     Read the plan envelope from disk, render the `/epic-plan --idea`
+ *     Read the plan envelope from disk, render the `/plan --idea`
  *     seed markdown, persist to --out.
  *
  *   --emit-stories --plan <plan.json>

package/.agents/scripts/check-doc-links.js

@@ -5,7 +5,7 @@
 // Story #2662 — Internal-link and slash-command resolver for active docs.
 //
 // Scans every `*.md` under `docs/` and `.agents/` (excluding
-// `docs/CHANGELOG.md` and anything under `docs/archive/**`) and validates:
+// `docs/CHANGELOG.md`) and validates:
 //
 //   1. Every Markdown relative-path link `[text](relative/path[#anchor])`
 //      resolves to a real file on disk (anchors are not validated, only
@@ -19,7 +19,7 @@
 //
 //   3. No active doc mentions any retired slash command. The retired-command
 //      blocklist is seeded with `agents-bootstrap-github`,
-//      `single-story-plan` (renamed to `/story-plan`), and `mandrel`
+//      `single-story-plan` (renamed to `/plan`), and `mandrel`
 //      (retired in favor of the generated `.agents/docs/workflows.md`
 //      catalog) and takes precedence over the workflow-resolution check —
 //      a retired token is always a non-zero exit even if a stale workflow
@@ -125,7 +125,6 @@ export const SLASH_ALLOWLIST = new Set([
 
 function isExcludedRelPath(relPath) {
   if (relPath === 'docs/CHANGELOG.md') return true;
-  if (relPath.startsWith('docs/archive/')) return true;
   return false;
 }
 

package/.agents/scripts/diagnose-friction.js

@@ -134,7 +134,7 @@ function buildFrictionSignal({
     timestamp: new Date().toISOString(),
     epicId: epicId ?? null,
     storyId: storyId ?? null,
-    // 3-tier hierarchy (Epic #3163): no Task tier, so friction signals
+    // 2-tier hierarchy (Epic #3163): no Task tier, so friction signals
     // carry no Task id. The field is retained for schema compatibility
     // and always null.
     taskId: null,

package/.agents/scripts/dispatcher.js

@@ -72,12 +72,12 @@ import { loadSpec, loadState } from './lib/spec/index.js';
  * loaded state mapping. The spec-aware renderer (`buildManifestFromSpec`)
  * looks up each Story's status via `state.mapping[slug].lastObservedAgentState`;
  * that field is only refreshed by the structural reconciler, so during
- * `/epic-deliver` execution it stays `null` and every Story renders as ⬜
+ * `/deliver` execution it stays `null` and every Story renders as ⬜
  * pending even after the Story merges. The wave-runner replaced the
  * dispatcher-per-wave refresh loop and the local state.json never sees
  * the progress signal.
  *
- * Under the 3-tier hierarchy (Epic #3163) the runtime manifest's wave
+ * Under the 2-tier hierarchy (Epic #3163) the runtime manifest's wave
  * records carry `stories[]` (each with the live `storyId` + `status` from
  * `fetchEpicContext`'s GH query), not the retired `tasks[]` shape. The
  * overlay walks `manifest.waves[].stories[]` and copies each Story's

package/.agents/scripts/drain-pending-cleanup.js

@@ -8,7 +8,7 @@
  * any still-stuck entries by enumerating the processes holding handles
  * inside the worktree path and terminating them.
  *
- * Invoked by `/epic-deliver`, `/epic-plan-spec` / `/epic-plan-decompose`
+ * Invoked by `/deliver`, `/epic-plan-spec` / `/epic-plan-decompose`
  * (via `drainPendingCleanupAtBoot` → `worktree-sweep.js`), and
  * `story-close` so the pending-cleanup ledger drains automatically
  * across the sprint lifecycle. Operators can also run it standalone:

package/.agents/scripts/epic-audit-prepare.js

@@ -2,7 +2,7 @@
 /* node:coverage ignore file */
 
 /**
- * epic-audit-prepare.js — Phase 4 prepare CLI for `/epic-deliver`.
+ * epic-audit-prepare.js — Phase 4 prepare CLI for `/deliver`.
  *
  * Thin glue around the audit-suite `selectAudits` SDK. Reads the Epic
  * ticket, runs the change-set selector against the Epic branch diff
@@ -193,7 +193,7 @@ function resolveTaskSizing(config) {
  * Best-effort and total, mirroring `resolveRiskRoutedLenses`: a
  * missing/unparseable checkpoint, an absent `planningRisk` field, or a
  * provider read failure all degrade to `standard` — the neutral default that
- * preserves today's behavior — so an Epic that skipped `/epic-plan` (no
+ * preserves today's behavior — so an Epic that skipped `/plan` (no
  * checkpoint) still gets a passing `standard` pass with no new failure mode.
  * The changed-file count can only escalate a low-risk Epic to `deep` (a wide
  * diff) and never downgrades a high-risk one; an unknown/absent count is the
@@ -295,7 +295,7 @@ export async function runEpicAuditPrepare(values, deps = {}) {
   const runner = deps.selectAudits ?? selectAudits;
 
   // Pin the change set to the requested Epic's own branch rather than the
-  // shared checkout's HEAD (Story #3362). Under two concurrent /epic-deliver
+  // shared checkout's HEAD (Story #3362). Under two concurrent /deliver
   // runs sharing one working copy, a HEAD-relative diff silently reports the
   // *other* Epic's change set; `refs/heads/epic/<id>` is unambiguous.
   const epicBranch = `epic/${epicId}`;

package/.agents/scripts/epic-deliver-note-intervention.js

@@ -3,9 +3,9 @@
 
 /**
  * epic-deliver-note-intervention.js — record a manual-intervention event
- * against the active `/epic-deliver` run-state checkpoint.
+ * against the active `/deliver` run-state checkpoint.
  *
- * The host LLM driving `/epic-deliver` invokes this CLI whenever it does
+ * The host LLM driving `/deliver` invokes this CLI whenever it does
  * something out-of-band that disqualifies the Epic from auto-merge:
  *
  *   - `AskUserQuestion` to the operator mid-run

package/.agents/scripts/epic-deliver-preflight.js

@@ -4,7 +4,7 @@
 /**
  * epic-deliver-preflight.js — Story #2899 (Epic #2880, F13).
  *
- * Estimates the cost of an upcoming `/epic-deliver` run *before* Story
+ * Estimates the cost of an upcoming `/deliver` run *before* Story
  * fan-out and surfaces the result to the operator on two channels:
  *
  *   1. A JSON envelope on stdout (always) with the keys
@@ -19,7 +19,7 @@
  *
  * The CLI is intentionally side-effect-light when `--dry-run` is set: no
  * comment write, no lifecycle emit. The slash-command workflow
- * (`/epic-deliver` Phase 1) calls the CLI without `--dry-run` so the
+ * (`/deliver` Phase 1) calls the CLI without `--dry-run` so the
  * comment is upserted; if any threshold is breached, the workflow flips
  * the Epic to `agent::blocked` and surfaces the envelope in chat for
  * operator review. The CLI itself does NOT flip labels — the workflow
@@ -70,7 +70,7 @@ const HELP = `Usage: node .agents/scripts/epic-deliver-preflight.js \\
   [--per-story-claude-tokens <n>]
 
 Estimates Story count, install cost, wave count, GitHub API request volume,
-and Claude Max quota burn for an Epic *before* /epic-deliver fan-out.
+and Claude Max quota burn for an Epic *before* /deliver fan-out.
 
 Flags:
   --dry-run                        Compute the estimate and print the JSON
@@ -103,7 +103,7 @@ const DEFAULTS = Object.freeze({
   perStoryApiRequests: 25,
   perStoryClaudeTokens: 200_000,
   // Base GH API budget: snapshot getTicket + getSubTickets + plan/manifest
-  // reads/writes that happen once per /epic-deliver run regardless of
+  // reads/writes that happen once per /deliver run regardless of
   // Story count. Empirical observation from a 5-Story Epic shows ~30
   // requests for the non-per-Story floor.
   baseApiRequests: 30,
@@ -240,7 +240,7 @@ export function renderPreflightBody({
     );
   } else {
     lines.push(
-      '⛔ **Threshold breaches** — `/epic-deliver` will flip the Epic to `agent::blocked` for operator review:',
+      '⛔ **Threshold breaches** — `/deliver` will flip the Epic to `agent::blocked` for operator review:',
     );
     for (const b of breaches) {
       lines.push(`- \`${b.key}\` = ${b.observed} (max ${b.max})`);
@@ -284,7 +284,7 @@ export async function runPreflight({
   const provider = injectedProvider ?? createProvider(config);
   const thresholds = getPreflight(config);
 
-  // Compose the same two phases /epic-deliver Phase 1 runs so the
+  // Compose the same two phases /deliver Phase 1 runs so the
   // preflight numbers match the actual dispatch plan.
   const ctx = { epicId, provider };
   let state = {};

package/.agents/scripts/epic-deliver-prepare.js

@@ -2,7 +2,7 @@
 /* node:coverage ignore file */
 
 /**
- * epic-deliver-prepare.js — Step 0/1 of the operator-driven `/epic-deliver`.
+ * epic-deliver-prepare.js — Step 0/1 of the operator-driven `/deliver`.
  *
  * Composes the existing engine phases that the in-process epic-runner used to
  * call sequentially, but does NOT dispatch any waves. The CLI is the single

package/.agents/scripts/epic-execute-record-wave.js

@@ -6,7 +6,7 @@
  * advance the `epic-run-state` checkpoint, and re-render the unified
  * `epic-run-progress` rollup on the Epic.
  *
- * The slash-command (`/epic-deliver`) calls this CLI once per wave, after
+ * The slash-command (`/deliver`) calls this CLI once per wave, after
  * its host-level Agent-tool fan-out drains. It is the only writer of the
  * `epic-run-progress` structured comment for the wave-completion path —
  * there is no separate `/wave-execute` skill, no `wave-run-progress`
@@ -95,7 +95,7 @@ const HELP = `Usage: node .agents/scripts/epic-execute-record-wave.js \\
 
 Records the wave's per-Story outcomes, advances the epic-run-state
 checkpoint, and upserts the unified epic-run-progress rollup on the Epic.
-Prints the next action for the /epic-deliver slash command.
+Prints the next action for the /deliver slash command.
 `;
 
 /**
@@ -237,7 +237,7 @@ export async function runEpicExecuteRecordWave({
   //     Closes the start/end pairing the wave-tick reconciler and the
   //     `--check-idle` watchdog use to derive in-flight Stories. Before this
   //     the only producer was `wave-session.js`, which the host-LLM driven
-  //     /epic-deliver path never imports — so every dispatched Story stayed
+  //     /deliver path never imports — so every dispatched Story stayed
   //     "in-flight" forever and completed Stories tripped the watchdog.
   //     Best-effort: a failed append must not block the wave loop.
   emitWaveDispatchEnds({ epicId, verified, config });
@@ -257,7 +257,7 @@ export async function runEpicExecuteRecordWave({
 
   // 7. Fire the curated webhook events for this wave boundary. Mirrors the
   //    wave-loop emits in `lib/orchestration/epic-runner/phases/iterate-waves.js`
-  //    for the host-LLM driven /epic-deliver path (which does not pass
+  //    for the host-LLM driven /deliver path (which does not pass
   //    through `runEpic`). Each helper is fire-and-forget — webhook
   //    misconfig or a transient Slack outage must not block the wave loop.
   await emitWaveBoundaryNotifications({

package/.agents/scripts/epic-plan-healthcheck.js

@@ -5,7 +5,7 @@
 /**
  * epic-plan-healthcheck.js — Post-Plan Readiness Check
  *
- * Runs at the end of /epic-plan (Phase 10) to validate the backlog and
+ * Runs at the end of /plan (Phase 10) to validate the backlog and
  * optionally prime the execution environment before handing off to
  * /epic-deliver.
  *
@@ -27,7 +27,7 @@
  *   node epic-plan-healthcheck.js --epic <EPIC_ID> \
  *     [--paranoid] [--prime-install] [--dry-run]
  *
- * @see .agents/workflows/epic-plan.md Phase 10
+ * @see .agents/workflows/helpers/plan-epic.md Phase 10
  */
 
 import { spawnSync } from 'node:child_process';
@@ -131,7 +131,7 @@ function checkGitRemote(baseBranch, cwd) {
 
 /**
  * Detect whether a Story body carries an inline `## Acceptance` section with
- * at least one checklist item. Epic #3078 — under 3-tier hierarchy, Stories
+ * at least one checklist item. Epic #3078 — under 2-tier hierarchy, Stories
  * carry acceptance inline, so the hierarchy check uses this signal as the
  * mark of a complete, executable Story.
  *
@@ -152,7 +152,7 @@ function hasInlineAcceptance(body) {
 }
 
 /**
- * Validate Epic ticket hierarchy. 3-tier is the only supported hierarchy
+ * Validate Epic ticket hierarchy. 2-tier is the only supported hierarchy
  * after Task #3154 deleted `planning.hierarchy`: every Story must carry an
  * inline `## Acceptance` checklist; there is no Task layer to graph.
  *
@@ -181,13 +181,9 @@ async function checkTickets(provider, epicId) {
     return { ok: false, detail: `Epic #${epicId} has no child tickets.` };
   }
 
-  const features = tickets.filter((t) =>
-    t.labels.includes(TYPE_LABELS.FEATURE),
-  );
   const stories = tickets.filter((t) => t.labels.includes(TYPE_LABELS.STORY));
 
   const errors = [];
-  if (features.length === 0) errors.push('no type::feature tickets');
   if (stories.length === 0) errors.push('no type::story tickets');
 
   const missingAcceptance = stories.filter(
@@ -214,7 +210,7 @@ async function checkTickets(provider, epicId) {
 
   return {
     ok: true,
-    detail: `${features.length} features, ${stories.length} stories (3-tier, inline acceptance) — hierarchy valid${advisory}.`,
+    detail: `${stories.length} stories (2-tier, inline acceptance) — hierarchy valid${advisory}.`,
   };
 }
 
@@ -313,7 +309,7 @@ export async function runPlanHealthcheck(opts = {}) {
     await timed('git-remote', async () => checkGitRemote(baseBranch, cwd)),
   );
 
-  // Paranoid lane: ticket-hierarchy revalidation (3-tier only).
+  // Paranoid lane: ticket-hierarchy revalidation (2-tier only).
   if (paranoid) {
     const provider = opts.injectedProvider || createProvider(config);
     progress('CHECK', 'Validating ticket hierarchy...');

package/.agents/scripts/epic-plan-spec-validate.js

@@ -3,7 +3,7 @@
 /**
  * epic-plan-spec-validate.js — Phase 7.5 Tech Spec post-authoring gate CLI.
  *
- * `/epic-plan` Phase 7 authors the Tech Spec; Phase 8.3 (Holistic
+ * `/plan` Phase 7 authors the Tech Spec; Phase 8.3 (Holistic
  * Consolidation) reconciles the draft ticket array against the Tech Spec's
  * `## Delivery Slicing` section, which the decompose-author skill uses as the
  * capability-boundary anchor. When that section is absent the consolidation

package/.agents/scripts/epic-reconcile.js

@@ -195,11 +195,11 @@ export async function fetchGhState(provider, epicId) {
 }
 
 /**
- * Walk the spec depth-first and yield one `{ slug, entity, title,
- * parentSlug, dependsOn }` record per logical entity (epic → feature →
- * story → task), mirroring the diff engine's `flattenSpec`. Local to the
- * CLI so the reseed pass (below) can map spec slugs onto live GH issues
- * without importing the diff engine's private walker. Pure.
+ * Walk the spec and yield one `{ slug, entity, title, parentSlug,
+ * dependsOn }` record per logical entity (epic → story), mirroring the
+ * diff engine's `flattenSpec`. Local to the CLI so the reseed pass
+ * (below) can map spec slugs onto live GH issues without importing the
+ * diff engine's private walker. Pure.
  *
  * @param {object} spec
  * @returns {Array<{slug: string, entity: string, title: string, parentSlug: string|null, dependsOn: string[]}>}
@@ -216,32 +216,14 @@ export function flattenSpecForReseed(spec) {
       dependsOn: [],
     });
   }
-  for (const feature of spec.features ?? []) {
+  for (const story of spec.stories ?? []) {
     out.push({
-      slug: feature.slug,
-      entity: 'feature',
-      title: String(feature.title ?? ''),
+      slug: story.slug,
+      entity: 'story',
+      title: String(story.title ?? ''),
       parentSlug: 'epic',
-      dependsOn: [],
+      dependsOn: story.dependsOn ?? [],
     });
-    for (const story of feature.stories ?? []) {
-      out.push({
-        slug: story.slug,
-        entity: 'story',
-        title: String(story.title ?? ''),
-        parentSlug: feature.slug,
-        dependsOn: story.dependsOn ?? [],
-      });
-      for (const task of story.tasks ?? []) {
-        out.push({
-          slug: task.slug,
-          entity: 'task',
-          title: String(task.title ?? ''),
-          parentSlug: story.slug,
-          dependsOn: [],
-        });
-      }
-    }
   }
   return out;
 }
@@ -255,7 +237,7 @@ export function flattenSpecForReseed(spec) {
  * file is absent (a fresh checkout, a reaped temp dir, the exact
  * situation `--resume` exists to recover from), `loadState` returns an
  * empty mapping, the diff engine sees every spec slug as unmapped, and
- * `apply` recreates the entire Feature/Story tree on top of the existing
+ * `apply` recreates the entire Story set on top of the existing
  * one — duplicating every child. This is precisely the failure `--resume`
  * is meant to prevent.
  *

package/.agents/scripts/evidence-gate.js

@@ -3,7 +3,7 @@
 /**
  * evidence-gate.js — evidence-aware wrapper around a single shell gate.
  *
- * Tech Spec #819 §"Evidence record (Story 7)" — `/epic-deliver` Phase 3
+ * Tech Spec #819 §"Evidence record (Story 7)" — `/deliver` Phase 3
  * (close-validation) runs `npm run lint` and `npm test` against the Epic
  * branch before opening the PR.
  * If the same gate has already passed against the current `git rev-parse

package/.agents/scripts/generate-workflows-doc.js

@@ -91,7 +91,7 @@ export function renderWorkflowsDoc(catalog) {
     'Every command file lives at `.agents/workflows/<name>.md` and is projected',
     'into a flat `.claude/commands/` tree by `npm run sync:commands` (the',
     'UserPromptSubmit hook keeps it current) so it shows up as a bare `/<name>`',
-    'slash command (e.g. `/epic-deliver`). The projection writes only',
+    'slash command (e.g. `/deliver`). The projection writes only',
     '`.claude/commands/<name>.md` — there is no plugin manifest and no',
     'marketplace listing. The commands load in every Claude Code environment.',
     '',

package/.agents/scripts/hierarchy-gate.js

@@ -3,7 +3,7 @@
 /**
  * .agents/scripts/hierarchy-gate.js — Hierarchy Completeness Gate
  *
- * Walks the Epic's full sub-issue graph (Features → Stories) and verifies
+ * Walks the Epic's full sub-issue graph (Stories) and verifies
  * every descendant is closed. Where the wave gate asks "did the sprint
  * complete what it committed to?" (manifest view), this gate asks "is
  * anything still open under this Epic?" (live GitHub graph view).
@@ -16,14 +16,13 @@
  *     top-level Stories outside the Epic's sub-issue graph.
  *
  * Per ticket type the rule is:
- *   - Features  — must be closed.
  *   - Stories   — must be closed.
  *   - Auxiliary (context::prd, context::tech-spec) — ignored.
  *     These are closed by the operator after the Epic PR merges, so
  *     requiring them closed here would block every Epic.
  *
- * **3-tier hierarchy (Epic #3078).** Mandrel ships only Epic / Feature /
- * Story tickets. `getSubTickets(<storyId>)` returns `[]`; the walk
+ * **2-tier hierarchy (Story #4041).** Mandrel ships only Epic / Story
+ * tickets. `getSubTickets(<storyId>)` returns `[]`; the walk
  * terminates at the Story. Acceptance criteria live inline on the
  * Story body.
  *
@@ -53,7 +52,6 @@ const SUB_TICKET_FETCH_CONCURRENCY = 4;
 function classify(ticket) {
   const labels = ticket.labels ?? [];
   if (labels.includes(TYPE_LABELS.STORY)) return 'story';
-  if (labels.includes(TYPE_LABELS.FEATURE)) return 'feature';
   if (
     labels.includes(CONTEXT_LABELS.PRD) ||
     labels.includes(CONTEXT_LABELS.TECH_SPEC)
@@ -80,7 +78,7 @@ async function collectDescendants(provider, epicId) {
   const out = [];
   // Level-order BFS: each round fetches the whole frontier's children with a
   // bounded-parallel map instead of one awaited round-trip per node. Stories
-  // are 3-tier leaves (no sub-issues by contract), so they are never expanded
+  // are leaves (no sub-issues by contract), so they are never expanded
   // — that skip alone removes the largest class of wasted GraphQL calls.
   let frontier = [epicId];
   while (frontier.length > 0) {
@@ -126,7 +124,7 @@ export async function runHierarchyGate({ epicId, injectedProvider } = {}) {
     process.exit(2);
   }
 
-  const failures = { feature: [], story: [], other: [] };
+  const failures = { story: [], other: [] };
   let auxiliaryDeferred = 0;
   for (const ticket of descendants) {
     const kind = classify(ticket);
@@ -144,15 +142,13 @@ export async function runHierarchyGate({ epicId, injectedProvider } = {}) {
     }
   }
 
-  const totalOpen =
-    failures.feature.length + failures.story.length + failures.other.length;
+  const totalOpen = failures.story.length + failures.other.length;
 
   if (totalOpen > 0) {
     Logger.error(
       `[hierarchy-gate] ❌ Hierarchy-completeness gate FAILED for Epic #${epicId}: ${totalOpen} descendant(s) incomplete.`,
     );
     const sections = [
-      ['feature', 'Features'],
       ['story', 'Stories'],
       ['other', 'Untyped descendants'],
     ];
@@ -163,7 +159,7 @@ export async function runHierarchyGate({ epicId, injectedProvider } = {}) {
         Logger.error(`    - #${item.id} (${item.reason}) — ${item.title}`);
       }
     }
-    Logger.error('\nClose the open descendants and re-run `/epic-deliver`.');
+    Logger.error('\nClose the open descendants and re-run `/deliver`.');
     process.exit(1);
   }
 

package/.agents/scripts/lib/ITicketingProvider.js

@@ -154,7 +154,7 @@ export class ITicketingProvider {
   /**
    * Create a child ticket within an Epic's structural hierarchy.
    *
-   * @param {number} parentId - GitHub Issue number of the immediate structural parent (e.g. Epic, Feature, or Story).
+   * @param {number} parentId - GitHub Issue number of the immediate structural parent (e.g. Epic or Story).
    * @param {{
    *   epicId: number,
    *   title: string,

package/.agents/scripts/lib/audit-suite/selector.js

@@ -60,7 +60,7 @@ export function matchesAnyFilePattern(patterns, files) {
  *   callers MUST pass the requested Epic's own branch ref (e.g.
  *   `refs/heads/epic/<id>`) so the change set is pinned to that Epic's branch
  *   rather than whatever HEAD the shared checkout happens to sit on. Under two
- *   concurrent `/epic-deliver` runs sharing one checkout, diffing against
+ *   concurrent `/deliver` runs sharing one checkout, diffing against
  *   `HEAD` silently resolves the *other* Epic's change set (Story #3362). When
  *   `headRef` cannot be resolved in the repo, the selector returns a
  *   `degraded: true` envelope (or hard-fails in gate-mode) instead of diffing

package/.agents/scripts/lib/audit-to-stories/seed-epic-from-findings.js

@@ -1,7 +1,7 @@
 /**
  * lib/audit-to-stories/seed-epic-from-findings.js
  *
- * Build the `--idea`-shaped seed markdown that `/epic-plan` Phase 1
+ * Build the `--idea`-shaped seed markdown that `/plan` Phase 1
  * consumes when the operator picks the Single-Epic grouping mode.
  *
  * The seed renders the canonical one-pager sections so the idea-refinement
@@ -10,7 +10,7 @@
  *   - Recommended Direction (rollup of recommendations by dimension)
  *   - Key Assumptions (carries the source-report links forward)
  *   - MVP Scope (the proposed Stories, one bullet per group)
- *   - Key Files (explicit file paths so /epic-plan Phase 7 decompose
+ *   - Key Files (explicit file paths so /plan Phase 7 decompose
  *     has concrete anchors)
  *   - Not Doing (out-of-scope items by convention)
  *