@nathapp/nax 0.57.0 → 0.57.1-canary.1

package/dist/nax.js

@@ -18048,31 +18048,36 @@ var init_defaults = __esm(() => {
           enabled: true,
           resolver: { type: "synthesis" },
           sessionMode: "stateful",
-          rounds: 3
+          rounds: 3,
+          timeoutSeconds: 600
         },
         review: {
           enabled: true,
           resolver: { type: "majority-fail-closed" },
           sessionMode: "one-shot",
-          rounds: 2
+          rounds: 2,
+          timeoutSeconds: 600
         },
         acceptance: {
           enabled: false,
           resolver: { type: "majority-fail-closed" },
           sessionMode: "one-shot",
-          rounds: 1
+          rounds: 1,
+          timeoutSeconds: 600
         },
         rectification: {
           enabled: false,
           resolver: { type: "synthesis" },
           sessionMode: "one-shot",
-          rounds: 1
+          rounds: 1,
+          timeoutSeconds: 600
         },
         escalation: {
           enabled: false,
           resolver: { type: "majority-fail-closed" },
           sessionMode: "one-shot",
-          rounds: 1
+          rounds: 1,
+          timeoutSeconds: 600
         }
       }
     }
@@ -18102,7 +18107,8 @@ var TokenPricingSchema, ModelDefSchema, ModelEntrySchema, PerAgentModelMapSchema
   resolver: makeResolverSchema(defaults.resolverType),
   sessionMode: exports_external.enum(["one-shot", "stateful"]).default(defaults.sessionMode),
   rounds: exports_external.number().int().min(1).default(defaults.rounds),
