ai 4.1.19 → 4.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "4.1.19",
+  "version": "4.1.21",
   "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.7",
     "@ai-sdk/provider-utils": "2.1.6",
-    "@ai-sdk/react": "1.1.9",
-    "@ai-sdk/ui-utils": "1.1.9",
+    "@ai-sdk/react": "1.1.10",
+    "@ai-sdk/ui-utils": "1.1.10",
     "@opentelemetry/api": "1.9.0",
     "jsondiffpatch": "0.6.0"
   },

package/rsc/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { LanguageModelV1FinishReason, LanguageModelV1CallWarning, LanguageModelV1ProviderMetadata, LanguageModelV1 } from '@ai-sdk/provider';
 import { ReactNode } from 'react';
 import { z } from 'zod';
-import { ToolInvocation, Attachment } from '@ai-sdk/ui-utils';
+import { Message } from '@ai-sdk/ui-utils';
 
 type AIAction<T = any, R = any> = (...args: T[]) => Promise<R>;
 type AIActions<T = any, R = any> = Record<string, AIAction<T, R>>;
@@ -480,13 +480,6 @@ It can be a user message, an assistant message, or a tool message.
  */
 type CoreMessage = CoreSystemMessage | CoreUserMessage | CoreAssistantMessage | CoreToolMessage;
 
-type UIMessage = {
-    role: 'system' | 'user' | 'assistant' | 'data';
-    content: string;
-    toolInvocations?: ToolInvocation[];
-    experimental_attachments?: Attachment[];
-};
-
 /**
 Prompt part of the AI function options.
 It contains a system message, a simple text prompt, or a list of messages.
@@ -503,7 +496,7 @@ type Prompt = {
     /**
   A list of messages. You can either use `prompt` or `messages` but not both.
      */
-    messages?: Array<CoreMessage> | Array<UIMessage>;
+    messages?: Array<CoreMessage> | Array<Omit<Message, 'id'>>;
 };
 
 type Streamable = ReactNode | Promise<ReactNode>;

package/rsc/dist/rsc-server.d.mts

@@ -1,7 +1,7 @@
 import { LanguageModelV1FinishReason, LanguageModelV1CallWarning, LanguageModelV1ProviderMetadata, LanguageModelV1 } from '@ai-sdk/provider';
 import { ReactNode } from 'react';
 import { z } from 'zod';
-import { ToolInvocation, Attachment } from '@ai-sdk/ui-utils';
+import { Message } from '@ai-sdk/ui-utils';
 
 type AIAction<T = any, R = any> = (...args: T[]) => Promise<R>;
 type AIActions<T = any, R = any> = Record<string, AIAction<T, R>>;
@@ -478,13 +478,6 @@ It can be a user message, an assistant message, or a tool message.
  */
 type CoreMessage = CoreSystemMessage | CoreUserMessage | CoreAssistantMessage | CoreToolMessage;
 
-type UIMessage = {
-    role: 'system' | 'user' | 'assistant' | 'data';
-    content: string;
-    toolInvocations?: ToolInvocation[];
-    experimental_attachments?: Attachment[];
-};
-
 /**
 Prompt part of the AI function options.
 It contains a system message, a simple text prompt, or a list of messages.
@@ -501,7 +494,7 @@ type Prompt = {
     /**
   A list of messages. You can either use `prompt` or `messages` but not both.
      */
-    messages?: Array<CoreMessage> | Array<UIMessage>;
+    messages?: Array<CoreMessage> | Array<Omit<Message, 'id'>>;
 };
 
 type Streamable = ReactNode | Promise<ReactNode>;

package/rsc/dist/rsc-server.mjs

@@ -976,13 +976,13 @@ _a6 = symbol6;
 
 // core/prompt/convert-to-core-messages.ts
 function convertToCoreMessages(messages, options) {
-  var _a9;
+  var _a9, _b;
   const tools = (_a9 = options == null ? void 0 : options.tools) != null ? _a9 : {};
   const coreMessages = [];
   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;
+    const { role, content, experimental_attachments } = message;
     switch (role) {
       case "system": {
         coreMessages.push({
@@ -1002,6 +1002,92 @@ function convertToCoreMessages(messages, options) {
         break;
       }
       case "assistant": {
+        if (message.parts != null) {
+          let processBlock2 = function() {
+            coreMessages.push({
+              role: "assistant",
+              content: block.map((part) => {
+                switch (part.type) {
+                  case "text":
+                    return {
+                      type: "text",
+                      text: part.text
+                    };
+                  default:
+                    return {
+                      type: "tool-call",
+                      toolCallId: part.toolInvocation.toolCallId,
+                      toolName: part.toolInvocation.toolName,
+                      args: part.toolInvocation.args
+                    };
+                }
+              })
+            });
+            const stepInvocations = block.filter(
+              (part) => part.type === "tool-invocation"
+            ).map((part) => part.toolInvocation);
+            if (stepInvocations.length > 0) {
+              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,
+                      result: tool.experimental_toToolResultContent(result),
+                      experimental_content: tool.experimental_toToolResultContent(result)
+                    } : {
+                      type: "tool-result",
+                      toolCallId,
+                      toolName,
+                      result
+                    };
+                  }
+                )
+              });
+            }
+            block = [];
+            blockHasToolInvocations = false;
+            currentStep++;
+          };
+          var processBlock = processBlock2;
+          let currentStep = 0;
+          let blockHasToolInvocations = false;
+          let block = [];
+          for (const part of message.parts) {
+            switch (part.type) {
+              case "reasoning":
+                break;
+              case "text": {
+                if (blockHasToolInvocations) {
+                  processBlock2();
+                }
+                block.push(part);
+                break;
+              }
+              case "tool-invocation": {
+                if (((_b = part.toolInvocation.step) != null ? _b : 0) !== currentStep) {
+                  processBlock2();
+                }
+                block.push(part);
+                blockHasToolInvocations = true;
+                break;
+              }
+            }
+          }
+          processBlock2();
+          break;
+        }
+        const toolInvocations = message.toolInvocations;
         if (toolInvocations == null || toolInvocations.length === 0) {
           coreMessages.push({ role: "assistant", content });
           break;