@nathapp/nax 0.45.0 → 0.46.1

package/dist/nax.js

@@ -3240,60 +3240,6 @@ async function withProcessTimeout(proc, timeoutMs, opts) {
   return { exitCode, timedOut };
 }
 
-// src/agents/types.ts
-var CompleteError;
-var init_types2 = __esm(() => {
-  CompleteError = class CompleteError extends Error {
-    exitCode;
-    constructor(message, exitCode) {
-      super(message);
-      this.exitCode = exitCode;
-      this.name = "CompleteError";
-    }
-  };
-});
-
-// src/agents/claude-complete.ts
-async function executeComplete(binary, prompt, options) {
-  const cmd = [binary, "-p", prompt];
-  if (options?.model) {
-    cmd.push("--model", options.model);
-  }
-  if (options?.jsonMode) {
-    cmd.push("--output-format", "json");
-  }
-  const { skipPermissions } = resolvePermissions(options?.config, "complete");
-  if (skipPermissions) {
-    cmd.push("--dangerously-skip-permissions");
-  }
-  const spawnOpts = { stdout: "pipe", stderr: "pipe" };
-  if (options?.workdir)
-    spawnOpts.cwd = options.workdir;
-  const proc = _completeDeps.spawn(cmd, spawnOpts);
-  const exitCode = await proc.exited;
-  const stdout = await new Response(proc.stdout).text();
-  const stderr = await new Response(proc.stderr).text();
-  const trimmed = stdout.trim();
-  if (exitCode !== 0) {
-    const errorDetails = stderr.trim() || trimmed;
-    const errorMessage = errorDetails || `complete() failed with exit code ${exitCode}`;
-    throw new CompleteError(errorMessage, exitCode);
-  }
-  if (!trimmed) {
-    throw new CompleteError("complete() returned empty output");
-  }
-  return trimmed;
-}
-var _completeDeps;
-var init_claude_complete = __esm(() => {
-  init_types2();
-  _completeDeps = {
-    spawn(cmd, opts) {
-      return Bun.spawn(cmd, opts);
-    }
-  };
-});
-
 // src/config/test-strategy.ts
 function resolveTestStrategy(raw) {
   if (!raw)
@@ -3343,7 +3289,7 @@ var init_test_strategy = __esm(() => {
   ];
 });
 
