ai 4.1.13 → 4.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "4.1.13",
+  "version": "4.1.14",
   "description": "AI SDK by Vercel - The AI Toolkit for TypeScript and JavaScript",
   "license": "Apache-2.0",
   "sideEffects": false,

package/rsc/dist/rsc-server.mjs

@@ -979,7 +979,9 @@ function convertToCoreMessages(messages, options) {
   var _a9;
   const tools = (_a9 = options == null ? void 0 : options.tools) != null ? _a9 : {};
   const coreMessages = [];
-  for (const message of messages) {
+  for (let i = 0; i < messages.length; i++) {
+    const message = messages[i];
+    const isLastMessage = i === messages.length - 1;
     const { role, content, toolInvocations, experimental_attachments } = message;
     switch (role) {
       case "system": {
@@ -1008,11 +1010,11 @@ function convertToCoreMessages(messages, options) {
           var _a10;
           return Math.max(max, (_a10 = toolInvocation.step) != null ? _a10 : 0);
         }, 0);
-        for (let i = 0; i <= maxStep; i++) {
+        for (let i2 = 0; i2 <= maxStep; i2++) {
           const stepInvocations = toolInvocations.filter(
             (toolInvocation) => {
               var _a10;
-              return ((_a10 = toolInvocation.step) != null ? _a10 : 0) === i;
+              return ((_a10 = toolInvocation.step) != null ? _a10 : 0) === i2;
             }
           );
           if (stepInvocations.length === 0) {
@@ -1021,6 +1023,7 @@ function convertToCoreMessages(messages, options) {
           coreMessages.push({
             role: "assistant",
             content: [
+              ...isLastMessage && content && i2 === 0 ? [{ type: "text", text: content }] : [],
               ...stepInvocations.map(
                 ({ toolCallId, toolName, args }) => ({
                   type: "tool-call",
@@ -1057,7 +1060,7 @@ function convertToCoreMessages(messages, options) {
             })
           });
         }
-        if (content) {
+        if (content && !isLastMessage) {
           coreMessages.push({ role: "assistant", content });
         }
         break;