@nathapp/nax 0.54.12 → 0.55.1

package/dist/nax.js

@@ -3259,6 +3259,14 @@ async function withProcessTimeout(proc, timeoutMs, opts) {
 }
 
 // src/utils/bun-deps.ts
+var exports_bun_deps = {};
+__export(exports_bun_deps, {
+  which: () => which,
+  typedSpawn: () => typedSpawn,
+  spawn: () => spawn,
+  sleep: () => sleep,
+  file: () => file
+});
 function typedSpawn(cmd, opts) {
   return Bun.spawn(cmd, opts);
 }
@@ -3268,6 +3276,9 @@ function which(name) {
 function sleep(ms) {
   return Bun.sleep(ms);
 }
+function file(path) {
+  return Bun.file(path);
+}
 var spawn;
 var init_bun_deps = __esm(() => {
   spawn = Bun.spawn;
@@ -14942,26 +14953,26 @@ var formatMap, stringProcessor = (schema, ctx, _json, _params) => {
   _json.pattern = pattern.source;
 }, fileProcessor = (schema, _ctx, json, _params) => {
   const _json = json;
-  const file = {
+  const file2 = {
     type: "string",
     format: "binary",
     contentEncoding: "binary"
   };
   const { minimum, maximum, mime } = schema._zod.bag;
   if (minimum !== undefined)
-    file.minLength = minimum;
+    file2.minLength = minimum;
   if (maximum !== undefined)
-    file.maxLength = maximum;
+    file2.maxLength = maximum;
   if (mime) {
     if (mime.length === 1) {
-      file.contentMediaType = mime[0];
-      Object.assign(_json, file);
+      file2.contentMediaType = mime[0];
+      Object.assign(_json, file2);
     } else {
-      Object.assign(_json, file);
+      Object.assign(_json, file2);
       _json.anyOf = mime.map((m) => ({ contentMediaType: m }));
     }
   } else {
-    Object.assign(_json, file);
+    Object.assign(_json, file2);
   }
 }, successProcessor = (_schema, _ctx, json, _params) => {
   json.type = "boolean";
@@ -15833,7 +15844,7 @@ __export(exports_schemas2, {
   function: () => _function,
   float64: () => float64,
   float32: () => float32,
-  file: () => file,
+  file: () => file2,
   exactOptional: () => exactOptional,
   enum: () => _enum2,
   emoji: () => emoji2,
@@ -16214,7 +16225,7 @@ function literal(value, params) {
     ...exports_util.normalizeParams(params)
   });
 }
-function file(params) {
+function file2(params) {
   return _file(ZodFile, params);
 }
 function transform(fn) {
@@ -17662,7 +17673,7 @@ __export(exports_external, {
   float64: () => float64,
   float32: () => float32,
   flattenError: () => flattenError,
-  file: () => file,
+  file: () => file2,
   exactOptional: () => exactOptional,
   enum: () => _enum2,
   endsWith: () => _endsWith,
@@ -19586,7 +19597,8 @@ class SpawnAcpSession {
       const stderr = await new Response(proc.stderr).text();
       if (exitCode !== 0) {
         getSafeLogger()?.warn("acp-adapter", `Session prompt exited with code ${exitCode}`, {
-          stderr: stderr.slice(0, 200)
+          exitCode,
+          stderr: stderr.slice(0, 500)
         });
         return {
           messages: [{ role: "assistant", content: stderr || `Exit code ${exitCode}` }],
@@ -19912,10 +19924,10 @@ async function sweepFeatureSessions(workdir, featureName) {
 }
 async function sweepStaleFeatureSessions(workdir, featureName, maxAgeMs = MAX_SESSION_AGE_MS) {
   const path = acpSessionsPath(workdir, featureName);
-  const file2 = Bun.file(path);
-  if (!await file2.exists())
+  const file3 = Bun.file(path);
+  if (!await file3.exists())
     return;
-  const ageMs = Date.now() - file2.lastModified;
+  const ageMs = Date.now() - file3.lastModified;
   if (ageMs < maxAgeMs)
     return;
   getSafeLogger()?.info("acp-adapter", `[sweep] Sidecar is ${Math.round(ageMs / 60000)}m old \u2014 sweeping stale sessions`, {
@@ -19994,11 +20006,23 @@ class AcpAgentAdapter {
       storyId: options.storyId,
       sessionRole: options.sessionRole
     });
+    let sessionErrorRetried = false;
     for (let attempt = 0;attempt < MAX_RATE_LIMIT_RETRIES; attempt++) {
       try {
         const result = await this._runWithClient(options, startTime);
         if (!result.success) {
           getSafeLogger()?.warn("acp-adapter", `Run failed for ${this.name}`, { exitCode: result.exitCode });
+          if (result.sessionError && _acpAdapterDeps.shouldRetrySessionError && !sessionErrorRetried) {
+            sessionErrorRetried = true;
+            getSafeLogger()?.warn("acp-adapter", "Session error \u2014 retrying with fresh session", {
+              storyId: options.storyId,
+              featureName: options.featureName
+            });
+            if (options.featureName && options.storyId) {
+              await clearAcpSession(options.workdir, options.featureName, options.storyId);
+            }
+            continue;
+          }
         }
         return result;
       } catch (err) {
@@ -20127,6 +20151,7 @@ class AcpAgentAdapter {
       };
     }
     const success2 = lastResponse?.stopReason === "end_turn";
+    const isSessionError = lastResponse?.stopReason === "error";
     const output = extractOutput(lastResponse);
     const estimatedCost = totalExactCostUsd ?? (totalTokenUsage.input_tokens > 0 || totalTokenUsage.output_tokens > 0 ? estimateCostFromTokenUsage(totalTokenUsage, options.modelDef.model) : 0);
     return {
@@ -20134,6 +20159,7 @@ class AcpAgentAdapter {
       exitCode: success2 ? 0 : 1,
       output: output.slice(-MAX_AGENT_OUTPUT_CHARS2),
       rateLimited: false,
+      sessionError: isSessionError,
       durationMs,
       estimatedCost
     };
@@ -20328,6 +20354,7 @@ var init_adapter2 = __esm(() => {
   _acpAdapterDeps = {
     which,
     sleep,
+    shouldRetrySessionError: true,
     createClient(cmdStr, cwd, timeoutSeconds, pidRegistry) {
       return createSpawnAcpClient(cmdStr, cwd, timeoutSeconds, pidRegistry);
     }
@@ -21190,17 +21217,24 @@ ${errors3.join(`
   return result.data;
 }
 async function loadConfigForWorkdir(rootConfigPath, packageDir) {
+  const logger = getLogger();
   const rootNaxDir = dirname(rootConfigPath);
   const rootConfig = await loadConfig(rootNaxDir);
   if (!packageDir) {
+    logger.debug("config", "No packageDir \u2014 using root config");
     return rootConfig;
   }
   const repoRoot = dirname(rootNaxDir);
   const packageConfigPath = join6(repoRoot, PROJECT_NAX_DIR, "mono", packageDir, "config.json");
   const packageOverride = await loadJsonFile(packageConfigPath, "config");
   if (!packageOverride) {
+    logger.debug("config", "Per-package config not found \u2014 falling back to root config", {
+      packageConfigPath,
+      packageDir
+    });
     return rootConfig;
   }
+  logger.debug("config", "Per-package config loaded", { packageConfigPath, packageDir });
   return mergePackageConfig(rootConfig, packageOverride);
 }
 var init_loader = __esm(() => {
@@ -22370,7 +22404,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.54.12",
+    version: "0.55.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22449,8 +22483,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("cbd14dd"))
-        return "cbd14dd";
+      if (/^[0-9a-f]{6,10}$/.test("a51fce0b"))
+        return "a51fce0b";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -23886,12 +23920,12 @@ async function loadPendingInteraction(requestId, featureDir) {
   const filename = `${requestId}.json`;
   const filePath = path3.join(interactionsDir, filename);
   try {
-    const file2 = Bun.file(filePath);
-    const exists = await file2.exists();
+    const file3 = Bun.file(filePath);
+    const exists = await file3.exists();
     if (!exists) {
       return null;
     }
-    const json2 = await file2.text();
+    const json2 = await file3.text();
     const request = JSON.parse(json2);
     return request;
   } catch {
@@ -24220,9 +24254,9 @@ var init_acceptance2 = __esm(() => {
     async execute(ctx) {
       const logger = getLogger();
       const effectiveConfig = ctx.effectiveConfig ?? ctx.config;
-      logger.info("acceptance", "Running acceptance tests");
+      logger.info("acceptance", "Running acceptance tests", { storyId: ctx.story.id });
       if (!ctx.featureDir) {
-        logger.warn("acceptance", "No feature directory \u2014 skipping acceptance tests");
+        logger.warn("acceptance", "No feature directory \u2014 skipping acceptance tests", { storyId: ctx.story.id });
         return { action: "continue" };
       }
       const testGroups = ctx.acceptanceTestPaths ?? [
@@ -24239,11 +24273,12 @@ var init_acceptance2 = __esm(() => {
         const testFile = Bun.file(testPath);
         const exists = await testFile.exists();
         if (!exists) {
-          logger.warn("acceptance", "Acceptance test file not found \u2014 skipping", { testPath });
+          logger.warn("acceptance", "Acceptance test file not found \u2014 skipping", { storyId: ctx.story.id, testPath });
           continue;
         }
         const testCmdParts = buildAcceptanceRunCommand(testPath, effectiveConfig.project?.testFramework, effectiveConfig.acceptance.command);
         logger.info("acceptance", "Running acceptance command", {
+          storyId: ctx.story.id,
           cmd: testCmdParts.join(" "),
           packageDir
         });
@@ -24266,12 +24301,14 @@ ${stderr}`;
         const overriddenFailures = failedACs.filter((acId) => overrides[acId]);
         if (overriddenFailures.length > 0) {
           logger.warn("acceptance", "Skipped failures (overridden)", {
+            storyId: ctx.story.id,
             overriddenFailures,
             overrides: overriddenFailures.map((acId) => ({ acId, reason: overrides[acId] }))
           });
         }
         if (failedACs.length === 0 && exitCode !== 0) {
           logger.error("acceptance", "Tests errored with no AC failures parsed", {
+            storyId: ctx.story.id,
             exitCode,
             packageDir
           });
@@ -24288,18 +24325,19 @@ ${stderr}`;
         }
         if (actualFailures.length > 0) {
           logger.error("acceptance", "Acceptance tests failed", {
+            storyId: ctx.story.id,
             failedACs: actualFailures,
             packageDir
           });
           logTestOutput(logger, "acceptance", output);
         } else if (exitCode === 0) {
-          logger.info("acceptance", "Package acceptance tests passed", { packageDir });
+          logger.info("acceptance", "Package acceptance tests passed", { storyId: ctx.story.id, packageDir });
         }
       }
       const combinedOutput = allOutputParts.join(`
 `);
       if (allFailedACs.length === 0) {
-        logger.info("acceptance", "All acceptance tests passed");
+        logger.info("acceptance", "All acceptance tests passed", { storyId: ctx.story.id });
         return { action: "continue" };
       }
       ctx.acceptanceFailures = {
@@ -24639,6 +24677,99 @@ ${stderr}` };
   };
 });
 
+// src/quality/runner.ts
+var {spawn: spawn2 } = globalThis.Bun;
+async function runQualityCommand(opts) {
+  const { commandName, command, workdir, storyId, timeoutMs = DEFAULT_TIMEOUT_MS } = opts;
+  const startTime = Date.now();
+  const logger = getSafeLogger();
+  logger?.info("quality", `Running ${commandName}`, { storyId, commandName, command, workdir });
+  try {
+    const parts = command.split(/\s+/);
+    const [executable, ...args] = parts;
+    const proc = _qualityRunnerDeps.spawn({
+      cmd: [executable, ...args],
+      cwd: workdir,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    let timedOut = false;
+    const killTimer = setTimeout(() => {
+      timedOut = true;
+      try {
+        proc.kill("SIGTERM");
+      } catch {}
+      setTimeout(() => {
+        try {
+          proc.kill("SIGKILL");
+        } catch {}
+      }, SIGKILL_GRACE_PERIOD_MS2);
+    }, timeoutMs);
+    const [exitCode, stdout, stderr] = await Promise.all([
+      proc.exited,
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text()
+    ]);
+    clearTimeout(killTimer);
+    const durationMs = Date.now() - startTime;
+    if (timedOut) {
+      logger?.warn("quality", `${commandName} timed out`, {
+        storyId,
+        commandName,
+        command,
+        workdir,
+        durationMs,
+        timedOut: true
+      });
+      return {
+        commandName,
+        command,
+        success: false,
+        exitCode: -1,
+        output: `[nax] ${commandName} timed out after ${timeoutMs / 1000}s`,
+        durationMs,
+        timedOut: true
+      };
+    }
+    const output = [stdout, stderr].filter(Boolean).join(`
+`);
+    const success2 = exitCode === 0;
+    logger?.info("quality", `${commandName} completed`, {
+      storyId,
+      commandName,
+      command,
+      workdir,
+      exitCode,
+      durationMs,
+      timedOut: false
+    });
+    return { commandName, command, success: success2, exitCode, output, durationMs, timedOut: false };
+  } catch (error48) {
+    const durationMs = Date.now() - startTime;
+    return {
+      commandName,
+      command,
+      success: false,
+      exitCode: -1,
+      output: errorMessage(error48),
+      durationMs,
+      timedOut: false
+    };
+  }
+}
+var DEFAULT_TIMEOUT_MS = 120000, SIGKILL_GRACE_PERIOD_MS2 = 5000, _qualityRunnerDeps;
+var init_runner2 = __esm(() => {
+  init_logger2();
+  _qualityRunnerDeps = {
+    spawn: spawn2
+  };
+});
+
+// src/quality/index.ts
+var init_quality = __esm(() => {
+  init_runner2();
+});
+
 // src/pipeline/event-bus.ts
 class PipelineEventBus {
   subscribers = new Map;
@@ -24913,7 +25044,7 @@ var init_language_commands = __esm(() => {
 });
 
 // src/review/semantic.ts
-var {spawn: spawn2 } = globalThis.Bun;
+var {spawn: spawn3 } = globalThis.Bun;
 async function collectDiff(workdir, storyGitRef, excludePatterns) {
   const cmd = ["git", "diff", "--unified=3", `${storyGitRef}..HEAD`];
   if (excludePatterns.length > 0) {
@@ -25016,7 +25147,7 @@ If all ACs are correctly implemented, respond with { "passed": true, "findings":
 function parseLLMResponse(raw) {
   try {
     let cleaned = raw.trim();
-    const fenceMatch = cleaned.match(/^```(?:json)?\s*\n?([\s\S]*?)\n?\s*```$/);
+    const fenceMatch = cleaned.match(/^```(?:json)?\s*\n([\s\S]*?)\n```/);
     if (fenceMatch)
       cleaned = fenceMatch[1].trim();
     const parsed = JSON.parse(cleaned);
@@ -25198,18 +25329,17 @@ var init_semantic = __esm(() => {
   init_logger2();
   init_git();
   _semanticDeps = {
-    spawn: spawn2,
+    spawn: spawn3,
     isGitRefValid,
     getMergeBase
   };
 });
 
 // src/review/runner.ts
-var {spawn: spawn3 } = globalThis.Bun;
 async function loadPackageJson(workdir) {
   try {
-    const file2 = _reviewRunnerDeps.file(`${workdir}/package.json`);
-    const content = await file2.text();
+    const file3 = _reviewRunnerDeps.file(`${workdir}/package.json`);
+    const content = await file3.text();
     return JSON.parse(content);
   } catch {
     return null;
@@ -25257,81 +25387,20 @@ async function resolveCommand(check2, config2, executionConfig, workdir, quality
   }
   return null;
 }
-async function runCheck(check2, command, workdir) {
-  const startTime = Date.now();
-  const logger = getSafeLogger();
-  logger?.info("review", `Running ${check2} check`, { check: check2, command, workdir });
-  try {
-    const parts = command.split(/\s+/);
-    const executable = parts[0];
-    const args = parts.slice(1);
-    const proc = _reviewRunnerDeps.spawn({
-      cmd: [executable, ...args],
-      cwd: workdir,
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    let timedOut = false;
-    const timerId = setTimeout(() => {
-      timedOut = true;
-      try {
-        proc.kill("SIGTERM");
-      } catch {}
-      setTimeout(() => {
-        try {
-          proc.kill("SIGKILL");
-        } catch {}
-      }, SIGKILL_GRACE_PERIOD_MS2);
-    }, REVIEW_CHECK_TIMEOUT_MS);
-    const exitCode = await proc.exited;
-    clearTimeout(timerId);
-    if (timedOut) {
-      return {
-        check: check2,
-        command,
-        success: false,
-        exitCode: -1,
-        output: `[nax] ${check2} timed out after ${REVIEW_CHECK_TIMEOUT_MS / 1000}s`,
-        durationMs: Date.now() - startTime
-      };
-    }
-    const stdout = await new Response(proc.stdout).text();
-    const stderr = await new Response(proc.stderr).text();
-    const output = [stdout, stderr].filter(Boolean).join(`
-`);
-    if (exitCode !== 0) {
-      logger?.warn("review", `${check2} check failed`, {
-        check: check2,
-        command,
-        workdir,
-        exitCode,
-        output: output.slice(0, 2000)
-      });
-    } else {
-      logger?.debug("review", `${check2} check passed`, { check: check2, command, durationMs: Date.now() - startTime });
-    }
-    return {
-      check: check2,
-      command,
-      success: exitCode === 0,
-      exitCode,
-      output,
-      durationMs: Date.now() - startTime
-    };
-  } catch (error48) {
-    return {
-      check: check2,
-      command,
-      success: false,
-      exitCode: -1,
-      output: errorMessage(error48),
-      durationMs: Date.now() - startTime
-    };
-  }
+async function runCheck(check2, command, workdir, storyId) {
+  const result = await runQualityCommand({ commandName: check2, command, workdir, storyId });
+  return {
+    check: check2,
+    command: result.command,
+    success: result.success,
+    exitCode: result.exitCode,
+    output: result.output,
+    durationMs: result.durationMs
+  };
 }
 async function getUncommittedFilesImpl(workdir) {
   try {
-    const proc = _reviewRunnerDeps.spawn({
+    const proc = Bun.spawn({
       cmd: ["git", "diff", "--name-only", "HEAD"],
       cwd: workdir,
       stdout: "pipe",
@@ -25348,7 +25417,7 @@ async function getUncommittedFilesImpl(workdir) {
     return [];
   }
 }
-async function runReview(config2, workdir, executionConfig, qualityCommands, storyId, storyGitRef, story, modelResolver, naxConfig) {
+async function runReview(config2, workdir, executionConfig, qualityCommands, storyId, storyGitRef, story, modelResolver, naxConfig, retrySkipChecks) {
   const startTime = Date.now();
   const logger = getSafeLogger();
   const checks3 = [];
@@ -25388,6 +25457,12 @@ Stage and commit these files before running review.`
     };
   }
   for (const checkName of config2.checks) {
+    if (retrySkipChecks?.has(checkName)) {
+      getSafeLogger()?.debug("review", `Skipping ${checkName} check (already passed in previous review pass)`, {
+        storyId
+      });
+      continue;
+    }
     if (checkName === "semantic") {
       const semanticStory = {
         id: storyId ?? "",
@@ -25416,7 +25491,7 @@ Stage and commit these files before running review.`
       getSafeLogger()?.warn("review", `Skipping ${checkName} check (command not configured or disabled)`);
       continue;
     }
-    const result = await runCheck(checkName, command, workdir);
+    const result = await runCheck(checkName, command, workdir, storyId);
     checks3.push(result);
     if (!result.success && !firstFailure) {
       firstFailure = `${checkName} failed (exit code ${result.exitCode})`;
@@ -25433,9 +25508,10 @@ Stage and commit these files before running review.`
     failureReason: firstFailure
   };
 }
-var _reviewSemanticDeps, _reviewRunnerDeps, REVIEW_CHECK_TIMEOUT_MS = 120000, SIGKILL_GRACE_PERIOD_MS2 = 5000, _reviewGitDeps;
-var init_runner2 = __esm(() => {
+var _reviewSemanticDeps, _reviewRunnerDeps, _reviewGitDeps;
+var init_runner3 = __esm(() => {
   init_logger2();
+  init_quality();
   init_git();
   init_language_commands();
   init_semantic();
@@ -25443,7 +25519,6 @@ var init_runner2 = __esm(() => {
     runSemanticReview
   };
   _reviewRunnerDeps = {
-    spawn: spawn3,
     file: Bun.file,
     which: Bun.which
   };
@@ -25483,9 +25558,9 @@ async function getChangedFiles(workdir, baseRef) {
 }
 
 class ReviewOrchestrator {
-  async review(reviewConfig, workdir, executionConfig, plugins, storyGitRef, scopePrefix, qualityCommands, storyId, story, modelResolver, naxConfig) {
+  async review(reviewConfig, workdir, executionConfig, plugins, storyGitRef, scopePrefix, qualityCommands, storyId, story, modelResolver, naxConfig, retrySkipChecks) {
     const logger = getSafeLogger();
-    const builtIn = await runReview(reviewConfig, workdir, executionConfig, qualityCommands, storyId, storyGitRef, story, modelResolver, naxConfig);
+    const builtIn = await runReview(reviewConfig, workdir, executionConfig, qualityCommands, storyId, storyGitRef, story, modelResolver, naxConfig, retrySkipChecks);
     if (!builtIn.success) {
       return { builtIn, success: false, failureReason: builtIn.failureReason, pluginFailed: false };
     }
@@ -25550,7 +25625,7 @@ class ReviewOrchestrator {
 var _orchestratorDeps, reviewOrchestrator;
 var init_orchestrator = __esm(() => {
   init_logger2();
-  init_runner2();
+  init_runner3();
   _orchestratorDeps = { spawn: spawn4 };
   reviewOrchestrator = new ReviewOrchestrator;
 });
@@ -25579,12 +25654,14 @@ var init_review = __esm(() => {
       const agentResolver = ctx.agentGetFn ?? getAgent;
       const agentName = effectiveConfig.autoMode?.defaultAgent;
       const modelResolver = (_tier) => agentName ? agentResolver(agentName) ?? null : null;
+      const retrySkipChecks = ctx.retrySkipChecks;
+      ctx.retrySkipChecks = undefined;
       const result = await reviewOrchestrator.review(effectiveConfig.review, effectiveWorkdir, effectiveConfig.execution, ctx.plugins, ctx.storyGitRef, ctx.story.workdir, effectiveConfig.quality?.commands, ctx.story.id, {
         id: ctx.story.id,
         title: ctx.story.title,
         description: ctx.story.description,
         acceptanceCriteria: ctx.story.acceptanceCriteria
-      }, modelResolver, ctx.config);
+      }, modelResolver, ctx.config, retrySkipChecks);
       ctx.reviewResult = result.builtIn;
       if (!result.success) {
         const pluginFindings = result.builtIn.pluginReviewers?.flatMap((pr) => pr.findings ?? []) ?? [];
@@ -25626,17 +25703,6 @@ var init_review = __esm(() => {
 
 // src/pipeline/stages/autofix.ts
 import { join as join17 } from "path";
-async function runCommand(cmd, cwd) {
-  const parts = cmd.split(/\s+/);
-  const proc = Bun.spawn(parts, { cwd, stdout: "pipe", stderr: "pipe" });
-  const [exitCode, stdout, stderr] = await Promise.all([
-    proc.exited,
-    new Response(proc.stdout).text(),
-    new Response(proc.stderr).text()
-  ]);
-  return { exitCode, output: `${stdout}
-${stderr}` };
-}
 async function recheckReview(ctx) {
   const { reviewStage: reviewStage2 } = await Promise.resolve().then(() => (init_review(), exports_review));
   if (!reviewStage2.enabled(ctx))
@@ -25672,20 +25738,35 @@ Commit your fixes when done.${scopeConstraint}`;
 async function runAgentRectification(ctx) {
   const logger = getLogger();
   const effectiveConfig = ctx.effectiveConfig ?? ctx.config;
-  const maxAttempts = effectiveConfig.quality.autofix?.maxAttempts ?? 2;
+  const maxPerCycle = effectiveConfig.quality.autofix?.maxAttempts ?? 2;
+  const maxTotal = effectiveConfig.quality.autofix?.maxTotalAttempts ?? 10;
+  const consumed = ctx.autofixAttempt ?? 0;
   const failedChecks = collectFailedChecks(ctx);
   if (failedChecks.length === 0) {
     logger.debug("autofix", "No failed checks found \u2014 skipping agent rectification", { storyId: ctx.story.id });
     return false;
   }
+  if (consumed >= maxTotal) {
+    logger.warn("autofix", "Global autofix budget exhausted \u2014 escalating", {
+      storyId: ctx.story.id,
+      totalAttempts: consumed,
+      maxTotalAttempts: maxTotal
+    });
+    return false;
+  }
+  const remainingBudget = maxTotal - consumed;
+  const maxAttempts = Math.min(maxPerCycle, remainingBudget);
   logger.info("autofix", "Starting agent rectification for review failures", {
     storyId: ctx.story.id,
     failedChecks: failedChecks.map((c) => c.check),
-    maxAttempts
+    maxAttempts,
+    totalUsed: consumed,
+    maxTotalAttempts: maxTotal
   });
   const agentGetFn = ctx.agentGetFn ?? _autofixDeps.getAgent;
   for (let attempt = 1;attempt <= maxAttempts; attempt++) {
-    logger.info("autofix", `Agent rectification attempt ${attempt}/${maxAttempts}`, { storyId: ctx.story.id });
+    ctx.autofixAttempt = consumed + attempt;
+    logger.info("autofix", `Agent rectification attempt ${ctx.autofixAttempt}/${maxTotal}`, { storyId: ctx.story.id });
     const agent = agentGetFn(ctx.config.autoMode.defaultAgent);
     if (!agent) {
       logger.error("autofix", "Agent not found \u2014 cannot run agent rectification", { storyId: ctx.story.id });
@@ -25732,6 +25813,7 @@ var init_autofix = __esm(() => {
   init_config();
   init_loader();
   init_logger2();
+  init_quality();
   init_event_bus();
   autofixStage = {
     name: "autofix",
@@ -25768,7 +25850,12 @@ var init_autofix = __esm(() => {
       if (hasLintFailure && (lintFixCmd || formatFixCmd)) {
         if (lintFixCmd) {
           pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: lintFixCmd });
-          const lintResult = await _autofixDeps.runCommand(lintFixCmd, effectiveWorkdir);
+          const lintResult = await _autofixDeps.runQualityCommand({
+            commandName: "lintFix",
+            command: lintFixCmd,
+            workdir: effectiveWorkdir,
+            storyId: ctx.story.id
+          });
           logger.debug("autofix", `lintFix exit=${lintResult.exitCode}`, { storyId: ctx.story.id, command: lintFixCmd });
           if (lintResult.exitCode !== 0) {
             logger.warn("autofix", "lintFix command failed \u2014 may not have fixed all issues", {
@@ -25779,7 +25866,12 @@ var init_autofix = __esm(() => {
         }
         if (formatFixCmd) {
           pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: formatFixCmd });
-          const fmtResult = await _autofixDeps.runCommand(formatFixCmd, effectiveWorkdir);
+          const fmtResult = await _autofixDeps.runQualityCommand({
+            commandName: "formatFix",
+            command: formatFixCmd,
+            workdir: effectiveWorkdir,
+            storyId: ctx.story.id
+          });
           logger.debug("autofix", `formatFix exit=${fmtResult.exitCode}`, {
             storyId: ctx.story.id,
             command: formatFixCmd
@@ -25805,6 +25897,14 @@ var init_autofix = __esm(() => {
       if (agentFixed) {
         if (ctx.reviewResult)
           ctx.reviewResult = { ...ctx.reviewResult, success: true };
+        const passedChecks = (ctx.reviewResult?.checks ?? []).filter((c) => c.success).map((c) => c.check);
+        if (passedChecks.length > 0) {
+          ctx.retrySkipChecks = new Set(passedChecks);
+          logger.debug("autofix", "Skipping already-passed checks on retry", {
+            storyId: ctx.story.id,
+            skippedChecks: passedChecks
+          });
+        }
         logger.info("autofix", "Agent rectification succeeded \u2014 retrying review", { storyId: ctx.story.id });
         return { action: "retry", fromStage: "review" };
       }
@@ -25814,7 +25914,7 @@ var init_autofix = __esm(() => {
   };
   _autofixDeps = {
     getAgent,
-    runCommand,
+    runQualityCommand,
     recheckReview,
     runAgentRectification,
     loadConfigForWorkdir
@@ -25830,8 +25930,8 @@ async function appendProgress(featureDir, storyId, status, message) {
   const timestamp = new Date().toISOString();
   const entry = `[${timestamp}] ${storyId} \u2014 ${status.toUpperCase()} \u2014 ${message}
 `;
-  const file2 = Bun.file(progressPath);
-  const existing = await file2.exists() ? await file2.text() : "";
+  const file3 = Bun.file(progressPath);
+  const existing = await file3.exists() ? await file3.text() : "";
   await Bun.write(progressPath, existing + entry);
 }
 var init_progress = () => {};
@@ -25890,6 +25990,7 @@ var init_completion = __esm(() => {
       await savePRD(ctx.prd, prdPath);
       const updatedCounts = countStories(ctx.prd);
       logger.info("completion", "Progress update", {
+        storyId: ctx.story.id,
         completed: updatedCounts.passed + updatedCounts.failed,
         total: updatedCounts.total,
         passed: updatedCounts.passed,
@@ -26347,7 +26448,7 @@ function deriveTestPatterns(contextFiles) {
 async function detectTestDir(workdir) {
   for (const dir of COMMON_TEST_DIRS) {
     const fullPath = path6.join(workdir, dir);
-    const file2 = Bun.file(path6.join(fullPath, "."));
+    const file3 = Bun.file(path6.join(fullPath, "."));
     try {
       const dirStat = await Bun.file(fullPath).exists();
       const proc = Bun.spawn(["test", "-d", fullPath], { stdout: "pipe", stderr: "pipe" });
@@ -26410,21 +26511,21 @@ function formatTestSummary(files, detail) {
   lines.push("The following tests already exist. DO NOT duplicate this coverage.");
   lines.push("Focus only on testing NEW behavior introduced by this story.");
   lines.push("");
-  for (const file2 of files) {
+  for (const file3 of files) {
     switch (detail) {
       case "names-only":
-        lines.push(`- **${file2.relativePath}** (${file2.testCount} tests)`);
+        lines.push(`- **${file3.relativePath}** (${file3.testCount} tests)`);
         break;
       case "names-and-counts":
-        lines.push(`### ${file2.relativePath} (${file2.testCount} tests)`);
-        for (const desc of file2.describes) {
+        lines.push(`### ${file3.relativePath} (${file3.testCount} tests)`);
+        for (const desc of file3.describes) {
           lines.push(`- ${desc.name} (${desc.tests.length} tests)`);
         }
         lines.push("");
         break;
       case "describe-blocks":
-        lines.push(`### ${file2.relativePath} (${file2.testCount} tests)`);
-        for (const desc of file2.describes) {
+        lines.push(`### ${file3.relativePath} (${file3.testCount} tests)`);
+        for (const desc of file3.describes) {
           lines.push(`- **${desc.name}** (${desc.tests.length} tests)`);
           for (const test of desc.tests) {
             lines.push(`  - ${test}`);
@@ -26553,8 +26654,8 @@ function renderErrorSection(sections, byType) {
         const fileList = match[1].split(",").map((f) => f.trim());
         sections.push(`**Required files:**
 `);
-        for (const file2 of fileList) {
-          sections.push(`- \`${file2}\``);
+        for (const file3 of fileList) {
+          sections.push(`- \`${file3}\``);
         }
         sections.push(`
 `);
@@ -26748,24 +26849,24 @@ async function addFileElements(elements, storyContext, story) {
   for (const relativeFilePath of filesToLoad) {
     try {
       const absolutePath = path7.resolve(workdir, relativeFilePath);
-      const file2 = Bun.file(absolutePath);
-      if (!await file2.exists()) {
+      const file3 = Bun.file(absolutePath);
+      if (!await file3.exists()) {
         const logger = getLogger();
         logger.warn("context", "Relevant file not found", { filePath: relativeFilePath, storyId: story.id });
         continue;
       }
-      if (file2.size > MAX_FILE_SIZE_BYTES) {
+      if (file3.size > MAX_FILE_SIZE_BYTES) {
         const logger = getLogger();
         logger.warn("context", "File too large for inline \u2014 using path-only", {
           filePath: relativeFilePath,
-          sizeKB: Math.round(file2.size / 1024),
+          sizeKB: Math.round(file3.size / 1024),
           maxKB: 10,
           storyId: story.id
         });
-        elements.push(createFileContext(relativeFilePath, `_File too large to inline (${Math.round(file2.size / 1024)}KB). Path: \`${relativeFilePath}\` \u2014 read it directly if needed._`, 5));
+        elements.push(createFileContext(relativeFilePath, `_File too large to inline (${Math.round(file3.size / 1024)}KB). Path: \`${relativeFilePath}\` \u2014 read it directly if needed._`, 5));
         continue;
       }
-      const content = await file2.text();
+      const content = await file3.text();
       const ext = path7.extname(relativeFilePath).slice(1) || "txt";
       elements.push(createFileContext(relativeFilePath, `\`\`\`${ext}
 // File: ${relativeFilePath}
@@ -26818,10 +26919,10 @@ function hookCtx(feature, opts) {
 }
 async function loadPackageContextMd(packageWorkdir) {
   const contextPath = `${packageWorkdir}/.nax/context.md`;
-  const file2 = Bun.file(contextPath);
-  if (!await file2.exists())
+  const file3 = Bun.file(contextPath);
+  if (!await file3.exists())
     return null;
-  return file2.text();
+  return file3.text();
 }
 async function buildStoryContextFull(prd, story, config2, packageWorkdir) {
   try {
@@ -27073,11 +27174,11 @@ async function verifyTestWriterIsolation(workdir, beforeRef, allowedPaths = ["sr
   const sourceFiles = changed.filter((f) => isSourceFile(f) && !isTestFile(f));
   const softViolations = [];
   const violations = [];
-  for (const file2 of sourceFiles) {
-    if (matchesAllowedPath(file2, allowedPaths)) {
-      softViolations.push(file2);
+  for (const file3 of sourceFiles) {
+    if (matchesAllowedPath(file3, allowedPaths)) {
+      softViolations.push(file3);
     } else {
-      violations.push(file2);
+      violations.push(file3);
     }
   }
   return {
@@ -27493,9 +27594,9 @@ async function verifyAssets(workingDirectory, expectedFiles) {
   if (!expectedFiles || expectedFiles.length === 0)
     return { success: true, missingFiles: [] };
   const missingFiles = [];
-  for (const file2 of expectedFiles) {
-    if (!existsSync16(join22(workingDirectory, file2)))
-      missingFiles.push(file2);
+  for (const file3 of expectedFiles) {
+    if (!existsSync16(join22(workingDirectory, file3)))
+      missingFiles.push(file3);
   }
   if (missingFiles.length > 0) {
     return {
@@ -27601,7 +27702,7 @@ function createRectificationPrompt(failures, story, config2) {
   const maxChars = config2?.maxFailureSummaryChars ?? 2000;
   const failureSummary = formatFailureSummary(failures, maxChars);
   const failingFiles = Array.from(new Set(failures.map((f) => f.file)));
-  const testCommands = failingFiles.map((file2) => `  bun test ${file2}`).join(`
+  const testCommands = failingFiles.map((file3) => `  bun test ${file3}`).join(`
 `);
   return `# Rectification Required
 
@@ -27648,7 +27749,7 @@ function createEscalatedRectificationPrompt(failures, story, priorAttempts, orig
   const maxChars = config2?.maxFailureSummaryChars ?? 2000;
   const failureSummary = formatFailureSummary(failures, maxChars);
   const failingFiles = Array.from(new Set(failures.map((f) => f.file)));
-  const testCommands = failingFiles.map((file2) => `  bun test ${file2}`).join(`
+  const testCommands = failingFiles.map((file3) => `  bun test ${file3}`).join(`
 `);
   const failingTestNames = failures.map((f) => f.testName);
   let failingTestsSection = "";
@@ -28359,12 +28460,12 @@ async function loadOverride(role, workdir, config2) {
     return null;
   }
   const absolutePath = join23(workdir, overridePath);
-  const file2 = Bun.file(absolutePath);
-  if (!await file2.exists()) {
+  const file3 = Bun.file(absolutePath);
+  if (!await file3.exists()) {
     return null;
   }
   try {
-    return await file2.text();
+    return await file3.text();
   } catch (err) {
     throw new Error(`Cannot read prompt override for role "${role}" at "${absolutePath}": ${err instanceof Error ? err.message : String(err)}`);
   }
@@ -28486,9 +28587,9 @@ ${this._contextMd}
     }
     if (this._overridePath) {
       try {
-        const file2 = Bun.file(this._overridePath);
-        if (await file2.exists()) {
-          return await file2.text();
+        const file3 = Bun.file(this._overridePath);
+        if (await file3.exists()) {
+          return await file3.text();
         }
       } catch {}
     }
@@ -28824,14 +28925,14 @@ async function readVerdict(workdir) {
   const logger = getLogger();
   const verdictPath = path9.join(workdir, VERDICT_FILE);
   try {
-    const file2 = Bun.file(verdictPath);
-    const exists = await file2.exists();
+    const file3 = Bun.file(verdictPath);
+    const exists = await file3.exists();
     if (!exists) {
       return null;
     }
     let rawText;
     try {
-      rawText = await file2.text();
+      rawText = await file3.text();
     } catch (readErr) {
       logger.warn("tdd", "Failed to read verifier verdict file", {
         path: verdictPath,
@@ -29756,8 +29857,8 @@ async function readQueueFile(workdir) {
   const processingPath = path10.join(workdir, ".queue.txt.processing");
   const logger = getSafeLogger4();
   try {
-    const file2 = Bun.file(queuePath);
-    const exists = await file2.exists();
+    const file3 = Bun.file(queuePath);
+    const exists = await file3.exists();
     if (!exists) {
       return [];
     }
@@ -29781,8 +29882,8 @@ async function clearQueueFile(workdir) {
   const processingPath = path10.join(workdir, ".queue.txt.processing");
   const logger = getSafeLogger4();
   try {
-    const file2 = Bun.file(processingPath);
-    const exists = await file2.exists();
+    const file3 = Bun.file(processingPath);
+    const exists = await file3.exists();
     if (exists) {
       await Bun.spawn(["rm", processingPath], { stdout: "pipe" }).exited;
     }
@@ -30378,8 +30479,8 @@ async function importGrepFallback(sourceFiles, workdir, testFilePatterns) {
   const testFilePaths = [];
   for (const pattern of testFilePatterns) {
     const glob = _bunDeps.glob(pattern);
-    for await (const file2 of glob.scan(workdir)) {
-      testFilePaths.push(`${workdir}/${file2}`);
+    for await (const file3 of glob.scan(workdir)) {
+      testFilePaths.push(`${workdir}/${file3}`);
     }
   }
   const matched = [];
@@ -31289,8 +31390,8 @@ function generateContextTemplate(scan) {
     lines.push(`## Project Structure
 `);
     lines.push("```");
-    for (const file2 of scan.fileTree.slice(0, 20)) {
-      lines.push(file2);
+    for (const file3 of scan.fileTree.slice(0, 20)) {
+      lines.push(file3);
     }
     if (scan.fileTree.length > 20) {
       lines.push(`... and ${scan.fileTree.length - 20} more files`);
@@ -32109,8 +32210,8 @@ async function checkStaleLock(workdir) {
     };
   }
   try {
-    const file2 = Bun.file(lockPath);
-    const content = await file2.text();
+    const file3 = Bun.file(lockPath);
+    const content = await file3.text();
     const lockData = JSON.parse(content);
     let lockTimeMs;
     if (lockData.timestamp) {
@@ -32396,8 +32497,8 @@ async function checkGitignoreCoversNax(workdir) {
       message: ".gitignore not found"
     };
   }
-  const file2 = Bun.file(gitignorePath);
-  const content = await file2.text();
+  const file3 = Bun.file(gitignorePath);
+  const content = await file3.text();
   const patterns = [
     "nax.lock",
     ".nax/**/runs/",
@@ -33081,14 +33182,14 @@ async function fireHook(config2, event, ctx, workdir) {
   }
 }
 var DEFAULT_TIMEOUT = 5000;
-var init_runner3 = __esm(() => {
+var init_runner4 = __esm(() => {
   init_logger2();
   init_json_file();
 });
 
 // src/hooks/index.ts
 var init_hooks = __esm(() => {
-  init_runner3();
+  init_runner4();
 });
 
 // src/execution/crash-heartbeat.ts
@@ -33982,7 +34083,7 @@ async function handleRunCompletion(options) {
 }
 var _runCompletionDeps;
 var init_run_completion = __esm(() => {
-  init_runner3();
+  init_runner4();
   init_logger2();
   init_metrics();
   init_event_bus();
@@ -35101,13 +35202,23 @@ __export(exports_parallel_worker, {
 async function executeStoryInWorktree(story, worktreePath, context, routing, eventEmitter) {
   const logger = getSafeLogger();
   try {
+    let storyGitRef;
+    if (story.storyGitRef && await isGitRefValid(worktreePath, story.storyGitRef)) {
+      storyGitRef = story.storyGitRef;
+    } else {
+      storyGitRef = await captureGitRef(worktreePath);
+      if (storyGitRef) {
+        story.storyGitRef = storyGitRef;
+      }
+    }
     const pipelineContext = {
       ...context,
       effectiveConfig: context.effectiveConfig ?? context.config,
       story,
       stories: [story],
       workdir: worktreePath,
-      routing
+      routing,
+      storyGitRef: storyGitRef ?? undefined
     };
     logger?.debug("parallel", "Executing story in worktree", {
       storyId: story.id,
@@ -35183,6 +35294,7 @@ var init_parallel_worker = __esm(() => {
   init_runner();
   init_stages();
   init_routing();
+  init_git();
 });
 
 // src/worktree/manager.ts
@@ -35613,6 +35725,16 @@ __export(exports_merge_conflict_rectify, {
   rectifyConflictedStory: () => rectifyConflictedStory
 });
 import path15 from "path";
+async function closeStaleAcpSession(worktreePath, sessionName) {
+  const logger = getSafeLogger();
+  try {
+    const { typedSpawn: typedSpawn2 } = await Promise.resolve().then(() => (init_bun_deps(), exports_bun_deps));
+    const cmd = ["acpx", "--cwd", worktreePath, "claude", "sessions", "close", sessionName];
+    logger?.debug("parallel", "Closing stale ACP session before rectification", { sessionName });
+    const proc = typedSpawn2(cmd, { stdout: "pipe", stderr: "pipe" });
+    await proc.exited;
+  } catch {}
+}
 async function rectifyConflictedStory(options) {
   const { storyId, workdir, config: config2, hooks, pluginRegistry, prd, eventEmitter, agentGetFn } = options;
   const logger = getSafeLogger();
@@ -35630,6 +35752,9 @@ async function rectifyConflictedStory(options) {
     } catch {}
     await worktreeManager.create(workdir, storyId);
     const worktreePath = path15.join(workdir, ".nax-wt", storyId);
+    const { buildSessionName: buildSessionName2 } = await Promise.resolve().then(() => (init_adapter2(), exports_adapter));
+    const staleSessionName = buildSessionName2(worktreePath, prd.feature, storyId);
+    await closeStaleAcpSession(worktreePath, staleSessionName);
     const story = prd.userStories.find((s) => s.id === storyId);
     if (!story) {
       return { success: false, storyId, cost: 0, finalConflict: false, pipelineFailure: true };
@@ -35707,9 +35832,47 @@ async function runParallelBatch(options) {
     }
     worktreePaths.set(story.id, path16.join(workdir, ".nax-wt", story.id));
   }
-  const workerResult = await _parallelBatchDeps.executeParallelBatch(stories, workdir, config2, pipelineContext, worktreePaths, maxConcurrency, eventEmitter);
+  const rootConfigPath = path16.join(workdir, ".nax", "config.json");
+  const storyEffectiveConfigs = new Map;
+  for (const story of stories) {
+    if (story.workdir) {
+      const effectiveConfig = await loadConfigForWorkdir(rootConfigPath, story.workdir);
+      storyEffectiveConfigs.set(story.id, effectiveConfig);
+    }
+  }
+  const workerResult = await _parallelBatchDeps.executeParallelBatch(stories, workdir, config2, pipelineContext, worktreePaths, maxConcurrency, eventEmitter, storyEffectiveConfigs.size > 0 ? storyEffectiveConfigs : undefined);
   const batchEndMs = Date.now();
-  const completed = workerResult.merged;
+  const completed = [];
+  if (workerResult.pipelinePassed.length > 0) {
+    const mergeEngine = await _parallelBatchDeps.createMergeEngine(worktreeManager);
+    const successfulIds = workerResult.pipelinePassed.map((s) => s.id);
+    const deps = {};
+    for (const s of stories)
+      deps[s.id] = s.dependencies ?? [];
+    const mergeResults = await mergeEngine.mergeAll(workdir, successfulIds, deps);
+    for (const mergeResult of mergeResults) {
+      const story = workerResult.pipelinePassed.find((s) => s.id === mergeResult.storyId);
+      if (!story)
+        continue;
+      if (mergeResult.success) {
+        completed.push(story);
+        workerResult.merged.push(story);
+        logger?.info("parallel-batch", "Story merged successfully", {
+          storyId: mergeResult.storyId
+        });
+      } else {
+        workerResult.mergeConflicts.push({
+          storyId: mergeResult.storyId,
+          conflictFiles: mergeResult.conflictFiles || [],
+          originalCost: workerResult.storyCosts.get(mergeResult.storyId) ?? 0
+        });
+        logger?.warn("parallel-batch", "Merge conflict \u2014 will attempt rectification", {
+          storyId: mergeResult.storyId,
+          conflictFiles: mergeResult.conflictFiles
+        });
+      }
+    }
+  }
   const failed = workerResult.failed.map((f) => ({
     story: f.story,
     pipelineResult: f.pipelineResult ?? {
@@ -35767,11 +35930,12 @@ async function runParallelBatch(options) {
 }
 var _parallelBatchDeps;
 var init_parallel_batch = __esm(() => {
+  init_loader();
   init_logger2();
   _parallelBatchDeps = {
-    executeParallelBatch: async (_stories, _projectRoot, _config, _context, _worktreePaths, _maxConcurrency, _eventEmitter) => {
+    executeParallelBatch: async (_stories, _projectRoot, _config, _context, _worktreePaths, _maxConcurrency, _eventEmitter, _storyEffectiveConfigs) => {
       const { executeParallelBatch: executeParallelBatch2 } = await Promise.resolve().then(() => (init_parallel_worker(), exports_parallel_worker));
-      return executeParallelBatch2(_stories, _projectRoot, _config, _context, _worktreePaths, _maxConcurrency, _eventEmitter);
+      return executeParallelBatch2(_stories, _projectRoot, _config, _context, _worktreePaths, _maxConcurrency, _eventEmitter, _storyEffectiveConfigs);
     },
     createWorktreeManager: async () => {
       const { WorktreeManager: WorktreeManager2 } = await Promise.resolve().then(() => (init_manager(), exports_manager));
@@ -36260,15 +36424,15 @@ var _detectorDeps, WEB_DEPS, API_DEPS;
 var init_detector = __esm(() => {
   _detectorDeps = {
     async fileExists(path17) {
-      const file2 = Bun.file(path17);
-      return file2.exists();
+      const file3 = Bun.file(path17);
+      return file3.exists();
     },
     async readJson(path17) {
       try {
-        const file2 = Bun.file(path17);
-        if (!await file2.exists())
+        const file3 = Bun.file(path17);
+        if (!await file3.exists())
           return null;
-        const text = await file2.text();
+        const text = await file3.text();
         return JSON.parse(text);
       } catch {
         return null;
@@ -36723,7 +36887,7 @@ var init_run_initialization = __esm(() => {
   init_errors3();
   init_logger2();
   init_prd();
-  init_runner2();
+  init_runner3();
   init_git();
   _reconcileDeps = {
     getAgent,
@@ -65896,7 +66060,7 @@ var require_stack_utils = __commonJS((exports, module) => {
       const evalFile = match[4];
       const evalLine = Number(match[5]);
       const evalCol = Number(match[6]);
-      let file2 = match[7];
+      let file3 = match[7];
       const lnum = match[8];
       const col = match[9];
       const native = match[10] === "native";
@@ -65909,17 +66073,17 @@ var require_stack_utils = __commonJS((exports, module) => {
       if (col) {
         res.column = Number(col);
       }
-      if (closeParen && file2) {
+      if (closeParen && file3) {
         let closes = 0;
-        for (let i = file2.length - 1;i > 0; i--) {
-          if (file2.charAt(i) === ")") {
+        for (let i = file3.length - 1;i > 0; i--) {
+          if (file3.charAt(i) === ")") {
             closes++;
-          } else if (file2.charAt(i) === "(" && file2.charAt(i - 1) === " ") {
+          } else if (file3.charAt(i) === "(" && file3.charAt(i - 1) === " ") {
             closes--;
-            if (closes === -1 && file2.charAt(i - 1) === " ") {
-              const before2 = file2.slice(0, i - 1);
-              const after2 = file2.slice(i + 1);
-              file2 = after2;
+            if (closes === -1 && file3.charAt(i - 1) === " ") {
+              const before2 = file3.slice(0, i - 1);
+              const after2 = file3.slice(i + 1);
+              file3 = after2;
               fname += ` (${before2}`;
               break;
             }
@@ -65933,7 +66097,7 @@ var require_stack_utils = __commonJS((exports, module) => {
           method2 = methodMatch[2];
         }
       }
-      setFile(res, file2, this._cwd);
+      setFile(res, file3, this._cwd);
       if (ctor) {
         Object.defineProperty(res, "constructor", {
           value: true,
@@ -68377,8 +68541,8 @@ async function detectNode(workdir) {
   if (!existsSync9(pkgPath))
     return null;
   try {
-    const file2 = Bun.file(pkgPath);
-    const pkg = await file2.json();
+    const file3 = Bun.file(pkgPath);
+    const pkg = await file3.json();
     const allDeps = { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
     const notable = [
       ...new Set(Object.keys(allDeps).filter((dep) => NOTABLE_NODE_DEPS.some((kw) => dep === kw || dep.startsWith(`${kw}/`) || dep.includes(kw))))
@@ -68454,8 +68618,8 @@ async function detectPhp(workdir) {
   if (!existsSync9(composerPath))
     return null;
   try {
-    const file2 = Bun.file(composerPath);
-    const composer = await file2.json();
+    const file3 = Bun.file(composerPath);
+    const composer = await file3.json();
     const deps = Object.keys({ ...composer.require ?? {}, ...composer["require-dev"] ?? {} }).filter((d) => d !== "php").map((d) => d.split("/").pop() ?? d).slice(0, 10);
     return { name: composer.name, lang: "PHP", dependencies: deps };
   } catch {
@@ -69970,16 +70134,16 @@ async function runsListCommand(options) {
     return;
   }
   logger.info("cli", `Runs for ${feature}`, { count: files.length });
-  for (const file2 of files.sort().reverse()) {
-    const logPath = join15(runsDir, file2);
+  for (const file3 of files.sort().reverse()) {
+    const logPath = join15(runsDir, file3);
     const entries = await parseRunLog(logPath);
     const startEvent = entries.find((e) => e.message === "run.start");
     const completeEvent = entries.find((e) => e.message === "run.complete");
     if (!startEvent) {
-      logger.warn("cli", "Run log missing run.start event", { file: file2 });
+      logger.warn("cli", "Run log missing run.start event", { file: file3 });
       continue;
     }
-    const runId = startEvent.data?.runId || file2.replace(".jsonl", "");
+    const runId = startEvent.data?.runId || file3.replace(".jsonl", "");
     const startedAt = startEvent.timestamp;
     const status = completeEvent ? "completed" : "in-progress";
     const totalCost = completeEvent?.data?.totalCost || 0;
@@ -71500,8 +71664,8 @@ async function selectRunFile(runsDir) {
   return join39(runsDir, files[0]);
 }
 async function extractRunSummary(filePath) {
-  const file2 = Bun.file(filePath);
-  const content = await file2.text();
+  const file3 = Bun.file(filePath);
+  const content = await file3.text();
   const lines = content.trim().split(`
 `);
   let total = 0;
@@ -71581,10 +71745,10 @@ Runs:
 `));
   console.log(source_default.gray("  Timestamp            Stories  Duration  Cost      Status"));
   console.log(source_default.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-  for (const file2 of files) {
-    const filePath = join40(runsDir, file2);
+  for (const file3 of files) {
+    const filePath = join40(runsDir, file3);
     const summary = await extractRunSummary(filePath);
-    const timestamp = file2.replace(".jsonl", "");
+    const timestamp = file3.replace(".jsonl", "");
     const stories = summary ? `${summary.passed}/${summary.total}` : "?/?";
     const duration3 = summary ? formatDuration(summary.durationMs) : "?";
     const cost = summary ? `$${summary.totalCost.toFixed(4)}` : "$?.????";
@@ -71594,8 +71758,8 @@ Runs:
   console.log();
 }
 async function displayLogs(filePath, options) {
-  const file2 = Bun.file(filePath);
-  const content = await file2.text();
+  const file3 = Bun.file(filePath);
+  const content = await file3.text();
   const lines = content.trim().split(`
 `);
   const mode = options.json ? "json" : "normal";
@@ -71622,8 +71786,8 @@ async function displayLogs(filePath, options) {
 }
 async function followLogs(filePath, options) {
   const mode = options.json ? "json" : "normal";
-  const file2 = Bun.file(filePath);
-  const content = await file2.text();
+  const file3 = Bun.file(filePath);
+  const content = await file3.text();
   const lines = content.trim().split(`
 `);
   for (const line of lines) {
@@ -78552,8 +78716,8 @@ async function writeQueueCommand(queueFilePath, command) {
       throw new Error(`Unhandled queue command: ${_exhaustive}`);
     }
   }
-  const file2 = Bun.file(queueFilePath);
-  const existingContent = await file2.text().catch(() => "");
+  const file3 = Bun.file(queueFilePath);
+  const existingContent = await file3.text().catch(() => "");
   const newContent = existingContent ? `${existingContent.trimEnd()}
 ${commandLine}
 ` : `${commandLine}

package/package.json

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