ai 4.1.11 → 4.1.12

package/dist/index.mjs

@@ -1547,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": {
@@ -5723,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) {