-// src/agents/claude-decompose.ts
+// src/agents/shared/decompose.ts
 function buildDecomposePrompt(options) {
   return `You are a requirements analyst. Break down the following feature specification into user stories and classify each story's complexity.
 
@@ -3454,11 +3400,104 @@ function coerceComplexity(value) {
   }
   return "medium";
 }
-var init_claude_decompose = __esm(() => {
+var init_decompose = __esm(() => {
   init_test_strategy();
 });
 
-// src/agents/cost.ts
+// src/agents/types.ts
+var CompleteError;
+var init_types2 = __esm(() => {
+  CompleteError = class CompleteError extends Error {
+    exitCode;
+    constructor(message, exitCode) {
+      super(message);
+      this.exitCode = exitCode;
+      this.name = "CompleteError";
+    }
+  };
+});
+
+// src/agents/claude/complete.ts
+async function executeComplete(binary, prompt, options) {
+  const cmd = [binary, "-p", prompt];
+  if (options?.model) {
+    cmd.push("--model", options.model);
+  }
+  if (options?.jsonMode) {
+    cmd.push("--output-format", "json");
+  }
+  const { skipPermissions } = resolvePermissions(options?.config, "complete");
+  if (skipPermissions) {
+    cmd.push("--dangerously-skip-permissions");
+  }
+  const spawnOpts = { stdout: "pipe", stderr: "pipe" };
+  if (options?.workdir)
+    spawnOpts.cwd = options.workdir;
+  const proc = _completeDeps.spawn(cmd, spawnOpts);
+  const exitCode = await proc.exited;
+  const stdout = await new Response(proc.stdout).text();
+  const stderr = await new Response(proc.stderr).text();
+  const trimmed = stdout.trim();
+  if (exitCode !== 0) {
+    const errorDetails = stderr.trim() || trimmed;
+    const errorMessage = errorDetails || `complete() failed with exit code ${exitCode}`;
+    throw new CompleteError(errorMessage, exitCode);
+  }
+  if (!trimmed) {
+    throw new CompleteError("complete() returned empty output");
+  }
+  return trimmed;
+}
+var _completeDeps;
+var init_complete = __esm(() => {
+  init_types2();
+  _completeDeps = {
+    spawn(cmd, opts) {
+      return Bun.spawn(cmd, opts);
+    }
+  };
+});
+
+// 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-execution.ts
+// 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]) {
@@ -3663,9 +3731,9 @@ 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_claude_execution = __esm(() => {
+var init_execution = __esm(() => {
   init_logger2();
-  init_cost();
+  init_cost2();
   _runOnceDeps = {
     killProc(proc, signal) {
       proc.kill(signal);
@@ -3676,7 +3744,7 @@ var init_claude_execution = __esm(() => {
   };
 });
 
-// src/agents/claude-interactive.ts
+// src/agents/claude/interactive.ts
 function runInteractiveMode(binary, options, pidRegistry) {
   const model = options.modelDef.model;
   const cmd = [binary, "--model", model, options.prompt];
@@ -3715,9 +3783,9 @@ function runInteractiveMode(binary, options, pidRegistry) {
     pid: proc.pid
   };
 }
-var init_claude_interactive = __esm(() => {
+var init_interactive = __esm(() => {
   init_logger2();
-  init_claude_execution();
+  init_execution();
 });
 
 // src/config/schema-types.ts
@@ -18139,7 +18207,7 @@ var init_schema = __esm(() => {
   init_defaults();
 });
 
-// src/agents/model-resolution.ts
+// src/agents/shared/model-resolution.ts
 var exports_model_resolution = {};
 __export(exports_model_resolution, {
   resolveBalancedModelDef: () => resolveBalancedModelDef
@@ -18160,7 +18228,7 @@ var init_model_resolution = __esm(() => {
   init_schema();
 });
 
-// src/agents/claude-plan.ts
+// src/agents/claude/plan.ts
 import { mkdtempSync, rmSync } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
@@ -18279,12 +18347,12 @@ async function runPlan(binary, options, pidRegistry, buildAllowedEnv2) {
     }
   }
 }
-var init_claude_plan = __esm(() => {
+var init_plan = __esm(() => {
   init_logger2();
   init_model_resolution();
 });
 
-// src/agents/claude.ts
+// src/agents/claude/adapter.ts
 class ClaudeCodeAdapter {
   name = "claude";
   displayName = "Claude Code";
@@ -18435,14 +18503,14 @@ class ClaudeCodeAdapter {
   }
 }
 var _decomposeDeps, _claudeAdapterDeps;
-var init_claude = __esm(() => {
+var init_adapter = __esm(() => {
   init_pid_registry();
   init_logger2();
-  init_claude_complete();
-  init_claude_decompose();
-  init_claude_execution();
-  init_claude_interactive();
-  init_claude_plan();
+  init_decompose();
+  init_complete();
+  init_execution();
+  init_interactive();
+  init_plan();
   _decomposeDeps = {
     spawn(cmd, opts) {
       return Bun.spawn(cmd, opts);
@@ -18453,6 +18521,12 @@ var init_claude = __esm(() => {
   };
 });
 
+// src/agents/claude/index.ts
+var init_claude = __esm(() => {
+  init_adapter();
+  init_execution();
+});
+
 // src/utils/errors.ts
 function errorMessage(err) {
   return err instanceof Error ? err.message : String(err);
@@ -18665,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) {
@@ -18977,11 +19051,40 @@ function parseAcpxJsonOutput(rawOutput) {
 `).filter((l) => l.trim());
   let text = "";
   let tokenUsage;
