ai 5.0.0-beta.25 → 5.0.0-beta.26

package/dist/index.mjs

@@ -3081,11 +3081,11 @@ function createStreamingUIMessageState({
 }
 function processUIMessageStream({
   stream,
-  onToolCall,
   messageMetadataSchema,
   dataPartSchemas,
   runUpdateMessageJob,
   onError,
+  onToolCall,
   onData
 }) {
   return stream.pipeThrough(
@@ -3264,19 +3264,9 @@ function processUIMessageStream({
               });
               write();
               if (onToolCall && !chunk.providerExecuted) {
-                const result = await onToolCall({
+                await onToolCall({
                   toolCall: chunk
                 });
-                if (result != null) {
-                  updateToolInvocationPart({
-                    toolCallId: chunk.toolCallId,
-                    toolName: chunk.toolName,
-                    state: "output-available",
-                    input: chunk.input,
-                    output: result
-                  });
-                  write();
-                }
               }
               break;
             }
@@ -4001,7 +3991,7 @@ function createOutputTransformStream(output) {
   }) {
     controller.enqueue({
       part: {
-        type: "text",
+        type: "text-delta",
         id: firstTextChunkId,
         text: textChunk
       },
@@ -4014,7 +4004,7 @@ function createOutputTransformStream(output) {
       if (chunk.type === "finish-step" && textChunk.length > 0) {
         publishTextChunk({ controller });
       }
-      if (chunk.type !== "text" && chunk.type !== "text-start" && chunk.type !== "text-end") {
+      if (chunk.type !== "text-delta" && chunk.type !== "text-start" && chunk.type !== "text-end") {
         controller.enqueue({ part: chunk, partialOutput: void 0 });
         return;
       }
@@ -4099,7 +4089,7 @@ var DefaultStreamTextResult = class {
         var _a16, _b, _c;
         controller.enqueue(chunk);
         const { part } = chunk;
-        if (part.type === "text" || part.type === "reasoning" || part.type === "source" || part.type === "tool-call" || part.type === "tool-result" || part.type === "tool-input-start" || part.type === "tool-input-delta" || part.type === "raw") {
+        if (part.type === "text-delta" || part.type === "reasoning-delta" || part.type === "source" || part.type === "tool-call" || part.type === "tool-result" || part.type === "tool-input-start" || part.type === "tool-input-delta" || part.type === "raw") {
           await (onChunk == null ? void 0 : onChunk({ chunk: part }));
         }
         if (part.type === "error") {
@@ -4113,7 +4103,7 @@ var DefaultStreamTextResult = class {
           };
           recordedContent.push(activeTextContent[part.id]);
         }
-        if (part.type === "text") {
+        if (part.type === "text-delta") {
           const activeText = activeTextContent[part.id];
           if (activeText == null) {
             controller.enqueue({
@@ -4139,7 +4129,7 @@ var DefaultStreamTextResult = class {
           };
           recordedContent.push(activeReasoningContent[part.id]);
         }
-        if (part.type === "reasoning") {
+        if (part.type === "reasoning-delta") {
           const activeReasoning = activeReasoningContent[part.id];
           if (activeReasoning == null) {
             controller.enqueue({
@@ -4505,7 +4495,7 @@ var DefaultStreamTextResult = class {
                     case "text-delta": {
                       if (chunk.delta.length > 0) {
                         controller.enqueue({
-                          type: "text",
+                          type: "text-delta",
                           id: chunk.id,
                           text: chunk.delta,
                           providerMetadata: chunk.providerMetadata
@@ -4521,7 +4511,7 @@ var DefaultStreamTextResult = class {
                     }
                     case "reasoning-delta": {
                       controller.enqueue({
-                        type: "reasoning",
+                        type: "reasoning-delta",
                         id: chunk.id,
                         text: chunk.delta,
                         providerMetadata: chunk.providerMetadata
@@ -4807,7 +4797,7 @@ var DefaultStreamTextResult = class {
       this.teeStream().pipeThrough(
         new TransformStream({
           transform({ part }, controller) {
-            if (part.type === "text") {
+            if (part.type === "text-delta") {
               controller.enqueue(part.text);
             }
           }
@@ -4882,7 +4872,7 @@ var DefaultStreamTextResult = class {
               });
               break;
             }
-            case "text": {
+            case "text-delta": {
               controller.enqueue({
                 type: "text-delta",
                 id: part.id,
@@ -4907,7 +4897,7 @@ var DefaultStreamTextResult = class {
               });
               break;
             }
-            case "reasoning": {
+            case "reasoning-delta": {
               if (sendReasoning) {
                 controller.enqueue({
                   type: "reasoning-delta",
@@ -7148,23 +7138,23 @@ function smoothStream({
     let id = "";
     return new TransformStream({
       async transform(chunk, controller) {
-        if (chunk.type !== "text") {
+        if (chunk.type !== "text-delta") {
           if (buffer.length > 0) {
-            controller.enqueue({ type: "text", text: buffer, id });
+            controller.enqueue({ type: "text-delta", text: buffer, id });
             buffer = "";
           }
           controller.enqueue(chunk);
           return;
         }
         if (chunk.id !== id && buffer.length > 0) {
-          controller.enqueue({ type: "text", text: buffer, id });
+          controller.enqueue({ type: "text-delta", text: buffer, id });
           buffer = "";
         }
         buffer += chunk.text;
         id = chunk.id;
         let match;
         while ((match = detectChunk(buffer)) != null) {
-          controller.enqueue({ type: "text", text: match, id });
+          controller.enqueue({ type: "text-delta", text: match, id });
           buffer = buffer.slice(match.length);
           await delay2(delayInMs);
         }
@@ -8631,47 +8621,12 @@ var DefaultChatTransport = class extends HttpChatTransport {
   }
 };
 
-// src/ui/should-resubmit-messages.ts
-function shouldResubmitMessages({
-  originalMaxToolInvocationStep,
-  originalMessageCount,
-  maxSteps,
-  messages
-}) {
-  const lastMessage = messages[messages.length - 1];
-  const lastMessageStepStartCount = lastMessage.parts.filter(
-    (part) => part.type === "step-start"
-  ).length;
-  return (
-    // check if the feature is enabled:
-    maxSteps > 1 && // ensure there is a last message:
-    lastMessage != null && // ensure we actually have new steps (to prevent infinite loops in case of errors):
-    (messages.length > originalMessageCount || lastMessageStepStartCount !== originalMaxToolInvocationStep) && // check that next step is possible:
-    isAssistantMessageWithCompletedToolCalls(lastMessage) && // limit the number of automatic steps:
-    lastMessageStepStartCount < maxSteps
-  );
-}
-function isAssistantMessageWithCompletedToolCalls(message) {
-  if (!message) {
-    return false;
-  }
-  if (message.role !== "assistant") {
-    return false;
-  }
-  const lastStepStartIndex = message.parts.reduce((lastIndex, part, index) => {
-    return part.type === "step-start" ? index : lastIndex;
-  }, -1);
-  const lastStepToolInvocations = message.parts.slice(lastStepStartIndex + 1).filter(isToolUIPart);
-  return lastStepToolInvocations.length > 0 && lastStepToolInvocations.every((part) => part.state === "output-available");
-}
-
 // src/ui/chat.ts
 var AbstractChat = class {
   constructor({
     generateId: generateId3 = generateIdFunc,
     id = generateId3(),
     transport = new DefaultChatTransport(),
-    maxSteps = 1,
     messageMetadataSchema,
     dataPartSchemas,
     state,
@@ -8688,8 +8643,16 @@ var AbstractChat = class {
      *
      * If a messageId is provided, the message will be replaced.
      */
-    this.sendMessage = async (message, options = {}) => {
-      var _a16, _b, _c;
+    this.sendMessage = async (message, options) => {
+      var _a16, _b, _c, _d;
+      if (message == null) {
+        await this.makeRequest({
+          trigger: "submit-message",
+          messageId: (_a16 = this.lastMessage) == null ? void 0 : _a16.id,
+          ...options
+        });
+        return;
+      }
       let uiMessage;
       if ("text" in message || "files" in message) {
         const fileParts = Array.isArray(message.files) ? message.files : await convertFileListToFileUIParts(message.files);
@@ -8718,19 +8681,19 @@ var AbstractChat = class {
         this.state.replaceMessage(messageIndex, {
           ...uiMessage,
           id: message.messageId,
-          role: (_a16 = uiMessage.role) != null ? _a16 : "user",
+          role: (_b = uiMessage.role) != null ? _b : "user",
           metadata: message.metadata
         });
       } else {
         this.state.pushMessage({
           ...uiMessage,
-          id: (_b = uiMessage.id) != null ? _b : this.generateId(),
-          role: (_c = uiMessage.role) != null ? _c : "user",
+          id: (_c = uiMessage.id) != null ? _c : this.generateId(),
+          role: (_d = uiMessage.role) != null ? _d : "user",
           metadata: message.metadata
         });
       }
       await this.makeRequest({
-        trigger: "submit-user-message",
+        trigger: "submit-message",
         messageId: message.messageId,
         ...options
       });
@@ -8753,7 +8716,7 @@ var AbstractChat = class {
         this.messages[messageIndex].role === "assistant" ? messageIndex : messageIndex + 1
       );
       await this.makeRequest({
-        trigger: "regenerate-assistant-message",
+        trigger: "regenerate-message",
         messageId,
         ...options
       });
@@ -8765,27 +8728,38 @@ var AbstractChat = class {
       await this.makeRequest({ trigger: "resume-stream", ...options });
     };
     this.addToolResult = async ({
+      tool: tool3,
       toolCallId,
       output
     }) => {
       this.jobExecutor.run(async () => {
-        updateToolOutput({
-          messages: this.state.messages,
-          toolCallId,
-          output
+        const messages = this.state.messages;
+        const lastMessage = messages[messages.length - 1];
+        this.state.replaceMessage(messages.length - 1, {
+          ...lastMessage,
+          parts: lastMessage.parts.map(
+            (part) => isToolUIPart(part) && part.toolCallId === toolCallId ? { ...part, state: "output-available", output } : part
+          )
         });
-        this.messages = this.state.messages;
-        if (this.status === "submitted" || this.status === "streaming") {
-          return;
-        }
-        const lastMessage = this.lastMessage;
-        if (isAssistantMessageWithCompletedToolCalls(lastMessage)) {
-          this.makeRequest({
-            trigger: "submit-tool-result"
-          });
+        if (this.activeResponse) {
+          this.activeResponse.state.message.parts = this.activeResponse.state.message.parts.map(
+            (part) => isToolUIPart(part) && part.toolCallId === toolCallId ? {
+              ...part,
+              state: "output-available",
+              output,
+              errorText: void 0
+            } : part
+          );
         }
       });
     };
+    /**
+     * Checks if the assistant message can be submitted, i.e. if it
+     * has tool calls and all tool calls have results.
+     *
+     * @returns {boolean} True if the assistant message can be submitted, false otherwise.
+     */
+    this.canAssistantMessageBeSubmitted = () => isAssistantMessageWithCompletedToolCalls(this.lastMessage);
     /**
      * Abort the current request immediately, keep the generated tokens if any.
      */
@@ -8798,7 +8772,6 @@ var AbstractChat = class {
       }
     };
     this.id = id;
-    this.maxSteps = maxSteps;
     this.transport = transport;
     this.generateId = generateId3;
     this.messageMetadataSchema = messageMetadataSchema;
@@ -8848,11 +8821,9 @@ var AbstractChat = class {
     body,
     messageId
   }) {
-    var _a16, _b;
+    var _a16;
     this.setStatus({ status: "submitted", error: void 0 });
-    const messageCount = this.state.messages.length;
     const lastMessage = this.lastMessage;
-    const maxStep = (_a16 = lastMessage == null ? void 0 : lastMessage.parts.filter((part) => part.type === "step-start").length) != null ? _a16 : 0;
     try {
       const activeResponse = {
         state: createStreamingUIMessageState({
@@ -8923,7 +8894,7 @@ var AbstractChat = class {
           throw error;
         }
       });
-      (_b = this.onFinish) == null ? void 0 : _b.call(this, { message: activeResponse.state.message });
+      (_a16 = this.onFinish) == null ? void 0 : _a16.call(this, { message: activeResponse.state.message });
       this.setStatus({ status: "ready" });
     } catch (err) {
       if (err.name === "AbortError") {
@@ -8937,36 +8908,20 @@ var AbstractChat = class {
     } finally {
       this.activeResponse = void 0;
     }
-    if (shouldResubmitMessages({
-      originalMaxToolInvocationStep: maxStep,
-      originalMessageCount: messageCount,
-      maxSteps: this.maxSteps,
-      messages: this.state.messages
-    })) {
-      await this.makeRequest({
-        metadata,
-        headers,
-        body,
-        // secondary requests are triggered by automatic tool execution
-        trigger: "submit-tool-result"
-      });
-    }
   }
 };
-function updateToolOutput({
-  messages,
-  toolCallId,
-  output
-}) {
-  const lastMessage = messages[messages.length - 1];
-  const toolPart = lastMessage.parts.find(
-    (part) => isToolUIPart(part) && part.toolCallId === toolCallId
-  );
-  if (toolPart == null) {
-    return;
+function isAssistantMessageWithCompletedToolCalls(message) {
+  if (!message) {
+    return false;
   }
-  toolPart.state = "output-available";
-  toolPart.output = output;
+  if (message.role !== "assistant") {
+    return false;
+  }
+  const lastStepStartIndex = message.parts.reduce((lastIndex, part, index) => {
+    return part.type === "step-start" ? index : lastIndex;
+  }, -1);
+  const lastStepToolInvocations = message.parts.slice(lastStepStartIndex + 1).filter(isToolUIPart);
+  return lastStepToolInvocations.length > 0 && lastStepToolInvocations.every((part) => part.state === "output-available");
 }
 
 // src/ui/convert-to-model-messages.ts
@@ -9267,10 +9222,13 @@ function createUIMessageStream({
 // src/ui-message-stream/read-ui-message-stream.ts
 function readUIMessageStream({
   message,
-  stream
+  stream,
+  onError,
+  terminateOnError = false
 }) {
   var _a16;
   let controller;
+  let hasErrored = false;
   const outputStream = new ReadableStream({
     start(controllerParam) {
       controller = controllerParam;
@@ -9280,6 +9238,13 @@ function readUIMessageStream({
     messageId: (_a16 = message == null ? void 0 : message.id) != null ? _a16 : "",
     lastMessage: message
   });
+  const handleError = (error) => {
+    onError == null ? void 0 : onError(error);
+    if (!hasErrored && terminateOnError) {
+      hasErrored = true;
+      controller == null ? void 0 : controller.error(error);
+    }
+  };
   consumeStream({
     stream: processUIMessageStream({
       stream,
@@ -9291,12 +9256,13 @@ function readUIMessageStream({
           }
         });
       },
-      onError: (error) => {
-        throw error;
-      }
-    })
+      onError: handleError
+    }),
+    onError: handleError
   }).finally(() => {
-    controller == null ? void 0 : controller.close();
+    if (!hasErrored) {
+      controller == null ? void 0 : controller.close();
+    }
   });
   return createAsyncIterableStream(outputStream);
 }