@nathapp/nax 0.75.2 → 0.75.3

package/dist/nax.js

@@ -17294,7 +17294,7 @@ var HeadersSchema, ReporterEventSchema, WebhookReporterConfigSchema, OtelReporte
 var init_schemas_reporters = __esm(() => {
   init_zod();
   HeadersSchema = exports_external.record(exports_external.string(), exports_external.string()).default({});
-  ReporterEventSchema = exports_external.enum(["onRunStart", "onStoryComplete", "onRunEnd"]);
+  ReporterEventSchema = exports_external.enum(["onRunStart", "onStoryComplete", "onRunEnd", "onPhaseStart", "onPhaseComplete"]);
   WebhookReporterConfigSchema = exports_external.object({
     enabled: exports_external.boolean().default(false),
     url: exports_external.string().url().optional(),
@@ -17311,12 +17311,23 @@ var init_schemas_reporters = __esm(() => {
     endpoint: exports_external.string().url().optional(),
     headers: HeadersSchema,
     serviceName: exports_external.string().default("nax"),
-    timeoutMs: exports_external.number().int().positive().default(5000)
+    timeoutMs: exports_external.number().int().positive().default(5000),
+    detail: exports_external.enum(["counts", "verbose"]).default("counts"),
+    heartbeatIntervalMs: exports_external.number().int().nonnegative().default(1e4),
+    maxBatchSize: exports_external.number().int().positive().default(64),
+    flushIntervalMs: exports_external.number().int().positive().default(5000),
+    maxQueueSize: exports_external.number().int().positive().default(2048),
+    phases: exports_external.array(exports_external.string()).optional()
   }).default({
     enabled: false,
     headers: {},
     serviceName: "nax",
-    timeoutMs: 5000
+    timeoutMs: 5000,
+    detail: "counts",
+    heartbeatIntervalMs: 1e4,
+    maxBatchSize: 64,
+    flushIntervalMs: 5000,
+    maxQueueSize: 2048
   });
   ReportersConfigSchema = exports_external.object({
     webhook: WebhookReporterConfigSchema,
@@ -17331,7 +17342,12 @@ var init_schemas_reporters = __esm(() => {
       enabled: false,
       headers: {},
       serviceName: "nax",
-      timeoutMs: 5000
+      timeoutMs: 5000,
+      detail: "counts",
+      heartbeatIntervalMs: 1e4,
+      maxBatchSize: 64,
+      flushIntervalMs: 5000,
+      maxQueueSize: 2048
     }
   });
 });
@@ -18222,6 +18238,10 @@ function formatAdvisorySummary(findings, options) {
   if (coverageGapCount > 0) {
     lines.push(c.gray(`  ${coverageGapCount} of ${findings.length} were coverage-gap demotions (recurred past the block limit \u2014 candidate for spec/AC review)`));
   }
+  const noActionCount = findings.filter((f) => f.actionRequired === false).length;
+  if (noActionCount > 0) {
+    lines.push(c.gray(`  ${noActionCount} of ${findings.length} asked for no change (compliance notes \u2014 the best-effort fix pass skipped them)`));
+  }
   lines.push(c.yellow("\u2500".repeat(60)));
   for (const f of sorted) {
     const location = f.file ? `${f.file}${f.line ? `:${f.line}` : ""}` : undefined;
@@ -18230,7 +18250,8 @@ function formatAdvisorySummary(findings, options) {
       f.storyId ?? "unknown",
       location,
       f.category,
-      f.coverageGap ? "coverage-gap" : undefined
+      f.coverageGap ? "coverage-gap" : undefined,
+      f.actionRequired === false ? "no-action" : undefined
     ].filter((v) => typeof v === "string" && v.length > 0);
     lines.push(`  ${c.gray(parts.join(" \xB7 "))}`);
     lines.push(`    ${f.issue}`);
@@ -33112,6 +33133,7 @@ Respond with ONLY a JSON object \u2014 no preamble, no explanation outside the J
       "acIndex": 2,
       "scopeQuote": "<out-of-scope findings ONLY: verbatim substring of one Out of Scope entry>",
       "scopeIndex": 1,
+      "actionRequired": true,
       "verifiedBy": {
         "command": "command used to inspect the current codebase",
         "file": "relative/path/to/file.ts",
@@ -33165,6 +33187,11 @@ A finding about code that crossed one of these boundaries must NOT cite an AC \u
 - When the boundary is only a description "Out:" bullet, quote it in \`issue\` and leave \`scopeQuote\`/\`scopeIndex\` unset.
 - Emit scope-violation findings as \`"warning"\` \u2014 never \`"error"\`. Reporting the boundary is the goal; it does not block the story.
 
+**Do not report compliance as a finding:**
+A finding is a request for a change. If you inspected something and the code was CORRECT \u2014 it honoured an out-of-scope boundary, satisfied a convention, handled the edge case \u2014 that is not a finding. Say it in \`passed\`, not in \`findings\`. Emitting "this is correct per Out of Scope #10 / no action needed" as a finding causes an automated fix pass to be dispatched against code that needs no fix; one such report edited working code and broke a test.
+
+If you judge a no-change note genuinely worth recording, set \`actionRequired: false\` on it. Every finding that asks for a change must leave \`actionRequired\` unset or \`true\`. Never pair \`actionRequired: false\` with a \`suggestion\` that requests an edit \u2014 pick one.
+
 Never use \`acIndex: 0\`; \`acIndex\` is 1-based (first AC bullet = 1). The same applies to \`scopeIndex\`.
 
 If you cannot find an AC that names the **specific symbol** in your finding, downgrade to \`"info"\` or \`"warning"\`. A finding dropped by the validator is worse than one correctly classified as advisory.`, AdversarialReviewPromptBuilder;
@@ -35887,6 +35914,7 @@ function toAdversarialReviewFindings(findings, opts = {}) {
       message: f.issue,
       suggestion: f.suggestion,
       fixTarget: resolveFixTarget({ base: categoryToFixTarget(f.category), file: f.file, isTestFile: opts.isTestFile }),
+      ...f.actionRequired === false ? { actionRequired: false } : {},
       meta: Object.keys(metaExtras).length > 0 ? metaExtras : undefined
     };
   });
@@ -36826,11 +36854,11 @@ var init_adversarial_review = __esm(() => {
       throw new ParseValidationError("[adversarial-review] parse failed: invalid JSON shape");
     },
     async verify(parsed, input, _verifyCtx) {
+      const threshold = input.blockingThreshold ?? "error";
       if (parsed.failOpen || parsed.looksLikeFail)
-        return parsed;
+        return { ...parsed, blockingThreshold: threshold };
       if (parsed.findings.length === 0)
-        return parsed;
-      const threshold = input.blockingThreshold ?? "error";
+        return { ...parsed, blockingThreshold: threshold };
       const findings = parsed.findings;
       const substantiated = await substantiateAdversarialFindings({
         findings,
@@ -36877,6 +36905,7 @@ var init_adversarial_review = __esm(() => {
       return {
         ...parsed,
         passed,
+        blockingThreshold: threshold,
         modelPassed: parsed.passed,
         findings: accepted,
         normalizedFindings: toAdversarialReviewFindings(blocking, { isTestFile: testFileMatch }),
@@ -39901,9 +39930,29 @@ var init_apply_test_edit_declarations = __esm(() => {
 });
 
 // src/operations/validate-mock-structure-files.ts
-import { join as join23 } from "path";
-async function validateMockStructureFiles(declarations, resolvedTestPatterns, packageDir, deps) {
-  const fileExists = deps?.fileExists ?? defaultFileExists;
+import { isAbsolute as isAbsolute9, join as join23, relative as relative9 } from "path";
+function resolutionCandidates(file3, packageDir, repoRoot) {
+  if (isAbsolute9(file3))
+    return [file3];
+  const viaPackageDir = join23(packageDir, file3);
+  if (repoRoot === undefined)
+    return [viaPackageDir];
+  const viaRepoRoot = join23(repoRoot, file3);
+  return viaRepoRoot === viaPackageDir ? [viaPackageDir] : [viaPackageDir, viaRepoRoot];
+}
+async function resolvePackageRelative(file3, opts) {
+  for (const candidate of resolutionCandidates(file3, opts.packageDir, opts.repoRoot)) {
+    if (!await opts.fileExists(candidate))
+      continue;
+    const rel = relative9(opts.packageDir, candidate);
+    if (rel === "" || rel.startsWith("..") || isAbsolute9(rel))
+      return null;
+    return rel;
+  }
+  return null;
+}
+async function validateMockStructureFiles(declarations, resolvedTestPatterns, packageDir, opts) {
+  const fileExists = opts?.fileExists ?? defaultFileExists;
   const valid = [];
   const invalid = [];
   for (const d of declarations) {
@@ -39914,13 +39963,16 @@ async function validateMockStructureFiles(declarations, resolvedTestPatterns, pa
     const files = d.files ?? [d.file];
     let allValid = true;
     for (const file3 of files) {
-      const absolutePath = join23(packageDir, file3);
-      const exists = await fileExists(absolutePath);
-      if (!exists) {
+      const packageRelative = await resolvePackageRelative(file3, {
+        packageDir,
+        repoRoot: opts?.repoRoot,
+        fileExists
+      });
+      if (packageRelative === null) {
         allValid = false;
         break;
       }
-      const matchesPattern = resolvedTestPatterns.regex.some((re) => re.test(file3));
+      const matchesPattern = resolvedTestPatterns.regex.some((re) => re.test(packageRelative));
       if (!matchesPattern) {
         allValid = false;
         break;
@@ -41458,7 +41510,7 @@ var init_mutation = __esm(() => {
 });
 
 // src/operations/mutation-check.ts
-import { isAbsolute as isAbsolute9, join as join24 } from "path";
+import { isAbsolute as isAbsolute10, join as join24 } from "path";
 var _mutationCheckDeps, mutationCheckOp;
 var init_mutation_check = __esm(() => {
   init_config();
@@ -41501,7 +41553,7 @@ var init_mutation_check = __esm(() => {
       }
       const changedFiles = await deps.getChangedNonTestFiles(input.workdir, input.storyGitRef, input.packagePrefix, [...input.resolvedTestPatterns.regex], undefined, input.repoRoot);
       const anchor = input.repoRoot ?? input.workdir;
-      const absoluteChangedFiles = changedFiles.map((f) => isAbsolute9(f) ? f : join24(anchor, f));
+      const absoluteChangedFiles = changedFiles.map((f) => isAbsolute10(f) ? f : join24(anchor, f));
       const survivors = [];
       const mutants = [];
       for (const file3 of absoluteChangedFiles) {
@@ -41626,6 +41678,31 @@ var init_operations = __esm(() => {
   init_mutation_check();
 });
 
+// src/findings/cycle-retirement.ts
+function createDeclineLedger() {
+  const declinedByStrategy = new Map;
+  const hasDeclined = (strategyName, finding) => declinedByStrategy.get(strategyName)?.has(findingKey(finding)) === true;
+  const isRetiredFor = (strategy, findings) => {
+    const claimed = findings.filter((f) => strategy.appliesTo(f));
+    return claimed.length > 0 && claimed.every((f) => hasDeclined(strategy.name, f));
+  };
+  return {
+    recordDeclined(strategy, dispatched) {
+      const declined = declinedByStrategy.get(strategy.name) ?? new Set;
+      for (const f of dispatched.filter((x) => strategy.appliesTo(x)))
+        declined.add(findingKey(f));
+      declinedByStrategy.set(strategy.name, declined);
+    },
+    isRetiredFor,
+    retiredNames(strategies, findings) {
+      return strategies.filter((s) => isRetiredFor(s, findings)).map((s) => s.name);
+    }
+  };
+}
+var init_cycle_retirement = __esm(() => {
+  init_types6();
+});
+
 // src/findings/cycle.ts
 function normalizeValidateResult(r) {
   return Array.isArray(r) ? { findings: r, shortCircuited: false } : r;
@@ -41695,17 +41772,18 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
   const storyId = ctx.storyId;
   const packageDir = ctx.packageDir;
   let totalCostUsd = 0;
-  const spentStrategies = new Set;
+  const declines = createDeclineLedger();
   let unresolvedDetail;
   const finish = (result) => unresolvedDetail !== undefined && result.unresolvedDetail === undefined ? { ...result, unresolvedDetail } : result;
   for (;; ) {
     if (cycle.findings.length === 0 && cycle.verdict === undefined) {
       return { iterations: cycle.iterations, finalFindings: [], exitReason: "resolved", costUsd: totalCostUsd };
     }
-    const selectable = cycle.strategies.filter((s) => !spentStrategies.has(s.name));
+    const selectable = cycle.strategies.filter((s) => !declines.isRetiredFor(s, cycle.findings));
     const active = selectActiveStrategies(selectable, cycle.findings, cycle.verdict);
     if (active.length === 0) {
       const orphanSources = [...new Set(cycle.findings.map((f) => f.source))];
+      const retiredStrategies = declines.retiredNames(cycle.strategies, cycle.findings);
       logger?.warn("findings.cycle", "cycle exited \u2014 no matching strategy (orphaned findings)", {
         storyId,
         packageDir,
@@ -41713,7 +41791,7 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
         reason: "no-strategy",
         findingsCount: cycle.findings.length,
         orphanSources,
-        ...spentStrategies.size > 0 ? { retiredStrategies: [...spentStrategies] } : {}
+        ...retiredStrategies.length > 0 ? { retiredStrategies } : {}
       });
       return finish({
         iterations: cycle.iterations,
@@ -41784,7 +41862,11 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
     for (const strategy of group) {
       const relevantFindings = findingsBefore.filter((f) => strategy.appliesTo(f));
       const input = strategy.buildInput(relevantFindings, cycle.iterations, ctx);
-      const output = await doCallOp(ctx, strategy.fixOp, input);
+      const fixCtx = {
+        ...ctx,
+        fixStrategy: { name: strategy.name, findingsBefore: findingsBefore.length }
+      };
+      const output = await doCallOp(fixCtx, strategy.fixOp, input);
       const extracted = await (strategy.extractApplied?.(output, input) ?? {});
       fixesApplied.push({
         strategyName: strategy.name,
@@ -41799,8 +41881,11 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
     if (unresolvedFas.length > 0) {
       const firstUnresolved = unresolvedFas[0];
       unresolvedDetail = firstUnresolved.unresolved;
-      for (const fa of unresolvedFas)
-        spentStrategies.add(fa.strategyName);
+      for (const fa of unresolvedFas) {
+        const strategy = group.find((s) => s.name === fa.strategyName);
+        if (strategy)
+          declines.recordDeclined(strategy, findingsBefore);
+      }
       const allGaveUp = unresolvedFas.length === fixesApplied.length;
       if (allGaveUp) {
         const finishedAt2 = now();
@@ -42015,6 +42100,7 @@ var _cycleDeps;
 var init_cycle = __esm(() => {
   init_logger2();
   init_operations();
+  init_cycle_retirement();
   init_types6();
   _cycleDeps = {
     callOp,
@@ -42346,13 +42432,13 @@ var init_finding_projection = __esm(() => {
 });
 
 // src/review/prepare-inputs.ts
-import { relative as relative9, sep } from "path";
+import { relative as relative10, sep } from "path";
 function derivePackageDirs(workdir, projectDir) {
   const repoRoot = projectDir ?? workdir;
   const packageDir = workdir !== repoRoot ? workdir : undefined;
   let packageDirRelative;
   if (projectDir && workdir !== projectDir) {
-    const rel = relative9(projectDir, workdir);
+    const rel = relative10(projectDir, workdir);
     if (rel !== ".." && !rel.startsWith(`..${sep}`)) {
       packageDirRelative = rel && rel !== "." ? rel : undefined;
     }
@@ -42493,7 +42579,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.75.2",
+    version: "0.75.3",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -42504,9 +42590,10 @@ var init_package = __esm(() => {
       dev: "bun run bin/nax.ts",
       build: 'bun build bin/nax.ts --outdir dist --target bun --define "GIT_COMMIT=\\"$(git rev-parse --short HEAD)\\""',
       typecheck: "bun x tsc --noEmit && bun x tsc --noEmit -p tsconfig.contracts.json",
-      lint: "bun x biome check src/ bin/ flows/ && bun run check:no-real-global-nax && bun run check:alias-internals && bun run check:deep-relatives && bun run check:nax-error && bun run check:logger-storyid && bun run check:log-format-layering && bun run check:file-sizes",
+      lint: "bun x biome check src/ bin/ flows/ && bun run check:flows-no-bun && bun run check:no-real-global-nax && bun run check:alias-internals && bun run check:deep-relatives && bun run check:nax-error && bun run check:logger-storyid && bun run check:log-format-layering && bun run check:file-sizes",
       "lint:json": "bun x biome check src/ bin/ flows/ --reporter json && bun run check:nax-error 1>&2 && bun run check:logger-storyid 1>&2",
       "lint:fix": "bun x biome check --write src/ bin/ flows/",
+      "check:flows-no-bun": "bun run scripts/check-flows-no-bun.ts",
       "check:no-real-global-nax": "bun run scripts/check-no-real-global-nax.ts",
       "check:alias-internals": "bun run scripts/check-alias-internals.ts",
       "check:deep-relatives": "bun run scripts/check-deep-relatives.ts",
@@ -42596,8 +42683,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("8538e8f4"))
-        return "8538e8f4";
+      if (/^[0-9a-f]{6,10}$/.test("ae716fd4"))
+        return "ae716fd4";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -42686,7 +42773,8 @@ function toAdvisorySummaryEntries(entry) {
       file: f.file,
       line: f.line,
       issue: f.issue ?? "(no description)",
-      coverageGap: f.meta?.coverageGap === true ? true : undefined
+      coverageGap: f.meta?.coverageGap === true ? true : undefined,
+      actionRequired: f.actionRequired === false ? false : undefined
     };
   });
 }
@@ -43420,7 +43508,7 @@ var init_language_commands = __esm(() => {
 });
 
 // src/review/scoped-lint.ts
-import { join as join27, relative as relative10 } from "path";
+import { join as join27, relative as relative11 } from "path";
 function shellQuotePath4(path6) {
   return `'${path6.replaceAll("'", "'\\''")}'`;
 }
@@ -43456,7 +43544,7 @@ async function listChangedFiles(workdir, baseRef) {
 function inferActivePackageDir(workdir, projectDir) {
   if (!projectDir)
     return;
-  const rel = normalizePath3(relative10(projectDir, workdir));
+  const rel = normalizePath3(relative11(projectDir, workdir));
   if (!rel || rel === "." || rel.startsWith(".."))
     return;
   return rel;
@@ -44610,6 +44698,7 @@ var init_runner2 = __esm(() => {
 // src/review/index.ts
 var init_review = __esm(() => {
   init_semantic_helpers();
+  init_adversarial_helpers();
   init_category_fix_target();
   init_finding_filters();
   init_ac_quote_validator();
@@ -44894,7 +44983,10 @@ REASON: <one paragraph: which mock is wrong vs which dispatch the new code uses,
 Rules:
 - Do NOT make any edits yourself; the test-writer will fulfill.
 - Do NOT also emit \`UNRESOLVED:\` in the same turn \u2014 this declaration IS the handoff.
-- FILES must list real test files. Each path must exist and be a test file.`, SINGLE_SESSION_PERMIT_HEADLINE = "You authored these tests in the same session as the implementation, so you MAY edit test files \u2014 but ONLY to resolve a genuine contradiction between a test and this story's acceptance criteria (or between two acceptance criteria). NEVER weaken, delete, loosen, or skip a test merely to make it pass. See the test-edit guidance appended below.", SINGLE_SESSION_TEST_EDIT_POLICY = `
+- FILES must list real test files. Each path must exist and be a test file.
+- Write each path exactly as it appears in the findings above (repository-relative).
+  Paths that resolve under neither the repository root nor the package directory are
+  rejected and the handoff is dropped \u2014 the findings then have no owner.`, SINGLE_SESSION_PERMIT_HEADLINE = "You authored these tests in the same session as the implementation, so you MAY edit test files \u2014 but ONLY to resolve a genuine contradiction between a test and this story's acceptance criteria (or between two acceptance criteria). NEVER weaken, delete, loosen, or skip a test merely to make it pass. See the test-edit guidance appended below.", SINGLE_SESSION_TEST_EDIT_POLICY = `
 
 ## Test-edit guidance (single-session implementer)
 
@@ -48676,7 +48768,7 @@ var init_pid_registry = __esm(() => {
 // src/session/manager-deps.ts
 import { randomUUID as randomUUID3 } from "crypto";
 import { mkdir as mkdir5 } from "fs/promises";
-import { isAbsolute as isAbsolute10, join as join30, relative as relative11, sep as sep2 } from "path";
+import { isAbsolute as isAbsolute11, join as join30, relative as relative12, sep as sep2 } from "path";
 function resolveProjectDirFromScratchDir(scratchDir) {
   const marker = `${sep2}.nax${sep2}features${sep2}`;
   const markerIdx = scratchDir.lastIndexOf(marker);
@@ -48688,7 +48780,7 @@ function resolveProjectDirFromScratchDir(scratchDir) {
   return;
 }
 function toProjectRelativePath(projectDir, pathValue) {
-  const relativePath = isAbsolute10(pathValue) ? relative11(projectDir, pathValue) : pathValue;
+  const relativePath = isAbsolute11(pathValue) ? relative12(projectDir, pathValue) : pathValue;
   return relativePath === "" ? "." : relativePath;
 }
 var _sessionManagerDeps;
@@ -50198,7 +50290,7 @@ var init_windsurf = __esm(() => {
 
 // src/context/generator.ts
 import { existsSync as existsSync9 } from "fs";
-import { join as join33, relative as relative12 } from "path";
+import { join as join33, relative as relative13 } from "path";
 async function loadContextContent(options, config2) {
   if (!_generatorDeps.existsSync(options.contextPath)) {
     throw new Error(`Context file not found: ${options.contextPath}`);
@@ -50326,7 +50418,7 @@ async function discoverWorkspacePackages2(repoRoot) {
 }
 async function generateForPackage(packageDir, config2, dryRun = false, repoRoot) {
   const resolvedRepoRoot = repoRoot ?? packageDir;
-  const relativePkgPath = relative12(resolvedRepoRoot, packageDir);
+  const relativePkgPath = relative13(resolvedRepoRoot, packageDir);
   const contextPath = join33(resolvedRepoRoot, ".nax", "mono", relativePkgPath, "context.md");
   if (!_generatorDeps.existsSync(contextPath)) {
     return [
@@ -54173,7 +54265,7 @@ var init_checks_blockers = __esm(() => {
 
 // src/precheck/checks-warnings.ts
 import { existsSync as existsSync14 } from "fs";
-import { isAbsolute as isAbsolute11 } from "path";
+import { isAbsolute as isAbsolute12 } from "path";
 async function checkClaudeMdExists(workdir) {
   const claudeMdPath = `${workdir}/CLAUDE.md`;
   const passed = existsSync14(claudeMdPath);
@@ -54308,7 +54400,7 @@ async function checkPromptOverrideFiles(config2, workdir) {
 }
 async function checkHomeEnvValid() {
   const home = process.env.HOME ?? "";
-  const passed = home !== "" && isAbsolute11(home);
+  const passed = home !== "" && isAbsolute12(home);
   return {
     name: "home-env-valid",
     tier: "warning",
@@ -57012,6 +57104,79 @@ ${stderr}`;
   };
 });
 
+// src/pipeline/event-bus.ts
+class PipelineEventBus {
+  subscribers = new Map;
+  _pending = new Set;
+  on(eventType, subscriber) {
+    const list = this.subscribers.get(eventType) ?? [];
+    list.push(subscriber);
+    this.subscribers.set(eventType, list);
+    return () => {
+      const current = this.subscribers.get(eventType) ?? [];
+      this.subscribers.set(eventType, current.filter((s) => s !== subscriber));
+    };
+  }
+  onAll(subscriber) {
+    const list = this.subscribers.get("*") ?? [];
+    list.push(subscriber);
+    this.subscribers.set("*", list);
+    return () => {
+      const current = this.subscribers.get("*") ?? [];
+      this.subscribers.set("*", current.filter((s) => s !== subscriber));
+    };
+  }
+  emit(event) {
+    const logger = getLogger();
+    const specific = this.subscribers.get(event.type) ?? [];
+    const all = this.subscribers.get("*") ?? [];
+    const targets = [...specific, ...all];
+    for (const sub of targets) {
+      try {
+        const result = sub(event);
+        if (result instanceof Promise) {
+          const tracked = result.catch((err) => {
+            logger.warn("event-bus", `Subscriber error on ${event.type}`, { error: String(err) });
+          });
+          this._pending.add(tracked);
+          tracked.finally(() => this._pending.delete(tracked));
+        }
+      } catch (err) {
+        logger.warn("event-bus", `Subscriber threw on ${event.type}`, { error: String(err) });
+      }
+    }
+  }
+  async emitAsync(event) {
+    const logger = getLogger();
+    const specific = this.subscribers.get(event.type) ?? [];
+    const all = this.subscribers.get("*") ?? [];
+    const targets = [...specific, ...all];
+    await Promise.allSettled(targets.map(async (sub) => {
+      try {
+        await sub(event);
+      } catch (err) {
+        logger.warn("event-bus", `Subscriber error on ${event.type}`, { error: String(err) });
+      }
+    }));
+  }
+  async drain() {
+    if (this._pending.size === 0)
+      return;
+    await Promise.allSettled([...this._pending]);
+  }
+  clear() {
+    this.subscribers.clear();
+  }
+  subscriberCount(eventType) {
+    return (this.subscribers.get(eventType) ?? []).length;
+  }
+}
+var pipelineEventBus;
+var init_event_bus = __esm(() => {
+  init_logger2();
+  pipelineEventBus = new PipelineEventBus;
+});
+
 // src/pipeline/stages/acceptance-setup.ts
 var exports_acceptance_setup = {};
 __export(exports_acceptance_setup, {
@@ -57027,6 +57192,214 @@ function computeACFingerprint(criteria) {
   hasher.update(sorted);
   return `sha256:${hasher.digest("hex")}`;
 }
+async function runAcceptanceSetup(ctx, featureDir, phaseStartTime) {
+  const language = ctx.config.project?.language;
+  const testPathConfig = ctx.config.acceptance.testPath;
+  const metaPath = path12.join(featureDir, "acceptance-meta.json");
+  const allCriteria = ctx.prd.userStories.filter((s) => !s.id.startsWith("US-FIX-") && s.status !== "decomposed").flatMap((s) => s.acceptanceCriteria);
+  const featureName = ctx.prd.feature ?? ctx.prd.featureName;
+  const groups = await groupStoriesByPackage(ctx.prd, ctx.workdir, featureName, testPathConfig, language);
+  const nonFixStories = groups.flatMap((g) => g.stories);
+  let totalCriteria = 0;
+  let testableCount = 0;
+  const fingerprint = computeACFingerprint(allCriteria);
+  const meta3 = await _acceptanceSetupDeps.readMeta(metaPath);
+  getSafeLogger()?.debug("acceptance-setup", "Fingerprint check", {
+    currentFingerprint: fingerprint,
+    storedFingerprint: meta3?.acFingerprint ?? "none",
+    match: meta3?.acFingerprint === fingerprint
+  });
+  let shouldGenerate = false;
+  let regenerated = false;
+  if (!meta3 || meta3.acFingerprint !== fingerprint) {
+    if (!meta3) {
+      getSafeLogger()?.info("acceptance-setup", "No acceptance meta \u2014 generating acceptance tests");
+    } else {
+      getSafeLogger()?.info("acceptance-setup", "ACs changed \u2014 regenerating acceptance tests", {
+        reason: "fingerprint mismatch",
+        currentFingerprint: fingerprint,
+        storedFingerprint: meta3.acFingerprint
+      });
+    }
+    for (const { testPath } of groups) {
+      if (await _acceptanceSetupDeps.fileExists(testPath)) {
+        await _acceptanceSetupDeps.copyFile(testPath, `${testPath}.bak`);
+        await _acceptanceSetupDeps.deleteFile(testPath);
+      }
+    }
+    await _acceptanceSetupDeps.deleteSemanticVerdicts(featureDir);
+    shouldGenerate = true;
+    regenerated = true;
+  } else {
+    getSafeLogger()?.info("acceptance-setup", "Reusing existing acceptance tests (fingerprint match)");
+  }
+  if (shouldGenerate) {
+    totalCriteria = allCriteria.length;
+    let allRefinedCriteria;
+    if (ctx.config.acceptance.refinement) {
+      const maxConcurrency = ctx.config.acceptance.refinementConcurrency ?? 3;
+      const results = new Array(nonFixStories.length);
+      const executing = new Set;
+      for (let i = 0;i < nonFixStories.length; i++) {
+        const story = nonFixStories[i];
+        const task = _acceptanceSetupDeps.callOp(ctx, ctx.workdir, acceptanceRefineOp, {
+          criteria: story.acceptanceCriteria,
+          codebaseContext: "",
+          storyId: story.id,
+          testStrategy: ctx.config.acceptance.testStrategy,
+          testFramework: ctx.config.acceptance.testFramework,
+          storyTitle: story.title,
+          storyDescription: story.description
+        }, story.id).then((refined) => {
+          results[i] = refined;
+        }).catch(() => {
+          getSafeLogger()?.warn("acceptance-setup", "AC refinement failed after retries \u2014 using unrefined criteria", {
+            storyId: story.id
+          });
+          results[i] = story.acceptanceCriteria.map((c) => ({
+            original: c,
+            refined: c,
+            testable: true,
+            storyId: story.id
+          }));
+        }).finally(() => {
+          executing.delete(task);
+        });
+        executing.add(task);
+        if (executing.size >= maxConcurrency) {
+          await Promise.race(executing);
+        }
+      }
+      await Promise.all(executing);
+      allRefinedCriteria = results.flat();
+    } else {
+      allRefinedCriteria = nonFixStories.flatMap((story) => story.acceptanceCriteria.map((c) => ({
+        original: c,
+        refined: c,
+        testable: true,
+        storyId: story.id
+      })));
+    }
+    testableCount = allRefinedCriteria.filter((r) => r.testable).length;
+    for (const group of groups) {
+      const { testPath, packageDir } = group;
+      const groupStoryIds = new Set(group.stories.map((s) => s.id));
+      const groupRefined = allRefinedCriteria.filter((r) => groupStoryIds.has(r.storyId));
+      const criteriaList = groupRefined.map((c, i) => `AC-${i + 1}: ${c.refined}`).join(`
+`);
+      const frameworkOverrideLine = ctx.config.acceptance.testFramework ? `
+[FRAMEWORK OVERRIDE: Use ${ctx.config.acceptance.testFramework} as the test framework regardless of what you detect.]` : "";
+      const groupStoryId = group.stories[0]?.id;
+      const genResult = await _acceptanceSetupDeps.callOp(ctx, packageDir, acceptanceGenerateOp, {
+        featureName: featureName ?? "",
+        criteriaList,
+        frameworkOverrideLine,
+        targetTestFilePath: testPath,
+        ..."implementationContext" in ctx && ctx.implementationContext ? { implementationContext: ctx.implementationContext } : {}
+      }, groupStoryId);
+      const testCode = genResult.testCode;
+      if (testCode) {
+        await _acceptanceSetupDeps.writeFile(testPath, testCode);
+      } else {
+        const skeletonCriteria = groupRefined.map((c, i) => ({
+          id: `AC-${i + 1}`,
+          text: c.refined,
+          lineNumber: i + 1
+        }));
+        const skeletonCode = generateSkeletonTests(featureName, skeletonCriteria, ctx.config.acceptance.testFramework, group.language);
+        await _acceptanceSetupDeps.writeFile(testPath, skeletonCode);
+        getSafeLogger()?.warn("acceptance-setup", "agent did not produce test content; using skeleton", {
+          storyId: groupStoryId,
+          testPath
+        });
+      }
+    }
+    if (allRefinedCriteria.length > 0) {
+      const refinedJsonContent = JSON.stringify(allRefinedCriteria.map((c, i) => ({
+        acId: `AC-${i + 1}`,
+        original: c.original,
+        refined: c.refined,
+        testable: c.testable,
+        storyId: c.storyId
+      })), null, 2);
+      await _acceptanceSetupDeps.writeFile(path12.join(featureDir, "acceptance-refined.json"), refinedJsonContent);
+    }
+    const fingerprint2 = computeACFingerprint(allCriteria);
+    await _acceptanceSetupDeps.writeMeta(metaPath, {
+      generatedAt: new Date().toISOString(),
+      acFingerprint: fingerprint2,
+      storyCount: ctx.prd.userStories.length,
+      acCount: totalCriteria,
+      generator: "nax"
+    });
+    await _acceptanceSetupDeps.autoCommitIfDirty(ctx.workdir, "acceptance-setup", "pre-run", ctx.prd.feature ?? "feature");
+  }
+  const acceptanceTestPaths = [];
+  for (const g of groups) {
+    const relativeWorkdir = path12.relative(ctx.projectDir, g.packageDir);
+    let groupConfig = ctx.config;
+    if (relativeWorkdir && relativeWorkdir !== ".") {
+      try {
+        groupConfig = await _acceptanceSetupDeps.loadGroupConfig(ctx.projectDir, relativeWorkdir);
+      } catch {
+        groupConfig = ctx.config;
+      }
+    }
+    acceptanceTestPaths.push({
+      testPath: g.testPath,
+      packageDir: g.packageDir,
+      testFramework: groupConfig.project?.testFramework,
+      commandOverride: groupConfig.acceptance.command
+    });
+  }
+  ctx.acceptanceTestPaths = acceptanceTestPaths;
+  if (ctx.config.acceptance.redGate === false) {
+    ctx.acceptanceSetup = { totalCriteria, testableCount, redFailCount: 0 };
+    pipelineEventBus.emit({
+      type: "postrun:phase:completed",
+      phase: "acceptance-setup",
+      passed: true,
+      durationMs: Date.now() - phaseStartTime,
+      details: { totalCriteria, testableCount, redFailCount: 0, regenerated }
+    });
+    return { action: "continue" };
+  }
+  let redFailCount = 0;
+  for (const { testPath, packageDir, testFramework, commandOverride } of acceptanceTestPaths) {
+    const runCmd = buildAcceptanceRunCommand(testPath, testFramework, commandOverride, packageDir);
+    getSafeLogger()?.info("acceptance-setup", "Running acceptance RED gate command", {
+      cmd: runCmd.join(" "),
+      packageDir
+    });
+    const { exitCode } = await _acceptanceSetupDeps.runTest(testPath, packageDir, runCmd);
+    if (exitCode !== 0) {
+      redFailCount++;
+    }
+  }
+  if (redFailCount === 0) {
+    ctx.acceptanceSetup = { totalCriteria, testableCount, redFailCount: 0 };
+    pipelineEventBus.emit({
+      type: "postrun:phase:completed",
+      phase: "acceptance-setup",
+      passed: true,
+      durationMs: Date.now() - phaseStartTime,
+      details: { totalCriteria, testableCount, redFailCount: 0, regenerated }
+    });
+    return {
+      action: "skip",
+      reason: "[acceptance-setup] Acceptance tests already pass \u2014 they are not testing new behavior. Skipping acceptance gate."
+    };
+  }
+  ctx.acceptanceSetup = { totalCriteria, testableCount, redFailCount };
+  pipelineEventBus.emit({
+    type: "postrun:phase:completed",
+    phase: "acceptance-setup",
+    passed: true,
+    durationMs: Date.now() - phaseStartTime,
+    details: { totalCriteria, testableCount, redFailCount, regenerated }
+  });
+  return { action: "continue" };
+}
 var _acceptanceSetupDeps, acceptanceSetupStage;
 var init_acceptance_setup = __esm(() => {
   init_acceptance2();
@@ -57035,6 +57408,7 @@ var init_acceptance_setup = __esm(() => {
   init_logger2();
   init_operations();
   init_git();
+  init_event_bus();
   _acceptanceSetupDeps = {
     getAgent: (_name) => {
       return;
@@ -57134,189 +57508,19 @@ ${stderr}` };
       if (!ctx.featureDir) {
         return { action: "fail", reason: "[acceptance-setup] featureDir is not set" };
       }
-      const language = ctx.config.project?.language;
-      const testPathConfig = ctx.config.acceptance.testPath;
-      const metaPath = path12.join(ctx.featureDir, "acceptance-meta.json");
-      const allCriteria = ctx.prd.userStories.filter((s) => !s.id.startsWith("US-FIX-") && s.status !== "decomposed").flatMap((s) => s.acceptanceCriteria);
-      const featureName = ctx.prd.feature ?? ctx.prd.featureName;
-      const groups = await groupStoriesByPackage(ctx.prd, ctx.workdir, featureName, testPathConfig, language);
-      const nonFixStories = groups.flatMap((g) => g.stories);
-      let totalCriteria = 0;
-      let testableCount = 0;
-      const fingerprint = computeACFingerprint(allCriteria);
-      const meta3 = await _acceptanceSetupDeps.readMeta(metaPath);
-      getSafeLogger()?.debug("acceptance-setup", "Fingerprint check", {
-        currentFingerprint: fingerprint,
-        storedFingerprint: meta3?.acFingerprint ?? "none",
-        match: meta3?.acFingerprint === fingerprint
-      });
-      let shouldGenerate = false;
-      if (!meta3 || meta3.acFingerprint !== fingerprint) {
-        if (!meta3) {
-          getSafeLogger()?.info("acceptance-setup", "No acceptance meta \u2014 generating acceptance tests");
-        } else {
-          getSafeLogger()?.info("acceptance-setup", "ACs changed \u2014 regenerating acceptance tests", {
-            reason: "fingerprint mismatch",
-            currentFingerprint: fingerprint,
-            storedFingerprint: meta3.acFingerprint
-          });
-        }
-        for (const { testPath } of groups) {
-          if (await _acceptanceSetupDeps.fileExists(testPath)) {
-            await _acceptanceSetupDeps.copyFile(testPath, `${testPath}.bak`);
-            await _acceptanceSetupDeps.deleteFile(testPath);
-          }
-        }
-        await _acceptanceSetupDeps.deleteSemanticVerdicts(ctx.featureDir);
-        shouldGenerate = true;
-      } else {
-        getSafeLogger()?.info("acceptance-setup", "Reusing existing acceptance tests (fingerprint match)");
-      }
-      if (shouldGenerate) {
-        totalCriteria = allCriteria.length;
-        let allRefinedCriteria;
-        if (ctx.config.acceptance.refinement) {
-          const maxConcurrency = ctx.config.acceptance.refinementConcurrency ?? 3;
-          const results = new Array(nonFixStories.length);
-          const executing = new Set;
-          for (let i = 0;i < nonFixStories.length; i++) {
-            const story = nonFixStories[i];
-            const task = _acceptanceSetupDeps.callOp(ctx, ctx.workdir, acceptanceRefineOp, {
-              criteria: story.acceptanceCriteria,
-              codebaseContext: "",
-              storyId: story.id,
-              testStrategy: ctx.config.acceptance.testStrategy,
-              testFramework: ctx.config.acceptance.testFramework,
-              storyTitle: story.title,
-              storyDescription: story.description
-            }, story.id).then((refined) => {
-              results[i] = refined;
-            }).catch(() => {
-              getSafeLogger()?.warn("acceptance-setup", "AC refinement failed after retries \u2014 using unrefined criteria", {
-                storyId: story.id
-              });
-              results[i] = story.acceptanceCriteria.map((c) => ({
-                original: c,
-                refined: c,
-                testable: true,
-                storyId: story.id
-              }));
-            }).finally(() => {
-              executing.delete(task);
-            });
-            executing.add(task);
-            if (executing.size >= maxConcurrency) {
-              await Promise.race(executing);
-            }
-          }
-          await Promise.all(executing);
-          allRefinedCriteria = results.flat();
-        } else {
-          allRefinedCriteria = nonFixStories.flatMap((story) => story.acceptanceCriteria.map((c) => ({
-            original: c,
-            refined: c,
-            testable: true,
-            storyId: story.id
-          })));
-        }
-        testableCount = allRefinedCriteria.filter((r) => r.testable).length;
-        for (const group of groups) {
-          const { testPath, packageDir } = group;
-          const groupStoryIds = new Set(group.stories.map((s) => s.id));
-          const groupRefined = allRefinedCriteria.filter((r) => groupStoryIds.has(r.storyId));
-          const criteriaList = groupRefined.map((c, i) => `AC-${i + 1}: ${c.refined}`).join(`
-`);
-          const frameworkOverrideLine = ctx.config.acceptance.testFramework ? `
-[FRAMEWORK OVERRIDE: Use ${ctx.config.acceptance.testFramework} as the test framework regardless of what you detect.]` : "";
-          const groupStoryId = group.stories[0]?.id;
-          const genResult = await _acceptanceSetupDeps.callOp(ctx, packageDir, acceptanceGenerateOp, {
-            featureName: featureName ?? "",
-            criteriaList,
-            frameworkOverrideLine,
-            targetTestFilePath: testPath,
-            ..."implementationContext" in ctx && ctx.implementationContext ? { implementationContext: ctx.implementationContext } : {}
-          }, groupStoryId);
-          const testCode = genResult.testCode;
-          if (testCode) {
-            await _acceptanceSetupDeps.writeFile(testPath, testCode);
-          } else {
-            const skeletonCriteria = groupRefined.map((c, i) => ({
-              id: `AC-${i + 1}`,
-              text: c.refined,
-              lineNumber: i + 1
-            }));
-            const skeletonCode = generateSkeletonTests(featureName, skeletonCriteria, ctx.config.acceptance.testFramework, group.language);
-            await _acceptanceSetupDeps.writeFile(testPath, skeletonCode);
-            getSafeLogger()?.warn("acceptance-setup", "agent did not produce test content; using skeleton", {
-              storyId: groupStoryId,
-              testPath
-            });
-          }
-        }
-        if (allRefinedCriteria.length > 0) {
-          const refinedJsonContent = JSON.stringify(allRefinedCriteria.map((c, i) => ({
-            acId: `AC-${i + 1}`,
-            original: c.original,
-            refined: c.refined,
-            testable: c.testable,
-            storyId: c.storyId
-          })), null, 2);
-          await _acceptanceSetupDeps.writeFile(path12.join(ctx.featureDir, "acceptance-refined.json"), refinedJsonContent);
-        }
-        const fingerprint2 = computeACFingerprint(allCriteria);
-        await _acceptanceSetupDeps.writeMeta(metaPath, {
-          generatedAt: new Date().toISOString(),
-          acFingerprint: fingerprint2,
-          storyCount: ctx.prd.userStories.length,
-          acCount: totalCriteria,
-          generator: "nax"
-        });
-        await _acceptanceSetupDeps.autoCommitIfDirty(ctx.workdir, "acceptance-setup", "pre-run", ctx.prd.feature ?? "feature");
-      }
-      const acceptanceTestPaths = [];
-      for (const g of groups) {
-        const relativeWorkdir = path12.relative(ctx.projectDir, g.packageDir);
-        let groupConfig = ctx.config;
-        if (relativeWorkdir && relativeWorkdir !== ".") {
-          try {
-            groupConfig = await _acceptanceSetupDeps.loadGroupConfig(ctx.projectDir, relativeWorkdir);
-          } catch {
-            groupConfig = ctx.config;
-          }
-        }
-        acceptanceTestPaths.push({
-          testPath: g.testPath,
-          packageDir: g.packageDir,
-          testFramework: groupConfig.project?.testFramework,
-          commandOverride: groupConfig.acceptance.command
-        });
-      }
-      ctx.acceptanceTestPaths = acceptanceTestPaths;
-      if (ctx.config.acceptance.redGate === false) {
-        ctx.acceptanceSetup = { totalCriteria, testableCount, redFailCount: 0 };
-        return { action: "continue" };
-      }
-      let redFailCount = 0;
-      for (const { testPath, packageDir, testFramework, commandOverride } of acceptanceTestPaths) {
-        const runCmd = buildAcceptanceRunCommand(testPath, testFramework, commandOverride, packageDir);
-        getSafeLogger()?.info("acceptance-setup", "Running acceptance RED gate command", {
-          cmd: runCmd.join(" "),
-          packageDir
+      const phaseStartTime = Date.now();
+      pipelineEventBus.emit({ type: "postrun:phase:started", phase: "acceptance-setup" });
+      try {
+        return await runAcceptanceSetup(ctx, ctx.featureDir, phaseStartTime);
+      } catch (err) {
+        pipelineEventBus.emit({
+          type: "postrun:phase:completed",
+          phase: "acceptance-setup",
+          passed: false,
+          durationMs: Date.now() - phaseStartTime
         });
-        const { exitCode } = await _acceptanceSetupDeps.runTest(testPath, packageDir, runCmd);
-        if (exitCode !== 0) {
-          redFailCount++;
-        }
-      }
-      if (redFailCount === 0) {
-        ctx.acceptanceSetup = { totalCriteria, testableCount, redFailCount: 0 };
-        return {
-          action: "skip",
-          reason: "[acceptance-setup] Acceptance tests already pass \u2014 they are not testing new behavior. Skipping acceptance gate."
-        };
+        throw err;
       }
-      ctx.acceptanceSetup = { totalCriteria, testableCount, redFailCount };
-      return { action: "continue" };
     }
   };
 });
@@ -57462,79 +57666,6 @@ async function appendProgress(featureDir, storyId, status, message) {
 }
 var init_progress = () => {};
 
-// src/pipeline/event-bus.ts
-class PipelineEventBus {
-  subscribers = new Map;
-  _pending = new Set;
-  on(eventType, subscriber) {
-    const list = this.subscribers.get(eventType) ?? [];
-    list.push(subscriber);
-    this.subscribers.set(eventType, list);
-    return () => {
-      const current = this.subscribers.get(eventType) ?? [];
-      this.subscribers.set(eventType, current.filter((s) => s !== subscriber));
-    };
-  }
-  onAll(subscriber) {
-    const list = this.subscribers.get("*") ?? [];
-    list.push(subscriber);
-    this.subscribers.set("*", list);
-    return () => {
-      const current = this.subscribers.get("*") ?? [];
-      this.subscribers.set("*", current.filter((s) => s !== subscriber));
-    };
-  }
-  emit(event) {
-    const logger = getLogger();
-    const specific = this.subscribers.get(event.type) ?? [];
-    const all = this.subscribers.get("*") ?? [];
-    const targets = [...specific, ...all];
-    for (const sub of targets) {
-      try {
-        const result = sub(event);
-        if (result instanceof Promise) {
-          const tracked = result.catch((err) => {
-            logger.warn("event-bus", `Subscriber error on ${event.type}`, { error: String(err) });
-          });
-          this._pending.add(tracked);
-          tracked.finally(() => this._pending.delete(tracked));
-        }
-      } catch (err) {
-        logger.warn("event-bus", `Subscriber threw on ${event.type}`, { error: String(err) });
-      }
-    }
-  }
-  async emitAsync(event) {
-    const logger = getLogger();
-    const specific = this.subscribers.get(event.type) ?? [];
-    const all = this.subscribers.get("*") ?? [];
-    const targets = [...specific, ...all];
-    await Promise.allSettled(targets.map(async (sub) => {
-      try {
-        await sub(event);
-      } catch (err) {
-        logger.warn("event-bus", `Subscriber error on ${event.type}`, { error: String(err) });
-      }
-    }));
-  }
-  async drain() {
-    if (this._pending.size === 0)
-      return;
-    await Promise.allSettled([...this._pending]);
-  }
-  clear() {
-    this.subscribers.clear();
-  }
-  subscriberCount(eventType) {
-    return (this.subscribers.get(eventType) ?? []).length;
-  }
-}
-var pipelineEventBus;
-var init_event_bus = __esm(() => {
-  init_logger2();
-  pipelineEventBus = new PipelineEventBus;
-});
-
 // src/pipeline/stages/completion.ts
 async function getDiffText(workdir, baseRef) {
   if (!baseRef)
@@ -58326,11 +58457,11 @@ var init_rollback = __esm(() => {
 });
 
 // src/utils/paths.ts
-import { join as join49, relative as relative13, sep as sep4 } from "path";
+import { join as join49, relative as relative14, sep as sep4 } from "path";
 function packageDirRelative(projectDir, workdir) {
   if (!projectDir || !workdir || workdir === projectDir)
     return;
-  const rel = relative13(projectDir, workdir);
+  const rel = relative14(projectDir, workdir);
   if (rel === ".." || rel.startsWith(`..${sep4}`))
     return;
   return rel && rel !== "." ? rel : undefined;
@@ -58346,6 +58477,9 @@ var init_paths3 = __esm(() => {
 });
 
 // src/execution/non-blocking-fix.ts
+function actionableAdvisoryFindings(findings) {
+  return findings.filter((f) => f.actionRequired !== false);
+}
 function shouldRunNonBlockingFix(cfg, advisoryCount) {
   return cfg?.enabled === true && advisoryCount > 0;
 }
@@ -58418,9 +58552,16 @@ async function runNonBlockingFix(args, overrides = {}) {
     exhausted = true;
   }
   if (!exhausted) {
-    if (args.keptTreeRegressed?.()) {
+    const gateVerdict = args.keptTreeRegressed?.();
+    if (gateVerdict?.regressed) {
       logger?.info("non-blocking-fix", "kept tree regressed the full-suite gate \u2014 restoring (ADR-024 \xA73)", {
-        storyId: args.storyId
+        storyId: args.storyId,
+        regressedKeys: gateVerdict.regressedKeys.slice(0, MAX_LOGGED_REGRESSED_KEYS),
+        regressedKeyCount: gateVerdict.regressedKeys.length,
+        baselineKeySize: gateVerdict.baselineKeySize,
+        keyless: gateVerdict.keyless,
+        memoExcludedKeyCount: gateVerdict.memoExcludedKeys.length,
+        flakeTriageRan: false
       });
       return restoreToSnapshot(args, _deps, restoreRef, phaseOutputsSnapshot, phaseCostsSnapshot, logger);
     }
@@ -58464,7 +58605,7 @@ async function restoreToSnapshot(args, _deps, restoreRef, phaseOutputsSnapshot,
   });
   return { ran: true, kept: false, restored: true };
 }
-var REVIEW_PHASE_KINDS, _nonBlockingFixDeps, DEFAULT_DEPS;
+var REVIEW_PHASE_KINDS, MAX_LOGGED_REGRESSED_KEYS = 10, _nonBlockingFixDeps, DEFAULT_DEPS;
 var init_non_blocking_fix = __esm(() => {
   init_logger2();
   init_rollback();
@@ -58607,13 +58748,29 @@ function gateFailureKeys(gateOutput) {
   }
   return keys;
 }
-function gateRegressedAfterRectification(finalGateOutput, baselineKeys, gateName, storyId) {
-  if (phasePassed(gateName, finalGateOutput, storyId))
-    return false;
-  const finalKeys = gateFailureKeys(finalGateOutput);
-  const hasNewStructuredKey = [...finalKeys].some((k) => !baselineKeys.has(k));
-  const isKeylessFailure = finalKeys.size === 0 || finalKeys.has(KEYLESS_GATE_FAILURE_KEY);
-  return hasNewStructuredKey || isKeylessFailure;
+function describeGateRegression(input) {
+  const { gateOutput, baselineKeys, gateName, storyId, quarantineMemo } = input;
+  const notRegressed = {
+    regressed: false,
+    regressedKeys: [],
+    memoExcludedKeys: [],
+    baselineKeySize: baselineKeys.size,
+    keyless: false
+  };
+  if (gateName === undefined || phasePassed(gateName, gateOutput, storyId))
+    return notRegressed;
+  const allKeys = gateFailureKeys(gateOutput);
+  const memoExcludedKeys = quarantineMemo ? [...allKeys].filter((k) => quarantineMemo.has(k)) : [];
+  const excluded = new Set(memoExcludedKeys);
+  const regressedKeys = [...allKeys].filter((k) => !baselineKeys.has(k) && !excluded.has(k));
+  const keyless = allKeys.size === 0 || allKeys.has(KEYLESS_GATE_FAILURE_KEY);
+  return {
+    regressed: regressedKeys.length > 0 || keyless,
+    regressedKeys,
+    memoExcludedKeys,
+    baselineKeySize: baselineKeys.size,
+    keyless
+  };
 }
 function phasesToRevalidate(strategiesRun, allPhases) {
   if (!strategiesRun || strategiesRun.length === 0)
@@ -58760,6 +58917,9 @@ function buildPhaseOutcomeLogData(storyId, opName, output, durationMs) {
   const data = { storyId, phase: opName, durationMs };
   if (findingsCount !== undefined)
     data.findingsCount = findingsCount;
+  const identities = extractPhaseFindings(output).slice(0, MAX_LOGGED_FINDING_IDENTITIES).map((f) => `${f.file ?? ""}::${f.rule ?? ""}`);
+  if (identities.length > 0)
+    data.findingIdentities = identities;
   if (status !== undefined)
     data.status = status;
   if (typeof r.failureCategory === "string")
@@ -58791,8 +58951,10 @@ function logDeterministicPhaseOutcome(storyId, opName, output, durationMs, isTdd
     logger?.warn("story-orchestrator", message, data);
   }
 }
+var MAX_LOGGED_FINDING_IDENTITIES = 10;
 var init_story_orchestrator_logging = __esm(() => {
   init_logger2();
+  init_phase_eval();
 });
 // src/verification/flake-baseline-diff.ts
 async function resolveFlakeBaselineDiff(config2, workdir, storyWorkdir) {
@@ -59065,10 +59227,13 @@ async function runPhase(ctx, slot, phaseCosts, phaseOutputs, isThreeSession = fa
   const beforeRef = isTddPhase ? await _storyOrchestratorDeps.captureGitRef(ctx.packageDir) : undefined;
   let dispatchInput = isTddPhase && beforeRef ? { ...slot.input, beforeRef } : slot.input;
   dispatchInput = await refreshReviewInputForDispatch(opName, dispatchInput);
+  let advIterationBefore = 0;
   if (opName === "adversarial-review" && ctx.storyId) {
+    const priorIterations = getAdversarialIterations(ctx.runtime.adversarialIterations, ctx.storyId);
+    advIterationBefore = priorIterations.length;
     dispatchInput = {
       ...dispatchInput,
-      priorAdversarialIterations: getAdversarialIterations(ctx.runtime.adversarialIterations, ctx.storyId)
+      priorAdversarialIterations: priorIterations
     };
   }
   if (isTddPhase) {
@@ -59085,6 +59250,7 @@ async function runPhase(ctx, slot, phaseCosts, phaseOutputs, isThreeSession = fa
   }
   const phaseStartedAt = Date.now();
   const scope = ctx.runtime.costAggregator.openScope();
+  let outcome = "passed";
   try {
     const output = await _storyOrchestratorDeps.callOp({ ...ctx, scopeId: scope.scopeId }, slot.op, dispatchInput);
     phaseOutputs[opName] = output;
@@ -59098,6 +59264,7 @@ async function runPhase(ctx, slot, phaseCosts, phaseOutputs, isThreeSession = fa
     }
     logUnifiedReviewPhaseResult(ctx.storyId, opName, output);
     logDeterministicPhaseOutcome(ctx.storyId, opName, output, Date.now() - phaseStartedAt, isTddPhase, slot.op.stage, progressData);
+    outcome = derivePhaseOutcome(output);
     if (isTddPhase) {
       const durationMs = Date.now() - phaseStartedAt;
       logger?.info("tdd", `Session complete: ${opName}`, {
@@ -59127,11 +59294,95 @@ async function runPhase(ctx, slot, phaseCosts, phaseOutputs, isThreeSession = fa
       }
     }
     return output;
+  } catch (err) {
+    outcome = "error";
+    throw err;
   } finally {
-    phaseCosts[opName] = (phaseCosts[opName] ?? 0) + scope.snapshot().totalCostUsd;
+    const snapshot = scope.snapshot();
+    phaseCosts[opName] = (phaseCosts[opName] ?? 0) + snapshot.totalCostUsd;
     scope.close();
+    if (ctx.storyId) {
+      const phaseDetails = buildPhaseDetails(opName, phaseOutputs[opName], isThreeSession, ctx.packageView.config, advIterationBefore, ctx.fixStrategy);
+      const event = {
+        type: "story:phase:completed",
+        storyId: ctx.storyId,
+        phase: opName,
+        outcome,
+        durationMs: Date.now() - phaseStartedAt,
+        costUsd: snapshot.totalCostUsd,
+        ...ctx.phaseTelemetry ? {
+          tier: ctx.phaseTelemetry.tier,
+          testStrategy: ctx.phaseTelemetry.testStrategy,
+          sessionModel: ctx.phaseTelemetry.sessionModel
+        } : {},
+        ...phaseDetails !== undefined ? { details: phaseDetails } : {}
+      };
+      pipelineEventBus.emit(event);
+    }
   }
 }
+function buildPhaseDetails(opName, output, isThreeSession, config2, advIterationBefore, fixStrategy) {
+  if (fixStrategy) {
+    return { kind: "fix", strategy: fixStrategy.name, findingsBefore: fixStrategy.findingsBefore };
+  }
+  if (output === null || typeof output !== "object")
+    return;
+  if (opName === "adversarial-review") {
+    const adv = output;
+    const findings = adv?.normalizedFindings ?? [];
+    const threshold = adv?.blockingThreshold ?? "error";
+    const bySeverity = Object.fromEntries(ALL_FINDING_SEVERITIES.map((sev) => [sev, findings.filter((f) => f.severity === sev).length]));
+    const blockingCount = findings.filter((f) => isBlockingSeverity(f.severity, threshold)).length;
+    const advisoryCount = findings.length - blockingCount;
+    return {
+      kind: "review",
+      reviewer: "adversarial",
+      iteration: advIterationBefore,
+      bySeverity,
+      blockingCount,
+      advisoryCount,
+      ...config2.reporters?.otel?.detail === "verbose" ? {
+        items: findings.map((f) => ({
+          message: f.message,
+          severity: f.severity,
+          ...f.rule ? { rule: f.rule } : {},
+          ...f.file ? { file: f.file } : {}
+        }))
+      } : {}
+    };
+  }
+  if (opName === "implementer") {
+    const impl = output;
+    const filesChanged = (impl?.filesChanged ?? []).length;
+    if (isThreeSession) {
+      return { kind: "authoring", role: "implementer", filesChanged, isolationPassed: impl?.isolation?.passed };
+    }
+    return { kind: "authoring", role: "implementer", filesChanged };
+  }
+  if (opName === "test-writer") {
+    const tw = output;
+    return { kind: "authoring", role: "test-writer", filesChanged: (tw?.filesChanged ?? []).length };
+  }
+  if (opName === "full-suite-gate") {
+    const gate = output;
+    return { kind: "gate", gate: "full-suite", failureCount: gate?.failureCount ?? 0 };
+  }
+  if (opName === "verifier" || opName === "verify-scoped") {
+    const verdict = output;
+    return { kind: "verdict", role: opName, passed: verdict.passed ?? false, failureCount: verdict.failureCount ?? 0 };
+  }
+  return;
+}
+function derivePhaseOutcome(output) {
+  const built = buildPhaseOutcomeLogData(undefined, "", output, 0);
+  if (!built)
+    return "passed";
+  if (built.success)
+    return "passed";
+  if (built.data.status === "skipped")
+    return "skipped";
+  return "failed";
+}
 function withIncreasingFailuresBail(strategies, enabled, consecutiveIncreases) {
   if (!enabled)
     return strategies;
@@ -59155,7 +59406,7 @@ function withIncreasingFailuresBail(strategies, enabled, consecutiveIncreases) {
     }
   }));
 }
-var _storyOrchestratorDeps;
+var _storyOrchestratorDeps, ALL_FINDING_SEVERITIES;
 var init_run_phase = __esm(() => {
   init_findings();
   init_logger2();
@@ -59185,6 +59436,14 @@ var init_run_phase = __esm(() => {
     },
     loadCheckpoints: async (_featureDir) => new Map
   };
+  ALL_FINDING_SEVERITIES = [
+    "critical",
+    "error",
+    "warning",
+    "info",
+    "low",
+    "unverifiable"
+  ];
 });
 
 // src/execution/story-orchestrator/rectification.ts
@@ -59408,6 +59667,15 @@ class ExecutionPlan {
     this.state = state;
     this.isThreeSession = isThreeSession;
   }
+  describeGateRegressionNow(phaseOutputs, gateName, baselineKeys) {
+    return describeGateRegression({
+      gateOutput: gateName === undefined ? undefined : phaseOutputs[gateName],
+      baselineKeys,
+      gateName,
+      storyId: this.ctx.storyId,
+      quarantineMemo: this.ctx.runtime.quarantineMemo
+    });
+  }
   phaseNames() {
     const names = collectOrderedPhases(this.state).map((p) => p.slot.op.name);
     if (this.state.rectification) {
@@ -59544,7 +59812,7 @@ class ExecutionPlan {
     const storyCurrentlyGreen = !rectResult.rectificationExhausted && Object.entries(phaseOutputs).every(([name, output]) => phasePassed(name, output, this.ctx.storyId));
     const advCfg = this.state.adversarialReview ? this.state.nonBlockingFix : undefined;
     const advisoryOut = phaseOutputs["adversarial-review"];
-    const advisoryFindings = advisoryOut?.advisoryFindings ?? [];
+    const advisoryFindings = actionableAdvisoryFindings(advisoryOut?.advisoryFindings ?? []);
     if (advCfg && storyCurrentlyGreen && this.state.rectification && this.ctx.storyId && shouldRunNonBlockingFix(advCfg, advisoryFindings.length)) {
       await _storyOrchestratorDeps.runNonBlockingFix({
         workdir: this.ctx.packageDir,
@@ -59561,7 +59829,7 @@ class ExecutionPlan {
           maxAttempts,
           postValidate: this.state.nonBlockingFixPostValidate
         }),
-        keptTreeRegressed: () => gateName !== undefined && gateRegressedAfterRectification(phaseOutputs[gateName], preRectGateFailureKeys, gateName, this.ctx.storyId)
+        keptTreeRegressed: () => this.describeGateRegressionNow(phaseOutputs, gateName, preRectGateFailureKeys)
       }, {
         measureSourceDiff: createMeasureSourceDiff({
           config: this.ctx.runtime.configLoader.current(),
@@ -59572,7 +59840,7 @@ class ExecutionPlan {
     }
     const verifierName = this.state.verifier?.slot.op.name;
     const verifierExplicitlyPassed = verifierName !== undefined && phaseExplicitlyPassed(phaseOutputs[verifierName]);
-    const gateRegressedDuringRect = gateName !== undefined && gateRegressedAfterRectification(phaseOutputs[gateName], preRectGateFailureKeys, gateName, this.ctx.storyId);
+    const gateRegressedDuringRect = this.describeGateRegressionNow(phaseOutputs, gateName, preRectGateFailureKeys).regressed;
     const verifierPassedSsot = verifierExplicitlyPassed && !gateRegressedDuringRect;
     if (verifierExplicitlyPassed && gateRegressedDuringRect) {
       logger?.warn("story-orchestrator", "Gate regressed during rectification after verifier passed \u2014 verifier verdict is stale, failing story", { storyId: this.ctx.storyId, packageDir: this.ctx.packageDir });
@@ -59792,8 +60060,9 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
   if (inputs.adversarialReview) {
     builder.addAdversarialReview(inputs.adversarialReview);
   }
-  const packageDir = join50(ctx.packageDir, story.workdir ?? "");
-  const resolvedTestPatterns = await resolveTestFilePatterns(config2, ctx.packageDir, story.workdir);
+  const repoRoot = ctx.packageDir;
+  const packageDir = join50(repoRoot, story.workdir ?? "");
+  const resolvedTestPatterns = await resolveTestFilePatterns(config2, repoRoot, story.workdir);
   if (shouldRunRectification(config2) && inputs.rectification) {
     const sink = makeDeclarationSink();
     const strategies = [];
@@ -59829,7 +60098,9 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
         files: h.files,
         reasonDetail: h.reasonDetail
       }));
-      const { valid, invalid } = await validateMockStructureFiles(pendingMock, resolvedTestPatterns, packageDir);
+      const { valid, invalid } = await validateMockStructureFiles(pendingMock, resolvedTestPatterns, packageDir, {
+        repoRoot
+      });
       sink.mockHandoffs = valid.map((d) => ({ files: d.files ?? [], reasonDetail: d.reasonDetail ?? "" }));
       const allDeclarations = [...sink.testEdits, ...valid];
       sink.testEdits = [];
@@ -59888,7 +60159,9 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
         files: h.files,
         reasonDetail: h.reasonDetail
       }));
-      const { valid, invalid } = await validateMockStructureFiles(pendingMock, resolvedTestPatterns, packageDir);
+      const { valid, invalid } = await validateMockStructureFiles(pendingMock, resolvedTestPatterns, packageDir, {
+        repoRoot
+      });
       nbSink.mockHandoffs = valid.map((d) => ({ files: d.files ?? [], reasonDetail: d.reasonDetail ?? "" }));
       const allDeclarations = [...nbSink.testEdits, ...valid];
       nbSink.testEdits = [];
@@ -60827,7 +61100,12 @@ var init_execution = __esm(() => {
         featureName: ctx.prd.feature,
         story: ctx.story,
         ...ctx.featureDir ? { featureDir: ctx.featureDir } : {},
-        ...interactionBridge ? { interactionBridge } : {}
+        ...interactionBridge ? { interactionBridge } : {},
+        phaseTelemetry: {
+          testStrategy: ctx.routing.testStrategy,
+          sessionModel: isThreeSessionStrategy(ctx.routing.testStrategy) ? "three-session" : "single-session",
+          tier: effectiveTier
+        }
       };
       let capturedTokenUsage;
       let capturedResponse = "";
@@ -61590,6 +61868,196 @@ var init_stages = __esm(() => {
   preRunPipeline = [acceptanceSetupStage];
 });
 
+// src/pipeline/subscribers/reporters.ts
+async function fanOutReporters(reporters, hook, invoke) {
+  const logger = getSafeLogger();
+  for (const reporter of reporters) {
+    try {
+      await invoke(reporter);
+    } catch (err) {
+      try {
+        logger?.warn("plugins", `Reporter '${reporter.name}' ${hook} failed`, { error: err });
+      } catch {}
+    }
+  }
+}
+function wireReporters(bus, pluginRegistry, runId, startTime) {
+  const logger = getSafeLogger();
+  const safe = (name, fn) => {
+    return fn().catch((err) => logger?.warn("reporters-subscriber", `Reporter "${name}" error`, { error: String(err) })).catch(() => {});
+  };
+  const unsubs = [];
+  const phaseStart = (event) => fanOutReporters(pluginRegistry.getReporters(), "onPhaseStart", (reporter) => reporter.onPhaseStart?.(event));
+  const phaseComplete = (event) => fanOutReporters(pluginRegistry.getReporters(), "onPhaseComplete", (reporter) => reporter.onPhaseComplete?.(event));
+  unsubs.push(bus.on("story:step", (ev) => phaseStart({
+    runId,
+    scope: "story",
+    storyId: ev.storyId,
+    phase: ev.step,
+    startTime: new Date().toISOString()
+  })), bus.on("story:phase:completed", (phaseEvent) => phaseComplete({
+    runId,
+    scope: "story",
+    storyId: phaseEvent.storyId,
+    phase: phaseEvent.phase,
+    outcome: phaseEvent.outcome,
+    durationMs: phaseEvent.durationMs,
+    costUsd: phaseEvent.costUsd,
+    tier: phaseEvent.tier,
+    testStrategy: phaseEvent.testStrategy,
+    sessionModel: phaseEvent.sessionModel,
+    details: phaseEvent.details
+  })), bus.on("postrun:phase:started", (ev) => phaseStart({
+    runId,
+    scope: "run",
+    phase: ev.phase,
+    startTime: new Date().toISOString()
+  })), bus.on("postrun:phase:completed", (phaseEvent) => phaseComplete({
+    runId,
+    scope: "run",
+    phase: phaseEvent.phase,
+    outcome: phaseEvent.passed ? "passed" : "failed",
+    durationMs: phaseEvent.durationMs ?? 0,
+    costUsd: phaseEvent.costUsd,
+    details: phaseEvent.details
+  })));
+  unsubs.push(bus.on("run:started", (ev) => {
+    return safe("onRunStart", async () => {
+      const reporters = pluginRegistry.getReporters();
+      for (const r of reporters) {
+        if (r.onRunStart) {
+          try {
+            await r.onRunStart({
+              runId,
+              feature: ev.feature,
+              totalStories: ev.totalStories,
+              startTime: new Date(startTime).toISOString()
+            });
+          } catch (err) {
+            logger?.warn("plugins", `Reporter '${r.name}' onRunStart failed`, { error: err });
+          }
+        }
+      }
+    });
+  }));
+  unsubs.push(bus.on("story:completed", (ev) => {
+    return safe("onStoryComplete(completed)", async () => {
+      const reporters = pluginRegistry.getReporters();
+      for (const r of reporters) {
+        if (r.onStoryComplete) {
+          try {
+            await r.onStoryComplete({
+              runId,
+              storyId: ev.storyId,
+              status: "completed",
+              runElapsedMs: ev.runElapsedMs,
+              cost: ev.cost ?? 0,
+              tier: ev.modelTier ?? "balanced",
+              testStrategy: ev.testStrategy ?? "test-after"
+            });
+          } catch (err) {
+            logger?.warn("plugins", `Reporter '${r.name}' onStoryComplete failed`, { error: err });
+          }
+        }
+      }
+    });
+  }));
+  unsubs.push(bus.on("story:failed", (ev) => {
+    return safe("onStoryComplete(failed)", async () => {
+      const reporters = pluginRegistry.getReporters();
+      for (const r of reporters) {
+        if (r.onStoryComplete) {
+          try {
+            await r.onStoryComplete({
+              runId,
+              storyId: ev.storyId,
+              status: "failed",
+              runElapsedMs: Date.now() - startTime,
+              cost: 0,
+              tier: "balanced",
+              testStrategy: "test-after"
+            });
+          } catch (err) {
+            logger?.warn("plugins", `Reporter '${r.name}' onStoryComplete failed`, { error: err });
+          }
+        }
+      }
+    });
+  }));
+  unsubs.push(bus.on("story:paused", (ev) => {
+    return safe("onStoryComplete(paused)", async () => {
+      const reporters = pluginRegistry.getReporters();
+      for (const r of reporters) {
+        if (r.onStoryComplete) {
+          try {
+            await r.onStoryComplete({
+              runId,
+              storyId: ev.storyId,
+              status: "paused",
+              runElapsedMs: Date.now() - startTime,
+              cost: 0,
+              tier: "balanced",
+              testStrategy: "test-after"
+            });
+          } catch (err) {
+            logger?.warn("plugins", `Reporter '${r.name}' onStoryComplete failed`, { error: err });
+          }
+        }
+      }
+    });
+  }));
+  unsubs.push(bus.on("story:escalated", (ev) => {
+    return safe("onEscalation", async () => {
+      const reporters = pluginRegistry.getReporters();
+      for (const r of reporters) {
+        if (r.onEscalation) {
+          try {
+            await r.onEscalation({
+              runId,
+              storyId: ev.storyId,
+              fromTier: ev.fromTier,
+              toTier: ev.toTier
+            });
+          } catch (err) {
+            logger?.warn("plugins", `Reporter '${r.name}' onEscalation failed`, { error: err });
+          }
+        }
+      }
+    });
+  }));
+  unsubs.push(bus.on("run:completed", (ev) => {
+    return safe("onRunEnd", async () => {
+      const reporters = pluginRegistry.getReporters();
+      for (const r of reporters) {
+        if (r.onRunEnd) {
+          try {
+            await r.onRunEnd({
+              runId,
+              totalDurationMs: Date.now() - startTime,
+              totalCost: ev.totalCost ?? 0,
+              storySummary: {
+                completed: ev.passedStories,
+                failed: ev.failedStories,
+                skipped: ev.skippedStories,
+                paused: ev.pausedStories
+              }
+            });
+          } catch (err) {
+            logger?.warn("plugins", `Reporter '${r.name}' onRunEnd failed`, { error: err });
+          }
+        }
+      }
+    });
+  }));
+  return () => {
+    for (const u of unsubs)
+      u();
+  };
+}
+var init_reporters = __esm(() => {
+  init_logger2();
+});
+
 // src/pipeline/index.ts
 var init_pipeline = __esm(() => {
   init_runner4();
@@ -61597,7 +62065,9 @@ var init_pipeline = __esm(() => {
   init_stages();
   init_queue_check();
   init_execution_helpers();
+  init_acceptance_setup();
   init_event_bus();
+  init_reporters();
 });
 
 // src/cli/prompts-shared.ts
@@ -64352,6 +64822,19 @@ var init_telegram2 = __esm(() => {
 
 // src/plugins/builtin/nax-finish/index.ts
 import * as path21 from "path";
+function logTail(stream) {
+  if (stream.length <= LOG_TAIL_CHARS)
+    return stream;
+  return `[\u2026${stream.length - LOG_TAIL_CHARS} chars truncated\u2026]
+${stream.slice(-LOG_TAIL_CHARS)}`;
+}
+function stderrTail(stderr) {
+  const trimmed = stderr.trim();
+  if (!trimmed)
+    return "";
+  const tail = trimmed.length > STDERR_TAIL_CHARS ? `\u2026${trimmed.slice(-STDERR_TAIL_CHARS)}` : trimmed;
+  return tail.replace(/\s+/g, " ");
+}
 async function defaultRun2(cmd, opts) {
   const proc = Bun.spawn(cmd, { cwd: opts.cwd, env: opts.env, stdout: "pipe", stderr: "pipe" });
   let timedOut = false;
@@ -64425,7 +64908,7 @@ function buildFlowEnv(cfg) {
     env2.NAX_FINISH_QUALITY_PROFILE = cfg.reviewers.quality;
   return env2;
 }
-var PLUGIN_NAME4 = "nax-finish", PLUGIN_VERSION4 = "0.1.0", PACKAGE_ROOT_SEARCH_DEPTH = 6, _naxFinishDeps, naxFinishAction, naxFinishPlugin;
+var PLUGIN_NAME4 = "nax-finish", PLUGIN_VERSION4 = "0.1.0", PACKAGE_ROOT_SEARCH_DEPTH = 6, STDERR_TAIL_CHARS = 400, LOG_TAIL_CHARS = 20000, _naxFinishDeps, naxFinishAction, naxFinishPlugin;
 var init_nax_finish = __esm(() => {
   init_config2();
   init_telegram2();
@@ -64476,7 +64959,16 @@ var init_nax_finish = __esm(() => {
         });
         const result = await _naxFinishDeps.readResult(ctx.workdir);
         if (!result) {
-          return { success: res.exitCode === 0, message: `nax-finish flow exited ${res.exitCode} (no result file)` };
+          ctx.logger.warn("nax-finish flow produced no result file", {
+            exitCode: res.exitCode,
+            stdout: logTail(res.stdout),
+            stderr: logTail(res.stderr)
+          });
+          const tail = stderrTail(res.stderr);
+          return {
+            success: false,
+            message: `nax-finish flow exited ${res.exitCode} (no result file)${tail ? `: ${tail}` : ""}`
+          };
         }
         if (result.status === "escalated" && escalateTelegram && creds) {
           await _naxFinishDeps.notify(creds, `nax-finish escalated *${result.feature}*: ${result.escalationReason ?? ""}`);
@@ -64554,16 +65046,72 @@ var init_reporter_shared = __esm(() => {
   init_post_json();
 });
 
-// src/plugins/builtin/otel-reporter/ids.ts
-function randomHex(bytes) {
-  const arr = new Uint8Array(bytes);
-  crypto.getRandomValues(arr);
-  let out = "";
-  for (const b of arr)
-    out += b.toString(16).padStart(2, "0");
-  return out;
+// src/plugins/builtin/otel-reporter/batch-queue.ts
+function createBatchQueue(opts) {
+  const { maxBatchSize, flushIntervalMs, maxQueueSize, send } = opts;
+  let queue = [];
+  let dropCount = 0;
+  let overflowing = false;
+  let tornDown = false;
+  let timer;
+  const armTimer = () => {
+    timer = setTimeout(() => {
+      doFlush();
+      if (!tornDown)
+        armTimer();
+    }, flushIntervalMs);
+  };
+  const sendWithRetry = async (batch) => {
+    for (let attempt = 0;attempt < RETRY_ATTEMPTS; attempt++) {
+      try {
+        const ok = await send(batch);
+        if (ok)
+          return;
+      } catch (err) {
+        getSafeLogger()?.warn(STAGE, "Batch export threw", { error: err instanceof Error ? err.message : String(err) });
+      }
+    }
+  };
+  const doFlush = () => {
+    if (tornDown || queue.length === 0)
+      return Promise.resolve();
+    const batch = queue;
+    queue = [];
+    sendWithRetry(batch);
+    return Promise.resolve();
+  };
+  const enqueue = (item) => {
+    queue.push(item);
+    if (queue.length > maxQueueSize) {
+      queue.shift();
+      dropCount++;
+      if (!overflowing) {
+        overflowing = true;
+        getSafeLogger()?.warn(STAGE, "Batch queue overflow \u2014 dropping oldest entries", { maxQueueSize });
+      }
+    } else {
+      overflowing = false;
+    }
+    if (queue.length >= maxBatchSize) {
+      doFlush();
+    }
+  };
+  armTimer();
+  return {
+    enqueue,
+    flushNow: () => doFlush(),
+    teardown: () => {
+      tornDown = true;
+      if (timer !== undefined)
+        clearTimeout(timer);
+    },
+    getMetrics: () => ({ size: queue.length, dropCount })
+  };
 }
-var newTraceId = () => randomHex(16), newSpanId = () => randomHex(8);
+var STAGE = "otel-batch-queue", RETRY_ATTEMPTS = 2;
+var init_batch_queue = __esm(() => {
+  init_logger2();
+});
 
 // src/plugins/builtin/otel-reporter/otlp.ts
 function attr(key, value) {
@@ -64572,10 +65120,27 @@ function attr(key, value) {
 function msToUnixNano(ms) {
   return (BigInt(Math.round(ms)) * 1000000n).toString();
 }
+function buildHistogramPoint(values, bounds, attributes, timeUnixNano) {
+  const bucketCounts = new Array(bounds.length + 1).fill(0);
+  let sum = 0;
+  for (const value of values) {
+    sum += value;
+    const bucketIndex = bounds.findIndex((bound) => value <= bound);
+    bucketCounts[bucketIndex === -1 ? bounds.length : bucketIndex]++;
+  }
+  return { attributes, timeUnixNano, count: values.length, sum, bucketCounts, explicitBounds: bounds };
+}
+function buildCounterPoint(count, attributes, timeUnixNano) {
+  return { attributes, timeUnixNano, asInt: String(count) };
+}
+function buildResourceAttributes(serviceName, runId) {
+  return [attr("service.name", serviceName), attr("nax.run_id", runId)];
+}
 function buildTracesPayload(p) {
   const span = {
     traceId: p.traceId,
     spanId: p.spanId,
+    ...p.parentSpanId ? { parentSpanId: p.parentSpanId } : {},
     name: "nax.run",
     kind: 1,
     startTimeUnixNano: p.startUnixNano,
@@ -64596,7 +65161,7 @@ function buildTracesPayload(p) {
     resourceSpans: [
       {
         resource: { attributes: [attr("service.name", p.serviceName)] },
-        scopeSpans: [{ scope: { name: "nax" }, spans: [span] }]
+        scopeSpans: [{ scope: { name: "nax" }, spans: [span, ...p.extraSpans ?? []] }]
       }
     ]
   };
@@ -64634,16 +65199,356 @@ function buildMetricsPayload(p) {
   };
 }
 
+// src/plugins/builtin/otel-reporter/heartbeat.ts
+function startHeartbeat(opts) {
+  const { intervalMs, getSnapshot, onTick } = opts;
+  if (intervalMs <= 0)
+    return { stop() {} };
+  let stopped = false;
+  let timer;
+  const armTimer = () => {
+    timer = setTimeout(() => {
+      try {
+        Promise.resolve(onTick(getSnapshot())).catch((err) => getSafeLogger()?.warn(STAGE2, "Heartbeat tick failed", {
+          error: err instanceof Error ? err.message : String(err)
+        }));
+      } catch (err) {
+        getSafeLogger()?.warn(STAGE2, "Heartbeat tick failed", {
+          error: err instanceof Error ? err.message : String(err)
+        });
+      }
+      if (!stopped)
+        armTimer();
+    }, intervalMs);
+  };
+  armTimer();
+  return {
+    stop() {
+      stopped = true;
+      if (timer !== undefined)
+        clearTimeout(timer);
+    }
+  };
+}
+function heartbeatAttributes(a) {
+  return [
+    attr("run_id", a.runId),
+    attr("feature", a.feature),
+    attr("project", a.project),
+    attr("story_id", a.storyId),
+    attr("phase", a.phase),
+    attr("tier", a.tier),
+    attr("test_strategy", a.testStrategy)
+  ];
+}
+function buildHeartbeatMetricsPayload(p) {
+  const attributes = heartbeatAttributes(p.snapshot.attributes);
+  const gauge = (name, value) => ({
+    name,
+    gauge: { dataPoints: [{ asDouble: value, timeUnixNano: p.timeUnixNano, attributes }] }
+  });
+  return {
+    resourceMetrics: [
+      {
+        resource: { attributes: [attr("service.name", p.serviceName)] },
+        scopeMetrics: [
+          {
+            scope: { name: "nax" },
+            metrics: [
+              gauge("nax.run.active", 1),
+              gauge("nax.run.phase_elapsed_ms", p.snapshot.phaseElapsedMs),
+              gauge("nax.run.cost_usd", p.snapshot.costUsd)
+            ]
+          }
+        ]
+      }
+    ]
+  };
+}
+var STAGE2 = "otel-reporter-heartbeat";
+var init_heartbeat = __esm(() => {
+  init_logger2();
+});
+
+// src/plugins/builtin/otel-reporter/ids.ts
+function randomHex(bytes) {
+  const arr = new Uint8Array(bytes);
+  crypto.getRandomValues(arr);
+  let out = "";
+  for (const b of arr)
+    out += b.toString(16).padStart(2, "0");
+  return out;
+}
+var newTraceId = () => randomHex(16), newSpanId = () => randomHex(8);
+
+// src/plugins/builtin/otel-reporter/span-tree.ts
+function createSpanTree(traceId, runSpanId) {
+  const storySpanIds = new Map;
+  function storySpanId(storyId) {
+    let spanId = storySpanIds.get(storyId);
+    if (!spanId) {
+      spanId = newSpanId();
+      storySpanIds.set(storyId, spanId);
+    }
+    return spanId;
+  }
+  function buildStorySpan(storyId, startUnixNano, endUnixNano) {
+    return {
+      traceId,
+      spanId: storySpanId(storyId),
+      parentSpanId: runSpanId,
+      name: "nax.story",
+      startTimeUnixNano: startUnixNano,
+      endTimeUnixNano: endUnixNano,
+      attributes: [attr("nax.story_id", storyId)]
+    };
+  }
+  function buildPhaseSpan({ event, traceId: spanTraceId, startUnixNano, endUnixNano }) {
+    const parentSpanId = event.scope === "story" && event.storyId !== undefined ? storySpanId(event.storyId) : runSpanId;
+    const attributes = [attr("phase", event.phase), attr("outcome", event.outcome)];
+    if (event.testStrategy)
+      attributes.push(attr("nax.test_strategy", event.testStrategy));
+    return {
+      traceId: spanTraceId,
+      spanId: newSpanId(),
+      parentSpanId,
+      name: "nax.phase",
+      startTimeUnixNano: startUnixNano,
+      endTimeUnixNano: endUnixNano,
+      attributes
+    };
+  }
+  return { traceId, runSpanId, storySpanId, buildStorySpan, buildPhaseSpan };
+}
+function counterKey(attributes) {
+  return attributes.map((a) => `${a.key}=${a.value.stringValue ?? a.value.doubleValue}`).join("|");
+}
+function bumpCounter(groups, attributes, count) {
+  const key = counterKey(attributes);
+  const existing = groups.get(key);
+  if (existing) {
+    existing.count += count;
+  } else {
+    groups.set(key, { attributes, count });
+  }
+}
+function createPhaseMetricsAggregator() {
+  const phaseGroups = new Map;
+  const reviewFindings = new Map;
+  const fixIterations = new Map;
+  const escalations = new Map;
+  function recordPhase(event) {
+    const attributes = [
+      attr("phase", event.phase),
+      attr("outcome", event.outcome),
+      attr("tier", event.tier ?? "unknown"),
+      attr("test_strategy", event.testStrategy ?? "unknown"),
+      attr("session_model", event.sessionModel ?? "unknown")
+    ];
+    const key = counterKey(attributes);
+    let group = phaseGroups.get(key);
+    if (!group) {
+      group = { attributes, durations: [], costs: [] };
+      phaseGroups.set(key, group);
+    }
+    group.durations.push(event.durationMs);
+    if (event.costUsd !== undefined)
+      group.costs.push(event.costUsd);
+  }
+  function recordReviewFindings(phase, severity2, count) {
+    bumpCounter(reviewFindings, [attr("phase", phase), attr("severity", severity2)], count);
+  }
+  function recordFixIterations(phase, strategy, count) {
+    bumpCounter(fixIterations, [attr("phase", phase), attr("strategy", strategy)], count);
+  }
+  function recordEscalation(toTier, count) {
+    bumpCounter(escalations, [attr("to_tier", toTier)], count);
+  }
+  function buildMetricsPayload2(serviceName, runId, timeUnixNano) {
+    const groups = [...phaseGroups.values()];
+    const counterMetric = (name, source) => ({
+      name,
+      sum: {
+        aggregationTemporality: 2,
+        isMonotonic: true,
+        dataPoints: [...source.values()].map((g) => buildCounterPoint(g.count, g.attributes, timeUnixNano))
+      }
+    });
+    const metrics = [];
+    if (groups.length > 0) {
+      metrics.push({
+        name: "nax.phase.duration",
+        histogram: {
+          aggregationTemporality: 2,
+          dataPoints: groups.map((g) => buildHistogramPoint(g.durations, PHASE_DURATION_BOUNDS, g.attributes, timeUnixNano))
+        }
+      });
+      metrics.push({
+        name: "nax.phase.cost_usd",
+        histogram: {
+          aggregationTemporality: 2,
+          dataPoints: groups.map((g) => buildHistogramPoint(g.costs, PHASE_COST_BOUNDS, g.attributes, timeUnixNano))
+        }
+      });
+    }
+    if (reviewFindings.size > 0)
+      metrics.push(counterMetric("nax.review.findings", reviewFindings));
+    if (fixIterations.size > 0)
+      metrics.push(counterMetric("nax.fix.iterations", fixIterations));
+    if (escalations.size > 0)
+      metrics.push(counterMetric("nax.escalations", escalations));
+    return {
+      resourceMetrics: [
+        {
+          resource: { attributes: buildResourceAttributes(serviceName, runId) },
+          scopeMetrics: [{ scope: { name: "nax" }, metrics }]
+        }
+      ]
+    };
+  }
+  return { recordPhase, recordReviewFindings, recordFixIterations, recordEscalation, buildMetricsPayload: buildMetricsPayload2 };
+}
+var PHASE_DURATION_BOUNDS, PHASE_COST_BOUNDS;
+var init_span_tree = __esm(() => {
+  PHASE_DURATION_BOUNDS = [100, 500, 1000, 5000, 15000, 60000, 300000, 900000];
+  PHASE_COST_BOUNDS = [0.001, 0.01, 0.05, 0.1, 0.5, 1, 5];
+});
+
+// src/plugins/builtin/otel-reporter/traceparent.ts
+function parseTraceparent(value) {
+  if (!value)
+    return null;
+  const match = TRACEPARENT_PATTERN.exec(value);
+  if (!match)
+    return null;
+  const [, traceId, spanId] = match;
+  if (!traceId || !spanId || ALL_ZERO.test(traceId))
+    return null;
+  return { traceId, spanId };
+}
+var TRACEPARENT_PATTERN, ALL_ZERO;
+var init_traceparent = __esm(() => {
+  TRACEPARENT_PATTERN = /^[0-9a-f]{2}-([0-9a-f]{32})-([0-9a-f]{16})-[0-9a-f]{2}$/;
+  ALL_ZERO = /^0+$/;
+});
+
 // src/plugins/builtin/otel-reporter/index.ts
+function rootSpanIdentity() {
+  const adopted = parseTraceparent(process.env.TRACEPARENT);
+  if (!adopted)
+    return { traceId: newTraceId(), spanId: newSpanId() };
+  return { traceId: adopted.traceId, spanId: newSpanId(), parentSpanId: adopted.spanId };
+}
+function heartbeatSnapshotOf(runId, st) {
+  const last = st.lastPhase;
+  return {
+    attributes: {
+      runId,
+      feature: st.feature,
+      project: st.project,
+      storyId: last?.storyId ?? "",
+      phase: last?.phase ?? "",
+      tier: last?.tier ?? "",
+      testStrategy: last?.testStrategy ?? ""
+    },
+    phaseElapsedMs: last ? Date.now() - last.atMs : 0,
+    costUsd: st.costUsd
+  };
+}
+function recordDetailMetrics(metrics, phase, details) {
+  if (typeof details !== "object" || details === null)
+    return;
+  const record2 = details;
+  if (record2.kind === "review" && typeof record2.bySeverity === "object" && record2.bySeverity !== null) {
+    for (const [severity2, count] of Object.entries(record2.bySeverity)) {
+      if (count > 0)
+        metrics.recordReviewFindings(phase, severity2, count);
+    }
+  } else if (record2.kind === "fix" && typeof record2.strategy === "string") {
+    metrics.recordFixIterations(phase, record2.strategy, 1);
+  }
+}
+function reviewSpanEvents(details, timeUnixNano, verbose) {
+  if (!verbose)
+    return [];
+  if (typeof details !== "object" || details === null)
+    return [];
+  const record2 = details;
+  if (record2.kind !== "review" || !Array.isArray(record2.items))
+    return [];
+  return record2.items.map((item) => {
+    const finding = typeof item === "object" && item !== null ? item : {};
+    const attributes = [attr("message", String(finding.message ?? ""))];
+    if (typeof finding.file === "string")
+      attributes.push(attr("file", finding.file));
+    return { timeUnixNano, name: "review.finding", attributes };
+  });
+}
 function createOtelReporterPlugin(cfg, deps) {
   const states = new Map;
   const base = cfg.endpoint?.replace(/\/$/, "");
+  let tornDown = false;
+  const sendSpanBatch = async (batch) => {
+    if (!base || batch.length === 0)
+      return true;
+    const { resolved, missing } = interpolateHeaders(cfg.headers);
+    if (missing.length > 0) {
+      getSafeLogger()?.warn(STAGE3, "Skipping OTLP export \u2014 unresolved env vars", { missing });
+      return true;
+    }
+    const payload = {
+      resourceSpans: [
+        {
+          resource: { attributes: [attr("service.name", cfg.serviceName)] },
+          scopeSpans: [{ scope: { name: "nax" }, spans: batch }]
+        }
+      ]
+    };
+    return postJson(`${base}/v1/traces`, payload, { headers: resolved, timeoutMs: cfg.timeoutMs, stage: STAGE3, deps });
+  };
+  const makeSpanQueue = () => createBatchQueue({
+    maxBatchSize: cfg.maxBatchSize ?? DEFAULT_MAX_BATCH_SIZE,
+    flushIntervalMs: cfg.flushIntervalMs ?? DEFAULT_FLUSH_INTERVAL_MS,
+    maxQueueSize: cfg.maxQueueSize ?? DEFAULT_MAX_QUEUE_SIZE,
+    send: sendSpanBatch
+  });
+  const buildOrphanState = (startMs) => {
+    const identity = rootSpanIdentity();
+    return {
+      ...identity,
+      startMs,
+      feature: "",
+      project: "",
+      events: [],
+      spanTree: createSpanTree(identity.traceId, identity.spanId),
+      spanQueue: makeSpanQueue(),
+      metrics: createPhaseMetricsAggregator(),
+      storyBounds: new Map,
+      costUsd: 0,
+      heartbeat: { stop() {} }
+    };
+  };
+  const exportHeartbeat = async (snapshot) => {
+    if (!base)
+      return;
+    const { resolved, missing } = interpolateHeaders(cfg.headers);
+    if (missing.length > 0) {
+      getSafeLogger()?.warn(STAGE3, "Skipping OTLP export \u2014 unresolved env vars", { missing });
+      return;
+    }
+    const metrics = buildHeartbeatMetricsPayload({
+      serviceName: cfg.serviceName,
+      timeUnixNano: msToUnixNano(Date.now()),
+      snapshot
+    });
+    await postJson(`${base}/v1/metrics`, metrics, { headers: resolved, timeoutMs: cfg.timeoutMs, stage: STAGE3, deps });
+  };
   const flush = async (st, endMs, e) => {
     if (!base)
       return;
     const { resolved, missing } = interpolateHeaders(cfg.headers);
     if (missing.length > 0) {
-      getSafeLogger()?.warn(STAGE, "Skipping OTLP export \u2014 unresolved env vars", { missing });
+      getSafeLogger()?.warn(STAGE3, "Skipping OTLP export \u2014 unresolved env vars", { missing });
       return;
     }
     const startUnixNano = msToUnixNano(st.startMs);
@@ -64652,6 +65557,7 @@ function createOtelReporterPlugin(cfg, deps) {
       serviceName: cfg.serviceName,
       traceId: st.traceId,
       spanId: st.spanId,
+      parentSpanId: st.parentSpanId,
       startUnixNano,
       endUnixNano,
       feature: st.feature,
@@ -64668,20 +65574,35 @@ function createOtelReporterPlugin(cfg, deps) {
       totalCost: e.totalCost,
       totalDurationMs: e.totalDurationMs
     });
-    const opts = { headers: resolved, timeoutMs: cfg.timeoutMs, stage: STAGE, deps };
+    const aggMetrics = st.metrics.buildMetricsPayload(cfg.serviceName, e.runId, endUnixNano);
+    metrics.resourceMetrics[0].scopeMetrics[0].metrics.push(...aggMetrics.resourceMetrics[0].scopeMetrics[0].metrics);
+    const opts = { headers: resolved, timeoutMs: cfg.timeoutMs, stage: STAGE3, deps };
     await postJson(`${base}/v1/traces`, traces, opts);
     await postJson(`${base}/v1/metrics`, metrics, opts);
   };
   const reporter = {
-    name: STAGE,
+    name: STAGE3,
     async onRunStart(event) {
-      states.set(event.runId, {
-        traceId: newTraceId(),
-        spanId: newSpanId(),
+      const identity = rootSpanIdentity();
+      const runId = event.runId;
+      const state = {
+        ...identity,
         startMs: Date.parse(event.startTime),
         feature: event.feature,
-        events: []
-      });
+        project: event.project ?? "",
+        events: [],
+        spanTree: createSpanTree(identity.traceId, identity.spanId),
+        spanQueue: makeSpanQueue(),
+        metrics: createPhaseMetricsAggregator(),
+        storyBounds: new Map,
+        costUsd: 0,
+        heartbeat: startHeartbeat({
+          intervalMs: cfg.heartbeatIntervalMs ?? 0,
+          getSnapshot: () => heartbeatSnapshotOf(runId, state),
+          onTick: (snapshot) => exportHeartbeat(snapshot)
+        })
+      };
+      states.set(runId, state);
     },
     async onStoryComplete(event) {
       const st = states.get(event.runId);
@@ -64698,32 +65619,98 @@ function createOtelReporterPlugin(cfg, deps) {
           attr("testStrategy", event.testStrategy)
         ]
       });
+      const bounds = st.storyBounds.get(event.storyId);
+      if (bounds) {
+        st.spanQueue.enqueue(st.spanTree.buildStorySpan(event.storyId, msToUnixNano(bounds.startMs), msToUnixNano(bounds.endMs)));
+        st.storyBounds.delete(event.storyId);
+      }
+    },
+    async onPhaseComplete(event) {
+      const st = states.get(event.runId);
+      if (!st)
+        return;
+      st.costUsd += event.costUsd ?? 0;
+      st.lastPhase = {
+        phase: event.phase,
+        storyId: event.storyId ?? "",
+        tier: event.tier ?? "",
+        testStrategy: event.testStrategy ?? "",
+        atMs: Date.now()
+      };
+      const endMs = Date.now();
+      const startMs = endMs - event.durationMs;
+      const endUnixNano = msToUnixNano(endMs);
+      const span = st.spanTree.buildPhaseSpan({
+        event,
+        traceId: st.traceId,
+        startUnixNano: msToUnixNano(startMs),
+        endUnixNano
+      });
+      const events = reviewSpanEvents(event.details, endUnixNano, cfg.detail === "verbose");
+      if (events.length > 0)
+        span.events = events;
+      st.spanQueue.enqueue(span);
+      st.metrics.recordPhase(event);
+      recordDetailMetrics(st.metrics, event.phase, event.details);
+      if (event.scope === "story" && event.storyId !== undefined) {
+        const bounds = st.storyBounds.get(event.storyId);
+        st.storyBounds.set(event.storyId, {
+          startMs: bounds ? Math.min(bounds.startMs, startMs) : startMs,
+          endMs: bounds ? Math.max(bounds.endMs, endMs) : endMs
+        });
+      }
+    },
+    async onEscalation(event) {
+      const st = states.get(event.runId);
+      if (!st)
+        return;
+      st.metrics.recordEscalation(event.toTier, 1);
     },
     async onRunEnd(event) {
       const existing = states.get(event.runId);
+      existing?.heartbeat.stop();
       const startMs = existing?.startMs ?? Date.now() - event.totalDurationMs;
-      const st = existing ?? {
-        traceId: newTraceId(),
-        spanId: newSpanId(),
-        startMs,
-        feature: "",
-        events: []
-      };
+      const st = existing ?? buildOrphanState(startMs);
       states.delete(event.runId);
+      await st.spanQueue.flushNow();
+      st.spanQueue.teardown();
       await flush(st, startMs + event.totalDurationMs, event);
     }
   };
   return {
-    name: STAGE,
+    name: STAGE3,
     version: "1.0.0",
     provides: ["reporter"],
+    async teardown() {
+      if (tornDown)
+        return;
+      tornDown = true;
+      const entries = [...states.entries()];
+      states.clear();
+      for (const [runId, st] of entries) {
+        st.heartbeat.stop();
+        await st.spanQueue.flushNow();
+        st.spanQueue.teardown();
+        const endMs = Date.now();
+        await flush(st, endMs, {
+          runId,
+          totalDurationMs: endMs - st.startMs,
+          totalCost: st.costUsd,
+          storySummary: { completed: 0, failed: 0, skipped: 0, paused: 0 }
+        });
+      }
+    },
     extensions: { reporter }
   };
 }
-var STAGE = "otel-reporter";
+var STAGE3 = "otel-reporter", DEFAULT_MAX_BATCH_SIZE = 64, DEFAULT_FLUSH_INTERVAL_MS = 5000, DEFAULT_MAX_QUEUE_SIZE = 2048;
 var init_otel_reporter = __esm(() => {
   init_logger2();
   init_reporter_shared();
+  init_batch_queue();
+  init_heartbeat();
+  init_span_tree();
+  init_traceparent();
 });
 
 // src/plugins/builtin/webhook-reporter/index.ts
@@ -64734,25 +65721,27 @@ function createWebhookReporterPlugin(cfg, deps) {
       return;
     const { resolved, missing } = interpolateHeaders(cfg.headers);
     if (missing.length > 0) {
-      getSafeLogger()?.warn(STAGE2, "Skipping webhook \u2014 unresolved env vars", { missing });
+      getSafeLogger()?.warn(STAGE4, "Skipping webhook \u2014 unresolved env vars", { missing });
       return;
     }
-    await postJson(cfg.url, { type, emittedAt: new Date().toISOString(), data }, { headers: resolved, timeoutMs: cfg.timeoutMs, stage: STAGE2, deps });
+    await postJson(cfg.url, { type, emittedAt: new Date().toISOString(), data }, { headers: resolved, timeoutMs: cfg.timeoutMs, stage: STAGE4, deps });
   };
   const reporter = {
-    name: STAGE2,
+    name: STAGE4,
     onRunStart: (event) => emit("onRunStart", event),
     onStoryComplete: (event) => emit("onStoryComplete", event),
-    onRunEnd: (event) => emit("onRunEnd", event)
+    onRunEnd: (event) => emit("onRunEnd", event),
+    onPhaseStart: (event) => emit("onPhaseStart", event),
+    onPhaseComplete: (event) => emit("onPhaseComplete", event)
   };
   return {
-    name: STAGE2,
+    name: STAGE4,
     version: "1.0.0",
     provides: ["reporter"],
     extensions: { reporter }
   };
 }
-var STAGE2 = "webhook-reporter";
+var STAGE4 = "webhook-reporter";
 var init_webhook_reporter = __esm(() => {
   init_logger2();
   init_reporter_shared();
@@ -65787,7 +66776,7 @@ async function heartbeatLoop(gen, statusWriter, getTotalCost, getIterations, jso
     }
   }
 }
-function startHeartbeat(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
+function startHeartbeat2(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
   const logger = _heartbeatDeps.getSafeLogger();
   _heartbeatActive = true;
   const gen = ++_heartbeatGen;
@@ -67381,28 +68370,47 @@ async function handleRunCompletion(options) {
   const regressionMode = config2.execution.regressionGate?.mode;
   if (options.skipRegression) {} else if ((regressionMode === "deferred" || regressionMode === "per-story") && config2.quality.commands.test) {
     statusWriter.setPostRunPhase("regression", { status: "running" });
+    const regressionStartTime = Date.now();
     pipelineEventBus.emit({ type: "postrun:phase:started", phase: "regression" });
-    const regressionResult = await _runCompletionDeps.runDeferredRegression({
-      config: config2,
-      prd,
-      workdir,
-      runtime: options.runtime,
-      quarantineMemo: options.runtime.quarantineMemo,
-      storyMetrics: options.isSequential === false ? undefined : allStoryMetrics.map((m) => ({
-        storyId: m.storyId,
-        completedAt: m.completedAt,
-        failingTestFiles: m.failingTestFiles
-      }))
-    });
+    let regressionResult;
+    try {
+      regressionResult = await _runCompletionDeps.runDeferredRegression({
+        config: config2,
+        prd,
+        workdir,
+        runtime: options.runtime,
+        quarantineMemo: options.runtime.quarantineMemo,
+        storyMetrics: options.isSequential === false ? undefined : allStoryMetrics.map((m) => ({
+          storyId: m.storyId,
+          completedAt: m.completedAt,
+          failingTestFiles: m.failingTestFiles
+        }))
+      });
+    } catch (err) {
+      pipelineEventBus.emit({
+        type: "postrun:phase:completed",
+        phase: "regression",
+        passed: false,
+        durationMs: Date.now() - regressionStartTime
+      });
+      throw err;
+    }
     const lastRunAt = new Date().toISOString();
     logger?.info("regression", "Deferred regression gate completed", {
       success: regressionResult.success,
       failedTests: regressionResult.failedTests,
       affectedStories: regressionResult.affectedStories
     });
+    const regressionDurationMs = Date.now() - regressionStartTime;
     if (regressionResult.success) {
       statusWriter.setPostRunPhase("regression", { status: "passed", lastRunAt });
-      pipelineEventBus.emit({ type: "postrun:phase:completed", phase: "regression", passed: true });
+      pipelineEventBus.emit({
+        type: "postrun:phase:completed",
+        phase: "regression",
+        passed: true,
+        durationMs: regressionDurationMs,
+        details: { mode: regressionMode, failedTests: 0 }
+      });
     } else {
       statusWriter.setPostRunPhase("regression", {
         status: "failed",
@@ -67410,7 +68418,16 @@ async function handleRunCompletion(options) {
         affectedStories: regressionResult.affectedStories,
         lastRunAt
       });
-      pipelineEventBus.emit({ type: "postrun:phase:completed", phase: "regression", passed: false });
+      pipelineEventBus.emit({
+        type: "postrun:phase:completed",
+        phase: "regression",
+        passed: false,
+        durationMs: regressionDurationMs,
+        details: {
+          mode: regressionMode,
+          failedTests: regressionResult.failedTests
+        }
+      });
       for (const storyId of regressionResult.affectedStories) {
         const story = prd.userStories.find((s) => s.id === storyId);
         if (story) {
@@ -67478,7 +68495,15 @@ async function handleRunCompletion(options) {
   let pluginGateFailed = false;
   const deferredReview = options.deferredReview;
   if (deferredReview !== undefined) {
-    pipelineEventBus.emit({ type: "postrun:phase:completed", phase: "review", passed: !deferredReview.anyFailed });
+    const findingCount = deferredReview.reviewerResults.filter((r) => !r.passed).length;
+    const reviewDurationMs = Date.now() - (options.deferredReviewStartedAt ?? Date.now());
+    pipelineEventBus.emit({
+      type: "postrun:phase:completed",
+      phase: "review",
+      passed: !deferredReview.anyFailed,
+      durationMs: reviewDurationMs,
+      details: { findingCount, anyFailed: deferredReview.anyFailed }
+    });
   }
   if (deferredReview?.anyFailed) {
     const failedReviewers = deferredReview.reviewerResults.filter((r) => !r.passed).map((r) => r.name);
@@ -67727,6 +68752,7 @@ async function runCompletionPhase(options) {
       logger?.info("execution", "Acceptance already passed \u2014 skipping acceptance phase");
     } else if (options.config.acceptance.enabled && isComplete(options.prd)) {
       options.statusWriter.setPostRunPhase("acceptance", { status: "running" });
+      const acceptanceStartTime = Date.now();
       pipelineEventBus.emit({ type: "postrun:phase:started", phase: "acceptance" });
       const acceptanceTestPaths = options.featureDir ? await Promise.all((await groupStoriesByPackage(options.prd, options.workdir, options.feature, options.config.acceptance.testPath, options.config.project?.language)).map(async (g) => {
         const relativeWorkdir = path25.relative(options.workdir, g.packageDir);
@@ -67749,32 +68775,54 @@ async function runCompletionPhase(options) {
           commandOverride: groupConfig.acceptance.command
         };
       })) : undefined;
-      const acceptanceResult = await _runnerCompletionDeps.runAcceptanceLoop({
-        config: options.config,
-        prd: options.prd,
-        prdPath: options.prdPath,
-        workdir: options.workdir,
-        featureDir: options.featureDir,
-        hooks: options.hooks,
-        feature: options.feature,
-        totalCost: options.totalCost,
-        iterations: options.iterations,
-        storiesCompleted: options.storiesCompleted,
-        allStoryMetrics: options.allStoryMetrics,
-        pluginRegistry: options.pluginRegistry,
-        eventEmitter: options.eventEmitter,
-        statusWriter: options.statusWriter,
-        agentGetFn: options.agentGetFn,
-        agentManager: options.agentManager,
-        sessionManager: options.sessionManager,
-        runtime: options.runtime,
-        abortSignal: options.abortSignal,
-        acceptanceTestPaths
-      });
+      let acceptanceResult;
+      try {
+        acceptanceResult = await _runnerCompletionDeps.runAcceptanceLoop({
+          config: options.config,
+          prd: options.prd,
+          prdPath: options.prdPath,
+          workdir: options.workdir,
+          featureDir: options.featureDir,
+          hooks: options.hooks,
+          feature: options.feature,
+          totalCost: options.totalCost,
+          iterations: options.iterations,
+          storiesCompleted: options.storiesCompleted,
+          allStoryMetrics: options.allStoryMetrics,
+          pluginRegistry: options.pluginRegistry,
+          eventEmitter: options.eventEmitter,
+          statusWriter: options.statusWriter,
+          agentGetFn: options.agentGetFn,
+          agentManager: options.agentManager,
+          sessionManager: options.sessionManager,
+          runtime: options.runtime,
+          abortSignal: options.abortSignal,
+          acceptanceTestPaths
+        });
+      } catch (err) {
+        pipelineEventBus.emit({
+          type: "postrun:phase:completed",
+          phase: "acceptance",
+          passed: false,
+          durationMs: Date.now() - acceptanceStartTime
+        });
+        throw err;
+      }
       const lastRunAt = new Date().toISOString();
+      const acceptanceDurationMs = Date.now() - acceptanceStartTime;
       if (acceptanceResult.success) {
         options.statusWriter.setPostRunPhase("acceptance", { status: "passed", lastRunAt });
-        pipelineEventBus.emit({ type: "postrun:phase:completed", phase: "acceptance", passed: true });
+        pipelineEventBus.emit({
+          type: "postrun:phase:completed",
+          phase: "acceptance",
+          passed: true,
+          durationMs: acceptanceDurationMs,
+          details: {
+            retries: acceptanceResult.retries ?? 0,
+            failedACCount: acceptanceResult.failedACs?.length ?? 0,
+            fixStoriesCreated: 0
+          }
+        });
       } else {
         acceptancePassed = false;
         options.statusWriter.setPostRunPhase("acceptance", {
@@ -67783,7 +68831,17 @@ async function runCompletionPhase(options) {
           retries: acceptanceResult.retries ?? 0,
           lastRunAt
         });
-        pipelineEventBus.emit({ type: "postrun:phase:completed", phase: "acceptance", passed: false });
+        pipelineEventBus.emit({
+          type: "postrun:phase:completed",
+          phase: "acceptance",
+          passed: false,
+          durationMs: acceptanceDurationMs,
+          details: {
+            retries: acceptanceResult.retries ?? 0,
+            failedACCount: acceptanceResult.failedACs?.length ?? 0,
+            fixStoriesCreated: 0
+          }
+        });
       }
       Object.assign(options, {
         prd: acceptanceResult.prd,
@@ -67814,6 +68872,7 @@ async function runCompletionPhase(options) {
     sessionManager: options.sessionManager,
     pluginProviderCache: options.pluginProviderCache,
     deferredReview: options.deferredReview,
+    deferredReviewStartedAt: options.deferredReviewStartedAt,
     exitReason: options.exitReason,
     runtime: options.runtime,
     abortSignal: options.abortSignal
@@ -67890,7 +68949,7 @@ var init_runner_completion = __esm(() => {
 });
 
 // src/execution/batching.ts
-function groupStoriesIntoBatches(stories, maxBatchSize = DEFAULT_MAX_BATCH_SIZE) {
+function groupStoriesIntoBatches(stories, maxBatchSize = DEFAULT_MAX_BATCH_SIZE2) {
   const batches = [];
   let currentBatch = [];
   for (const story of stories) {
@@ -67923,7 +68982,7 @@ function groupStoriesIntoBatches(stories, maxBatchSize = DEFAULT_MAX_BATCH_SIZE)
   }
   return batches;
 }
-function precomputeBatchPlan(stories, maxBatchSize = DEFAULT_MAX_BATCH_SIZE) {
+function precomputeBatchPlan(stories, maxBatchSize = DEFAULT_MAX_BATCH_SIZE2) {
   const batches = [];
   let currentBatch = [];
   for (const story of stories) {
@@ -67960,7 +69019,7 @@ function precomputeBatchPlan(stories, maxBatchSize = DEFAULT_MAX_BATCH_SIZE) {
   }
   return batches;
 }
-var DEFAULT_MAX_BATCH_SIZE = 4;
+var DEFAULT_MAX_BATCH_SIZE2 = 4;
 
 // src/execution/ensure-package-dirs.ts
 import path26 from "path";
@@ -68240,131 +69299,6 @@ var init_registry6 = __esm(() => {
   init_paths3();
 });
 
-// src/pipeline/subscribers/reporters.ts
-function wireReporters(bus, pluginRegistry, runId, startTime) {
-  const logger = getSafeLogger();
-  const safe = (name, fn) => {
-    return fn().catch((err) => logger?.warn("reporters-subscriber", `Reporter "${name}" error`, { error: String(err) })).catch(() => {});
-  };
-  const unsubs = [];
-  unsubs.push(bus.on("run:started", (ev) => {
-    return safe("onRunStart", async () => {
-      const reporters = pluginRegistry.getReporters();
-      for (const r of reporters) {
-        if (r.onRunStart) {
-          try {
-            await r.onRunStart({
-              runId,
-              feature: ev.feature,
-              totalStories: ev.totalStories,
-              startTime: new Date(startTime).toISOString()
-            });
-          } catch (err) {
-            logger?.warn("plugins", `Reporter '${r.name}' onRunStart failed`, { error: err });
-          }
-        }
-      }
-    });
-  }));
-  unsubs.push(bus.on("story:completed", (ev) => {
-    return safe("onStoryComplete(completed)", async () => {
-      const reporters = pluginRegistry.getReporters();
-      for (const r of reporters) {
-        if (r.onStoryComplete) {
-          try {
-            await r.onStoryComplete({
-              runId,
-              storyId: ev.storyId,
-              status: "completed",
-              runElapsedMs: ev.runElapsedMs,
-              cost: ev.cost ?? 0,
-              tier: ev.modelTier ?? "balanced",
-              testStrategy: ev.testStrategy ?? "test-after"
-            });
-          } catch (err) {
-            logger?.warn("plugins", `Reporter '${r.name}' onStoryComplete failed`, { error: err });
-          }
-        }
-      }
-    });
-  }));
-  unsubs.push(bus.on("story:failed", (ev) => {
-    return safe("onStoryComplete(failed)", async () => {
-      const reporters = pluginRegistry.getReporters();
-      for (const r of reporters) {
-        if (r.onStoryComplete) {
-          try {
-            await r.onStoryComplete({
-              runId,
-              storyId: ev.storyId,
-              status: "failed",
-              runElapsedMs: Date.now() - startTime,
-              cost: 0,
-              tier: "balanced",
-              testStrategy: "test-after"
-            });
-          } catch (err) {
-            logger?.warn("plugins", `Reporter '${r.name}' onStoryComplete failed`, { error: err });
-          }
-        }
-      }
-    });
-  }));
-  unsubs.push(bus.on("story:paused", (ev) => {
-    return safe("onStoryComplete(paused)", async () => {
-      const reporters = pluginRegistry.getReporters();
-      for (const r of reporters) {
-        if (r.onStoryComplete) {
-          try {
-            await r.onStoryComplete({
-              runId,
-              storyId: ev.storyId,
-              status: "paused",
-              runElapsedMs: Date.now() - startTime,
-              cost: 0,
-              tier: "balanced",
-              testStrategy: "test-after"
-            });
-          } catch (err) {
-            logger?.warn("plugins", `Reporter '${r.name}' onStoryComplete failed`, { error: err });
-          }
-        }
-      }
-    });
-  }));
-  unsubs.push(bus.on("run:completed", (ev) => {
-    return safe("onRunEnd", async () => {
-      const reporters = pluginRegistry.getReporters();
-      for (const r of reporters) {
-        if (r.onRunEnd) {
-          try {
-            await r.onRunEnd({
-              runId,
-              totalDurationMs: Date.now() - startTime,
-              totalCost: ev.totalCost ?? 0,
-              storySummary: {
-                completed: ev.passedStories,
-                failed: ev.failedStories,
-                skipped: ev.skippedStories,
-                paused: ev.pausedStories
-              }
-            });
-          } catch (err) {
-            logger?.warn("plugins", `Reporter '${r.name}' onRunEnd failed`, { error: err });
-          }
-        }
-      }
-    });
-  }));
-  return () => {
-    for (const u of unsubs)
-      u();
-  };
-}
-var init_reporters = __esm(() => {
-  init_logger2();
-});
-
 // src/execution/deferred-review.ts
 var {spawn: spawn4 } = globalThis.Bun;
 async function captureRunStartRef(workdir) {
@@ -70378,6 +71312,7 @@ async function executeUnified(ctx, initialPrd) {
   const allStoryMetrics = [];
   let warningSent = false;
   let deferredReview;
+  let deferredReviewStartedAt;
   const runStartRef = await captureRunStartRef(ctx.workdir);
   let cachedNaxIgnoreKey;
   const getRunNaxIgnoreIndex = async (currentPrd) => {
@@ -70416,14 +71351,16 @@ async function executeUnified(ctx, initialPrd) {
     totalCost: totalCost2,
     allStoryMetrics,
     exitReason,
-    deferredReview
+    deferredReview,
+    deferredReviewStartedAt
   });
-  startHeartbeat(ctx.statusWriter, () => totalCost2, () => iterations, ctx.logFilePath);
+  startHeartbeat2(ctx.statusWriter, () => totalCost2, () => iterations, ctx.logFilePath);
   let _executeThrew = false;
   try {
     if (isComplete(prd)) {
       logger?.info("execution", "All stories already complete \u2014 skipping pre-run pipeline");
       const naxIgnoreIndex = await getRunNaxIgnoreIndex(prd);
+      deferredReviewStartedAt = Date.now();
       pipelineEventBus.emit({ type: "postrun:phase:started", phase: "review" });
       deferredReview = await runDeferredReview(ctx.workdir, ctx.config.review, ctx.pluginRegistry, runStartRef, naxIgnoreIndex);
       return buildResult2("completed");
@@ -70478,6 +71415,7 @@ async function executeUnified(ctx, initialPrd) {
             return buildResult2("pre-merge-aborted");
         }
         logger?.debug("execution", "Running deferred review");
+        deferredReviewStartedAt = Date.now();
         pipelineEventBus.emit({ type: "postrun:phase:started", phase: "review" });
         deferredReview = await runDeferredReview(ctx.workdir, ctx.config.review, ctx.pluginRegistry, runStartRef, naxIgnoreIndex);
         logger?.debug("execution", "Deferred review done \u2014 returning completed");
@@ -70988,6 +71926,7 @@ async function runExecutionPhase(options, prd, pluginRegistry) {
     totalCost: totalCost2,
     allStoryMetrics,
     deferredReview: unifiedResult.deferredReview,
+    deferredReviewStartedAt: unifiedResult.deferredReviewStartedAt,
     exitReason: unifiedResult.exitReason
   };
 }
@@ -72241,10 +73180,10 @@ async function cleanupRun(options) {
   }
   const actions = pluginRegistry.getPostRunActions();
   const pluginLogger = {
-    debug: (msg) => logger?.debug("post-run", msg),
-    info: (msg) => logger?.info("post-run", msg),
-    warn: (msg) => logger?.warn("post-run", msg),
-    error: (msg) => logger?.error("post-run", msg)
+    debug: (msg, data) => logger?.debug("post-run", msg, data),
+    info: (msg, data) => logger?.info("post-run", msg, data),
+    warn: (msg, data) => logger?.warn("post-run", msg, data),
+    error: (msg, data) => logger?.error("post-run", msg, data)
   };
   const ctx = buildPostRunContext(options, durationMs, pluginLogger);
   for (const action of actions) {
@@ -72440,6 +73379,7 @@ async function run(options) {
       agentManager,
       pluginProviderCache,
       deferredReview: executionResult.deferredReview,
+      deferredReviewStartedAt: executionResult.deferredReviewStartedAt,
       exitReason: executionResult.exitReason,
       runtime,
       abortSignal: shutdownController.signal
@@ -72538,8 +73478,11 @@ __export(exports_execution, {
   withIncreasingFailuresBail: () => withIncreasingFailuresBail,
   synthesizeBackfillMetric: () => synthesizeBackfillMetric,
   stopHeartbeat: () => stopHeartbeat,
-  startHeartbeat: () => startHeartbeat,
+  startHeartbeat: () => startHeartbeat2,
+  runRectification: () => runRectification,
+  runPhase: () => runPhase,
   runDeferredRegression: () => runDeferredRegression,
+  runCompletionPhase: () => runCompletionPhase,
   run: () => run,
   resolveMaxAttemptsOutcome: () => resolveMaxAttemptsOutcome,
   resetCrashHandlers: () => resetCrashHandlers,
@@ -72565,7 +73508,6 @@ __export(exports_execution, {
   getTierConfig: () => getTierConfig,
   getOscillations: () => getOscillations,
   getAllReadyStories: () => getAllReadyStories,
-  gateRegressedAfterRectification: () => gateRegressedAfterRectification,
   gateFailureKeys: () => gateFailureKeys,
   formatProgress: () => formatProgress,
   formatPhaseResultMessage: () => formatPhaseResultMessage,
@@ -72574,11 +73516,13 @@ __export(exports_execution, {
   extractPauseReason: () => extractPauseReason,
   escalateTier: () => escalateTier,
   ensureStoryPackageDirs: () => ensureStoryPackageDirs,
+  describeGateRegression: () => describeGateRegression,
   deriveTddFailureCategory: () => deriveTddFailureCategory,
   decideStageAction: () => decideStageAction,
   createCheckpointWriter: () => createCheckpointWriter,
   countOscillationOutcomes: () => countOscillationOutcomes,
   clearQueueFile: () => clearQueueFile,
+  cleanupRun: () => cleanupRun,
   captureTreeState: () => captureTreeState,
   calculateMaxIterations: () => calculateMaxIterations,
   buildStoryContext: () => buildStoryContext,
@@ -72595,6 +73539,7 @@ __export(exports_execution, {
   _storyOrchestratorDeps: () => _storyOrchestratorDeps,
   _runnerReentrancyGuard: () => _runnerReentrancyGuard,
   _runnerDeps: () => _runnerDeps,
+  _runnerCompletionDeps: () => _runnerCompletionDeps,
   _runCompletionDeps: () => _runCompletionDeps,
   _regressionDeps: () => _regressionDeps,
   _postRunDeps: () => _postRunDeps,
@@ -72626,6 +73571,7 @@ var init_execution2 = __esm(() => {
   init_plan_inputs();
   init_build_plan_for_strategy();
   init_checkpoint();
+  init_runner_completion();
   init_post_run();
 });
 
@@ -104405,7 +105351,7 @@ async function resolveRunProfileOverride(opts) {
 // src/cli/features-resolve.ts
 init_config();
 import { existsSync as existsSync28, readdirSync as readdirSync6 } from "fs";
-import { join as join74, relative as relative16 } from "path";
+import { join as join74, relative as relative17 } from "path";
 
 // src/cli/features-acceptance.ts
 init_acceptance2();
@@ -104413,7 +105359,7 @@ init_config();
 init_logger2();
 init_prd();
 import { existsSync as existsSync27 } from "fs";
-import { join as join73, relative as relative15 } from "path";
+import { join as join73, relative as relative16 } from "path";
 async function resolveFeatureAcceptance(featureName, workdir) {
   let enabled = true;
   try {
@@ -104434,11 +105380,11 @@ async function resolveFeatureAcceptance(featureName, workdir) {
     const prd = await loadPRD(prdPath);
     const testGroups = await groupStoriesByPackage(prd, repoRoot, featureName, config2.acceptance?.testPath, config2.project?.language);
     const groups = await Promise.all(testGroups.map(async (g) => {
-      const packageDir = relative15(repoRoot, g.packageDir);
+      const packageDir = relative16(repoRoot, g.packageDir);
       const command = await resolveGroupCommand(repoRoot, packageDir, config2.acceptance?.command);
       return {
         packageDir,
-        testPath: relative15(repoRoot, g.testPath),
+        testPath: relative16(repoRoot, g.testPath),
         exists: await Bun.file(g.testPath).exists(),
         command,
         cwd: packageDir,
@@ -104475,17 +105421,17 @@ async function searchSpecSource(naxDir, repoRoot, name) {
   ];
   const docsSpecExact = join74(repoRoot, "docs", "specs", `SPEC-${name}.md`);
   candidates.push({ abs: docsSpecExact, kind: "markdown" });
-  const checked = candidates.map((c) => relative16(repoRoot, c.abs));
+  const checked = candidates.map((c) => relative17(repoRoot, c.abs));
   for (const { abs, kind } of candidates.slice(0, 2)) {
     if (kind === "markdown") {
       const nonEmpty = await isNonEmptyFile(abs);
       if (nonEmpty) {
-        return { source: { kind, path: relative16(repoRoot, abs) }, checked };
+        return { source: { kind, path: relative17(repoRoot, abs) }, checked };
       }
     }
   }
   if (await isNonEmptyFile(docsSpecExact)) {
-    return { source: { kind: "markdown", path: relative16(repoRoot, docsSpecExact) }, checked };
+    return { source: { kind: "markdown", path: relative17(repoRoot, docsSpecExact) }, checked };
   }
   const docsSpecsDir = join74(repoRoot, "docs", "specs");
   if (existsSync28(docsSpecsDir)) {
@@ -104493,7 +105439,7 @@ async function searchSpecSource(naxDir, repoRoot, name) {
     for (const match of glob.scanSync({ cwd: docsSpecsDir, absolute: false })) {
       const abs = join74(docsSpecsDir, match);
       if (await isNonEmptyFile(abs)) {
-        const relPath = relative16(repoRoot, abs);
+        const relPath = relative17(repoRoot, abs);
         if (!checked.includes(relPath))
           checked.push(relPath);
         return { source: { kind: "markdown", path: relPath }, checked };
@@ -104501,7 +105447,7 @@ async function searchSpecSource(naxDir, repoRoot, name) {
     }
   }
   const prdAbs = join74(naxDir, "features", name, "prd.json");
-  const prdRel = relative16(repoRoot, prdAbs);
+  const prdRel = relative17(repoRoot, prdAbs);
   if (!checked.includes(prdRel))
     checked.push(prdRel);
   if (existsSync28(prdAbs)) {
@@ -104553,8 +105499,8 @@ async function resolveFeatureSpec(name, workdir) {
     return {
       status: "ok",
       featureName: null,
-      specSource: { kind: "markdown", path: relative16(repoRoot, abs) },
-      message: `resolved spec: ${relative16(repoRoot, abs)}`
+      specSource: { kind: "markdown", path: relative17(repoRoot, abs) },
+      message: `resolved spec: ${relative17(repoRoot, abs)}`
     };
   }
   if (name !== undefined && name.trim() !== "") {
@@ -106052,9 +106998,9 @@ function parseSchedule(input, now2) {
   const trimmed = input.trim();
   if (trimmed === "")
     return { ok: false, error: `Empty schedule value. ${ACCEPTED}` };
-  const relative17 = parseRelative(trimmed, now2);
-  if (relative17)
-    return relative17;
+  const relative18 = parseRelative(trimmed, now2);
+  if (relative18)
+    return relative18;
   const timeOfDay = parseTimeOfDay(trimmed, now2);
   if (timeOfDay)
     return timeOfDay;