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

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 } : {}
@@ -32088,6 +32092,19 @@ ${STEP3_SHARED_RULES}
 - **File output (REQUIRED)**: Write the acceptance test file DIRECTLY to the path shown below. Do NOT output the test code in your response. After writing the file, reply with a brief confirmation.
 - **Path anchor (CRITICAL \u2014 do NOT deviate)**: Write the test file to this exact path: \`${p.targetTestFilePath}\`. This path is intentional and computed by the orchestrator \u2014 do not change it based on what you observe in the project. In particular: if you see a \`.nax/features/\` directory at the repo root, that is for stories scoped to the repo root. When a story belongs to a specific package (e.g. \`packages/core\`), its acceptance test lives inside that package's \`.nax/features/\` directory so the test runner can resolve the package's imports correctly. The package root is 3 levels above the test file (\`../../../\` relative to the test file).
 - **Process cwd**: When spawning child processes to invoke a CLI or binary, set the working directory to the **package root** (\`join(import.meta.dir, "../../..")\`) as your default \u2014 unless your Step 2 exploration reveals the CLI uses a different working directory convention (e.g. reads config from \`~/.config/\`, or resolves paths relative to a flag value). Always check how the CLI resolves file paths before assuming.${implSection}`;
+  }
+  buildPathCorrection(targetTestFilePath) {
+    return `The acceptance test file was NOT found at the required path. You likely wrote it to a different filename or directory (for example, by renaming a dotfile or replacing dashes with underscores).
+
+Move (or re-write) the acceptance test you just created so it lives at EXACTLY this path:
+${targetTestFilePath}
+
+Requirements:
+- The file must be at that exact path \u2014 same directory and same filename, including any leading dot and dashes. Do NOT sanitize, rename, or relocate it.
+- Preserve the test content you already wrote. Do not regenerate, weaken, or stub the assertions.
+- If you wrote it somewhere else, delete the misplaced copy after moving it so only the canonical path remains.
+
+After writing the file to the exact path above, reply with a brief confirmation only.`;
   }
   buildGeneratorFromSpecPrompt(p) {
     return `You are a senior test engineer. Your task is to generate a complete acceptance test file for the "${p.featureName}" feature.
@@ -34755,6 +34772,40 @@ ${outputFormat}`, overridable: false }
   };
 });
 
