mandrel 2.0.0 → 2.1.0

package/.agents/scripts/lib/checks/subagent-agent-tool-required.js

@@ -22,8 +22,7 @@
  * catches an over-deep fan-out. The self-healing surface is preserved — it is
  * re-scoped, not removed.
  *
- * Scope: 'epic-deliver', 'retro'. Surfaces as a blocker at preflight for
- * `epic-deliver` (the fan-out site) and as audit signal at retro.
+ * Scope: 'retro'. Surfaces as audit signal at retro.
  *
  * The check is `refuse-and-print` — auto-rewriting a workflow's declared
  * depth or tool list would silently change runtime behavior in ways the
@@ -208,7 +207,7 @@ const FIX_COMMAND = [
 export default {
   id: 'subagent-agent-tool-required',
   severity: 'blocker',
-  scope: ['epic-deliver', 'retro'],
+  scope: ['retro'],
   autoCorrect: 'refuse-and-print',
 
   detect(state) {
@@ -249,7 +248,7 @@ export default {
     return {
       id: 'subagent-agent-tool-required',
       severity: 'blocker',
-      scope: state?.scope ?? 'epic-deliver',
+      scope: state?.scope ?? 'retro',
       summary: `${offences.length} sub-agent workflow(s) declare an Agent fan-out deeper than the supported nesting ceiling (${ceiling})`,
       detail,
       fixCommand: FIX_COMMAND,

package/.agents/scripts/lib/checks/worktree-bootstrap-env.js

@@ -8,7 +8,7 @@
  * tests that read environment variables silently take a different code
  * path.
  *
- * Surface: `epic-deliver` preflight and the `/diagnose` CLI. Surfaced as a
+ * Surface: the `/diagnose` CLI. Surfaced as a
  * warning rather than a blocker — the missing file may be a deliberate
  * choice (e.g. a worktree that doesn't need MCP), but the operator should
  * see the divergence from the main checkout.
@@ -28,7 +28,7 @@ const ID = 'worktree-bootstrap-env';
 export default {
   id: ID,
   severity: 'warning',
-  scope: ['epic-deliver', 'diagnose'],
+  scope: ['diagnose'],
   autoCorrect: 'refuse-and-print',
   detect(state) {
     const status = state?.fs?.worktreeBootstrapStatus ?? {};

package/.agents/scripts/lib/checks/worktree-residue-biome.js

@@ -6,8 +6,8 @@
  * root `npm run lint` walks into the orphan tree, hits the nested config,
  * and fails. The close-time biome block is the canonical symptom.
  *
- * Surface: `epic-deliver` preflight, `story-close` preflight, and the
- * `/diagnose` CLI. Surfaced as a blocker so the operator clears the residue
+ * Surface: `story-close` preflight, the `/diagnose` CLI, and retro.
+ * Surfaced as a blocker so the operator clears the residue
  * with `rm -rf` before close re-runs the validation chain.
  *
  * AutoCorrect is `refuse-and-print`. Recursive deletion under `.worktrees/`
@@ -21,7 +21,7 @@ const ID = 'worktree-residue-biome';
 export default {
   id: ID,
   severity: 'blocker',
-  scope: ['epic-deliver', 'story-close', 'diagnose', 'retro'],
+  scope: ['story-close', 'diagnose', 'retro'],
   autoCorrect: 'refuse-and-print',
   detect(state) {
     const orphans = state?.fs?.worktreeBiomeOrphans ?? [];

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

@@ -46,6 +46,22 @@ function optionalBooleanFlag(value) {
   return coerceBooleanFlag(value);
 }
 
+/**
+ * Parse a positive-integer flag, preserving `undefined` when the flag is
+ * absent so a caller can distinguish "not supplied" (fall back to config)
+ * from an explicit value. A non-numeric or non-positive value is treated as
+ * absent rather than coerced to 0 — a `--max-wait-seconds=abc` typo must not
+ * silently become a zero-second wait.
+ *
+ * @param {unknown} value
+ * @returns {number|undefined}
+ */
+function parsePositiveInt(value) {
+  if (value === undefined || value === null) return undefined;
+  const parsed = Number.parseInt(String(value), 10);
+  return Number.isInteger(parsed) && parsed > 0 ? parsed : undefined;
+}
+
 /**
  * Standardized CLI argument parser for sprint scripts.
  * Supports options like --epic, --story, --dry-run, --skip-dashboard.
@@ -63,10 +79,12 @@ export function parseSprintArgs(args = process.argv) {
       'skip-validation': { type: 'boolean', default: false },
       'skip-sync': { type: 'boolean', default: false },
       'no-auto-merge': { type: 'boolean', default: false },
-      'no-full-scope-crap': { type: 'boolean', default: false },
       // No default — absent means "use delivery.routing.closeAndLand".
       'wait-merge': { type: 'boolean' },
       'no-wait-merge': { type: 'boolean', default: false },
+      // Story #4543 — per-run override of `delivery.mergeWatch.maxWaitSeconds`
+      // (the merge wait's per-invocation bound). Absent means "use the config".
+      'max-wait-seconds': { type: 'string' },
       executor: { type: 'string' },
       cwd: { type: 'string' },
       'recut-of': { type: 'string' },
@@ -87,13 +105,16 @@ export function parseSprintArgs(args = process.argv) {
     skipValidation: coerceBooleanFlag(values['skip-validation']),
     skipSync: coerceBooleanFlag(values['skip-sync']),
     noAutoMerge: coerceBooleanFlag(values['no-auto-merge']),
-    noFullScopeCrap: coerceBooleanFlag(values['no-full-scope-crap']),
     // 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']),
+    // Story #4543 — raise the merge wait's per-invocation bound for a
+    // headless caller with no host tool-invocation ceiling, so it lands in
+    // one block instead of returning `pending` at the default 300s.
+    maxWaitSeconds: parsePositiveInt(values['max-wait-seconds']),
     executor: values.executor ?? null,
     // Resolve worktree cwd from flag or env. Empty string/whitespace → null.
     cwd:

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

@@ -54,22 +54,22 @@ function buildChangedFileScope(baseRef) {
  *
  * The baselines gate resolves its compare ref through `resolveScope`,
  * whose environment layer reads `BASELINE_REF`. Threading
- * `origin/<epicBranch>` here makes the gate diff head against the epic
+ * `origin/<baseBranch>` here makes the gate diff head against the epic
  * integration branch instead of the framework-default `origin/main`, so
  * drift that already landed on `main` but is outside the Story's own diff
  * does not surface as a phantom regression. The same convention
- * (`origin/<epicBranch>`) is used by the baseline-attribution and
+ * (`origin/<baseBranch>`) is used by the baseline-attribution and
  * auto-refresh paths, keeping read/compare bases aligned.
  *
  * Returns `null` when no integration branch is supplied (the gate then
  * keeps its existing default-ref / consumer-config behaviour untouched).
  *
- * @param {string|undefined|null} epicBranch
+ * @param {string|undefined|null} baseBranch
  * @returns {{ BASELINE_REF: string } | null}
  */
-function buildBaselinesGateEnv(epicBranch) {
-  if (typeof epicBranch !== 'string' || epicBranch.length === 0) return null;
-  return { BASELINE_REF: `origin/${epicBranch}` };
+function buildBaselinesGateEnv(baseBranch) {
+  if (typeof baseBranch !== 'string' || baseBranch.length === 0) return null;
+  return { BASELINE_REF: `origin/${baseBranch}` };
 }
 
 /**
@@ -240,11 +240,11 @@ function probeBaselinesGate({ config, cwd, presentBaselines } = {}) {
  * shared in-process runner. The unified `check-baselines` gate is now the
  * single source of truth for per-kind regression enforcement
  * (attribution-wired floor + tolerance + schema).
- * The `epicBranch` parameter threads the close run's integration branch
+ * The `baseBranch` parameter threads the close run's integration branch
  * into two gates: the `format` gate's `changedFileScope` (existing) and —
  * since Story #3890 — the `check-baselines` gate's `BASELINE_REF` env, so
  * the baselines regression compare diffs head against the epic integration
- * branch (`origin/<epicBranch>`) rather than the framework-default
+ * branch (`origin/<baseBranch>`) rather than the framework-default
  * `origin/main`. Without this, every child Story on an `epic/<id>` branch
  * re-discovered inherited main-vs-epic drift in untouched files as phantom
  * regressions and worked around it by hand-setting `BASELINE_REF`.
@@ -268,10 +268,10 @@ function probeBaselinesGate({ config, cwd, presentBaselines } = {}) {
  * none are required, the gate is skipped with a logged reason (via `log`)
  * instead of a blocking failure.
  *
- * @param {{ config?: object, epicBranch?: string, cwd?: string, packageScripts?: Record<string, string>, presentBaselines?: string[]|Set<string>, log?: (message: string) => void }} [opts]
+ * @param {{ config?: object, baseBranch?: string, cwd?: string, packageScripts?: Record<string, string>, presentBaselines?: string[]|Set<string>, log?: (message: string) => void }} [opts]
  *   `config` is the canonical resolved config (`{ project, delivery, ... }`);
  *   gate commands resolve from `project.commands` and the CRAP toggle from
- *   `delivery.quality.gates.crap.enabled`. `epicBranch` is the close run's
+ *   `delivery.quality.gates.crap.enabled`. `baseBranch` is the close run's
  *   integration branch (`epic/<id>` for Epic-attached Stories, the base
  *   branch for standalone Stories). `cwd` is where the `package.json`
  *   coverage-script probe and the `baselines/<kind>.json` presence probe
@@ -285,7 +285,7 @@ function probeBaselinesGate({ config, cwd, presentBaselines } = {}) {
  */
 export function buildDefaultGates({
   config,
-  epicBranch,
+  baseBranch,
   cwd,
   packageScripts,
   presentBaselines,
@@ -305,9 +305,9 @@ export function buildDefaultGates({
   const formatWriteString = resolveFormatWriteCommand(config);
   const formatChangedFileScope =
     formatCheckString === FORMAT_CHECK_FALLBACK
-      ? buildChangedFileScope(epicBranch)
+      ? buildChangedFileScope(baseBranch)
       : null;
-  const baselinesGateEnv = buildBaselinesGateEnv(epicBranch);
+  const baselinesGateEnv = buildBaselinesGateEnv(baseBranch);
   const baselinesDecision = probeBaselinesGate({
     config,
     cwd,

package/.agents/scripts/lib/close-validation/projections/inputs.js

@@ -3,7 +3,7 @@
  * inputs.js — shared input validator for close-validation projection helpers.
  *
  * Used by `projections/maintainability.js` (and any future projection that
- * shares the same `{ cwd, epicBranch, storyBranch, baselinePath }` argument
+ * shares the same `{ cwd, baseBranch, storyBranch, baselinePath }` argument
  * shape) to collapse the inline guard cascade into a single predicate that
  * returns a typed `reason` on failure.
  *
@@ -16,7 +16,7 @@
 /**
  * @typedef {Object} ProjectionInputs
  * @property {string} [cwd]
- * @property {string} [epicBranch]
+ * @property {string} [baseBranch]
  * @property {string} [storyBranch]
  * @property {string} [baselinePath]
  */
@@ -32,7 +32,7 @@
 /**
  * @typedef {Object} ValidationFail
  * @property {false} ok
- * @property {'missing-cwd'|'missing-epic-branch'|'missing-story-branch'|'missing-baseline-path'|'no-baseline'} reason
+ * @property {'missing-cwd'|'missing-base-branch'|'missing-story-branch'|'missing-baseline-path'|'no-baseline'} reason
  */
 
 /**
@@ -40,7 +40,7 @@
  *
  * Reason branches (in order):
  *   - `missing-cwd`           — cwd is falsy
- *   - `missing-epic-branch`   — epicBranch is falsy
+ *   - `missing-base-branch`   — baseBranch is falsy
  *   - `missing-story-branch`  — storyBranch is falsy
  *   - `missing-baseline-path` — baselinePath is falsy
  *   - `no-baseline`           — loadBaseline returned null/undefined/empty
@@ -54,9 +54,9 @@
  * @returns {ValidationOk | ValidationFail}
  */
 export function validateProjectionInputs(inputs, opts = {}) {
-  const { cwd, epicBranch, storyBranch, baselinePath } = inputs ?? {};
+  const { cwd, baseBranch, storyBranch, baselinePath } = inputs ?? {};
   if (!cwd) return { ok: false, reason: 'missing-cwd' };
-  if (!epicBranch) return { ok: false, reason: 'missing-epic-branch' };
+  if (!baseBranch) return { ok: false, reason: 'missing-base-branch' };
   if (!storyBranch) return { ok: false, reason: 'missing-story-branch' };
   if (!baselinePath) return { ok: false, reason: 'missing-baseline-path' };
 
@@ -80,7 +80,7 @@ export function validateProjectionInputs(inputs, opts = {}) {
  */
 export const MISSING_ARG_REASONS = new Set([
   'missing-cwd',
-  'missing-epic-branch',
+  'missing-base-branch',
   'missing-story-branch',
   'missing-baseline-path',
 ]);

package/.agents/scripts/lib/close-validation/projections/maintainability.js

@@ -41,18 +41,18 @@ function normaliseSkipReason(reason) {
 }
 
 /**
- * Refresh `origin/<epicBranch>` so the diff range resolves even when the
+ * Refresh `origin/<baseBranch>` so the diff range resolves even when the
  * close script hasn't reached its own pull/rebase step yet. Routed through
  * the shared `(cwd, ref, windowMs)` cache so a story-init fetch in the same
  * wave satisfies the projection without re-hitting origin.
  *
  * @param {string} cwd
- * @param {string} epicBranch
+ * @param {string} baseBranch
  * @param {{ gitSpawn: typeof defaultGitSpawn }} git
  * @returns {{ ok: true } | { ok: false, detail: string }}
  */
-function refreshEpicRef(cwd, epicBranch, git) {
-  const fetchRes = cachedGitFetchSync(cwd, epicBranch, {
+function refreshEpicRef(cwd, baseBranch, git) {
+  const fetchRes = cachedGitFetchSync(cwd, baseBranch, {
     gitSpawn: git.gitSpawn,
   });
   if (fetchRes.status !== 0) {
@@ -69,13 +69,13 @@ function refreshEpicRef(cwd, epicBranch, git) {
  * the changed-files list. Normalises Windows-style backslash paths to
  * forward slashes so the baseline lookup is platform-agnostic.
  *
- * @param {{ cwd: string, epicBranch: string, storyBranch: string, git: { gitSpawn: typeof defaultGitSpawn } }} opts
+ * @param {{ cwd: string, baseBranch: string, storyBranch: string, git: { gitSpawn: typeof defaultGitSpawn } }} opts
  * @returns {{ ok: true, files: string[] } | { ok: false, detail: string }}
  */
-function diffChangedFiles({ cwd, epicBranch, storyBranch, git }) {
+function diffChangedFiles({ cwd, baseBranch, storyBranch, git }) {
   try {
     const files = diffNameOnly({
-      range: `origin/${epicBranch}...${storyBranch}`,
+      range: `origin/${baseBranch}...${storyBranch}`,
       cwd,
       gitSpawn: git.gitSpawn,
     });
@@ -190,7 +190,7 @@ function collectRegressions({
  *
  * @param {{
  *   cwd: string,
- *   epicBranch: string,
+ *   baseBranch: string,
  *   storyBranch: string,
  *   baselinePath: string,
  *   tolerance?: number,
@@ -207,7 +207,7 @@ function collectRegressions({
  */
 export function projectMaintainabilityRegressions({
   cwd,
-  epicBranch,
+  baseBranch,
   storyBranch,
   baselinePath,
   tolerance = DEFAULT_MI_TOLERANCE,
@@ -216,7 +216,7 @@ export function projectMaintainabilityRegressions({
   loadBaseline = getBaseline,
 } = {}) {
   const validation = validateProjectionInputs(
-    { cwd, epicBranch, storyBranch, baselinePath },
+    { cwd, baseBranch, storyBranch, baselinePath },
     { loadBaseline },
   );
   if (!validation.ok) {
@@ -227,7 +227,7 @@ export function projectMaintainabilityRegressions({
     };
   }
 
-  const fetchOutcome = refreshEpicRef(cwd, epicBranch, git);
+  const fetchOutcome = refreshEpicRef(cwd, baseBranch, git);
   if (!fetchOutcome.ok) {
     return {
       ok: true,
@@ -237,7 +237,7 @@ export function projectMaintainabilityRegressions({
     };
   }
 
-  const diffOutcome = diffChangedFiles({ cwd, epicBranch, storyBranch, git });
+  const diffOutcome = diffChangedFiles({ cwd, baseBranch, storyBranch, git });
   if (!diffOutcome.ok) {
     return {
       ok: true,

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

@@ -72,21 +72,19 @@ function applyChangedFileScope({ gate, spawnCwd, log }) {
  * Worktree locality (Story #1120): when `worktreePath` is supplied, every
  * gate runner is spawned with `cwd: worktreePath` so the gate sees the
  * Story branch's post-rebase tree. Evidence reads/writes still key against
- * `cwd` (the main checkout) because the per-Epic temp tree lives under
- * the main `.git/`. Failure messages name the worktree path.
+ * `cwd` (the main checkout) because the temp tree lives under the main
+ * `.git/`. Failure messages name the worktree path.
  *
- * Evidence-aware: when `storyId` is provided alongside either `epicId` or
- * `standalone: true`, and `useEvidence !== false`, each gate consults
+ * Evidence-aware: when `storyId` is provided alongside `standalone: true`,
+ * and `useEvidence !== false`, each gate consults
  * `validation-evidence.shouldSkip()` against current HEAD + the gate's
  * command-config hash. A matching record skips the gate; a successful run
  * is recorded so the next caller in the local hot path can skip in turn.
  *
- * Standalone keyspace (Story #4250): the standalone path has no parent
- * Epic, so it passes `standalone: true` (and leaves `epicId` null) to route
- * the evidence file to the storyId-anchored
+ * Standalone keyspace (Story #4250): `standalone: true` routes the evidence
+ * file to the storyId-anchored
  * `<tempRoot>/standalone/stories/story-<id>/validation-evidence.json`
- * keyspace instead of feeding a null `epicId` into the Epic-keyed path
- * (which structurally disabled the cache before).
+ * keyspace. v2.0.0 removed the Epic tier and its Epic-keyed keyspace.
  *
  * `onGateStart` is invoked immediately before each gate's runner spawn.
  * story-close uses it to drive `phaseTimer.mark(...)` for per-gate
@@ -100,7 +98,6 @@ function applyChangedFileScope({ gate, spawnCwd, log }) {
  *   log?: (m: string) => void,
  *   onGateStart?: (gate: Gate) => void,
  *   storyId?: number|null,
- *   epicId?: number|null,
  *   standalone?: boolean,
  *   useEvidence?: boolean,
  *   evidenceClock?: () => number,
@@ -118,7 +115,6 @@ export async function runCloseValidation({
   log = () => {},
   onGateStart,
   storyId = null,
-  epicId = null,
   standalone = false,
   useEvidence = true,
   evidenceClock = () => Date.now(),
@@ -129,16 +125,12 @@ export async function runCloseValidation({
   const failed = [];
   const skipped = [];
   // Evidence is active when a Story id is present AND there is a keyspace to
-  // anchor on: either a real Epic id (Epic path) or `standalone: true`
-  // (Story #4250 — standalone storyId-anchored keyspace). A bare `epicId:
-  // null` without `standalone` keeps the cache off, as before.
-  const evidenceActive =
-    useEvidence && storyId != null && (epicId != null || standalone);
-  // The evidence-store opts: `standalone` routes to the storyId-anchored
-  // keyspace; otherwise the Epic-keyed path resolves under `epicId`.
-  const evidenceStoreOpts = { cwd, epicId, standalone };
-  // Evidence keys against the main checkout's HEAD because the per-Epic
-  // evidence file lives under the main `.git/`. Gate spawn, in contrast,
+  // anchor on (`standalone: true` — Story #4250's storyId-anchored
+  // keyspace, now the only one).
+  const evidenceActive = useEvidence && storyId != null && standalone;
+  const evidenceStoreOpts = { cwd, standalone };
+  // Evidence keys against the main checkout's HEAD because the evidence
+  // file lives under the main `.git/`. Gate spawn, in contrast,
   // runs in the worktree when one is supplied — that's the whole point of
   // Story #1120.
   const spawnCwd = worktreePath ?? cwd;

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

@@ -3,19 +3,25 @@
  */
 
 import { writeFile as defaultWriteFile } from 'node:fs/promises';
-import { storyArtifactPath } from '../config/temp-paths.js';
+import path from 'node:path';
+import { storyTempDir } from '../config/temp-paths.js';
 import { getSpawnCount as defaultGetSpawnCount } from '../gh-exec.js';
 
 /**
  * Throw-away ghSpawnCount emitter (Story #1795 / Epic #1788).
  *
  * Writes the current `gh-exec` spawn counter to
- * `temp/epic-<eid>/stories/story-<sid>/gh-spawn-count.json` so the
- * `analyze-execution.js` child process can read it and emit a
- * `ghSpawnCount` field on the `story-perf-summary` payload. The Story-
- * close orchestrator calls this inside `runPostMergeClose` right before
- * the perf-summary phase, capturing every `gh` invocation from preflight
- * through the merge in one counter snapshot.
+ * `temp/run-<id>/stories/story-<sid>/gh-spawn-count.json`.
+ *
+ * Story #4545 — its reader is gone: `analyze-execution.js` consumed this file
+ * to emit a `ghSpawnCount` field on the `story-perf-summary` payload, and both
+ * that CLI and that payload were deleted with the execution-analysis surface.
+ * The writer itself already had no production caller before that (the
+ * `runPostMergeClose` orchestrator named below went in the v2.0.0 cutover), so
+ * this module is production-dead and kept alive only by its own test — the
+ * test-importer blind spot the dead-exports ratchet cannot see. It is left in
+ * place rather than deleted because reviving spawn telemetry against the live
+ * close path is a decision, not a sweep.
  *
  * @param {object} opts
  * @param {number|string} opts.epicId
@@ -50,7 +56,10 @@ export async function emitGhSpawnCount({
     );
     return { status: 'failed', reason: 'counter-read-failed' };
   }
-  const targetPath = storyArtifactPath(eid, sid, 'gh-spawn-count.json', config);
+  const targetPath = path.join(
+    storyTempDir(eid, sid, config),
+    'gh-spawn-count.json',
+  );
   const payload = {
     kind: 'gh-spawn-count',
     epicId: eid,

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

@@ -18,12 +18,13 @@
  * 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
- * acceptance cluster down the contract-identical *inline* critic path, but a
- * fraction of low-risk clusters are still forced through a *fresh-context*
- * critic so "low risk" never degrades to zero independent checking. The rate is
- * clamped into `[0, 1]`; `0` disables the floor (pure risk routing), `1` forces
- * every cluster fresh. The default is `0.2`. See `resolveCeremonyForRisk` in
+ * floor** (Epic #4478, M7-B, Part 2). Ceremony routing sends the acceptance
+ * clusters of a change set that touches no sensitive path down the
+ * contract-identical *inline* critic path, but a fraction of them are still
+ * forced through a *fresh-context* critic so a low derived level never degrades
+ * to zero independent checking. The rate is clamped into `[0, 1]`; `0` disables
+ * the floor (pure level routing), `1` forces every cluster fresh. The default is
+ * `0.2`. See `resolveCeremonyForRisk` in
  * `lib/orchestration/ceremony-routing.js`.
  *
  * Framework-defaults pattern mirrors `lib/config/ci.js#getCiDelivery`.

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

@@ -63,13 +63,13 @@ const SECRET_SEGMENT_PATTERNS = Object.freeze([
 const KEY_MEANINGS = Object.freeze({
   // project.*
   'project.baseBranch':
-    'Default base branch Epics and Stories branch from and merge back into.',
+    'Default base branch Stories branch from and merge back into.',
   'project.paths.agentRoot':
     'Directory holding the distributed agent bundle (instructions, skills, scripts).',
   'project.paths.docsRoot':
     'Directory the mandatory docs-context reads resolve against.',
   'project.paths.tempRoot':
-    'Root for gitignored scratch output (per-Epic run state, mirrors, logs).',
+    'Root for gitignored scratch output (per-run state, mirrors, logs).',
   'project.docsContextFiles':
     'Authoritative files an agent must read before starting any task.',
   'project.commands.lintBaseline':
@@ -114,10 +114,6 @@ const KEY_MEANINGS = Object.freeze({
     'Allowlist of events that fire a webhook notification.',
 
   // planning.*
-  'planning.context.maxBytes':
-    'Byte budget for the planning-context payload before summary mode kicks in.',
-  'planning.context.summaryMode':
-    'When the planner switches to a summarized context representation.',
   'planning.codebaseSnapshot.tier':
     'Depth of the structural codebase view threaded into spec authoring.',
   'planning.codebaseSnapshot.include':
@@ -149,7 +145,7 @@ const KEY_MEANINGS = Object.freeze({
   'delivery.execution.timeoutMs':
     'Per-execution timeout for orchestrated delivery steps.',
   'delivery.lease.ttlMs':
-    'Time-to-live for the Epic lease before a stale claim is reclaimable.',
+    'Time-to-live for the delivery lease before a stale claim is reclaimable.',
   'delivery.ci.watch.pollIntervalMs':
     'Poll cadence (ms) for the merge/CI watch loop.',
   'delivery.ci.watch.maxPolls':
@@ -161,9 +157,7 @@ const KEY_MEANINGS = Object.freeze({
   '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.verifyConcurrencyCap':
-    'Maximum verify steps run in parallel.',
+    'Maximum Stories dispatched in parallel within one wave. Default 3 — conservative by design to keep host-quota consumption predictable. Operators running wide waves with adequate parallel-agent quota should raise this to reduce wall-clock time proportionally.',
   'delivery.worktreeIsolation.enabled':
     'Whether each Story runs in its own git worktree.',
   'delivery.worktreeIsolation.root':
@@ -179,9 +173,9 @@ const KEY_MEANINGS = Object.freeze({
   'delivery.worktreeIsolation.bootstrapFiles':
     '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.',
+    'Poll cadence (seconds) for the close-and-land merge wait after the arm.',
   'delivery.mergeWatch.maxBudgetSeconds':
-    'Wall-clock budget (seconds) before MergeWatcher surfaces budget-exceeded.',
+    'Cumulative wall-clock budget (seconds) across resumes before the merge wait gives up and blocks.',
   'delivery.codeReview.providers':
     'Ordered provider chain the code-review phase consults.',
   'delivery.codeReview.maxFixAttempts':
@@ -195,7 +189,7 @@ const KEY_MEANINGS = Object.freeze({
   '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).',
+    'Acceptance-ceremony depth: minimal (always inline), standard (derived-level 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':
@@ -217,7 +211,7 @@ const KEY_MEANINGS = Object.freeze({
   'delivery.acceptanceEval.maxRounds':
     'Redraft rounds the per-Story acceptance self-eval loop runs before escalating to agent::blocked (default 2; clamped to a hard ceiling that cannot be disabled).',
   'delivery.acceptanceEval.clusterCeiling':
-    'Max acceptance criteria one single-delivery acceptance critic scores per fresh-context pass; the Epic ACs are split into ceil(totalACs / clusterCeiling) maker-blind critic clusters (default 4; clamped to [1, 8]).',
+    'Max acceptance criteria one single-delivery acceptance critic scores per fresh-context pass; the Story ACs are split into ceil(totalACs / clusterCeiling) maker-blind critic clusters (default 4; clamped to [1, 8]).',
 
   // qa.*
   'qa.featureRoot': 'Root directory holding the QA harness .feature files.',
@@ -252,7 +246,7 @@ const PREFIX_MEANINGS = Object.freeze([
   ],
   ['delivery.quality', 'Delivery-time quality configuration.'],
   ['delivery.signals', 'Threshold for a delivery friction/telemetry signal.'],
-  ['delivery.mergeWatch', 'MergeWatcher poll cadence and wall-clock budget.'],
+  ['delivery.mergeWatch', 'Merge-wait poll cadence and wall-clock budget.'],
   [
     'delivery.feedbackLoop',
     'Opt-out toggles for auto-filing non-blocking findings.',
@@ -282,7 +276,7 @@ const PREFIX_MEANINGS = Object.freeze([
 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.',
+  planning: 'Inputs and guardrails for /plan.',
   delivery: 'Execution, isolation, quality, and CI settings for delivery.',
   qa: 'Agent-driven QA harness contract.',
 });

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

@@ -55,11 +55,13 @@ export const NOTIFICATIONS_DEFAULTS = Object.freeze({
     'operator-message',
   ]),
   webhookEvents: Object.freeze([
-    'epic-started',
-    'epic-progress',
-    'epic-blocked',
-    'epic-unblocked',
-    'epic-complete',
+    'state-transition',
+    'story-merged',
+    'story-closing',
+    'operator-message',
+    'merge.unlanded',
+    'merge.flip-failed',
+    'loop.tick',
   ]),
 });