@nathapp/nax 0.46.0 → 0.46.2

package/dist/nax.js

@@ -3458,7 +3458,46 @@ var init_complete = __esm(() => {
   };
 });
 
-// src/agents/claude/cost.ts
+// src/agents/cost/pricing.ts
+var COST_RATES, MODEL_PRICING;
+var init_pricing = __esm(() => {
+  COST_RATES = {
+    fast: {
+      inputPer1M: 0.8,
+      outputPer1M: 4
+    },
+    balanced: {
+      inputPer1M: 3,
+      outputPer1M: 15
+    },
+    powerful: {
+      inputPer1M: 15,
+      outputPer1M: 75
+    }
+  };
+  MODEL_PRICING = {
+    sonnet: { input: 3, output: 15 },
+    haiku: { input: 0.8, output: 4, cacheRead: 0.1, cacheCreation: 1 },
+    opus: { input: 15, output: 75 },
+    "claude-sonnet-4": { input: 3, output: 15 },
+    "claude-sonnet-4-5": { input: 3, output: 15 },
+    "claude-sonnet-4-6": { input: 3, output: 15 },
+    "claude-haiku": { input: 0.8, output: 4, cacheRead: 0.1, cacheCreation: 1 },
+    "claude-haiku-4-5": { input: 0.8, output: 4, cacheRead: 0.1, cacheCreation: 1 },
+    "claude-opus": { input: 15, output: 75 },
+    "claude-opus-4": { input: 15, output: 75 },
+    "claude-opus-4-6": { input: 15, output: 75 },
+    "gpt-4.1": { input: 10, output: 30 },
+    "gpt-4": { input: 30, output: 60 },
+    "gpt-3.5-turbo": { input: 0.5, output: 1.5 },
+    "gemini-2.5-pro": { input: 0.075, output: 0.3 },
+    "gemini-2-pro": { input: 0.075, output: 0.3 },
+    codex: { input: 0.02, output: 0.06 },
+    "code-davinci-002": { input: 0.02, output: 0.06 }
+  };
+});
+
+// src/agents/cost/parse.ts
 function parseTokenUsage(output) {
   try {
     const jsonMatch = output.match(/\{[^}]*"usage"\s*:\s*\{[^}]*"input_tokens"\s*:\s*(\d+)[^}]*"output_tokens"\s*:\s*(\d+)[^}]*\}[^}]*\}/);
@@ -3502,6 +3541,8 @@ function parseTokenUsage(output) {
   }
   return null;
 }
+
+// src/agents/cost/calculate.ts
 function estimateCost(modelTier, inputTokens, outputTokens, customRates) {
   const rates = customRates ?? COST_RATES[modelTier];
   const inputCost = inputTokens / 1e6 * rates.inputPer1M;
@@ -3543,25 +3584,45 @@ function formatCostWithConfidence(estimate) {
       return `~${formattedCost} (duration-based)`;
   }
 }
-var COST_RATES;
+function estimateCostFromTokenUsage(usage, model) {
+  const pricing = MODEL_PRICING[model];
+  if (!pricing) {
+    const fallbackInputRate = 3 / 1e6;
+    const fallbackOutputRate = 15 / 1e6;
+    const inputCost2 = (usage.input_tokens ?? 0) * fallbackInputRate;
+    const outputCost2 = (usage.output_tokens ?? 0) * fallbackOutputRate;
+    const cacheReadCost2 = (usage.cache_read_input_tokens ?? 0) * (0.5 / 1e6);
+    const cacheCreationCost2 = (usage.cache_creation_input_tokens ?? 0) * (2 / 1e6);
+    return inputCost2 + outputCost2 + cacheReadCost2 + cacheCreationCost2;
+  }
+  const inputRate = pricing.input / 1e6;
+  const outputRate = pricing.output / 1e6;
+  const cacheReadRate = (pricing.cacheRead ?? pricing.input * 0.1) / 1e6;
+  const cacheCreationRate = (pricing.cacheCreation ?? pricing.input * 0.33) / 1e6;
+  const inputCost = (usage.input_tokens ?? 0) * inputRate;
+  const outputCost = (usage.output_tokens ?? 0) * outputRate;
+  const cacheReadCost = (usage.cache_read_input_tokens ?? 0) * cacheReadRate;
+  const cacheCreationCost = (usage.cache_creation_input_tokens ?? 0) * cacheCreationRate;
+  return inputCost + outputCost + cacheReadCost + cacheCreationCost;
+}
+var init_calculate = __esm(() => {
+  init_pricing();
+});
+
+// src/agents/cost/index.ts
 var init_cost = __esm(() => {
-  COST_RATES = {
-    fast: {
-      inputPer1M: 0.8,
-      outputPer1M: 4
-    },
-    balanced: {
-      inputPer1M: 3,
-      outputPer1M: 15
-    },
-    powerful: {
-      inputPer1M: 15,
-      outputPer1M: 75
-    }
-  };
+  init_pricing();
+  init_calculate();
+});
+
+// src/agents/claude/cost.ts
+var init_cost2 = __esm(() => {
+  init_cost();
 });
 
 // src/agents/claude/execution.ts