+// src/operations/self-heal.ts
+function makeSelfHealStep(spec) {
+  return {
+    async run(ctx) {
+      const deviations = await spec.detect(ctx.input);
+      if (deviations.length === 0)
+        return null;
+      if (spec.log) {
+        getSafeLogger()?.info(spec.log.kind, spec.log.message, spec.log.meta?.(ctx.input, deviations) ?? {});
+      }
+      return ctx.send(spec.buildRepair(deviations, ctx.input));
+    }
+  };
+}
+async function runSelfHealChain(ctx, seed, steps) {
+  let last = seed;
+  let totalCost = seed.estimatedCostUsd ?? 0;
+  for (const step of steps) {
+    try {
+      const turn = await step.run(ctx);
+      if (turn) {
+        totalCost += turn.estimatedCostUsd ?? 0;
+        last = turn;
+      }
+    } catch (err) {
+      getSafeLogger()?.warn("self-heal", "step threw \u2014 skipping", { error: errorMessage(err) });
+    }
+  }
+  return { ...last, estimatedCostUsd: totalCost };
+}
+var init_self_heal = __esm(() => {
+  init_logger2();
+});
+
 // src/operations/plan-refine.ts
 import { join as join21 } from "path";
 function hasToken(text, tokens) {
@@ -34893,6 +34944,28 @@ async function normalizeCreatedContextFiles(prd, workdir, fileExists) {
     return prd;
   return { ...prd, userStories: results.map((r) => r.story) };
 }
+function verbatimSelfHealStep(builder) {
+  return makeSelfHealStep({
+    detect: (input) => readMissingVerbatimAcs(input),
+    buildRepair: (missing, input) => builder.buildVerbatimRepair(missing, input.outputPath),
+    log: {
+      kind: "plan",
+      message: "Refine dropped [verbatim] spec ACs \u2014 issuing one repair turn",
+      meta: (input, missing) => ({ featureName: input.featureName, missingCount: missing.length })
+    }
+  });
+}
+function specDriftSelfHealStep(builder) {
+  return makeSelfHealStep({
+    detect: (input) => readSpecDriftViolations(input),
+    buildRepair: (drifted, input) => builder.buildSpecDriftRepair(drifted, input.outputPath),
+    log: {
+      kind: "plan",
+      message: "specGuard: spec-drift violations found \u2014 issuing one repair turn",
+      meta: (input, drifted) => ({ featureName: input.featureName, violationCount: drifted.length })
+    }
+  });
+}
 var _planRefineDeps, NEGATIVE_PATH_TOKENS, planRefineOp;
 var init_plan_refine = __esm(() => {
   init_retry();
@@ -34902,6 +34975,7 @@ var init_plan_refine = __esm(() => {
   init_prd();
   init_schema2();
   init_prompts();
+  init_self_heal();
   init_verbatim_warn();
   _planRefineDeps = {
     readFile: async (path3) => {
@@ -34981,31 +35055,15 @@ ${outputFormat}`,
       const specGuard = ctx.input.specGuard ?? false;
       const turn1 = await ctx.sendWithParseRetry(initialPrompt);
       const turn2 = await ctx.send(builder.buildRefineContinuation(ctx.input.outputPath, specGuard));
-      let totalCost = (turn1.estimatedCostUsd ?? 0) + (turn2.estimatedCostUsd ?? 0);
-      let last = turn2;
-      const missing = await readMissingVerbatimAcs(ctx.input);
-      if (missing.length > 0) {
-        getSafeLogger()?.info("plan", "Refine dropped [verbatim] spec ACs \u2014 issuing one repair turn", {
-          featureName: ctx.input.featureName,
-          missingCount: missing.length
-        });
-        const turn3 = await ctx.send(builder.buildVerbatimRepair(missing, ctx.input.outputPath));
-        totalCost += turn3.estimatedCostUsd ?? 0;
-        last = turn3;
-      }
-      if (specGuard) {
-        const drifted = await readSpecDriftViolations(ctx.input);
-        if (drifted.length > 0) {
-          getSafeLogger()?.info("plan", "specGuard: spec-drift violations found \u2014 issuing one repair turn", {
-            featureName: ctx.input.featureName,
-            violationCount: drifted.length
-          });
-          const turn4 = await ctx.send(builder.buildSpecDriftRepair(drifted, ctx.input.outputPath));
-          totalCost += turn4.estimatedCostUsd ?? 0;
-          last = turn4;
-        }
-      }
-      return { ...last, estimatedCostUsd: totalCost };
+      const seed = {
+        ...turn2,
+        estimatedCostUsd: (turn1.estimatedCostUsd ?? 0) + (turn2.estimatedCostUsd ?? 0)
+      };
+      const steps = [
+        verbatimSelfHealStep(builder),
+        ...specGuard ? [specDriftSelfHealStep(builder)] : []
+      ];
+      return runSelfHealChain(ctx, seed, steps);
     },
     parse(output, input) {
       return validatePlanOutput(output, input.featureName, input.branchName);
@@ -36123,11 +36181,32 @@ function isStubTestContent(content) {
 }
 
 // src/operations/acceptance-generate.ts
-var acceptanceGenerateOp;
+function pathCorrectionStep() {
+  return makeSelfHealStep({
+    detect: async (input) => await _acceptanceGenerateDeps.fileExists(input.targetTestFilePath) ? [] : [input.targetTestFilePath],
+    buildRepair: (_deviations, input) => new AcceptancePromptBuilder().buildPathCorrection(input.targetTestFilePath),
+    log: {
+      kind: "acceptance",
+      message: "Acceptance test not found at target path \u2014 issuing one corrective turn",
+      meta: (input) => ({ targetTestFilePath: input.targetTestFilePath })
+    }
+  });
+}
+var _acceptanceGenerateDeps, acceptanceGenerateOp;
 var init_acceptance_generate = __esm(() => {
   init_generator();
   init_config();
   init_prompts();
+  init_self_heal();
+  _acceptanceGenerateDeps = {
+    fileExists: async (path4) => {
+      try {
+        return await Bun.file(path4).exists();
+      } catch {
+        return false;
+      }
+    }
+  };
   acceptanceGenerateOp = {
     kind: "run",
     name: "acceptance-generate",
@@ -36149,6 +36228,10 @@ var init_acceptance_generate = __esm(() => {
         task: { id: "task", content: prompt, overridable: false }
       };
     },
+    async hopBody(initialPrompt, ctx) {
+      const turn1 = await ctx.sendWithParseRetry(initialPrompt);
+      return runSelfHealChain(ctx, turn1, [pathCorrectionStep()]);
+    },
     parse(output, _input, _ctx) {
       return { testCode: extractTestCode(output) };
     },
@@ -40159,6 +40242,7 @@ var init_operations = __esm(() => {
   init_call();
   init_plan();
   init_plan_refine();
+  init_self_heal();
   init_verbatim_warn();
   init_decompose2();
   init_build_hop_callback();
@@ -44729,11 +44813,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 +45337,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 +55251,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 +55422,8 @@ class ExecutionPlan {
           strategies: this.state.nonBlockingFixStrategies ?? [],
           excludePhaseKinds: nonBlockingExcludePhases(),
           extraRevalidationKinds: nonBlockingExtraPhases(advCfg),
-          maxAttempts
+          maxAttempts,
+          postValidate: this.state.nonBlockingFixPostValidate
         })
       });
     }
@@ -55421,9 +55519,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 +55652,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 +55711,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 +60325,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.70.0-canary.2",
+    version: "0.70.0-canary.4",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -60306,8 +60420,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("e2a854e7"))
+        return "e2a854e7";
     } 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.4",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {