@nathapp/nax 0.45.0 → 0.46.0

package/CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.46.0] - 2026-03-16
+
+### Fixed
+- **ACP cost metric:** Cost was always `$0` for ACP sessions. `parseAcpxJsonOutput` now handles JSON-RPC envelope format (acpx v0.3+): extracts text from `agent_message_chunk`, captures exact USD cost from `usage_update` (`cost.amount`), and reads camelCase token breakdown (`inputTokens`, `outputTokens`, `cachedReadTokens`, `cachedWriteTokens`) from `result.usage`.
+- **ACP `complete()` cost:** Now logs exact cost via `getSafeLogger()` — previously had zero cost tracking.
+- **`run()` cost:** Prefers exact `cost.amount` from acpx over token-based estimation; falls back to `estimateCostFromTokenUsage` when unavailable.
+
+### Refactored
+- **`src/agents/` folder restructure:** Each adapter now lives in its own subfolder for consistency.
+  - `claude/` — Claude Code adapter (adapter, execution, complete, interactive, plan, cost)
+  - `acp/` — ACP protocol adapter (unchanged internals)
+  - `aider/`, `codex/`, `gemini/`, `opencode/` — per-adapter subfolders
+  - `shared/` — cross-adapter utilities: `decompose` (extracted from both claude + acp), `model-resolution`, `validation`, `version-detection`, `types-extended`
+- **Dead code removal:** `streamJsonRpcEvents` (exported but never called), stale `estimateCostFromTokenUsage` re-export from `acp/index.ts`.
+
+### Docs
+- **ARCHITECTURE.md §1:** Updated `src/agents/` tree.
+- **ARCHITECTURE.md §16:** New section — agent adapter folder conventions, `shared/` rules, ACP cost alignment.
+
 ## [0.43.0] - 2026-03-16
 
 ### Added

package/bin/nax.ts

@@ -366,10 +366,11 @@ program
       }
 
       try {
-        // Initialize plan logger before calling planCommand — writes to features/<feature>/plan-<ts>.jsonl
-        mkdirSync(featureDir, { recursive: true });
+        // Initialize plan logger before calling planCommand — writes to features/<feature>/plan/<ts>.jsonl
+        const planLogDir = join(featureDir, "plan");
+        mkdirSync(planLogDir, { recursive: true });
         const planLogId = new Date().toISOString().replace(/:/g, "-").replace(/\..+/, "");
-        const planLogPath = join(featureDir, `plan-${planLogId}.jsonl`);
+        const planLogPath = join(planLogDir, `${planLogId}.jsonl`);
         initLogger({ level: "info", filePath: planLogPath, useChalk: false, headless: true });
         console.log(chalk.dim(`   [Plan log: ${planLogPath}]`));
 
@@ -688,11 +689,11 @@ program
     // Load config
     const config = await loadConfig(workdir);
 
-    // Initialize logger — writes to nax/features/<feature>/plan-<timestamp>.jsonl
-    const featureLogDir = join(naxDir, "features", options.feature);
+    // Initialize logger — writes to nax/features/<feature>/plan/<timestamp>.jsonl
+    const featureLogDir = join(naxDir, "features", options.feature, "plan");
     mkdirSync(featureLogDir, { recursive: true });
     const planLogId = new Date().toISOString().replace(/:/g, "-").replace(/\..+/, "");
-    const planLogPath = join(featureLogDir, `plan-${planLogId}.jsonl`);
+    const planLogPath = join(featureLogDir, `${planLogId}.jsonl`);
     initLogger({ level: "info", filePath: planLogPath, useChalk: false, headless: true });
     console.log(chalk.dim(`   [Plan log: ${planLogPath}]`));
 

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,65 @@ 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/claude/cost.ts
 function parseTokenUsage(output) {
   try {
     const jsonMatch = output.match(/\{[^}]*"usage"\s*:\s*\{[^}]*"input_tokens"\s*:\s*(\d+)[^}]*"output_tokens"\s*:\s*(\d+)[^}]*\}[^}]*\}/);
@@ -3561,7 +3561,7 @@ var init_cost = __esm(() => {
   };
 });
 
-// src/agents/claude-execution.ts
+// src/agents/claude/execution.ts
 function buildCommand(binary, options) {
   const model = options.modelDef.model;
   const { skipPermissions } = resolvePermissions(options.config, options.pipelineStage ?? "run");
@@ -3663,7 +3663,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_claude_execution = __esm(() => {
+var init_execution = __esm(() => {
   init_logger2();
   init_cost();
   _runOnceDeps = {
@@ -3676,7 +3676,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 +3715,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 +18139,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 +18160,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 +18279,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 +18435,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 +18453,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);
@@ -18977,11 +18983,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,7 +19043,7 @@ 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
@@ -19107,8 +19142,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", {
@@ -19569,7 +19605,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 +19630,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 +19681,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 +19731,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,9 +19823,9 @@ 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();
@@ -19817,7 +19870,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 +19935,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 +19947,7 @@ var init_aider = __esm(() => {
   };
 });
 
-// src/agents/adapters/codex.ts
+// src/agents/codex/adapter.ts
 class CodexAdapter {
   name = "codex";
   displayName = "Codex";
@@ -19957,7 +20010,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 +20027,7 @@ var init_codex = __esm(() => {
   };
 });
 
-// src/agents/adapters/gemini.ts
+// src/agents/gemini/adapter.ts
 class GeminiAdapter {
   name = "gemini";
   displayName = "Gemini CLI";
@@ -20057,7 +20110,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 +20127,7 @@ var init_gemini = __esm(() => {
   };
 });
 
-// src/agents/adapters/opencode.ts
+// src/agents/opencode/adapter.ts
 class OpenCodeAdapter {
   name = "opencode";
   displayName = "OpenCode";
@@ -20119,7 +20172,7 @@ class OpenCodeAdapter {
   }
 }
 var _opencodeCompleteDeps;
-var init_opencode = __esm(() => {
+var init_adapter6 = __esm(() => {
   init_types2();
   _opencodeCompleteDeps = {
     which(name) {
@@ -20211,12 +20264,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,
@@ -22085,7 +22138,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.45.0",
+    version: "0.46.0",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22158,8 +22211,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("6a485b9"))
+        return "6a485b9";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -23759,6 +23812,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 +23909,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 +23928,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
@@ -25615,7 +25678,7 @@ ${pluginMarkdown}` : pluginMarkdown;
   };
 });
 
-// src/agents/validation.ts
+// src/agents/shared/validation.ts
 function validateAgentForTier(agent, tier) {
   return agent.capabilities.supportedTiers.includes(tier);
 }
@@ -25629,7 +25692,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"], {
@@ -27742,7 +27805,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 +29160,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 +29459,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 +29505,7 @@ var init_stages = __esm(() => {
   init_completion();
   init_constitution2();
   init_context2();
-  init_execution();
+  init_execution2();
   init_optimizer2();
   init_prompt();
   init_queue_check();
@@ -29464,7 +29520,7 @@ var init_stages = __esm(() => {
   init_context2();
   init_prompt();
   init_optimizer2();
-  init_execution();
+  init_execution2();
   init_verify();
   init_rectify();
   init_review();
@@ -34454,7 +34510,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) {
@@ -69088,7 +69144,7 @@ async function unlockCommand(options) {
 init_config();
 
 // src/execution/runner.ts
-init_adapter();
+init_adapter2();
 init_registry();
 init_hooks();
 init_logger2();
@@ -77039,9 +77095,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]"));
@@ -77286,10 +77343,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 {

package/package.json

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