@nathapp/nax 0.45.0 → 0.46.0

package/src/agents/acp/adapter.ts

@@ -15,7 +15,7 @@ import { createHash } from "node:crypto";
 import { join } from "node:path";
 import { resolvePermissions } from "../../config/permissions";
 import { getSafeLogger } from "../../logger";
-import { buildDecomposePrompt, parseDecomposeOutput } from "../claude-decompose";
+import { buildDecomposePrompt, parseDecomposeOutput } from "../shared/decompose";
 import { createSpawnAcpClient } from "./spawn-client";
 
 import type {
@@ -80,7 +80,14 @@ const DEFAULT_ENTRY: AgentRegistryEntry = {
 export interface AcpSessionResponse {
   messages: Array<{ role: string; content: string }>;
   stopReason: string;
-  cumulative_token_usage?: { input_tokens: number; output_tokens: number };
+  cumulative_token_usage?: {
+    input_tokens: number;
+    output_tokens: number;
+    cache_read_input_tokens?: number;
+    cache_creation_input_tokens?: number;
+  };
+  /** Exact cost in USD from acpx usage_update event. Preferred over token-based estimation. */
+  exactCostUsd?: number;
 }
 
 export interface AcpSession {
@@ -555,7 +562,13 @@ export class AcpAgentAdapter implements AgentAdapter {
     // Tracks whether the run completed successfully — used by finally to decide
     // whether to close the session (success) or keep it open for retry (failure).
     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: number | undefined;
 
     try {
       // 5. Multi-turn loop
@@ -577,10 +590,16 @@ export class AcpAgentAdapter implements AgentAdapter {
         lastResponse = turnResult.response;
         if (!lastResponse) break;
 
-        // Accumulate token usage
+        // Accumulate token usage and exact cost
         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;
         }
 
         // Check for agent question → route to interaction bridge
@@ -643,10 +662,12 @@ export class AcpAgentAdapter implements AgentAdapter {
     const success = lastResponse?.stopReason === "end_turn";
     const output = extractOutput(lastResponse);
 
+    // Prefer exact cost from acpx usage_update; fall back to token-based estimation
     const estimatedCost =
-      totalTokenUsage.input_tokens > 0 || totalTokenUsage.output_tokens > 0
+      totalExactCostUsd ??
+      (totalTokenUsage.input_tokens > 0 || totalTokenUsage.output_tokens > 0
         ? estimateCostFromTokenUsage(totalTokenUsage, options.modelDef.model)
-        : 0;
+        : 0);
 
     return {
       success,
@@ -719,6 +740,13 @@ export class AcpAgentAdapter implements AgentAdapter {
           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 error = err instanceof Error ? err : new Error(String(err));

package/src/agents/acp/index.ts

@@ -4,6 +4,4 @@
 
 export { AcpAgentAdapter, _acpAdapterDeps } from "./adapter";
 export { createSpawnAcpClient } from "./spawn-client";
-export { estimateCostFromTokenUsage } from "./cost";
-export type { SessionTokenUsage } from "./cost";
 export type { AgentRegistryEntry } from "./types";

package/src/agents/acp/parser.ts

@@ -2,11 +2,9 @@
  * ACP adapter — NDJSON and JSON-RPC output parsing helpers.
  *
  * Extracted from adapter.ts to keep that file within the 800-line limit.
- * Used only by _runOnce() (the spawn-based legacy path).
+ * Used by SpawnAcpSession.prompt() to parse acpx stdout.
  */
 
-import type { AgentRunOptions } from "../types";
-
 // ─────────────────────────────────────────────────────────────────────────────
 // Types
 // ─────────────────────────────────────────────────────────────────────────────
@@ -15,131 +13,86 @@ import type { AgentRunOptions } from "../types";
 export interface AcpxTokenUsage {
   input_tokens: number;
   output_tokens: number;
-}
-
-/** JSON-RPC message from acpx --format json --json-strict */
-interface JsonRpcMessage {
-  jsonrpc: "2.0";
-  method?: string;
-  params?: {
-    sessionId: string;
-    update?: {
-      sessionUpdate: string;
-      content?: { type: string; text?: string };
-      used?: number;
-      size?: number;
-      cost?: { amount: number; currency: string };
-    };
-  };
-  id?: number | string;
-  result?: unknown;
-  error?: { code: number; message: string };
+  cache_read_input_tokens?: number;
+  cache_creation_input_tokens?: number;
 }
 
 // ─────────────────────────────────────────────────────────────────────────────
-// streamJsonRpcEvents
+// parseAcpxJsonOutput
 // ─────────────────────────────────────────────────────────────────────────────
 
 /**
- * Stream stdout line-by-line, parse JSON-RPC, detect questions, call bridge.
+ * Parse acpx NDJSON output for assistant text, token usage, and exact cost.
+ *
+ * Handles the JSON-RPC envelope format emitted by acpx:
+ * - session/update agent_message_chunk → text accumulation
+ * - session/update usage_update → exact cost (cost.amount) + context size
+ * - id/result → token breakdown (inputTokens, outputTokens, cachedWriteTokens, cachedReadTokens)
+ *
+ * Also handles legacy flat NDJSON format for backward compatibility.
  */
-export async function streamJsonRpcEvents(
-  stdout: ReadableStream<Uint8Array>,
-  bridge: AgentRunOptions["interactionBridge"],
-  _sessionId: string,
-): Promise<{ text: string; tokenUsage?: AcpxTokenUsage }> {
-  let accumulatedText = "";
+export function parseAcpxJsonOutput(rawOutput: string): {
+  text: string;
+  tokenUsage?: AcpxTokenUsage;
+  exactCostUsd?: number;
+  stopReason?: string;
+  error?: string;
+} {
+  const lines = rawOutput.split("\n").filter((l) => l.trim());
+  let text = "";
   let tokenUsage: AcpxTokenUsage | undefined;
-  const decoder = new TextDecoder();
-  let buffer = "";
-
-  const reader = stdout.getReader();
-
-  try {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-
-      buffer += decoder.decode(value, { stream: true });
-      const lines = buffer.split("\n");
-      buffer = lines.pop() ?? "";
-
-      for (const line of lines) {
-        if (!line.trim()) continue;
+  let exactCostUsd: number | undefined;
+  let stopReason: string | undefined;
+  let error: string | undefined;
 
-        let msg: JsonRpcMessage;
-        try {
-          msg = JSON.parse(line);
-        } catch {
-          continue;
-        }
+  for (const line of lines) {
+    try {
+      const event = JSON.parse(line);
 
-        if (msg.method === "session/update" && msg.params?.update) {
-          const update = msg.params.update;
+      // ── JSON-RPC envelope format (acpx v0.3+) ──────────────────────────────
+      if (event.jsonrpc === "2.0") {
+        // session/update events
+        if (event.method === "session/update" && event.params?.update) {
+          const update = event.params.update;
 
+          // Text chunks
           if (
             update.sessionUpdate === "agent_message_chunk" &&
             update.content?.type === "text" &&
             update.content.text
           ) {
-            accumulatedText += update.content.text;
-
-            if (bridge?.detectQuestion && bridge.onQuestionDetected) {
-              const isQuestion = await bridge.detectQuestion(accumulatedText);
-              if (isQuestion) {
-                const response = await bridge.onQuestionDetected(accumulatedText);
-                accumulatedText += `\n\n[Human response: ${response}]`;
-              }
-            }
+            text += update.content.text;
           }
 
-          if (update.sessionUpdate === "usage_update" && update.used !== undefined) {
-            const total = update.used;
-            tokenUsage = {
-              input_tokens: Math.floor(total * 0.3),
-              output_tokens: Math.floor(total * 0.7),
-            };
+          // Exact cost from usage_update
+          if (update.sessionUpdate === "usage_update" && typeof update.cost?.amount === "number") {
+            exactCostUsd = update.cost.amount;
           }
         }
 
-        if (msg.result) {
-          const result = msg.result as Record<string, unknown>;
-          if (typeof result === "string") {
-            accumulatedText += result;
-          }
-        }
-      }
-    }
-  } finally {
-    reader.releaseLock();
-  }
-
-  return { text: accumulatedText.trim(), tokenUsage };
-}
+        // Final result with token breakdown (camelCase from acpx)
+        if (event.id !== undefined && event.result && typeof event.result === "object") {
+          const result = event.result as Record<string, unknown>;
 
-// ─────────────────────────────────────────────────────────────────────────────
-// parseAcpxJsonOutput
-// ─────────────────────────────────────────────────────────────────────────────
+          if (result.stopReason) stopReason = result.stopReason as string;
+          if (result.stop_reason) stopReason = result.stop_reason as string;
 
-/**
- * Parse acpx NDJSON output for assistant text and token usage.
- */
-export function parseAcpxJsonOutput(rawOutput: string): {
-  text: string;
-  tokenUsage?: AcpxTokenUsage;
-  stopReason?: string;
-  error?: string;
-} {
-  const lines = rawOutput.split("\n").filter((l) => l.trim());
-  let text = "";
-  let tokenUsage: AcpxTokenUsage | undefined;
-  let stopReason: string | undefined;
-  let error: string | undefined;
+          if (result.usage && typeof result.usage === "object") {
+            const u = result.usage as Record<string, unknown>;
+            tokenUsage = {
+              input_tokens: (u.inputTokens as number) ?? (u.input_tokens as number) ?? 0,
+              output_tokens: (u.outputTokens as number) ?? (u.output_tokens as number) ?? 0,
+              cache_read_input_tokens: (u.cachedReadTokens as number) ?? (u.cache_read_input_tokens as number) ?? 0,
+              cache_creation_input_tokens:
+                (u.cachedWriteTokens as number) ?? (u.cache_creation_input_tokens as number) ?? 0,
+            };
+          }
+        }
 
-  for (const line of lines) {
-    try {
-      const event = JSON.parse(line);
+        continue;
+      }
 
+      // ── Legacy flat NDJSON format ───────────────────────────────────────────
       if (event.content && typeof event.content === "string") text += event.content;
       if (event.text && typeof event.text === "string") text += event.text;
       if (event.result && typeof event.result === "string") text = event.result;
@@ -162,5 +115,5 @@ export function parseAcpxJsonOutput(rawOutput: string): {
     }
   }
 
-  return { text: text.trim(), tokenUsage, stopReason, error };
+  return { text: text.trim(), tokenUsage, exactCostUsd, stopReason, error };
 }

package/src/agents/acp/spawn-client.ts

@@ -180,8 +180,9 @@ class SpawnAcpSession implements AcpSession {
         const parsed = parseAcpxJsonOutput(stdout);
         return {
           messages: [{ role: "assistant", content: parsed.text || "" }],
-          stopReason: "end_turn",
+          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", {

package/src/agents/{claude.ts → claude/adapter.ts}

@@ -4,15 +4,11 @@
  * Main adapter class coordinating execution, completion, decomposition, and interactive modes.
  */
 
-import { resolvePermissions } from "../config/permissions";
-import { PidRegistry } from "../execution/pid-registry";
-import { withProcessTimeout } from "../execution/timeout-handler";
-import { getLogger } from "../logger";
-import { _completeDeps, executeComplete } from "./claude-complete";
-import { buildDecomposePrompt, parseDecomposeOutput } from "./claude-decompose";
-import { _runOnceDeps, buildAllowedEnv, buildCommand, executeOnce } from "./claude-execution";
-import { runInteractiveMode } from "./claude-interactive";
-import { runPlan } from "./claude-plan";
+import { resolvePermissions } from "../../config/permissions";
+import { PidRegistry } from "../../execution/pid-registry";
+import { withProcessTimeout } from "../../execution/timeout-handler";
+import { getLogger } from "../../logger";
+import { buildDecomposePrompt, parseDecomposeOutput } from "../shared/decompose";
 import type {
   AgentAdapter,
   AgentCapabilities,
@@ -25,7 +21,11 @@ import type {
   PlanOptions,
   PlanResult,
   PtyHandle,
-} from "./types";
+} from "../types";
+import { _completeDeps, executeComplete } from "./complete";
+import { _runOnceDeps, buildAllowedEnv, buildCommand, executeOnce } from "./execution";
+import { runInteractiveMode } from "./interactive";
+import { runPlan } from "./plan";
 
 /**
  * Injectable dependencies for decompose() — allows tests to intercept
@@ -174,7 +174,7 @@ export class ClaudeCodeAdapter implements AgentAdapter {
   }
 
   async decompose(options: DecomposeOptions): Promise<DecomposeResult> {
-    const { resolveBalancedModelDef } = await import("./model-resolution");
+    const { resolveBalancedModelDef } = await import("../shared/model-resolution");
 
     const prompt = buildDecomposePrompt(options);
 
@@ -186,7 +186,10 @@ export class ClaudeCodeAdapter implements AgentAdapter {
       modelDef = resolveBalancedModelDef(options.config);
     }
 
-    const { skipPermissions } = resolvePermissions(options.config as import("../config").NaxConfig | undefined, "run");
+    const { skipPermissions } = resolvePermissions(
+      options.config as import("../../config").NaxConfig | undefined,
+      "run",
+    );
     const cmd = [this.binary, "--model", modelDef.model, "-p", prompt];
     if (skipPermissions) {
       cmd.splice(cmd.length - 2, 0, "--dangerously-skip-permissions");

package/src/agents/{claude-complete.ts → claude/complete.ts}

@@ -4,9 +4,9 @@
  * Standalone completion endpoint for simple prompts.
  */
 
-import { resolvePermissions } from "../config/permissions";
-import type { CompleteOptions } from "./types";
-import { CompleteError } from "./types";
+import { resolvePermissions } from "../../config/permissions";
+import type { CompleteOptions } from "../types";
+import { CompleteError } from "../types";
 
 /**
  * Injectable dependencies for complete() — allows tests to intercept

package/src/agents/{cost.ts → claude/cost.ts}

@@ -5,7 +5,7 @@
  * Parses agent output for token usage and calculates costs.
  */
 
-import type { ModelTier } from "../config/schema";
+import type { ModelTier } from "../../config/schema";
 
 /** Cost rates per 1M tokens (USD) */
 export interface ModelCostRates {

package/src/agents/{claude-execution.ts → claude/execution.ts}

@@ -4,12 +4,12 @@
  * Handles building commands, preparing environment, and process execution.
  */
 
-import { resolvePermissions } from "../config/permissions";
-import type { PidRegistry } from "../execution/pid-registry";
-import { withProcessTimeout } from "../execution/timeout-handler";
-import { getLogger } from "../logger";
+import { resolvePermissions } from "../../config/permissions";
+import type { PidRegistry } from "../../execution/pid-registry";
+import { withProcessTimeout } from "../../execution/timeout-handler";
+import { getLogger } from "../../logger";
+import type { AgentResult, AgentRunOptions } from "../types";
 import { estimateCostByDuration, estimateCostFromOutput } from "./cost";
-import type { AgentResult, AgentRunOptions } from "./types";
 
 /**
  * Maximum characters to capture from agent stdout.

package/src/agents/claude/index.ts

@@ -0,0 +1,3 @@
+// Re-export everything external callers need from claude/
+export { ClaudeCodeAdapter, _completeDeps, _claudeAdapterDeps } from "./adapter";
+export { _runOnceDeps } from "./execution";

package/src/agents/{claude-interactive.ts → claude/interactive.ts}

@@ -4,10 +4,10 @@
  * Handles terminal UI interactions with the Claude agent.
  */
 
-import type { PidRegistry } from "../execution/pid-registry";
-import { getLogger } from "../logger";
-import { buildAllowedEnv } from "./claude-execution";
-import type { AgentRunOptions, InteractiveRunOptions, PtyHandle } from "./types";
+import type { PidRegistry } from "../../execution/pid-registry";
+import { getLogger } from "../../logger";
+import type { AgentRunOptions, InteractiveRunOptions, PtyHandle } from "../types";
+import { buildAllowedEnv } from "./execution";
 
 /**
  * Run Claude agent in interactive (TTY) mode for TUI output.

package/src/agents/{claude-plan.ts → claude/plan.ts}

@@ -7,13 +7,13 @@ import { join } from "node:path";
  * Extracted from claude.ts: plan(), buildPlanCommand()
  */
 
-import { resolvePermissions } from "../config/permissions";
-import type { PidRegistry } from "../execution/pid-registry";
-import { withProcessTimeout } from "../execution/timeout-handler";
-import { getLogger } from "../logger";
-import { resolveBalancedModelDef } from "./model-resolution";
-import type { AgentRunOptions } from "./types";
-import type { PlanOptions, PlanResult } from "./types-extended";
+import { resolvePermissions } from "../../config/permissions";
+import type { PidRegistry } from "../../execution/pid-registry";
+import { withProcessTimeout } from "../../execution/timeout-handler";
+import { getLogger } from "../../logger";
+import { resolveBalancedModelDef } from "../shared/model-resolution";
+import type { PlanOptions, PlanResult } from "../shared/types-extended";
+import type { AgentRunOptions } from "../types";
 
 /**
  * Build the CLI command for plan mode.
@@ -32,7 +32,10 @@ export function buildPlanCommand(binary: string, options: PlanOptions): string[]
   }
 
   // Resolve permission mode from config
-  const { skipPermissions } = resolvePermissions(options.config as import("../config").NaxConfig | undefined, "plan");
+  const { skipPermissions } = resolvePermissions(
+    options.config as import("../../config").NaxConfig | undefined,
+    "plan",
+  );
   if (skipPermissions) {
     cmd.push("--dangerously-skip-permissions");
   }
@@ -75,7 +78,7 @@ export async function runPlan(
   pidRegistry: PidRegistry,
   buildAllowedEnv: (options: AgentRunOptions) => Record<string, string | undefined>,
 ): Promise<PlanResult> {
-  const { resolveBalancedModelDef } = await import("./model-resolution");
+  const { resolveBalancedModelDef } = await import("../shared/model-resolution");
 
   const cmd = buildPlanCommand(binary, options);
 

package/src/agents/index.ts

@@ -2,7 +2,7 @@ export type { AgentAdapter, AgentCapabilities, AgentResult, AgentRunOptions, Com
 export { CompleteError } from "./types";
 export { ClaudeCodeAdapter } from "./claude";
 export { getAllAgentNames, getAgent, getInstalledAgents, checkAgentHealth } from "./registry";
-export type { ModelCostRates, TokenUsage, CostEstimate, TokenUsageWithConfidence } from "./cost";
+export type { ModelCostRates, TokenUsage, CostEstimate, TokenUsageWithConfidence } from "./claude/cost";
 export {
   COST_RATES,
   parseTokenUsage,
@@ -10,7 +10,7 @@ export {
   estimateCostFromOutput,
   estimateCostByDuration,
   formatCostWithConfidence,
-} from "./cost";
-export { validateAgentForTier, validateAgentFeature, describeAgentCapabilities } from "./validation";
-export type { AgentVersionInfo } from "./version-detection";
-export { getAgentVersion, getAgentVersions } from "./version-detection";
+} from "./claude/cost";
+export { validateAgentForTier, validateAgentFeature, describeAgentCapabilities } from "./shared/validation";
+export type { AgentVersionInfo } from "./shared/version-detection";
+export { getAgentVersion, getAgentVersions } from "./shared/version-detection";

package/src/agents/registry.ts

@@ -7,11 +7,11 @@
 import type { NaxConfig } from "../config/schema";
 import { getLogger } from "../logger";
 import { AcpAgentAdapter } from "./acp/adapter";
-import { AiderAdapter } from "./adapters/aider";
-import { CodexAdapter } from "./adapters/codex";
-import { GeminiAdapter } from "./adapters/gemini";
-import { OpenCodeAdapter } from "./adapters/opencode";
-import { ClaudeCodeAdapter } from "./claude";
+import { AiderAdapter } from "./aider/adapter";
+import { ClaudeCodeAdapter } from "./claude/adapter";
+import { CodexAdapter } from "./codex/adapter";
+import { GeminiAdapter } from "./gemini/adapter";
+import { OpenCodeAdapter } from "./opencode/adapter";
 import type { AgentAdapter } from "./types";
 
 /** All known agent adapters */

package/src/agents/{claude-decompose.ts → shared/decompose.ts}

@@ -5,8 +5,8 @@
  * parseDecomposeOutput(), validateComplexity()
  */
 
-import { COMPLEXITY_GUIDE, GROUPING_RULES, TEST_STRATEGY_GUIDE, resolveTestStrategy } from "../config/test-strategy";
-import type { DecomposeOptions, DecomposeResult, DecomposedStory } from "./types";
+import { COMPLEXITY_GUIDE, GROUPING_RULES, TEST_STRATEGY_GUIDE, resolveTestStrategy } from "../../config/test-strategy";
+import type { DecomposeOptions, DecomposeResult, DecomposedStory } from "../types";
 
 /**
  * Build the decompose prompt combining spec content and codebase context.

package/src/agents/{model-resolution.ts → shared/model-resolution.ts}

@@ -7,8 +7,8 @@
  * Implementation placeholder — logic to be filled in by the implementer.
  */
 
-import { resolveModel } from "../config/schema";
-import type { ModelDef, NaxConfig } from "../config/schema";
+import { resolveModel } from "../../config/schema";
+import type { ModelDef, NaxConfig } from "../../config/schema";
 
 /**
  * Resolve the balanced model definition from config, with optional adapter default fallback.

package/src/agents/{types-extended.ts → shared/types-extended.ts}

@@ -5,7 +5,7 @@
  * Separated from core types to keep each file under 400 lines.
  */
 
-import type { ModelDef, ModelTier, NaxConfig } from "../config/schema";
+import type { ModelDef, ModelTier, NaxConfig } from "../../config/schema";
 
 /**
  * Configuration options for running an agent in plan mode.
@@ -56,7 +56,7 @@ export interface PlanOptions {
    */
   onAcpSessionCreated?: (sessionName: string) => Promise<void> | void;
   /** PID registry for tracking spawned agent processes — cleanup on crash/SIGTERM */
-  pidRegistry?: import("../execution/pid-registry").PidRegistry;
+  pidRegistry?: import("../../execution/pid-registry").PidRegistry;
 }
 
 /**
@@ -117,7 +117,7 @@ export interface DecomposedStory {
   /** Implementation risks */
   risks: string[];
   /** Test strategy recommendation from LLM */
-  testStrategy?: import("../config/test-strategy").TestStrategy;
+  testStrategy?: import("../../config/test-strategy").TestStrategy;
 }
 
 /**
@@ -161,4 +161,4 @@ export interface InteractiveRunOptions extends AgentRunOptions {
 }
 
 // Re-import for the extends clause
-import type { AgentRunOptions } from "./types";
+import type { AgentRunOptions } from "../types";

package/src/agents/{validation.ts → shared/validation.ts}

@@ -4,8 +4,8 @@
  * Runtime validation for agent capabilities and tier compatibility.
  */
 
-import type { ModelTier } from "../config/schema";
-import type { AgentAdapter } from "./types";
+import type { ModelTier } from "../../config/schema";
+import type { AgentAdapter } from "../types";
 
 /**
  * Check if an agent supports a given model tier.

package/src/agents/{version-detection.ts → shared/version-detection.ts}

@@ -5,8 +5,8 @@
  * by running `<agent> --version` and parsing the output.
  */
 
-import { getInstalledAgents } from "./registry";
-import type { AgentAdapter } from "./types";
+import { getInstalledAgents } from "../registry";
+import type { AgentAdapter } from "../types";
 
 /**
  * Information about an installed agent including its version
@@ -90,7 +90,7 @@ export async function getAgentVersions(): Promise<AgentVersionInfo[]> {
   const agentsByName = new Map(agents.map((a) => [a.name, a]));
 
   // Import ALL_AGENTS to include non-installed ones
-  const { ALL_AGENTS } = await import("./registry");
+  const { ALL_AGENTS } = await import("../registry");
 
   const versions = await Promise.all(
     ALL_AGENTS.map(async (agent: AgentAdapter): Promise<AgentVersionInfo> => {

package/src/agents/types.ts

@@ -18,7 +18,7 @@ export type {
   DecomposedStory,
   PtyHandle,
   InteractiveRunOptions,
-} from "./types-extended";
+} from "./shared/types-extended";
 
 /**
  * Agent execution result returned after running a coding agent.
@@ -165,10 +165,12 @@ export interface AgentAdapter {
   buildCommand(options: AgentRunOptions): string[];
 
   /** Run the agent in plan mode to generate a feature specification. */
-  plan(options: import("./types-extended").PlanOptions): Promise<import("./types-extended").PlanResult>;
+  plan(options: import("./shared/types-extended").PlanOptions): Promise<import("./shared/types-extended").PlanResult>;
 
   /** Run the agent in decompose mode to break spec into classified stories. */
-  decompose(options: import("./types-extended").DecomposeOptions): Promise<import("./types-extended").DecomposeResult>;
+  decompose(
+    options: import("./shared/types-extended").DecomposeOptions,
+  ): Promise<import("./shared/types-extended").DecomposeResult>;
 
   /**
    * Run a one-shot LLM call and return the plain text response.
@@ -181,5 +183,7 @@ export interface AgentAdapter {
    * This method is optional — only implemented by agents that support
    * interactive terminal sessions (e.g., Claude Code).
    */
-  runInteractive?(options: import("./types-extended").InteractiveRunOptions): import("./types-extended").PtyHandle;
+  runInteractive?(
+    options: import("./shared/types-extended").InteractiveRunOptions,
+  ): import("./shared/types-extended").PtyHandle;
 }

package/src/cli/agents.ts

@@ -5,7 +5,7 @@
  */
 
 import { ALL_AGENTS } from "../agents/registry";
-import { getAgentVersion } from "../agents/version-detection";
+import { getAgentVersion } from "../agents/shared/version-detection";
 import type { NaxConfig } from "../config/schema";
 
 /**