@nathapp/nax 0.43.1 → 0.45.0

package/dist/nax.js

@@ -3294,6 +3294,55 @@ var init_claude_complete = __esm(() => {
   };
 });
 
+// src/config/test-strategy.ts
+function resolveTestStrategy(raw) {
+  if (!raw)
+    return "test-after";
+  if (VALID_TEST_STRATEGIES.includes(raw))
+    return raw;
+  if (raw === "tdd")
+    return "tdd-simple";
+  if (raw === "three-session")
+    return "three-session-tdd";
+  if (raw === "tdd-lite")
+    return "three-session-tdd-lite";
+  return "test-after";
+}
+var VALID_TEST_STRATEGIES, COMPLEXITY_GUIDE = `## Complexity Classification Guide
+
+- simple: \u226450 LOC, single-file change, purely additive, no new dependencies \u2192 test-after
+- medium: 50\u2013200 LOC, 2\u20135 files, standard patterns, clear requirements \u2192 tdd-simple
+- complex: 200\u2013500 LOC, multiple modules, new abstractions or integrations \u2192 three-session-tdd
+- expert: 500+ LOC, architectural changes, cross-cutting concerns, high risk \u2192 three-session-tdd-lite
+
+### Security Override
+
+Security-critical functions (authentication, cryptography, tokens, sessions, credentials,
+password hashing, access control) must be classified at MINIMUM "medium" complexity
+regardless of LOC count. These require at minimum "tdd-simple" test strategy.`, TEST_STRATEGY_GUIDE = `## Test Strategy Guide
+
+- test-after: Simple changes with well-understood behavior. Write tests after implementation.
+- tdd-simple: Medium complexity. Write key tests first, implement, then fill coverage.
+- three-session-tdd: Complex stories. Full TDD cycle with separate test-writer and implementer sessions.
+- three-session-tdd-lite: Expert/high-risk stories. Full TDD with additional verifier session.`, GROUPING_RULES = `## Grouping Rules
+
+- Combine small, related tasks into a single "simple" or "medium" story.
+- Do NOT create separate stories for every single file or function unless complex.
+- Do NOT create standalone stories purely for test coverage or testing.
+  Each story's testStrategy already handles testing (tdd-simple writes tests first,
+  three-session-tdd uses separate test-writer session, test-after writes tests after).
+  Only create a dedicated test story for unique integration/E2E test logic that spans
+  multiple stories and cannot be covered by individual story test strategies.
+- Aim for coherent units of value. Maximum recommended stories: 10-15 per feature.`;
+var init_test_strategy = __esm(() => {
+  VALID_TEST_STRATEGIES = [
+    "test-after",
+    "tdd-simple",
+    "three-session-tdd",
+    "three-session-tdd-lite"
+  ];
+});
+
 // src/agents/claude-decompose.ts
 function buildDecomposePrompt(options) {
   return `You are a requirements analyst. Break down the following feature specification into user stories and classify each story's complexity.
@@ -3316,24 +3365,13 @@ Decompose this spec into user stories. For each story, provide:
 9. reasoning: Why this complexity level
 10. estimatedLOC: Estimated lines of code to change
 11. risks: Array of implementation risks
-12. testStrategy: "three-session-tdd" | "test-after"
+12. testStrategy: "test-after" | "tdd-simple" | "three-session-tdd" | "three-session-tdd-lite"
 
-testStrategy rules:
-- "three-session-tdd": ONLY for complex/expert tasks that are security-critical (auth, encryption, tokens, credentials) or define public API contracts consumers depend on
-- "test-after": for all other tasks including simple/medium complexity
-- A "simple" complexity task should almost never be "three-session-tdd"
+${COMPLEXITY_GUIDE}
 
-Complexity classification rules:
-- simple: 1-3 files, <100 LOC, straightforward implementation, existing patterns
-- medium: 3-6 files, 100-300 LOC, moderate logic, some new patterns
-- complex: 6+ files, 300-800 LOC, architectural changes, cross-cutting concerns
-- expert: Security/crypto/real-time/distributed systems, >800 LOC, new infrastructure
+${TEST_STRATEGY_GUIDE}
 
-Grouping Guidelines:
-- Combine small, related tasks (e.g., multiple utility functions, interfaces) into a single "simple" or "medium" story.
-- Do NOT create separate stories for every single file or function unless complex.
-- Aim for coherent units of value (e.g., "Implement User Authentication" vs "Create User Interface", "Create Login Service").
-- Maximum recommended stories: 10-15 per feature. Group aggressively if list grows too long.
+${GROUPING_RULES}
 
 Consider:
 1. Does infrastructure exist? (e.g., "add caching" when no cache layer exists = complex)
@@ -3402,7 +3440,7 @@ ${output.slice(0, 500)}`);
       reasoning: String(record.reasoning || "No reasoning provided"),
       estimatedLOC: Number(record.estimatedLOC) || 0,
       risks: Array.isArray(record.risks) ? record.risks : [],
