ai 6.0.301 → 6.0.303

package/dist/index.js

@@ -895,7 +895,8 @@ function convertV2UsageToV3(usage) {
       total: usage.outputTokens,
       text: void 0,
       reasoning: usage.reasoningTokens
-    }
+    },
+    raw: usage.totalTokens == null ? void 0 : { totalTokens: usage.totalTokens }
   };
 }
 
@@ -1334,7 +1335,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.301" : "0.0.0-test";
+var VERSION = true ? "6.0.303" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2806,6 +2807,7 @@ function createNullLanguageModelUsage() {
 }
 function addLanguageModelUsage(usage1, usage2) {
   var _a23, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  const raw = isNullLanguageModelUsage(usage1) ? usage2.raw : isNullLanguageModelUsage(usage2) ? usage1.raw : void 0;
   return {
     inputTokens: addTokenCounts(usage1.inputTokens, usage2.inputTokens),
     inputTokenDetails: {
@@ -2841,9 +2843,14 @@ function addLanguageModelUsage(usage1, usage2) {
     cachedInputTokens: addTokenCounts(
       usage1.cachedInputTokens,
       usage2.cachedInputTokens
-    )
+    ),
+    ...raw == null ? {} : { raw }
   };
 }
+function isNullLanguageModelUsage(usage) {
+  var _a23, _b, _c, _d, _e;
+  return usage.inputTokens == null && ((_a23 = usage.inputTokenDetails) == null ? void 0 : _a23.noCacheTokens) == null && ((_b = usage.inputTokenDetails) == null ? void 0 : _b.cacheReadTokens) == null && ((_c = usage.inputTokenDetails) == null ? void 0 : _c.cacheWriteTokens) == null && usage.outputTokens == null && ((_d = usage.outputTokenDetails) == null ? void 0 : _d.textTokens) == null && ((_e = usage.outputTokenDetails) == null ? void 0 : _e.reasoningTokens) == null && usage.totalTokens == null && usage.raw == null;
+}
 function addTokenCounts(tokenCount1, tokenCount2) {
   return tokenCount1 == null && tokenCount2 == null ? void 0 : (tokenCount1 != null ? tokenCount1 : 0) + (tokenCount2 != null ? tokenCount2 : 0);
 }
@@ -6117,7 +6124,8 @@ function processUIMessageStream({
   runUpdateMessageJob,
   onError,
   onToolCall,
-  onData
+  onData,
+  resetStateOnMessageIdChange = false
 }) {
   return stream.pipeThrough(
     new TransformStream({
@@ -6630,6 +6638,16 @@ function processUIMessageStream({
               break;
             }
             case "start": {
+              if (resetStateOnMessageIdChange && chunk.messageId != null && chunk.messageId !== state.message.id) {
+                Object.assign(
+                  state,
+                  createStreamingUIMessageState({
+                    lastMessage: void 0,
+                    messageId: chunk.messageId
+                  }),
+                  { finishReason: void 0 }
+                );
+              }
               if (chunk.messageId != null) {
                 state.message.id = chunk.messageId;
               }
@@ -9684,6 +9702,7 @@ function readUIMessageStream({
   consumeStream({
     stream: processUIMessageStream({
       stream,
+      resetStateOnMessageIdChange: true,
       runUpdateMessageJob(job) {
         return job({
           state,
@@ -9708,6 +9727,22 @@ function readUIMessageStream({
 
 // src/ui/convert-to-model-messages.ts
 var import_provider_utils23 = require("@ai-sdk/provider-utils");
+
+// src/util/get-own.ts
+function getOwn(obj, key) {
+  return obj != null && Object.hasOwn(obj, key) ? obj[key] : void 0;
+}
+
+// src/ui/unavailable-tool.ts
+function markToolPartAsUnavailable(part) {
+  part.dynamic = false;
+  return part;
+}
+function isToolPartFromUnavailableTool(part) {
+  return part.type === "dynamic-tool" && part.dynamic === false;
+}
+
+// src/ui/convert-to-model-messages.ts
 async function convertToModelMessages(messages, options) {
   const modelMessages = [];
   if (options == null ? void 0 : options.ignoreIncompleteToolCalls) {
@@ -9718,6 +9753,27 @@ async function convertToModelMessages(messages, options) {
       )
     }));
   }
+  async function createModelOutput({
+    toolPart,
+    toolName,
+    output,
+    errorMode
+  }) {
+    const tool2 = getOwn(options == null ? void 0 : options.tools, toolName);
+    if (errorMode === "none" && tool2 == null && isToolPartFromUnavailableTool(toolPart)) {
+      return {
+        type: "text",
+        value: "Tool output omitted because the tool is no longer available."
+      };
+    }
+    return createToolModelOutput({
+      toolCallId: toolPart.toolCallId,
+      input: toolPart.input,
+      output,
+      tool: tool2,
+      errorMode
+    });
+  }
   for (const message of messages) {
     switch (message.role) {
       case "system": {
@@ -9772,7 +9828,7 @@ async function convertToModelMessages(messages, options) {
         if (message.parts != null) {
           let block = [];
           async function processBlock() {
-            var _a23, _b, _c, _d, _e, _f, _g, _h, _i;
+            var _a23, _b, _c, _d, _e, _f, _g;
             if (block.length === 0) {
               return;
             }
@@ -9830,11 +9886,10 @@ async function convertToModelMessages(messages, options) {
                       type: "tool-result",
                       toolCallId: part.toolCallId,
                       toolName,
-                      output: await createToolModelOutput({
-                        toolCallId: part.toolCallId,
-                        input: part.input,
+                      output: await createModelOutput({
+                        toolPart: part,
+                        toolName,
                         output: part.state === "output-error" ? part.errorText : part.output,
-                        tool: (_d = options == null ? void 0 : options.tools) == null ? void 0 : _d[toolName],
                         errorMode: part.state === "output-error" ? "json" : "none"
                       }),
                       ...resultProviderMetadata != null ? { providerOptions: resultProviderMetadata } : {}
@@ -9842,7 +9897,7 @@ async function convertToModelMessages(messages, options) {
                   }
                 }
               } else if (isDataUIPart(part)) {
-                const dataPart = (_e = options == null ? void 0 : options.convertDataPart) == null ? void 0 : _e.call(
+                const dataPart = (_d = options == null ? void 0 : options.convertDataPart) == null ? void 0 : _d.call(
                   options,
                   part
                 );
@@ -9870,7 +9925,7 @@ async function convertToModelMessages(messages, options) {
               {
                 const content2 = [];
                 for (const toolPart of toolParts) {
-                  if (((_f = toolPart.approval) == null ? void 0 : _f.approved) != null) {
+                  if (((_e = toolPart.approval) == null ? void 0 : _e.approved) != null) {
                     content2.push({
                       type: "tool-approval-response",
                       approvalId: toolPart.approval.id,
@@ -9890,7 +9945,7 @@ async function convertToModelMessages(messages, options) {
                         toolName: getToolName(toolPart),
                         output: {
                           type: "error-text",
-                          value: (_h = (_g = toolPart.approval) == null ? void 0 : _g.reason) != null ? _h : "Tool call execution denied."
+                          value: (_g = (_f = toolPart.approval) == null ? void 0 : _f.reason) != null ? _g : "Tool call execution denied."
                         },
                         ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
                       });
@@ -9903,11 +9958,10 @@ async function convertToModelMessages(messages, options) {
                         type: "tool-result",
                         toolCallId: toolPart.toolCallId,
                         toolName,
-                        output: await createToolModelOutput({
-                          toolCallId: toolPart.toolCallId,
-                          input: toolPart.input,
+                        output: await createModelOutput({
+                          toolPart,
+                          toolName,
                           output: toolPart.state === "output-error" ? toolPart.errorText : toolPart.output,
-                          tool: (_i = options == null ? void 0 : options.tools) == null ? void 0 : _i[toolName],
                           errorMode: toolPart.state === "output-error" ? "text" : "none"
                         }),
                         ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
@@ -9963,11 +10017,11 @@ function isEmptyObject(value) {
 }
 function asDynamicToolPart(toolPart) {
   const { type, ...part } = toolPart;
-  return {
+  return markToolPartAsUnavailable({
     ...part,
     type: "dynamic-tool",
     toolName: type.slice(5)
-  };
+  });
 }
 function getToolPartInputSchemaInput(toolPart) {
   return toolPart.approval != null && Object.prototype.hasOwnProperty.call(toolPart.approval, "inputSchemaInput") ? { value: toolPart.approval.inputSchemaInput } : void 0;
@@ -10044,6 +10098,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10058,6 +10113,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10071,6 +10127,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10084,6 +10141,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10097,6 +10155,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10112,6 +10171,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10127,6 +10187,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10315,7 +10376,7 @@ async function safeValidateUIMessagesInternal({
           if (shouldValidateToolParts && part.type.startsWith("tool-")) {
             const toolPart = part;
             const toolName = toolPart.type.slice(5);
-            const tool2 = tools == null ? void 0 : tools[toolName];
+            const tool2 = getOwn(tools, toolName);
             const isTerminal = toolPart.state === "output-available" || toolPart.state === "output-error" || toolPart.state === "output-denied";
             if (!tool2 && isTerminal) {
               if (tools != null || convertMissingTerminalToolsToDynamic) {
@@ -10632,11 +10693,6 @@ var DefaultEmbedResult = class {
   }
 };
 
-// src/util/get-own.ts
-function getOwn(obj, key) {
-  return obj != null && Object.hasOwn(obj, key) ? obj[key] : void 0;
-}
-
 // src/util/set-own.ts
 function setOwn(object2, key, value) {
   Object.defineProperty(object2, key, {
@@ -11953,17 +12009,24 @@ var SerialJobExecutor = class {
   constructor() {
     this.queue = [];
     this.isProcessing = false;
+    this.idleWaiters = [];
   }
   async processQueue() {
     if (this.isProcessing) {
       return;
     }
     this.isProcessing = true;
-    while (this.queue.length > 0) {
-      await this.queue[0]();
-      this.queue.shift();
+    try {
+      while (this.queue.length > 0) {
+        await this.queue[0]();
+        this.queue.shift();
+      }
+    } finally {
+      this.isProcessing = false;
+      for (const resolve3 of this.idleWaiters.splice(0)) {
+        resolve3();
+      }
     }
-    this.isProcessing = false;
   }
   async run(job) {
     return new Promise((resolve3, reject) => {
@@ -11978,6 +12041,14 @@ var SerialJobExecutor = class {
       void this.processQueue();
     });
   }
+  async waitForIdle() {
+    if (!this.isProcessing && this.queue.length === 0) {
+      return;
+    }
+    await new Promise((resolve3) => {
+      this.idleWaiters.push(resolve3);
+    });
+  }
 };
 
 // src/util/simulate-readable-stream.ts
@@ -14440,7 +14511,9 @@ var import_provider_utils42 = require("@ai-sdk/provider-utils");
 var import_provider_utils41 = require("@ai-sdk/provider-utils");
 function appendPathToUrl(url, path) {
   const queryOrFragmentStart = url.search(/[?#]/);
-  return queryOrFragmentStart === -1 ? `${url}${path}` : `${url.slice(0, queryOrFragmentStart)}${path}${url.slice(queryOrFragmentStart)}`;
+  const urlPath = queryOrFragmentStart === -1 ? url : url.slice(0, queryOrFragmentStart);
+  const suffix = queryOrFragmentStart === -1 ? "" : url.slice(queryOrFragmentStart);
+  return `${urlPath.endsWith("/") && path.startsWith("/") ? urlPath.slice(0, -1) : urlPath}${path}${suffix}`;
 }
 var HttpChatTransport = class {
   constructor({
@@ -14611,6 +14684,8 @@ var AbstractChat = class {
     this.activeResumeRequest = void 0;
     this.resumableStreamState = void 0;
     this.jobExecutor = new SerialJobExecutor();
+    this.activeStopCount = 0;
+    this.stopGeneration = 0;
     /**
      * Appends or replaces a user message to the chat list. This triggers the API call to fetch
      * the assistant's response.
@@ -14754,17 +14829,18 @@ var AbstractChat = class {
         this.activeResponse.state.message.parts = this.activeResponse.state.message.parts.map(updatePart);
       }
       if (this.status !== "streaming" && this.status !== "submitted" && this.sendAutomaticallyWhen) {
-        this.shouldSendAutomatically().then((shouldSend) => {
-          var _a23;
-          if (shouldSend) {
+        const shouldSend = await this.shouldSendAutomatically();
+        if (shouldSend) {
+          void this.runAutomaticRequest(() => {
+            var _a23;
             const messageId = messageIndex === -1 ? (_a23 = this.lastMessage) == null ? void 0 : _a23.id : messages[messageIndex].id;
-            this.makeRequestForToolApproval({
+            return this.makeRequestForToolApproval({
               messageId,
               messageIndex,
               ...options
             });
-          }
-        });
+          }, shouldSend);
+        }
       }
     });
     this.addToolOutput = async ({
@@ -14785,27 +14861,44 @@ var AbstractChat = class {
         this.activeResponse.state.message.parts = this.activeResponse.state.message.parts.map(updatePart);
       }
       if (this.status !== "streaming" && this.status !== "submitted" && this.sendAutomaticallyWhen) {
-        this.shouldSendAutomatically().then((shouldSend) => {
-          var _a23;
-          if (shouldSend) {
-            this.makeRequest({
-              trigger: "submit-message",
-              messageId: (_a23 = this.lastMessage) == null ? void 0 : _a23.id,
-              ...options
-            });
-          }
-        });
+        const shouldSend = await this.shouldSendAutomatically();
+        if (shouldSend) {
+          void this.runAutomaticRequest(
+            () => {
+              var _a23;
+              return this.makeRequest({
+                trigger: "submit-message",
+                messageId: (_a23 = this.lastMessage) == null ? void 0 : _a23.id,
+                ...options
+              });
+            },
+            shouldSend
+          );
+        }
       }
     });
     /** @deprecated Use addToolOutput */
     this.addToolResult = this.addToolOutput;
     /**
-     * Abort the current request immediately, keep the generated tokens if any.
+     * Abort the current request, keep the generated tokens if any, and wait for
+     * the request pipeline to finish.
      */
     this.stop = async () => {
-      var _a23, _b;
-      (_a23 = this.activeResumeRequest) == null ? void 0 : _a23.abortController.abort();
-      (_b = this.activeResponse) == null ? void 0 : _b.abortController.abort();
+      this.activeStopCount++;
+      this.stopGeneration++;
+      try {
+        const activeResumeRequest = this.activeResumeRequest;
+        const activeResponse = this.activeResponse;
+        activeResumeRequest == null ? void 0 : activeResumeRequest.abortController.abort();
+        activeResponse == null ? void 0 : activeResponse.abortController.abort();
+        await Promise.all([
+          activeResumeRequest == null ? void 0 : activeResumeRequest.completionPromise,
+          activeResponse == null ? void 0 : activeResponse.completionPromise
+        ]);
+        await this.jobExecutor.waitForIdle();
+      } finally {
+        this.activeStopCount--;
+      }
     };
     this.id = id;
     this.transport = transport;
@@ -14834,8 +14927,12 @@ var AbstractChat = class {
     status,
     error
   }) {
-    if (this.status === status)
+    if (this.status === status) {
+      if (this.error !== error) {
+        this.state.error = error;
+      }
       return;
+    }
     this.state.status = status;
     this.state.error = error;
   }
@@ -14862,6 +14959,17 @@ var AbstractChat = class {
     }
     return result;
   }
+  async runAutomaticRequest(request, shouldSend) {
+    const stopGeneration = this.stopGeneration;
+    const startedWhileStopping = this.activeStopCount > 0;
+    if (!(shouldSend != null ? shouldSend : await this.shouldSendAutomatically())) {
+      return;
+    }
+    if (startedWhileStopping || stopGeneration !== this.stopGeneration || this.activeStopCount > 0) {
+      return;
+    }
+    await request();
+  }
   async makeRequestForToolApproval({
     messageId,
     messageIndex,
@@ -14881,19 +14989,31 @@ var AbstractChat = class {
       this.pendingApprovalMessageId = (_b = (_a23 = this.state.messages[messageIndex]) == null ? void 0 : _a23.id) != null ? _b : messageId;
     }
   }
-  async makeRequest({
+  async makeRequest(options) {
+    const completion = createResolvablePromise();
+    try {
+      await this.makeRequestImpl({
+        ...options,
+        completionPromise: completion.promise
+      });
+    } finally {
+      completion.resolve();
+    }
+  }
+  async makeRequestImpl({
     trigger,
     metadata,
     headers,
     body,
-    messageId
+    messageId,
+    completionPromise
   }) {
-    var _a23, _b, _c;
+    var _a23, _b;
     if (trigger !== "resume-stream") {
       this.resumableStreamState = void 0;
     }
     const abortController = new AbortController();
-    const activeResumeRequest = trigger === "resume-stream" ? { abortController } : void 0;
+    const activeResumeRequest = trigger === "resume-stream" ? { abortController, completionPromise } : void 0;
     if (activeResumeRequest) {
       (_a23 = this.activeResumeRequest) == null ? void 0 : _a23.abortController.abort();
       this.activeResumeRequest = activeResumeRequest;
@@ -14969,7 +15089,8 @@ var AbstractChat = class {
           lastMessage: trigger === "resume-stream" ? resumableResponseMessage : trigger === "regenerate-message" ? void 0 : this.state.snapshot(responseMessage),
           messageId: this.generateId()
         }),
-        abortController
+        abortController,
+        completionPromise
       };
       activeResponse = response;
       response.abortController.signal.addEventListener("abort", () => {
@@ -15102,14 +15223,19 @@ var AbstractChat = class {
         clearActiveResumeRequest();
       }
     }
-    if (!isError && await this.shouldSendAutomatically()) {
-      await this.makeRequest({
-        trigger: "submit-message",
-        messageId: (_c = this.lastMessage) == null ? void 0 : _c.id,
-        metadata,
-        headers,
-        body
-      });
+    if (!isAbort && !isError) {
+      await this.runAutomaticRequest(
+        () => {
+          var _a24;
+          return this.makeRequest({
+            trigger: "submit-message",
+            messageId: (_a24 = this.lastMessage) == null ? void 0 : _a24.id,
+            metadata,
+            headers,
+            body
+          });
+        }
+      );
     }
   }
 };