@nathapp/nax 0.70.0-canary.2 → 0.70.0-canary.3

package/dist/nax.js

@@ -21022,6 +21022,7 @@ class AcpAgentAdapter {
     const MAX_TURNS = opts.maxTurns ?? 10;
     let totalTokenUsage = { inputTokens: 0, outputTokens: 0 };
     let totalExactCostUsd;
+    const interactions = [];
     let turnCount = 0;
     let lastResponse = null;
     let timedOut = false;
@@ -21106,6 +21107,7 @@ class AcpAgentAdapter {
             })
           ]);
           if (response) {
+            interactions.push({ turnIndex: turnCount, question, reply: response.answer });
             currentPrompt = response.answer;
             continue;
           }
@@ -21136,7 +21138,8 @@ class AcpAgentAdapter {
       tokenUsage,
       estimatedCostUsd,
       exactCostUsd,
-      internalRoundTrips: turnCount
+      internalRoundTrips: turnCount,
+      ...interactions.length > 0 ? { interactions } : {}
     };
   }
   async closeSession(handle) {
@@ -22139,6 +22142,7 @@ class AgentManager {
           sessionId: handle.protocolIds?.sessionId ?? null,
           recordId: handle.protocolIds?.recordId ?? null
         },
+        ...result.interactions?.length ? { interactions: result.interactions } : {},
         origin: "runAsSession",
         ...opts.callId !== undefined ? { callId: opts.callId } : {},
         ...opts.scopeId !== undefined ? { scopeId: opts.scopeId } : {}
@@ -44729,11 +44733,22 @@ function buildTxtContent(entry) {
     "",
     "=== RESPONSE ===",
     "",
-    entry.response
+    entry.response,
+    ...buildInteractionLines(entry.interactions)
   ];
   return lines.join(`
 `);
 }
+function buildInteractionLines(interactions) {
+  if (!interactions?.length)
+    return [];
+  const lines = ["", "=== INTERACTIONS ===", ""];
+  for (const ix of interactions) {
+    lines.push(`[turn ${ix.turnIndex}] Q: ${ix.question}`, `         A: ${ix.reply}`, "");
+  }
+  lines.pop();
+  return lines;
+}
 
 class PromptAuditor {
   _queue = Promise.resolve();
@@ -45242,7 +45257,8 @@ function attachAuditSubscriber(bus, auditor, runId) {
       ...event.kind === "session-turn" && {
         sessionId: event.protocolIds.sessionId ?? null,
         recordId: event.protocolIds.recordId ?? null,
-        turn: event.turn
+        turn: event.turn,
+        ...event.interactions?.length ? { interactions: event.interactions } : {}
       }
     };
     auditor.record(entry);
@@ -55155,7 +55171,8 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs, overrides)
           break;
         }
       }
-      const validated = rectification.postValidate ? await rectification.postValidate(findings, _validateCtx) : findings;
+      const postValidateFn = overrides?.postValidate ?? rectification.postValidate;
+      const validated = postValidateFn ? await postValidateFn(findings, _validateCtx) : findings;
       return { findings: validated, shortCircuited };
     }
   };
@@ -55325,7 +55342,8 @@ class ExecutionPlan {
           strategies: this.state.nonBlockingFixStrategies ?? [],
           excludePhaseKinds: nonBlockingExcludePhases(),
           extraRevalidationKinds: nonBlockingExtraPhases(advCfg),
-          maxAttempts
+          maxAttempts,
+          postValidate: this.state.nonBlockingFixPostValidate
         })
       });
     }
@@ -55421,9 +55439,10 @@ class StoryOrchestratorBuilder {
     this.state.rectification = opts;
     return this;
   }
-  addNonBlockingFix(cfg, strategies) {
+  addNonBlockingFix(cfg, strategies, postValidate) {
     this.state.nonBlockingFix = cfg;
     this.state.nonBlockingFixStrategies = strategies;
+    this.state.nonBlockingFixPostValidate = postValidate;
     return this;
   }
   build(ctx, opts = {}) {
@@ -55553,10 +55572,10 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
   if (inputs.adversarialReview) {
     builder.addAdversarialReview(inputs.adversarialReview);
   }
+  const packageDir = join47(ctx.packageDir, story.workdir ?? "");
+  const resolvedTestPatterns = await resolveTestFilePatterns(config2, ctx.packageDir, story.workdir);
   if (shouldRunRectification(config2) && inputs.rectification) {
     const sink = makeDeclarationSink();
-    const packageDir = join47(ctx.packageDir, story.workdir ?? "");
-    const resolvedTestPatterns = await resolveTestFilePatterns(config2, ctx.packageDir, story.workdir);
     const strategies = [];
     const pkgQuality = ctx.packageView.select(qualityConfigSelector).quality;
     if (pkgQuality?.commands?.lintFix || pkgQuality?.commands?.lintFixScoped) {
@@ -55612,7 +55631,22 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
       }), makeAutofixTestWriterStrategy(story, config2, nbSink));
     }
     nbStrategies.push(makeFullSuiteRectifyStrategy(story, config2, nbSink));
-    builder.addNonBlockingFix(nbf, nbStrategies);
+    const nbPostValidate = async (findings, _validateCtx) => {
+      if (nbSink.testEdits.length === 0 && nbSink.mockHandoffs.length === 0)
+        return findings;
+      const pendingMock = nbSink.mockHandoffs.map((h) => ({
+        reason: "mock_structure",
+        file: h.files[0] ?? "",
+        files: h.files,
+        reasonDetail: h.reasonDetail
+      }));
+      const { valid, invalid } = await validateMockStructureFiles(pendingMock, resolvedTestPatterns, packageDir);
+      nbSink.mockHandoffs = valid.map((d) => ({ files: d.files ?? [], reasonDetail: d.reasonDetail ?? "" }));
+      const allDeclarations = [...nbSink.testEdits, ...valid];
+      nbSink.testEdits = [];
+      return applyTestEditDeclarations(findings, allDeclarations, story, invalid);
+    };
+    builder.addNonBlockingFix(nbf, nbStrategies, nbPostValidate);
   }
   return builder.build(ctx, { isThreeSession });
 }
@@ -60211,7 +60245,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.70.0-canary.2",
+    version: "0.70.0-canary.3",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -60306,8 +60340,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("b070f4c1"))
-        return "b070f4c1";
+      if (/^[0-9a-f]{6,10}$/.test("905b80cf"))
+        return "905b80cf";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

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