@nodetool-ai/runtime 0.8.3 → 0.8.4-a13.1

package/dist/providers/claude-agent-provider.d.ts

@@ -1,68 +1,54 @@
-import type { McpSdkServerConfigWithInstance, Options, SdkMcpToolDefinition, SDKMessage, SDKUserMessage } from "@anthropic-ai/claude-agent-sdk";
+import { type ClaudeCliSpawnFn, type ClaudeQueryFn, type ClaudeToolResultBlock } from "./claude-cli.js";
 import { BaseProvider } from "./base-provider.js";
 import { type LanguageModel, type Message, type MessageContent, type ProviderSession, type ProviderStreamItem, type ProviderSkill, type ProviderTool, type ToolCall } from "./types.js";
 import type { RunBudget, TurnBudget } from "../turn-budget.js";
-/**
- * The subset of the SDK `query` signature this provider depends on. We only
- * pass a string for text-only turns or a structured user message for images,
- * and consume the result as an async iterable. Injectable for tests.
- */
-export type ClaudeQueryFn = (params: {
-    prompt: string | AsyncIterable<SDKUserMessage>;
-    options?: Options;
-}) => AsyncIterable<SDKMessage>;
-/** The SDK `createSdkMcpServer` factory. Injectable for tests. */
-export type ClaudeCreateMcpServerFn = (opts: {
-    name: string;
-    version?: string;
-    tools: Array<SdkMcpToolDefinition>;
-}) => McpSdkServerConfigWithInstance;
+export type { ClaudeQueryFn };
 interface ClaudeAgentProviderOptions {
-    /**
-     * Inject the SDK `query` (tests). Defaults to the real `query`, lazily
-     * imported on first use so the browser worker bundle that pulls in this
-     * barrel never tries to bundle the Node-only SDK.
-     */
+    /** Replace the CLI session runner (tests). */
     queryFn?: ClaudeQueryFn;
-    /** Inject the SDK `createSdkMcpServer` (tests). Defaults to the real one. */
-    createMcpServerFn?: ClaudeCreateMcpServerFn;
+    /** Start the CLI process another way (tests). */
+    spawn?: ClaudeCliSpawnFn;
 }
 export declare class ClaudeAgentProvider extends BaseProvider {
-    /** The SDK runs with bypassPermissions, so its built-in `WebSearch` is live. */
+    /** The CLI runs with bypassPermissions, so its built-in `WebSearch` is live. */
     get supportsNativeWebSearch(): boolean;
     static requiredSecrets(): string[];
     private readonly injectedQueryFn;
-    private readonly injectedCreateMcpServerFn;
+    private readonly spawnFn;
+    /** `CLAUDE_CLI_PATH` from settings or the environment, when set. */
+    private readonly configuredCliPath;
+    /** The resolved executable. Cleared on failure so a later install is found. */
+    private cliPath;
     /**
      * Within-process cache of the active session per thread. The persisted
      * `provider_session` column is the source of truth; this only spares a DB
      * round-trip for back-to-back turns in the same process.
      */
     private readonly sessions;
-    constructor(_secrets?: Record<string, unknown>, options?: ClaudeAgentProviderOptions);
-    /** The subscription token is the SDK's business — never hand it to a sandbox. */
+    constructor(secrets?: Record<string, unknown>, options?: ClaudeAgentProviderOptions);
+    /** The subscription token is the CLI's business — never hand it to a sandbox. */
     getContainerEnv(): {};
     /**
-     * Tools run inside the SDK's own agent loop ({@link generateLoop}): NodeTool's
-     * tools are exposed as an in-process MCP server whose handlers call back into
+     * Tools run inside the CLI's own agent loop ({@link generateLoop}): NodeTool's
+     * tools are exposed as a host-served MCP server whose handlers call back into
      * the harness's tool executor. The single-turn {@link generateMessages} stays
      * tool-free.
      */
     hasToolSupport(): Promise<boolean>;
     /**
-     * Stable model aliases the SDK resolves to the latest dated model. Aliases
-     * avoid pinning a version that ages out; the concrete model id the SDK
+     * Stable model aliases the CLI resolves to the latest dated model. Aliases
+     * avoid pinning a version that ages out; the concrete model id the CLI
      * selects is captured from the stream for accurate cost attribution.
      */
     getAvailableLanguageModels(): Promise<LanguageModel[]>;
-    /** Resolve the SDK `query`, lazily importing it off the Node-only package. */
+    /** The CLI executable, located once per provider. */
+    resolveCliPath(): Promise<string>;
+    /** The session runner: the injected one, or the real CLI. */
     private loadQuery;
-    /** Resolve the SDK `createSdkMcpServer`, lazily importing the Node-only pkg. */
-    private loadCreateMcpServer;
     /**
-     * Run the SDK's own agent loop. Tool-free turns behave exactly like
-     * {@link generateMessages}; with `tools` we expose them as an in-process MCP
-     * server whose handlers call `executeTool`, let the SDK loop (`maxTurns > 1`),
+     * Run the CLI's own agent loop. Tool-free turns behave exactly like
+     * {@link generateMessages}; with `tools` we expose them as a host-served MCP
+     * server whose handlers call `executeTool`, let the CLI loop (`maxTurns > 1`),
      * and translate its `tool_use`/`tool_result` stream into ToolCall items and
      * persistable {@link ProviderMessageEvent}s.
      */
@@ -75,14 +61,14 @@ export declare class ClaudeAgentProvider extends BaseProvider {
         workspaceDir?: string;
         /**
          * The user's DB skills. Materialized into an isolated local plugin so the
-         * SDK's native `Skill` tool can list and load them on demand, keeping
+         * CLI's native `Skill` tool can list and load them on demand, keeping
          * `settingSources: []` intact (no `~/.claude` / `CLAUDE.md` leakage). The
          * caller hands these in instead of baking a skill catalog into the system
          * prompt — this provider owns skill resolution.
          */
         skills?: ProviderSkill[];
     }): AsyncGenerator<ProviderStreamItem>;
