@ai-sdk/anthropic 2.0.98 → 2.0.100

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ai-sdk/anthropic
 
+## 2.0.100
+
+### Patch Changes
+
+- cd8f35c: Preserve tool calls when using JSON structured output.
+- Updated dependencies [26165ee]
+  - @ai-sdk/provider-utils@3.0.36
+
+## 2.0.99
+
+### Patch Changes
+
+- 78c7304: fix(anthropic): order client tool calls after provider-executed tool results
+
 ## 2.0.98
 
 ### 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 ? "2.0.98" : "0.0.0-test";
+var VERSION = true ? "2.0.100" : "0.0.0-test";
 
 // src/anthropic-messages-language-model.ts
 var import_provider3 = require("@ai-sdk/provider");
@@ -704,7 +704,7 @@ var anthropicProviderOptions = import_v43.z.object({
    * Determines how structured outputs are generated.
    *
    * - `outputFormat`: Use the `output_format` parameter to specify the structured output format.
-   * - `jsonTool`: Use a special 'json' tool to specify the structured output format (default).
+   * - `jsonTool`: Use a special JSON response tool to specify the structured output format (default).
    * - `auto`: Use 'outputFormat' when supported, otherwise use 'jsonTool'.
    */
   structuredOutputMode: import_v43.z.enum(["outputFormat", "jsonTool", "auto"]).optional(),
@@ -1994,7 +1994,10 @@ async function convertToAnthropicMessagesPrompt({
             }
           }
         }
-        messages.push({ role: "assistant", content: anthropicContent });
+        messages.push({
+          role: "assistant",
+          content: moveToolUseBlocksToEnd(anthropicContent)
+        });
         break;
       }
       default: {
@@ -2054,6 +2057,27 @@ function groupIntoBlocks(prompt) {
   }
   return blocks;
 }
