@nathapp/nax 0.68.4 → 0.68.6

package/dist/nax.js

@@ -16837,6 +16837,7 @@ var init_schemas_execution = __esm(() => {
     fullSuiteTimeoutSeconds: exports_external.number().int().min(10).max(600).default(120),
     maxFailureSummaryChars: exports_external.number().int().min(500).max(1e4).default(2000),
     abortOnIncreasingFailures: exports_external.boolean().default(true),
+    consecutiveIncreasesToBail: exports_external.number().int().min(1).max(10).default(2),
     escalateOnExhaustion: exports_external.boolean().optional().default(true),
     rethinkAtAttempt: exports_external.number().int().min(1).default(2),
     urgencyAtAttempt: exports_external.number().int().min(1).default(3)
@@ -17321,6 +17322,7 @@ var init_schemas3 = __esm(() => {
         fullSuiteTimeoutSeconds: 300,
         maxFailureSummaryChars: 2000,
         abortOnIncreasingFailures: true,
+        consecutiveIncreasesToBail: 2,
         escalateOnExhaustion: true,
         rethinkAtAttempt: 2,
         urgencyAtAttempt: 3
@@ -18378,16 +18380,13 @@ function deepMergeConfig(base, override) {
         for (const hookName of allHookNames) {
           const baseHook = baseHookDefs[hookName];
           const overrideHook = overrideHookDefs[hookName];
-          if (baseHook && overrideHook) {
-            mergedHookDefs[hookName] = [baseHook, overrideHook];
-          } else if (overrideHook) {
-            mergedHookDefs[hookName] = overrideHook;
-          } else {
-            mergedHookDefs[hookName] = baseHook;
-          }
+          const baseItems = Array.isArray(baseHook) ? baseHook : baseHook ? [baseHook] : [];
+          const overrideItems = Array.isArray(overrideHook) ? overrideHook : overrideHook ? [overrideHook] : [];
+          const combined = [...baseItems, ...overrideItems];
+          mergedHookDefs[hookName] = combined.length === 1 ? combined[0] : combined;
         }
         merged.hooks = mergedHookDefs;
-      } else if (overrideHooks.hooks) {
+      } else if (isPlainObject2(overrideHooks.hooks)) {
         merged.hooks = overrideHooks.hooks;
       }
       for (const hookKey of Object.keys(overrideHooks)) {
@@ -19086,6 +19085,12 @@ function resolveTestStrategy(raw) {
     return "three-session-tdd-lite";
   return "test-after";
 }
+function isThreeSessionStrategy(strategy) {
+  return strategy !== undefined && THREE_SESSION_STRATEGIES.has(strategy);
+}
+function isSingleSessionTestOwningStrategy(strategy) {
+  return strategy !== undefined && SINGLE_SESSION_TEST_OWNING_STRATEGIES.has(strategy);
+}
 function getAcQualityRules(profile) {
   const langSection = profile?.language ? LANGUAGE_PATTERNS[profile.language] : undefined;
   const typeSection = profile?.type ? TYPE_PATTERNS[profile.type] : undefined;
@@ -19098,7 +19103,7 @@ function getAcQualityRules(profile) {
 
 ${extras}`;
 }
-var VALID_TEST_STRATEGIES, COMPLEXITY_GUIDE = `## Complexity Classification Guide
+var VALID_TEST_STRATEGIES, THREE_SESSION_STRATEGIES, SINGLE_SESSION_TEST_OWNING_STRATEGIES, COMPLEXITY_GUIDE = `## Complexity Classification Guide
 
 Classify each story's complexity based on scope and risk \u2014 NOT acceptance criteria count.
 A story with 10 simple "add field" ACs is simpler than one with 3 ACs involving concurrent
@@ -19239,6 +19244,11 @@ var init_test_strategy = __esm(() => {
     "three-session-tdd",
     "three-session-tdd-lite"
   ];
+  THREE_SESSION_STRATEGIES = new Set([
+    "three-session-tdd",
+    "three-session-tdd-lite"
+  ]);
+  SINGLE_SESSION_TEST_OWNING_STRATEGIES = new Set(["tdd-simple", "test-after"]);
   LANGUAGE_PATTERNS = {
     go: `### Go-Specific AC Patterns
 
@@ -28043,16 +28053,17 @@ function deriveTestPatterns(contextFiles, resolvedGlobs) {
 async function detectTestDir(workdir, resolvedGlobs) {
   const resolvedDirs = resolvedGlobs ? extractTestDirs(resolvedGlobs) : [];
   const candidateDirs = resolvedDirs.length > 0 ? [...new Set([...resolvedDirs, ...DEFAULT_SCAN_TEST_DIRS])] : DEFAULT_SCAN_TEST_DIRS;
-  for (const dir of candidateDirs) {
+  const checks3 = await Promise.all(candidateDirs.map(async (dir) => {
     const fullPath = path.join(workdir, dir);
     try {
       const proc = Bun.spawn(["test", "-d", fullPath], { stdout: "pipe", stderr: "pipe" });
       const exitCode = await proc.exited;
-      if (exitCode === 0)
-        return dir;
-    } catch {}
-  }
-  return null;
+      return exitCode === 0 ? dir : null;
+    } catch {
+      return null;
+    }
+  }));
+  return checks3.find((dir) => dir !== null) ?? null;
 }
 function deriveScanGlob(resolvedTestGlobs, testDir) {
   const prefix = `${testDir}/`;
@@ -29765,9 +29776,10 @@ Your task: make the failing tests pass by writing real source code.
 Workflow:
 1. Read every failing test in scope. The tests are the contract \u2014 understand what each one asserts before editing source.
 2. Run the scoped test files once to establish the baseline (which fail, which pass, and why).
-3. Implement source code in the package's source location (the project context names it).
-4. After each meaningful change, re-run only the scoped test files \u2014 never the full suite.
-5. When all scoped tests pass, stage and commit ALL changed files: \`git commit -m '${commitMsg}'\`.
+3. Break the work into small steps before writing: for each step, note the source change and the failing test that verifies it (step -> verify). Resolve ambiguities now, not mid-edit.
+4. Implement source code in the package's source location (the project context names it).
+5. After each meaningful change, re-run only the scoped test files \u2014 never the full suite.
+6. When all scoped tests pass, stage and commit ALL changed files: \`git commit -m '${commitMsg}'\`.
 
 Rules:
 - Do NOT modify test files. Three narrow exceptions: (a) a lint-only fix to a test, (b) a contract drift where the test imports a removed/renamed symbol, (c) a sibling test file rename forced by your source change. Name which exception applies in the commit body before editing any test file.
@@ -29782,10 +29794,11 @@ Context: A test-writer session has already created tests and may have added mini
 Workflow:
 1. Run the existing scoped tests to see which fail and why (assertion failure vs import error).
 2. Read each failing test. Note which ACs they cover and which they DON'T.
-3. Replace stubs with real implementations. A stub is one of: a type-only declaration, a function returning a placeholder/throwing "not implemented", or a const placeholder.
-4. If any AC has no test, add one before implementing \u2014 do not implement uncovered behavior.
-5. Re-run only the scoped test files after each meaningful change.
-6. When all scoped tests pass, stage and commit ALL changed files: \`git commit -m '${commitMsg}'\`.
+3. Break the work into small steps before writing: for each stub, note the real implementation that replaces it and the test that verifies it (step -> verify); flag any AC still missing a test. Resolve ambiguities now, not mid-edit.
+4. Replace stubs with real implementations. A stub is one of: a type-only declaration, a function returning a placeholder/throwing "not implemented", or a const placeholder.
+5. If any AC has no test, add one before implementing \u2014 do not implement uncovered behavior.
+6. Re-run only the scoped test files after each meaningful change.
+7. When all scoped tests pass, stage and commit ALL changed files: \`git commit -m '${commitMsg}'\`.
 
 Rules:
 - Three test-modification exceptions apply (lint-only fix, contract drift, sibling rename). Name the exception in the commit body before editing any test the test-writer wrote.
@@ -29802,10 +29815,11 @@ Context: You are session 1 of a multi-session workflow. An implementer will foll
 
 Workflow:
 1. Re-read the acceptance criteria above.
-2. Create test files in the location the project uses for tests.
-3. Create stubs in the package's source location so the tests can import and compile. A stub is one of: a type/interface declaration, a function returning a placeholder/throwing "not implemented" (no more than 3 lines of body), or a const placeholder. If a stub body needs real logic, you have crossed into implementer territory \u2014 stop.
-4. For each AC: at least one success-path test and one boundary/failure-path test.
-5. Run the new test files. Confirm tests compile (stubs work) AND fail with ASSERTION failures \u2014 NOT import errors or compile errors. A test that errors before reaching its assertion does not prove the behavior is missing.
+2. Break the work into small tasks before writing: treat each AC as one task and note the test name(s) you will add (success + boundary) and the minimal stub each test needs to compile. This per-AC list is your checklist.
+3. Create test files in the location the project uses for tests.
+4. Create stubs in the package's source location so the tests can import and compile. A stub is one of: a type/interface declaration, a function returning a placeholder/throwing "not implemented" (no more than 3 lines of body), or a const placeholder. If a stub body needs real logic, you have crossed into implementer territory \u2014 stop.
+5. For each AC: at least one success-path test and one boundary/failure-path test.
+6. Run the new test files. Confirm tests compile (stubs work) AND fail with ASSERTION failures \u2014 NOT import errors or compile errors. A test that errors before reaching its assertion does not prove the behavior is missing.
 
 Rules:
 - Stubs are NOT implementations. The implementer in the next session writes real logic.
@@ -29822,9 +29836,10 @@ Context: You are session 1 of a multi-session workflow.
 
 Workflow:
 1. Re-read the acceptance criteria above.
-2. Create test files in the location the project uses for tests (project context names it).
-3. For each AC: write at least one test for the success path AND at least one for a boundary/failure path (zero, empty, negative, missing, throws). ACs worded as "throws X" require a test asserting the throw.
-4. Run the new test files. Confirm every test fails with an ASSERTION failure \u2014 NOT an import error, compile error, or runtime crash before assertion. A test that errors before reaching its assertion does not prove the behavior is missing.
+2. Break the work into small tasks before writing: treat each AC as one task and note the test name(s) you will write (success + boundary) and which file they belong in. This per-AC list is your checklist.
+3. Create test files in the location the project uses for tests (project context names it).
+4. For each AC: write at least one test for the success path AND at least one for a boundary/failure path (zero, empty, negative, missing, throws). ACs worded as "throws X" require a test asserting the throw.
+5. Run the new test files. Confirm every test fails with an ASSERTION failure \u2014 NOT an import error, compile error, or runtime crash before assertion. A test that errors before reaching its assertion does not prove the behavior is missing.
 
 Rules:
 - Do NOT create or modify any source files. Read source for types/interfaces only.
@@ -36046,7 +36061,7 @@ var init_autofix_test_writer = __esm(() => {
     kind: "run",
     name: "autofix-test-writer",
     stage: "rectification",
-    session: { role: "test-writer", lifetime: "fresh" },
+    session: { role: "test-writer", lifetime: "warm" },
     config: autofixConfigSelector,
     build(input, _ctx) {
       const prompt = RectifierPromptBuilder.testWriterRectification(input.failedChecks, input.story, {
@@ -36838,18 +36853,36 @@ var init__session_output = __esm(() => {
   EMPTY = { success: false, filesChanged: [], output: "", parsed: false };
 });
 
+// src/operations/execution-gates.ts
+function shouldRunReview(config2) {
+  return config2.review?.enabled === true;
+}
+function shouldRunRectification(config2) {
+  return config2.execution?.rectification?.enabled === true;
+}
+function shouldKeepSessionOpen(config2, role) {
+  return SESSION_CONTINUITY_ROLES.has(role) && (shouldRunReview(config2) || shouldRunRectification(config2));
+}
+var SESSION_CONTINUITY_ROLES;
+var init_execution_gates = __esm(() => {
+  init_config();
+  SESSION_CONTINUITY_ROLES = new Set(["implementer", "test-writer"]);
+});
+
 // src/operations/write-test.ts
 var testWriterOp;
 var init_write_test = __esm(() => {
   init_config();
   init_isolation();
   init__session_output();
+  init_execution_gates();
   testWriterOp = {
     kind: "run",
     name: "test-writer",
     stage: "run",
-    session: { role: "test-writer", lifetime: "fresh" },
+    session: { role: "test-writer", lifetime: "warm" },
     config: tddConfigSelector,
+    keepOpen: (_input, ctx) => shouldKeepSessionOpen(ctx.config, "test-writer"),
     build(input, _ctx) {
       if (input.promptMarkdown?.trim()) {
         return {
@@ -36896,20 +36929,6 @@ var init_write_test = __esm(() => {
   };
 });
 
-// src/operations/execution-gates.ts
-function shouldRunReview(config2) {
-  return config2.review?.enabled === true;
-}
-function shouldRunRectification(config2) {
-  return config2.execution?.rectification?.enabled === true;
-}
-function shouldKeepSessionOpen(config2, role) {
-  return role === "implementer" && (shouldRunReview(config2) || shouldRunRectification(config2));
-}
-var init_execution_gates = __esm(() => {
-  init_config();
-});
-
 // src/operations/implement.ts
 var implementerOp;
 var init_implement = __esm(() => {
@@ -38416,10 +38435,11 @@ var init__finding_to_check = __esm(() => {
 });
 
 // src/operations/autofix-implementer-strategy.ts
-function makeAutofixImplementerStrategy(story, config2, sink) {
+function makeAutofixImplementerStrategy(story, config2, sink, opts = {}) {
+  const claimsAdversarial = opts.includeAdversarialReview === true;
   return {
     name: "autofix-implementer",
-    appliesTo: (f) => f.fixTarget === "source" && IMPLEMENTER_SOURCES.has(f.source),
+    appliesTo: (f) => f.fixTarget === "source" && IMPLEMENTER_SOURCES.has(f.source) || claimsAdversarial && f.source === "adversarial-review",
     fixOp: implementerRectifyOp,
     buildInput: (findings, _prior, _cycleCtx) => ({
       failedChecks: findingsToFailedChecks(findings),
@@ -41078,18 +41098,18 @@ ${exceptions.join(`
 `)}`;
 }
 function implementerOwnsTests(story) {
-  return SINGLE_SESSION_TEST_OWNING_STRATEGIES.has(story.routing?.testStrategy ?? "");
+  return isSingleSessionTestOwningStrategy(story.routing?.testStrategy);
 }
 function testEditHeadline(story, prohibition) {
   return implementerOwnsTests(story) ? SINGLE_SESSION_PERMIT_HEADLINE : prohibition;
 }
 function exceptionCountWord(story) {
-  return THREE_SESSION_STRATEGIES.has(story.routing?.testStrategy ?? "") ? "four" : "three";
+  return isThreeSessionStrategy(story.routing?.testStrategy) ? "four" : "three";
 }
 function escapeHatchFor(story) {
   if (implementerOwnsTests(story))
     return SINGLE_SESSION_TEST_EDIT_POLICY;
-  const isTdd = THREE_SESSION_STRATEGIES.has(story.routing?.testStrategy ?? "");
+  const isTdd = isThreeSessionStrategy(story.routing?.testStrategy);
   return buildEscapeHatch({ includeMockHandoff: isTdd });
 }
 function noTestIsolationBlock(story) {
@@ -41159,6 +41179,7 @@ ${errors3}
 1. Read the relevant files to verify each finding is a real issue
 2. Only fix findings that are actually valid problems
 3. Do NOT add keys, functions, or imports that already exist \u2014 check first
+4. Break the fix into one small step per valid finding before touching code, each verified by re-running the relevant check
 
 ${testEditHeadline(story, `Do NOT change test files or test behavior \u2014 see the ${exceptionCountWord(story)} narrow exceptions appended below.`)}
 Do NOT add new features \u2014 only fix valid issues.
@@ -41182,6 +41203,7 @@ ${errors3}
 1. Read the relevant files to verify each finding is a real issue
 2. Only fix findings that are actually valid problems
 3. Do NOT add keys, functions, or imports that already exist \u2014 check first
+4. Break the fix into one small step per valid finding before touching code, each verified by re-running the relevant check
 
 Do NOT add new features \u2014 only fix valid issues.
 Commit your fixes when done.${scopeConstraint}${noTestIsolationBlock(story)}${escapeHatchFor(story)}`;
@@ -41208,6 +41230,7 @@ ${adversarialErrors}
 1. Read the relevant files to verify each finding is a real issue
 2. Only fix findings that are actually valid problems
 3. Do NOT add keys, functions, or imports that already exist \u2014 check first
+4. Break the fix into one small step per valid finding before touching code, each verified by re-running the relevant check
 
 Do NOT add new features \u2014 only fix valid issues.
 Commit your fixes when done.${scopeConstraint}${noTestIsolationBlock(story)}${escapeHatchFor(story)}`;
@@ -41294,7 +41317,7 @@ 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.`, THREE_SESSION_STRATEGIES, SINGLE_SESSION_TEST_OWNING_STRATEGIES, 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.`, 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)
 
@@ -41313,10 +41336,9 @@ If two findings or two acceptance criteria contradict each other and you cannot
 both even after adjusting tests, do not guess. Emit:
 UNRESOLVED: <which findings/ACs conflicted and why they cannot both be satisfied>`, CONTRADICTION_ESCAPE_HATCH, MAX_STRUCTURED_FINDINGS = 10, RAW_WITH_FINDINGS_LIMIT = 1000, RAW_FALLBACK_LIMIT = 4000;
 var init_rectifier_builder_helpers = __esm(() => {
+  init_config();
   init_review();
   init_sections2();
-  THREE_SESSION_STRATEGIES = new Set(["three-session-tdd", "three-session-tdd-lite"]);
-  SINGLE_SESSION_TEST_OWNING_STRATEGIES = new Set(["tdd-simple", "test-after"]);
   CONTRADICTION_ESCAPE_HATCH = buildEscapeHatch({ includeMockHandoff: false });
 });
 
@@ -41474,6 +41496,8 @@ ${findingLines}
 
 **Task:** For each bug above, write a NEW failing test that asserts the spec-correct behavior described in the finding. The test should FAIL with the current (buggy) implementation and PASS once the implementer fixes the source.
 
+Break the work into one small task per bug before writing: for each, note the failing test's name and which spec-correct behavior it pins down.
+
 Rules:
 1. Write the test against the SPECIFICATION, not the current behavior.
 2. Do NOT fix the source files \u2014 only write test files.
@@ -41501,6 +41525,8 @@ ${fileList}
 ### Implementer handoff
 ${reason}
 
+Break the work into one small task per listed file before editing: for each, note how its mock setup and dispatch wiring must change to match the AC-mandated dispatch shape.
+
 Rules:
 1. Modify ONLY the files listed above.
 2. Do NOT modify any source file.
@@ -41539,7 +41565,8 @@ Before making any changes:
 2. Do NOT loosen assertions to match current implementation behavior. If a test is failing because the source is wrong, the source is the suspect \u2014 not the test.
 3. Do NOT delete a failing test because the implementation makes it hard to assert on. Refactor the test structure if needed; never silently drop coverage.
 4. If the current behavior disagrees with the acceptance criteria, write the test against the spec and let the implementer fix the source.
-5. Do NOT modify source implementation files.`;
+5. Do NOT modify source implementation files.
+6. Break the work into one small change per flagged test before editing, each verified by re-running that test.`;
     return `${opener}
 
 Story: ${story.title} (${story.id})
@@ -41729,7 +41756,7 @@ ${acList}
 ### Findings
 ${llmSection}
 
-**Important:** LLM reviewers may flag false positives. Before making changes for LLM review findings, read the relevant files to verify each finding is a real issue. Do NOT add keys, functions, or imports that already exist.
+**Important:** LLM reviewers may flag false positives. Before making changes for LLM review findings, read the relevant files to verify each finding is a real issue, then break the fix into one small step per valid finding before touching code, each verified by re-running the relevant check. Do NOT add keys, functions, or imports that already exist.
 
 Do NOT add new features \u2014 only fix the identified issues.
 Commit your fixes when done.${scopeConstraint}${escapeHatchFor(story)}`;
@@ -41887,7 +41914,7 @@ Tests are failing. Fix the source so all tests pass \u2014 not just the ones lis
 ${detail}`);
     }
     lines.push(`
-Fix the implementation to resolve all verifier findings.`);
+Before editing, break the work into one small fix per finding above (fix -> re-run to verify). Then fix the implementation to resolve all verifier findings.`);
     return lines.join(`
 `);
   }
@@ -48144,8 +48171,9 @@ ${request.summary}
     if (!this.rl) {
       throw new Error("CLI plugin not initialized");
     }
+    let timeoutId;
     const timeoutPromise = new Promise((resolve13) => {
-      setTimeout(() => {
+      timeoutId = setTimeout(() => {
         resolve13({
           requestId: request.id,
           action: "skip",
@@ -48155,8 +48183,12 @@ ${request.summary}
       }, timeout);
     });
     const userPromise = this.getUserInput(request);
-    const response = await Promise.race([userPromise, timeoutPromise]);
-    return response;
+    try {
+      return await Promise.race([userPromise, timeoutPromise]);
+    } finally {
+      if (timeoutId !== undefined)
+        clearTimeout(timeoutId);
+    }
   }
   async getUserInput(request) {
     if (!this.rl) {
@@ -53430,6 +53462,11 @@ function phasesToRevalidate(strategiesRun, allPhases) {
   }
   return allPhases.filter((p) => needed.has(p.kind));
 }
+function orderGateLast(phases) {
+  const rest = phases.filter((p) => p.kind !== "full-suite-gate");
+  const gates = phases.filter((p) => p.kind === "full-suite-gate");
+  return [...rest, ...gates];
+}
 function toReviewDecisionPayload(opName, output) {
   if (output === null || output === undefined || typeof output !== "object")
     return null;
@@ -53644,18 +53681,24 @@ async function runPhase(ctx, slot, phaseCosts, phaseOutputs, isThreeSession = fa
     scope.close();
   }
 }
-function withIncreasingFailuresBail(strategies, enabled) {
+function withIncreasingFailuresBail(strategies, enabled, consecutiveIncreases) {
   if (!enabled)
     return strategies;
+  const threshold = Math.max(1, consecutiveIncreases);
   return strategies.map((strategy) => ({
     ...strategy,
     bailWhen: (iterations) => {
       const userReason = strategy.bailWhen?.(iterations) ?? null;
       if (userReason !== null)
         return userReason;
-      const last = iterations[iterations.length - 1];
-      if (last && last.findingsAfter.length > last.findingsBefore.length) {
-        return `failure count increased: ${last.findingsBefore.length} -> ${last.findingsAfter.length}`;
+      if (iterations.length < threshold)
+        return null;
+      const trailing = iterations.slice(-threshold);
+      const allRegressed = trailing.every((it) => it.findingsAfter.length > it.findingsBefore.length);
+      if (allRegressed) {
+        const first = trailing[0];
+        const last = trailing[trailing.length - 1];
+        return `failure count increased for ${threshold} consecutive iteration(s): ${first.findingsBefore.length} -> ${last.findingsAfter.length}`;
       }
       return null;
     }
@@ -53685,13 +53728,14 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
   const cycle = {
     findings: [...initialFindings],
     iterations: [],
-    strategies: withIncreasingFailuresBail(rectification.strategies, rectification.abortOnIncreasingFailures),
+    strategies: withIncreasingFailuresBail(rectification.strategies, rectification.abortOnIncreasingFailures, rectification.consecutiveIncreasesToBail ?? 1),
     config: { maxAttemptsTotal: rectification.maxAttempts, validatorRetries: 1 },
     validate: async (_validateCtx, opts) => {
       if (ctx.runtime.signal?.aborted)
         return { findings: [], shortCircuited: false };
       const lite = (opts?.mode ?? "full") === "lite";
-      const phases = phasesToRevalidate(opts?.strategiesRun, validationPhases);
+      const selected = phasesToRevalidate(opts?.strategiesRun, validationPhases);
+      const phases = lite ? orderGateLast(selected) : selected;
       getSafeLogger()?.debug("story-orchestrator", "rectification validate scope", {
         storyId: ctx.storyId,
         mode: opts?.mode ?? "full",
@@ -53701,9 +53745,6 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
       const findings = [];
       let shortCircuited = false;
       for (const phase of phases) {
-        if (lite && phase.kind === "full-suite-gate") {
-          continue;
-        }
         await runPhase(ctx, phase.slot, phaseCosts, phaseOutputs);
         if (shouldSkipPhaseForRectification(phase, state, phaseOutputs))
           continue;
@@ -54019,9 +54060,6 @@ var init_story_orchestrator = __esm(() => {
 
 // src/execution/build-plan-for-strategy.ts
 import { join as join46 } from "path";
-function isThreeSessionStrategy(strategy) {
-  return THREE_SESSION_STRATEGIES2.has(strategy);
-}
 function requiresInitialRefCapture(strategy) {
   return isThreeSessionStrategy(strategy);
 }
@@ -54080,8 +54118,12 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
       strategies.push(makeFullSuiteRectifyStrategy(story, config2));
     }
     if (config2.quality.autofix?.enabled !== false) {
-      strategies.push(makeAutofixImplementerStrategy(story, config2, sink));
-      strategies.push(makeAutofixTestWriterStrategy(story, config2, sink));
+      strategies.push(makeAutofixImplementerStrategy(story, config2, sink, {
+        includeAdversarialReview: !isThreeSession
+      }));
+      if (isThreeSession) {
+        strategies.push(makeAutofixTestWriterStrategy(story, config2, sink));
+      }
     }
     const postValidate = async (findings, _validateCtx) => {
       if (sink.testEdits.length === 0 && sink.mockHandoffs.length === 0)
@@ -54107,14 +54149,13 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
   }
   return builder.build(ctx, { isThreeSession });
 }
-var THREE_SESSION_STRATEGIES2;
 var init_build_plan_for_strategy = __esm(() => {
+  init_config();
   init_operations();
   init_execution_gates();
   init_full_suite_rectify();
   init_test_runners();
   init_story_orchestrator();
-  THREE_SESSION_STRATEGIES2 = new Set(["three-session-tdd", "three-session-tdd-lite"]);
 });
 
 // src/execution/plan-inputs.ts
@@ -54314,7 +54355,8 @@ async function assemblePlanInputsFromCtx(ctx) {
   const rectificationInput = ctx.config.execution?.rectification?.enabled === true ? {
     maxAttempts: ctx.config.execution.rectification.maxAttemptsTotal,
     strategies: [],
-    abortOnIncreasingFailures: ctx.config.execution.rectification.abortOnIncreasingFailures
+    abortOnIncreasingFailures: ctx.config.execution.rectification.abortOnIncreasingFailures,
+    consecutiveIncreasesToBail: ctx.config.execution.rectification.consecutiveIncreasesToBail
   } : undefined;
   return {
     story,
@@ -54333,12 +54375,12 @@ async function assemblePlanInputsFromCtx(ctx) {
   };
 }
 var init_plan_inputs = __esm(() => {
+  init_config();
   init_context();
   init_errors();
   init_prompts();
   init_review();
   init_resolver();
-  init_build_plan_for_strategy();
 });
 
 // src/pipeline/stages/execution-helpers.ts
@@ -54865,6 +54907,7 @@ var init_post_run = __esm(() => {
 // src/pipeline/stages/execution.ts
 var RUNTIME_CRASH_CODES, executionStage, _executionDeps;
 var init_execution = __esm(() => {
+  init_config();
   init_agents();
   init_errors();
   init_build_plan_for_strategy();
@@ -55455,7 +55498,16 @@ var init_routing2 = __esm(() => {
       const TIER_RANK = { fast: 0, balanced: 1, powerful: 2 };
       const derivedTier = decision.modelTier;
       const previousTier = ctx.story.routing?.modelTier;
-      const isEscalated = previousTier !== undefined && (TIER_RANK[previousTier] ?? 0) > (TIER_RANK[derivedTier] ?? 0);
+      const previousRank = previousTier !== undefined ? TIER_RANK[previousTier] : undefined;
+      const derivedRank = TIER_RANK[derivedTier];
+      if (previousTier !== undefined && previousRank === undefined) {
+        logger?.warn("routing", "Ignoring unknown previousTier \u2014 not escalating", {
+          storyId: ctx.story.id,
+          previousTier,
+          derivedTier
+        });
+      }
+      const isEscalated = previousTier !== undefined && previousRank !== undefined && derivedRank !== undefined && previousRank > derivedRank;
       const modelTier = isEscalated ? previousTier : derivedTier;
       const routing = { ...decision, modelTier, agent: ctx.story.routing?.agent };
       ctx.story.routing = {
@@ -55562,6 +55614,7 @@ var init_pipeline = __esm(() => {
   init_runner4();
   init_events();
   init_stages();
+  init_event_bus();
 });
 
 // src/cli/prompts-shared.ts
@@ -58122,12 +58175,12 @@ var init_loader4 = __esm(() => {
 });
 
 // src/utils/paths.ts
-import { join as join64 } from "path";
+import { join as join63 } from "path";
 function getRunsDir() {
-  return process.env.NAX_RUNS_DIR ?? join64(globalConfigDir(), "runs");
+  return process.env.NAX_RUNS_DIR ?? join63(globalConfigDir(), "runs");
 }
 function getEventsRootDir() {
-  return join64(globalConfigDir(), "events");
+  return join63(globalConfigDir(), "events");
 }
 var init_paths3 = __esm(() => {
   init_paths();
@@ -58187,7 +58240,7 @@ var init_command_argv = __esm(() => {
 });
 
 // src/hooks/runner.ts
-import { join as join71 } from "path";
+import { join as join70 } from "path";
 function createDrainDeadline2(deadlineMs) {
   let timeoutId;
   const promise2 = new Promise((resolve16) => {
@@ -58206,14 +58259,14 @@ async function loadHooksConfig(projectDir, globalDir) {
   let globalHooks = { hooks: {} };
   let projectHooks = { hooks: {} };
   let skipGlobal = false;
-  const projectPath = join71(projectDir, "hooks.json");
+  const projectPath = join70(projectDir, "hooks.json");
   const projectData = await loadJsonFile(projectPath, "hooks");
   if (projectData) {
     projectHooks = projectData;
     skipGlobal = projectData.skipGlobal ?? false;
   }
   if (!skipGlobal && globalDir) {
-    const globalPath = join71(globalDir, "hooks.json");
+    const globalPath = join70(globalDir, "hooks.json");
     const globalData = await loadJsonFile(globalPath, "hooks");
     if (globalData) {
       globalHooks = globalData;
@@ -58383,7 +58436,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.68.4",
+    version: "0.68.6",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -58478,8 +58531,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("197c6530"))
-        return "197c6530";
+      if (/^[0-9a-f]{6,10}$/.test("acc1d4bd"))
+        return "acc1d4bd";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -58500,9 +58553,9 @@ var init_version = __esm(() => {
 // src/execution/crash-heartbeat.ts
 import { appendFileSync as appendFileSync2 } from "fs";
 async function heartbeatLoop(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
-  const logger = getSafeLogger();
+  const logger = _heartbeatDeps.getSafeLogger();
   while (heartbeatActive) {
-    await Bun.sleep(60000);
+    await _heartbeatDeps.sleep(60000);
     if (!heartbeatActive)
       break;
     try {
@@ -58531,10 +58584,14 @@ async function heartbeatLoop(statusWriter, getTotalCost, getIterations, jsonlFil
   }
 }
 function startHeartbeat(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
-  const logger = getSafeLogger();
+  const logger = _heartbeatDeps.getSafeLogger();
   stopHeartbeat();
   heartbeatActive = true;
-  heartbeatLoop(statusWriter, getTotalCost, getIterations, jsonlFilePath).catch(() => {});
+  heartbeatLoop(statusWriter, getTotalCost, getIterations, jsonlFilePath).catch((err) => {
+    _heartbeatDeps.getSafeLogger()?.warn("crash-recovery", "Heartbeat loop crashed; status updates stopped", {
+      error: err instanceof Error ? err.message : String(err)
+    });
+  });
   logger?.debug("crash-recovery", "Heartbeat started (60s interval)");
 }
 function stopHeartbeat() {
@@ -58543,9 +58600,13 @@ function stopHeartbeat() {
     getSafeLogger()?.debug("crash-recovery", "Heartbeat stopped");
   }
 }
-var heartbeatActive = false;
+var _heartbeatDeps, heartbeatActive = false;
 var init_crash_heartbeat = __esm(() => {
   init_logger2();
+  _heartbeatDeps = {
+    sleep: async (ms) => Bun.sleep(ms),
+    getSafeLogger
+  };
 });
 
 // src/execution/crash-writer.ts
@@ -59348,15 +59409,15 @@ var init_acceptance_loop = __esm(() => {
 
 // src/session/scratch-purge.ts
 import { mkdir as mkdir13, rename, rm } from "fs/promises";
-import { dirname as dirname12, join as join72 } from "path";
+import { dirname as dirname12, join as join71 } from "path";
 async function purgeStaleScratch(projectDir, featureName, retentionDays, archiveInsteadOfDelete = false) {
-  const sessionsDir = join72(projectDir, ".nax", "features", featureName, "sessions");
+  const sessionsDir = join71(projectDir, ".nax", "features", featureName, "sessions");
   const sessionIds = await _scratchPurgeDeps.listSessionDirs(sessionsDir);
   const cutoffMs = _scratchPurgeDeps.now() - retentionDays * 86400000;
   let purged = 0;
   for (const sessionId of sessionIds) {
-    const sessionDir = join72(sessionsDir, sessionId);
-    const descriptorPath = join72(sessionDir, "descriptor.json");
+    const sessionDir = join71(sessionsDir, sessionId);
+    const descriptorPath = join71(sessionDir, "descriptor.json");
     if (!await _scratchPurgeDeps.fileExists(descriptorPath))
       continue;
     let lastActivityAt;
@@ -59372,7 +59433,7 @@ async function purgeStaleScratch(projectDir, featureName, retentionDays, archive
     if (new Date(lastActivityAt).getTime() >= cutoffMs)
       continue;
     if (archiveInsteadOfDelete) {
-      const archiveDest = join72(projectDir, ".nax", "features", featureName, "_archive", "sessions", sessionId);
+      const archiveDest = join71(projectDir, ".nax", "features", featureName, "_archive", "sessions", sessionId);
       await _scratchPurgeDeps.move(sessionDir, archiveDest);
     } else {
       await _scratchPurgeDeps.remove(sessionDir);
@@ -59595,6 +59656,13 @@ async function runDeferredRegression(options) {
       storyOutcomes: {}
     };
   }
+  for (const storyId of affectedStories) {
+    pipelineEventBus.emit({
+      type: "regression:detected",
+      storyId,
+      failedTests: testSummary.failed
+    });
+  }
   let rectificationAttempts = 0;
   let storiesRectified = 0;
   let currentTestOutput = fullSuiteResult.output;
@@ -59708,6 +59776,7 @@ var init_run_regression = __esm(() => {
   init_findings();
   init_logger2();
   init_operations();
+  init_pipeline();
   init_prd();
   init_test_runners();
   init_git();
@@ -60105,12 +60174,12 @@ var DEFAULT_MAX_BATCH_SIZE = 4;
 
 // src/pipeline/subscribers/events-writer.ts
 import { appendFile as appendFile4, mkdir as mkdir14 } from "fs/promises";
-import { basename as basename14, join as join73 } from "path";
+import { basename as basename13, join as join72 } from "path";
 function wireEventsWriter(bus, feature, runId, workdir) {
   const logger = getSafeLogger();
-  const project = basename14(workdir);
-  const eventsDir = join73(getEventsRootDir(), project);
-  const eventsFile = join73(eventsDir, "events.jsonl");
+  const project = basename13(workdir);
+  const eventsDir = join72(getEventsRootDir(), project);
+  const eventsFile = join72(eventsDir, "events.jsonl");
   let dirReady = false;
   const write = (line) => {
     return (async () => {
@@ -60291,12 +60360,12 @@ var init_interaction2 = __esm(() => {
 
 // src/pipeline/subscribers/registry.ts
 import { mkdir as mkdir15, writeFile as writeFile2 } from "fs/promises";
-import { basename as basename15, join as join74 } from "path";
+import { basename as basename14, join as join73 } from "path";
 function wireRegistry(bus, feature, runId, workdir, outputDir) {
   const logger = getSafeLogger();
-  const project = basename15(workdir);
-  const runDir = join74(getRunsDir(), `${project}-${feature}-${runId}`);
-  const metaFile = join74(runDir, "meta.json");
+  const project = basename14(workdir);
+  const runDir = join73(getRunsDir(), `${project}-${feature}-${runId}`);
+  const metaFile = join73(runDir, "meta.json");
   const unsub = bus.on("run:started", (_ev) => {
     return (async () => {
       try {
@@ -60306,8 +60375,8 @@ function wireRegistry(bus, feature, runId, workdir, outputDir) {
           project,
           feature,
           workdir,
-          statusPath: join74(outputDir, "features", feature, "status.json"),
-          eventsDir: join74(outputDir, "features", feature, "runs"),
+          statusPath: join73(outputDir, "features", feature, "status.json"),
+          eventsDir: join73(outputDir, "features", feature, "runs"),
           registeredAt: new Date().toISOString()
         };
         await writeFile2(metaFile, JSON.stringify(meta3, null, 2));
@@ -60552,8 +60621,8 @@ var init_types9 = __esm(() => {
 });
 
 // src/worktree/dependencies.ts
-import { existsSync as existsSync32 } from "fs";
-import { join as join75 } from "path";
+import { existsSync as existsSync31 } from "fs";
+import { join as join74 } from "path";
 async function prepareWorktreeDependencies(options) {
   const mode = options.config.execution.worktreeDependencies.mode;
   const resolvedCwd = resolveDependencyCwd(options);
@@ -60567,7 +60636,7 @@ async function prepareWorktreeDependencies(options) {
   }
 }
 function resolveDependencyCwd(options) {
-  return options.storyWorkdir ? join75(options.worktreeRoot, options.storyWorkdir) : options.worktreeRoot;
+  return options.storyWorkdir ? join74(options.worktreeRoot, options.storyWorkdir) : options.worktreeRoot;
 }
 function resolveInheritedDependencies(options, resolvedCwd) {
   if (hasDependencyManifests(options.worktreeRoot, resolvedCwd)) {
@@ -60577,7 +60646,7 @@ function resolveInheritedDependencies(options, resolvedCwd) {
 }
 function hasDependencyManifests(worktreeRoot, resolvedCwd) {
   const directories = resolvedCwd === worktreeRoot ? [worktreeRoot] : [worktreeRoot, resolvedCwd];
-  return directories.some((directory) => PHASE_ONE_INHERIT_UNSUPPORTED_FILES.some((filename) => _worktreeDependencyDeps.existsSync(join75(directory, filename))));
+  return directories.some((directory) => PHASE_ONE_INHERIT_UNSUPPORTED_FILES.some((filename) => _worktreeDependencyDeps.existsSync(join74(directory, filename))));
 }
 async function provisionDependencies(config2, worktreeRoot, resolvedCwd) {
   const setupCommand = config2.execution.worktreeDependencies.setupCommand;
@@ -60628,7 +60697,7 @@ var init_dependencies = __esm(() => {
     "build.gradle.kts"
   ];
   _worktreeDependencyDeps = {
-    existsSync: existsSync32,
+    existsSync: existsSync31,
     spawn
   };
 });
@@ -60639,19 +60708,19 @@ __export(exports_manager, {
   _managerDeps: () => _managerDeps,
   WorktreeManager: () => WorktreeManager
 });
-import { existsSync as existsSync33, symlinkSync } from "fs";
+import { existsSync as existsSync32, symlinkSync } from "fs";
 import { mkdir as mkdir16 } from "fs/promises";
-import { join as join76 } from "path";
+import { join as join75 } from "path";
 
 class WorktreeManager {
   async ensureGitExcludes(projectRoot) {
     const logger = getSafeLogger();
-    const infoDir = join76(projectRoot, ".git", "info");
-    const excludePath = join76(infoDir, "exclude");
+    const infoDir = join75(projectRoot, ".git", "info");
+    const excludePath = join75(infoDir, "exclude");
     try {
       await mkdir16(infoDir, { recursive: true });
       let existing = "";
-      if (existsSync33(excludePath)) {
+      if (existsSync32(excludePath)) {
         existing = await Bun.file(excludePath).text();
       }
       const missing = NAX_GITIGNORE_ENTRIES.filter((entry) => !existing.includes(entry));
@@ -60674,7 +60743,7 @@ ${missing.join(`
   }
   async create(projectRoot, storyId) {
     validateStoryId(storyId);
-    const worktreePath = join76(projectRoot, ".nax-wt", storyId);
+    const worktreePath = join75(projectRoot, ".nax-wt", storyId);
     const branchName = `nax/${storyId}`;
     try {
       const pruneProc = _managerDeps.spawn(["git", "worktree", "prune"], {
@@ -60715,9 +60784,9 @@ ${missing.join(`
       }
       throw new Error(`Failed to create worktree: ${String(error48)}`);
     }
-    const envSource = join76(projectRoot, ".env");
-    if (existsSync33(envSource)) {
-      const envTarget = join76(worktreePath, ".env");
+    const envSource = join75(projectRoot, ".env");
+    if (existsSync32(envSource)) {
+      const envTarget = join75(worktreePath, ".env");
       try {
         symlinkSync(envSource, envTarget, "file");
       } catch (error48) {
@@ -60728,7 +60797,7 @@ ${missing.join(`
   }
   async remove(projectRoot, storyId) {
     validateStoryId(storyId);
-    const worktreePath = join76(projectRoot, ".nax-wt", storyId);
+    const worktreePath = join75(projectRoot, ".nax-wt", storyId);
     const branchName = `nax/${storyId}`;
     try {
       const proc = _managerDeps.spawn(["git", "worktree", "remove", worktreePath, "--force"], {
@@ -61406,6 +61475,12 @@ async function handleTierEscalation(ctx) {
       runtime: ctx.runtime
     });
   }
+  pipelineEventBus.emit({
+    type: "story:escalated",
+    storyId: ctx.story.id,
+    fromTier: ctx.routing.modelTier,
+    toTier: escalatedTier
+  });
   return {
     outcome: "escalated",
     prdDirty: true,
@@ -61416,6 +61491,7 @@ var _tierEscalationDeps;
 var init_tier_escalation = __esm(() => {
   init_hooks();
   init_logger2();
+  init_event_bus();
   init_prd();
   init_routing();
   init_llm();
@@ -61531,10 +61607,10 @@ var init_merge_conflict_rectify = __esm(() => {
 });
 
 // src/execution/pipeline-result-handler.ts
-import { join as join77 } from "path";
+import { join as join76 } from "path";
 async function removeWorktreeDirectory(projectRoot, storyId) {
   const logger = getSafeLogger();
-  const worktreePath = join77(projectRoot, ".nax-wt", storyId);
+  const worktreePath = join76(projectRoot, ".nax-wt", storyId);
   try {
     const proc = _resultHandlerDeps.spawn(["git", "worktree", "remove", worktreePath, "--force"], {
       cwd: projectRoot,
@@ -61664,6 +61740,11 @@ async function handlePipelineFailure(ctx, pipelineResult) {
       break;
     case "skip":
       logger?.warn("pipeline", "Story skipped", { storyId: ctx.story.id, reason: pipelineResult.reason });
+      pipelineEventBus.emit({
+        type: "story:skipped",
+        storyId: ctx.story.id,
+        reason: pipelineResult.reason || "Story skipped"
+      });
       prdDirty = true;
       break;
     case "fail":
@@ -61744,8 +61825,8 @@ var init_pipeline_result_handler = __esm(() => {
 });
 
 // src/execution/iteration-runner.ts
-import { existsSync as existsSync34 } from "fs";
-import { join as join78 } from "path";
+import { existsSync as existsSync33 } from "fs";
+import { join as join77 } from "path";
 async function runIteration(ctx, prd, selection, iterations, totalCost, allStoryMetrics) {
   const { story, storiesToExecute, routing, isBatchExecution } = selection;
   if (ctx.dryRun) {
@@ -61770,7 +61851,7 @@ async function runIteration(ctx, prd, selection, iterations, totalCost, allStory
   const storyStartTime = Date.now();
   let effectiveWorkdir = ctx.workdir;
   if (ctx.config.execution.storyIsolation === "worktree") {
-    const worktreePath = join78(ctx.workdir, ".nax-wt", story.id);
+    const worktreePath = join77(ctx.workdir, ".nax-wt", story.id);
     const worktreeExists = _iterationRunnerDeps.existsSync(worktreePath);
     if (!worktreeExists) {
       await _iterationRunnerDeps.worktreeManager.ensureGitExcludes(ctx.workdir);
@@ -61790,7 +61871,7 @@ async function runIteration(ctx, prd, selection, iterations, totalCost, allStory
   }
   const accumulatedAttemptCost = (story.priorFailures || []).reduce((sum, f) => sum + (f.cost || 0), 0);
   const profileOverride = ctx.config.profile && ctx.config.profile !== "default" ? { profile: ctx.config.profile } : undefined;
-  const effectiveConfig = story.workdir ? await _iterationRunnerDeps.loadConfigForWorkdir(join78(ctx.workdir, ".nax", "config.json"), story.workdir, profileOverride) : ctx.config;
+  const effectiveConfig = story.workdir ? await _iterationRunnerDeps.loadConfigForWorkdir(join77(ctx.workdir, ".nax", "config.json"), story.workdir, profileOverride) : ctx.config;
   let dependencyContext;
   if (ctx.config.execution.storyIsolation === "worktree") {
     try {
@@ -61817,7 +61898,7 @@ async function runIteration(ctx, prd, selection, iterations, totalCost, allStory
       };
     }
   }
-  const resolvedWorkdir = dependencyContext?.cwd ? dependencyContext.cwd : ctx.config.execution.storyIsolation === "worktree" ? story.workdir ? join78(effectiveWorkdir, story.workdir) : effectiveWorkdir : story.workdir ? join78(ctx.workdir, story.workdir) : ctx.workdir;
+  const resolvedWorkdir = dependencyContext?.cwd ? dependencyContext.cwd : ctx.config.execution.storyIsolation === "worktree" ? story.workdir ? join77(effectiveWorkdir, story.workdir) : effectiveWorkdir : story.workdir ? join77(ctx.workdir, story.workdir) : ctx.workdir;
   const pipelineContext = {
     config: effectiveConfig,
     rootConfig: ctx.config,
@@ -61949,7 +62030,7 @@ var init_iteration_runner = __esm(() => {
     loadConfigForWorkdir,
     prepareWorktreeDependencies,
     runPipeline,
-    existsSync: existsSync34,
+    existsSync: existsSync33,
     worktreeManager: new WorktreeManager
   };
 });
@@ -61960,7 +62041,7 @@ function selectNextStories(prd, config2, batchPlan, currentBatchIndex, lastStory
     const batch = batchPlan[currentBatchIndex];
     const storiesToExecute = batch.stories.filter((s) => !s.passes && s.status !== "passed" && s.status !== "skipped" && s.status !== "blocked" && s.status !== "failed" && s.status !== "paused" && s.status !== "decomposed");
     if (storiesToExecute.length === 0) {
-      return { selection: null, nextBatchIndex: currentBatchIndex + 1 };
+      return null;
     }
     const story2 = storiesToExecute[0];
     return {
@@ -62019,7 +62100,7 @@ __export(exports_parallel_worker, {
   buildWorktreePipelineContext: () => buildWorktreePipelineContext,
   _parallelWorkerDeps: () => _parallelWorkerDeps
 });
-import { join as join79 } from "path";
+import { join as join78 } from "path";
 function buildWorktreePipelineContext(base, _story) {
   return { ...base, prd: structuredClone(base.prd) };
 }
@@ -62042,7 +62123,7 @@ async function executeStoryInWorktree(story, worktreePath, dependencyContext, co
       story,
       stories: [story],
       projectDir: context.projectDir,
-      workdir: dependencyContext.cwd ?? (story.workdir ? join79(worktreePath, story.workdir) : worktreePath),
+      workdir: dependencyContext.cwd ?? (story.workdir ? join78(worktreePath, story.workdir) : worktreePath),
       worktreeDependencyContext: dependencyContext,
       routing,
       storyGitRef: storyGitRef ?? undefined
@@ -62167,10 +62248,27 @@ async function runParallelBatch(options) {
   const rootConfigPath = path21.join(workdir, ".nax", "config.json");
   const profileOverride = config2.profile && config2.profile !== "default" ? { profile: config2.profile } : undefined;
   const storyEffectiveConfigs = new Map;
-  await Promise.all(stories.filter((story) => story.workdir).map(async (story) => {
-    const effectiveConfig = await loadConfigForWorkdir(rootConfigPath, story.workdir, profileOverride);
-    storyEffectiveConfigs.set(story.id, effectiveConfig);
+  const configResults = await Promise.allSettled(stories.filter((story) => story.workdir).map(async (story) => {
+    try {
+      const effectiveConfig = await _parallelBatchDeps.loadConfigForWorkdir(rootConfigPath, story.workdir, profileOverride);
+      return { storyId: story.id, effectiveConfig };
+    } catch (err) {
+      const enriched = new Error(err instanceof Error ? err.message : String(err));
+      enriched.storyId = story.id;
+      throw enriched;
+    }
   }));
+  for (const result of configResults) {
+    if (result.status === "fulfilled") {
+      storyEffectiveConfigs.set(result.value.storyId, result.value.effectiveConfig);
+    } else {
+      const storyId = result.reason?.storyId ?? "(unknown)";
+      logger?.warn("parallel-batch", "Failed to load per-story config; using root config", {
+        storyId,
+        reason: result.reason instanceof Error ? result.reason.message : String(result.reason)
+      });
+    }
+  }
   const dependencyContexts = new Map;
   const readyStories = [];
   const preExecutionFailures = [];
@@ -62329,7 +62427,8 @@ var init_parallel_batch = __esm(() => {
       const { rectifyConflictedStory: rectifyConflictedStory2 } = await Promise.resolve().then(() => (init_merge_conflict_rectify(), exports_merge_conflict_rectify));
       return rectifyConflictedStory2(opts);
     },
-    prepareWorktreeDependencies
+    prepareWorktreeDependencies,
+    loadConfigForWorkdir
   };
 });
 
@@ -62697,6 +62796,8 @@ async function executeUnified(ctx, initialPrd) {
       if (!selected)
         return buildResult2("no-stories");
       const { selection } = selected;
+      if (!selection)
+        return buildResult2("no-stories");
       if (!ctx.useBatch)
         lastStoryId = selection.story.id;
       {
@@ -62903,7 +63004,7 @@ async function writeStatusFile(filePath, status) {
 var init_status_file = () => {};
 
 // src/execution/status-writer.ts
-import { join as join80 } from "path";
+import { join as join79 } from "path";
 
 class StatusWriter {
   statusFile;
@@ -63022,7 +63123,7 @@ class StatusWriter {
     if (!this._prd)
       return;
     const safeLogger = getSafeLogger();
-    const featureStatusPath = join80(featureDir, "status.json");
+    const featureStatusPath = join79(featureDir, "status.json");
     const write = async () => {
       try {
         const base = this.getSnapshot(totalCost, iterations);
@@ -63053,11 +63154,11 @@ __export(exports_migrate, {
   migrateCommand: () => migrateCommand,
   detectGeneratedContent: () => detectGeneratedContent
 });
-import { existsSync as existsSync35 } from "fs";
+import { existsSync as existsSync34 } from "fs";
 import { mkdir as mkdir17, readdir as readdir6, rename as rename3 } from "fs/promises";
 import path22 from "path";
 async function detectGeneratedContent(naxDir) {
-  if (!existsSync35(naxDir))
+  if (!existsSync34(naxDir))
     return [];
   const candidates = [];
   let entries = [];
@@ -63072,7 +63173,7 @@ async function detectGeneratedContent(naxDir) {
     }
   }
   const featuresDir = path22.join(naxDir, "features");
-  if (existsSync35(featuresDir)) {
+  if (existsSync34(featuresDir)) {
     let featureDirs = [];
     try {
       featureDirs = await readdir6(featuresDir);
@@ -63134,7 +63235,7 @@ async function migrateCommand(options) {
       });
     }
     const src = path22.join(globalConfigDir(), options.reclaim);
-    if (!existsSync35(src)) {
+    if (!existsSync34(src)) {
       throw new NaxError(`Nothing to reclaim: ~/.nax/${options.reclaim} does not exist`, "MIGRATE_RECLAIM_NOT_FOUND", {
         stage: "migrate",
         name: options.reclaim
@@ -63180,7 +63281,7 @@ async function migrateCommand(options) {
   }
   const naxDir = path22.join(options.workdir, ".nax");
   const configPath = path22.join(naxDir, "config.json");
-  if (!existsSync35(configPath)) {
+  if (!existsSync34(configPath)) {
     throw new NaxError("No .nax/config.json found \u2014 run nax init first", "MIGRATE_NO_CONFIG", {
       stage: "migrate",
       workdir: options.workdir
@@ -63215,7 +63316,7 @@ async function migrateCommand(options) {
   for (const candidate of candidates) {
     const dest = path22.join(destBase, candidate.name);
     await mkdir17(path22.dirname(dest), { recursive: true });
-    if (existsSync35(dest)) {
+    if (existsSync34(dest)) {
       throw new NaxError(`Migration conflict: destination already exists.
   Source:      ${candidate.srcPath}
   Destination: ${dest}
@@ -63456,7 +63557,7 @@ __export(exports_run_initialization, {
   initializeRun: () => initializeRun,
   _reconcileDeps: () => _reconcileDeps
 });
-import { join as join81 } from "path";
+import { join as join80 } from "path";
 async function reconcileState(prd, prdPath, workdir, config2) {
   const logger = getSafeLogger();
   let reconciledCount = 0;
@@ -63473,7 +63574,7 @@ async function reconcileState(prd, prdPath, workdir, config2) {
       });
       continue;
     }
-    const effectiveWorkdir = story.workdir ? join81(workdir, story.workdir) : workdir;
+    const effectiveWorkdir = story.workdir ? join80(workdir, story.workdir) : workdir;
     try {
       const reviewResult = await _reconcileDeps.runReview(config2.review, effectiveWorkdir, config2.execution);
       if (!reviewResult.success) {
@@ -93031,6 +93132,229 @@ var require_stack_utils = __commonJS((exports, module) => {
   module.exports = StackUtils;
 });
 
+// node_modules/react/cjs/react-jsx-dev-runtime.development.js
+var require_react_jsx_dev_runtime_development = __commonJS((exports) => {
+  var React11 = __toESM(require_react());
+  (function() {
+    function getComponentNameFromType(type) {
+      if (type == null)
+        return null;
+      if (typeof type === "function")
+        return type.$$typeof === REACT_CLIENT_REFERENCE ? null : type.displayName || type.name || null;
+      if (typeof type === "string")
+        return type;
+      switch (type) {
+        case REACT_FRAGMENT_TYPE:
+          return "Fragment";
+        case REACT_PROFILER_TYPE:
+          return "Profiler";
+        case REACT_STRICT_MODE_TYPE:
+          return "StrictMode";
+        case REACT_SUSPENSE_TYPE:
+          return "Suspense";
+        case REACT_SUSPENSE_LIST_TYPE:
+          return "SuspenseList";
+        case REACT_ACTIVITY_TYPE:
+          return "Activity";
+      }
+      if (typeof type === "object")
+        switch (typeof type.tag === "number" && console.error("Received an unexpected object in getComponentNameFromType(). This is likely a bug in React. Please file an issue."), type.$$typeof) {
+          case REACT_PORTAL_TYPE:
+            return "Portal";
+          case REACT_CONTEXT_TYPE:
+            return type.displayName || "Context";
+          case REACT_CONSUMER_TYPE:
+            return (type._context.displayName || "Context") + ".Consumer";
+          case REACT_FORWARD_REF_TYPE:
+            var innerType = type.render;
+            type = type.displayName;
+            type || (type = innerType.displayName || innerType.name || "", type = type !== "" ? "ForwardRef(" + type + ")" : "ForwardRef");
+            return type;
+          case REACT_MEMO_TYPE:
+            return innerType = type.displayName || null, innerType !== null ? innerType : getComponentNameFromType(type.type) || "Memo";
+          case REACT_LAZY_TYPE:
+            innerType = type._payload;
+            type = type._init;
+            try {
+              return getComponentNameFromType(type(innerType));
+            } catch (x) {}
+        }
+      return null;
+    }
+    function testStringCoercion(value) {
+      return "" + value;
+    }
+    function checkKeyStringCoercion(value) {
+      try {
+        testStringCoercion(value);
+        var JSCompiler_inline_result = false;
+      } catch (e) {
+        JSCompiler_inline_result = true;
+      }
+      if (JSCompiler_inline_result) {
+        JSCompiler_inline_result = console;
+        var JSCompiler_temp_const = JSCompiler_inline_result.error;
+        var JSCompiler_inline_result$jscomp$0 = typeof Symbol === "function" && Symbol.toStringTag && value[Symbol.toStringTag] || value.constructor.name || "Object";
+        JSCompiler_temp_const.call(JSCompiler_inline_result, "The provided key is an unsupported type %s. This value must be coerced to a string before using it here.", JSCompiler_inline_result$jscomp$0);
+        return testStringCoercion(value);
+      }
+    }
+    function getTaskName(type) {
+      if (type === REACT_FRAGMENT_TYPE)
+        return "<>";
+      if (typeof type === "object" && type !== null && type.$$typeof === REACT_LAZY_TYPE)
+        return "<...>";
+      try {
+        var name = getComponentNameFromType(type);
+        return name ? "<" + name + ">" : "<...>";
+      } catch (x) {
+        return "<...>";
+      }
+    }
+    function getOwner() {
+      var dispatcher = ReactSharedInternals.A;
+      return dispatcher === null ? null : dispatcher.getOwner();
+    }
+    function UnknownOwner() {
+      return Error("react-stack-top-frame");
+    }
+    function hasValidKey(config2) {
+      if (hasOwnProperty.call(config2, "key")) {
+        var getter = Object.getOwnPropertyDescriptor(config2, "key").get;
+        if (getter && getter.isReactWarning)
+          return false;
+      }
+      return config2.key !== undefined;
+    }
+    function defineKeyPropWarningGetter(props, displayName) {
+      function warnAboutAccessingKey() {
+        specialPropKeyWarningShown || (specialPropKeyWarningShown = true, console.error("%s: `key` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://react.dev/link/special-props)", displayName));
+      }
+      warnAboutAccessingKey.isReactWarning = true;
+      Object.defineProperty(props, "key", {
+        get: warnAboutAccessingKey,
+        configurable: true
+      });
+    }
+    function elementRefGetterWithDeprecationWarning() {
+      var componentName = getComponentNameFromType(this.type);
+      didWarnAboutElementRef[componentName] || (didWarnAboutElementRef[componentName] = true, console.error("Accessing element.ref was removed in React 19. ref is now a regular prop. It will be removed from the JSX Element type in a future release."));
+      componentName = this.props.ref;
+      return componentName !== undefined ? componentName : null;
+    }
+    function ReactElement(type, key, props, owner, debugStack, debugTask) {
+      var refProp = props.ref;
+      type = {
+        $$typeof: REACT_ELEMENT_TYPE,
+        type,
+        key,
+        props,
+        _owner: owner
+      };
+      (refProp !== undefined ? refProp : null) !== null ? Object.defineProperty(type, "ref", {
+        enumerable: false,
+        get: elementRefGetterWithDeprecationWarning
+      }) : Object.defineProperty(type, "ref", { enumerable: false, value: null });
+      type._store = {};
+      Object.defineProperty(type._store, "validated", {
+        configurable: false,
+        enumerable: false,
+        writable: true,
+        value: 0
+      });
+      Object.defineProperty(type, "_debugInfo", {
+        configurable: false,
+        enumerable: false,
+        writable: true,
+        value: null
+      });
+      Object.defineProperty(type, "_debugStack", {
+        configurable: false,
+        enumerable: false,
+        writable: true,
+        value: debugStack
+      });
+      Object.defineProperty(type, "_debugTask", {
+        configurable: false,
+        enumerable: false,
+        writable: true,
+        value: debugTask
+      });
+      Object.freeze && (Object.freeze(type.props), Object.freeze(type));
+      return type;
+    }
+    function jsxDEVImpl(type, config2, maybeKey, isStaticChildren, debugStack, debugTask) {
+      var children = config2.children;
+      if (children !== undefined)
+        if (isStaticChildren)
+          if (isArrayImpl(children)) {
+            for (isStaticChildren = 0;isStaticChildren < children.length; isStaticChildren++)
+              validateChildKeys(children[isStaticChildren]);
+            Object.freeze && Object.freeze(children);
+          } else
+            console.error("React.jsx: Static children should always be an array. You are likely explicitly calling React.jsxs or React.jsxDEV. Use the Babel transform instead.");
+        else
+          validateChildKeys(children);
+      if (hasOwnProperty.call(config2, "key")) {
+        children = getComponentNameFromType(type);
+        var keys2 = Object.keys(config2).filter(function(k) {
+          return k !== "key";
+        });
+        isStaticChildren = 0 < keys2.length ? "{key: someKey, " + keys2.join(": ..., ") + ": ...}" : "{key: someKey}";
+        didWarnAboutKeySpread[children + isStaticChildren] || (keys2 = 0 < keys2.length ? "{" + keys2.join(": ..., ") + ": ...}" : "{}", console.error(`A props object containing a "key" prop is being spread into JSX:
+  let props = %s;
+  <%s {...props} />
+React keys must be passed directly to JSX without using spread:
+  let props = %s;
+  <%s key={someKey} {...props} />`, isStaticChildren, children, keys2, children), didWarnAboutKeySpread[children + isStaticChildren] = true);
+      }
+      children = null;
+      maybeKey !== undefined && (checkKeyStringCoercion(maybeKey), children = "" + maybeKey);
+      hasValidKey(config2) && (checkKeyStringCoercion(config2.key), children = "" + config2.key);
+      if ("key" in config2) {
+        maybeKey = {};
+        for (var propName in config2)
+          propName !== "key" && (maybeKey[propName] = config2[propName]);
+      } else
+        maybeKey = config2;
+      children && defineKeyPropWarningGetter(maybeKey, typeof type === "function" ? type.displayName || type.name || "Unknown" : type);
+      return ReactElement(type, children, maybeKey, getOwner(), debugStack, debugTask);
+    }
+    function validateChildKeys(node) {
+      isValidElement(node) ? node._store && (node._store.validated = 1) : typeof node === "object" && node !== null && node.$$typeof === REACT_LAZY_TYPE && (node._payload.status === "fulfilled" ? isValidElement(node._payload.value) && node._payload.value._store && (node._payload.value._store.validated = 1) : node._store && (node._store.validated = 1));
+    }
+    function isValidElement(object2) {
+      return typeof object2 === "object" && object2 !== null && object2.$$typeof === REACT_ELEMENT_TYPE;
+    }
+    var REACT_ELEMENT_TYPE = Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = Symbol.for("react.memo"), REACT_LAZY_TYPE = Symbol.for("react.lazy"), REACT_ACTIVITY_TYPE = Symbol.for("react.activity"), REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"), ReactSharedInternals = React11.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, hasOwnProperty = Object.prototype.hasOwnProperty, isArrayImpl = Array.isArray, createTask = console.createTask ? console.createTask : function() {
+      return null;
+    };
+    React11 = {
+      react_stack_bottom_frame: function(callStackForError) {
+        return callStackForError();
+      }
+    };
+    var specialPropKeyWarningShown;
+    var didWarnAboutElementRef = {};
+    var unknownOwnerDebugStack = React11.react_stack_bottom_frame.bind(React11, UnknownOwner)();
+    var unknownOwnerDebugTask = createTask(getTaskName(UnknownOwner));
+    var didWarnAboutKeySpread = {};
+    exports.Fragment = REACT_FRAGMENT_TYPE;
+    exports.jsxDEV = function(type, config2, maybeKey, isStaticChildren) {
+      var trackActualOwner = 1e4 > ReactSharedInternals.recentlyCreatedOwnerStacks++;
+      return jsxDEVImpl(type, config2, maybeKey, isStaticChildren, trackActualOwner ? Error("react-stack-top-frame") : unknownOwnerDebugStack, trackActualOwner ? createTask(getTaskName(type)) : unknownOwnerDebugTask);
+    };
+  })();
+});
+
+// node_modules/react/jsx-dev-runtime.js
+var require_jsx_dev_runtime = __commonJS((exports, module) => {
+  var react_jsx_dev_runtime_development = __toESM(require_react_jsx_dev_runtime_development());
+  if (false) {} else {
+    module.exports = react_jsx_dev_runtime_development;
+  }
+});
+
 // node_modules/cli-spinners/spinners.json
 var require_spinners = __commonJS((exports, module) => {
   module.exports = {
@@ -94671,229 +94995,6 @@ var require_cli_spinners = __commonJS((exports, module) => {
   module.exports = spinners;
 });
 
-// node_modules/react/cjs/react-jsx-dev-runtime.development.js
-var require_react_jsx_dev_runtime_development = __commonJS((exports) => {
-  var React12 = __toESM(require_react());
-  (function() {
-    function getComponentNameFromType(type) {
-      if (type == null)
-        return null;
-      if (typeof type === "function")
-        return type.$$typeof === REACT_CLIENT_REFERENCE ? null : type.displayName || type.name || null;
-      if (typeof type === "string")
-        return type;
-      switch (type) {
-        case REACT_FRAGMENT_TYPE:
-          return "Fragment";
-        case REACT_PROFILER_TYPE:
-          return "Profiler";
-        case REACT_STRICT_MODE_TYPE:
-          return "StrictMode";
-        case REACT_SUSPENSE_TYPE:
-          return "Suspense";
-        case REACT_SUSPENSE_LIST_TYPE:
-          return "SuspenseList";
-        case REACT_ACTIVITY_TYPE:
-          return "Activity";
-      }
-      if (typeof type === "object")
-        switch (typeof type.tag === "number" && console.error("Received an unexpected object in getComponentNameFromType(). This is likely a bug in React. Please file an issue."), type.$$typeof) {
-          case REACT_PORTAL_TYPE:
-            return "Portal";
-          case REACT_CONTEXT_TYPE:
-            return type.displayName || "Context";
-          case REACT_CONSUMER_TYPE:
-            return (type._context.displayName || "Context") + ".Consumer";
-          case REACT_FORWARD_REF_TYPE:
-            var innerType = type.render;
-            type = type.displayName;
-            type || (type = innerType.displayName || innerType.name || "", type = type !== "" ? "ForwardRef(" + type + ")" : "ForwardRef");
-            return type;
-          case REACT_MEMO_TYPE:
-            return innerType = type.displayName || null, innerType !== null ? innerType : getComponentNameFromType(type.type) || "Memo";
-          case REACT_LAZY_TYPE:
-            innerType = type._payload;
-            type = type._init;
-            try {
-              return getComponentNameFromType(type(innerType));
-            } catch (x) {}
-        }
-      return null;
-    }
-    function testStringCoercion(value) {
-      return "" + value;
-    }
-    function checkKeyStringCoercion(value) {
-      try {
-        testStringCoercion(value);
-        var JSCompiler_inline_result = false;
-      } catch (e) {
-        JSCompiler_inline_result = true;
-      }
-      if (JSCompiler_inline_result) {
-        JSCompiler_inline_result = console;
-        var JSCompiler_temp_const = JSCompiler_inline_result.error;
-        var JSCompiler_inline_result$jscomp$0 = typeof Symbol === "function" && Symbol.toStringTag && value[Symbol.toStringTag] || value.constructor.name || "Object";
-        JSCompiler_temp_const.call(JSCompiler_inline_result, "The provided key is an unsupported type %s. This value must be coerced to a string before using it here.", JSCompiler_inline_result$jscomp$0);
-        return testStringCoercion(value);
-      }
-    }
-    function getTaskName(type) {
-      if (type === REACT_FRAGMENT_TYPE)
-        return "<>";
-      if (typeof type === "object" && type !== null && type.$$typeof === REACT_LAZY_TYPE)
-        return "<...>";
-      try {
-        var name = getComponentNameFromType(type);
-        return name ? "<" + name + ">" : "<...>";
-      } catch (x) {
-        return "<...>";
-      }
-    }
-    function getOwner() {
-      var dispatcher = ReactSharedInternals.A;
-      return dispatcher === null ? null : dispatcher.getOwner();
-    }
-    function UnknownOwner() {
-      return Error("react-stack-top-frame");
-    }
-    function hasValidKey(config2) {
-      if (hasOwnProperty.call(config2, "key")) {
-        var getter = Object.getOwnPropertyDescriptor(config2, "key").get;
-        if (getter && getter.isReactWarning)
-          return false;
-      }
-      return config2.key !== undefined;
-    }
-    function defineKeyPropWarningGetter(props, displayName) {
-      function warnAboutAccessingKey() {
-        specialPropKeyWarningShown || (specialPropKeyWarningShown = true, console.error("%s: `key` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://react.dev/link/special-props)", displayName));
-      }
-      warnAboutAccessingKey.isReactWarning = true;
-      Object.defineProperty(props, "key", {
-        get: warnAboutAccessingKey,
-        configurable: true
-      });
-    }
-    function elementRefGetterWithDeprecationWarning() {
-      var componentName = getComponentNameFromType(this.type);
-      didWarnAboutElementRef[componentName] || (didWarnAboutElementRef[componentName] = true, console.error("Accessing element.ref was removed in React 19. ref is now a regular prop. It will be removed from the JSX Element type in a future release."));
-      componentName = this.props.ref;
-      return componentName !== undefined ? componentName : null;
-    }
-    function ReactElement(type, key, props, owner, debugStack, debugTask) {
-      var refProp = props.ref;
-      type = {
-        $$typeof: REACT_ELEMENT_TYPE,
-        type,
-        key,
-        props,
-        _owner: owner
-      };
-      (refProp !== undefined ? refProp : null) !== null ? Object.defineProperty(type, "ref", {
-        enumerable: false,
-        get: elementRefGetterWithDeprecationWarning
-      }) : Object.defineProperty(type, "ref", { enumerable: false, value: null });
-      type._store = {};
-      Object.defineProperty(type._store, "validated", {
-        configurable: false,
-        enumerable: false,
-        writable: true,
-        value: 0
-      });
-      Object.defineProperty(type, "_debugInfo", {
-        configurable: false,
-        enumerable: false,
-        writable: true,
-        value: null
-      });
-      Object.defineProperty(type, "_debugStack", {
-        configurable: false,
-        enumerable: false,
-        writable: true,
-        value: debugStack
-      });
-      Object.defineProperty(type, "_debugTask", {
-        configurable: false,
-        enumerable: false,
-        writable: true,
-        value: debugTask
-      });
-      Object.freeze && (Object.freeze(type.props), Object.freeze(type));
-      return type;
-    }
-    function jsxDEVImpl(type, config2, maybeKey, isStaticChildren, debugStack, debugTask) {
-      var children = config2.children;
-      if (children !== undefined)
-        if (isStaticChildren)
-          if (isArrayImpl(children)) {
-            for (isStaticChildren = 0;isStaticChildren < children.length; isStaticChildren++)
-              validateChildKeys(children[isStaticChildren]);
-            Object.freeze && Object.freeze(children);
-          } else
-            console.error("React.jsx: Static children should always be an array. You are likely explicitly calling React.jsxs or React.jsxDEV. Use the Babel transform instead.");
-        else
-          validateChildKeys(children);
-      if (hasOwnProperty.call(config2, "key")) {
-        children = getComponentNameFromType(type);
-        var keys2 = Object.keys(config2).filter(function(k) {
-          return k !== "key";
-        });
-        isStaticChildren = 0 < keys2.length ? "{key: someKey, " + keys2.join(": ..., ") + ": ...}" : "{key: someKey}";
-        didWarnAboutKeySpread[children + isStaticChildren] || (keys2 = 0 < keys2.length ? "{" + keys2.join(": ..., ") + ": ...}" : "{}", console.error(`A props object containing a "key" prop is being spread into JSX:
-  let props = %s;
-  <%s {...props} />
-React keys must be passed directly to JSX without using spread:
-  let props = %s;
-  <%s key={someKey} {...props} />`, isStaticChildren, children, keys2, children), didWarnAboutKeySpread[children + isStaticChildren] = true);
-      }
-      children = null;
-      maybeKey !== undefined && (checkKeyStringCoercion(maybeKey), children = "" + maybeKey);
-      hasValidKey(config2) && (checkKeyStringCoercion(config2.key), children = "" + config2.key);
-      if ("key" in config2) {
-        maybeKey = {};
-        for (var propName in config2)
-          propName !== "key" && (maybeKey[propName] = config2[propName]);
-      } else
-        maybeKey = config2;
-      children && defineKeyPropWarningGetter(maybeKey, typeof type === "function" ? type.displayName || type.name || "Unknown" : type);
-      return ReactElement(type, children, maybeKey, getOwner(), debugStack, debugTask);
-    }
-    function validateChildKeys(node) {
-      isValidElement(node) ? node._store && (node._store.validated = 1) : typeof node === "object" && node !== null && node.$$typeof === REACT_LAZY_TYPE && (node._payload.status === "fulfilled" ? isValidElement(node._payload.value) && node._payload.value._store && (node._payload.value._store.validated = 1) : node._store && (node._store.validated = 1));
-    }
-    function isValidElement(object2) {
-      return typeof object2 === "object" && object2 !== null && object2.$$typeof === REACT_ELEMENT_TYPE;
-    }
-    var REACT_ELEMENT_TYPE = Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = Symbol.for("react.memo"), REACT_LAZY_TYPE = Symbol.for("react.lazy"), REACT_ACTIVITY_TYPE = Symbol.for("react.activity"), REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"), ReactSharedInternals = React12.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, hasOwnProperty = Object.prototype.hasOwnProperty, isArrayImpl = Array.isArray, createTask = console.createTask ? console.createTask : function() {
-      return null;
-    };
-    React12 = {
-      react_stack_bottom_frame: function(callStackForError) {
-        return callStackForError();
-      }
-    };
-    var specialPropKeyWarningShown;
-    var didWarnAboutElementRef = {};
-    var unknownOwnerDebugStack = React12.react_stack_bottom_frame.bind(React12, UnknownOwner)();
-    var unknownOwnerDebugTask = createTask(getTaskName(UnknownOwner));
-    var didWarnAboutKeySpread = {};
-    exports.Fragment = REACT_FRAGMENT_TYPE;
-    exports.jsxDEV = function(type, config2, maybeKey, isStaticChildren) {
-      var trackActualOwner = 1e4 > ReactSharedInternals.recentlyCreatedOwnerStacks++;
-      return jsxDEVImpl(type, config2, maybeKey, isStaticChildren, trackActualOwner ? Error("react-stack-top-frame") : unknownOwnerDebugStack, trackActualOwner ? createTask(getTaskName(type)) : unknownOwnerDebugTask);
-    };
-  })();
-});
-
-// node_modules/react/jsx-dev-runtime.js
-var require_jsx_dev_runtime = __commonJS((exports, module) => {
-  var react_jsx_dev_runtime_development = __toESM(require_react_jsx_dev_runtime_development());
-  if (false) {} else {
-    module.exports = react_jsx_dev_runtime_development;
-  }
-});
-
 // src/commands/curator.ts
 var exports_curator = {};
 __export(exports_curator, {
@@ -94903,15 +95004,15 @@ __export(exports_curator, {
   curatorCommit: () => curatorCommit,
   _curatorCmdDeps: () => _curatorCmdDeps
 });
-import { readdirSync as readdirSync9 } from "fs";
+import { readdirSync as readdirSync8 } from "fs";
 import { unlink as unlink4 } from "fs/promises";
-import { basename as basename16, join as join83 } from "path";
+import { basename as basename15, join as join82 } from "path";
 function getProjectKey(config2, projectDir) {
-  return config2.name?.trim() || basename16(projectDir);
+  return config2.name?.trim() || basename15(projectDir);
 }
 function listRunIds(runsDir) {
   try {
-    return readdirSync9(runsDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name).sort();
+    return readdirSync8(runsDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name).sort();
   } catch {
     return [];
   }
@@ -94988,7 +95089,7 @@ async function curatorStatus(options) {
   const config2 = await _curatorCmdDeps.loadConfig(resolved.projectDir);
   const projectKey = getProjectKey(config2, resolved.projectDir);
   const outputDir = _curatorCmdDeps.projectOutputDir(projectKey, config2.outputDir);
-  const runsDir = join83(outputDir, "runs");
+  const runsDir = join82(outputDir, "runs");
   const runIds = listRunIds(runsDir);
   let runId;
   if (options.run) {
@@ -95005,8 +95106,8 @@ async function curatorStatus(options) {
     runId = runIds[runIds.length - 1];
   }
   console.log(`Run: ${runId}`);
-  const runDir = join83(runsDir, runId);
-  const observationsPath = join83(runDir, "observations.jsonl");
+  const runDir = join82(runsDir, runId);
+  const observationsPath = join82(runDir, "observations.jsonl");
   const observations = await parseObservations(observationsPath);
   const counts = new Map;
   for (const obs of observations) {
@@ -95016,7 +95117,7 @@ async function curatorStatus(options) {
   for (const [kind, count] of counts.entries()) {
     console.log(`  ${kind}: ${count}`);
   }
-  const proposalsPath = join83(runDir, "curator-proposals.md");
+  const proposalsPath = join82(runDir, "curator-proposals.md");
   const proposalText = await _curatorCmdDeps.readFile(proposalsPath).catch(() => null);
   if (proposalText !== null) {
     console.log("");
@@ -95030,8 +95131,8 @@ async function curatorCommit(options) {
   const config2 = await _curatorCmdDeps.loadConfig(resolved.projectDir);
   const projectKey = getProjectKey(config2, resolved.projectDir);
   const outputDir = _curatorCmdDeps.projectOutputDir(projectKey, config2.outputDir);
-  const runDir = join83(outputDir, "runs", options.runId);
-  const proposalsPath = join83(runDir, "curator-proposals.md");
+  const runDir = join82(outputDir, "runs", options.runId);
+  const proposalsPath = join82(runDir, "curator-proposals.md");
   const proposalText = await _curatorCmdDeps.readFile(proposalsPath).catch(() => null);
   if (proposalText === null) {
     console.log(`curator-proposals.md not found for run ${options.runId}.`);
@@ -95047,7 +95148,7 @@ async function curatorCommit(options) {
   const dropFileState = new Map;
   const skippedDrops = new Set;
   for (const drop2 of drops) {
-    const targetPath = join83(resolved.projectDir, drop2.canonicalFile);
+    const targetPath = join82(resolved.projectDir, drop2.canonicalFile);
     if (!dropFileState.has(targetPath)) {
       const fileExists2 = await Bun.file(targetPath).exists();
       const existing = fileExists2 ? await _curatorCmdDeps.readFile(targetPath).catch(() => "") : "";
@@ -95081,7 +95182,7 @@ async function curatorCommit(options) {
     if (skippedDrops.has(drop2)) {
       continue;
     }
-    const targetPath = join83(resolved.projectDir, drop2.canonicalFile);
+    const targetPath = join82(resolved.projectDir, drop2.canonicalFile);
     const existing = await _curatorCmdDeps.readFile(targetPath).catch(() => "");
     const filtered = filterDropContent(existing, drop2.description);
     await _curatorCmdDeps.writeFile(targetPath, filtered);
@@ -95090,7 +95191,7 @@ async function curatorCommit(options) {
   }
   const adds = proposals.filter((p) => p.action === "add" || p.action === "advisory");
   for (const add2 of adds) {
-    const targetPath = join83(resolved.projectDir, add2.canonicalFile);
+    const targetPath = join82(resolved.projectDir, add2.canonicalFile);
     const content = buildAddContent(add2);
     await _curatorCmdDeps.appendFile(targetPath, content);
     modifiedFiles.add(targetPath);
@@ -95127,7 +95228,7 @@ async function curatorDryrun(options) {
   const config2 = await _curatorCmdDeps.loadConfig(resolved.projectDir);
   const projectKey = getProjectKey(config2, resolved.projectDir);
   const outputDir = _curatorCmdDeps.projectOutputDir(projectKey, config2.outputDir);
-  const runsDir = join83(outputDir, "runs");
+  const runsDir = join82(outputDir, "runs");
   const runIds = listRunIds(runsDir);
   if (runIds.length === 0) {
     console.log("No runs found.");
@@ -95138,7 +95239,7 @@ async function curatorDryrun(options) {
     console.log(`Run ${options.run} not found in ${runsDir}.`);
     return;
   }
-  const observationsPath = join83(runsDir, runId, "observations.jsonl");
+  const observationsPath = join82(runsDir, runId, "observations.jsonl");
   const observations = await parseObservations(observationsPath);
   const thresholds = getThresholds(config2);
   const proposals = runHeuristics(observations, thresholds);
@@ -95179,12 +95280,12 @@ async function curatorGc(options) {
   await _curatorCmdDeps.writeFile(rollupPath, newContent);
   const projectKey = getProjectKey(config2, resolved.projectDir);
   const outputDir = _curatorCmdDeps.projectOutputDir(projectKey, config2.outputDir);
-  const perRunsDir = join83(outputDir, "runs");
+  const perRunsDir = join82(outputDir, "runs");
   for (const runId of uniqueRunIds) {
     if (!keepSet.has(runId)) {
-      const runDir = join83(perRunsDir, runId);
-      await _curatorCmdDeps.removeFile(join83(runDir, "observations.jsonl"));
-      await _curatorCmdDeps.removeFile(join83(runDir, "curator-proposals.md"));
+      const runDir = join82(perRunsDir, runId);
+      await _curatorCmdDeps.removeFile(join82(runDir, "observations.jsonl"));
+      await _curatorCmdDeps.removeFile(join82(runDir, "curator-proposals.md"));
     }
   }
   console.log(`[gc] Pruned rollup to ${keep} most recent runs (was ${uniqueRunIds.length}).`);
@@ -95227,9 +95328,9 @@ var init_curator2 = __esm(() => {
 
 // bin/nax.ts
 init_source();
-import { existsSync as existsSync37, mkdirSync as mkdirSync7 } from "fs";
+import { existsSync as existsSync36, mkdirSync as mkdirSync7 } from "fs";
 import { homedir as homedir3 } from "os";
-import { basename as basename17, join as join84 } from "path";
+import { basename as basename16, join as join83 } from "path";
 
 // node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
@@ -96385,324 +96486,6 @@ function formatSource(type, sourcePath) {
 function pad(str, width) {
   return str.padEnd(width);
 }
-// src/cli/diagnose.ts
-init_config();
-init_logger2();
-init_prd();
-init_runtime();
-import { existsSync as existsSync25, readdirSync as readdirSync5 } from "fs";
-import { basename as basename12, join as join57 } from "path";
-
-// src/cli/diagnose-analysis.ts
-function detectFailurePattern(story, _prd, status) {
-  if (story.status === "passed" && story.priorErrors?.some((err) => err.toLowerCase().includes("greenfield-no-tests"))) {
-    return "AUTO_RECOVERED";
-  }
-  if (story.status !== "failed" && story.status !== "blocked" && story.status !== "paused") {
-    return "UNKNOWN";
-  }
-  if (story.failureCategory === "greenfield-no-tests" || story.priorErrors?.some((err) => err.toLowerCase().includes("greenfield-no-tests"))) {
-    return "GREENFIELD_TDD";
-  }
-  const testFailingCount = story.priorErrors?.filter((err) => err.toLowerCase().includes("tests-failing")).length || 0;
-  if (testFailingCount >= 2)
-    return "TEST_MISMATCH";
-  if (story.priorErrors?.some((err) => err.toLowerCase().includes("precheck-failed")) || (status?.progress.blocked ?? 0) > 0) {
-    return "ENVIRONMENTAL";
-  }
-  if (story.priorErrors?.some((err) => err.toLowerCase().includes("ratelimited")))
-    return "RATE_LIMITED";
-  if (story.failureCategory === "isolation-violation")
-    return "ISOLATION_VIOLATION";
-  if (status?.run.status === "stalled")
-    return "STALLED";
-  if (story.priorErrors?.some((err) => err.toLowerCase().includes("session-failure")))
-    return "SESSION_CRASH";
-  if (story.attempts > 3)
-    return "MAX_TIERS_EXHAUSTED";
-  return "UNKNOWN";
-}
-function getPatternSymptom(pattern) {
-  const symptoms = {
-    GREENFIELD_TDD: "Story attempted in greenfield project with no existing tests",
-    TEST_MISMATCH: "Multiple test failures across attempts",
-    ENVIRONMENTAL: "Environment prechecks failed or blockers detected",
-    RATE_LIMITED: "API rate limit exceeded",
-    ISOLATION_VIOLATION: "Story modified files outside its scope",
-    MAX_TIERS_EXHAUSTED: "Story attempted at all configured model tiers without success",
-    SESSION_CRASH: "Agent session crashed without producing commits",
-    STALLED: "All stories blocked or paused -- no forward progress possible",
-    LOCK_STALE: "Lock file present but process is dead",
-    AUTO_RECOVERED: "Greenfield issue detected but S5 auto-recovery succeeded",
-    UNKNOWN: "Unknown failure pattern"
-  };
-  return symptoms[pattern] ?? "Unknown failure pattern";
-}
-function getPatternFixSuggestion(pattern, _story) {
-  const fixes = {
-    GREENFIELD_TDD: "Add --greenfield flag or bootstrap with scaffolding tests first",
-    TEST_MISMATCH: "Review acceptance criteria; tests may be too strict or story underspecified",
-    ENVIRONMENTAL: "Fix precheck issues (deps, env, build) before re-running",
-    RATE_LIMITED: "Wait for rate limit to reset or increase tier limits",
-    ISOLATION_VIOLATION: "Narrow story scope or adjust expectedFiles to allow cross-file changes",
-    MAX_TIERS_EXHAUSTED: "Simplify story or split into smaller sub-stories",
-    SESSION_CRASH: "Check agent logs for crash details; may need manual intervention",
-    STALLED: "Resolve blocked stories or skip them to unblock dependencies",
-    LOCK_STALE: "Run: rm nax.lock",
-    AUTO_RECOVERED: "No action needed -- S5 successfully handled greenfield scenario",
-    UNKNOWN: "Review logs and prior errors for clues"
-  };
-  return fixes[pattern] ?? "Review logs and prior errors for clues";
-}
-function generateRecommendations(report) {
-  const recommendations = [];
-  if (report.lockCheck.lockPresent && report.lockCheck.pidAlive === false) {
-    recommendations.push(`Remove stale lock: ${report.lockCheck.fixCommand}`);
-  }
-  const criticalPatterns = report.failureAnalysis.filter((f) => ["ENVIRONMENTAL", "STALLED", "SESSION_CRASH"].includes(f.pattern));
-  if (criticalPatterns.length > 0) {
-    recommendations.push(`Fix ${criticalPatterns.length} critical blocker(s): ${criticalPatterns.map((f) => f.storyId).join(", ")}`);
-  }
-  if (report.failureAnalysis.some((f) => f.pattern === "RATE_LIMITED")) {
-    recommendations.push("Wait for rate limits to reset before re-running");
-  }
-  if (report.failureAnalysis.some((f) => f.pattern === "GREENFIELD_TDD")) {
-    recommendations.push("Consider adding --greenfield flag or bootstrap tests for greenfield stories");
-  }
-  if (report.runSummary.storiesFailed > 0 && recommendations.length === 0) {
-    recommendations.push(`Re-run with: nax run -f ${report.runSummary.feature}`);
-  }
-  if (report.runSummary.storiesFailed === 0 && report.runSummary.storiesPending === 0) {
-    recommendations.push("All stories passed -- feature is complete!");
-  }
-  return recommendations;
-}
-function diagnoseStories(prd, status) {
-  const storyBreakdown = [];
-  const failureAnalysis = [];
-  for (const story of prd.userStories) {
-    const pattern = detectFailurePattern(story, prd, status);
-    const diagnosis = {
-      storyId: story.id,
-      title: story.title,
-      status: story.status,
-      attempts: story.attempts,
-      tier: story.routing?.modelTier,
-      strategy: story.routing?.testStrategy,
-      pattern
-    };
-    storyBreakdown.push(diagnosis);
-    if (story.status === "failed" || story.status === "blocked" || story.status === "paused" || pattern === "AUTO_RECOVERED") {
-      diagnosis.symptom = getPatternSymptom(pattern);
-      diagnosis.fixSuggestion = getPatternFixSuggestion(pattern, story);
-      failureAnalysis.push(diagnosis);
-    }
-  }
-  return { storyBreakdown, failureAnalysis };
-}
-
-// src/cli/diagnose-formatter.ts
-init_source();
-function formatReport(report, verbose) {
-  const lines = [];
-  lines.push(source_default.bold(`
-Diagnosis Report: ${report.runSummary.feature}
-`));
-  if (!report.dataSources.eventsFound) {
-    lines.push(source_default.yellow(`[WARN] events.jsonl not found -- diagnosis limited to PRD + git log
-`));
-  }
-  lines.push(source_default.bold(`Run Summary
-`));
-  if (report.runSummary.lastRunTime) {
-    lines.push(source_default.dim(`   Last Run:    ${report.runSummary.lastRunTime}`));
-  }
-  lines.push(source_default.dim(`   Status:      ${report.runSummary.status}`));
-  lines.push(source_default.green(`   Passed:      ${report.runSummary.storiesPassed}`));
-  lines.push(source_default.red(`   Failed:      ${report.runSummary.storiesFailed}`));
-  lines.push(source_default.dim(`   Pending:     ${report.runSummary.storiesPending}`));
-  if (report.runSummary.cost !== undefined) {
-    lines.push(source_default.dim(`   Cost:        $${report.runSummary.cost.toFixed(4)}`));
-  }
-  lines.push(source_default.dim(`   Commits:     ${report.runSummary.commitsProduced}`));
-  lines.push("");
-  if (verbose && report.storyBreakdown.length > 0) {
-    lines.push(source_default.bold(`Story Breakdown
-`));
-    for (const story of report.storyBreakdown) {
-      const icon = story.status === "passed" ? "[OK]" : story.status === "failed" ? "[FAIL]" : "[ ]";
-      const pattern = story.pattern !== "UNKNOWN" ? source_default.yellow(` [${story.pattern}]`) : "";
-      lines.push(`   ${icon} ${story.storyId}: ${story.title}${pattern}`);
-      if (verbose && story.tier) {
-        lines.push(source_default.dim(`      Tier: ${story.tier}, Strategy: ${story.strategy}, Attempts: ${story.attempts}`));
-      }
-    }
-    lines.push("");
-  }
-  if (report.failureAnalysis.length > 0) {
-    lines.push(source_default.bold(`Failure Analysis
-`));
-    for (const failure of report.failureAnalysis) {
-      const level = failure.pattern === "AUTO_RECOVERED" ? source_default.green("INFO") : source_default.red("ERROR");
-      lines.push(`   ${level} ${failure.storyId}: ${failure.title}`);
-      lines.push(source_default.dim(`      Pattern:     ${failure.pattern}`));
-      if (failure.symptom) {
-        lines.push(source_default.dim(`      Symptom:     ${failure.symptom}`));
-      }
-      if (failure.fixSuggestion) {
-        lines.push(source_default.yellow(`      Fix:         ${failure.fixSuggestion}`));
-      }
-      lines.push("");
-    }
-  }
-  lines.push(source_default.bold(`Lock Check
-`));
-  if (!report.lockCheck.lockPresent) {
-    lines.push(source_default.dim(`   No lock file present
-`));
-  } else if (report.lockCheck.pidAlive === false) {
-    lines.push(source_default.red(`   [FAIL] Stale lock detected (PID ${report.lockCheck.pid} is dead)`));
-    lines.push(source_default.yellow(`   Fix: ${report.lockCheck.fixCommand}
-`));
-  } else {
-    lines.push(source_default.green(`   [OK] Active lock (PID ${report.lockCheck.pid})
-`));
-  }
-  if (report.recommendations.length > 0) {
-    lines.push(source_default.bold(`Recommendations
-`));
-    for (let i = 0;i < report.recommendations.length; i++) {
-      lines.push(`   ${i + 1}. ${report.recommendations[i]}`);
-    }
-    lines.push("");
-  }
-  return lines.join(`
-`);
-}
-
-// src/cli/diagnose.ts
-var _diagnoseDeps = {
-  projectOutputDir,
-  loadConfig
-};
-function isProcessAlive2(pid) {
-  try {
-    const result = Bun.spawnSync(["ps", "-p", String(pid)], { stdout: "ignore", stderr: "ignore" });
-    return result.exitCode === 0;
-  } catch {
-    return false;
-  }
-}
-async function loadStatusFile2(outputDir) {
-  const statusPath = join57(outputDir, "status.json");
-  if (!existsSync25(statusPath))
-    return null;
-  try {
-    return await Bun.file(statusPath).json();
-  } catch {
-    return null;
-  }
-}
-async function countCommitsSince(workdir, since) {
-  if (!since)
-    return 0;
-  try {
-    const result = Bun.spawnSync(["git", "log", "--oneline", `--since=${since}`, "--all"], {
-      cwd: workdir,
-      stdout: "pipe",
-      stderr: "ignore"
-    });
-    if (result.exitCode !== 0)
-      return 0;
-    const output = new TextDecoder().decode(result.stdout);
-    return output.trim().split(`
-`).filter((line) => line.length > 0).length;
-  } catch {
-    return 0;
-  }
-}
-async function checkLock(workdir) {
-  const lockFile = Bun.file(join57(workdir, "nax.lock"));
-  if (!await lockFile.exists())
-    return { lockPresent: false };
-  try {
-    const lockData = JSON.parse(await lockFile.text());
-    const pid = lockData.pid;
-    const pidAlive = isProcessAlive2(pid);
-    if (!pidAlive)
-      return { lockPresent: true, pidAlive: false, pid, fixCommand: "rm nax.lock" };
-    return { lockPresent: true, pidAlive: true, pid };
-  } catch {
-    return { lockPresent: true };
-  }
-}
-async function diagnoseCommand(options = {}) {
-  const logger = getLogger();
-  const workdir = options.workdir ?? process.cwd();
-  const naxSubdir = findProjectDir(workdir);
-  let projectDir = naxSubdir ? join57(naxSubdir, "..") : null;
-  if (!projectDir && existsSync25(join57(workdir, ".nax"))) {
-    projectDir = workdir;
-  }
-  if (!projectDir)
-    throw new Error("Not in a nax project directory");
-  const config2 = await _diagnoseDeps.loadConfig(projectDir).catch(() => null);
-  const projectKey = config2?.name?.trim() || basename12(projectDir);
-  const outputDir = _diagnoseDeps.projectOutputDir(projectKey, config2?.outputDir);
-  let feature = options.feature;
-  if (!feature) {
-    const status2 = await loadStatusFile2(outputDir);
-    if (status2) {
-      feature = status2.run.feature;
-    } else {
-      const featuresDir = join57(outputDir, "features");
-      if (!existsSync25(featuresDir))
-        throw new Error("No features found in project");
-      const features = readdirSync5(featuresDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
-      if (features.length === 0)
-        throw new Error("No features found");
-      feature = features[0];
-      logger.info("diagnose", "No feature specified, using first found", { feature });
-    }
-  }
-  const featureDir = join57(outputDir, "features", feature);
-  const prdPath = join57(featureDir, "prd.json");
-  if (!existsSync25(prdPath))
-    throw new Error(`Feature not found: ${feature}`);
-  const prd = await loadPRD(prdPath);
-  const status = await loadStatusFile2(outputDir);
-  const lockCheck = await checkLock(projectDir);
-  const commitCount = await countCommitsSince(projectDir, status?.run.startedAt);
-  const { storyBreakdown, failureAnalysis } = diagnoseStories(prd, status);
-  const report = {
-    runSummary: {
-      feature,
-      lastRunTime: status?.run.startedAt,
-      status: status?.run.status ?? "unknown",
-      storiesPassed: prd.userStories.filter((s) => s.status === "passed").length,
-      storiesFailed: prd.userStories.filter((s) => s.status === "failed").length,
-      storiesPending: prd.userStories.filter((s) => s.status !== "passed" && s.status !== "failed" && s.status !== "skipped").length,
-      cost: status?.cost.spent,
-      commitsProduced: commitCount
-    },
-    storyBreakdown,
-    failureAnalysis,
-    lockCheck,
-    recommendations: [],
-    dataSources: {
-      prdFound: true,
-      statusFound: status !== null,
-      eventsFound: false,
-      gitLogFound: commitCount > 0
-    }
-  };
-  report.recommendations = generateRecommendations(report);
-  if (options.json) {
-    console.log(JSON.stringify(report, null, 2));
-  } else {
-    console.log(formatReport(report, options.verbose ?? false));
-  }
-}
 // src/cli/interact.ts
 init_common();
 init_interaction();
@@ -96710,8 +96493,8 @@ init_interaction();
 init_source();
 init_loader();
 init_generator2();
-import { existsSync as existsSync26 } from "fs";
-import { join as join58 } from "path";
+import { existsSync as existsSync25 } from "fs";
+import { join as join57 } from "path";
 var VALID_AGENTS = ["claude", "codex", "opencode", "cursor", "windsurf", "aider", "gemini"];
 async function generateCommand(options) {
   const workdir = options.dir ?? process.cwd();
@@ -96754,7 +96537,7 @@ async function generateCommand(options) {
     return;
   }
   if (options.package) {
-    const packageDir = join58(workdir, options.package);
+    const packageDir = join57(workdir, options.package);
     if (dryRun) {
       console.log(source_default.yellow("\u26A0 Dry run \u2014 no files will be written"));
     }
@@ -96774,10 +96557,10 @@ async function generateCommand(options) {
       process.exit(1);
     return;
   }
-  const contextPath = options.context ? join58(workdir, options.context) : join58(workdir, ".nax/context.md");
-  const outputDir = options.output ? join58(workdir, options.output) : workdir;
+  const contextPath = options.context ? join57(workdir, options.context) : join57(workdir, ".nax/context.md");
+  const outputDir = options.output ? join57(workdir, options.output) : workdir;
   const autoInject = !options.noAutoInject;
-  if (!existsSync26(contextPath)) {
+  if (!existsSync25(contextPath)) {
     console.error(source_default.red(`\u2717 Context file not found: ${contextPath}`));
     console.error(source_default.yellow("  Create .nax/context.md first, or run `nax init` to scaffold it."));
     process.exit(1);
@@ -96880,8 +96663,8 @@ async function generateCommand(options) {
 }
 // src/cli/config-display.ts
 init_loader();
-import { existsSync as existsSync28 } from "fs";
-import { join as join60 } from "path";
+import { existsSync as existsSync27 } from "fs";
+import { join as join59 } from "path";
 
 // src/cli/config-descriptions.ts
 var FIELD_DESCRIPTIONS = {
@@ -96937,6 +96720,7 @@ var FIELD_DESCRIPTIONS = {
   "execution.rectification.fullSuiteTimeoutSeconds": "Timeout for full test suite run in seconds",
   "execution.rectification.maxFailureSummaryChars": "Max characters in failure summary",
   "execution.rectification.abortOnIncreasingFailures": "Abort if failure count increases",
+  "execution.rectification.consecutiveIncreasesToBail": "Consecutive regressing iterations required before abortOnIncreasingFailures bails (default: 2; 1 = legacy behaviour)",
   "execution.rectification.escalateOnExhaustion": "Enable model tier escalation when attempts are exhausted with remaining failures",
   "execution.rectification.rethinkAtAttempt": "Attempt number at which 'rethink your approach' language is injected into the prompt (default: 2)",
   "execution.rectification.urgencyAtAttempt": "Attempt number at which 'final chance before escalation' urgency is added (default: 3)",
@@ -97131,10 +96915,10 @@ function deepEqual(a, b) {
 // src/cli/config-get.ts
 init_defaults();
 init_loader();
-import { existsSync as existsSync27 } from "fs";
-import { join as join59 } from "path";
+import { existsSync as existsSync26 } from "fs";
+import { join as join58 } from "path";
 async function loadConfigFile(path18) {
-  if (!existsSync27(path18))
+  if (!existsSync26(path18))
     return null;
   try {
     return await Bun.file(path18).json();
@@ -97154,7 +96938,7 @@ async function loadProjectConfig() {
   const projectDir = findProjectDir();
   if (!projectDir)
     return null;
-  const projectPath = join59(projectDir, "config.json");
+  const projectPath = join58(projectDir, "config.json");
   return await loadConfigFile(projectPath);
 }
 
@@ -97214,14 +96998,14 @@ async function configCommand(config2, options = {}) {
 function determineConfigSources() {
   const globalPath = globalConfigPath();
   const projectDir = findProjectDir();
-  const projectPath = projectDir ? join60(projectDir, "config.json") : null;
+  const projectPath = projectDir ? join59(projectDir, "config.json") : null;
   return {
     global: fileExists(globalPath) ? globalPath : null,
     project: projectPath && fileExists(projectPath) ? projectPath : null
   };
 }
 function fileExists(path18) {
-  return existsSync28(path18);
+  return existsSync27(path18);
 }
 function displayConfigWithDescriptions(obj, path18, sources, indent = 0) {
   const indentStr = "  ".repeat(indent);
@@ -97362,16 +97146,16 @@ function formatValueForTable(value) {
 init_paths();
 init_profile();
 import { mkdirSync as mkdirSync5 } from "fs";
-import { readdirSync as readdirSync6 } from "fs";
-import { join as join61 } from "path";
+import { readdirSync as readdirSync5 } from "fs";
+import { join as join60 } from "path";
 var _profileCLIDeps = {
   env: process.env
 };
 var SENSITIVE_KEY_PATTERN = /key|token|secret|password|credential/i;
 var VAR_PATTERN = /\$[A-Za-z_][A-Za-z0-9_]*/;
 async function profileListCommand(startDir) {
-  const globalProfilesDir = join61(globalConfigDir(), "profiles");
-  const projectProfilesDir = join61(projectConfigDir(startDir), "profiles");
+  const globalProfilesDir = join60(globalConfigDir(), "profiles");
+  const projectProfilesDir = join60(projectConfigDir(startDir), "profiles");
   const globalProfiles = scanProfileDir(globalProfilesDir);
   const projectProfiles = scanProfileDir(projectProfilesDir);
   const activeProfile = await resolveProfileName({}, _profileCLIDeps.env, startDir);
@@ -97397,7 +97181,7 @@ async function profileListCommand(startDir) {
 }
 function scanProfileDir(dir) {
   try {
-    return readdirSync6(dir).filter((f) => f.endsWith(".json")).map((f) => f.replace(/\.json$/, ""));
+    return readdirSync5(dir).filter((f) => f.endsWith(".json")).map((f) => f.replace(/\.json$/, ""));
   } catch {
     return [];
   }
@@ -97430,7 +97214,7 @@ function maskProfileValues(obj) {
   return result;
 }
 async function profileUseCommand(profileName, startDir) {
-  const configPath = join61(projectConfigDir(startDir), "config.json");
+  const configPath = join60(projectConfigDir(startDir), "config.json");
   const configFile = Bun.file(configPath);
   let existing = {};
   if (await configFile.exists()) {
@@ -97449,8 +97233,8 @@ async function profileCurrentCommand(startDir) {
   return resolveProfileName({}, _profileCLIDeps.env, startDir);
 }
 async function profileCreateCommand(profileName, startDir) {
-  const profilesDir = join61(projectConfigDir(startDir), "profiles");
-  const profilePath = join61(profilesDir, `${profileName}.json`);
+  const profilesDir = join60(projectConfigDir(startDir), "profiles");
+  const profilePath = join60(profilesDir, `${profileName}.json`);
   const profileFile = Bun.file(profilePath);
   if (await profileFile.exists()) {
     throw new Error(`Profile "${profileName}" already exists at ${profilePath}`);
@@ -97572,7 +97356,7 @@ async function contextInspectCommand(options) {
 init_canonical_loader();
 init_errors();
 import { mkdir as mkdir12 } from "fs/promises";
-import { basename as basename13, join as join62 } from "path";
+import { basename as basename12, join as join61 } from "path";
 var _rulesCLIDeps = {
   readFile: async (path18) => Bun.file(path18).text(),
   writeFile: async (path18, content) => {
@@ -97581,7 +97365,7 @@ var _rulesCLIDeps = {
   fileExists: async (path18) => Bun.file(path18).exists(),
   globInDir: (dir) => {
     try {
-      return [...new Bun.Glob("*.md").scanSync({ cwd: dir })].sort().map((f) => join62(dir, f));
+      return [...new Bun.Glob("*.md").scanSync({ cwd: dir })].sort().map((f) => join61(dir, f));
     } catch {
       return [];
     }
@@ -97630,7 +97414,7 @@ ${r.content}`).join(`
 `);
   const shimContent = `${header + body}
 `;
-  const shimPath = join62(workdir, shimFileName);
+  const shimPath = join61(workdir, shimFileName);
   if (options.dryRun) {
     console.log(`[dry-run] Would write ${shimPath} (${shimContent.length} bytes)`);
     return;
@@ -97659,20 +97443,20 @@ function neutralizeContent(content) {
 }
 async function collectMigrationSources(workdir) {
   const sources = [];
-  const claudeMdPath = join62(workdir, "CLAUDE.md");
+  const claudeMdPath = join61(workdir, "CLAUDE.md");
   if (await _rulesCLIDeps.fileExists(claudeMdPath)) {
     const content = await _rulesCLIDeps.readFile(claudeMdPath);
     if (content.trim()) {
       sources.push({ sourcePath: claudeMdPath, targetFileName: "project-conventions.md", content });
     }
   }
-  const rulesDir = join62(workdir, ".claude", "rules");
+  const rulesDir = join61(workdir, ".claude", "rules");
   const ruleFiles = _rulesCLIDeps.globInDir(rulesDir);
   for (const filePath of ruleFiles) {
     try {
       const content = await _rulesCLIDeps.readFile(filePath);
       if (content.trim()) {
-        sources.push({ sourcePath: filePath, targetFileName: basename13(filePath), content });
+        sources.push({ sourcePath: filePath, targetFileName: basename12(filePath), content });
       }
     } catch {}
   }
@@ -97686,7 +97470,7 @@ async function rulesMigrateCommand(options) {
     console.log("[WARN] No source files found (checked CLAUDE.md and .claude/rules/*.md). Nothing to migrate.");
     return;
   }
-  const targetDir = join62(workdir, CANONICAL_RULES_DIR);
+  const targetDir = join61(workdir, CANONICAL_RULES_DIR);
   if (!options.dryRun) {
     try {
       await _rulesCLIDeps.mkdir(targetDir);
@@ -97697,7 +97481,7 @@ async function rulesMigrateCommand(options) {
   let written = 0;
   let skipped = 0;
   for (const { sourcePath, targetFileName, content } of sources) {
-    const targetPath = join62(targetDir, targetFileName);
+    const targetPath = join61(targetDir, targetFileName);
     if (!force && !options.dryRun && await _rulesCLIDeps.fileExists(targetPath)) {
       console.log(`[skip] ${targetFileName} already exists (use --force to overwrite)`);
       skipped++;
@@ -97736,7 +97520,7 @@ function collectCanonicalRuleRoots(workdir) {
     const packageRel = normalized.slice(0, idx);
     if (!packageRel)
       continue;
-    roots.add(join62(workdir, packageRel));
+    roots.add(join61(workdir, packageRel));
   }
   return [...roots].sort();
 }
@@ -97758,7 +97542,7 @@ init_logger2();
 init_detect2();
 init_workspace();
 init_common();
-import { join as join63 } from "path";
+import { join as join62 } from "path";
 function resolveEffective(detected, configPatterns) {
   if (configPatterns !== undefined)
     return "config";
@@ -97843,7 +97627,7 @@ async function detectCommand(options) {
   const rootDetected = detectionMap[""] ?? { patterns: [], confidence: "empty", sources: [] };
   const pkgEntries = await Promise.all(packageDirs.map(async (dir) => {
     const det = detectionMap[dir] ?? { patterns: [], confidence: "empty", sources: [] };
-    const pkgConfigPath = join63(workdir, ".nax", "mono", dir, "config.json");
+    const pkgConfigPath = join62(workdir, ".nax", "mono", dir, "config.json");
     const pkgRaw = await loadRawConfig(pkgConfigPath);
     const pkgPatterns = deepGet(pkgRaw, TEST_PATTERNS_KEY);
     const effective = Array.isArray(pkgPatterns) ? pkgPatterns : undefined;
@@ -97897,13 +97681,13 @@ async function detectCommand(options) {
     if (rootDetected.confidence === "empty") {
       console.log(source_default.yellow("  root: skipped (empty detection)"));
     } else {
-      const rootConfigPath = join63(workdir, ".nax", "config.json");
+      const rootConfigPath = join62(workdir, ".nax", "config.json");
       try {
         const status = await applyToConfig(rootConfigPath, rootDetected.patterns, options.force ?? false);
         if (status === "skipped") {
           console.log(source_default.dim("  root: skipped (testFilePatterns already set; use --force to overwrite)"));
         } else {
-          console.log(source_default.green(`  root: ${status} \u2192 ${join63(".nax", "config.json")}`));
+          console.log(source_default.green(`  root: ${status} \u2192 ${join62(".nax", "config.json")}`));
         }
       } catch (err) {
         console.error(source_default.red(`  root: write failed \u2014 ${err.message}`));
@@ -97916,13 +97700,13 @@ async function detectCommand(options) {
         console.log(source_default.dim(`  ${dir}: skipped (empty detection)`));
         continue;
       }
-      const pkgConfigPath = join63(workdir, ".nax", "mono", dir, "config.json");
+      const pkgConfigPath = join62(workdir, ".nax", "mono", dir, "config.json");
       try {
         const status = await applyToConfig(pkgConfigPath, det.patterns, options.force ?? false);
         if (status === "skipped") {
           console.log(source_default.dim(`  ${dir}: skipped (already set)`));
         } else {
-          console.log(source_default.green(`  ${dir}: ${status} \u2192 ${join63(".nax", "mono", dir, "config.json")}`));
+          console.log(source_default.green(`  ${dir}: ${status} \u2192 ${join62(".nax", "mono", dir, "config.json")}`));
         }
       } catch (err) {
         console.error(source_default.red(`  ${dir}: write failed \u2014 ${err.message}`));
@@ -97937,27 +97721,22 @@ async function detectCommand(options) {
   process.exitCode = allEmpty ? 1 : 0;
 }
 
-// src/commands/diagnose.ts
-async function diagnose(options) {
-  await diagnoseCommand(options);
-}
-
 // src/commands/logs.ts
 init_common();
-import { existsSync as existsSync30 } from "fs";
-import { join as join67 } from "path";
+import { existsSync as existsSync29 } from "fs";
+import { join as join66 } from "path";
 
 // src/commands/logs-formatter.ts
 init_source();
 init_formatter();
-import { readdirSync as readdirSync8 } from "fs";
-import { join as join66 } from "path";
+import { readdirSync as readdirSync7 } from "fs";
+import { join as join65 } from "path";
 
 // src/commands/logs-reader.ts
 init_paths3();
-import { existsSync as existsSync29, readdirSync as readdirSync7 } from "fs";
+import { existsSync as existsSync28, readdirSync as readdirSync6 } from "fs";
 import { readdir as readdir4 } from "fs/promises";
-import { join as join65 } from "path";
+import { join as join64 } from "path";
 var _logsReaderDeps = {
   getRunsDir
 };
@@ -97971,7 +97750,7 @@ async function resolveRunFileFromRegistry(runId) {
   }
   let matched = null;
   for (const entry of entries) {
-    const metaPath = join65(runsDir, entry, "meta.json");
+    const metaPath = join64(runsDir, entry, "meta.json");
     try {
       const meta3 = await Bun.file(metaPath).json();
       if (meta3.runId === runId || meta3.runId.startsWith(runId)) {
@@ -97983,24 +97762,24 @@ async function resolveRunFileFromRegistry(runId) {
   if (!matched) {
     throw new Error(`Run not found in registry: ${runId}`);
   }
-  if (!existsSync29(matched.eventsDir)) {
+  if (!existsSync28(matched.eventsDir)) {
     console.log(`Log directory unavailable for run: ${runId}`);
     return null;
   }
-  const files = readdirSync7(matched.eventsDir).filter((f) => f.endsWith(".jsonl") && f !== "latest.jsonl").sort().reverse();
+  const files = readdirSync6(matched.eventsDir).filter((f) => f.endsWith(".jsonl") && f !== "latest.jsonl").sort().reverse();
   if (files.length === 0) {
     console.log(`No log files found for run: ${runId}`);
     return null;
   }
   const specificFile = files.find((f) => f === `${matched.runId}.jsonl`);
-  return join65(matched.eventsDir, specificFile ?? files[0]);
+  return join64(matched.eventsDir, specificFile ?? files[0]);
 }
 async function selectRunFile(runsDir) {
-  const files = readdirSync7(runsDir).filter((f) => f.endsWith(".jsonl") && f !== "latest.jsonl").sort().reverse();
+  const files = readdirSync6(runsDir).filter((f) => f.endsWith(".jsonl") && f !== "latest.jsonl").sort().reverse();
   if (files.length === 0) {
     return null;
   }
-  return join65(runsDir, files[0]);
+  return join64(runsDir, files[0]);
 }
 async function extractRunSummary(filePath) {
   const file3 = Bun.file(filePath);
@@ -98075,7 +97854,7 @@ var LOG_LEVEL_PRIORITY2 = {
   error: 3
 };
 async function displayRunsList(runsDir) {
-  const files = readdirSync8(runsDir).filter((f) => f.endsWith(".jsonl") && f !== "latest.jsonl").sort().reverse();
+  const files = readdirSync7(runsDir).filter((f) => f.endsWith(".jsonl") && f !== "latest.jsonl").sort().reverse();
   if (files.length === 0) {
     console.log(source_default.dim("No runs found"));
     return;
@@ -98086,7 +97865,7 @@ Runs:
   console.log(source_default.gray("  Timestamp            Stories  Duration  Cost      Status"));
   console.log(source_default.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
   for (const file3 of files) {
-    const filePath = join66(runsDir, file3);
+    const filePath = join65(runsDir, file3);
     const summary = await extractRunSummary(filePath);
     const timestamp = file3.replace(".jsonl", "");
     const stories = summary ? `${summary.passed}/${summary.total}` : "?/?";
@@ -98200,7 +97979,7 @@ async function logsCommand(options) {
     return;
   }
   const resolved = resolveProject({ dir: options.dir });
-  const naxDir = join67(resolved.projectDir, ".nax");
+  const naxDir = join66(resolved.projectDir, ".nax");
   const configPath = resolved.configPath;
   const configFile = Bun.file(configPath);
   const config2 = await configFile.json();
@@ -98208,9 +97987,9 @@ async function logsCommand(options) {
   if (!featureName) {
     throw new Error("No feature specified in config.json");
   }
-  const featureDir = join67(naxDir, "features", featureName);
-  const runsDir = join67(featureDir, "runs");
-  if (!existsSync30(runsDir)) {
+  const featureDir = join66(naxDir, "features", featureName);
+  const runsDir = join66(featureDir, "runs");
+  if (!existsSync29(runsDir)) {
     throw new Error(`No runs directory found for feature: ${featureName}`);
   }
   if (options.list) {
@@ -98234,8 +98013,8 @@ init_config();
 init_prd();
 init_precheck();
 init_common();
-import { existsSync as existsSync31 } from "fs";
-import { join as join68 } from "path";
+import { existsSync as existsSync30 } from "fs";
+import { join as join67 } from "path";
 async function precheckCommand(options) {
   const resolved = resolveProject({
     dir: options.dir,
@@ -98257,14 +98036,14 @@ async function precheckCommand(options) {
       process.exit(1);
     }
   }
-  const naxDir = join68(resolved.projectDir, ".nax");
-  const featureDir = join68(naxDir, "features", featureName);
-  const prdPath = join68(featureDir, "prd.json");
-  if (!existsSync31(featureDir)) {
+  const naxDir = join67(resolved.projectDir, ".nax");
+  const featureDir = join67(naxDir, "features", featureName);
+  const prdPath = join67(featureDir, "prd.json");
+  if (!existsSync30(featureDir)) {
     console.error(source_default.red(`Feature not found: ${featureName}`));
     process.exit(1);
   }
-  if (!existsSync31(prdPath)) {
+  if (!existsSync30(prdPath)) {
     console.error(source_default.red(`Missing prd.json for feature: ${featureName}`));
     console.error(source_default.dim(`Run: nax plan -f ${featureName} --from spec.md --auto`));
     process.exit(EXIT_CODES.INVALID_PRD);
@@ -98282,7 +98061,7 @@ async function precheckCommand(options) {
 init_source();
 init_paths3();
 import { readdir as readdir5 } from "fs/promises";
-import { join as join69 } from "path";
+import { join as join68 } from "path";
 var DEFAULT_LIMIT = 20;
 var _runsCmdDeps = {
   getRunsDir
@@ -98337,7 +98116,7 @@ async function runsCommand(options = {}) {
   }
   const rows = [];
   for (const entry of entries) {
-    const metaPath = join69(runsDir, entry, "meta.json");
+    const metaPath = join68(runsDir, entry, "meta.json");
     let meta3;
     try {
       meta3 = await Bun.file(metaPath).json();
@@ -98414,8 +98193,8 @@ async function runsCommand(options = {}) {
 
 // src/commands/unlock.ts
 init_source();
-import { join as join70 } from "path";
-function isProcessAlive3(pid) {
+import { join as join69 } from "path";
+function isProcessAlive2(pid) {
   try {
     process.kill(pid, 0);
     return true;
@@ -98429,7 +98208,7 @@ function formatLockAge(ageMs) {
 }
 async function unlockCommand(options) {
   const workdir = options.dir ?? process.cwd();
-  const lockPath = join70(workdir, "nax.lock");
+  const lockPath = join69(workdir, "nax.lock");
   const lockFile = Bun.file(lockPath);
   const exists = await lockFile.exists();
   if (!exists) {
@@ -98447,7 +98226,7 @@ async function unlockCommand(options) {
   const { pid, timestamp } = lockData;
   const ageMs = Date.now() - timestamp;
   if (!options.force) {
-    if (isProcessAlive3(pid)) {
+    if (isProcessAlive2(pid)) {
       console.error(source_default.red(`nax is still running (PID ${pid}). Use --force to override.`));
       process.exit(1);
     }
@@ -105127,7 +104906,7 @@ var import_react27 = __toESM(require_react(), 1);
 // node_modules/ink/build/hooks/use-cursor.js
 var import_react28 = __toESM(require_react(), 1);
 // src/tui/App.tsx
-var import_react35 = __toESM(require_react(), 1);
+var import_react36 = __toESM(require_react(), 1);
 
 // src/utils/queue-writer.ts
 async function writeQueueCommand(queueFilePath, command) {
@@ -105156,151 +104935,8 @@ ${commandLine2}
   await Bun.write(queueFilePath, newContent);
 }
 
-// node_modules/ink-spinner/build/index.js
-var import_react29 = __toESM(require_react(), 1);
-var import_cli_spinners = __toESM(require_cli_spinners(), 1);
-function Spinner({ type = "dots" }) {
-  const [frame, setFrame] = import_react29.useState(0);
-  const spinner = import_cli_spinners.default[type];
-  import_react29.useEffect(() => {
-    const timer = setInterval(() => {
-      setFrame((previousFrame) => {
-        const isLastFrame = previousFrame === spinner.frames.length - 1;
-        return isLastFrame ? 0 : previousFrame + 1;
-      });
-    }, spinner.interval);
-    return () => {
-      clearInterval(timer);
-    };
-  }, [spinner]);
-  return import_react29.default.createElement(Text, null, spinner.frames[frame]);
-}
-var build_default = Spinner;
-
-// src/tui/components/AgentPanel.tsx
-var jsx_dev_runtime = __toESM(require_jsx_dev_runtime(), 1);
-var MAX_OUTPUT_LINES = 500;
-function AgentPanel({ focused = false, outputLines = [], activeCalls }) {
-  const borderColor = focused ? "cyan" : "gray";
-  const bufferedLines = outputLines.length > MAX_OUTPUT_LINES ? outputLines.slice(-MAX_OUTPUT_LINES) : outputLines;
-  const activeCallList = activeCalls ? Array.from(activeCalls.values()) : [];
-  const hasActiveCalls = activeCallList.length > 0;
-  const hasOutput = bufferedLines.length > 0;
-  return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
-    flexDirection: "column",
-    flexGrow: 1,
-    borderStyle: "single",
-    borderColor,
-    children: [
-      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
-        paddingX: 1,
-        borderStyle: "single",
-        borderBottom: true,
-        borderColor,
-        children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-          bold: true,
-          color: focused ? "cyan" : undefined,
-          children: [
-            "Agent ",
-            focused && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-              dimColor: true,
-              children: "(focused)"
-            }, undefined, false, undefined, this)
-          ]
-        }, undefined, true, undefined, this)
-      }, undefined, false, undefined, this),
-      hasActiveCalls && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
-        flexDirection: "column",
-        paddingX: 1,
-        paddingY: 1,
-        children: activeCallList.map((call) => /* @__PURE__ */ jsx_dev_runtime.jsxDEV(AgentCallRow, {
-          call
-        }, call.callId, false, undefined, this))
-      }, undefined, false, undefined, this),
-      !hasActiveCalls && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
-        flexDirection: "column",
-        paddingX: 1,
-        paddingY: 1,
-        children: hasOutput ? bufferedLines.map((line, i) => /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-          children: line
-        }, `line-${i}-${line.slice(0, 20)}`, false, undefined, this)) : /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-          dimColor: true,
-          children: [
-            /* @__PURE__ */ jsx_dev_runtime.jsxDEV(build_default, {
-              type: "dots"
-            }, undefined, false, undefined, this),
-            " Waiting for agent..."
-          ]
-        }, undefined, true, undefined, this)
-      }, undefined, false, undefined, this)
-    ]
-  }, undefined, true, undefined, this);
-}
-function formatMs(ms) {
-  if (ms < 1000)
-    return `${ms}ms`;
-  return `${Math.floor(ms / 1000)}s`;
-}
-function AgentCallRow({ call }) {
-  const now3 = Date.now();
-  const elapsedMs = now3 - call.startedAt;
-  const idleMs = now3 - call.lastActivityAt;
-  return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
-    flexDirection: "row",
-    gap: 1,
-    children: [
-      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-        color: "cyan",
-        children: call.agentName
-      }, undefined, false, undefined, this),
-      call.storyId && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-        dimColor: true,
-        children: call.storyId
-      }, undefined, false, undefined, this),
-      call.stage && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-        dimColor: true,
-        children: [
-          "[",
-          call.stage,
-          "]"
-        ]
-      }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-        children: [
-          " elapsed:",
-          formatMs(elapsedMs)
-        ]
-      }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-        children: [
-          " idle:",
-          formatMs(idleMs)
-        ]
-      }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-        children: [
-          " msg:",
-          call.messageUpdates
-        ]
-      }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-        children: [
-          " think:",
-          call.thinkingUpdates
-        ]
-      }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-        children: [
-          " usage:",
-          call.usageUpdates
-        ]
-      }, undefined, true, undefined, this)
-    ]
-  }, undefined, true, undefined, this);
-}
-
 // src/tui/components/CostOverlay.tsx
-var jsx_dev_runtime2 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime = __toESM(require_jsx_dev_runtime(), 1);
 function formatCost2(cost) {
   return `$${cost.toFixed(4)}`;
 }
@@ -105309,7 +104945,7 @@ function CostOverlay({ visible = false, stories = [], totalCost = 0 }) {
     return null;
   }
   const executedStories = stories.filter((s) => s.cost && s.cost > 0 || s.status !== "pending");
-  return /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
     flexDirection: "column",
     borderStyle: "double",
     borderColor: "cyan",
@@ -105317,87 +104953,87 @@ function CostOverlay({ visible = false, stories = [], totalCost = 0 }) {
     paddingY: 1,
     minWidth: 60,
     children: [
-      /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         paddingBottom: 1,
-        children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+        children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
           bold: true,
           color: "cyan",
           children: "Cost Breakdown"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         paddingBottom: 1,
         borderBottom: true,
         borderColor: "gray",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
             width: 12,
-            children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
               bold: true,
               children: "Story ID"
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
             width: 12,
-            children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
               bold: true,
               children: "Status"
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
             width: 12,
-            children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
               bold: true,
               children: "Cost"
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         flexDirection: "column",
         paddingY: 1,
-        children: executedStories.length > 0 ? executedStories.map((story) => /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+        children: executedStories.length > 0 ? executedStories.map((story) => /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
           children: [
-            /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+            /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
               width: 12,
-              children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+              children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
                 children: story.story.id
               }, undefined, false, undefined, this)
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+            /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
               width: 12,
-              children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+              children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
                 color: story.status === "passed" ? "green" : story.status === "failed" ? "red" : undefined,
                 children: story.status
               }, undefined, false, undefined, this)
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+            /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
               width: 12,
-              children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+              children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
                 children: formatCost2(story.cost || 0)
               }, undefined, false, undefined, this)
             }, undefined, false, undefined, this)
           ]
-        }, story.story.id, true, undefined, this)) : /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+        }, story.story.id, true, undefined, this)) : /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
           dimColor: true,
           children: "No stories executed yet"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         paddingTop: 1,
         borderTop: true,
         borderColor: "gray",
         children: [
-          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
             width: 24,
-            children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
               bold: true,
               children: "Total Cost:"
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
             width: 12,
-            children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
               bold: true,
               color: "cyan",
               children: formatCost2(totalCost)
@@ -105405,16 +105041,16 @@ function CostOverlay({ visible = false, stories = [], totalCost = 0 }) {
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         justifyContent: "center",
         paddingTop: 1,
         borderTop: true,
         borderColor: "gray",
-        children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+        children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
           dimColor: true,
           children: [
             "Press ",
-            /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
               color: "yellow",
               children: "Esc"
             }, undefined, false, undefined, this),
@@ -105427,118 +105063,118 @@ function CostOverlay({ visible = false, stories = [], totalCost = 0 }) {
 }
 
 // src/tui/components/HelpOverlay.tsx
-var jsx_dev_runtime3 = __toESM(require_jsx_dev_runtime(), 1);
+var jsx_dev_runtime2 = __toESM(require_jsx_dev_runtime(), 1);
 function HelpOverlay({ visible = false }) {
   if (!visible) {
     return null;
   }
-  return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
     flexDirection: "column",
     borderStyle: "double",
     borderColor: "cyan",
     paddingX: 2,
     paddingY: 1,
     children: [
-      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
         paddingBottom: 1,
-        children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+        children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
           bold: true,
           color: "cyan",
           children: "Keyboard Shortcuts"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
         flexDirection: "column",
         paddingBottom: 1,
         children: [
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             dimColor: true,
             children: "Stories Panel (default):"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "p"
               }, undefined, false, undefined, this),
               " \u2014 Pause after current story"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "a"
               }, undefined, false, undefined, this),
               " \u2014 Abort run"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "s"
               }, undefined, false, undefined, this),
               " \u2014 Skip current story"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "Tab"
               }, undefined, false, undefined, this),
               " \u2014 Toggle focus to Agent panel"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "q"
               }, undefined, false, undefined, this),
               " \u2014 Quit TUI"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "?"
               }, undefined, false, undefined, this),
               " \u2014 Show this help"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "c"
               }, undefined, false, undefined, this),
               " \u2014 Show cost breakdown"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "r"
               }, undefined, false, undefined, this),
               " \u2014 Retry last failed story"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "Esc"
               }, undefined, false, undefined, this),
@@ -105547,28 +105183,28 @@ function HelpOverlay({ visible = false }) {
           }, undefined, true, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
         flexDirection: "column",
         paddingBottom: 1,
         children: [
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             dimColor: true,
             children: "Agent Panel (when focused):"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 color: "yellow",
                 children: "Ctrl+]"
               }, undefined, false, undefined, this),
               " \u2014 Escape back to Stories panel"
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
             children: [
               " ",
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
                 dimColor: true,
                 children: "All other keys"
               }, undefined, false, undefined, this),
@@ -105577,16 +105213,16 @@ function HelpOverlay({ visible = false }) {
           }, undefined, true, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Box_default, {
         justifyContent: "center",
         paddingTop: 1,
         borderTop: true,
         borderColor: "gray",
-        children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+        children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
           dimColor: true,
           children: [
             "Press ",
-            /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+            /* @__PURE__ */ jsx_dev_runtime2.jsxDEV(Text, {
               color: "yellow",
               children: "Esc"
             }, undefined, false, undefined, this),
@@ -105598,46 +105234,289 @@ function HelpOverlay({ visible = false }) {
   }, undefined, true, undefined, this);
 }
 
-// src/tui/components/StatusBar.tsx
-var jsx_dev_runtime4 = __toESM(require_jsx_dev_runtime(), 1);
-function StatusBar({ currentStory, currentStage, modelTier, testStrategy }) {
-  if (!currentStory) {
-    return /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
-      paddingX: 1,
-      borderStyle: "single",
-      borderColor: "gray",
-      children: /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-        dimColor: true,
-        children: "Idle"
-      }, undefined, false, undefined, this)
-    }, undefined, false, undefined, this);
-  }
-  const storyInfo = `Story ${currentStory.id}`;
-  const stageInfo = currentStage ? ` \xB7 ${currentStage}` : "";
-  const tierInfo = modelTier ? ` \xB7 ${modelTier}` : "";
-  const strategyInfo = testStrategy ? ` \xB7 ${testStrategy}` : "";
-  return /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
-    paddingX: 1,
+// node_modules/ink-spinner/build/index.js
+var import_react29 = __toESM(require_react(), 1);
+var import_cli_spinners = __toESM(require_cli_spinners(), 1);
+function Spinner({ type = "dots" }) {
+  const [frame, setFrame] = import_react29.useState(0);
+  const spinner = import_cli_spinners.default[type];
+  import_react29.useEffect(() => {
+    const timer = setInterval(() => {
+      setFrame((previousFrame) => {
+        const isLastFrame = previousFrame === spinner.frames.length - 1;
+        return isLastFrame ? 0 : previousFrame + 1;
+      });
+    }, spinner.interval);
+    return () => {
+      clearInterval(timer);
+    };
+  }, [spinner]);
+  return import_react29.default.createElement(Text, null, spinner.frames[frame]);
+}
+var build_default = Spinner;
+
+// src/tui/components/LiveActivityPanel.tsx
+var jsx_dev_runtime3 = __toESM(require_jsx_dev_runtime(), 1);
+var MAX_ESCALATION_DISPLAY = 5;
+function LiveActivityPanel({
+  focused = false,
+  activeCalls,
+  runSummary,
+  runErrored,
+  escalationLog = []
+}) {
+  const borderColor = focused ? "cyan" : "gray";
+  const activeCallList = activeCalls ? Array.from(activeCalls.values()) : [];
+  const hasActiveCalls = activeCallList.length > 0;
+  const hasSummary = runSummary !== undefined;
+  const hasError = runErrored !== undefined;
+  const recentEscalations = escalationLog.slice(-MAX_ESCALATION_DISPLAY);
+  const hasEscalations = recentEscalations.length > 0;
+  return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+    flexDirection: "column",
+    flexGrow: 1,
     borderStyle: "single",
-    borderColor: "gray",
-    children: /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
+    borderColor,
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        paddingX: 1,
+        borderStyle: "single",
+        borderBottom: true,
+        borderColor,
+        children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          bold: true,
+          color: focused ? "cyan" : undefined,
+          children: [
+            "Live Activity ",
+            focused && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              dimColor: true,
+              children: "(focused)"
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this)
+      }, undefined, false, undefined, this),
+      hasError && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        paddingX: 1,
+        paddingY: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          color: "red",
+          children: [
+            "[FAIL] ",
+            runErrored
+          ]
+        }, undefined, true, undefined, this)
+      }, undefined, false, undefined, this),
+      hasSummary && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        flexDirection: "column",
+        paddingX: 1,
+        paddingY: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(RunSummaryRow, {
+          summary: runSummary
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this),
+      hasActiveCalls && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        flexDirection: "column",
+        paddingX: 1,
+        paddingY: 1,
+        children: activeCallList.map((call) => /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(ActiveCallRow, {
+          call
+        }, call.callId, false, undefined, this))
+      }, undefined, false, undefined, this),
+      hasEscalations && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        flexDirection: "column",
+        paddingX: 1,
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+            dimColor: true,
+            children: "Escalations:"
+          }, undefined, false, undefined, this),
+          recentEscalations.map((entry) => /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(EscalationRow, {
+            entry
+          }, `${entry.storyId}-${entry.at}`, false, undefined, this))
+        ]
+      }, undefined, true, undefined, this),
+      !hasActiveCalls && !hasSummary && !hasError && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        paddingX: 1,
+        paddingY: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          dimColor: true,
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(build_default, {
+              type: "dots"
+            }, undefined, false, undefined, this),
+            " Waiting for agent..."
+          ]
+        }, undefined, true, undefined, this)
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+function ActiveCallRow({ call }) {
+  return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+    flexDirection: "column",
+    marginBottom: 1,
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        flexDirection: "row",
+        gap: 1,
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+            color: "cyan",
+            children: call.agentName
+          }, undefined, false, undefined, this),
+          call.storyId && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+            children: call.storyId
+          }, undefined, false, undefined, this),
+          call.stage && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              "[",
+              call.stage,
+              "]"
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        flexDirection: "row",
+        gap: 1,
+        children: [
+          call.model && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              "model:",
+              call.model
+            ]
+          }, undefined, true, undefined, this),
+          call.lastToolName && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              "tool:",
+              call.lastToolName
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              "tools:",
+              call.toolCallUpdates,
+              " msg:",
+              call.messageUpdates
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+function RunSummaryRow({ summary }) {
+  const cost = summary.totalCost !== undefined ? `$${summary.totalCost.toFixed(4)}` : null;
+  return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+    flexDirection: "column",
+    children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+      flexDirection: "row",
+      gap: 1,
       children: [
-        /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
           bold: true,
-          children: storyInfo
+          children: "Run complete"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
+        /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          color: "green",
+          children: [
+            summary.passedStories,
+            " passed"
+          ]
+        }, undefined, true, undefined, this),
+        summary.failedStories > 0 && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          color: "red",
+          children: [
+            summary.failedStories,
+            " failed"
+          ]
+        }, undefined, true, undefined, this),
+        summary.skippedStories > 0 && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
           dimColor: true,
           children: [
-            stageInfo,
-            tierInfo,
-            strategyInfo
+            summary.skippedStories,
+            " skipped"
           ]
-        }, undefined, true, undefined, this)
+        }, undefined, true, undefined, this),
+        cost && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          dimColor: true,
+          children: cost
+        }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this)
   }, undefined, false, undefined, this);
 }
+function EscalationRow({ entry }) {
+  return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+    flexDirection: "row",
+    gap: 1,
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+        dimColor: true,
+        children: entry.storyId
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+        color: "yellow",
+        children: entry.fromTier
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+        dimColor: true,
+        children: "->"
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+        color: "cyan",
+        children: entry.toTier
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+
+// src/tui/components/StatusBar.tsx
+var jsx_dev_runtime4 = __toESM(require_jsx_dev_runtime(), 1);
+function StatusBar({
+  currentStage,
+  currentStoryId,
+  modelTier,
+  runPaused,
+  runComplete,
+  isParallel,
+  activeCount = 0
+}) {
+  const hints = runComplete ? "q quit  c cost  ? help" : "p pause  a abort  s skip  c cost  ? help";
+  let context;
+  if (runComplete) {
+    context = "done";
+  } else if (runPaused) {
+    context = "run paused";
+  } else if (isParallel && activeCount > 0) {
+    context = `parallel \xB7 ${activeCount} active`;
+  } else if (currentStoryId) {
+    const parts = [currentStoryId, currentStage, modelTier].filter(Boolean);
+    context = parts.join(" \xB7 ");
+  } else {
+    context = "idle";
+  }
+  return /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
+    paddingX: 1,
+    borderStyle: "single",
+    borderColor: "gray",
+    justifyContent: "space-between",
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
+        dimColor: true,
+        children: hints
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
+        dimColor: true,
+        children: context
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
 
 // src/tui/components/StoriesPanel.tsx
 var import_react31 = __toESM(require_react(), 1);
@@ -105702,13 +105581,7 @@ function getStatusIcon(status) {
       return "\u23F8\uFE0F";
   }
 }
-function formatElapsedTime(ms) {
-  const totalSeconds = Math.floor(ms / 1000);
-  const minutes = Math.floor(totalSeconds / 60);
-  const seconds = totalSeconds % 60;
-  return `${minutes}m ${seconds}s`;
-}
-function StoriesPanel({ stories, totalCost, elapsedMs, width, compact: compact2 = false, maxHeight }) {
+function StoriesPanel({ stories, width, compact: compact2 = false, maxHeight }) {
   const maxVisible = compact2 ? COMPACT_MAX_VISIBLE_STORIES : MAX_VISIBLE_STORIES;
   const needsScrolling = stories.length > maxVisible;
   const [scrollOffset, setScrollOffset] = import_react31.useState(0);
@@ -105781,20 +105654,37 @@ function StoriesPanel({ stories, totalCost, elapsedMs, width, compact: compact2
               }, undefined, true, undefined, this)
             }, s.story.id, false, undefined, this);
           }
-          const routing = s.routing ? ` ${s.routing.complexity.slice(0, 3)} ${s.routing.modelTier}` : "";
+          const routing = s.routing ? ` ${s.routing.complexity.slice(0, 3)}` : "";
+          const shortTier = s.modelTier?.slice(0, 3);
+          const tierSuffix = s.status === "retrying" && shortTier ? `\u2192${shortTier}` : s.status === "running" && shortTier ? shortTier : "";
+          const showFailureLine = (s.status === "failed" || s.status === "paused") && s.failureReason;
           return /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
-            children: /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-              children: [
-                icon,
-                " ",
-                s.story.id,
-                /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-                  dimColor: true,
-                  children: routing
-                }, undefined, false, undefined, this)
-              ]
-            }, undefined, true, undefined, this)
-          }, s.story.id, false, undefined, this);
+            flexDirection: "column",
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                children: [
+                  icon,
+                  " ",
+                  s.story.id,
+                  /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                    dimColor: true,
+                    children: routing
+                  }, undefined, false, undefined, this),
+                  tierSuffix ? /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                    dimColor: true,
+                    children: [
+                      " ",
+                      tierSuffix
+                    ]
+                  }, undefined, true, undefined, this) : null
+                ]
+              }, undefined, true, undefined, this),
+              showFailureLine && /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
+                dimColor: true,
+                children: `  \u2514 ${s.failureReason.slice(0, 25)}`
+              }, undefined, false, undefined, this)
+            ]
+          }, s.story.id, true, undefined, this);
         })
       }, undefined, false, undefined, this),
       needsScrolling && canScrollDown && /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