+  let exactCostUsd;
   let stopReason;
   let error48;
   for (const line of lines) {
     try {
       const event = JSON.parse(line);
+      if (event.jsonrpc === "2.0") {
+        if (event.method === "session/update" && event.params?.update) {
+          const update = event.params.update;
+          if (update.sessionUpdate === "agent_message_chunk" && update.content?.type === "text" && update.content.text) {
+            text += update.content.text;
+          }
+          if (update.sessionUpdate === "usage_update" && typeof update.cost?.amount === "number") {
+            exactCostUsd = update.cost.amount;
+          }
+        }
+        if (event.id !== undefined && event.result && typeof event.result === "object") {
+          const result = event.result;
+          if (result.stopReason)
+            stopReason = result.stopReason;
+          if (result.stop_reason)
+            stopReason = result.stop_reason;
+          if (result.usage && typeof result.usage === "object") {
+            const u = result.usage;
+            tokenUsage = {
+              input_tokens: u.inputTokens ?? u.input_tokens ?? 0,
+              output_tokens: u.outputTokens ?? u.output_tokens ?? 0,
+              cache_read_input_tokens: u.cachedReadTokens ?? u.cache_read_input_tokens ?? 0,
+              cache_creation_input_tokens: u.cachedWriteTokens ?? u.cache_creation_input_tokens ?? 0
+            };
+          }
+        }
+        continue;
+      }
       if (event.content && typeof event.content === "string")
         text += event.content;
       if (event.text && typeof event.text === "string")
@@ -19008,17 +19111,25 @@ function parseAcpxJsonOutput(rawOutput) {
         text = line;
     }
   }
-  return { text: text.trim(), tokenUsage, stopReason, error: error48 };
+  return { text: text.trim(), tokenUsage, exactCostUsd, stopReason, error: error48 };
 }
 
 // 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])
