@nathapp/nax 0.70.0-canary.7 → 0.70.1

package/dist/nax.js

@@ -17277,9 +17277,13 @@ var init_schemas_review = __esm(() => {
     }).optional(),
     nonBlockingFix: exports_external.object({
       enabled: exports_external.boolean().default(false),
-      scope: exports_external.enum(["source", "both"]).default("both"),
+      scope: exports_external.enum(["source", "both", "triage"]).default("both"),
       regressionAttempts: exports_external.number().int().min(0).default(1),
-      verifierGuard: exports_external.boolean().default(true)
+      verifierGuard: exports_external.boolean().default(true),
+      sourceDiffCap: exports_external.object({
+        maxFiles: exports_external.number().int().min(0).default(10),
+        maxLines: exports_external.number().int().min(0).default(500)
+      }).optional().default({ maxFiles: 10, maxLines: 500 })
     }).optional()
   });
   ReviewConfigSchema = exports_external.object({
@@ -32581,6 +32585,14 @@ var init_ac_structural_counterfactual = __esm(() => {
   BLOCKING_CATEGORIES = new Set(["input", "error-path", "abandonment", "assumption"]);
 });
 
+// src/review/category-fix-target.ts
+function categoryToFixTarget(category) {
+  return category != null && BLOCKING_CATEGORIES.has(category) ? "source" : "test";
+}
+var init_category_fix_target = __esm(() => {
+  init_ac_structural_counterfactual();
+});
+
 // src/review/severity.ts
 function isBlockingSeverity(sev, threshold = "error") {
   return (SEVERITY_RANK[sev] ?? 0) >= SEVERITY_RANK[threshold];
@@ -32637,12 +32649,13 @@ function toAdversarialReviewFindings(findings) {
       line: f.line,
       message: f.issue,
       suggestion: f.suggestion,
-      fixTarget: f.category === "test-gap" ? "test" : undefined,
+      fixTarget: categoryToFixTarget(f.category),
       meta: Object.keys(metaExtras).length > 0 ? metaExtras : undefined
     };
   });
 }
 var init_adversarial_helpers = __esm(() => {
+  init_category_fix_target();
   init_severity();
 });
 