-    private generateSdkLoop;
+    private generateCliLoop;
     generateMessages(args: {
         messages: Message[];
         model: string;
@@ -104,11 +90,11 @@ export declare class ClaudeAgentProvider extends BaseProvider {
     /**
      * Shared session machinery for {@link generateMessages} and
      * {@link generateLoop}: decide resume vs fresh (best-effort, with a
-     * full-history priming fallback), then drive one SDK turn via {@link runTurn}.
+     * full-history priming fallback), then drive one CLI turn via {@link runTurn}.
      * `config` selects single-turn streaming vs the tool/message-emitting loop.
      */
     private runWithSession;
-    /** Drive one SDK `query` turn and translate its messages into stream items. */
+    /** Drive one CLI session and translate its messages into stream items. */
     private runTurn;
     /** Record token usage from a terminal `result` message (success or error). */
     private trackResultUsage;
@@ -128,19 +114,11 @@ export declare class ClaudeAgentProvider extends BaseProvider {
         signal?: AbortSignal;
     }): Promise<Message>;
 }
-type McpContentBlock = {
-    type: "text";
-    text: string;
-} | {
-    type: "image";
-    data: string;
-    mimeType: string;
-};
+type McpContentBlock = ClaudeToolResultBlock;
 /**
  * Convert a tool result into MCP content blocks. Text passes through; image
- * parts become MCP image blocks (the SDK forwards them to Claude as real
+ * parts become MCP image blocks (the CLI forwards them to Claude as real
  * images). An image that can't be inlined becomes a failure note.
  */
 export declare function toolResultToMcpContent(result: string | MessageContent[]): McpContentBlock[];
-export {};
 //# sourceMappingURL=claude-agent-provider.d.ts.map

package/dist/providers/claude-agent-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-agent-provider.d.ts","sourceRoot":"","sources":["../../src/providers/claude-agent-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude-agent-provider.d.ts","sourceRoot":"","sources":["../../src/providers/claude-agent-provider.ts"],"names":[],"mappings":"AAoCA,OAAO,EASL,KAAK,gBAAgB,EAMrB,KAAK,aAAa,EAElB,KAAK,qBAAqB,EAE3B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,YAAY,EAGb,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAIL,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,cAAc,EAEnB,KAAK,eAAe,EAEpB,KAAK,kBAAkB,EAEvB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EAEX,MAAM,mBAAmB,CAAC;AAuC3B,YAAY,EAAE,aAAa,EAAE,CAAC;AAwE9B,UAAU,0BAA0B;IAClC,8CAA8C;IAC9C,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,iDAAiD;IACjD,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC1B;AAED,qBAAa,mBAAoB,SAAQ,YAAY;IACnD,gFAAgF;IAChF,IAAa,uBAAuB,IAAI,OAAO,CAE9C;IAED,MAAM,CAAC,eAAe,IAAI,MAAM,EAAE,CAIjC;IAED,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuB;IACvD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;IACvD,oEAAoE;IACpE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,+EAA+E;IAC/E,OAAO,CAAC,OAAO,CAAgC;IAC/C;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsC;IAE/D,YACE,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACrC,OAAO,GAAE,0BAA+B,EAWzC;IAED,iFAAiF;IACxE,eAAe,OAEvB;IAED;;;;;OAKG;IACY,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAEhD;IAED;;;;OAIG;IACY,0BAA0B,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAQpE;IAED,qDAAqD;IACrD,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAQhC;IAED,6DAA6D;IAC7D,OAAO,CAAC,SAAS;IAUjB;;;;;;OAMG;IACa,YAAY,CAC1B,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QAC7D,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,MAAM,GAAG,cAAc,EAAE,CAAC,CAAC;QACzE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;QACpC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB;;;;;;WAMG;QACH,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;KAC1B,GACA,cAAc,CAAC,kBAAkB,CAAC,CAEpC;YAEc,eAAe;IAwLd,gBAAgB,CAAC,IAAI,EAAE;QACrC,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;QAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,eAAe,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;QACzC,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3C,UAAU,CAAC,EAAE,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC1B,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,EAAE,WAAW,CAAC;KACtB,GAAG,cAAc,CAAC,kBAAkB,CAAC,CAqBrC;IAED;;;;;OAKG;YACY,cAAc;IAgF7B,0EAA0E;YAC3D,OAAO;IA4WtB,8EAA8E;IAC9E,OAAO,CAAC,gBAAgB;IAgBT,eAAe,CAAC,IAAI,EAAE;QACnC,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;QACvB,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;QAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,eAAe,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;QACzC,UAAU,CAAC,EAAE,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC1B,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,EAAE,WAAW,CAAC;KACtB,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBnB;CACF;AAmRD,KAAK,eAAe,GAAG,qBAAqB,CAAC;AAqC7C;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,GAAG,cAAc,EAAE,GAChC,eAAe,EAAE,CAyBnB"}