ai 5.0.0-alpha.12 → 5.0.0-alpha.14

package/dist/index.js

@@ -33,7 +33,7 @@ __export(src_exports, {
   InvalidPromptError: () => import_provider16.InvalidPromptError,
   InvalidResponseDataError: () => import_provider16.InvalidResponseDataError,
   InvalidStreamPartError: () => InvalidStreamPartError,
-  InvalidToolArgumentsError: () => InvalidToolArgumentsError,
+  InvalidToolInputError: () => InvalidToolInputError,
   JSONParseError: () => import_provider16.JSONParseError,
   JsonToSseTransformStream: () => JsonToSseTransformStream,
   LoadAPIKeyError: () => import_provider16.LoadAPIKeyError,
@@ -54,7 +54,7 @@ __export(src_exports, {
   ToolExecutionError: () => ToolExecutionError,
   TypeValidationError: () => import_provider16.TypeValidationError,
   UnsupportedFunctionalityError: () => import_provider16.UnsupportedFunctionalityError,
-  asSchema: () => import_provider_utils25.asSchema,
+  asSchema: () => import_provider_utils26.asSchema,
   assistantModelMessageSchema: () => assistantModelMessageSchema,
   callCompletionApi: () => callCompletionApi,
   convertFileListToFileUIParts: () => convertFileListToFileUIParts,
@@ -66,7 +66,7 @@ __export(src_exports, {
   coreToolMessageSchema: () => coreToolMessageSchema,
   coreUserMessageSchema: () => coreUserMessageSchema,
   cosineSimilarity: () => cosineSimilarity,
-  createIdGenerator: () => import_provider_utils25.createIdGenerator,
+  createIdGenerator: () => import_provider_utils26.createIdGenerator,
   createProviderRegistry: () => createProviderRegistry,
   createTextStreamResponse: () => createTextStreamResponse,
   createUIMessageStream: () => createUIMessageStream,
@@ -82,14 +82,15 @@ __export(src_exports, {
   experimental_generateSpeech: () => generateSpeech,
   experimental_transcribe: () => transcribe,
   extractReasoningMiddleware: () => extractReasoningMiddleware,
-  generateId: () => import_provider_utils25.generateId,
+  generateId: () => import_provider_utils26.generateId,
   generateObject: () => generateObject,
   generateText: () => generateText,
   getTextFromDataUrl: () => getTextFromDataUrl,
-  getToolInvocations: () => getToolInvocations,
+  getToolName: () => getToolName,
   hasToolCall: () => hasToolCall,
   isDeepEqualData: () => isDeepEqualData,
-  jsonSchema: () => import_provider_utils25.jsonSchema,
+  isToolUIPart: () => isToolUIPart,
+  jsonSchema: () => import_provider_utils26.jsonSchema,
   modelMessageSchema: () => modelMessageSchema,
   parsePartialJson: () => parsePartialJson,
   pipeTextStreamToResponse: () => pipeTextStreamToResponse,
@@ -107,7 +108,7 @@ __export(src_exports, {
   wrapLanguageModel: () => wrapLanguageModel
 });
 module.exports = __toCommonJS(src_exports);
-var import_provider_utils25 = require("@ai-sdk/provider-utils");
+var import_provider_utils26 = require("@ai-sdk/provider-utils");
 
 // src/error/index.ts
 var import_provider16 = require("@ai-sdk/provider");
@@ -159,24 +160,22 @@ var InvalidStreamPartError = class extends import_provider2.AISDKError {
 };
 _a2 = symbol2;
 
-// src/error/invalid-tool-arguments-error.ts
+// src/error/invalid-tool-input-error.ts
 var import_provider3 = require("@ai-sdk/provider");
-var name3 = "AI_InvalidToolArgumentsError";
+var name3 = "AI_InvalidToolInputError";
 var marker3 = `vercel.ai.error.${name3}`;
 var symbol3 = Symbol.for(marker3);
 var _a3;
-var InvalidToolArgumentsError = class extends import_provider3.AISDKError {
+var InvalidToolInputError = class extends import_provider3.AISDKError {
   constructor({
-    toolArgs,
+    toolInput,
     toolName,
     cause,
-    message = `Invalid arguments for tool ${toolName}: ${(0, import_provider3.getErrorMessage)(
-      cause
-    )}`
+    message = `Invalid input for tool ${toolName}: ${(0, import_provider3.getErrorMessage)(cause)}`
   }) {
     super({ name: name3, message, cause });
     this[_a3] = true;
-    this.toolArgs = toolArgs;
+    this.toolInput = toolInput;
     this.toolName = toolName;
   }
   static isInstance(error) {
@@ -327,7 +326,7 @@ var symbol10 = Symbol.for(marker10);
 var _a10;
 var ToolExecutionError = class extends import_provider10.AISDKError {
   constructor({
-    toolArgs,
+    toolInput,
     toolName,
     toolCallId,
     cause,
@@ -335,7 +334,7 @@ var ToolExecutionError = class extends import_provider10.AISDKError {
   }) {
     super({ name: name10, message, cause });
     this[_a10] = true;
-    this.toolArgs = toolArgs;
+    this.toolInput = toolInput;
     this.toolName = toolName;
     this.toolCallId = toolCallId;
   }
@@ -540,42 +539,45 @@ var import_provider_utils = require("@ai-sdk/provider-utils");
 // src/ui-message-stream/ui-message-stream-parts.ts
 var import_zod = require("zod");
 var uiMessageStreamPartSchema = import_zod.z.union([
-  import_zod.z.object({
+  import_zod.z.strictObject({
     type: import_zod.z.literal("text"),
     text: import_zod.z.string()
   }),
-  import_zod.z.object({
+  import_zod.z.strictObject({
     type: import_zod.z.literal("error"),
     errorText: import_zod.z.string()
   }),
-  import_zod.z.object({
-    type: import_zod.z.literal("tool-call-streaming-start"),
+  import_zod.z.strictObject({
+    type: import_zod.z.literal("tool-input-start"),
     toolCallId: import_zod.z.string(),
     toolName: import_zod.z.string()
   }),
-  import_zod.z.object({
-    type: import_zod.z.literal("tool-call-delta"),
+  import_zod.z.strictObject({
+    type: import_zod.z.literal("tool-input-delta"),
     toolCallId: import_zod.z.string(),
-    argsTextDelta: import_zod.z.string()
+    inputTextDelta: import_zod.z.string()
   }),
-  import_zod.z.object({
-    type: import_zod.z.literal("tool-call"),
+  import_zod.z.strictObject({
+    type: import_zod.z.literal("tool-input-available"),
     toolCallId: import_zod.z.string(),
     toolName: import_zod.z.string(),
-    args: import_zod.z.unknown()
+    input: import_zod.z.unknown()
   }),
-  import_zod.z.object({
-    type: import_zod.z.literal("tool-result"),
+  import_zod.z.strictObject({
+    type: import_zod.z.literal("tool-output-available"),
     toolCallId: import_zod.z.string(),
-    result: import_zod.z.unknown(),
+    output: import_zod.z.unknown(),
     providerMetadata: import_zod.z.any().optional()
   }),
-  import_zod.z.object({
+  import_zod.z.strictObject({
     type: import_zod.z.literal("reasoning"),
     text: import_zod.z.string(),
     providerMetadata: import_zod.z.record(import_zod.z.any()).optional()
   }),
-  import_zod.z.object({
+  import_zod.z.strictObject({
+    type: import_zod.z.literal("reasoning-part-finish")
+  }),
+  import_zod.z.strictObject({
     type: import_zod.z.literal("source-url"),
     sourceId: import_zod.z.string(),
     url: import_zod.z.string(),
@@ -583,7 +585,7 @@ var uiMessageStreamPartSchema = import_zod.z.union([
     providerMetadata: import_zod.z.any().optional()
     // Use z.any() for generic metadata
   }),
-  import_zod.z.object({
+  import_zod.z.strictObject({
     type: import_zod.z.literal("source-document"),
     sourceId: import_zod.z.string(),
     mediaType: import_zod.z.string(),
@@ -592,39 +594,34 @@ var uiMessageStreamPartSchema = import_zod.z.union([
     providerMetadata: import_zod.z.any().optional()
     // Use z.any() for generic metadata
   }),
-  import_zod.z.object({
+  import_zod.z.strictObject({
     type: import_zod.z.literal("file"),
     url: import_zod.z.string(),
     mediaType: import_zod.z.string()
   }),
-  import_zod.z.object({
+  import_zod.z.strictObject({
     type: import_zod.z.string().startsWith("data-"),
     id: import_zod.z.string().optional(),
     data: import_zod.z.unknown()
   }),
-  import_zod.z.object({
-    type: import_zod.z.literal("metadata"),
-    value: import_zod.z.object({ metadata: import_zod.z.unknown() })
+  import_zod.z.strictObject({
+    type: import_zod.z.literal("start-step")
   }),
-  import_zod.z.object({
-    type: import_zod.z.literal("start-step"),
-    metadata: import_zod.z.unknown().optional()
+  import_zod.z.strictObject({
+    type: import_zod.z.literal("finish-step")
   }),
-  import_zod.z.object({
-    type: import_zod.z.literal("finish-step"),
-    metadata: import_zod.z.unknown().optional()
-  }),
-  import_zod.z.object({
+  import_zod.z.strictObject({
     type: import_zod.z.literal("start"),
     messageId: import_zod.z.string().optional(),
-    metadata: import_zod.z.unknown().optional()
+    messageMetadata: import_zod.z.unknown().optional()
   }),
-  import_zod.z.object({
+  import_zod.z.strictObject({
     type: import_zod.z.literal("finish"),
-    metadata: import_zod.z.unknown().optional()
+    messageMetadata: import_zod.z.unknown().optional()
   }),
-  import_zod.z.object({
-    type: import_zod.z.literal("reasoning-part-finish")
+  import_zod.z.strictObject({
+    type: import_zod.z.literal("message-metadata"),
+    messageMetadata: import_zod.z.unknown()
   })
 ]);
 function isDataUIMessageStreamPart(part) {
@@ -1314,27 +1311,26 @@ async function parsePartialJson(jsonText) {
   return { value: void 0, state: "failed-parse" };
 }
 
-// src/ui/get-tool-invocations.ts
-function getToolInvocations(message) {
-  return message.parts.filter(
-    (part) => part.type === "tool-invocation"
-  ).map((part) => part.toolInvocation);
+// src/ui/ui-messages.ts
+function isToolUIPart(part) {
+  return part.type.startsWith("tool-");
+}
+function getToolName(part) {
+  return part.type.split("-")[1];
 }
 
 // src/ui/process-ui-message-stream.ts
 function createStreamingUIMessageState({
   lastMessage,
-  newMessageId = ""
-} = {}) {
-  const isContinuation = (lastMessage == null ? void 0 : lastMessage.role) === "assistant";
-  const message = isContinuation ? lastMessage : {
-    id: newMessageId,
-    metadata: {},
-    role: "assistant",
-    parts: []
-  };
+  messageId
+}) {
   return {
-    message,
+    message: (lastMessage == null ? void 0 : lastMessage.role) === "assistant" ? lastMessage : {
+      id: messageId,
+      metadata: void 0,
+      role: "assistant",
+      parts: []
+    },
     activeTextPart: void 0,
     activeReasoningPart: void 0,
     partialToolCalls: {}
@@ -1351,16 +1347,21 @@ function processUIMessageStream({
     new TransformStream({
       async transform(part, controller) {
         await runUpdateMessageJob(async ({ state, write }) => {
-          function updateToolInvocationPart(toolCallId, invocation) {
+          function updateToolInvocationPart(options) {
             const part2 = state.message.parts.find(
-              (part3) => isToolInvocationUIPart(part3) && part3.toolInvocation.toolCallId === toolCallId
+              (part3) => isToolUIPart(part3) && part3.toolCallId === options.toolCallId
             );
             if (part2 != null) {
-              part2.toolInvocation = invocation;
+              part2.state = options.state;
+              part2.input = options.input;
+              part2.output = options.output;
             } else {
               state.message.parts.push({
-                type: "tool-invocation",
-                toolInvocation: invocation
+                type: `tool-${options.toolName}`,
+                toolCallId: options.toolCallId,
+                state: options.state,
+                input: options.input,
+                output: options.output
               });
             }
           }
@@ -1443,43 +1444,43 @@ function processUIMessageStream({
               write();
               break;
             }
-            case "tool-call-streaming-start": {
-              const toolInvocations = getToolInvocations(state.message);
+            case "tool-input-start": {
+              const toolInvocations = state.message.parts.filter(isToolUIPart);
               state.partialToolCalls[part.toolCallId] = {
                 text: "",
                 toolName: part.toolName,
                 index: toolInvocations.length
               };
-              updateToolInvocationPart(part.toolCallId, {
-                state: "partial-call",
+              updateToolInvocationPart({
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                args: void 0
+                state: "input-streaming",
+                input: void 0
               });
               write();
               break;
             }
-            case "tool-call-delta": {
+            case "tool-input-delta": {
               const partialToolCall = state.partialToolCalls[part.toolCallId];
-              partialToolCall.text += part.argsTextDelta;
+              partialToolCall.text += part.inputTextDelta;
               const { value: partialArgs } = await parsePartialJson(
                 partialToolCall.text
               );
-              updateToolInvocationPart(part.toolCallId, {
-                state: "partial-call",
+              updateToolInvocationPart({
                 toolCallId: part.toolCallId,
                 toolName: partialToolCall.toolName,
-                args: partialArgs
+                state: "input-streaming",
+                input: partialArgs
               });
               write();
               break;
             }
-            case "tool-call": {
-              updateToolInvocationPart(part.toolCallId, {
-                state: "call",
+            case "tool-input-available": {
+              updateToolInvocationPart({
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                args: part.args
+                state: "input-available",
+                input: part.input
               });
               write();
               if (onToolCall) {
@@ -1487,20 +1488,20 @@ function processUIMessageStream({
                   toolCall: part
                 });
                 if (result != null) {
-                  updateToolInvocationPart(part.toolCallId, {
-                    state: "result",
+                  updateToolInvocationPart({
                     toolCallId: part.toolCallId,
                     toolName: part.toolName,
-                    args: part.args,
-                    result
+                    state: "output-available",
+                    input: part.input,
+                    output: result
                   });
                   write();
                 }
               }
               break;
             }
-            case "tool-result": {
-              const toolInvocations = getToolInvocations(state.message);
+            case "tool-output-available": {
+              const toolInvocations = state.message.parts.filter(isToolUIPart);
               if (toolInvocations == null) {
                 throw new Error("tool_result must be preceded by a tool_call");
               }
@@ -1512,49 +1513,48 @@ function processUIMessageStream({
                   "tool_result must be preceded by a tool_call with the same toolCallId"
                 );
               }
-              updateToolInvocationPart(part.toolCallId, {
-                ...toolInvocations[toolInvocationIndex],
-                state: "result",
-                result: part.result
+              const toolName = getToolName(
+                toolInvocations[toolInvocationIndex]
+              );
+              updateToolInvocationPart({
+                toolCallId: part.toolCallId,
+                toolName,
+                state: "output-available",
+                input: toolInvocations[toolInvocationIndex].input,
+                output: part.output
               });
               write();
               break;
             }
             case "start-step": {
               state.message.parts.push({ type: "step-start" });
-              await updateMessageMetadata(part.metadata);
-              write();
               break;
             }
             case "finish-step": {
               state.activeTextPart = void 0;
               state.activeReasoningPart = void 0;
-              await updateMessageMetadata(part.metadata);
-              if (part.metadata != null) {
-                write();
-              }
               break;
             }
             case "start": {
               if (part.messageId != null) {
                 state.message.id = part.messageId;
               }
-              await updateMessageMetadata(part.metadata);
-              if (part.messageId != null || part.metadata != null) {
+              await updateMessageMetadata(part.messageMetadata);
+              if (part.messageId != null || part.messageMetadata != null) {
                 write();
               }
               break;
             }
             case "finish": {
-              await updateMessageMetadata(part.metadata);
-              if (part.metadata != null) {
+              await updateMessageMetadata(part.messageMetadata);
+              if (part.messageMetadata != null) {
                 write();
               }
               break;
             }
-            case "metadata": {
-              await updateMessageMetadata(part.metadata);
-              if (part.metadata != null) {
+            case "message-metadata": {
+              await updateMessageMetadata(part.messageMetadata);
+              if (part.messageMetadata != null) {
                 write();
               }
               break;
@@ -1582,9 +1582,6 @@ function processUIMessageStream({
     })
   );
 }
-function isToolInvocationUIPart(part) {
-  return part.type === "tool-invocation";
-}
 function isObject(value) {
   return typeof value === "object" && value !== null;
 }
@@ -1619,8 +1616,8 @@ function isAssistantMessageWithCompletedToolCalls(message) {
   const lastStepStartIndex = message.parts.reduce((lastIndex, part, index) => {
     return part.type === "step-start" ? index : lastIndex;
   }, -1);
-  const lastStepToolInvocations = message.parts.slice(lastStepStartIndex + 1).filter((part) => part.type === "tool-invocation");
-  return lastStepToolInvocations.length > 0 && lastStepToolInvocations.every((part) => "result" in part.toolInvocation);
+  const lastStepToolInvocations = message.parts.slice(lastStepStartIndex + 1).filter(isToolUIPart);
+  return lastStepToolInvocations.length > 0 && lastStepToolInvocations.every((part) => part.state === "output-available");
 }
 
 // src/ui/chat.ts
@@ -1694,13 +1691,13 @@ var AbstractChat = class {
     };
     this.addToolResult = async ({
       toolCallId,
-      result
+      output
     }) => {
       this.jobExecutor.run(async () => {
-        updateToolCallResult({
+        updateToolOutput({
           messages: this.state.messages,
           toolCallId,
-          toolResult: result
+          output
         });
         this.messages = this.state.messages;
         if (this.status === "submitted" || this.status === "streaming") {
@@ -1723,7 +1720,6 @@ var AbstractChat = class {
         return;
       if ((_a17 = this.activeResponse) == null ? void 0 : _a17.abortController) {
         this.activeResponse.abortController.abort();
-        this.activeResponse.abortController = void 0;
       }
     };
     this.id = id;
@@ -1784,7 +1780,7 @@ var AbstractChat = class {
       const activeResponse = {
         state: createStreamingUIMessageState({
           lastMessage: this.state.snapshot(lastMessage),
-          newMessageId: this.generateId()
+          messageId: this.generateId()
         }),
         abortController: new AbortController()
       };
@@ -1861,23 +1857,20 @@ var AbstractChat = class {
     }
   }
 };
-function updateToolCallResult({
+function updateToolOutput({
   messages,
   toolCallId,
-  toolResult: result
+  output
 }) {
   const lastMessage = messages[messages.length - 1];
-  const invocationPart = lastMessage.parts.find(
-    (part) => part.type === "tool-invocation" && part.toolInvocation.toolCallId === toolCallId
+  const toolPart = lastMessage.parts.find(
+    (part) => isToolUIPart(part) && part.toolCallId === toolCallId
   );
-  if (invocationPart == null) {
+  if (toolPart == null) {
     return;
   }
-  invocationPart.toolInvocation = {
-    ...invocationPart.toolInvocation,
-    state: "result",
-    result
-  };
+  toolPart.state = "output-available";
+  toolPart.output = output;
 }
 
 // src/ui/convert-to-model-messages.ts
@@ -1918,75 +1911,71 @@ function convertToModelMessages(messages, options) {
             }
             const content = [];
             for (const part of block) {
-              switch (part.type) {
-                case "text": {
-                  content.push(part);
-                  break;
-                }
-                case "file": {
-                  content.push({
-                    type: "file",
-                    mediaType: part.mediaType,
-                    data: part.url
-                  });
-                  break;
-                }
-                case "reasoning": {
-                  content.push({
-                    type: "reasoning",
-                    text: part.text,
-                    providerOptions: part.providerMetadata
+              if (part.type === "text") {
+                content.push(part);
+              } else if (part.type === "file") {
+                content.push({
+                  type: "file",
+                  mediaType: part.mediaType,
+                  data: part.url
+                });
+              } else if (part.type === "reasoning") {
+                content.push({
+                  type: "reasoning",
+                  text: part.text,
+                  providerOptions: part.providerMetadata
+                });
+              } else if (isToolUIPart(part)) {
+                const toolName = getToolName(part);
+                if (part.state === "input-streaming") {
+                  throw new MessageConversionError({
+                    originalMessage: message,
+                    message: `incomplete tool input is not supported: ${part.toolCallId}`
                   });
-                  break;
-                }
-                case "tool-invocation":
+                } else {
                   content.push({
                     type: "tool-call",
-                    toolCallId: part.toolInvocation.toolCallId,
-                    toolName: part.toolInvocation.toolName,
-                    args: part.toolInvocation.args
+                    toolCallId: part.toolCallId,
+                    toolName,
+                    input: part.input
                   });
-                  break;
-                default: {
-                  const _exhaustiveCheck = part;
-                  throw new Error(`Unsupported part: ${_exhaustiveCheck}`);
                 }
+              } else {
+                const _exhaustiveCheck = part;
+                throw new Error(`Unsupported part: ${_exhaustiveCheck}`);
               }
             }
             modelMessages.push({
               role: "assistant",
               content
             });
-            const stepInvocations = block.filter(
-              (part) => part.type === "tool-invocation"
-            ).map((part) => part.toolInvocation);
-            if (stepInvocations.length > 0) {
+            const toolParts = block.filter(isToolUIPart);
+            if (toolParts.length > 0) {
               modelMessages.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 tool2 = tools[toolName];
-                    return (tool2 == null ? void 0 : tool2.experimental_toToolResultContent) != null ? {
-                      type: "tool-result",
-                      toolCallId,
-                      toolName,
-                      result: tool2.experimental_toToolResultContent(result),
-                      experimental_content: tool2.experimental_toToolResultContent(result)
-                    } : {
-                      type: "tool-result",
-                      toolCallId,
-                      toolName,
-                      result
-                    };
+                content: toolParts.map((toolPart) => {
+                  if (toolPart.state !== "output-available") {
+                    throw new MessageConversionError({
+                      originalMessage: message,
+                      message: "ToolInvocation must have a result: " + JSON.stringify(toolPart)
+                    });
                   }
-                )
+                  const toolName = getToolName(toolPart);
+                  const { toolCallId, output } = toolPart;
+                  const tool2 = tools[toolName];
+                  return (tool2 == null ? void 0 : tool2.experimental_toToolResultContent) != null ? {
+                    type: "tool-result",
+                    toolCallId,
+                    toolName,
+                    output: tool2.experimental_toToolResultContent(output),
+                    experimental_content: tool2.experimental_toToolResultContent(output)
+                  } : {
+                    type: "tool-result",
+                    toolCallId,
+                    toolName,
+                    output
+                  };
+                })
               });
             }
             block = [];
@@ -1994,18 +1983,10 @@ function convertToModelMessages(messages, options) {
           var processBlock = processBlock2;
           let block = [];
           for (const part of message.parts) {
-            switch (part.type) {
-              case "text":
-              case "reasoning":
-              case "file":
-              case "tool-invocation": {
-                block.push(part);
-                break;
-              }
-              case "step-start": {
-                processBlock2();
-                break;
-              }
+            if (part.type === "text" || part.type === "reasoning" || part.type === "file" || isToolUIPart(part)) {
+              block.push(part);
+            } else if (part.type === "step-start") {
+              processBlock2();
             }
           }
           processBlock2();
@@ -2135,9 +2116,12 @@ var TextStreamChatTransport = class {
   }
 };
 
+// src/ui-message-stream/create-ui-message-stream.ts
+var import_provider_utils6 = require("@ai-sdk/provider-utils");
+
 // src/ui-message-stream/handle-ui-message-stream-finish.ts
 function handleUIMessageStreamFinish({
-  newMessageId,
+  messageId,
   originalMessages = [],
   onFinish,
   stream
@@ -2145,19 +2129,30 @@ function handleUIMessageStreamFinish({
   if (onFinish == null) {
     return stream;
   }
-  const lastMessage = originalMessages[originalMessages.length - 1];
-  const isContinuation = (lastMessage == null ? void 0 : lastMessage.role) === "assistant";
-  const messageId = isContinuation ? lastMessage.id : newMessageId;
+  const lastMessage = originalMessages == null ? void 0 : originalMessages[originalMessages.length - 1];
   const state = createStreamingUIMessageState({
-    lastMessage: structuredClone(lastMessage),
-    newMessageId: messageId
+    lastMessage: lastMessage ? structuredClone(lastMessage) : void 0,
+    messageId
+    // will be overridden by the stream
   });
   const runUpdateMessageJob = async (job) => {
     await job({ state, write: () => {
     } });
   };
   return processUIMessageStream({
-    stream,
+    stream: stream.pipeThrough(
+      new TransformStream({
+        transform(chunk, controller) {
+          if (chunk.type === "start") {
+            const startChunk = chunk;
+            if (startChunk.messageId == null) {
+              startChunk.messageId = messageId;
+            }
+          }
+          controller.enqueue(chunk);
+        }
+      })
+    ),
     runUpdateMessageJob
   }).pipeThrough(
     new TransformStream({
@@ -2165,12 +2160,12 @@ function handleUIMessageStreamFinish({
         controller.enqueue(chunk);
       },
       flush() {
-        const isContinuation2 = state.message.id === (lastMessage == null ? void 0 : lastMessage.id);
+        const isContinuation = state.message.id === (lastMessage == null ? void 0 : lastMessage.id);
         onFinish({
-          isContinuation: isContinuation2,
+          isContinuation,
           responseMessage: state.message,
           messages: [
-            ...isContinuation2 ? originalMessages.slice(0, -1) : originalMessages,
+            ...isContinuation ? originalMessages.slice(0, -1) : originalMessages,
             state.message
           ]
         });
@@ -2185,7 +2180,8 @@ function createUIMessageStream({
   onError = () => "An error occurred.",
   // mask error messages for safety by default
   originalMessages,
-  onFinish
+  onFinish,
+  generateId: generateId3 = import_provider_utils6.generateId
 }) {
   let controller;
   const ongoingStreamPromises = [];
@@ -2257,7 +2253,7 @@ function createUIMessageStream({
   });
   return handleUIMessageStreamFinish({
     stream,
-    newMessageId: "",
+    messageId: generateId3(),
     originalMessages,
     onFinish
   });
@@ -2401,7 +2397,7 @@ function isDeepEqualData(obj1, obj2) {
 }
 
 // src/util/simulate-readable-stream.ts
-var import_provider_utils6 = require("@ai-sdk/provider-utils");
+var import_provider_utils7 = require("@ai-sdk/provider-utils");
 function simulateReadableStream({
   chunks,
   initialDelayInMs = 0,
@@ -2409,7 +2405,7 @@ function simulateReadableStream({
   _internal
 }) {
   var _a17;
-  const delay2 = (_a17 = _internal == null ? void 0 : _internal.delay) != null ? _a17 : import_provider_utils6.delay;
+  const delay2 = (_a17 = _internal == null ? void 0 : _internal.delay) != null ? _a17 : import_provider_utils7.delay;
   let index = 0;
   return new ReadableStream({
     async pull(controller) {
@@ -2425,7 +2421,7 @@ function simulateReadableStream({
 
 // src/util/retry-with-exponential-backoff.ts
 var import_provider17 = require("@ai-sdk/provider");
-var import_provider_utils7 = require("@ai-sdk/provider-utils");
+var import_provider_utils8 = require("@ai-sdk/provider-utils");
 var retryWithExponentialBackoff = ({
   maxRetries = 2,
   initialDelayInMs = 2e3,
@@ -2443,13 +2439,13 @@ async function _retryWithExponentialBackoff(f, {
   try {
     return await f();
   } catch (error) {
-    if ((0, import_provider_utils7.isAbortError)(error)) {
+    if ((0, import_provider_utils8.isAbortError)(error)) {
       throw error;
     }
     if (maxRetries === 0) {
       throw error;
     }
-    const errorMessage = (0, import_provider_utils7.getErrorMessage)(error);
+    const errorMessage = (0, import_provider_utils8.getErrorMessage)(error);
     const newErrors = [...errors, error];
     const tryNumber = newErrors.length;
     if (tryNumber > maxRetries) {
@@ -2460,7 +2456,7 @@ async function _retryWithExponentialBackoff(f, {
       });
     }
     if (error instanceof Error && import_provider17.APICallError.isInstance(error) && error.isRetryable === true && tryNumber <= maxRetries) {
-      await (0, import_provider_utils7.delay)(delayInMs);
+      await (0, import_provider_utils8.delay)(delayInMs);
       return _retryWithExponentialBackoff(
         f,
         { maxRetries, delayInMs: backoffFactor * delayInMs, backoffFactor },
@@ -3019,7 +3015,7 @@ var DefaultEmbedManyResult = class {
 };
 
 // src/util/detect-media-type.ts
-var import_provider_utils8 = require("@ai-sdk/provider-utils");
+var import_provider_utils9 = require("@ai-sdk/provider-utils");
 var imageMediaTypeSignatures = [
   {
     mediaType: "image/gif",
@@ -3126,7 +3122,7 @@ var audioMediaTypeSignatures = [
   }
 ];
 var stripID3 = (data) => {
-  const bytes = typeof data === "string" ? (0, import_provider_utils8.convertBase64ToUint8Array)(data) : data;
+  const bytes = typeof data === "string" ? (0, import_provider_utils9.convertBase64ToUint8Array)(data) : data;
   const id3Size = (bytes[6] & 127) << 21 | (bytes[7] & 127) << 14 | (bytes[8] & 127) << 7 | bytes[9] & 127;
   return bytes.slice(id3Size + 10);
 };
@@ -3152,7 +3148,7 @@ function detectMediaType({
 }
 
 // core/generate-text/generated-file.ts
-var import_provider_utils9 = require("@ai-sdk/provider-utils");
+var import_provider_utils10 = require("@ai-sdk/provider-utils");
 var DefaultGeneratedFile = class {
   constructor({
     data,
@@ -3166,14 +3162,14 @@ var DefaultGeneratedFile = class {
   // lazy conversion with caching to avoid unnecessary conversion overhead:
   get base64() {
     if (this.base64Data == null) {
-      this.base64Data = (0, import_provider_utils9.convertUint8ArrayToBase64)(this.uint8ArrayData);
+      this.base64Data = (0, import_provider_utils10.convertUint8ArrayToBase64)(this.uint8ArrayData);
     }
     return this.base64Data;
   }
   // lazy conversion with caching to avoid unnecessary conversion overhead:
   get uint8Array() {
     if (this.uint8ArrayData == null) {
-      this.uint8ArrayData = (0, import_provider_utils9.convertBase64ToUint8Array)(this.base64Data);
+      this.uint8ArrayData = (0, import_provider_utils10.convertBase64ToUint8Array)(this.base64Data);
     }
     return this.uint8ArrayData;
   }
@@ -3289,7 +3285,7 @@ async function invokeModelMaxImagesPerCall(model) {
 
 // core/generate-object/generate-object.ts
 var import_provider22 = require("@ai-sdk/provider");
-var import_provider_utils14 = require("@ai-sdk/provider-utils");
+var import_provider_utils15 = require("@ai-sdk/provider-utils");
 
 // core/generate-text/extract-content-text.ts
 function extractContentText(content) {
@@ -3303,7 +3299,7 @@ function extractContentText(content) {
 }
 
 // core/prompt/convert-to-language-model-prompt.ts
-var import_provider_utils11 = require("@ai-sdk/provider-utils");
+var import_provider_utils12 = require("@ai-sdk/provider-utils");
 
 // src/util/download.ts
 async function download({ url }) {
@@ -3332,7 +3328,7 @@ async function download({ url }) {
 
 // core/prompt/data-content.ts
 var import_provider18 = require("@ai-sdk/provider");
-var import_provider_utils10 = require("@ai-sdk/provider-utils");
+var import_provider_utils11 = require("@ai-sdk/provider-utils");
 var import_zod2 = require("zod");
 
 // core/prompt/split-data-url.ts
@@ -3397,9 +3393,9 @@ function convertDataContentToBase64String(content) {
     return content;
   }
   if (content instanceof ArrayBuffer) {
-    return (0, import_provider_utils10.convertUint8ArrayToBase64)(new Uint8Array(content));
+    return (0, import_provider_utils11.convertUint8ArrayToBase64)(new Uint8Array(content));
   }
-  return (0, import_provider_utils10.convertUint8ArrayToBase64)(content);
+  return (0, import_provider_utils11.convertUint8ArrayToBase64)(content);
 }
 function convertDataContentToUint8Array(content) {
   if (content instanceof Uint8Array) {
@@ -3407,7 +3403,7 @@ function convertDataContentToUint8Array(content) {
   }
   if (typeof content === "string") {
     try {
-      return (0, import_provider_utils10.convertBase64ToUint8Array)(content);
+      return (0, import_provider_utils11.convertBase64ToUint8Array)(content);
     } catch (error) {
       throw new InvalidDataContentError({
         message: "Invalid data content. Content string is not a base64-encoded media.",
@@ -3511,7 +3507,7 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
                 type: "tool-call",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                args: part.args,
+                input: part.input,
                 providerOptions
               };
             }
@@ -3527,7 +3523,7 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
           type: "tool-result",
           toolCallId: part.toolCallId,
           toolName: part.toolName,
-          result: part.result,
+          output: part.output,
           content: part.experimental_content,
           isError: part.isError,
           providerOptions: part.providerOptions
@@ -3558,7 +3554,7 @@ async function downloadAssets(messages, downloadImplementation, supportedUrls) {
     }
     return { mediaType, data };
   }).filter(
-    (part) => part.data instanceof URL && part.mediaType != null && !(0, import_provider_utils11.isUrlSupported)({
+    (part) => part.data instanceof URL && part.mediaType != null && !(0, import_provider_utils12.isUrlSupported)({
       url: part.data.toString(),
       mediaType: part.mediaType,
       supportedUrls
@@ -3742,7 +3738,7 @@ function resolveLanguageModel(model) {
 
 // core/prompt/standardize-prompt.ts
 var import_provider19 = require("@ai-sdk/provider");
-var import_provider_utils12 = require("@ai-sdk/provider-utils");
+var import_provider_utils13 = require("@ai-sdk/provider-utils");
 var import_zod8 = require("zod");
 
 // core/prompt/message.ts
@@ -3814,14 +3810,14 @@ var toolCallPartSchema = import_zod6.z.object({
   type: import_zod6.z.literal("tool-call"),
   toolCallId: import_zod6.z.string(),
   toolName: import_zod6.z.string(),
-  args: import_zod6.z.unknown(),
+  input: import_zod6.z.unknown(),
   providerOptions: providerMetadataSchema.optional()
 });
 var toolResultPartSchema = import_zod6.z.object({
   type: import_zod6.z.literal("tool-result"),
   toolCallId: import_zod6.z.string(),
   toolName: import_zod6.z.string(),
-  result: import_zod6.z.unknown(),
+  output: import_zod6.z.unknown(),
   content: toolResultContentSchema.optional(),
   isError: import_zod6.z.boolean().optional(),
   providerOptions: providerMetadataSchema.optional()
@@ -3914,7 +3910,7 @@ async function standardizePrompt(prompt) {
       message: "messages must not be empty"
     });
   }
-  const validationResult = await (0, import_provider_utils12.safeValidateTypes)({
+  const validationResult = await (0, import_provider_utils13.safeValidateTypes)({
     value: messages,
     schema: import_zod8.z.array(modelMessageSchema)
   });
@@ -3962,7 +3958,7 @@ function stringifyForTelemetry(prompt) {
 
 // core/generate-object/output-strategy.ts
 var import_provider21 = require("@ai-sdk/provider");
-var import_provider_utils13 = require("@ai-sdk/provider-utils");
+var import_provider_utils14 = require("@ai-sdk/provider-utils");
 
 // src/util/async-iterable-stream.ts
 function createAsyncIterableStream(source) {
@@ -4018,7 +4014,7 @@ var objectOutputStrategy = (schema) => ({
     };
   },
   async validateFinalResult(value) {
-    return (0, import_provider_utils13.safeValidateTypes)({ value, schema });
+    return (0, import_provider_utils14.safeValidateTypes)({ value, schema });
   },
   createElementStream() {
     throw new import_provider21.UnsupportedFunctionalityError({
@@ -4062,7 +4058,7 @@ var arrayOutputStrategy = (schema) => {
       const resultArray = [];
       for (let i = 0; i < inputArray.length; i++) {
         const element = inputArray[i];
-        const result = await (0, import_provider_utils13.safeValidateTypes)({ value: element, schema });
+        const result = await (0, import_provider_utils14.safeValidateTypes)({ value: element, schema });
         if (i === inputArray.length - 1 && !isFinalDelta) {
           continue;
         }
@@ -4103,7 +4099,7 @@ var arrayOutputStrategy = (schema) => {
       }
       const inputArray = value.elements;
       for (const element of inputArray) {
-        const result = await (0, import_provider_utils13.safeValidateTypes)({ value: element, schema });
+        const result = await (0, import_provider_utils14.safeValidateTypes)({ value: element, schema });
         if (!result.success) {
           return result;
         }
@@ -4221,9 +4217,9 @@ function getOutputStrategy({
 }) {
   switch (output) {
     case "object":
-      return objectOutputStrategy((0, import_provider_utils13.asSchema)(schema));
+      return objectOutputStrategy((0, import_provider_utils14.asSchema)(schema));
     case "array":
-      return arrayOutputStrategy((0, import_provider_utils13.asSchema)(schema));
+      return arrayOutputStrategy((0, import_provider_utils14.asSchema)(schema));
     case "enum":
       return enumOutputStrategy(enumValues);
     case "no-schema":
@@ -4354,7 +4350,7 @@ function validateObjectGenerationInput({
 }
 
 // core/generate-object/generate-object.ts
-var originalGenerateId = (0, import_provider_utils14.createIdGenerator)({ prefix: "aiobj", size: 24 });
+var originalGenerateId = (0, import_provider_utils15.createIdGenerator)({ prefix: "aiobj", size: 24 });
 async function generateObject(options) {
   const {
     model: modelArg,
@@ -4532,7 +4528,7 @@ async function generateObject(options) {
         request = (_a17 = generateResult.request) != null ? _a17 : {};
         response = generateResult.responseData;
         async function processResult(result2) {
-          const parseResult = await (0, import_provider_utils14.safeParseJSON)({ text: result2 });
+          const parseResult = await (0, import_provider_utils15.safeParseJSON)({ text: result2 });
           if (!parseResult.success) {
             throw new NoObjectGeneratedError({
               message: "No object generated: could not parse the response.",
@@ -4631,7 +4627,7 @@ var DefaultGenerateObjectResult = class {
 };
 
 // core/generate-object/stream-object.ts
-var import_provider_utils15 = require("@ai-sdk/provider-utils");
+var import_provider_utils16 = require("@ai-sdk/provider-utils");
 
 // src/util/create-resolvable-promise.ts
 function createResolvablePromise() {
@@ -4775,7 +4771,7 @@ function now() {
 }
 
 // core/generate-object/stream-object.ts
-var originalGenerateId2 = (0, import_provider_utils15.createIdGenerator)({ prefix: "aiobj", size: 24 });
+var originalGenerateId2 = (0, import_provider_utils16.createIdGenerator)({ prefix: "aiobj", size: 24 });
 function streamObject(options) {
   const {
     model,
@@ -5374,7 +5370,7 @@ var DefaultSpeechResult = class {
 };
 
 // core/generate-text/generate-text.ts
-var import_provider_utils18 = require("@ai-sdk/provider-utils");
+var import_provider_utils19 = require("@ai-sdk/provider-utils");
 
 // src/util/as-array.ts
 function asArray(value) {
@@ -5382,7 +5378,7 @@ function asArray(value) {
 }
 
 // core/prompt/prepare-tools-and-tool-choice.ts
-var import_provider_utils16 = require("@ai-sdk/provider-utils");
+var import_provider_utils17 = require("@ai-sdk/provider-utils");
 
 // src/util/is-non-empty-object.ts
 function isNonEmptyObject(object2) {
@@ -5414,11 +5410,18 @@ function prepareToolsAndToolChoice({
             type: "function",
             name: name17,
             description: tool2.description,
-            parameters: (0, import_provider_utils16.asSchema)(tool2.parameters).jsonSchema
+            inputSchema: (0, import_provider_utils17.asSchema)(tool2.inputSchema).jsonSchema
+          };
+        case "provider-defined-client":
+          return {
+            type: "provider-defined-client",
+            name: name17,
+            id: tool2.id,
+            args: tool2.args
           };
-        case "provider-defined":
+        case "provider-defined-server":
           return {
-            type: "provider-defined",
+            type: "provider-defined-server",
             name: name17,
             id: tool2.id,
             args: tool2.args
@@ -5484,7 +5487,7 @@ function asContent({
 }
 
 // core/generate-text/parse-tool-call.ts
-var import_provider_utils17 = require("@ai-sdk/provider-utils");
+var import_provider_utils18 = require("@ai-sdk/provider-utils");
 async function parseToolCall({
   toolCall,
   tools,
@@ -5498,7 +5501,7 @@ async function parseToolCall({
   try {
     return await doParseToolCall({ toolCall, tools });
   } catch (error) {
-    if (repairToolCall == null || !(NoSuchToolError.isInstance(error) || InvalidToolArgumentsError.isInstance(error))) {
+    if (repairToolCall == null || !(NoSuchToolError.isInstance(error) || InvalidToolInputError.isInstance(error))) {
       throw error;
     }
     let repairedToolCall = null;
@@ -5506,9 +5509,9 @@ async function parseToolCall({
       repairedToolCall = await repairToolCall({
         toolCall,
         tools,
-        parameterSchema: ({ toolName }) => {
-          const { parameters } = tools[toolName];
-          return (0, import_provider_utils17.asSchema)(parameters).jsonSchema;
+        inputSchema: ({ toolName }) => {
+          const { inputSchema } = tools[toolName];
+          return (0, import_provider_utils18.asSchema)(inputSchema).jsonSchema;
         },
         system,
         messages,
@@ -5538,12 +5541,12 @@ async function doParseToolCall({
       availableTools: Object.keys(tools)
     });
   }
-  const schema = (0, import_provider_utils17.asSchema)(tool2.parameters);
-  const parseResult = toolCall.args.trim() === "" ? await (0, import_provider_utils17.safeValidateTypes)({ value: {}, schema }) : await (0, import_provider_utils17.safeParseJSON)({ text: toolCall.args, schema });
+  const schema = (0, import_provider_utils18.asSchema)(tool2.inputSchema);
+  const parseResult = toolCall.input.trim() === "" ? await (0, import_provider_utils18.safeValidateTypes)({ value: {}, schema }) : await (0, import_provider_utils18.safeParseJSON)({ text: toolCall.input, schema });
   if (parseResult.success === false) {
-    throw new InvalidToolArgumentsError({
+    throw new InvalidToolInputError({
       toolName,
-      toolArgs: toolCall.args,
+      toolInput: toolCall.input,
       cause: parseResult.error
     });
   }
@@ -5551,7 +5554,7 @@ async function doParseToolCall({
     type: "tool-call",
     toolCallId: toolCall.toolCallId,
     toolName,
-    args: parseResult == null ? void 0 : parseResult.value
+    input: parseResult.value
   };
 }
 
@@ -5654,15 +5657,15 @@ function toResponseMessages({
       type: "tool-result",
       toolCallId: toolResult.toolCallId,
       toolName: toolResult.toolName,
-      result: tool2.experimental_toToolResultContent(toolResult.result),
+      output: tool2.experimental_toToolResultContent(toolResult.output),
       experimental_content: tool2.experimental_toToolResultContent(
-        toolResult.result
+        toolResult.output
       )
     } : {
       type: "tool-result",
       toolCallId: toolResult.toolCallId,
       toolName: toolResult.toolName,
-      result: toolResult.result
+      output: toolResult.output
     };
   });
   if (toolResultContent.length > 0) {
@@ -5675,7 +5678,7 @@ function toResponseMessages({
 }
 
 // core/generate-text/generate-text.ts
-var originalGenerateId3 = (0, import_provider_utils18.createIdGenerator)({
+var originalGenerateId3 = (0, import_provider_utils19.createIdGenerator)({
   prefix: "aitxt",
   size: 24
 });
@@ -5968,11 +5971,11 @@ async function executeTools({
   abortSignal
 }) {
   const toolResults = await Promise.all(
-    toolCalls.map(async ({ toolCallId, toolName, args }) => {
+    toolCalls.map(async ({ toolCallId, toolName, input }) => {
       const tool2 = tools[toolName];
-      if ((tool2 == null ? void 0 : tool2.onArgsAvailable) != null) {
-        await tool2.onArgsAvailable({
-          args,
+      if ((tool2 == null ? void 0 : tool2.onInputAvailable) != null) {
+        await tool2.onInputAvailable({
+          input,
           toolCallId,
           messages,
           abortSignal
@@ -5992,15 +5995,15 @@ async function executeTools({
             }),
             "ai.toolCall.name": toolName,
             "ai.toolCall.id": toolCallId,
-            "ai.toolCall.args": {
-              output: () => JSON.stringify(args)
+            "ai.toolCall.input": {
+              output: () => JSON.stringify(input)
             }
           }
         }),
         tracer,
         fn: async (span) => {
           try {
-            const result2 = await tool2.execute(args, {
+            const result2 = await tool2.execute(input, {
               toolCallId,
               messages,
               abortSignal
@@ -6023,7 +6026,7 @@ async function executeTools({
             throw new ToolExecutionError({
               toolCallId,
               toolName,
-              toolArgs: args,
+              toolInput: input,
               cause: error
             });
           }
@@ -6033,8 +6036,8 @@ async function executeTools({
         type: "tool-result",
         toolCallId,
         toolName,
-        args,
-        result
+        input,
+        output: result
       };
     })
   );
@@ -6124,7 +6127,7 @@ function asToolCalls(content) {
     toolCallType: toolCall.toolCallType,
     toolCallId: toolCall.toolCallId,
     toolName: toolCall.toolName,
-    args: toolCall.args
+    input: toolCall.input
   }));
 }
 
@@ -6134,7 +6137,7 @@ __export(output_exports, {
   object: () => object,
   text: () => text
 });
-var import_provider_utils19 = require("@ai-sdk/provider-utils");
+var import_provider_utils20 = require("@ai-sdk/provider-utils");
 var text = () => ({
   type: "text",
   responseFormat: { type: "text" },
@@ -6148,7 +6151,7 @@ var text = () => ({
 var object = ({
   schema: inputSchema
 }) => {
-  const schema = (0, import_provider_utils19.asSchema)(inputSchema);
+  const schema = (0, import_provider_utils20.asSchema)(inputSchema);
   return {
     type: "object",
     responseFormat: {
@@ -6174,7 +6177,7 @@ var object = ({
       }
     },
     async parseOutput({ text: text2 }, context) {
-      const parseResult = await (0, import_provider_utils19.safeParseJSON)({ text: text2 });
+      const parseResult = await (0, import_provider_utils20.safeParseJSON)({ text: text2 });
       if (!parseResult.success) {
         throw new NoObjectGeneratedError({
           message: "No object generated: could not parse the response.",
@@ -6185,7 +6188,7 @@ var object = ({
           finishReason: context.finishReason
         });
       }
-      const validationResult = await (0, import_provider_utils19.safeValidateTypes)({
+      const validationResult = await (0, import_provider_utils20.safeValidateTypes)({
         value: parseResult.value,
         schema
       });
@@ -6205,7 +6208,7 @@ var object = ({
 };
 
 // core/generate-text/smooth-stream.ts
-var import_provider_utils20 = require("@ai-sdk/provider-utils");
+var import_provider_utils21 = require("@ai-sdk/provider-utils");
 var import_provider24 = require("@ai-sdk/provider");
 var CHUNKING_REGEXPS = {
   word: /\S+\s+/m,
@@ -6214,7 +6217,7 @@ var CHUNKING_REGEXPS = {
 function smoothStream({
   delayInMs = 10,
   chunking = "word",
-  _internal: { delay: delay2 = import_provider_utils20.delay } = {}
+  _internal: { delay: delay2 = import_provider_utils21.delay } = {}
 } = {}) {
   let detectChunk;
   if (typeof chunking === "function") {
@@ -6274,10 +6277,10 @@ function smoothStream({
 }
 
 // core/generate-text/stream-text.ts
-var import_provider_utils22 = require("@ai-sdk/provider-utils");
+var import_provider_utils23 = require("@ai-sdk/provider-utils");
 
 // core/generate-text/run-tools-transformation.ts
-var import_provider_utils21 = require("@ai-sdk/provider-utils");
+var import_provider_utils22 = require("@ai-sdk/provider-utils");
 function runToolsTransformation({
   tools,
   generatorStream,
@@ -6348,7 +6351,7 @@ function runToolsTransformation({
             type: "tool-call-delta",
             toolCallId: chunk.toolCallId,
             toolName: chunk.toolName,
-            argsTextDelta: chunk.argsTextDelta
+            inputTextDelta: chunk.inputTextDelta
           });
           break;
         }
@@ -6363,16 +6366,16 @@ function runToolsTransformation({
             });
             controller.enqueue(toolCall);
             const tool2 = tools[toolCall.toolName];
-            if (tool2.onArgsAvailable != null) {
-              await tool2.onArgsAvailable({
-                args: toolCall.args,
+            if (tool2.onInputAvailable != null) {
+              await tool2.onInputAvailable({
+                input: toolCall.input,
                 toolCallId: toolCall.toolCallId,
                 messages,
                 abortSignal
               });
             }
             if (tool2.execute != null) {
-              const toolExecutionId = (0, import_provider_utils21.generateId)();
+              const toolExecutionId = (0, import_provider_utils22.generateId)();
               outstandingToolResults.add(toolExecutionId);
               recordSpan({
                 name: "ai.toolCall",
@@ -6385,22 +6388,22 @@ function runToolsTransformation({
                     }),
                     "ai.toolCall.name": toolCall.toolName,
                     "ai.toolCall.id": toolCall.toolCallId,
-                    "ai.toolCall.args": {
-                      output: () => JSON.stringify(toolCall.args)
+                    "ai.toolCall.input": {
+                      output: () => JSON.stringify(toolCall.input)
                     }
                   }
                 }),
                 tracer,
-                fn: async (span) => tool2.execute(toolCall.args, {
+                fn: async (span) => tool2.execute(toolCall.input, {
                   toolCallId: toolCall.toolCallId,
                   messages,
                   abortSignal
                 }).then(
-                  (result) => {
+                  (output) => {
                     toolResultsStreamController.enqueue({
                       ...toolCall,
                       type: "tool-result",
-                      result
+                      output
                     });
                     outstandingToolResults.delete(toolExecutionId);
                     attemptClose();
@@ -6409,8 +6412,8 @@ function runToolsTransformation({
                         selectTelemetryAttributes({
                           telemetry,
                           attributes: {
-                            "ai.toolCall.result": {
-                              output: () => JSON.stringify(result)
+                            "ai.toolCall.output": {
+                              output: () => JSON.stringify(output)
                             }
                           }
                         })
@@ -6424,7 +6427,7 @@ function runToolsTransformation({
                       error: new ToolExecutionError({
                         toolCallId: toolCall.toolCallId,
                         toolName: toolCall.toolName,
-                        toolArgs: toolCall.args,
+                        toolInput: toolCall.input,
                         cause: error
                       })
                     });
@@ -6480,8 +6483,20 @@ function runToolsTransformation({
   });
 }
 
+// src/ui-message-stream/get-response-ui-message-id.ts
+function getResponseUIMessageId({
+  originalMessages,
+  responseMessageId
+}) {
+  if (originalMessages == null) {
+    return void 0;
+  }
+  const lastMessage = originalMessages[originalMessages.length - 1];
+  return (lastMessage == null ? void 0 : lastMessage.role) === "assistant" ? lastMessage.id : typeof responseMessageId === "function" ? responseMessageId() : responseMessageId;
+}
+
 // core/generate-text/stream-text.ts
-var originalGenerateId4 = (0, import_provider_utils22.createIdGenerator)({
+var originalGenerateId4 = (0, import_provider_utils23.createIdGenerator)({
   prefix: "aitxt",
   size: 24
 });
@@ -6644,7 +6659,7 @@ var DefaultStreamTextResult = class {
       async transform(chunk, controller) {
         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-call-streaming-start" || part.type === "tool-call-delta") {
+        if (part.type === "text" || part.type === "reasoning" || part.type === "source" || part.type === "tool-call" || part.type === "tool-result" || part.type === "tool-call-streaming-start" || part.type === "tool-call-delta" || part.type === "raw") {
           await (onChunk == null ? void 0 : onChunk({ chunk: part }));
         }
         if (part.type === "error") {
@@ -7064,8 +7079,8 @@ var DefaultStreamTextResult = class {
                     }
                     case "tool-call-streaming-start": {
                       const tool2 = tools == null ? void 0 : tools[chunk.toolName];
-                      if ((tool2 == null ? void 0 : tool2.onArgsStreamingStart) != null) {
-                        await tool2.onArgsStreamingStart({
+                      if ((tool2 == null ? void 0 : tool2.onInputStart) != null) {
+                        await tool2.onInputStart({
                           toolCallId: chunk.toolCallId,
                           messages: stepInputMessages,
                           abortSignal
@@ -7076,9 +7091,9 @@ var DefaultStreamTextResult = class {
                     }
                     case "tool-call-delta": {
                       const tool2 = tools == null ? void 0 : tools[chunk.toolName];
-                      if ((tool2 == null ? void 0 : tool2.onArgsStreamingDelta) != null) {
-                        await tool2.onArgsStreamingDelta({
-                          argsTextDelta: chunk.argsTextDelta,
+                      if ((tool2 == null ? void 0 : tool2.onInputDelta) != null) {
+                        await tool2.onInputDelta({
+                          inputTextDelta: chunk.inputTextDelta,
                           toolCallId: chunk.toolCallId,
                           messages: stepInputMessages,
                           abortSignal
@@ -7093,7 +7108,9 @@ var DefaultStreamTextResult = class {
                       break;
                     }
                     case "raw": {
-                      controller.enqueue(chunk);
+                      if (includeRawChunks2) {
+                        controller.enqueue(chunk);
+                      }
                       break;
                     }
                     default: {
@@ -7316,23 +7333,24 @@ var DefaultStreamTextResult = class {
     );
   }
   toUIMessageStream({
-    newMessageId,
-    originalMessages = [],
+    originalMessages,
     onFinish,
     messageMetadata,
-    sendReasoning = false,
+    sendReasoning = true,
     sendSources = false,
     sendStart = true,
     sendFinish = true,
     onError = () => "An error occurred."
     // mask error messages for safety by default
   } = {}) {
-    const lastMessage = originalMessages[originalMessages.length - 1];
-    const isContinuation = (lastMessage == null ? void 0 : lastMessage.role) === "assistant";
-    const messageId = isContinuation ? lastMessage.id : newMessageId;
+    const responseMessageId = getResponseUIMessageId({
+      originalMessages,
+      responseMessageId: this.generateId
+    });
     const baseStream = this.fullStream.pipeThrough(
       new TransformStream({
         transform: async (part, controller) => {
+          const messageMetadataValue = messageMetadata == null ? void 0 : messageMetadata({ part });
           const partType = part.type;
           switch (partType) {
             case "text": {
@@ -7390,7 +7408,7 @@ var DefaultStreamTextResult = class {
             }
             case "tool-call-streaming-start": {
               controller.enqueue({
-                type: "tool-call-streaming-start",
+                type: "tool-input-start",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName
               });
@@ -7398,26 +7416,26 @@ var DefaultStreamTextResult = class {
             }
             case "tool-call-delta": {
               controller.enqueue({
-                type: "tool-call-delta",
+                type: "tool-input-delta",
                 toolCallId: part.toolCallId,
-                argsTextDelta: part.argsTextDelta
+                inputTextDelta: part.inputTextDelta
               });
               break;
             }
             case "tool-call": {
               controller.enqueue({
-                type: "tool-call",
+                type: "tool-input-available",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                args: part.args
+                input: part.input
               });
               break;
             }
             case "tool-result": {
               controller.enqueue({
-                type: "tool-result",
+                type: "tool-output-available",
                 toolCallId: part.toolCallId,
-                result: part.result
+                output: part.output
               });
               break;
             }
@@ -7429,38 +7447,28 @@ var DefaultStreamTextResult = class {
               break;
             }
             case "start-step": {
-              const metadata = messageMetadata == null ? void 0 : messageMetadata({ part });
-              controller.enqueue({
-                type: "start-step",
-                metadata
-              });
+              controller.enqueue({ type: "start-step" });
               break;
             }
             case "finish-step": {
-              const metadata = messageMetadata == null ? void 0 : messageMetadata({ part });
-              controller.enqueue({
-                type: "finish-step",
-                metadata
-              });
+              controller.enqueue({ type: "finish-step" });
               break;
             }
             case "start": {
               if (sendStart) {
-                const metadata = messageMetadata == null ? void 0 : messageMetadata({ part });
                 controller.enqueue({
                   type: "start",
-                  messageId,
-                  metadata
+                  messageId: responseMessageId,
+                  messageMetadata: messageMetadataValue
                 });
               }
               break;
             }
             case "finish": {
               if (sendFinish) {
-                const metadata = messageMetadata == null ? void 0 : messageMetadata({ part });
                 controller.enqueue({
                   type: "finish",
-                  metadata
+                  messageMetadata: messageMetadataValue
                 });
               }
               break;
@@ -7473,18 +7481,23 @@ var DefaultStreamTextResult = class {
               throw new Error(`Unknown chunk type: ${exhaustiveCheck}`);
             }
           }
+          if (messageMetadataValue != null && partType !== "start" && partType !== "finish") {
+            controller.enqueue({
+              type: "message-metadata",
+              messageMetadata: messageMetadataValue
+            });
+          }
         }
       })
     );
     return handleUIMessageStreamFinish({
       stream: baseStream,
-      newMessageId: messageId != null ? messageId : this.generateId(),
+      messageId: responseMessageId != null ? responseMessageId : this.generateId(),
       originalMessages,
       onFinish
     });
   }
   pipeUIMessageStreamToResponse(response, {
-    newMessageId,
     originalMessages,
     onFinish,
     messageMetadata,
@@ -7498,7 +7511,6 @@ var DefaultStreamTextResult = class {
     pipeUIMessageStreamToResponse({
       response,
       stream: this.toUIMessageStream({
-        newMessageId,
         originalMessages,
         onFinish,
         messageMetadata,
@@ -7519,7 +7531,6 @@ var DefaultStreamTextResult = class {
     });
   }
   toUIMessageStreamResponse({
-    newMessageId,
     originalMessages,
     onFinish,
     messageMetadata,
@@ -7532,7 +7543,6 @@ var DefaultStreamTextResult = class {
   } = {}) {
     return createUIMessageStreamResponse({
       stream: this.toUIMessageStream({
-        newMessageId,
         originalMessages,
         onFinish,
         messageMetadata,
@@ -7929,7 +7939,7 @@ var DefaultProviderRegistry = class {
 };
 
 // core/tool/mcp/mcp-client.ts
-var import_provider_utils24 = require("@ai-sdk/provider-utils");
+var import_provider_utils25 = require("@ai-sdk/provider-utils");
 
 // core/tool/tool.ts
 function tool(tool2) {
@@ -7937,7 +7947,7 @@ function tool(tool2) {
 }
 
 // core/tool/mcp/mcp-sse-transport.ts
-var import_provider_utils23 = require("@ai-sdk/provider-utils");
+var import_provider_utils24 = require("@ai-sdk/provider-utils");
 
 // core/tool/mcp/json-rpc-message.ts
 var import_zod10 = require("zod");
@@ -8108,7 +8118,7 @@ var SseMCPTransport = class {
             (_b = this.onerror) == null ? void 0 : _b.call(this, error);
             return reject(error);
           }
-          const stream = response.body.pipeThrough(new TextDecoderStream()).pipeThrough((0, import_provider_utils23.createEventSourceParserStream)());
+          const stream = response.body.pipeThrough(new TextDecoderStream()).pipeThrough((0, import_provider_utils24.createEventSourceParserStream)());
           const reader = stream.getReader();
           const processEvents = async () => {
             var _a18, _b2, _c2;
@@ -8432,15 +8442,14 @@ var MCPClient = class {
         if (schemas !== "automatic" && !(name17 in schemas)) {
           continue;
         }
-        const parameters = schemas === "automatic" ? (0, import_provider_utils24.jsonSchema)({
-          ...inputSchema,
-          properties: (_a17 = inputSchema.properties) != null ? _a17 : {},
-          additionalProperties: false
-        }) : schemas[name17].parameters;
         const self = this;
         const toolWithExecute = tool({
           description,
-          parameters,
+          inputSchema: schemas === "automatic" ? (0, import_provider_utils25.jsonSchema)({
+            ...inputSchema,
+            properties: (_a17 = inputSchema.properties) != null ? _a17 : {},
+            additionalProperties: false
+          }) : schemas[name17].inputSchema,
           execute: async (args, options) => {
             var _a18;
             (_a18 = options == null ? void 0 : options.abortSignal) == null ? void 0 : _a18.throwIfAborted();
@@ -8573,7 +8582,7 @@ var DefaultTranscriptionResult = class {
   InvalidPromptError,
   InvalidResponseDataError,
   InvalidStreamPartError,
-  InvalidToolArgumentsError,
+  InvalidToolInputError,
   JSONParseError,
   JsonToSseTransformStream,
   LoadAPIKeyError,
@@ -8626,9 +8635,10 @@ var DefaultTranscriptionResult = class {
   generateObject,
   generateText,
   getTextFromDataUrl,
-  getToolInvocations,
+  getToolName,
   hasToolCall,
   isDeepEqualData,
+  isToolUIPart,
   jsonSchema,
   modelMessageSchema,
   parsePartialJson,