@ai-sdk/amazon-bedrock 5.0.74 → 5.0.75

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @ai-sdk/amazon-bedrock
 
+## 5.0.75
+
+### Patch Changes
+
+- d0b6d6d: fix(bedrock): preserve provider-executed tool results when replaying messages
+- 770c214: fix(amazon-bedrock): sanitize document filenames before sending them to Bedrock
+- 1ee6b1f: fix(amazon-bedrock): return text from citation content responses
+- Updated dependencies [4af00d1]
+- Updated dependencies [abb9ebf]
+  - @ai-sdk/openai@4.0.59
+
 ## 5.0.74
 
 ### Patch Changes

package/dist/anthropic/index.js

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

package/dist/index.js

@@ -526,6 +526,9 @@ function pushCachePoint(content, providerMetadata) {
 function sanitizeToolName(toolName) {
   return toolName.replace(/[^a-zA-Z0-9_-]/g, "") || "_";
 }
+function sanitizeDocumentName(filename) {
+  return stripFileExtension(filename).replace(/\s+/g, " ").replace(/[^a-zA-Z0-9 ()[\]-]/g, "").trim().slice(0, 200).trim();
+}
 function getAmazonBedrockMediaSource({
   data,
   functionality
@@ -588,6 +591,7 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
   const messages = [];
   let documentCounter = 0;
   const generateDocumentName = () => `document-${++documentCounter}`;
+  const getDocumentName = (filename) => filename && sanitizeDocumentName(filename) || generateDocumentName();
   for (let i = 0; i < blocks.length; i++) {
     const block = blocks[i];
     const isLastBlock = i === blocks.length - 1;
@@ -692,7 +696,7 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                         amazonBedrockContent.push({
                           document: {
                             format: getAmazonBedrockDocumentFormat(textMediaType),
-                            name: part.filename ? stripFileExtension(part.filename) : generateDocumentName(),
+                            name: getDocumentName(part.filename),
                             source: {
                               bytes: convertToBase64(
                                 new TextEncoder().encode(part.data.text)
@@ -749,7 +753,7 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                             amazonBedrockContent.push({
                               document: {
                                 format: getAmazonBedrockDocumentFormat(fullMediaType),
-                                name: part.filename ? stripFileExtension(part.filename) : generateDocumentName(),
+                                name: getDocumentName(part.filename),
                                 source: {
                                   bytes: convertToBase64(part.data.data)
                                 },
@@ -775,110 +779,13 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                 if (part.type === "tool-approval-response") {
                   continue;
                 }
-                let toolResultContent;
-                const output = part.output;
-                switch (output.type) {
-                  case "content": {
-                    toolResultContent = await Promise.all(
-                      output.value.map(async (contentPart) => {
-                        switch (contentPart.type) {
-                          case "text":
-                            return { text: contentPart.text };
-                          case "file": {
-                            if (contentPart.data.type !== "data" && (contentPart.data.type !== "url" || contentPart.data.url.protocol !== "s3:")) {
-                              throw new UnsupportedFunctionalityError2({
-                                functionality: `tool result file data of type "${contentPart.data.type}"`
-                              });
-                            }
-                            const fullMediaType = resolveFullMediaType({
-                              part: contentPart
-                            });
-                            switch (getTopLevelMediaType(fullMediaType)) {
-                              case "image": {
-                                return {
-                                  image: {
-                                    format: getAmazonBedrockImageFormat(
-                                      fullMediaType
-                                    ),
-                                    source: getAmazonBedrockMediaSource({
-                                      data: contentPart.data,
-                                      functionality: `tool result file data of type "${contentPart.data.type}"`
-                                    })
-                                  }
-                                };
-                              }
-                              case "video": {
-                                return {
-                                  video: {
-                                    format: getAmazonBedrockVideoFormat(
-                                      fullMediaType
-                                    ),
-                                    source: getAmazonBedrockMediaSource({
-                                      data: contentPart.data,
-                                      functionality: `tool result file data of type "${contentPart.data.type}"`
-                                    })
-                                  }
-                                };
-                              }
-                              default: {
-                                if (contentPart.data.type !== "data") {
-                                  throw new UnsupportedFunctionalityError2({
-                                    functionality: `tool result file data of type "${contentPart.data.type}"`
-                                  });
-                                }
-                                const enableCitations = await shouldEnableCitations(
-                                  contentPart.providerOptions
-                                );
-                                return {
-                                  document: {
-                                    format: getAmazonBedrockDocumentFormat(
-                                      fullMediaType
-                                    ),
-                                    name: contentPart.filename ? stripFileExtension(contentPart.filename) : generateDocumentName(),
-                                    source: {
-                                      bytes: convertToBase64(
-                                        contentPart.data.data
-                                      )
-                                    },
-                                    ...enableCitations && {
-                                      citations: { enabled: true }
-                                    }
-                                  }
-                                };
-                              }
-                            }
-                          }
-                          default: {
-                            throw new UnsupportedFunctionalityError2({
-                              functionality: `unsupported tool content part type: ${contentPart.type}`
-                            });
-                          }
-                        }
-                      })
-                    );
-                    break;
-                  }
-                  case "text":
-                  case "error-text":
-                    toolResultContent = [{ text: output.value }];
-                    break;
-                  case "execution-denied":
-                    toolResultContent = [
-                      { text: (_a = output.reason) != null ? _a : "Tool call execution denied." }
-                    ];
-                    break;
-                  case "json":
-                  case "error-json":
-                  default:
-                    toolResultContent = [
-                      { text: JSON.stringify(output.value) }
-                    ];
-                    break;
-                }
                 amazonBedrockContent.push({
                   toolResult: {
                     toolUseId: normalizeToolCallId(part.toolCallId, isMistral),
-                    content: toolResultContent
+                    content: await convertToolResultOutput({
+                      output: part.output,
+                      getDocumentName
+                    })
                   }
                 });
                 pushCachePoint(amazonBedrockContent, part.providerOptions);
@@ -892,11 +799,24 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
           }
           pushCachePoint(amazonBedrockContent, providerOptions);
         }
-        messages.push({ role: "user", content: amazonBedrockContent });
+        appendToUserMessage(messages, amazonBedrockContent);
         break;
       }
       case "assistant": {
-        const amazonBedrockContent = [];
+        let assistantContent = [];
+        let toolResultContent = [];
+        const flushAssistantContent = () => {
+          if (assistantContent.some((block2) => !("cachePoint" in block2))) {
+            messages.push({ role: "assistant", content: assistantContent });
+          }
+          assistantContent = [];
+        };
+        const flushToolResultContent = () => {
+          if (toolResultContent.length > 0) {
+            appendToUserMessage(messages, toolResultContent);
+            toolResultContent = [];
+          }
+        };
         for (let j = 0; j < block.messages.length; j++) {
           const message = block.messages[j];
           const isLastMessage = j === block.messages.length - 1;
@@ -907,12 +827,15 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
           for (let k = 0; k < content.length; k++) {
             const part = content[k];
             const isLastContentPart = k === content.length - 1;
+            if (part.type !== "tool-result") {
+              flushToolResultContent();
+            }
             switch (part.type) {
               case "text": {
                 if (!part.text.trim() && !hasReasoningBlocks) {
                   break;
                 }
-                amazonBedrockContent.push({
+                assistantContent.push({
                   text: (
                     // trim the last text part if it's the last message in the block
                     // because Bedrock does not allow trailing whitespace
@@ -928,17 +851,17 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                 break;
               }
               case "reasoning": {
-                const reasoningMetadata = (_b = await parseProviderOptions({
+                const reasoningMetadata = (_a = await parseProviderOptions({
                   provider: "amazonBedrock",
                   providerOptions: part.providerOptions,
                   schema: amazonBedrockReasoningMetadataSchema
-                })) != null ? _b : await parseProviderOptions({
+                })) != null ? _a : await parseProviderOptions({
                   provider: "bedrock",
                   providerOptions: part.providerOptions,
                   schema: amazonBedrockReasoningMetadataSchema
                 });
                 if ((reasoningMetadata == null ? void 0 : reasoningMetadata.signature) != null) {
-                  amazonBedrockContent.push({
+                  assistantContent.push({
                     reasoningContent: {
                       reasoningText: {
                         text: part.text,
@@ -947,13 +870,13 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                     }
                   });
                 } else if ((reasoningMetadata == null ? void 0 : reasoningMetadata.redactedContent) != null) {
-                  amazonBedrockContent.push({
+                  assistantContent.push({
                     reasoningContent: {
                       redactedContent: reasoningMetadata.redactedContent
                     }
                   });
                 } else if ((reasoningMetadata == null ? void 0 : reasoningMetadata.redactedData) != null) {
-                  amazonBedrockContent.push({
+                  assistantContent.push({
                     reasoningContent: {
                       redactedReasoning: {
                         data: reasoningMetadata.redactedData
@@ -964,7 +887,7 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                 break;
               }
               case "tool-call": {
-                amazonBedrockContent.push({
+                assistantContent.push({
                   toolUse: {
                     toolUseId: normalizeToolCallId(part.toolCallId, isMistral),
                     name: sanitizeToolName(part.toolName),
@@ -973,14 +896,32 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                 });
                 break;
               }
+              case "tool-result": {
+                flushAssistantContent();
+                toolResultContent.push({
+                  toolResult: {
+                    toolUseId: normalizeToolCallId(part.toolCallId, isMistral),
+                    content: await convertToolResultOutput({
+                      output: part.output,
+                      getDocumentName
+                    })
+                  }
+                });
+                break;
+              }
             }
-            pushCachePoint(amazonBedrockContent, part.providerOptions);
+            pushCachePoint(
+              part.type === "tool-result" ? toolResultContent : assistantContent,
+              part.providerOptions
+            );
           }
-          pushCachePoint(amazonBedrockContent, message.providerOptions);
-        }
-        if (amazonBedrockContent.some((block2) => !("cachePoint" in block2))) {
-          messages.push({ role: "assistant", content: amazonBedrockContent });
+          pushCachePoint(
+            ((_b = content[content.length - 1]) == null ? void 0 : _b.type) === "tool-result" ? toolResultContent : assistantContent,
+            message.providerOptions
+          );
         }
+        flushToolResultContent();
+        flushAssistantContent();
         break;
       }
       default: {
@@ -991,6 +932,97 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
   }
   return { system, messages };
 }
+function appendToUserMessage(messages, content) {
+  const lastMessage = messages[messages.length - 1];
+  if ((lastMessage == null ? void 0 : lastMessage.role) === "user" && lastMessage.content.some((block) => "toolResult" in block)) {
+    lastMessage.content.push(...content);
+  } else {
+    messages.push({ role: "user", content });
+  }
+}
+async function convertToolResultOutput({
+  output,
+  getDocumentName
+}) {
+  var _a;
+  switch (output.type) {
+    case "content": {
+      return Promise.all(
+        output.value.map(async (contentPart) => {
+          switch (contentPart.type) {
+            case "text":
+              return { text: contentPart.text };
+            case "file": {
+              if (contentPart.data.type !== "data" && (contentPart.data.type !== "url" || contentPart.data.url.protocol !== "s3:")) {
+                throw new UnsupportedFunctionalityError2({
+                  functionality: `tool result file data of type "${contentPart.data.type}"`
+                });
+              }
+              const fullMediaType = resolveFullMediaType({ part: contentPart });
+              switch (getTopLevelMediaType(fullMediaType)) {
+                case "image":
+                  return {
+                    image: {
+                      format: getAmazonBedrockImageFormat(fullMediaType),
+                      source: getAmazonBedrockMediaSource({
+                        data: contentPart.data,
+                        functionality: `tool result file data of type "${contentPart.data.type}"`
+                      })
+                    }
+                  };
+                case "video":
+                  return {
+                    video: {
+                      format: getAmazonBedrockVideoFormat(fullMediaType),
+                      source: getAmazonBedrockMediaSource({
+                        data: contentPart.data,
+                        functionality: `tool result file data of type "${contentPart.data.type}"`
+                      })
+                    }
+                  };
+                default: {
+                  if (contentPart.data.type !== "data") {
+                    throw new UnsupportedFunctionalityError2({
+                      functionality: `tool result file data of type "${contentPart.data.type}"`
+                    });
+                  }
+                  const enableCitations = await shouldEnableCitations(
+                    contentPart.providerOptions
+                  );
+                  return {
+                    document: {
+                      format: getAmazonBedrockDocumentFormat(fullMediaType),
+                      name: getDocumentName(contentPart.filename),
+                      source: {
+                        bytes: convertToBase64(contentPart.data.data)
+                      },
+                      ...enableCitations && {
+                        citations: { enabled: true }
+                      }
+                    }
+                  };
+                }
+              }
+            }
+            default:
+              throw new UnsupportedFunctionalityError2({
+                functionality: `unsupported tool content part type: ${contentPart.type}`
+              });
+          }
+        })
+      );
+    }
+    case "text":
+    case "error-text":
+      return [{ text: output.value }];
+    case "execution-denied":
+      return [{ text: (_a = output.reason) != null ? _a : "Tool call execution denied." }];
+    case "json":
+    case "error-json":
+    default:
+      return [{ text: JSON.stringify(output.value) }];
+  }
+}
 function toBedrockToolInput(input) {
   return typeof input === "object" && input !== null && !Array.isArray(input) ? input : { rawInvalidInput: input };
 }
@@ -1463,7 +1495,7 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
     );
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const {
       command: args,
       warnings,
@@ -1492,10 +1524,13 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
     let isJsonResponseFromTool = false;
     const jsonObjectTextExtractor = usesJsonInstruction ? new JsonObjectTextExtractor() : void 0;
     for (const part of response.output.message.content) {
-      if (part.text != null) {
+      const textParts = part.text != null ? [part.text] : (_c = (_b = (_a = part.citationsContent) == null ? void 0 : _a.content) == null ? void 0 : _b.flatMap(
+        (content2) => content2.text == null ? [] : [content2.text]
+      )) != null ? _c : [];
+      for (const text of textParts) {
         content.push({
           type: "text",
-          text: (_a = jsonObjectTextExtractor == null ? void 0 : jsonObjectTextExtractor.process(part.text)) != null ? _a : part.text
+          text: (_d = jsonObjectTextExtractor == null ? void 0 : jsonObjectTextExtractor.process(text)) != null ? _d : text
         });
       }
       if (part.reasoningContent) {
@@ -1516,7 +1551,7 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
           content.push(reasoning);
         } else if ("redactedReasoning" in part.reasoningContent) {
           const redactedPayload = {
-            redactedData: (_b = part.reasoningContent.redactedReasoning.data) != null ? _b : ""
+            redactedData: (_e = part.reasoningContent.redactedReasoning.data) != null ? _e : ""
           };
           content.push({
             type: "reasoning",
@@ -1550,17 +1585,17 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
           });
         } else {
           const isMistral = isMistralModel(this.modelId);
-          const rawToolCallId = ((_c = part.toolUse) == null ? void 0 : _c.toolUseId) || this.config.generateId();
+          const rawToolCallId = ((_f = part.toolUse) == null ? void 0 : _f.toolUseId) || this.config.generateId();
           content.push({
             type: "tool-call",
             toolCallId: normalizeToolCallId(rawToolCallId, isMistral),
-            toolName: (_e = (_d = part.toolUse) == null ? void 0 : _d.name) != null ? _e : `tool-${this.config.generateId()}`,
-            input: JSON.stringify((_g = (_f = part.toolUse) == null ? void 0 : _f.input) != null ? _g : {})
+            toolName: (_h = (_g = part.toolUse) == null ? void 0 : _g.name) != null ? _h : `tool-${this.config.generateId()}`,
+            input: JSON.stringify((_j = (_i = part.toolUse) == null ? void 0 : _i.input) != null ? _j : {})
           });
         }
       }
     }
-    const stopSequence = (_j = (_i = (_h = response.additionalModelResponseFields) == null ? void 0 : _h.delta) == null ? void 0 : _i.stop_sequence) != null ? _j : null;
+    const stopSequence = (_m = (_l = (_k = response.additionalModelResponseFields) == null ? void 0 : _k.delta) == null ? void 0 : _l.stop_sequence) != null ? _m : null;
     const providerMetadataPayload = response.trace || response.usage || response.performanceConfig || response.serviceTier || isJsonResponseFromTool || stopSequence ? {
       ...response.trace && typeof response.trace === "object" ? { trace: response.trace } : {},
       ...response.performanceConfig && {
@@ -1569,7 +1604,7 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
       ...response.serviceTier && {
         serviceTier: response.serviceTier
       },
-      ...(((_k = response.usage) == null ? void 0 : _k.cacheWriteInputTokens) != null || ((_l = response.usage) == null ? void 0 : _l.cacheDetails) != null) && {
+      ...(((_n = response.usage) == null ? void 0 : _n.cacheWriteInputTokens) != null || ((_o = response.usage) == null ? void 0 : _o.cacheDetails) != null) && {
         usage: {
           ...response.usage.cacheWriteInputTokens != null && {
             cacheWriteInputTokens: response.usage.cacheWriteInputTokens
@@ -1593,11 +1628,11 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
           response.stopReason,
           isJsonResponseFromTool
         ),
-        raw: (_m = response.stopReason) != null ? _m : void 0
+        raw: (_p = response.stopReason) != null ? _p : void 0
       },
       usage: convertAmazonBedrockUsage(response.usage),
       response: {
-        id: (_n = responseHeaders == null ? void 0 : responseHeaders["x-amzn-requestid"]) != null ? _n : void 0,
+        id: (_q = responseHeaders == null ? void 0 : responseHeaders["x-amzn-requestid"]) != null ? _q : void 0,
         timestamp: (responseHeaders == null ? void 0 : responseHeaders["date"]) != null ? new Date(responseHeaders["date"]) : void 0,
         modelId: this.modelId,
         headers: responseHeaders
@@ -2063,6 +2098,13 @@ var AmazonBedrockResponseSchema = z4.object({
       content: z4.array(
         z4.object({
           text: z4.string().nullish(),
+          citationsContent: z4.object({
+            content: z4.array(
+              z4.object({
+                text: z4.string().nullish()
+              })
+            ).nullish()
+          }).nullish(),
           toolUse: AmazonBedrockToolUseSchema.nullish(),
           reasoningContent: z4.union([
             z4.object({
@@ -2736,7 +2778,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "5.0.74" : "0.0.0-test";
+var VERSION = true ? "5.0.75" : "0.0.0-test";
 
 // src/amazon-bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {