mandrel 1.59.0 → 1.60.0

package/.agents/scripts/lib/baseline-snapshot.js

@@ -28,8 +28,8 @@ import { calculateAll, scanDirectory } from './maintainability-utils.js';
  * baseline-snapshot.js — per-Epic baseline lifecycle helpers.
  *
  * Story #1396 (Epic #1386). The Epic-snapshot scheme freezes the maintainability
- * and crap baselines at /epic-plan time and reconciles them back to `main`
- * at /epic-deliver time. Two helpers, both pure-ish (deterministic given the
+ * and crap baselines at /plan time and reconciles them back to `main`
+ * at /deliver time. Two helpers, both pure-ish (deterministic given the
  * working tree + injected I/O):
  *
  *   - forkMainToEpic({ epicId, cwd }) — copies the tracked main baselines
@@ -37,20 +37,20 @@ import { calculateAll, scanDirectory } from './maintainability-utils.js';
  *     source content produces the same destination bytes (no fs churn). When
  *     the source baseline is missing, emits a warn through the injected
  *     logger and returns `{ written: false, reason: 'source-missing' }` for
- *     that file — callers (e.g. /epic-plan Phase 7) treat the absence as
+ *     that file — callers (e.g. /plan Phase 7) treat the absence as
  *     non-fatal and stay in `--full-scope` mode.
  *
  *   - regenerateMainFromTree({ cwd }) — re-scores maintainability + crap
  *     against the current working tree and writes the result to the tracked
  *     main baseline paths. Returns `{ didChange, paths }` where `didChange`
  *     is true iff any baseline file's content differs from what's already on
- *     disk. Callers in /epic-deliver use `didChange === false` to skip the
+ *     disk. Callers in /deliver use `didChange === false` to skip the
  *     `baseline-refresh: epic-<id>` commit.
  *
  * Lifecycle note (Story #1467): per-epic ratchet snapshots are ephemeral
  * scratch state under the `temp/epic-<id>/baselines/` namespace, NOT committed
  * artifacts. They inherit the existing per-epic temp-tree cleanup contract —
- * `/epic-deliver` reaps the parent `temp/epic-<id>/` directory on merge, so
+ * `/deliver` reaps the parent `temp/epic-<id>/` directory on merge, so
  * no manual prune is required. Earlier versions of this module wrote under
  * `baselines/epic/<id>/`, which committed them to git and accumulated obsolete
  * snapshots forever.
@@ -103,7 +103,7 @@ export function epicSnapshotPathFor({ epicId, kind, cwd = process.cwd() }) {
  *   - Source baseline missing → returned per-file `{ written: false,
  *     reason: 'source-missing' }`. Logger warn fires once per missing file.
  *     Caller stays in `--full-scope` mode.
- *   - Source unreadable / not parseable → throws. Re-running /epic-plan
+ *   - Source unreadable / not parseable → throws. Re-running /plan
  *     with `--force` after fixing the source recovers.
  *
  * @param {{
@@ -428,7 +428,7 @@ export function commitSnapshotsToEpicBranch({
  * via `delivery.quality.gates.crap.coveragePath`. When coverage is missing and
  * `requireCoverage` is true, the crap regeneration is skipped (didChange stays
  * false for that file) and a warn is emitted — the operator is expected to run
- * `npm run test:coverage` before /epic-deliver if a refresh is anticipated.
+ * `npm run test:coverage` before /deliver if a refresh is anticipated.
  *
  * @param {{
  *   cwd?: string,

package/.agents/scripts/lib/bdd-runner-detect.js

@@ -13,7 +13,7 @@
  * The verification is **static**: we inspect `package.json` for a known BDD
  * runner dependency, and consult a small lookup table of which runners
  * support which pending/skip tag. We do not boot the runner. This keeps
- * `/epic-plan` Phase 7 hermetic and offline.
+ * `/plan` Phase 7 hermetic and offline.
  *
  * **Workspace awareness (Story #2956).** In a pnpm / npm / yarn monorepo the
  * BDD runner is rarely a root devDependency — it lives in the workspace

package/.agents/scripts/lib/bdd-scenario-scanner.js

@@ -1,5 +1,5 @@
 /**
- * bdd-scenario-scanner.js — Gherkin scenario index for /epic-plan Phase 7.
+ * bdd-scenario-scanner.js — Gherkin scenario index for /plan Phase 7.
  *
  * Story #2637 (sibling to #2634 codebase-snapshot, #2635 spec-freshness,
  * #2636 file-assumption gate). The Acceptance Engineer step of
@@ -7,7 +7,7 @@
  * alone — it never inspects the consumer project's existing `.feature`
  * files. Planned ACs frequently duplicate scenarios that already exist or
  * re-specify behaviour the codebase already proves; the duplication is
- * only discovered (at best) during `/story-deliver` or (at worst) after
+ * only discovered (at best) during `/deliver` or (at worst) after
  * a redundant PR ships.
  *
  * `scanBddScenarios` walks every configured feature root, parses each
@@ -20,7 +20,7 @@
  * have a matching scenario.
  *
  * Determinism is load-bearing: the matcher is keyword-based, not
- * embedding-based, so re-running `/epic-plan` against the same
+ * embedding-based, so re-running `/plan` against the same
  * acceptance spec produces the same disposition annotations.
  */
 

package/.agents/scripts/lib/bootstrap/baselines-layout-migration.js

@@ -15,7 +15,7 @@
  *
  * All three shapes are relocated under `<repoRoot>/temp/epic/<id>/baselines/`,
  * where they inherit the existing per-epic temp-tree cleanup contract:
- * `/epic-deliver` reaps `temp/epic/<id>/` on merge, so the ratchet snapshots
+ * `/deliver` reaps `temp/epic/<id>/` on merge, so the ratchet snapshots
  * are ephemeral scratch state — never committed, no manual prune.
  *
  * The main-tracked `baselines/{maintainability,crap}.json` files are NOT

package/.agents/scripts/lib/bootstrap/branch-protection.js

@@ -7,7 +7,7 @@
  *   - `enforce_admins: true` — admins do not bypass the prGate suite.
  *   - `required_pull_request_reviews.required_approving_review_count: 0` —
  *     CI is the gate; the operator monitors and iterates the open PR
- *     to green via `/epic-deliver`'s Phase 7 watch loop.
+ *     to green via `/deliver`'s Phase 7 watch loop.
  *
  * Behaviour rules
  * ---------------

package/.agents/scripts/lib/bootstrap/ci-workflow-template.js

@@ -14,7 +14,7 @@
  *      `--full-scope` so a self-diff doesn't degrade to "no files in diff".
  *
  *   2. **Pass `--epic-ref` where the firing site is Epic-aware.** Inside
- *      `/story-deliver` the close-validation chain already threads
+ *      `/deliver` the close-validation chain already threads
  *      `--epic-ref epic/<id>`; on CI the equivalent surface is the PR's
  *      base branch. The template wires `--epic-ref ${EPIC_REF}` through an
  *      env var the workflow computes from `github.head_ref` (story-N

package/.agents/scripts/lib/bootstrap/commit-push.js

@@ -112,8 +112,8 @@ export function buildManualInstructions({ stagePaths, baseBranch }) {
     `  git push -u origin ${baseBranch}`,
     '',
     'Story delivery runs in git worktrees that check out tracked files only,',
-    'so the .agents/ wiring MUST be committed before any /story-deliver or',
-    '/epic-deliver run — otherwise the worktree has no scripts and breaks.',
+    'so the .agents/ wiring MUST be committed before any /deliver or',
+    '/deliver run — otherwise the worktree has no scripts and breaks.',
   ].join('\n');
 }
 

package/.agents/scripts/lib/codebase-snapshot.js

@@ -1,7 +1,7 @@
 /**
  * codebase-snapshot.js — Bounded structural view of the consumer repo.
  *
- * Story #2634 (sibling to #2635 spec-freshness). `/epic-plan` Phase 7
+ * Story #2634 (sibling to #2635 spec-freshness). `/plan` Phase 7
  * authors PRD + Tech Spec from documentation alone — `architecture.md`,
  * `data-dictionary.md`, `decisions.md`, `patterns.md`. When those docs
  * drift from the real source tree, the Architect persona cites modules

package/.agents/scripts/lib/config/explain.js

@@ -113,7 +113,7 @@ const KEY_MEANINGS = Object.freeze({
 
   // planning.*
   'planning.maxTickets':
-    'Upper bound on tickets a single /epic-plan run may create.',
+    'Upper bound on tickets a single /plan run may create.',
   'planning.context.maxBytes':
     'Byte budget for the planning-context payload before summary mode kicks in.',
   'planning.context.summaryMode':

package/.agents/scripts/lib/config/runners.js

@@ -29,7 +29,7 @@ export const DEFAULT_DECOMPOSER = Object.freeze({
  * host has adequate parallel-agent quota, operators should raise
  * `delivery.deliverRunner.concurrencyCap` — wall-clock time falls
  * proportionally to the extra concurrency. The safe default is a tuning
- * knob, not a performance ceiling. See `epic-deliver.md` § Phase 2b and
+ * knob, not a performance ceiling. See `helpers/deliver-epic.md` § Phase 2b and
  * `agentrc-reference.json` `delivery.deliverRunner.concurrencyCap` for details.
  *
  * **`verifyConcurrencyCap`** (Epic #3019 Tech Spec §1.4 / Story #3024) is a
@@ -44,7 +44,7 @@ const DEFAULT_DELIVER_RUNNER = Object.freeze({
 });
 
 /**
- * Default auto-fix loop ceilings for /epic-deliver Phase 4 (epic-audit)
+ * Default auto-fix loop ceilings for /deliver Phase 4 (epic-audit)
  * and Phase 5 (code-review). Operators override via
  * `delivery.epicAudit.*` and `delivery.codeReview.*` in `.agentrc.json`
  * (Story #2611, Epic #2586).

package/.agents/scripts/lib/config/runtime.js

@@ -77,7 +77,7 @@ export function resolveWorkingPath({
 
 /**
  * One-shot environment-aware runtime resolution. Returns the trio of runtime
- * signals consumed across `/epic-deliver`: whether worktree isolation is on
+ * signals consumed across `/deliver`: whether worktree isolation is on
  * for this process, the session id for claim labels, and whether we're in a
  * Claude Code web session. Each signal also records its **source** so the
  * `story-init` startup log can name why the value is what it is.

package/.agents/scripts/lib/config/temp-paths.js

@@ -44,7 +44,7 @@
  * parent of `git rev-parse --git-common-dir`) rather than `process.cwd()`.
  * Without this, a story child that `cd`s into `.worktrees/story-<id>/` before
  * calling `story-phase.js` would append `story.heartbeat` records to
- * `<worktree>/temp/epic-N/lifecycle.ndjson`, while the `/epic-deliver` host
+ * `<worktree>/temp/epic-N/lifecycle.ndjson`, while the `/deliver` host
  * (running from the main checkout) reads the main-checkout copy — so the
  * idle-watchdog never sees heartbeats and the Epic-lease guard silently
  * reclaims live foreign claims (the audit-#3513 bug class). Anchoring the
@@ -335,7 +335,7 @@ export const epicPerfReportPath = (eid, config) =>
 
 /**
  * `temp/epic-<eid>/epic-perf-report.json` — canonical JSON snapshot of
- * the `epic-perf-report` payload persisted at /epic-deliver close
+ * the `epic-perf-report` payload persisted at /deliver close
  * (Epic #3019 / Story #3029 / Task #3040). When present alongside the
  * `epic-perf-report` structured comment, the report is discoverable
  * from the file system without round-tripping the ticketing provider,

package/.agents/scripts/lib/config-settings-schema-delivery.js

@@ -203,7 +203,7 @@ const MERGE_WATCH_SCHEMA = {
 };
 
 /**
- * `delivery.epicAudit` — bounded-retry knobs for /epic-deliver Phase 4
+ * `delivery.epicAudit` — bounded-retry knobs for /deliver Phase 4
  * (epic-audit). `maxFixAttempts` caps how many times the auto-fix loop
  * retries a single finding (Story #2611, Epic #2586). `maxFixScopeFiles`
  * caps how many files a single auto-fix may touch before escalating to
@@ -237,7 +237,7 @@ const CI_DELIVERY_SCHEMA = {
 // Story #2899 (Epic #2880) — `delivery.preflight.*` thresholds consumed
 // by `epic-deliver-preflight.js`. When any value is exceeded the CLI
 // surfaces a breach in its envelope and the workflow flips the Epic to
-// `agent::blocked` (see /epic-deliver Phase 1 prelude).
+// `agent::blocked` (see /deliver Phase 1 prelude).
 const PREFLIGHT_SCHEMA = {
   type: 'object',
   properties: {

package/.agents/scripts/lib/config-settings-schema-quality.js

@@ -102,7 +102,7 @@ export const QUALITY_SCHEMA = {
 
 /**
  * `delivery.codeReview` — sibling to `delivery.epicAudit`. Same bounded
- * retry + scope cap, applied to /epic-deliver Phase 5 (code-review).
+ * retry + scope cap, applied to /deliver Phase 5 (code-review).
  */
 export const CODE_REVIEW_SCHEMA = {
   type: 'object',

package/.agents/scripts/lib/config-settings-schema.js

@@ -205,7 +205,7 @@ const GITHUB_SCHEMA = {
 };
 
 // ---------------------------------------------------------------------------
-// planning.* — inputs to /epic-plan
+// planning.* — inputs to /plan
 // ---------------------------------------------------------------------------
 
 /**
@@ -224,7 +224,7 @@ const PLANNING_CONTEXT_SCHEMA = {
 
 /**
  * Story #2634 — `planning.codebaseSnapshot` controls the structural
- * view of the consumer repo threaded into `/epic-plan` Phase 7 spec
+ * view of the consumer repo threaded into `/plan` Phase 7 spec
  * authoring. Absent / partial entries resolve to defaults inside
  * `lib/codebase-snapshot.js#resolveSnapshotConfig` — the schema only
  * enforces shape (correct enum value, well-formed glob arrays).
@@ -287,7 +287,7 @@ const PLANNING_SCHEMA = {
 };
 
 // ---------------------------------------------------------------------------
-// delivery.* — /epic-deliver + story-deliver consume. The full block of
+// delivery.* — /deliver + story-deliver consume. The full block of
 // per-key sub-schemas lives in `config-settings-schema-delivery.js` (refs
 // #3457); DELIVERY_SCHEMA is imported above and referenced unchanged below.
 // ---------------------------------------------------------------------------

package/.agents/scripts/lib/duplicate-search.js

@@ -1,7 +1,7 @@
 /**
  * duplicate-search.js — Cross-Epic Duplicate Detection
  *
- * Used by `/epic-plan` Phase 2 (s-plan-ideation) to surface open Epics
+ * Used by `/plan` Phase 2 (s-plan-ideation) to surface open Epics
  * whose scope overlaps with a sharpened one-pager before a new Epic is
  * created. Returns ranked candidates with an overlap score and URL so
  * the host LLM can pause for HITL confirmation.

package/.agents/scripts/lib/dynamic-workflow/capability.js

@@ -26,7 +26,7 @@
  *
  * Both paths MUST emit the identical per-lens report contract
  * (`{{auditOutputDir}}/<lens>-results.md`), so downstream consumers
- * (`/epic-deliver` Phase 4 epic-audit, `audit-to-stories`) are agnostic to
+ * (`/deliver` Phase 4 epic-audit, `audit-to-stories`) are agnostic to
  * which path produced it.
  *
  * ## Why this is capability-degradation, not a contract shim

package/.agents/scripts/lib/epic-plan-clarity.js

@@ -10,7 +10,7 @@
  * Verdict rule: `clear` requires **both** (a) ≥ 4 of 5 canonical sections
  * present, **and** (b) the **Acceptance Criteria** section present. The
  * Acceptance-Criteria requirement is load-bearing: a downstream
- * `/epic-deliver` start gate and the close-time acceptance-spec reconciler
+ * `/deliver` start gate and the close-time acceptance-spec reconciler
  * both assume the Epic carries acceptance criteria, so a gate that passed an
  * Epic with no Acceptance Criteria (the pre-Story-#3910 `≥ 4 of 5` behaviour)
  * advertised a clarity guarantee it did not provide. AC is now a required

package/.agents/scripts/lib/epic-plan-ideation.js

@@ -1,5 +1,5 @@
 /**
- * epic-plan-ideation.js — Phase 3/4 helpers for /epic-plan
+ * epic-plan-ideation.js — Phase 3/4 helpers for /plan
  *
  * Phase 3: render an Epic body from a sharpened ideation one-pager
  * using the canonical template at `.agents/templates/epic-from-idea.md`.

package/.agents/scripts/lib/feedback-loop/memory-freshness.js

@@ -1,5 +1,5 @@
 /**
- * memory-freshness.js — walker + verifier for the `/epic-plan` Phase 0
+ * memory-freshness.js — walker + verifier for the `/plan` Phase 0
  * memory-freshness pre-flight. Story #2557 / Epic #2547. Tech Spec #2550.
  *
  * Walks every `.md` file under a memory directory (typically

package/.agents/scripts/lib/feedback-loop/prior-feedback-fetcher.js

@@ -1,6 +1,6 @@
 /**
  * prior-feedback-fetcher.js — gh-CLI-backed fetcher for open meta feedback
- * issues that feed the `/epic-plan` Phase 0 planner context.
+ * issues that feed the `/plan` Phase 0 planner context.
  *
  * Story #2554 / Epic #2547. Tech Spec #2550 specifies that the fetcher MUST
  * return open issues carrying the `meta::framework-gap` and

package/.agents/scripts/lib/findings/classify-finding.js

@@ -51,7 +51,7 @@ export const FINDING_CLASSES = Object.freeze([
 /**
  * Class → label-set routing table. Each class maps to exactly one label set.
  * `tooling-dx` is the framework-gap path: it carries `meta::framework-gap` so
- * the `/epic-plan` Phase 0 feedback fetcher surfaces it to the planner.
+ * the `/plan` Phase 0 feedback fetcher surfaces it to the planner.
  */
 const CLASS_TO_LABELS = Object.freeze({
   'product-bug': [FOCUS_LABELS.PRODUCT],

package/.agents/scripts/lib/findings/promote-finding.js

@@ -5,8 +5,8 @@
  * tail of the exploratory-QA Triage path: once an operator has dispositioned a
  * session's ledger items (see `.agents/schemas/qa-ledger.schema.json` and
  * `lib/qa/qa-session.js`), the still-untriaged backlog is clustered and each
- * cluster is promoted to a follow-up ticket — a single Story (via `/story-plan`)
- * for a tight, one-deliverable cluster, or an Epic (via `/epic-plan --idea`) for
+ * cluster is promoted to a follow-up ticket — a single Story (via `/plan`)
+ * for a tight, one-deliverable cluster, or an Epic (via `/plan --idea`) for
  * a broad cluster that spans multiple coverage surfaces. Each contributing
  * ledger item then has the resulting `routedTo` issue link written back onto it
  * so a resume run sees the item as filed rather than re-promoting it.
@@ -23,7 +23,7 @@
  * Pure orchestration: **no network I/O lives here.** Every GitHub side-effect
  * (issue search, ticket creation) flows through INJECTED PORTS so the unit test
  * runs with no network. Production wires the ports to the GitHub provider /
- * `/story-plan` / `/epic-plan` surfaces; tests pass in-memory stubs.
+ * `/plan` / `/plan` surfaces; tests pass in-memory stubs.
  */
 
 import { fingerprintFinding, routeFinding } from './route-finding.js';
@@ -40,8 +40,8 @@ export const PROMOTION_TARGETS = Object.freeze({
 
 /**
  * A cluster of more than this many distinct coverage surfaces is broad enough
- * to warrant an Epic (`/epic-plan --idea`) rather than a single Story
- * (`/story-plan`). One or two surfaces is a tight, single-deliverable cluster.
+ * to warrant an Epic (`/plan --idea`) rather than a single Story
+ * (`/plan`). One or two surfaces is a tight, single-deliverable cluster.
  */
 const EPIC_COVERAGE_THRESHOLD = 2;
 
@@ -159,8 +159,8 @@ export function clusterLedgerItems(items) {
 /**
  * Decide a cluster's promotion target. A cluster that spans more than
  * {@link EPIC_COVERAGE_THRESHOLD} distinct coverage surfaces is broad enough to
- * warrant an Epic (`/epic-plan --idea`); otherwise it is a single-deliverable
- * Story (`/story-plan`).
+ * warrant an Epic (`/plan --idea`); otherwise it is a single-deliverable
+ * Story (`/plan`).
  *
  * @param {{ coverages: string[] }} cluster
  * @returns {'story'|'epic'}
@@ -233,7 +233,7 @@ function routedToLink(issue, kind) {
  *      shared `routeFinding` against existing Issues (via the injected search
  *      port). This dedups against work already filed.
  *   2. On a `new` decision, open the follow-up ticket through the injected
- *      `createStory` (`/story-plan`) or `createEpic` (`/epic-plan --idea`) port,
+ *      `createStory` (`/plan`) or `createEpic` (`/plan --idea`) port,
  *      chosen by {@link targetForCluster}. On any other decision, link back to
  *      the matched Issue rather than creating a duplicate.
  *   3. Stamp the resolved `routedTo` link onto every contributing ledger item
@@ -250,9 +250,9 @@ function routedToLink(issue, kind) {
  * @param {(finding: object) => Promise<Array<{ number: number, state: string, title?: string, body?: string }>>} [ports.searchCandidates]
  *   Optional semantic candidate search, forwarded to `routeFinding`.
  * @param {(cluster: object) => Promise<{ number: number, url?: string }>} ports.createStory
- *   Opens a single Story (`/story-plan`) for a tight cluster.
+ *   Opens a single Story (`/plan`) for a tight cluster.
  * @param {(cluster: object) => Promise<{ number: number, url?: string }>} ports.createEpic
- *   Opens an Epic (`/epic-plan --idea`) for a broad cluster.
+ *   Opens an Epic (`/plan --idea`) for a broad cluster.
  * @returns {Promise<{
  *   promotions: Array<{
  *     clusterKey: string,

package/.agents/scripts/lib/label-constants.js

@@ -76,7 +76,6 @@ export function isValidTransition(fromState, toState) {
 
 export const TYPE_LABELS = {
   EPIC: 'type::epic',
-  FEATURE: 'type::feature',
   STORY: 'type::story',
 };
 
@@ -104,7 +103,7 @@ export const CONTEXT_LABELS = {
 export const CONTEXT_ACCEPTANCE_SPEC = CONTEXT_LABELS.ACCEPTANCE_SPEC;
 
 /**
- * Acceptance-axis labels for opt-out signalling on Stories and Features that
+ * Acceptance-axis labels for opt-out signalling on Stories that
  * intentionally have no acceptance-spec coverage. Separate namespace from
  * `context::` because it expresses absence rather than a linked context
  * ticket.
@@ -120,7 +119,7 @@ export const ACCEPTANCE_NA = ACCEPTANCE_LABELS.N_A;
  * loop). `meta::framework-gap` is applied to issues that surface a defect or
  * missing capability in the framework itself; `meta::consumer-improvement`
  * is applied to issues that surface improvements to a consumer project
- * (workflow tweaks, ergonomic asks, doc polish). The `/epic-plan` Phase 0
+ * (workflow tweaks, ergonomic asks, doc polish). The `/plan` Phase 0
  * fetcher (see `lib/feedback-loop/prior-feedback-fetcher.js`) reads open
  * issues carrying either label and surfaces them to the planner so retro
  * signals are routed into durable substrates rather than lost in chat.
@@ -133,7 +132,7 @@ export const META_LABELS = {
 /**
  * Planning-axis labels (Epic #2880 F7). Currently scoped to the
  * `planning::healthcheck-waived` operator-applied waiver, which is the
- * documented escape hatch for the `/epic-plan` Phase 10 readiness
+ * documented escape hatch for the `/plan` Phase 10 readiness
  * healthcheck (`epic-plan-healthcheck.js`). The persist half of
  * `epic-plan-decompose.js` refuses to flip an Epic to `agent::ready`
  * when the healthcheck returned `ok: false` unless this label is

package/.agents/scripts/lib/label-taxonomy.js

@@ -53,15 +53,10 @@ export const LABEL_TAXONOMY = [
     color: LABEL_COLORS.TYPE,
     description: 'Epic-level work item',
   },
-  {
-    name: TYPE_LABELS.FEATURE,
-    color: LABEL_COLORS.TYPE,
-    description: 'Feature under an Epic',
-  },
   {
     name: TYPE_LABELS.STORY,
     color: LABEL_COLORS.TYPE,
-    description: 'User story under a Feature',
+    description: 'User story under an Epic',
   },
 
   // Agent State
@@ -75,7 +70,7 @@ export const LABEL_TAXONOMY = [
     name: AGENT_LABELS.READY,
     color: LABEL_COLORS.AGENT,
     description:
-      'Parking state — frozen dispatch manifest exists; awaiting local /epic-deliver',
+      'Parking state — frozen dispatch manifest exists; awaiting local /deliver',
   },
   {
     name: AGENT_LABELS.EXECUTING,
@@ -120,7 +115,7 @@ export const LABEL_TAXONOMY = [
     description: 'Acceptance Specification (Gherkin scenarios)',
   },
 
-  // Acceptance axis — explicit opt-out signal for Stories/Features that
+  // Acceptance axis — explicit opt-out signal for Stories that
   // intentionally have no acceptance-spec coverage.
   {
     name: ACCEPTANCE_LABELS.N_A,

package/.agents/scripts/lib/orchestration/acceptance-eval-decision.js

@@ -152,7 +152,7 @@ export function decideAcceptanceEval({ verdict, maxRounds, round: roundIn }) {
 /**
  * Build the per-criterion acceptance-eval signal payload for the retro /
  * feedback substrate. Carries which acceptance items needed rework and the
- * round count so `/epic-plan` Phase 0 feedback fetch and the retro can
+ * round count so `/plan` Phase 0 feedback fetch and the retro can
  * surface acceptance churn. PII-free by construction — it carries only
  * acceptance-item indices, verdicts, and the terminal decision.
  *

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