mandrel 1.59.0 → 1.61.0

package/.agents/scripts/lib/orchestration/code-review.js

@@ -3,7 +3,7 @@
  *
  * Story #1155 (Epic #1142, 5.40.0) — extracted the helper-driven
  * `epic-code-review` invocation into a callable module so the
- * `/epic-deliver` runner can run Phase D without spawning a child
+ * `/deliver` runner can run Phase D without spawning a child
  * process or routing through an LLM-driven helper.
  *
  * Story #2831 (Epic #2815, Pluggable Code Review) — refactored to load
@@ -25,11 +25,11 @@
  *   - Always posts the structured `code-review` comment on the Epic
  *     issue (the adapter never posts; the orchestrator owns persistence).
  *   - Treats severity.critical > 0 as a halting blocker — the merged
- *     `/epic-deliver` runner consults `halted` and refuses to advance
+ *     `/deliver` runner consults `halted` and refuses to advance
  *     to Phase E (retro) when set.
  *
  * Halting on critical findings is the in-process replacement for the
- * helper's "operator must remediate before /epic-deliver" gate.
+ * helper's "operator must remediate before /deliver" gate.
  */
 
 import { resolveConfig } from '../config-resolver.js';
@@ -116,7 +116,7 @@ function resolveTaskSizing(config) {
  *
  * Best-effort and total: a missing/unparseable checkpoint, an absent
  * `planningRisk` field, a read failure, or a malformed `overallLevel` all
- * degrade to `standard` (never throws). So an Epic that skipped `/epic-plan`
+ * degrade to `standard` (never throws). So an Epic that skipped `/plan`
  * (no checkpoint) still gets a passing `standard` review with no new failure
  * mode. The producer resolves depth from the judged risk alone (the diff is
  * not yet enumerated at this point); the full risk + diff-width combination is
@@ -401,7 +401,7 @@ function resolveScopeEnvelope(opts, config) {
 }
 
 /**
- * In-process wrapper that the `/epic-deliver` runner and the
+ * In-process wrapper that the `/deliver` runner and the
  * `/single-story-deliver` close path consume.
  *
  * Story #2252 — emits `code-review.start` immediately on entry and

package/.agents/scripts/lib/orchestration/context-hydration-engine.js

@@ -163,7 +163,7 @@ function getVersion() {
 /**
  * Parse the work-breakdown hierarchy from a Task ticket body.
  *
- * Looks for patterns like: `Epic: #1`, `Feature: #2`, `Story: #3`,
+ * Looks for patterns like: `Epic: #1`, `Story: #3`,
  * `PRD: #4`, `Tech Spec: #5`.
  *
  * @param {string} body
@@ -177,7 +177,7 @@ export function parseHierarchy(body) {
   for (const match of matches) {
     const key = match[1].trim().toLowerCase().replace(/\s+/g, '');
     const val = Number.parseInt(match[2], 10);
-    result[key] = val; // e.g. { epic: 1, feature: 2, story: 3, prd: 4, techspec: 5 }
+    result[key] = val; // e.g. { epic: 1, story: 3, prd: 4, techspec: 5 }
   }
   return result;
 }
@@ -217,9 +217,9 @@ function extractSectionList(body, heading) {
 
 /**
  * Extract the inline `## Acceptance` / `## Acceptance Criteria` and
- * `## Verify` checklists from a Story body. Used by 3-tier hydration to
+ * `## Verify` checklists from a Story body. Used by 2-tier hydration to
  * populate the `acceptanceCriteria` and `verificationCommands` envelope
- * sections directly from the dispatched Story ticket — under 3-tier the
+ * sections directly from the dispatched Story ticket — under 2-tier the
  * Story IS the unit of execution and carries acceptance/verify inline
  * (no child tickets to walk).
  *
@@ -235,18 +235,18 @@ export function extractStorySections(body) {
 }
 
 /**
- * Detect whether the dispatched unit is a 3-tier Story (Story is the
+ * Detect whether the dispatched unit is a 2-tier Story (Story is the
  * leaf, carries inline acceptance/verify) vs. a 4-tier Task (Task is
  * the leaf, Story is one level up). The decision is made off the
  * `type::*` label the dispatcher already stamps on every ticket; it
  * does not depend on `planning.hierarchy`, so this engine
- * stays correct even when a 4-tier Epic ships in a 3-tier-default repo
+ * stays correct even when a 4-tier Epic ships in a 2-tier-default repo
  * (or vice versa) during the Epic #3078 dual-shape window.
  *
  * @param {object} task
  * @returns {boolean}
  */
-function isThreeTierStoryTask(task) {
+function isTwoTierStoryTask(task) {
   const labels = task?.labels ?? [];
   return labels.includes('type::story');
 }
@@ -355,7 +355,6 @@ async function buildHierarchySections(task, provider, epicId, agentSettings) {
     idsToFetch.push({ key: 'Epic', id: epicId || hierarchyKeys.epic });
     idsToFetch.push({ key: 'PRD', id: hierarchyKeys.prd });
     idsToFetch.push({ key: 'Tech Spec', id: hierarchyKeys.techspec });
-    idsToFetch.push({ key: 'Feature', id: hierarchyKeys.feature });
     idsToFetch.push({ key: 'Story', id: hierarchyKeys.story });
   } else if (depth === 'standard') {
     idsToFetch.push({ key: 'Epic', id: epicId || hierarchyKeys.epic });
@@ -475,7 +474,7 @@ function buildStaticSections(
     }
   }
 
-  if (isThreeTierStoryTask(task)) {
+  if (isTwoTierStoryTask(task)) {
     const { acceptance, verify } = extractStorySections(task.body ?? '');
     if (acceptance.length > 0) {
       sections.push({

package/.agents/scripts/lib/orchestration/dependency-analyzer.js

@@ -6,8 +6,8 @@ import { assignLayers, detectCycle } from '../Graph.js';
  *
  * Sources of story dependencies:
  *   1. **Implicit (cross-story tasks)**: Task T in Story A depends on Task T'
- *      in Story B → Story A depends on Story B. Under the 3-tier hierarchy
- *      (Epic → Feature → Story) Stories carry no child Tasks, so this source
+ *      in Story B → Story A depends on Story B. Under the 2-tier hierarchy
+ *      (Epic → Story) Stories carry no child Tasks, so this source
  *      is empty in practice; it is retained for callers that adapt a
  *      task-bearing shape into `storyGroups`.
  *   2. **Explicit (story body)**: Story A body contains `blocked by #B` →
@@ -18,7 +18,7 @@ import { assignLayers, detectCycle } from '../Graph.js';
  * > **Focus-overlap engine removed (Story #3906).** A third source — a
  * > focus-area overlap engine that rolled task-level `focusAreas` / `scope`
  * > up to the Story level and serialized "overlapping" Stories — was deleted
- * > because Task deletion in the 3-tier migration left every Story's task
+ * > because Task deletion in the 2-tier migration left every Story's task
  * > list empty, so the rollup produced empty focus bags and the engine added
  * > **zero** edges on every real plan. It advertised file-contention
  * > serialization it never delivered. Cross-Story prerequisites are carried

package/.agents/scripts/lib/orchestration/detectors-phase.js

@@ -29,8 +29,8 @@
  *   (`detectors: rework=N retry=M`) is the only stdout signal — one
  *   line per Story rather than two per detector + N per event.
  *
- * - **3-tier (Storyless) closure (Story #3127).** When `tasks` is
- *   empty (the 3-tier hierarchy shape), `resolveLastTaskId` returns
+ * - **2-tier (Storyless) closure (Story #3127).** When `tasks` is
+ *   empty (the 2-tier hierarchy shape), `resolveLastTaskId` returns
  *   `null` and both detectors run with `taskId: null`. The detector
  *   modules already accept a nullable `taskId` (see
  *   `lib/signals/detectors/{rework,retry}.js`), so no branching on

package/.agents/scripts/lib/orchestration/dispatch-engine.js

@@ -4,8 +4,8 @@
  * Thin facade composing:
  *   - `dispatch-pipeline.js` — internal resolve/fetch/reconcile/graph helpers
  *
- * Every Epic is 3-tier (Epic → Feature → Story); `dispatch()` computes a
- * Story-level wave plan and emits a 3-tier manifest. The legacy Task-tier
+ * Every Epic is 2-tier (Epic → Story); `dispatch()` computes a
+ * Story-level wave plan and emits a 2-tier manifest. The legacy Task-tier
  * dispatch runtime (Task fetcher, single-Story executor, the per-Task
  * wave fan-out, and the Epic-completion detector) was removed in Epic
  * #3163.
@@ -20,8 +20,7 @@ import { createProvider } from '../provider-factory.js';
 import {
   buildStoryDispatchGraph,
   fetchEpicContext,
-  isThreeTierDispatch,
-  reconcileEpicState,
+  isTwoTierDispatch,
   resolveDispatchContext,
 } from './dispatch-pipeline.js';
 import { buildManifest } from './manifest-builder.js';
@@ -60,14 +59,13 @@ export async function resolveAndDispatch(options) {
 
   const isStory = labels.includes(TYPE_LABELS.STORY);
   const isEpic = labels.includes(TYPE_LABELS.EPIC);
-  const isFeature = labels.includes(TYPE_LABELS.FEATURE);
 
   if (isStory) {
     throw new Error(
       `[Dispatcher] Ticket #${ticketId} is a **Story**. Stories are dispatched ` +
-        'through the 3-tier Story path, not directly via the dispatcher. ' +
-        `Run \`/story-deliver ${ticketId}\` to execute this Story, ` +
-        `or dispatch its parent Epic with \`/epic-deliver #<epicId>\`.`,
+        'through the Story delivery path, not directly via the dispatcher. ' +
+        `Run \`/deliver ${ticketId}\` to execute this Story, ` +
+        `or dispatch its parent Epic with \`/deliver #<epicId>\`.`,
     );
   }
 
@@ -75,14 +73,6 @@ export async function resolveAndDispatch(options) {
     return dispatch({ epicId: ticketId, dryRun, provider });
   }
 
-  if (isFeature) {
-    throw new Error(
-      `[Dispatcher] Ticket #${ticketId} is a **Feature**. Features are containers and cannot be executed directly. ` +
-        `Please execute individual Stories within this Feature using \`/epic-deliver #[Story ID]\`, ` +
-        `or dispatch the entire Epic using \`/epic-deliver #${ticket.body?.match(/^parent:\s*#(\d+)/m)?.[1] || 'ID'}\`.`,
-    );
-  }
-
   const typeLabel = labels.find((l) => l.startsWith('type::')) || 'unknown';
   throw new Error(
     `[Dispatcher] Ticket #${ticketId} has type "${typeLabel.replace('type::', '')}". ` +
@@ -100,17 +90,16 @@ export async function dispatch(options) {
   const { epicId, dryRun } = ctx;
 
   const fetched = await fetchEpicContext(ctx);
-  await reconcileEpicState(ctx, fetched);
 
-  // Every Epic is 3-tier (Epic → Feature → Story). Compute Story-level
-  // waves directly from the Story tickets and emit a 3-tier-shaped
+  // Every Epic is 2-tier (Epic → Story). Compute Story-level
+  // waves directly from the Story tickets and emit a 2-tier-shaped
   // manifest with `waves[].stories[]` so downstream consumers (manifest
-  // renderer, /epic-deliver wave planner) see the correct execution plan.
-  // Per-Story execution is owned by `/story-deliver` (story-init →
+  // renderer, /deliver wave planner) see the correct execution plan.
+  // Per-Story execution is owned by `/deliver` (story-init →
   // story-close), not by this dispatcher.
-  if (isThreeTierDispatch(fetched.allTickets)) {
+  if (isTwoTierDispatch(fetched.allTickets)) {
     Logger.info(
-      'Detected 3-tier hierarchy — computing Story-level execution waves.',
+      'Detected 2-tier hierarchy — computing Story-level execution waves.',
     );
     const { allWaves: storyWaves } = buildStoryDispatchGraph(
       fetched.allTickets,
@@ -123,22 +112,25 @@ export async function dispatch(options) {
       waves: storyWaves,
       dispatched: [],
       dryRun,
-      hierarchy: '3-tier',
+      hierarchy: '2-tier',
     });
   }
 
-  // No Story tickets under the Epic — nothing to dispatch. Emit an empty
-  // manifest so callers (renderer, /epic-deliver) get a well-formed
-  // artifact instead of a throw.
-  Logger.info('No Story tickets found under the Epic. Nothing to dispatch.');
-  return buildManifest({
-    epicId,
-    epic: fetched.epic,
-    tasks: [],
-    allTickets: fetched.allTickets,
-    waves: [],
-    dispatched: [],
-    dryRun,
-    hierarchy: '3-tier',
-  });
+  // No Story tickets under the Epic — throw loudly rather than emit an
+  // empty manifest, matching the wave-loop's behavior (build-wave-dag.js
+  // throws the same message shape on this input). A silently-empty
+  // manifest masks a pre-cutover Epic whose children are legacy Features.
+  const typedChildren = (fetched.allTickets ?? [])
+    .map((t) => (t.labels ?? []).find((l) => l.startsWith('type::')))
+    .filter(Boolean);
+  const legacyHint =
+    typedChildren.length > 0
+      ? ` Found ${typedChildren.length} non-Story child ticket(s) ` +
+        `(${[...new Set(typedChildren)].join(', ')}) — this Epic looks ` +
+        `pre-cutover (legacy Feature children) and needs migration to the ` +
+        `2-tier (Epic → Story) hierarchy before dispatch.`
+      : '';
+  throw new Error(
+    `Epic #${epicId} has no child stories to dispatch.${legacyHint}`,
+  );
 }

package/.agents/scripts/lib/orchestration/dispatch-pipeline.js

@@ -3,7 +3,7 @@
  *
  * Internal pipeline helpers composed by `dispatch-engine.js::dispatch()`.
  * Keeping these out of the coordinator keeps the public entry point compact
- * and focused on the 3-tier flow: resolve → fetch → reconcile → Story-graph.
+ * and focused on the 2-tier flow: resolve → fetch → Story-graph.
  */
 
 import { PROJECT_ROOT, resolveConfig } from '../config-resolver.js';
@@ -14,13 +14,12 @@ import { createProvider } from '../provider-factory.js';
 import { buildStoryAdjacency } from '../story-adjacency.js';
 import { WorktreeManager } from '../worktree-manager.js';
 import { computeStoryWaves } from './dependency-analyzer.js';
-import { reconcileHierarchy } from './reconciler.js';
 
 /**
  * Runtime context for a single dispatch cycle.
  *
  * Produced by {@link resolveDispatchContext} and consumed by every pipeline
- * stage (fetch → reconcile → graph → scaffold → GC → dispatch). All fields
+ * stage (fetch → graph → scaffold → GC → dispatch). All fields
  * are resolved once up-front so downstream helpers can stay free of
  * configuration look-ups.
  *
@@ -40,7 +39,7 @@ import { reconcileHierarchy } from './reconciler.js';
  *
  * @typedef {object} FetchedEpic
  * @property {object} epic                 The Epic ticket record.
- * @property {object[]} allTickets         Every ticket under the Epic (stories + features + health).
+ * @property {object[]} allTickets         Every ticket under the Epic (stories + health).
  * @property {Map<number, object>} allTicketsById  Index of `allTickets` by ticket id.
  */
 
@@ -106,30 +105,15 @@ export async function fetchEpicContext(ctx) {
 }
 
 /**
- * Propagate already-done work up the hierarchy so the manifest reflects
- * reality before dispatch. Walks Stories → Features bottom-up.
- *
- * @param {DispatchContext} ctx  Dispatch context.
- * @param {FetchedEpic} fetched  Result of {@link fetchEpicContext}.
- * @returns {Promise<void>}
- */
-export async function reconcileEpicState(ctx, fetched) {
-  const { provider, dryRun, epicId } = ctx;
-  const { epic, allTickets } = fetched;
-
-  await reconcileHierarchy(provider, epicId, epic, allTickets, dryRun);
-}
-
-/**
- * Detect 3-tier hierarchy from the fetched ticket graph. After Epic #3163's
+ * Detect 2-tier hierarchy from the fetched ticket graph. After Epic #3163's
  * hard cutover deleted the `type::task` ticket layer, shape selection is
  * purely structural: any Epic carrying at least one `type::story` ticket
- * resolves to 3-tier.
+ * resolves to 2-tier.
  *
  * @param {object[]} allTickets
  * @returns {boolean}
  */
-export function isThreeTierDispatch(allTickets) {
+export function isTwoTierDispatch(allTickets) {
   if (!Array.isArray(allTickets) || allTickets.length === 0) return false;
   return allTickets.some((t) =>
     (t.labelSet ?? new Set(t.labels ?? [])).has(TYPE_LABELS.STORY),
@@ -137,7 +121,7 @@ export function isThreeTierDispatch(allTickets) {
 }
 
 /**
- * Build the Story-level dispatch graph for a 3-tier Epic. Reads story
+ * Build the Story-level dispatch graph for a 2-tier Epic. Reads story
  * tickets from `allTickets`, parses cross-Story `blocked by` references
  * from each Story body (also honoring an optional `dependencies[]`
  * field set by fixture providers), and computes wave indices via
@@ -151,7 +135,7 @@ export function isThreeTierDispatch(allTickets) {
  * are placed in their own trailing wave so they remain visible in the
  * manifest output.
  *
- * @param {object[]} allTickets  Fetched ticket graph (Epic + Features + Stories).
+ * @param {object[]} allTickets  Fetched ticket graph (Epic + Stories).
  * @returns {{ allWaves: object[][], storyMap: Map<number, object> }}
  * @throws {Error} When the Story dependency graph contains a cycle.
  */
@@ -193,7 +177,7 @@ export function buildStoryDispatchGraph(allTickets) {
   if (byWave.has(-1)) allWaves.push(byWave.get(-1));
 
   Logger.info(
-    `Computed ${allWaves.length} Story-level execution wave(s) (3-tier).`,
+    `Computed ${allWaves.length} Story-level execution wave(s) (2-tier).`,
   );
   return { allWaves, storyMap };
 }

package/.agents/scripts/lib/orchestration/epic-cleanup.js

@@ -1,7 +1,7 @@
 /* node:coverage ignore file -- MI 0 orchestration glue; reaps live worktrees + runs `git branch -D` — testing requires mocking real worktree/git state to the point of asserting only the mock structure */
 
 /**
- * Epic-cleanup primitives — local branch + worktree reap for `/epic-deliver`
+ * Epic-cleanup primitives — local branch + worktree reap for `/deliver`
  * Phase 8.
  *
  * Once a PR has merged (auto or operator-button), the Epic branch and every

package/.agents/scripts/lib/orchestration/epic-deliver-lease-guard.js

@@ -1,8 +1,8 @@
 /**
- * epic-deliver-lease-guard.js — preflight guards for `/epic-deliver`
+ * epic-deliver-lease-guard.js — preflight guards for `/deliver`
  * (Story #3482, Epic #3457).
  *
- * `/epic-deliver`'s prepare phase used to checkout `epic/<id>` over whatever
+ * `/deliver`'s prepare phase used to checkout `epic/<id>` over whatever
  * the operator had checked out, yanking HEAD and resetting baselines under a
  * live working session (the documented "epic-deliver shares the main checkout"
  * footgun). This module supplies the two preflight guards the Tech Spec
@@ -60,7 +60,7 @@ export function resolveOperator({ asFlag, config, gitUserEmail } = {}) {
 }
 
 /**
- * Normalise the expected-branch argument into a non-empty list. `/epic-deliver`
+ * Normalise the expected-branch argument into a non-empty list. `/deliver`
  * may legitimately start from either the Epic integration branch (`epic/<id>`,
  * on a resume) or the project base branch (`main`, on a fresh run), so the
  * guard accepts a set rather than a single name.
@@ -153,20 +153,20 @@ export function renderCheckoutRefusal(result) {
   if (result.reason === 'dirty') {
     return (
       `[epic-deliver] Refusing to start: the working tree is dirty. ` +
-      `/epic-deliver will not check out ${expected} over uncommitted ` +
+      `/deliver will not check out ${expected} over uncommitted ` +
       `or untracked changes — commit, stash, or clean them, then re-run.\n` +
       `--- dirty entries ---\n${result.dirtyEntries ?? '(unavailable)'}`
     );
   }
   if (result.reason === 'detached-head') {
     return (
-      `[epic-deliver] Refusing to start: HEAD is detached. /epic-deliver ` +
+      `[epic-deliver] Refusing to start: HEAD is detached. /deliver ` +
       `expects HEAD on ${expected}. Check one out before re-running.`
     );
   }
   return (
     `[epic-deliver] Refusing to start: HEAD is on '${result.currentBranch}', ` +
-    `not the expected ${expected}. /epic-deliver will not yank HEAD ` +
+    `not the expected ${expected}. /deliver will not yank HEAD ` +
     `away from your branch — switch to ${expected} yourself before re-running.`
   );
 }
@@ -182,7 +182,7 @@ export function renderLeaseRefusal(lease, epicId) {
   return (
     `[epic-deliver] Refusing to start: Epic #${epicId} is already claimed by ` +
     `'${lease.owner}' with a live lease (recent heartbeat within the TTL). ` +
-    `Another /epic-deliver run is driving this Epic. Wait for it to finish, ` +
+    `Another /deliver run is driving this Epic. Wait for it to finish, ` +
     `or pass --steal to forcibly transfer the claim.`
   );
 }
@@ -281,7 +281,7 @@ export async function runPrepareGuards({
       '[epic-deliver] Refusing to start: no operator identity could be ' +
         'resolved. --as, github.operatorHandle (unset or still the shipped ' +
         '`@[USERNAME]` placeholder), and git user.email are all empty, so the ' +
-        'Epic-lease has no owner and concurrent /epic-deliver runs cannot be ' +
+        'Epic-lease has no owner and concurrent /deliver runs cannot be ' +
         'serialised. Set your own handle in .agentrc.local.json (e.g. ' +
         '{ "github": { "operatorHandle": "@your-login" } }), pass --as <handle>, ' +
         'or configure git user.email, then re-run.',

package/.agents/scripts/lib/orchestration/epic-plan-decompose/phases/creation.js

@@ -69,6 +69,6 @@ export function warnTicketCapNearLimit(
 ) {
   if (tickets.length < maxTickets) return;
   logger.warn(
-    `[${tag}] ⚠️  Received ${tickets.length} tickets against a reviewability budget of ${maxTickets}. Review the Feature/Story split before persisting; over-budget persistence requires --allow-over-budget.`,
+    `[${tag}] ⚠️  Received ${tickets.length} tickets against a reviewability budget of ${maxTickets}. Review the Story decomposition before persisting; over-budget persistence requires --allow-over-budget.`,
   );
 }

package/.agents/scripts/lib/orchestration/epic-plan-decompose/phases/dag.js

@@ -3,9 +3,8 @@
  *
  * Owns the deterministic DAG helpers used by the reconciler pipeline:
  *   - `resolveDependencies(ticket, slugMap)`
- *   - `orderTicketsForCreation(validated)` (topological sort within each
- *     (parent_slug, type) group, concatenated in feature → story → task
- *     order so parents always exist before their children get created)
+ *   - `orderTicketsForCreation(validated)` (topological sort of the
+ *     Story set so dependency producers are created before consumers)
  *
  * Extracted verbatim from `epic-plan-decompose.js` so the named exports
  * (`resolveDependencies`, `orderTicketsForCreation`) that the
@@ -53,26 +52,13 @@ function topoSortGroup(group) {
 }
 
 /**
- * Topologically sort tickets within each (parent_slug, type) group, then
- * concatenate groups in typeOrder so parents are always created before
- * children (Feature → Story → Task) and intra-group dep chains resolve
- * before their dependents are created.
+ * Topologically sort the Story set so intra-set dep chains resolve
+ * before their dependents are created. The 2-tier hierarchy has a
+ * single ticket type (story) attached directly to the Epic, so there
+ * is no parent-type ordering to interleave.
  */
 export function orderTicketsForCreation(validated) {
-  const typeOrder = { feature: 0, story: 1, task: 2 };
-  const groups = new Map();
-  for (const t of validated) {
-    const parentKey = t.parent_slug ?? '__epic__';
-    const key = `${t.type}::${parentKey}`;
-    if (!groups.has(key)) groups.set(key, { type: t.type, items: [] });
-    groups.get(key).items.push(t);
-  }
-  const ordered = [...groups.values()].sort(
-    (a, b) => typeOrder[a.type] - typeOrder[b.type],
-  );
   const result = [];
-  for (const group of ordered) {
-    for (const t of topoSortGroup(group.items)) result.push(t);
-  }
+  for (const t of topoSortGroup([...validated])) result.push(t);
   return result;
 }

package/.agents/scripts/lib/orchestration/epic-plan-decompose/phases/diagnostics.js

@@ -16,8 +16,8 @@ import { TYPE_LABELS } from '../../../label-constants.js';
 
 /**
  * Count open child tickets under the Epic without distinguishing by
- * type. Under the 3-tier hierarchy (Epic → Feature → Story), child
- * tickets are always Feature or Story.
+ * type. Under the 2-tier hierarchy (Epic → Story), child
+ * tickets are always Stories.
  */
 async function emitOpenChildrenDiagnostic(provider, epicId) {
   if (typeof provider.getSubTickets !== 'function') return;
@@ -27,7 +27,7 @@ async function emitOpenChildrenDiagnostic(provider, epicId) {
   // closed children) yields the same open-child count without paging
   // every issue in the repo.
   const existing = await provider.getSubTickets(epicId);
-  const childTypes = [TYPE_LABELS.FEATURE, TYPE_LABELS.STORY];
+  const childTypes = [TYPE_LABELS.STORY];
   const created = (existing || []).filter(
     (t) =>
       (t.labels || []).some((l) => childTypes.includes(l)) &&

package/.agents/scripts/lib/orchestration/epic-plan-lease-guard.js

@@ -1,17 +1,17 @@
 /**
- * epic-plan-lease-guard.js — `/epic-plan` workflow guards (Story #3481,
+ * epic-plan-lease-guard.js — `/plan` workflow guards (Story #3481,
  * Epic #3457).
  *
  * Wires the assignee-as-lease primitive (`ticket-lease.js`, Story #3480) and a
  * decompose-idempotency guard into the split planning flow so two concurrent
- * `/epic-plan` runs cannot both drive the same Epic, and so a re-run does not
+ * `/plan` runs cannot both drive the same Epic, and so a re-run does not
  * silently duplicate the Feature/Story tree:
  *
  *   - `acquireEpicPlanLease`   — claim the Epic before Phase 7 (spec). Refuses
  *                                (throws, exit non-zero) when a live foreign
  *                                claim already holds the Epic, naming the
  *                                current owner. **Claim-time liveness
- *                                (Story #4019):** `/epic-plan` emits no
+ *                                (Story #4019):** `/plan` emits no
  *                                `story.heartbeat`, so the lease records its
  *                                own claim-time in a `plan-lease` structured
  *                                comment on the Epic at acquire time. A
@@ -24,7 +24,7 @@
  *                                Best-effort and self-scoped: a no-op once the
  *                                Epic was reassigned elsewhere.
  *   - `assertNoOpenPlanChildren` — refuse Phase 8 persist when the Epic already
- *                                has open Feature/Story children, unless the
+ *                                has open Story children, unless the
  *                                operator passed `--force` (a deliberate
  *                                re-decompose that closes the old tree).
  *
@@ -45,7 +45,7 @@ import { currentOwner, releaseLease } from './ticket-lease.js';
 import { findStructuredComment, upsertStructuredComment } from './ticketing.js';
 
 /**
- * Resolve the operator handle that owns this `/epic-plan` run from
+ * Resolve the operator handle that owns this `/plan` run from
  * `github.operatorHandle`. The assignee-as-lease primitive is single-holder
  * keyed on a non-empty string; when no operator is configured (unset, or the
  * shipped `@[USERNAME]` placeholder, both of which `normalizeOperatorHandle`
@@ -99,7 +99,7 @@ export function buildPlanLeaseCommentBody({ epicId, owner, claimedAt }) {
     `### 🔒 Plan Lease — claimed by \`${owner}\``,
     '',
     `This Epic is being planned by \`${owner}\` (claimed ${claimedAt}). A`,
-    'concurrent `/epic-plan` run refuses while this claim is fresher than the',
+    'concurrent `/plan` run refuses while this claim is fresher than the',
     'lease TTL, and reclaims automatically once it goes stale.',
     '',
     '```json',
@@ -141,7 +141,7 @@ export function parsePlanLeaseClaim(body) {
  * Acquire the Epic-lease before Phase 7.
  *
  * **Claim-time liveness (Story #4019, superseding the audit-#3513
- * fail-closed anchor).** `/epic-plan` emits no `story.heartbeat`, so the
+ * fail-closed anchor).** `/plan` emits no `story.heartbeat`, so the
  * old guard treated EVERY foreign assignee as live — which made the
  * documented "`--steal` once you have confirmed the other run is dead"
  * contract undecidable (there was no in-band liveness signal to confirm
@@ -186,7 +186,7 @@ export async function acquireEpicPlanLease({
       `[epic-plan] Refusing to plan Epic #${epicId}: no operator identity is ` +
         'configured. github.operatorHandle is unset or still the shipped ' +
         '`@[USERNAME]` placeholder, so the Epic-lease has no owner and ' +
-        'concurrent /epic-plan runs cannot be serialised. Set your own handle ' +
+        'concurrent /plan runs cannot be serialised. Set your own handle ' +
         'in .agentrc.local.json (e.g. { "github": { "operatorHandle": ' +
         '"@your-login" } }) and re-run.',
     );
@@ -242,7 +242,7 @@ export async function acquireEpicPlanLease({
           : '';
       return (
         `[epic-plan] Epic #${epicId} is currently claimed by '${refused.owner}'. ` +
-        `Refusing to plan concurrently — another /epic-plan run owns this Epic. ` +
+        `Refusing to plan concurrently — another /plan run owns this Epic. ` +
         `${ageNote}Wait for that run to finish (the claim auto-expires at the ` +
         `lease TTL), or re-run with --steal to forcibly transfer the claim.`
       );
@@ -341,10 +341,14 @@ export async function assertNoOpenPlanChildren({
   const openChildren = (children ?? []).filter((t) => {
     const labels = Array.isArray(t.labels) ? t.labels : [];
     const isOpen = t.state === undefined || t.state === 'open';
+    // Any open typed plan ticket counts — `type::story` plus pre-v4
+    // `type::feature` leftovers. The prefix check is legacy-data
+    // detection, not compat support: the guard only refuses, it never
+    // processes the legacy tier. Context tickets (`context::*`) are
+    // untouched.
     return (
       isOpen &&
-      (labels.includes(TYPE_LABELS.FEATURE) ||
-        labels.includes(TYPE_LABELS.STORY))
+      labels.some((l) => typeof l === 'string' && l.startsWith('type::'))
     );
   });
 
@@ -357,12 +361,21 @@ export async function assertNoOpenPlanChildren({
       openChildren.length > 10
         ? `\n  …and ${openChildren.length - 10} more`
         : '';
+    const legacyCount = openChildren.filter(
+      (t) => !(t.labels ?? []).includes(TYPE_LABELS.STORY),
+    ).length;
+    const legacyHint =
+      legacyCount > 0
+        ? `\n${legacyCount} of these are not type::story — they look like ` +
+          `legacy pre-v4 Feature tickets; migrate or close them per the ` +
+          `v1.60.0 migration notes before re-planning.`
+        : '';
     throw new Error(
       `[epic-plan-decompose] Epic #${epicId} already has ` +
-        `${openChildren.length} open Feature/Story child ticket(s):\n${summary}${more}\n\n` +
+        `${openChildren.length} open plan child ticket(s):\n${summary}${more}\n\n` +
         `Persisting now would duplicate the breakdown. Re-run with --force to ` +
         `close the existing tree and re-decompose, or close the stale children ` +
-        `by hand first.`,
+        `by hand first.${legacyHint}`,
     );
   }
 

package/.agents/scripts/lib/orchestration/epic-plan-spec/phases/plan-epic.js

@@ -78,7 +78,7 @@ export async function overwriteContextTicket(
   try {
     await provider.postComment(ticketId, {
       type: 'notification',
-      body: `♻️ **Regeneration Audit**: This ${artifact} body was regenerated in place by a \`/epic-plan --force\` re-plan. The issue number and prior discussion history are preserved.`,
+      body: `♻️ **Regeneration Audit**: This ${artifact} body was regenerated in place by a \`/plan --force\` re-plan. The issue number and prior discussion history are preserved.`,
     });
   } catch (_err) {
     // Audit comment is best-effort — never fail the overwrite on a comment

package/.agents/scripts/lib/orchestration/epic-plan-spec/phases/prompts.js

@@ -1,6 +1,6 @@
 /**
  * phases/prompts.js — Canonical PRD / Tech Spec / Acceptance Spec system
- * prompts for the spec phase of `/epic-plan`.
+ * prompts for the spec phase of `/plan`.
  *
  * These ride along on the `--emit-context` envelope as a backstop. The
  * `epic-plan-spec-author` Skill