@nathapp/nax 0.48.3 → 0.48.4

package/dist/nax.js

@@ -22210,7 +22210,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.48.3",
+    version: "0.48.4",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22283,8 +22283,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("fa27043"))
-        return "fa27043";
+      if (/^[0-9a-f]{6,10}$/.test("59e08c0"))
+        return "59e08c0";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -24397,8 +24397,23 @@ async function runReview(config2, workdir, executionConfig) {
   const checks3 = [];
   let firstFailure;
   const allUncommittedFiles = await _deps4.getUncommittedFiles(workdir);
-  const NAX_RUNTIME_FILES = new Set(["nax/status.json", ".nax-verifier-verdict.json"]);
-  const uncommittedFiles = allUncommittedFiles.filter((f) => !NAX_RUNTIME_FILES.has(f) && !f.match(/^nax\/features\/.+\/prd\.json$/));
+  const NAX_RUNTIME_PATTERNS = [
+    /nax\.lock$/,
+    /nax\/metrics\.json$/,
+    /nax\/status\.json$/,
+    /nax\/features\/[^/]+\/status\.json$/,
+    /nax\/features\/[^/]+\/prd\.json$/,
+    /nax\/features\/[^/]+\/runs\//,
+    /nax\/features\/[^/]+\/plan\//,
+    /nax\/features\/[^/]+\/acp-sessions\.json$/,
+    /nax\/features\/[^/]+\/interactions\//,
+    /nax\/features\/[^/]+\/progress\.txt$/,
+    /nax\/features\/[^/]+\/acceptance-refined\.json$/,
+    /\.nax-verifier-verdict\.json$/,
+    /\.nax-pids$/,
+    /\.nax-wt\//
+  ];
+  const uncommittedFiles = allUncommittedFiles.filter((f) => !NAX_RUNTIME_PATTERNS.some((pattern) => pattern.test(f)));
   if (uncommittedFiles.length > 0) {
     const fileList = uncommittedFiles.join(", ");
     logger?.warn("review", `Uncommitted changes detected before review: ${fileList}`);
@@ -29551,6 +29566,23 @@ function buildScopedCommand2(testFiles, baseCommand, testScopedTemplate) {
   }
   return _smartRunnerDeps.buildSmartTestCommand(testFiles, baseCommand);
 }
+async function readPackageName(dir) {
+  try {
+    const content = await Bun.file(join26(dir, "package.json")).json();
+    return typeof content.name === "string" ? content.name : null;
+  } catch {
+    return null;
+  }
+}
+async function resolvePackageTemplate(template, packageDir) {
+  if (!template.includes("{{package}}"))
+    return template;
+  const name = await _verifyDeps.readPackageName(packageDir);
+  if (name === null) {
+    return null;
+  }
+  return template.replaceAll("{{package}}", name);
+}
 var DEFAULT_SMART_RUNNER_CONFIG2, verifyStage, _verifyDeps;
 var init_verify = __esm(() => {
   init_loader2();
@@ -29558,6 +29590,7 @@ var init_verify = __esm(() => {
   init_crash_detector();
   init_runners();
   init_smart_runner();
+  init_scoped();
   DEFAULT_SMART_RUNNER_CONFIG2 = {
     enabled: true,
     testFilePatterns: ["test/**/*.test.ts"],
@@ -29586,14 +29619,34 @@ var init_verify = __esm(() => {
       let isFullSuite = true;
       const smartRunnerConfig = coerceSmartTestRunner(ctx.config.execution.smartTestRunner);
       const regressionMode = ctx.config.execution.regressionGate?.mode ?? "deferred";
-      if (smartRunnerConfig.enabled) {
+      let resolvedTestScopedTemplate = testScopedTemplate;
+      if (testScopedTemplate && ctx.story.workdir) {
+        const resolved = await resolvePackageTemplate(testScopedTemplate, effectiveWorkdir);
+        resolvedTestScopedTemplate = resolved ?? undefined;
+      }
+      const isMonorepoOrchestrator = isMonorepoOrchestratorCommand(testCommand);
+      if (isMonorepoOrchestrator) {
+        if (resolvedTestScopedTemplate && ctx.story.workdir) {
+          effectiveCommand = resolvedTestScopedTemplate;
+          isFullSuite = false;
+          logger.info("verify", "Monorepo orchestrator \u2014 using testScoped template", {
+            storyId: ctx.story.id,
+            command: effectiveCommand
+          });
+        } else {
+          logger.info("verify", "Monorepo orchestrator \u2014 running full suite (no package context)", {
+            storyId: ctx.story.id,
+            command: effectiveCommand
+          });
+        }
+      } else if (smartRunnerConfig.enabled) {
         const sourceFiles = await _smartRunnerDeps.getChangedSourceFiles(effectiveWorkdir, ctx.storyGitRef, ctx.story.workdir);
         const pass1Files = await _smartRunnerDeps.mapSourceToTests(sourceFiles, effectiveWorkdir);
         if (pass1Files.length > 0) {
           logger.info("verify", `[smart-runner] Pass 1: path convention matched ${pass1Files.length} test files`, {
             storyId: ctx.story.id
           });
-          effectiveCommand = buildScopedCommand2(pass1Files, testCommand, testScopedTemplate);
+          effectiveCommand = buildScopedCommand2(pass1Files, testCommand, resolvedTestScopedTemplate);
           isFullSuite = false;
         } else if (smartRunnerConfig.fallback === "import-grep") {
           const pass2Files = await _smartRunnerDeps.importGrepFallback(sourceFiles, effectiveWorkdir, smartRunnerConfig.testFilePatterns);
@@ -29601,7 +29654,7 @@ var init_verify = __esm(() => {
             logger.info("verify", `[smart-runner] Pass 2: import-grep matched ${pass2Files.length} test files`, {
               storyId: ctx.story.id
             });
-            effectiveCommand = buildScopedCommand2(pass2Files, testCommand, testScopedTemplate);
+            effectiveCommand = buildScopedCommand2(pass2Files, testCommand, resolvedTestScopedTemplate);
             isFullSuite = false;
           }
         }
@@ -29668,7 +29721,8 @@ var init_verify = __esm(() => {
   };
   _verifyDeps = {
     regression,
-    loadConfigForWorkdir
+    loadConfigForWorkdir,
+    readPackageName
   };
 });
 
@@ -29755,7 +29809,7 @@ __export(exports_init_context, {
 });
 import { existsSync as existsSync20 } from "fs";
 import { mkdir } from "fs/promises";
-import { basename, join as join30 } from "path";
+import { basename as basename2, join as join30 } from "path";
 async function findFiles(dir, maxFiles = 200) {
   try {
     const proc = Bun.spawnSync([
@@ -29843,7 +29897,7 @@ async function scanProject(projectRoot) {
   const readmeSnippet = await readReadmeSnippet(projectRoot);
   const entryPoints = await detectEntryPoints(projectRoot);
   const configFiles = await detectConfigFiles(projectRoot);
-  const projectName = packageManifest?.name || basename(projectRoot);
+  const projectName = packageManifest?.name || basename2(projectRoot);
   return {
     projectName,
     fileTree,
@@ -30352,11 +30406,11 @@ function getSafeLogger6() {
   return getSafeLogger();
 }
 function extractPluginName(pluginPath) {
-  const basename3 = path12.basename(pluginPath);
-  if (basename3 === "index.ts" || basename3 === "index.js" || basename3 === "index.mjs") {
+  const basename4 = path12.basename(pluginPath);
+  if (basename4 === "index.ts" || basename4 === "index.js" || basename4 === "index.mjs") {
     return path12.basename(path12.dirname(pluginPath));
   }
-  return basename3.replace(/\.(ts|js|mjs)$/, "");
+  return basename4.replace(/\.(ts|js|mjs)$/, "");
 }
 async function loadPlugins(globalDir, projectDir, configPlugins, projectRoot, disabledPlugins) {
   const loadedPlugins = [];
@@ -33389,10 +33443,10 @@ var init_parallel_executor = __esm(() => {
 // src/pipeline/subscribers/events-writer.ts
 import { appendFile as appendFile2, mkdir as mkdir2 } from "fs/promises";
 import { homedir as homedir7 } from "os";
-import { basename as basename4, join as join46 } from "path";
+import { basename as basename5, join as join46 } from "path";
 function wireEventsWriter(bus, feature, runId, workdir) {
   const logger = getSafeLogger();
-  const project = basename4(workdir);
+  const project = basename5(workdir);
   const eventsDir = join46(homedir7(), ".nax", "events", project);
   const eventsFile = join46(eventsDir, "events.jsonl");
   let dirReady = false;
@@ -33554,10 +33608,10 @@ var init_interaction2 = __esm(() => {
 // src/pipeline/subscribers/registry.ts
 import { mkdir as mkdir3, writeFile } from "fs/promises";
 import { homedir as homedir8 } from "os";
-import { basename as basename5, join as join47 } from "path";
+import { basename as basename6, join as join47 } from "path";
 function wireRegistry(bus, feature, runId, workdir) {
   const logger = getSafeLogger();
-  const project = basename5(workdir);
+  const project = basename6(workdir);
   const runDir = join47(homedir8(), ".nax", "runs", `${project}-${feature}-${runId}`);
   const metaFile = join47(runDir, "meta.json");
   const unsub = bus.on("run:started", (_ev) => {

package/package.json

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

package/src/pipeline/stages/verify.ts

@@ -9,7 +9,7 @@
  * - `escalate`: Tests failed (retry with escalation)
  */
 
-import { join } from "node:path";
+import { basename, join } from "node:path";
 import { loadConfigForWorkdir } from "../../config/loader";
 import type { SmartTestRunnerConfig } from "../../config/types";
 import { getLogger } from "../../logger";
@@ -18,6 +18,7 @@ import { detectRuntimeCrash } from "../../verification/crash-detector";
 import type { VerifyStatus } from "../../verification/orchestrator-types";
 import { regression } from "../../verification/runners";
 import { _smartRunnerDeps } from "../../verification/smart-runner";
+import { isMonorepoOrchestratorCommand } from "../../verification/strategies/scoped";
 import type { PipelineContext, PipelineStage, StageResult } from "../types";
 
 const DEFAULT_SMART_RUNNER_CONFIG: SmartTestRunnerConfig = {
@@ -47,6 +48,41 @@ function buildScopedCommand(testFiles: string[], baseCommand: string, testScoped
   return _smartRunnerDeps.buildSmartTestCommand(testFiles, baseCommand);
 }
 
+/**
+ * Read the npm package name from <dir>/package.json.
+ * Returns null if not found or file has no name field.
+ */
+async function readPackageName(dir: string): Promise<string | null> {
+  try {
+    const content = await Bun.file(join(dir, "package.json")).json();
+    return typeof content.name === "string" ? content.name : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Substitute {{package}} placeholder in a testScoped template.
+ *
+ * Reads the npm package name from <packageDir>/package.json.
+ * Returns null when package.json is absent or has no name field — callers
+ * should skip the template entirely in that case (non-JS/non-Node projects
+ * have no package identity to inject, so don't fall back to a dir name guess).
+ *
+ * @param template   - Template string (e.g. "bunx turbo test --filter={{package}}")
+ * @param packageDir - Absolute path to the package directory
+ * @returns Resolved template, or null if {{package}} cannot be resolved
+ */
+async function resolvePackageTemplate(template: string, packageDir: string): Promise<string | null> {
+  if (!template.includes("{{package}}")) return template;
+  const name = await _verifyDeps.readPackageName(packageDir);
+  if (name === null) {
+    // No package.json or no name field — skip template, can't resolve {{package}}
+    return null;
+  }
+  return template.replaceAll("{{package}}", name);
+}
+
 export const verifyStage: PipelineStage = {
   name: "verify",
   enabled: (ctx: PipelineContext) => !ctx.fullSuiteGatePassed,
@@ -85,7 +121,35 @@ export const verifyStage: PipelineStage = {
     const smartRunnerConfig = coerceSmartTestRunner(ctx.config.execution.smartTestRunner);
     const regressionMode = ctx.config.execution.regressionGate?.mode ?? "deferred";
 
-    if (smartRunnerConfig.enabled) {
+    // Resolve {{package}} in testScoped template for monorepo stories.
+    // Returns null if package.json is absent (non-JS project) — falls through to smart-runner.
+    let resolvedTestScopedTemplate: string | undefined = testScopedTemplate;
+    if (testScopedTemplate && ctx.story.workdir) {
+      const resolved = await resolvePackageTemplate(testScopedTemplate, effectiveWorkdir);
+      resolvedTestScopedTemplate = resolved ?? undefined; // null → skip template
+    }
+
+    // Monorepo orchestrators (turbo, nx) handle change-aware scoping natively via their own
+    // filter syntax. Skip nax's smart runner — appending file paths would produce invalid syntax.
+    // Instead, use the testScoped template (with {{package}} resolved) to scope per-story.
+    const isMonorepoOrchestrator = isMonorepoOrchestratorCommand(testCommand);
+
+    if (isMonorepoOrchestrator) {
+      if (resolvedTestScopedTemplate && ctx.story.workdir) {
+        // Use the resolved scoped template (e.g. "bunx turbo test --filter=@koda/cli")
+        effectiveCommand = resolvedTestScopedTemplate;
+        isFullSuite = false;
+        logger.info("verify", "Monorepo orchestrator — using testScoped template", {
+          storyId: ctx.story.id,
+          command: effectiveCommand,
+        });
+      } else {
+        logger.info("verify", "Monorepo orchestrator — running full suite (no package context)", {
+          storyId: ctx.story.id,
+          command: effectiveCommand,
+        });
+      }
+    } else if (smartRunnerConfig.enabled) {
       // MW-006: pass packagePrefix so git diff is scoped to the package in monorepos
       const sourceFiles = await _smartRunnerDeps.getChangedSourceFiles(
         effectiveWorkdir,
@@ -99,7 +163,7 @@ export const verifyStage: PipelineStage = {
         logger.info("verify", `[smart-runner] Pass 1: path convention matched ${pass1Files.length} test files`, {
           storyId: ctx.story.id,
         });
-        effectiveCommand = buildScopedCommand(pass1Files, testCommand, testScopedTemplate);
+        effectiveCommand = buildScopedCommand(pass1Files, testCommand, resolvedTestScopedTemplate);
         isFullSuite = false;
       } else if (smartRunnerConfig.fallback === "import-grep") {
         // Pass 2: import-grep fallback
@@ -112,7 +176,7 @@ export const verifyStage: PipelineStage = {
           logger.info("verify", `[smart-runner] Pass 2: import-grep matched ${pass2Files.length} test files`, {
             storyId: ctx.story.id,
           });
-          effectiveCommand = buildScopedCommand(pass2Files, testCommand, testScopedTemplate);
+          effectiveCommand = buildScopedCommand(pass2Files, testCommand, resolvedTestScopedTemplate);
           isFullSuite = false;
         }
       }
@@ -215,4 +279,5 @@ export const verifyStage: PipelineStage = {
 export const _verifyDeps = {
   regression,
   loadConfigForWorkdir,
+  readPackageName,
 };

package/src/review/runner.ts

@@ -221,11 +221,26 @@ export async function runReview(
 
   // RQ-001: Check for uncommitted tracked files before running checks
   const allUncommittedFiles = await _deps.getUncommittedFiles(workdir);
-  // Exclude nax runtime files — written by nax itself during the run, not by the agent
-  const NAX_RUNTIME_FILES = new Set(["nax/status.json", ".nax-verifier-verdict.json"]);
-  const uncommittedFiles = allUncommittedFiles.filter(
-    (f) => !NAX_RUNTIME_FILES.has(f) && !f.match(/^nax\/features\/.+\/prd\.json$/),
-  );
+  // Exclude nax runtime files — written by nax itself during the run, not by the agent.
+  // Patterns use a suffix match (no leading ^) so they work in both single-package repos
+  // (nax/features/…) and monorepos where paths are prefixed (apps/cli/nax/features/…).
+  const NAX_RUNTIME_PATTERNS = [
+    /nax\.lock$/,
+    /nax\/metrics\.json$/,
+    /nax\/status\.json$/,
+    /nax\/features\/[^/]+\/status\.json$/,
+    /nax\/features\/[^/]+\/prd\.json$/,
+    /nax\/features\/[^/]+\/runs\//,
+    /nax\/features\/[^/]+\/plan\//,
+    /nax\/features\/[^/]+\/acp-sessions\.json$/,
+    /nax\/features\/[^/]+\/interactions\//,
+    /nax\/features\/[^/]+\/progress\.txt$/,
+    /nax\/features\/[^/]+\/acceptance-refined\.json$/,
+    /\.nax-verifier-verdict\.json$/,
+    /\.nax-pids$/,
+    /\.nax-wt\//,
+  ];
+  const uncommittedFiles = allUncommittedFiles.filter((f) => !NAX_RUNTIME_PATTERNS.some((pattern) => pattern.test(f)));
   if (uncommittedFiles.length > 0) {
     const fileList = uncommittedFiles.join(", ");
     logger?.warn("review", `Uncommitted changes detected before review: ${fileList}`);