mandrel 1.59.0 → 1.61.0

package/.agents/scripts/lib/orchestration/story-close/baseline-friction-body.js

@@ -100,7 +100,7 @@ export function renderBaselineFrictionBody({ rows, epicId, storyId } = {}) {
   const triage = [
     '**Triage:**',
     `1. Open each suspect Story above and run \`npm run maintainability:update\` (or \`npm run crap:update\`) on **its** branch, then commit with a \`baseline-refresh:\` subject and re-close it.`,
-    `2. Re-run \`/story-deliver ${storyId}\` once the suspect Story's refresh has merged into \`epic/${epicId}\`.`,
+    `2. Re-run \`/deliver ${storyId}\` once the suspect Story's refresh has merged into \`epic/${epicId}\`.`,
     `3. If the suspect column reads \`_unknown_\`, the path has no commit on \`epic/${epicId}\` — investigate the baseline file directly before refreshing.`,
   ];
 

package/.agents/scripts/lib/orchestration/story-close/phases/locked-pipeline.js

@@ -127,7 +127,7 @@ export async function runGatesAndRefresh(
  * Read the parent Epic's judged `planningRisk` envelope off its
  * `epic-plan-state` checkpoint so the Story-scope review can inherit the
  * Epic's review depth (Story #3940). Best-effort and total — it reuses the
- * shared `read` from `epic-plan-state-store.js` (the same reader `/epic-plan
+ * shared `read` from `epic-plan-state-store.js` (the same reader `/plan
  * --resume` and `epic-audit-prepare.js`'s `resolveRiskRoutedLenses` use, no
  * third bespoke reader) and never fails the close:
  *
@@ -137,7 +137,7 @@ export async function runGatesAndRefresh(
  *
  * A `null` result threads through `runStoryCodeReview` → `runCodeReview`
  * unchanged, so depth resolves from diff width alone (`standard`), preserving
- * today's behaviour for an Epic that skipped `/epic-plan`.
+ * today's behaviour for an Epic that skipped `/plan`.
  *
  * @param {{ provider: object, epicId: number|null|undefined, readPlanStateFn?: typeof readPlanState }} args
  * @returns {Promise<{ overallLevel?: string, axes?: Array<object> }|null>}

package/.agents/scripts/lib/orchestration/task-body-validator.js

@@ -1,7 +1,7 @@
 /**
  * Story body schema validator (v5.33+).
  *
- * Enforces the four-section structured body shape on 3-tier Stories emitted
+ * Enforces the four-section structured body shape on 2-tier Stories emitted
  * by the decomposer. The canonical decomposition serializes every Story
  * `body` to a **markdown string** via `serialize()` from
  * `lib/story-body/story-body.js` (the decompose-author skill mandates this,
@@ -17,7 +17,7 @@
  *
  * Only `type: 'story'` tickets are validated; Feature/Epic tickets and
  * null/empty bodies pass through. There is no `type::task` ticket layer in
- * the 3-tier hierarchy (Epic → Feature → Story).
+ * the 2-tier hierarchy (Epic → Story).
  *
  * Required after parse/normalize: a non-empty `goal`, and non-empty
  * `changes`, `acceptance`, and `verify` arrays — and `changes` items must
@@ -110,7 +110,7 @@ function vagueVerbWithoutTarget(bullet) {
  *   - it has no body (null / undefined / empty-or-whitespace string — there
  *     is nothing to inspect).
  *
- * Under the 3-tier hierarchy (Epic → Feature → Story), Stories carry the
+ * Under the 2-tier hierarchy (Epic → Story), Stories carry the
  * implementation scope inline. A canonical decomposition serializes the
  * Story body to a markdown string, so a *string* body is NOT skipped here
  * (Story #3906) — `validateTaskBodyShape` parses it back into structured
@@ -127,7 +127,7 @@ function vagueVerbWithoutTarget(bullet) {
  */
 function shouldSkipTicket(ticket) {
   if (!ticket) return true;
-  // Only Stories carry an inline implementation contract in the 3-tier
+  // Only Stories carry an inline implementation contract in the 2-tier
   // world. Features (and everything else) use narrative bodies.
   if (ticket.type !== 'story') return true;
   const body = ticket.body;
@@ -197,7 +197,7 @@ export function validateTaskBodyShape(ticket) {
   }
   errors.push(...collectChangesErrors(prefix, body.changes));
   errors.push(...collectAcceptanceErrors(prefix, body.acceptance));
-  // Tier-suffix validation is always enforced on Story bodies (3-tier world).
+  // Tier-suffix validation is always enforced on Story bodies (2-tier world).
   errors.push(...collectVerifyErrors(prefix, body.verify));
   errors.push(...collectReferencesErrors(prefix, body.references));
   return errors;
@@ -359,7 +359,7 @@ function collectVerifyErrors(prefix, rawVerify) {
 }
 
 /**
- * Validate every 3-tier Story in `tickets` whose `body` is a structured
+ * Validate every 2-tier Story in `tickets` whose `body` is a structured
  * object. Returns an array of error strings (one per offending slug); empty
  * array means clean.
  *

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

@@ -96,7 +96,7 @@ export function normalizeOperatorHandle(raw) {
  * observability artifact never wedges the lease preflight.
  *
  * This is the shared liveness source the lease guards thread into
- * `acquireLease` via `heartbeatAt`; `/epic-plan` and `/epic-deliver` both
+ * `acquireLease` via `heartbeatAt`; `/plan` and `/deliver` both
  * reuse it so a live foreign claim actually refuses.
  *
  * @param {object} args

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

@@ -170,7 +170,7 @@ function collectStoryProducerPaths(story) {
 }
 
 /**
- * Resolve the Story-identifying slug for a 3-tier Story. A Story is its
+ * Resolve the Story-identifying slug for a 2-tier Story. A Story is its
  * own implementation unit (Epic #3238) — there is no parent Task — so the
  * producer/consumer indices key on the Story's own `slug`.
  */
@@ -187,7 +187,7 @@ function storySlugOf(story) {
  * producers.
  *
  * `taskSlug` is retained in the entry shape for finding/render
- * compatibility; in the 3-tier model it carries the Story's own slug since
+ * compatibility; in the 2-tier model it carries the Story's own slug since
  * the Story is the implementation unit.
  */
 function indexProducers(stories) {

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

@@ -39,15 +39,6 @@ export const DEFAULT_TASK_SIZING = Object.freeze({
   maxAcceptance: 14,
 });
 
-/**
- * Soft prose guidance for how many Stories a Feature typically decomposes
- * into before the Feature scope smells like two Features. Rendered into the
- * decomposer prompt's Feature-count sentence from this single constant so
- * the prompt prose cannot drift from the SSOT module (Story #3874). Advisory
- * only — no validator finding keys off it.
- */
-export const SOFT_STORIES_PER_FEATURE = 7;
-
 /**
  * `DELIVERABLE_GRANULARITY_GUIDANCE` is the **single source of truth** for the
  * deliverable-granularity definition of a Story (Story #3777). It is stated
@@ -339,7 +330,7 @@ function computeStorySizingFindings(story, sizing) {
  * `findings`; the AC-visible `errors[]` channel is the rendered
  * subset where `severity === 'hard'`.
  *
- * 3-tier (Epic #3238): each Story is its own implementation unit and
+ * 2-tier (Epic #3238): each Story is its own implementation unit and
  * carries the `body` (acceptance / changes / wide) that the sizing layers
  * score. There is no Task tier, so findings are computed directly over
  * `stories`.

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

@@ -200,9 +200,8 @@ function makeMemoizedGitRunner(runner) {
  * path was deleted between planning and decomposition) — refuse to decompose
  * because the resulting Task would be unimplementable as written.
  *
- * Only Tasks are scanned; Features and Stories carry narrative copy, not
- * implementation paths, and their bodies routinely reference docs/templates
- * the freshness regex would (correctly) ignore.
+ * Only Stories are scanned — they are the implementation unit; the Epic
+ * carries narrative copy, not implementation paths.
  *
  * @param {object}   opts
  * @param {object[]} opts.tickets         - Validated ticket hierarchy.
@@ -416,7 +415,6 @@ function renderMissLine({ slug, path }) {
 
 function indexTicketsBySlug(tickets) {
   const ticketBySlug = new Map();
-  const features = [];
   const stories = [];
   const slugAdjacency = new Map();
   for (const t of tickets) {
@@ -429,75 +427,37 @@ function indexTicketsBySlug(tickets) {
       ticketBySlug.set(t.slug, t);
     }
     slugAdjacency.set(t.slug, t.depends_on ?? []);
-    if (t.type === 'feature') features.push(t);
-    else if (t.type === 'story') stories.push(t);
+    if (t.type === 'story') stories.push(t);
   }
-  return { ticketBySlug, features, stories, slugAdjacency };
+  return { ticketBySlug, stories, slugAdjacency };
 }
 
-function assertEachTypePresent({ features, stories }) {
-  if (features.length === 0)
+/**
+ * 2-tier invariant (Story #4041): the decomposer emits Stories only — every
+ * ticket in the backlog must be `type: "story"` and at least one must be
+ * present. Any other type (the retired `feature`/`task` tiers, or planner
+ * hallucinations) HARD-rejects the decomposition.
+ */
+function assertAllTicketsAreStories({ tickets, stories }) {
+  const nonStories = (tickets ?? []).filter((t) => t.type !== 'story');
+  if (nonStories.length > 0) {
+    const list = nonStories
+      .map((t) => `"${t.title}" (${t.slug ?? '<no slug>'}, type: ${t.type})`)
+      .join(', ');
     throw new Error(
-      'Cross-Validation Failed: Backlog must contain at least one Feature.',
+      `Cross-Validation Failed: ${nonStories.length} ticket(s) are not Stories: ${list}. ` +
+        'The 2-tier hierarchy (Epic → Story) admits type "story" only — there is no Feature or Task tier.',
     );
+  }
   if (stories.length === 0)
     throw new Error(
       'Cross-Validation Failed: Backlog must contain at least one Story.',
     );
 }
 
-function assertHierarchy({ stories, ticketBySlug }) {
-  for (const story of stories) {
-    if (!story.parent_slug)
-      throw new Error(
-        `Cross-Validation Failed: Story "${story.title}" must have a parent_slug.`,
-      );
-    const parent = ticketBySlug.get(story.parent_slug);
-    if (!parent || parent.type !== 'feature')
-      throw new Error(
-        `Cross-Validation Failed: Story "${story.title}" parent must be a Feature.`,
-      );
-  }
-}
-
-/**
- * Deterministic invariant (Story #3777): a Feature MUST decompose into at
- * least two Stories. A single-Story Feature is the work of a Story, not a
- * Feature — the Feature wrapper is dead weight and signals decomposition at
- * module/task granularity rather than deliverable granularity. HARD-reject
- * the decomposition, naming the offending Feature(s) and telling the planner
- * to collapse them, in the same throw-on-violation style as the surrounding
- * hierarchy invariants.
- */
-function assertNoSingleStoryFeature({ features, stories }) {
-  const storyCountByParent = new Map();
-  for (const story of stories) {
-    if (!story.parent_slug) continue;
-    storyCountByParent.set(
-      story.parent_slug,
-      (storyCountByParent.get(story.parent_slug) ?? 0) + 1,
-    );
-  }
-  const undersized = features.filter(
-    (feature) => (storyCountByParent.get(feature.slug) ?? 0) < 2,
-  );
-  if (undersized.length === 0) return;
-  const list = undersized
-    .map((feature) => {
-      const count = storyCountByParent.get(feature.slug) ?? 0;
-      return `"${feature.title}" (${feature.slug}, ${count} ${count === 1 ? 'Story' : 'Stories'})`;
-    })
-    .join(', ');
-  throw new Error(
-    `Cross-Validation Failed: ${undersized.length} Feature(s) decompose into fewer than two Stories: ${list}. ` +
-      'Every Feature MUST contain at least two Stories — a single-Story Feature is the work of a Story, not a Feature. ' +
-      'Collapse each offending Feature: drop the Feature wrapper and attach its lone Story to a sibling Feature, or merge the Feature into another.',
-  );
-}
-
 /**
  * Return true when a Story object carries inline acceptance + verify
- * arrays — the 3-tier shape (Epic #3078) where the Story is itself the
+ * arrays — the inline-contract shape (Epic #3078) where the Story is itself the
  * implementation unit and acceptance / verify live on the Story body
  * rather than in child Task tickets.
  *
@@ -506,7 +466,7 @@ function assertNoSingleStoryFeature({ features, stories }) {
  * `acceptance[]` (no `verify[]`) cannot be implemented without a
  * verification handle, and a Story with only `verify[]` (no
  * `acceptance[]`) carries no observable criterion. Requiring both is the
- * inline-contract invariant every Story must satisfy in the 3-tier model.
+ * inline-contract invariant every Story must satisfy.
  */
 function hasInlineAcceptanceAndVerify(story) {
   if (story === null || typeof story !== 'object') return false;
@@ -520,7 +480,7 @@ function hasInlineAcceptanceAndVerify(story) {
 }
 
 function assertEveryStoryHasInlineContract({ stories }) {
-  // 3-tier (Epic #3078 / #3238): every Story is its own implementation
+  // Every Story is its own implementation
   // unit and MUST carry a non-empty inline contract — top-level
   // `acceptance[]` AND `verify[]`. A Story missing either is the legacy
   // 4-tier shape that expected child Tasks; there is no Task tier any
@@ -577,12 +537,9 @@ function attachFindingsAndErrors(tickets, findings, errors) {
 }
 
 export function validateAndNormalizeTickets(tickets, opts = {}) {
-  const { ticketBySlug, features, stories, slugAdjacency } =
-    indexTicketsBySlug(tickets);
+  const { ticketBySlug, stories, slugAdjacency } = indexTicketsBySlug(tickets);
 
-  assertEachTypePresent({ features, stories });
-  assertHierarchy({ stories, ticketBySlug });
-  assertNoSingleStoryFeature({ features, stories });
+  assertAllTicketsAreStories({ tickets, stories });
   assertEveryStoryHasInlineContract({ stories });
   assertNoUnknownDeps({ tickets, ticketBySlug });
 
@@ -680,9 +637,7 @@ export function validateAndNormalizeTickets(tickets, opts = {}) {
 // Internal helpers exposed for unit tests; not part of the public surface.
 export const _internal = {
   indexTicketsBySlug,
-  assertEachTypePresent,
-  assertHierarchy,
-  assertNoSingleStoryFeature,
+  assertAllTicketsAreStories,
   assertEveryStoryHasInlineContract,
   assertNoUnknownDeps,
   assertAcyclic,

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

@@ -291,7 +291,7 @@ async function processCascadeParentLocked(
     if (!allDone) return { cascadedTo, failed };
 
     // EXCLUSION: Epics do not auto-close via cascade. Epics close via
-    // formal /epic-deliver (its own machinery handles branch merges,
+    // formal /deliver (its own machinery handles branch merges,
     // PR-driven `Closes #N` auto-close, and a recovery transition in
     // `epic-deliver-finalize.js`).
     //
@@ -305,13 +305,6 @@ async function processCascadeParentLocked(
     // defense-in-depth path when a Story's tasklist references a
     // planning ticket directly.
     //
-    // Features auto-close via cascade. A Feature is a purely
-    // hierarchical grouping — no standalone branch, no merge step.
-    // When its last child Story closes, the Feature is complete by
-    // definition. Operators who need Feature-level AC verification
-    // should encode it in the final child Story, not rely on a manual
-    // close step.
-    //
     // Reuse the parentSnapshot from the idempotency check above — it is
     // a fresh read (cache was invalidated before the getTicket call) and
     // the parent's type label is invariant within a single cascade lock
@@ -371,7 +364,7 @@ async function processCascadeParentLocked(
  * If yes, transitions parent to DONE and cascades up.
  *
  * Parents run strictly sequentially in input order (Story #4017 —
- * fan-out is <= 1 under the 3-tier hierarchy, so the former
+ * fan-out is <= 1 under the 2-tier hierarchy, so the former
  * shared-ancestor grouping / parallel dispatch was deleted); concurrent
  * transitions against a shared ancestor would race the "all children
  * done?" check. Within each parent, sibling reads fan out via
@@ -415,7 +408,7 @@ export async function cascadeCompletion(provider, ticketId, opts = {}) {
   // resume reconciler can strip the `parent: #N` orchestrator footer
   // from a Story body (see Issue 2 in #2982); without the body marker
   // the cascade silently returned `{ cascadedTo: [], failed: [] }` and
-  // left intermediate Feature tickets stranded OPEN. The native link is
+  // left intermediate parent tickets stranded OPEN. The native link is
   // independent of body text, so consult it when the first two
   // strategies came back empty.
   if (
@@ -442,7 +435,7 @@ export async function cascadeCompletion(provider, ticketId, opts = {}) {
     return { cascadedTo: [], failed: [] };
   }
 
-  // Story #4017 — under the 3-tier hierarchy a ticket has at most one
+  // Story #4017 — under the 2-tier hierarchy a ticket has at most one
   // parent, so the shared-ancestor grouping / parallel-group dispatch
   // machinery was deleted. Parents (fan-out <= 1
   // in practice; the loop stays general for the body-reference fallback)
@@ -557,7 +550,7 @@ export async function cascadeParentState(provider, ticketId, opts = {}) {
   if (parsedParents.length === 0) return { cascadedTo: [], failed: [] };
 
   // Story #4017 — sequential per-parent walk (fan-out <= 1 under the
-  // 3-tier hierarchy); see cascadeCompletion for the rationale.
+  // 2-tier hierarchy); see cascadeCompletion for the rationale.
   const cascadedTo = [];
   const failed = [];
   for (const parentId of parsedParents) {

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

@@ -76,8 +76,8 @@ export const STRUCTURED_COMMENT_TYPES = Object.freeze([
   // downstream workflow steps don't have to infer install state from
   // node_modules presence.
   'story-init',
-  // Story #908 — /story-deliver upserts a `story-run-progress` snapshot
-  // on each Story per Task transition. The /epic-deliver aggregator and
+  // Story #908 — /deliver upserts a `story-run-progress` snapshot
+  // on each Story per Task transition. The /deliver aggregator and
   // the epic-runner progress reporter both read this comment to derive
   // Story-level state without re-fetching ticket labels.
   'story-run-progress',
@@ -98,7 +98,7 @@ export const STRUCTURED_COMMENT_TYPES = Object.freeze([
   // operator can correct drift before Phase 8 decomposes from a stale
   // spec. Advisory: the run continues regardless of the report contents.
   'spec-freshness',
-  // Story #2681 — `/epic-deliver` Phase 4 epic-audit helper upserts an
+  // Story #2681 — `/deliver` Phase 4 epic-audit helper upserts an
   // `audit-results` comment on the Epic listing the per-lens findings
   // returned by the change-set audit pass. The marker was prescribed by
   // `helpers/epic-audit.md` Step 4 long before it was added to this
@@ -126,7 +126,7 @@ export const STRUCTURED_COMMENT_TYPES = Object.freeze([
   'epic-handoff',
   // Story #2899 (Epic #2880, F13) — `epic-deliver-preflight.js` upserts a
   // `delivery-preflight` comment on the Epic at the start of
-  // /epic-deliver Phase 1, surfacing estimated story count, install cost,
+  // /deliver Phase 1, surfacing estimated story count, install cost,
   // wave count, GitHub API request volume, Claude quota burn, and any
   // threshold breaches against `delivery.preflight.max*`. One entry per
   // Epic; re-runs replace prior content.
@@ -137,7 +137,7 @@ export const STRUCTURED_COMMENT_TYPES = Object.freeze([
   // `close-validate.end`. One entry per Epic; re-ticks with the same
   // findings upsert in place (`upsertStructuredComment` diffs by body).
   'recurring-failure-class',
-  // Story #3061 (Epic #3051) — the /epic-deliver §2e Idle Watchdog
+  // Story #3061 (Epic #3051) — the /deliver §2e Idle Watchdog
   // subsection instructs the parent host LLM to upsert a `wave-stall`
   // comment on the Epic whenever an in-flight Story has been silent for
   // longer than the configured cadence. `wave-tick.js --check-idle`
@@ -153,7 +153,7 @@ export const STRUCTURED_COMMENT_TYPES = Object.freeze([
   'risk-verdict',
   // Story #4019 — `epic-plan-lease-guard.js` upserts a `plan-lease`
   // comment on the Epic at lease-acquire time, recording the claiming
-  // operator and the claim timestamp. `/epic-plan` emits no
+  // operator and the claim timestamp. `/plan` emits no
   // `story.heartbeat`, so this claim-time is the liveness signal that
   // makes the documented `--steal` contract decidable: a foreign claim
   // older than the lease TTL is reclaimed automatically; a fresh one
@@ -268,8 +268,8 @@ export const _structuredCommentCache = new WeakMap();
 /**
  * Build a well-formed ticket snapshot for a Story that has zero child
  * Tasks. Story #3097 (Wave-0 additive, Epic #3078 Strategy B) — the
- * 3-tier hierarchy collapses Epic → Feature → Story → Task into
- * Epic → Feature → Story, so a Story may legitimately have no Task
+ * 2-tier hierarchy collapses Epic → Story → Task into
+ * Epic → Story, so a Story may legitimately have no Task
  * children. Read-side callers that expect a `subTickets` array on the
  * Story can route through this helper to materialise an empty-children
  * snapshot without paying a provider round-trip and without risk of

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

@@ -66,13 +66,13 @@ registerCascadeRunner(async (provider, ticketId, opts) => {
 /**
  * Transition a Story ticket directly to a new `agent::*` state without
  * walking a Task cascade. Story #3097 (Wave-0 additive, Epic #3078
- * Strategy B) — in the 3-tier hierarchy a Story has no Task children, so
+ * Strategy B) — in the 2-tier hierarchy a Story has no Task children, so
  * the canonical `transitionTicketState` upward-cascade path
  * (`cascadeParentState`) is the only meaningful walk. This helper is a
- * thin wrapper that pins `cascade: true` (so the parent Feature/Epic
+ * thin wrapper that pins `cascade: true` (so the parent Epic
  * still receives derived-state updates) and is intentionally a no-op
  * difference from `transitionTicketState` in 4-tier mode — the helper
- * exists so 3-tier callers can opt into a name that documents intent
+ * exists so 2-tier callers can opt into a name that documents intent
  * (and so F8 can pivot the implementation to skip the now-impossible
  * Task-fan-in without rewriting call sites). The wrapper preserves every
  * `opts` field the caller supplies; only `cascade` defaults to `true`

package/.agents/scripts/lib/orchestration/wave-record-notifications.js

@@ -3,7 +3,7 @@
  * `epic-execute-record-wave.js`.
  *
  * The CLI fires curated webhook events at every wave boundary (started,
- * progress, blocked, unblocked) so the host-LLM-driven `/epic-deliver` path
+ * progress, blocked, unblocked) so the host-LLM-driven `/deliver` path
  * mirrors the wave-loop emits in
  * `lib/orchestration/epic-runner/phases/iterate-waves.js`. Each helper here
  * is fire-and-forget — webhook misconfig or a transient Slack outage must
@@ -45,7 +45,7 @@ export function buildNotifyFn(injectedNotify, config, provider, defaultNotify) {
  * fire-and-forget (the emit helpers swallow webhook misconfiguration), but
  * we still serialise them so the order matches the wave-loop emits in
  * `lib/orchestration/epic-runner/phases/iterate-waves.js` for the host-LLM
- * driven /epic-deliver path.
+ * driven /deliver path.
  */
 export async function emitWaveBoundaryNotifications({
   injectedNotify,

package/.agents/scripts/lib/orchestration/wave-record-projection.js

@@ -32,7 +32,7 @@ import { parseStoryAgentReturn } from './epic-runner/sub-agent-return.js';
 /** Valid wave-level rollup statuses. */
 export const VALID_RESULT_STATUSES = new Set(['complete', 'blocked', 'failed']);
 
-/** Per-Story return statuses we accept off `/story-deliver` sub-agents. */
+/** Per-Story return statuses we accept off `/deliver` sub-agents. */
 export const VALID_STORY_STATUSES = new Set(['done', 'blocked', 'failed']);
 
 /**

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

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

package/.agents/scripts/lib/preflight-runner.js

@@ -13,7 +13,7 @@
  *         auto-fixes. The wrapper prints a human-readable blocker table
  *         (`id · summary · fixCommand`) before returning. Code 2 is the
  *         project-wide "preflight refused" reservation — see
- *         .agents/workflows/epic-deliver.md for the rationale.
+ *         .agents/workflows/helpers/deliver-epic.md for the rationale.
  *
  * Auto-fixes are logged via `logFixes` before the blocker check so the
  * operator sees the "we corrected X" line even when a separate blocker

package/.agents/scripts/lib/presentation/dispatch-manifest-render.js

@@ -12,9 +12,8 @@
 
 /**
  * Pure: project a full dispatch manifest into the `{ stories }` shape
- * `renderManifest` accepts. Returns the canonical, non-feature,
- * non-ungrouped story rows used by the Epic-level dispatch-manifest
- * comment.
+ * `renderManifest` accepts. Returns the canonical, non-ungrouped story
+ * rows used by the Epic-level dispatch-manifest comment.
  *
  * @param {object} manifest
  * @returns {{ storyId: number|string, wave: number, title: string }[]}
@@ -22,7 +21,7 @@
 export function projectStoriesFromManifest(manifest) {
   const storyManifest = manifest?.storyManifest ?? [];
   return storyManifest
-    .filter((s) => s && s.type !== 'feature' && s.storyId !== '__ungrouped__')
+    .filter((s) => s && s.storyId !== '__ungrouped__')
     .map((s) => ({
       storyId: s.storyId,
       wave: s.earliestWave ?? -1,
@@ -71,7 +70,7 @@ export function renderManifest({ epicId, stories, generatedAt }) {
     `- **Stories:** ${list.length}`,
     `- **Generated:** ${generatedAt}`,
     '',
-    'Source of truth for the wave-completeness gate run at `/epic-deliver`.',
+    'Source of truth for the wave-completeness gate run at `/deliver`.',
     '',
     '```json',
     JSON.stringify({ stories: list }, null, 2),

package/.agents/scripts/lib/presentation/manifest-builder.js

@@ -9,19 +9,19 @@
  * Extracted from `manifest-formatter.js` (Story #1849 Task #1869). The
  * shape projection used to be inlined in the formatter; pulling it out
  * isolates the spec → manifest projection from the Markdown renderer and
- * lets the per-feature / per-story guard cascade live behind a single
+ * lets the per-story guard cascade live behind a single
  * private predicate (`validateSpecShape`) so the orchestrator function's
  * CRAP score drops below 12.
  *
- * Story #3413 (3-tier cutover, final): the residual per-Task projection
+ * Story #3413 (2-tier cutover, final): the residual per-Task projection
  * (the Task projector, the per-Story Task array, and the Task-count
- * rollup) has been deleted. The walker (`projectFeatures`) now counts
+ * rollup) has been deleted. The walker (`projectStories`) counts
  * Stories directly, and `summary` carries Story-tier counts only
  * (`totalStories` / `doneStories` / `progressPercent`), matching the
  * canonical producer in `lib/orchestration/manifest-builder.js`.
  *
  * Story-level status surfaces on each `storyEntry.status` so downstream
- * renderers read the Story's own `agent::*` label directly — the 3-tier
+ * renderers read the Story's own `agent::*` label directly — the
  * "Stories are first-class lifecycle units" invariant.
  *
  * No fs / network access; pure transform. Caller supplies `state` from
@@ -38,8 +38,7 @@ import { AGENT_LABELS } from '../label-constants.js';
  * "is this thing iterable / object-shaped?" decisions.
  *
  * `level` describes which spec node we are validating:
- *   - `'features'` → the spec-level `features` array
- *   - `'stories'`  → a feature's `stories` array
+ *   - `'stories'`  → the spec-level `stories` array
  *   - `'story'`    → a single Story object (must be a non-null object)
  *
  * Returns `true` when the node satisfies the shape contract for that
@@ -52,7 +51,6 @@ import { AGENT_LABELS } from '../label-constants.js';
  */
 function validateSpecShape(level, value) {
   switch (level) {
-    case 'features':
     case 'stories':
       return Array.isArray(value);
     case 'story':
@@ -102,8 +100,8 @@ function buildResolvers(state) {
  * Private: project a single spec Story into a manifest Story entry. The
  * Story's status is resolved directly from the Story-level label
  * (`state.mapping[slug].lastObservedAgentState`) and surfaces on
- * `storyEntry.status` — under the 3-tier hierarchy Stories carry their
- * own lifecycle state and are leaves with no child Task tickets. Caller
+ * `storyEntry.status` — Stories carry their own lifecycle state and are
+ * leaves with no child tickets. Caller
  * filters non-object stories with `validateSpecShape('story', ...)`
  * before invoking.
  *
@@ -129,16 +127,17 @@ function projectStory(story, resolvers) {
 }
 
 /**
- * Private: walk every feature → story pair in a spec and collect the
- * per-story projections + Story-tier roll-up counters. Keeps the loop
- * machinery out of `buildManifestFromSpec` so the entry point reads as a
- * straight assembly of the result envelope.
+ * Private: walk every Story in a spec and collect the per-story
+ * projections + Story-tier roll-up counters. Keeps the loop machinery
+ * out of `buildManifestFromSpec` so the entry point reads as a straight
+ * assembly of the result envelope.
  *
- * Under the 3-tier hierarchy (Epic #3163) Stories are leaves, so the
- * rollup counts Stories directly: `totalStories` is every projected
- * Story and `doneStories` is the subset carrying `agent::done`.
+ * Under the 2-tier hierarchy (Story #4041) Stories are direct Epic
+ * children and leaves, so the rollup counts Stories directly:
+ * `totalStories` is every projected Story and `doneStories` is the
+ * subset carrying `agent::done`.
  *
- * @param {object[]} features
+ * @param {object[]} stories
  * @param {{ resolveId: Function, resolveStatus: Function }} resolvers
  * @returns {{
  *   storyManifest: object[],
@@ -147,23 +146,18 @@ function projectStory(story, resolvers) {
  *   waveSet: Set<number>,
  * }}
  */
-function projectFeatures(features, resolvers) {
+function projectStories(stories, resolvers) {
   const storyManifest = [];
   let totalStories = 0;
   let doneStories = 0;
   const waveSet = new Set();
-  for (const feature of features) {
-    const stories = validateSpecShape('stories', feature?.stories)
-      ? feature.stories
-      : [];
-    for (const story of stories) {
-      if (!validateSpecShape('story', story)) continue;
-      const { storyEntry, wave } = projectStory(story, resolvers);
-      storyManifest.push(storyEntry);
-      totalStories++;
-      if (storyEntry.status === AGENT_LABELS.DONE) doneStories++;
-      if (wave >= 0) waveSet.add(wave);
-    }
+  for (const story of stories) {
+    if (!validateSpecShape('story', story)) continue;
+    const { storyEntry, wave } = projectStory(story, resolvers);
+    storyManifest.push(storyEntry);
+    totalStories++;
+    if (storyEntry.status === AGENT_LABELS.DONE) doneStories++;
+    if (wave >= 0) waveSet.add(wave);
   }
   return { storyManifest, totalStories, doneStories, waveSet };
 }
@@ -199,12 +193,12 @@ export function buildManifestFromSpec(spec, opts = {}) {
     spec?.epic && typeof spec.epic.id === 'number' ? spec.epic.id : null;
   const epicTitle =
     spec?.epic && typeof spec.epic.title === 'string' ? spec.epic.title : '';
-  const features = validateSpecShape('features', spec?.features)
-    ? spec.features
+  const stories = validateSpecShape('stories', spec?.stories)
+    ? spec.stories
     : [];
 
-  const { storyManifest, totalStories, doneStories, waveSet } = projectFeatures(
-    features,
+  const { storyManifest, totalStories, doneStories, waveSet } = projectStories(
+    stories,
     resolvers,
   );