+import { homedir } from "os";
+import { isAbsolute } from "path";
 function buildCommand(binary, options) {
   const model = options.modelDef.model;
   const { skipPermissions } = resolvePermissions(options.config, options.pipelineStage ?? "run");
@@ -3570,12 +3631,19 @@ function buildCommand(binary, options) {
 }
 function buildAllowedEnv(options) {
   const allowed = {};
-  const essentialVars = ["PATH", "HOME", "TMPDIR", "NODE_ENV", "USER", "LOGNAME"];
+  const essentialVars = ["PATH", "TMPDIR", "NODE_ENV", "USER", "LOGNAME"];
   for (const varName of essentialVars) {
     if (process.env[varName]) {
       allowed[varName] = process.env[varName];
     }
   }
+  const rawHome = process.env.HOME ?? "";
+  const safeHome = rawHome && isAbsolute(rawHome) ? rawHome : homedir();
+  if (rawHome !== safeHome) {
+    const logger = getLogger();
+    logger.warn("env", `HOME env is not absolute ("${rawHome}"), falling back to os.homedir(): ${safeHome}`);
+  }
+  allowed.HOME = safeHome;
   const apiKeyVars = ["ANTHROPIC_API_KEY", "OPENAI_API_KEY"];
   for (const varName of apiKeyVars) {
     if (process.env[varName]) {
@@ -3665,7 +3733,7 @@ async function executeOnce(binary, options, pidRegistry) {
 var MAX_AGENT_OUTPUT_CHARS = 5000, MAX_AGENT_STDERR_CHARS = 1000, SIGKILL_GRACE_PERIOD_MS = 5000, _runOnceDeps;
 var init_execution = __esm(() => {
   init_logger2();
-  init_cost();
+  init_cost2();
   _runOnceDeps = {
     killProc(proc, signal) {
       proc.kill(signal);
@@ -18671,7 +18739,7 @@ Respond with ONLY the TypeScript test code (no markdown code fences, no explanat
     testable: c.testable,
     storyId: c.storyId
   })), null, 2);
-  await _generatorPRDDeps.writeFile(join2(options.workdir, "acceptance-refined.json"), refinedJsonContent);
+  await _generatorPRDDeps.writeFile(join2(options.featureDir, "acceptance-refined.json"), refinedJsonContent);
   return { testCode, criteria };
 }
 function buildStrategyInstructions(strategy, framework) {
@@ -19047,13 +19115,21 @@ function parseAcpxJsonOutput(rawOutput) {
 }
 
 // src/agents/acp/spawn-client.ts
+import { homedir as homedir2 } from "os";
+import { isAbsolute as isAbsolute2 } from "path";
 function buildAllowedEnv2(extraEnv) {
   const allowed = {};
-  const essentialVars = ["PATH", "HOME", "TMPDIR", "NODE_ENV", "USER", "LOGNAME"];
+  const essentialVars = ["PATH", "TMPDIR", "NODE_ENV", "USER", "LOGNAME"];
   for (const varName of essentialVars) {
     if (process.env[varName])
       allowed[varName] = process.env[varName];
   }
+  const rawHome = process.env.HOME ?? "";
+  const safeHome = rawHome && isAbsolute2(rawHome) ? rawHome : homedir2();
+  if (rawHome !== safeHome) {
+    getSafeLogger()?.warn("env", `HOME env is not absolute ("${rawHome}"), falling back to os.homedir(): ${safeHome}`);
+  }
+  allowed.HOME = safeHome;
   const apiKeyVars = ["ANTHROPIC_API_KEY", "OPENAI_API_KEY", "GEMINI_API_KEY", "GOOGLE_API_KEY", "CLAUDE_API_KEY"];
   for (const varName of apiKeyVars) {
     if (process.env[varName])
@@ -19270,44 +19346,8 @@ var init_spawn_client = __esm(() => {
 });
 
 // src/agents/acp/cost.ts
-function estimateCostFromTokenUsage(usage, model) {
-  const pricing = MODEL_PRICING[model];
-  if (!pricing) {
-    const fallbackInputRate = 3 / 1e6;
-    const fallbackOutputRate = 15 / 1e6;
-    const inputCost2 = (usage.input_tokens ?? 0) * fallbackInputRate;
-    const outputCost2 = (usage.output_tokens ?? 0) * fallbackOutputRate;
-    const cacheReadCost2 = (usage.cache_read_input_tokens ?? 0) * (0.5 / 1e6);
-    const cacheCreationCost2 = (usage.cache_creation_input_tokens ?? 0) * (2 / 1e6);
-    return inputCost2 + outputCost2 + cacheReadCost2 + cacheCreationCost2;
-  }
-  const inputRate = pricing.input / 1e6;
-  const outputRate = pricing.output / 1e6;
-  const cacheReadRate = (pricing.cacheRead ?? pricing.input * 0.1) / 1e6;
-  const cacheCreationRate = (pricing.cacheCreation ?? pricing.input * 0.33) / 1e6;
-  const inputCost = (usage.input_tokens ?? 0) * inputRate;
-  const outputCost = (usage.output_tokens ?? 0) * outputRate;
-  const cacheReadCost = (usage.cache_read_input_tokens ?? 0) * cacheReadRate;
-  const cacheCreationCost = (usage.cache_creation_input_tokens ?? 0) * cacheCreationRate;
-  return inputCost + outputCost + cacheReadCost + cacheCreationCost;
-}
-var MODEL_PRICING;
-var init_cost2 = __esm(() => {
-  MODEL_PRICING = {
-    "claude-sonnet-4": { input: 3, output: 15 },
-    "claude-sonnet-4-5": { input: 3, output: 15 },
-    "claude-haiku": { input: 0.8, output: 4, cacheRead: 0.1, cacheCreation: 1 },
-    "claude-haiku-4-5": { input: 0.8, output: 4, cacheRead: 0.1, cacheCreation: 1 },
-    "claude-opus": { input: 15, output: 75 },
-    "claude-opus-4": { input: 15, output: 75 },
-    "gpt-4.1": { input: 10, output: 30 },
-    "gpt-4": { input: 30, output: 60 },
-    "gpt-3.5-turbo": { input: 0.5, output: 1.5 },
-    "gemini-2.5-pro": { input: 0.075, output: 0.3 },
-    "gemini-2-pro": { input: 0.075, output: 0.3 },
-    codex: { input: 0.02, output: 0.06 },
-    "code-davinci-002": { input: 0.02, output: 0.06 }
-  };
+var init_cost3 = __esm(() => {
+  init_cost();
 });
 
 // src/agents/acp/adapter.ts
@@ -19828,7 +19868,7 @@ var init_adapter2 = __esm(() => {
   init_decompose();
   init_spawn_client();
   init_types2();
-  init_cost2();
+  init_cost3();
   INTERACTION_TIMEOUT_MS = 5 * 60 * 1000;
   AGENT_REGISTRY = {
     claude: {
@@ -20427,7 +20467,7 @@ var init_chain = __esm(() => {
 
 // src/utils/path-security.ts
 import { realpathSync } from "fs";
-import { dirname, isAbsolute, join as join5, normalize, resolve } from "path";
+import { dirname, isAbsolute as isAbsolute3, join as join5, normalize, resolve } from "path";
 function safeRealpath(p) {
   try {
     return realpathSync(p);
@@ -20445,7 +20485,7 @@ function validateModulePath(modulePath, allowedRoots) {
     return { valid: false, error: "Module path is empty" };
   }
   const normalizedRoots = allowedRoots.map((r) => safeRealpath(resolve(r)));
-  if (isAbsolute(modulePath)) {
+  if (isAbsolute3(modulePath)) {
     const absoluteTarget = safeRealpath(normalize(modulePath));
     const isWithin = normalizedRoots.some((root) => {
       return absoluteTarget.startsWith(`${root}/`) || absoluteTarget === root;
@@ -20736,7 +20776,7 @@ function isPlainObject2(value) {
 
 // src/config/path-security.ts
 import { existsSync as existsSync4, lstatSync, realpathSync as realpathSync2 } from "fs";
-import { isAbsolute as isAbsolute2, normalize as normalize2, resolve as resolve3 } from "path";
+import { isAbsolute as isAbsolute4, normalize as normalize2, resolve as resolve3 } from "path";
 function validateDirectory(dirPath, baseDir) {
   const resolved = resolve3(dirPath);
   if (!existsSync4(resolved)) {
@@ -20768,7 +20808,7 @@ function validateDirectory(dirPath, baseDir) {
 function isWithinDirectory(targetPath, basePath) {
   const normalizedTarget = normalize2(targetPath);
   const normalizedBase = normalize2(basePath);
-  if (!isAbsolute2(normalizedTarget) || !isAbsolute2(normalizedBase)) {
+  if (!isAbsolute4(normalizedTarget) || !isAbsolute4(normalizedBase)) {
     return false;
   }
   const baseWithSlash = normalizedBase.endsWith("/") ? normalizedBase : `${normalizedBase}/`;
@@ -20804,10 +20844,10 @@ var MAX_DIRECTORY_DEPTH = 10;
 var init_path_security2 = () => {};
 
 // src/config/paths.ts
-import { homedir } from "os";
+import { homedir as homedir3 } from "os";
 import { join as join6, resolve as resolve4 } from "path";
 function globalConfigDir() {
-  return join6(homedir(), ".nax");
+  return join6(homedir3(), ".nax");
 }
 var init_paths = () => {};
 
@@ -22138,7 +22178,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.46.0",
+    version: "0.46.2",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22211,8 +22251,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("6a485b9"))
-        return "6a485b9";
+      if (/^[0-9a-f]{6,10}$/.test("506ad27"))
+        return "506ad27";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -24018,6 +24058,7 @@ ${stderr}` };
         const result = await _acceptanceSetupDeps.generate(ctx.prd.userStories, refinedCriteria, {
           featureName: ctx.prd.feature,
           workdir: ctx.workdir,
+          featureDir: ctx.featureDir,
           codebaseContext: "",
           modelTier: ctx.config.acceptance.model ?? "fast",
           modelDef: resolveModel(ctx.config.models[ctx.config.acceptance.model ?? "fast"]),
@@ -24045,6 +24086,99 @@ ${stderr}` };
   };
 });
 
+// src/agents/shared/validation.ts
+function validateAgentForTier(agent, tier) {
+  return agent.capabilities.supportedTiers.includes(tier);
+}
+function validateAgentFeature(agent, feature) {
+  return agent.capabilities.features.has(feature);
+}
+function describeAgentCapabilities(agent) {
+  const tiers = agent.capabilities.supportedTiers.join(",");
+  const features = Array.from(agent.capabilities.features).join(",");
+  const maxTokens = agent.capabilities.maxContextTokens;
+  return `${agent.name}: tiers=[${tiers}], maxTokens=${maxTokens}, features=[${features}]`;
+}
+
+// src/agents/shared/version-detection.ts
+async function getAgentVersion(binaryName) {
+  try {
+    const proc = _versionDetectionDeps.spawn([binaryName, "--version"], {
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const exitCode = await proc.exited;
+    if (exitCode !== 0) {
+      return null;
+    }
+    const stdout = await new Response(proc.stdout).text();
+    const versionLine = stdout.trim().split(`
+`)[0];
+    const versionMatch = versionLine.match(/v?(\d+\.\d+(?:\.\d+)?(?:[-+][\w.]+)?)/);
+    if (versionMatch) {
+      return versionMatch[0];
+    }
+    return versionLine || null;
+  } catch {
+    return null;
+  }
+}
+async function getAgentVersions() {
+  const agents = await getInstalledAgents();
+  const agentsByName = new Map(agents.map((a) => [a.name, a]));
+  const { ALL_AGENTS: ALL_AGENTS2 } = await Promise.resolve().then(() => (init_registry(), exports_registry));
+  const versions2 = await Promise.all(ALL_AGENTS2.map(async (agent) => {
+    const version2 = agentsByName.has(agent.name) ? await getAgentVersion(agent.binary) : null;
+    return {
+      name: agent.name,
+      displayName: agent.displayName,
+      version: version2,
+      installed: agentsByName.has(agent.name)
+    };
+  }));
+  return versions2;
+}
+var _versionDetectionDeps;
+var init_version_detection = __esm(() => {
+  init_registry();
+  _versionDetectionDeps = {
+    spawn(cmd, opts) {
+      return Bun.spawn(cmd, opts);
+    }
+  };
+});
+
+// src/agents/index.ts
+var exports_agents = {};
+__export(exports_agents, {
+  validateAgentForTier: () => validateAgentForTier,
+  validateAgentFeature: () => validateAgentFeature,
+  parseTokenUsage: () => parseTokenUsage,
+  getInstalledAgents: () => getInstalledAgents,
+  getAllAgentNames: () => getAllAgentNames,
+  getAgentVersions: () => getAgentVersions,
+  getAgentVersion: () => getAgentVersion,
+  getAgent: () => getAgent,
+  formatCostWithConfidence: () => formatCostWithConfidence,
+  estimateCostFromTokenUsage: () => estimateCostFromTokenUsage,
+  estimateCostFromOutput: () => estimateCostFromOutput,
+  estimateCostByDuration: () => estimateCostByDuration,
+  estimateCost: () => estimateCost,
+  describeAgentCapabilities: () => describeAgentCapabilities,
+  checkAgentHealth: () => checkAgentHealth,
+  MODEL_PRICING: () => MODEL_PRICING,
+  CompleteError: () => CompleteError,
+  ClaudeCodeAdapter: () => ClaudeCodeAdapter,
+  COST_RATES: () => COST_RATES
+});
+var init_agents = __esm(() => {
+  init_types2();
+  init_claude();
+  init_registry();
+  init_cost();
+  init_version_detection();
+});
+
 // src/pipeline/event-bus.ts
 class PipelineEventBus {
   subscribers = new Map;
@@ -24455,8 +24589,87 @@ async function recheckReview(ctx) {
   const result = await reviewStage2.execute(ctx);
   return result.action === "continue";
 }
+function collectFailedChecks(ctx) {
+  return (ctx.reviewResult?.checks ?? []).filter((c) => !c.success);
+}
+function buildReviewRectificationPrompt(failedChecks, story) {
+  const errors3 = failedChecks.map((c) => `## ${c.check} errors (exit code ${c.exitCode})
+\`\`\`
+${c.output}
+\`\`\``).join(`
+
+`);
+  return `You are fixing lint/typecheck errors from a code review.
+
+Story: ${story.title} (${story.id})
+
+The following quality checks failed after implementation:
+
+${errors3}
+
+Fix ALL errors listed above. Do NOT change test files or test behavior.
+Do NOT add new features \u2014 only fix the quality check errors.
+Commit your fixes when done.`;
+}
+async function runAgentRectification(ctx) {
+  const logger = getLogger();
+  const maxAttempts = ctx.config.quality.autofix?.maxAttempts ?? 2;
+  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;
+  }
+  logger.info("autofix", "Starting agent rectification for review failures", {
+    storyId: ctx.story.id,
+    failedChecks: failedChecks.map((c) => c.check),
+    maxAttempts
+  });
+  const agentGetFn = ctx.agentGetFn ?? getAgent;
+  for (let attempt = 1;attempt <= maxAttempts; attempt++) {
+    logger.info("autofix", `Agent rectification attempt ${attempt}/${maxAttempts}`, { 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 });
+      return false;
+    }
+    const prompt = buildReviewRectificationPrompt(failedChecks, ctx.story);
+    const modelTier = ctx.story.routing?.modelTier ?? ctx.config.autoMode.escalation.tierOrder[0]?.tier ?? "balanced";
+    const modelDef = resolveModel(ctx.config.models[modelTier]);
+    await agent.run({
+      prompt,
+      workdir: ctx.workdir,
+      modelTier,
+      modelDef,
+      timeoutSeconds: ctx.config.execution.sessionTimeoutSeconds,
+      dangerouslySkipPermissions: resolvePermissions(ctx.config, "rectification").skipPermissions,
+      pipelineStage: "rectification",
+      config: ctx.config,
+      maxInteractionTurns: ctx.config.agent?.maxInteractionTurns,
+      storyId: ctx.story.id,
+      sessionRole: "implementer"
+    });
+    const passed = await _autofixDeps.recheckReview(ctx);
+    if (passed) {
+      logger.info("autofix", `[OK] Agent rectification succeeded on attempt ${attempt}`, {
+        storyId: ctx.story.id
+      });
+      return true;
+    }
+    const updatedFailed = collectFailedChecks(ctx);
+    if (updatedFailed.length > 0) {
+      failedChecks.splice(0, failedChecks.length, ...updatedFailed);
+    }
+    logger.warn("autofix", `Agent rectification still failing after attempt ${attempt}`, {
+      storyId: ctx.story.id
+    });
+  }
+  logger.warn("autofix", "Agent rectification exhausted", { storyId: ctx.story.id });
+  return false;
+}
 var autofixStage, _autofixDeps;
 var init_autofix = __esm(() => {
+  init_agents();
+  init_config();
   init_logger2();
   init_event_bus();
   autofixStage = {
@@ -24482,14 +24695,7 @@ var init_autofix = __esm(() => {
       }
       const lintFixCmd = ctx.config.quality.commands.lintFix;
       const formatFixCmd = ctx.config.quality.commands.formatFix;
-      if (!lintFixCmd && !formatFixCmd) {
-        logger.debug("autofix", "No fix commands configured \u2014 skipping autofix", { storyId: ctx.story.id });
-        return { action: "escalate", reason: "Review failed and no autofix commands configured" };
-      }
-      const maxAttempts = ctx.config.quality.autofix?.maxAttempts ?? 2;
-      let fixed = false;
-      for (let attempt = 1;attempt <= maxAttempts; attempt++) {
-        logger.info("autofix", `Autofix attempt ${attempt}/${maxAttempts}`, { storyId: ctx.story.id });
+      if (lintFixCmd || formatFixCmd) {
         if (lintFixCmd) {
           pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: lintFixCmd });
           const lintResult = await _autofixDeps.runCommand(lintFixCmd, ctx.workdir);
@@ -24515,22 +24721,24 @@ var init_autofix = __esm(() => {
         const recheckPassed = await _autofixDeps.recheckReview(ctx);
         pipelineEventBus.emit({ type: "autofix:completed", storyId: ctx.story.id, fixed: recheckPassed });
         if (recheckPassed) {
-          if (ctx.reviewResult) {
+          if (ctx.reviewResult)
             ctx.reviewResult = { ...ctx.reviewResult, success: true };
-          }
-          fixed = true;
-          break;
+          logger.info("autofix", "Mechanical autofix succeeded \u2014 retrying review", { storyId: ctx.story.id });
+          return { action: "retry", fromStage: "review" };
         }
       }
-      if (fixed) {
-        logger.info("autofix", "Autofix succeeded \u2014 retrying review", { storyId: ctx.story.id });
+      const agentFixed = await _autofixDeps.runAgentRectification(ctx);
+      if (agentFixed) {
+        if (ctx.reviewResult)
+          ctx.reviewResult = { ...ctx.reviewResult, success: true };
+        logger.info("autofix", "Agent rectification succeeded \u2014 retrying review", { storyId: ctx.story.id });
         return { action: "retry", fromStage: "review" };
       }
       logger.warn("autofix", "Autofix exhausted \u2014 escalating", { storyId: ctx.story.id });
       return { action: "escalate", reason: "Autofix exhausted: review still failing after fix attempts" };
     }
   };
-  _autofixDeps = { runCommand, recheckReview };
+  _autofixDeps = { runCommand, recheckReview, runAgentRectification };
 });
 
 // src/execution/progress.ts
@@ -25678,97 +25886,6 @@ ${pluginMarkdown}` : pluginMarkdown;
   };
 });
 
-// src/agents/shared/validation.ts
-function validateAgentForTier(agent, tier) {
-  return agent.capabilities.supportedTiers.includes(tier);
-}
-function validateAgentFeature(agent, feature) {
-  return agent.capabilities.features.has(feature);
-}
-function describeAgentCapabilities(agent) {
-  const tiers = agent.capabilities.supportedTiers.join(",");
-  const features = Array.from(agent.capabilities.features).join(",");
-  const maxTokens = agent.capabilities.maxContextTokens;
-  return `${agent.name}: tiers=[${tiers}], maxTokens=${maxTokens}, features=[${features}]`;
-}
-
-// src/agents/shared/version-detection.ts
-async function getAgentVersion(binaryName) {
-  try {
-    const proc = _versionDetectionDeps.spawn([binaryName, "--version"], {
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    const exitCode = await proc.exited;
-    if (exitCode !== 0) {
-      return null;
-    }
-    const stdout = await new Response(proc.stdout).text();
-    const versionLine = stdout.trim().split(`
-`)[0];
-    const versionMatch = versionLine.match(/v?(\d+\.\d+(?:\.\d+)?(?:[-+][\w.]+)?)/);
-    if (versionMatch) {
-      return versionMatch[0];
-    }
-    return versionLine || null;
-  } catch {
-    return null;
-  }
-}
-async function getAgentVersions() {
-  const agents = await getInstalledAgents();
-  const agentsByName = new Map(agents.map((a) => [a.name, a]));
-  const { ALL_AGENTS: ALL_AGENTS2 } = await Promise.resolve().then(() => (init_registry(), exports_registry));
-  const versions2 = await Promise.all(ALL_AGENTS2.map(async (agent) => {
-    const version2 = agentsByName.has(agent.name) ? await getAgentVersion(agent.binary) : null;
-    return {
-      name: agent.name,
-      displayName: agent.displayName,
-      version: version2,
-      installed: agentsByName.has(agent.name)
-    };
-  }));
-  return versions2;
-}
-var _versionDetectionDeps;
-var init_version_detection = __esm(() => {
-  init_registry();
-  _versionDetectionDeps = {
-    spawn(cmd, opts) {
-      return Bun.spawn(cmd, opts);
-    }
-  };
-});
-
-// src/agents/index.ts
-var exports_agents = {};
-__export(exports_agents, {
-  validateAgentForTier: () => validateAgentForTier,
-  validateAgentFeature: () => validateAgentFeature,
-  parseTokenUsage: () => parseTokenUsage,
-  getInstalledAgents: () => getInstalledAgents,
-  getAllAgentNames: () => getAllAgentNames,
-  getAgentVersions: () => getAgentVersions,
-  getAgentVersion: () => getAgentVersion,
-  getAgent: () => getAgent,
-  formatCostWithConfidence: () => formatCostWithConfidence,
-  estimateCostFromOutput: () => estimateCostFromOutput,
-  estimateCostByDuration: () => estimateCostByDuration,
-  estimateCost: () => estimateCost,
-  describeAgentCapabilities: () => describeAgentCapabilities,
-  checkAgentHealth: () => checkAgentHealth,
-  CompleteError: () => CompleteError,
-  ClaudeCodeAdapter: () => ClaudeCodeAdapter,
-  COST_RATES: () => COST_RATES
-});
-var init_agents = __esm(() => {
-  init_types2();
-  init_claude();
-  init_registry();
-  init_cost();
-  init_version_detection();
-});
-
 // src/tdd/isolation.ts
 function isTestFile(filePath) {
   return TEST_PATTERNS.some((pattern) => pattern.test(filePath));
@@ -30069,12 +30186,15 @@ async function checkWorkingTreeClean(workdir) {
   });
   const output = await new Response(proc.stdout).text();
   const exitCode = await proc.exited;
-  const passed = exitCode === 0 && output.trim() === "";
+  const lines = output.trim() === "" ? [] : output.split(`
+`).filter(Boolean);
+  const nonNaxDirtyFiles = lines.filter((line) => !NAX_RUNTIME_PATTERNS.some((pattern) => pattern.test(line)));
+  const passed = exitCode === 0 && nonNaxDirtyFiles.length === 0;
   return {
     name: "working-tree-clean",
     tier: "blocker",
     passed,
-    message: passed ? "Working tree is clean" : "Uncommitted changes detected"
+    message: passed ? "Working tree is clean" : `Uncommitted changes detected: ${nonNaxDirtyFiles.map((l) => l.slice(3)).join(", ")}`
   };
 }
 async function checkGitUserConfigured(workdir) {
@@ -30099,7 +30219,23 @@ async function checkGitUserConfigured(workdir) {
     message: passed ? "Git user is configured" : !hasName && !hasEmail ? "Git user.name and user.email not configured" : !hasName ? "Git user.name not configured" : "Git user.email not configured"
   };
 }
-var init_checks_git = () => {};
+var NAX_RUNTIME_PATTERNS;
+var init_checks_git = __esm(() => {
+  NAX_RUNTIME_PATTERNS = [
+    /^.{2} nax\.lock$/,
+    /^.{2} nax\/metrics\.json$/,
+    /^.{2} nax\/features\/[^/]+\/status\.json$/,
+    /^.{2} nax\/features\/[^/]+\/runs\//,
+    /^.{2} nax\/features\/[^/]+\/plan\//,
+    /^.{2} nax\/features\/[^/]+\/acp-sessions\.json$/,
+    /^.{2} nax\/features\/[^/]+\/interactions\//,
+    /^.{2} nax\/features\/[^/]+\/progress\.txt$/,
+    /^.{2} nax\/features\/[^/]+\/acceptance-refined\.json$/,
+    /^.{2} \.nax-verifier-verdict\.json$/,
+    /^.{2} \.nax-pids$/,
+    /^.{2} \.nax-wt\//
+  ];
+});
 
 // src/precheck/checks-config.ts
 import { existsSync as existsSync26, statSync as statSync3 } from "fs";
@@ -30360,6 +30496,7 @@ var init_checks_blockers = __esm(() => {
 
 // src/precheck/checks-warnings.ts
 import { existsSync as existsSync28 } from "fs";
+import { isAbsolute as isAbsolute6 } from "path";
 async function checkClaudeMdExists(workdir) {
   const claudeMdPath = `${workdir}/CLAUDE.md`;
   const passed = existsSync28(claudeMdPath);
@@ -30453,7 +30590,14 @@ async function checkGitignoreCoversNax(workdir) {
   }
   const file2 = Bun.file(gitignorePath);
   const content = await file2.text();
-  const patterns = ["nax.lock", "runs/", "test/tmp/"];
+  const patterns = [
+    "nax.lock",
+    "nax/**/runs/",
+    "nax/metrics.json",
+    "nax/features/*/status.json",
+    ".nax-pids",
+    ".nax-wt/"
+  ];
   const missing = patterns.filter((pattern) => !content.includes(pattern));
   const passed = missing.length === 0;
   return {
@@ -30482,6 +30626,16 @@ async function checkPromptOverrideFiles(config2, workdir) {
   }
   return checks3;
 }
+async function checkHomeEnvValid() {
+  const home = process.env.HOME ?? "";
+  const passed = home !== "" && isAbsolute6(home);
+  return {
+    name: "home-env-valid",
+    tier: "warning",
+    passed,
+    message: passed ? `HOME env is valid: ${home}` : home === "" ? "HOME env is not set \u2014 agent may write files to unexpected locations" : `HOME env is not an absolute path ("${home}") \u2014 may cause literal "~" directories in repo`
+  };
+}
 var init_checks_warnings = () => {};
 
 // src/precheck/checks-agents.ts
@@ -30662,6 +30816,7 @@ function getEnvironmentWarnings(config2, workdir) {
     () => checkDiskSpace(),
     () => checkOptionalCommands(config2, workdir),
     () => checkGitignoreCoversNax(workdir),
+    () => checkHomeEnvValid(),
     () => checkPromptOverrideFiles(config2, workdir),
     () => checkMultiAgentHealth()
   ];
@@ -32902,12 +33057,12 @@ var init_parallel_executor = __esm(() => {
 
 // src/pipeline/subscribers/events-writer.ts
 import { appendFile as appendFile2, mkdir } from "fs/promises";
-import { homedir as homedir5 } from "os";
+import { homedir as homedir7 } from "os";
 import { basename as basename3, join as join40 } from "path";
 function wireEventsWriter(bus, feature, runId, workdir) {
   const logger = getSafeLogger();
   const project = basename3(workdir);
-  const eventsDir = join40(homedir5(), ".nax", "events", project);
+  const eventsDir = join40(homedir7(), ".nax", "events", project);
   const eventsFile = join40(eventsDir, "events.jsonl");
   let dirReady = false;
   const write = (line) => {
@@ -33067,12 +33222,12 @@ var init_interaction2 = __esm(() => {
 
 // src/pipeline/subscribers/registry.ts
 import { mkdir as mkdir2, writeFile } from "fs/promises";
-import { homedir as homedir6 } from "os";
+import { homedir as homedir8 } from "os";
 import { basename as basename4, join as join41 } from "path";
 function wireRegistry(bus, feature, runId, workdir) {
   const logger = getSafeLogger();
   const project = basename4(workdir);
-  const runDir = join41(homedir6(), ".nax", "runs", `${project}-${feature}-${runId}`);
+  const runDir = join41(homedir8(), ".nax", "runs", `${project}-${feature}-${runId}`);
   const metaFile = join41(runDir, "meta.json");
   const unsub = bus.on("run:started", (_ev) => {
     (async () => {
@@ -65472,7 +65627,7 @@ var require_jsx_dev_runtime = __commonJS((exports, module) => {
 // bin/nax.ts
 init_source();
 import { existsSync as existsSync32, mkdirSync as mkdirSync6 } from "fs";
-import { homedir as homedir8 } from "os";
+import { homedir as homedir10 } from "os";
 import { join as join43 } from "path";
 
 // node_modules/commander/esm.mjs
@@ -68628,10 +68783,10 @@ import { join as join32 } from "path";
 // src/commands/logs-reader.ts
 import { existsSync as existsSync23, readdirSync as readdirSync6 } from "fs";
 import { readdir as readdir3 } from "fs/promises";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir5 } from "os";
 import { join as join31 } from "path";
 var _deps6 = {
-  getRunsDir: () => process.env.NAX_RUNS_DIR ?? join31(homedir3(), ".nax", "runs")
+  getRunsDir: () => process.env.NAX_RUNS_DIR ?? join31(homedir5(), ".nax", "runs")
 };
 async function resolveRunFileFromRegistry(runId) {
   const runsDir = _deps6.getRunsDir();
@@ -68957,11 +69112,11 @@ async function precheckCommand(options) {
 // src/commands/runs.ts
 init_source();
 import { readdir as readdir4 } from "fs/promises";
-import { homedir as homedir4 } from "os";
+import { homedir as homedir6 } from "os";
 import { join as join35 } from "path";
 var DEFAULT_LIMIT = 20;
 var _deps8 = {
-  getRunsDir: () => join35(homedir4(), ".nax", "runs")
+  getRunsDir: () => join35(homedir6(), ".nax", "runs")
 };
 function formatDuration3(ms) {
   if (ms <= 0)
@@ -77155,7 +77310,7 @@ program2.command("run").description("Run the orchestration loop for a feature").
     config2.autoMode.defaultAgent = options.agent;
   }
   config2.execution.maxIterations = Number.parseInt(options.maxIterations, 10);
-  const globalNaxDir = join43(homedir8(), ".nax");
+  const globalNaxDir = join43(homedir10(), ".nax");
   const hooks = await loadHooksConfig(naxDir, globalNaxDir);
   const eventEmitter = new PipelineEventEmitter;
   let tuiInstance;