@ai-sdk/amazon-bedrock 4.0.163 → 4.0.166

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.some((block2) => !("cachePoint" in block2))) {
+          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, _n, _o, _p;
+    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: amazonBedrockLanguageModelOptions
     })) != null ? _a : {};
+    const anthropicOptions = await parseProviderOptions2({
+      provider: "anthropic",
+      providerOptions,
+      schema: anthropicProviderOptions
+    });
     const warnings = [];
     if (frequencyPenalty != null) {
       warnings.push({
@@ -955,11 +997,11 @@ var BedrockChatLanguageModel = class {
         details: "Only text and json response formats are supported."
       });
     }
-    const isAnthropicModel = this.modelId.includes("anthropic");
-    const openAIModelId = (_b = /^(?:[^.]+\.)?(openai\..+)$/.exec(this.modelId)) == null ? void 0 : _b[1];
+    const isAnthropicModel = this.modelId.includes("anthropic") || this.modelId.includes(":application-inference-profile/") && ((_b = bedrockOptions.reasoningConfig) == null ? void 0 : _b.budgetTokens) != null;
+    const openAIModelId = (_c = /^(?:[^.]+\.)?(openai\..+)$/.exec(this.modelId)) == null ? void 0 : _c[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 isOpenAIGptOssModel = (_d = openAIModelId == null ? void 0 : openAIModelId.startsWith("openai.gpt-oss-")) != null ? _d : false;
+    const isThinkingEnabled = ((_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type) === "enabled" || ((_f = bedrockOptions.reasoningConfig) == null ? void 0 : _f.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;
@@ -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) {
@@ -982,16 +1025,16 @@ var BedrockChatLanguageModel = class {
       };
     }
     if (betas.size > 0 || bedrockOptions.anthropicBeta) {
-      const existingBetas = (_f = bedrockOptions.anthropicBeta) != null ? _f : [];
+      const existingBetas = (_g = bedrockOptions.anthropicBeta) != null ? _g : [];
       const mergedBetas = betas.size > 0 ? [...existingBetas, ...Array.from(betas)] : existingBetas;
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         anthropic_beta: mergedBetas
       };
     }
-    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 thinkingType = (_h = bedrockOptions.reasoningConfig) == null ? void 0 : _h.type;
+    const thinkingBudget = thinkingType === "enabled" ? (_i = bedrockOptions.reasoningConfig) == null ? void 0 : _i.budgetTokens : void 0;
+    const thinkingDisplay = thinkingType === "adaptive" ? (_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.display : void 0;
     const isAnthropicThinkingEnabled = isAnthropicModel && isThinkingEnabled;
     const inferenceConfig = {
       ...maxOutputTokens != null && { maxTokens: maxOutputTokens },
@@ -1024,7 +1067,7 @@ var BedrockChatLanguageModel = class {
         };
       }
     } else if (!isAnthropicModel) {
-      if (((_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.budgetTokens) != null) {
+      if (((_k = bedrockOptions.reasoningConfig) == null ? void 0 : _k.budgetTokens) != null) {
         warnings.push({
           type: "unsupported",
           feature: "budgetTokens",
@@ -1039,13 +1082,13 @@ var BedrockChatLanguageModel = class {
         });
       }
     }
-    const maxReasoningEffort = (_k = bedrockOptions.reasoningConfig) == null ? void 0 : _k.maxReasoningEffort;
+    const maxReasoningEffort = (_l = bedrockOptions.reasoningConfig) == null ? void 0 : _l.maxReasoningEffort;
     if (maxReasoningEffort != null) {
       if (isAnthropicModel) {
         bedrockOptions.additionalModelRequestFields = {
           ...bedrockOptions.additionalModelRequestFields,
           output_config: {
-            ...(_l = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _l.output_config,
+            ...(_m = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _m.output_config,
             effort: maxReasoningEffort
           }
         };
@@ -1056,7 +1099,7 @@ var BedrockChatLanguageModel = class {
         } : {
           ...bedrockOptions.additionalModelRequestFields,
           reasoning: {
-            ...(_m = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _m.reasoning,
+            ...(_n = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _n.reasoning,
             effort: maxReasoningEffort
           }
         };
@@ -1075,7 +1118,7 @@ var BedrockChatLanguageModel = class {
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         output_config: {
-          ...(_n = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _n.output_config,
+          ...(_o = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _o.output_config,
           format: {
             type: "json_schema",
             schema: sanitizeJsonSchema(responseFormat.schema)
@@ -1107,7 +1150,7 @@ var BedrockChatLanguageModel = class {
         details: "topK is not supported when thinking is enabled"
       });
     }
-    const hasAnyTools = ((_p = (_o = toolConfig.tools) == null ? void 0 : _o.length) != null ? _p : 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(
@@ -1790,6 +1833,9 @@ var BedrockStreamSchema = z4.object({
     contentBlockIndex: z4.number(),
     delta: z4.union([
       z4.object({ text: z4.string() }),
+      z4.object({
+        citation: z4.record(z4.string(), z4.unknown())
+      }),
       z4.object({ toolUse: z4.object({ input: z4.string() }) }),
       z4.object({
         reasoningContent: z4.object({ text: z4.string() })
@@ -1919,7 +1965,11 @@ var BedrockEmbeddingModel = class {
     this.supportsParallelCalls = true;
   }
   get maxEmbeddingsPerCall() {
-    return isCohereEmbeddingModel(this.modelId) ? 96 : 1;
+    return this.modelFamily === "cohere" ? 96 : 1;
+  }
+  get modelFamily() {
+    var _a;
+    return (_a = this.config.modelFamily) != null ? _a : detectEmbeddingModelFamily(this.modelId);
   }
   getUrl(modelId) {
     const encodedModelId = encodeURIComponent(modelId);
@@ -1945,9 +1995,8 @@ var BedrockEmbeddingModel = class {
       providerOptions,
       schema: amazonBedrockEmbeddingModelOptionsSchema
     })) != null ? _a : {};
-    const isNovaModel = isNovaEmbeddingModel(this.modelId);
-    const isCohereModel = isCohereEmbeddingModel(this.modelId);
-    const args = isNovaModel ? {
+    const modelFamily = this.modelFamily;
+    const args = modelFamily === "nova" ? {
       taskType: "SINGLE_EMBEDDING",
       singleEmbeddingParams: {
         embeddingPurpose: (_b = bedrockOptions.embeddingPurpose) != null ? _b : "GENERIC_INDEX",
@@ -1957,7 +2006,7 @@ var BedrockEmbeddingModel = class {
           value: values[0]
         }
       }
-    } : isCohereModel ? {
+    } : modelFamily === "cohere" ? {
       // Cohere embedding models on Bedrock require `input_type`.
       // Without it, the service attempts other schema branches and rejects the request.
       input_type: (_e = bedrockOptions.inputType) != null ? _e : "search_query",
@@ -2014,7 +2063,10 @@ function isCohereEmbeddingModel(modelId) {
   return modelId.includes("cohere.embed-");
 }
 function isNovaEmbeddingModel(modelId) {
-  return modelId.startsWith("amazon.nova-") && modelId.includes("embed");
+  return modelId.includes("amazon.nova-") && modelId.includes("embed");
+}
+function detectEmbeddingModelFamily(modelId) {
+  return isNovaEmbeddingModel(modelId) ? "nova" : isCohereEmbeddingModel(modelId) ? "cohere" : "titan";
 }
 var BedrockEmbeddingResponseSchema = z6.union([
   // Titan-style response
@@ -2268,7 +2320,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "4.0.163" : "0.0.0-test";
+var VERSION = true ? "4.0.166" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {
@@ -2586,10 +2638,11 @@ Original error: ${errorMessage}`
     }
     return createChatModel(modelId);
   };
-  const createEmbeddingModel = (modelId) => new BedrockEmbeddingModel(modelId, {
+  const createEmbeddingModel = (modelId, settings = {}) => new BedrockEmbeddingModel(modelId, {
     baseUrl: getBedrockRuntimeBaseUrl,
     headers: getHeaders,
-    fetch: fetchFunction
+    fetch: fetchFunction,
+    modelFamily: settings.modelFamily
   });
   const createImageModel = (modelId) => new BedrockImageModel(modelId, {
     baseUrl: getBedrockRuntimeBaseUrl,