@nathapp/nax 0.67.15 → 0.67.17

package/dist/nax.js

@@ -52720,6 +52720,65 @@ var init_context2 = __esm(() => {
 });
 
 // src/execution/story-orchestrator.ts
+async function refreshReviewInputForDispatch(opName, input) {
+  if (opName !== "semantic-review" && opName !== "adversarial-review")
+    return input;
+  const i = input;
+  const { _refresh } = i;
+  if (!_refresh || !i.workdir)
+    return input;
+  try {
+    if (opName === "semantic-review") {
+      const { _refresh: _, ...semInput } = input;
+      const fresh2 = await _storyOrchestratorDeps.prepareSemanticReviewInput({
+        workdir: semInput.workdir,
+        projectDir: _refresh.projectDir,
+        storyId: _refresh.storyId,
+        storyGitRef: _refresh.storyGitRef,
+        config: _refresh.config,
+        naxIgnoreIndex: _refresh.naxIgnoreIndex,
+        resolvedTestPatterns: _refresh.resolvedTestPatterns,
+        semanticConfig: semInput.semanticConfig
+      });
+      return {
+        ...semInput,
+        stat: fresh2.stat,
+        diff: fresh2.diff,
+        excludePatterns: fresh2.excludePatterns,
+        storyGitRef: fresh2.effectiveRef ?? semInput.storyGitRef
+      };
+    }
+    const { _refresh: __, ...advInput } = input;
+    const fresh = await _storyOrchestratorDeps.prepareAdversarialReviewInput({
+      workdir: advInput.workdir,
+      projectDir: _refresh.projectDir,
+      storyId: _refresh.storyId,
+      storyGitRef: _refresh.storyGitRef,
+      config: _refresh.config,
+      naxIgnoreIndex: _refresh.naxIgnoreIndex,
+      resolvedTestPatterns: _refresh.resolvedTestPatterns,
+      adversarialConfig: advInput.adversarialConfig
+    });
+    return {
+      ...advInput,
+      stat: fresh.stat,
+      diff: fresh.diff,
+      testInventory: fresh.testInventory,
+      excludePatterns: fresh.excludePatterns,
+      testGlobs: fresh.testGlobs,
+      refExcludePatterns: fresh.refExcludePatterns,
+      storyGitRef: fresh.effectiveRef ?? advInput.storyGitRef
+    };
+  } catch (err) {
+    getSafeLogger()?.warn("story-orchestrator", "review input refresh failed \u2014 dispatching with stale input", {
+      storyId: _refresh.storyId,
+      phase: opName,
+      error: errorMessage(err)
+    });
+    const { _refresh: _stripped, ...fallback } = input;
+    return fallback;
+  }
+}
 function formatPhaseResultMessage(opName, success2) {
   if (opName === "greenfield-gate") {
     return success2 ? "Greenfield-gate: pre-existing tests detected (not greenfield) \u2014 proceeding with normal TDD" : "Greenfield-gate: no pre-existing tests \u2014 greenfield run, pausing TDD test-writer";
@@ -52995,7 +53054,8 @@ async function runPhase(ctx, slot, phaseCosts, phaseOutputs, isThreeSession = fa
   const opName = slot.op.name;
   const isTddPhase = isThreeSession && TDD_OP_NAMES.has(opName);
   const beforeRef = isTddPhase ? await _storyOrchestratorDeps.captureGitRef(ctx.packageDir) : undefined;
-  const dispatchInput = isTddPhase && beforeRef ? { ...slot.input, beforeRef } : slot.input;
+  let dispatchInput = isTddPhase && beforeRef ? { ...slot.input, beforeRef } : slot.input;
+  dispatchInput = await refreshReviewInputForDispatch(opName, dispatchInput);
   if (isTddPhase) {
     logger?.info("tdd", `-> Session: ${opName}`, { storyId: ctx.storyId, role: opName });
   } else if (isThreeSession && opName === "full-suite-gate") {
@@ -53106,7 +53166,15 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
         await runPhase(ctx, phase.slot, phaseCosts, phaseOutputs);
         if (shouldSkipPhaseForRectification(phase, state, phaseOutputs))
           continue;
-        findings.push(...extractPhaseFindings(phaseOutputs[phase.slot.op.name]));
+        const output = phaseOutputs[phase.slot.op.name];
+        findings.push(...extractPhaseFindings(output));
+        if (!phasePassed(phase.slot.op.name, output, ctx.storyId)) {
+          getSafeLogger()?.warn("story-orchestrator", "Short-circuiting revalidation on phase failure", {
+            storyId: ctx.storyId,
+            phase: phase.slot.op.name
+          });
+          break;
+        }
       }
       return rectification.postValidate ? await rectification.postValidate(findings, _validateCtx) : findings;
     }
@@ -53137,14 +53205,7 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
       storyId: ctx.storyId
     });
   }
-  const exhaustedReasons = new Set([
-    "max-attempts-total",
-    "max-attempts-per-strategy",
-    "bail-when",
-    "no-strategy",
-    "agent-gave-up"
-  ]);
-  if (exhaustedReasons.has(cycleResult.exitReason) && cycleResult.finalFindings.length > 0) {
+  if (EXHAUSTED_EXIT_REASONS.has(cycleResult.exitReason) && cycleResult.finalFindings.length > 0) {
     return { rectificationExhausted: true, unfixedFindings: cycleResult.finalFindings };
   }
   return {};
@@ -53191,6 +53252,50 @@ class ExecutionPlan {
       }
     }
     const rectResult = await runRectification(this.ctx, this.state, phaseCosts, phaseOutputs);
+    if (this.state.rectification && !rectResult.rectificationExhausted) {
+      let resumeRectifyUsed = false;
+      for (const phase of collectOrderedPhases(this.state)) {
+        const name = phase.slot.op.name;
+        if (name in phaseOutputs && phasePassed(name, phaseOutputs[name], this.ctx.storyId)) {
+          continue;
+        }
+        try {
+          await runPhase(this.ctx, phase.slot, phaseCosts, phaseOutputs, this.isThreeSession);
+        } catch (error48) {
+          logger?.error("story-orchestrator", "Phase threw unexpected error (post-rectification resume)", {
+            storyId: this.ctx.storyId,
+            phase: name,
+            error: errorMessage(error48)
+          });
+          throw error48;
+        }
+        if (!phasePassed(name, phaseOutputs[name], this.ctx.storyId)) {
+          if (!resumeRectifyUsed) {
+            resumeRectifyUsed = true;
+            logger?.info("story-orchestrator", "Phase failed in post-rectification resume \u2014 invoking second rectification pass", { storyId: this.ctx.storyId, phase: name, source: "post-rectification-resume" });
+            const secondRect = await runRectification(this.ctx, this.state, phaseCosts, phaseOutputs);
+            if (secondRect.rectificationExhausted) {
+              logger?.warn("story-orchestrator", "Second rectification pass exhausted \u2014 terminal failure", {
+                storyId: this.ctx.storyId,
+                phase: name,
+                source: "post-rectification-resume"
+              });
+              break;
+            }
+            if (phasePassed(name, phaseOutputs[name], this.ctx.storyId)) {
+              continue;
+            }
+          }
+          logger?.warn("story-orchestrator", "Terminal phase failure (post-rectification resume \u2014 bypasses rectification)", {
+            storyId: this.ctx.storyId,
+            phase: name,
+            source: "post-rectification-resume",
+            secondRectifyUsed: resumeRectifyUsed
+          });
+          break;
+        }
+      }
+    }
     const verifierName = this.state.verifier?.slot.op.name;
     const gateName = this.state.fullSuiteGate?.slot.op.name;
     const verifierPassedSsot = verifierName !== undefined && phaseExplicitlyPassed(phaseOutputs[verifierName]);
@@ -53290,19 +53395,29 @@ class StoryOrchestratorBuilder {
     return new ExecutionPlan(ctx, { ...this.state }, opts.isThreeSession ?? false);
   }
 }
-var _storyOrchestratorDeps, TDD_OP_NAMES, STRICT_VERDICT_PHASE_NAMES, CANONICAL_ORDER, PHASE_KIND_TO_STATE_KEY, STRATEGY_TO_REVALIDATION_PHASES;
+var _storyOrchestratorDeps, EXHAUSTED_EXIT_REASONS, TDD_OP_NAMES, STRICT_VERDICT_PHASE_NAMES, CANONICAL_ORDER, PHASE_KIND_TO_STATE_KEY, STRATEGY_TO_REVALIDATION_PHASES;
 var init_story_orchestrator = __esm(() => {
   init_errors();
   init_findings();
   init_logger2();
   init_operations();
   init_call();
+  init_prepare_inputs();
   init_git();
   _storyOrchestratorDeps = {
     callOp,
     runFixCycle,
-    captureGitRef
+    captureGitRef,
+    prepareSemanticReviewInput,
+    prepareAdversarialReviewInput
   };
+  EXHAUSTED_EXIT_REASONS = new Set([
+    "max-attempts-total",
+    "max-attempts-per-strategy",
+    "bail-when",
+    "no-strategy",
+    "agent-gave-up"
+  ]);
   TDD_OP_NAMES = new Set(["test-writer", "implementer", "verifier"]);
   STRICT_VERDICT_PHASE_NAMES = new Set([
     fullSuiteGateOp.name,
@@ -53601,8 +53716,6 @@ async function assemblePlanInputsFromCtx(ctx) {
       resolvedTestPatterns,
       semanticConfig: ctx.config.review.semantic
     });
-    if (prepared.skipReason)
-      return;
     return {
       workdir: ctx.workdir,
       story,
@@ -53614,7 +53727,15 @@ async function assemblePlanInputsFromCtx(ctx) {
       excludePatterns: prepared.excludePatterns,
       featureCtxBlock: buildFeatureCtxBlock(ctx, "reviewer-semantic"),
       priorSemanticIterations: ctx.priorSemanticIterations,
-      blockingThreshold: ctx.config.review.blockingThreshold
+      blockingThreshold: ctx.config.review.blockingThreshold,
+      _refresh: {
+        projectDir: ctx.projectDir,
+        storyId: story.id,
+        storyGitRef: ctx.storyGitRef,
+        config: ctx.config,
+        naxIgnoreIndex: ctx.naxIgnoreIndex,
+        resolvedTestPatterns
+      }
     };
   })() : undefined;
   const adversarialEnabled = ctx.config.review?.enabled === true && ctx.config.review.checks?.includes("adversarial") && !!ctx.config.review.adversarial;
@@ -53629,8 +53750,6 @@ async function assemblePlanInputsFromCtx(ctx) {
       resolvedTestPatterns,
       adversarialConfig: ctx.config.review.adversarial
     });
-    if (prepared.skipReason)
-      return;
     return {
       workdir: ctx.workdir,
       story,
@@ -53645,7 +53764,15 @@ async function assemblePlanInputsFromCtx(ctx) {
       refExcludePatterns: prepared.refExcludePatterns,
       featureCtxBlock: buildFeatureCtxBlock(ctx, "reviewer-adversarial"),
       priorAdversarialIterations: ctx.priorAdversarialIterations,
-      blockingThreshold: ctx.config.review.blockingThreshold
+      blockingThreshold: ctx.config.review.blockingThreshold,
+      _refresh: {
+        projectDir: ctx.projectDir,
+        storyId: story.id,
+        storyGitRef: ctx.storyGitRef,
+        config: ctx.config,
+        naxIgnoreIndex: ctx.naxIgnoreIndex,
+        resolvedTestPatterns
+      }
     };
   })() : undefined;
   const rectificationInput = ctx.config.execution?.rectification?.enabled === true ? {
@@ -53839,7 +53966,7 @@ function extractPauseReason(phaseOutputs) {
   }
   return;
 }
-function deriveTddFailureCategory(phaseOutputs) {
+function deriveTddFailureCategory(phaseOutputs, unfixedFindings) {
   const testWriterOutput = phaseOutputs[testWriterOp.name];
   if (testWriterOutput?.success === false) {
     return "session-failure";
@@ -53856,6 +53983,12 @@ function deriveTddFailureCategory(phaseOutputs) {
     return "tests-failing";
   }
   const verifierPassed = verifierOutput?.success === true;
+  if (!verifierPassed && unfixedFindings && unfixedFindings.length > 0) {
+    const rectOutput = phaseOutputs.rectification;
+    if (rectOutput?.exitReason && EXHAUSTED_EXIT_REASONS.has(rectOutput.exitReason) && unfixedFindings.some((f) => f.source === "test-runner")) {
+      return "full-suite-gate-exhausted";
+    }
+  }
   if (!verifierPassed) {
     const gateOutput = phaseOutputs[fullSuiteGateOp.name];
     if (gateOutput && (gateOutput.success === false || gateOutput.passed === false)) {
@@ -53888,7 +54021,6 @@ async function applyPostRunInspection(ctx, planResult, opts) {
     ...capturedTokenUsage ? { tokenUsage: capturedTokenUsage } : {}
   };
   ctx.agentResult = agentResult;
-  ctx.agentSwapCount = 0;
   const fullSuiteGateOutput = planResult.phaseOutputs[fullSuiteGateOp.name];
   if (fullSuiteGateOutput?.passed) {
     ctx.fullSuiteGatePassed = true;
@@ -53959,7 +54091,7 @@ async function applyPostRunInspection(ctx, planResult, opts) {
     }
   }
   const pauseReason = extractPauseReason(planResult.phaseOutputs);
-  const failureCategory = isTdd && !planResult.success ? deriveTddFailureCategory(planResult.phaseOutputs) : undefined;
+  const failureCategory = isTdd && !planResult.success ? deriveTddFailureCategory(planResult.phaseOutputs, planResult.unfixedFindings) : undefined;
   if (isTdd && !planResult.success && !failureCategory) {
     const phaseSignals = {};
     for (const [name, output] of Object.entries(planResult.phaseOutputs)) {
@@ -54178,6 +54310,7 @@ var init_post_run = __esm(() => {
   init_scratch_writer();
   init_rollback();
   init_git();
+  init_story_orchestrator();
   _postRunDeps = {
     detectMergeConflict,
     checkMergeConflict,
@@ -57700,7 +57833,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.67.15",
+    version: "0.67.17",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -57795,8 +57928,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("035dd857"))
-        return "035dd857";
+      if (/^[0-9a-f]{6,10}$/.test("74621ad5"))
+        return "74621ad5";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

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