@ai-sdk/amazon-bedrock 4.0.163 → 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;
@@ -914,6 +951,11 @@ var BedrockChatLanguageModel = class {
       providerOptions,
       schema: amazonBedrockLanguageModelOptions
     })) != null ? _a : {};
+    const anthropicOptions = await parseProviderOptions2({
+      provider: "anthropic",
+      providerOptions,
+      schema: anthropicProviderOptions
+    });
     const warnings = [];
     if (frequencyPenalty != null) {
       warnings.push({
@@ -972,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) {
@@ -2268,7 +2311,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "4.0.163" : "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") {