@nathapp/nax 0.67.7 → 0.67.8

package/dist/nax.js

@@ -21312,7 +21312,7 @@ class AgentManager {
           return { result, fallbacks, finalBundle: updatedBundle, finalPrompt, finalAgent: currentAgent };
         }
         const isFailStale = result.adapterFailure?.outcome === "fail-stale";
-        const maxStaleRetries = this._config.agent?.idleWatchdog?.maxRetryAttempts ?? 1;
+        const maxStaleRetries = this._config.agent?.idleWatchdog?.maxRetryAttempts ?? 3;
         if (isFailStale && result.adapterFailure?.retriable && staleRetryAttempts < maxStaleRetries) {
           staleRetryAttempts++;
           const retryHop = {
@@ -21330,7 +21330,8 @@ class AgentManager {
           logger?.info("agent-manager", "fail-stale: immediate same-agent retry", {
             storyId: request.runOptions.storyId,
             attempt: staleRetryAttempts,
-            agent: currentAgent
+            agent: currentAgent,
+            reason: result.adapterFailure?.reason
           });
           currentHopKind = { kind: "stale-retry", attempt: staleRetryAttempts };
           continue;
@@ -21461,6 +21462,8 @@ class AgentManager {
     const primaryAgent = primaryAgentOverride ?? this.getDefault();
     let currentAgent = primaryAgent;
     let hopsSoFar = 0;
+    let staleRetryAttempts = 0;
+    const maxStaleRetries = this._config.agent?.idleWatchdog?.maxRetryAttempts ?? 3;
     const _opStartMs = Date.now();
     const _agentChain = [primaryAgent];
     let _finalStatus = "error";
@@ -21497,10 +21500,45 @@ class AgentManager {
           };
         }
         _totalCostUsd += result.estimatedCostUsd;
+        if (!result.adapterFailure && !result.output?.trim()) {
+          result = {
+            ...result,
+            adapterFailure: {
+              outcome: "fail-stale",
+              category: "availability",
+              retriable: true,
+              message: "[completeWithFallback] agent returned no output",
+              reason: "empty-output"
+            }
+          };
+        }
         if (!result.adapterFailure) {
           _finalStatus = "ok";
           return { result, fallbacks };
         }
+        const isFailStale = result.adapterFailure.outcome === "fail-stale";
+        if (isFailStale && result.adapterFailure.retriable && staleRetryAttempts < maxStaleRetries) {
+          staleRetryAttempts++;
+          const retryHop = {
+            storyId: options.storyId,
+            priorAgent: currentAgent,
+            newAgent: currentAgent,
+            hop: staleRetryAttempts,
+            outcome: result.adapterFailure.outcome,
+            category: result.adapterFailure.category,
+            timestamp: new Date().toISOString(),
+            costUsd: result.estimatedCostUsd
+          };
+          fallbacks.push(retryHop);
+          this._emitter.emit("onSwapAttempt", retryHop);
+          logger?.info("agent-manager", "completeWithFallback: fail-stale same-agent retry", {
+            storyId: options.storyId,
+            attempt: staleRetryAttempts,
+            agent: currentAgent,
+            reason: result.adapterFailure.reason
+          });
+          continue;
+        }
         if (!this.shouldSwap(result.adapterFailure, hopsSoFar, true)) {
           _finalStatus = hopsSoFar > 0 ? "exhausted" : "error";
           return { result, fallbacks };
@@ -34951,6 +34989,53 @@ var init_acceptance_fix = __esm(() => {
   };
 });
 
+// src/review/requote-response.ts
+function parseRequoteResponse(output) {
+  const parsed = tryParseLLMJson(output);
+  if (!isRecord(parsed))
+    return null;
+  const canonical = extractCanonical(parsed);
+  if (canonical)
+    return canonical;
+  const findings = parsed.findings;
+  if (!Array.isArray(findings) || findings.length !== 1)
+    return null;
+  const finding = findings[0];
+  if (!isRecord(finding))
+    return null;
+  return extractCanonical(finding.verifiedBy) ?? extractCanonical(finding);
+}
+function extractCanonical(value) {
+  if (!isRecord(value))
+    return null;
+  if (typeof value.file !== "string" || typeof value.observed !== "string")
+    return null;
+  const file3 = value.file.trim();
+  if (!file3)
+    return null;
+  const line = coerceLine(value.line);
+  if (line === null)
+    return null;
+  return {
+    file: file3,
+    line: line === undefined ? undefined : line,
+    observed: value.observed
+  };
+}
+function coerceLine(value) {
+  if (value == null)
+    return;
+  if (typeof value === "number")
+    return value;
+  if (typeof value === "string" && /^\d+$/.test(value))
+    return Number.parseInt(value, 10);
+  return null;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+var init_requote_response = () => {};
+
 // src/operations/semantic-review.ts
 async function requoteBlockingFindings(findings, ctx) {
   const threshold = ctx.input.blockingThreshold ?? "error";
@@ -35021,18 +35106,6 @@ async function requoteBlockingFindings(findings, ctx) {
   }
   return { findings: next, changed, extraCostUsd };
 }
-function parseRequoteResponse(output) {
-  const parsed = tryParseLLMJson(output);
-  if (!parsed || typeof parsed.file !== "string" || typeof parsed.observed !== "string")
-    return null;
-  if (parsed.line != null && typeof parsed.line !== "number")
-    return null;
-  return {
-    file: parsed.file,
-    line: typeof parsed.line === "number" ? parsed.line : undefined,
-    observed: parsed.observed
-  };
-}
 var FAIL_OPEN2, SEMANTIC_REQUOTE_RECOVERED_EVENT = "review.semantic.finding.requote_recovered", SEMANTIC_REQUOTE_FAILED_EVENT = "review.semantic.finding.requote_failed", DEFAULT_MAX_REQUOTES = 5, semanticReviewHopBody = async (initialPrompt, ctx) => {
   const turn = await ctx.sendWithParseRetry(initialPrompt);
   const parsed = validateLLMShape(tryParseLLMJson(turn.output));
@@ -35041,9 +35114,10 @@ var FAIL_OPEN2, SEMANTIC_REQUOTE_RECOVERED_EVENT = "review.semantic.finding.requ
   const requoted = await requoteBlockingFindings(parsed.findings, ctx);
   if (!requoted.changed)
     return turn;
+  const passed = !requoted.findings.some((finding) => isBlockingSeverity(finding.severity, ctx.input.blockingThreshold ?? "error"));
   return {
     ...turn,
-    output: JSON.stringify({ passed: parsed.passed, findings: requoted.findings }),
+    output: JSON.stringify({ passed, findings: requoted.findings }),
     estimatedCostUsd: (turn.estimatedCostUsd ?? 0) + requoted.extraCostUsd
   };
 }, semanticReviewOp;
@@ -35052,6 +35126,7 @@ var init_semantic_review = __esm(() => {
   init_config();
   init_logger2();
   init_prompts();
+  init_requote_response();
   init_semantic_evidence();
   init_semantic_helpers();
   FAIL_OPEN2 = { passed: true, findings: [], failOpen: true };
@@ -39743,6 +39818,7 @@ var init_review = __esm(() => {
   init_diff_utils();
   init_finding_projection();
   init_runner2();
+  init_requote_response();
   init_severity();
 });
 
@@ -41251,8 +41327,8 @@ var init_prompts = __esm(() => {
 // src/operations/build-hop-callback.ts
 function turnResultToAgentResult(r) {
   return {
-    success: true,
-    exitCode: 0,
+    success: !r.adapterFailure,
+    exitCode: r.adapterFailure ? 1 : 0,
     output: r.output,
     rateLimited: false,
     durationMs: 0,
@@ -41260,7 +41336,8 @@ function turnResultToAgentResult(r) {
     exactCostUsd: r.exactCostUsd,
     tokenUsage: r.tokenUsage,
     protocolIds: r.protocolIds,
-    internalRoundTrips: r.internalRoundTrips
+    internalRoundTrips: r.internalRoundTrips,
+    ...r.adapterFailure ? { adapterFailure: r.adapterFailure } : {}
   };
 }
 function buildHopCallback(ctx, sessionId, _initialOptions) {
@@ -41629,13 +41706,26 @@ async function callOp(ctx, op, input) {
   let lastRetryTurn;
   const sendWithFileOutput = async (promptText, bodyCtx) => {
     const turn = await bodyCtx.send(promptText);
-    if (!fileOutputPath)
-      return turn;
-    const fileContent = await _callOpDeps.readFileOutput(fileOutputPath);
-    if (fileContent === null) {
-      return turn;
+    let effective = turn;
+    if (fileOutputPath) {
+      const fileContent = await _callOpDeps.readFileOutput(fileOutputPath);
+      if (fileContent !== null) {
+        effective = { ...turn, output: fileContent };
+      }
+    }
+    if (!effective.output?.trim() && !effective.adapterFailure) {
+      return {
+        ...effective,
+        adapterFailure: {
+          outcome: "fail-stale",
+          category: "availability",
+          retriable: true,
+          message: `[${op.name}] agent returned no output`,
+          reason: "empty-output"
+        }
+      };
     }
-    return { ...turn, output: fileContent };
+    return effective;
   };
   const sendWithParseRetry = async (initialPrompt, bodyCtx) => {
     retryFallback = undefined;
@@ -43828,7 +43918,8 @@ class SessionManager {
             category: "availability",
             outcome: "fail-stale",
             retriable: true,
-            message: "idle watchdog cancelled session \u2014 no stream activity"
+            message: "idle watchdog cancelled session \u2014 no stream activity",
+            reason: "idle-watchdog"
           });
         }
       }
@@ -56753,7 +56844,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.67.7",
+    version: "0.67.8",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -56848,8 +56939,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("1c26c38d"))
-        return "1c26c38d";
+      if (/^[0-9a-f]{6,10}$/.test("1e88267c"))
+        return "1e88267c";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

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