@nathapp/nax 0.69.3 → 0.69.5

package/dist/nax.js

@@ -25203,8 +25203,22 @@ async function selectScopedTests(input) {
   if (!smartCfg.enabled || !input.storyGitRef || isMonorepoOrchestrator) {
     return { effectiveCommand: input.testCommand, isFullSuite: true, thresholdFallback: false, isMonorepoOrchestrator };
   }
-  const nonTestFiles = await _scopedSelectionDeps.getChangedNonTestFiles(input.workdir, input.storyGitRef, undefined, globsToTestRegex(smartCfg.testFilePatterns), input.naxIgnoreIndex);
-  const pass1Files = await _scopedSelectionDeps.mapSourceToTests(nonTestFiles, input.workdir);
+  const repoRoot = input.repoRoot ?? input.workdir;
+  const classifyRegex = input.resolvedTestPatterns?.regex ? [...input.resolvedTestPatterns.regex] : globsToTestRegex(smartCfg.testFilePatterns);
+  const mappingGlobs = input.resolvedTestPatterns?.globs ? [...input.resolvedTestPatterns.globs] : smartCfg.testFilePatterns;
+  const changedTestFiles = await _scopedSelectionDeps.getChangedTestFiles(input.workdir, repoRoot, input.storyGitRef, input.packagePrefix, classifyRegex, input.naxIgnoreIndex);
+  if (changedTestFiles.length > threshold) {
+    logger.warn("verify[scoped]", `Changed test file count ${changedTestFiles.length} exceeds threshold ${threshold} \u2014 falling back to full suite`, { storyId: input.storyId });
+    return fullSuite({ scopeTestFallback: true, thresholdFallback: true });
+  }
+  if (changedTestFiles.length > 0) {
+    logger.info("verify[scoped]", `Pass 0: ${changedTestFiles.length} changed test file(s) detected directly`, {
+      storyId: input.storyId
+    });
+    return scoped(changedTestFiles);
+  }
+  const nonTestFiles = await _scopedSelectionDeps.getChangedNonTestFiles(input.workdir, input.storyGitRef, input.packagePrefix, classifyRegex, input.naxIgnoreIndex, repoRoot);
+  const pass1Files = await _scopedSelectionDeps.mapSourceToTests(nonTestFiles, repoRoot, input.packagePrefix, mappingGlobs);
   if (pass1Files.length > threshold) {
     logger.warn("verify[scoped]", `Scoped test file count ${pass1Files.length} exceeds threshold ${threshold} \u2014 falling back to full suite`, { storyId: input.storyId });
     return fullSuite({ scopeTestFallback: true, thresholdFallback: true });
@@ -25218,7 +25232,7 @@ async function selectScopedTests(input) {
   if (smartCfg.fallback !== "import-grep") {
     return fullSuite();
   }
-  const pass2Files = await _scopedSelectionDeps.importGrepFallback(nonTestFiles, input.workdir, smartCfg.testFilePatterns);
+  const pass2Files = await _scopedSelectionDeps.importGrepFallback(nonTestFiles, input.workdir, mappingGlobs);
   if (pass2Files.length > threshold) {
     logger.warn("verify[scoped]", `Scoped test file count ${pass2Files.length} exceeds threshold ${threshold} \u2014 falling back to full suite`, { storyId: input.storyId });
     return fullSuite({ scopeTestFallback: true, thresholdFallback: true });
@@ -25243,6 +25257,7 @@ var init_scoped_selection = __esm(() => {
   };
   _scopedSelectionDeps = {
     getChangedNonTestFiles: _smartRunnerDeps.getChangedNonTestFiles,
+    getChangedTestFiles: _smartRunnerDeps.getChangedTestFiles,
     mapSourceToTests: _smartRunnerDeps.mapSourceToTests,
     importGrepFallback: _smartRunnerDeps.importGrepFallback,
     buildSmartTestCommand: _smartRunnerDeps.buildSmartTestCommand
@@ -34374,17 +34389,18 @@ function acSentinelToFinding(sentinel, _output) {
 }
 
 // src/findings/adapters/typecheck.ts
-function tscDiagnosticToFinding(d, workdir) {
+function genericTypecheckDiagnosticToFinding(d, workdir, tool) {
   return {
     source: "typecheck",
-    tool: "tsc",
+    tool,
     severity: "error",
     category: "type-error",
     rule: d.code ? `TS${d.code}` : undefined,
     file: rebaseToWorkdir(d.file, workdir, workdir),
     line: d.line,
     column: d.column,
-    message: d.message
+    message: d.message,
+    fixTarget: "source"
   };
 }
 var init_typecheck = __esm(() => {
@@ -38896,7 +38912,7 @@ function makeAutofixImplementerStrategy(story, config2, sink, opts = {}) {
   const claimsAdversarial = opts.includeAdversarialReview === true;
   return {
     name: "autofix-implementer",
-    appliesTo: (f) => f.fixTarget === "source" && IMPLEMENTER_SOURCES.has(f.source) || claimsAdversarial && f.source === "adversarial-review",
+    appliesTo: (f) => (f.fixTarget === "source" || f.fixTarget == null) && IMPLEMENTER_SOURCES.has(f.source) || claimsAdversarial && f.source === "adversarial-review",
     fixOp: implementerRectifyOp,
     buildInput: (findings, _prior, _cycleCtx) => ({
       failedChecks: findingsToFailedChecks(findings),
@@ -39377,7 +39393,15 @@ var init_lint_check = __esm(() => {
         return { success: true, status: "passed", findings: [], durationMs: Date.now() - start };
       }
       const parsed = deps.parseLintOutput(result.output, "auto", { workdir: input.workdir });
-      return { success: false, findings: parsed?.findings ?? [], durationMs: Date.now() - start };
+      const parsedFindings = parsed?.findings ?? [];
+      const sentinel = {
+        source: "lint",
+        severity: "error",
+        category: "lint-failure",
+        message: `lint failed (no structured findings parsed), please run the lint check command: ${command}`
+      };
+      const findings = parsedFindings.length > 0 ? parsedFindings : [sentinel];
+      return { success: false, findings, durationMs: Date.now() - start };
     }
   };
 });
@@ -39568,6 +39592,11 @@ function strategiesFor(format) {
     return [];
   return [tscStrategy, typecheckTextBlockStrategy];
 }
+function toolForFormat(format) {
+  if (format === "tsc")
+    return "tsc";
+  return;
+}
 function parseTypecheckOutput(output, format = "auto", opts) {
   if (!output.trim())
     return null;
@@ -39575,7 +39604,8 @@ function parseTypecheckOutput(output, format = "auto", opts) {
     const parsed = strategy.parse(output);
     if (parsed && parsed.diagnostics.length > 0) {
       if (opts) {
-        const findings = parsed.diagnostics.map((d) => tscDiagnosticToFinding(d, opts.workdir));
+        const tool = toolForFormat(parsed.format);
+        const findings = parsed.diagnostics.map((d) => genericTypecheckDiagnosticToFinding(d, opts.workdir, tool));
         return { ...parsed, findings };
       }
       return parsed;
@@ -39633,7 +39663,16 @@ var init_typecheck_check = __esm(() => {
         return { success: true, status: "passed", findings: [], durationMs: Date.now() - start };
       }
       const parsed = deps.parseTypecheckOutput(result.output, "auto", { workdir: input.workdir });
-      return { success: false, findings: parsed?.findings ?? [], durationMs: Date.now() - start };
+      const parsedFindings = parsed?.findings ?? [];
+      const sentinel = {
+        source: "typecheck",
+        severity: "error",
+        category: "typecheck-failure",
+        fixTarget: "source",
+        message: `typecheck failed (no structured findings parsed), please run the typecheck command: ${command}`
+      };
+      const findings = parsedFindings.length > 0 ? parsedFindings : [sentinel];
+      return { success: false, findings, durationMs: Date.now() - start };
     }
   };
 });
@@ -39685,7 +39724,10 @@ var init_verify_scoped = __esm(() => {
         smartRunnerConfig: quality.execution?.smartTestRunner,
         scopeTestThreshold: quality.quality?.scopeTestThreshold,
         fallbackFullSuiteCommand: quality.quality?.commands?.test,
-        naxIgnoreIndex: input.naxIgnoreIndex
+        naxIgnoreIndex: input.naxIgnoreIndex,
+        repoRoot: input.repoRoot,
+        packagePrefix: input.packagePrefix,
+        resolvedTestPatterns: input.resolvedTestPatterns
       });
       if (selection.isFullSuite && regressionMode === "deferred" && !selection.isMonorepoOrchestrator && !selection.thresholdFallback) {
         logger.info("verify[scoped]", "No mapped tests \u2014 deferring to run-end (mode: deferred)", {
@@ -40449,6 +40491,67 @@ var init_text_block2 = __esm(() => {
   };
 });
 
+// src/review/lint-parsing/strategies/ruff-annotated.ts
+function parseRuffAnnotated(output) {
+  if (!output.trim())
+    return null;
+  const lines = output.split(/\r?\n/);
+  let hasArrow = false;
+  for (const line of lines) {
+    if (ARROW_RE.test(line)) {
+      hasArrow = true;
+      break;
+    }
+  }
+  if (!hasArrow)
+    return null;
+  const diagnostics = [];
+  let i = 0;
+  while (i < lines.length) {
+    const arrowMatch = ARROW_RE.exec(lines[i]);
+    if (!arrowMatch || !SOURCE_EXT_RE2.test(arrowMatch[1])) {
+      i++;
+      continue;
+    }
+    const file3 = arrowMatch[1];
+    const line = Number.parseInt(arrowMatch[2], 10);
+    const col = arrowMatch[3] ? Number.parseInt(arrowMatch[3], 10) : undefined;
+    const messageLines = [];
+    let j = i - 1;
+    while (j >= 0) {
+      const l = lines[j]?.trim() ?? "";
+      if (!l || ARROW_RE.test(lines[j] ?? "") || CONTEXT_LINE_RE.test(lines[j] ?? ""))
+        break;
+      messageLines.unshift(lines[j] ?? "");
+      j--;
+    }
+    const contextLines = [lines[i]];
+    let k = i + 1;
+    while (k < lines.length && CONTEXT_LINE_RE.test(lines[k])) {
+      contextLines.push(lines[k]);
+      k++;
+    }
+    const raw = [...messageLines, ...contextLines].join(`
+`);
+    const message = (messageLines[messageLines.length - 1] ?? file3).trim();
+    diagnostics.push({ file: file3, line, column: col, message, raw });
+    i = k;
+  }
+  if (diagnostics.length === 0)
+    return null;
+  return { diagnostics, format: "ruff-annotated" };
+}
+var ARROW_RE, CONTEXT_LINE_RE, ruffAnnotatedStrategy;
+var init_ruff_annotated = __esm(() => {
+  init_text_block2();
+  ARROW_RE = /^\s+-->\s+(.+?):(\d+)(?::(\d+))?$/;
+  CONTEXT_LINE_RE = /^\s*\d*\s*\|/;
+  ruffAnnotatedStrategy = {
+    name: "ruff-annotated",
+    parse: parseRuffAnnotated
+  };
+});
+
 // src/review/lint-parsing/parse.ts
 function strategiesFor2(format) {
   if (format === "eslint-json")
@@ -40456,12 +40559,12 @@ function strategiesFor2(format) {
   if (format === "biome-json")
     return [biomeJsonStrategy];
   if (format === "text")
-    return [textBlockStrategy];
+    return [ruffAnnotatedStrategy, textBlockStrategy];
   if (format === "none")
     return [];
-  return [eslintJsonStrategy, biomeJsonStrategy, textBlockStrategy];
+  return [eslintJsonStrategy, biomeJsonStrategy, ruffAnnotatedStrategy, textBlockStrategy];
 }
-function toolForFormat(format) {
+function toolForFormat2(format) {
   if (format === "biome-json")
     return "biome";
   if (format === "eslint-json")
@@ -40475,7 +40578,7 @@ function parseLintOutput(output, format = "auto", opts) {
     const parsed = strategy.parse(output);
     if (parsed && parsed.diagnostics.length > 0) {
       if (opts) {
-        const tool = toolForFormat(parsed.format);
+        const tool = toolForFormat2(parsed.format);
         const findings = parsed.diagnostics.map((d) => lintDiagnosticToFinding(d, opts.workdir, tool));
         return { ...parsed, findings };
       }
@@ -40495,6 +40598,7 @@ var init_parse4 = __esm(() => {
   init_findings();
   init_biome_json();
   init_eslint_json();
+  init_ruff_annotated();
   init_text_block2();
 });
 
@@ -55133,7 +55237,10 @@ async function assemblePlanInputsFromCtx(ctx) {
     storyId: story.id,
     storyGitRef: ctx.storyGitRef,
     naxIgnoreIndex: ctx.naxIgnoreIndex,
-    regressionMode: toVerifyScopedMode(ctx.config.execution?.regressionGate?.mode)
+    regressionMode: toVerifyScopedMode(ctx.config.execution?.regressionGate?.mode),
+    repoRoot: ctx.projectDir,
+    packagePrefix: packageDirRelative,
+    resolvedTestPatterns
   } : undefined;
   const lintCheckInput = ctx.config.review?.enabled === true && ctx.config.review.checks?.includes("lint") && ctx.config.quality.commands.lint ? { workdir: ctx.workdir, storyId: story.id } : undefined;
   const typecheckCheckInput = ctx.config.review?.enabled === true && ctx.config.review.checks?.includes("typecheck") && ctx.config.quality.commands.typecheck ? { workdir: ctx.workdir, storyId: story.id } : undefined;
@@ -59551,7 +59658,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.69.3",
+    version: "0.69.5",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -59646,8 +59753,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("7917c240"))
-        return "7917c240";
+      if (/^[0-9a-f]{6,10}$/.test("f09a75e2"))
+        return "f09a75e2";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

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