@ai-sdk/anthropic 3.0.0-beta.68 → 3.0.0-beta.70

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ai-sdk/anthropic
 
+## 3.0.0-beta.70
+
+### Patch Changes
+
+- f13958c: chore(antropic): allow custom names for provider-defined tools
+
+## 3.0.0-beta.69
+
+### Patch Changes
+
+- 589a4ee: fix(anthropic): simplify pulling first chunk
+
 ## 3.0.0-beta.68
 
 ### Patch Changes

package/dist/index.js

@@ -31,7 +31,7 @@ var import_provider4 = require("@ai-sdk/provider");
 var import_provider_utils20 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.0-beta.68" : "0.0.0-test";
+var VERSION = true ? "3.0.0-beta.70" : "0.0.0-test";
 
 // src/anthropic-messages-language-model.ts
 var import_provider3 = require("@ai-sdk/provider");
@@ -1237,7 +1237,8 @@ async function convertToAnthropicMessagesPrompt({
   prompt,
   sendReasoning,
   warnings,
-  cacheControlValidator
+  cacheControlValidator,
+  toolNameMapping
 }) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const betas = /* @__PURE__ */ new Set();
@@ -1575,6 +1576,9 @@ async function convertToAnthropicMessagesPrompt({
               }
               case "tool-call": {
                 if (part.providerExecuted) {
+                  const providerToolName = toolNameMapping.toProviderToolName(
+                    part.toolName
+                  );
                   const isMcpToolUse = ((_h = (_g = part.providerOptions) == null ? void 0 : _g.anthropic) == null ? void 0 : _h.type) === "mcp-tool-use";
                   if (isMcpToolUse) {
                     mcpToolUseIds.add(part.toolCallId);
@@ -1596,7 +1600,7 @@ async function convertToAnthropicMessagesPrompt({
                     });
                   } else if (
                     // code execution 20250825:
-                    part.toolName === "code_execution" && part.input != null && typeof part.input === "object" && "type" in part.input && typeof part.input.type === "string" && (part.input.type === "bash_code_execution" || part.input.type === "text_editor_code_execution")
+                    providerToolName === "code_execution" && part.input != null && typeof part.input === "object" && "type" in part.input && typeof part.input.type === "string" && (part.input.type === "bash_code_execution" || part.input.type === "text_editor_code_execution")
                   ) {
                     anthropicContent.push({
                       type: "server_tool_use",
@@ -1606,20 +1610,22 @@ async function convertToAnthropicMessagesPrompt({
                       input: part.input,
                       cache_control: cacheControl
                     });
-                  } else if (part.toolName === "code_execution" || // code execution 20250522
-                  part.toolName === "web_fetch" || part.toolName === "web_search") {
-                    anthropicContent.push({
-                      type: "server_tool_use",
-                      id: part.toolCallId,
-                      name: part.toolName,
-                      input: part.input,
-                      cache_control: cacheControl
-                    });
                   } else {
-                    warnings.push({
-                      type: "other",
-                      message: `provider executed tool call for tool ${part.toolName} is not supported`
-                    });
+                    if (providerToolName === "code_execution" || // code execution 20250522
+                    providerToolName === "web_fetch" || providerToolName === "web_search") {
+                      anthropicContent.push({
+                        type: "server_tool_use",
+                        id: part.toolCallId,
+                        name: providerToolName,
+                        input: part.input,
+                        cache_control: cacheControl
+                      });
+                    } else {
+                      warnings.push({
+                        type: "other",
+                        message: `provider executed tool call for tool ${part.toolName} is not supported`
+                      });
+                    }
                   }
                   break;
                 }
@@ -1633,6 +1639,9 @@ async function convertToAnthropicMessagesPrompt({
                 break;
               }
               case "tool-result": {
+                const providerToolName = toolNameMapping.toProviderToolName(
+                  part.toolName
+                );
                 if (mcpToolUseIds.has(part.toolCallId)) {
                   const output = part.output;
                   if (output.type !== "json" && output.type !== "error-json") {
@@ -1649,7 +1658,7 @@ async function convertToAnthropicMessagesPrompt({
                     content: output.value,
                     cache_control: cacheControl
                   });
-                } else if (part.toolName === "code_execution") {
+                } else if (providerToolName === "code_execution") {
                   const output = part.output;
                   if (output.type !== "json") {
                     warnings.push({
@@ -1702,7 +1711,7 @@ async function convertToAnthropicMessagesPrompt({
                   }
                   break;
                 }
-                if (part.toolName === "web_fetch") {
+                if (providerToolName === "web_fetch") {
                   const output = part.output;
                   if (output.type !== "json") {
                     warnings.push({
@@ -1737,7 +1746,7 @@ async function convertToAnthropicMessagesPrompt({
                   });
                   break;
                 }
-                if (part.toolName === "web_search") {
+                if (providerToolName === "web_search") {
                   const output = part.output;
                   if (output.type !== "json") {
                     warnings.push({
@@ -1974,11 +1983,30 @@ var AnthropicMessagesLanguageModel = class {
       inputSchema: responseFormat.schema
     } : void 0;
     const cacheControlValidator = new CacheControlValidator();
+    const toolNameMapping = (0, import_provider_utils11.createToolNameMapping)({
+      tools,
+      providerToolNames: {
+        "anthropic.code_execution_20250522": "code_execution",
+        "anthropic.code_execution_20250825": "code_execution",
+        "anthropic.computer_20241022": "computer",
+        "anthropic.computer_20250124": "computer",
+        "anthropic.text_editor_20241022": "str_replace_editor",
+        "anthropic.text_editor_20250124": "str_replace_editor",
+        "anthropic.text_editor_20250429": "str_replace_based_edit_tool",
+        "anthropic.text_editor_20250728": "str_replace_based_edit_tool",
+        "anthropic.bash_20241022": "bash",
+        "anthropic.bash_20250124": "bash",
+        "anthropic.memory_20250818": "memory",
+        "anthropic.web_search_20250305": "web_search",
+        "anthropic.web_fetch_20250910": "web_fetch"
+      }
+    });
     const { prompt: messagesPrompt, betas } = await convertToAnthropicMessagesPrompt({
       prompt,
       sendReasoning: (_b = anthropicOptions == null ? void 0 : anthropicOptions.sendReasoning) != null ? _b : true,
       warnings,
-      cacheControlValidator
+      cacheControlValidator,
+      toolNameMapping
     });
     const isThinking = ((_c = anthropicOptions == null ? void 0 : anthropicOptions.thinking) == null ? void 0 : _c.type) === "enabled";
     const thinkingBudget = (_d = anthropicOptions == null ? void 0 : anthropicOptions.thinking) == null ? void 0 : _d.budgetTokens;
@@ -2130,7 +2158,8 @@ var AnthropicMessagesLanguageModel = class {
       },
       warnings: [...warnings, ...toolWarnings, ...cacheWarnings],
       betas: /* @__PURE__ */ new Set([...betas, ...toolsBetas, ...userSuppliedBetas]),
-      usesJsonResponseTool: jsonResponseTool != null
+      usesJsonResponseTool: jsonResponseTool != null,
+      toolNameMapping
     };
   }
   async getHeaders({
@@ -2188,7 +2217,7 @@ var AnthropicMessagesLanguageModel = class {
   }
   async doGenerate(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { args, warnings, betas, usesJsonResponseTool } = await this.getArgs({
+    const { args, warnings, betas, usesJsonResponseTool, toolNameMapping } = await this.getArgs({
       ...options,
       stream: false,
       userSuppliedBetas: await this.getBetasFromHeaders(options.headers)
@@ -2279,7 +2308,7 @@ var AnthropicMessagesLanguageModel = class {
             content.push({
               type: "tool-call",
               toolCallId: part.id,
-              toolName: "code_execution",
+              toolName: toolNameMapping.toCustomToolName("code_execution"),
               input: JSON.stringify({ type: part.name, ...part.input }),
               providerExecuted: true
             });
@@ -2287,7 +2316,7 @@ var AnthropicMessagesLanguageModel = class {
             content.push({
               type: "tool-call",
               toolCallId: part.id,
-              toolName: part.name,
+              toolName: toolNameMapping.toCustomToolName(part.name),
               input: JSON.stringify(part.input),
               providerExecuted: true
             });
@@ -2329,7 +2358,7 @@ var AnthropicMessagesLanguageModel = class {
             content.push({
               type: "tool-result",
               toolCallId: part.tool_use_id,
-              toolName: "web_fetch",
+              toolName: toolNameMapping.toCustomToolName("web_fetch"),
               result: {
                 type: "web_fetch_result",
                 url: part.content.url,
@@ -2350,7 +2379,7 @@ var AnthropicMessagesLanguageModel = class {
             content.push({
               type: "tool-result",
               toolCallId: part.tool_use_id,
-              toolName: "web_fetch",
+              toolName: toolNameMapping.toCustomToolName("web_fetch"),
               isError: true,
               result: {
                 type: "web_fetch_tool_result_error",
@@ -2365,7 +2394,7 @@ var AnthropicMessagesLanguageModel = class {
             content.push({
               type: "tool-result",
               toolCallId: part.tool_use_id,
-              toolName: "web_search",
+              toolName: toolNameMapping.toCustomToolName("web_search"),
               result: part.content.map((result) => {
                 var _a2;
                 return {
@@ -2395,7 +2424,7 @@ var AnthropicMessagesLanguageModel = class {
             content.push({
               type: "tool-result",
               toolCallId: part.tool_use_id,
-              toolName: "web_search",
+              toolName: toolNameMapping.toCustomToolName("web_search"),
               isError: true,
               result: {
                 type: "web_search_tool_result_error",
@@ -2411,7 +2440,7 @@ var AnthropicMessagesLanguageModel = class {
             content.push({
               type: "tool-result",
               toolCallId: part.tool_use_id,
-              toolName: "code_execution",
+              toolName: toolNameMapping.toCustomToolName("code_execution"),
               result: {
                 type: part.content.type,
                 stdout: part.content.stdout,
@@ -2423,7 +2452,7 @@ var AnthropicMessagesLanguageModel = class {
             content.push({
               type: "tool-result",
               toolCallId: part.tool_use_id,
-              toolName: "code_execution",
+              toolName: toolNameMapping.toCustomToolName("code_execution"),
               isError: true,
               result: {
                 type: "code_execution_tool_result_error",
@@ -2439,7 +2468,7 @@ var AnthropicMessagesLanguageModel = class {
           content.push({
             type: "tool-result",
             toolCallId: part.tool_use_id,
-            toolName: "code_execution",
+            toolName: toolNameMapping.toCustomToolName("code_execution"),
             result: part.content
           });
           break;
@@ -2485,11 +2514,13 @@ var AnthropicMessagesLanguageModel = class {
     };
   }
   async doStream(options) {
+    var _a, _b;
     const {
       args: body,
       warnings,
       betas,
-      usesJsonResponseTool
+      usesJsonResponseTool,
+      toolNameMapping
     } = await this.getArgs({
       ...options,
       stream: true,
@@ -2523,25 +2554,13 @@ var AnthropicMessagesLanguageModel = class {
     let isJsonResponseFromTool = false;
     let blockType = void 0;
     const generateId3 = this.generateId;
-    let isFirstChunk = true;
-    let stream = void 0;
-    const returnPromise = new import_provider_utils11.DelayedPromise();
     const transformedStream = response.pipeThrough(
       new TransformStream({
         start(controller) {
           controller.enqueue({ type: "stream-start", warnings });
         },
-        async flush() {
-          if (returnPromise.isPending()) {
-            returnPromise.resolve({
-              stream,
-              request: { body },
-              response: { headers: responseHeaders }
-            });
-          }
-        },
         transform(chunk, controller) {
-          var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+          var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j;
           if (options.includeRawChunks) {
             controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
           }
@@ -2549,29 +2568,6 @@ var AnthropicMessagesLanguageModel = class {
             controller.enqueue({ type: "error", error: chunk.error });
             return;
           }
-          if (isFirstChunk) {
-            if (chunk.value.type === "error") {
-              returnPromise.reject(
-                new import_provider3.APICallError({
-                  message: chunk.value.error.message,
-                  url,
-                  requestBodyValues: body,
-                  statusCode: chunk.value.error.type === "overloaded_error" ? 529 : 500,
-                  responseHeaders,
-                  responseBody: JSON.stringify(chunk.value.error),
-                  isRetryable: chunk.value.error.type === "overloaded_error"
-                })
-              );
-              controller.terminate();
-              return;
-            }
-            isFirstChunk = false;
-            returnPromise.resolve({
-              stream,
-              request: { body },
-              response: { headers: responseHeaders }
-            });
-          }
           const value = chunk.value;
           switch (value.type) {
             case "ping": {
@@ -2650,19 +2646,21 @@ var AnthropicMessagesLanguageModel = class {
                     // code execution 20250825 bash:
                     "bash_code_execution"
                   ].includes(part.name)) {
+                    const providerToolName = part.name === "text_editor_code_execution" || part.name === "bash_code_execution" ? "code_execution" : part.name;
+                    const customToolName = toolNameMapping.toCustomToolName(providerToolName);
                     contentBlocks[value.index] = {
                       type: "tool-call",
                       toolCallId: part.id,
-                      toolName: part.name,
+                      toolName: customToolName,
                       input: "",
                       providerExecuted: true,
-                      firstDelta: true
+                      firstDelta: true,
+                      providerToolName: part.name
                     };
-                    const mappedToolName = part.name === "text_editor_code_execution" || part.name === "bash_code_execution" ? "code_execution" : part.name;
                     controller.enqueue({
                       type: "tool-input-start",
                       id: part.id,
-                      toolName: mappedToolName,
+                      toolName: customToolName,
                       providerExecuted: true
                     });
                   }
@@ -2673,7 +2671,7 @@ var AnthropicMessagesLanguageModel = class {
                     controller.enqueue({
                       type: "tool-result",
                       toolCallId: part.tool_use_id,
-                      toolName: "web_fetch",
+                      toolName: toolNameMapping.toCustomToolName("web_fetch"),
                       result: {
                         type: "web_fetch_result",
                         url: part.content.url,
@@ -2694,7 +2692,7 @@ var AnthropicMessagesLanguageModel = class {
                     controller.enqueue({
                       type: "tool-result",
                       toolCallId: part.tool_use_id,
-                      toolName: "web_fetch",
+                      toolName: toolNameMapping.toCustomToolName("web_fetch"),
                       isError: true,
                       result: {
                         type: "web_fetch_tool_result_error",
@@ -2709,13 +2707,13 @@ var AnthropicMessagesLanguageModel = class {
                     controller.enqueue({
                       type: "tool-result",
                       toolCallId: part.tool_use_id,
-                      toolName: "web_search",
+                      toolName: toolNameMapping.toCustomToolName("web_search"),
                       result: part.content.map((result) => {
-                        var _a2;
+                        var _a3;
                         return {
                           url: result.url,
                           title: result.title,
-                          pageAge: (_a2 = result.page_age) != null ? _a2 : null,
+                          pageAge: (_a3 = result.page_age) != null ? _a3 : null,
                           encryptedContent: result.encrypted_content,
                           type: result.type
                         };
@@ -2730,7 +2728,7 @@ var AnthropicMessagesLanguageModel = class {
                         title: result.title,
                         providerMetadata: {
                           anthropic: {
-                            pageAge: (_a = result.page_age) != null ? _a : null
+                            pageAge: (_a2 = result.page_age) != null ? _a2 : null
                           }
                         }
                       });
@@ -2739,7 +2737,7 @@ var AnthropicMessagesLanguageModel = class {
                     controller.enqueue({
                       type: "tool-result",
                       toolCallId: part.tool_use_id,
-                      toolName: "web_search",
+                      toolName: toolNameMapping.toCustomToolName("web_search"),
                       isError: true,
                       result: {
                         type: "web_search_tool_result_error",
@@ -2755,7 +2753,7 @@ var AnthropicMessagesLanguageModel = class {
                     controller.enqueue({
                       type: "tool-result",
                       toolCallId: part.tool_use_id,
-                      toolName: "code_execution",
+                      toolName: toolNameMapping.toCustomToolName("code_execution"),
                       result: {
                         type: part.content.type,
                         stdout: part.content.stdout,
@@ -2767,7 +2765,7 @@ var AnthropicMessagesLanguageModel = class {
                     controller.enqueue({
                       type: "tool-result",
                       toolCallId: part.tool_use_id,
-                      toolName: "code_execution",
+                      toolName: toolNameMapping.toCustomToolName("code_execution"),
                       isError: true,
                       result: {
                         type: "code_execution_tool_result_error",
@@ -2783,7 +2781,7 @@ var AnthropicMessagesLanguageModel = class {
                   controller.enqueue({
                     type: "tool-result",
                     toolCallId: part.tool_use_id,
-                    toolName: "code_execution",
+                    toolName: toolNameMapping.toCustomToolName("code_execution"),
                     result: part.content
                   });
                   return;
@@ -2851,11 +2849,10 @@ var AnthropicMessagesLanguageModel = class {
                         type: "tool-input-end",
                         id: contentBlock.toolCallId
                       });
-                      const toolName = contentBlock.toolName === "text_editor_code_execution" || contentBlock.toolName === "bash_code_execution" ? "code_execution" : contentBlock.toolName;
                       controller.enqueue({
                         type: "tool-call",
                         toolCallId: contentBlock.toolCallId,
-                        toolName,
+                        toolName: contentBlock.toolName,
                         input: contentBlock.input === "" ? "{}" : contentBlock.input,
                         providerExecuted: contentBlock.providerExecuted
                       });
@@ -2923,8 +2920,8 @@ var AnthropicMessagesLanguageModel = class {
                     if ((contentBlock == null ? void 0 : contentBlock.type) !== "tool-call") {
                       return;
                     }
-                    if (contentBlock.firstDelta && (contentBlock.toolName === "bash_code_execution" || contentBlock.toolName === "text_editor_code_execution")) {
-                      delta = `{"type": "${contentBlock.toolName}",${delta.substring(1)}`;
+                    if (contentBlock.firstDelta && (contentBlock.providerToolName === "bash_code_execution" || contentBlock.providerToolName === "text_editor_code_execution")) {
+                      delta = `{"type": "${contentBlock.providerToolName}",${delta.substring(1)}`;
                     }
                     controller.enqueue({
                       type: "tool-input-delta",
@@ -2958,7 +2955,7 @@ var AnthropicMessagesLanguageModel = class {
             }
             case "message_start": {
               usage.inputTokens = value.message.usage.input_tokens;
-              usage.cachedInputTokens = (_b = value.message.usage.cache_read_input_tokens) != null ? _b : void 0;
+              usage.cachedInputTokens = (_b2 = value.message.usage.cache_read_input_tokens) != null ? _b2 : void 0;
               rawUsage = {
                 ...value.message.usage
               };
@@ -3022,22 +3019,35 @@ var AnthropicMessagesLanguageModel = class {
       })
     );
     const [streamForFirstChunk, streamForConsumer] = transformedStream.tee();
-    stream = streamForConsumer;
     const firstChunkReader = streamForFirstChunk.getReader();
     try {
-      const { done } = await firstChunkReader.read();
-      if (!done) {
-        firstChunkReader.cancel();
+      await firstChunkReader.read();
+      let result = await firstChunkReader.read();
+      if (((_a = result.value) == null ? void 0 : _a.type) === "raw") {
+        result = await firstChunkReader.read();
       }
-    } catch (error) {
-      try {
-        firstChunkReader.cancel();
-      } catch (e) {
+      if (((_b = result.value) == null ? void 0 : _b.type) === "error") {
+        const error = result.value.error;
+        throw new import_provider3.APICallError({
+          message: error.message,
+          url,
+          requestBodyValues: body,
+          statusCode: error.type === "overloaded_error" ? 529 : 500,
+          responseHeaders,
+          responseBody: JSON.stringify(error),
+          isRetryable: error.type === "overloaded_error"
+        });
       }
     } finally {
+      firstChunkReader.cancel().catch(() => {
+      });
       firstChunkReader.releaseLock();
     }
-    return returnPromise.promise;
+    return {
+      stream: streamForConsumer,
+      request: { body },
+      response: { headers: responseHeaders }
+    };
   }
 };
 function getModelCapabilities(modelId) {