@nathapp/nax 0.54.5 → 0.54.6

package/dist/nax.js

@@ -19826,7 +19826,7 @@ async function saveAcpSession(workdir, featureName, storyId, sessionName, agentN
     getSafeLogger()?.warn("acp-adapter", "Failed to save session to sidecar", { error: String(err) });
   }
 }
-async function clearAcpSession(workdir, featureName, storyId) {
+async function clearAcpSession(workdir, featureName, storyId, sessionRole) {
   try {
     const path = acpSessionsPath(workdir, featureName);
     let data = {};
@@ -19836,7 +19836,8 @@ async function clearAcpSession(workdir, featureName, storyId) {
     } catch {
       return;
     }
-    delete data[storyId];
+    const sidecarKey = sessionRole ? `${storyId}:${sessionRole}` : storyId;
+    delete data[sidecarKey];
     await Bun.write(path, JSON.stringify(data, null, 2));
   } catch (err) {
     getSafeLogger()?.warn("acp-adapter", "Failed to clear session from sidecar", { error: String(err) });
@@ -20024,7 +20025,8 @@ class AcpAgentAdapter {
     await client.start();
     let sessionName = options.acpSessionName;
     if (!sessionName && options.featureName && options.storyId) {
-      sessionName = await readAcpSession(options.workdir, options.featureName, options.storyId) ?? undefined;
+      const sidecarKey = options.sessionRole ? `${options.storyId}:${options.sessionRole}` : options.storyId;
+      sessionName = await readAcpSession(options.workdir, options.featureName, sidecarKey) ?? undefined;
     }
     sessionName ??= buildSessionName(options.workdir, options.featureName, options.storyId, options.sessionRole);
     const resolvedPerm = resolvePermissions(options.config, options.pipelineStage ?? "run");
@@ -20035,7 +20037,8 @@ class AcpAgentAdapter {
     });
     const session = await ensureAcpSession(client, sessionName, this.name, permissionMode);
     if (options.featureName && options.storyId) {
-      await saveAcpSession(options.workdir, options.featureName, options.storyId, sessionName, this.name);
+      const sidecarKey = options.sessionRole ? `${options.storyId}:${options.sessionRole}` : options.storyId;
+      await saveAcpSession(options.workdir, options.featureName, sidecarKey, sessionName, this.name);
     }
     let lastResponse = null;
     let timedOut = false;
@@ -20072,7 +20075,8 @@ class AcpAgentAdapter {
           totalExactCostUsd = (totalExactCostUsd ?? 0) + lastResponse.exactCostUsd;
         }
         const outputText = extractOutput(lastResponse);
-        const question = extractQuestion(outputText);
+        const isEndTurn = lastResponse.stopReason === "end_turn";
+        const question = isEndTurn ? extractQuestion(outputText) : null;
         if (!question || !options.interactionBridge)
           break;
         getSafeLogger()?.debug("acp-adapter", "Agent asked question, routing to interactionBridge", { question });
@@ -22348,7 +22352,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.54.5",
+    version: "0.54.6",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22361,7 +22365,7 @@ var init_package = __esm(() => {
       typecheck: "bun x tsc --noEmit",
       lint: "bun x biome check src/ bin/",
       release: "bun scripts/release.ts",
-      test: "bun test test/ --timeout=60000",
+      test: "bun test test/unit/ --timeout=60000 && bun test test/integration/ --timeout=60000 && bun test test/ui/ --timeout=60000",
       "test:watch": "bun test --watch",
       "test:unit": "bun test ./test/unit/ --timeout=60000",
       "test:integration": "bun test ./test/integration/ --timeout=60000",
@@ -22425,8 +22429,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("e98d5b1"))
-        return "e98d5b1";
+      if (/^[0-9a-f]{6,10}$/.test("955ab31"))
+        return "955ab31";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -27464,6 +27468,9 @@ function shouldRetryRectification(state, config2) {
   if (state.attempt >= config2.maxRetries) {
     return false;
   }
+  if (state.lastExitCode !== undefined && state.lastExitCode !== 0 && state.currentFailures === 0) {
+    return true;
+  }
   if (state.currentFailures === 0) {
     return false;
   }
@@ -29754,7 +29761,8 @@ async function runRectificationLoop2(opts) {
   const rectificationState = {
     attempt: 0,
     initialFailures: testSummary.failed,
-    currentFailures: testSummary.failed
+    currentFailures: testSummary.failed,
+    lastExitCode: 1
   };
   logger?.info("rectification", `Starting ${label} loop`, {
     storyId: story.id,
@@ -29832,6 +29840,7 @@ ${rectificationPrompt}`;
     if (retryVerification.output) {
       const newTestSummary = parseBunTestOutput(retryVerification.output);
       rectificationState.currentFailures = newTestSummary.failed;
+      rectificationState.lastExitCode = retryVerification.status === "SUCCESS" ? 0 : 1;
       testSummary.failures = newTestSummary.failures;
       testSummary.failed = newTestSummary.failed;
       testSummary.passed = newTestSummary.passed;
@@ -30040,7 +30049,8 @@ function makeFailResult(storyId, strategy, status, opts = {}) {
     failures: opts.failures ?? [],
     rawOutput: opts.rawOutput,
     durationMs: opts.durationMs ?? 0,
-    countsTowardEscalation: opts.countsTowardEscalation ?? true
+    countsTowardEscalation: opts.countsTowardEscalation ?? true,
+    exitCode: opts.exitCode
   };
 }
 function makePassResult(storyId, strategy, opts = {}) {
@@ -30449,7 +30459,8 @@ class ScopedStrategy {
       passCount: parsed.passed,
       failCount: parsed.failed,
       failures: parsed.failures,
-      durationMs
+      durationMs,
+      exitCode: result.status === "TEST_FAILURE" ? 1 : undefined
     });
   }
 }
@@ -34298,7 +34309,7 @@ async function executeStoryInWorktree(story, worktreePath, context, routing, eve
     };
   }
 }
-async function executeParallelBatch(stories, projectRoot, config2, context, worktreePaths, maxConcurrency, eventEmitter) {
+async function executeParallelBatch(stories, projectRoot, config2, context, worktreePaths, maxConcurrency, eventEmitter, storyEffectiveConfigs) {
   const logger = getSafeLogger();
   const results = {
     pipelinePassed: [],
@@ -34319,7 +34330,9 @@ async function executeParallelBatch(stories, projectRoot, config2, context, work
       continue;
     }
     const routing = routeTask(story.title, story.description, story.acceptanceCriteria, story.tags, config2);
-    const executePromise = executeStoryInWorktree(story, worktreePath, context, routing, eventEmitter).then((result) => {
+    const storyConfig = storyEffectiveConfigs?.get(story.id);
+    const storyContext = storyConfig ? { ...context, effectiveConfig: storyConfig } : context;
+    const executePromise = executeStoryInWorktree(story, worktreePath, storyContext, routing, eventEmitter).then((result) => {
       results.totalCost += result.cost;
       results.storyCosts.set(story.id, result.cost);
       if (result.success) {
@@ -34354,6 +34367,7 @@ var init_parallel_worker = __esm(() => {
 });
 
 // src/execution/parallel-coordinator.ts
+import { existsSync as existsSync33, symlinkSync as symlinkSync2 } from "fs";
 import os3 from "os";
 import { join as join48 } from "path";
 function groupStoriesByDependencies(stories) {
@@ -34398,7 +34412,7 @@ function resolveMaxConcurrency(parallel) {
   }
   return Math.max(1, parallel);
 }
-async function executeParallel(stories, prdPath, projectRoot, config2, hooks, plugins, prd, featureDir, parallel, eventEmitter, agentGetFn) {
+async function executeParallel(stories, prdPath, projectRoot, config2, hooks, plugins, prd, featureDir, parallel, eventEmitter, agentGetFn, pidRegistry, interactionChain) {
   const logger = getSafeLogger();
   const maxConcurrency = resolveMaxConcurrency(parallel);
   const worktreeManager = new WorktreeManager;
@@ -34430,9 +34444,12 @@ async function executeParallel(stories, prdPath, projectRoot, config2, hooks, pl
       hooks,
       plugins,
       storyStartTime: new Date().toISOString(),
-      agentGetFn
+      agentGetFn,
+      pidRegistry,
+      interaction: interactionChain ?? undefined
     };
     const worktreePaths = new Map;
+    const storyEffectiveConfigs = new Map;
     for (const story of batch) {
       const worktreePath = join48(projectRoot, ".nax-wt", story.id);
       try {
@@ -34442,6 +34459,27 @@ async function executeParallel(stories, prdPath, projectRoot, config2, hooks, pl
           storyId: story.id,
           worktreePath
         });
+        if (story.workdir) {
+          const pkgNodeModulesSrc = join48(projectRoot, story.workdir, "node_modules");
+          const pkgNodeModulesDst = join48(worktreePath, story.workdir, "node_modules");
+          if (existsSync33(pkgNodeModulesSrc) && !existsSync33(pkgNodeModulesDst)) {
+            try {
+              symlinkSync2(pkgNodeModulesSrc, pkgNodeModulesDst, "dir");
+              logger?.debug("parallel", "Symlinked package node_modules", {
+                storyId: story.id,
+                src: pkgNodeModulesSrc
+              });
+            } catch (symlinkError) {
+              logger?.warn("parallel", "Failed to symlink package node_modules \u2014 test runner may not find deps", {
+                storyId: story.id,
+                error: errorMessage(symlinkError)
+              });
+            }
+          }
+        }
+        const rootConfigPath = join48(projectRoot, ".nax", "config.json");
+        const effectiveConfig = story.workdir ? await loadConfigForWorkdir(rootConfigPath, story.workdir) : config2;
+        storyEffectiveConfigs.set(story.id, effectiveConfig);
       } catch (error48) {
         markStoryFailed(currentPrd, story.id, undefined, undefined);
         logger?.error("parallel", "Failed to create worktree", {
@@ -34450,7 +34488,7 @@ async function executeParallel(stories, prdPath, projectRoot, config2, hooks, pl
         });
       }
     }
-    const batchResult = await executeParallelBatch(batch, projectRoot, config2, baseContext, worktreePaths, maxConcurrency, eventEmitter);
+    const batchResult = await executeParallelBatch(batch, projectRoot, config2, baseContext, worktreePaths, maxConcurrency, eventEmitter, storyEffectiveConfigs);
     totalCost += batchResult.totalCost;
     if (batchResult.pipelinePassed.length > 0) {
       const successfulIds = batchResult.pipelinePassed.map((s) => s.id);
@@ -34520,6 +34558,7 @@ async function executeParallel(stories, prdPath, projectRoot, config2, hooks, pl
   return { storiesCompleted, totalCost, updatedPrd: currentPrd, mergeConflicts: allMergeConflicts };
 }
 var init_parallel_coordinator = __esm(() => {
+  init_loader();
   init_logger2();
   init_prd();
   init_manager();
@@ -34807,7 +34846,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, options.agentGetFn);
+    const parallelResult = await _parallelExecutorDeps.executeParallel(readyStories, prdPath, workdir, config2, hooks, pluginRegistry, prd, featureDir, parallelCount, eventEmitter, options.agentGetFn, options.pidRegistry, options.interactionChain);
     const batchDurationMs = Date.now() - batchStartMs;
     const batchCompletedAt = new Date().toISOString();
     prd = parallelResult.updatedPrd;
@@ -67812,7 +67851,7 @@ var require_jsx_dev_runtime = __commonJS((exports, module) => {
 
 // bin/nax.ts
 init_source();
-import { existsSync as existsSync34, mkdirSync as mkdirSync6 } from "fs";
+import { existsSync as existsSync35, mkdirSync as mkdirSync6 } from "fs";
 import { homedir as homedir8 } from "os";
 import { join as join56 } from "path";
 
@@ -69067,9 +69106,10 @@ async function planCommand(workdir, config2, options) {
   const timeoutSeconds = config2?.execution?.sessionTimeoutSeconds ?? 600;
   let rawResponse;
   if (options.auto) {
-    const prompt = buildPlanningPrompt(specContent, codebaseContext, undefined, relativePackages, packageDetails, config2?.project);
-    const cliAdapter = _planDeps.getAgent(agentName);
-    if (!cliAdapter)
+    const isAcp = config2?.agent?.protocol === "acp";
+    const prompt = buildPlanningPrompt(specContent, codebaseContext, isAcp ? outputPath : undefined, relativePackages, packageDetails, config2?.project);
+    const adapter = _planDeps.getAgent(agentName, config2);
+    if (!adapter)
       throw new Error(`[plan] No agent adapter found for '${agentName}'`);
     let autoModel;
     try {
@@ -69080,20 +69120,52 @@ async function planCommand(workdir, config2, options) {
       if (entry)
         autoModel = resolveModel2(entry).model;
     } catch {}
-    rawResponse = await cliAdapter.complete(prompt, {
-      model: autoModel,
-      jsonMode: true,
-      workdir,
-      config: config2,
-      featureName: options.feature,
-      sessionRole: "plan"
-    });
-    try {
-      const envelope = JSON.parse(rawResponse);
-      if (envelope?.type === "result" && typeof envelope?.result === "string") {
-        rawResponse = envelope.result;
+    if (isAcp) {
+      logger?.info("plan", "Starting ACP auto planning session", {
+        agent: agentName,
+        model: autoModel ?? config2?.plan?.model ?? "balanced",
+        workdir,
+        feature: options.feature,
+        timeoutSeconds
+      });
+      const pidRegistry = new PidRegistry(workdir);
+      try {
+        await adapter.plan({
+          prompt,
+          workdir,
+          interactive: false,
+          timeoutSeconds,
+          config: config2,
+          modelTier: config2?.plan?.model ?? "balanced",
+          dangerouslySkipPermissions: resolvePermissions(config2, "plan").skipPermissions,
+          maxInteractionTurns: config2?.agent?.maxInteractionTurns,
+          featureName: options.feature,
+          pidRegistry,
+          sessionRole: "plan"
+        });
+      } finally {
+        await pidRegistry.killAll().catch(() => {});
       }
-    } catch {}
+      if (!_planDeps.existsSync(outputPath)) {
+        throw new Error(`[plan] ACP agent did not write PRD to ${outputPath}. Check agent logs for errors.`);
+      }
+      rawResponse = await _planDeps.readFile(outputPath);
+    } else {
+      rawResponse = await adapter.complete(prompt, {
+        model: autoModel,
+        jsonMode: true,
+        workdir,
+        config: config2,
+        featureName: options.feature,
+        sessionRole: "plan"
+      });
+      try {
+        const envelope = JSON.parse(rawResponse);
+        if (envelope?.type === "result" && typeof envelope?.result === "string") {
+          rawResponse = envelope.result;
+        }
+      } catch {}
+    }
   } else {
     const prompt = buildPlanningPrompt(specContent, codebaseContext, outputPath, relativePackages, packageDetails, config2?.project);
     const adapter = _planDeps.getAgent(agentName, config2);
@@ -72116,7 +72188,9 @@ async function runExecutionPhase(options, prd, pluginRegistry) {
       pluginRegistry,
       formatterMode: options.formatterMode,
       headless: options.headless,
-      agentGetFn: options.agentGetFn
+      agentGetFn: options.agentGetFn,
+      pidRegistry: options.pidRegistry,
+      interactionChain: options.interactionChain
     }, prd);
     prd = parallelResult.prd;
     totalCost = parallelResult.totalCost;
@@ -79712,7 +79786,7 @@ Next: nax generate --package ${options.package}`));
     return;
   }
   const naxDir = join56(workdir, ".nax");
-  if (existsSync34(naxDir) && !options.force) {
+  if (existsSync35(naxDir) && !options.force) {
     console.log(source_default.yellow("nax already initialized. Use --force to overwrite."));
     return;
   }
@@ -79829,7 +79903,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 && !existsSync34(options.from)) {
+  if (options.from && !existsSync35(options.from)) {
     console.error(source_default.red(`Error: File not found: ${options.from} (required with --plan)`));
     process.exit(1);
   }
@@ -79861,7 +79935,7 @@ program2.command("run").description("Run the orchestration loop for a feature").
   const featureDir = join56(naxDir, "features", options.feature);
   const prdPath = join56(featureDir, "prd.json");
   if (options.plan && options.from) {
-    if (existsSync34(prdPath) && !options.force) {
+    if (existsSync35(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);
@@ -79917,7 +79991,7 @@ program2.command("run").description("Run the orchestration loop for a feature").
       process.exit(1);
     }
   }
-  if (!existsSync34(prdPath)) {
+  if (!existsSync35(prdPath)) {
     console.error(source_default.red(`Feature "${options.feature}" not found or missing prd.json`));
     process.exit(1);
   }
@@ -79992,7 +80066,7 @@ program2.command("run").description("Run the orchestration loop for a feature").
   });
   const latestSymlink = join56(runsDir, "latest.jsonl");
   try {
-    if (existsSync34(latestSymlink)) {
+    if (existsSync35(latestSymlink)) {
       Bun.spawnSync(["rm", latestSymlink]);
     }
     Bun.spawnSync(["ln", "-s", `${runId}.jsonl`, latestSymlink], {
@@ -80090,7 +80164,7 @@ features.command("list").description("List all features").option("-d, --dir <pat
     process.exit(1);
   }
   const featuresDir = join56(naxDir, "features");
-  if (!existsSync34(featuresDir)) {
+  if (!existsSync35(featuresDir)) {
     console.log(source_default.dim("No features yet."));
     return;
   }
@@ -80105,7 +80179,7 @@ Features:
 `));
   for (const name of entries) {
     const prdPath = join56(featuresDir, name, "prd.json");
-    if (existsSync34(prdPath)) {
+    if (existsSync35(prdPath)) {
       const prd = await loadPRD(prdPath);
       const c = countStories(prd);
       console.log(`  ${name} \u2014 ${c.passed}/${c.total} stories done`);
@@ -80176,7 +80250,7 @@ program2.command("analyze").description("(deprecated) Parse spec.md into prd.jso
     process.exit(1);
   }
   const featureDir = join56(naxDir, "features", options.feature);
-  if (!existsSync34(featureDir)) {
+  if (!existsSync35(featureDir)) {
     console.error(source_default.red(`Feature "${options.feature}" not found.`));
     process.exit(1);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.54.5",
+  "version": "0.54.6",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {
@@ -13,7 +13,7 @@
     "typecheck": "bun x tsc --noEmit",
     "lint": "bun x biome check src/ bin/",
     "release": "bun scripts/release.ts",
-    "test": "bun test test/ --timeout=60000",
+    "test": "bun test test/unit/ --timeout=60000 && bun test test/integration/ --timeout=60000 && bun test test/ui/ --timeout=60000",
     "test:watch": "bun test --watch",
     "test:unit": "bun test ./test/unit/ --timeout=60000",
     "test:integration": "bun test ./test/integration/ --timeout=60000",