+function moveToolUseBlocksToEnd(content) {
+  const result = [];
+  let segment = [];
+  function flushSegment() {
+    result.push(
+      ...segment.filter((part) => part.type !== "tool_use"),
+      ...segment.filter((part) => part.type === "tool_use")
+    );
+    segment = [];
+  }
+  for (const part of content) {
+    if (part.type === "thinking" || part.type === "redacted_thinking") {
+      flushSegment();
+      result.push(part);
+    } else {
+      segment.push(part);
+    }
+  }
+  flushSegment();
+  return result;
+}
 
 // src/map-anthropic-stop-reason.ts
 function mapAnthropicStopReason({
@@ -2225,6 +2249,15 @@ function isPlainObject(value) {
 }
 
 // src/anthropic-messages-language-model.ts
+function getJsonResponseToolName(tools) {
+  const toolNames = new Set(tools == null ? void 0 : tools.map((tool) => tool.name));
+  let name = "json";
+  let suffix = 1;
+  while (toolNames.has(name)) {
+    name = `json_${suffix++}`;
+  }
+  return name;
+}
 function createCitationSource(citation, citationDocuments, generateId3) {
   var _a;
   if (citation.type !== "page_location" && citation.type !== "char_location") {
@@ -2330,12 +2363,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 anthropicOptions = await (0, import_provider_utils10.parseProviderOptions)({
@@ -2385,9 +2412,10 @@ var AnthropicMessagesLanguageModel = class {
     const isAnthropicModel = isKnownModel || this.modelId.includes("claude-");
     const structureOutputMode = (_a = anthropicOptions == null ? void 0 : anthropicOptions.structuredOutputMode) != null ? _a : "jsonTool";
     const useStructuredOutput = structureOutputMode === "outputFormat" || structureOutputMode === "auto" && supportsStructuredOutput;
+    const jsonResponseToolName = getJsonResponseToolName(tools);
     const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && !useStructuredOutput ? {
       type: "function",
-      name: "json",
+      name: jsonResponseToolName,
       description: "Respond with a JSON object.",
       inputSchema: responseFormat.schema
     } : void 0;
@@ -2630,8 +2658,8 @@ var AnthropicMessagesLanguageModel = class {
       betas: toolsBetas
     } = await prepareTools(
       jsonResponseTool != null ? {
-        tools: [jsonResponseTool],
-        toolChoice: { type: "tool", toolName: jsonResponseTool.name },
+        tools: [...tools != null ? tools : [], jsonResponseTool],
+        toolChoice: tools != null && tools.length > 0 ? { type: "required" } : { type: "tool", toolName: jsonResponseTool.name },
         disableParallelToolUse: true,
         cacheControlValidator
       } : {
@@ -2655,7 +2683,7 @@ var AnthropicMessagesLanguageModel = class {
         ...userSuppliedBetas,
         ...(_i = anthropicOptions == null ? void 0 : anthropicOptions.anthropicBeta) != null ? _i : []
       ]),
-      usesJsonResponseTool: jsonResponseTool != null
+      jsonResponseToolName: jsonResponseTool != null ? jsonResponseToolName : void 0
     };
   }
   async getHeaders({
@@ -2713,7 +2741,7 @@ var AnthropicMessagesLanguageModel = class {
   }
   async doGenerate(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-    const { args, warnings, betas, usesJsonResponseTool } = await this.getArgs({
+    const { args, warnings, betas, jsonResponseToolName } = await this.getArgs({
       ...options,
       userSuppliedBetas: await this.getBetasFromHeaders(options.headers)
     });
@@ -2734,10 +2762,11 @@ var AnthropicMessagesLanguageModel = class {
       fetch: this.config.fetch
     });
     const content = [];
+    let isJsonResponseFromTool = false;
     for (const part of response.content) {
       switch (part.type) {
         case "text": {
-          if (!usesJsonResponseTool) {
+          if (jsonResponseToolName == null) {
             const webSearchCitations = (_a = part.citations) == null ? void 0 : _a.filter(
               (citation) => citation.type === "web_search_result_location"
             );
@@ -2804,18 +2833,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 = part.name === jsonResponseToolName;
+          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": {
@@ -2997,7 +3029,7 @@ var AnthropicMessagesLanguageModel = class {
       content,
       finishReason: mapAnthropicStopReason({
         finishReason: response.stop_reason,
-        isJsonResponseFromTool: usesJsonResponseTool
+        isJsonResponseFromTool
       }),
       usage: {
         inputTokens,
@@ -3065,7 +3097,7 @@ var AnthropicMessagesLanguageModel = class {
   }
   async doStream(options) {
     var _a, _b;
-    const { args, warnings, betas, usesJsonResponseTool } = await this.getArgs({
+    const { args, warnings, betas, jsonResponseToolName } = await this.getArgs({
       ...options,
       userSuppliedBetas: await this.getBetasFromHeaders(options.headers)
     });
@@ -3097,6 +3129,7 @@ var AnthropicMessagesLanguageModel = class {
     let container = null;
     let iterations = null;
     let contextManagement = null;
+    let isJsonResponseFromTool = false;
     let isMessageOpen = false;
     let activeMessageId;
     let hasInvalidMessageSequence = false;
@@ -3180,20 +3213,31 @@ var AnthropicMessagesLanguageModel = class {
                   return;
                 }
                 case "tool_use": {
-                  contentBlocks[value.index] = usesJsonResponseTool ? { type: "text", citations: [] } : {
-                    type: "tool-call",
-                    toolCallId: value.content_block.id,
-                    toolName: value.content_block.name,
-                    input: "",
-                    firstDelta: true
-                  };
-                  controller.enqueue(
-                    usesJsonResponseTool ? { type: "text-start", id: String(value.index) } : {
+                  const isJsonResponseTool = value.content_block.name === jsonResponseToolName;
+                  if (isJsonResponseTool) {
+                    isJsonResponseFromTool = true;
+                    contentBlocks[value.index] = {
+                      type: "text",
+                      citations: []
+                    };
+                    controller.enqueue({
+                      type: "text-start",
+                      id: String(value.index)
+                    });
+                  } else {
+                    contentBlocks[value.index] = {
+                      type: "tool-call",
+                      toolCallId: value.content_block.id,
+                      toolName: value.content_block.name,
+                      input: "",
+                      firstDelta: true
+                    };
+                    controller.enqueue({
                       type: "tool-input-start",
                       id: value.content_block.id,
                       toolName: value.content_block.name
-                    }
-                  );
+                    });
+                  }
                   return;
                 }
                 case "server_tool_use": {
@@ -3389,22 +3433,21 @@ var AnthropicMessagesLanguageModel = class {
                     });
                     break;
                   }
-                  case "tool-call":
-                    if (!usesJsonResponseTool) {
-                      controller.enqueue({
-                        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,
-                        input: contentBlock.input === "" ? "{}" : contentBlock.input,
-                        providerExecuted: contentBlock.providerExecuted
-                      });
-                    }
+                  case "tool-call": {
+                    controller.enqueue({
+                      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,
+                      input: contentBlock.input === "" ? "{}" : contentBlock.input,
+                      providerExecuted: contentBlock.providerExecuted
+                    });
                     break;
+                  }
                 }
                 delete contentBlocks[value.index];
               }
@@ -3415,7 +3458,7 @@ var AnthropicMessagesLanguageModel = class {
               const deltaType = value.delta.type;
               switch (deltaType) {
                 case "text_delta": {
-                  if (usesJsonResponseTool) {
+                  if (jsonResponseToolName != null) {
                     return;
                   }
                   controller.enqueue({
@@ -3464,10 +3507,7 @@ var AnthropicMessagesLanguageModel = class {
                   if (delta.length === 0) {
                     return;
                   }
-                  if (usesJsonResponseTool) {
-                    if ((contentBlock == null ? void 0 : contentBlock.type) !== "text") {
-                      return;
-                    }
+                  if ((contentBlock == null ? void 0 : contentBlock.type) === "text") {
                     controller.enqueue({
                       type: "text-delta",
                       id: String(value.index),
@@ -3576,7 +3616,7 @@ var AnthropicMessagesLanguageModel = class {
               usage.totalTokens = ((_g = usage.inputTokens) != null ? _g : 0) + ((_h = usage.outputTokens) != null ? _h : 0);
               finishReason = mapAnthropicStopReason({
                 finishReason: value.delta.stop_reason,
-                isJsonResponseFromTool: usesJsonResponseTool
+                isJsonResponseFromTool
               });
               stopDetails = mapAnthropicStopDetails(value.delta.stop_details);
               stopSequence = (_i = value.delta.stop_sequence) != null ? _i : null;