@ai-sdk/anthropic 3.0.0-beta.43 → 3.0.0-beta.44

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ai-sdk/anthropic
 
+## 3.0.0-beta.44
+
+### Patch Changes
+
+- cf4e2a9: Add support for tool calling with structured output
+
 ## 3.0.0-beta.43
 
 ### 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.43" : "0.0.0-test";
+var VERSION = true ? "3.0.0-beta.44" : "0.0.0-test";
 
 // src/anthropic-messages-language-model.ts
 var import_provider3 = require("@ai-sdk/provider");
@@ -1909,12 +1909,6 @@ var AnthropicMessagesLanguageModel = class {
           setting: "responseFormat",
           details: "JSON response format requires a schema. The response format is ignored."
         });
-      } else if (tools != null) {
-        warnings.push({
-          type: "unsupported-setting",
-          setting: "tools",
-          details: "JSON response format does not support tools. The provided tools are ignored."
-        });
       }
     }
     const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null ? {
@@ -2045,8 +2039,8 @@ var AnthropicMessagesLanguageModel = class {
       betas: toolsBetas
     } = await prepareTools(
       jsonResponseTool != null ? {
-        tools: [jsonResponseTool],
-        toolChoice: { type: "tool", toolName: jsonResponseTool.name },
+        tools: [...tools != null ? tools : [], jsonResponseTool],
+        toolChoice: { type: "required" },
         disableParallelToolUse: true,
         cacheControlValidator
       } : {
@@ -2130,6 +2124,7 @@ var AnthropicMessagesLanguageModel = class {
     });
     const content = [];
     const mcpToolCalls = {};
+    let isJsonResponseFromTool = false;
     for (const part of response.content) {
       switch (part.type) {
         case "text": {
@@ -2175,18 +2170,21 @@ var AnthropicMessagesLanguageModel = class {
           break;
         }
         case "tool_use": {
-          content.push(
-            // when a json response tool is used, the tool call becomes the text:
-            usesJsonResponseTool ? {
+          const isJsonResponseTool = usesJsonResponseTool && part.name === "json";
+          if (isJsonResponseTool) {
+            isJsonResponseFromTool = true;
+            content.push({
               type: "text",
               text: JSON.stringify(part.input)
-            } : {
+            });
+          } else {
+            content.push({
               type: "tool-call",
               toolCallId: part.id,
               toolName: part.name,
               input: JSON.stringify(part.input)
-            }
-          );
+            });
+          }
           break;
         }
         case "server_tool_use": {
@@ -2373,7 +2371,7 @@ var AnthropicMessagesLanguageModel = class {
       content,
       finishReason: mapAnthropicStopReason({
         finishReason: response.stop_reason,
-        isJsonResponseFromTool: usesJsonResponseTool
+        isJsonResponseFromTool
       }),
       usage: {
         inputTokens: response.usage.input_tokens,
@@ -2434,6 +2432,7 @@ var AnthropicMessagesLanguageModel = class {
     let cacheCreationInputTokens = null;
     let stopSequence = null;
     let container = null;
+    let isJsonResponseFromTool = false;
     let blockType = void 0;
     const generateId3 = this.generateId;
     return {
@@ -2462,6 +2461,9 @@ var AnthropicMessagesLanguageModel = class {
                 blockType = contentBlockType;
                 switch (contentBlockType) {
                   case "text": {
+                    if (usesJsonResponseTool) {
+                      return;
+                    }
                     contentBlocks[value.index] = { type: "text" };
                     controller.enqueue({
                       type: "text-start",
@@ -2491,20 +2493,28 @@ var AnthropicMessagesLanguageModel = class {
                     return;
                   }
                   case "tool_use": {
-                    contentBlocks[value.index] = usesJsonResponseTool ? { type: "text" } : {
-                      type: "tool-call",
-                      toolCallId: part.id,
-                      toolName: part.name,
-                      input: "",
-                      firstDelta: true
-                    };
-                    controller.enqueue(
-                      usesJsonResponseTool ? { type: "text-start", id: String(value.index) } : {
+                    const isJsonResponseTool = usesJsonResponseTool && part.name === "json";
+                    if (isJsonResponseTool) {
+                      isJsonResponseFromTool = true;
+                      contentBlocks[value.index] = { type: "text" };
+                      controller.enqueue({
+                        type: "text-start",
+                        id: String(value.index)
+                      });
+                    } else {
+                      contentBlocks[value.index] = {
+                        type: "tool-call",
+                        toolCallId: part.id,
+                        toolName: part.name,
+                        input: "",
+                        firstDelta: true
+                      };
+                      controller.enqueue({
                         type: "tool-input-start",
                         id: part.id,
                         toolName: part.name
-                      }
-                    );
+                      });
+                    }
                     return;
                   }
                   case "server_tool_use": {
@@ -2720,7 +2730,8 @@ var AnthropicMessagesLanguageModel = class {
                       break;
                     }
                     case "tool-call":
-                      if (!usesJsonResponseTool) {
+                      const isJsonResponseTool = usesJsonResponseTool && contentBlock.toolName === "json";
+                      if (!isJsonResponseTool) {
                         controller.enqueue({
                           type: "tool-input-end",
                           id: contentBlock.toolCallId
@@ -2784,7 +2795,7 @@ var AnthropicMessagesLanguageModel = class {
                     if (delta.length === 0) {
                       return;
                     }
-                    if (usesJsonResponseTool) {
+                    if (isJsonResponseFromTool) {
                       if ((contentBlock == null ? void 0 : contentBlock.type) !== "text") {
                         return;
                       }
@@ -2849,7 +2860,7 @@ var AnthropicMessagesLanguageModel = class {
                 usage.totalTokens = ((_f = usage.inputTokens) != null ? _f : 0) + ((_g = value.usage.output_tokens) != null ? _g : 0);
                 finishReason = mapAnthropicStopReason({
                   finishReason: value.delta.stop_reason,
-                  isJsonResponseFromTool: usesJsonResponseTool
+                  isJsonResponseFromTool
                 });
                 stopSequence = (_h = value.delta.stop_sequence) != null ? _h : null;
                 container = value.delta.container != null ? {