-  debaters: exports_external.array(DebaterSchema).min(2, "debaters must have at least 2 entries").optional()
+  debaters: exports_external.array(DebaterSchema).min(2, "debaters must have at least 2 entries").optional(),
+  timeoutSeconds: exports_external.number().int().positive().default(600)
 })), DebateConfigSchema, NaxConfigSchema;
 var init_schemas3 = __esm(() => {
   init_zod();
@@ -18303,7 +18309,8 @@ var init_schemas3 = __esm(() => {
   });
   PlanConfigSchema = exports_external.object({
     model: ModelTierSchema,
-    outputPath: exports_external.string().min(1, "plan.outputPath must be non-empty")
+    outputPath: exports_external.string().min(1, "plan.outputPath must be non-empty"),
+    timeoutSeconds: exports_external.number().int().positive().default(600)
   });
   AcceptanceFixConfigSchema = exports_external.object({
     diagnoseModel: exports_external.string().min(1, "acceptance.fix.diagnoseModel must be non-empty"),
@@ -19846,9 +19853,9 @@ async function runPlan(binary, options, pidRegistry, buildAllowedEnv2) {
     modelDef,
     prompt: "",
     modelTier: options.modelTier || "balanced",
-    timeoutSeconds: 600
+    timeoutSeconds: options.timeoutSeconds ?? 600
   };
-  const PLAN_TIMEOUT_MS = 600000;
+  const planTimeoutMs = (options.timeoutSeconds ?? 600) * 1000;
   if (options.interactive) {
     const proc = Bun.spawn(cmd, {
       cwd: options.workdir,
@@ -19860,7 +19867,7 @@ async function runPlan(binary, options, pidRegistry, buildAllowedEnv2) {
     await pidRegistry.register(proc.pid);
     let exitCode;
     try {
-      const timeoutResult = await withProcessTimeout(proc, PLAN_TIMEOUT_MS, {
+      const timeoutResult = await withProcessTimeout(proc, planTimeoutMs, {
         graceMs: 5000
       });
       exitCode = timeoutResult.exitCode;
@@ -19886,7 +19893,7 @@ async function runPlan(binary, options, pidRegistry, buildAllowedEnv2) {
     await pidRegistry.register(proc.pid);
     let exitCode;
     try {
-      const timeoutResult = await withProcessTimeout(proc, PLAN_TIMEOUT_MS, {
+      const timeoutResult = await withProcessTimeout(proc, planTimeoutMs, {
         graceMs: 5000
       });
       exitCode = timeoutResult.exitCode;
@@ -22156,7 +22163,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.57.0",
+    version: "0.57.1-canary.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22235,8 +22242,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("478df448"))
-        return "478df448";
+      if (/^[0-9a-f]{6,10}$/.test("814ed29f"))
+        return "814ed29f";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -22523,10 +22530,11 @@ function modelTierFromDebater(debater) {
 function isTierLabel(value) {
   return value === "fast" || value === "balanced" || value === "powerful";
 }
-async function runComplete(adapter, prompt, options, modelTier) {
+async function runComplete(adapter, prompt, options, modelTier, timeoutMs) {
   return adapter.complete(prompt, {
     ...options,
-    modelTier
+    modelTier,
+    ...timeoutMs !== undefined && { timeoutMs }
   });
 }
 
@@ -22538,6 +22546,9 @@ class DebateSession {
   workdir;
   featureName;
   timeoutSeconds;
+  get timeoutMs() {
+    return this.timeoutSeconds * 1000;
+  }
   constructor(opts) {
     this.storyId = opts.storyId;
     this.stage = opts.stage;
@@ -22545,7 +22556,7 @@ class DebateSession {
     this.config = opts.config;
     this.workdir = opts.workdir ?? process.cwd();
     this.featureName = opts.featureName ?? opts.stage;
-    this.timeoutSeconds = opts.timeoutSeconds ?? opts.config?.execution?.sessionTimeoutSeconds ?? 600;
+    this.timeoutSeconds = opts.timeoutSeconds ?? opts.stageConfig.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS;
   }
   pipelineStageForDebate() {
     switch (this.stage) {
@@ -22785,7 +22796,8 @@ class DebateSession {
       featureName: this.stage,
       config: this.config,
       storyId: this.storyId,
-      sessionRole: "debate-proposal"
+      sessionRole: "debate-proposal",
+      timeoutMs: this.timeoutMs
     }, modelTierFromDebater(debater)).then((result) => ({ debater, adapter, output: result.output, cost: result.costUsd }))));
     const successful = proposalSettled.filter((r) => r.status === "fulfilled").map((r) => r.value);
     for (const r of proposalSettled) {
@@ -22839,7 +22851,8 @@ class DebateSession {
             featureName: this.stage,
             config: this.config,
             storyId: this.storyId,
-            sessionRole: "debate-fallback"
+            sessionRole: "debate-fallback",
+            timeoutMs: this.timeoutMs
           }, modelTierFromDebater(fallbackDebater));
           totalCostUsd += fallbackResult.costUsd;
           logger?.info("debate", "debate:result", {
@@ -22869,7 +22882,8 @@ class DebateSession {
         featureName: this.stage,
         config: this.config,
         storyId: this.storyId,
-        sessionRole: "debate-critique"
+        sessionRole: "debate-critique",
+        timeoutMs: this.timeoutMs
       }, modelTierFromDebater(debater))));
       for (const r of critiqueSettled) {
         if (r.status === "fulfilled") {
@@ -23012,7 +23026,8 @@ Do NOT output the JSON to the conversation. Write the file, then reply with a br
             model: resolveDebaterModel({ agent: agentName }, this.config),
             config: this.config,
             storyId: this.storyId,
-            sessionRole: "synthesis"
+            sessionRole: "synthesis",
+            timeoutMs: this.timeoutMs
           }
         });
         return {
@@ -23034,7 +23049,8 @@ Do NOT output the JSON to the conversation. Write the file, then reply with a br
           model: resolveDebaterModel({ agent: agentName }, this.config),
           config: this.config,
           storyId: this.storyId,
-          sessionRole: "judge"
+          sessionRole: "judge",
+          timeoutMs: this.timeoutMs
         }
       });
       return {
@@ -23048,7 +23064,7 @@ Do NOT output the JSON to the conversation. Write the file, then reply with a br
     };
   }
 }
-var RESOLVER_FALLBACK_AGENT = "synthesis", _debateSessionDeps;
+var RESOLVER_FALLBACK_AGENT = "synthesis", _debateSessionDeps, DEFAULT_TIMEOUT_SECONDS = 600;
 var init_session = __esm(() => {
   init_registry();
   init_config();
@@ -23252,13 +23268,15 @@ class AutoInteractionPlugin {
       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;
     const result = await adapter.complete(prompt, {
       ...modelArg && { model: modelArg },
       jsonMode: true,
       ...this.config.naxConfig && { config: this.config.naxConfig },
       featureName: request.featureName,
       storyId: request.storyId,
-      sessionRole: "auto"
+      sessionRole: "auto",
+      ...timeoutMs !== undefined && { timeoutMs }
     });
     const output = typeof result === "string" ? result : result.output;
     return this.parseResponse(output);
@@ -31556,8 +31574,15 @@ async function _defaultRunDebate(storyId, stageConfig, prompt, config2) {
   if (resolved.length === 0) {
     return { output: null, totalCostUsd: 0 };
   }
+  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 }).then((out) => typeof out === "string" ? out : out.output)));
+  const proposalSettled = await Promise.allSettled(resolved.map(({ debater, adapter }) => adapter.complete(prompt, {
+    model: debater.model,
+    config: config2,
+    storyId,
+    sessionRole: "debate-proposal",
+    timeoutMs
+  }).then((out) => typeof out === "string" ? out : out.output)));
   const durationMs = Date.now() - startMs;
   const successful = proposalSettled.filter((r) => r.status === "fulfilled").map((r) => r.value);
   if (successful.length === 0) {
@@ -34882,6 +34907,16 @@ async function runDeferredRegression(options) {
     };
   }
   const testSummary = _regressionDeps.parseBunTestOutput(fullSuiteResult.output);
+  if (testSummary.failed === 0 && testSummary.passed === 0) {
+    logger?.warn("regression", "No test results parsed from output \u2014 test runner likely crashed or errored (not a regression, accepting as pass)", { output: fullSuiteResult.output.slice(0, 500) });
+    return {
+      success: true,
+      failedTests: 0,
+      passedTests: 0,
+      rectificationAttempts: 0,
+      affectedStories: []
+    };
+  }
   const affectedStories = new Set;
   const affectedStoriesObjs = new Map;
   logger?.warn("regression", "Regression detected", {
@@ -37063,13 +37098,25 @@ async function executeUnified(ctx, initialPrd) {
         prd = await loadPRD(ctx.prdPath);
         prdDirty = false;
       }
+      const storyCounts = countStories(prd);
+      logger?.debug("execution", "Loop iteration", {
+        iteration: iterations,
+        isComplete: isComplete(prd),
+        passed: storyCounts.passed,
+        pending: storyCounts.pending,
+        failed: storyCounts.failed,
+        total: storyCounts.total
+      });
       if (isComplete(prd)) {
+        logger?.debug("execution", "All stories complete \u2014 entering completion path");
         if (ctx.interactionChain && isTriggerEnabled("pre-merge", ctx.config)) {
           const shouldProceed = await checkPreMerge({ featureName: ctx.feature, totalStories: prd.userStories.length, cost: totalCost }, ctx.config, ctx.interactionChain);
           if (!shouldProceed)
             return buildResult2("pre-merge-aborted");
         }
+        logger?.debug("execution", "Running deferred review");
         deferredReview = await runDeferredReview(ctx.workdir, ctx.config.review, ctx.pluginRegistry, runStartRef);
+        logger?.debug("execution", "Deferred review done \u2014 returning completed");
         return buildResult2("completed");
       }
       const costLimit = ctx.config.execution.costLimit;
@@ -37322,9 +37369,7 @@ async function executeUnified(ctx, initialPrd) {
       }, ctx.eventEmitter);
     }
     return buildResult2("max-iterations");
-  } finally {
-    stopHeartbeat();
-  }
+  } finally {}
 }
 var _unifiedExecutorDeps;
 var init_unified_executor = __esm(() => {
@@ -70249,6 +70294,7 @@ function validatePlanOutput(raw, feature, branch) {
 }
 
 // src/cli/plan.ts
+var DEFAULT_TIMEOUT_SECONDS2 = 600;
 var _planDeps = {
   readFile: (path) => Bun.file(path).text(),
   writeFile: (path, content) => Bun.write(path, content).then(() => {}),
@@ -70299,7 +70345,7 @@ async function planCommand(workdir, config2, options) {
   const outputPath = join12(outputDir, "prd.json");
   await _planDeps.mkdirp(outputDir);
   const agentName = config2?.autoMode?.defaultAgent ?? "claude";
-  const timeoutSeconds = config2?.execution?.sessionTimeoutSeconds ?? 600;
+  const timeoutSeconds = config2?.plan?.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS2;
   let rawResponse;
   const debateEnabled = config2?.debate?.enabled && config2?.debate?.stages?.plan?.enabled;
   if (debateEnabled) {
@@ -70383,6 +70429,7 @@ async function planCommand(workdir, config2, options) {
       }
       rawResponse = await _planDeps.readFile(outputPath);
     } else {
+      const timeoutMs = (config2?.plan?.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS2) * 1000;
       const completeResult = await adapter.complete(prompt, {
         model: autoModel,
         jsonMode: true,
@@ -70390,7 +70437,7 @@ async function planCommand(workdir, config2, options) {
         config: config2,
         featureName: options.feature,
         sessionRole: "plan",
-        timeoutMs: (config2?.execution?.sessionTimeoutSeconds ?? 3600) * 1000
+        timeoutMs
       });
       let result = typeof completeResult === "string" ? completeResult : completeResult.output;
       try {
@@ -70763,6 +70810,8 @@ async function planDecomposeCommand(workdir, config2, options) {
   const stages = config2?.debate?.stages;
   const debateEnabled = config2?.debate?.enabled && stages?.decompose?.enabled;
   let rawResponse;
+  const timeoutSeconds = config2?.plan?.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS2;
+  const timeoutMs = timeoutSeconds * 1000;
   if (debateEnabled) {
     const stageConfig = stages?.decompose;
     const debateSession = _planDeps.createDebateSession({
@@ -70772,7 +70821,7 @@ async function planDecomposeCommand(workdir, config2, options) {
       config: config2,
       workdir,
       featureName: options.feature,
-      timeoutSeconds: config2?.execution?.sessionTimeoutSeconds
+      timeoutSeconds
     });
     const debateResult = await debateSession.run(prompt);
     if (debateResult.outcome !== "failed" && debateResult.output) {
@@ -70784,7 +70833,7 @@ async function planDecomposeCommand(workdir, config2, options) {
         sessionRole: "decompose",
         featureName: options.feature,
         storyId: options.storyId,
-        timeoutMs: (config2?.execution?.sessionTimeoutSeconds ?? 3600) * 1000
+        timeoutMs
       });
       rawResponse = typeof completeResult === "string" ? completeResult : completeResult.output;
     }
@@ -70795,7 +70844,7 @@ async function planDecomposeCommand(workdir, config2, options) {
       sessionRole: "decompose",
       featureName: options.feature,
       storyId: options.storyId,
-      timeoutMs: (config2?.execution?.sessionTimeoutSeconds ?? 3600) * 1000
+      timeoutMs
     });
     rawResponse = typeof completeResult === "string" ? completeResult : completeResult.output;
   }
@@ -73438,6 +73487,10 @@ init_crash_recovery();
 init_story_context();
 async function runCompletionPhase(options) {
   const logger = getSafeLogger();
+  logger?.debug("execution", "Completion phase started", {
+    acceptanceEnabled: options.config.acceptance?.enabled,
+    isComplete: isComplete(options.prd)
+  });
   if (options.config.acceptance.enabled && isComplete(options.prd)) {
     const { runAcceptanceLoop: runAcceptanceLoop2 } = await Promise.resolve().then(() => (init_acceptance_loop(), exports_acceptance_loop));
     const acceptanceResult = await runAcceptanceLoop2({
@@ -73505,9 +73558,12 @@ async function runCompletionPhase(options) {
       formatterMode: options.formatterMode
     });
   }
+  logger?.debug("execution", "Completion phase \u2014 stopping heartbeat and writing exit summary");
   stopHeartbeat();
   await writeExitSummary(options.logFilePath, options.totalCost, options.iterations, options.storiesCompleted, durationMs);
+  logger?.debug("execution", "Completion phase \u2014 auto-committing dirty files");
   await autoCommitIfDirty(options.workdir, "run.complete", "run-summary", options.feature);
+  logger?.debug("execution", "Completion phase done \u2014 returning to runner");
   return {
     durationMs,
     runCompletedAt
@@ -73645,6 +73701,12 @@ async function runExecutionPhase(options, prd, pluginRegistry) {
   storiesCompleted = unifiedResult.storiesCompleted;
   totalCost = unifiedResult.totalCost;
   allStoryMetrics.push(...unifiedResult.allStoryMetrics);
+  logger?.debug("execution", "Execution phase complete \u2014 handing off to completion phase", {
+    exitReason: unifiedResult.exitReason,
+    iterations,
+    storiesCompleted,
+    totalCost
+  });
   return { prd, iterations, storiesCompleted, totalCost, allStoryMetrics };
 }
 
@@ -73803,15 +73865,20 @@ async function run(options) {
       durationMs
     };
   } finally {
+    const logger2 = getSafeLogger();
+    logger2?.debug("execution", "Runner finally block \u2014 starting cleanup");
     stopHeartbeat();
     cleanupCrashHandlers();
+    logger2?.debug("execution", "Runner finally \u2014 sweeping ACP sessions");
     await sweepFeatureSessions(workdir, feature).catch(() => {});
+    logger2?.debug("execution", "Runner finally \u2014 ACP sweep done");
     let branch = "";
     try {
       const { stdout, exitCode } = await gitWithTimeout(["branch", "--show-current"], workdir);
       if (exitCode === 0)
         branch = stdout.trim();
     } catch {}
+    logger2?.debug("execution", "Runner finally \u2014 running cleanupRun");
     const { cleanupRun: cleanupRun2 } = await Promise.resolve().then(() => (init_run_cleanup(), exports_run_cleanup));
     await cleanupRun2({
       runId,
@@ -73827,6 +73894,7 @@ async function run(options) {
       branch,
       version: NAX_VERSION
     });
+    logger2?.debug("execution", "Runner finally \u2014 cleanupRun done, run() returning");
   }
 }
 

package/package.json

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