ai 4.1.10 → 4.1.12

package/dist/index.mjs

@@ -1150,13 +1150,14 @@ async function convertToLanguageModelPrompt({
   ];
 }
 function convertToLanguageModelMessage(message, downloadedAssets) {
+  var _a15, _b, _c, _d, _e, _f;
   const role = message.role;
   switch (role) {
     case "system": {
       return {
         role: "system",
         content: message.content,
-        providerMetadata: message.experimental_providerMetadata
+        providerMetadata: (_a15 = message.providerOptions) != null ? _a15 : message.experimental_providerMetadata
       };
     }
     case "user": {
@@ -1164,13 +1165,13 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
         return {
           role: "user",
           content: [{ type: "text", text: message.content }],
-          providerMetadata: message.experimental_providerMetadata
+          providerMetadata: (_b = message.providerOptions) != null ? _b : message.experimental_providerMetadata
         };
       }
       return {
         role: "user",
         content: message.content.map((part) => convertPartToLanguageModelPart(part, downloadedAssets)).filter((part) => part.type !== "text" || part.text !== ""),
-        providerMetadata: message.experimental_providerMetadata
+        providerMetadata: (_c = message.providerOptions) != null ? _c : message.experimental_providerMetadata
       };
     }
     case "assistant": {
@@ -1178,7 +1179,7 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
         return {
           role: "assistant",
           content: [{ type: "text", text: message.content }],
-          providerMetadata: message.experimental_providerMetadata
+          providerMetadata: (_d = message.providerOptions) != null ? _d : message.experimental_providerMetadata
         };
       }
       return {
@@ -1187,28 +1188,31 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
           // remove empty text parts:
           (part) => part.type !== "text" || part.text !== ""
         ).map((part) => {
-          const { experimental_providerMetadata, ...rest } = part;
+          const { experimental_providerMetadata, providerOptions, ...rest } = part;
           return {
             ...rest,
-            providerMetadata: experimental_providerMetadata
+            providerMetadata: providerOptions != null ? providerOptions : experimental_providerMetadata
           };
         }),
-        providerMetadata: message.experimental_providerMetadata
+        providerMetadata: (_e = message.providerOptions) != null ? _e : message.experimental_providerMetadata
       };
     }
     case "tool": {
       return {
         role: "tool",
-        content: message.content.map((part) => ({
-          type: "tool-result",
-          toolCallId: part.toolCallId,
-          toolName: part.toolName,
-          result: part.result,
-          content: part.experimental_content,
-          isError: part.isError,
-          providerMetadata: part.experimental_providerMetadata
-        })),
-        providerMetadata: message.experimental_providerMetadata
+        content: message.content.map((part) => {
+          var _a16;
+          return {
+            type: "tool-result",
+            toolCallId: part.toolCallId,
+            toolName: part.toolName,
+            result: part.result,
+            content: part.experimental_content,
+            isError: part.isError,
+            providerMetadata: (_a16 = part.providerOptions) != null ? _a16 : part.experimental_providerMetadata
+          };
+        }),
+        providerMetadata: (_f = message.providerOptions) != null ? _f : message.experimental_providerMetadata
       };
     }
     default: {
@@ -1543,45 +1547,62 @@ function convertToCoreMessages(messages, options) {
           coreMessages.push({ role: "assistant", content });
           break;
         }
-        coreMessages.push({
-          role: "assistant",
-          content: [
-            { type: "text", text: content },
-            ...toolInvocations.map(
-              ({ toolCallId, toolName, args }) => ({
-                type: "tool-call",
+        const maxStep = toolInvocations.reduce((max, toolInvocation) => {
+          var _a16;
+          return Math.max(max, (_a16 = toolInvocation.step) != null ? _a16 : 0);
+        }, 0);
+        for (let i = 0; i <= maxStep; i++) {
+          const stepInvocations = toolInvocations.filter(
+            (toolInvocation) => {
+              var _a16;
+              return ((_a16 = toolInvocation.step) != null ? _a16 : 0) === i;
+            }
+          );
+          if (stepInvocations.length === 0) {
+            continue;
+          }
+          coreMessages.push({
+            role: "assistant",
+            content: [
+              ...stepInvocations.map(
+                ({ toolCallId, toolName, args }) => ({
+                  type: "tool-call",
+                  toolCallId,
+                  toolName,
+                  args
+                })
+              )
+            ]
+          });
+          coreMessages.push({
+            role: "tool",
+            content: stepInvocations.map((toolInvocation) => {
+              if (!("result" in toolInvocation)) {
+                throw new MessageConversionError({
+                  originalMessage: message,
+                  message: "ToolInvocation must have a result: " + JSON.stringify(toolInvocation)
+                });
+              }
+              const { toolCallId, toolName, result } = toolInvocation;
+              const tool2 = tools[toolName];
+              return (tool2 == null ? void 0 : tool2.experimental_toToolResultContent) != null ? {
+                type: "tool-result",
                 toolCallId,
                 toolName,
-                args
-              })
-            )
-          ]
-        });
-        coreMessages.push({
-          role: "tool",
-          content: toolInvocations.map((toolInvocation) => {
-            if (!("result" in toolInvocation)) {
-              throw new MessageConversionError({
-                originalMessage: message,
-                message: "ToolInvocation must have a result: " + JSON.stringify(toolInvocation)
-              });
-            }
-            const { toolCallId, toolName, result } = toolInvocation;
-            const tool2 = tools[toolName];
-            return (tool2 == null ? void 0 : tool2.experimental_toToolResultContent) != null ? {
-              type: "tool-result",
-              toolCallId,
-              toolName,
-              result: tool2.experimental_toToolResultContent(result),
-              experimental_content: tool2.experimental_toToolResultContent(result)
-            } : {
-              type: "tool-result",
-              toolCallId,
-              toolName,
-              result
-            };
-          })
-        });
+                result: tool2.experimental_toToolResultContent(result),
+                experimental_content: tool2.experimental_toToolResultContent(result)
+              } : {
+                type: "tool-result",
+                toolCallId,
+                toolName,
+                result
+              };
+            })
+          });
+        }
+        if (content) {
+          coreMessages.push({ role: "assistant", content });
+        }
         break;
       }
       case "data": {
@@ -1625,7 +1646,7 @@ function detectSingleMessageCharacteristics(message) {
   "experimental_attachments" in message)) {
     return "has-ui-specific-parts";
   } else if (typeof message === "object" && message !== null && "content" in message && (Array.isArray(message.content) || // Core messages can have array content
-  "experimental_providerMetadata" in message)) {
+  "experimental_providerMetadata" in message || "providerOptions" in message)) {
     return "has-core-specific-parts";
   } else if (typeof message === "object" && message !== null && "role" in message && "content" in message && typeof message.content === "string" && ["system", "user", "assistant", "tool"].includes(message.role)) {
     return "message";
@@ -1679,25 +1700,30 @@ var toolResultContentSchema = z4.array(
 var textPartSchema = z5.object({
   type: z5.literal("text"),
   text: z5.string(),
+  providerOptions: providerMetadataSchema.optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
 var imagePartSchema = z5.object({
   type: z5.literal("image"),
   image: z5.union([dataContentSchema, z5.instanceof(URL)]),
   mimeType: z5.string().optional(),
+  providerOptions: providerMetadataSchema.optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
 var filePartSchema = z5.object({
   type: z5.literal("file"),
   data: z5.union([dataContentSchema, z5.instanceof(URL)]),
   mimeType: z5.string(),
+  providerOptions: providerMetadataSchema.optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
 var toolCallPartSchema = z5.object({
   type: z5.literal("tool-call"),
   toolCallId: z5.string(),
   toolName: z5.string(),
-  args: z5.unknown()
+  args: z5.unknown(),
+  providerOptions: providerMetadataSchema.optional(),
+  experimental_providerMetadata: providerMetadataSchema.optional()
 });
 var toolResultPartSchema = z5.object({
   type: z5.literal("tool-result"),
@@ -1706,6 +1732,7 @@ var toolResultPartSchema = z5.object({
   result: z5.unknown(),
   content: toolResultContentSchema.optional(),
   isError: z5.boolean().optional(),
+  providerOptions: providerMetadataSchema.optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
 
@@ -1713,6 +1740,7 @@ var toolResultPartSchema = z5.object({
 var coreSystemMessageSchema = z6.object({
   role: z6.literal("system"),
   content: z6.string(),
+  providerOptions: providerMetadataSchema.optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
 var coreUserMessageSchema = z6.object({
@@ -1721,6 +1749,7 @@ var coreUserMessageSchema = z6.object({
     z6.string(),
     z6.array(z6.union([textPartSchema, imagePartSchema, filePartSchema]))
   ]),
+  providerOptions: providerMetadataSchema.optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
 var coreAssistantMessageSchema = z6.object({
@@ -1729,11 +1758,13 @@ var coreAssistantMessageSchema = z6.object({
     z6.string(),
     z6.array(z6.union([textPartSchema, toolCallPartSchema]))
   ]),
+  providerOptions: providerMetadataSchema.optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
 var coreToolMessageSchema = z6.object({
   role: z6.literal("tool"),
   content: z6.array(toolResultPartSchema),
+  providerOptions: providerMetadataSchema.optional(),
   experimental_providerMetadata: providerMetadataSchema.optional()
 });
 var coreMessageSchema = z6.union([
@@ -2249,7 +2280,8 @@ async function generateObject({
   abortSignal,
   headers,
   experimental_telemetry: telemetry,
-  experimental_providerMetadata: providerMetadata,
+  experimental_providerMetadata,
+  providerOptions = experimental_providerMetadata,
   _internal: {
     generateId: generateId3 = originalGenerateId,
     currentDate = () => /* @__PURE__ */ new Date()
@@ -2376,7 +2408,7 @@ async function generateObject({
                   ...prepareCallSettings(settings),
                   inputFormat: standardizedPrompt.type,
                   prompt: promptMessages,
-                  providerMetadata,
+                  providerMetadata: providerOptions,
                   abortSignal,
                   headers
                 });
@@ -2483,7 +2515,7 @@ async function generateObject({
                   ...prepareCallSettings(settings),
                   inputFormat,
                   prompt: promptMessages,
-                  providerMetadata,
+                  providerMetadata: providerOptions,
                   abortSignal,
                   headers
                 });
@@ -2787,7 +2819,8 @@ function streamObject({
   abortSignal,
   headers,
   experimental_telemetry: telemetry,
-  experimental_providerMetadata: providerMetadata,
+  experimental_providerMetadata,
+  providerOptions = experimental_providerMetadata,
   onFinish,
   _internal: {
     generateId: generateId3 = originalGenerateId2,
@@ -2820,7 +2853,7 @@ function streamObject({
     messages,
     schemaName,
     schemaDescription,
-    inputProviderMetadata: providerMetadata,
+    providerOptions,
     mode,
     onFinish,
     generateId: generateId3,
@@ -2842,7 +2875,7 @@ var DefaultStreamObjectResult = class {
     messages,
     schemaName,
     schemaDescription,
-    inputProviderMetadata,
+    providerOptions,
     mode,
     onFinish,
     generateId: generateId3,
@@ -2923,7 +2956,7 @@ var DefaultStreamObjectResult = class {
                 modelSupportsImageUrls: model.supportsImageUrls,
                 modelSupportsUrl: model.supportsUrl
               }),
-              providerMetadata: inputProviderMetadata,
+              providerMetadata: providerOptions,
               abortSignal,
               headers
             };
@@ -2965,7 +2998,7 @@ var DefaultStreamObjectResult = class {
                 modelSupportsImageUrls: model.supportsImageUrls,
                 modelSupportsUrl: model.supportsUrl
               }),
-              providerMetadata: inputProviderMetadata,
+              providerMetadata: providerOptions,
               abortSignal,
               headers
             };
@@ -3647,7 +3680,8 @@ async function generateText({
   experimental_output: output,
   experimental_continueSteps: continueSteps = false,
   experimental_telemetry: telemetry,
-  experimental_providerMetadata: providerMetadata,
+  experimental_providerMetadata,
+  providerOptions = experimental_providerMetadata,
   experimental_activeTools: activeTools,
   experimental_repairToolCall: repairToolCall,
   _internal: {
@@ -3780,7 +3814,7 @@ async function generateText({
                 inputFormat: promptFormat,
                 responseFormat: output == null ? void 0 : output.responseFormat({ model }),
                 prompt: promptMessages,
-                providerMetadata,
+                providerMetadata: providerOptions,
                 abortSignal,
                 headers
               });
@@ -4511,7 +4545,8 @@ function streamText({
   experimental_output: output,
   experimental_continueSteps: continueSteps = false,
   experimental_telemetry: telemetry,
-  experimental_providerMetadata: providerMetadata,
+  experimental_providerMetadata,
+  providerOptions = experimental_providerMetadata,
   experimental_toolCallStreaming = false,
   toolCallStreaming = experimental_toolCallStreaming,
   experimental_activeTools: activeTools,
@@ -4546,7 +4581,7 @@ function streamText({
     maxSteps,
     output,
     continueSteps,
-    providerMetadata,
+    providerOptions,
     onChunk,
     onFinish,
     onStepFinish,
@@ -4627,7 +4662,7 @@ var DefaultStreamTextResult = class {
     maxSteps,
     output,
     continueSteps,
-    providerMetadata,
+    providerOptions,
     onChunk,
     onFinish,
     onStepFinish,
@@ -4955,7 +4990,7 @@ var DefaultStreamTextResult = class {
                   inputFormat: promptFormat,
                   responseFormat: output == null ? void 0 : output.responseFormat({ model }),
                   prompt: promptMessages,
-                  providerMetadata,
+                  providerMetadata: providerOptions,
                   abortSignal,
                   headers
                 })
@@ -5705,41 +5740,62 @@ function appendClientMessage({
 }
 
 // core/prompt/append-response-messages.ts
+import {
+  extractMaxToolInvocationStep
+} from "@ai-sdk/ui-utils";
 function appendResponseMessages({
   messages,
   responseMessages
 }) {
-  var _a15;
+  var _a15, _b;
   const clonedMessages = structuredClone(messages);
   for (const message of responseMessages) {
     const role = message.role;
+    const lastMessage = clonedMessages[clonedMessages.length - 1];
+    const isLastMessageAssistant = lastMessage.role === "assistant";
     switch (role) {
       case "assistant": {
-        clonedMessages.push({
-          role: "assistant",
-          id: message.id,
-          createdAt: /* @__PURE__ */ new Date(),
-          // generate a createdAt date for the message, will be overridden by the client
-          // only include text in the content:
-          content: typeof message.content === "string" ? message.content : message.content.filter((part) => part.type === "text").map((part) => part.text).join(""),
-          // separate tool calls from the content:
-          toolInvocations: (typeof message.content === "string" ? [] : message.content.filter((part) => part.type === "tool-call")).map((call) => ({
+        let getToolInvocations2 = function(step) {
+          return (typeof message.content === "string" ? [] : message.content.filter((part) => part.type === "tool-call")).map((call) => ({
             state: "call",
-            ...call
-          }))
-        });
+            step,
+            args: call.args,
+            toolCallId: call.toolCallId,
+            toolName: call.toolName
+          }));
+        };
+        var getToolInvocations = getToolInvocations2;
+        const textContent = typeof message.content === "string" ? message.content : message.content.filter((part) => part.type === "text").map((part) => part.text).join("");
+        if (isLastMessageAssistant) {
+          const maxStep = extractMaxToolInvocationStep(
+            lastMessage.toolInvocations
+          );
+          lastMessage.content = textContent;
+          lastMessage.toolInvocations = [
+            ...(_a15 = lastMessage.toolInvocations) != null ? _a15 : [],
+            ...getToolInvocations2(maxStep === void 0 ? 0 : maxStep + 1)
+          ];
+        } else {
+          clonedMessages.push({
+            role: "assistant",
+            id: message.id,
+            createdAt: /* @__PURE__ */ new Date(),
+            // generate a createdAt date for the message, will be overridden by the client
+            content: textContent,
+            toolInvocations: getToolInvocations2(0)
+          });
+        }
         break;
       }
       case "tool": {
-        const previousMessage = clonedMessages[clonedMessages.length - 1];
-        (_a15 = previousMessage.toolInvocations) != null ? _a15 : previousMessage.toolInvocations = [];
-        if (previousMessage.role !== "assistant") {
+        (_b = lastMessage.toolInvocations) != null ? _b : lastMessage.toolInvocations = [];
+        if (lastMessage.role !== "assistant") {
           throw new Error(
-            `Tool result must follow an assistant message: ${previousMessage.role}`
+            `Tool result must follow an assistant message: ${lastMessage.role}`
           );
         }
         for (const part of message.content) {
-          const toolCall = previousMessage.toolInvocations.find(
+          const toolCall = lastMessage.toolInvocations.find(
             (call) => call.toolCallId === part.toolCallId
           );
           if (!toolCall) {