@nathapp/nax 0.56.5 → 0.57.0

package/dist/nax.js

@@ -17991,7 +17991,13 @@ var init_defaults = __esm(() => {
       model: "fast",
       refinement: true,
       redGate: true,
-      timeoutMs: 1800000
+      timeoutMs: 1800000,
+      fix: {
+        diagnoseModel: "fast",
+        fixModel: "balanced",
+        strategy: "diagnose-first",
+        maxRetries: 2
+      }
     },
     context: {
       fileInjection: "disabled",
@@ -18086,7 +18092,7 @@ function isLegacyFlatModels(val) {
   }
   return false;
 }
-var TokenPricingSchema, ModelDefSchema, ModelEntrySchema, PerAgentModelMapSchema, ModelMapSchema, ModelTierSchema, TierConfigSchema, AutoModeConfigSchema, RectificationConfigSchema, RegressionGateConfigSchema, SmartTestRunnerConfigSchema, SMART_TEST_RUNNER_DEFAULT, smartTestRunnerFieldSchema, ExecutionConfigSchema, QualityConfigSchema, TddConfigSchema, ConstitutionConfigSchema, AnalyzeConfigSchema, SemanticReviewConfigSchema, ReviewConfigSchema, PlanConfigSchema, AcceptanceConfigSchema, TestCoverageConfigSchema, ContextAutoDetectConfigSchema, ContextConfigSchema, LlmRoutingConfigSchema, RoutingConfigSchema, OptimizerConfigSchema, PluginConfigEntrySchema, HooksConfigSchema, InteractionConfigSchema, StorySizeGateConfigSchema, AgentConfigSchema, PrecheckConfigSchema, PromptsConfigSchema, ProjectProfileSchema, VALID_AGENT_TYPES, GenerateConfigSchema, DebaterSchema, toObject = (val) => val === undefined || val === null ? {} : val, RESOLVER_TYPES, makeResolverSchema = (defaultType) => exports_external.preprocess(toObject, exports_external.object({
+var TokenPricingSchema, ModelDefSchema, ModelEntrySchema, PerAgentModelMapSchema, ModelMapSchema, ModelTierSchema, TierConfigSchema, AutoModeConfigSchema, RectificationConfigSchema, RegressionGateConfigSchema, SmartTestRunnerConfigSchema, SMART_TEST_RUNNER_DEFAULT, smartTestRunnerFieldSchema, ExecutionConfigSchema, QualityConfigSchema, TddConfigSchema, ConstitutionConfigSchema, AnalyzeConfigSchema, SemanticReviewConfigSchema, ReviewConfigSchema, PlanConfigSchema, AcceptanceFixConfigSchema, AcceptanceConfigSchema, TestCoverageConfigSchema, ContextAutoDetectConfigSchema, ContextConfigSchema, LlmRoutingConfigSchema, RoutingConfigSchema, OptimizerConfigSchema, PluginConfigEntrySchema, HooksConfigSchema, InteractionConfigSchema, StorySizeGateConfigSchema, AgentConfigSchema, PrecheckConfigSchema, PromptsConfigSchema, ProjectProfileSchema, VALID_AGENT_TYPES, GenerateConfigSchema, DebaterSchema, toObject = (val) => val === undefined || val === null ? {} : val, RESOLVER_TYPES, makeResolverSchema = (defaultType) => exports_external.preprocess(toObject, exports_external.object({
   type: exports_external.enum(RESOLVER_TYPES).default(defaultType),
   agent: exports_external.string().min(1).optional(),
   tieBreaker: exports_external.string().min(1).optional(),
@@ -18299,6 +18305,12 @@ var init_schemas3 = __esm(() => {
     model: ModelTierSchema,
     outputPath: exports_external.string().min(1, "plan.outputPath must be non-empty")
   });
+  AcceptanceFixConfigSchema = exports_external.object({
+    diagnoseModel: exports_external.string().min(1, "acceptance.fix.diagnoseModel must be non-empty"),
+    fixModel: exports_external.string().min(1, "acceptance.fix.fixModel must be non-empty"),
+    strategy: exports_external.enum(["diagnose-first", "implement-only"]),
+    maxRetries: exports_external.number().int().nonnegative()
+  });
   AcceptanceConfigSchema = exports_external.object({
     enabled: exports_external.boolean(),
     maxRetries: exports_external.number().int().nonnegative(),
@@ -18310,7 +18322,13 @@ var init_schemas3 = __esm(() => {
     redGate: exports_external.boolean().default(true),
     testStrategy: exports_external.enum(["unit", "component", "cli", "e2e", "snapshot"]).optional(),
     testFramework: exports_external.string().min(1, "acceptance.testFramework must be non-empty").optional(),
-    timeoutMs: exports_external.number().int().min(30000).max(3600000).default(1800000)
+    timeoutMs: exports_external.number().int().min(30000).max(3600000).default(1800000),
+    fix: AcceptanceFixConfigSchema.optional().default({
+      diagnoseModel: "fast",
+      fixModel: "balanced",
+      strategy: "diagnose-first",
+      maxRetries: 2
+    })
   });
   TestCoverageConfigSchema = exports_external.object({
     enabled: exports_external.boolean().default(true),
@@ -18982,7 +19000,8 @@ class AcpAgentAdapter {
     const tryOneAgent = async (agentName) => {
       const model = await resolveModel2(agentName);
       const cmdStr = `acpx --model ${model} ${agentName}`;
-      const client = _acpAdapterDeps.createClient(cmdStr, workdir);
+      const timeoutSeconds = Math.ceil(timeoutMs / 1000);
+      const client = _acpAdapterDeps.createClient(cmdStr, workdir, timeoutSeconds);
       await client.start();
       let session = null;
       let hadError = false;
@@ -20909,7 +20928,8 @@ async function refineAcceptanceCriteria(criteria, context) {
       featureName,
       storyId,
       workdir,
-      sessionRole: "refine"
+      sessionRole: "refine",
+      timeoutMs: config2.acceptance?.timeoutMs ?? 120000
     });
     response = typeof completeResult === "string" ? completeResult : completeResult.output;
   } catch (error48) {
@@ -20958,6 +20978,7 @@ var init_refinement = __esm(() => {
 // src/acceptance/generator.ts
 var exports_generator = {};
 __export(exports_generator, {
+  resolveAcceptanceTestFile: () => resolveAcceptanceTestFile,
   parseAcceptanceCriteria: () => parseAcceptanceCriteria,
   generateSkeletonTests: () => generateSkeletonTests,
   generateFromPRD: () => generateFromPRD,
@@ -20993,6 +21014,9 @@ function acceptanceTestFilename(language) {
       return ".nax-acceptance.test.ts";
   }
 }
+function resolveAcceptanceTestFile(language, testPathConfig) {
+  return testPathConfig ?? acceptanceTestFilename(language);
+}
 function buildAcceptanceRunCommand(testPath, testFramework, commandOverride) {
   if (commandOverride) {
     const resolved = commandOverride.replace(/\{\{files\}\}/g, testPath).replace(/\{\{file\}\}/g, testPath).replace(/\{\{FILE\}\}/g, testPath);
@@ -21061,7 +21085,7 @@ Rules:
 - Every test MUST have real assertions that PASS when the feature is correctly implemented and FAIL when it is broken
 - **Prefer behavioral tests** \u2014 import functions and call them rather than reading source files. For example, to verify "getPostRunActions() returns empty array", import PluginRegistry and call getPostRunActions(), don't grep the source file for the method name.
 - **File output (REQUIRED)**: Write the acceptance test file DIRECTLY to the path shown below. Do NOT output the test code in your response. After writing the file, reply with a brief confirmation.
-- **Path anchor (CRITICAL)**: Write the test file to this exact path: \`${join5(options.workdir, ".nax", "features", options.featureName, acceptanceTestFilename(options.language))}\`. Import from package sources using relative paths like \`../../../src/...\` (3 levels up from \`.nax/features/<name>/\` to the package root).`;
+- **Path anchor (CRITICAL)**: Write the test file to this exact path: \`${join5(options.workdir, ".nax", "features", options.featureName, resolveAcceptanceTestFile(options.language, options.config?.acceptance?.testPath))}\`. Import from package sources using relative paths like \`../../../src/...\` (3 levels up from \`.nax/features/<name>/\` to the package root).`;
   const prompt = basePrompt;
   logger.info("acceptance", "Generating tests from PRD refined criteria", { count: refinedCriteria.length });
   const completeResult = await (options.adapter ?? _generatorPRDDeps.adapter).complete(prompt, {
@@ -21080,7 +21104,7 @@ Rules:
     outputPreview: rawOutput.slice(0, 300)
   });
   if (!testCode) {
-    const targetPath = join5(options.workdir, ".nax", "features", options.featureName, acceptanceTestFilename(options.language));
+    const targetPath = join5(options.workdir, ".nax", "features", options.featureName, resolveAcceptanceTestFile(options.language, options.config?.acceptance?.testPath));
     let recoveryFailed = false;
     logger.debug("acceptance", "BUG-076 recovery: checking for agent-written file", { targetPath });
     try {
@@ -22132,7 +22156,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.56.5",
+    version: "0.57.0",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22211,8 +22235,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("01c24d40"))
-        return "01c24d40";
+      if (/^[0-9a-f]{6,10}$/.test("478df448"))
+        return "478df448";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -25977,6 +26001,7 @@ ${stderr}` };
         return { action: "fail", reason: "[acceptance-setup] featureDir is not set" };
       }
       const language = (ctx.effectiveConfig ?? ctx.config).project?.language;
+      const testPathConfig = (ctx.effectiveConfig ?? ctx.config).acceptance.testPath;
       const metaPath = path5.join(ctx.featureDir, "acceptance-meta.json");
       const allCriteria = ctx.prd.userStories.filter((s) => !s.id.startsWith("US-FIX-")).flatMap((s) => s.acceptanceCriteria);
       const nonFixStories = ctx.prd.userStories.filter((s) => !s.id.startsWith("US-FIX-"));
@@ -25999,7 +26024,7 @@ ${stderr}` };
       const testPaths = [];
       for (const [workdir] of workdirGroups) {
         const packageDir = workdir ? path5.join(ctx.workdir, workdir) : ctx.workdir;
-        const testPath = path5.join(packageDir, ".nax", "features", featureName, acceptanceTestFilename(language));
+        const testPath = path5.join(packageDir, ".nax", "features", featureName, resolveAcceptanceTestFile(language, testPathConfig));
         testPaths.push({ testPath, packageDir });
       }
       let totalCriteria = 0;
@@ -26062,7 +26087,7 @@ ${stderr}` };
         testableCount = allRefinedCriteria.filter((r) => r.testable).length;
         for (const [workdir, group] of workdirGroups) {
           const packageDir = workdir ? path5.join(ctx.workdir, workdir) : ctx.workdir;
-          const testPath = path5.join(packageDir, acceptanceTestFilename(language));
+          const testPath = path5.join(packageDir, resolveAcceptanceTestFile(language, testPathConfig));
           const groupStoryIds = new Set(group.stories.map((s) => s.id));
           const groupRefined = allRefinedCriteria.filter((r) => groupStoryIds.has(r.storyId));
           const result = await _acceptanceSetupDeps.generate(group.stories, groupRefined, {
@@ -34087,6 +34112,214 @@ var init_crash_recovery = __esm(() => {
   init_crash_heartbeat();
 });
 
+// src/acceptance/fix-diagnosis.ts
+function parseImportStatements(content) {
+  const importRegex = /import\s+(?:{[^}]+}|[^;]+)\s+from\s+["']([^"']+)["']/g;
+  const imports = [];
+  const regexMatch = content.matchAll(importRegex);
+  for (const match of regexMatch) {
+    imports.push(match[1]);
+  }
+  return imports;
+}
+function resolveImportPaths(imports, workdir) {
+  const resolved = [];
+  for (const imp of imports) {
+    if (imp.startsWith(".")) {
+      resolved.push(imp);
+    }
+  }
+  return resolved.slice(0, MAX_SOURCE_FILES);
+}
+async function readSourceFileContent(filePath, workdir) {
+  try {
+    const fullPath = `${workdir}/${filePath}`;
+    const file3 = await Bun.file(fullPath).text();
+    const lines = file3.split(`
+`).slice(0, MAX_FILE_LINES);
+    return { path: filePath, content: lines.join(`
+`) };
+  } catch {
+    return null;
+  }
+}
+function buildDiagnosisPrompt(options) {
+  const truncatedOutput = options.testOutput.slice(0, MAX_TEST_OUTPUT_CHARS);
+  const sourceFilesSection = options.sourceFiles.length > 0 ? options.sourceFiles.map((f) => `FILE: ${f.path}
+\`\`\`
+${f.content}
+\`\`\``).join(`
+
+`) : "(No source files could be resolved from imports)";
+  return `You are a debugging expert. An acceptance test has failed.
+
+TASK: Diagnose whether the failure is due to a bug in the SOURCE CODE or a bug in the TEST CODE.
+
+FAILING TEST OUTPUT:
+${truncatedOutput}
+
+ACCEPTANCE TEST FILE CONTENT:
+\`\`\`typescript
+${options.testFileContent}
+\`\`\`
+
+SOURCE FILES (auto-detected from imports, up to ${MAX_FILE_LINES} lines each):
+${sourceFilesSection}
+
+Respond with ONLY a JSON object in this exact format (no markdown, no extra text):
+{
+  "verdict": "source_bug" | "test_bug" | "both",
+  "reasoning": "Your analysis explaining why this is a source_bug, test_bug, or both",
+  "confidence": 0.0-1.0,
+  "testIssues": ["Issue in test code if any"],
+  "sourceIssues": ["Issue in source code if any"]
+}`;
+}
+async function diagnoseAcceptanceFailure(agent, options) {
+  if (!agent) {
+    throw new Error("[diagnosis] Agent adapter is required");
+  }
+  const { testOutput, testFileContent, config: config2, workdir, featureName, storyId } = options;
+  const sessionName = buildSessionName(workdir, featureName, storyId, "diagnose");
+  const diagnoseModelTier = config2.acceptance.fix.diagnoseModel;
+  const modelDef = resolveModelForAgent(config2.models, config2.autoMode.defaultAgent, diagnoseModelTier, config2.autoMode.defaultAgent);
+  const imports = parseImportStatements(testFileContent);
+  const relativeImports = resolveImportPaths(imports, workdir);
+  const sourceFiles = await Promise.all(relativeImports.map((imp) => readSourceFileContent(imp, workdir)));
+  const validSourceFiles = sourceFiles.filter((f) => f !== null);
+  const prompt = buildDiagnosisPrompt({
+    testOutput,
+    testFileContent,
+    sourceFiles: validSourceFiles
+  });
+  try {
+    const result = await agent.run({
+      prompt,
+      workdir,
+      modelTier: undefined,
+      modelDef,
+      timeoutSeconds: 300,
+      sessionRole: "diagnose",
+      acpSessionName: sessionName,
+      featureName,
+      storyId,
+      config: config2
+    });
+    const diagnosis = parseDiagnosisResult(result.output);
+    if (diagnosis) {
+      return diagnosis;
+    }
+    return {
+      verdict: "source_bug",
+      reasoning: "diagnosis failed \u2014 falling back to source fix",
+      confidence: 0
+    };
+  } catch (err) {
+    return {
+      verdict: "source_bug",
+      reasoning: "diagnosis failed \u2014 falling back to source fix",
+      confidence: 0
+    };
+  }
+}
+function parseDiagnosisResult(output) {
+  if (!output || output.trim() === "") {
+    return null;
+  }
+  try {
+    const cleaned = output.trim();
+    let jsonStr = cleaned;
+    const firstBrace = cleaned.indexOf("{");
+    const lastBrace = cleaned.lastIndexOf("}");
+    if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
+      jsonStr = cleaned.slice(firstBrace, lastBrace + 1);
+    }
+    const parsed = JSON.parse(jsonStr);
+    if (typeof parsed.verdict === "string" && typeof parsed.reasoning === "string" && typeof parsed.confidence === "number") {
+      return {
+        verdict: parsed.verdict,
+        reasoning: parsed.reasoning,
+        confidence: parsed.confidence,
+        testIssues: parsed.testIssues,
+        sourceIssues: parsed.sourceIssues
+      };
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+var MAX_SOURCE_FILES = 5, MAX_FILE_LINES = 500, MAX_TEST_OUTPUT_CHARS = 2000;
+var init_fix_diagnosis = __esm(() => {
+  init_adapter();
+});
+
+// src/acceptance/fix-executor.ts
+function buildSourceFixPrompt(options) {
+  const { testOutput, diagnosis, acceptanceTestPath } = options;
+  let prompt = `ACCEPTANCE TEST FAILURE:
+${testOutput}
+
+`;
+  if (diagnosis.reasoning) {
+    prompt += `DIAGNOSIS:
+${diagnosis.reasoning}
+
+`;
+  }
+  prompt += `ACCEPTANCE TEST FILE: ${acceptanceTestPath}
+
+`;
+  prompt += "Fix the source implementation. Do NOT modify the test file.";
+  return prompt;
+}
+async function executeSourceFix(agent, options) {
+  if (!agent) {
+    throw new Error("[fix-executor] agent is required");
+  }
+  const { testOutput, testFileContent, diagnosis, config: config2, workdir, featureName, storyId, acceptanceTestPath } = options;
+  const modelDef = resolveModelForAgent(config2.models, config2.autoMode.defaultAgent, config2.acceptance.fix.fixModel, config2.autoMode.defaultAgent);
+  const sessionName = buildSessionName(workdir, featureName, storyId, "source-fix");
+  const prompt = buildSourceFixPrompt(options);
+  const timeoutSeconds = config2.execution?.sessionTimeoutSeconds ?? 3600;
+  const runOptions = {
+    prompt,
+    workdir,
+    modelTier: undefined,
+    modelDef,
+    timeoutSeconds,
+    sessionRole: "source-fix",
+    acpSessionName: sessionName,
+    featureName,
+    storyId,
+    config: config2,
+    pipelineStage: "acceptance"
+  };
+  const result = await agent.run(runOptions);
+  let success2 = result.success;
+  try {
+    const verifyProc = _fixExecutorDeps.spawn(["bun", "test", acceptanceTestPath], {
+      cwd: workdir,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const exitCode = await verifyProc.exited;
+    success2 = exitCode === 0;
+  } catch {
+    success2 = result.success;
+  }
+  return {
+    success: success2,
+    cost: result.estimatedCost
+  };
+}
+var _fixExecutorDeps;
+var init_fix_executor = __esm(() => {
+  init_adapter();
+  init_bun_deps();
+  _fixExecutorDeps = { spawn };
+});
+
 // src/execution/lifecycle/acceptance-loop.ts
 var exports_acceptance_loop = {};
 __export(exports_acceptance_loop, {
@@ -34113,6 +34346,14 @@ async function loadSpecContent(featureDir) {
   const specFile = Bun.file(specPath);
   return await specFile.exists() ? await specFile.text() : "";
 }
+async function loadAcceptanceTestContent(featureDir) {
+  if (!featureDir)
+    return { content: "", path: "" };
+  const testPath = path14.join(featureDir, "acceptance.test.ts");
+  const testFile = Bun.file(testPath);
+  const content = await testFile.exists() ? await testFile.text() : "";
+  return { content, path: testPath };
+}
 function buildResult(success2, prd, totalCost, iterations, storiesCompleted, prdDirty) {
   return { success: success2, prd, totalCost, iterations, storiesCompleted, prdDirty };
 }
@@ -34198,6 +34439,191 @@ async function regenerateAcceptanceTest(testPath, acceptanceContext) {
   logger?.info("acceptance", "Acceptance test regenerated successfully");
   return true;
 }
+async function runFixRouting(options) {
+  const logger = getSafeLogger();
+  const { ctx, failures, prd, acceptanceContext } = options;
+  const agentName = ctx.config.autoMode.defaultAgent;
+  const agent = (ctx.agentGetFn ?? _acceptanceLoopDeps.getAgent)(agentName);
+  if (!agent) {
+    logger?.error("acceptance", "Agent not found for fix routing");
+    return { fixed: false, cost: 0, prdDirty: false };
+  }
+  const strategy = ctx.config.acceptance.fix?.strategy ?? "diagnose-first";
+  const fixMaxRetries = ctx.config.acceptance.fix?.maxRetries ?? 2;
+  const { content: testFileContent, path: acceptanceTestPath } = await loadAcceptanceTestContent(ctx.featureDir);
+  const firstStory = prd.userStories[0];
+  const storyId = firstStory?.id ?? "unknown";
+  if (strategy === "implement-only") {
+    logger?.info("acceptance", "Strategy is implement-only \u2014 executing source fix directly");
+    let fixAttempts = 0;
+    while (fixAttempts < fixMaxRetries) {
+      fixAttempts++;
+      logger?.info("acceptance", `Source fix attempt ${fixAttempts}/${fixMaxRetries}`);
+      const defaultDiagnosis = {
+        verdict: "source_bug",
+        reasoning: "implement-only strategy \u2014 skipping diagnosis",
+        confidence: 1
+      };
+      const fixResult = await executeSourceFix(agent, {
+        testOutput: failures.testOutput,
+        testFileContent,
+        diagnosis: defaultDiagnosis,
+        config: ctx.config,
+        workdir: ctx.workdir,
+        featureName: ctx.feature,
+        storyId,
+        acceptanceTestPath
+      });
+      logger?.info("acceptance.source-fix", "Source fix completed", {
+        success: fixResult.success,
+        cost: fixResult.cost,
+        attempt: fixAttempts
+      });
+      if (fixResult.success) {
+        return { fixed: true, cost: fixResult.cost, prdDirty: false };
+      }
+      if (fixAttempts >= fixMaxRetries) {
+        logger?.error("acceptance", `Source fix failed after ${fixMaxRetries} attempts`);
+        break;
+      }
+    }
+    return { fixed: false, cost: 0, prdDirty: false };
+  }
+  logger?.info("acceptance", "Strategy is diagnose-first \u2014 running diagnosis");
+  const diagnosis = await diagnoseAcceptanceFailure(agent, {
+    testOutput: failures.testOutput,
+    testFileContent,
+    config: ctx.config,
+    workdir: ctx.workdir,
+    featureName: ctx.feature,
+    storyId
+  });
+  logger?.info("acceptance.diagnosis", "Diagnosis complete", {
+    verdict: diagnosis.verdict,
+    confidence: diagnosis.confidence,
+    reasoning: diagnosis.reasoning
+  });
+  if (diagnosis.verdict === "source_bug") {
+    logger?.info("acceptance", "Diagnosis: source_bug \u2014 executing source fix");
+    let fixAttempts = 0;
+    while (fixAttempts < fixMaxRetries) {
+      fixAttempts++;
+      logger?.info("acceptance", `Source fix attempt ${fixAttempts}/${fixMaxRetries}`);
+      const fixResult = await executeSourceFix(agent, {
+        testOutput: failures.testOutput,
+        testFileContent,
+        diagnosis,
+        config: ctx.config,
+        workdir: ctx.workdir,
+        featureName: ctx.feature,
+        storyId,
+        acceptanceTestPath
+      });
+      logger?.info("acceptance.source-fix", "Source fix completed", {
+        success: fixResult.success,
+        cost: fixResult.cost,
+        attempt: fixAttempts
+      });
+      if (fixResult.success) {
+        return { fixed: true, cost: fixResult.cost, prdDirty: false };
+      }
+      if (fixAttempts >= fixMaxRetries) {
+        logger?.error("acceptance", `Source fix failed after ${fixMaxRetries} attempts`);
+        break;
+      }
+    }
+    return { fixed: false, cost: 0, prdDirty: false };
+  }
+  if (diagnosis.verdict === "test_bug") {
+    logger?.info("acceptance", "Diagnosis: test_bug \u2014 regenerating acceptance test");
+    if (!ctx.featureDir) {
+      logger?.error("acceptance", "Cannot regenerate test without featureDir");
+      return { fixed: false, cost: 0, prdDirty: false };
+    }
+    const testPath = path14.join(ctx.featureDir, "acceptance.test.ts");
+    const testFile = Bun.file(testPath);
+    if (!await testFile.exists()) {
+      logger?.error("acceptance", "Acceptance test file not found for regeneration");
+      return { fixed: false, cost: 0, prdDirty: false };
+    }
+    const regenerated = await regenerateAcceptanceTest(testPath, acceptanceContext);
+    logger?.info("acceptance.test-regen", "Test regeneration completed", {
+      outcome: regenerated ? "success" : "failure"
+    });
+    if (!regenerated) {
+      return { fixed: false, cost: 0, prdDirty: false };
+    }
+    const { acceptanceStage: acceptanceStage2 } = await Promise.resolve().then(() => (init_acceptance2(), exports_acceptance));
+    const acceptanceResult = await acceptanceStage2.execute(acceptanceContext);
+    if (acceptanceResult.action === "continue") {
+      logger?.info("acceptance", "Acceptance passed after test regeneration");
+      return { fixed: true, cost: 0, prdDirty: true };
+    }
+    logger?.warn("acceptance", "Acceptance still failing after test regeneration");
+    return { fixed: false, cost: 0, prdDirty: true };
+  }
+  if (diagnosis.verdict === "both") {
+    logger?.info("acceptance", "Diagnosis: both \u2014 executing source fix then regenerating test if needed");
+    let sourceFixSuccess = false;
+    let sourceFixCost = 0;
+    let fixAttempts = 0;
+    while (fixAttempts < fixMaxRetries && !sourceFixSuccess) {
+      fixAttempts++;
+      logger?.info("acceptance", `Source fix attempt ${fixAttempts}/${fixMaxRetries}`);
+      const fixResult = await executeSourceFix(agent, {
+        testOutput: failures.testOutput,
+        testFileContent,
+        diagnosis,
+        config: ctx.config,
+        workdir: ctx.workdir,
+        featureName: ctx.feature,
+        storyId,
+        acceptanceTestPath
+      });
+      logger?.info("acceptance.source-fix", "Source fix completed", {
+        success: fixResult.success,
+        cost: fixResult.cost,
+        attempt: fixAttempts
+      });
+      sourceFixSuccess = fixResult.success;
+      sourceFixCost += fixResult.cost;
+      if (fixResult.success) {
+        break;
+      }
+      if (fixAttempts >= fixMaxRetries) {
+        logger?.error("acceptance", `Source fix failed after ${fixMaxRetries} attempts`);
+        break;
+      }
+    }
+    if (!sourceFixSuccess) {
+      return { fixed: false, cost: sourceFixCost, prdDirty: false };
+    }
+    logger?.info("acceptance", "Source fix succeeded \u2014 re-running acceptance to verify");
+    const { acceptanceStage: acceptanceStage2 } = await Promise.resolve().then(() => (init_acceptance2(), exports_acceptance));
+    const acceptanceResult = await acceptanceStage2.execute(acceptanceContext);
+    if (acceptanceResult.action === "continue") {
+      logger?.info("acceptance", "Acceptance passed after source fix");
+      return { fixed: true, cost: sourceFixCost, prdDirty: false };
+    }
+    logger?.info("acceptance", "Acceptance still failing after source fix \u2014 regenerating test");
+    if (!ctx.featureDir) {
+      logger?.error("acceptance", "Cannot regenerate test without featureDir");
+      return { fixed: false, cost: sourceFixCost, prdDirty: false };
+    }
+    const testPath = path14.join(ctx.featureDir, "acceptance.test.ts");
+    const testFile = Bun.file(testPath);
+    if (!await testFile.exists()) {
+      logger?.error("acceptance", "Acceptance test file not found for regeneration");
+      return { fixed: false, cost: sourceFixCost, prdDirty: false };
+    }
+    const regenerated = await regenerateAcceptanceTest(testPath, acceptanceContext);
+    logger?.info("acceptance.test-regen", "Test regeneration completed", {
+      outcome: regenerated ? "success" : "failure"
+    });
+    return { fixed: regenerated, cost: sourceFixCost, prdDirty: regenerated };
+  }
+  return { fixed: false, cost: 0, prdDirty: false };
+}
 async function runAcceptanceLoop(ctx) {
   const logger = getSafeLogger();
   const maxRetries = ctx.config.acceptance.maxRetries;
@@ -34292,6 +34718,23 @@ async function runAcceptanceLoop(ctx) {
         continue;
       }
     }
+    const strategy = ctx.config.acceptance.fix?.strategy ?? "diagnose-first";
+    if (strategy === "diagnose-first" || strategy === "implement-only") {
+      logger?.info("acceptance", `Running fix routing with strategy: ${strategy}`);
+      const fixResult = await runFixRouting({
+        ctx,
+        failures,
+        prd,
+        acceptanceContext
+      });
+      totalCost += fixResult.cost;
+      if (fixResult.fixed) {
+        logger?.info("acceptance", "Fix succeeded \u2014 re-running acceptance tests...");
+        continue;
+      }
+      logger?.error("acceptance", "Fix routing failed to resolve acceptance failures");
+      return buildResult(false, prd, totalCost, iterations, storiesCompleted, prdDirty);
+    }
     logger?.info("acceptance", "Generating fix stories...");
     const fixStories = await generateAndAddFixStories(ctx, failures, prd);
     if (!fixStories) {
@@ -34323,6 +34766,8 @@ async function runAcceptanceLoop(ctx) {
 var _acceptanceLoopDeps;
 var init_acceptance_loop = __esm(() => {
   init_acceptance();
+  init_fix_diagnosis();
+  init_fix_executor();
   init_registry();
   init_config();
   init_loader();
@@ -69944,7 +70389,8 @@ async function planCommand(workdir, config2, options) {
         workdir,
         config: config2,
         featureName: options.feature,
-        sessionRole: "plan"
+        sessionRole: "plan",
+        timeoutMs: (config2?.execution?.sessionTimeoutSeconds ?? 3600) * 1000
       });
       let result = typeof completeResult === "string" ? completeResult : completeResult.output;
       try {
@@ -70337,7 +70783,8 @@ async function planDecomposeCommand(workdir, config2, options) {
         workdir,
         sessionRole: "decompose",
         featureName: options.feature,
-        storyId: options.storyId
+        storyId: options.storyId,
+        timeoutMs: (config2?.execution?.sessionTimeoutSeconds ?? 3600) * 1000
       });
       rawResponse = typeof completeResult === "string" ? completeResult : completeResult.output;
     }
@@ -70347,7 +70794,8 @@ async function planDecomposeCommand(workdir, config2, options) {
       workdir,
       sessionRole: "decompose",
       featureName: options.feature,
-      storyId: options.storyId
+      storyId: options.storyId,
+      timeoutMs: (config2?.execution?.sessionTimeoutSeconds ?? 3600) * 1000
     });
     rawResponse = typeof completeResult === "string" ? completeResult : completeResult.output;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.56.5",
+  "version": "0.57.0",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {