@nathapp/nax 0.70.0-canary.4 → 0.70.0-canary.6

package/dist/nax.js

@@ -16828,7 +16828,8 @@ var init_schemas_execution = __esm(() => {
     escalation: exports_external.object({
       enabled: exports_external.boolean(),
       tierOrder: exports_external.array(TierConfigSchema).min(1, { message: "tierOrder must have at least one tier" }),
-      escalateEntireBatch: exports_external.boolean().optional()
+      escalateEntireBatch: exports_external.boolean().optional(),
+      resetMode: exports_external.enum(["initial", "last"]).default("initial")
     })
   });
   RectificationConfigSchema = exports_external.object({
@@ -16852,11 +16853,13 @@ var init_schemas_execution = __esm(() => {
   SmartTestRunnerConfigSchema = exports_external.object({
     enabled: exports_external.boolean().default(true),
     testFilePatterns: exports_external.array(exports_external.string()).optional(),
-    fallback: exports_external.enum(["import-grep", "full-suite"]).default("import-grep")
+    fallback: exports_external.enum(["import-grep", "full-suite"]).default("import-grep"),
+    maxScanFiles: exports_external.number().int().min(1).max(5000).default(200)
   });
   SMART_TEST_RUNNER_DEFAULT = {
     enabled: true,
-    fallback: "import-grep"
+    fallback: "import-grep",
+    maxScanFiles: 200
   };
   smartTestRunnerFieldSchema = exports_external.preprocess((val) => {
     if (typeof val === "boolean") {
@@ -16870,7 +16873,7 @@ var init_schemas_execution = __esm(() => {
   }).superRefine((value, ctx) => {
     if (value.mode !== "provision" && value.setupCommand !== null) {
       ctx.addIssue({
-        code: exports_external.ZodIssueCode.custom,
+        code: "custom",
         path: ["setupCommand"],
         message: "execution.worktreeDependencies.setupCommand requires mode 'provision'"
       });
@@ -17352,7 +17355,8 @@ var init_schemas3 = __esm(() => {
           { tier: "balanced", attempts: 3 },
           { tier: "powerful", attempts: 2 }
         ],
-        escalateEntireBatch: true
+        escalateEntireBatch: true,
+        resetMode: "initial"
       }
     }),
     routing: RoutingConfigSchema.default({
@@ -17665,7 +17669,8 @@ var init_schemas3 = __esm(() => {
       }
     })),
     curator: CuratorConfigSchema.optional(),
-    profile: exports_external.string().default("default")
+    profile: exports_external.string().default("default"),
+    profileChain: exports_external.array(exports_external.string()).default([])
   }).refine((data) => data.version === 1, {
     message: "Invalid version: expected 1",
     path: ["version"]
@@ -18728,7 +18733,11 @@ async function loadProfile(profileName, projectRoot) {
   if (!globalExists && !projectExists) {
     const available = await listAvailableProfileNames(projectRoot);
     const availableList = available.length > 0 ? available.join(", ") : "(none)";
-    throw new Error(`Profile "${profileName}" not found. Available: ${availableList}`);
+    throw new NaxError(`Profile "${profileName}" not found. Available: ${availableList}`, "PROFILE_NOT_FOUND", {
+      stage: "config",
+      profileName,
+      available
+    });
   }
   let base = {};
   if (globalExists) {
@@ -18760,30 +18769,59 @@ async function loadProfileEnv(profileName, projectRoot) {
   }
   return merged;
 }
-async function resolveProfileName(cliOptions, env2, projectRoot) {
-  if (cliOptions.profile) {
-    return cliOptions.profile;
-  }
-  if (env2.NAX_PROFILE) {
-    return env2.NAX_PROFILE;
-  }
-  const projectConfigPath = join2(projectConfigDir(projectRoot), "config.json");
-  const projectConfigFile = Bun.file(projectConfigPath);
-  if (await projectConfigFile.exists()) {
-    const config2 = await projectConfigFile.json();
-    if (typeof config2.profile === "string" && config2.profile && config2.profile !== "default") {
-      return config2.profile;
+function parseProfileList(input) {
+  if (input == null)
+    return [];
+  const parts = Array.isArray(input) ? input : [input];
+  const out = [];
+  for (const part of parts) {
+    if (typeof part !== "string")
+      continue;
+    for (const segment of part.split(",")) {
+      const trimmed = segment.trim();
+      if (trimmed)
+        out.push(trimmed);
     }
   }
-  const globalConfigPath = join2(globalConfigDir(), "config.json");
-  const globalConfigFile = Bun.file(globalConfigPath);
-  if (await globalConfigFile.exists()) {
-    const config2 = await globalConfigFile.json();
-    if (typeof config2.profile === "string" && config2.profile && config2.profile !== "default") {
-      return config2.profile;
-    }
+  return out;
+}
+function profileOverrideFromConfig(config2) {
+  if (config2.profileChain && config2.profileChain.length > 0) {
+    return { profile: config2.profileChain };
+  }
+  if (config2.profile && config2.profile !== "default") {
+    return { profile: [config2.profile] };
   }
-  return "default";
+  return;
+}
+async function readProfileChainFromConfig(dir) {
+  const configFile = Bun.file(join2(dir, "config.json"));
+  if (!await configFile.exists())
+    return [];
+  const config2 = await configFile.json();
+  return parseProfileList(config2.profile);
+}
+function isDefaultOnlyChain(chain) {
+  return chain.length === 0 || chain.length === 1 && chain[0] === "default";
+}
+async function resolveProfileNames(cliOptions, env2, projectRoot) {
+  const fromCli = parseProfileList(cliOptions.profile);
+  if (fromCli.length)
+    return fromCli;
+  const fromEnv = parseProfileList(env2.NAX_PROFILE);
+  if (fromEnv.length)
+    return fromEnv;
+  const projectChain = await readProfileChainFromConfig(projectConfigDir(projectRoot));
+  if (!isDefaultOnlyChain(projectChain))
+    return projectChain;
+  const globalChain = await readProfileChainFromConfig(globalConfigDir());
+  if (!isDefaultOnlyChain(globalChain))
+    return globalChain;
+  return ["default"];
+}
+async function resolveProfileName(cliOptions, env2, projectRoot) {
+  const chain = await resolveProfileNames(cliOptions, env2, projectRoot);
+  return chain[chain.length - 1] ?? "default";
 }
 async function listAvailableProfileNames(projectRoot) {
   const entries = await listProfiles(projectRoot);
@@ -18811,6 +18849,7 @@ async function listProfiles(projectRoot) {
   return entries;
 }
 var init_profile = __esm(() => {
+  init_errors();
   init_paths();
 });
 
@@ -18993,7 +19032,8 @@ async function loadConfig(startDir, cliOverrides) {
   let rawConfig = structuredClone(DEFAULT_CONFIG);
   const projDir = startDir ? basename2(startDir) === PROJECT_NAX_DIR ? startDir : findProjectDir(startDir) : findProjectDir();
   const projectRoot = startDir ? basename2(startDir) === PROJECT_NAX_DIR ? dirname(startDir) : startDir : process.cwd();
-  const profileName = await resolveProfileName(cliOverrides ?? {}, process.env, projectRoot);
+  const profileChain = await resolveProfileNames(cliOverrides ?? {}, process.env, projectRoot);
+  const overlayChain = profileChain.filter((name) => name && name !== "default");
   const globalConfRaw = await loadJsonFile(globalConfigPath(), "config");
   let logger = null;
   try {
@@ -19012,16 +19052,17 @@ async function loadConfig(startDir, cliOverrides) {
       rawConfig = deepMergeConfig(rawConfig, resolvedProjConf);
     }
   }
-  if (profileName !== "default") {
-    const profileData = await loadProfile(profileName, projectRoot);
+  for (const name of overlayChain) {
+    const profileData = await loadProfile(name, projectRoot);
     rawConfig = deepMergeConfig(rawConfig, profileData);
-    await loadProfileEnv(profileName, projectRoot);
+    await loadProfileEnv(name, projectRoot);
   }
   if (cliOverrides) {
     rawConfig = deepMergeConfig(rawConfig, cliOverrides);
   }
-  rawConfig.profile = profileName;
-  const hasMergedConfigs = globalConfRaw || projDir !== null || cliOverrides !== undefined || profileName !== "default";
+  rawConfig.profile = overlayChain.length > 0 ? overlayChain.join("+") : "default";
+  rawConfig.profileChain = overlayChain;
+  const hasMergedConfigs = globalConfRaw || projDir !== null || cliOverrides !== undefined || overlayChain.length > 0;
   if (!hasMergedConfigs) {
     return structuredClone(DEFAULT_CONFIG);
   }
@@ -19051,11 +19092,14 @@ async function loadConfigForWorkdir(rootConfigPath, packageDir, cliOverrides) {
   const logger = getLogger();
   const resolvedRootConfigPath = resolve3(rootConfigPath);
   const rootNaxDir = dirname(resolvedRootConfigPath);
-  const profileKey = cliOverrides?.profile ?? "";
+  const profileKey = parseProfileList(cliOverrides?.profile).join(",");
   const cacheKey = profileKey ? `${resolvedRootConfigPath}:${profileKey}` : resolvedRootConfigPath;
   let rootConfigPromise = _rootConfigCache.get(cacheKey);
   if (!rootConfigPromise) {
-    rootConfigPromise = loadConfig(rootNaxDir, cliOverrides);
+    rootConfigPromise = loadConfig(rootNaxDir, cliOverrides).catch((err) => {
+      _rootConfigCache.delete(cacheKey);
+      throw err;
+    });
     if (_rootConfigCache.size >= ROOT_CONFIG_CACHE_MAX) {
       const firstKey = _rootConfigCache.keys().next().value;
       if (firstKey !== undefined)
@@ -19081,22 +19125,29 @@ async function loadConfigForWorkdir(rootConfigPath, packageDir, cliOverrides) {
   logger.debug("config", "Per-package config loaded", { packageConfigPath, packageDir });
   const { profile: packageProfile, ...packageFields } = packageOverride;
   let merged = mergePackageConfig(rootConfig, packageFields);
-  if (packageProfile && packageProfile !== "default") {
+  const packageChain = parseProfileList(packageProfile).filter((name) => name && name !== "default");
+  if (packageChain.length > 0) {
     const packageRoot = join3(repoRoot, packageDir);
-    const profileData = await loadProfile(packageProfile, packageRoot);
-    const rawMerged = deepMergeConfig(merged, profileData);
-    rawMerged.profile = packageProfile;
+    let rawMerged = merged;
+    for (const name of packageChain) {
+      const profileData = await loadProfile(name, packageRoot);
+      rawMerged = deepMergeConfig(rawMerged, profileData);
+    }
+    rawMerged.profile = packageChain.join("+");
+    rawMerged.profileChain = packageChain;
     rejectLegacyAgentKeys(rawMerged);
     rejectLegacyRectificationKeys(rawMerged);
     const result = NaxConfigSchema.safeParse(rawMerged);
-    if (result.success) {
-      merged = result.data;
-    } else {
-      logger.warn("config", "Per-package profile failed validation \u2014 using merged config without profile", {
-        packageDir,
-        packageProfile
+    if (!result.success) {
+      const errors3 = result.error.issues.map((err) => {
+        const path = String(err.path.join("."));
+        return path ? `${path}: ${err.message}` : err.message;
       });
+      throw new NaxError(`Per-package profile "${packageChain.join("+")}" produced an invalid config for package "${packageDir}":
+${errors3.join(`
+`)}`, "PER_PACKAGE_PROFILE_INVALID", { stage: "config", packageDir, profileChain: packageChain });
     }
+    merged = result.data;
   }
   return merged;
 }
@@ -19504,6 +19555,7 @@ __export(exports_config, {
   routingConfigSelector: () => routingConfigSelector,
   reviewConfigSelector: () => reviewConfigSelector,
   resolveTestStrategy: () => resolveTestStrategy,
+  resolveProfileNames: () => resolveProfileNames,
   resolveProfileName: () => resolveProfileName,
   resolveModelForAgent: () => resolveModelForAgent,
   resolveModel: () => resolveModel,
@@ -19514,9 +19566,11 @@ __export(exports_config, {
   qualityConfigSelector: () => qualityConfigSelector,
   promptLoaderConfigSelector: () => promptLoaderConfigSelector,
   projectConfigDir: () => projectConfigDir,
+  profileOverrideFromConfig: () => profileOverrideFromConfig,
   precheckConfigSelector: () => precheckConfigSelector,
   planConfigSelector: () => planConfigSelector,
   pickSelector: () => pickSelector,
+  parseProfileList: () => parseProfileList,
   mergePackageConfig: () => mergePackageConfig,
   loadProfileEnv: () => loadProfileEnv,
   loadProfile: () => loadProfile,
@@ -21286,12 +21340,13 @@ function parseAcpxJsonLine(line, state) {
       }
       return;
     }
-    if (event.content && typeof event.content === "string")
+    if (event.result && typeof event.result === "string") {
+      state.text = event.result;
+    } else if (event.content && typeof event.content === "string") {
       state.text += event.content;
-    if (event.text && typeof event.text === "string")
+    } else if (event.text && typeof event.text === "string") {
       state.text += event.text;
-    if (event.result && typeof event.result === "string")
-      state.text = event.result;
+    }
     if (event.cumulative_token_usage)
       state.tokenUsage = event.cumulative_token_usage;
     if (event.usage) {
@@ -21626,7 +21681,11 @@ class AgentManager {
   _registry;
   _unavailable = new Map;
   _prunedFallback = new Set;
-  _emitter = new EventEmitter;
+  _emitter = (() => {
+    const ee = new EventEmitter;
+    ee.setMaxListeners(MAX_EMITTER_LISTENERS);
+    return ee;
+  })();
   _logger;
   _middleware;
   _runId;
@@ -22225,6 +22284,9 @@ class AgentManager {
       throw err;
     }
   }
+  close() {
+    this._emitter.removeAllListeners();
+  }
   _resolveRegistry() {
     this._registry ??= createAgentRegistry(this._config);
     return this._registry;
@@ -22233,7 +22295,7 @@ class AgentManager {
     this._emitter.emit(event, payload);
   }
 }
-var _agentManagerDeps;
+var MAX_EMITTER_LISTENERS = 100, _agentManagerDeps;
 var init_manager = __esm(() => {
   init_errors();
   init_logger2();
@@ -25144,7 +25206,7 @@ function extractSearchTerms(sourceFile) {
   const basename4 = parts[parts.length - 1];
   return [`/${basename4}`, withoutExt];
 }
-async function importGrepFallback(sourceFiles, workdir, testFilePatterns) {
+async function importGrepFallback(sourceFiles, workdir, testFilePatterns, maxScanFiles = MAX_GREP_TEST_FILES) {
   if (sourceFiles.length === 0 || testFilePatterns.length === 0)
     return [];
   const searchTerms = sourceFiles.flatMap(extractSearchTerms);
@@ -25152,11 +25214,11 @@ async function importGrepFallback(sourceFiles, workdir, testFilePatterns) {
   outer:
     for (const pattern of testFilePatterns) {
       const g = _bunDeps.glob(pattern);
-      for await (const file3 of g.scan(workdir)) {
+      for await (const file3 of g.scan({ cwd: workdir, absolute: false })) {
         testFilePaths.push(`${workdir}/${file3}`);
-        if (testFilePaths.length >= MAX_GREP_TEST_FILES) {
+        if (testFilePaths.length >= maxScanFiles) {
           getSafeLogger()?.debug("smart-runner", "import-grep glob cap reached \u2014 results truncated", {
-            cap: MAX_GREP_TEST_FILES
+            cap: maxScanFiles
           });
           break outer;
         }
@@ -25404,7 +25466,7 @@ async function selectScopedTests(input) {
   if (smartCfg.fallback !== "import-grep") {
     return fullSuite();
   }
-  const pass2Files = await _scopedSelectionDeps.importGrepFallback(nonTestFiles, input.workdir, mappingGlobs);
+  const pass2Files = await _scopedSelectionDeps.importGrepFallback(nonTestFiles, input.workdir, mappingGlobs, smartCfg.maxScanFiles);
   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 });
@@ -25425,7 +25487,8 @@ var init_scoped_selection = __esm(() => {
   DEFAULT_SMART_RUNNER_CONFIG = {
     enabled: true,
     testFilePatterns: [...DEFAULT_TEST_FILE_PATTERNS],
-    fallback: "import-grep"
+    fallback: "import-grep",
+    maxScanFiles: MAX_GREP_TEST_FILES
   };
   _scopedSelectionDeps = {
     getChangedNonTestFiles: _smartRunnerDeps.getChangedNonTestFiles,
@@ -27573,7 +27636,7 @@ class SessionScratchProvider {
     if (!dirs || dirs.length === 0) {
       return { chunks: [], pullTools: [] };
     }
-    const ignoreMatchers = await resolveNaxIgnorePatterns(request.repoRoot, request.packageDir);
+    const ignoreMatchers = request.naxIgnoreIndex?.getMatchers(request.packageDir) ?? await resolveNaxIgnorePatterns(request.repoRoot, request.packageDir);
     const chunks = [];
     for (const dir of dirs) {
       const chunk = await readScratchDir(dir, request.agentId, ignoreMatchers);
@@ -27895,7 +27958,8 @@ var init_static_rules = __esm(() => {
 
 // src/prd/types.ts
 function getContextFiles(story) {
-  const files = story.contextFiles ?? story.relevantFiles ?? [];
+  const legacyFiles = story.relevantFiles;
+  const files = story.contextFiles ?? legacyFiles ?? [];
   return files.map((f) => typeof f === "string" ? f : f.path);
 }
 function getExpectedFiles(story) {
@@ -28407,16 +28471,28 @@ function markStoryFailed(prd, storyId, failureCategory, failureStage, statusWrit
     }
   }
 }
-function resetFailedStoriesToPending(prd, resetRef = false, storyIsolation) {
+function resetFailedStoriesToPending(prd, opts = {}) {
+  const { resetRef = false, storyIsolation, resetMode = "initial" } = opts;
   const reset = [];
   for (const story of prd.userStories) {
-    if (story.status === "failed") {
-      story.status = "pending";
-      if (resetRef || storyIsolation === "worktree") {
-        story.storyGitRef = undefined;
-      }
-      reset.push(story);
+    if (story.status !== "failed")
+      continue;
+    story.status = "pending";
+    story.attempts = 0;
+    if (resetMode === "initial" && story.routing) {
+      story.routing = {
+        ...story.routing,
+        ...story.routing.initialModelTier !== undefined && {
+          modelTier: story.routing.initialModelTier
+        },
+        agent: story.routing.initialAgent
+      };
+      story.escalations = [];
     }
+    if (resetRef || storyIsolation === "worktree") {
+      story.storyGitRef = undefined;
+    }
+    reset.push(story);
   }
   return reset;
 }
@@ -28553,6 +28629,7 @@ async function scanTestFiles(options) {
     const patterns = deriveTestPatterns(contextFiles, resolvedTestGlobs);
     allowedBasenames = new Set(patterns);
   }
+  const maxScanFiles = options.maxScanFiles ?? DEFAULT_MAX_SCAN_FILES;
   const glob = new Glob2(testPattern);
   const files = [];
   for await (const filePath of glob.scan({ cwd: scanDir, absolute: false })) {
@@ -28562,6 +28639,13 @@ async function scanTestFiles(options) {
         continue;
       }
     }
+    if (files.length >= maxScanFiles) {
+      getLogger().debug("test-scanner", "Glob cap reached \u2014 results truncated", {
+        cap: maxScanFiles,
+        scanDir
+      });
+      break;
+    }
     const fullPath = path.join(scanDir, filePath);
     try {
       const source = await Bun.file(fullPath).text();
@@ -28658,6 +28742,7 @@ async function generateTestCoverageSummary(options) {
   const tokens = estimateTokens4(summary);
   return { files, totalTests, summary, tokens };
 }
+var DEFAULT_MAX_SCAN_FILES = 200;
 var init_test_scanner = __esm(() => {
   init_logger2();
   init_conventions();
@@ -28692,12 +28777,14 @@ class TestCoverageProvider {
       const resolved = await _testCoverageProviderDeps.resolveTestFilePatterns(this.config, request.repoRoot, relPackageDir);
       const contextFiles = _testCoverageProviderDeps.getContextFiles(this.story);
       const globs = resolved.patterns ?? resolved.globs;
+      const smartCfg = coerceSmartRunner(this.config.execution?.smartTestRunner);
       const scanOptions = {
         workdir: request.packageDir,
         testDir: tcConfig.testDir,
         maxTokens: tcConfig.maxTokens ?? 500,
         detail: tcConfig.detail ?? "names-and-counts",
         scopeToStory: tcConfig.scopeToStory ?? true,
+        maxScanFiles: smartCfg.maxScanFiles,
         contextFiles,
         resolvedTestGlobs: globs
       };
@@ -28729,6 +28816,7 @@ class TestCoverageProvider {
 }
 var _testCoverageProviderDeps;
 var init_test_coverage = __esm(() => {
+  init_test_runners();
   init_logger2();
   init_prd();
   init_resolver();
@@ -29602,10 +29690,12 @@ function formatPriorFailures(failures) {
     return "";
   }
   const parts = [];
-  parts.push(`## Prior Failures (Structured Context)
-`);
   for (const failure of failures) {
     parts.push(`### Attempt ${failure.attempt} \u2014 ${failure.modelTier}`);
+    if (failure.agent) {
+      const profilePart = failure.agentProfileId ? ` (profile: ${failure.agentProfileId})` : "";
+      parts.push(`**Agent:** ${failure.agent}${profilePart}`);
+    }
     parts.push(`**Stage:** ${failure.stage}`);
     parts.push(`**Summary:** ${failure.summary}`);
     if (failure.testFailures && failure.testFailures.length > 0) {
@@ -29711,10 +29801,14 @@ function formatContextAsMarkdown(built) {
     byType.set(element.type, existing);
   }
   renderSection(sections, byType, "progress", `## Progress
+`, renderSimple);
+  renderSection(sections, byType, "prior-failures", `## Prior Failures (Structured Context)
 `, renderSimple);
   renderErrorSection(sections, byType);
   renderSection(sections, byType, "test-coverage", "", renderSimple);
   renderSection(sections, byType, "story", `## Current Story
+`, renderSimple);
+  renderSection(sections, byType, "planning-analysis", `## Planning Analysis
 `, renderSimple);
   renderSection(sections, byType, "dependency", `## Dependency Stories
 `, renderSimple);
@@ -30026,10 +30120,9 @@ async function gitLsFiles2(workdir) {
       stdout: "pipe",
       stderr: "pipe"
     });
-    const exitCode = await proc.exited;
+    const [exitCode, output] = await Promise.all([proc.exited, new Response(proc.stdout).text()]);
     if (exitCode !== 0)
       return null;
-    const output = await new Response(proc.stdout).text();
     return output.split(`
 `).filter(Boolean);
   } catch {
@@ -33167,12 +33260,16 @@ async function collectDiff(workdir, storyGitRef, excludePatterns, options) {
     stdout: "pipe",
     stderr: "pipe"
   });
-  const [exitCode, stdout] = await Promise.all([
+  const [exitCode, stdout, stderr] = await Promise.all([
     proc.exited,
     new Response(proc.stdout).text(),
     new Response(proc.stderr).text()
   ]);
-  return exitCode === 0 ? stdout : "";
+  if (exitCode !== 0) {
+    getSafeLogger()?.warn("diff-utils", "git diff failed \u2014 skipping review diff", { storyGitRef, stderr });
+    return null;
+  }
+  return stdout;
 }
 async function collectDiffStat(workdir, storyGitRef, options) {
   const naxIgnoreExcludes = await resolveNaxIgnorePathspecExcludes(workdir, options);
@@ -33423,6 +33520,9 @@ async function prepareSemanticReviewInput(args) {
     return { effectiveRef, stat, diff: undefined, excludePatterns };
   }
   const rawDiff = await collectDiff(workdir, effectiveRef, excludePatterns, { naxIgnoreIndex, packageDir });
+  if (rawDiff === null) {
+    return { effectiveRef, stat, diff: undefined, excludePatterns, skipReason: "git diff failed" };
+  }
   const diff = truncateDiff(rawDiff, rawDiff.length > DIFF_CAP_BYTES ? stat : undefined);
   if (!diff) {
     return { effectiveRef, stat, diff: undefined, excludePatterns, skipReason: "no production code changes" };
@@ -41050,10 +41150,9 @@ async function listChangedFiles(workdir, baseRef) {
     stdout: "pipe",
     stderr: "pipe"
   });
-  const exitCode = await proc.exited;
+  const [exitCode, output] = await Promise.all([proc.exited, new Response(proc.stdout).text()]);
   if (exitCode !== 0)
     return null;
-  const output = await new Response(proc.stdout).text();
   return output.split(`
 `).map((line) => line.trim()).filter(Boolean).map(normalizePath3);
 }
@@ -45726,6 +45825,8 @@ class PidRegistry {
   pidsFilePath;
   pids = new Set;
   frozen = false;
+  _writing = false;
+  _pendingWrite = false;
   writeQueueTail = Promise.resolve();
   constructor(workdir, _platform) {
     this.workdir = workdir;
@@ -46023,11 +46124,22 @@ class PidRegistry {
     }
   }
   enqueueWrite() {
-    this.writeQueueTail = this.writeQueueTail.then(() => this.writePidsFile().catch((err) => {
+    if (this._writing) {
+      this._pendingWrite = true;
+      return this.writeQueueTail;
+    }
+    this._writing = true;
+    this.writeQueueTail = this.writePidsFile().catch((err) => {
       getSafeLogger()?.warn("pid-registry", "Failed to flush PID file \u2014 on-disk registry may be stale", {
         error: errorMessage(err)
       });
-    }));
+    }).then(async () => {
+      this._writing = false;
+      if (this._pendingWrite) {
+        this._pendingWrite = false;
+        await this.enqueueWrite();
+      }
+    });
     return this.writeQueueTail;
   }
 }
@@ -46589,6 +46701,7 @@ class SessionManager {
     }
     this._busySessions.delete(handle.id);
     this._cancelledSessions.delete(handle.id);
+    this._clearWatchdogCancelledCalls(handle.id);
   }
   async sendPrompt(handle, prompt, opts) {
     if (this._cancelledSessions.has(handle.id)) {
@@ -46673,6 +46786,10 @@ class SessionManager {
   sweepOrphans(ttlMs = DEFAULT_ORPHAN_TTL_MS) {
     return sweepOrphansImpl(this._sessions, ttlMs);
   }
+  close() {
+    this._agentStreamUnsubscribe?.();
+    this._agentStreamUnsubscribe = undefined;
+  }
 }
 var NULL_PROTOCOL_IDS;
 var init_manager2 = __esm(() => {
@@ -46937,6 +47054,9 @@ function createRuntime(config2, workdir, opts) {
       if (opts?.parentSignal && parentAbortHandler) {
         opts.parentSignal.removeEventListener("abort", parentAbortHandler);
       }
+      agentManager.close();
+      if (sessionManager instanceof SessionManager)
+        sessionManager.close();
       const results = await Promise.allSettled([promptAuditor.flush(), reviewAuditor.flush(), costAggregator.drain()]);
       for (const r of results) {
         if (r.status === "rejected") {
@@ -52413,6 +52533,7 @@ async function collectStoryMetrics(ctx, storyStartTime) {
     startedAt: storyStartTime,
     completedAt: new Date().toISOString(),
     fullSuiteGatePassed,
+    ...ctx.fullSuiteGateFailingFiles && ctx.fullSuiteGateFailingFiles.length > 0 ? { failingTestFiles: ctx.fullSuiteGateFailingFiles } : {},
     runtimeCrashes: ctx.storyRuntimeCrashes ?? 0,
     tokens: agentResult?.tokenUsage ? new TokenUsage({
       inputTokens: agentResult.tokenUsage.inputTokens,
@@ -52475,17 +52596,18 @@ async function saveRunMetrics(outputDir, runMetrics) {
     }
   }
   const hasTokenData = totalInputTokens > 0 || totalOutputTokens > 0 || totalCacheReadInputTokens > 0 || totalCacheCreationInputTokens > 0;
-  if (hasTokenData) {
-    runMetrics.totalTokens = new TokenUsage({
+  const finalMetrics = hasTokenData ? {
+    ...runMetrics,
+    totalTokens: new TokenUsage({
       inputTokens: totalInputTokens,
       outputTokens: totalOutputTokens,
       cacheReadInputTokens: totalCacheReadInputTokens,
       cacheCreationInputTokens: totalCacheCreationInputTokens
-    });
-  }
+    })
+  } : runMetrics;
   const existing = await loadJsonFile(metricsPath, "metrics");
   const allMetrics = Array.isArray(existing) ? existing : [];
-  allMetrics.push(runMetrics);
+  allMetrics.push(finalMetrics);
   await saveJsonFile(metricsPath, allMetrics, "metrics");
 }
 async function loadRunMetrics(outputDir) {
@@ -54652,29 +54774,27 @@ async function rollbackToRef(workdir, ref) {
     stdout: "pipe",
     stderr: "pipe"
   });
-  const exitCode = await resetProc.exited;
+  const [exitCode, resetStderr] = await Promise.all([resetProc.exited, new Response(resetProc.stderr).text()]);
   if (exitCode !== 0) {
-    const stderr = await new Response(resetProc.stderr).text();
-    logger.error("tdd", "Failed to rollback git changes", { ref, stderr });
-    throw new Error(`Git rollback failed: ${stderr}`);
+    logger.error("tdd", "Failed to rollback git changes", { ref, stderr: resetStderr });
+    throw new Error(`Git rollback failed: ${resetStderr}`);
   }
   const cleanProc = _rollbackDeps.spawn(["git", "clean", "-fd"], {
     cwd: workdir,
     stdout: "pipe",
     stderr: "pipe"
   });
-  const cleanExitCode = await cleanProc.exited;
+  const [cleanExitCode, cleanStderr] = await Promise.all([cleanProc.exited, new Response(cleanProc.stderr).text()]);
   if (cleanExitCode !== 0) {
-    const stderr = await new Response(cleanProc.stderr).text();
-    logger.warn("tdd", "Failed to clean untracked files", { stderr });
+    logger.warn("tdd", "Failed to clean untracked files", { stderr: cleanStderr });
   }
   logger.info("tdd", "Successfully rolled back git changes", { ref });
 }
 async function captureSnapshotRef(workdir, storyId) {
   await _rollbackDeps.autoCommitIfDirty(workdir, "non-blocking-fix-snapshot", "snapshot", storyId);
   const proc = _rollbackDeps.spawn(["git", "rev-parse", "HEAD"], { cwd: workdir, stdout: "pipe", stderr: "pipe" });
-  const sha = (await new Response(proc.stdout).text()).trim();
-  const exitCode = await proc.exited;
+  const [exitCode, shaRaw] = await Promise.all([proc.exited, new Response(proc.stdout).text()]);
+  const sha = shaRaw.trim();
   if (exitCode !== 0) {
     throw new NaxError("git rev-parse HEAD failed in non-blocking-fix snapshot", "SNAPSHOT_REF_FAILED", {
       storyId,
@@ -54946,6 +55066,15 @@ function extractPhaseFindings(output) {
   const success2 = "success" in record2 ? record2.success === true : ("passed" in record2) ? record2.passed === true : findings.length === 0;
   return success2 ? [] : findings;
 }
+function gateFailureKeys(gateOutput) {
+  const keys = new Set;
+  for (const f of extractPhaseFindings(gateOutput)) {
+    if (f.source !== "test-runner")
+      continue;
+    keys.add(`${f.file ?? ""}::${f.rule ?? ""}`);
+  }
+  return keys;
+}
 function shouldSkipPhaseForRectification(phase, state, phaseOutputs) {
   if (phase.kind !== "full-suite-gate")
     return false;
@@ -55335,6 +55464,8 @@ class ExecutionPlan {
         break;
       }
     }
+    const gateName = this.state.fullSuiteGate?.slot.op.name;
+    const preRectGateFailureKeys = gateName ? gateFailureKeys(phaseOutputs[gateName]) : new Set;
     const rectResult = await runRectification(this.ctx, this.state, phaseCosts, phaseOutputs);
     if (this.state.rectification && (!rectResult.rectificationExhausted || rectResult.liteScopeIncomplete)) {
       let resumeRectifyUsed = false;
@@ -55428,9 +55559,12 @@ class ExecutionPlan {
       });
     }
     const verifierName = this.state.verifier?.slot.op.name;
-    const gateName = this.state.fullSuiteGate?.slot.op.name;
-    const verifierPassedSsot = verifierName !== undefined && phaseExplicitlyPassed(phaseOutputs[verifierName]);
-    if (verifierPassedSsot && gateName !== undefined && !phasePassed(gateName, phaseOutputs[gateName], this.ctx.storyId)) {
+    const verifierExplicitlyPassed = verifierName !== undefined && phaseExplicitlyPassed(phaseOutputs[verifierName]);
+    const gateRegressedDuringRect = gateName !== undefined && [...gateFailureKeys(phaseOutputs[gateName])].some((k) => !preRectGateFailureKeys.has(k));
+    const verifierPassedSsot = verifierExplicitlyPassed && !gateRegressedDuringRect;
+    if (verifierExplicitlyPassed && gateRegressedDuringRect) {
+      logger?.warn("story-orchestrator", "Gate regressed during rectification after verifier passed \u2014 verifier verdict is stale, failing story", { storyId: this.ctx.storyId, packageDir: this.ctx.packageDir });
+    } else if (verifierPassedSsot && gateName !== undefined && !phasePassed(gateName, phaseOutputs[gateName], this.ctx.storyId)) {
       logger?.warn("story-orchestrator", "Full-suite gate failed but verifier judged story OK \u2014 treating gate failures as unrelated regressions", { storyId: this.ctx.storyId, packageDir: this.ctx.packageDir });
     }
     const success2 = Object.entries(phaseOutputs).every(([name, output]) => {
@@ -55468,7 +55602,8 @@ class ExecutionPlan {
       totalCostUsd,
       durationMs,
       phaseOutputs,
-      ...rectResult
+      ...rectResult,
+      gateRegressedDuringRect
     };
   }
 }
@@ -55664,7 +55799,9 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
     if (pkgQuality?.commands?.formatFix || pkgQuality?.commands?.formatFixScoped) {
       strategies.push(makeMechanicalFormatFixStrategy());
     }
-    if (inputs.fullSuiteGate && (isThreeSession || regressionMode === "per-story")) {
+    const fullSuiteGatePhasePresent = Boolean(inputs.fullSuiteGate) && (isThreeSession || regressionMode === "per-story");
+    const verifyScopedPhasePresent = !isThreeSession && Boolean(inputs.verifyScoped);
+    if (fullSuiteGatePhasePresent || verifyScopedPhasePresent) {
       strategies.push(makeFullSuiteRectifyStrategy(story, config2, sink));
     }
     if (config2.quality.autofix?.enabled !== false) {
@@ -56117,7 +56254,7 @@ function extractPauseReason(phaseOutputs) {
   }
   return;
 }
-function deriveTddFailureCategory(phaseOutputs, unfixedFindings) {
+function deriveTddFailureCategory(phaseOutputs, unfixedFindings, gateRegressedDuringRect) {
   const testWriterOutput = phaseOutputs[testWriterOp.name];
   if (testWriterOutput?.success === false) {
     return "session-failure";
@@ -56133,7 +56270,7 @@ function deriveTddFailureCategory(phaseOutputs, unfixedFindings) {
     }
     return "tests-failing";
   }
-  const verifierPassed = verifierOutput?.success === true;
+  const verifierPassed = verifierOutput?.success === true && !gateRegressedDuringRect;
   if (!verifierPassed && unfixedFindings && unfixedFindings.length > 0) {
     const rectOutput = phaseOutputs.rectification;
     if (rectOutput?.exitReason && EXHAUSTED_EXIT_REASONS.has(rectOutput.exitReason) && unfixedFindings.some((f) => f.source === "test-runner")) {
@@ -56182,6 +56319,11 @@ async function applyPostRunInspection(ctx, planResult, opts) {
   if (fullSuiteGateOutput?.passed) {
     ctx.fullSuiteGatePassed = true;
   }
+  const gateFailingFiles = [
+    ...new Set((fullSuiteGateOutput?.findings ?? []).map((f) => f.file).filter((f) => !!f))
+  ];
+  if (gateFailingFiles.length > 0)
+    ctx.fullSuiteGateFailingFiles = gateFailingFiles;
   ctx.selfVerification = parseSelfVerificationMarker(agentResult.output ?? "", ctx.workdir);
   const selfVerificationFailed = ctx.selfVerification.lint === "fail" || ctx.selfVerification.typecheck === "fail";
   if (ctx.config.context?.v2?.enabled && ctx.sessionScratchDir) {
@@ -56248,7 +56390,7 @@ async function applyPostRunInspection(ctx, planResult, opts) {
     }
   }
   const pauseReason = extractPauseReason(planResult.phaseOutputs);
-  const failureCategory = isTdd && !planResult.success ? deriveTddFailureCategory(planResult.phaseOutputs, planResult.unfixedFindings) : undefined;
+  const failureCategory = isTdd && !planResult.success ? deriveTddFailureCategory(planResult.phaseOutputs, planResult.unfixedFindings, planResult.gateRegressedDuringRect) : undefined;
   if (isTdd && !planResult.success && !failureCategory) {
     const phaseSignals = {};
     for (const [name, output] of Object.entries(planResult.phaseOutputs)) {
@@ -57103,6 +57245,7 @@ var init_routing2 = __esm(() => {
       const neverEscalated = !hasEscalationRecords;
       const initialAgent = ctx.story.routing?.initialAgent ?? (neverEscalated ? routing.agent : undefined);
       const initialProfileId = ctx.story.routing?.initialProfileId ?? (neverEscalated ? ctx.story.routing?.agentProfileId : undefined);
+      const initialModelTier = ctx.story.routing?.initialModelTier ?? (neverEscalated ? routing.modelTier : undefined);
       ctx.story.routing = {
         ...ctx.story.routing ?? {},
         complexity: routing.complexity,
@@ -57112,7 +57255,8 @@ var init_routing2 = __esm(() => {
         modelTier: routing.modelTier,
         ...routing.agent !== undefined && { agent: routing.agent },
         ...initialAgent !== undefined && { initialAgent },
-        ...initialProfileId !== undefined && { initialProfileId }
+        ...initialProfileId !== undefined && { initialProfileId },
+        ...initialModelTier !== undefined && { initialModelTier }
       };
       if (ctx.prdPath) {
         await _routingDeps.savePRD(ctx.prd, ctx.prdPath);
@@ -60325,7 +60469,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.70.0-canary.4",
+    version: "0.70.0-canary.6",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -60420,8 +60564,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("e2a854e7"))
-        return "e2a854e7";
+      if (/^[0-9a-f]{6,10}$/.test("4423f3a5"))
+        return "4423f3a5";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -60441,11 +60585,11 @@ var init_version = __esm(() => {
 
 // src/execution/crash-heartbeat.ts
 import { appendFileSync as appendFileSync2 } from "fs";
-async function heartbeatLoop(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
+async function heartbeatLoop(gen, statusWriter, getTotalCost, getIterations, jsonlFilePath) {
   const logger = _heartbeatDeps.getSafeLogger();
-  while (heartbeatActive) {
+  while (gen === _heartbeatGen && _heartbeatActive) {
     await _heartbeatDeps.sleep(60000);
-    if (!heartbeatActive)
+    if (gen !== _heartbeatGen || !_heartbeatActive)
       break;
     try {
       logger?.debug("crash-recovery", "Heartbeat");
@@ -60474,9 +60618,9 @@ async function heartbeatLoop(statusWriter, getTotalCost, getIterations, jsonlFil
 }
 function startHeartbeat(statusWriter, getTotalCost, getIterations, jsonlFilePath) {
   const logger = _heartbeatDeps.getSafeLogger();
-  stopHeartbeat();
-  heartbeatActive = true;
-  heartbeatLoop(statusWriter, getTotalCost, getIterations, jsonlFilePath).catch((err) => {
+  _heartbeatActive = true;
+  const gen = ++_heartbeatGen;
+  heartbeatLoop(gen, statusWriter, getTotalCost, getIterations, jsonlFilePath).catch((err) => {
     _heartbeatDeps.getSafeLogger()?.warn("crash-recovery", "Heartbeat loop crashed; status updates stopped", {
       error: err instanceof Error ? err.message : String(err)
     });
@@ -60484,12 +60628,13 @@ function startHeartbeat(statusWriter, getTotalCost, getIterations, jsonlFilePath
   logger?.debug("crash-recovery", "Heartbeat started (60s interval)");
 }
 function stopHeartbeat() {
-  if (heartbeatActive) {
-    heartbeatActive = false;
+  if (_heartbeatActive) {
+    _heartbeatActive = false;
+    _heartbeatGen++;
     getSafeLogger()?.debug("crash-recovery", "Heartbeat stopped");
   }
 }
-var _heartbeatDeps, heartbeatActive = false;
+var _heartbeatDeps, _heartbeatGen = 0, _heartbeatActive = false;
 var init_crash_heartbeat = __esm(() => {
   init_logger2();
   _heartbeatDeps = {
@@ -61374,6 +61519,15 @@ async function findResponsibleStory(testFile, workdir, passedStories) {
   }
   return;
 }
+function findResponsibleStoryByTransition(testFile, snapshots) {
+  const ordered = [...snapshots].sort((a, b) => a.completedAt.localeCompare(b.completedAt) || a.storyId.localeCompare(b.storyId));
+  for (const snap of ordered) {
+    if (snap.failingTestFiles?.includes(testFile)) {
+      return snap.storyId;
+    }
+  }
+  return;
+}
 async function runDeferredRegression(options) {
   const logger = getSafeLogger();
   const { config: config2, prd, workdir, runtime } = options;
@@ -61521,8 +61675,21 @@ async function runDeferredRegression(options) {
     }
   } else {
     const testFilesArray = Array.from(testFilesInFailures);
+    const snapshots = options.storyMetrics ?? [];
+    const passedById = new Map(passedStories.map((s) => [s.id, s]));
     for (const testFile of testFilesArray) {
-      const responsibleStory = await findResponsibleStory(testFile, workdir, passedStories);
+      let responsibleStory;
+      const transitionId = findResponsibleStoryByTransition(testFile, snapshots);
+      if (transitionId && passedById.has(transitionId)) {
+        responsibleStory = passedById.get(transitionId);
+        logger?.info("regression", "Mapped test to story via gate transition", {
+          storyId: transitionId,
+          testFile
+        });
+      }
+      if (!responsibleStory) {
+        responsibleStory = await findResponsibleStory(testFile, workdir, passedStories);
+      }
       if (responsibleStory) {
         affectedStories.add(responsibleStory.id);
         affectedStoriesObjs.set(responsibleStory.id, responsibleStory);
@@ -61707,7 +61874,12 @@ async function handleRunCompletion(options) {
       config: config2,
       prd,
       workdir,
-      runtime: options.runtime
+      runtime: options.runtime,
+      storyMetrics: options.isSequential === false ? undefined : allStoryMetrics.map((m) => ({
+        storyId: m.storyId,
+        completedAt: m.completedAt,
+        failingTestFiles: m.failingTestFiles
+      }))
     });
     const lastRunAt = new Date().toISOString();
     logger?.info("regression", "Deferred regression gate completed", {
@@ -62656,9 +62828,8 @@ ${missing.join(`
         stdout: "pipe",
         stderr: "pipe"
       });
-      const exitCode = await proc.exited;
+      const [exitCode, stderr] = await Promise.all([proc.exited, new Response(proc.stderr).text()]);
       if (exitCode !== 0) {
-        const stderr = await new Response(proc.stderr).text();
         throw new Error(`Failed to create worktree: ${stderr || "unknown error"}`);
       }
     } catch (error48) {
@@ -62691,9 +62862,8 @@ ${missing.join(`
         stdout: "pipe",
         stderr: "pipe"
       });
-      const exitCode = await proc.exited;
+      const [exitCode, stderr] = await Promise.all([proc.exited, new Response(proc.stderr).text()]);
       if (exitCode !== 0) {
-        const stderr = await new Response(proc.stderr).text();
         if (stderr.includes("not found") || stderr.includes("does not exist") || stderr.includes("no such worktree") || stderr.includes("is not a working tree")) {
           throw new Error(`Worktree not found: ${worktreePath}`);
         }
@@ -62711,9 +62881,8 @@ ${missing.join(`
         stdout: "pipe",
         stderr: "pipe"
       });
-      const exitCode = await proc.exited;
+      const [exitCode, stderr] = await Promise.all([proc.exited, new Response(proc.stderr).text()]);
       if (exitCode !== 0) {
-        const stderr = await new Response(proc.stderr).text();
         if (!stderr.includes("not found")) {
           const logger = getSafeLogger();
           logger?.warn("worktree", `Failed to delete branch ${branchName}`, { stderr });
@@ -62733,12 +62902,14 @@ ${missing.join(`
         stdout: "pipe",
         stderr: "pipe"
       });
-      const exitCode = await proc.exited;
+      const [exitCode, stderr, stdout] = await Promise.all([
+        proc.exited,
+        new Response(proc.stderr).text(),
+        new Response(proc.stdout).text()
+      ]);
       if (exitCode !== 0) {
-        const stderr = await new Response(proc.stderr).text();
         throw new Error(`Failed to list worktrees: ${stderr || "unknown error"}`);
       }
-      const stdout = await new Response(proc.stdout).text();
       return this.parseWorktreeList(stdout);
     } catch (error48) {
       if (error48 instanceof Error) {
@@ -62850,9 +63021,11 @@ class MergeEngine {
         stdout: "pipe",
         stderr: "pipe"
       });
-      const exitCode = await mergeProc.exited;
-      const stderr = await new Response(mergeProc.stderr).text();
-      const stdout = await new Response(mergeProc.stdout).text();
+      const [exitCode, stderr, stdout] = await Promise.all([
+        mergeProc.exited,
+        new Response(mergeProc.stderr).text(),
+        new Response(mergeProc.stdout).text()
+      ]);
       if (exitCode === 0) {
         try {
           await this.worktreeManager.remove(projectRoot, storyId);
@@ -62979,19 +63152,25 @@ ${stderr}`;
         stdout: "pipe",
         stderr: "pipe"
       });
-      const exitCode = await currentBranchProc.exited;
+      const [exitCode, currentBranchRaw] = await Promise.all([
+        currentBranchProc.exited,
+        new Response(currentBranchProc.stdout).text()
+      ]);
       if (exitCode !== 0) {
         throw new Error("Failed to get current branch");
       }
-      const currentBranch = (await new Response(currentBranchProc.stdout).text()).trim();
+      const currentBranch = currentBranchRaw.trim();
       const rebaseProc = _mergeDeps.spawn(["git", "rebase", currentBranch], {
         cwd: worktreePath,
         stdout: "pipe",
         stderr: "pipe"
       });
-      const rebaseExitCode = await rebaseProc.exited;
+      const [rebaseExitCode, rebaseStderr] = await Promise.all([
+        rebaseProc.exited,
+        new Response(rebaseProc.stderr).text()
+      ]);
       if (rebaseExitCode !== 0) {
-        const stderr = await new Response(rebaseProc.stderr).text();
+        const stderr = rebaseStderr;
         const abortProc = _mergeDeps.spawn(["git", "rebase", "--abort"], {
           cwd: worktreePath,
           stdout: "pipe",
@@ -63014,11 +63193,10 @@ ${stderr}`;
         stdout: "pipe",
         stderr: "pipe"
       });
-      const exitCode = await proc.exited;
+      const [exitCode, stdout] = await Promise.all([proc.exited, new Response(proc.stdout).text()]);
       if (exitCode !== 0) {
         return [];
       }
-      const stdout = await new Response(proc.stdout).text();
       return stdout.trim().split(`
 `).filter((line) => line.length > 0);
     } catch {
@@ -63234,13 +63412,17 @@ function buildEscalationFailure(story, currentTier, reviewFindings, cost, pipeli
     summary,
     reviewFindings: reviewFindings && reviewFindings.length > 0 ? reviewFindings : undefined,
     cost: cost ?? 0,
-    timestamp: new Date().toISOString()
+    timestamp: new Date().toISOString(),
+    ...story.routing?.agent !== undefined ? { agent: story.routing.agent } : {},
+    ...story.routing?.agentProfileId !== undefined ? { agentProfileId: story.routing.agentProfileId } : {}
   };
 }
-function buildEscalationRecord(currentTier, nextTier, reason) {
+function buildEscalationRecord(currentTier, nextTier, reason, agents) {
   return {
     fromTier: currentTier,
     toTier: nextTier,
+    ...agents?.fromAgent !== undefined ? { fromAgent: agents.fromAgent } : {},
+    ...agents?.toAgent !== undefined ? { toAgent: agents.toAgent } : {},
     reason,
     timestamp: new Date().toISOString()
   };
@@ -63337,7 +63519,7 @@ async function handleTierEscalation(ctx) {
       const currentStoryTier = s.routing?.modelTier ?? ctx.routing.modelTier;
       const isChangingTier = currentStoryTier !== escalatedTier;
       const shouldResetAttempts = isChangingTier || shouldSwitchToTestAfter;
-      const escalationRecord = isChangingTier || shouldSwitchToTestAfter ? buildEscalationRecord(currentStoryTier, shouldSwitchToTestAfter ? currentStoryTier : escalatedTier, ctx.pipelineResult.reason ?? "Escalated to next retry path") : undefined;
+      const escalationRecord = isChangingTier || shouldSwitchToTestAfter ? buildEscalationRecord(currentStoryTier, shouldSwitchToTestAfter ? currentStoryTier : escalatedTier, ctx.pipelineResult.reason ?? "Escalated to next retry path", { fromAgent: s.routing?.agent, toAgent: nextAgent }) : undefined;
       const escalationFailure = buildEscalationFailure(s, currentStoryTier, escalateReviewFindings, ctx.attemptCost, verifiedPipelineReason, escalateFailureCategory);
       return {
         ...s,
@@ -63758,7 +63940,7 @@ async function runIteration(ctx, prd, selection, iterations, totalCost, allStory
     }
   }
   const accumulatedAttemptCost = (story.priorFailures || []).reduce((sum, f) => sum + (f.cost || 0), 0);
-  const profileOverride = ctx.config.profile && ctx.config.profile !== "default" ? { profile: ctx.config.profile } : undefined;
+  const profileOverride = profileOverrideFromConfig(ctx.config);
   const effectiveConfig = story.workdir ? await _iterationRunnerDeps.loadConfigForWorkdir(join81(ctx.workdir, ".nax", "config.json"), story.workdir, profileOverride) : ctx.config;
   let dependencyContext;
   if (ctx.config.execution.storyIsolation === "worktree") {
@@ -63904,6 +64086,7 @@ async function runIteration(ctx, prd, selection, iterations, totalCost, allStory
 }
 var _iterationRunnerDeps;
 var init_iteration_runner = __esm(() => {
+  init_config();
   init_loader();
   init_logger2();
   init_runner4();
@@ -64134,7 +64317,7 @@ async function runParallelBatch(options) {
     worktreePaths.set(story.id, path22.join(workdir, ".nax-wt", story.id));
   }
   const rootConfigPath = path22.join(workdir, ".nax", "config.json");
-  const profileOverride = config2.profile && config2.profile !== "default" ? { profile: config2.profile } : undefined;
+  const profileOverride = profileOverrideFromConfig(config2);
   const storyEffectiveConfigs = new Map;
   const configResults = await Promise.allSettled(stories.filter((story) => story.workdir).map(async (story) => {
     try {
@@ -64295,6 +64478,7 @@ async function runParallelBatch(options) {
 }
 var _parallelBatchDeps;
 var init_parallel_batch = __esm(() => {
+  init_config();
   init_loader();
   init_logger2();
   init_dependencies();
@@ -64361,13 +64545,15 @@ async function executeUnified(ctx, initialPrd) {
   };
   for (const fn of _prevRunUnsubscribers)
     fn();
-  _prevRunUnsubscribers = [
+  _prevRunUnsubscribers = [];
+  const thisRunUnsubscribers = [
     wireHooks(pipelineEventBus, ctx.hooks, ctx.workdir, ctx.feature),
     wireReporters(pipelineEventBus, ctx.pluginRegistry, ctx.runId, ctx.startTime),
     wireInteraction(pipelineEventBus, ctx.interactionChain, ctx.config),
     wireEventsWriter(pipelineEventBus, ctx.feature, ctx.runId, ctx.workdir),
     wireRegistry(pipelineEventBus, ctx.feature, ctx.runId, ctx.workdir, ctx.runtime.outputDir)
   ];
+  _prevRunUnsubscribers = thisRunUnsubscribers;
   pipelineEventBus.emit({
     type: "run:started",
     feature: ctx.feature,
@@ -64384,6 +64570,7 @@ async function executeUnified(ctx, initialPrd) {
     deferredReview
   });
   startHeartbeat(ctx.statusWriter, () => totalCost, () => iterations, ctx.logFilePath);
+  let _executeThrew = false;
   try {
     if (isComplete(prd)) {
       logger?.info("execution", "All stories already complete \u2014 skipping pre-run pipeline");
@@ -64790,7 +64977,16 @@ async function executeUnified(ctx, initialPrd) {
       }, ctx.eventEmitter);
     }
     return buildResult2("max-iterations");
-  } finally {}
+  } catch (err) {
+    _executeThrew = true;
+    throw err;
+  } finally {
+    if (_executeThrew && _prevRunUnsubscribers === thisRunUnsubscribers) {
+      for (const fn of thisRunUnsubscribers)
+        fn();
+      _prevRunUnsubscribers = [];
+    }
+  }
 }
 function reconcileBatchOutcome(prd, batchResult) {
   for (const story of batchResult.completed) {
@@ -65542,7 +65738,8 @@ async function initializeRun(ctx) {
   prd = await reconcileState(prd, ctx.prdPath, ctx.workdir, ctx.config);
   const resetRef = ctx.config.review?.semantic?.resetRefOnRerun ?? false;
   const storyIsolation = ctx.config.execution.storyIsolation;
-  const resetStories = resetFailedStoriesToPending(prd, resetRef, storyIsolation);
+  const resetMode = ctx.config.autoMode.escalation.resetMode;
+  const resetStories = resetFailedStoriesToPending(prd, { resetRef, storyIsolation, resetMode });
   if (resetStories.length > 0) {
     const resetIds = resetStories.map((s) => s.id);
     logger?.info("run-initialization", "Reset failed stories to pending for re-run", { storyIds: resetIds });
@@ -65882,6 +66079,7 @@ async function setupRun(options) {
     const resolvedPatterns = await resolveTestFilePatterns(config2, workdir);
     const isTestFileFn = (filename) => resolvedPatterns.regex.some((re) => re.test(filename));
     const pluginRegistry = await loadPlugins(globalPluginsDir, projectPluginsDir, configPlugins, workdir, config2.disabledPlugins, isTestFileFn);
+    clearCache();
     logger?.info("plugins", `Loaded ${pluginRegistry.plugins.length} plugins`, {
       plugins: pluginRegistry.plugins.map((p) => ({ name: p.name, version: p.version, provides: p.provides }))
     });
@@ -65935,6 +66133,7 @@ async function setupRun(options) {
 var _runSetupDeps;
 var init_run_setup = __esm(() => {
   init_pipeline();
+  init_routing();
   init_test_runners();
   init_paths();
   init_errors();
@@ -95771,7 +95970,8 @@ function finalizePrdRouting(prd, agentRouting, profileName) {
       agentProfileId: assignment.agentProfileId,
       profileModelTier: assignment.profileModelTier,
       initialAgent: story.routing?.initialAgent ?? assignment.agent,
-      initialProfileId: story.routing?.initialProfileId ?? assignment.agentProfileId
+      initialProfileId: story.routing?.initialProfileId ?? assignment.agentProfileId,
+      initialModelTier: story.routing?.initialModelTier ?? assignment.profileModelTier
     };
     return { ...story, routing };
   });
@@ -97864,8 +98064,9 @@ async function rulesLintCommand(options) {
 init_config();
 init_logger2();
 async function resolveRunProfileOverride(opts) {
-  if (opts.cliProfile)
-    return opts.cliProfile;
+  const cliChain = parseProfileList(opts.cliProfile);
+  if (cliChain.length > 0)
+    return cliChain;
   if (opts.envProfile)
     return;
   const readJson = opts._readJson ?? (async (path19) => {
@@ -97876,15 +98077,15 @@ async function resolveRunProfileOverride(opts) {
   });
   try {
     const prd = await readJson(opts.prdPath);
-    if (prd && typeof prd.routingProfile === "string" && prd.routingProfile.length > 0) {
-      const name = prd.routingProfile;
-      if (name === "default")
-        return name;
+    const rp = prd?.routingProfile;
+    const prdChain = parseProfileList(typeof rp === "string" || Array.isArray(rp) ? rp : undefined);
+    if (prdChain.length > 0) {
       const listNames = opts._listProfileNames ?? (async () => (await listProfiles(opts.projectRoot)).map((p) => p.name));
       const available = await listNames();
-      if (available.includes(name))
-        return name;
-      getSafeLogger()?.warn("run", `PRD was planned with config profile "${name}" but no such profile exists \u2014 continuing with current config resolution`, { storyId: "prd", plannedProfile: name });
+      const missing = prdChain.filter((name) => name !== "default" && !available.includes(name));
+      if (missing.length === 0)
+        return prdChain;
+      getSafeLogger()?.warn("run", `PRD was planned with config profile(s) "${prdChain.join(",")}" but ${missing.join(", ")} not found \u2014 continuing with current config resolution`, { storyId: "prd", plannedProfile: prdChain.join(","), missing });
     }
   } catch {}
   return;
@@ -105271,6 +105472,7 @@ var import_react28 = __toESM(require_react(), 1);
 var import_react35 = __toESM(require_react(), 1);
 
 // src/utils/queue-writer.ts
+var _writeChains = new Map;
 async function writeQueueCommand(queueFilePath, command) {
   let commandLine2;
   switch (command.type) {
@@ -105288,13 +105490,22 @@ async function writeQueueCommand(queueFilePath, command) {
       throw new Error(`Unhandled queue command: ${_exhaustive}`);
     }
   }
-  const file3 = Bun.file(queueFilePath);
-  const existingContent = await file3.text().catch(() => "");
-  const newContent = existingContent ? `${existingContent.trimEnd()}
+  const chain = _writeChains.get(queueFilePath) ?? Promise.resolve();
+  const next = chain.then(async () => {
+    const existing = await Bun.file(queueFilePath).text().catch(() => "");
+    const content = existing ? `${existing.trimEnd()}
 ${commandLine2}
 ` : `${commandLine2}
 `;
-  await Bun.write(queueFilePath, newContent);
+    await Bun.write(queueFilePath, content);
+  });
+  const settled = next.catch(() => {});
+  _writeChains.set(queueFilePath, settled);
+  settled.then(() => {
+    if (_writeChains.get(queueFilePath) === settled)
+      _writeChains.delete(queueFilePath);
+  });
+  await next;
 }
 
 // src/tui/components/CostOverlay.tsx
@@ -106939,6 +107150,9 @@ function renderTui(props) {
 init_version();
 var program2 = new Command;
 program2.name("nax").description("AI Coding Agent Orchestrator \u2014 loops until done").version(NAX_VERSION);
+function collectProfile(value, previous) {
+  return previous.concat(value);
+}
 async function promptForConfirmation(question) {
   if (!process.stdin.isTTY) {
     return true;
@@ -107136,7 +107350,7 @@ program2.command("setup").description("Analyze repo and generate .nax/config.jso
   });
   process.exit(exitCode);
 });
-program2.command("run").description("Run the orchestration loop for a feature").requiredOption("-f, --feature <name>", "Feature name").option("-a, --agent <name>", "Force a specific agent").option("-m, --max-iterations <n>", "Max iterations", "20").option("--dry-run", "Show plan without executing", false).option("--no-context", "Disable context builder (skip file context in prompts)").option("--no-batch", "Disable story batching (execute all stories individually)").option("--parallel <n>", "Max parallel sessions (0=auto, omit=sequential)").option("--plan", "Run plan phase first before execution", false).option("--from <spec-path>", "Path to spec file (required when --plan is used)").option("--one-shot", "Skip interactive planning Q&A, use single LLM call (ACP only)", false).option("--force", "Force overwrite existing prd.json when using --plan", false).option("--headless", "Force headless mode (disable TUI, use pipe mode)", false).option("--verbose", "Enable verbose logging (debug level)", false).option("--quiet", "Quiet mode (warnings and errors only)", false).option("--silent", "Silent mode (errors only)", false).option("--json", "JSON mode (raw JSONL output to stdout)", false).option("-d, --dir <path>", "Working directory", process.cwd()).option("--skip-precheck", "Skip precheck validations (advanced users only)", false).option("--profile <name>", "Profile to use (overrides config.json profile)").action(async (options) => {
+program2.command("run").description("Run the orchestration loop for a feature").requiredOption("-f, --feature <name>", "Feature name").option("-a, --agent <name>", "Force a specific agent").option("-m, --max-iterations <n>", "Max iterations", "20").option("--dry-run", "Show plan without executing", false).option("--no-context", "Disable context builder (skip file context in prompts)").option("--no-batch", "Disable story batching (execute all stories individually)").option("--parallel <n>", "Max parallel sessions (0=auto, omit=sequential)").option("--plan", "Run plan phase first before execution", false).option("--from <spec-path>", "Path to spec file (required when --plan is used)").option("--one-shot", "Skip interactive planning Q&A, use single LLM call (ACP only)", false).option("--force", "Force overwrite existing prd.json when using --plan", false).option("--headless", "Force headless mode (disable TUI, use pipe mode)", false).option("--verbose", "Enable verbose logging (debug level)", false).option("--quiet", "Quiet mode (warnings and errors only)", false).option("--silent", "Silent mode (errors only)", false).option("--json", "JSON mode (raw JSONL output to stdout)", false).option("-d, --dir <path>", "Working directory", process.cwd()).option("--skip-precheck", "Skip precheck validations (advanced users only)", false).option("--profile <name>", "Profile(s) to overlay (comma-separated or repeated; later overrides earlier)", collectProfile, []).action(async (options) => {
   let workdir;
   try {
     workdir = validateDirectory(options.dir);
@@ -107173,13 +107387,14 @@ program2.command("run").description("Run the orchestration loop for a feature").
   }
   const naxDir = findProjectDir(workdir);
   const cliOverrides = {};
+  const cliProfiles = options.profile ?? [];
   const profileOverride = naxDir ? await resolveRunProfileOverride({
     prdPath: join87(naxDir, "features", options.feature, "prd.json"),
     projectRoot: workdir,
-    cliProfile: options.profile,
+    cliProfile: cliProfiles,
     envProfile: process.env.NAX_PROFILE
-  }) : options.profile;
-  if (profileOverride) {
+  }) : cliProfiles;
+  if (profileOverride && profileOverride.length > 0) {
     cliOverrides.profile = profileOverride;
   }
   const config2 = await loadConfig(naxDir ?? undefined, cliOverrides);
@@ -107480,7 +107695,7 @@ Features:
   }
   console.log();
 });
-program2.command("plan [description]").description("Generate prd.json from a spec file via LLM one-shot call (replaces deprecated 'nax analyze')").option("--from <spec-path>", "Path to spec file (required unless --decompose is used)").requiredOption("-f, --feature <name>", "Feature name (required)").option("--auto", "Run in one-shot LLM mode (alias: --one-shot)", false).option("--one-shot", "Run in one-shot LLM mode (alias: --auto)", false).option("-b, --branch <branch>", "Override default branch name").option("-d, --dir <path>", "Project directory", process.cwd()).option("--decompose <storyId>", "Decompose an existing story into sub-stories").option("--profile <name>", "Profile to use (overrides config.json profile)").action(async (description, options) => {
+program2.command("plan [description]").description("Generate prd.json from a spec file via LLM one-shot call (replaces deprecated 'nax analyze')").option("--from <spec-path>", "Path to spec file (required unless --decompose is used)").requiredOption("-f, --feature <name>", "Feature name (required)").option("--auto", "Run in one-shot LLM mode (alias: --one-shot)", false).option("--one-shot", "Run in one-shot LLM mode (alias: --auto)", false).option("-b, --branch <branch>", "Override default branch name").option("-d, --dir <path>", "Project directory", process.cwd()).option("--decompose <storyId>", "Decompose an existing story into sub-stories").option("--profile <name>", "Profile(s) to overlay (comma-separated or repeated; later overrides earlier)", collectProfile, []).action(async (description, options) => {
   if (description) {
     console.error(source_default.red(`Error: Positional args removed in plan v2.
 
@@ -107500,8 +107715,9 @@ Use: nax plan -f <feature> --from <spec>`));
     process.exit(1);
   }
   const cliOverrides = {};
-  if (options.profile) {
-    cliOverrides.profile = options.profile;
+  const cliProfiles = options.profile ?? [];
+  if (cliProfiles.length > 0) {
+    cliOverrides.profile = cliProfiles;
   }
   const config2 = await loadConfig(workdir, cliOverrides);
   const featureLogDir = join87(naxDir, "features", options.feature, "plan");

package/package.json

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