@ai-sdk/amazon-bedrock 4.0.133 → 4.0.135

package/dist/mantle/index.js

@@ -35,7 +35,7 @@ var import_provider_utils = require("@ai-sdk/provider-utils");
 var import_aws4fetch = require("aws4fetch");
 
 // src/version.ts
-var VERSION = true ? "4.0.133" : "0.0.0-test";
+var VERSION = true ? "4.0.135" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {

package/dist/mantle/index.mjs

@@ -23,7 +23,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "4.0.133" : "0.0.0-test";
+var VERSION = true ? "4.0.135" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/amazon-bedrock",
-  "version": "4.0.133",
+  "version": "4.0.135",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -44,10 +44,10 @@
     "@smithy/eventstream-codec": "^4.0.1",
     "@smithy/util-utf8": "^4.0.0",
     "aws4fetch": "^1.0.20",
-    "@ai-sdk/anthropic": "3.0.96",
-    "@ai-sdk/openai": "3.0.84",
+    "@ai-sdk/anthropic": "3.0.97",
+    "@ai-sdk/openai": "3.0.85",
     "@ai-sdk/provider": "3.0.14",
-    "@ai-sdk/provider-utils": "4.0.38"
+    "@ai-sdk/provider-utils": "4.0.39"
   },
   "devDependencies": {
     "@types/node": "20.17.24",

package/src/anthropic/bedrock-anthropic-provider.ts

@@ -272,41 +272,52 @@ export function createBedrockAnthropic(
             : undefined;
 
         const requiredBetas = new Set<string>(betas);
-        const transformedTools = tools?.map((tool: Record<string, unknown>) => {
-          const toolType = tool.type as string | undefined;
-
-          if (toolType && toolType in BEDROCK_TOOL_VERSION_MAP) {
-            const newType =
-              BEDROCK_TOOL_VERSION_MAP[
-                toolType as keyof typeof BEDROCK_TOOL_VERSION_MAP
-              ];
-            if (newType in BEDROCK_TOOL_BETA_MAP) {
-              requiredBetas.add(BEDROCK_TOOL_BETA_MAP[newType]);
+        const transformedTools = tools?.map(
+          (rawTool: Record<string, unknown>) => {
+            // Bedrock rejects the per-tool eager_input_streaming field even when
+            // the fine-grained-tool-streaming beta is declared, but the beta alone
+            // enables the same behavior, so translate the field into the beta
+            const { eager_input_streaming: eagerInputStreaming, ...tool } =
+              rawTool;
+            if (eagerInputStreaming === true) {
+              requiredBetas.add('fine-grained-tool-streaming-2025-05-14');
             }
-            const newName =
-              newType in BEDROCK_TOOL_NAME_MAP
-                ? BEDROCK_TOOL_NAME_MAP[newType]
-                : tool.name;
-            return {
-              ...tool,
-              type: newType,
-              name: newName,
-            };
-          }
 
-          if (toolType && toolType in BEDROCK_TOOL_BETA_MAP) {
-            requiredBetas.add(BEDROCK_TOOL_BETA_MAP[toolType]);
-          }
+            const toolType = tool.type as string | undefined;
 
-          if (toolType && toolType in BEDROCK_TOOL_NAME_MAP) {
-            return {
-              ...tool,
-              name: BEDROCK_TOOL_NAME_MAP[toolType],
-            };
-          }
+            if (toolType && toolType in BEDROCK_TOOL_VERSION_MAP) {
+              const newType =
+                BEDROCK_TOOL_VERSION_MAP[
+                  toolType as keyof typeof BEDROCK_TOOL_VERSION_MAP
+                ];
+              if (newType in BEDROCK_TOOL_BETA_MAP) {
+                requiredBetas.add(BEDROCK_TOOL_BETA_MAP[newType]);
+              }
+              const newName =
+                newType in BEDROCK_TOOL_NAME_MAP
+                  ? BEDROCK_TOOL_NAME_MAP[newType]
+                  : tool.name;
+              return {
+                ...tool,
+                type: newType,
+                name: newName,
+              };
+            }
 
-          return tool;
-        });
+            if (toolType && toolType in BEDROCK_TOOL_BETA_MAP) {
+              requiredBetas.add(BEDROCK_TOOL_BETA_MAP[toolType]);
+            }
+
+            if (toolType && toolType in BEDROCK_TOOL_NAME_MAP) {
+              return {
+                ...tool,
+                name: BEDROCK_TOOL_NAME_MAP[toolType],
+              };
+            }
+
+            return tool;
+          },
+        );
 
         return {
           ...rest,

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

@@ -16,6 +16,7 @@ import {
   combineHeaders,
   createJsonErrorResponseHandler,
   createJsonResponseHandler,
+  injectJsonInstructionIntoMessages,
   parseProviderOptions,
   postJsonToApi,
   resolve,
@@ -78,6 +79,7 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
   }: LanguageModelV3CallOptions): Promise<{
     command: BedrockConverseInput;
     warnings: SharedV3Warning[];
+    usesJsonInstruction: boolean;
     usesJsonResponseTool: boolean;
     betas: Set<string>;
   }> {
@@ -145,16 +147,36 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
       bedrockOptions.reasoningConfig?.type === 'enabled' ||
       bedrockOptions.reasoningConfig?.type === 'adaptive';
 
+    const modelRejectsNativeStructuredOutput =
+      this.modelId.includes('claude-opus-4-7') ||
+      this.modelId.includes('claude-opus-4-8') ||
+      this.modelId.includes('claude-fable-5') ||
+      this.modelId.includes('claude-sonnet-5');
+
+    const modelSupportsStructuredOutput =
+      bedrockChatModelSupportsStructuredOutput(this.modelId);
+
     const useNativeStructuredOutput =
       isAnthropicModel &&
-      isThinkingEnabled &&
+      !modelRejectsNativeStructuredOutput &&
+      (modelSupportsStructuredOutput || isThinkingEnabled) &&
       responseFormat?.type === 'json' &&
       responseFormat.schema != null;
 
+    const useJsonInstructionForStructuredOutput =
+      isAnthropicModel &&
+      (this.modelId.includes('claude-opus-4-7') ||
+        this.modelId.includes('claude-opus-4-8')) &&
+      responseFormat?.type === 'json' &&
+      responseFormat.schema != null &&
+      tools != null &&
+      tools.length > 0;
+
     const jsonResponseTool: LanguageModelV3FunctionTool | undefined =
       responseFormat?.type === 'json' &&
       responseFormat.schema != null &&
-      !useNativeStructuredOutput
+      !useNativeStructuredOutput &&
+      !useJsonInstructionForStructuredOutput
         ? {
             type: 'function',
             name: 'json',
@@ -367,6 +389,15 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
       }
     }
 
+    if (useJsonInstructionForStructuredOutput) {
+      filteredPrompt = injectJsonInstructionIntoMessages({
+        messages: filteredPrompt,
+        schema: responseFormat!.schema,
+        schemaSuffix:
+          'You MUST answer with only a JSON object that matches the JSON schema above. Do not wrap it in markdown fences or include any other text.',
+      });
+    }
+
     const isMistral = isMistralModel(this.modelId);
     const { system, messages } = await convertToBedrockChatMessages(
       filteredPrompt,
@@ -408,6 +439,7 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
           : {}),
       },
       warnings,
+      usesJsonInstruction: useJsonInstructionForStructuredOutput,
       usesJsonResponseTool: jsonResponseTool != null,
       betas,
     };
@@ -431,6 +463,7 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
     const {
       command: args,
       warnings,
+      usesJsonInstruction,
       usesJsonResponseTool,
     } = await this.getArgs(options);
 
@@ -452,12 +485,18 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
 
     const content: Array<LanguageModelV3Content> = [];
     let isJsonResponseFromTool = false;
+    const jsonObjectTextExtractor = usesJsonInstruction
+      ? new JsonObjectTextExtractor()
+      : undefined;
 
     // map response content to content array
     for (const part of response.output.message.content) {
       // text
       if (part.text != null) {
-        content.push({ type: 'text', text: part.text });
+        content.push({
+          type: 'text',
+          text: jsonObjectTextExtractor?.process(part.text) ?? part.text,
+        });
       }
 
       // reasoning
@@ -586,6 +625,7 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
     const {
       command: args,
       warnings,
+      usesJsonInstruction,
       usesJsonResponseTool,
     } = await this.getArgs(options);
     const modelId = this.modelId;
@@ -614,6 +654,9 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
     let providerMetadata: SharedV3ProviderMetadata | undefined = undefined;
     let isJsonResponseFromTool = false;
     let stopSequence: string | null = null;
+    const jsonObjectTextExtractor = usesJsonInstruction
+      ? new JsonObjectTextExtractor()
+      : undefined;
 
     const contentBlocks: Record<
       number,
@@ -773,11 +816,18 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
                 });
               }
 
-              controller.enqueue({
-                type: 'text-delta',
-                id: String(blockIndex),
-                delta: value.contentBlockDelta.delta.text,
-              });
+              const textDelta =
+                jsonObjectTextExtractor?.process(
+                  value.contentBlockDelta.delta.text,
+                ) ?? value.contentBlockDelta.delta.text;
+
+              if (textDelta.length > 0) {
+                controller.enqueue({
+                  type: 'text-delta',
+                  id: String(blockIndex),
+                  delta: textDelta,
+                });
+              }
             }
 
             if (value.contentBlockStop?.contentBlockIndex != null) {
@@ -995,6 +1045,83 @@ export class BedrockChatLanguageModel implements LanguageModelV3 {
   }
 }
 
+function bedrockChatModelSupportsStructuredOutput(modelId: string): boolean {
+  return (
+    modelId.includes('claude-opus-4-8') ||
+    modelId.includes('claude-opus-4-7') ||
+    modelId.includes('claude-fable-5') ||
+    modelId.includes('claude-sonnet-5') ||
+    modelId.includes('claude-sonnet-4-6') ||
+    modelId.includes('claude-opus-4-6') ||
+    modelId.includes('claude-sonnet-4-5') ||
+    modelId.includes('claude-opus-4-5') ||
+    modelId.includes('claude-haiku-4-5') ||
+    modelId.includes('claude-opus-4-1')
+  );
+}
+
+class JsonObjectTextExtractor {
+  private started = false;
+  private completed = false;
+  private depth = 0;
+  private inString = false;
+  private escaped = false;
+
+  process(text: string): string {
+    let result = '';
+
+    for (const character of text) {
+      if (this.completed) {
+        break;
+      }
+
+      if (!this.started) {
+        if (character !== '{') {
+          continue;
+        }
+
+        this.started = true;
+        this.depth = 1;
+        result += character;
+        continue;
+      }
+
+      result += character;
+
+      if (this.escaped) {
+        this.escaped = false;
+        continue;
+      }
+
+      if (character === '\\' && this.inString) {
+        this.escaped = true;
+        continue;
+      }
+
+      if (character === '"') {
+        this.inString = !this.inString;
+        continue;
+      }
+
+      if (this.inString) {
+        continue;
+      }
+
+      if (character === '{') {
+        this.depth++;
+      } else if (character === '}') {
+        this.depth--;
+
+        if (this.depth === 0) {
+          this.completed = true;
+        }
+      }
+    }
+
+    return result;
+  }
+}
+
 const BedrockStopReasonSchema = z.union([
   z.enum(BEDROCK_STOP_REASONS),
   z.string(),