@ai-sdk/amazon-bedrock 3.0.120 → 3.0.124

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @ai-sdk/amazon-bedrock
 
+## 3.0.124
+
+### Patch Changes
+
+- 7a7a971: Forward the Anthropic option for disabling parallel tool use through Amazon Bedrock without sending conflicting tool choice fields.
+
+## 3.0.123
+
+### Patch Changes
+
+- 1f9e026: Omit assistant messages that become empty after unsupported reasoning content is removed.
+- Updated dependencies [77d33c0]
+  - @ai-sdk/provider-utils@3.0.35
+  - @ai-sdk/anthropic@2.0.98
+
+## 3.0.122
+
+### Patch Changes
+
+- 5f3c624: Send nested reasoning effort for CRIS-prefixed OpenAI GPT-5.x Converse requests while preserving the flat gpt-oss format.
+
+## 3.0.121
+
+### Patch Changes
+
+- Updated dependencies [2fff9f1]
+- Updated dependencies [f364ea0]
+  - @ai-sdk/provider-utils@3.0.34
+  - @ai-sdk/anthropic@2.0.97
+
 ## 3.0.120
 
 ### Patch Changes

package/dist/anthropic/index.js

@@ -35,7 +35,7 @@ var import_provider_utils = require("@ai-sdk/provider-utils");
 var import_aws4fetch = require("aws4fetch");
 
 // src/version.ts
