@ai-sdk/amazon-bedrock 5.0.130 → 5.0.131

package/dist/mantle/index.cjs

@@ -4,7 +4,7 @@ let _ai_sdk_provider = require("@ai-sdk/provider");
 let _ai_sdk_provider_utils = require("@ai-sdk/provider-utils");
 let aws4fetch = require("aws4fetch");
 //#region src/version.ts
-const VERSION = "5.0.130";
+const VERSION = "5.0.131";
 //#endregion
 //#region src/amazon-bedrock-sigv4-fetch.ts
 /**

package/dist/mantle/index.js

@@ -3,7 +3,7 @@ import { InvalidArgumentError, LoadAPIKeyError, NoSuchModelError } from "@ai-sdk
 import { combineHeaders, getRuntimeEnvironmentUserAgent, isValidHostnamePart, loadOptionalSetting, loadSetting, normalizeHeaders, resolve, withUserAgentSuffix, withoutTrailingSlash } from "@ai-sdk/provider-utils";
 import { AwsV4Signer } from "aws4fetch";
 //#region src/version.ts
-const VERSION = "5.0.130";
+const VERSION = "5.0.131";
 //#endregion
 //#region src/amazon-bedrock-sigv4-fetch.ts
 /**

package/docs/08-amazon-bedrock.mdx

@@ -295,6 +295,17 @@ choose how Amazon Bedrock generates structured outputs:
 - `"auto"`: Use native structured output when supported and otherwise fall
   back to the JSON tool. This is the default.
 
+In `"auto"` mode, supported Claude 5 models use native output for compatible
+schemas. Recursive references, open objects, and schemas with more than ten
+optional properties fall back to the JSON tool, or JSON instructions for models
+that reject forced tool use.
+
+The JSON-tool fallback limits which application tools are available:
+`toolChoice: 'none'` sends only the internal JSON response tool, and a named tool
+choice sends only that application tool alongside the JSON response tool. The
+fallback can produce a JSON response without calling the named application tool;
+verify the selected call if your application requires it.
+
 In `"auto"` mode, Claude Sonnet 4.6 and Claude Haiku 4.5 use the JSON tool
 fallback because native structured output can be unreliable across workloads
 and Bedrock accounts. You can set `"outputFormat"` to opt into native structured

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/amazon-bedrock",
-  "version": "5.0.130",
+  "version": "5.0.131",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -41,10 +41,10 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "4.0.94",
-    "@ai-sdk/openai": "4.0.106",
+    "@ai-sdk/anthropic": "4.0.95",
+    "@ai-sdk/openai": "4.0.107",
     "@ai-sdk/provider": "4.0.35",
-    "@ai-sdk/provider-utils": "5.0.72",
+    "@ai-sdk/provider-utils": "5.0.73",
     "@smithy/eventstream-codec": "^4.3.3",
     "@smithy/util-utf8": "^4.3.3",
     "aws4fetch": "^1.0.20"

package/src/amazon-bedrock-anthropic-model-support.ts

@@ -17,9 +17,9 @@ export function isAnthropicModel({
   );
 }
 
-// Bedrock validates its own Messages schema. New Claude generations currently
-// reject native structured output and strict tools, so only known supported
-// Claude models receive those fields. Non-Claude models and opaque inference
+// Bedrock validates its own Messages schema. Only known supported Claude
+// models receive native structured output and strict tool fields.
+// Non-Claude models and opaque inference
 // profile IDs retain their existing behavior.
 export function supportsStrictTools(modelId: string): boolean {
   return (
@@ -44,4 +44,6 @@ const MODELS_WITH_STRICT_TOOL_SUPPORT = [
   /claude-opus-4-(?:1|5|6)(?=[-.:]|$)/,
   /claude-sonnet-4-(?:5|6)(?=[-.:]|$)/,
   /claude-haiku-4-5(?=[-.:]|$)/,
+  /claude-(?:opus|sonnet)-5(?:-5)?(?:-\d{8})?(?:-v\d+)?(?=[:.]|$)/,
+  /claude-haiku-5-5(?:-\d{8})?(?:-v\d+)?(?=[:.]|$)/,
 ];

package/src/amazon-bedrock-chat-language-model.ts

@@ -36,6 +36,7 @@ import {
 import {
   getModelCapabilities,
   sanitizeJsonSchema,
+  supportsNativeStructuredOutputSchema,
 } from '@ai-sdk/anthropic/internal';
 import { z } from 'zod/v4';
 import {
@@ -421,7 +422,8 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
       responseFormat.schema != null &&
       (structuredOutputMode === 'outputFormat' ||
         (structuredOutputMode === 'auto' &&
-          modelSupportsNativeStructuredOutput));
+          modelSupportsNativeStructuredOutput &&
+          supportsNativeStructuredOutputSchema(responseFormat.schema)));
 
     const useJsonInstructionForStructuredOutput =
       !useNativeStructuredOutput &&
@@ -453,7 +455,17 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
 
     const { toolConfig, additionalTools, toolWarnings, betas } =
       await prepareTools({
-        tools: jsonResponseTool ? [...(tools ?? []), jsonResponseTool] : tools,
+        tools: jsonResponseTool
+          ? [
+              ...(tools ?? []).filter(
+                tool =>
+                  toolChoice?.type !== 'none' &&
+                  (toolChoice?.type !== 'tool' ||
+                    tool.name === toolChoice.toolName),
+              ),
+              jsonResponseTool,
+            ]
+          : tools,
         toolChoice:
           jsonResponseTool != null ? { type: 'required' } : toolChoice,
         modelId: this.modelId,

package/src/amazon-bedrock-prepare-tools.ts

@@ -96,6 +96,14 @@ export async function prepareTools({
     rejectsForcedToolChoice && toolChoice.type === 'tool'
       ? providerTools.filter(tool => tool.name === toolChoice.toolName)
       : providerTools;
+  // A named tool choice keeps every function tool for these models (see
+  // below), so parallel tool use is disabled by default to keep the response
+  // to the named tool. `disableParallelToolUse: false` opts out.
+  const disableParallelToolUseForRequest =
+    disableParallelToolUse ??
+    (isAnthropicModel && toolChoice?.type === 'tool' && !rejectsForcedToolChoice
+      ? true
+      : undefined);
 
   let additionalTools: Record<string, unknown> | undefined = undefined;
   const amazonBedrockTools: AmazonBedrockTool[] = [];
@@ -112,7 +120,7 @@ export async function prepareTools({
     } = await prepareAnthropicTools({
       tools: providerTools,
       toolChoice,
-      disableParallelToolUse,
+      disableParallelToolUse: disableParallelToolUseForRequest,
       supportsStructuredOutput: false,
       supportsStrictTools: false,
       rejectsForcedToolUse,
@@ -181,8 +189,12 @@ export async function prepareTools({
     preparedToolChoice = { type: 'auto' };
   }
 
+  // Anthropic models that accept forced tool use guarantee the named tool is
+  // called, so they keep every function tool. Other models only receive the
+  // named tool so they cannot call a different one.
   const filteredFunctionTools =
-    toolChoice?.type === 'tool'
+    toolChoice?.type === 'tool' &&
+    (!isAnthropicModel || rejectsForcedToolChoice)
       ? functionTools.filter(t => t.name === toolChoice.toolName)
       : functionTools;
 
@@ -226,7 +238,7 @@ export async function prepareTools({
   if (
     isAnthropicModel &&
     !usingAnthropicTools &&
-    disableParallelToolUse &&
+    disableParallelToolUseForRequest &&
     amazonBedrockTools.length > 0 &&
     preparedToolChoice?.type !== 'none'
   ) {

package/src/convert-to-amazon-bedrock-chat-messages.ts

@@ -9,11 +9,13 @@ import {
   type SharedV4ProviderMetadata,
 } from '@ai-sdk/provider';
 import {
+  stringifyWithBigIntAndCycles,
   convertToBase64,
   getTopLevelMediaType,
   isFullMediaType,
   parseProviderOptions,
   resolveFullMediaType,
+  secureJsonParse,
   stripFileExtension,
 } from '@ai-sdk/provider-utils';
 import {
@@ -700,12 +702,27 @@ async function convertToolResultOutput({
     case 'json':
     case 'error-json':
     default:
-      return [{ text: JSON.stringify(output.value) }];
+      return [{ text: stringifyWithBigIntAndCycles(output.value) }];
   }
 }
 
 // wrap invalid tool call input because Bedrock requires it to be an object
 function toBedrockToolInput(input: unknown): JSONObject {
+  if (typeof input === 'string') {
+    try {
+      const parsed = secureJsonParse(input);
+      if (
+        typeof parsed === 'object' &&
+        parsed !== null &&
+        !Array.isArray(parsed)
+      ) {
+        return parsed as JSONObject;
+      }
+    } catch {
+      // malformed JSON falls through to rawInvalidInput wrapper
+    }
+  }
+
   return typeof input === 'object' && input !== null && !Array.isArray(input)
     ? (input as JSONObject)
     : { rawInvalidInput: input as JSONValue };