ai 4.1.11 → 4.1.12

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # ai
 
+## 4.1.12
+
+### Patch Changes
+
+- 0d2d9bf: fix (ui): single assistant message with multiple tool steps
+- Updated dependencies [0d2d9bf]
+- Updated dependencies [0d2d9bf]
+  - @ai-sdk/react@1.1.7
+  - @ai-sdk/ui-utils@1.1.7
+
 ## 4.1.11
 
 ### Patch Changes

package/dist/index.js

@@ -69,17 +69,17 @@ __export(streams_exports, {
   experimental_generateImage: () => generateImage,
   experimental_wrapLanguageModel: () => experimental_wrapLanguageModel,
   extractReasoningMiddleware: () => extractReasoningMiddleware,
-  formatAssistantStreamPart: () => import_ui_utils9.formatAssistantStreamPart,
-  formatDataStreamPart: () => import_ui_utils9.formatDataStreamPart,
+  formatAssistantStreamPart: () => import_ui_utils10.formatAssistantStreamPart,
+  formatDataStreamPart: () => import_ui_utils10.formatDataStreamPart,
   generateId: () => import_provider_utils14.generateId,
   generateObject: () => generateObject,
   generateText: () => generateText,
-  jsonSchema: () => import_ui_utils9.jsonSchema,
-  parseAssistantStreamPart: () => import_ui_utils9.parseAssistantStreamPart,
-  parseDataStreamPart: () => import_ui_utils9.parseDataStreamPart,
+  jsonSchema: () => import_ui_utils10.jsonSchema,
+  parseAssistantStreamPart: () => import_ui_utils10.parseAssistantStreamPart,
+  parseDataStreamPart: () => import_ui_utils10.parseDataStreamPart,
   pipeDataStreamToResponse: () => pipeDataStreamToResponse,
-  processDataStream: () => import_ui_utils9.processDataStream,
-  processTextStream: () => import_ui_utils9.processTextStream,
+  processDataStream: () => import_ui_utils10.processDataStream,
+  processTextStream: () => import_ui_utils10.processTextStream,
   simulateReadableStream: () => simulateReadableStream,
   smoothStream: () => smoothStream,
   streamObject: () => streamObject,
@@ -91,7 +91,7 @@ module.exports = __toCommonJS(streams_exports);
 
 // core/index.ts
 var import_provider_utils14 = require("@ai-sdk/provider-utils");
-var import_ui_utils9 = require("@ai-sdk/ui-utils");
+var import_ui_utils10 = require("@ai-sdk/ui-utils");
 
 // core/data-stream/create-data-stream.ts
 var import_ui_utils = require("@ai-sdk/ui-utils");
@@ -1618,45 +1618,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": {
@@ -5771,41 +5788,60 @@ function appendClientMessage({
 }
 
 // core/prompt/append-response-messages.ts
+var import_ui_utils9 = require("@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 = (0, import_ui_utils9.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) {
@@ -6012,7 +6048,7 @@ function simulateReadableStream({
 }
 
 // streams/assistant-response.ts
-var import_ui_utils10 = require("@ai-sdk/ui-utils");
+var import_ui_utils11 = require("@ai-sdk/ui-utils");
 function AssistantResponse({ threadId, messageId }, process2) {
   const stream = new ReadableStream({
     async start(controller) {
@@ -6021,20 +6057,20 @@ function AssistantResponse({ threadId, messageId }, process2) {
       const sendMessage = (message) => {
         controller.enqueue(
           textEncoder.encode(
-            (0, import_ui_utils10.formatAssistantStreamPart)("assistant_message", message)
+            (0, import_ui_utils11.formatAssistantStreamPart)("assistant_message", message)
           )
         );
       };
       const sendDataMessage = (message) => {
         controller.enqueue(
           textEncoder.encode(
-            (0, import_ui_utils10.formatAssistantStreamPart)("data_message", message)
+            (0, import_ui_utils11.formatAssistantStreamPart)("data_message", message)
           )
         );
       };
       const sendError = (errorMessage) => {
         controller.enqueue(
-          textEncoder.encode((0, import_ui_utils10.formatAssistantStreamPart)("error", errorMessage))
+          textEncoder.encode((0, import_ui_utils11.formatAssistantStreamPart)("error", errorMessage))
         );
       };
       const forwardStream = async (stream2) => {
@@ -6045,7 +6081,7 @@ function AssistantResponse({ threadId, messageId }, process2) {
             case "thread.message.created": {
               controller.enqueue(
                 textEncoder.encode(
-                  (0, import_ui_utils10.formatAssistantStreamPart)("assistant_message", {
+                  (0, import_ui_utils11.formatAssistantStreamPart)("assistant_message", {
                     id: value.data.id,
                     role: "assistant",
                     content: [{ type: "text", text: { value: "" } }]
@@ -6059,7 +6095,7 @@ function AssistantResponse({ threadId, messageId }, process2) {
               if ((content == null ? void 0 : content.type) === "text" && ((_b = content.text) == null ? void 0 : _b.value) != null) {
                 controller.enqueue(
                   textEncoder.encode(
-                    (0, import_ui_utils10.formatAssistantStreamPart)("text", content.text.value)
+                    (0, import_ui_utils11.formatAssistantStreamPart)("text", content.text.value)
                   )
                 );
               }
@@ -6076,7 +6112,7 @@ function AssistantResponse({ threadId, messageId }, process2) {
       };
       controller.enqueue(
         textEncoder.encode(
-          (0, import_ui_utils10.formatAssistantStreamPart)("assistant_control_data", {
+          (0, import_ui_utils11.formatAssistantStreamPart)("assistant_control_data", {
             threadId,
             messageId
           })
@@ -6114,7 +6150,7 @@ __export(langchain_adapter_exports, {
   toDataStream: () => toDataStream,
   toDataStreamResponse: () => toDataStreamResponse
 });
-var import_ui_utils11 = require("@ai-sdk/ui-utils");
+var import_ui_utils12 = require("@ai-sdk/ui-utils");
 
 // streams/stream-callbacks.ts
 function createCallbacksTransformer(callbacks = {}) {
@@ -6170,7 +6206,7 @@ function toDataStreamInternal(stream, callbacks) {
   ).pipeThrough(createCallbacksTransformer(callbacks)).pipeThrough(new TextDecoderStream()).pipeThrough(
     new TransformStream({
       transform: async (chunk, controller) => {
-        controller.enqueue((0, import_ui_utils11.formatDataStreamPart)("text", chunk));
+        controller.enqueue((0, import_ui_utils12.formatDataStreamPart)("text", chunk));
       }
     })
   );
@@ -6222,7 +6258,7 @@ __export(llamaindex_adapter_exports, {
   toDataStreamResponse: () => toDataStreamResponse2
 });
 var import_provider_utils15 = require("@ai-sdk/provider-utils");
-var import_ui_utils12 = require("@ai-sdk/ui-utils");
+var import_ui_utils13 = require("@ai-sdk/ui-utils");
 function toDataStreamInternal2(stream, callbacks) {
   const trimStart = trimStartOfStream();
   return (0, import_provider_utils15.convertAsyncIteratorToReadableStream)(stream[Symbol.asyncIterator]()).pipeThrough(
@@ -6234,7 +6270,7 @@ function toDataStreamInternal2(stream, callbacks) {
   ).pipeThrough(createCallbacksTransformer(callbacks)).pipeThrough(new TextDecoderStream()).pipeThrough(
     new TransformStream({
       transform: async (chunk, controller) => {
-        controller.enqueue((0, import_ui_utils12.formatDataStreamPart)("text", chunk));
+        controller.enqueue((0, import_ui_utils13.formatDataStreamPart)("text", chunk));
       }
     })
   );
@@ -6276,7 +6312,7 @@ function trimStartOfStream() {
 }
 
 // streams/stream-data.ts
-var import_ui_utils13 = require("@ai-sdk/ui-utils");
+var import_ui_utils14 = require("@ai-sdk/ui-utils");
 
 // util/constants.ts
 var HANGING_STREAM_WARNING_TIME_MS = 15 * 1e3;
@@ -6328,7 +6364,7 @@ var StreamData = class {
       throw new Error("Stream controller is not initialized.");
     }
     this.controller.enqueue(
-      this.encoder.encode((0, import_ui_utils13.formatDataStreamPart)("data", [value]))
+      this.encoder.encode((0, import_ui_utils14.formatDataStreamPart)("data", [value]))
     );
   }
   appendMessageAnnotation(value) {
@@ -6339,7 +6375,7 @@ var StreamData = class {
       throw new Error("Stream controller is not initialized.");
     }
     this.controller.enqueue(
-      this.encoder.encode((0, import_ui_utils13.formatDataStreamPart)("message_annotations", [value]))
+      this.encoder.encode((0, import_ui_utils14.formatDataStreamPart)("message_annotations", [value]))
     );
   }
 };