@nathapp/nax 0.65.4 → 0.65.5

package/dist/nax.js

@@ -29424,53 +29424,71 @@ var init_debate_builder = __esm(() => {
 function buildPriorIterationsBlock(iterations) {
   if (iterations.length === 0)
     return "";
-  const rows = iterations.map((iter) => {
-    const strategies = iter.fixesApplied.map((fa) => fa.strategyName).join(", ") || "-";
-    const files = iter.fixesApplied.flatMap((fa) => fa.targetFiles).join(", ") || "-";
-    const outcome = iter.outcome;
-    const findingSummary = formatFindingSummary(iter.findingsBefore, iter.findingsAfter);
-    return `| ${iter.iterationNum} | ${strategies} | ${files} | ${outcome} | ${findingSummary} |`;
-  });
-  const header = "| # | Strategies run | Files touched | Outcome | Findings before \u2192 after |";
-  const separator = "|---|----------------|---------------|---------|--------------------------|";
-  const table = [header, separator, ...rows].join(`
+  const sections2 = iterations.map((iter) => renderIteration(iter));
+  const { displaySections, visibleIterations } = applyTokenGuard(sections2, iterations);
+  const verdictTemplate = renderVerdictTemplate(visibleIterations);
+  return [
+    "## Prior Iterations \u2014 verdict required before new analysis",
+    "",
+    ...displaySections,
+    "",
+    verdictTemplate,
+    ""
+  ].join(`
 `);
-  const hasUnchanged = iterations.some((i) => i.outcome === "unchanged");
-  const unchangedNote = hasUnchanged ? `
-When outcome is "unchanged", the prior hypothesis is FALSIFIED \u2014 the change did not affect what was tested. Choose a different category before producing a new verdict. Do NOT repeat fixes listed above.` : "";
-  return `## Prior Iterations \u2014 verdict required before new analysis
-
-${table}${unchangedNote}
+}
+function applyTokenGuard(sections2, iterations) {
+  if (sections2.join(`
 
-`;
+`).length <= MAX_BLOCK_CHARS || sections2.length <= 2) {
+    return { displaySections: sections2, visibleIterations: iterations };
+  }
+  const n = sections2.length;
+  const collapsed = iterations.slice(0, n - 2).map((iter) => `### Round ${iter.iterationNum} \u2014 outcome: ${iter.outcome} (${iter.findingsAfter.length} findings, omitted for brevity)`);
+  const verbatim = sections2.slice(n - 2);
+  return { displaySections: [...collapsed, ...verbatim], visibleIterations: iterations.slice(n - 2) };
 }
-function formatFindingSummary(before, after) {
-  const beforeStr = before.length === 0 ? "0" : formatFindingCount(before);
-  const afterStr = after.length === 0 ? "0" : formatFindingCount(after);
-  return `${beforeStr} \u2192 ${afterStr}`;
+function renderIteration(iter) {
+  const header = `### Round ${iter.iterationNum} \u2014 outcome: ${iter.outcome} (${iter.findingsBefore.length} \u2192 ${iter.findingsAfter.length})`;
+  if (iter.findingsAfter.length === 0) {
+    return [header, "_All prior findings cleared._"].join(`
+`);
+  }
+  const lines = iter.findingsAfter.map((f, i) => renderFinding(f, i + 1));
+  return [header, "Findings flagged previously:", ...lines].join(`
+`);
 }
-function formatFindingCount(findings) {
-  const count = findings.length;
-  const topCategory = mostFrequentCategory(findings);
-  return topCategory !== null ? `${count} [${topCategory}]` : `${count}`;
+function renderFinding(f, n) {
+  const message = truncate(f.message ?? "", 240);
+  const suggestion = truncate(f.suggestion ?? "", 200);
+  const loc = f.file ? f.line != null ? `${f.file}:${f.line}` : f.file : "(workdir-global)";
+  const tag = `[${f.severity} / ${f.category}]`;
+  const ac = typeof f.meta?.acQuote === "string" ? f.meta.acQuote : undefined;
+  const acLine = ac ? `
+   acQuote: "${truncate(ac, 160)}"` : "";
+  return `${n}. ${tag} ${loc}
+   Message: ${message}
+   Suggestion: ${suggestion}${acLine}`;
+}
+function renderVerdictTemplate(iterations) {
+  const total = iterations.reduce((sum, it) => sum + it.findingsAfter.length, 0);
+  const hasUnchanged = iterations.some((i) => i.outcome === "unchanged");
+  const unchangedNote = hasUnchanged ? `
+
+When outcome is "unchanged", the prior hypothesis is FALSIFIED \u2014 the change did not affect what was tested. Choose a different category before producing a new verdict. Do NOT repeat fixes listed above.` : "";
+  return [
+    `**Required:** before adding any new finding, classify each of the ${total} prior finding(s) above as one of:`,
+    "- `addressed` \u2014 the current diff resolves it (cite the diff line that fixes it in your `message` field)",
+    "- `still-blocking` \u2014 the implementer did not fix it; re-flag it with the IDENTICAL `file`, `line`, `category`, and substantively the same `message` wording",
+    `- \`never-an-issue\` \u2014 your prior judgment was wrong; explain why in \`message\` and emit severity \`"info"\``,
+    `Then surface any genuinely new findings.${unchangedNote}`
+  ].join(`
+`);
 }
-function mostFrequentCategory(findings) {
-  if (findings.length === 0)
-    return null;
-  const freq = new Map;
-  for (const f of findings) {
-    freq.set(f.category, (freq.get(f.category) ?? 0) + 1);
-  }
-  let top = null;
-  let topCount = 0;
-  for (const [cat, cnt] of freq) {
-    if (cnt > topCount) {
-      topCount = cnt;
-      top = cat;
-    }
-  }
-  return top;
+function truncate(s, max) {
+  return s.length > max ? `${s.slice(0, max - 1)}\u2026` : s;
 }
+var MAX_BLOCK_CHARS = 6000;
 
 // src/prompts/builders/review-builder.ts
 class ReviewPromptBuilder {
@@ -47468,6 +47486,16 @@ function buildFailureReason(checks3) {
 }
 
 class ReviewOrchestrator {
+  priorAdversarialByStory = new Map;
+  priorSemanticByStory = new Map;
+  clearStory(storyId) {
+    this.priorAdversarialByStory.delete(storyId);
+    this.priorSemanticByStory.delete(storyId);
+  }
+  reset() {
+    this.priorAdversarialByStory.clear();
+    this.priorSemanticByStory.clear();
+  }
   async review(opts) {
     const {
       reviewConfig,
@@ -47795,6 +47823,8 @@ class ReviewOrchestrator {
       assembleForStage(ctx, "review-adversarial")
     ]);
     const contextBundles = semanticBundle || adversarialBundle ? { semantic: semanticBundle ?? undefined, adversarial: adversarialBundle ?? undefined } : undefined;
+    const priorAdversarialIterations = this.priorAdversarialByStory.get(ctx.story.id) ?? [];
+    const priorSemanticIterations = this.priorSemanticByStory.get(ctx.story.id) ?? [];
     const result = await this.review({
       reviewConfig: ctx.config.review,
       workdir: ctx.workdir,
@@ -47816,23 +47846,24 @@ class ReviewOrchestrator {
       featureName: ctx.prd.feature,
       resolverSession,
       priorFailures: ctx.story.priorFailures,
-      priorSemanticIterations: ctx.priorSemanticIterations,
+      priorSemanticIterations,
       featureContextMarkdown: ctx.featureContextMarkdown,
       contextBundles,
       projectDir: ctx.projectDir,
       env: ctx.worktreeDependencyContext?.env,
       naxIgnoreIndex: ctx.naxIgnoreIndex,
       runtime: ctx.runtime,
-      priorAdversarialIterations: ctx.priorAdversarialIterations
+      priorAdversarialIterations
     });
+    const logger = getSafeLogger();
     const advCheck = result.builtIn.checks?.find((c) => c.check === "adversarial");
     if (advCheck) {
       if (!advCheck.success && !advCheck.skipped) {
-        const prior = ctx.priorAdversarialIterations ?? [];
+        const prior = this.priorAdversarialByStory.get(ctx.story.id) ?? [];
         const findingsBefore = prior.length > 0 ? prior[prior.length - 1].findingsAfter ?? [] : [];
         const findingsAfter = advCheck.findings ?? [];
         const now = new Date().toISOString();
-        const newIteration = {
+        const next = {
           iterationNum: prior.length + 1,
           findingsBefore,
           fixesApplied: [],
@@ -47841,21 +47872,27 @@ class ReviewOrchestrator {
           startedAt: now,
           finishedAt: now
         };
-        ctx.priorAdversarialIterations = [...prior, newIteration];
+        this.priorAdversarialByStory.set(ctx.story.id, [...prior, next]);
+        logger?.debug("review", "Adversarial iteration recorded", {
+          storyId: ctx.story.id,
+          iterationNum: next.iterationNum,
+          outcome: next.outcome,
+          findingsCount: findingsAfter.length
+        });
       } else if (advCheck.success && !advCheck.skipped) {
-        ctx.priorAdversarialIterations = undefined;
+        this.priorAdversarialByStory.delete(ctx.story.id);
       }
     } else if (retrySkipChecks?.has("adversarial")) {
-      ctx.priorAdversarialIterations = undefined;
+      this.priorAdversarialByStory.delete(ctx.story.id);
     }
     const semCheck = result.builtIn.checks?.find((c) => c.check === "semantic");
     if (semCheck) {
       if (!semCheck.success && !semCheck.skipped) {
-        const prior = ctx.priorSemanticIterations ?? [];
+        const prior = this.priorSemanticByStory.get(ctx.story.id) ?? [];
         const findingsBefore = prior.length > 0 ? prior[prior.length - 1].findingsAfter ?? [] : [];
         const findingsAfter = semCheck.findings ?? [];
         const now = new Date().toISOString();
-        const newIteration = {
+        const next = {
           iterationNum: prior.length + 1,
           findingsBefore,
           fixesApplied: [],
@@ -47864,12 +47901,18 @@ class ReviewOrchestrator {
           startedAt: now,
           finishedAt: now
         };
-        ctx.priorSemanticIterations = [...prior, newIteration];
+        this.priorSemanticByStory.set(ctx.story.id, [...prior, next]);
+        logger?.debug("review", "Semantic iteration recorded", {
+          storyId: ctx.story.id,
+          iterationNum: next.iterationNum,
+          outcome: next.outcome,
+          findingsCount: findingsAfter.length
+        });
       } else if (semCheck.success && !semCheck.skipped) {
-        ctx.priorSemanticIterations = undefined;
+        this.priorSemanticByStory.delete(ctx.story.id);
       }
     } else if (retrySkipChecks?.has("semantic")) {
-      ctx.priorSemanticIterations = undefined;
+      this.priorSemanticByStory.delete(ctx.story.id);
     }
     return result;
   }
@@ -48561,6 +48604,7 @@ var init_completion = __esm(() => {
   init_logger2();
   init_metrics();
   init_prd();
+  init_orchestrator2();
   init_event_bus();
   completionStage = {
     name: "completion",
@@ -48594,6 +48638,7 @@ var init_completion = __esm(() => {
       }
       for (const completedStory of ctx.stories) {
         markStoryPassed(ctx.prd, completedStory.id);
+        reviewOrchestrator.clearStory(completedStory.id);
         const costPerStory = sessionCost / ctx.stories.length;
         logger.info("completion", "Story passed", {
           storyId: completedStory.id,
@@ -55138,7 +55183,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.65.4",
+    version: "0.65.5",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -55149,10 +55194,13 @@ var init_package = __esm(() => {
       dev: "bun run bin/nax.ts",
       build: 'bun build bin/nax.ts --outdir dist --target bun --define "GIT_COMMIT=\\"$(git rev-parse --short HEAD)\\""',
       typecheck: "bun x tsc --noEmit",
-      lint: "bun x biome check src/ bin/ && bun run check:no-real-global-nax",
+      lint: "bun x biome check src/ bin/ && bun run check:no-real-global-nax && bun run check:alias-internals && bun run check:deep-relatives",
       "lint:json": "bun x biome check src/ bin/ --reporter json",
       "lint:fix": "bun x biome check --write src/ bin/",
       "check:no-real-global-nax": "bun run scripts/check-no-real-global-nax.ts",
+      "check:alias-internals": "bun run scripts/check-alias-internals.ts",
+      "check:deep-relatives": "bun run scripts/check-deep-relatives.ts",
+      "check:deep-relatives:update": "bun run scripts/check-deep-relatives.ts --update-baseline",
       release: "bun scripts/release.ts",
       test: "bun run scripts/run-tests.ts",
       "test:bail": "bun run scripts/run-tests.ts --bail",
@@ -55224,8 +55272,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("006c297f"))
-        return "006c297f";
+      if (/^[0-9a-f]{6,10}$/.test("a329264b"))
+        return "a329264b";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -58380,6 +58428,7 @@ async function handlePipelineFailure(ctx, pipelineResult) {
       break;
     case "fail":
       markStoryFailed(prd, ctx.story.id, pipelineResult.context.tddFailureCategory, pipelineResult.stoppedAtStage, ctx.statusWriter);
+      reviewOrchestrator.clearStory(ctx.story.id);
       await savePRD(prd, ctx.prdPath);
       prdDirty = true;
       logger?.error("pipeline", "Story failed", { storyId: ctx.story.id, reason: pipelineResult.reason });
@@ -58442,6 +58491,7 @@ var init_pipeline_result_handler = __esm(() => {
   init_logger2();
   init_event_bus();
   init_prd();
+  init_orchestrator2();
   init_bun_deps();
   init_git();
   init_manager3();
@@ -58515,6 +58565,7 @@ async function runIteration(ctx, prd, selection, iterations, totalCost, allStory
       });
     } catch (error48) {
       markStoryFailed(prd, story.id, "dependency-prep", "worktree-dependencies", ctx.statusWriter);
+      reviewOrchestrator.clearStory(story.id);
       await savePRD(prd, ctx.prdPath);
       try {
         await _iterationRunnerDeps.worktreeManager.remove(ctx.workdir, story.id);
@@ -58648,6 +58699,7 @@ var init_iteration_runner = __esm(() => {
   init_runner3();
   init_stages();
   init_prd();
+  init_orchestrator2();
   init_git();
   init_dependencies();
   init_manager3();
@@ -94915,6 +94967,7 @@ init_test_path();
 init_hooks();
 init_logger2();
 init_prd();
+init_orchestrator2();
 init_git();
 init_crash_recovery();
 init_story_context();
@@ -95038,6 +95091,7 @@ async function runCompletionPhase(options) {
   await writeExitSummary(options.logFilePath, options.totalCost, options.iterations, options.storiesCompleted, durationMs);
   logger?.debug("execution", "Completion phase \u2014 auto-committing dirty files");
   await autoCommitIfDirty(options.workdir, "run.complete", "run-summary", options.feature);
+  reviewOrchestrator.reset();
   await options.runtime?.close();
   logger?.debug("execution", "Completion phase done \u2014 returning to runner");
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.65.4",
+  "version": "0.65.5",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {
@@ -11,10 +11,13 @@
     "dev": "bun run bin/nax.ts",
     "build": "bun build bin/nax.ts --outdir dist --target bun --define \"GIT_COMMIT=\\\"$(git rev-parse --short HEAD)\\\"\"",
     "typecheck": "bun x tsc --noEmit",
-    "lint": "bun x biome check src/ bin/ && bun run check:no-real-global-nax",
+    "lint": "bun x biome check src/ bin/ && bun run check:no-real-global-nax && bun run check:alias-internals && bun run check:deep-relatives",
     "lint:json": "bun x biome check src/ bin/ --reporter json",
     "lint:fix": "bun x biome check --write src/ bin/",
     "check:no-real-global-nax": "bun run scripts/check-no-real-global-nax.ts",
+    "check:alias-internals": "bun run scripts/check-alias-internals.ts",
+    "check:deep-relatives": "bun run scripts/check-deep-relatives.ts",
+    "check:deep-relatives:update": "bun run scripts/check-deep-relatives.ts --update-baseline",
     "release": "bun scripts/release.ts",
     "test": "bun run scripts/run-tests.ts",
     "test:bail": "bun run scripts/run-tests.ts --bail",