mandrel 2.0.0 → 2.2.0

package/.agents/scripts/lib/single-story/story-merged-notify.js

@@ -41,7 +41,13 @@ export async function flipLabelAndNotify({
   config,
   progress,
 }) {
-  const labelFlipped = await flipLabel(provider, storyId, story, progress);
+  const labelFlipped = await flipLabel(
+    provider,
+    storyId,
+    story,
+    progress,
+    config,
+  );
   if (!labelFlipped) return;
   await fireStoryClosingNotify({
     notifyFn: notifyFn ?? defaultNotify,
@@ -55,7 +61,7 @@ export async function flipLabelAndNotify({
   });
 }
 
-async function flipLabel(provider, storyId, story, progress) {
+async function flipLabel(provider, storyId, story, progress, config) {
   try {
     // Story #3385 — flip to `agent::closing`, NOT `agent::done`. The
     // canonical mutator (`transitionTicketState`) only closes the GitHub
@@ -81,8 +87,13 @@ async function flipLabel(provider, storyId, story, progress) {
     // notification that `transitionTicketState` would dispatch is
     // redundant with the typed `story-closing` event that
     // `fireStoryClosingNotify` emits immediately afterwards.
+    //
+    // `config` is threaded so the on-disk board-metadata cache (issue #4555)
+    // lands under the project's configured `tempRoot` rather than the
+    // framework default, matching every other transition call site.
     await transitionTicketState(provider, storyId, STATE_LABELS.CLOSING, {
       ticketSnapshot: story,
+      config,
     });
     progress?.('LABELS', `🏷️  Story #${storyId} → agent::closing`);
     return true;

package/.agents/scripts/lib/skills/parse-skill.js

@@ -30,6 +30,8 @@ const FRONTMATTER_DELIMITER = '---';
 const POLICY_HEADING_RE = /^## Policy Capsule\s*$/;
 const ANY_H2_RE = /^## /;
 const BULLET_RE = /^- /;
+/** An indented (wrapped) continuation of the bullet above it. */
+const CONTINUATION_RE = /^\s+\S/;
 
 /**
  * Repo root resolver. Walks up from the SKILL.md path until we find a
@@ -85,8 +87,14 @@ function extractFrontmatterBlock(lines, skillPath) {
 /**
  * Scan the body for the '## Policy Capsule' heading and count contiguous
  * top-level '- ' bullets that follow it, stopping at the next '## ' heading
- * or end-of-file. Blank lines inside the bullet run do not reset the count;
- * a non-bullet, non-blank line does.
+ * or end-of-file. Blank lines inside the bullet run do not reset the count.
+ *
+ * An **indented** continuation line belongs to the bullet above it — capsule
+ * bullets routinely wrap at the document's prose width — so it neither counts
+ * as a new bullet nor terminates the run. Only a **flush-left**, non-blank,
+ * non-bullet line after the run terminates it (Story #4546: treating any
+ * non-bullet line as a terminator counted a wrapped 5-bullet capsule as 1 and
+ * tripped the floor in validate-skills.js).
  */
 function findPolicyCapsule(lines, bodyStart) {
   let headingIndex = -1;
@@ -114,8 +122,13 @@ function findPolicyCapsule(lines, bodyStart) {
       // Blank lines inside or before the bullet run are tolerated.
       continue;
     }
+    if (sawBulletRun && CONTINUATION_RE.test(line)) {
+      // Indented continuation of the bullet above — same bullet, not a
+      // terminator. Wrapped capsule bullets are the norm, not an error.
+      continue;
+    }
     if (sawBulletRun) {
-      // Non-blank, non-bullet line after the bullet run terminates it.
+      // Flush-left, non-blank, non-bullet line after the run terminates it.
       break;
     }
     // Leading prose between heading and the first bullet is allowed.

package/.agents/scripts/lib/story-adjacency.js

@@ -42,16 +42,17 @@ import { parseBlockedBy } from './dependency-parser.js';
  *   Story records (live ticket payloads, fixture tickets, or operator
  *   DAG nodes).
  * @param {object} [opts]
- * @param {boolean} [opts.dropForeign=true] When true (the default,
- *   matching pre-v2 Epic-scoped wrappers), edges pointing at ids outside
+ * @param {boolean} [opts.dropForeign=false] When `false` (the v2 default,
+ *   matching the `/deliver` path — `stories-wave-tick.js` and the
+ *   `selectReadySet` core), the operator-DAG contract is preserved: a
+ *   dependency on an id absent from the input is treated as not-yet-done
+ *   and withholds the dependent until it completes. When `true` (the
+ *   pre-v2 Epic-scoped-wrapper semantics), edges pointing at ids outside
  *   the supplied story set are dropped so the DAG stays closed over the
- *   scheduled set. The v2 `/deliver` path (`stories-wave-tick.js` and the
- *   `selectReadySet` core) passes `false` to preserve the operator-DAG
- *   contract, where a dependency on an id absent from the input is treated
- *   as not-yet-done and withholds the dependent until it completes.
+ *   scheduled set.
  * @returns {Map<number, number[]>}
  */
-export function buildStoryAdjacency(stories, { dropForeign = true } = {}) {
+export function buildStoryAdjacency(stories, { dropForeign = false } = {}) {
   const records = Array.isArray(stories) ? stories : [];
   const storyIds = new Set(records.map((s) => Number(s?.id ?? s?.number)));
   const adjacency = new Map();

package/.agents/scripts/lib/story-body/story-body.js

@@ -105,10 +105,9 @@ import { FILE_ASSUMPTION_VALUES } from '../orchestration/file-assumption-enum.js
 
 /**
  * @typedef {object} SerializeOptions
- * @property {boolean} [includeFooter=false] - Include `---\nparent/epic/blocked-by` footer.
+ * @property {boolean} [includeFooter=false] - Include `---\nparent/blocked-by` footer.
  * @property {object}  [footer]              - Footer fields when `includeFooter` is true.
  * @property {number}  [footer.parent]       - Parent feature issue number.
- * @property {number}  [footer.epic]         - Epic issue number.
  */
 
 // ---------------------------------------------------------------------------
@@ -166,13 +165,35 @@ function stripListMarker(line) {
   return line.replace(/^-\s+(?:\[\s*[xX ]?\s*\]\s+)?/, '').trim();
 }
 
+// Humanized PathEntry bullet (Story #4600): `path` — assumption. This is the
+// shape serialize() now emits for `## Changes` / `## References`; the legacy
+// inline-JSON object bullet remains accepted at parse time indefinitely (live
+// issue bodies are never rewritten).
+const HUMANIZED_PATH_ENTRY_RE = /^`([^`]+)`\s+—\s+(\S+)$/;
+
+// AC-<n> presentation prefix on acceptance checkboxes (Story #4600). The
+// numbering is a stable 1-based human handle only — parse() strips it so the
+// top-level acceptance[] machine contract round-trips byte-identical.
+const AC_PREFIX_RE = /^AC-\d+:\s+/;
+
+// Visible wide-rationale line (Story #4600): `> **Wide:** <reason>` rendered
+// under `## Goal`. Presentation only — the `<!-- meta -->` block stays the
+// canonical machine carrier, so the parser skips this line wherever it
+// appears (same treatment as the authored-provenance marker).
+const WIDE_MARKER_LINE_RE = /^>\s*\*\*Wide:\*\*/;
+
 /**
  * Parse a single `changes` / `references` bullet into a `PathEntry`.
  *
- * Object form: `{ path: "...", assumption: "creates" }` (stored as
- * `- { "path": "...", "assumption": "..." }` or just recognized from the
- * structured body directly — when deserializing from a structured object
- * that was never serialized to markdown, the entry arrives as-is).
+ * Accepted markdown shapes (both parsed indefinitely — live issue bodies
+ * are never rewritten):
+ *   - Humanized bullet (canonical serialize() output since Story #4600):
+ *     `` `src/x.js` — refactors-existing ``
+ *   - Legacy inline-JSON object bullet:
+ *     `- { "path": "...", "assumption": "..." }`
+ *
+ * A structured object entry (from a parsed JSON body that was never
+ * serialized to markdown) arrives as-is and is validated directly.
  *
  * @param {string|object} raw
  * @param {string[]} warnings
@@ -198,6 +219,21 @@ function parsePathEntry(raw, warnings) {
   const str = typeof raw === 'string' ? raw.trim() : String(raw).trim();
   if (str.length === 0) return null;
 
+  // Humanized bullet shape (the canonical serialize() output since
+  // Story #4600): `path` — assumption.
+  const humanized = str.match(HUMANIZED_PATH_ENTRY_RE);
+  if (humanized) {
+    const path = humanized[1].trim();
+    if (path.length > 0 && FILE_ASSUMPTION_VALUES.includes(humanized[2])) {
+      return { path, assumption: humanized[2] };
+    }
+    // Recognized the humanized shape but the fields are invalid: fail closed.
+    throw new StoryBodyParseError(
+      `changes/references entry is a humanized bullet but not a valid PathEntry: ${str.slice(0, 120)}`,
+      { field: 'changes', raw: str },
+    );
+  }
+
   // Try to detect inline JSON object shape: `{ "path": "...", "assumption": "..." }`
   if (str.startsWith('{')) {
     try {
@@ -434,6 +470,14 @@ function splitSections(markdown) {
       continue;
     }
 
+    // The visible `> **Wide:** <reason>` rationale line is presentation only
+    // (Story #4600): the meta block remains the canonical carrier for
+    // `wide.reason`, so this line must not bleed into the goal (or any other)
+    // section. Skip it wherever it appears.
+    if (WIDE_MARKER_LINE_RE.test(line)) {
+      continue;
+    }
+
     if (inPreamble) {
       preambleLines.push(line);
     } else if (currentSection !== null) {
@@ -638,7 +682,11 @@ export function parse(input) {
     sections.get('changes') ?? [],
     warnings,
   );
-  const acceptance = parseTextListSection(sections.get('acceptance') ?? []);
+  // The AC-<n> checkbox prefix is presentation-only (Story #4600): strip it
+  // so acceptance[] round-trips byte-identical to the authored array.
+  const acceptance = parseTextListSection(sections.get('acceptance') ?? []).map(
+    (a) => a.replace(AC_PREFIX_RE, ''),
+  );
   const verify = parseTextListSection(sections.get('verify') ?? []);
   const references = parsePathEntrySection(
     sections.get('references') ?? [],
@@ -821,8 +869,10 @@ function parseStructuredObject(obj) {
  */
 function serializePathEntry(entry) {
   if (typeof entry === 'string') return entry;
-  // Canonical object form: render as JSON inline for round-trip fidelity.
-  return JSON.stringify({ path: entry.path, assumption: entry.assumption });
+  // Canonical object form (Story #4600): render as a human-readable bullet —
+  // path in backticks, em-dash, assumption. parsePathEntry recognizes this
+  // shape (and the legacy inline-JSON shape) for round-trip fidelity.
+  return `\`${entry.path}\` — ${entry.assumption}`;
 }
 
 /**
@@ -846,6 +896,18 @@ const SERIALIZE_SECTIONS = [
         ? `## Goal\n${goal.trim()}`
         : null,
   },
+  {
+    // Visible wide-rationale line (Story #4600), rendered directly under
+    // `## Goal`. Presentation only: the `<!-- meta -->` block remains the
+    // canonical machine carrier and the parser skips this line, so `wide`
+    // round-trips through the meta block alone. Absent/invalid wide emits
+    // nothing, keeping every non-wide body byte-identical to before.
+    field: 'wide',
+    render: (wide) => {
+      const normalized = normalizeWide(wide);
+      return normalized === null ? null : `> **Wide:** ${normalized.reason}`;
+    },
+  },
   {
     // Optional v2 intra-Story delivery slice plan. Single-token `## Slicing`
     // heading (recognized by the `[\w-]+` field-heading regex). Verbatim text
@@ -874,10 +936,14 @@ const SERIALIZE_SECTIONS = [
         : null,
   },
   {
+    // Each checkbox carries a stable 1-based `AC-<n>:` handle (Story #4600)
+    // so humans and reviewers can reference criteria by number. The prefix
+    // is presentation-only — parse() strips it, and validators compare the
+    // top-level acceptance[] array, so numbering never affects gating.
     field: 'acceptance',
     render: (acceptance) =>
       Array.isArray(acceptance) && acceptance.length > 0
-        ? `## Acceptance\n${acceptance.map((a) => `- [ ] ${a}`).join('\n')}`
+        ? `## Acceptance\n${acceptance.map((a, i) => `- [ ] AC-${i + 1}: ${a}`).join('\n')}`
         : null,
   },
   {
@@ -967,8 +1033,8 @@ function serializeAuthoredMarker(body) {
 }
 
 /**
- * Build the optional `---` footer block (`parent` / `Epic` / `blocked by`
- * lines). Returns the empty string when `opts.includeFooter` is falsy.
+ * Build the optional `---` footer block (`parent` / `blocked by` lines).
+ * Returns the empty string when `opts.includeFooter` is falsy.
  *
  * @param {StoryBody} body
  * @param {SerializeOptions} opts
@@ -978,7 +1044,9 @@ function serializeFooter(body, opts) {
   if (!opts.includeFooter) return '';
   const footerLines = ['---'];
   if (opts.footer?.parent) footerLines.push(`parent: #${opts.footer.parent}`);
-  if (opts.footer?.epic) footerLines.push(`Epic: #${opts.footer.epic}`);
+  // Story #4545 — no `Epic: #N` branch. `pr-base-guard.js` hard-refuses a
+  // Story body carrying that footer, so composing one here would let the
+  // framework generate work it would then reject at delivery.
   if (Array.isArray(body.depends_on)) {
     for (const dep of body.depends_on) {
       footerLines.push(`blocked by ${dep}`);

package/.agents/scripts/lib/templates/decomposer-prompts.js

@@ -26,9 +26,8 @@ import {
  */
 export function renderDecomposerSystemPrompt({
   maxTickets = LIMITS_DEFAULTS.maxTickets,
-  epicId = null,
 } = {}) {
-  return render2TierPrompt({ maxTickets, epicId });
+  return render2TierPrompt({ maxTickets });
 }
 
 /**
@@ -37,7 +36,7 @@ export function renderDecomposerSystemPrompt({
  * on the Story body so the executing agent has everything it needs in one
  * ticket. Thematic grouping lives as prose in the Epic body / Tech Spec.
  */
-function render2TierPrompt({ maxTickets, epicId = null }) {
+function render2TierPrompt({ maxTickets }) {
   // v2 Stage 3: default-single — emit one Story unless the split policy clears.
   // Capacity thresholds are sourced from the single DEFAULT_MODEL_CAPACITY
   // constant (ticket-validator-sizing.js) so the prompt and the validator
@@ -64,13 +63,6 @@ function render2TierPrompt({ maxTickets, epicId = null }) {
     advisoryCaveat,
     newFileContract,
   } = AUTHORING_ALTITUDE_GUIDANCE;
-  // The namespaced AC-tag token the wave-0 BDD scaffold section below must
-  // require on every scaffolded scenario (Story #4301). When the Epic ID is
-  // known at render time, interpolate the concrete tag so the author has no
-  // placeholder to get wrong; otherwise fall back to the documented pattern.
-  const acTagExample = Number.isInteger(epicId)
-    ? `@epic-${epicId}-ac-1`
-    : '@epic-<id>-ac-N';
   return `You are an expert Senior Project Manager and Orchestrator.
 Your job is to turn a plan seed / Tech Spec into a Story ticket array for an AI Agent to execute.
 
@@ -82,7 +74,9 @@ Your job is to turn a plan seed / Tech Spec into a Story ticket array for an AI
    - Thematic grouping is prose in the Story's folded \`## Spec\` / \`## Slicing\`, never sibling tickets for coupled work.
 
 ### LABEL CONVENTIONS:
-- Every ticket must have the \`type::story\` label. No other type label is allowed — the retired Feature and Task tiers have no labels under this hierarchy.
+- \`type::story\` is applied automatically by persist — you do not need to emit it, and no other type label is allowed (the retired Feature and Task tiers have no labels under this hierarchy).
+- \`labels[]\` is **optional**. Emit it only to request an *additional* label; persist sanitizes the list before applying it.
+- Do **not** emit \`agent::*\` labels — lifecycle state is runtime-owned, and persist applies \`agent::ready\` itself once every checkpoint is on the ticket.
 - Do **not** emit \`persona::*\` labels — the behavioral persona concept (and its label axis) was removed in v2.
 
 ### OUTPUT FORMAT:
@@ -97,7 +91,7 @@ You MUST respond ONLY with a valid JSON array of objects. No prose, no markdown
     "body": <string — see STORY BODY SCHEMA below>,
     "acceptance": ["<testable, observable criterion>", ...],
     "verify": ["<exact command or test path> (<tier>)", ...],
-    "labels": ["type::story"],
+    "labels": ["<extra-label>"] (optional — type::story is applied automatically; omit this field unless you need an additional label),
     "depends_on": ["slug-of-blocking-dependency"] (optional array of Story slugs that block execution)
   }
 ]
@@ -107,7 +101,9 @@ You MUST respond ONLY with a valid JSON array of objects. No prose, no markdown
 ### STORY BODY SCHEMA (REQUIRED FOR EVERY STORY):
 \`body\` MUST be a **string** — the serialized markdown produced by \`serialize()\` from \`lib/story-body/story-body.js\`. Do NOT emit \`body\` as a JSON object: an object body throws \`StoryBodyParseError\` in the reconciler (Story #3302) and is discarded by the GitHub provider, producing an empty issue body. Stories are consumed by non-interactive sub-agents that must self-verify from the Story ticket alone — so the ticket must carry everything an agent needs to execute and self-verify.
 
-The \`acceptance[]\` and \`verify[]\` arrays live at the **top level** of the Story ticket object — that is the machine contract the validator reads. Persist syncs those arrays into the body's \`## Acceptance\` / \`## Verify\` sections so the GitHub issue stays a complete executable document. Prefer authoring the lists **once at top-level** and omitting those sections from the authored \`body\` string (or mirroring the exact same items). Do **not** invent a second criteria list inside \`## Spec\`, and do not author a separate Acceptance Spec / PRD artifact.
+The \`acceptance[]\` and \`verify[]\` arrays live at the **top level** of the Story ticket object — that is the machine contract the validator reads. Author each list **once, at top level**, and **omit** the \`## Acceptance\` / \`## Verify\` sections from the authored \`body\` string: persist syncs the top-level arrays into those sections so the GitHub issue stays a complete executable document. The validator resolves both fields from the top level, so an omitted section is the expected shape, not a violation.
+
+If you do write those sections into the \`body\` string anyway, they must mirror the top-level arrays **item for item** — persist fails closed on a disagreement rather than guessing which list is authoritative. Do **not** invent a second criteria list inside \`## Spec\`, and do not author a separate Acceptance Spec / PRD artifact.
 
 The serialized \`body\` string renders these markdown sections (in order):
 
@@ -150,6 +146,10 @@ The serialized \`body\` string renders these markdown sections (in order):
 - **verify** (top-level array on the ticket object): Each entry MUST name a testing tier in parentheses, drawn from \`unit\` / \`contract\` / \`e2e\` / \`validate\`. Example: \`npm run test -- src/x.test.ts (unit)\`, \`npm run validate (validate)\`. Stories with zero verify entries SHOULD fail validation; if a story is genuinely unverifiable in isolation (e.g., a copy edit auditor will eyeball), the literal entry \`manual:<reason>\` is allowed so the absence is intentional, not lazy. Manual entries without a reason are rejected.
 - **reason to exist** (REQUIRED, encoded as the \`reason_to_exist\` field of the \`<!-- meta: {...} -->\` comment appended to the serialized body string — NOT a top-level ticket field): One sentence stating the single coherent reason this Story exists, distinct from its broader \`## Goal\` prose. Every Story MUST carry a non-empty \`reason_to_exist\`; it is the machine-checkable form of the cohesion rule (**one Story = one coherent change with one reason to exist**) and the \`epic-plan-consolidate\` critic flags any Story whose body carries no non-empty reason to exist. Encode it as \`<!-- meta: {"reason_to_exist": "..."} -->\`.
 - **estimated_test_files** (optional, encoded in the \`<!-- meta: {...} -->\` comment appended to the serialized body string — NOT a top-level ticket field): Integer estimate of how many test files this Story creates or modifies. Omit when the number is not estimable. Informational only — it does not gate the decompose.
+- **Observed-behavior claims open with \`Current state (verified <date>)\`.** Any Spec claim about how the codebase behaves today MUST open with that preamble (e.g. \`Current state (verified 2026-07-17): …\`) so a reader can tell a verified observation from an assumption, and can tell when the observation went stale.
+- **Intent-then-proxy acceptance shape.** When an acceptance item verifies through a proxy check (a grep, a file-exists probe, an exit-code test), state the intent clause before the proxy check — what outcome the check stands in for — so the proxy never becomes the goal (e.g. "the workflow names hygiene findings as re-author input: \`grep -n "textHygiene" …\` exits 0").
+- **Slicing checkpoints are one line each.** Each \`## Slicing\` checkpoint is a single line naming the checkpoint; implementation detail lives in \`## Spec\`, never duplicated into Slicing. A Slicing section outweighing its Spec is a defect the text-hygiene lint flags.
+- **Bodies record decisions, never questions to the operator.** Never persist an open question ("Flag if…", "TBD", "confirm with the operator") into a Story body — the executing sub-agent is non-interactive and cannot answer it. Resolve the unknown before authoring, or restate it as a declarative Key Assumption the agent can act on.
 - **non_goals** (OPTIONAL, in body string as the \`## Non-Goals\` section): A short list of capabilities or changes this Story explicitly does NOT deliver — an advisory negative-scope bound that fences the executing agent away from adjacent work. It is **advisory and NON-GATING**: the validator does not require, count, or reject on it, and an absent or empty section renders nothing. Use the EXACT single-word hyphenated heading spelling \`## Non-Goals\` (a space-separated heading like \`## Out of Scope\` is NOT recognized by the parser and will be dropped). Reach for it when a Story's negative boundary is non-obvious from its \`acceptance[]\` alone; omit it otherwise.
 
 #### AUTHORING ALTITUDE — BINDING ACCEPTANCE vs ADVISORY CHANGES:
@@ -225,9 +225,8 @@ When the Acceptance Spec contains **one or more \`Disposition: new\` rows**, you
 - **goal**: contains the literal token \`bdd-scaffold\` (e.g. "bdd-scaffold: create the @skip-tagged feature files the implementation Stories verify against").
 - **depends_on**: EMPTY (\`[]\`) — it runs first, in wave 0.
 - **changes**: one entry per distinct \`.feature\` file named in a \`new\` row, each \`{ "path": "<feature file path>", "assumption": "creates" }\`.
-- **acceptance**: MUST assert (a) every new \`.feature\` file exists, (b) every new scenario within them carries an \`@skip\` tag, AND (c) every new scenario also carries its **namespaced per-Epic AC tag** \`${acTagExample}\` (one tag per AC ID the scenario satisfies — see below). Keep these observable (a grep/validate command exits 0, a file exists at a path).
-- **Namespaced AC tag is REQUIRED at scaffold time, not only at de-skip time.** Phase 7 finalize's \`acceptance-spec-reconciler.js\` matches AC IDs only against \`@epic-<id>-ac-*\` / \`@pending\` tags in \`tests/features/**\` — a bare \`@ac-N\` tag is deliberately ignored to prevent cross-Epic collision. A scaffolded scenario that carries \`@skip\` but omits \`@epic-<id>-ac-N\` reads as \`missing[]\` at finalize and aborts the close even after the implementation Story de-skips it, because the tag was never added. Tag each scenario with both \`@skip\` AND \`${acTagExample}\` (substituting the AC's own number) in this SAME wave-0 pass — do not defer the AC tag to the later de-skip edit.
-- **verify**: a grep/validate command (tier \`validate\`), NOT an e2e runner — verifying that a file exists with the required tags needs no browser/playwright run. Example: \`grep -rL '@skip' tests/features/<area>/*.feature (validate)\` paired with an existence check, AND a check that every new AC ID's namespaced tag (\`${acTagExample}\`) appears in the scaffolded files, e.g. \`grep -q '${acTagExample}' tests/features/<area>/<file>.feature (validate)\` for each new AC row.
+- **acceptance**: MUST assert (a) every new \`.feature\` file exists AND (b) every new scenario within them carries an \`@skip\` tag. Keep these observable (a grep/validate command exits 0, a file exists at a path).
+- **verify**: a grep/validate command (tier \`validate\`), NOT an e2e runner — verifying that a file exists with the required tags needs no browser/playwright run. Example: \`grep -rL '@skip' tests/features/<area>/*.feature (validate)\` paired with an existence check.
 - Each implementation Story whose \`verify[]\` references one of these scaffolded \`.feature\` paths MUST \`depends_on\` the scaffold Story (so the scaffold lands in an earlier wave). Omitting the link trips the soft \`missing-bdd-scaffold\` validator finding.
 
 When the Acceptance Spec contains **zero \`new\`-disposition rows** (every row is \`updated\` or \`unchanged\`), do NOT emit a scaffold Story — there is nothing to create.

package/.agents/scripts/lib/test-env.js

@@ -17,12 +17,25 @@
  *     the NODE_ENV band-aid was removed in Story #3342. Tests that need to
  *     exercise the webhook POST inject `opts.fetchImpl` instead, so the
  *     request never reaches the real network even if a URL resolves.)
+ *   - Every `GIT_*` variable is dropped. When the suite runs inside a git
+ *     hook (husky pre-push via the coverage-capture path), the parent git
+ *     invocation exports `GIT_DIR` — from a linked worktree, the absolute
+ *     `<main>/.git/worktrees/<name>` path. A test fixture's `git init`
+ *     under that env re-initializes the shared gitdir and writes
+ *     `core.bare=true` into the MAIN checkout's `.git/config`, breaking
+ *     every worktree at once (#4580). Production git call sites are
+ *     covered by `cleanGitEnv` in `git-utils.js`; this is the same scrub
+ *     for test child processes, which may spawn git directly. Tests that
+ *     need a `GIT_*` variable set it explicitly on their own spawn.
  *
  * @param {NodeJS.ProcessEnv} baseEnv
  * @returns {NodeJS.ProcessEnv}
  */
 export function buildWebhookSafeTestEnv(baseEnv = process.env) {
-  const env = { ...baseEnv, NODE_ENV: baseEnv.NODE_ENV ?? 'test' };
+  const env = Object.fromEntries(
+    Object.entries(baseEnv).filter(([k]) => !k.startsWith('GIT_')),
+  );
+  env.NODE_ENV = baseEnv.NODE_ENV ?? 'test';
   if (env.MANDREL_ALLOW_TEST_WEBHOOKS !== '1') {
     delete env.NOTIFICATION_WEBHOOK_URL;
   }

package/.agents/scripts/lib/test-tiers.js

@@ -12,13 +12,10 @@ import picomatch from 'picomatch';
  */
 export const INTEGRATION_INCLUDE = [
   'tests/**/*.integration.test.js',
-  'tests/epic-execute/epic-execute-record-wave.test.js',
   'tests/hook-chain-reflog-invariant.test.js',
-  'tests/push-epic-retry.test.js',
   'tests/contract/check-baselines-regression.test.js',
   'tests/contract/check-baselines-kernel-mismatch.test.js',
   'tests/integration-prime-after-sweep.test.js',
-  'tests/concurrency-wiring.test.js',
   'tests/scripts/git-cleanup.test.js',
   'tests/lib/checks/runner-integration.test.js',
   'tests/single-story-close-sync.test.js',

package/.agents/scripts/lib/ticket-body-sections.js

@@ -107,20 +107,6 @@ export function hasTicketSection(body, kind) {
   return locate(body, kind) !== null;
 }
 
-/**
- * Extract a managed region's content (between the markers, trimmed).
- * Returns `null` when the region is absent.
- *
- * @param {string} body
- * @param {'techSpec'|'acceptanceTable'} kind
- * @returns {string|null}
- */
-export function extractTicketSection(body, kind) {
-  const loc = locate(body, kind);
-  if (!loc) return null;
-  return body.slice(loc.contentStart, loc.contentEnd).trim();
-}
-
 /**
  * Insert or replace a managed region, preserving every byte outside it.
  *

package/.agents/scripts/lib/validation-evidence.js

@@ -3,15 +3,12 @@
  *
  * Tech Spec #819 §"Evidence record (Story 7)". Each successful gate run
  * writes a record keyed by `{ gateName, commitSha, commandConfigHash }` to
- * a per-Epic-tree path under the resolved `tempRoot`:
+ * a storyId-anchored path under the resolved `tempRoot`:
  *
- *   - Epic-scoped (scopeId === epicId):
- *       `<tempRoot>/epic-<epicId>/validation-evidence.json`
- *   - Story-scoped (scopeId === storyId):
- *       `<tempRoot>/epic-<epicId>/story-<storyId>/validation-evidence.json`
+ *   `<tempRoot>/standalone/stories/story-<storyId>/validation-evidence.json`
  *
- * Both paths sit inside the per-Epic durable workspace (Epic #1030, Stories
- * #1039 + #1054) and are gitignored via `temp/`.
+ * The path is gitignored via `temp/`. v2.0.0 removed the Epic tier along
+ * with the Epic-keyed `<tempRoot>/epic-<epicId>/…` keyspace.
  *
  * A subsequent caller can `shouldSkip(...)` to learn whether the same gate
  * has already passed against the current HEAD with an identical
@@ -34,7 +31,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import Ajv from 'ajv/dist/2020.js';
 import addFormats from 'ajv-formats';
-import { epicTempDir, storyTempDir } from './config/temp-paths.js';
+import { storyTempDir } from './config/temp-paths.js';
 
 export const SCHEMA_VERSION = 1;
 const DEFAULT_TEMP_DIR = 'temp';
@@ -97,37 +94,28 @@ function requirePositiveInt(value, label) {
 
 /**
  * Compute the absolute path of the evidence file for `scopeId` under the
- * per-Epic temp tree.
+ * storyId-anchored temp tree.
  *
- * The resolution rule mirrors `lib/config/temp-paths.js`:
- *   - `scopeId === epicId` → `<tempRoot>/epic-<epicId>/validation-evidence.json`
- *   - `scopeId !== epicId` → treated as a Story id → `<tempRoot>/epic-<epicId>/story-<scopeId>/validation-evidence.json`
- *
- * **Standalone keyspace (Story #4250).** When `opts.standalone === true`,
+ * **Standalone keyspace (Story #4250).** `opts.standalone` must be `true`:
  * the Story has no parent Epic, so the evidence file is anchored on the
  * Story id alone at
  * `<tempRoot>/standalone/stories/story-<scopeId>/validation-evidence.json`
- * (the `storyTempDir(null, sid)` layout from Story #2874). In this mode
- * `epicId` is ignored — callers MUST NOT feed a `0`/`null` epicId into the
- * Epic-keyed branch (the historical bug this keyspace replaces). Outside
- * standalone mode `epicId` remains required.
+ * (the `storyTempDir(null, sid)` layout from Story #2874).
  *
- * The legacy flat `temp/validation-evidence-<scopeId>.json` layout is no
- * longer supported — Epic-scoped callers must thread the Epic id through
- * (Epic #1030 follow-up to Story #1054). The synthetic config bag passed to
- * `epicTempDir` / `storyTempDir` keeps the resolver from doing a disk-bound
- * `.agentrc.json` lookup; bare callers can pass `tempDir` via `opts` to
- * override the default `'temp'`.
+ * The legacy flat `temp/validation-evidence-<scopeId>.json` layout and the
+ * Epic-keyed `<tempRoot>/epic-<epicId>/…` layout are both gone. The
+ * synthetic config bag passed to `storyTempDir` keeps the resolver from
+ * doing a disk-bound `.agentrc.json` lookup; bare callers can pass
+ * `tempDir` via `opts` to override the default `'temp'`.
  *
  * @param {number|string} scopeId
- * @param {{ cwd?: string, tempDir?: string, epicId?: number|string|null, standalone?: boolean }} opts
+ * @param {{ cwd?: string, tempDir?: string, standalone?: boolean }} opts
  * @returns {string}
  */
 export function evidencePath(scopeId, opts = {}) {
-  const standalone = opts.standalone === true;
-  if (!standalone && opts.epicId == null) {
+  if (opts.standalone !== true) {
     throw new Error(
-      '[validation-evidence] evidencePath requires opts.epicId (Epic-scoped path resolution) unless opts.standalone is set.',
+      '[validation-evidence] evidencePath requires opts.standalone (the storyId-anchored keyspace is the only keyspace).',
     );
   }
   const { cwd, tempDir } = resolveOpts(opts);
@@ -143,18 +131,9 @@ export function evidencePath(scopeId, opts = {}) {
     ? tempDir
     : path.join(cwd, tempDir);
   const configBag = { project: { paths: { tempRoot: absTempRoot } } };
-  let dir;
-  if (standalone) {
-    // Story #4250 — storyId-anchored standalone keyspace. `null` is the
-    // standalone-story sentinel `storyTempDir` accepts (Story #2874).
-    dir = storyTempDir(null, scope, configBag);
-  } else {
-    const epicId = requirePositiveInt(opts.epicId, 'epicId');
-    dir =
-      scope === epicId
-        ? epicTempDir(epicId, configBag)
-        : storyTempDir(epicId, scope, configBag);
-  }
+  // Story #4250 — storyId-anchored standalone keyspace. `null` is the
+  // standalone-story sentinel `storyTempDir` accepts (Story #2874).
+  const dir = storyTempDir(null, scope, configBag);
   return path.join(dir, EVIDENCE_FILENAME);
 }
 
@@ -189,19 +168,17 @@ function emptyDoc(scopeId) {
  * cross-scopeId cases — callers don't have to branch on those failure
  * modes; they manifest as `shouldSkip()` returning `skip: false`.
  *
- * `opts.epicId` is required so the per-Epic-tree path can be resolved,
- * unless `opts.standalone === true` (Story #4250) routes to the
- * storyId-anchored standalone keyspace.
+ * `opts.standalone` is required (Story #4250) — it routes to the
+ * storyId-anchored keyspace.
  *
  * @param {number|string} scopeId
- * @param {{ cwd?: string, tempDir?: string, epicId?: number|string|null, standalone?: boolean, fs?: object }} opts
+ * @param {{ cwd?: string, tempDir?: string, standalone?: boolean, fs?: object }} opts
  * @returns {{ storyId: number, schemaVersion: number, records: object[] }}
  */
 export function loadEvidence(scopeId, opts = {}) {
   const resolved = resolveOpts(opts);
   const file = evidencePath(scopeId, {
     ...resolved,
-    epicId: opts.epicId,
     standalone: opts.standalone,
   });
   if (!resolved.fs.existsSync(file)) return emptyDoc(scopeId);
@@ -223,9 +200,8 @@ export function loadEvidence(scopeId, opts = {}) {
  * Validates the resulting document against the schema before writing — a
  * malformed write throws so the bug surfaces immediately.
  *
- * `opts.epicId` is required so the per-Epic-tree path can be resolved,
- * unless `opts.standalone === true` (Story #4250) routes to the
- * storyId-anchored standalone keyspace.
+ * `opts.standalone` is required (Story #4250) — it routes to the
+ * storyId-anchored keyspace.
  *
  * @param {{
  *   storyId: number|string,
@@ -235,7 +211,7 @@ export function loadEvidence(scopeId, opts = {}) {
  *   exitCode?: number,
  *   durationMs?: number|null,
  * }} input
- * @param {{ cwd?: string, tempDir?: string, epicId?: number|string|null, standalone?: boolean, fs?: object, now?: Function }} opts
+ * @param {{ cwd?: string, tempDir?: string, standalone?: boolean, fs?: object, now?: Function }} opts
  * @returns {object} The persisted record.
  */
 export function recordPass(
@@ -258,7 +234,6 @@ export function recordPass(
   const resolved = resolveOpts(opts);
   const evidenceOpts = {
     ...resolved,
-    epicId: opts.epicId,
     standalone: opts.standalone,
   };
   const doc = loadEvidence(storyId, evidenceOpts);
@@ -297,13 +272,12 @@ export function recordPass(
  * with a machine-readable `reason` so callers can log why the skip didn't
  * fire.
  *
- * `opts.epicId` is required so the per-Epic-tree path can be resolved,
- * unless `opts.standalone === true` (Story #4250) routes to the
- * storyId-anchored standalone keyspace. `opts` is forwarded verbatim to
+ * `opts.standalone` is required (Story #4250) — it routes to the
+ * storyId-anchored keyspace. `opts` is forwarded verbatim to
  * `loadEvidence`, so `standalone` flows through unchanged.
  *
  * @param {{ storyId: number|string, gateName: string, currentSha: string, configHash: string }} input
- * @param {{ cwd?: string, tempDir?: string, epicId?: number|string|null, standalone?: boolean, fs?: object }} opts
+ * @param {{ cwd?: string, tempDir?: string, standalone?: boolean, fs?: object }} opts
  * @returns {{ skip: boolean, reason: string, record?: object }}
  */
 export function shouldSkip(
@@ -340,19 +314,17 @@ export function shouldSkip(
  * start of each Story so a re-run always starts clean. Idempotent —
  * absent file is not an error.
  *
- * `opts.epicId` is required so the per-Epic-tree path can be resolved,
- * unless `opts.standalone === true` (Story #4250) routes to the
- * storyId-anchored standalone keyspace.
+ * `opts.standalone` is required (Story #4250) — it routes to the
+ * storyId-anchored keyspace.
  *
  * @param {number|string} scopeId
- * @param {{ cwd?: string, tempDir?: string, epicId?: number|string|null, standalone?: boolean, fs?: object }} opts
+ * @param {{ cwd?: string, tempDir?: string, standalone?: boolean, fs?: object }} opts
  * @returns {{ cleared: boolean, path: string }}
  */
 export function forceClear(scopeId, opts = {}) {
   const resolved = resolveOpts(opts);
   const file = evidencePath(scopeId, {
     ...resolved,
-    epicId: opts.epicId,
     standalone: opts.standalone,
   });
   if (!resolved.fs.existsSync(file)) return { cleared: false, path: file };