@nathapp/nax 0.64.0 → 0.64.1

package/dist/nax.js

@@ -4309,28 +4309,20 @@ class AcpAgentAdapter {
         if (!unwrapped) {
           throw new CompleteError("complete() returned empty output");
         }
-        if (response.exactCostUsd !== undefined) {
+        const tokenUsage = response.cumulative_token_usage ? this._mapper.toInternal(response.cumulative_token_usage) : { inputTokens: 0, outputTokens: 0 };
+        const estimatedCostUsd = tokenUsage.inputTokens > 0 ? estimateCostFromTokenUsage(tokenUsage, _options.modelDef.model) : 0;
+        const exactCostUsd = response.exactCostUsd;
+        if (exactCostUsd !== undefined) {
           getSafeLogger()?.info("acp-adapter", "complete() cost", {
-            costUsd: response.exactCostUsd,
+            costUsd: exactCostUsd,
             model: _options.modelDef.model
           });
-          return {
-            output: unwrapped,
-            costUsd: response.exactCostUsd,
-            source: "exact"
-          };
-        }
-        if (response.cumulative_token_usage) {
-          return {
-            output: unwrapped,
-            costUsd: estimateCostFromTokenUsage(this._mapper.toInternal(response.cumulative_token_usage), _options.modelDef.model),
-            source: "estimated"
-          };
         }
         return {
           output: unwrapped,
-          costUsd: 0,
-          source: "fallback"
+          tokenUsage,
+          estimatedCostUsd,
+          exactCostUsd
         };
       } finally {
         if (session) {
@@ -4347,8 +4339,8 @@ class AcpAgentAdapter {
       if (parsed.type === "auth") {
         return {
           output: error.message,
-          costUsd: 0,
-          source: "fallback",
+          tokenUsage: { inputTokens: 0, outputTokens: 0 },
+          estimatedCostUsd: 0,
           adapterFailure: {
             category: "availability",
             outcome: "fail-auth",
@@ -4360,8 +4352,8 @@ class AcpAgentAdapter {
       if (parsed.type === "rate-limit") {
         return {
           output: error.message,
-          costUsd: 0,
-          source: "fallback",
+          tokenUsage: { inputTokens: 0, outputTokens: 0 },
+          estimatedCostUsd: 0,
           adapterFailure: {
             category: "availability",
             outcome: "fail-rate-limit",
@@ -4374,8 +4366,8 @@ class AcpAgentAdapter {
       if (parsed.type === "model-not-available") {
         return {
           output: error.message,
-          costUsd: 0,
-          source: "fallback",
+          tokenUsage: { inputTokens: 0, outputTokens: 0 },
+          estimatedCostUsd: 0,
           adapterFailure: {
             category: "quality",
             outcome: "fail-adapter-error",
@@ -5189,7 +5181,7 @@ class AgentManager {
         if (!adapter) {
           _finalStatus = "error";
           return {
-            result: { output: "", costUsd: 0, source: "fallback" },
+            result: { output: "", tokenUsage: { inputTokens: 0, outputTokens: 0 }, estimatedCostUsd: 0 },
             fallbacks
           };
         }
@@ -5204,8 +5196,8 @@ class AgentManager {
         } catch (err) {
           result = {
             output: "",
-            costUsd: 0,
-            source: "fallback",
+            tokenUsage: { inputTokens: 0, outputTokens: 0 },
+            estimatedCostUsd: 0,
             adapterFailure: {
               category: "quality",
               outcome: "fail-unknown",
@@ -5214,7 +5206,7 @@ class AgentManager {
             }
           };
         }
-        _totalCostUsd += result.costUsd ?? 0;
+        _totalCostUsd += result.estimatedCostUsd;
         if (!result.adapterFailure) {
           _finalStatus = "ok";
           return { result, fallbacks };
@@ -5237,7 +5229,7 @@ class AgentManager {
           outcome: result.adapterFailure.outcome,
           category: result.adapterFailure.category,
           timestamp: new Date().toISOString(),
-          costUsd: result.costUsd ?? 0
+          costUsd: result.estimatedCostUsd
         };
         fallbacks.push(hop);
         this._emitter.emit("onSwapAttempt", hop);
@@ -5383,7 +5375,9 @@ class AgentManager {
         featureName: options.featureName,
         workdir: options.workdir,
         resolvedPermissions,
-        exactCostUsd: outcome.result.source === "exact" ? outcome.result.costUsd : undefined,
+        tokenUsage: outcome.result.tokenUsage,
+        estimatedCostUsd: outcome.result.estimatedCostUsd,
+        exactCostUsd: outcome.result.exactCostUsd,
         durationMs: Date.now() - start,
         timestamp: Date.now()
       };
@@ -28560,6 +28554,10 @@ function buildDebateDiffSection(ctx) {
   if (ctx.mode === "ref") {
     const stat = ctx.stat ?? "(no stat available)";
     const ref = ctx.storyGitRef;
+    const excludes = [
+      ...new Set([...ctx.productionExcludePatterns ?? [], ":!.nax/", ":!**/.nax/", ":!.nax-pids", ":!**/.nax-pids"])
+    ];
+    const excludeArgs = excludes.map((p) => `'${p}'`).join(" ");
     return [
       "## Changed Files",
       "```",
@@ -28570,7 +28568,7 @@ function buildDebateDiffSection(ctx) {
       "",
       "To inspect the implementation:",
       `- Full diff: \`git diff --unified=3 ${ref}..HEAD\``,
-      `- Production diff: \`git diff --unified=3 ${ref}..HEAD -- . ':!test/' ':!tests/' ':!*.test.ts' ':!*.spec.ts' ':!.nax/' ':!.nax-pids'\``,
+      `- Production diff: \`git diff --unified=3 ${ref}..HEAD -- . ${excludeArgs}\``,
       `- Commit history: \`git log --oneline ${ref}..HEAD\``,
       "",
       "Use these commands to inspect the code. Do NOT rely solely on the file list above."
@@ -28790,9 +28788,13 @@ If all ACs are correctly implemented, respond with { "passed": true, "findings":
 var init_review_builder = () => {};
 
 // src/prompts/builders/adversarial-review-builder.ts
-function buildAdversarialRefDiffSection(storyGitRef, stat, excludePatterns = []) {
-  const merged = [...new Set([...excludePatterns, ":!.nax/", ":!.nax-pids"])];
+function buildAdversarialRefDiffSection(storyGitRef, stat, excludePatterns = [], testGlobs = [], refExcludePatterns = []) {
+  const merged = [...new Set([...excludePatterns, ":!.nax/", ":!**/.nax/", ":!.nax-pids", ":!**/.nax-pids"])];
   const excludeArgs = merged.map((p) => `'${p}'`).join(" ");
+  const productionExcludes = [
+    ...new Set([...refExcludePatterns, ":!.nax/", ":!**/.nax/", ":!.nax-pids", ":!**/.nax-pids"])
+  ];
+  const productionExcludeArgs = productionExcludes.map((p) => `'${p}'`).join(" ");
   const statBlock = stat ? `## Changed Files Summary
 
 \`\`\`
@@ -28800,6 +28802,7 @@ ${stat}
 \`\`\`
 
 ` : "";
+  const testPatternGuide = testGlobs.length > 0 ? testGlobs.map((glob) => `\`${glob}\``).join(", ") : "the resolved project test-file patterns";
   return `${statBlock}## Diff Access
 
 You have access to git commands. Fetch the diff yourself \u2014 do NOT ask for it to be provided.
@@ -28824,8 +28827,10 @@ cat path/to/file.ts
 
 **Test audit workflow:**
 1. Run: \`git diff --name-only --diff-filter=A ${storyGitRef}..HEAD -- . ${excludeArgs}\`
-2. For each new \`src/**.ts\` file, check whether a matching \`test/**/**.test.ts\` was also added.
+2. For each new source file, check whether a matching test file was added (patterns: ${testPatternGuide}).
 3. If a new exported module has no test file, flag it as \`"test-gap"\`.
+4. To focus only on production deltas while auditing test coverage, run:
+  \`git diff --unified=3 ${storyGitRef}..HEAD -- . ${productionExcludeArgs}\`
 
 `;
 }
@@ -28872,7 +28877,18 @@ ${rows}
 
 class AdversarialReviewPromptBuilder {
   buildAdversarialReviewPrompt(story, config2, options) {
-    const { mode, diff, storyGitRef, stat, priorFailures, testInventory, excludePatterns, priorAdversarialFindings } = options;
+    const {
+      mode,
+      diff,
+      storyGitRef,
+      stat,
+      priorFailures,
+      testInventory,
+      excludePatterns,
+      testGlobs,
+      refExcludePatterns,
+      priorAdversarialFindings
+    } = options;
     const priorFindingsBlock = priorAdversarialFindings && priorAdversarialFindings.findings.length > 0 ? buildPriorFindingsBlock(priorAdversarialFindings.round, priorAdversarialFindings.findings) : "";
     const storyBlock = `## Story Under Review
 
@@ -28894,7 +28910,7 @@ ${config2.rules.map((r) => `- ${r}`).join(`
     const attemptBlock = buildAttemptContextBlock(priorFailures);
     let diffBlock;
     if (mode === "ref" && storyGitRef) {
-      diffBlock = buildAdversarialRefDiffSection(storyGitRef, stat, excludePatterns ?? []);
+      diffBlock = buildAdversarialRefDiffSection(storyGitRef, stat, excludePatterns ?? [], testGlobs ?? [], refExcludePatterns ?? []);
     } else if (mode === "embedded" && diff) {
       diffBlock = buildAdversarialEmbeddedDiffSection(diff, testInventory);
     } else {
@@ -28957,7 +28973,7 @@ What did the implementer accept but not actually use?
 
 ### 4. Test Audit Gap
 What new exported units lack corresponding test files?
-- New \`src/foo/bar.ts\` with exports but no \`test/**/bar.test.ts\`
+- New source modules with exports but no matching test file
 - New public functions that only appear in implementation, not in tests
 - Acceptance criteria that touch a code path with no test coverage
 
@@ -32181,6 +32197,8 @@ var init_adversarial_review = __esm(() => {
         priorFailures: input.priorFailures,
         testInventory: input.testInventory,
         excludePatterns: input.excludePatterns,
+        testGlobs: input.testGlobs,
+        refExcludePatterns: input.refExcludePatterns,
         priorAdversarialFindings: input.priorAdversarialFindings
       });
       const content = input.featureCtxBlock ? `${input.featureCtxBlock}${base}` : base;
@@ -33656,7 +33674,12 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
         description: "",
         acceptanceCriteria: resolverContext.story.acceptanceCriteria
       };
-      const diffContext = resolverContext.diffMode === "ref" ? { mode: "ref", storyGitRef: resolverContext.storyGitRef ?? "", stat: resolverContext.stat } : { mode: "embedded", diff: resolverContext.diff ?? "" };
+      const diffContext = resolverContext.diffMode === "ref" ? {
+        mode: "ref",
+        storyGitRef: resolverContext.storyGitRef ?? "",
+        stat: resolverContext.stat,
+        productionExcludePatterns: resolverContext.productionExcludePatterns
+      } : { mode: "embedded", diff: resolverContext.diff ?? "" };
       let dialogueResult;
       if (resolverContext.isReReview) {
         dialogueResult = await reviewerSession.reReviewDebate(resolverContext.labeledProposals, critiqueOutputs, diffContext, debateCtx);
@@ -33724,7 +33747,7 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
       });
       return {
         outcome: "passed",
-        resolverCostUsd: resolverResult.costUsd,
+        resolverCostUsd: resolverResult.exactCostUsd ?? resolverResult.estimatedCostUsd,
         output: resolverResult.output
       };
     }
@@ -33767,7 +33790,7 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
     });
     return {
       outcome: "passed",
-      resolverCostUsd: resolverResult.costUsd,
+      resolverCostUsd: resolverResult.exactCostUsd ?? resolverResult.estimatedCostUsd,
       output: resolverResult.output
     };
   }
@@ -37210,9 +37233,9 @@ function attachCostSubscriber(bus, aggregator, runId) {
   const offDispatch = bus.onDispatch((event) => {
     const tu = event.tokenUsage;
     const exactCostUsd = event.exactCostUsd;
-    if (!tu && exactCostUsd == null)
+    const estimatedCostUsd = event.estimatedCostUsd ?? exactCostUsd ?? 0;
+    if (!tu && exactCostUsd == null && estimatedCostUsd === 0)
       return;
-    const estimatedCostUsd = exactCostUsd ?? 0;
     const costUsd = exactCostUsd ?? estimatedCostUsd;
     const confidence = exactCostUsd != null ? "exact" : "estimated";
     const costEvent = {
@@ -42067,6 +42090,7 @@ var init_diff_utils = __esm(() => {
 });
 
 // src/review/adversarial.ts
+import { relative as relative10, sep as sep3 } from "path";
 function recordAdversarialAudit(opts) {
   opts.runtime?.reviewAuditor.recordDecision({
     reviewer: "adversarial",
@@ -42135,6 +42159,17 @@ async function runAdversarialReview(opts) {
   }
   let diff;
   let testInventory;
+  const effectiveConfig = naxConfig ?? reviewConfigSelector.select(DEFAULT_CONFIG);
+  const packageDirRelative = projectDir && workdir !== projectDir ? (() => {
+    const rel = relative10(projectDir, workdir);
+    if (rel === ".." || rel.startsWith(`..${sep3}`))
+      return;
+    return rel && rel !== "." ? rel : undefined;
+  })() : undefined;
+  const resolvedTestPatterns = await resolveTestFilePatterns(effectiveConfig, projectDir ?? workdir, packageDirRelative);
+  const effectiveRefExcludePatterns = [
+    ...resolveReviewExcludePatterns(adversarialConfig.excludePatterns, resolvedTestPatterns)
+  ];
   if (diffMode === "embedded") {
     diff = await collectDiff(workdir, effectiveRef, adversarialConfig.excludePatterns ?? [], {
       naxIgnoreIndex,
@@ -42211,9 +42246,11 @@ async function runAdversarialReview(opts) {
       priorFailures,
       testInventory,
       excludePatterns: adversarialConfig.excludePatterns,
+      testGlobs: resolvedTestPatterns.globs,
       featureCtxBlock,
       priorAdversarialFindings,
-      blockingThreshold
+      blockingThreshold,
+      refExcludePatterns: effectiveRefExcludePatterns
     });
   } catch (err) {
     logger?.warn("adversarial", "LLM call failed \u2014 fail-open", { storyId: story.id, cause: String(err) });
@@ -42412,11 +42449,13 @@ ${formatFindings(blockingFindings)}`,
 }
 var _adversarialDeps;
 var init_adversarial = __esm(() => {
+  init_config();
   init_context();
   init_errors();
   init_logger2();
   init_adversarial_review();
   init_call();
+  init_test_runners();
   init_adversarial_helpers();
   init_diff_utils();
   init_review_audit();
@@ -42582,6 +42621,7 @@ async function runSemanticDebate(opts) {
     effectiveRef,
     startTime,
     prompt,
+    productionExcludePatterns,
     blockingThreshold,
     createDebateRunner
   } = opts;
@@ -42620,7 +42660,7 @@ async function runSemanticDebate(opts) {
     reviewerSession: resolverSession,
     resolverContextInput: resolverSession ? {
       diffMode,
-      ...diffMode === "ref" ? { storyGitRef: effectiveRef, stat } : { diff },
+      ...diffMode === "ref" ? { storyGitRef: effectiveRef, stat, productionExcludePatterns } : { diff },
       story: { id: story.id, title: story.title, acceptanceCriteria: story.acceptanceCriteria },
       semanticConfig,
       resolverType: reviewStageConfig.resolver.type,
@@ -42862,6 +42902,7 @@ var init_semantic_evidence = __esm(() => {
 });
 
 // src/review/semantic.ts
+import { relative as relative11, sep as sep4 } from "path";
 function recordSemanticAudit(opts) {
   opts.runtime?.reviewAuditor.recordDecision({
     reviewer: "semantic",
@@ -42924,7 +42965,13 @@ async function runSemanticReview(opts) {
   const repoRoot = projectDir ?? workdir;
   const packageDir = workdir !== repoRoot ? workdir : undefined;
   const stat = await collectDiffStat(workdir, effectiveRef, { naxIgnoreIndex, packageDir });
-  const resolved = await resolveTestFilePatterns(naxConfig ?? reviewConfigSelector.select(DEFAULT_CONFIG), workdir);
+  const packageDirRelative = projectDir && workdir !== projectDir ? (() => {
+    const rel = relative11(projectDir, workdir);
+    if (rel === ".." || rel.startsWith(`..${sep4}`))
+      return;
+    return rel && rel !== "." ? rel : undefined;
+  })() : undefined;
+  const resolved = await resolveTestFilePatterns(naxConfig ?? reviewConfigSelector.select(DEFAULT_CONFIG), projectDir ?? workdir, packageDirRelative);
   const excludePatterns = [...resolveReviewExcludePatterns(semanticConfig.excludePatterns, resolved)];
   let diff;
   if (diffMode === "embedded") {
@@ -43020,6 +43067,7 @@ async function runSemanticReview(opts) {
       effectiveRef,
       startTime,
       prompt,
+      productionExcludePatterns: excludePatterns,
       blockingThreshold,
       createDebateRunner: _semanticDeps.createDebateRunner
     });
@@ -49813,7 +49861,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.64.0",
+    version: "0.64.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -49897,8 +49945,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("a0e4443d"))
-        return "a0e4443d";
+      if (/^[0-9a-f]{6,10}$/.test("8afbec51"))
+        return "8afbec51";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

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