mandrel 1.94.0 → 2.0.0

package/.agents/scripts/lib/checks/story-init-not-backgrounded.js

@@ -1,17 +1,17 @@
 /**
  * story-init-not-backgrounded — refuse-and-print check.
  *
- * Detects orchestration call sites that invoke `story-init.js` via the
- * Bash tool's `run_in_background: true` mode (with subsequent `Monitor`
+ * Detects orchestration call sites that invoke `single-story-init.js` via
+ * the Bash tool's `run_in_background: true` mode (with subsequent `Monitor`
  * waiting on completion) instead of a synchronous Bash call with a
  * 10-minute timeout. This guards the failure mode where `Monitor`'s wait
  * is not equivalent to script exit — a sub-agent that exits during a
- * Monitor wait kills `story-init.js` mid-batch, leaving a half-initialized
- * worktree and a failed wave aggregator.
+ * Monitor wait kills `single-story-init.js` mid-run, leaving a
+ * half-initialized worktree.
  *
  * Scope: 'epic-deliver', 'story-close', 'retro'. The check runs at every
- * preflight surface that has the opportunity to invoke story-init —
- * primarily `epic-deliver`'s wave loop — and surfaces as a retro audit
+ * preflight surface that has the opportunity to invoke Story init —
+ * primarily `/deliver`'s init step — and surfaces as a retro audit
  * signal if the failure mode resurfaces during a sprint.
  *
  * The check is `refuse-and-print`. Auto-rewriting an orchestration call
@@ -20,7 +20,8 @@
  * synchronous-call replacement pattern so they can apply it deliberately.
  *
  * Implementation note: we scan `.agents/` (markdown + js) for the
- * juxtaposition of a `story-init.js` reference and a backgrounding token
+ * juxtaposition of a `story-init.js` reference (which also matches
+ * `single-story-init.js` as a suffix) and a backgrounding token
  * (`run_in_background: true`, the literal `Monitor` tool name as a
  * fan-out target, or `&` shell backgrounding) within a small line window.
  */
@@ -39,7 +40,8 @@ const WINDOW_LINES = 20;
  * - `run_in_background: true` — Bash tool's backgrounding flag.
  * - `detached: true` — child_process.spawn options that detach the
  *   subprocess from the parent's lifecycle, equivalent to backgrounding.