@@ -33448,9 +33461,16 @@ function buildMeta(f, originalSeverity) {
 function findingCategory(f) {
   return "category" in f && f.category ? f.category : undefined;
 }
+function deriveFixTargetForReviewFinding(category, source) {
+  if (source === "semantic-review" || source === "semantic-debate-review") {
+    return "source";
+  }
+  return categoryToFixTarget(category);
+}
 function llmFindingToReviewFinding(f, opts = {}) {
   const category = findingCategory(f);
   const narrowed = narrowSeverity(f.severity);
+  const source = opts.source;
   const result = {
     ruleId: deriveRuleId(category, f.issue),
     severity: narrowed,
@@ -33460,8 +33480,9 @@ function llmFindingToReviewFinding(f, opts = {}) {
   };
   if (category)
     result.category = category;
-  if (opts.source)
-    result.source = opts.source;
+  if (source)
+    result.source = source;
+  result.fixTarget = deriveFixTargetForReviewFinding(category, source);
   const meta3 = buildMeta(f, f.severity !== narrowed ? f.severity : undefined);
   if (meta3)
     result.meta = meta3;
@@ -33472,6 +33493,7 @@ function llmFindingsToReviewFindings(findings, opts = {}) {
 }
 var SEVERITY_MAP, RULE_ID_SLUG_TOKENS = 6;
 var init_finding_projection = __esm(() => {
+  init_category_fix_target();
   SEVERITY_MAP = {
     critical: "critical",
     error: "error",
@@ -39375,9 +39397,10 @@ var init__finding_to_check = __esm(() => {
 // src/operations/autofix-implementer-strategy.ts
 function makeAutofixImplementerStrategy(story, config2, sink, opts = {}) {
   const claimsAdversarial = opts.includeAdversarialReview === true;
+  const adversarialReviewByFixTarget = opts.adversarialReviewByFixTarget;
   return {
     name: "autofix-implementer",
-    appliesTo: (f) => (f.fixTarget === "source" || f.fixTarget == null) && IMPLEMENTER_SOURCES.has(f.source) || claimsAdversarial && f.source === "adversarial-review",
+    appliesTo: (f) => (f.fixTarget === "source" || f.fixTarget == null) && IMPLEMENTER_SOURCES.has(f.source) || adversarialReviewByFixTarget !== undefined && f.source === "adversarial-review" && f.fixTarget === adversarialReviewByFixTarget || adversarialReviewByFixTarget === undefined && claimsAdversarial && f.source === "adversarial-review",
     fixOp: implementerRectifyOp,
     buildInput: (findings, _prior, _cycleCtx) => ({
       failedChecks: findingsToFailedChecks(findings),
@@ -39409,10 +39432,11 @@ var init_autofix_implementer_strategy = __esm(() => {
 });
 
 // src/operations/autofix-test-writer-strategy.ts
-function makeAutofixTestWriterStrategy(story, config2, sink) {
+function makeAutofixTestWriterStrategy(story, config2, sink, opts = {}) {
+  const includeAdversarial = opts.includeAdversarialReview !== false;
   return {
     name: "autofix-test-writer",
-    appliesTo: (f) => f.fixTarget === "test" || f.source === "adversarial-review" || sink.mockHandoffs.length > 0,
+    appliesTo: (f) => f.fixTarget === "test" || includeAdversarial && f.source === "adversarial-review" || sink.mockHandoffs.length > 0,
     fixOp: testWriterRectifyOp,
     buildInput: (findings, _prior, _cycleCtx) => {
       if (sink.mockHandoffs.length > 0) {
@@ -42307,6 +42331,7 @@ var init_runner2 = __esm(() => {
 // src/review/index.ts
 var init_review = __esm(() => {
   init_semantic_helpers();
+  init_category_fix_target();
   init_ac_quote_validator();
   init_ac_structural_counterfactual();
   init_adversarial();
@@ -54815,6 +54840,26 @@ var init_rollback = __esm(() => {
   };
 });
 
+// src/utils/paths.ts
+import { join as join47, relative as relative13, sep as sep4 } from "path";
+function packageDirRelative(projectDir, workdir) {
+  if (!projectDir || !workdir || workdir === projectDir)
+    return;
+  const rel = relative13(projectDir, workdir);
+  if (rel === ".." || rel.startsWith(`..${sep4}`))
+    return;
+  return rel && rel !== "." ? rel : undefined;
+}
+function getRunsDir() {
+  return process.env.NAX_RUNS_DIR ?? join47(globalConfigDir(), "runs");
+}
+function getEventsRootDir() {
+  return join47(globalConfigDir(), "events");
+}
+var init_paths3 = __esm(() => {
+  init_paths();
+});
+
 // src/execution/non-blocking-fix.ts
 function shouldRunNonBlockingFix(cfg, advisoryCount) {
   return cfg?.enabled === true && advisoryCount > 0;
@@ -54823,9 +54868,42 @@ function nonBlockingExcludePhases() {
   return REVIEW_PHASE_KINDS;
 }
 function nonBlockingExtraPhases(cfg) {
-  return cfg.scope === "both" && cfg.verifierGuard ? ["verifier"] : [];
+  return (cfg.scope === "both" || cfg.scope === "triage") && cfg.verifierGuard ? ["verifier"] : [];
+}
+function createMeasureSourceDiff(args) {
+  const packageDirRel = packageDirRelative(args.projectDir, args.packageDir);
+  return async (workdir, fromRef) => {
+    const resolved = await _nonBlockingFixDeps.resolveTestFilePatterns(args.config, args.projectDir, packageDirRel);
+    const isTestFile3 = createTestFileClassifier(resolved);
+    const proc = _nonBlockingFixDeps.spawn(["git", "diff", "--numstat", fromRef], {
+      cwd: workdir,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const stdout = await Bun.readableStreamToText(proc.stdout);
+    const stderr = await Bun.readableStreamToText(proc.stderr);
+    const exitCode = await proc.exited;
+    if (exitCode !== 0) {
+      const detail = stderr.trim() || `exit ${exitCode}`;
+      throw new Error(`[non-blocking-fix] git diff --numstat failed: ${detail}`);
+    }
+    let fileCount = 0;
+    let sourceLineCount = 0;
+    for (const line of stdout.trim().split(`
+`).filter(Boolean)) {
+      const [addedStr, _deletedStr, filePath] = line.split("\t");
+      if (!filePath || isTestFile3(filePath))
+        continue;
+      fileCount += 1;
+      const added = Number.parseInt(addedStr ?? "", 10);
+      if (Number.isFinite(added))
+        sourceLineCount += added;
+    }
+    return { fileCount, sourceLineCount };
+  };
 }
-async function runNonBlockingFix(args, _deps = DEFAULT_DEPS) {
+async function runNonBlockingFix(args, overrides = {}) {
+  const _deps = { ...DEFAULT_DEPS, ...overrides };
   const logger = getSafeLogger();
   if (!shouldRunNonBlockingFix(args.cfg, args.advisoryFindings.length)) {
     return { ran: false, kept: false, restored: false };
@@ -54845,9 +54923,34 @@ async function runNonBlockingFix(args, _deps = DEFAULT_DEPS) {
     exhausted = true;
   }
   if (!exhausted) {
+    const cap = args.cfg.sourceDiffCap;
+    if (cap) {
+      let metrics;
+      try {
+        metrics = await _deps.measureSourceDiff(args.workdir, restoreRef);
+      } catch (err) {
+        logger?.warn("non-blocking-fix", "source-diff measurement threw \u2014 restoring", {
+          storyId: args.storyId,
+          error: err instanceof Error ? err.message : String(err)
+        });
+        return restoreToSnapshot(args, _deps, restoreRef, phaseOutputsSnapshot, logger);
+      }
+      if (metrics.fileCount > cap.maxFiles || metrics.sourceLineCount > cap.maxLines) {
+        logger?.info("non-blocking-fix", "source diff exceeded cap \u2014 restoring", {
+          storyId: args.storyId,
+          fileCount: metrics.fileCount,
+          sourceLineCount: metrics.sourceLineCount,
+          cap
+        });
+        return restoreToSnapshot(args, _deps, restoreRef, phaseOutputsSnapshot, logger);
+      }
+    }
     logger?.info("non-blocking-fix", "best-effort fix kept", { storyId: args.storyId });
     return { ran: true, kept: true, restored: false };
   }
+  return restoreToSnapshot(args, _deps, restoreRef, phaseOutputsSnapshot, logger);
+}
+async function restoreToSnapshot(args, _deps, restoreRef, phaseOutputsSnapshot, logger) {
   await _deps.rollbackToRef(args.workdir, restoreRef);
   for (const key of Object.keys(args.phaseOutputs))
     delete args.phaseOutputs[key];
@@ -54857,12 +54960,23 @@ async function runNonBlockingFix(args, _deps = DEFAULT_DEPS) {
   });
   return { ran: true, kept: false, restored: true };
 }
-var REVIEW_PHASE_KINDS, DEFAULT_DEPS;
+var REVIEW_PHASE_KINDS, _nonBlockingFixDeps, DEFAULT_DEPS;
 var init_non_blocking_fix = __esm(() => {
   init_logger2();
   init_rollback();
+  init_test_runners();
+  init_bun_deps();
+  init_paths3();
   REVIEW_PHASE_KINDS = ["semantic-review", "adversarial-review"];
-  DEFAULT_DEPS = { captureSnapshotRef, rollbackToRef };
+  _nonBlockingFixDeps = {
+    spawn: typedSpawn,
+    resolveTestFilePatterns
+  };
+  DEFAULT_DEPS = {
+    captureSnapshotRef,
+    rollbackToRef,
+    measureSourceDiff: async () => ({ fileCount: 0, sourceLineCount: 0 })
+  };
 });
 
 // src/execution/story-orchestrator-logging.ts
@@ -55542,7 +55656,7 @@ class ExecutionPlan {
     const advisoryOut = phaseOutputs["adversarial-review"];
     const advisoryFindings = advisoryOut?.advisoryFindings ?? [];
     if (advCfg && this.state.rectification && this.ctx.storyId && shouldRunNonBlockingFix(advCfg, advisoryFindings.length)) {
-      await runNonBlockingFix({
+      await _storyOrchestratorDeps.runNonBlockingFix({
         workdir: this.ctx.packageDir,
         storyId: this.ctx.storyId,
         advisoryFindings,
@@ -55556,6 +55670,12 @@ class ExecutionPlan {
           maxAttempts,
           postValidate: this.state.nonBlockingFixPostValidate
         })
+      }, {
+        measureSourceDiff: createMeasureSourceDiff({
+          config: this.ctx.runtime.configLoader.current(),
+          projectDir: this.ctx.runtime.projectDir,
+          packageDir: this.ctx.packageDir
+        })
       });
     }
     const verifierName = this.state.verifier?.slot.op.name;
@@ -55684,7 +55804,8 @@ var init_story_orchestrator = __esm(() => {
     runFixCycle,
     captureGitRef,
     prepareSemanticReviewInput,
-    prepareAdversarialReviewInput
+    prepareAdversarialReviewInput,
+    runNonBlockingFix
   };
   EXHAUSTED_EXIT_REASONS = new Set([
     "max-attempts-total",
@@ -55743,7 +55864,7 @@ var init_story_orchestrator = __esm(() => {
 });
 
 // src/execution/build-plan-for-strategy.ts
-import { join as join47 } from "path";
+import { join as join48 } from "path";
 function requiresInitialRefCapture(strategy) {
   return isThreeSessionStrategy(strategy);
 }
@@ -55787,7 +55908,7 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
   if (inputs.adversarialReview) {
     builder.addAdversarialReview(inputs.adversarialReview);
   }
-  const packageDir = join47(ctx.packageDir, story.workdir ?? "");
+  const packageDir = join48(ctx.packageDir, story.workdir ?? "");
   const resolvedTestPatterns = await resolveTestFilePatterns(config2, ctx.packageDir, story.workdir);
   if (shouldRunRectification(config2) && inputs.rectification) {
     const sink = makeDeclarationSink();
@@ -55842,6 +55963,12 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
       nbStrategies.push(makeAutofixImplementerStrategy(story, config2, nbSink, {
         includeAdversarialReview: true
       }));
+    } else if (nbf.scope === "triage") {
+      nbStrategies.push(makeAutofixImplementerStrategy(story, config2, nbSink, {
+        adversarialReviewByFixTarget: "source"
+      }), makeAutofixTestWriterStrategy(story, config2, nbSink, {
+        includeAdversarialReview: false
+      }));
     } else {
       nbStrategies.push(makeAutofixImplementerStrategy(story, config2, nbSink, {
         includeAdversarialReview: false
@@ -55876,26 +56003,6 @@ var init_build_plan_for_strategy = __esm(() => {
   init_story_orchestrator();
 });
 
-// src/utils/paths.ts
-import { join as join48, relative as relative13, sep as sep4 } from "path";
-function packageDirRelative(projectDir, workdir) {
-  if (!projectDir || !workdir || workdir === projectDir)
-    return;
-  const rel = relative13(projectDir, workdir);
-  if (rel === ".." || rel.startsWith(`..${sep4}`))
-    return;
-  return rel && rel !== "." ? rel : undefined;
-}
-function getRunsDir() {
-  return process.env.NAX_RUNS_DIR ?? join48(globalConfigDir(), "runs");
-}
-function getEventsRootDir() {
-  return join48(globalConfigDir(), "events");
-}
-var init_paths3 = __esm(() => {
-  init_paths();
-});
-
 // src/execution/plan-inputs.ts
 function validatePlanInputs(story, config2) {
   if (!story.id || story.id.trim() === "") {
@@ -60469,7 +60576,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.70.0-canary.7",
+    version: "0.70.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -60501,6 +60608,7 @@ var init_package = __esm(() => {
       "test:unit": "bun test ./test/unit/ --timeout=60000",
       "test:integration": "bun test ./test/integration/ --timeout=60000",
       "test:ui": "bun test ./test/ui/ --timeout=60000",
+      "test:e2e": "timeout -k 5s 180s bun test test/e2e/ --timeout=60000",
       "check-test-overlap": "bun run scripts/check-test-overlap.ts",
       "check-dead-tests": "bun run scripts/check-dead-tests.ts",
       "check:test-sizes": "bun run scripts/check-test-sizes.ts",
@@ -60564,8 +60672,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("08567b02"))
-        return "08567b02";
+      if (/^[0-9a-f]{6,10}$/.test("c53be9bf"))
+        return "c53be9bf";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -61546,20 +61654,6 @@ async function runDeferredRegression(options) {
       storyOutcomes: {}
     };
   }
-  if (regressionMode !== "deferred") {
-    logger?.info("regression", "Regression gate mode is not deferred, skipping");
-    return {
-      success: true,
-      failedTests: 0,
-      failedTestFiles: [],
-      passedTests: 0,
-      rectificationAttempts: 0,
-      affectedStories: [],
-      storyCosts: {},
-      storyDurations: {},
-      storyOutcomes: {}
-    };
-  }
   const testCommand = config2.quality.commands.test ?? "bun test";
   const timeoutSeconds = config2.execution.regressionGate?.timeoutSeconds ?? 120;
   const maxRectificationAttempts = config2.execution.rectification.maxAttemptsTotal;
@@ -61867,7 +61961,7 @@ async function handleRunCompletion(options) {
     hooksConfig
   } = options;
   const regressionMode = config2.execution.regressionGate?.mode;
-  if (options.skipRegression) {} else if (regressionMode === "deferred" && config2.quality.commands.test) {
+  if (options.skipRegression) {} else if ((regressionMode === "deferred" || regressionMode === "per-story") && config2.quality.commands.test) {
     statusWriter.setPostRunPhase("regression", { status: "running" });
     pipelineEventBus.emit({ type: "postrun:phase:started", phase: "regression" });
     const regressionResult = await _runCompletionDeps.runDeferredRegression({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.70.0-canary.7",
+  "version": "0.70.1",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {
@@ -32,6 +32,7 @@
     "test:unit": "bun test ./test/unit/ --timeout=60000",
     "test:integration": "bun test ./test/integration/ --timeout=60000",
     "test:ui": "bun test ./test/ui/ --timeout=60000",
+    "test:e2e": "timeout -k 5s 180s bun test test/e2e/ --timeout=60000",
     "check-test-overlap": "bun run scripts/check-test-overlap.ts",
     "check-dead-tests": "bun run scripts/check-dead-tests.ts",
     "check:test-sizes": "bun run scripts/check-test-sizes.ts",