@nathapp/nax 0.48.2 → 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.2",
+    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("c1ac720"))
-        return "c1ac720";
+      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 = [];
@@ -30597,6 +30651,7 @@ var init_checks_git = __esm(() => {
     /^.{2} nax\.lock$/,
     /^.{2} nax\/metrics\.json$/,
     /^.{2} nax\/features\/[^/]+\/status\.json$/,
+    /^.{2} nax\/features\/[^/]+\/prd\.json$/,
     /^.{2} nax\/features\/[^/]+\/runs\//,
     /^.{2} nax\/features\/[^/]+\/plan\//,
     /^.{2} nax\/features\/[^/]+\/acp-sessions\.json$/,
@@ -31659,6 +31714,9 @@ function createSignalHandler(ctx) {
     if (ctx.pidRegistry) {
       await ctx.pidRegistry.killAll();
     }
+    if (ctx.onShutdown) {
+      await ctx.onShutdown().catch(() => {});
+    }
     ctx.emitError?.(signal.toLowerCase());
     await writeFatalLog(ctx.jsonlFilePath, signal);
     await writeRunComplete(ctx, signal.toLowerCase());
@@ -31677,6 +31735,9 @@ function createUncaughtExceptionHandler(ctx) {
     if (ctx.pidRegistry) {
       await ctx.pidRegistry.killAll();
     }
+    if (ctx.onShutdown) {
+      await ctx.onShutdown().catch(() => {});
+    }
     ctx.emitError?.("uncaughtException");
     await writeFatalLog(ctx.jsonlFilePath, "uncaughtException", error48);
     await updateStatusToCrashed(ctx.statusWriter, ctx.getTotalCost(), ctx.getIterations(), "uncaughtException", ctx.featureDir);
@@ -31694,6 +31755,9 @@ function createUnhandledRejectionHandler(ctx) {
     if (ctx.pidRegistry) {
       await ctx.pidRegistry.killAll();
     }
+    if (ctx.onShutdown) {
+      await ctx.onShutdown().catch(() => {});
+    }
     ctx.emitError?.("unhandledRejection");
     await writeFatalLog(ctx.jsonlFilePath, "unhandledRejection", error48);
     await updateStatusToCrashed(ctx.statusWriter, ctx.getTotalCost(), ctx.getIterations(), "unhandledRejection", ctx.featureDir);
@@ -33379,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;
@@ -33544,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) => {
@@ -34965,6 +35029,10 @@ async function setupRun(options) {
     getStoriesCompleted: options.getStoriesCompleted,
     emitError: (reason) => {
       pipelineEventBus.emit({ type: "run:errored", reason, feature: options.feature });
+    },
+    onShutdown: async () => {
+      const { sweepFeatureSessions: sweepFeatureSessions2 } = await Promise.resolve().then(() => (init_adapter2(), exports_adapter));
+      await sweepFeatureSessions2(workdir, feature).catch(() => {});
     }
   });
   let prd = await loadPRD(prdPath);
@@ -66820,10 +66888,11 @@ async function generateFor(agent, options, config2) {
     return { agent, outputFile: generator.outputFile, content: "", written: false, error: error48 };
   }
 }
-async function generateAll(options, config2) {
+async function generateAll(options, config2, agentFilter) {
   const context = await loadContextContent(options, config2);
   const results = [];
-  for (const [agentKey, generator] of Object.entries(GENERATORS)) {
+  const entries = Object.entries(GENERATORS).filter(([agentKey]) => !agentFilter || agentFilter.length === 0 || agentFilter.includes(agentKey));
+  for (const [agentKey, generator] of entries) {
     try {
       const content = generator.generate(context);
       const outputPath = join11(options.outputDir, generator.outputFile);
@@ -66925,34 +66994,42 @@ async function discoverWorkspacePackages(repoRoot) {
 async function generateForPackage(packageDir, config2, dryRun = false) {
   const contextPath = join11(packageDir, "nax", "context.md");
   if (!existsSync10(contextPath)) {
-    return {
-      packageDir,
-      outputFile: "CLAUDE.md",
-      content: "",
-      written: false,
-      error: `context.md not found: ${contextPath}`
-    };
+    return [
+      {
+        packageDir,
+        outputFile: "CLAUDE.md",
+        content: "",
+        written: false,
+        error: `context.md not found: ${contextPath}`
+      }
+    ];
   }
-  try {
-    const options = {
-      contextPath,
-      outputDir: packageDir,
-      workdir: packageDir,
-      dryRun,
-      autoInject: true
-    };
-    const result = await generateFor("claude", options, config2);
-    return {
-      packageDir,
-      outputFile: result.outputFile,
-      content: result.content,
-      written: result.written,
-      error: result.error
-    };
-  } catch (err) {
-    const error48 = err instanceof Error ? err.message : String(err);
-    return { packageDir, outputFile: "CLAUDE.md", content: "", written: false, error: error48 };
+  const agentsToGenerate = config2?.generate?.agents && config2.generate.agents.length > 0 ? config2.generate.agents : ["claude"];
+  const options = {
+    contextPath,
+    outputDir: packageDir,
+    workdir: packageDir,
+    dryRun,
+    autoInject: true
+  };
+  const results = [];
+  for (const agent of agentsToGenerate) {
+    try {
+      const result = await generateFor(agent, options, config2);
+      results.push({
+        packageDir,
+        outputFile: result.outputFile,
+        content: result.content,
+        written: result.written,
+        error: result.error
+      });
+    } catch (err) {
+      const error48 = err instanceof Error ? err.message : String(err);
+      const fallbackFile = GENERATORS[agent]?.outputFile ?? `${agent}.md`;
+      results.push({ packageDir, outputFile: fallbackFile, content: "", written: false, error: error48 });
+    }
   }
+  return results;
 }
 
 // src/cli/plan.ts
@@ -68773,16 +68850,18 @@ async function generateCommand(options) {
       console.log(source_default.yellow("  No packages found (no */nax/context.md or */*/nax/context.md)"));
       return;
     }
-    console.log(source_default.blue(`\u2192 Generating CLAUDE.md for ${packages.length} package(s)...`));
+    console.log(source_default.blue(`\u2192 Generating agent files for ${packages.length} package(s)...`));
     let errorCount = 0;
     for (const pkgDir of packages) {
-      const result = await generateForPackage(pkgDir, config2, dryRun);
-      if (result.error) {
-        console.error(source_default.red(`\u2717 ${pkgDir}: ${result.error}`));
-        errorCount++;
-      } else {
-        const suffix = dryRun ? " (dry run)" : "";
-        console.log(source_default.green(`\u2713 ${pkgDir}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+      const results = await generateForPackage(pkgDir, config2, dryRun);
+      for (const result of results) {
+        if (result.error) {
+          console.error(source_default.red(`\u2717 ${pkgDir}: ${result.error}`));
+          errorCount++;
+        } else {
+          const suffix = dryRun ? " (dry run)" : "";
+          console.log(source_default.green(`\u2713 ${pkgDir}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+        }
       }
     }
     if (errorCount > 0) {
@@ -68797,14 +68876,20 @@ async function generateCommand(options) {
     if (dryRun) {
       console.log(source_default.yellow("\u26A0 Dry run \u2014 no files will be written"));
     }
-    console.log(source_default.blue(`\u2192 Generating CLAUDE.md for package: ${options.package}`));
-    const result = await generateForPackage(packageDir, config2, dryRun);
-    if (result.error) {
-      console.error(source_default.red(`\u2717 ${result.error}`));
-      process.exit(1);
+    console.log(source_default.blue(`\u2192 Generating agent files for package: ${options.package}`));
+    const pkgResults = await generateForPackage(packageDir, config2, dryRun);
+    let pkgHasError = false;
+    for (const result of pkgResults) {
+      if (result.error) {
+        console.error(source_default.red(`\u2717 ${result.error}`));
+        pkgHasError = true;
+      } else {
+        const suffix = dryRun ? " (dry run)" : "";
+        console.log(source_default.green(`\u2713 ${options.package}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+      }
     }
-    const suffix = dryRun ? " (dry run)" : "";
-    console.log(source_default.green(`\u2713 ${options.package}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+    if (pkgHasError)
+      process.exit(1);
     return;
   }
   const contextPath = options.context ? join34(workdir, options.context) : join34(workdir, "nax/context.md");
@@ -68859,8 +68944,7 @@ async function generateCommand(options) {
       } else {
         console.log(source_default.blue("\u2192 Generating configs for all agents..."));
       }
-      const allResults = await generateAll(genOptions, config2);
-      const results = agentFilter ? allResults.filter((r) => agentFilter.includes(r.agent)) : allResults;
+      const results = await generateAll(genOptions, config2, agentFilter ?? undefined);
       let errorCount = 0;
       for (const result of results) {
         if (result.error) {
@@ -68879,17 +68963,19 @@ async function generateCommand(options) {
       const packages = await discoverPackages(workdir);
       if (packages.length > 0) {
         console.log(source_default.blue(`
-\u2192 Discovered ${packages.length} package(s) with nax/context.md \u2014 generating CLAUDE.md...`));
+\u2192 Discovered ${packages.length} package(s) with nax/context.md \u2014 generating agent files...`));
         let pkgErrorCount = 0;
         for (const pkgDir of packages) {
-          const result = await generateForPackage(pkgDir, config2, dryRun);
-          if (result.error) {
-            console.error(source_default.red(`\u2717 ${pkgDir}: ${result.error}`));
-            pkgErrorCount++;
-          } else {
-            const suffix = dryRun ? " (dry run)" : "";
-            const rel = pkgDir.startsWith(workdir) ? pkgDir.slice(workdir.length + 1) : pkgDir;
-            console.log(source_default.green(`\u2713 ${rel}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+          const pkgResults = await generateForPackage(pkgDir, config2, dryRun);
+          for (const result of pkgResults) {
+            if (result.error) {
+              console.error(source_default.red(`\u2717 ${pkgDir}: ${result.error}`));
+              pkgErrorCount++;
+            } else {
+              const suffix = dryRun ? " (dry run)" : "";
+              const rel = pkgDir.startsWith(workdir) ? pkgDir.slice(workdir.length + 1) : pkgDir;
+              console.log(source_default.green(`\u2713 ${rel}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+            }
           }
         }
         if (pkgErrorCount > 0) {

package/package.json

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

package/src/cli/generate.ts

@@ -67,17 +67,19 @@ export async function generateCommand(options: GenerateCommandOptions): Promise<
       return;
     }
 
-    console.log(chalk.blue(`→ Generating CLAUDE.md for ${packages.length} package(s)...`));
+    console.log(chalk.blue(`→ Generating agent files for ${packages.length} package(s)...`));
     let errorCount = 0;
 
     for (const pkgDir of packages) {
-      const result = await generateForPackage(pkgDir, config, dryRun);
-      if (result.error) {
-        console.error(chalk.red(`✗ ${pkgDir}: ${result.error}`));
-        errorCount++;
-      } else {
-        const suffix = dryRun ? " (dry run)" : "";
-        console.log(chalk.green(`✓ ${pkgDir}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+      const results = await generateForPackage(pkgDir, config, dryRun);
+      for (const result of results) {
+        if (result.error) {
+          console.error(chalk.red(`✗ ${pkgDir}: ${result.error}`));
+          errorCount++;
+        } else {
+          const suffix = dryRun ? " (dry run)" : "";
+          console.log(chalk.green(`✓ ${pkgDir}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+        }
       }
     }
 
@@ -94,14 +96,19 @@ export async function generateCommand(options: GenerateCommandOptions): Promise<
     if (dryRun) {
       console.log(chalk.yellow("⚠ Dry run — no files will be written"));
     }
-    console.log(chalk.blue(`→ Generating CLAUDE.md for package: ${options.package}`));
-    const result = await generateForPackage(packageDir, config, dryRun);
-    if (result.error) {
-      console.error(chalk.red(`✗ ${result.error}`));
-      process.exit(1);
+    console.log(chalk.blue(`→ Generating agent files for package: ${options.package}`));
+    const pkgResults = await generateForPackage(packageDir, config, dryRun);
+    let pkgHasError = false;
+    for (const result of pkgResults) {
+      if (result.error) {
+        console.error(chalk.red(`✗ ${result.error}`));
+        pkgHasError = true;
+      } else {
+        const suffix = dryRun ? " (dry run)" : "";
+        console.log(chalk.green(`✓ ${options.package}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+      }
     }
-    const suffix = dryRun ? " (dry run)" : "";
-    console.log(chalk.green(`✓ ${options.package}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+    if (pkgHasError) process.exit(1);
     return;
   }
 
@@ -183,8 +190,8 @@ export async function generateCommand(options: GenerateCommandOptions): Promise<
         console.log(chalk.blue("→ Generating configs for all agents..."));
       }
 
-      const allResults = await generateAll(genOptions, config);
-      const results = agentFilter ? allResults.filter((r) => agentFilter.includes(r.agent as AgentType)) : allResults;
+      // Pass agentFilter to generateAll so only matching agents are written to disk
+      const results = await generateAll(genOptions, config, agentFilter ?? undefined);
 
       let errorCount = 0;
 
@@ -205,22 +212,24 @@ export async function generateCommand(options: GenerateCommandOptions): Promise<
         process.exit(1);
       }
 
-      // Auto-generate per-package CLAUDE.md when packages with nax/context.md are discovered
+      // Auto-generate per-package agent files when packages with nax/context.md are discovered
       const packages = await discoverPackages(workdir);
       if (packages.length > 0) {
         console.log(
-          chalk.blue(`\n→ Discovered ${packages.length} package(s) with nax/context.md — generating CLAUDE.md...`),
+          chalk.blue(`\n→ Discovered ${packages.length} package(s) with nax/context.md — generating agent files...`),
         );
         let pkgErrorCount = 0;
         for (const pkgDir of packages) {
-          const result = await generateForPackage(pkgDir, config, dryRun);
-          if (result.error) {
-            console.error(chalk.red(`✗ ${pkgDir}: ${result.error}`));
-            pkgErrorCount++;
-          } else {
-            const suffix = dryRun ? " (dry run)" : "";
-            const rel = pkgDir.startsWith(workdir) ? pkgDir.slice(workdir.length + 1) : pkgDir;
-            console.log(chalk.green(`✓ ${rel}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+          const pkgResults = await generateForPackage(pkgDir, config, dryRun);
+          for (const result of pkgResults) {
+            if (result.error) {
+              console.error(chalk.red(`✗ ${pkgDir}: ${result.error}`));
+              pkgErrorCount++;
+            } else {
+              const suffix = dryRun ? " (dry run)" : "";
+              const rel = pkgDir.startsWith(workdir) ? pkgDir.slice(workdir.length + 1) : pkgDir;
+              console.log(chalk.green(`✓ ${rel}/${result.outputFile} (${result.content.length} bytes${suffix})`));
+            }
           }
         }
         if (pkgErrorCount > 0) {

package/src/cli/init.ts

@@ -51,7 +51,6 @@ const NAX_GITIGNORE_ENTRIES = [
   "nax/features/*/acceptance-refined.json",
   ".nax-pids",
   ".nax-wt/",
-  "~/",
 ];
 
 /**

package/src/context/generator.ts

@@ -100,15 +100,26 @@ async function generateFor(agent: AgentType, options: GenerateOptions, config: N
 }
 
 /**
- * Generate configs for all agents.
+ * Generate configs for all agents (or a filtered subset).
+ *
+ * @param agentFilter - Optional list of agent names to generate. When provided,
+ *   only those agents are written to disk. When omitted, all agents are generated.
  */
-async function generateAll(options: GenerateOptions, config: NaxConfig): Promise<GenerationResult[]> {
+async function generateAll(
+  options: GenerateOptions,
+  config: NaxConfig,
+  agentFilter?: AgentType[],
+): Promise<GenerationResult[]> {
   // Load context once and share across generators
   const context = await loadContextContent(options, config);
 
   const results: GenerationResult[] = [];
 
-  for (const [agentKey, generator] of Object.entries(GENERATORS) as [AgentType, AgentContextGenerator][]) {
+  const entries = (Object.entries(GENERATORS) as [AgentType, AgentContextGenerator][]).filter(
+    ([agentKey]) => !agentFilter || agentFilter.length === 0 || agentFilter.includes(agentKey),
+  );
+
+  for (const [agentKey, generator] of entries) {
     try {
       const content = generator.generate(context);
       const outputPath = join(options.outputDir, generator.outputFile);
@@ -262,51 +273,70 @@ export async function discoverWorkspacePackages(repoRoot: string): Promise<strin
 }
 
 /**
- * Generate the claude CLAUDE.md for a specific package.
+ * Generate agent config file(s) for a specific package.
+ *
+ * Reads `<packageDir>/nax/context.md` and writes agent files (e.g. CLAUDE.md,
+ * AGENTS.md) into the package directory. Respects `config.generate.agents` — when
+ * set, only generates for those agents; defaults to `["claude"]` when unset.
+ *
+ * Per-package files contain only package-specific content — Claude Code's native
+ * directory hierarchy merges root CLAUDE.md + package CLAUDE.md at runtime.
  *
- * Reads `<packageDir>/nax/context.md` and writes `<packageDir>/CLAUDE.md`.
- * Per-package CLAUDE.md contains only package-specific content — Claude Code's
- * native directory hierarchy merges root CLAUDE.md + package CLAUDE.md at runtime.
+ * Returns one result per generated agent.
  */
 export async function generateForPackage(
   packageDir: string,
   config: NaxConfig,
   dryRun = false,
-): Promise<PackageGenerationResult> {
+): Promise<PackageGenerationResult[]> {
   const contextPath = join(packageDir, "nax", "context.md");
 
   if (!existsSync(contextPath)) {
-    return {
-      packageDir,
-      outputFile: "CLAUDE.md",
-      content: "",
-      written: false,
-      error: `context.md not found: ${contextPath}`,
-    };
+    return [
+      {
+        packageDir,
+        outputFile: "CLAUDE.md",
+        content: "",
+        written: false,
+        error: `context.md not found: ${contextPath}`,
+      },
+    ];
   }
 
-  try {
-    const options: GenerateOptions = {
-      contextPath,
-      outputDir: packageDir,
-      workdir: packageDir,
-      dryRun,
-      autoInject: true,
-    };
-
-    const result = await generateFor("claude", options, config);
-
-    return {
-      packageDir,
-      outputFile: result.outputFile,
-      content: result.content,
-      written: result.written,
-      error: result.error,
-    };
-  } catch (err) {
-    const error = err instanceof Error ? err.message : String(err);
-    return { packageDir, outputFile: "CLAUDE.md", content: "", written: false, error };
+  // Respect config.generate.agents; default to ["claude"] when unset
+  const agentsToGenerate: AgentType[] =
+    config?.generate?.agents && config.generate.agents.length > 0
+      ? (config.generate.agents as AgentType[])
+      : ["claude"];
+
+  const options: GenerateOptions = {
+    contextPath,
+    outputDir: packageDir,
+    workdir: packageDir,
+    dryRun,
+    autoInject: true,
+  };
+
+  const results: PackageGenerationResult[] = [];
+
+  for (const agent of agentsToGenerate) {
+    try {
+      const result = await generateFor(agent, options, config);
+      results.push({
+        packageDir,
+        outputFile: result.outputFile,
+        content: result.content,
+        written: result.written,
+        error: result.error,
+      });
+    } catch (err) {
+      const error = err instanceof Error ? err.message : String(err);
+      const fallbackFile = GENERATORS[agent]?.outputFile ?? `${agent}.md`;
+      results.push({ packageDir, outputFile: fallbackFile, content: "", written: false, error });
+    }
   }
+
+  return results;
 }
 
 export { generateFor, generateAll };

package/src/execution/crash-recovery.ts

@@ -45,6 +45,8 @@ export interface CrashRecoveryContext {
   getTotalStories?: () => number;
   getStoriesCompleted?: () => number;
   emitError?: (reason: string) => void;
+  /** Called during graceful shutdown before process.exit — use to close ACP sessions etc. */
+  onShutdown?: () => Promise<void>;
 }
 
 let handlersInstalled = false;

package/src/execution/crash-signals.ts

@@ -15,6 +15,8 @@ export interface SignalHandlerContext extends RunCompleteContext {
   pidRegistry?: PidRegistry;
   featureDir?: string;
   emitError?: (reason: string) => void;
+  /** Called during graceful shutdown (signal/exception) before process.exit — use to close ACP sessions etc. */
+  onShutdown?: () => Promise<void>;
 }
 
 /**
@@ -46,6 +48,11 @@ function createSignalHandler(ctx: SignalHandlerContext): (signal: NodeJS.Signals
       await ctx.pidRegistry.killAll();
     }
 
+    // Close any open ACP sessions before exiting (prevents orphaned acpx processes)
+    if (ctx.onShutdown) {
+      await ctx.onShutdown().catch(() => {});
+    }
+
     ctx.emitError?.(signal.toLowerCase());
 
     await writeFatalLog(ctx.jsonlFilePath, signal);
@@ -72,6 +79,10 @@ function createUncaughtExceptionHandler(ctx: SignalHandlerContext): (error: Erro
       await ctx.pidRegistry.killAll();
     }
 
+    if (ctx.onShutdown) {
+      await ctx.onShutdown().catch(() => {});
+    }
+
     ctx.emitError?.("uncaughtException");
     await writeFatalLog(ctx.jsonlFilePath, "uncaughtException", error);
     await updateStatusToCrashed(
@@ -102,6 +113,10 @@ function createUnhandledRejectionHandler(ctx: SignalHandlerContext): (reason: un
       await ctx.pidRegistry.killAll();
     }
 
+    if (ctx.onShutdown) {
+      await ctx.onShutdown().catch(() => {});
+    }
+
     ctx.emitError?.("unhandledRejection");
     await writeFatalLog(ctx.jsonlFilePath, "unhandledRejection", error);
     await updateStatusToCrashed(

package/src/execution/lifecycle/run-setup.ts

@@ -130,6 +130,11 @@ export async function setupRun(options: RunSetupOptions): Promise<RunSetupResult
     emitError: (reason: string) => {
       pipelineEventBus.emit({ type: "run:errored", reason, feature: options.feature });
     },
+    // Close open ACP sessions on SIGINT/SIGTERM so acpx processes don't stay alive
+    onShutdown: async () => {
+      const { sweepFeatureSessions } = await import("../../agents/acp/adapter");
+      await sweepFeatureSessions(workdir, feature).catch(() => {});
+    },
   });
 
   // Load PRD (before try block so it's accessible in finally for onRunEnd)

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/precheck/checks-git.ts

@@ -40,6 +40,7 @@ const NAX_RUNTIME_PATTERNS = [
   /^.{2} nax\.lock$/,
   /^.{2} nax\/metrics\.json$/,
   /^.{2} nax\/features\/[^/]+\/status\.json$/,
+  /^.{2} nax\/features\/[^/]+\/prd\.json$/,
   /^.{2} nax\/features\/[^/]+\/runs\//,
   /^.{2} nax\/features\/[^/]+\/plan\//,
   /^.{2} nax\/features\/[^/]+\/acp-sessions\.json$/,

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}`);