@nathapp/nax 0.67.14 → 0.67.16

package/dist/nax.js

@@ -52720,6 +52720,71 @@ 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";
+  }
+  return success2 ? `Phase passed: ${opName}` : `Phase failed: ${opName}`;
+}
 function isSlot(value) {
   return value !== null && typeof value === "object" && "op" in value && "input" in value && typeof value.op?.kind === "string";
 }
@@ -52832,19 +52897,18 @@ function collectRectificationPhases(state) {
   ].filter((phase) => phase !== undefined);
 }
 function phasesToRevalidate(strategiesRun, allPhases) {
-  const sourceFiltered = allPhases.filter((p) => p.kind !== "verifier");
   if (!strategiesRun || strategiesRun.length === 0)
-    return sourceFiltered;
+    return allPhases;
   const unknown2 = strategiesRun.some((name) => STRATEGY_TO_REVALIDATION_PHASES[name] === undefined);
   if (unknown2)
-    return sourceFiltered;
+    return allPhases;
   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));
+  return allPhases.filter((p) => needed.has(p.kind));
 }
 function toReviewDecisionPayload(opName, output) {
   if (output === null || output === undefined || typeof output !== "object")
@@ -52928,10 +52992,11 @@ function logDeterministicPhaseOutcome(storyId, opName, output, durationMs, isTdd
     data.findingsCount = findingsCount;
   if (status !== undefined)
     data.status = status;
+  const message = formatPhaseResultMessage(opName, success2);
   if (success2) {
-    logger?.info("story-orchestrator", `Phase passed: ${opName}`, data);
+    logger?.info("story-orchestrator", message, data);
   } else {
-    logger?.warn("story-orchestrator", `Phase failed: ${opName}`, data);
+    logger?.warn("story-orchestrator", message, data);
   }
 }
 function logUnifiedReviewPhaseResult(storyId, opName, output) {
@@ -52989,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") {
@@ -53100,13 +53166,26 @@ 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;
     }
   };
   const cycleResult = await _storyOrchestratorDeps.runFixCycle(cycle, ctx, "story-orchestrator-rectification", { callOp: wrappedCallOp });
-  phaseOutputs.rectification = { iterationCount: cycleResult.iterations.length };
+  phaseOutputs.rectification = {
+    success: cycleResult.exitReason === "resolved",
+    iterationCount: cycleResult.iterations.length,
+    exitReason: cycleResult.exitReason,
+    finalFindingsCount: cycleResult.finalFindings.length
+  };
   const rectLogger = getSafeLogger();
   const rectSummary = {
     storyId: ctx.storyId,
@@ -53160,13 +53239,6 @@ class ExecutionPlan {
     const phaseOutputs = {};
     const startedAt = Date.now();
     const logger = getSafeLogger();
-    const verifierPresent = this.state.verifier !== undefined;
-    const rectificationExempt = this.state.rectification ? [
-      ...this.state.fullSuiteGate ? [this.state.fullSuiteGate.slot.op.name] : [],
-      ...this.state.verifier ? [this.state.verifier.slot.op.name] : []
-    ] : [];
-    const verifierExempt = verifierPresent && this.state.fullSuiteGate ? [this.state.fullSuiteGate.slot.op.name] : [];
-    const shortCircuitExempt = new Set([...rectificationExempt, ...verifierExempt]);
     for (const phase of collectOrderedPhases(this.state)) {
       try {
         await runPhase(this.ctx, phase.slot, phaseCosts, phaseOutputs, this.isThreeSession);
@@ -53179,16 +53251,40 @@ class ExecutionPlan {
         throw error48;
       }
       if (!phasePassed(phase.slot.op.name, phaseOutputs[phase.slot.op.name], this.ctx.storyId)) {
-        if (!shortCircuitExempt.has(phase.slot.op.name)) {
-          logger?.warn("story-orchestrator", "Short-circuiting on phase failure", {
+        logger?.warn("story-orchestrator", "Short-circuiting on phase failure", {
+          storyId: this.ctx.storyId,
+          phase: phase.slot.op.name
+        });
+        break;
+      }
+    }
+    const rectResult = await runRectification(this.ctx, this.state, phaseCosts, phaseOutputs);
+    if (this.state.rectification && !rectResult.rectificationExhausted) {
+      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: phase.slot.op.name
+            phase: name,
+            error: errorMessage(error48)
+          });
+          throw error48;
+        }
+        if (!phasePassed(name, phaseOutputs[name], this.ctx.storyId)) {
+          logger?.warn("story-orchestrator", "Terminal phase failure (post-rectification resume \u2014 bypasses rectification)", {
+            storyId: this.ctx.storyId,
+            phase: name,
+            source: "post-rectification-resume"
           });
           break;
         }
       }
     }
-    const rectResult = await runRectification(this.ctx, this.state, phaseCosts, phaseOutputs);
     const verifierName = this.state.verifier?.slot.op.name;
     const gateName = this.state.fullSuiteGate?.slot.op.name;
     const verifierPassedSsot = verifierName !== undefined && phaseExplicitlyPassed(phaseOutputs[verifierName]);
@@ -53295,11 +53391,14 @@ var init_story_orchestrator = __esm(() => {
   init_logger2();
   init_operations();
   init_call();
+  init_prepare_inputs();
   init_git();
   _storyOrchestratorDeps = {
     callOp,
     runFixCycle,
-    captureGitRef
+    captureGitRef,
+    prepareSemanticReviewInput,
+    prepareAdversarialReviewInput
   };
   TDD_OP_NAMES = new Set(["test-writer", "implementer", "verifier"]);
   STRICT_VERDICT_PHASE_NAMES = new Set([
@@ -53340,12 +53439,27 @@ var init_story_orchestrator = __esm(() => {
       "lint-check",
       "typecheck-check",
       "full-suite-gate",
+      "verifier",
       "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"]
+    "autofix-test-writer": [
+      "lint-check",
+      "typecheck-check",
+      "full-suite-gate",
+      "verifier",
+      "verify-scoped",
+      "adversarial-review"
+    ],
+    "full-suite-rectify": [
+      "lint-check",
+      "typecheck-check",
+      "full-suite-gate",
+      "verifier",
+      "verify-scoped",
+      "semantic-review"
+    ]
   };
 });
 
@@ -53584,8 +53698,6 @@ async function assemblePlanInputsFromCtx(ctx) {
       resolvedTestPatterns,
       semanticConfig: ctx.config.review.semantic
     });
-    if (prepared.skipReason)
-      return;
     return {
       workdir: ctx.workdir,
       story,
@@ -53597,7 +53709,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;
@@ -53612,8 +53732,6 @@ async function assemblePlanInputsFromCtx(ctx) {
       resolvedTestPatterns,
       adversarialConfig: ctx.config.review.adversarial
     });
-    if (prepared.skipReason)
-      return;
     return {
       workdir: ctx.workdir,
       story,
@@ -53628,7 +53746,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 ? {
@@ -57683,7 +57809,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.67.14",
+    version: "0.67.16",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -57778,8 +57904,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("5b7acea1"))
-        return "5b7acea1";
+      if (/^[0-9a-f]{6,10}$/.test("215c9e93"))
+        return "215c9e93";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

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