@@ -105807,50 +105697,7 @@ function StoriesPanel({ stories, totalCost, elapsedMs, width, compact: compact2
             " more below"
           ]
         }, undefined, true, undefined, this)
-      }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Box_default, {
-        flexDirection: "column",
-        paddingX: 1,
-        paddingY: 1,
-        borderStyle: "single",
-        borderTop: true,
-        borderColor: "gray",
-        children: [
-          !compact2 && /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(jsx_dev_runtime5.Fragment, {
-            children: [
-              /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-                children: [
-                  "Cost: ",
-                  /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-                    color: "green",
-                    children: [
-                      "$",
-                      totalCost.toFixed(4)
-                    ]
-                  }, undefined, true, undefined, this)
-                ]
-              }, undefined, true, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-                children: [
-                  "Time: ",
-                  /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-                    color: "cyan",
-                    children: formatElapsedTime(elapsedMs)
-                  }, undefined, false, undefined, this)
-                ]
-              }, undefined, true, undefined, this)
-            ]
-          }, undefined, true, undefined, this),
-          compact2 && /* @__PURE__ */ jsx_dev_runtime5.jsxDEV(Text, {
-            children: [
-              "$",
-              totalCost.toFixed(2),
-              " \xB7 ",
-              formatElapsedTime(elapsedMs)
-            ]
-          }, undefined, true, undefined, this)
-        ]
-      }, undefined, true, undefined, this)
+      }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
@@ -105879,7 +105726,8 @@ function useAgentStreamEvents(bus) {
               thinkingUpdates: 0,
               usageUpdates: 0,
               toolCallUpdates: 0,
-              status: "active"
+              status: "active",
+              model: event.model
             });
             break;
           }
