mandrel 1.59.0 → 1.61.0

package/.agents/scripts/lib/orchestration/file-assumptions.js

@@ -8,7 +8,7 @@
  * are batched per-Story and surfaced through the same error envelope the
  * decompose loop already uses.
  *
- * Under the 3-tier hierarchy (Epic → Feature → Story; Epic #3078 / #3238)
+ * Under the 2-tier hierarchy (Epic → Story; Epic #3078 / #3238)
  * the Story is the implementation unit — there is no `type::task` ticket
  * layer — so the gate scans `type === 'story'` tickets and reads the
  * `{ path, assumption }` entries inlined on each Story body.
@@ -255,7 +255,7 @@ function predecessorMutator(index, path, predecessors) {
  *     mismatches: object[]  // structured payload for downstream tooling
  *   }
  *
- * Under the 3-tier hierarchy the Story is the implementation unit, so the
+ * Under the 2-tier hierarchy the Story is the implementation unit, so the
  * gate scans `type === 'story'` tickets and reads the inline
  * `{ path, assumption }` entries on each Story body.
  *

package/.agents/scripts/lib/orchestration/finalize/close-planning-tickets.js

@@ -4,7 +4,7 @@
  * planning context tickets (PRD / Tech Spec / Acceptance Spec) linked
  * from the Epic body's `## Planning Artifacts` section.
  *
- * Extracted from `/epic-deliver` Phase 7.1 prose (the `gh issue close`
+ * Extracted from `/deliver` Phase 7.1 prose (the `gh issue close`
  * sequence) so the lifecycle Finalizer listener has a single async
  * helper to call. Reuses `parseLinkedIssues` so the three planning ids
  * are read from the same canonical body shape that `epic-plan` writes

package/.agents/scripts/lib/orchestration/finalize/open-or-locate-pr.js

@@ -4,7 +4,7 @@
  * request, or locates the existing one when finalize is replaying after
  * a crash between `gh pr create` and the `pr.created` emit.
  *
- * Extracted from `/epic-deliver` Phase 7.1 prose so the lifecycle
+ * Extracted from `/deliver` Phase 7.1 prose so the lifecycle
  * Finalizer listener has a single async helper that returns the
  * `{ prNumber, url, created }` envelope it needs to compose
  * downstream emits.
@@ -26,7 +26,7 @@
  * the same head branch: the second call short-circuits at the probe and
  * does not attempt to create a duplicate PR. This is the AC-10
  * idempotency contract the Finalizer relies on for cross-process
- * re-runs of `/epic-deliver`.
+ * re-runs of `/deliver`.
  */
 
 import { spawnSync } from 'node:child_process';

package/.agents/scripts/lib/orchestration/finalize/sanitize-skip-ci.js

@@ -4,7 +4,7 @@
  * `[skip ci]` markers (and the four variant spellings GitHub honours)
  * from a text payload.
  *
- * Story #3165: `/epic-deliver` Phase 7 opens a PR squashed into `main`
+ * Story #3165: `/deliver` Phase 7 opens a PR squashed into `main`
  * via `gh pr merge --squash`. Story commits legitimately carry
  * `[skip ci]` markers under `delivery.ci.skipForStoryPushes: true` to
  * keep CI from firing on the wave's intermediate pushes. When GitHub

package/.agents/scripts/lib/orchestration/lease-guard-shared.js

@@ -19,7 +19,7 @@
  *
  *   - **Operator candidates** — each surface supplies its own ordered
  *     candidate list (e.g. `--as` flag → `github.operatorHandle` →
- *     `git user.email` for `/epic-deliver`; bare `operatorHandle` for the
+ *     `git user.email` for `/deliver`; bare `operatorHandle` for the
  *     plan/standalone paths).
  *   - **Missing-handle behaviour** — `'null'` (return null; the caller fails
  *     closed at acquire time) vs `'throw'` (refuse immediately with surface
@@ -31,7 +31,7 @@
  *     message via `renderRefusal(result, ticketId)`.
  *   - **Liveness anchoring** — the plan/standalone paths have no heartbeat
  *     ledger, so they anchor `heartbeatAt` to `now` (fail-closed: every
- *     foreign claim reads live). `/epic-deliver` threads a real
+ *     foreign claim reads live). `/deliver` threads a real
  *     `heartbeatAt` through from the lifecycle ledger, so it opts out of
  *     anchoring.
  *
@@ -91,7 +91,7 @@ export function resolveOperatorFromCandidates({
  * same resolved clock value so `isClaimLive` returns true for ANY foreign
  * owner — `acquireLease` then refuses a foreign assignee unless `steal` is
  * set, while unclaimed and self-held tickets still proceed without a write.
- * When unset (`/epic-deliver`), the caller-supplied `heartbeatAt` / `now`
+ * When unset (`/deliver`), the caller-supplied `heartbeatAt` / `now`
  * pass through untouched.
  *
  * @param {object} opts

package/.agents/scripts/lib/orchestration/lifecycle/emit-story-dispatch-end.js

@@ -12,7 +12,7 @@
  *   `lib/orchestration/wave-session.js`, which nothing imports outside
  *   tests — so every dispatched Story stayed "in-flight" forever and the
  *   idle watchdog flagged completed Stories as stalled. The host-LLM driven
- *   `/epic-deliver` path closes a wave through `epic-execute-record-wave.js`,
+ *   `/deliver` path closes a wave through `epic-execute-record-wave.js`,
  *   so that CLI is the correct place to emit the matching dispatch-end per
  *   recorded Story.
  *

package/.agents/scripts/lib/orchestration/lifecycle/emit-story-heartbeat.js

@@ -25,7 +25,7 @@
  * signature is deliberately narrow: only the schema-allowed fields are
  * accepted. The earlier per-child Task id and progress counters
  * were dropped under Epic #3078's
- * 3-tier hard cutover — they would fail strict validation and have no
+ * 2-tier hard cutover — they would fail strict validation and have no
  * meaning now that the Story is the leaf execution unit with no child
  * tickets. The optional `operator` field (Story #3480) records the handle
  * holding the assignee-as-lease claim; it is included only when supplied so

package/.agents/scripts/lib/orchestration/lifecycle/listeners/README.md

@@ -5,7 +5,7 @@ events and performs a single side effect. The canonical close-tail roster
 — in registration order — is wired by
 [`index.js`](./index.js) (`buildDefaultListenerChain`), the production
 entrypoint the standalone `lifecycle-emit.js` CLI shells in for
-`/epic-deliver`'s Phase 6 / 7.5 / 8 / 8.5 markdown invocations:
+`/deliver`'s Phase 6 / 7.5 / 8 / 8.5 markdown invocations:
 
 - `ledger-writer.js` — privileged `onEmitted` hook that lands every
   `emitted` record on disk before any listener body runs (MUST be first).

package/.agents/scripts/lib/orchestration/lifecycle/listeners/automerge-armer.js

@@ -41,7 +41,7 @@
  *      This is the bus-level replay defence.
  *   2. The `gh pr view` probe — short-circuits across process
  *      boundaries when a prior run already armed auto-merge. This is
- *      the recovery defence: `/epic-deliver` restarted on the same PR
+ *      the recovery defence: `/deliver` restarted on the same PR
  *      will see the existing arm and emit `epic.merge.armed` exactly
  *      once.
  *

package/.agents/scripts/lib/orchestration/lifecycle/listeners/automerge-predicate.js

@@ -7,7 +7,7 @@
  *
  * Subscribes to:
  *   - `epic.automerge.start` (production path, Story #3901) → the
- *     `/epic-deliver` Phase 8.5 boundary that the `lifecycle-emit.js`
+ *     `/deliver` Phase 8.5 boundary that the `lifecycle-emit.js`
  *     CLI actually fires. This event carries `prUrl` but NO
  *     `checkOutcomes` (Phase 8's `pr-watch-with-update.js` has already
  *     polled every required check to green before Phase 8.5 runs), so

package/.agents/scripts/lib/orchestration/lifecycle/listeners/branch-cleaner.js

@@ -1,7 +1,7 @@
 // .agents/scripts/lib/orchestration/lifecycle/listeners/branch-cleaner.js
 /**
  * BranchCleaner — lifecycle listener that owns post-merge **branch** reap
- * for `/epic-deliver`. Story #2398 (companion to Cleaner, which owns the
+ * for `/deliver`. Story #2398 (companion to Cleaner, which owns the
  * temp-tree archival half of end-of-Epic cleanup).
  *
  * Subscribes to:

package/.agents/scripts/lib/orchestration/lifecycle/listeners/finalizer.js

@@ -49,7 +49,7 @@
  *      level replays short-circuit.
  *   2. The `gh pr list --head` probe + `openOrLocatePr`'s internal
  *      locate path — both defend against cross-process re-runs
- *      (`/epic-deliver` restarted on the same branch after a crash).
+ *      (`/deliver` restarted on the same branch after a crash).
  *
  * Side-effect firewall: the listener emits on the bus, shells out to
  * `gh`/`git` (via the helpers), and upserts the `epic-handoff`

package/.agents/scripts/lib/orchestration/lifecycle/listeners/index.js

@@ -8,7 +8,7 @@
  * mirrored this roster for an in-session runner was deleted with the
  * dead epic-runner stratum in Story #3908; the host-LLM-drives-CLIs
  * model reaches every close-tail listener through the `lifecycle-emit.js`
- * CLI shells in `/epic-deliver`'s Phase 6 / 7.5 / 8 markdown invocations,
+ * CLI shells in `/deliver`'s Phase 6 / 7.5 / 8 markdown invocations,
  * which call this builder.)
  *
  * Canonical roster (registration order):

package/.agents/scripts/lib/orchestration/lifecycle/listeners/merge-watcher.js

@@ -20,7 +20,7 @@
  *      `{ epicId, prNumber, mergeCommitSha, mergedAt, pollAttempts }`.
  *   4. If the budget is exceeded without observing a merge, return
  *      a `failed` classification with reason `budget-exceeded` and
- *      do NOT emit `epic.merge.confirmed`. The /epic-deliver
+ *      do NOT emit `epic.merge.confirmed`. The /deliver
  *      blocker-handler flow surfaces this via `agent::blocked`.
  *
  * Resume contract (AC of Task #2907): the ledger is the source of

package/.agents/scripts/lib/orchestration/lifecycle/listeners/notify-dispatcher.js

@@ -14,7 +14,7 @@
  *
  *   webhookEvents entry    lifecycle event
  *   --------------------   ---------------------
- *   `epic-started`         (emitted at /epic-deliver kickoff;
+ *   `epic-started`         (emitted at /deliver kickoff;
  *                          this listener handles `epic.snapshot.start`)
  *   `epic-blocked`         `epic.blocked`
  *   `epic-complete`        `epic.complete`

package/.agents/scripts/lib/orchestration/lifecycle/listeners/watcher.js

@@ -23,7 +23,7 @@
  * Idempotency contract (AC-10): per-instance `Set<string>` of
  * `${event}:${seqId}` keys. A repeat `(event, seqId)` short-circuits
  * without re-polling and emits nothing. Combined with the bus-level
- * replay defence, this is sufficient — re-running `/epic-deliver` after
+ * replay defence, this is sufficient — re-running `/deliver` after
  * a crash will produce a NEW seqId and the listener legitimately
  * re-runs the poll loop (which is itself idempotent: the outcome map
  * always reflects the live GitHub state).

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

@@ -1,7 +1,7 @@
 /**
  * lib/orchestration/manifest-builder.js — Manifest Building Logic
  *
- * 3-tier-only producer. Reads Story tickets from `allTickets` directly,
+ * 2-tier-only producer. Reads Story tickets from `allTickets` directly,
  * computes Story-scoped waves, and emits the `waves[].stories[]` /
  * Story-only `storyManifest` shape. The pre-Epic-#3163 Task-tier branch
  * has been removed; the framework no longer carries a Task-tier
@@ -48,7 +48,7 @@ function extractSectionList(body, heading) {
 
 /**
  * Project a Story ticket into the inline-acceptance/verify shape required by
- * the 3-tier waves[].stories[] schema. Reads `## Acceptance` /
+ * the 2-tier waves[].stories[] schema. Reads `## Acceptance` /
  * `## Acceptance Criteria` and `## Verify` sections from the body.
  *
  * @param {object} story
@@ -95,7 +95,7 @@ function projectStoryForWave(story, epicId) {
 const AGENT_DONE_LABEL = STATE_LABELS.DONE;
 
 /**
- * Build the Story-only manifest array used by the 3-tier hierarchy path.
+ * Build the Story-only manifest array used by the 2-tier hierarchy path.
  * Reads Story tickets directly from `allTickets`; there is no Task tier
  * to walk. Each entry exposes an empty `tasks: []` to keep downstream
  * consumers (renderers, dispatch helpers) on a single per-Story shape
@@ -145,7 +145,7 @@ function buildStoryOnlyManifest(stories, epicId) {
 }
 
 /**
- * Build the wave records for a 3-tier manifest. Each wave entry exposes a
+ * Build the wave records for a 2-tier manifest. Each wave entry exposes a
  * `stories[]` projection (instead of the legacy `tasks[]`) so dispatch
  * consumers can fan Story execution out wave-by-wave without ever seeing
  * a `type::task` ticket.
@@ -200,7 +200,7 @@ export function buildManifest({
     epicTitle: epic?.title ?? '',
     executor: 'claude-code',
     dryRun,
-    hierarchy: '3-tier',
+    hierarchy: '2-tier',
     summary: {
       totalStories,
       doneStories,

package/.agents/scripts/lib/orchestration/parked-follow-ons.js

@@ -9,7 +9,7 @@
  *   - "parked" — the Story is genuinely outside the manifest (carved off
  *                mid-sprint, no recut lineage). The operator should explicitly
  *                adopt it into the current Epic or defer it. Surfaced as a
- *                structured comment so `/epic-deliver` has a single checkpoint.
+ *                structured comment so `/deliver` has a single checkpoint.
  *
  * Both categories are informational at the wave-completeness gate — they do
  * not fail closure by themselves. The gate continues to enforce that every
@@ -81,7 +81,7 @@ export function renderParkedFollowOnsComment(epicId, classification) {
     `## 🪝 Parked Follow-Ons & Recuts — Epic #${epicId}`,
     '',
     'Stories created under this Epic that are **not** in the frozen dispatch',
-    'manifest. Surfaced here so `/epic-deliver` can gate on them at the',
+    'manifest. Surfaced here so `/deliver` can gate on them at the',
     'completeness check.',
     '',
     `- **Recuts** (attributable to a manifest Story): ${recuts.length}`,

package/.agents/scripts/lib/orchestration/plan-runner/plan-router.js

@@ -2,7 +2,7 @@
  * plan-router — given an Epic's current labels, decide which plan-phase CLI
  * should run next.
  *
- * Used by the local `/epic-plan` wrapper (chains spec → decompose).
+ * Used by the local `/plan` wrapper (chains spec → decompose).
  *
  * The router is intentionally stateless. Callers feed the current label set
  * (a string array, usually from `provider.getEpic(id).labels`) and receive a
@@ -21,7 +21,7 @@ export const PLAN_PHASE_NAMES = Object.freeze({
  * path used by the local wrapper; `command` is the slash-command invocation
  * operators fire.
  *
- * Spec and Decompose are served by the unified `/epic-plan` wrapper with a
+ * Spec and Decompose are served by the unified `/plan` wrapper with a
  * `--phase` flag — the phase workflows themselves live at
  * `.agents/workflows/helpers/epic-plan-{spec,decompose}.md` and are not
  * directly invokable slash commands.
@@ -33,20 +33,20 @@ export const PLAN_PHASE_DESCRIPTORS = Object.freeze({
   [PLAN_PHASE_NAMES.SPEC]: {
     phase: PLAN_PHASE_NAMES.SPEC,
     script: '.agents/scripts/epic-plan-spec.js',
-    command: '/epic-plan --phase spec',
+    command: '/plan --phase spec',
     parkingLabel: AGENT_LABELS.REVIEW_SPEC,
   },
   [PLAN_PHASE_NAMES.DECOMPOSE]: {
     phase: PLAN_PHASE_NAMES.DECOMPOSE,
     script: '.agents/scripts/epic-plan-decompose.js',
-    command: '/epic-plan --phase decompose',
+    command: '/plan --phase decompose',
     parkingLabel: AGENT_LABELS.READY,
   },
 });
 
 /**
  * Given the Epic's current labels, pick the next plan phase to run in the
- * local `/epic-plan` wrapper.
+ * local `/plan` wrapper.
  *
  * Precedence:
  *   1. If the Epic already carries `agent::ready`, there is nothing left to

package/.agents/scripts/lib/orchestration/post-merge/phases/ticket-closure.js

@@ -2,14 +2,14 @@
  * phases/ticket-closure.js — post-merge ticket transition + cascade phase.
  *
  * Transitions the Story to `agent::done`, then runs cascade completion
- * so any parent Feature/Epic that is now fully resolved closes too.
+ * so any parent Epic-side rollup that is now fully resolved closes too.
  *
- * **3-tier closure (Story #3127).** Under the 3-tier hierarchy a Story
+ * **2-tier closure (Story #3127).** Under the 2-tier hierarchy a Story
  * is the leaf unit of execution and has no child tickets — `tasks`
  * arrives as an empty array. `batchTransitionTickets` handles the empty
  * input cleanly (the loop trivially completes), the Story is
  * transitioned alone, and cascade completion walks upward to
- * Feature/Epic. No branch on hierarchy mode is required here.
+ * parent. No branch on hierarchy mode is required here.
  *
  * Notifications are intentionally
  * NOT routed through the per-ticket transitions here — `notificationPhase`

package/.agents/scripts/lib/orchestration/preflight-cache.js

@@ -3,7 +3,7 @@
  *
  * Cache adapter for the snapshot/DAG envelope produced by
  * `epic-deliver-preflight.js` so `epic-deliver-prepare.js` can skip the
- * second walk of Epic → Feature → Story when the underlying Epic ticket
+ * second walk of Epic → Story when the underlying Epic ticket
  * has not drifted between the two operator invocations.
  *
  * Contract:

package/.agents/scripts/lib/orchestration/recurring-failure-detector.js

@@ -6,7 +6,7 @@
  * `close-validate.end` `emitted` records and groups them by `failedGate`.
  * Returns one finding per gate that appears in **two or more distinct
  * Stories** within the same Epic. Findings are the substrate
- * `/epic-deliver` consumes when upserting the cross-Story
+ * `/deliver` consumes when upserting the cross-Story
  * `recurring-failure-class` structured comment on the Epic ticket.
  *
  * The helper is intentionally pure: no GitHub I/O, no global state. It

package/.agents/scripts/lib/orchestration/retro/phases/compose-body.js

@@ -328,7 +328,7 @@ function followOnBody(s) {
     ``,
     `Trigger: ${trigger}.`,
     ``,
-    `Apply the meta::framework-gap label so /epic-plan Phase 0 surfaces it on the next planning pass.`,
+    `Apply the meta::framework-gap label so /plan Phase 0 surfaces it on the next planning pass.`,
   ].join('\n');
 }
 

package/.agents/scripts/lib/orchestration/retro/phases/gather-signals.js

@@ -130,8 +130,8 @@ async function warnIfEpicLooksPopulated({ epicId, provider, logger }) {
  * `logger` so the silent failure becomes visible. Probe failure degrades
  * gracefully — the function never throws on the guard alone.
  *
- * **3-tier ledgers (Story #3151, Story #3200).** Under the 3-tier
- * hierarchy (Epic → Feature → Story; no Task-tier children), `friction`
+ * **2-tier ledgers (Story #3151, Story #3200).** Under the 2-tier
+ * hierarchy (Epic → Story; no Task-tier children), `friction`
  * / `parked` / `recuts` / `storyPerfSummaries` are all Story-scoped, so
  * the function continues to produce a non-empty signals report. The
  * empty-walk guard above is **not** triggered for this shape because

package/.agents/scripts/lib/orchestration/retro-runner.js

@@ -3,10 +3,10 @@
  *
  * Story #1155 (Epic #1142, 5.40.0) — extracts the helper-driven
  * `epic-retro` invocation into a callable module so the
- * `/epic-deliver` runner can fire Phase E without a separate LLM
+ * `/deliver` runner can fire Phase E without a separate LLM
  * helper turn. (Story #2259, Epic #2172: the legacy deliver-runner
  * CLI was retired once delivery moved entirely into the slash
- * command.) The retro fires before `/epic-deliver`'s finalize step
+ * command.) The retro fires before `/deliver`'s finalize step
  * opens the PR — the operator's PR-merge is the final human gate, not
  * the retro itself.
  *
@@ -56,7 +56,7 @@ export { gatherRetroSignals } from './retro/phases/gather-signals.js';
 /**
  * Public: compose and post the retro structured comment on the Epic.
  *
- * Story #1290 (Epic #1143) — at /epic-deliver Phase 5, the runner invokes
+ * Story #1290 (Epic #1143) — at /deliver Phase 5, the runner invokes
  * the self-healing checks registry with `scope: 'retro'` and
  * `autoFix: false`. The retro is **read-only by construction**: the
  * registry runner enforces the invariant by throwing if any caller flips

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

@@ -22,7 +22,7 @@
  *                  is enumerated).
  *   - `standard` — everything else, including absent/malformed risk envelopes
  *                  and a `medium` level. Fail toward the middle, never toward
- *                  `light`: an Epic that skipped `/epic-plan` has no risk
+ *                  `light`: an Epic that skipped `/plan` has no risk
  *                  verdict, and treating it as `light` would under-review
  *                  unjudged work while `standard` preserves today's behaviour.
  *

package/.agents/scripts/lib/orchestration/single-story-close/phases/wrong-tree-guard.js

@@ -1,7 +1,7 @@
 /**
  * phases/wrong-tree-guard.js — detect worktree/main-checkout edit divergence.
  *
- * Story #3364 — `/single-story-deliver` (and `/story-deliver`) materializes a
+ * Story #3364 — `/single-story-deliver` (and `/deliver`) materializes a
  * per-Story worktree and instructs the agent to `cd` into it before editing.
  * On Windows that guidance is silently insufficient: `cd <workCwd>` steers the
  * Bash tool's working directory, but the path-based Edit/Write tools operate on

package/.agents/scripts/lib/orchestration/spec-freshness.js

@@ -2,7 +2,7 @@
  * spec-freshness.js — Tech Spec post-author cross-validation against the
  * current codebase.
  *
- * `/epic-plan` Phase 7 authors PRD + Tech Spec from documentation alone.
+ * `/plan` Phase 7 authors PRD + Tech Spec from documentation alone.
  * When `project.docsContextFiles` (architecture.md, etc.) drift from
  * the real source tree, the Architect persona happily cites modules and
  * paths that no longer exist. The mismatch only surfaces at delivery time,

package/.agents/scripts/lib/orchestration/spec-renderer.js

@@ -1,30 +1,29 @@
 /**
  * lib/orchestration/spec-renderer.js — tickets.json → epic-spec.yaml
- * projection (3-tier shape, Epic #3163).
+ * projection (2-tier shape, Story #4041).
  *
  * The decomposer (`epic-plan-decompose-author`) produces a flat array
- * of ticket objects of two shapes (feature / story) keyed by stable
- * `slug`s and linked by `parent_slug` + `depends_on`. The spec
- * reconciler consumes the declarative structural representation
- * defined by `.agents/schemas/epic-spec.schema.json` — a nested
- * `{ epic, features: [{ stories: [...] }] }` tree with Story-level
- * `wave`, `dependsOn`, and inline `acceptance[]` / `verify[]` arrays
+ * of Story ticket objects keyed by stable `slug`s and linked by
+ * `depends_on`. The spec reconciler consumes the declarative
+ * structural representation defined by
+ * `.agents/schemas/epic-spec.schema.json` — a flat
+ * `{ epic, stories: [...] }` shape with Story-level `wave`,
+ * `dependsOn`, and inline `acceptance[]` / `verify[]` arrays
  * projected from the decomposer's edges.
  *
- * Under the 3-tier hierarchy (Epic #3078), Stories have no Task
- * children — acceptance and verify steps live inline on the Story.
- * Epic #3163 deletes the historical 4-tier Task emission code path
- * from this renderer (and its companion producers / consumers) in a
- * single hard cutover (see `.agents/rules/git-conventions.md` §
- * "Contract Cutovers — No Shim Layer"). A `task` ticket in the
- * decomposer input is rejected at index time.
+ * Under the 2-tier hierarchy (Story #4041), Stories have no Feature
+ * parent and no Task children — acceptance and verify steps live
+ * inline on the Story, and Stories attach directly to the Epic. Any
+ * `feature` or `task` ticket in the decomposer input is rejected at
+ * index time (hard cutover; see `.agents/rules/git-conventions.md` §
+ * "Contract Cutovers — No Shim Layer").
  *
  * `renderSpec(tickets, opts)` is the pure projection between those
  * two shapes. It:
  *
- *   1. Indexes the flat array by slug, partitioning into features /
- *      stories. Any unrecognised type (including the historical
- *      `task`) raises immediately.
+ *   1. Indexes the flat array by slug. Any unrecognised type
+ *      (including the historical `feature` / `task`) raises
+ *      immediately.
  *   2. Filters Story `depends_on` edges down to inter-Story
  *      references in the same Epic.
  *   3. Layers Stories into waves via `Graph.assignLayers` (depth in
@@ -33,9 +32,9 @@
  *      convention (`build-wave-dag.js` produces the same layering at
  *      dispatch time from the live GH state, so the spec's waves are
  *      observationally identical to what dispatch will compute).
- *   4. Walks the hierarchy in decomposer-declared order (feature →
- *      story), preserving the order the LLM emitted so the
- *      reconciler's diff stays human-readable.
+ *   4. Walks the Stories in decomposer-declared order, preserving
+ *      the order the LLM emitted so the reconciler's diff stays
+ *      human-readable.
  *   5. Strips `agent::*` labels from every entity. The decomposer
  *      doesn't normally write them, but they can leak via reverse-
  *      bootstrap from live GH state — and the schema forbids them
@@ -162,7 +161,7 @@ function sanitizeLabels(labels) {
  * Convert a decomposer body value into a spec `body` string. The
  * decomposer schema admits two shapes for a Story body:
  *
- *   - A short string (preferred under the 3-tier hierarchy).
+ *   - A short string (preferred under the 2-tier hierarchy).
  *   - A structured object (`{ goal, changes[], acceptance[],
  *     verify[] }`) carried over from the legacy 4-tier Task body
  *     shape, when the decomposer chooses to inline the Story's
@@ -215,16 +214,12 @@ function assignNonEmpty(target, key, value) {
 }
 
 /**
- * Partition the flat ticket array into per-type maps keyed by slug.
- * Returns the ordered slug lists alongside the lookup map so the
- * renderer can walk the hierarchy in the decomposer's emit order
- * (parents-before-children is guaranteed by the validator's
- * topological sort, but we don't need that invariant here — we walk
- * features in array order, then look up their children by parent_slug
- * in the order the decomposer emitted them).
+ * Index the flat ticket array by slug. Returns the ordered Story slug
+ * list alongside the lookup map so the renderer can walk Stories in
+ * the decomposer's emit order.
  *
- * Under the 3-tier hierarchy (Epic #3078), only `feature` and `story`
- * types are recognised. Any other type — including the historical
+ * Under the 2-tier hierarchy (Story #4041), only the `story` type is
+ * recognised. Any other type — including the historical `feature` /
  * `task` — falls through to the unknown-type guard and raises
  * immediately; there is no silent drop.
  *
@@ -232,7 +227,6 @@ function assignNonEmpty(target, key, value) {
  */
 function indexTickets(tickets) {
   const bySlug = new Map();
-  const featureSlugs = [];
   const storySlugs = [];
 
   for (const t of tickets) {
@@ -247,15 +241,14 @@ function indexTickets(tickets) {
       throw new Error(`[spec-renderer] duplicate slug "${slug}"`);
     }
     bySlug.set(slug, t);
-    if (t.type === 'feature') featureSlugs.push(slug);
-    else if (t.type === 'story') storySlugs.push(slug);
+    if (t.type === 'story') storySlugs.push(slug);
     else {
       throw new Error(
         `[spec-renderer] ticket "${slug}" has unknown type "${t.type}"`,
       );
     }
   }
-  return { bySlug, featureSlugs, storySlugs };
+  return { bySlug, storySlugs };
 }
 
 /**
@@ -283,9 +276,8 @@ function layerStories(storySlugs, bySlug) {
  * Project the decomposer ticket array into the structural spec object.
  *
  * @param {Array<object>} tickets — flat ticket array as emitted by the
- *   decomposer Skill (`type` ∈ {feature, story}, `slug`,
- *   `parent_slug`, `depends_on`, `title`, `body`, `labels`,
- *   `acceptance`, `verify`).
+ *   decomposer Skill (`type` = story, `slug`, `depends_on`, `title`,
+ *   `body`, `labels`, `acceptance`, `verify`).
  * @param {object}        opts
  * @param {{id: number, title: string, body?: string, labels?: string[]}} opts.epic
  *   — Epic descriptor (the decomposer doesn't emit the Epic row; it's
@@ -297,7 +289,7 @@ function layerStories(storySlugs, bySlug) {
  * @param {boolean} [opts.validate=true] — when `false`, skip final
  *   schema validation (used by tests that intentionally craft invalid
  *   inputs).
- * @returns {object} spec — `{ epic, features, gates? }` matching
+ * @returns {object} spec — `{ epic, stories, gates? }` matching
  *   `.agents/schemas/epic-spec.schema.json`.
  */
 function validateRenderSpecInputs(tickets, opts) {
@@ -318,18 +310,6 @@ function validateRenderSpecInputs(tickets, opts) {
   }
 }
 
-function bucketStoriesByFeature({ storySlugs, bySlug }) {
-  const storiesByFeature = new Map();
-  for (const slug of storySlugs) {
-    const story = bySlug.get(slug);
-    const parent = story.parent_slug;
-    if (typeof parent !== 'string' || !bySlug.has(parent)) continue;
-    if (!storiesByFeature.has(parent)) storiesByFeature.set(parent, []);
-    storiesByFeature.get(parent).push(slug);
-  }
-  return storiesByFeature;
-}
-
 function pickStringArray(primary, fallback) {
   const src = Array.isArray(primary)
     ? primary
@@ -342,7 +322,7 @@ function pickStringArray(primary, fallback) {
 }
 
 function extractStoryAcceptanceVerify(story) {
-  // Under the 3-tier hierarchy (Epic #3078), Stories carry inline
+  // Stories carry inline
   // acceptance[] / verify[] arrays directly on the ticket. The
   // decomposer may emit these either at the top level of the ticket
   // (preferred) or nested under a structured `body` object (legacy
@@ -380,20 +360,6 @@ function buildStoryOut({ story, layers, storySet }) {
   return out;
 }
 
-function buildFeatureOut({ feature, storySlugs, bySlug, layers, storySet }) {
-  const stories = storySlugs.map((storySlug) =>
-    buildStoryOut({
-      story: bySlug.get(storySlug),
-      layers,
-      storySet,
-    }),
-  );
-  const out = { slug: feature.slug, title: feature.title, stories };
-  assignNonEmpty(out, 'body', renderBody(feature.body));
-  assignNonEmpty(out, 'labels', sanitizeLabels(feature.labels));
-  return out;
-}
-
 function buildEpicOut(epic) {
   const out = { id: epic.id, title: epic.title };
   assignNonEmpty(out, 'body', renderBody(epic.body));
@@ -432,22 +398,19 @@ export function renderSpec(tickets, opts = {}) {
   validateRenderSpecInputs(tickets, opts);
   const { epic, gates, schemaPath, validate = true } = opts;
 
-  const { bySlug, featureSlugs, storySlugs } = indexTickets(tickets);
+  const { bySlug, storySlugs } = indexTickets(tickets);
   const { layers } = layerStories(storySlugs, bySlug);
-  const storiesByFeature = bucketStoriesByFeature({ storySlugs, bySlug });
   const storySet = new Set(storySlugs);
 
-  const features = featureSlugs.map((featureSlug) =>
-    buildFeatureOut({
-      feature: bySlug.get(featureSlug),
-      storySlugs: storiesByFeature.get(featureSlug) ?? [],
-      bySlug,
+  const stories = storySlugs.map((storySlug) =>
+    buildStoryOut({
+      story: bySlug.get(storySlug),
       layers,
       storySet,
     }),
   );
 
-  const spec = { epic: buildEpicOut(epic), features };
+  const spec = { epic: buildEpicOut(epic), stories };
   const gatesOut = buildGatesOut(gates);
   if (gatesOut) spec.gates = gatesOut;
 

package/.agents/scripts/lib/orchestration/spec-section-validator.js

@@ -1,7 +1,7 @@
 /**
  * spec-section-validator.js — Phase 7.5 Tech Spec post-authoring section gate.
  *
- * `/epic-plan` Phase 7 authors a Tech Spec from documentation and the PRD.
+ * `/plan` Phase 7 authors a Tech Spec from documentation and the PRD.
  * Phase 8.3 (Holistic Consolidation) then 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 the