ai 6.0.270 → 6.0.271

package/dist/index.js

@@ -1304,7 +1304,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.270" : "0.0.0-test";
+var VERSION = true ? "6.0.271" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -6446,7 +6446,8 @@ function handleUIMessageStreamFinish({
   onStepFinish,
   onFinish,
   onError,
-  stream
+  stream,
+  getOutcome
 }) {
   let lastMessage = originalMessages == null ? void 0 : originalMessages[originalMessages.length - 1];
   if ((lastMessage == null ? void 0 : lastMessage.role) !== "assistant") {
@@ -6455,19 +6456,34 @@ function handleUIMessageStreamFinish({
     messageId = lastMessage.id;
   }
   let isAborted = false;
+  let hasProcessingFailure = false;
+  let processingError;
+  const recordProcessingFailure = (error) => {
+    hasProcessingFailure = true;
+    processingError = error;
+  };
   const idInjectedStream = stream.pipeThrough(
     new TransformStream({
       transform(chunk, controller) {
-        if (chunk.type === "start") {
-          const startChunk = chunk;
-          if (startChunk.messageId == null && messageId != null) {
-            startChunk.messageId = messageId;
+        try {
+          let outputChunk = chunk;
+          if (chunk.type === "start") {
+            const startChunk = chunk;
+            if (startChunk.messageId == null && messageId != null) {
+              outputChunk = {
+                ...startChunk,
+                messageId
+              };
+            }
           }
+          if (chunk.type === "abort") {
+            isAborted = true;
+          }
+          controller.enqueue(outputChunk);
+        } catch (error) {
+          recordProcessingFailure(error);
+          throw error;
         }
-        if (chunk.type === "abort") {
-          isAborted = true;
-        }
-        controller.enqueue(chunk);
       }
     })
   );
@@ -6480,19 +6496,28 @@ function handleUIMessageStreamFinish({
     // will be overridden by the stream
   });
   const runUpdateMessageJob = async (job) => {
-    await job({ state, write: () => {
-    } });
+    try {
+      await job({ state, write: () => {
+      } });
+    } catch (error) {
+      recordProcessingFailure(error);
+      throw error;
+    }
   };
   let finishCalled = false;
   const callOnFinish = async () => {
+    var _a22;
     if (finishCalled || !onFinish) {
       return;
     }
     finishCalled = true;
     const isContinuation = state.message.id === (lastMessage == null ? void 0 : lastMessage.id);
+    const declaredOutcome = (_a22 = getOutcome == null ? void 0 : getOutcome()) != null ? _a22 : { status: "unknown" };
+    const outcome = hasProcessingFailure ? { status: "failed", error: processingError } : declaredOutcome.status === "unknown" && isAborted ? { status: "aborted" } : declaredOutcome;
     await onFinish({
-      isAborted,
+      isAborted: isAborted || outcome.status === "aborted",
       isContinuation,
+      outcome,
       responseMessage: state.message,
       messages: [
         ...isContinuation ? originalMessages.slice(0, -1) : originalMessages,
@@ -6516,7 +6541,13 @@ function handleUIMessageStreamFinish({
         ]
       });
     } catch (error) {
-      onError(error);
+      try {
+        onError(error);
+      } catch (onErrorError) {
+        recordProcessingFailure(onErrorError);
+        await callOnFinish();
+        throw onErrorError;
+      }
     }
   };
   return processUIMessageStream({
@@ -8673,6 +8704,17 @@ var DefaultStreamTextResult = class {
     onError = () => "An error occurred."
     // prevent leaking server error details to the client by default
   } = {}) {
+    let outcome = { status: "unknown" };
+    let hasFatalFailure = false;
+    const setSourceOutcome = (newOutcome) => {
+      if (!hasFatalFailure && outcome.status !== "completed" && outcome.status !== "aborted" && newOutcome.status !== "unknown" && (outcome.status === "unknown" || newOutcome.status !== "failed")) {
+        outcome = newOutcome;
+      }
+    };
+    const failOutcome = (error) => {
+      hasFatalFailure = true;
+      outcome = { status: "failed", error };
+    };
     const responseMessageId = generateMessageId != null ? getResponseUIMessageId({
       originalMessages,
       responseMessageId: generateMessageId
@@ -8685,7 +8727,51 @@ var DefaultStreamTextResult = class {
       }
       return (tool2 == null ? void 0 : tool2.type) === "dynamic" ? true : void 0;
     };
-    const baseStream = this.fullStream.pipeThrough(
+    const trackFatalFailures = (stream) => {
+      const reader = stream.getReader();
+      let readerReleased = false;
+      let streamCancelled = false;
+      const releaseReader = () => {
+        if (!readerReleased) {
+          reader.releaseLock();
+          readerReleased = true;
+        }
+      };
+      return new ReadableStream({
+        async pull(controller) {
+          try {
+            const { done, value } = await reader.read();
+            if (done) {
+              releaseReader();
+              if (!streamCancelled) {
+                controller.close();
+              }
+            } else {
+              controller.enqueue(value);
+            }
+          } catch (error) {
+            releaseReader();
+            if (!streamCancelled) {
+              failOutcome(error);
+              controller.error(error);
+            }
+          }
+        },
+        async cancel(reason) {
+          streamCancelled = true;
+          if (readerReleased) {
+            return;
+          }
+          try {
+            await reader.cancel(reason);
+          } finally {
+            releaseReader();
+          }
+        }
+      });
+    };
+    const sourceStream = trackFatalFailures(this.fullStream);
+    const convertedStream = sourceStream.pipeThrough(
       new TransformStream({
         transform: async (part, controller) => {
           const messageMetadataValue = messageMetadata == null ? void 0 : messageMetadata({ part });
@@ -8922,16 +9008,25 @@ var DefaultStreamTextResult = class {
               messageMetadata: messageMetadataValue
             });
           }
+          if (part.type === "finish") {
+            setSourceOutcome({ status: "completed" });
+          } else if (part.type === "abort") {
+            setSourceOutcome({ status: "aborted" });
+          } else if (part.type === "error") {
+            setSourceOutcome({ status: "failed", error: part.error });
+          }
         }
       })
     );
+    const baseStream = trackFatalFailures(convertedStream);
     return createAsyncIterableStream(
       handleUIMessageStreamFinish({
         stream: baseStream,
         messageId: responseMessageId != null ? responseMessageId : generateMessageId == null ? void 0 : generateMessageId(),
         originalMessages,
         onFinish,
-        onError
+        onError,
+        getOutcome: () => outcome
       })
     );
   }
@@ -9122,6 +9217,7 @@ function createUIMessageStream({
 }) {
   let controller;
   const ongoingStreamPromises = [];
+  let outcome = { status: "unknown" };
   const stream = new ReadableStream({
     start(controllerArg) {
       controller = controllerArg;
@@ -9133,6 +9229,35 @@ function createUIMessageStream({
     } catch (error) {
     }
   }
+  function setOutcome(newOutcome) {
+    if (outcome.status === "unknown" && newOutcome.status !== "unknown") {
+      outcome = newOutcome;
+    }
+  }
+  function failOutcome(error) {
+    outcome = { status: "failed", error };
+  }
+  function safeError(error) {
+    try {
+      controller.error(error);
+    } catch (e) {
+    }
+  }
+  function handleError(error) {
+    failOutcome(error);
+    let errorText;
+    try {
+      errorText = onError(error);
+    } catch (onErrorError) {
+      failOutcome(onErrorError);
+      safeError(onErrorError);
+      return;
+    }
+    safeEnqueue({
+      type: "error",
+      errorText
+    });
+  }
   try {
     const result = execute({
       writer: {
@@ -9150,38 +9275,29 @@ function createUIMessageStream({
                 safeEnqueue(value);
               }
             })().catch((error) => {
-              safeEnqueue({
-                type: "error",
-                errorText: onError(error)
-              });
+              handleError(error);
             })
           );
         },
+        setOutcome,
         onError
       }
     });
     if (result) {
       ongoingStreamPromises.push(
         result.catch((error) => {
-          safeEnqueue({
-            type: "error",
-            errorText: onError(error)
-          });
+          handleError(error);
         })
       );
     }
   } catch (error) {
-    safeEnqueue({
-      type: "error",
-      errorText: onError(error)
-    });
+    handleError(error);
   }
-  const waitForStreams = new Promise(async (resolve3) => {
+  const waitForStreams = (async () => {
     while (ongoingStreamPromises.length > 0) {
       await ongoingStreamPromises.shift();
     }
-    resolve3();
-  });
+  })();
   waitForStreams.finally(() => {
     try {
       controller.close();
@@ -9194,7 +9310,8 @@ function createUIMessageStream({
     originalMessages,
     onStepFinish,
     onFinish,
-    onError
+    onError,
+    getOutcome: () => outcome
   });
 }
 
@@ -9512,6 +9629,17 @@ var toolMetadataSchema2 = import_v48.z.record(
   import_v48.z.string(),
   jsonValueSchema.optional()
 );
+function isEmptyObject(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 0;
+}
+function asDynamicToolPart(toolPart) {
+  const { type, ...part } = toolPart;
+  return {
+    ...part,
+    type: "dynamic-tool",
+    toolName: type.slice(5)
+  };
+}
 var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(
   () => (0, import_provider_utils24.zodSchema)(
     import_v48.z.array(
@@ -9815,11 +9943,13 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(
     ).nonempty("Messages array must not be empty")
   )
 );
-async function safeValidateUIMessages({
+async function safeValidateUIMessagesInternal({
   messages,
   metadataSchema,
   dataSchemas,
   tools
+}, {
+  convertMissingTerminalToolsToDynamic
 }) {
   try {
     if (messages == null) {
@@ -9848,7 +9978,8 @@ async function safeValidateUIMessages({
         });
       }
     }
-    if (dataSchemas || tools) {
+    const shouldValidateToolParts = tools != null || convertMissingTerminalToolsToDynamic;
+    if (dataSchemas || shouldValidateToolParts) {
       for (const [msgIdx, message] of validatedMessages.entries()) {
         for (const [partIdx, part] of message.parts.entries()) {
           if (dataSchemas && part.type.startsWith("data-")) {
@@ -9879,11 +10010,17 @@ async function safeValidateUIMessages({
               }
             });
           }
-          if (tools && part.type.startsWith("tool-")) {
+          if (shouldValidateToolParts && part.type.startsWith("tool-")) {
             const toolPart = part;
             const toolName = toolPart.type.slice(5);
-            const tool2 = tools[toolName];
-            if (!tool2 && (toolPart.state === "output-available" || toolPart.state === "output-error" || toolPart.state === "output-denied")) {
+            const tool2 = tools == null ? void 0 : tools[toolName];
+            const isTerminal = toolPart.state === "output-available" || toolPart.state === "output-error" || toolPart.state === "output-denied";
+            if (!tool2 && isTerminal) {
+              if (tools != null || convertMissingTerminalToolsToDynamic) {
+                message.parts[partIdx] = asDynamicToolPart(
+                  toolPart
+                );
+              }
               continue;
             }
             if (!tool2) {
@@ -9900,15 +10037,39 @@ async function safeValidateUIMessages({
                 })
               };
             }
-            if (toolPart.state === "input-available") {
-              await (0, import_provider_utils24.validateTypes)({
+            const inputValidationContext = {
+              field: `messages[${msgIdx}].parts[${partIdx}].input`,
+              entityName: toolName,
+              entityId: toolPart.toolCallId
+            };
+            let convertToDynamic = false;
+            if (toolPart.state === "output-error") {
+              if (toolPart.input !== void 0) {
+                const result = await (0, import_provider_utils24.safeValidateTypes)({
+                  value: toolPart.input,
+                  schema: tool2.inputSchema,
+                  context: inputValidationContext
+                });
+                convertToDynamic = !result.success;
+              }
+            } else if (toolPart.state === "output-available") {
+              const result = await (0, import_provider_utils24.safeValidateTypes)({
                 value: toolPart.input,
                 schema: tool2.inputSchema,
-                context: {
-                  field: `messages[${msgIdx}].parts[${partIdx}].input`,
-                  entityName: toolName,
-                  entityId: toolPart.toolCallId
+                context: inputValidationContext
+              });
+              if (!result.success) {
+                if (isEmptyObject(toolPart.input)) {
+                  convertToDynamic = true;
+                } else {
+                  throw result.error;
                 }
+              }
+            } else if (toolPart.state === "input-available" || toolPart.state === "approval-requested" || toolPart.state === "approval-responded" || toolPart.state === "output-denied") {
+              await (0, import_provider_utils24.validateTypes)({
+                value: toolPart.input,
+                schema: tool2.inputSchema,
+                context: inputValidationContext
               });
             }
             if (toolPart.state === "output-available" && tool2.outputSchema) {
@@ -9922,6 +10083,11 @@ async function safeValidateUIMessages({
                 }
               });
             }
+            if (convertToDynamic) {
+              message.parts[partIdx] = asDynamicToolPart(
+                toolPart
+              );
+            }
           }
         }
       }
@@ -9938,17 +10104,23 @@ async function safeValidateUIMessages({
     };
   }
 }
-async function validateUIMessages({
-  messages,
-  metadataSchema,
-  dataSchemas,
-  tools
-}) {
-  const response = await safeValidateUIMessages({
-    messages,
-    metadataSchema,
-    dataSchemas,
-    tools
+async function safeValidateUIMessages(options) {
+  return safeValidateUIMessagesInternal(options, {
+    convertMissingTerminalToolsToDynamic: false
+  });
+}
+async function validateUIMessages(options) {
+  const response = await safeValidateUIMessages(options);
+  if (!response.success)
+    throw response.error;
+  return response.data;
+}
+async function validateUIMessagesForAgent(options) {
+  const response = await safeValidateUIMessagesInternal(options, {
+    // Agent tool sets can include ephemeral tools (for example, tools from a
+    // disconnected MCP server), so terminal history is converted to dynamic
+    // tool parts when those tools are no longer registered.
+    convertMissingTerminalToolsToDynamic: true
   });
   if (!response.success)
     throw response.error;
@@ -9967,7 +10139,7 @@ async function createAgentUIStream({
   ...uiMessageStreamOptions
 }) {
   var _a22;
-  const validatedMessages = await validateUIMessages({
+  const validatedMessages = await validateUIMessagesForAgent({
     messages: uiMessages,
     tools: agent.tools
   });
@@ -14488,7 +14660,7 @@ var DirectChatTransport = class {
     messages,
     abortSignal
   }) {
-    const validatedMessages = await validateUIMessages({
+    const validatedMessages = await validateUIMessagesForAgent({
       messages,
       tools: this.agent.tools
     });