@ai-sdk/amazon-bedrock 3.0.142 → 3.0.143

package/dist/index.mjs

@@ -7,15 +7,16 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "3.0.142" : "0.0.0-test";
+var VERSION = true ? "3.0.143" : "0.0.0-test";
 
 // src/bedrock-provider.ts
 import { anthropicTools as anthropicTools2 } from "@ai-sdk/anthropic/internal";
 
 // src/bedrock-chat-language-model.ts
 import {
-  getModelCapabilities,
-  sanitizeJsonSchema
+  getModelCapabilities as getModelCapabilities2,
+  sanitizeJsonSchema,
+  supportsNativeStructuredOutputSchema
 } from "@ai-sdk/anthropic/internal";
 import {
   lazySchema as lazySchema4,
@@ -135,6 +136,11 @@ function isAnthropicModel({
 }) {
   return modelFamily === "anthropic" || modelId.includes("anthropic") || modelId.includes(":application-inference-profile/") && reasoningBudgetTokens != null;
 }
+function supportsClaude5NativeStructuredOutput(modelId) {
+  return /claude-(?:(?:opus|sonnet)-5(?:-5)?|haiku-5-5)(?:-\d{8})?(?:-v\d+)?(?=[:.]|$)/.test(
+    modelId
+  );
+}
 
 // src/bedrock-error.ts
 import {
@@ -261,6 +267,7 @@ import {
 import { asSchema } from "@ai-sdk/provider-utils";
 import {
   anthropicTools,
+  getModelCapabilities,
   prepareTools as prepareAnthropicTools
 } from "@ai-sdk/anthropic/internal";
 async function prepareTools({
@@ -310,6 +317,7 @@ async function prepareTools({
     reasoningBudgetTokens
   });
   const functionTools = supportedTools.filter((t) => t.type === "function");
+  const disableParallelToolUseForRequest = disableParallelToolUse != null ? disableParallelToolUse : isAnthropicModel2 && (toolChoice == null ? void 0 : toolChoice.type) === "tool" && !getModelCapabilities(modelId).rejectsForcedToolUse ? true : void 0;
   let additionalTools = void 0;
   const bedrockTools = [];
   const usingAnthropicTools = isAnthropicModel2 && providerDefinedTools.length > 0;
@@ -328,7 +336,7 @@ async function prepareTools({
     } = await prepareAnthropicTools({
       tools: providerDefinedTools,
       toolChoice,
-      disableParallelToolUse
+      disableParallelToolUse: disableParallelToolUseForRequest
     });
     toolWarnings.push(...anthropicToolWarnings);
     anthropicBetas.forEach((beta) => betas.add(beta));
@@ -372,7 +380,7 @@ async function prepareTools({
       }
     });
   }
-  if (isAnthropicModel2 && !usingAnthropicTools && disableParallelToolUse && bedrockTools.length > 0 && (toolChoice == null ? void 0 : toolChoice.type) !== "none") {
+  if (isAnthropicModel2 && !usingAnthropicTools && disableParallelToolUseForRequest && 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",
@@ -419,7 +427,12 @@ async function prepareTools({
 import {
   UnsupportedFunctionalityError as UnsupportedFunctionalityError2
 } from "@ai-sdk/provider";
-import { convertToBase64, parseProviderOptions } from "@ai-sdk/provider-utils";
+import {
+  stringifyWithBigIntAndCycles,
+  secureJsonParse,
+  convertToBase64,
+  parseProviderOptions
+} from "@ai-sdk/provider-utils";
 
 // src/bedrock-reasoning-metadata.ts
 import {
@@ -585,7 +598,7 @@ async function convertToBedrockChatMessages(prompt) {
                   case "error-json":
                   default:
                     toolResultContent = [
-                      { text: JSON.stringify(output.value) }
+                      { text: stringifyWithBigIntAndCycles(output.value) }
                     ];
                     break;
                 }
@@ -716,6 +729,15 @@ async function convertToBedrockChatMessages(prompt) {
   return { system, messages };
 }
 function toBedrockToolInput(input) {
+  if (typeof input === "string") {
+    try {
+      const parsed = secureJsonParse(input);
+      if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+        return parsed;
+      }
+    } catch (e) {
+    }
+  }
   return typeof input === "object" && input !== null && !Array.isArray(input) ? input : { rawInvalidInput: input };
 }
 function getBedrockImageFormat(mimeType) {
@@ -907,7 +929,7 @@ var BedrockChatLanguageModel = class {
     const isOpenAIModel = openAIModelId != null;
     const isOpenAIGptOssModel = (_d = openAIModelId == null ? void 0 : openAIModelId.startsWith("openai.gpt-oss-")) != null ? _d : false;
     const isThinkingRequested = ((_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type) === "enabled" || ((_f = bedrockOptions.reasoningConfig) == null ? void 0 : _f.type) === "adaptive";
-    const { rejectsForcedToolUse } = getModelCapabilities(this.modelId);
+    const { rejectsForcedToolUse } = getModelCapabilities2(this.modelId);
     const structuredOutputMode = (_h = (_g = bedrockOptions.structuredOutputMode) != null ? _g : anthropicOptions == null ? void 0 : anthropicOptions.structuredOutputMode) != null ? _h : "auto";
     if (structuredOutputMode === "jsonTool") {
       const additionalModelRequestFields = {
@@ -925,8 +947,8 @@ var BedrockChatLanguageModel = class {
         bedrockOptions.additionalModelRequestFields = additionalModelRequestFields;
       }
     }
-    const modelSupportsNativeStructuredOutput = this.config.modelFamily === "anthropic" || supportsNativeStructuredOutput(this.modelId) && isThinkingRequested;
-    const useNativeStructuredOutput = isAnthropicModel2 && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && (structuredOutputMode === "outputFormat" || structuredOutputMode === "auto" && modelSupportsNativeStructuredOutput);
+    const modelSupportsNativeStructuredOutput = this.config.modelFamily === "anthropic" || supportsClaude5NativeStructuredOutput(this.modelId) || supportsNativeStructuredOutput(this.modelId) && isThinkingRequested;
+    const useNativeStructuredOutput = isAnthropicModel2 && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && (structuredOutputMode === "outputFormat" || structuredOutputMode === "auto" && modelSupportsNativeStructuredOutput && supportsNativeStructuredOutputSchema(responseFormat.schema));
     const useJsonInstructionForStructuredOutput = !useNativeStructuredOutput && isAnthropicModel2 && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && rejectsForcedToolUse;
     const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && !useNativeStructuredOutput && !useJsonInstructionForStructuredOutput ? {
       type: "function",
@@ -935,7 +957,12 @@ var BedrockChatLanguageModel = class {
       inputSchema: responseFormat.schema
     } : void 0;
     const { toolConfig, additionalTools, toolWarnings, betas } = await prepareTools({
-      tools: jsonResponseTool ? [...tools != null ? tools : [], jsonResponseTool] : tools,
+      tools: jsonResponseTool ? [
+        ...(tools != null ? tools : []).filter(
+          (tool) => (toolChoice == null ? void 0 : toolChoice.type) !== "none" && ((toolChoice == null ? void 0 : toolChoice.type) !== "tool" || tool.name === toolChoice.toolName)
+        ),
+        jsonResponseTool
+      ] : tools,
       toolChoice: jsonResponseTool != null ? { type: "required" } : toolChoice,
       modelId: this.modelId,
       modelFamily: this.config.modelFamily,