ai 4.1.11 → 4.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "4.1.11",
+  "version": "4.1.12",
   "description": "AI SDK by Vercel - The AI Toolkit for TypeScript and JavaScript",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -42,8 +42,8 @@
   "dependencies": {
     "@ai-sdk/provider": "1.0.6",
     "@ai-sdk/provider-utils": "2.1.5",
-    "@ai-sdk/react": "1.1.6",
-    "@ai-sdk/ui-utils": "1.1.6",
+    "@ai-sdk/react": "1.1.7",
+    "@ai-sdk/ui-utils": "1.1.7",
     "@opentelemetry/api": "1.9.0",
     "jsondiffpatch": "0.6.0"
   },

package/rsc/dist/rsc-server.mjs

@@ -1004,45 +1004,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 _a10;
+          return Math.max(max, (_a10 = toolInvocation.step) != null ? _a10 : 0);
+        }, 0);
+        for (let i = 0; i <= maxStep; i++) {
+          const stepInvocations = toolInvocations.filter(
+            (toolInvocation) => {
+              var _a10;
+              return ((_a10 = toolInvocation.step) != null ? _a10 : 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 tool = tools[toolName];
+              return (tool == null ? void 0 : tool.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 tool = tools[toolName];
-            return (tool == null ? void 0 : tool.experimental_toToolResultContent) != null ? {
-              type: "tool-result",
-              toolCallId,
-              toolName,
-              result: tool.experimental_toToolResultContent(result),
-              experimental_content: tool.experimental_toToolResultContent(result)
-            } : {
-              type: "tool-result",
-              toolCallId,
-              toolName,
-              result
-            };
-          })
-        });
+                result: tool.experimental_toToolResultContent(result),
+                experimental_content: tool.experimental_toToolResultContent(result)
+              } : {
+                type: "tool-result",
+                toolCallId,
+                toolName,
+                result
+              };
+            })
+          });
+        }
+        if (content) {
+          coreMessages.push({ role: "assistant", content });
+        }
         break;
       }
       case "data": {