@nathapp/nax 0.58.0 → 0.58.1

package/dist/nax.js

@@ -3596,75 +3596,106 @@ var init_env = __esm(() => {
 });
 
 // src/agents/acp/parser.ts
-function parseAcpxJsonOutput(rawOutput) {
-  const lines = rawOutput.split(`
-`).filter((l) => l.trim());
-  let text = "";
-  let tokenUsage;
-  let exactCostUsd;
-  let stopReason;
-  let error;
-  for (const line of lines) {
-    try {
-      const event = JSON.parse(line);
-      if (event.jsonrpc === "2.0") {
-        if (event.method === "session/update" && event.params?.update) {
-          const update = event.params.update;
-          if (update.sessionUpdate === "agent_message_chunk" && update.content?.type === "text" && update.content.text) {
-            text += update.content.text;
-          }
-          if (update.sessionUpdate === "usage_update" && typeof update.cost?.amount === "number") {
-            exactCostUsd = update.cost.amount;
-          }
-        }
-        if (event.id !== undefined && event.result && typeof event.result === "object") {
-          const result = event.result;
-          if (result.stopReason)
-            stopReason = result.stopReason;
-          if (result.stop_reason)
-            stopReason = result.stop_reason;
-          if (result.usage && typeof result.usage === "object") {
-            const u = result.usage;
-            tokenUsage = {
-              input_tokens: u.inputTokens ?? u.input_tokens ?? 0,
-              output_tokens: u.outputTokens ?? u.output_tokens ?? 0,
-              cache_read_input_tokens: u.cachedReadTokens ?? u.cache_read_input_tokens ?? 0,
-              cache_creation_input_tokens: u.cachedWriteTokens ?? u.cache_creation_input_tokens ?? 0
-            };
-          }
+function createParseState() {
+  return { text: "", tokenUsage: undefined, exactCostUsd: undefined, stopReason: undefined, error: undefined };
+}
+function parseAcpxJsonLine(line, state) {
+  try {
+    const event = JSON.parse(line);
+    if (event.jsonrpc === "2.0") {
+      if (event.method === "session/update" && event.params?.update) {
+        const update = event.params.update;
+        if (update.sessionUpdate === "agent_message_chunk" && update.content?.type === "text" && update.content.text) {
+          state.text += update.content.text;
+        }
+        if (update.sessionUpdate === "usage_update" && typeof update.cost?.amount === "number") {
+          state.exactCostUsd = update.cost.amount;
+        }
+      }
+      if (event.id !== undefined && event.result && typeof event.result === "object") {
+        const result = event.result;
+        if (result.stopReason)
+          state.stopReason = result.stopReason;
+        if (result.stop_reason)
+          state.stopReason = result.stop_reason;
+        if (result.usage && typeof result.usage === "object") {
+          const u = result.usage;
+          state.tokenUsage = {
+            input_tokens: u.inputTokens ?? u.input_tokens ?? 0,
+            output_tokens: u.outputTokens ?? u.output_tokens ?? 0,
+            cache_read_input_tokens: u.cachedReadTokens ?? u.cache_read_input_tokens ?? 0,
+            cache_creation_input_tokens: u.cachedWriteTokens ?? u.cache_creation_input_tokens ?? 0
+          };
         }
-        continue;
-      }
-      if (event.content && typeof event.content === "string")
-        text += event.content;
-      if (event.text && typeof event.text === "string")
-        text += event.text;
-      if (event.result && typeof event.result === "string")
-        text = event.result;
-      if (event.cumulative_token_usage)
-        tokenUsage = event.cumulative_token_usage;
-      if (event.usage) {
-        tokenUsage = {
-          input_tokens: event.usage.input_tokens ?? event.usage.prompt_tokens ?? 0,
-          output_tokens: event.usage.output_tokens ?? event.usage.completion_tokens ?? 0
-        };
-      }
-      if (event.stopReason)
-        stopReason = event.stopReason;
-      if (event.stop_reason)
-        stopReason = event.stop_reason;
-      if (event.error) {
-        error = typeof event.error === "string" ? event.error : event.error.message ?? JSON.stringify(event.error);
       }
-    } catch {
-      if (!text)
-        text = line;
+      return;
+    }
+    if (event.content && typeof event.content === "string")
+      state.text += event.content;
+    if (event.text && typeof event.text === "string")
+      state.text += event.text;
+    if (event.result && typeof event.result === "string")
+      state.text = event.result;
+    if (event.cumulative_token_usage)
+      state.tokenUsage = event.cumulative_token_usage;
+    if (event.usage) {
+      state.tokenUsage = {
+        input_tokens: event.usage.input_tokens ?? event.usage.prompt_tokens ?? 0,
+        output_tokens: event.usage.output_tokens ?? event.usage.completion_tokens ?? 0
+      };
     }
+    if (event.stopReason)
+      state.stopReason = event.stopReason;
+    if (event.stop_reason)
+      state.stopReason = event.stop_reason;
+    if (event.error) {
+      state.error = typeof event.error === "string" ? event.error : event.error.message ?? JSON.stringify(event.error);
+    }
+  } catch {
+    if (!state.text)
+      state.text = line;
   }
-  return { text: text.trim(), tokenUsage, exactCostUsd, stopReason, error };
+}
+function finalizeParseState(state) {
+  return {
+    text: state.text.trim(),
+    tokenUsage: state.tokenUsage,
+    exactCostUsd: state.exactCostUsd,
+    stopReason: state.stopReason,
+    error: state.error
+  };
 }
 
 // src/agents/acp/spawn-client.ts
+async function readAndParseLines(stream, state) {
+  const decoder = new TextDecoder;
+  let remainder = "";
+  const reader = stream.getReader();
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      remainder += decoder.decode(value, { stream: true });
+      for (;; ) {
+        const nl = remainder.indexOf(`
+`);
+        if (nl < 0)
+          break;
+        const line = remainder.slice(0, nl);
+        remainder = remainder.slice(nl + 1);
+        if (line.trim())
+          parseAcpxJsonLine(line, state);
+      }
+    }
+    remainder += decoder.decode();
+    if (remainder.trim())
+      parseAcpxJsonLine(remainder.trim(), state);
+  } finally {
+    reader.releaseLock();
+  }
+}
+
 class SpawnAcpSession {
   agentName;
   sessionName;
@@ -3729,13 +3760,22 @@ class SpawnAcpSession {
           session: this.sessionName
         });
       }
-      const stdoutPromise = new Response(proc.stdout).text().catch(() => "");
+      const parseState = createParseState();
+      const parsePromise = readAndParseLines(proc.stdout, parseState).catch(() => {});
       const stderrPromise = new Response(proc.stderr).text().catch(() => "");
       const exitCode = await proc.exited;
-      const drained = Bun.sleep(_spawnClientDeps.streamDrainTimeoutMs).then(() => "");
-      const [stdout, stderr] = await Promise.all([
-        Promise.race([stdoutPromise, drained]),
-        Promise.race([stderrPromise, drained])
+      const makeDrain = (ms) => {
+        let id;
+        const promise = new Promise((resolve) => {
+          id = setTimeout(() => resolve(""), ms);
+        });
+        return { promise, cancel: () => clearTimeout(id) };
+      };
+      const drainA = makeDrain(_spawnClientDeps.streamDrainTimeoutMs);
+      const drainB = makeDrain(_spawnClientDeps.streamDrainTimeoutMs);
+      const [, stderr] = await Promise.all([
+        Promise.race([parsePromise, drainA.promise]).finally(() => drainA.cancel()),
+        Promise.race([stderrPromise, drainB.promise]).finally(() => drainB.cancel())
       ]);
       if (exitCode !== 0) {
         getSafeLogger()?.warn("acp-adapter", `Session prompt exited with code ${exitCode}`, {
@@ -3748,7 +3788,7 @@ class SpawnAcpSession {
         };
       }
       try {
-        const parsed = parseAcpxJsonOutput(stdout);
+        const parsed = finalizeParseState(parseState);
         return {
           messages: [{ role: "assistant", content: parsed.text || "" }],
           stopReason: parsed.stopReason ?? "end_turn",
@@ -18209,7 +18249,9 @@ var init_schemas3 = __esm(() => {
       typecheck: exports_external.string().optional(),
       lint: exports_external.string().optional(),
       test: exports_external.string().optional(),
-      build: exports_external.string().optional()
+      build: exports_external.string().optional(),
+      lintFix: exports_external.string().optional(),
+      formatFix: exports_external.string().optional()
     }),
     pluginMode: exports_external.enum(["per-story", "deferred"]).default("per-story"),
     semantic: SemanticReviewConfigSchema.optional(),
@@ -20862,7 +20904,7 @@ function isPlainObject2(value) {
 
 // src/config/path-security.ts
 import { existsSync as existsSync3, lstatSync, realpathSync } from "fs";
-import { isAbsolute as isAbsolute3, normalize, resolve } from "path";
+import { basename, isAbsolute as isAbsolute3, normalize, resolve } from "path";
 function validateDirectory(dirPath, baseDir) {
   const resolved = resolve(dirPath);
   if (!existsSync3(resolved)) {
@@ -20909,7 +20951,7 @@ function validateFilePath(filePath, baseDir) {
       const parent = resolve(resolved, "..");
       if (existsSync3(parent)) {
         const realParent = realpathSync(parent);
-        realPath = resolve(realParent, filePath.split("/").pop() || "");
+        realPath = resolve(realParent, basename(resolved));
       } else {
         realPath = resolved;
       }
@@ -21093,7 +21135,7 @@ var init_profile = __esm(() => {
 
 // src/config/loader.ts
 import { existsSync as existsSync4 } from "fs";
-import { basename, dirname, join as join6, resolve as resolve3 } from "path";
+import { basename as basename2, dirname, join as join6, resolve as resolve3 } from "path";
 function globalConfigPath() {
   return join6(globalConfigDir(), "config.json");
 }
@@ -21148,8 +21190,8 @@ function applyBatchModeCompat(conf) {
 }
 async function loadConfig(startDir, cliOverrides) {
   let rawConfig = structuredClone(DEFAULT_CONFIG);
-  const projDir = startDir ? basename(startDir) === PROJECT_NAX_DIR ? startDir : findProjectDir(startDir) : findProjectDir();
-  const projectRoot = startDir ? basename(startDir) === PROJECT_NAX_DIR ? dirname(startDir) : startDir : process.cwd();
+  const projDir = startDir ? basename2(startDir) === PROJECT_NAX_DIR ? startDir : findProjectDir(startDir) : findProjectDir();
+  const projectRoot = startDir ? basename2(startDir) === PROJECT_NAX_DIR ? dirname(startDir) : startDir : process.cwd();
   const profileName = await resolveProfileName(cliOverrides ?? {}, process.env, projectRoot);
   const globalConfRaw = await loadJsonFile(globalConfigPath(), "config");
   if (globalConfRaw) {
@@ -21202,7 +21244,7 @@ async function loadConfigForWorkdir(rootConfigPath, packageDir) {
   const packageConfigPath = join6(repoRoot, PROJECT_NAX_DIR, "mono", packageDir, "config.json");
   const packageOverride = await loadJsonFile(packageConfigPath, "config");
   if (!packageOverride) {
-    logger.debug("config", "Per-package config not found \u2014 falling back to root config", {
+    logger.info("config", "Per-package config not found \u2014 falling back to root config", {
       packageConfigPath,
       packageDir
     });
@@ -22761,7 +22803,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.58.0",
+    version: "0.58.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22841,8 +22883,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("073d6b70"))
-        return "073d6b70";
+      if (/^[0-9a-f]{6,10}$/.test("2975c129"))
+        return "2975c129";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -29092,8 +29134,8 @@ var init_autofix = __esm(() => {
         return { action: "continue" };
       }
       const effectiveConfig = ctx.effectiveConfig ?? ctx.config;
-      const lintFixCmd = effectiveConfig.quality.commands.lintFix;
-      const formatFixCmd = effectiveConfig.quality.commands.formatFix;
+      const lintFixCmd = effectiveConfig.quality.commands.lintFix ?? effectiveConfig.review.commands.lintFix;
+      const formatFixCmd = effectiveConfig.quality.commands.formatFix ?? effectiveConfig.review.commands.formatFix;
       const effectiveWorkdir = ctx.story.workdir ? join20(ctx.workdir, ctx.story.workdir) : ctx.workdir;
       const failedCheckNames = new Set((reviewResult.checks ?? []).filter((c) => !c.success).map((c) => c.check));
       const hasLintFailure = failedCheckNames.has("lint");
@@ -29757,8 +29799,8 @@ function extractTestStructure(source) {
 function deriveTestPatterns(contextFiles) {
   const patterns = new Set;
   for (const filePath of contextFiles) {
-    const basename2 = path7.basename(filePath);
-    const basenameNoExt = basename2.replace(/\.(ts|js|tsx|jsx)$/, "");
+    const basename3 = path7.basename(filePath);
+    const basenameNoExt = basename3.replace(/\.(ts|js|tsx|jsx)$/, "");
     patterns.add(`${basenameNoExt}.test.ts`);
     patterns.add(`${basenameNoExt}.test.js`);
     patterns.add(`${basenameNoExt}.test.tsx`);
@@ -29811,8 +29853,8 @@ async function scanTestFiles(options) {
   const files = [];
   for await (const filePath of glob.scan({ cwd: scanDir, absolute: false })) {
     if (allowedBasenames !== null) {
-      const basename2 = path7.basename(filePath);
-      if (!allowedBasenames.has(basename2)) {
+      const basename3 = path7.basename(filePath);
+      if (!allowedBasenames.has(basename3)) {
         continue;
       }
     }
@@ -34044,8 +34086,8 @@ function extractSearchTerms(sourceFile) {
   const withoutSrc = sourceFile.replace(/^src\//, "");
   const withoutExt = withoutSrc.replace(/\.ts$/, "");
   const parts = withoutExt.split("/");
-  const basename2 = parts[parts.length - 1];
-  return [`/${basename2}`, withoutExt];
+  const basename3 = parts[parts.length - 1];
+  return [`/${basename3}`, withoutExt];
 }
 async function importGrepFallback(sourceFiles, workdir, testFilePatterns) {
   if (sourceFiles.length === 0 || testFilePatterns.length === 0)
@@ -34403,7 +34445,6 @@ var init_regression2 = __esm(() => {
 import { join as join28 } from "path";
 var routingStage, _routingDeps;
 var init_routing2 = __esm(() => {
-  init_registry();
   init_greenfield();
   init_logger2();
   init_prd();
@@ -34417,6 +34458,9 @@ var init_routing2 = __esm(() => {
       const effectiveConfig = ctx.effectiveConfig ?? ctx.config;
       const agentName = effectiveConfig.execution?.agent ?? "claude";
       const adapter = ctx.agentGetFn ? ctx.agentGetFn(agentName) : undefined;
+      if (ctx.story.id === ctx.stories[0]?.id) {
+        _routingDeps.clearCache();
+      }
       const decision = await _routingDeps.resolveRouting(ctx.story, effectiveConfig, ctx.plugins, adapter);
       const TIER_RANK = { fast: 0, balanced: 1, powerful: 2 };
       const derivedTier = decision.modelTier;
@@ -34467,8 +34511,7 @@ var init_routing2 = __esm(() => {
     complexityToModelTier,
     isGreenfieldStory,
     clearCache,
-    savePRD,
-    getAgent
+    savePRD
   };
 });
 
@@ -34769,7 +34812,7 @@ __export(exports_init_context, {
 });
 import { existsSync as existsSync24 } from "fs";
 import { mkdir as mkdir2 } from "fs/promises";
-import { basename as basename3, join as join33 } from "path";
+import { basename as basename4, join as join33 } from "path";
 async function findFiles(dir, maxFiles = 200) {
   try {
     const proc = Bun.spawnSync([
@@ -34857,7 +34900,7 @@ async function scanProject(projectRoot) {
   const readmeSnippet = await readReadmeSnippet(projectRoot);
   const entryPoints = await detectEntryPoints(projectRoot);
   const configFiles = await detectConfigFiles(projectRoot);
-  const projectName = packageManifest?.name || basename3(projectRoot);
+  const projectName = packageManifest?.name || basename4(projectRoot);
   return {
     projectName,
     fileTree,
@@ -35439,11 +35482,11 @@ function getSafeLogger6() {
   return getSafeLogger();
 }
 function extractPluginName(pluginPath) {
-  const basename5 = path13.basename(pluginPath);
-  if (basename5 === "index.ts" || basename5 === "index.js" || basename5 === "index.mjs") {
+  const basename6 = path13.basename(pluginPath);
+  if (basename6 === "index.ts" || basename6 === "index.js" || basename6 === "index.mjs") {
     return path13.basename(path13.dirname(pluginPath));
   }
-  return basename5.replace(/\.(ts|js|mjs)$/, "");
+  return basename6.replace(/\.(ts|js|mjs)$/, "");
 }
 async function loadPlugins(globalDir, projectDir, configPlugins, projectRoot, disabledPlugins) {
   const loadedPlugins = [];
@@ -35685,8 +35728,50 @@ function validateHookCommand(command) {
   }
 }
 function parseCommandToArgv(command) {
-  const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
-  return command.trim().split(/\s+/).map((token) => token.startsWith("~/") ? home + token.slice(1) : token);
+  const safeEnv = buildAllowedEnv();
+  const home = safeEnv.HOME ?? "";
+  const args = [];
+  let current = "";
+  let i = 0;
+  const s = command.trim();
+  while (i < s.length) {
+    const ch = s[i];
+    if (ch === " " || ch === "\t") {
+      if (current.length > 0) {
+        args.push(current);
+        current = "";
+      }
+      i++;
+      continue;
+    }
+    if (ch === "'") {
+      i++;
+      while (i < s.length && s[i] !== "'") {
+        current += s[i++];
+      }
+      i++;
+      continue;
+    }
+    if (ch === '"') {
+      i++;
+      while (i < s.length && s[i] !== '"') {
+        if (s[i] === "\\" && i + 1 < s.length && (s[i + 1] === '"' || s[i + 1] === "\\")) {
+          current += s[i + 1];
+          i += 2;
+        } else {
+          current += s[i++];
+        }
+      }
+      i++;
+      continue;
+    }
+    current += ch;
+    i++;
+  }
+  if (current.length > 0) {
+    args.push(current);
+  }
+  return args.map((token) => token.startsWith("~/") && home ? home + token.slice(1) : token);
 }
 async function executeHook(hookDef, ctx, workdir) {
   if (hookDef.enabled === false) {
@@ -35719,7 +35804,7 @@ async function executeHook(hookDef, ctx, workdir) {
     stdin: new Response(contextJson),
     stdout: "pipe",
     stderr: "pipe",
-    env: { ...process.env, ...env2 }
+    env: buildAllowedEnv({ env: env2 })
   });
   const timeoutId = setTimeout(() => {
     killProcessGroup(proc.pid, "SIGTERM");
@@ -35769,6 +35854,7 @@ async function fireHook(config2, event, ctx, workdir) {
 }
 var DEFAULT_TIMEOUT = 5000;
 var init_runner4 = __esm(() => {
+  init_env();
   init_logger2();
   init_json_file();
 });
@@ -35780,46 +35866,51 @@ var init_hooks = __esm(() => {
 
 // src/execution/crash-heartbeat.ts
 import { appendFileSync as appendFileSync2 } from "fs";
-function startHeartbeat(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
+async function heartbeatLoop(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
   const logger = getSafeLogger();
-  stopHeartbeat();
-  heartbeatTimer = setInterval(() => {
-    (async () => {
-      try {
-        logger?.debug("crash-recovery", "Heartbeat");
-        if (jsonlFilePath) {
-          const heartbeatEntry = {
-            timestamp: new Date().toISOString(),
-            level: "debug",
-            stage: "heartbeat",
-            message: "Process alive",
-            data: {
-              pid: process.pid,
-              memoryUsageMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
-            }
-          };
-          const line = `${JSON.stringify(heartbeatEntry)}
+  while (heartbeatActive) {
+    await Bun.sleep(60000);
+    if (!heartbeatActive)
+      break;
+    try {
+      logger?.debug("crash-recovery", "Heartbeat");
+      if (jsonlFilePath) {
+        const heartbeatEntry = {
+          timestamp: new Date().toISOString(),
+          level: "debug",
+          stage: "heartbeat",
+          message: "Process alive",
+          data: {
+            pid: process.pid,
+            memoryUsageMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
+          }
+        };
+        const line = `${JSON.stringify(heartbeatEntry)}
 `;
-          appendFileSync2(jsonlFilePath, line);
-        }
-        await statusWriter.update(getTotalCost(), getIterations(), {
-          lastHeartbeat: new Date().toISOString()
-        });
-      } catch (err) {
-        logger?.warn("crash-recovery", "Failed during heartbeat", { error: err.message });
+        appendFileSync2(jsonlFilePath, line);
       }
-    })().catch(() => {});
-  }, 60000);
+      await statusWriter.update(getTotalCost(), getIterations(), {
+        lastHeartbeat: new Date().toISOString()
+      });
+    } catch (err) {
+      logger?.warn("crash-recovery", "Failed during heartbeat", { error: err.message });
+    }
+  }
+}
+function startHeartbeat(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
+  const logger = getSafeLogger();
+  stopHeartbeat();
+  heartbeatActive = true;
+  heartbeatLoop(statusWriter, getTotalCost, getIterations, jsonlFilePath).catch(() => {});
   logger?.debug("crash-recovery", "Heartbeat started (60s interval)");
 }
 function stopHeartbeat() {
-  if (heartbeatTimer) {
-    clearInterval(heartbeatTimer);
-    heartbeatTimer = null;
+  if (heartbeatActive) {
+    heartbeatActive = false;
     getSafeLogger()?.debug("crash-recovery", "Heartbeat stopped");
   }
 }
-var heartbeatTimer = null;
+var heartbeatActive = false;
 var init_crash_heartbeat = __esm(() => {
   init_logger2();
 });
@@ -35847,7 +35938,8 @@ async function writeFatalLog(jsonlFilePath, signal, error48) {
 `;
     appendFileSync3(jsonlFilePath, line);
   } catch (err) {
-    console.error("[crash-recovery] Failed to write fatal log:", err);
+    process.stderr.write(`[crash-recovery] Failed to write fatal log: ${String(err)}
+`);
   }
 }
 async function writeRunComplete(ctx, exitReason) {
@@ -35883,7 +35975,8 @@ async function writeRunComplete(ctx, exitReason) {
     appendFileSync3(ctx.jsonlFilePath, line);
     logger?.debug("crash-recovery", "run.complete event written", { exitReason });
   } catch (err) {
-    console.error("[crash-recovery] Failed to write run.complete event:", err);
+    process.stderr.write(`[crash-recovery] Failed to write run.complete event: ${String(err)}
+`);
   }
 }
 async function updateStatusToCrashed(statusWriter, totalCost, iterations, signal, featureDir) {
@@ -35900,7 +35993,8 @@ async function updateStatusToCrashed(statusWriter, totalCost, iterations, signal
       });
     }
   } catch (err) {
-    console.error("[crash-recovery] Failed to update status.json:", err);
+    process.stderr.write(`[crash-recovery] Failed to update status.json: ${String(err)}
+`);
   }
 }
 async function writeExitSummary(jsonlFilePath, totalCost, iterations, storiesCompleted, durationMs) {
@@ -37366,10 +37460,10 @@ var init_headless_formatter = __esm(() => {
 // src/pipeline/subscribers/events-writer.ts
 import { appendFile as appendFile3, mkdir as mkdir3 } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { basename as basename6, join as join51 } from "path";
+import { basename as basename7, join as join51 } from "path";
 function wireEventsWriter(bus, feature, runId, workdir) {
   const logger = getSafeLogger();
-  const project = basename6(workdir);
+  const project = basename7(workdir);
   const eventsDir = join51(homedir5(), ".nax", "events", project);
   const eventsFile = join51(eventsDir, "events.jsonl");
   let dirReady = false;
@@ -37552,10 +37646,10 @@ var init_interaction2 = __esm(() => {
 // src/pipeline/subscribers/registry.ts
 import { mkdir as mkdir4, writeFile } from "fs/promises";
 import { homedir as homedir6 } from "os";
-import { basename as basename7, join as join52 } from "path";
+import { basename as basename8, join as join52 } from "path";
 function wireRegistry(bus, feature, runId, workdir) {
   const logger = getSafeLogger();
-  const project = basename7(workdir);
+  const project = basename8(workdir);
   const runDir = join52(homedir6(), ".nax", "runs", `${project}-${feature}-${runId}`);
   const metaFile = join52(runDir, "meta.json");
   const unsub = bus.on("run:started", (_ev) => {
@@ -38499,7 +38593,7 @@ async function executeParallelBatch(stories, projectRoot, config2, context, work
       executing.delete(executePromise);
     });
     executing.add(executePromise);
-    if (executing.size >= maxConcurrency) {
+    while (executing.size >= maxConcurrency) {
       await Promise.race(executing);
     }
   }
@@ -39051,12 +39145,10 @@ async function runParallelBatch(options) {
   }
   const rootConfigPath = path17.join(workdir, ".nax", "config.json");
   const storyEffectiveConfigs = new Map;
-  for (const story of stories) {
-    if (story.workdir) {
-      const effectiveConfig = await loadConfigForWorkdir(rootConfigPath, story.workdir);
-      storyEffectiveConfigs.set(story.id, effectiveConfig);
-    }
-  }
+  await Promise.all(stories.filter((story) => story.workdir).map(async (story) => {
+    const effectiveConfig = await loadConfigForWorkdir(rootConfigPath, story.workdir);
+    storyEffectiveConfigs.set(story.id, effectiveConfig);
+  }));
   const workerResult = await _parallelBatchDeps.executeParallelBatch(stories, workdir, config2, pipelineContext, worktreePaths, maxConcurrency, eventEmitter, storyEffectiveConfigs.size > 0 ? storyEffectiveConfigs : undefined);
   const batchEndMs = Date.now();
   const completed = [];
@@ -72318,7 +72410,7 @@ init_logger2();
 
 // src/prd/decompose-mapper.ts
 init_errors();
-function mapDecomposedStoriesToUserStories(stories, parentStoryId) {
+function mapDecomposedStoriesToUserStories(stories, parentStoryId, parentWorkdir) {
   return stories.map((story, entryIndex) => {
     if (!story.id) {
       throw new NaxError(`Entry at index ${entryIndex} is missing required field: id`, "DECOMPOSE_VALIDATION_FAILED", {
@@ -72348,6 +72440,7 @@ function mapDecomposedStoriesToUserStories(stories, parentStoryId) {
       escalations: [],
       attempts: 0,
       parentStoryId,
+      ...parentWorkdir !== undefined && { workdir: parentWorkdir },
       routing: {
         complexity: story.complexity,
         testStrategy: story.testStrategy ?? "test-after",
@@ -73032,6 +73125,15 @@ async function planDecomposeCommand(workdir, config2, options) {
   const timeoutSeconds = config2?.plan?.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS2;
   const maxAcCount = config2?.precheck?.storySizeGate?.maxAcCount ?? Number.POSITIVE_INFINITY;
   const maxReplanAttempts = config2?.precheck?.storySizeGate?.maxReplanAttempts ?? 3;
+  let decomposeModelDef;
+  try {
+    const decomposeTier = config2?.plan?.model ?? "balanced";
+    const { resolveModelForAgent: resolveModelForAgent2 } = await Promise.resolve().then(() => (init_schema(), exports_schema));
+    if (config2?.models) {
+      const defaultAgent = config2.autoMode?.defaultAgent ?? "claude";
+      decomposeModelDef = resolveModelForAgent2(config2.models, agentName, decomposeTier, defaultAgent);
+    }
+  } catch {}
   if (typeof adapter.decompose !== "function") {
     throw new NaxError(`Agent "${agentName}" does not support decompose() required by plan --decompose`, "DECOMPOSE_NOT_SUPPORTED", { stage: "decompose", agent: agentName, storyId: options.storyId });
   }
@@ -73078,7 +73180,8 @@ ${repairHint}` : codebaseContext;
         siblings,
         featureName: options.feature,
         storyId: options.storyId,
-        config: config2
+        config: config2,
+        modelDef: decomposeModelDef
       });
       decompStories = result.stories;
     }
@@ -73100,7 +73203,7 @@ ${repairHint}` : codebaseContext;
     repairHint = `REPAIR REQUIRED (attempt ${attempt + 1}/${maxReplanAttempts}): The following sub-stories exceeded maxAcCount of ${maxAcCount}: ${violationSummary}. Split each offending story further so every sub-story has at most ${maxAcCount} acceptance criteria.`;
     decompStories = undefined;
   }
-  const subStoriesWithParent = mapDecomposedStoriesToUserStories(decompStories, options.storyId);
+  const subStoriesWithParent = mapDecomposedStoriesToUserStories(decompStories, options.storyId, targetStory.workdir);
   const updatedStories = prd.userStories.map((s) => s.id === options.storyId ? { ...s, status: "decomposed" } : s);
   const originalIndex = updatedStories.findIndex((s) => s.id === options.storyId);
   const finalStories = [
@@ -83184,8 +83287,9 @@ function usePipelineEvents(events, initialStories) {
     totalCost: 0,
     elapsedMs: 0
   }));
-  const startTime = Date.now();
+  const startTimeRef = import_react32.useRef(Date.now());
   import_react32.useEffect(() => {
+    const startTime = startTimeRef.current;
     let timer = null;
     const startTimer = () => {
       if (!timer) {
@@ -83272,7 +83376,7 @@ function usePipelineEvents(events, initialStories) {
       events.off("stage:enter", onStageEnter);
       events.off("run:complete", onRunComplete);
     };
-  }, [events, startTime]);
+  }, [events]);
   return state;
 }
 

package/package.json

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