-      testStrategy: record.testStrategy === "three-session-tdd" ? "three-session-tdd" : record.testStrategy === "test-after" ? "test-after" : undefined
+      testStrategy: resolveTestStrategy(typeof record.testStrategy === "string" ? record.testStrategy : undefined)
     };
   });
   if (stories.length === 0) {
@@ -3416,6 +3454,9 @@ function coerceComplexity(value) {
   }
   return "medium";
 }
+var init_claude_decompose = __esm(() => {
+  init_test_strategy();
+});
 
 // src/agents/cost.ts
 function parseTokenUsage(output) {
@@ -18398,6 +18439,7 @@ var init_claude = __esm(() => {
   init_pid_registry();
   init_logger2();
   init_claude_complete();
+  init_claude_decompose();
   init_claude_execution();
   init_claude_interactive();
   init_claude_plan();
@@ -19233,6 +19275,20 @@ var init_cost2 = __esm(() => {
 });
 
 // src/agents/acp/adapter.ts
+var exports_adapter = {};
+__export(exports_adapter, {
+  sweepStaleFeatureSessions: () => sweepStaleFeatureSessions,
+  sweepFeatureSessions: () => sweepFeatureSessions,
+  saveAcpSession: () => saveAcpSession,
+  runSessionPrompt: () => runSessionPrompt,
+  readAcpSession: () => readAcpSession,
+  ensureAcpSession: () => ensureAcpSession,
+  closeAcpSession: () => closeAcpSession,
+  clearAcpSession: () => clearAcpSession,
+  buildSessionName: () => buildSessionName,
+  _acpAdapterDeps: () => _acpAdapterDeps,
+  AcpAgentAdapter: () => AcpAgentAdapter
+});
 import { createHash } from "crypto";
 import { join as join3 } from "path";
 function resolveRegistryEntry(agentName) {
@@ -19336,6 +19392,59 @@ async function readAcpSession(workdir, featureName, storyId) {
     return null;
   }
 }
+async function sweepFeatureSessions(workdir, featureName) {
+  const path = acpSessionsPath(workdir, featureName);
+  let sessions;
+  try {
+    const text = await Bun.file(path).text();
+    sessions = JSON.parse(text);
+  } catch {
+    return;
+  }
+  const entries = Object.entries(sessions);
+  if (entries.length === 0)
+    return;
+  const logger = getSafeLogger();
+  logger?.info("acp-adapter", `[sweep] Closing ${entries.length} open sessions for feature: ${featureName}`);
+  const cmdStr = "acpx claude";
+  const client = _acpAdapterDeps.createClient(cmdStr, workdir);
+  try {
+    await client.start();
+    for (const [, sessionName] of entries) {
+      try {
+        if (client.loadSession) {
+          const session = await client.loadSession(sessionName, "claude", "approve-reads");
+          if (session) {
+            await session.close().catch(() => {});
+          }
+        }
+      } catch (err) {
+        logger?.warn("acp-adapter", `[sweep] Failed to close session ${sessionName}`, { error: String(err) });
+      }
+    }
+  } finally {
+    await client.close().catch(() => {});
+  }
+  try {
+    await Bun.write(path, JSON.stringify({}, null, 2));
+  } catch (err) {
+    logger?.warn("acp-adapter", "[sweep] Failed to clear sidecar after sweep", { error: String(err) });
+  }
+}
+async function sweepStaleFeatureSessions(workdir, featureName, maxAgeMs = MAX_SESSION_AGE_MS) {
+  const path = acpSessionsPath(workdir, featureName);
+  const file2 = Bun.file(path);
+  if (!await file2.exists())
+    return;
+  const ageMs = Date.now() - file2.lastModified;
+  if (ageMs < maxAgeMs)
+    return;
+  getSafeLogger()?.info("acp-adapter", `[sweep] Sidecar is ${Math.round(ageMs / 60000)}m old \u2014 sweeping stale sessions`, {
+    featureName,
+    ageMs
+  });
+  await sweepFeatureSessions(workdir, featureName);
+}
 function extractOutput(response) {
   if (!response)
     return "";
@@ -19459,6 +19568,7 @@ class AcpAgentAdapter {
     }
     let lastResponse = null;
     let timedOut = false;
+    const runState = { succeeded: false };
     const totalTokenUsage = { input_tokens: 0, output_tokens: 0 };
     try {
       let currentPrompt = options.prompt;
@@ -19499,12 +19609,17 @@ class AcpAgentAdapter {
       if (turnCount >= MAX_TURNS && options.interactionBridge) {
         getSafeLogger()?.warn("acp-adapter", "Reached max turns limit", { sessionName, maxTurns: MAX_TURNS });
       }
+      runState.succeeded = !timedOut && lastResponse?.stopReason === "end_turn";
     } finally {
-      await closeAcpSession(session);
-      await client.close().catch(() => {});
-      if (options.featureName && options.storyId) {
-        await clearAcpSession(options.workdir, options.featureName, options.storyId);
+      if (runState.succeeded) {
+        await closeAcpSession(session);
+        if (options.featureName && options.storyId) {
+          await clearAcpSession(options.workdir, options.featureName, options.storyId);
+        }
+      } else {
+        getSafeLogger()?.info("acp-adapter", "Keeping session open for retry", { sessionName });
       }
+      await client.close().catch(() => {});
     }
     const durationMs = Date.now() - startTime;
     if (timedOut) {
@@ -19654,9 +19769,10 @@ class AcpAgentAdapter {
     return { stories };
   }
 }
-var MAX_AGENT_OUTPUT_CHARS2 = 5000, MAX_RATE_LIMIT_RETRIES = 3, INTERACTION_TIMEOUT_MS, AGENT_REGISTRY, DEFAULT_ENTRY, _acpAdapterDeps;
+var MAX_AGENT_OUTPUT_CHARS2 = 5000, MAX_RATE_LIMIT_RETRIES = 3, INTERACTION_TIMEOUT_MS, AGENT_REGISTRY, DEFAULT_ENTRY, _acpAdapterDeps, MAX_SESSION_AGE_MS;
 var init_adapter = __esm(() => {
   init_logger2();
+  init_claude_decompose();
   init_spawn_client();
   init_types2();
   init_cost2();
@@ -19698,6 +19814,7 @@ var init_adapter = __esm(() => {
       return createSpawnAcpClient(cmdStr, cwd, timeoutSeconds, pidRegistry);
     }
   };
+  MAX_SESSION_AGE_MS = 2 * 60 * 60 * 1000;
 });
 
 // src/agents/adapters/aider.ts
@@ -21968,7 +22085,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.43.1",
+    version: "0.45.0",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22041,8 +22158,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("82a45aa"))
-        return "82a45aa";
+      if (/^[0-9a-f]{6,10}$/.test("d6bdccb"))
+        return "d6bdccb";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -25320,6 +25437,11 @@ async function buildStoryContextFull(prd, story, config2) {
 }
 function getAllReadyStories(prd) {
   const completedIds = new Set(prd.userStories.filter((s) => s.passes || s.status === "skipped").map((s) => s.id));
+  const logger = getSafeLogger2();
+  logger?.debug("routing", "getAllReadyStories: completed set", {
+    completedIds: [...completedIds],
+    totalStories: prd.userStories.length
+  });
   return prd.userStories.filter((s) => !s.passes && s.status !== "skipped" && s.status !== "failed" && s.status !== "paused" && s.status !== "blocked" && s.dependencies.every((dep) => completedIds.has(dep)));
 }
 var CONTEXT_MAX_TOKENS = 1e5, CONTEXT_RESERVED_TOKENS = 1e4;
@@ -28235,7 +28357,7 @@ var init_test_output_parser = () => {};
 
 // src/verification/rectification-loop.ts
 async function runRectificationLoop2(opts) {
-  const { config: config2, workdir, story, testCommand, timeoutSeconds, testOutput, promptPrefix } = opts;
+  const { config: config2, workdir, story, testCommand, timeoutSeconds, testOutput, promptPrefix, featureName } = opts;
   const logger = getSafeLogger();
   const rectificationConfig = config2.execution.rectification;
   const testSummary = parseBunTestOutput(testOutput);
@@ -28261,7 +28383,7 @@ async function runRectificationLoop2(opts) {
       rectificationPrompt = `${promptPrefix}
 
 ${rectificationPrompt}`;
-    const agent = getAgent(config2.autoMode.defaultAgent);
+    const agent = _rectificationDeps.getAgent(config2.autoMode.defaultAgent);
     if (!agent) {
       logger?.error("rectification", "Agent not found, cannot retry");
       break;
@@ -28277,7 +28399,10 @@ ${rectificationPrompt}`;
       dangerouslySkipPermissions: resolvePermissions(config2, "rectification").skipPermissions,
       pipelineStage: "rectification",
       config: config2,
-      maxInteractionTurns: config2.agent?.maxInteractionTurns
+      maxInteractionTurns: config2.agent?.maxInteractionTurns,
+      featureName,
+      storyId: story.id,
+      sessionRole: "implementer"
     });
     if (agentResult.success) {
       logger?.info("rectification", `Agent ${label} session complete`, {
@@ -28292,7 +28417,7 @@ ${rectificationPrompt}`;
         exitCode: agentResult.exitCode
       });
     }
-    const retryVerification = await fullSuite({
+    const retryVerification = await _rectificationDeps.runVerification({
       workdir,
       expectedFiles: getExpectedFiles(story),
       command: testCommand,
@@ -28342,6 +28467,7 @@ ${rectificationPrompt}`;
   }
   return false;
 }
+var _rectificationDeps;
 var init_rectification_loop = __esm(() => {
   init_agents();
   init_config();
@@ -28350,6 +28476,10 @@ var init_rectification_loop = __esm(() => {
   init_prd();
   init_rectification();
   init_runners();
+  _rectificationDeps = {
+    getAgent,
+    runVerification: fullSuite
+  };
 });
 
 // src/pipeline/stages/rectify.ts
@@ -30451,8 +30581,85 @@ async function checkStorySizeGate(config2, prd) {
 var exports_precheck = {};
 __export(exports_precheck, {
   runPrecheck: () => runPrecheck,
+  runEnvironmentPrecheck: () => runEnvironmentPrecheck,
   EXIT_CODES: () => EXIT_CODES
 });
+function getEarlyEnvironmentBlockers(workdir) {
+  return [() => checkGitRepoExists(workdir), () => checkWorkingTreeClean(workdir), () => checkStaleLock(workdir)];
+}
+function getLateEnvironmentBlockers(config2, workdir) {
+  return [
+    () => checkAgentCLI(config2),
+    () => checkDependenciesInstalled(workdir),
+    () => checkTestCommand(config2),
+    () => checkLintCommand(config2),
+    () => checkTypecheckCommand(config2),
+    () => checkGitUserConfigured(workdir)
+  ];
+}
+function getEnvironmentBlockers(config2, workdir) {
+  return [...getEarlyEnvironmentBlockers(workdir), ...getLateEnvironmentBlockers(config2, workdir)];
+}
+function getEnvironmentWarnings(config2, workdir) {
+  return [
+    () => checkClaudeMdExists(workdir),
+    () => checkDiskSpace(),
+    () => checkOptionalCommands(config2, workdir),
+    () => checkGitignoreCoversNax(workdir),
+    () => checkPromptOverrideFiles(config2, workdir),
+    () => checkMultiAgentHealth()
+  ];
+}
+function getProjectBlockers(prd) {
+  return [() => checkPRDValid(prd)];
+}
+function getProjectWarnings(prd) {
+  return [() => checkPendingStories(prd)];
+}
+function normalizeChecks(result) {
+  return Array.isArray(result) ? result : [result];
+}
+async function runEnvironmentPrecheck(config2, workdir, options) {
+  const format = options?.format ?? "human";
+  const silent = options?.silent ?? false;
+  const passed = [];
+  const blockers = [];
+  const warnings = [];
+  for (const checkFn of getEnvironmentBlockers(config2, workdir)) {
+    const checks3 = normalizeChecks(await checkFn());
+    let blocked = false;
+    for (const check2 of checks3) {
+      if (!silent && format === "human")
+        printCheckResult(check2);
+      if (check2.passed) {
+        passed.push(check2);
+      } else {
+        blockers.push(check2);
+        blocked = true;
+        break;
+      }
+    }
+    if (blocked)
+      break;
+  }
+  if (blockers.length === 0) {
+    for (const checkFn of getEnvironmentWarnings(config2, workdir)) {
+      for (const check2 of normalizeChecks(await checkFn())) {
+        if (!silent && format === "human")
+          printCheckResult(check2);
+        if (check2.passed) {
+          passed.push(check2);
+        } else {
+          warnings.push(check2);
+        }
+      }
+    }
+  }
+  if (!silent && format === "json") {
+    console.log(JSON.stringify({ passed: blockers.length === 0, blockers, warnings }, null, 2));
+  }
+  return { passed: blockers.length === 0, blockers, warnings };
+}
 async function runPrecheck(config2, prd, options) {
   const workdir = options?.workdir || process.cwd();
   const format = options?.format || "human";
@@ -30461,47 +30668,33 @@ async function runPrecheck(config2, prd, options) {
   const blockers = [];
   const warnings = [];
   const tier1Checks = [
-    () => checkGitRepoExists(workdir),
-    () => checkWorkingTreeClean(workdir),
-    () => checkStaleLock(workdir),
-    () => checkPRDValid(prd),
-    () => checkAgentCLI(config2),
-    () => checkDependenciesInstalled(workdir),
-    () => checkTestCommand(config2),
-    () => checkLintCommand(config2),
-    () => checkTypecheckCommand(config2),
-    () => checkGitUserConfigured(workdir)
+    ...getEarlyEnvironmentBlockers(workdir),
+    ...getProjectBlockers(prd),
+    ...getLateEnvironmentBlockers(config2, workdir)
   ];
+  let tier1Blocked = false;
   for (const checkFn of tier1Checks) {
-    const result = await checkFn();
-    if (format === "human") {
-      printCheckResult(result);
+    for (const check2 of normalizeChecks(await checkFn())) {
+      if (format === "human")
+        printCheckResult(check2);
+      if (check2.passed) {
+        passed.push(check2);
+      } else {
+        blockers.push(check2);
+        tier1Blocked = true;
+        break;
+      }
     }
-    if (result.passed) {
-      passed.push(result);
-    } else {
-      blockers.push(result);
+    if (tier1Blocked)
       break;
-    }
   }
   let flaggedStories = [];
   if (blockers.length === 0) {
-    const tier2Checks = [
-      () => checkClaudeMdExists(workdir),
-      () => checkDiskSpace(),
-      () => checkPendingStories(prd),
-      () => checkOptionalCommands(config2, workdir),
-      () => checkGitignoreCoversNax(workdir),
-      () => checkPromptOverrideFiles(config2, workdir),
-      () => checkMultiAgentHealth()
-    ];
+    const tier2Checks = [...getEnvironmentWarnings(config2, workdir), ...getProjectWarnings(prd)];
     for (const checkFn of tier2Checks) {
-      const result = await checkFn();
-      const checksToProcess = Array.isArray(result) ? result : [result];
-      for (const check2 of checksToProcess) {
-        if (format === "human") {
+      for (const check2 of normalizeChecks(await checkFn())) {
+        if (format === "human")
           printCheckResult(check2);
-        }
         if (check2.passed) {
           passed.push(check2);
         } else {
@@ -31092,7 +31285,8 @@ async function executeFixStory(ctx, story, prd, iterations) {
     featureDir: ctx.featureDir,
     hooks: ctx.hooks,
     plugins: ctx.pluginRegistry,
-    storyStartTime: new Date().toISOString()
+    storyStartTime: new Date().toISOString(),
+    agentGetFn: ctx.agentGetFn
   };
   const result = await runPipeline(defaultPipeline, fixContext, ctx.eventEmitter);
   logger?.info("acceptance", `Fix story ${story.id} ${result.success ? "passed" : "failed"}`);
@@ -31128,7 +31322,8 @@ async function runAcceptanceLoop(ctx) {
       workdir: ctx.workdir,
       featureDir: ctx.featureDir,
       hooks: ctx.hooks,
-      plugins: ctx.pluginRegistry
+      plugins: ctx.pluginRegistry,
+      agentGetFn: ctx.agentGetFn
     };
     const { acceptanceStage: acceptanceStage2 } = await Promise.resolve().then(() => (init_acceptance2(), exports_acceptance));
     const acceptanceResult = await acceptanceStage2.execute(acceptanceContext);
@@ -32109,7 +32304,7 @@ function resolveMaxConcurrency(parallel) {
   }
   return Math.max(1, parallel);
 }
-async function executeParallel(stories, prdPath, projectRoot, config2, hooks, plugins, prd, featureDir, parallel, eventEmitter) {
+async function executeParallel(stories, prdPath, projectRoot, config2, hooks, plugins, prd, featureDir, parallel, eventEmitter, agentGetFn) {
   const logger = getSafeLogger();
   const maxConcurrency = resolveMaxConcurrency(parallel);
   const worktreeManager = new WorktreeManager;
@@ -32139,7 +32334,8 @@ async function executeParallel(stories, prdPath, projectRoot, config2, hooks, pl
       featureDir,
       hooks,
       plugins,
-      storyStartTime: new Date().toISOString()
+      storyStartTime: new Date().toISOString(),
+      agentGetFn
     };
     const worktreePaths = new Map;
     for (const story of batch) {
@@ -32513,7 +32709,7 @@ async function runParallelExecution(options, initialPrd) {
   const batchStoryMetrics = [];
   let conflictedStories = [];
   try {
-    const parallelResult = await _parallelExecutorDeps.executeParallel(readyStories, prdPath, workdir, config2, hooks, pluginRegistry, prd, featureDir, parallelCount, eventEmitter);
+    const parallelResult = await _parallelExecutorDeps.executeParallel(readyStories, prdPath, workdir, config2, hooks, pluginRegistry, prd, featureDir, parallelCount, eventEmitter, options.agentGetFn);
     const batchDurationMs = Date.now() - batchStartMs;
     const batchCompletedAt = new Date().toISOString();
     prd = parallelResult.updatedPrd;
@@ -34258,6 +34454,8 @@ async function setupRun(options) {
   } else {
     logger?.warn("precheck", "Precheck validations skipped (--skip-precheck)");
   }
+  const { sweepStaleFeatureSessions: sweepStaleFeatureSessions2 } = await Promise.resolve().then(() => (init_adapter(), exports_adapter));
+  await sweepStaleFeatureSessions2(workdir, feature).catch(() => {});
   const lockAcquired = await acquireLock(workdir);
   if (!lockAcquired) {
     logger?.error("execution", "Another nax process is already running in this directory");
@@ -65707,17 +65905,13 @@ init_registry();
 import { existsSync as existsSync9 } from "fs";
 import { join as join10 } from "path";
 import { createInterface } from "readline";
+init_test_strategy();
 init_pid_registry();
 init_logger2();
 
 // src/prd/schema.ts
+init_test_strategy();
 var VALID_COMPLEXITY = ["simple", "medium", "complex", "expert"];
-var VALID_TEST_STRATEGIES = [
-  "test-after",
-  "tdd-simple",
-  "three-session-tdd",
-  "three-session-tdd-lite"
-];
 var STORY_ID_NO_SEPARATOR = /^([A-Za-z]+)(\d+)$/;
 function extractJsonFromMarkdown(text) {
   const match = text.match(/```(?:json)?\s*\n([\s\S]*?)\n?\s*```/);
@@ -65787,9 +65981,7 @@ function validateStory(raw, index, allIds) {
     throw new Error(`[schema] story[${index}].routing.complexity "${rawComplexity}" is invalid. Valid values: ${VALID_COMPLEXITY.join(", ")}`);
   }
   const rawTestStrategy = routing.testStrategy ?? s.testStrategy;
-  const STRATEGY_ALIASES = { "tdd-lite": "three-session-tdd-lite" };
-  const normalizedStrategy = typeof rawTestStrategy === "string" ? STRATEGY_ALIASES[rawTestStrategy] ?? rawTestStrategy : rawTestStrategy;
-  const testStrategy = normalizedStrategy !== undefined && VALID_TEST_STRATEGIES.includes(normalizedStrategy) ? normalizedStrategy : "tdd-simple";
+  const testStrategy = resolveTestStrategy(typeof rawTestStrategy === "string" ? rawTestStrategy : undefined);
   const rawDeps = s.dependencies;
   const dependencies = Array.isArray(rawDeps) ? rawDeps : [];
   for (const dep of dependencies) {
@@ -66056,19 +66248,11 @@ Generate a JSON object with this exact structure (no markdown, no explanation \u
   ]
 }
 
-## Complexity Classification Guide
+${COMPLEXITY_GUIDE}
 
-- simple: \u226450 LOC, single-file change, purely additive, no new dependencies \u2192 test-after
-- medium: 50\u2013200 LOC, 2\u20135 files, standard patterns, clear requirements \u2192 tdd-simple
-- complex: 200\u2013500 LOC, multiple modules, new abstractions or integrations \u2192 three-session-tdd
-- expert: 500+ LOC, architectural changes, cross-cutting concerns, high risk \u2192 three-session-tdd-lite
+${TEST_STRATEGY_GUIDE}
 
-## Test Strategy Guide
-
-- test-after: Simple changes with well-understood behavior. Write tests after implementation.
-- tdd-simple: Medium complexity. Write key tests first, implement, then fill coverage.
-- three-session-tdd: Complex stories. Full TDD cycle with separate test-writer and implementer sessions.
-- three-session-tdd-lite: Expert/high-risk stories. Full TDD with additional verifier session.
+${GROUPING_RULES}
 
 ${outputFilePath ? `Write the PRD JSON directly to this file path: ${outputFilePath}
 Do NOT output the JSON to the conversation. Write the file, then reply with a brief confirmation.` : "Output ONLY the JSON object. Do not wrap in markdown code blocks."}`;
@@ -66342,6 +66526,15 @@ async function loadProjectStatusFile(projectDir) {
 }
 async function getFeatureSummary(featureName, featureDir) {
   const prdPath = join13(featureDir, "prd.json");
+  if (!existsSync11(prdPath)) {
+    return {
+      name: featureName,
+      done: 0,
+      failed: 0,
+      pending: 0,
+      total: 0
+    };
+  }
   const prd = await loadPRD(prdPath);
   const counts = countStories(prd);
   const summary = {
@@ -66454,6 +66647,13 @@ async function displayAllFeatures(projectDir) {
 }
 async function displayFeatureDetails(featureName, featureDir) {
   const prdPath = join13(featureDir, "prd.json");
+  if (!existsSync11(prdPath)) {
+    console.log(source_default.bold(`
+\uD83D\uDCCA ${featureName}
+`));
+    console.log(source_default.dim(`No prd.json found. Run: nax plan -f ${featureName} --from <spec>`));
+    return;
+  }
   const prd = await loadPRD(prdPath);
   const counts = countStories(prd);
   const status = await loadStatusFile(featureDir);
@@ -68888,6 +69088,7 @@ async function unlockCommand(options) {
 init_config();
 
 // src/execution/runner.ts
+init_adapter();
 init_registry();
 init_hooks();
 init_logger2();
@@ -69063,9 +69264,20 @@ async function runExecutionPhase(options, prd, pluginRegistry) {
     batchingEnabled: options.useBatch
   });
   clearCache();
-  const batchPlan = options.useBatch ? precomputeBatchPlan(getAllReadyStories(prd), 4) : [];
+  const readyStories = getAllReadyStories(prd);
+  logger?.debug("routing", "Ready stories for batch routing", {
+    readyCount: readyStories.length,
+    readyIds: readyStories.map((s) => s.id),
+    allStories: prd.userStories.map((s) => ({
+      id: s.id,
+      status: s.status,
+      passes: s.passes,
+      deps: s.dependencies
+    }))
+  });
+  const batchPlan = options.useBatch ? precomputeBatchPlan(readyStories, 4) : [];
   if (options.useBatch) {
-    await tryLlmBatchRoute(options.config, getAllReadyStories(prd), "routing");
+    await tryLlmBatchRoute(options.config, readyStories, "routing");
   }
   if (options.parallel !== undefined) {
     const runParallelExecution2 = options.runParallelExecution ?? (await Promise.resolve().then(() => (init_parallel_executor(), exports_parallel_executor))).runParallelExecution;
@@ -69301,6 +69513,7 @@ async function run(options) {
   } finally {
     stopHeartbeat();
     cleanupCrashHandlers();
+    await sweepFeatureSessions(workdir, feature).catch(() => {});
     const { cleanupRun: cleanupRun2 } = await Promise.resolve().then(() => (init_run_cleanup(), exports_run_cleanup));
     await cleanupRun2({
       runId,
@@ -76762,7 +76975,7 @@ Run \`nax generate\` to regenerate agent config files (CLAUDE.md, AGENTS.md, .cu
   console.log(source_default.dim(`
 Next: nax features create <name>`));
 });
-program2.command("run").description("Run the orchestration loop for a feature").requiredOption("-f, --feature <name>", "Feature name").option("-a, --agent <name>", "Force a specific agent").option("-m, --max-iterations <n>", "Max iterations", "20").option("--dry-run", "Show plan without executing", false).option("--no-context", "Disable context builder (skip file context in prompts)").option("--no-batch", "Disable story batching (execute all stories individually)").option("--parallel <n>", "Max parallel sessions (0=auto, omit=sequential)").option("--plan", "Run plan phase first before execution", false).option("--from <spec-path>", "Path to spec file (required when --plan is used)").option("--one-shot", "Skip interactive planning Q&A, use single LLM call (ACP only)", false).option("--headless", "Force headless mode (disable TUI, use pipe mode)", false).option("--verbose", "Enable verbose logging (debug level)", false).option("--quiet", "Quiet mode (warnings and errors only)", false).option("--silent", "Silent mode (errors only)", false).option("--json", "JSON mode (raw JSONL output to stdout)", false).option("-d, --dir <path>", "Working directory", process.cwd()).option("--skip-precheck", "Skip precheck validations (advanced users only)", false).action(async (options) => {
+program2.command("run").description("Run the orchestration loop for a feature").requiredOption("-f, --feature <name>", "Feature name").option("-a, --agent <name>", "Force a specific agent").option("-m, --max-iterations <n>", "Max iterations", "20").option("--dry-run", "Show plan without executing", false).option("--no-context", "Disable context builder (skip file context in prompts)").option("--no-batch", "Disable story batching (execute all stories individually)").option("--parallel <n>", "Max parallel sessions (0=auto, omit=sequential)").option("--plan", "Run plan phase first before execution", false).option("--from <spec-path>", "Path to spec file (required when --plan is used)").option("--one-shot", "Skip interactive planning Q&A, use single LLM call (ACP only)", false).option("--force", "Force overwrite existing prd.json when using --plan", false).option("--headless", "Force headless mode (disable TUI, use pipe mode)", false).option("--verbose", "Enable verbose logging (debug level)", false).option("--quiet", "Quiet mode (warnings and errors only)", false).option("--silent", "Silent mode (errors only)", false).option("--json", "JSON mode (raw JSONL output to stdout)", false).option("-d, --dir <path>", "Working directory", process.cwd()).option("--skip-precheck", "Skip precheck validations (advanced users only)", false).action(async (options) => {
   let workdir;
   try {
     workdir = validateDirectory(options.dir);
@@ -76806,6 +77019,25 @@ program2.command("run").description("Run the orchestration loop for a feature").
   const featureDir = join43(naxDir, "features", options.feature);
   const prdPath = join43(featureDir, "prd.json");
   if (options.plan && options.from) {
+    if (existsSync32(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);
+    }
+    if (!options.skipPrecheck) {
+      const { runEnvironmentPrecheck: runEnvironmentPrecheck2 } = await Promise.resolve().then(() => (init_precheck(), exports_precheck));
+      console.log(source_default.dim(`
+   [Pre-plan environment check]`));
+      const envResult = await runEnvironmentPrecheck2(config2, workdir);
+      if (!envResult.passed) {
+        console.error(source_default.red(`
+\u274C Environment precheck failed \u2014 cannot proceed with planning.`));
+        for (const b of envResult.blockers) {
+          console.error(source_default.red(`   ${b.name}: ${b.message}`));
+        }
+        process.exit(1);
+      }
+    }
     try {
       mkdirSync6(featureDir, { recursive: true });
       const planLogId = new Date().toISOString().replace(/:/g, "-").replace(/\..+/, "");