ai-sdk-provider-claude-code 0.2.1 → 1.0.0-beta.1

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { LanguageModelV1, ProviderV1, APICallError, LoadAPIKeyError } from '@ai-sdk/provider';
+import { LanguageModelV2, ProviderV2, APICallError, LoadAPIKeyError } from '@ai-sdk/provider';
 import { PermissionMode, McpServerConfig } from '@anthropic-ai/claude-code';
 
 /**
@@ -25,7 +25,7 @@ interface Logger {
     error: (message: string) => void;
 }
 /**
- * Configuration settings for Claude Code CLI behavior.
+ * Configuration settings for Claude Code SDK behavior.
  * These settings control how the CLI executes, what permissions it has,
  * and which tools are available during conversations.
  *
@@ -42,7 +42,7 @@ interface Logger {
  */
 interface ClaudeCodeSettings {
     /**
-     * Custom path to Claude Code CLI executable
+     * Custom path to Claude Code SDK executable
      * @default 'claude' (uses system PATH)
      */
     pathToClaudeCodeExecutable?: string;
@@ -179,9 +179,9 @@ interface ClaudeCodeLanguageModelOptions {
  */
 type ClaudeCodeModelId = 'opus' | 'sonnet' | (string & {});
 /**
- * Language model implementation for Claude Code CLI.
+ * Language model implementation for Claude Code SDK.
  * This class implements the AI SDK's LanguageModelV1 interface to provide
- * integration with Claude models through the Claude Code CLI.
+ * integration with Claude models through the Claude Code SDK.
  *
  * Features:
  * - Supports streaming and non-streaming generation
@@ -207,10 +207,11 @@ type ClaudeCodeModelId = 'opus' | 'sonnet' | (string & {});
  * });
  * ```
  */
-declare class ClaudeCodeLanguageModel implements LanguageModelV1 {
-    readonly specificationVersion: "v1";
+declare class ClaudeCodeLanguageModel implements LanguageModelV2 {
+    readonly specificationVersion: "v2";
     readonly defaultObjectGenerationMode: "json";
     readonly supportsImageUrls = false;
+    readonly supportedUrls: {};
     readonly supportsStructuredOutputs = false;
     readonly modelId: ClaudeCodeModelId;
     readonly settings: ClaudeCodeSettings;
@@ -226,8 +227,8 @@ declare class ClaudeCodeLanguageModel implements LanguageModelV1 {
     private handleClaudeCodeError;
     private setSessionId;
     private validateJsonExtraction;
-    doGenerate(options: Parameters<LanguageModelV1['doGenerate']>[0]): Promise<Awaited<ReturnType<LanguageModelV1['doGenerate']>>>;
-    doStream(options: Parameters<LanguageModelV1['doStream']>[0]): Promise<Awaited<ReturnType<LanguageModelV1['doStream']>>>;
+    doGenerate(options: Parameters<LanguageModelV2['doGenerate']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doGenerate']>>>;
+    doStream(options: Parameters<LanguageModelV2['doStream']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doStream']>>>;
 }
 
 /**
@@ -246,7 +247,7 @@ declare class ClaudeCodeLanguageModel implements LanguageModelV1 {
  * const languageModel = claudeCode.languageModel('opus', { maxTurns: 10 });
  * ```
  */
-interface ClaudeCodeProvider extends ProviderV1 {
+interface ClaudeCodeProvider extends ProviderV2 {
     /**
      * Creates a language model instance for the specified model ID.
      * This is a shorthand for calling `languageModel()`.
@@ -255,7 +256,7 @@ interface ClaudeCodeProvider extends ProviderV1 {
      * @param settings - Optional settings to configure the model
      * @returns A language model instance
      */
-    (modelId: ClaudeCodeModelId, settings?: ClaudeCodeSettings): LanguageModelV1;
+    (modelId: ClaudeCodeModelId, settings?: ClaudeCodeSettings): LanguageModelV2;
     /**
      * Creates a language model instance for text generation.
      *
@@ -263,7 +264,7 @@ interface ClaudeCodeProvider extends ProviderV1 {
      * @param settings - Optional settings to configure the model
      * @returns A language model instance
      */
-    languageModel(modelId: ClaudeCodeModelId, settings?: ClaudeCodeSettings): LanguageModelV1;
+    languageModel(modelId: ClaudeCodeModelId, settings?: ClaudeCodeSettings): LanguageModelV2;
     /**
      * Alias for `languageModel()` to maintain compatibility with AI SDK patterns.
      *
@@ -271,7 +272,8 @@ interface ClaudeCodeProvider extends ProviderV1 {
      * @param settings - Optional settings to configure the model
      * @returns A language model instance
      */
-    chat(modelId: ClaudeCodeModelId, settings?: ClaudeCodeSettings): LanguageModelV1;
+    chat(modelId: ClaudeCodeModelId, settings?: ClaudeCodeSettings): LanguageModelV2;
+    imageModel(modelId: string): never;
 }
 /**
  * Configuration options for creating a Claude Code provider instance.
@@ -332,7 +334,7 @@ declare function createClaudeCode(options?: ClaudeCodeProviderSettings): ClaudeC
 declare const claudeCode: ClaudeCodeProvider;
 
 /**
- * Metadata associated with Claude Code CLI errors.
+ * Metadata associated with Claude Code SDK errors.
  * Provides additional context about command execution failures.
  */
 interface ClaudeCodeErrorMetadata {
@@ -341,7 +343,7 @@ interface ClaudeCodeErrorMetadata {
      */
     code?: string;
     /**
-     * Exit code from the Claude Code CLI process.
+     * Exit code from the Claude Code SDK process.
      * Common codes:
      * - 401: Authentication error
      * - 1: General error
@@ -373,7 +375,7 @@ interface ClaudeCodeErrorMetadata {
  * @example
  * ```typescript
  * throw createAPICallError({
- *   message: 'Claude Code CLI failed',
+ *   message: 'Claude Code SDK failed',
  *   code: 'ENOENT',
  *   isRetryable: true
  * });
@@ -384,7 +386,7 @@ declare function createAPICallError({ message, code, exitCode, stderr, promptExc
     isRetryable?: boolean;
 }): APICallError;
 /**
- * Creates an authentication error for Claude Code CLI login failures.
+ * Creates an authentication error for Claude Code SDK login failures.
  *
  * @param options - Error configuration
  * @param options.message - Error message describing the authentication failure
@@ -401,7 +403,7 @@ declare function createAuthenticationError({ message, }: {
     message: string;
 }): LoadAPIKeyError;
 /**
- * Creates a timeout error for Claude Code CLI operations.
+ * Creates a timeout error for Claude Code SDK operations.
  *
  * @param options - Timeout error details
  * @param options.message - Error message describing the timeout
@@ -435,7 +437,7 @@ declare function createTimeoutError({ message, promptExcerpt, timeoutMs, }: {
  *   await model.generate(...);
  * } catch (error) {
  *   if (isAuthenticationError(error)) {
- *     console.log('Please authenticate with Claude Code CLI');
+ *     console.log('Please authenticate with Claude Code SDK');
  *   }
  * }
  * ```

package/dist/index.js

@@ -6,7 +6,7 @@ import { NoSuchModelError } from "@ai-sdk/provider";
 import { generateId } from "@ai-sdk/provider-utils";
 
 // src/convert-to-claude-code-messages.ts
-function convertToClaudeCodeMessages(prompt, mode) {
+function convertToClaudeCodeMessages(prompt, mode = { type: "regular" }, jsonSchema) {
   const messages = [];
   const warnings = [];
   let systemPrompt;
@@ -25,26 +25,33 @@ function convertToClaudeCodeMessages(prompt, mode) {
           }
           const imageParts = message.content.filter((part) => part.type === "image");
           if (imageParts.length > 0) {
-            warnings.push("Claude Code CLI does not support image inputs. Images will be ignored.");
+            warnings.push("Claude Code SDK does not support image inputs. Images will be ignored.");
           }
         }
         break;
-      case "assistant":
+      case "assistant": {
+        let assistantContent = "";
         if (typeof message.content === "string") {
-          messages.push(`Assistant: ${message.content}`);
+          assistantContent = message.content;
         } else {
           const textParts = message.content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
           if (textParts) {
-            messages.push(`Assistant: ${textParts}`);
+            assistantContent = textParts;
           }
           const toolCalls = message.content.filter((part) => part.type === "tool-call");
           if (toolCalls.length > 0) {
-            messages.push(`Assistant: [Tool calls made]`);
+            assistantContent += `
+[Tool calls made]`;
           }
         }
+        messages.push(`Assistant: ${assistantContent}`);
         break;
+      }
       case "tool":
-        messages.push(`Tool Result (${message.content[0].toolName}): ${JSON.stringify(message.content[0].result)}`);
+        for (const tool of message.content) {
+          const resultText = tool.output.type === "text" ? tool.output.value : JSON.stringify(tool.output.value);
+          messages.push(`Tool Result (${tool.toolName}): ${resultText}`);
+        }
         break;
     }
   }
@@ -69,19 +76,20 @@ function convertToClaudeCodeMessages(prompt, mode) {
   } else {
     finalPrompt = formattedMessages.join("\n\n");
   }
-  if (mode?.type === "object-json") {
-    finalPrompt = `${finalPrompt}
+  if (mode?.type === "object-json" && jsonSchema) {
+    const schemaStr = JSON.stringify(jsonSchema, null, 2);
+    finalPrompt = `CRITICAL: You MUST respond with ONLY a JSON object. NO other text, NO explanations, NO questions.
+
+Your response MUST start with { and end with }
+
+The JSON MUST match this EXACT schema:
+${schemaStr}
+
+Now, based on the following conversation, generate ONLY the JSON object with the exact fields specified above:
 
-CRITICAL INSTRUCTION: You MUST respond with ONLY valid JSON. Follow these rules EXACTLY:
-1. Start your response with an opening brace {
-2. End your response with a closing brace }
-3. Do NOT include any text before the opening brace
-4. Do NOT include any text after the closing brace
-5. Do NOT use markdown code blocks or backticks
-6. Do NOT include explanations or commentary
-7. The ENTIRE response must be valid JSON that can be parsed with JSON.parse()
+${finalPrompt}
 
-Begin your response with { and end with }`;
+Remember: Your ENTIRE response must be ONLY the JSON object, starting with { and ending with }`;
   }
   return {
     messagesPrompt: finalPrompt,
@@ -205,7 +213,7 @@ function createAuthenticationError({
   message
 }) {
   return new LoadAPIKeyError({
-    message: message || "Authentication failed. Please ensure Claude Code CLI is properly authenticated."
+    message: message || "Authentication failed. Please ensure Claude Code SDK is properly authenticated."
   });
 }
 function createTimeoutError({
@@ -398,9 +406,10 @@ var modelMap = {
   "sonnet": "sonnet"
 };
 var ClaudeCodeLanguageModel = class {
-  specificationVersion = "v1";
+  specificationVersion = "v2";
   defaultObjectGenerationMode = "json";
   supportsImageUrls = false;
+  supportedUrls = {};
   supportsStructuredOutputs = false;
   modelId;
   settings;
@@ -435,7 +444,6 @@ var ClaudeCodeLanguageModel = class {
     const warnings = [];
     const unsupportedParams = [];
     if (options.temperature !== void 0) unsupportedParams.push("temperature");
-    if (options.maxTokens !== void 0) unsupportedParams.push("maxTokens");
     if (options.topP !== void 0) unsupportedParams.push("topP");
     if (options.topK !== void 0) unsupportedParams.push("topK");
     if (options.presencePenalty !== void 0) unsupportedParams.push("presencePenalty");
@@ -447,7 +455,7 @@ var ClaudeCodeLanguageModel = class {
         warnings.push({
           type: "unsupported-setting",
           setting: param,
-          details: `Claude Code CLI does not support the ${param} parameter. It will be ignored.`
+          details: `Claude Code SDK does not support the ${param} parameter. It will be ignored.`
         });
       }
     }
@@ -516,7 +524,7 @@ var ClaudeCodeLanguageModel = class {
     const isAuthError = authErrorPatterns.some((pattern) => errorMessage.includes(pattern)) || exitCode === 401;
     if (isAuthError) {
       return createAuthenticationError({
-        message: isErrorWithMessage(error) && error.message ? error.message : "Authentication failed. Please ensure Claude Code CLI is properly authenticated."
+        message: isErrorWithMessage(error) && error.message ? error.message : "Authentication failed. Please ensure Claude Code SDK is properly authenticated."
       });
     }
     const errorCode = isErrorWithCode(error) && typeof error.code === "string" ? error.code : "";
@@ -530,7 +538,7 @@ var ClaudeCodeLanguageModel = class {
     }
     const isRetryable = errorCode === "ENOENT" || errorCode === "ECONNREFUSED" || errorCode === "ETIMEDOUT" || errorCode === "ECONNRESET";
     return createAPICallError({
-      message: isErrorWithMessage(error) && error.message ? error.message : "Claude Code CLI error",
+      message: isErrorWithMessage(error) && error.message ? error.message : "Claude Code SDK error",
       code: errorCode || void 0,
       exitCode,
       stderr: isErrorWithCode(error) && typeof error.stderr === "string" ? error.stderr : void 0,
@@ -569,7 +577,12 @@ var ClaudeCodeLanguageModel = class {
     }
   }
   async doGenerate(options) {
-    const { messagesPrompt, warnings: messageWarnings } = convertToClaudeCodeMessages(options.prompt, options.mode);
+    const mode = options.responseFormat?.type === "json" ? { type: "object-json" } : { type: "regular" };
+    const { messagesPrompt, warnings: messageWarnings } = convertToClaudeCodeMessages(
+      options.prompt,
+      mode,
+      options.responseFormat?.type === "json" ? options.responseFormat.schema : void 0
+    );
     const abortController = new AbortController();
     let abortListener;
     if (options.abortSignal) {
@@ -578,7 +591,7 @@ var ClaudeCodeLanguageModel = class {
     }
     const queryOptions = this.createQueryOptions(abortController);
     let text = "";
-    let usage = { promptTokens: 0, completionTokens: 0 };
+    let usage = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
     let finishReason = "stop";
     let costUsd;
     let durationMs;
@@ -609,8 +622,9 @@ var ClaudeCodeLanguageModel = class {
           if ("usage" in message) {
             rawUsage = message.usage;
             usage = {
-              promptTokens: (message.usage.cache_creation_input_tokens ?? 0) + (message.usage.cache_read_input_tokens ?? 0) + (message.usage.input_tokens ?? 0),
-              completionTokens: message.usage.output_tokens ?? 0
+              inputTokens: (message.usage.cache_creation_input_tokens ?? 0) + (message.usage.cache_read_input_tokens ?? 0) + (message.usage.input_tokens ?? 0),
+              outputTokens: message.usage.output_tokens ?? 0,
+              totalTokens: (message.usage.cache_creation_input_tokens ?? 0) + (message.usage.cache_read_input_tokens ?? 0) + (message.usage.input_tokens ?? 0) + (message.usage.output_tokens ?? 0)
             };
           }
           finishReason = mapClaudeCodeFinishReason(message.subtype);
@@ -628,7 +642,7 @@ var ClaudeCodeLanguageModel = class {
         options.abortSignal.removeEventListener("abort", abortListener);
       }
     }
-    if (options.mode?.type === "object-json" && text) {
+    if (options.responseFormat?.type === "json" && text) {
       const extracted = extractJson(text);
       const validation = this.validateJsonExtraction(text, extracted);
       if (!validation.valid && validation.warning) {
@@ -637,14 +651,10 @@ var ClaudeCodeLanguageModel = class {
       text = extracted;
     }
     return {
-      text: text || void 0,
+      content: [{ type: "text", text }],
       usage,
       finishReason,
-      rawCall: {
-        rawPrompt: messagesPrompt,
-        rawSettings: queryOptions
-      },
-      warnings: warnings.length > 0 ? warnings : void 0,
+      warnings,
       response: {
         id: generateId(),
         timestamp: /* @__PURE__ */ new Date(),
@@ -664,7 +674,12 @@ var ClaudeCodeLanguageModel = class {
     };
   }
   async doStream(options) {
-    const { messagesPrompt, warnings: messageWarnings } = convertToClaudeCodeMessages(options.prompt, options.mode);
+    const mode = options.responseFormat?.type === "json" ? { type: "object-json" } : { type: "regular" };
+    const { messagesPrompt, warnings: messageWarnings } = convertToClaudeCodeMessages(
+      options.prompt,
+      mode,
+      options.responseFormat?.type === "json" ? options.responseFormat.schema : void 0
+    );
     const abortController = new AbortController();
     let abortListener;
     if (options.abortSignal) {
@@ -684,21 +699,31 @@ var ClaudeCodeLanguageModel = class {
     const stream = new ReadableStream({
       start: async (controller) => {
         try {
+          controller.enqueue({ type: "stream-start", warnings });
           const response = query({
             prompt: messagesPrompt,
             options: queryOptions
           });
-          let usage = { promptTokens: 0, completionTokens: 0 };
+          let usage = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
           let accumulatedText = "";
+          let textPartId;
           for await (const message of response) {
             if (message.type === "assistant") {
               const text = message.message.content.map((c) => c.type === "text" ? c.text : "").join("");
               if (text) {
                 accumulatedText += text;
-                if (options.mode?.type !== "object-json") {
+                if (options.responseFormat?.type !== "json") {
+                  if (!textPartId) {
+                    textPartId = generateId();
+                    controller.enqueue({
+                      type: "text-start",
+                      id: textPartId
+                    });
+                  }
                   controller.enqueue({
                     type: "text-delta",
-                    textDelta: text
+                    id: textPartId,
+                    delta: text
                   });
                 }
               }
@@ -707,18 +732,34 @@ var ClaudeCodeLanguageModel = class {
               if ("usage" in message) {
                 rawUsage = message.usage;
                 usage = {
-                  promptTokens: (message.usage.cache_creation_input_tokens ?? 0) + (message.usage.cache_read_input_tokens ?? 0) + (message.usage.input_tokens ?? 0),
-                  completionTokens: message.usage.output_tokens ?? 0
+                  inputTokens: (message.usage.cache_creation_input_tokens ?? 0) + (message.usage.cache_read_input_tokens ?? 0) + (message.usage.input_tokens ?? 0),
+                  outputTokens: message.usage.output_tokens ?? 0,
+                  totalTokens: (message.usage.cache_creation_input_tokens ?? 0) + (message.usage.cache_read_input_tokens ?? 0) + (message.usage.input_tokens ?? 0) + (message.usage.output_tokens ?? 0)
                 };
               }
               const finishReason = mapClaudeCodeFinishReason(message.subtype);
               this.setSessionId(message.session_id);
-              if (options.mode?.type === "object-json" && accumulatedText) {
+              if (options.responseFormat?.type === "json" && accumulatedText) {
                 const extractedJson = extractJson(accumulatedText);
                 this.validateJsonExtraction(accumulatedText, extractedJson);
+                const jsonTextId = generateId();
+                controller.enqueue({
+                  type: "text-start",
+                  id: jsonTextId
+                });
                 controller.enqueue({
                   type: "text-delta",
-                  textDelta: extractedJson
+                  id: jsonTextId,
+                  delta: extractedJson
+                });
+                controller.enqueue({
+                  type: "text-end",
+                  id: jsonTextId
+                });
+              } else if (textPartId) {
+                controller.enqueue({
+                  type: "text-end",
+                  id: textPartId
                 });
               }
               controller.enqueue({
@@ -771,11 +812,6 @@ var ClaudeCodeLanguageModel = class {
     });
     return {
       stream,
-      rawCall: {
-        rawPrompt: messagesPrompt,
-        rawSettings: queryOptions
-      },
-      warnings: warnings.length > 0 ? warnings : void 0,
       request: {
         body: messagesPrompt
       }
@@ -826,6 +862,12 @@ function createClaudeCode(options = {}) {
       modelType: "textEmbeddingModel"
     });
   };
+  provider.imageModel = (modelId) => {
+    throw new NoSuchModelError2({
+      modelId,
+      modelType: "imageModel"
+    });
+  };
   return provider;
 }
 var claudeCode = createClaudeCode();