@ai-sdk/amazon-bedrock 4.0.161 → 4.0.165

package/dist/index.mjs

@@ -239,7 +239,8 @@ import {
 async function prepareTools({
   tools,
   toolChoice,
-  modelId
+  modelId,
+  disableParallelToolUse
 }) {
   var _a;
   const toolWarnings = [];
@@ -285,6 +286,7 @@ async function prepareTools({
     } = await prepareAnthropicTools({
       tools: ProviderTools,
       toolChoice,
+      disableParallelToolUse,
       supportsStructuredOutput: false,
       supportsStrictTools: false
     });
@@ -340,8 +342,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":
@@ -692,7 +703,12 @@ async function convertToBedrockChatMessages(prompt, isMistral = false) {
           }
           pushCachePoint(bedrockContent, providerOptions);
         }
-        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": {
@@ -701,15 +717,56 @@ async function convertToBedrockChatMessages(prompt, isMistral = false) {
           const message = block.messages[j];
           const isLastMessage = j === block.messages.length - 1;
           const { content } = message;
-          const hasReasoningBlocks = content.some(
-            (part) => part.type === "reasoning"
+          const convertedReasoningContent = await Promise.all(
+            content.map(async (part) => {
+              if (part.type !== "reasoning") {
+                return void 0;
+              }
+              const metadata = await parseProviderOptions({
+                provider: "bedrock",
+                providerOptions: part.providerOptions,
+                schema: bedrockReasoningMetadataSchema
+              });
+              if ((metadata == null ? void 0 : metadata.signature) != null) {
+                return {
+                  reasoningContent: {
+                    reasoningText: {
+                      // do not trim reasoning text when a signature is present:
+                      // the signature validates the exact original bytes
+                      text: part.text,
+                      signature: metadata.signature
+                    }
+                  }
+                };
+              }
+              if ((metadata == null ? void 0 : metadata.redactedContent) != null) {
+                return {
+                  reasoningContent: {
+                    redactedContent: metadata.redactedContent
+                  }
+                };
+              }
+              if ((metadata == null ? void 0 : metadata.redactedData) != null) {
+                return {
+                  reasoningContent: {
+                    redactedReasoning: {
+                      data: metadata.redactedData
+                    }
+                  }
+                };
+              }
+              return void 0;
+            })
+          );
+          const hasReplayableReasoningBlocks = convertedReasoningContent.some(
+            (part) => part != null
           );
           for (let k = 0; k < content.length; k++) {
             const part = content[k];
             const isLastContentPart = k === content.length - 1;
             switch (part.type) {
               case "text": {
-                if (!part.text.trim() && !hasReasoningBlocks) {
+                if (!part.text.trim() && !hasReplayableReasoningBlocks) {
                   break;
                 }
                 bedrockContent.push({
@@ -728,34 +785,9 @@ async function convertToBedrockChatMessages(prompt, isMistral = false) {
                 break;
               }
               case "reasoning": {
-                const reasoningMetadata = await parseProviderOptions({
-                  provider: "bedrock",
-                  providerOptions: part.providerOptions,
-                  schema: bedrockReasoningMetadataSchema
-                });
-                if ((reasoningMetadata == null ? void 0 : reasoningMetadata.signature) != null) {
-                  bedrockContent.push({
-                    reasoningContent: {
-                      reasoningText: {
-                        text: part.text,
-                        signature: reasoningMetadata.signature
-                      }
-                    }
-                  });
-                } else if ((reasoningMetadata == null ? void 0 : reasoningMetadata.redactedContent) != null) {
-                  bedrockContent.push({
-                    reasoningContent: {
-                      redactedContent: reasoningMetadata.redactedContent
-                    }
-                  });
-                } else if ((reasoningMetadata == null ? void 0 : reasoningMetadata.redactedData) != null) {
-                  bedrockContent.push({
-                    reasoningContent: {
-                      redactedReasoning: {
-                        data: reasoningMetadata.redactedData
-                      }
-                    }
-                  });
+                const convertedPart = convertedReasoningContent[k];
+                if (convertedPart != null) {
+                  bedrockContent.push(convertedPart);
                 }
                 break;
               }
@@ -774,7 +806,9 @@ async function convertToBedrockChatMessages(prompt, isMistral = false) {
           }
           pushCachePoint(bedrockContent, message.providerOptions);
         }
-        messages.push({ role: "assistant", content: bedrockContent });
+        if (bedrockContent.length > 0) {
+          messages.push({ role: "assistant", content: bedrockContent });
+        }
         break;
       }
       default: {
@@ -883,6 +917,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;
@@ -908,12 +945,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;
     const bedrockOptions = (_a = await parseProviderOptions2({
       provider: "bedrock",
       providerOptions,
       schema: amazonBedrockLanguageModelOptions
     })) != null ? _a : {};
+    const anthropicOptions = await parseProviderOptions2({
+      provider: "anthropic",
+      providerOptions,
+      schema: anthropicProviderOptions
+    });
     const warnings = [];
     if (frequencyPenalty != null) {
       warnings.push({
@@ -956,7 +998,10 @@ var BedrockChatLanguageModel = class {
       });
     }
     const isAnthropicModel = this.modelId.includes("anthropic");
-    const isThinkingEnabled = ((_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 isThinkingEnabled = ((_d = bedrockOptions.reasoningConfig) == null ? void 0 : _d.type) === "enabled" || ((_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type) === "adaptive";
     const { supportsStructuredOutput: modelSupportsStructuredOutput } = getModelCapabilities(this.modelId);
     const useNativeStructuredOutput = isAnthropicModel && supportsNativeStructuredOutput(this.modelId) && (modelSupportsStructuredOutput || isThinkingEnabled) && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null;
     const useJsonInstructionForStructuredOutput = isAnthropicModel && !supportsStrictTools(this.modelId) && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && tools != null && tools.length > 0;
@@ -969,7 +1014,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) {
@@ -979,16 +1025,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 && isThinkingEnabled;
     const inferenceConfig = {
       ...maxOutputTokens != null && { maxTokens: maxOutputTokens },
@@ -1021,7 +1067,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",
           feature: "budgetTokens",
@@ -1036,21 +1082,26 @@ var BedrockChatLanguageModel = class {
         });
       }
     }
-    const maxReasoningEffort = (_i = bedrockOptions.reasoningConfig) == null ? void 0 : _i.maxReasoningEffort;
-    const isOpenAIModel = this.modelId.startsWith("openai.");
+    const maxReasoningEffort = (_k = bedrockOptions.reasoningConfig) == null ? void 0 : _k.maxReasoningEffort;
     if (maxReasoningEffort != null) {
       if (isAnthropicModel) {
         bedrockOptions.additionalModelRequestFields = {
           ...bedrockOptions.additionalModelRequestFields,
           output_config: {
-            ...(_j = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _j.output_config,
+            ...(_l = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _l.output_config,
             effort: maxReasoningEffort
           }
         };
       } else if (isOpenAIModel) {
-        bedrockOptions.additionalModelRequestFields = {
+        bedrockOptions.additionalModelRequestFields = isOpenAIGptOssModel ? {
           ...bedrockOptions.additionalModelRequestFields,
           reasoning_effort: maxReasoningEffort
+        } : {
+          ...bedrockOptions.additionalModelRequestFields,
+          reasoning: {
+            ...(_m = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _m.reasoning,
+            effort: maxReasoningEffort
+          }
         };
       } else {
         bedrockOptions.additionalModelRequestFields = {
@@ -1067,7 +1118,7 @@ var BedrockChatLanguageModel = class {
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         output_config: {
-          ...(_k = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _k.output_config,
+          ...(_n = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _n.output_config,
           format: {
             type: "json_schema",
             schema: sanitizeJsonSchema(responseFormat.schema)
@@ -1099,7 +1150,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 = ((_p = (_o = toolConfig.tools) == null ? void 0 : _o.length) != null ? _p : 0) > 0 || additionalTools;
     let filteredPrompt = prompt;
     if (!hasAnyTools) {
       const hasToolContent = prompt.some(
@@ -1729,6 +1780,10 @@ var BedrockReasoningTextSchema = z4.object({
 var BedrockRedactedReasoningSchema = z4.object({
   data: z4.string()
 });
+var AmazonBedrockCacheDetailSchema = z4.object({
+  inputTokens: z4.number(),
+  ttl: z4.string()
+}).catchall(z4.json());
 var BedrockResponseSchema = z4.object({
   metrics: z4.object({
     latencyMs: z4.number()
@@ -1770,8 +1825,8 @@ var BedrockResponseSchema = z4.object({
     totalTokens: z4.number(),
     cacheReadInputTokens: z4.number().nullish(),
     cacheWriteInputTokens: z4.number().nullish(),
-    cacheDetails: z4.array(z4.object({ inputTokens: z4.number(), ttl: z4.string() })).nullish()
-  })
+    cacheDetails: z4.array(AmazonBedrockCacheDetailSchema).nullish()
+  }).catchall(z4.json())
 });
 var BedrockStreamSchema = z4.object({
   contentBlockDelta: z4.object({
@@ -1819,10 +1874,11 @@ var BedrockStreamSchema = z4.object({
     usage: z4.object({
       cacheReadInputTokens: z4.number().nullish(),
       cacheWriteInputTokens: z4.number().nullish(),
-      cacheDetails: z4.array(z4.object({ inputTokens: z4.number(), ttl: z4.string() })).nullish(),
+      cacheDetails: z4.array(AmazonBedrockCacheDetailSchema).nullish(),
       inputTokens: z4.number(),
-      outputTokens: z4.number()
-    }).nullish()
+      outputTokens: z4.number(),
+      totalTokens: z4.number().optional()
+    }).catchall(z4.json()).nullish()
   }).nullish(),
   modelStreamErrorException: z4.record(z4.string(), z4.unknown()).nullish(),
   serviceUnavailableException: z4.record(z4.string(), z4.unknown()).nullish(),
@@ -2255,7 +2311,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "4.0.161" : "0.0.0-test";
+var VERSION = true ? "4.0.165" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {