@ai-sdk/amazon-bedrock 3.0.120 → 3.0.125

package/dist/index.mjs

@@ -8,7 +8,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "3.0.120" : "0.0.0-test";
+var VERSION = true ? "3.0.125" : "0.0.0-test";
 
 // src/bedrock-provider.ts
 import { anthropicTools as anthropicTools2 } from "@ai-sdk/anthropic/internal";
@@ -223,7 +223,8 @@ import {
 async function prepareTools({
   tools,
   toolChoice,
-  modelId
+  modelId,
+  disableParallelToolUse
 }) {
   var _a;
   const toolWarnings = [];
@@ -277,7 +278,8 @@ async function prepareTools({
       betas: anthropicBetas
     } = await prepareAnthropicTools({
       tools: providerDefinedTools,
-      toolChoice
+      toolChoice,
+      disableParallelToolUse
     });
     toolWarnings.push(...anthropicToolWarnings);
     anthropicBetas.forEach((beta) => betas.add(beta));
@@ -321,8 +323,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":
@@ -539,7 +550,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": {
@@ -629,7 +645,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: {
@@ -738,6 +756,9 @@ function mapBedrockFinishReason(finishReason, isJsonResponseFromTool) {
 }
 
 // src/bedrock-chat-language-model.ts
+var anthropicProviderOptions = z4.object({
+  disableParallelToolUse: z4.boolean().optional()
+});
 var BedrockChatLanguageModel = class {
   constructor(modelId, config) {
     this.modelId = modelId;
@@ -763,12 +784,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 parseProviderOptions2({
       provider: "bedrock",
       providerOptions,
       schema: bedrockProviderOptions
     })) != null ? _a : {};
+    const anthropicOptions = await parseProviderOptions2({
+      provider: "anthropic",
+      providerOptions,
+      schema: anthropicProviderOptions
+    });
     const warnings = [];
     if (frequencyPenalty != null) {
       warnings.push({
@@ -811,7 +837,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",
@@ -822,7 +851,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) {
@@ -832,16 +862,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 },
@@ -874,7 +904,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",
@@ -889,30 +919,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: sanitizeJsonSchema(responseFormat.schema)
@@ -944,7 +988,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(