@@ -19107,8 +19218,9 @@ class SpawnAcpSession {
         const parsed = parseAcpxJsonOutput(stdout);
         return {
           messages: [{ role: "assistant", content: parsed.text || "" }],
-          stopReason: "end_turn",
-          cumulative_token_usage: parsed.tokenUsage
+          stopReason: parsed.stopReason ?? "end_turn",
+          cumulative_token_usage: parsed.tokenUsage,
+          exactCostUsd: parsed.exactCostUsd
         };
       } catch (err) {
         getSafeLogger()?.warn("acp-adapter", "Failed to parse session prompt response", {
@@ -19234,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
@@ -19569,7 +19645,13 @@ class AcpAgentAdapter {
     let lastResponse = null;
     let timedOut = false;
     const runState = { succeeded: false };
-    const totalTokenUsage = { input_tokens: 0, output_tokens: 0 };
+    const totalTokenUsage = {
+      input_tokens: 0,
+      output_tokens: 0,
+      cache_read_input_tokens: 0,
+      cache_creation_input_tokens: 0
+    };
+    let totalExactCostUsd;
     try {
       let currentPrompt = options.prompt;
       let turnCount = 0;
@@ -19588,6 +19670,11 @@ class AcpAgentAdapter {
         if (lastResponse.cumulative_token_usage) {
           totalTokenUsage.input_tokens += lastResponse.cumulative_token_usage.input_tokens ?? 0;
           totalTokenUsage.output_tokens += lastResponse.cumulative_token_usage.output_tokens ?? 0;
+          totalTokenUsage.cache_read_input_tokens += lastResponse.cumulative_token_usage.cache_read_input_tokens ?? 0;
+          totalTokenUsage.cache_creation_input_tokens += lastResponse.cumulative_token_usage.cache_creation_input_tokens ?? 0;
+        }
+        if (lastResponse.exactCostUsd !== undefined) {
+          totalExactCostUsd = (totalExactCostUsd ?? 0) + lastResponse.exactCostUsd;
         }
         const outputText = extractOutput(lastResponse);
         const question = extractQuestion(outputText);
@@ -19634,7 +19721,7 @@ class AcpAgentAdapter {
     }
     const success2 = lastResponse?.stopReason === "end_turn";
     const output = extractOutput(lastResponse);
-    const estimatedCost = totalTokenUsage.input_tokens > 0 || totalTokenUsage.output_tokens > 0 ? estimateCostFromTokenUsage(totalTokenUsage, options.modelDef.model) : 0;
+    const estimatedCost = totalExactCostUsd ?? (totalTokenUsage.input_tokens > 0 || totalTokenUsage.output_tokens > 0 ? estimateCostFromTokenUsage(totalTokenUsage, options.modelDef.model) : 0);
     return {
       success: success2,
       exitCode: success2 ? 0 : 1,
@@ -19684,6 +19771,12 @@ class AcpAgentAdapter {
         if (!unwrapped) {
           throw new CompleteError("complete() returned empty output");
         }
+        if (response.exactCostUsd !== undefined) {
+          getSafeLogger()?.info("acp-adapter", "complete() cost", {
+            costUsd: response.exactCostUsd,
+            model
+          });
+        }
         return unwrapped;
       } catch (err) {
         const error48 = err instanceof Error ? err : new Error(String(err));
@@ -19770,12 +19863,12 @@ class AcpAgentAdapter {
   }
 }
 var MAX_AGENT_OUTPUT_CHARS2 = 5000, MAX_RATE_LIMIT_RETRIES = 3, INTERACTION_TIMEOUT_MS, AGENT_REGISTRY, DEFAULT_ENTRY, _acpAdapterDeps, MAX_SESSION_AGE_MS;
-var init_adapter = __esm(() => {
+var init_adapter2 = __esm(() => {
   init_logger2();
-  init_claude_decompose();
+  init_decompose();
   init_spawn_client();
   init_types2();
-  init_cost2();
+  init_cost3();
   INTERACTION_TIMEOUT_MS = 5 * 60 * 1000;
   AGENT_REGISTRY = {
     claude: {
@@ -19817,7 +19910,7 @@ var init_adapter = __esm(() => {
   MAX_SESSION_AGE_MS = 2 * 60 * 60 * 1000;
 });
 
-// src/agents/adapters/aider.ts
+// src/agents/aider/adapter.ts
 class AiderAdapter {
   name = "aider";
   displayName = "Aider";
@@ -19882,7 +19975,7 @@ class AiderAdapter {
   }
 }
 var _aiderCompleteDeps, MAX_AGENT_OUTPUT_CHARS3 = 5000;
-var init_aider = __esm(() => {
+var init_adapter3 = __esm(() => {
   init_types2();
   _aiderCompleteDeps = {
     which(name) {
@@ -19894,7 +19987,7 @@ var init_aider = __esm(() => {
   };
 });
 
-// src/agents/adapters/codex.ts
+// src/agents/codex/adapter.ts
 class CodexAdapter {
   name = "codex";
   displayName = "Codex";
@@ -19957,7 +20050,7 @@ class CodexAdapter {
   }
 }
 var _codexRunDeps, _codexCompleteDeps, MAX_AGENT_OUTPUT_CHARS4 = 5000;
-var init_codex = __esm(() => {
+var init_adapter4 = __esm(() => {
   init_types2();
   _codexRunDeps = {
     which(name) {
@@ -19974,7 +20067,7 @@ var init_codex = __esm(() => {
   };
 });
 
-// src/agents/adapters/gemini.ts
+// src/agents/gemini/adapter.ts
 class GeminiAdapter {
   name = "gemini";
   displayName = "Gemini CLI";
@@ -20057,7 +20150,7 @@ class GeminiAdapter {
   }
 }
 var _geminiRunDeps, _geminiCompleteDeps, MAX_AGENT_OUTPUT_CHARS5 = 5000;
-var init_gemini = __esm(() => {
+var init_adapter5 = __esm(() => {
   init_types2();
   _geminiRunDeps = {
     which(name) {
@@ -20074,7 +20167,7 @@ var init_gemini = __esm(() => {
   };
 });
 
-// src/agents/adapters/opencode.ts
+// src/agents/opencode/adapter.ts
 class OpenCodeAdapter {
   name = "opencode";
   displayName = "OpenCode";
@@ -20119,7 +20212,7 @@ class OpenCodeAdapter {
   }
 }
 var _opencodeCompleteDeps;
-var init_opencode = __esm(() => {
+var init_adapter6 = __esm(() => {
   init_types2();
   _opencodeCompleteDeps = {
     which(name) {
@@ -20211,12 +20304,12 @@ function createAgentRegistry(config2) {
 var ALL_AGENTS;
 var init_registry = __esm(() => {
   init_logger2();
+  init_adapter2();
+  init_adapter3();
   init_adapter();
-  init_aider();
-  init_codex();
-  init_gemini();
-  init_opencode();
-  init_claude();
+  init_adapter4();
+  init_adapter5();
+  init_adapter6();
   ALL_AGENTS = [
     new ClaudeCodeAdapter,
     new CodexAdapter,
@@ -20374,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);
@@ -20392,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;
@@ -20683,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)) {
@@ -20715,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}/`;
@@ -20751,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 = () => {};
 
@@ -22085,7 +22178,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.45.0",
+    version: "0.46.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22158,8 +22251,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("d6bdccb"))
-        return "d6bdccb";
+      if (/^[0-9a-f]{6,10}$/.test("405c88a"))
+        return "405c88a";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -23759,6 +23852,20 @@ var init_runner = __esm(() => {
   init_logger2();
 });
 
+// src/utils/log-test-output.ts
+function logTestOutput(logger, stage, output, opts = {}) {
+  if (!logger || !output)
+    return;
+  const tailLines = opts.tailLines ?? 20;
+  const lines = output.split(`
+`).slice(-tailLines).join(`
+`);
+  logger.debug(stage, "Test output (tail)", {
+    ...opts.storyId !== undefined && { storyId: opts.storyId },
+    output: lines
+  });
+}
+
 // src/pipeline/stages/acceptance.ts
 var exports_acceptance = {};
 __export(exports_acceptance, {
@@ -23842,10 +23949,8 @@ ${stderr}`;
         return { action: "continue" };
       }
       if (failedACs.length === 0 && exitCode !== 0) {
-        logger.error("acceptance", "Tests errored with no AC failures parsed", {
-          exitCode,
-          output
-        });
+        logger.error("acceptance", "Tests errored with no AC failures parsed", { exitCode });
+        logTestOutput(logger, "acceptance", output);
         ctx.acceptanceFailures = {
           failedACs: ["AC-ERROR"],
           testOutput: output
@@ -23863,10 +23968,8 @@ ${stderr}`;
             overrides: overriddenFailures.map((acId) => ({ acId, reason: overrides[acId] }))
           });
         }
-        logger.error("acceptance", "Acceptance tests failed", {
-          failedACs: actualFailures,
-          output
-        });
+        logger.error("acceptance", "Acceptance tests failed", { failedACs: actualFailures });
+        logTestOutput(logger, "acceptance", output);
         ctx.acceptanceFailures = {
           failedACs: actualFailures,
           testOutput: output
@@ -23955,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"]),
@@ -25615,7 +25719,7 @@ ${pluginMarkdown}` : pluginMarkdown;
   };
 });
 
-// src/agents/validation.ts
+// src/agents/shared/validation.ts
 function validateAgentForTier(agent, tier) {
   return agent.capabilities.supportedTiers.includes(tier);
 }
@@ -25629,7 +25733,7 @@ function describeAgentCapabilities(agent) {
   return `${agent.name}: tiers=[${tiers}], maxTokens=${maxTokens}, features=[${features}]`;
 }
 
-// src/agents/version-detection.ts
+// src/agents/shared/version-detection.ts
 async function getAgentVersion(binaryName) {
   try {
     const proc = _versionDetectionDeps.spawn([binaryName, "--version"], {
@@ -25689,11 +25793,13 @@ __export(exports_agents, {
   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
@@ -27742,7 +27848,7 @@ function routeTddFailure(failureCategory, isLiteMode, ctx, reviewReason) {
   };
 }
 var executionStage, _executionDeps;
-var init_execution = __esm(() => {
+var init_execution2 = __esm(() => {
   init_agents();
   init_config();
   init_triggers();
@@ -29097,6 +29203,7 @@ var init_regression2 = __esm(() => {
         storyId: ctx.story.id,
         failCount: result.failCount
       });
+      logTestOutput(logger, "regression", result.rawOutput, { storyId: ctx.story.id });
       pipelineEventBus.emit({
         type: "regression:detected",
         storyId: ctx.story.id,
@@ -29395,16 +29502,8 @@ var init_verify = __esm(() => {
             storyId: ctx.story.id
           });
         }
-        if (result.output && result.status !== "TIMEOUT") {
-          const outputLines = result.output.split(`
-`).slice(-20);
-          if (outputLines.length > 0) {
-            logger.debug("verify", "Test output preview", {
-              storyId: ctx.story.id,
-              output: outputLines.join(`
-`)
-            });
-          }
+        if (result.status !== "TIMEOUT") {
+          logTestOutput(logger, "verify", result.output, { storyId: ctx.story.id });
         }
         return {
           action: "escalate",
@@ -29449,7 +29548,7 @@ var init_stages = __esm(() => {
   init_completion();
   init_constitution2();
   init_context2();
-  init_execution();
+  init_execution2();
   init_optimizer2();
   init_prompt();
   init_queue_check();
@@ -29464,7 +29563,7 @@ var init_stages = __esm(() => {
   init_context2();
   init_prompt();
   init_optimizer2();
-  init_execution();
+  init_execution2();
   init_verify();
   init_rectify();
   init_review();
@@ -30013,12 +30112,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) {
@@ -30043,7 +30145,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";
@@ -30304,6 +30422,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);
@@ -30397,7 +30516,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 {
@@ -30426,6 +30552,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
@@ -30606,6 +30742,7 @@ function getEnvironmentWarnings(config2, workdir) {
     () => checkDiskSpace(),
     () => checkOptionalCommands(config2, workdir),
     () => checkGitignoreCoversNax(workdir),
+    () => checkHomeEnvValid(),
     () => checkPromptOverrideFiles(config2, workdir),
     () => checkMultiAgentHealth()
   ];
@@ -32846,12 +32983,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) => {
@@ -33011,12 +33148,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 () => {
@@ -34454,7 +34591,7 @@ async function setupRun(options) {
   } else {
     logger?.warn("precheck", "Precheck validations skipped (--skip-precheck)");
   }
-  const { sweepStaleFeatureSessions: sweepStaleFeatureSessions2 } = await Promise.resolve().then(() => (init_adapter(), exports_adapter));
+  const { sweepStaleFeatureSessions: sweepStaleFeatureSessions2 } = await Promise.resolve().then(() => (init_adapter2(), exports_adapter));
   await sweepStaleFeatureSessions2(workdir, feature).catch(() => {});
   const lockAcquired = await acquireLock(workdir);
   if (!lockAcquired) {
@@ -65416,7 +65553,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
@@ -68572,10 +68709,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();
@@ -68901,11 +69038,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)
@@ -69088,7 +69225,7 @@ async function unlockCommand(options) {
 init_config();
 
 // src/execution/runner.ts
-init_adapter();
+init_adapter2();
 init_registry();
 init_hooks();
 init_logger2();
@@ -77039,9 +77176,10 @@ program2.command("run").description("Run the orchestration loop for a feature").
       }
     }
     try {
-      mkdirSync6(featureDir, { recursive: true });
+      const planLogDir = join43(featureDir, "plan");
+      mkdirSync6(planLogDir, { recursive: true });
       const planLogId = new Date().toISOString().replace(/:/g, "-").replace(/\..+/, "");
-      const planLogPath = join43(featureDir, `plan-${planLogId}.jsonl`);
+      const planLogPath = join43(planLogDir, `${planLogId}.jsonl`);
       initLogger({ level: "info", filePath: planLogPath, useChalk: false, headless: true });
       console.log(source_default.dim(`   [Plan log: ${planLogPath}]`));
       console.log(source_default.dim("   [Planning phase: generating PRD from spec]"));
@@ -77098,7 +77236,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;
@@ -77286,10 +77424,10 @@ Use: nax plan -f <feature> --from <spec>`));
     process.exit(1);
   }
   const config2 = await loadConfig(workdir);
-  const featureLogDir = join43(naxDir, "features", options.feature);
+  const featureLogDir = join43(naxDir, "features", options.feature, "plan");
   mkdirSync6(featureLogDir, { recursive: true });
   const planLogId = new Date().toISOString().replace(/:/g, "-").replace(/\..+/, "");
-  const planLogPath = join43(featureLogDir, `plan-${planLogId}.jsonl`);
+  const planLogPath = join43(featureLogDir, `${planLogId}.jsonl`);
   initLogger({ level: "info", filePath: planLogPath, useChalk: false, headless: true });
   console.log(source_default.dim(`   [Plan log: ${planLogPath}]`));
   try {