-var VERSION = true ? "3.0.120" : "0.0.0-test";
+var VERSION = true ? "3.0.124" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch = globalThis.fetch) {

package/dist/anthropic/index.mjs

@@ -24,7 +24,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "3.0.120" : "0.0.0-test";
+var VERSION = true ? "3.0.124" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch = globalThis.fetch) {

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(index_exports);
 var import_provider_utils8 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.120" : "0.0.0-test";
+var VERSION = true ? "3.0.124" : "0.0.0-test";
 
 // src/bedrock-provider.ts
 var import_internal3 = require("@ai-sdk/anthropic/internal");
@@ -229,7 +229,8 @@ var import_internal = require("@ai-sdk/anthropic/internal");
 async function prepareTools({
   tools,
   toolChoice,
-  modelId
+  modelId,
+  disableParallelToolUse
 }) {
   var _a;
   const toolWarnings = [];
@@ -283,7 +284,8 @@ async function prepareTools({
       betas: anthropicBetas
     } = await (0, import_internal.prepareTools)({
       tools: providerDefinedTools,
-      toolChoice
+      toolChoice,
+      disableParallelToolUse
     });
     toolWarnings.push(...anthropicToolWarnings);
     anthropicBetas.forEach((beta) => betas.add(beta));
@@ -327,8 +329,17 @@ async function prepareTools({
       }
     });
   }
+  if (isAnthropicModel && !usingAnthropicTools && disableParallelToolUse && bedrockTools.length > 0 && (toolChoice == null ? void 0 : toolChoice.type) !== "none") {
+    additionalTools = {
+      tool_choice: (toolChoice == null ? void 0 : toolChoice.type) === "required" ? { type: "any", disable_parallel_tool_use: true } : (toolChoice == null ? void 0 : toolChoice.type) === "tool" ? {
+        type: "tool",
+        name: toolChoice.toolName,
+        disable_parallel_tool_use: true
+      } : { type: "auto", disable_parallel_tool_use: true }
+    };
+  }
   let bedrockToolChoice = void 0;
-  if (!usingAnthropicTools && bedrockTools.length > 0 && toolChoice) {
+  if (!usingAnthropicTools && (additionalTools == null ? void 0 : additionalTools.tool_choice) == null && bedrockTools.length > 0 && toolChoice) {
     const type = toolChoice.type;
     switch (type) {
       case "auto":
@@ -543,7 +554,12 @@ async function convertToBedrockChatMessages(prompt) {
             bedrockContent.push(BEDROCK_CACHE_POINT);
           }
         }
-        messages.push({ role: "user", content: bedrockContent });
+        const previousMessage = messages.at(-1);
+        if ((previousMessage == null ? void 0 : previousMessage.role) === "user") {
+          previousMessage.content.push(...bedrockContent);
+        } else {
+          messages.push({ role: "user", content: bedrockContent });
+        }
         break;
       }
       case "assistant": {
@@ -633,7 +649,9 @@ async function convertToBedrockChatMessages(prompt) {
             bedrockContent.push(BEDROCK_CACHE_POINT);
           }
         }
-        messages.push({ role: "assistant", content: bedrockContent });
+        if (bedrockContent.length > 0) {
+          messages.push({ role: "assistant", content: bedrockContent });
+        }
         break;
       }
       default: {
@@ -742,6 +760,9 @@ function mapBedrockFinishReason(finishReason, isJsonResponseFromTool) {
 }
 
 // src/bedrock-chat-language-model.ts
+var anthropicProviderOptions = import_v44.z.object({
+  disableParallelToolUse: import_v44.z.boolean().optional()
+});
 var BedrockChatLanguageModel = class {
   constructor(modelId, config) {
     this.modelId = modelId;
@@ -767,12 +788,17 @@ var BedrockChatLanguageModel = class {
     toolChoice,
     providerOptions
   }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const bedrockOptions = (_a = await (0, import_provider_utils4.parseProviderOptions)({
       provider: "bedrock",
       providerOptions,
       schema: bedrockProviderOptions
     })) != null ? _a : {};
+    const anthropicOptions = await (0, import_provider_utils4.parseProviderOptions)({
+      provider: "anthropic",
+      providerOptions,
+      schema: anthropicProviderOptions
+    });
     const warnings = [];
     if (frequencyPenalty != null) {
       warnings.push({
@@ -815,7 +841,10 @@ var BedrockChatLanguageModel = class {
       });
     }
     const isAnthropicModel = this.modelId.includes("anthropic");
-    const isThinkingRequested = ((_b = bedrockOptions.reasoningConfig) == null ? void 0 : _b.type) === "enabled" || ((_c = bedrockOptions.reasoningConfig) == null ? void 0 : _c.type) === "adaptive";
+    const openAIModelId = (_b = /^(?:[^.]+\.)?(openai\..+)$/.exec(this.modelId)) == null ? void 0 : _b[1];
+    const isOpenAIModel = openAIModelId != null;
+    const isOpenAIGptOssModel = (_c = openAIModelId == null ? void 0 : openAIModelId.startsWith("openai.gpt-oss-")) != null ? _c : false;
+    const isThinkingRequested = ((_d = bedrockOptions.reasoningConfig) == null ? void 0 : _d.type) === "enabled" || ((_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type) === "adaptive";
     const useNativeStructuredOutput = isAnthropicModel && supportsNativeStructuredOutput(this.modelId) && isThinkingRequested && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null;
     const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && !useNativeStructuredOutput ? {
       type: "function",
@@ -826,7 +855,8 @@ var BedrockChatLanguageModel = class {
     const { toolConfig, additionalTools, toolWarnings, betas } = await prepareTools({
       tools: jsonResponseTool ? [...tools != null ? tools : [], jsonResponseTool] : tools,
       toolChoice: jsonResponseTool != null ? { type: "required" } : toolChoice,
-      modelId: this.modelId
+      modelId: this.modelId,
+      disableParallelToolUse: anthropicOptions == null ? void 0 : anthropicOptions.disableParallelToolUse
     });
     warnings.push(...toolWarnings);
     if (additionalTools) {
@@ -836,16 +866,16 @@ var BedrockChatLanguageModel = class {
       };
     }
     if (betas.size > 0 || bedrockOptions.anthropicBeta) {
-      const existingBetas = (_d = bedrockOptions.anthropicBeta) != null ? _d : [];
+      const existingBetas = (_f = bedrockOptions.anthropicBeta) != null ? _f : [];
       const mergedBetas = betas.size > 0 ? [...existingBetas, ...Array.from(betas)] : existingBetas;
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         anthropic_beta: mergedBetas
       };
     }
-    const thinkingType = (_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type;
-    const thinkingBudget = thinkingType === "enabled" ? (_f = bedrockOptions.reasoningConfig) == null ? void 0 : _f.budgetTokens : void 0;
-    const thinkingDisplay = thinkingType === "adaptive" ? (_g = bedrockOptions.reasoningConfig) == null ? void 0 : _g.display : void 0;
+    const thinkingType = (_g = bedrockOptions.reasoningConfig) == null ? void 0 : _g.type;
+    const thinkingBudget = thinkingType === "enabled" ? (_h = bedrockOptions.reasoningConfig) == null ? void 0 : _h.budgetTokens : void 0;
+    const thinkingDisplay = thinkingType === "adaptive" ? (_i = bedrockOptions.reasoningConfig) == null ? void 0 : _i.display : void 0;
     const isAnthropicThinkingEnabled = isAnthropicModel && isThinkingRequested;
     const inferenceConfig = {
       ...maxOutputTokens != null && { maxTokens: maxOutputTokens },
@@ -878,7 +908,7 @@ var BedrockChatLanguageModel = class {
         };
       }
     } else if (!isAnthropicModel) {
-      if (((_h = bedrockOptions.reasoningConfig) == null ? void 0 : _h.budgetTokens) != null) {
+      if (((_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.budgetTokens) != null) {
         warnings.push({
           type: "unsupported-setting",
           setting: "budgetTokens",
@@ -893,30 +923,44 @@ var BedrockChatLanguageModel = class {
         });
       }
     }
-    const maxReasoningEffort = (_i = bedrockOptions.reasoningConfig) == null ? void 0 : _i.maxReasoningEffort;
-    if (maxReasoningEffort != null && !isAnthropicModel) {
-      bedrockOptions.additionalModelRequestFields = {
-        ...bedrockOptions.additionalModelRequestFields,
-        reasoningConfig: {
-          ...((_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.type) != null && {
-            type: bedrockOptions.reasoningConfig.type
-          },
-          maxReasoningEffort
-        }
-      };
-    } else if (maxReasoningEffort != null && isAnthropicModel) {
-      bedrockOptions.additionalModelRequestFields = {
-        ...bedrockOptions.additionalModelRequestFields,
-        output_config: {
-          effort: maxReasoningEffort
-        }
-      };
+    const maxReasoningEffort = (_k = bedrockOptions.reasoningConfig) == null ? void 0 : _k.maxReasoningEffort;
+    if (maxReasoningEffort != null) {
+      if (isAnthropicModel) {
+        bedrockOptions.additionalModelRequestFields = {
+          ...bedrockOptions.additionalModelRequestFields,
+          output_config: {
+            ...(_l = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _l.output_config,
+            effort: maxReasoningEffort
+          }
+        };
+      } else if (isOpenAIModel) {
+        bedrockOptions.additionalModelRequestFields = isOpenAIGptOssModel ? {
+          ...bedrockOptions.additionalModelRequestFields,
+          reasoning_effort: maxReasoningEffort
+        } : {
+          ...bedrockOptions.additionalModelRequestFields,
+          reasoning: {
+            ...(_m = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _m.reasoning,
+            effort: maxReasoningEffort
+          }
+        };
+      } else {
+        bedrockOptions.additionalModelRequestFields = {
+          ...bedrockOptions.additionalModelRequestFields,
+          reasoningConfig: {
+            ...((_n = bedrockOptions.reasoningConfig) == null ? void 0 : _n.type) != null && {
+              type: bedrockOptions.reasoningConfig.type
+            },
+            maxReasoningEffort
+          }
+        };
+      }
     }
     if (useNativeStructuredOutput && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null) {
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         output_config: {
-          ...(_k = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _k.output_config,
+          ...(_o = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _o.output_config,
           format: {
             type: "json_schema",
             schema: (0, import_internal2.sanitizeJsonSchema)(responseFormat.schema)
@@ -948,7 +992,7 @@ var BedrockChatLanguageModel = class {
         details: "topK is not supported when thinking is enabled"
       });
     }
-    const hasAnyTools = ((_m = (_l = toolConfig.tools) == null ? void 0 : _l.length) != null ? _m : 0) > 0 || additionalTools;
+    const hasAnyTools = ((_q = (_p = toolConfig.tools) == null ? void 0 : _p.length) != null ? _q : 0) > 0 || additionalTools;
     let filteredPrompt = prompt;
     if (!hasAnyTools) {
       const hasToolContent = prompt.some(