@@ -105922,7 +105770,8 @@ function useAgentStreamEvents(bus) {
               next.set(event.callId, {
                 ...state,
                 toolCallUpdates: state.toolCallUpdates + 1,
-                lastActivityAt: event.timestamp
+                lastActivityAt: event.timestamp,
+                lastToolName: event.toolName
               });
             }
             break;
@@ -105996,128 +105845,159 @@ function useKeyboard({ focus, currentStory, onAction, disabled = false }) {
   });
 }
 
-// src/tui/hooks/usePipelineEvents.ts
+// src/tui/hooks/usePipelineBusEvents.ts
+init_pipeline();
 var import_react33 = __toESM(require_react(), 1);
-function usePipelineEvents(events, initialStories) {
+function usePipelineBusEvents(initialStories) {
   const [state, setState] = import_react33.useState(() => ({
-    stories: initialStories.map((story) => ({
-      story,
-      status: story.passes ? "passed" : "pending",
-      routing: story.routing,
-      cost: 0
-    })),
+    stories: initialStories,
     totalCost: 0,
-    elapsedMs: 0
+    elapsedMs: 0,
+    runPaused: false,
+    runErrored: false,
+    escalationLog: []
   }));
   const startTimeRef = import_react33.useRef(Date.now());
   import_react33.useEffect(() => {
     const startTime = startTimeRef.current;
-    let timer = null;
-    const startTimer = () => {
-      if (!timer) {
-        timer = setInterval(() => {
-          setState((prev) => ({
-            ...prev,
-            elapsedMs: Date.now() - startTime
-          }));
-        }, 1000);
-      }
-    };
-    const stopTimer = () => {
-      if (timer) {
-        clearInterval(timer);
-        timer = null;
-      }
-    };
-    const onStoryStart = (story) => {
-      startTimer();
+    const timer = setInterval(() => {
       setState((prev) => ({
         ...prev,
-        currentStory: story,
-        stories: prev.stories.map((s) => s.story.id === story.id ? { ...s, status: "running" } : s)
+        elapsedMs: Date.now() - startTime
       }));
-    };
-    const onStoryComplete = (story, result2) => {
-      stopTimer();
+    }, 1000);
+    const unsubStarted = pipelineEventBus.on("story:started", (event) => {
+      setState((prev) => ({
+        ...prev,
+        stories: prev.stories.map((s) => s.story.id === event.storyId ? {
+          ...s,
+          status: "running",
+          modelTier: event.modelTier,
+          iteration: event.iteration
+        } : s)
+      }));
+    });
+    const unsubCompleted = pipelineEventBus.on("story:completed", (event) => {
       setState((prev) => {
         const newStories = prev.stories.map((s) => {
-          if (s.story.id === story.id) {
-            let status = "pending";
-            if (result2.action === "continue") {
-              status = "passed";
-            } else if (result2.action === "fail") {
-              status = "failed";
-            } else if (result2.action === "skip") {
-              status = "skipped";
-            } else if (result2.action === "pause") {
-              status = "paused";
-            }
-            const storyCost = (s.cost || 0) + (result2.cost || 0);
+          if (s.story.id === event.storyId) {
+            const status = event.passed ? "passed" : "failed";
+            const storyCost = event.cost ?? s.cost;
             return { ...s, status, cost: storyCost };
           }
           return s;
         });
-        const totalCost = newStories.reduce((sum2, s) => sum2 + (s.cost || 0), 0);
-        return {
-          ...prev,
-          stories: newStories,
-          currentStory: undefined,
-          totalCost
-        };
+        const totalCost = newStories.reduce((sum2, s) => sum2 + (s.cost ?? 0), 0);
+        return { ...prev, stories: newStories, totalCost };
       });
-    };
-    const onStoryEscalate = (story) => {
+    });
+    const unsubFailed = pipelineEventBus.on("story:failed", (event) => {
       setState((prev) => ({
         ...prev,
-        stories: prev.stories.map((s) => s.story.id === story.id ? { ...s, status: "retrying" } : s)
+        stories: prev.stories.map((s) => s.story.id === event.storyId ? {
+          ...s,
+          status: "failed",
+          failureReason: event.reason
+        } : s)
       }));
-    };
-    const onStageEnter = (stage) => {
+    });
+    const unsubSkipped = pipelineEventBus.on("story:skipped", (event) => {
       setState((prev) => ({
         ...prev,
-        currentStage: stage
+        stories: prev.stories.map((s) => s.story.id === event.storyId ? { ...s, status: "skipped" } : s)
       }));
-    };
-    const onRunComplete = (summary) => {
+    });
+    const unsubEscalated = pipelineEventBus.on("story:escalated", (event) => {
+      const entry = {
+        storyId: event.storyId,
+        fromTier: event.fromTier,
+        toTier: event.toTier,
+        at: Date.now()
+      };
       setState((prev) => ({
         ...prev,
-        totalCost: summary.totalCost,
-        summary
+        stories: prev.stories.map((s) => s.story.id === event.storyId ? { ...s, status: "retrying" } : s),
+        escalationLog: [...prev.escalationLog, entry]
       }));
-    };
-    events.on("story:start", onStoryStart);
-    events.on("story:complete", onStoryComplete);
-    events.on("story:escalate", onStoryEscalate);
-    events.on("stage:enter", onStageEnter);
-    events.on("run:complete", onRunComplete);
+    });
+    const unsubStoryPaused = pipelineEventBus.on("story:paused", (event) => {
+      setState((prev) => ({
+        ...prev,
+        stories: prev.stories.map((s) => s.story.id === event.storyId ? { ...s, status: "paused", failureReason: event.reason } : s)
+      }));
+    });
+    const unsubPaused = pipelineEventBus.on("run:paused", (_event) => {
+      setState((prev) => ({ ...prev, runPaused: true }));
+    });
+    const unsubResumed = pipelineEventBus.on("run:resumed", (_event) => {
+      setState((prev) => ({ ...prev, runPaused: false }));
+    });
+    const unsubCompleted2 = pipelineEventBus.on("run:completed", (event) => {
+      clearInterval(timer);
+      const summary = {
+        totalStories: event.totalStories,
+        passedStories: event.passedStories,
+        failedStories: event.failedStories,
+        skippedStories: event.skippedStories,
+        pausedStories: event.pausedStories,
+        durationMs: event.durationMs,
+        totalCost: event.totalCost
+      };
+      setState((prev) => ({
+        ...prev,
+        elapsedMs: event.durationMs,
+        runSummary: summary,
+        totalCost: event.totalCost ?? prev.totalCost
+      }));
+    });
+    const unsubErrored = pipelineEventBus.on("run:errored", (_event) => {
+      setState((prev) => ({ ...prev, runErrored: true }));
+    });
     return () => {
-      stopTimer();
-      events.off("story:start", onStoryStart);
-      events.off("story:complete", onStoryComplete);
-      events.off("story:escalate", onStoryEscalate);
-      events.off("stage:enter", onStageEnter);
-      events.off("run:complete", onRunComplete);
+      clearInterval(timer);
+      unsubStarted();
+      unsubCompleted();
+      unsubFailed();
+      unsubSkipped();
+      unsubEscalated();
+      unsubStoryPaused();
+      unsubPaused();
+      unsubResumed();
+      unsubCompleted2();
+      unsubErrored();
     };
-  }, [events]);
+  }, []);
   return state;
 }
 
