@nathapp/nax 0.58.2 → 0.58.4

package/dist/nax.js

@@ -3483,8 +3483,8 @@ function parseAgentError(stderr) {
 }
 
 // src/agents/acp/prompt-audit.ts
-import { mkdirSync as mkdirSync2 } from "fs";
-import { isAbsolute, join } from "path";
+import { existsSync as fsExistsSync, mkdirSync as mkdirSync2 } from "fs";
+import { dirname, isAbsolute, join, resolve, sep } from "path";
 function buildAuditFilename(entry, epochMs) {
   const stage = entry.pipelineStage ?? entry.callType;
   if (entry.callType === "run" && entry.turn !== undefined) {
@@ -3509,13 +3509,30 @@ function buildAuditContent(entry, epochMs) {
   return lines.join(`
 `);
 }
+function findNaxProjectRoot(startDir) {
+  let dir = resolve(startDir);
+  for (let depth = 0;depth < MAX_NAX_WALK_DEPTH; depth++) {
+    if (_promptAuditDeps.existsSync(join(dir, ".nax", "config.json"))) {
+      return dir;
+    }
+    const parent = dirname(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  return startDir;
+}
 async function writePromptAudit(entry) {
   try {
     let baseDir;
     if (entry.auditDir) {
       baseDir = isAbsolute(entry.auditDir) ? entry.auditDir : join(entry.workdir, entry.auditDir);
     } else {
-      baseDir = join(entry.workdir, ".nax", "prompt-audit");
+      const wtMarker = `${sep}.nax-wt${sep}`;
+      const wtIdx = entry.workdir.indexOf(wtMarker);
+      const strippedWorkdir = wtIdx !== -1 ? entry.workdir.substring(0, wtIdx) : entry.workdir;
+      const projectRoot = findNaxProjectRoot(strippedWorkdir);
+      baseDir = join(projectRoot, ".nax", "prompt-audit");
     }
     const resolvedDir = join(baseDir, entry.featureName ?? "_unknown");
     _promptAuditDeps.mkdirSync(resolvedDir);
@@ -3530,13 +3547,16 @@ async function writePromptAudit(entry) {
     });
   }
 }
-var _promptAuditDeps;
+var _promptAuditDeps, MAX_NAX_WALK_DEPTH = 10;
 var init_prompt_audit = __esm(() => {
   init_logger2();
   _promptAuditDeps = {
     mkdirSync(path) {
       mkdirSync2(path, { recursive: true });
     },
+    existsSync(path) {
+      return fsExistsSync(path);
+    },
     async writeFile(path, content) {
       await Bun.write(path, content);
     },
@@ -3766,8 +3786,8 @@ class SpawnAcpSession {
       const exitCode = await proc.exited;
       const makeDrain = (ms) => {
         let id;
-        const promise = new Promise((resolve) => {
-          id = setTimeout(() => resolve(""), ms);
+        const promise = new Promise((resolve2) => {
+          id = setTimeout(() => resolve2(""), ms);
         });
         return { promise, cancel: () => clearTimeout(id) };
       };
@@ -18799,8 +18819,8 @@ async function ensureAcpSession(client, sessionName, agentName, permissionMode)
 async function runSessionPrompt(session, prompt, timeoutMs) {
   const promptPromise = session.prompt(prompt);
   let timeoutId;
-  const timeoutPromise = new Promise((resolve) => {
-    timeoutId = setTimeout(() => resolve("timeout"), timeoutMs);
+  const timeoutPromise = new Promise((resolve2) => {
+    timeoutId = setTimeout(() => resolve2("timeout"), timeoutMs);
   });
   let winner;
   try {
@@ -18976,12 +18996,14 @@ function extractQuestion(output) {
 }
 
 class AcpAgentAdapter {
+  naxConfig;
   name;
   displayName;
   binary;
   capabilities;
   _unavailableAgents;
-  constructor(agentName) {
+  constructor(agentName, naxConfig) {
+    this.naxConfig = naxConfig;
     const entry = resolveRegistryEntry(agentName);
     this.name = agentName;
     this.displayName = entry.displayName;
@@ -19158,12 +19180,13 @@ class AcpAgentAdapter {
       while (turnCount < MAX_TURNS) {
         turnCount++;
         getSafeLogger()?.debug("acp-adapter", `Session turn ${turnCount}/${MAX_TURNS}`, { sessionName });
-        if (options.config?.agent?.promptAudit?.enabled) {
+        const _runAuditConfig = options.config;
+        if (_runAuditConfig?.agent?.promptAudit?.enabled) {
           writePromptAudit({
             prompt: currentPrompt,
             sessionName,
             workdir: options.workdir,
-            auditDir: options.config.agent.promptAudit.dir,
+            auditDir: _runAuditConfig.agent.promptAudit.dir,
             storyId: options.storyId,
             featureName: options.featureName,
             pipelineStage: options.pipelineStage ?? "run",
@@ -19265,7 +19288,7 @@ class AcpAgentAdapter {
     };
   }
   async complete(prompt, _options) {
-    const timeoutMs = _options?.timeoutMs ?? 120000;
+    const timeoutMs = _options?.timeoutMs || 120000;
     const permissionMode = resolvePermissions(_options?.config, "complete").mode;
     const workdir = _options?.workdir;
     const config2 = _options?.config;
@@ -19291,15 +19314,16 @@ class AcpAgentAdapter {
       try {
         const completeSessionName = _options?.sessionName ?? buildSessionName(workdir ?? process.cwd(), _options?.featureName, _options?.storyId, _options?.sessionRole);
         session = await client.createSession({ agentName, permissionMode, sessionName: completeSessionName });
-        if (config2?.agent?.promptAudit?.enabled) {
+        const _completeAuditConfig = config2 ?? this.naxConfig;
+        if (_completeAuditConfig?.agent?.promptAudit?.enabled) {
           writePromptAudit({
             prompt,
             sessionName: completeSessionName,
             workdir: workdir ?? process.cwd(),
-            auditDir: config2.agent.promptAudit.dir,
+            auditDir: _completeAuditConfig.agent.promptAudit.dir,
             storyId: _options?.storyId,
             featureName: _options?.featureName,
-            pipelineStage: "complete",
+            pipelineStage: _options?.pipelineStage ?? "complete",
             callType: "complete"
           });
         }
@@ -19449,9 +19473,9 @@ class AcpAgentAdapter {
       modelTier: options.modelTier ?? "balanced",
       modelDef,
       timeoutSeconds,
-      dangerouslySkipPermissions: resolvePermissions(options.config, "plan").skipPermissions,
+      dangerouslySkipPermissions: resolvePermissions(this.naxConfig, "plan").skipPermissions,
       pipelineStage: "plan",
-      config: options.config,
+      config: this.naxConfig,
       interactionBridge: options.interactionBridge,
       maxInteractionTurns: options.maxInteractionTurns,
       featureName: options.featureName,
@@ -19478,7 +19502,7 @@ class AcpAgentAdapter {
       const completeResult = await this.complete(prompt, {
         model,
         jsonMode: true,
-        config: options.config,
+        config: this.naxConfig,
         workdir: options.workdir,
         featureName: options.featureName,
         storyId: options.storyId,
@@ -19852,8 +19876,8 @@ async function withProcessTimeout(proc, timeoutMs, opts) {
   try {
     const hardDeadlineMs = timeoutMs + graceMs + hardDeadlineBufferMs;
     let hardDeadlineId;
-    const hardDeadlinePromise = new Promise((resolve) => {
-      hardDeadlineId = setTimeout(() => resolve(-1), hardDeadlineMs);
+    const hardDeadlinePromise = new Promise((resolve2) => {
+      hardDeadlineId = setTimeout(() => resolve2(-1), hardDeadlineMs);
     });
     exitCode = await Promise.race([proc.exited, hardDeadlinePromise]);
     clearTimeout(hardDeadlineId);
@@ -19964,8 +19988,8 @@ async function executeOnce(binary, options, pidRegistry) {
   let stdoutTimeoutId;
   const stdout = await Promise.race([
     new Response(proc.stdout).text(),
-    new Promise((resolve) => {
-      stdoutTimeoutId = setTimeout(() => resolve(""), 5000);
+    new Promise((resolve2) => {
+      stdoutTimeoutId = setTimeout(() => resolve2(""), 5000);
     })
   ]);
   clearTimeout(stdoutTimeoutId);
@@ -20129,7 +20153,7 @@ ${inputContent}`;
   }
   return cmd;
 }
-async function runPlan(binary, options, pidRegistry, buildAllowedEnv2) {
+async function runPlan(binary, options, pidRegistry) {
   const { resolveBalancedModelDef: resolveBalancedModelDef2 } = await Promise.resolve().then(() => (init_model_resolution(), exports_model_resolution));
   const cmd = buildPlanCommand(binary, options);
   let modelDef = options.modelDef;
@@ -20139,13 +20163,6 @@ async function runPlan(binary, options, pidRegistry, buildAllowedEnv2) {
     }
     modelDef = resolveBalancedModelDef2(options.config);
   }
-  const envOptions = {
-    workdir: options.workdir,
-    modelDef,
-    prompt: "",
-    modelTier: options.modelTier || "balanced",
-    timeoutSeconds: options.timeoutSeconds ?? 600
-  };
   const planTimeoutMs = (options.timeoutSeconds ?? 600) * 1000;
   if (options.interactive) {
     const proc = Bun.spawn(cmd, {
@@ -20153,7 +20170,7 @@ async function runPlan(binary, options, pidRegistry, buildAllowedEnv2) {
       stdin: "inherit",
       stdout: "inherit",
       stderr: "inherit",
-      env: buildAllowedEnv2(envOptions)
+      env: buildAllowedEnv()
     });
     await pidRegistry.register(proc.pid);
     let exitCode;
@@ -20179,7 +20196,7 @@ async function runPlan(binary, options, pidRegistry, buildAllowedEnv2) {
       stdin: "ignore",
       stdout: Bun.file(outFile),
       stderr: Bun.file(errFile),
-      env: buildAllowedEnv2(envOptions)
+      env: buildAllowedEnv()
     });
     await pidRegistry.register(proc.pid);
     let exitCode;
@@ -20209,6 +20226,7 @@ async function runPlan(binary, options, pidRegistry, buildAllowedEnv2) {
 var init_plan = __esm(() => {
   init_timeout_handler();
   init_logger2();
+  init_env();
   init_model_resolution();
 });
 
@@ -20303,7 +20321,7 @@ class ClaudeCodeAdapter {
   }
   async plan(options) {
     const pidRegistry = this.getPidRegistry(options.workdir);
-    return runPlan(this.binary, options, pidRegistry, this.buildAllowedEnv.bind(this));
+    return runPlan(this.binary, options, pidRegistry);
   }
   async decompose(options) {
     const { resolveBalancedModelDef: resolveBalancedModelDef2 } = await Promise.resolve().then(() => (init_model_resolution(), exports_model_resolution));
@@ -20321,13 +20339,7 @@ class ClaudeCodeAdapter {
       cmd.splice(cmd.length - 2, 0, "--dangerously-skip-permissions");
     }
     const pidRegistry = this.getPidRegistry(options.workdir);
-    const env2 = this.buildAllowedEnv({
-      workdir: options.workdir,
-      modelDef,
-      prompt: "",
-      modelTier: options.modelTier || "balanced",
-      timeoutSeconds: 600
-    });
+    const env2 = buildAllowedEnv();
     if (options.featureName) {
       env2.NAX_FEATURE_NAME = options.featureName;
     }
@@ -20364,8 +20376,8 @@ class ClaudeCodeAdapter {
     let stdoutTimeoutId;
     const stdout = await Promise.race([
       new Response(proc.stdout).text(),
-      new Promise((resolve) => {
-        stdoutTimeoutId = setTimeout(() => resolve(""), 5000);
+      new Promise((resolve2) => {
+        stdoutTimeoutId = setTimeout(() => resolve2(""), 5000);
       })
     ]);
     clearTimeout(stdoutTimeoutId);
@@ -20679,7 +20691,7 @@ function createAgentRegistry(config2) {
       if (!known)
         return;
       if (!acpCache.has(name)) {
-        acpCache.set(name, new AcpAgentAdapter(name));
+        acpCache.set(name, new AcpAgentAdapter(name, config2));
         logger?.debug("agents", `Created AcpAgentAdapter for ${name}`, { name, protocol });
       }
       return acpCache.get(name);
@@ -20693,7 +20705,7 @@ function createAgentRegistry(config2) {
   async function getInstalledAgents2() {
     const agents = protocol === "acp" ? ALL_AGENTS.map((a) => {
       if (!acpCache.has(a.name)) {
-        acpCache.set(a.name, new AcpAgentAdapter(a.name));
+        acpCache.set(a.name, new AcpAgentAdapter(a.name, config2));
       }
       return acpCache.get(a.name);
     }) : ALL_AGENTS;
@@ -20703,7 +20715,7 @@ function createAgentRegistry(config2) {
   async function checkAgentHealth2() {
     const agents = protocol === "acp" ? ALL_AGENTS.map((a) => {
       if (!acpCache.has(a.name)) {
-        acpCache.set(a.name, new AcpAgentAdapter(a.name));
+        acpCache.set(a.name, new AcpAgentAdapter(a.name, config2));
       }
       return acpCache.get(a.name);
     }) : ALL_AGENTS;
@@ -20735,9 +20747,9 @@ var init_registry = __esm(() => {
 
 // src/config/path-security.ts
 import { existsSync as existsSync3, lstatSync, realpathSync } from "fs";
-import { basename, isAbsolute as isAbsolute3, normalize, resolve } from "path";
+import { basename, isAbsolute as isAbsolute3, normalize, resolve as resolve2 } from "path";
 function validateDirectory(dirPath, baseDir) {
-  const resolved = resolve(dirPath);
+  const resolved = resolve2(dirPath);
   if (!existsSync3(resolved)) {
     throw new Error(`Directory does not exist: ${dirPath}`);
   }
@@ -20756,7 +20768,7 @@ function validateDirectory(dirPath, baseDir) {
     throw new Error(`Failed to stat path: ${dirPath} (${error48.message})`);
   }
   if (baseDir) {
-    const resolvedBase = resolve(baseDir);
+    const resolvedBase = resolve2(baseDir);
     const realBase = existsSync3(resolvedBase) ? realpathSync(resolvedBase) : resolvedBase;
     if (!isWithinDirectory(realPath, realBase)) {
       throw new Error(`Path is outside allowed directory: ${dirPath} (resolved to ${realPath}, base: ${realBase})`);
@@ -20775,14 +20787,14 @@ function isWithinDirectory(targetPath, basePath) {
   return targetWithSlash.startsWith(baseWithSlash) || normalizedTarget === normalizedBase;
 }
 function validateFilePath(filePath, baseDir) {
-  const resolved = resolve(filePath);
+  const resolved = resolve2(filePath);
   let realPath;
   try {
     if (!existsSync3(resolved)) {
-      const parent = resolve(resolved, "..");
+      const parent = resolve2(resolved, "..");
       if (existsSync3(parent)) {
         const realParent = realpathSync(parent);
-        realPath = resolve(realParent, basename(resolved));
+        realPath = resolve2(realParent, basename(resolved));
       } else {
         realPath = resolved;
       }
@@ -20792,7 +20804,7 @@ function validateFilePath(filePath, baseDir) {
   } catch (error48) {
     throw new Error(`Failed to resolve path: ${filePath} (${error48.message})`);
   }
-  const resolvedBase = resolve(baseDir);
+  const resolvedBase = resolve2(baseDir);
   const realBase = existsSync3(resolvedBase) ? realpathSync(resolvedBase) : resolvedBase;
   if (!isWithinDirectory(realPath, realBase)) {
     throw new Error(`Path is outside allowed directory: ${filePath} (resolved to ${realPath}, base: ${realBase})`);
@@ -20839,12 +20851,22 @@ var init_json_file = __esm(() => {
 
 // src/config/merge.ts
 function mergePackageConfig(root, packageOverride) {
-  const hasAnyMergeableField = packageOverride.execution !== undefined || packageOverride.review !== undefined || packageOverride.acceptance !== undefined || packageOverride.quality !== undefined || packageOverride.context !== undefined || packageOverride.project !== undefined;
+  const hasAnyMergeableField = packageOverride.agent !== undefined || packageOverride.models !== undefined || packageOverride.routing !== undefined || packageOverride.execution !== undefined || packageOverride.review !== undefined || packageOverride.acceptance !== undefined || packageOverride.quality !== undefined || packageOverride.context !== undefined || packageOverride.project !== undefined;
   if (!hasAnyMergeableField) {
     return root;
   }
   return {
     ...root,
+    agent: packageOverride.agent !== undefined ? {
+      ...root.agent,
+      ...packageOverride.agent,
+      promptAudit: {
+        enabled: packageOverride.agent.promptAudit?.enabled ?? root.agent?.promptAudit?.enabled ?? false,
+        ...packageOverride.agent.promptAudit?.dir !== undefined ? { dir: packageOverride.agent.promptAudit.dir } : root.agent?.promptAudit?.dir !== undefined ? { dir: root.agent.promptAudit.dir } : {}
+      }
+    } : root.agent,
+    models: packageOverride.models !== undefined ? { ...root.models, ...packageOverride.models } : root.models,
+    routing: packageOverride.routing !== undefined ? { ...root.routing, ...packageOverride.routing, llm: { ...root.routing?.llm, ...packageOverride.routing.llm } } : root.routing,
     execution: {
       ...root.execution,
       ...packageOverride.execution,
@@ -20986,7 +21008,7 @@ function isPlainObject2(value) {
 
 // src/config/paths.ts
 import { homedir as homedir2 } from "os";
-import { join as join7, resolve as resolve2 } from "path";
+import { join as join7, resolve as resolve3 } from "path";
 function globalConfigDir() {
   const override = process.env[GLOBAL_CONFIG_DIR_ENV];
   if (override)
@@ -20994,7 +21016,7 @@ function globalConfigDir() {
   return join7(homedir2(), ".nax");
 }
 function projectConfigDir(projectRoot) {
-  return join7(resolve2(projectRoot), PROJECT_NAX_DIR);
+  return join7(resolve3(projectRoot), PROJECT_NAX_DIR);
 }
 var GLOBAL_CONFIG_DIR_ENV = "NAX_GLOBAL_CONFIG_DIR", PROJECT_NAX_DIR = ".nax";
 var init_paths = () => {};
@@ -21148,12 +21170,12 @@ var init_profile = __esm(() => {
 
 // src/config/loader.ts
 import { existsSync as existsSync7 } from "fs";
-import { basename as basename2, dirname as dirname2, join as join9, resolve as resolve3 } from "path";
+import { basename as basename2, dirname as dirname3, join as join9, resolve as resolve4 } from "path";
 function globalConfigPath() {
   return join9(globalConfigDir(), "config.json");
 }
 function findProjectDir(startDir = process.cwd()) {
-  let dir = resolve3(startDir);
+  let dir = resolve4(startDir);
   let depth = 0;
   while (depth < MAX_DIRECTORY_DEPTH) {
     const candidate = join9(dir, PROJECT_NAX_DIR);
@@ -21204,7 +21226,7 @@ function applyBatchModeCompat(conf) {
 async function loadConfig(startDir, cliOverrides) {
   let rawConfig = structuredClone(DEFAULT_CONFIG);
   const projDir = startDir ? basename2(startDir) === PROJECT_NAX_DIR ? startDir : findProjectDir(startDir) : findProjectDir();
-  const projectRoot = startDir ? basename2(startDir) === PROJECT_NAX_DIR ? dirname2(startDir) : startDir : process.cwd();
+  const projectRoot = startDir ? basename2(startDir) === PROJECT_NAX_DIR ? dirname3(startDir) : startDir : process.cwd();
   const profileName = await resolveProfileName(cliOverrides ?? {}, process.env, projectRoot);
   const globalConfRaw = await loadJsonFile(globalConfigPath(), "config");
   if (globalConfRaw) {
@@ -21247,13 +21269,19 @@ ${errors3.join(`
 }
 async function loadConfigForWorkdir(rootConfigPath, packageDir) {
   const logger = getLogger();
-  const rootNaxDir = dirname2(rootConfigPath);
-  const rootConfig = await loadConfig(rootNaxDir);
+  const resolvedRootConfigPath = resolve4(rootConfigPath);
+  const rootNaxDir = dirname3(resolvedRootConfigPath);
+  let rootConfigPromise = _rootConfigCache.get(resolvedRootConfigPath);
+  if (!rootConfigPromise) {
+    rootConfigPromise = loadConfig(rootNaxDir);
+    _rootConfigCache.set(resolvedRootConfigPath, rootConfigPromise);
+  }
+  const rootConfig = await rootConfigPromise;
   if (!packageDir) {
     logger.debug("config", "No packageDir \u2014 using root config");
     return rootConfig;
   }
-  const repoRoot = dirname2(rootNaxDir);
+  const repoRoot = dirname3(rootNaxDir);
   const packageConfigPath = join9(repoRoot, PROJECT_NAX_DIR, "mono", packageDir, "config.json");
   const packageOverride = await loadJsonFile(packageConfigPath, "config");
   if (!packageOverride) {
@@ -21264,8 +21292,26 @@ async function loadConfigForWorkdir(rootConfigPath, packageDir) {
     return rootConfig;
   }
   logger.debug("config", "Per-package config loaded", { packageConfigPath, packageDir });
-  return mergePackageConfig(rootConfig, packageOverride);
+  const { profile: packageProfile, ...packageFields } = packageOverride;
+  let merged = mergePackageConfig(rootConfig, packageFields);
+  if (packageProfile && packageProfile !== "default") {
+    const packageRoot = join9(repoRoot, packageDir);
+    const profileData = await loadProfile(packageProfile, packageRoot);
+    const rawMerged = deepMergeConfig(merged, profileData);
+    rawMerged.profile = packageProfile;
+    const result = NaxConfigSchema.safeParse(rawMerged);
+    if (result.success) {
+      merged = result.data;
+    } else {
+      logger.warn("config", "Per-package profile failed validation \u2014 using merged config without profile", {
+        packageDir,
+        packageProfile
+      });
+    }
+  }
+  return merged;
 }
+var _rootConfigCache;
 var init_loader = __esm(() => {
   init_logger2();
   init_json_file();
@@ -21273,6 +21319,7 @@ var init_loader = __esm(() => {
   init_paths();
   init_profile();
   init_schema();
+  _rootConfigCache = new Map;
 });
 // src/config/index.ts
 var init_config = __esm(() => {
@@ -22425,22 +22472,21 @@ class AutoInteractionPlugin {
     if (!adapter) {
       throw new Error("Auto plugin requires adapter to be injected via _autoPluginDeps.adapter");
     }
-    let modelArg;
-    if (this.config.naxConfig) {
+    const naxConfig = this.config.naxConfig ?? DEFAULT_CONFIG;
+    let resolvedModel;
+    try {
       const modelTier = this.config.model ?? "fast";
-      const naxConfig = this.config.naxConfig;
-      const modelDef = resolveModelForAgent(naxConfig.models, naxConfig.autoMode.defaultAgent, modelTier, naxConfig.autoMode.defaultAgent);
-      modelArg = modelDef.model;
-    }
-    const timeoutMs = this.config.naxConfig ? (this.config.naxConfig.execution?.sessionTimeoutSeconds ?? 600) * 1000 : undefined;
+      resolvedModel = resolveModelForAgent(naxConfig.models, naxConfig.autoMode.defaultAgent, modelTier, naxConfig.autoMode.defaultAgent).model;
+    } catch {}
+    const timeoutMs = (naxConfig.execution?.sessionTimeoutSeconds ?? 600) * 1000;
     const result = await adapter.complete(prompt, {
-      ...modelArg && { model: modelArg },
+      ...resolvedModel !== undefined && { model: resolvedModel },
       jsonMode: true,
-      ...this.config.naxConfig && { config: this.config.naxConfig },
+      config: naxConfig,
       featureName: request.featureName,
       storyId: request.storyId,
       sessionRole: "auto",
-      ...timeoutMs !== undefined && { timeoutMs }
+      timeoutMs
     });
     const output = typeof result === "string" ? result : result.output;
     return this.parseResponse(output);
@@ -22598,9 +22644,9 @@ ${request.summary}
     if (!this.rl) {
       throw new Error("CLI plugin not initialized");
     }
-    const timeoutPromise = new Promise((resolve4) => {
+    const timeoutPromise = new Promise((resolve5) => {
       setTimeout(() => {
-        resolve4({
+        resolve5({
           requestId: request.id,
           action: "skip",
           respondedBy: "timeout",
@@ -22752,9 +22798,9 @@ ${request.summary}
     if (!this.rl) {
       throw new Error("CLI plugin not initialized");
     }
-    return new Promise((resolve4) => {
+    return new Promise((resolve5) => {
       this.rl?.question(prompt, (answer) => {
-        resolve4(answer);
+        resolve5(answer);
       });
     });
   }
@@ -23186,7 +23232,7 @@ class WebhookInteractionPlugin {
       this.pendingResponses.delete(requestId);
       return early;
     }
-    return new Promise((resolve4) => {
+    return new Promise((resolve5) => {
       const existingCallback = this.receiveCallbacks.get(requestId);
       if (existingCallback) {
         this.clearReceiveTimer(requestId);
@@ -23200,7 +23246,7 @@ class WebhookInteractionPlugin {
       const timer = setTimeout(() => {
         this.clearReceiveTimer(requestId);
         this.receiveCallbacks.delete(requestId);
-        resolve4({
+        resolve5({
           requestId,
           action: "skip",
           respondedBy: "timeout",
@@ -23211,7 +23257,7 @@ class WebhookInteractionPlugin {
       this.receiveCallbacks.set(requestId, (response) => {
         this.clearReceiveTimer(requestId);
         this.receiveCallbacks.delete(requestId);
-        resolve4(response);
+        resolve5(response);
       });
     });
   }
@@ -24578,8 +24624,9 @@ function getNextStory(prd, currentStoryId, maxRetries) {
       return currentStory;
     }
   }
+  const storyIds = new Set(prd.userStories.map((s) => s.id));
   const completedIds = new Set(prd.userStories.filter((s) => s.passes || s.status === "passed" || s.status === "skipped").map((s) => s.id));
-  return prd.userStories.find((s) => !s.passes && s.status !== "passed" && s.status !== "skipped" && s.status !== "blocked" && s.status !== "failed" && s.status !== "paused" && s.status !== "decomposed" && s.dependencies.every((dep) => completedIds.has(dep))) ?? null;
+  return prd.userStories.find((s) => !s.passes && s.status !== "passed" && s.status !== "skipped" && s.status !== "blocked" && s.status !== "failed" && s.status !== "paused" && s.status !== "decomposed" && s.dependencies.every((dep) => !storyIds.has(dep) || completedIds.has(dep))) ?? null;
 }
 function isComplete(prd) {
   return prd.userStories.every((s) => s.passes || s.status === "passed" || s.status === "skipped");
@@ -27379,7 +27426,7 @@ async function runSemanticReview(workdir, storyGitRef, story, semanticConfig, mo
       storyId: story.id,
       stage: "review",
       stageConfig: reviewStageConfig,
-      config: naxConfig,
+      config: naxConfig ?? DEFAULT_CONFIG,
       workdir,
       featureName,
       timeoutSeconds: naxConfig?.execution?.sessionTimeoutSeconds
@@ -27482,7 +27529,7 @@ ${formatFindings(debateBlocking)}`,
         timeoutSeconds: semanticConfig.timeoutMs ? Math.ceil(semanticConfig.timeoutMs / 1000) : 3600,
         modelTier: semanticConfig.modelTier,
         modelDef: resolvedModelDef,
-        config: naxConfig
+        config: naxConfig ?? DEFAULT_CONFIG
       });
       runOutput = runResult.output;
       runSucceeded = true;
@@ -27497,7 +27544,7 @@ ${formatFindings(debateBlocking)}`,
         workdir,
         timeoutMs: semanticConfig.timeoutMs,
         modelTier: semanticConfig.modelTier,
-        config: naxConfig
+        config: naxConfig ?? DEFAULT_CONFIG
       });
       rawResponse = typeof completeResult === "string" ? completeResult : completeResult.output;
     }
@@ -27603,6 +27650,7 @@ ${formatFindings(blockingFindings)}`;
 var _semanticDeps, DIFF_CAP_BYTES = 51200;
 var init_semantic = __esm(() => {
   init_adapter();
+  init_config();
   init_debate();
   init_logger2();
   init_git();
@@ -28626,7 +28674,7 @@ var init_constitution = __esm(() => {
 });
 
 // src/pipeline/stages/constitution.ts
-import { dirname as dirname3 } from "path";
+import { dirname as dirname4 } from "path";
 var constitutionStage;
 var init_constitution2 = __esm(() => {
   init_constitution();
@@ -28636,7 +28684,7 @@ var init_constitution2 = __esm(() => {
     enabled: (ctx) => ctx.config.constitution.enabled,
     async execute(ctx) {
       const logger = getLogger();
-      const ngentDir = ctx.featureDir ? dirname3(dirname3(ctx.featureDir)) : `${ctx.workdir}/nax`;
+      const ngentDir = ctx.featureDir ? dirname4(dirname4(ctx.featureDir)) : `${ctx.workdir}/nax`;
       const result = await loadConstitution(ngentDir, ctx.config.constitution);
       if (result) {
         ctx.constitution = result;
@@ -29498,13 +29546,14 @@ ${pkgContent.trim()}`;
   }
 }
 function getAllReadyStories(prd) {
+  const storyIds = new Set(prd.userStories.map((s) => s.id));
   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)));
+  return prd.userStories.filter((s) => !s.passes && s.status !== "skipped" && s.status !== "failed" && s.status !== "paused" && s.status !== "blocked" && s.dependencies.every((dep) => !storyIds.has(dep) || completedIds.has(dep)));
 }
 var CONTEXT_MAX_TOKENS = 1e5, CONTEXT_RESERVED_TOKENS = 1e4;
 var init_story_context = __esm(() => {
@@ -29823,10 +29872,10 @@ async function executeWithTimeout(command, timeoutSeconds, env2, options) {
   const timeoutMs = timeoutSeconds * 1000;
   let timedOut = false;
   const timer = { id: undefined };
-  const timeoutPromise = new Promise((resolve6) => {
+  const timeoutPromise = new Promise((resolve7) => {
     timer.id = setTimeout(() => {
       timedOut = true;
-      resolve6();
+      resolve7();
     }, timeoutMs);
   });
   const processPromise = proc.exited;
@@ -32644,7 +32693,7 @@ async function _defaultRunDebate(storyId, stageConfig, prompt, config2) {
   if (resolved.length === 0) {
     return { output: null, totalCostUsd: 0 };
   }
-  const timeoutMs = (config2?.execution?.sessionTimeoutSeconds ?? 600) * 1000;
+  const timeoutMs = (config2.execution?.sessionTimeoutSeconds ?? 600) * 1000;
   const startMs = Date.now();
   const proposalSettled = await Promise.allSettled(resolved.map(({ debater, adapter }) => adapter.complete(prompt, {
     model: debater.model,
@@ -33122,16 +33171,16 @@ class AcceptanceStrategy {
     }, timeoutMs);
     const exitCode = await Promise.race([
       proc.exited,
-      new Promise((resolve6) => setTimeout(() => resolve6(124), timeoutMs + 6000))
+      new Promise((resolve7) => setTimeout(() => resolve7(124), timeoutMs + 6000))
     ]);
     clearTimeout(timeoutId);
     const stdout = await Promise.race([
       new Response(proc.stdout).text(),
-      new Promise((resolve6) => setTimeout(() => resolve6(""), 3000))
+      new Promise((resolve7) => setTimeout(() => resolve7(""), 3000))
     ]);
     const stderr = await Promise.race([
       new Response(proc.stderr).text(),
-      new Promise((resolve6) => setTimeout(() => resolve6(""), 3000))
+      new Promise((resolve7) => setTimeout(() => resolve7(""), 3000))
     ]);
     const durationMs = Date.now() - start;
     if (timedOut || exitCode === 124) {
@@ -34827,12 +34876,12 @@ var init_init_context = __esm(() => {
 
 // src/utils/path-security.ts
 import { realpathSync as realpathSync3 } from "fs";
-import { dirname as dirname4, isAbsolute as isAbsolute5, join as join32, normalize as normalize2, resolve as resolve6 } from "path";
+import { dirname as dirname5, isAbsolute as isAbsolute5, join as join32, normalize as normalize2, resolve as resolve7 } from "path";
 function safeRealpathForComparison(p) {
   try {
     return realpathSync3(p);
   } catch {
-    const parent = dirname4(p);
+    const parent = dirname5(p);
     if (parent === p)
       return normalize2(p);
     const resolvedParent = safeRealpathForComparison(parent);
@@ -34843,7 +34892,7 @@ function validateModulePath(modulePath, allowedRoots) {
   if (!modulePath) {
     return { valid: false, error: "Module path is empty" };
   }
-  const resolvedRoots = allowedRoots.map((r) => safeRealpathForComparison(resolve6(r)));
+  const resolvedRoots = allowedRoots.map((r) => safeRealpathForComparison(resolve7(r)));
   if (isAbsolute5(modulePath)) {
     const normalized = normalize2(modulePath);
     const resolved = safeRealpathForComparison(normalized);
@@ -34853,8 +34902,8 @@ function validateModulePath(modulePath, allowedRoots) {
     }
   } else {
     for (let i = 0;i < allowedRoots.length; i++) {
-      const originalRoot = resolve6(allowedRoots[i]);
-      const absoluteInput = resolve6(join32(originalRoot, modulePath));
+      const originalRoot = resolve7(allowedRoots[i]);
+      const absoluteInput = resolve7(join32(originalRoot, modulePath));
       const resolved = safeRealpathForComparison(absoluteInput);
       const resolvedRoot = resolvedRoots[i];
       if (resolved.startsWith(`${resolvedRoot}/`) || resolved === resolvedRoot) {
@@ -35602,7 +35651,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.58.2",
+    version: "0.58.4",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -35682,8 +35731,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("46191e3a"))
-        return "46191e3a";
+      if (/^[0-9a-f]{6,10}$/.test("05836706"))
+        return "05836706";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -39857,7 +39906,7 @@ var init_project = __esm(() => {
 
 // src/execution/status-file.ts
 import { rename, unlink as unlink3 } from "fs/promises";
-import { resolve as resolve8 } from "path";
+import { resolve as resolve9 } from "path";
 function countProgress(prd) {
   const stories = prd.userStories;
   const passed = stories.filter((s) => s.status === "passed").length;
@@ -39902,7 +39951,7 @@ function buildStatusSnapshot(state) {
   return snapshot;
 }
 async function writeStatusFile(filePath, status) {
-  const resolvedPath = resolve8(filePath);
+  const resolvedPath = resolve9(filePath);
   if (filePath.includes("../") || filePath.includes("..\\")) {
     throw new Error("Invalid status file path: path traversal detected");
   }
@@ -40985,14 +41034,14 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
       prevActScopeDepth !== actScopeDepth - 1 && console.error("You seem to have overlapping act() calls, this is not supported. Be sure to await previous act() calls before making a new one. ");
       actScopeDepth = prevActScopeDepth;
     }
-    function recursivelyFlushAsyncActWork(returnValue, resolve9, reject) {
+    function recursivelyFlushAsyncActWork(returnValue, resolve10, reject) {
       var queue = ReactSharedInternals.actQueue;
       if (queue !== null)
         if (queue.length !== 0)
           try {
             flushActQueue(queue);
             enqueueTask(function() {
-              return recursivelyFlushAsyncActWork(returnValue, resolve9, reject);
+              return recursivelyFlushAsyncActWork(returnValue, resolve10, reject);
             });
             return;
           } catch (error48) {
@@ -41000,7 +41049,7 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
           }
         else
           ReactSharedInternals.actQueue = null;
-      0 < ReactSharedInternals.thrownErrors.length ? (queue = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, reject(queue)) : resolve9(returnValue);
+      0 < ReactSharedInternals.thrownErrors.length ? (queue = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, reject(queue)) : resolve10(returnValue);
     }
     function flushActQueue(queue) {
       if (!isFlushing) {
@@ -41176,14 +41225,14 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
           didAwaitActCall || didWarnNoAwaitAct || (didWarnNoAwaitAct = true, console.error("You called act(async () => ...) without await. This could lead to unexpected testing behaviour, interleaving multiple act calls and mixing their scopes. You should - await act(async () => ...);"));
         });
         return {
-          then: function(resolve9, reject) {
+          then: function(resolve10, reject) {
             didAwaitActCall = true;
             thenable.then(function(returnValue) {
               popActScope(prevActQueue, prevActScopeDepth);
               if (prevActScopeDepth === 0) {
                 try {
                   flushActQueue(queue), enqueueTask(function() {
-                    return recursivelyFlushAsyncActWork(returnValue, resolve9, reject);
+                    return recursivelyFlushAsyncActWork(returnValue, resolve10, reject);
                   });
                 } catch (error$0) {
                   ReactSharedInternals.thrownErrors.push(error$0);
@@ -41194,7 +41243,7 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
                   reject(_thrownError);
                 }
               } else
-                resolve9(returnValue);
+                resolve10(returnValue);
             }, function(error48) {
               popActScope(prevActQueue, prevActScopeDepth);
               0 < ReactSharedInternals.thrownErrors.length ? (error48 = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, reject(error48)) : reject(error48);
@@ -41210,11 +41259,11 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
       if (0 < ReactSharedInternals.thrownErrors.length)
         throw callback = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, callback;
       return {
-        then: function(resolve9, reject) {
+        then: function(resolve10, reject) {
           didAwaitActCall = true;
           prevActScopeDepth === 0 ? (ReactSharedInternals.actQueue = queue, enqueueTask(function() {
-            return recursivelyFlushAsyncActWork(returnValue$jscomp$0, resolve9, reject);
-          })) : resolve9(returnValue$jscomp$0);
+            return recursivelyFlushAsyncActWork(returnValue$jscomp$0, resolve10, reject);
+          })) : resolve10(returnValue$jscomp$0);
         }
       };
     };
@@ -44056,8 +44105,8 @@ It can also happen if the client has a browser extension installed which messes
         currentEntangledActionThenable = {
           status: "pending",
           value: undefined,
-          then: function(resolve9) {
-            entangledListeners.push(resolve9);
+          then: function(resolve10) {
+            entangledListeners.push(resolve10);
           }
         };
       }
@@ -44081,8 +44130,8 @@ It can also happen if the client has a browser extension installed which messes
         status: "pending",
         value: null,
         reason: null,
-        then: function(resolve9) {
-          listeners.push(resolve9);
+        then: function(resolve10) {
+          listeners.push(resolve10);
         }
       };
       thenable.then(function() {
@@ -72607,13 +72656,13 @@ function createCliInteractionBridge() {
       process.stdout.write(`
 \uD83E\uDD16 Agent: ${text}
 You: `);
-      return new Promise((resolve4) => {
+      return new Promise((resolve5) => {
         const rl = createInterface2({ input: process.stdin, terminal: false });
         rl.once("line", (line) => {
           rl.close();
-          resolve4(line.trim());
+          resolve5(line.trim());
         });
-        rl.once("close", () => resolve4(""));
+        rl.once("close", () => resolve5(""));
       });
     }
   };
@@ -73118,20 +73167,20 @@ async function displayModelEfficiency(workdir) {
 // src/cli/status-features.ts
 init_source();
 import { existsSync as existsSync15, readdirSync as readdirSync4 } from "fs";
-import { join as join14, resolve as resolve5 } from "path";
+import { join as join14, resolve as resolve6 } from "path";
 
 // src/commands/common.ts
 init_path_security();
 init_errors();
 import { existsSync as existsSync14, readdirSync as readdirSync3, realpathSync as realpathSync2 } from "fs";
-import { join as join12, resolve as resolve4 } from "path";
+import { join as join12, resolve as resolve5 } from "path";
 function resolveProject(options = {}) {
   const { dir, feature } = options;
   let projectRoot;
   let naxDir;
   let configPath;
   if (dir) {
-    projectRoot = realpathSync2(resolve4(dir));
+    projectRoot = realpathSync2(resolve5(dir));
     naxDir = join12(projectRoot, ".nax");
     if (!existsSync14(naxDir)) {
       throw new NaxError(`Directory does not contain a nax project: ${projectRoot}
@@ -73184,7 +73233,7 @@ No features found in this project.`;
   };
 }
 function findProjectRoot(startDir) {
-  let current = resolve4(startDir);
+  let current = resolve5(startDir);
   let depth = 0;
   while (depth < MAX_DIRECTORY_DEPTH) {
     const naxDir = join12(current, ".nax");
@@ -73501,7 +73550,7 @@ async function displayFeatureStatus(options = {}) {
   if (options.feature) {
     let featureDir;
     if (options.dir) {
-      featureDir = join14(resolve5(options.dir), ".nax", "features", options.feature);
+      featureDir = join14(resolve6(options.dir), ".nax", "features", options.feature);
     } else {
       const resolved = resolveProject({ feature: options.feature });
       if (!resolved.featureDir) {
@@ -81627,8 +81676,8 @@ class Ink {
     }
   }
   async waitUntilExit() {
-    this.exitPromise ||= new Promise((resolve9, reject2) => {
-      this.resolveExitPromise = resolve9;
+    this.exitPromise ||= new Promise((resolve10, reject2) => {
+      this.resolveExitPromise = resolve10;
       this.rejectExitPromise = reject2;
     });
     if (!this.beforeExitHandler) {
@@ -83441,7 +83490,7 @@ async function promptForConfirmation(question) {
   if (!process.stdin.isTTY) {
     return true;
   }
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     process.stdout.write(source_default.bold(`${question} [Y/n] `));
     process.stdin.setRawMode(true);
     process.stdin.resume();
@@ -83454,9 +83503,9 @@ async function promptForConfirmation(question) {
       process.stdout.write(`
 `);
       if (answer === "n") {
-        resolve9(false);
+        resolve10(false);
       } else {
-        resolve9(true);
+        resolve10(true);
       }
     };
     process.stdin.on("data", handler);

package/package.json

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