- * - `story-init.js &` — POSIX shell ampersand backgrounding.
+ * - `single-story-init.js &` — POSIX shell ampersand backgrounding
+ *   (the pattern matches the `story-init.js` suffix of both names).
  */
 const BACKGROUND_TOKENS = [
   /run_in_background\s*:\s*true/,
@@ -85,12 +87,12 @@ function walkSources(dir) {
 
 /**
  * For one file, return an array of `{ line, kind }` offences: every line
- * referencing `story-init.js` that has a backgrounding token in the same
- * ±WINDOW_LINES window.
+ * referencing `story-init.js` (including `single-story-init.js`) that has
+ * a backgrounding token in the same ±WINDOW_LINES window.
  *
- * The check explicitly excludes the `story-init.js` file itself and any
- * dedicated check module (this file): the source-of-truth implementation
- * legitimately mentions itself.
+ * The check explicitly excludes the `single-story-init.js` file itself and
+ * any dedicated check module (this file): the source-of-truth
+ * implementation legitimately mentions itself.
  *
  * @param {string} file
  * @param {string} src
@@ -100,12 +102,12 @@ function scanFile(file, src) {
   const offences = [];
   // Don't flag the actual story-init script, self-references, or the
   // parallel-tooling helper — the helper documents both Rule 2
-  // (run_in_background) and the story-init.js anti-pattern in adjacent
-  // bullets, which collides with the scanner's ±20-line window even
-  // though there is no real invocation in the prose.
+  // (run_in_background) and the story-init backgrounding anti-pattern in
+  // adjacent bullets, which collides with the scanner's ±20-line window
+  // even though there is no real invocation in the prose.
   const basename = path.basename(file);
   if (
-    basename === 'story-init.js' ||
+    basename === 'single-story-init.js' ||
     basename === 'story-init-not-backgrounded.js' ||
     basename === 'story-init-not-backgrounded.test.js' ||
     basename === 'parallel-tooling.md'
@@ -129,13 +131,13 @@ function scanFile(file, src) {
 }
 
 const FIX_COMMAND = [
-  '# Invoke story-init.js synchronously with a 10-minute timeout. The',
-  '# script is idempotent on partial state, so re-running after a',
+  '# Invoke single-story-init.js synchronously with a 10-minute timeout.',
+  '# The script is idempotent on partial state, so re-running after a',
   '# half-initialized worktree is safe — but blocking on the Bash call',
   '# is what prevents the half-init state in the first place.',
   '#',
   '# Replacement pattern (Bash tool):',
-  '#   Bash(timeout: 600000, command: "node .agents/scripts/story-init.js --story <id>")',
+  '#   Bash(timeout: 600000, command: "node .agents/scripts/single-story-init.js --story <id>")',
   '#',
   '# Do NOT use:',
   '#   Bash(run_in_background: true, ...) + Monitor(...)',
@@ -177,7 +179,7 @@ export default {
       id: 'story-init-not-backgrounded',
       severity: 'blocker',
       scope: state?.scope ?? 'epic-deliver',
-      summary: `${offences.length} orchestration call site(s) invoke story-init.js with Monitor backgrounding`,
+      summary: `${offences.length} orchestration call site(s) invoke single-story-init.js with Monitor backgrounding`,
       detail,
       fixCommand: FIX_COMMAND,
       autoCorrectable: false,

package/.agents/scripts/lib/cli/standard-args.js

@@ -13,7 +13,6 @@
  *
  * Contract
  * --------
- *   parseStandardCliArgs(argv, schema?) → { values, positionals }
  *   parseStandardCliArgs({ argv, schema?, extras? }) → { values, positionals }
  *
  *   - `argv`    — `process.argv.slice(2)` shape; the helper does NOT strip
@@ -99,24 +98,20 @@ function camelCase(name) {
 }
 
 /**
- * Normalize the call signature. Accepts either positional
- * `(argv, schema)` (backward compat) or the object form
- * `({ argv, schema, extras })`.
+ * Validate the call signature. Only the object form
+ * `({ argv, schema, extras })` is accepted.
  *
- * @param {unknown} argvOrOpts
- * @param {unknown} maybeSchema
+ * @param {unknown} opts
  * @returns {{ argv: string[], schema: object | undefined, extras: object | undefined }}
  */
-function normaliseCallSignature(argvOrOpts, maybeSchema) {
-  if (
-    argvOrOpts !== null &&
-    typeof argvOrOpts === 'object' &&
-    !Array.isArray(argvOrOpts)
-  ) {
-    const { argv, schema, extras } = argvOrOpts;
-    return { argv: argv ?? [], schema, extras };
+function normaliseCallSignature(opts) {
+  if (opts === null || typeof opts !== 'object' || Array.isArray(opts)) {
+    throw new Error(
+      'parseStandardCliArgs: options must be a plain object ({ argv, schema?, extras? })',
+    );
   }
-  return { argv: argvOrOpts ?? [], schema: maybeSchema, extras: undefined };
+  const { argv, schema, extras } = opts;
+  return { argv: argv ?? [], schema, extras };
 }
 
 /**
@@ -313,15 +308,11 @@ function normaliseValues(raw, extras) {
  * Parse the dispatcher's shared CLI flag surface. See module docstring
  * for the full contract.
  *
- * @param {string[]|{argv?: string[], schema?: object, extras?: object}} argvOrOpts
- * @param {Record<string, { required?: boolean }>} [maybeSchema]
+ * @param {{ argv?: string[], schema?: object, extras?: object }} [opts]
  * @returns {{ values: Record<string, unknown>, positionals: string[] }}
  */
-export function parseStandardCliArgs(argvOrOpts = [], maybeSchema) {
-  const { argv, schema, extras } = normaliseCallSignature(
-    argvOrOpts,
-    maybeSchema,
-  );
+export function parseStandardCliArgs(opts = {}) {
+  const { argv, schema, extras } = normaliseCallSignature(opts);
   if (!Array.isArray(argv)) {
     throw new Error('parseStandardCliArgs: argv must be an array');
   }

package/.agents/scripts/lib/cli-args.js

@@ -40,6 +40,12 @@ function coerceBooleanFlag(value) {
   return Boolean(value);
 }
 
+/** Like coerceBooleanFlag, but preserves `undefined` (flag absent). */
+function optionalBooleanFlag(value) {
+  if (value === undefined) return undefined;
+  return coerceBooleanFlag(value);
+}
+
 /**
  * Standardized CLI argument parser for sprint scripts.
  * Supports options like --epic, --story, --dry-run, --skip-dashboard.
@@ -58,7 +64,8 @@ export function parseSprintArgs(args = process.argv) {
       'skip-sync': { type: 'boolean', default: false },
       'no-auto-merge': { type: 'boolean', default: false },
       'no-full-scope-crap': { type: 'boolean', default: false },
-      'wait-merge': { type: 'boolean', default: false },
+      // No default — absent means "use delivery.routing.closeAndLand".
+      'wait-merge': { type: 'boolean' },
       'no-wait-merge': { type: 'boolean', default: false },
       executor: { type: 'string' },
       cwd: { type: 'string' },
@@ -81,11 +88,11 @@ export function parseSprintArgs(args = process.argv) {
     skipSync: coerceBooleanFlag(values['skip-sync']),
     noAutoMerge: coerceBooleanFlag(values['no-auto-merge']),
     noFullScopeCrap: coerceBooleanFlag(values['no-full-scope-crap']),
-    // Story #4428 — headless must-land signal for `single-story-close.js`:
-    // `--wait-merge` opts a headless run into polling to merge confirmation
-    // instead of resting at `agent::closing`; `--no-wait-merge` is the
-    // explicit opt-out (see `single-story-close/phases/options.js`).
-    waitForMerge: coerceBooleanFlag(values['wait-merge']),
+    // Close-and-land: `--wait-merge` forces land-in-close; `--no-wait-merge`
+    // opts out. When neither flag is present (`undefined`),
+    // `parseCloseOptions` applies `delivery.routing.closeAndLand` (default
+    // true) so attended and headless delivers share the same happy path.
+    waitForMerge: optionalBooleanFlag(values['wait-merge']),
     noWaitForMerge: coerceBooleanFlag(values['no-wait-merge']),
     executor: values.executor ?? null,
     // Resolve worktree cwd from flag or env. Empty string/whitespace → null.
@@ -95,7 +102,9 @@ export function parseSprintArgs(args = process.argv) {
       null,
     recutOf: parseTicketId(values['recut-of']),
     // Story #4253: pre-resolved Epic linkage threaded by the /deliver
-    // fan-out so `story-init.js` can skip the per-Story `getEpic` round-trip.
+    // fan-out so `single-story-init.js` can skip redundant Epic lookups when
+    // the parent already threaded Epic context (pre-v2; field retained for
+    // CLI compatibility).
     resume: values.resume ?? false,
     restart: values.restart ?? false,
     noEvidence: values['no-evidence'] ?? false,

package/.agents/scripts/lib/close-validation/gates.js

@@ -146,7 +146,7 @@ function enabledBaselineKinds(config) {
  * `delivery.quality.requireBaselines: true`. Default false — a consumer that
  * enables baseline gates but has not committed baseline artifacts gets a
  * clean skip (see `probeBaselinesGate`) rather than a deterministic first-try
- * close failure. Mirrors the `delivery.ci.requireChecks` escape hatch (#4472).
+ * close failure. Fail-closed baseline posture (#4495).
  *
  * @param {object|undefined|null} config
  * @returns {boolean}
@@ -379,7 +379,7 @@ export function buildDefaultGates({
 /**
  * Default gate list resolved with no consumer config — uses the
  * `npm run typecheck` fallback for the typecheck gate. Call sites that have a
- * resolved config object in scope (e.g. `story-close.js`) should
+ * resolved config object in scope (e.g. `single-story-close.js`) should
  * prefer `buildDefaultGates({ config })` so a configured
  * `project.commands.typecheck` is honoured.
  *

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

@@ -1,30 +1,17 @@
 /**
- * `delivery.ci` accessor + framework defaults — Story #2899 (Epic #2880, F13)
- * and Story #4356 (Epic #4355).
+ * `delivery.ci` accessor + framework defaults — Story #4356 (Epic #4355).
  *
- * `delivery.ci.skipForStoryPushes` defaults to `true` so per-Task Story-branch
- * commits append a `[skip ci]` trailer out of the box. The Epic-branch merge
- * commit produced by `story-close.js`'s merge runner never carries the
- * marker — that path is the one consumers actually want CI to evaluate.
- *
- * Story #4356 adds the CI-aware delivery knobs: `earlyPr` (default `true`)
- * gates whether /deliver opens the Epic PR early so CI warms while later
- * waves run; `watch` tunes the merge/CI watch poll loop; and `autoMerge`
+ * Surviving knobs: `watch` tunes the merge/CI watch poll loop; `autoMerge`
  * (default `"trust-ci"`) selects the merge posture — `"trust-ci"` merges once
  * required checks pass, `"strict"` additionally requires a clean review gate.
  *
- * Story #4472 adds `requireChecks` (default `false`): when `true` the
- * AutomergePredicate treats a checks-less repo ("no checks reported") as a
- * hard block rather than green, so a consumer that wants fail-closed-without-
- * checks as policy opts into it explicitly instead of the framework blocking
- * implicitly.
+ * Retired (no production readers on v2 Story-only delivery): `earlyPr`
+ * (Epic early-PR warmup) and `requireChecks` (AutomergePredicate escape hatch
+ * whose listener was never landed).
  */
 
 export const CI_DELIVERY_DEFAULTS = Object.freeze({
-  skipForStoryPushes: true,
-  earlyPr: true,
   autoMerge: 'trust-ci',
-  requireChecks: false,
 });
 
 /**
@@ -35,27 +22,15 @@ export const CI_DELIVERY_DEFAULTS = Object.freeze({
  * defaults; only the scalar knobs carry framework defaults here.
  *
  * @param {object | null | undefined} config
- * @returns {{ skipForStoryPushes: boolean, earlyPr: boolean, autoMerge: 'trust-ci' | 'strict', requireChecks: boolean, watch: object | undefined }}
+ * @returns {{ autoMerge: 'trust-ci' | 'strict', watch: object | undefined }}
  */
 export function getCiDelivery(config) {
   const ci = config?.delivery?.ci ?? config?.ci ?? config ?? {};
   return {
-    skipForStoryPushes:
-      typeof ci.skipForStoryPushes === 'boolean'
-        ? ci.skipForStoryPushes
-        : CI_DELIVERY_DEFAULTS.skipForStoryPushes,
-    earlyPr:
-      typeof ci.earlyPr === 'boolean'
-        ? ci.earlyPr
-        : CI_DELIVERY_DEFAULTS.earlyPr,
     autoMerge:
       ci.autoMerge === 'trust-ci' || ci.autoMerge === 'strict'
         ? ci.autoMerge
         : CI_DELIVERY_DEFAULTS.autoMerge,
-    requireChecks:
-      typeof ci.requireChecks === 'boolean'
-        ? ci.requireChecks
-        : CI_DELIVERY_DEFAULTS.requireChecks,
     watch:
       ci.watch && typeof ci.watch === 'object' ? { ...ci.watch } : undefined,
   };

package/.agents/scripts/lib/config/delivery-routing.js

@@ -1,31 +1,21 @@
 /**
- * `delivery.routing` accessor + framework defaults — Epic #4475 (M4-A),
- * the single-delivery-as-default foundation, plus Epic #4478 (M7-B), the
+ * `delivery.routing` accessor + framework defaults — Epic #4478 (M7-B), the
  * role-scoped-boot-context flip and the maker-checker sampling floor.
  *
- * `delivery.routing.singleDelivery` is the **global kill-switch** for the
- * single-delivery route. It defaults to `true` (single-delivery is the
- * default shape for epic-shaped work), and is shipped INERT in M4-A: the
- * `deliver.md` router's single verdict currently falls through to the
- * fan-out helper, so flipping this knob has no observable effect until
- * M4-B wires `deliver-epic-single.md`.
- *
- * When set to `false`, `resolveEpicDeliveryRoute` forces EVERY Epic — even
- * one carrying the `delivery::single` label or a `decompose.shape:"single"`
- * checkpoint — down the fan-out path. This is the instant, per-consumer
- * global revert that ships BEFORE the default flips: no code rollback, no
- * re-plan, just a config edit.
+ * Stage 6 dropped `delivery.routing.singleDelivery` (the v1 epic
+ * single-vs-fan-out kill-switch). v2 has one Story delivery path; routing
+ * here is only about spawn boot context and critic sampling.
  *
  * `delivery.routing.roleScopedAgents` is the **kill-switch for the role-scoped
- * boot contexts** (Epic #4478, M7-B). It mirrors the `singleDelivery` shape
- * exactly. It defaults to `true`: a converted spawn (`story-worker`,
- * `acceptance-critic`) boots on its own `.claude/agents/<role>.md` system
- * prompt instead of re-paying the full `CLAUDE.md` @-import closure, which is
- * the whole payoff of the context diet (≈50KB → ≈8KB per spawn). When set to
- * `false`, every converted spawn falls back to `subagent_type: general-purpose`
- * — the instant, code-rollback-free per-consumer revert, and the universal
- * escape for hosts that ignore `.claude/agents/`. Flipping it off never drops a
- * gate: the fallback is the full-closure agent that ran before M7-B.
+ * boot contexts** (Epic #4478, M7-B). It defaults to `true`: a converted spawn
+ * (`story-worker`, `acceptance-critic`) boots on its own
+ * `.claude/agents/<role>.md` system prompt instead of re-paying the full
+ * `CLAUDE.md` @-import closure, which is the whole payoff of the context diet
+ * (≈50KB → ≈8KB per spawn). When set to `false`, every converted spawn falls
+ * back to `subagent_type: general-purpose` — the instant, code-rollback-free
+ * per-consumer revert, and the universal escape for hosts that ignore
+ * `.claude/agents/`. Flipping it off never drops a gate: the fallback is the
+ * full-closure agent that ran before M7-B.
  *
  * `delivery.routing.freshCriticSampleRate` is the **maker-checker sampling
  * floor** (Epic #4478, M7-B, Part 2). Risk-routed ceremony sends a low-risk
@@ -40,9 +30,16 @@
  */
 
 export const DELIVERY_ROUTING_DEFAULTS = Object.freeze({
-  singleDelivery: true,
   roleScopedAgents: true,
   freshCriticSampleRate: 0.2,
+  /** @type {'minimal'|'standard'|'strict'} */
+  ceremonyProfile: 'standard',
+  /**
+   * When true (default), attended `/deliver` lands through merge in one
+   * close (`--wait-merge` semantics) instead of stopping at `agent::closing`.
+   * Operators opt out per-run with `--no-wait-merge`.
+   */
+  closeAndLand: true,
 });
 
 /**
@@ -62,6 +59,19 @@ function clampSampleRate(value) {
   return value;
 }
 
+/**
+ * Normalize ceremony profile; unknown values → `standard`.
+ *
+ * @param {unknown} value
+ * @returns {'minimal'|'standard'|'strict'}
+ */
+function normalizeCeremonyProfile(value) {
+  if (value === 'minimal' || value === 'standard' || value === 'strict') {
+    return value;
+  }
+  return DELIVERY_ROUTING_DEFAULTS.ceremonyProfile;
+}
+
 /**
  * Read the merged `delivery.routing` block, applying framework defaults for
  * any field the operator omitted. Accepts the full resolved config, the bare
@@ -69,19 +79,25 @@ function clampSampleRate(value) {
  * tolerant unwrap so callers can pass whichever shape they hold.
  *
  * @param {object | null | undefined} config
- * @returns {{ singleDelivery: boolean, roleScopedAgents: boolean, freshCriticSampleRate: number }}
+ * @returns {{
+ *   roleScopedAgents: boolean,
+ *   freshCriticSampleRate: number,
+ *   ceremonyProfile: 'minimal'|'standard'|'strict',
+ *   closeAndLand: boolean,
+ * }}
  */
 export function getDeliveryRouting(config) {
   const routing = config?.delivery?.routing ?? config?.routing ?? config ?? {};
   return {
-    singleDelivery:
-      typeof routing.singleDelivery === 'boolean'
-        ? routing.singleDelivery
-        : DELIVERY_ROUTING_DEFAULTS.singleDelivery,
     roleScopedAgents:
       typeof routing.roleScopedAgents === 'boolean'
         ? routing.roleScopedAgents
         : DELIVERY_ROUTING_DEFAULTS.roleScopedAgents,
     freshCriticSampleRate: clampSampleRate(routing.freshCriticSampleRate),
+    ceremonyProfile: normalizeCeremonyProfile(routing.ceremonyProfile),
+    closeAndLand:
+      typeof routing.closeAndLand === 'boolean'
+        ? routing.closeAndLand
+        : DELIVERY_ROUTING_DEFAULTS.closeAndLand,
   };
 }

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

@@ -90,6 +90,8 @@ const KEY_MEANINGS = Object.freeze({
   'github.projectOwner': 'Owner of the GitHub Projects board.',
   'github.operatorHandle':
     'GitHub @handle mentioned when a run needs operator attention.',
+  'github.defaultTimeoutMs':
+    'Default timeout (ms) for GitHub CLI / API calls when a caller does not supply one.',
   'github.branchProtection.enforce':
     'Whether the framework applies branch-protection rules.',
   'github.branchProtection.requiredChecks':
@@ -126,28 +128,28 @@ const KEY_MEANINGS = Object.freeze({
     'How many recent commits the snapshot summarizes.',
   'planning.riskHeuristics':
     'Phrases that flag a Story as high-risk for HITL escalation.',
-  'planning.taskSizing.softAcceptanceCount':
-    'Acceptance-criteria count above which a Story is flagged as large (advisory-only — there is no hard acceptance ceiling).',
-  'planning.taskSizing.softFiles':
-    'Touched-file count above which a Story is flagged as large.',
-  'planning.taskSizing.hardFiles':
-    'Touched-file count above which a Story is rejected unless it declares `wide` with a reason.',
   'planning.failOnSharedEditors':
     'Whether shared-editor conflict findings are promoted to hard errors.',
   'planning.requireExplicitCrossStoryDeps':
     'Whether implicit cross-Story dependencies are promoted to hard errors.',
+  'planning.failOnRegistryConflicts':
+    'Whether cross-cutting registry conflict findings are promoted to hard errors.',
+  'planning.failOnLargeFanOut':
+    'Whether large fan-out findings are promoted to hard errors.',
+  'planning.largeFanOutThreshold':
+    'Story count above which a plan is flagged as a large fan-out.',
+  'planning.crossCuttingRegistries':
+    'Glob patterns naming cross-cutting registry files the planner conflict-checks.',
+  'planning.navigation.routeGlobs':
+    'Glob patterns marking paths that add a user-facing route (plan-time reachability gate).',
+  'planning.navigation.navRegistry':
+    'Tokens identifying the nav-registry SSOT a route-adding Story is expected to reference.',
 
   // delivery.*
   'delivery.execution.timeoutMs':
     'Per-execution timeout for orchestrated delivery steps.',
-  'delivery.maxTokenBudget':
-    'Cap on the hydrated task-prompt size handed to an agent.',
   'delivery.lease.ttlMs':
     'Time-to-live for the Epic lease before a stale claim is reclaimable.',
-  'delivery.ci.skipForStoryPushes':
-    'Whether Story-branch pushes carry a [skip ci] trailer.',
-  'delivery.ci.earlyPr':
-    'Whether /deliver opens the Epic PR early so CI warms during later waves.',
   'delivery.ci.watch.pollIntervalMs':
     'Poll cadence (ms) for the merge/CI watch loop.',
   'delivery.ci.watch.maxPolls':
@@ -156,22 +158,10 @@ const KEY_MEANINGS = Object.freeze({
     'Maximum times the CI watch may resume after a transient stall.',
   'delivery.ci.autoMerge':
     'Merge posture: trust-ci merges on green checks; strict also requires a clean review gate.',
-  'delivery.preflight.maxStories':
-    'Pre-dispatch ceiling on estimated Story count (no cap when unset).',
-  'delivery.preflight.maxWaves':
-    'Pre-dispatch ceiling on estimated wave count.',
-  'delivery.preflight.maxInstallCostSeconds':
-    'Pre-dispatch ceiling on estimated dependency-install seconds.',
-  'delivery.preflight.maxGithubApiRequests':
-    'Pre-dispatch ceiling on estimated GitHub API request volume.',
-  'delivery.preflight.maxClaudeQuotaTokens':
-    'Pre-dispatch ceiling on estimated Claude quota-token burn.',
   'delivery.docsFreshness.paths':
     'Docs whose freshness is checked at delivery time.',
   'delivery.deliverRunner.concurrencyCap':
     'Maximum Stories dispatched in parallel within one wave. Default 3 — conservative by design to keep host-quota consumption predictable. Operators running wide-wave Epics with adequate parallel-agent quota should raise this to reduce wall-clock time proportionally.',
-  'delivery.deliverRunner.progressReportIntervalSec':
-    'Cadence for delivery progress reporting.',
   'delivery.deliverRunner.verifyConcurrencyCap':
     'Maximum verify steps run in parallel.',
   'delivery.worktreeIsolation.enabled':
@@ -179,17 +169,19 @@ const KEY_MEANINGS = Object.freeze({
   'delivery.worktreeIsolation.root':
     'Directory under which per-Story worktrees are created.',
   'delivery.worktreeIsolation.nodeModulesStrategy':
-    'How node_modules is provisioned per worktree.',
+    'How node_modules is provisioned per worktree (default clone on darwin/linux; per-worktree on win32).',
   'delivery.worktreeIsolation.primeFromPath':
     'Source path a worktree primes its node_modules from.',
   'delivery.worktreeIsolation.allowSymlinkOnWindows':
     'Whether symlink node_modules strategy is allowed on Windows.',
   'delivery.worktreeIsolation.reapOnSuccess':
     'Whether a worktree is removed after a Story closes cleanly.',
-  'delivery.worktreeIsolation.reapOnCancel':
-    'Whether a worktree is removed after a cancelled run.',
   'delivery.worktreeIsolation.bootstrapFiles':
-    'Files copied into each new worktree (e.g. .env, .mcp.json).',
+    'Files copied into each new worktree (e.g. .env, .mcp.json, local overrides).',
+  'delivery.mergeWatch.intervalSeconds':
+    'Poll cadence (seconds) for MergeWatcher after epic.merge.armed.',
+  'delivery.mergeWatch.maxBudgetSeconds':
+    'Wall-clock budget (seconds) before MergeWatcher surfaces budget-exceeded.',
   'delivery.codeReview.providers':
     'Ordered provider chain the code-review phase consults.',
   'delivery.codeReview.maxFixAttempts':
@@ -198,8 +190,28 @@ const KEY_MEANINGS = Object.freeze({
     'Maximum files an auto-fix may touch in one attempt.',
   'delivery.codeReview.autoFixSeverity':
     'Severity threshold for on-branch code-review remediation (medium fixes 🔴/🟠/🟡, high fixes 🔴/🟠 only; default medium).',
-  'delivery.epicAudit.autoFixSeverity':
-    'Severity threshold for on-branch epic-audit remediation (medium fixes 🔴/🟠/🟡, high fixes 🔴/🟠 only; default medium).',
+  'delivery.routing.roleScopedAgents':
+    'Whether delivery spawns boot on role-scoped .claude/agents/<role>.md contexts.',
+  'delivery.routing.freshCriticSampleRate':
+    'Fraction of low-risk acceptance clusters forced through a fresh-context critic (maker-checker floor).',
+  'delivery.routing.ceremonyProfile':
+    'Acceptance-ceremony depth: minimal (always inline), standard (risk-routed), or strict (always fresh).',
+  'delivery.routing.closeAndLand':
+    'When true, single-story-close lands through merge in one close (opt out with --no-wait-merge).',
+  'delivery.feedbackLoop.auditResultsAutoFile':
+    'When true, auto-file non-blocking audit findings as follow-up issues.',
+  'delivery.feedbackLoop.retroProposals':
+    'When true, auto-file actionable retro proposals as follow-up issues.',
+  'delivery.quality.formatAutofix.timeoutMs':
+    'Bounded timeout (ms) for the close-time format autofix spawn.',
+  'delivery.quality.requireBaselines':
+    'When true, absent baseline artifacts fail close-validation instead of skipping cleanly.',
+  'delivery.quality.navigability.routeGlobs':
+    'Glob patterns marking user-facing routes for the navigability lens / journey gate.',
+  'delivery.quality.navigability.navRegistry':
+    'Tokens identifying the nav-registry SSOT the navigability lens expects.',
+  'delivery.quality.navigability.journeySuite':
+    'Optional journey-suite path the post-wave navigability integration gate runs.',
   'delivery.refactorStage.enabled':
     'Whether a dedicated refactor stage runs during delivery.',
   'delivery.acceptanceEval.maxRounds':
@@ -240,11 +252,19 @@ const PREFIX_MEANINGS = Object.freeze([
   ],
   ['delivery.quality', 'Delivery-time quality configuration.'],
   ['delivery.signals', 'Threshold for a delivery friction/telemetry signal.'],
-  ['delivery.lifecycle.timeouts', 'Timeout for a lifecycle-bus phase.'],
-  ['delivery.lifecycle', 'Lifecycle-bus configuration.'],
+  ['delivery.mergeWatch', 'MergeWatcher poll cadence and wall-clock budget.'],
   [
-    'planning.taskSizing',
-    'Story-sizing threshold for the decompose validator.',
+    'delivery.feedbackLoop',
+    'Opt-out toggles for auto-filing non-blocking findings.',
+  ],
+  [
+    'delivery.routing',
+    'Delivery-spawn routing and acceptance-ceremony profile.',
+  ],
+  ['delivery.ci', 'CI-aware delivery namespace (watch, auto-merge).'],
+  [
+    'planning.navigation',
+    'Plan-time navigability reachability gate (route globs + nav registry).',
   ],
   [
     'qa.environments',
@@ -263,8 +283,7 @@ const BLOCK_MEANINGS = Object.freeze({
   project: 'Project identity, paths, and command configuration.',
   github: 'GitHub provider identity and merge/notification policy.',
   planning: 'Inputs and guardrails for /epic-plan.',
-  delivery:
-    'Execution, isolation, quality, and lifecycle settings for delivery.',
+  delivery: 'Execution, isolation, quality, and CI settings for delivery.',
   qa: 'Agent-driven QA harness contract.',
 });