-// src/tui/hooks/usePty.ts
+// src/tui/hooks/usePipelineEvents.ts
 var import_react34 = __toESM(require_react(), 1);
+function usePipelineEvents(events) {
+  const [currentStage, setCurrentStage] = import_react34.useState(undefined);
+  import_react34.useEffect(() => {
+    const onStageEnter = (stage) => setCurrentStage(stage);
+    events.on("stage:enter", onStageEnter);
+    return () => events.off("stage:enter", onStageEnter);
+  }, [events]);
+  return { currentStage };
+}
+
+// src/tui/hooks/usePty.ts
+var import_react35 = __toESM(require_react(), 1);
 var MAX_PTY_BUFFER_LINES = 500;
 var MAX_LINE_LENGTH = 1e4;
 var PTY_FLUSH_INTERVAL_MS = 100;
 function usePty(options) {
-  const [state, setState] = import_react34.useState(() => ({
+  const [state, setState] = import_react35.useState(() => ({
     outputLines: [],
     isRunning: false
   }));
-  const [handle, setHandle] = import_react34.useState(null);
+  const [handle, setHandle] = import_react35.useState(null);
   const command = options?.command;
   const argsJson = JSON.stringify(options?.args);
   const cwd2 = options?.cwd;
   const envJson = JSON.stringify(options?.env);
-  import_react34.useEffect(() => {
+  import_react35.useEffect(() => {
     if (!command) {
       return;
     }
@@ -106186,8 +106066,8 @@ function usePty(options) {
       proc.kill();
     };
   }, [command, argsJson, cwd2, envJson]);
-  const handleResize = import_react34.useCallback((_cols, _rows) => {}, []);
-  import_react34.useEffect(() => {
+  const handleResize = import_react35.useCallback((_cols, _rows) => {}, []);
+  import_react35.useEffect(() => {
     const onResize = () => {
       const cols = process.stdout.columns ?? 80;
       const rows = process.stdout.rows ?? 24;
@@ -106203,6 +106083,14 @@ function usePty(options) {
 
 // src/tui/App.tsx
 var jsx_dev_runtime6 = __toESM(require_jsx_dev_runtime(), 1);
+function formatElapsed(ms) {
+  const mins = Math.floor(ms / 60000);
+  const secs = Math.floor(ms % 60000 / 1000);
+  return `${mins}m ${secs}s`;
+}
+function formatCost3(cost) {
+  return `$${cost.toFixed(4)}`;
+}
 function App2({
   feature,
   stories: initialStories,
@@ -106212,15 +106100,21 @@ function App2({
   agentStreamEvents
 }) {
   const layout = useLayout();
-  const state = usePipelineEvents(events, initialStories.map((s) => s.story));
+  const busState = usePipelineBusEvents(initialStories);
+  const { currentStage } = usePipelineEvents(events);
   const { exit } = use_app_default();
-  const [focus, setFocus] = import_react35.useState("stories" /* Stories */);
-  const [showHelp, setShowHelp] = import_react35.useState(false);
-  const [showCost, setShowCost] = import_react35.useState(false);
-  const [showQuitConfirm, setShowQuitConfirm] = import_react35.useState(false);
-  const [showAbortConfirm, setShowAbortConfirm] = import_react35.useState(false);
-  const { outputLines: agentOutputLines, handle: ptyHandle } = usePty(ptyOptions ?? null);
+  const [focus, setFocus] = import_react36.useState("stories" /* Stories */);
+  const [showHelp, setShowHelp] = import_react36.useState(false);
+  const [showCost, setShowCost] = import_react36.useState(false);
+  const [showQuitConfirm, setShowQuitConfirm] = import_react36.useState(false);
+  const [showAbortConfirm, setShowAbortConfirm] = import_react36.useState(false);
+  const { handle: ptyHandle } = usePty(ptyOptions ?? null);
   const { activeCalls } = useAgentStreamEvents(agentStreamEvents);
+  const isRunComplete = !!busState.runSummary;
+  const runningStories = busState.stories.filter((s) => s.status === "running");
+  const isParallel = runningStories.length > 1;
+  const currentRunningStory = runningStories[0];
+  const runErroredForPanel = busState.runErrored ? "Run encountered an error" : undefined;
   const handleKeyboardAction = async (action) => {
     switch (action.type) {
       case "TOGGLE_FOCUS":
@@ -106242,7 +106136,7 @@ function App2({
         setShowAbortConfirm(false);
         break;
       case "QUIT":
-        if (state.currentStory) {
+        if (currentRunningStory) {
           setShowQuitConfirm(true);
         } else {
           exit();
@@ -106254,7 +106148,7 @@ function App2({
         }
         break;
       case "ABORT":
-        if (state.currentStory) {
+        if (currentRunningStory) {
           setShowAbortConfirm(true);
         } else if (queueFilePath) {
           await writeQueueCommand(queueFilePath, { type: "ABORT" });
@@ -106296,12 +106190,18 @@ function App2({
   });
   useKeyboard({
     focus,
-    currentStory: state.currentStory,
+    currentStory: currentRunningStory?.story,
     onAction: handleKeyboardAction,
     disabled: showQuitConfirm || showAbortConfirm
   });
-  const currentRouting = state.currentStory?.routing;
   const isTooSmall = layout.width < MIN_TERMINAL_WIDTH;
+  const activeCount = runningStories.length;
+  const headerRight = [
+    activeCount > 0 ? `${activeCount} running` : null,
+    formatCost3(busState.totalCost),
+    formatElapsed(busState.elapsedMs)
+  ].filter(Boolean).join("  \xB7  ");
+  const maxHeight = layout.mode === "single" ? COMPACT_MAX_VISIBLE_STORIES : MAX_VISIBLE_STORIES;
   return /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
     flexDirection: "column",
     height: "100%",
@@ -106311,22 +106211,29 @@ function App2({
         borderStyle: "single",
         borderBottom: true,
         borderColor: "cyan",
-        children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
-          bold: true,
-          color: "cyan",
-          children: [
-            "nax run \u2014 ",
-            feature
-          ]
-        }, undefined, true, undefined, this)
-      }, undefined, false, undefined, this),
+        justifyContent: "space-between",
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+            bold: true,
+            color: "cyan",
+            children: [
+              "nax run \u2014 ",
+              feature
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
+            dimColor: true,
+            children: headerRight
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
       isTooSmall && /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
         paddingX: 1,
         backgroundColor: "yellow",
         children: /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
           color: "black",
           children: [
-            "\u26A0\uFE0F Terminal too narrow (",
+            "Terminal too narrow (",
             layout.width,
             " cols). Minimum ",
             MIN_TERMINAL_WIDTH,
@@ -106339,33 +106246,36 @@ function App2({
         flexGrow: 1,
         children: [
           /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(StoriesPanel, {
-            stories: state.stories,
-            totalCost: state.totalCost,
-            elapsedMs: state.elapsedMs,
+            stories: busState.stories,
             width: layout.mode === "single" ? layout.width : layout.storiesPanelWidth,
             compact: layout.mode === "single",
-            maxHeight: layout.mode === "single" ? 10 : undefined
+            maxHeight
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(AgentPanel, {
+          /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(LiveActivityPanel, {
             focused: focus === "agent" /* Agent */,
-            outputLines: agentOutputLines,
-            activeCalls
+            activeCalls,
+            runSummary: busState.runSummary,
+            runErrored: runErroredForPanel,
+            escalationLog: busState.escalationLog
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(StatusBar, {
-        currentStory: state.currentStory,
-        currentStage: state.currentStage,
-        modelTier: currentRouting?.modelTier,
-        testStrategy: currentRouting?.testStrategy
+        currentStage,
+        currentStoryId: currentRunningStory?.story.id,
+        modelTier: currentRunningStory?.modelTier,
+        runPaused: busState.runPaused,
+        runComplete: isRunComplete,
+        isParallel,
+        activeCount
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(HelpOverlay, {
         visible: showHelp
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(CostOverlay, {
         visible: showCost,
-        stories: state.stories,
-        totalCost: state.totalCost
+        stories: busState.stories,
+        totalCost: busState.totalCost
       }, undefined, false, undefined, this),
       showQuitConfirm && /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
         position: "absolute",
@@ -106383,7 +106293,7 @@ function App2({
           children: [
             /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
               color: "yellow",
-              children: "\u26A0\uFE0F Story is running. Quit anyway?"
+              children: "Story is running. Quit anyway?"
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
               paddingTop: 1,
@@ -106423,7 +106333,7 @@ function App2({
           children: [
             /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
               color: "red",
-              children: "\u26A0\uFE0F Story is running. Abort anyway?"
+              children: "Story is running. Abort anyway?"
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Box_default, {
               paddingTop: 1,
@@ -106512,8 +106422,8 @@ Next: nax generate --package ${options.package}`));
     }
     return;
   }
-  const naxDir = join84(workdir, ".nax");
-  if (existsSync37(naxDir) && !options.force) {
+  const naxDir = join83(workdir, ".nax");
+  if (existsSync36(naxDir) && !options.force) {
     console.log(source_default.yellow("nax already initialized. Use --force to overwrite."));
     return;
   }
@@ -106541,11 +106451,11 @@ Next: nax generate --package ${options.package}`));
       }
     }
   }
-  mkdirSync7(join84(naxDir, "features"), { recursive: true });
-  mkdirSync7(join84(naxDir, "hooks"), { recursive: true });
+  mkdirSync7(join83(naxDir, "features"), { recursive: true });
+  mkdirSync7(join83(naxDir, "hooks"), { recursive: true });
   const initConfig = options.name ? { ...DEFAULT_CONFIG, name: options.name } : DEFAULT_CONFIG;
-  await Bun.write(join84(naxDir, "config.json"), JSON.stringify(initConfig, null, 2));
-  await Bun.write(join84(naxDir, "hooks.json"), JSON.stringify({
+  await Bun.write(join83(naxDir, "config.json"), JSON.stringify(initConfig, null, 2));
+  await Bun.write(join83(naxDir, "hooks.json"), JSON.stringify({
     hooks: {
       "on-start": { command: 'echo "nax started: $NAX_FEATURE"', enabled: false },
       "on-complete": { command: 'echo "nax complete: $NAX_FEATURE"', enabled: false },
@@ -106553,12 +106463,12 @@ Next: nax generate --package ${options.package}`));
       "on-error": { command: 'echo "nax error: $NAX_REASON"', enabled: false }
     }
   }, null, 2));
-  await Bun.write(join84(naxDir, ".gitignore"), `# nax temp files
+  await Bun.write(join83(naxDir, ".gitignore"), `# nax temp files
 *.tmp
 .paused.json
 .nax-verifier-verdict.json
 `);
-  await Bun.write(join84(naxDir, "context.md"), `# Project Context
+  await Bun.write(join83(naxDir, "context.md"), `# Project Context
 
 This document defines coding standards, architectural decisions, and forbidden patterns for this project.
 Run \`nax generate\` to regenerate agent config files (CLAUDE.md, AGENTS.md, .cursorrules, etc.) from this file.
@@ -106655,7 +106565,7 @@ program2.command("run").description("Run the orchestration loop for a feature").
     console.error(source_default.red("Error: --plan requires --from <spec-path>"));
     process.exit(1);
   }
-  if (options.from && !existsSync37(options.from)) {
+  if (options.from && !existsSync36(options.from)) {
     console.error(source_default.red(`Error: File not found: ${options.from} (required with --plan)`));
     process.exit(1);
   }
@@ -106688,10 +106598,10 @@ program2.command("run").description("Run the orchestration loop for a feature").
     console.error(source_default.red("nax not initialized. Run: nax init"));
     process.exit(1);
   }
-  const featureDir = join84(naxDir, "features", options.feature);
-  const prdPath = join84(featureDir, "prd.json");
+  const featureDir = join83(naxDir, "features", options.feature);
+  const prdPath = join83(featureDir, "prd.json");
   if (options.plan && options.from) {
-    if (existsSync37(prdPath) && !options.force) {
+    if (existsSync36(prdPath) && !options.force) {
       console.error(source_default.red(`Error: prd.json already exists for feature "${options.feature}".`));
       console.error(source_default.dim("   Use --force to overwrite, or run without --plan to use the existing PRD."));
       process.exit(1);
@@ -106711,10 +106621,10 @@ program2.command("run").description("Run the orchestration loop for a feature").
       }
     }
     try {
-      const planLogDir = join84(featureDir, "plan");
+      const planLogDir = join83(featureDir, "plan");
       mkdirSync7(planLogDir, { recursive: true });
       const planLogId = new Date().toISOString().replace(/:/g, "-").replace(/\..+/, "");
-      const planLogPath = join84(planLogDir, `${planLogId}.jsonl`);
+      const planLogPath = join83(planLogDir, `${planLogId}.jsonl`);
       initLogger({ level: "info", filePath: planLogPath, useChalk: false, headless: true });
       console.log(source_default.dim(`   [Plan log: ${planLogPath}]`));
       console.log(source_default.dim("   [Planning phase: generating PRD from spec]"));
@@ -106753,17 +106663,17 @@ program2.command("run").description("Run the orchestration loop for a feature").
       process.exit(1);
     }
   }
-  if (!existsSync37(prdPath)) {
+  if (!existsSync36(prdPath)) {
     console.error(source_default.red(`Feature "${options.feature}" not found or missing prd.json`));
     process.exit(1);
   }
   resetLogger();
-  const projectKey = config2.name?.trim() || basename17(workdir);
+  const projectKey = config2.name?.trim() || basename16(workdir);
   const outputDir = projectOutputDir(projectKey, config2.outputDir);
-  const runsDir = join84(outputDir, "features", options.feature, "runs");
+  const runsDir = join83(outputDir, "features", options.feature, "runs");
   mkdirSync7(runsDir, { recursive: true });
   const runId = new Date().toISOString().replace(/:/g, "-").replace(/\..+/, "");
-  const logFilePath = join84(runsDir, `${runId}.jsonl`);
+  const logFilePath = join83(runsDir, `${runId}.jsonl`);
   const isTTY = process.stdout.isTTY ?? false;
   const headlessFlag = options.headless ?? false;
   const headlessEnv = process.env.NAX_HEADLESS === "1";
@@ -106780,7 +106690,7 @@ program2.command("run").description("Run the orchestration loop for a feature").
     config2.agent.default = options.agent;
   }
   config2.execution.maxIterations = Number.parseInt(options.maxIterations, 10);
-  const globalNaxDir = join84(homedir3(), ".nax");
+  const globalNaxDir = join83(homedir3(), ".nax");
   const hooks = await loadHooksConfig(naxDir, globalNaxDir);
   const eventEmitter = new PipelineEventEmitter;
   let tuiInstance;
@@ -106795,15 +106705,13 @@ program2.command("run").description("Run the orchestration loop for a feature").
     tuiInstance = renderTui({
       feature: options.feature,
       stories: initialStories,
-      totalCost: 0,
-      elapsedMs: 0,
       events: eventEmitter,
       ptyOptions: null
     });
   } else {
     console.log(source_default.dim("   [Headless mode \u2014 pipe output]"));
   }
-  const statusFilePath = join84(outputDir, "status.json");
+  const statusFilePath = join83(outputDir, "status.json");
   let parallel;
   if (options.parallel !== undefined) {
     parallel = Number.parseInt(options.parallel, 10);
@@ -106829,9 +106737,9 @@ program2.command("run").description("Run the orchestration loop for a feature").
     headless: useHeadless,
     skipPrecheck: options.skipPrecheck ?? false
   });
-  const latestSymlink = join84(runsDir, "latest.jsonl");
+  const latestSymlink = join83(runsDir, "latest.jsonl");
   try {
-    if (existsSync37(latestSymlink)) {
+    if (existsSync36(latestSymlink)) {
       Bun.spawnSync(["rm", latestSymlink]);
     }
     Bun.spawnSync(["ln", "-s", `${runId}.jsonl`, latestSymlink], {
@@ -106890,9 +106798,9 @@ features.command("create <name>").description("Create a new feature").option("-d
     console.error(source_default.red("nax not initialized. Run: nax init"));
     process.exit(1);
   }
-  const featureDir = join84(naxDir, "features", name);
+  const featureDir = join83(naxDir, "features", name);
   mkdirSync7(featureDir, { recursive: true });
-  await Bun.write(join84(featureDir, "spec.md"), `# Feature: ${name}
+  await Bun.write(join83(featureDir, "spec.md"), `# Feature: ${name}
 
 ## Overview
 
@@ -106925,7 +106833,7 @@ features.command("create <name>").description("Create a new feature").option("-d
 
 <!-- What this feature explicitly does NOT cover. -->
 `);
-  await Bun.write(join84(featureDir, "progress.txt"), `# Progress: ${name}
+  await Bun.write(join83(featureDir, "progress.txt"), `# Progress: ${name}
 
 Created: ${new Date().toISOString()}
 
@@ -106951,13 +106859,13 @@ features.command("list").description("List all features").option("-d, --dir <pat
     console.error(source_default.red("nax not initialized."));
     process.exit(1);
   }
-  const featuresDir = join84(naxDir, "features");
-  if (!existsSync37(featuresDir)) {
+  const featuresDir = join83(naxDir, "features");
+  if (!existsSync36(featuresDir)) {
     console.log(source_default.dim("No features yet."));
     return;
   }
-  const { readdirSync: readdirSync10 } = await import("fs");
-  const entries = readdirSync10(featuresDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+  const { readdirSync: readdirSync9 } = await import("fs");
+  const entries = readdirSync9(featuresDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
   if (entries.length === 0) {
     console.log(source_default.dim("No features yet."));
     return;
@@ -106966,8 +106874,8 @@ features.command("list").description("List all features").option("-d, --dir <pat
 Features:
 `));
   for (const name of entries) {
-    const prdPath = join84(featuresDir, name, "prd.json");
-    if (existsSync37(prdPath)) {
+    const prdPath = join83(featuresDir, name, "prd.json");
+    if (existsSync36(prdPath)) {
       const prd = await loadPRD(prdPath);
       const c = countStories(prd);
       console.log(`  ${name} \u2014 ${c.passed}/${c.total} stories done`);
@@ -107001,10 +106909,10 @@ Use: nax plan -f <feature> --from <spec>`));
     cliOverrides.profile = options.profile;
   }
   const config2 = await loadConfig(workdir, cliOverrides);
-  const featureLogDir = join84(naxDir, "features", options.feature, "plan");
+  const featureLogDir = join83(naxDir, "features", options.feature, "plan");
   mkdirSync7(featureLogDir, { recursive: true });
   const planLogId = new Date().toISOString().replace(/:/g, "-").replace(/\..+/, "");
-  const planLogPath = join84(featureLogDir, `${planLogId}.jsonl`);
+  const planLogPath = join83(featureLogDir, `${planLogId}.jsonl`);
   initLogger({ level: "info", filePath: planLogPath, useChalk: false, headless: true });
   console.log(source_default.dim(`   [Plan log: ${planLogPath}]`));
   try {
@@ -107169,19 +107077,6 @@ program2.command("logs").description("Display run logs with filtering and follow
     process.exit(1);
   }
 });
-program2.command("diagnose").description("Diagnose run failures and generate recommendations").option("-f, --feature <name>", "Feature name (defaults to current feature)").option("-d, --dir <path>", "Working directory", process.cwd()).option("--json", "Output machine-readable JSON", false).option("--verbose", "Verbose output with story breakdown", false).action(async (options) => {
-  try {
-    await diagnose({
-      feature: options.feature,
-      workdir: options.dir,
-      json: options.json,
-      verbose: options.verbose
-    });
-  } catch (err) {
-    console.error(source_default.red(`Error: ${err.message}`));
-    process.exit(1);
-  }
-});
 program2.command("precheck").description("Validate feature readiness before execution").option("-f, --feature <name>", "Feature name").option("-d, --dir <path>", "Project directory", process.cwd()).option("--json", "Output machine-readable JSON", false).option("--light", "Environment-only check \u2014 skips PRD validation (use before nax plan)", false).action(async (options) => {
   try {
     await precheckCommand({