@nathapp/nax 0.67.7 → 0.67.9

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 };
@@ -30343,18 +30381,19 @@ Schema: {"passed": boolean, "findings": [{"severity": string, "category": string
     const line = opts.finding.verifiedBy?.line ?? opts.finding.line;
     return `Your previous verifiedBy.observed value did not match the referenced file on disk.
 
+You MUST use your file-reading tool to open ${file3} and copy the actual bytes around line ${line}. Do NOT quote from memory or from the prior conversation \u2014 the previous quote was wrong precisely because it was not read from disk. If you reply without a file-read tool call, the quote will be rejected.
+
 Return ONLY this JSON object:
 {"file":"${file3}","line":${line},"observed":"exact 1-3 line quote"}
 
 Finding issue: ${opts.finding.issue}
 Referenced file: ${file3}
 Referenced line: ${line}
-Previous observed: ${opts.previousObserved}
 
 Rules:
-- Copy observed verbatim from the file. Do not paraphrase.
-- observed must be a 1-3 line excerpt that proves the claim.
-- If you cannot quote proof exactly, set observed to "".
+- Read ${file3} with your file tool first. Then copy observed verbatim from the read result.
+- observed must be a 1-3 line excerpt that proves the claim, taken from at or near line ${line}.
+- If after reading the file you cannot find anything that proves the claim, set observed to "".
 - Do not return a full review. Do not include markdown fences or explanation.`;
   }
 }
@@ -31813,7 +31852,20 @@ async function checkFindingEvidence(opts) {
   const contents = await readSafeFile(opts.workdir, file3);
   if (contents === null)
     return { status: "unreadable", file: file3, line, observed };
-  return normalizedIncludes(contents, observed) ? { status: "matched", file: file3, line, observed } : { status: "unmatched", file: file3, line, observed };
+  return matchesEvidence(contents, observed, line) ? { status: "matched", file: file3, line, observed } : { status: "unmatched", file: file3, line, observed };
+}
+function matchesEvidence(contents, observed, line) {
+  if (!line || line <= 0) {
+    return normalizedIncludes(contents, observed);
+  }
+  const lines = contents.split(`
+`);
+  const cited = Math.min(Math.max(0, line - 1), lines.length - 1);
+  const start = Math.max(0, cited - EVIDENCE_LINE_WINDOW);
+  const end = Math.min(lines.length, cited + EVIDENCE_LINE_WINDOW + 1);
+  const windowText = lines.slice(start, end).join(`
+`);
+  return normalizedIncludes(windowText, observed);
 }
 function downgradeUnsubstantiatedFinding(opts) {
   _evidenceDeps.getLogger()?.warn("review", "Downgraded unsubstantiated review finding", {
@@ -31861,7 +31913,7 @@ function stripWrappingQuotes(text) {
 function isMatchingWrapper(first, last) {
   return first === "`" && last === "`" || first === `"` && last === `"` || first === "'" && last === "'";
 }
-var OBSERVED_PREVIEW_CHARS = 160, ISSUE_PREVIEW_CHARS = 200, SEMANTIC_FINDING_DOWNGRADED_EVENT = "review.semantic.finding.downgraded", ADVERSARIAL_FINDING_DOWNGRADED_EVENT = "review.adversarial.finding.downgraded", _evidenceDeps;
+var OBSERVED_PREVIEW_CHARS = 160, ISSUE_PREVIEW_CHARS = 200, EVIDENCE_LINE_WINDOW = 10, SEMANTIC_FINDING_DOWNGRADED_EVENT = "review.semantic.finding.downgraded", ADVERSARIAL_FINDING_DOWNGRADED_EVENT = "review.adversarial.finding.downgraded", _evidenceDeps;
 var init_semantic_evidence = __esm(() => {
   init_logger2();
   init_path_security2();
@@ -34951,6 +35003,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";
@@ -34972,7 +35071,7 @@ async function requoteBlockingFindings(findings, ctx) {
     if (used >= maxRequotes)
       break;
     used += 1;
-    const retry = await ctx.send(ReviewPromptBuilder.requoteVerbatim({ finding, previousObserved: initialEvidence.observed ?? "" }));
+    const retry = await ctx.send(ReviewPromptBuilder.requoteVerbatim({ finding }));
     extraCostUsd += retry.estimatedCostUsd ?? 0;
     const requote = parseRequoteResponse(retry.output);
     if (!requote) {
@@ -35021,18 +35120,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 +35128,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 +35140,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 };
@@ -37259,14 +37348,45 @@ var init_full_suite_rectify = __esm(() => {
   init_implement();
 });
 
+// src/operations/_finding-to-check.ts
+function findingsToFailedChecks(findings) {
+  const grouped = new Map;
+  for (const finding of findings) {
+    const check2 = SOURCE_TO_CHECK[finding.source];
+    if (!check2)
+      continue;
+    const bucket = grouped.get(check2) ?? [];
+    bucket.push(finding);
+    grouped.set(check2, bucket);
+  }
+  return [...grouped.entries()].map(([check2, grpFindings]) => ({
+    check: check2,
+    success: false,
+    command: "",
+    exitCode: 1,
+    output: "",
+    durationMs: 0,
+    findings: grpFindings
+  }));
+}
+var SOURCE_TO_CHECK;
+var init__finding_to_check = __esm(() => {
+  SOURCE_TO_CHECK = {
+    "semantic-review": "semantic",
+    "adversarial-review": "adversarial",
+    lint: "lint",
+    typecheck: "typecheck"
+  };
+});
+
 // src/operations/autofix-implementer-strategy.ts
 function makeAutofixImplementerStrategy(story) {
   return {
     name: "autofix-implementer",
     appliesTo: (f) => f.fixTarget === "source" && IMPLEMENTER_SOURCES.has(f.source),
     fixOp: implementerRectifyOp,
-    buildInput: (_findings, _prior, _cycleCtx) => ({
-      failedChecks: [],
+    buildInput: (findings, _prior, _cycleCtx) => ({
+      failedChecks: findingsToFailedChecks(findings),
       story
     }),
     extractApplied: (output) => ({
@@ -37279,6 +37399,7 @@ function makeAutofixImplementerStrategy(story) {
 }
 var IMPLEMENTER_SOURCES;
 var init_autofix_implementer_strategy = __esm(() => {
+  init__finding_to_check();
   init_autofix_implementer();
   IMPLEMENTER_SOURCES = new Set(["lint", "typecheck", "semantic-review"]);
 });
@@ -37289,8 +37410,8 @@ function makeAutofixTestWriterStrategy(story, config2) {
     name: "autofix-test-writer",
     appliesTo: (f) => f.fixTarget === "test" || f.source === "adversarial-review",
     fixOp: testWriterRectifyOp,
-    buildInput: (_findings, _prior, _cycleCtx) => ({
-      failedChecks: [],
+    buildInput: (findings, _prior, _cycleCtx) => ({
+      failedChecks: findingsToFailedChecks(findings),
       story,
       blockingThreshold: config2.review?.blockingThreshold
     }),
@@ -37299,6 +37420,7 @@ function makeAutofixTestWriterStrategy(story, config2) {
   };
 }
 var init_autofix_test_writer_strategy = __esm(() => {
+  init__finding_to_check();
   init_autofix_test_writer();
 });
 
@@ -37782,6 +37904,7 @@ var init_operations = __esm(() => {
   init_full_suite_rectify();
   init_autofix_implementer_strategy();
   init_autofix_test_writer_strategy();
+  init__finding_to_check();
   init_mechanical_lintfix_strategy();
   init_mechanical_formatfix_strategy();
   init_lint_check();
@@ -37987,7 +38110,10 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
     if (allExhausted) {
       let liteFindingsAfter;
       try {
-        liteFindingsAfter = await cycle.validate(ctx, { mode: "lite" });
+        liteFindingsAfter = await cycle.validate(ctx, {
+          mode: "lite",
+          strategiesRun: group.map((s) => s.name)
+        });
       } catch (err) {
         const finishedAt3 = now();
         cycle.iterations.push({
@@ -38059,7 +38185,7 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
     let validatorAttempt = 0;
     for (;; ) {
       try {
-        findingsAfter = await cycle.validate(ctx, { mode: "full" });
+        findingsAfter = await cycle.validate(ctx, { mode: "full", strategiesRun: group.map((s) => s.name) });
         break;
       } catch (err) {
         if (validatorAttempt >= cycle.config.validatorRetries) {
@@ -39743,6 +39869,7 @@ var init_review = __esm(() => {
   init_diff_utils();
   init_finding_projection();
   init_runner2();
+  init_requote_response();
   init_severity();
 });
 
@@ -41251,8 +41378,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 +41387,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 +41757,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 };
+      }
     }
-    return { ...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 effective;
   };
   const sendWithParseRetry = async (initialPrompt, bodyCtx) => {
     retryFallback = undefined;
@@ -43828,7 +43969,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"
           });
         }
       }
@@ -51884,9 +52026,19 @@ function extractPhaseFindings(output) {
   const success2 = "success" in record2 ? record2.success === true : ("passed" in record2) ? record2.passed === true : findings.length === 0;
   return success2 ? [] : findings;
 }
-function gatherRectificationFindings(phaseOutputs, phases) {
+function shouldSkipPhaseForRectification(phase, state, phaseOutputs) {
+  if (phase.kind !== "full-suite-gate")
+    return false;
+  const verifierName = state.verifier?.slot.op.name;
+  if (!verifierName)
+    return false;
+  return phaseExplicitlyPassed(phaseOutputs[verifierName]);
+}
+function gatherRectificationFindings(phaseOutputs, phases, state) {
   const findings = [];
   for (const phase of phases) {
+    if (shouldSkipPhaseForRectification(phase, state, phaseOutputs))
+      continue;
     findings.push(...extractPhaseFindings(phaseOutputs[phase.slot.op.name]));
   }
   return findings;
@@ -51902,6 +52054,21 @@ function collectRectificationPhases(state) {
     state.adversarialReview
   ].filter((phase) => phase !== undefined);
 }
+function phasesToRevalidate(strategiesRun, allPhases) {
+  const sourceFiltered = allPhases.filter((p) => p.kind !== "verifier");
+  if (!strategiesRun || strategiesRun.length === 0)
+    return sourceFiltered;
+  const unknown2 = strategiesRun.some((name) => STRATEGY_TO_REVALIDATION_PHASES[name] === undefined);
+  if (unknown2)
+    return sourceFiltered;
+  const needed = new Set;
+  for (const name of strategiesRun) {
+    for (const kind of STRATEGY_TO_REVALIDATION_PHASES[name] ?? []) {
+      needed.add(kind);
+    }
+  }
+  return sourceFiltered.filter((p) => needed.has(p.kind));
+}
 function toReviewDecisionPayload(opName, output) {
   if (output === null || output === undefined || typeof output !== "object")
     return null;
@@ -52057,7 +52224,7 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
   if (ctx.runtime.signal?.aborted) {
     return {};
   }
-  const initialFindings = gatherRectificationFindings(phaseOutputs, validationPhases);
+  const initialFindings = gatherRectificationFindings(phaseOutputs, validationPhases, state);
   if (initialFindings.length === 0) {
     return {};
   }
@@ -52077,13 +52244,22 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
     validate: async (_validateCtx, opts) => {
       if (ctx.runtime.signal?.aborted)
         return [];
-      const lite = opts?.mode === "lite";
+      const lite = (opts?.mode ?? "full") === "lite";
+      const phases = phasesToRevalidate(opts?.strategiesRun, validationPhases);
+      getSafeLogger()?.debug("story-orchestrator", "rectification validate scope", {
+        storyId: ctx.storyId,
+        mode: opts?.mode ?? "full",
+        strategiesRun: opts?.strategiesRun,
+        phasesSelected: phases.map((p) => p.kind)
+      });
       const findings = [];
-      for (const phase of validationPhases) {
+      for (const phase of phases) {
         if (lite && phase.kind === "full-suite-gate") {
           continue;
         }
         await runPhase(ctx, phase.slot, phaseCosts, phaseOutputs);
+        if (shouldSkipPhaseForRectification(phase, state, phaseOutputs))
+          continue;
         findings.push(...extractPhaseFindings(phaseOutputs[phase.slot.op.name]));
       }
       return findings;
@@ -52230,7 +52406,7 @@ class StoryOrchestratorBuilder {
     return new ExecutionPlan(ctx, { ...this.state }, opts.isThreeSession ?? false);
   }
 }
-var _storyOrchestratorDeps, TDD_OP_NAMES, CANONICAL_ORDER, PHASE_KIND_TO_STATE_KEY;
+var _storyOrchestratorDeps, TDD_OP_NAMES, CANONICAL_ORDER, PHASE_KIND_TO_STATE_KEY, STRATEGY_TO_REVALIDATION_PHASES;
 var init_story_orchestrator = __esm(() => {
   init_errors();
   init_findings();
@@ -52268,6 +52444,20 @@ var init_story_orchestrator = __esm(() => {
     "semantic-review": "semanticReview",
     "adversarial-review": "adversarialReview"
   };
+  STRATEGY_TO_REVALIDATION_PHASES = {
+    "mechanical-lintfix": ["lint-check"],
+    "mechanical-formatfix": ["lint-check"],
+    "autofix-implementer": [
+      "lint-check",
+      "typecheck-check",
+      "full-suite-gate",
+      "verify-scoped",
+      "semantic-review",
+      "adversarial-review"
+    ],
+    "autofix-test-writer": ["lint-check", "typecheck-check", "full-suite-gate", "verify-scoped", "adversarial-review"],
+    "full-suite-rectify": ["lint-check", "typecheck-check", "full-suite-gate", "verify-scoped", "semantic-review"]
+  };
 });
 
 // src/execution/build-plan-for-strategy.ts
@@ -56753,7 +56943,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.67.7",
+    version: "0.67.9",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -56848,8 +57038,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("ab2db4bb"))
+        return "ab2db4bb";
     } 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.9",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {