ai 6.0.0-beta.49 → 6.0.0-beta.50

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # ai
 
+## 6.0.0-beta.50
+
+### Patch Changes
+
+- 4812235: fix(ai): add missing export for `LoadSettingError`
+- 81d4308: feat: provider-executed dynamic tools
+- Updated dependencies [81d4308]
+  - @ai-sdk/provider@3.0.0-beta.7
+  - @ai-sdk/gateway@2.0.0-beta.32
+  - @ai-sdk/provider-utils@4.0.0-beta.18
+
 ## 6.0.0-beta.49
 
 ### Patch Changes

package/dist/index.d.mts

@@ -4,7 +4,7 @@ import { Tool, InferToolInput, InferToolOutput, AssistantModelMessage, ToolModel
 export { AssistantContent, AssistantModelMessage, DataContent, FilePart, FlexibleSchema, IdGenerator, ImagePart, InferSchema, InferToolInput, InferToolOutput, ModelMessage, Schema, SystemModelMessage, TextPart, Tool, ToolApprovalRequest, ToolApprovalResponse, ToolCallOptions, ToolCallPart, ToolContent, ToolExecuteFunction, ToolModelMessage, ToolResultPart, UserContent, UserModelMessage, asSchema, createIdGenerator, dynamicTool, generateId, jsonSchema, parseJsonEventStream, tool, zodSchema } from '@ai-sdk/provider-utils';
 import * as _ai_sdk_provider from '@ai-sdk/provider';
 import { EmbeddingModelV3, EmbeddingModelV2, EmbeddingModelV3Embedding, ImageModelV3, ImageModelV3CallWarning, ImageModelV3ProviderMetadata, JSONValue as JSONValue$1, LanguageModelV3, LanguageModelV2, LanguageModelV3FinishReason, LanguageModelV3CallWarning, LanguageModelV3Source, LanguageModelV3Middleware, SharedV3ProviderMetadata, SpeechModelV3, SpeechModelV2, SpeechModelV3CallWarning, TranscriptionModelV3, TranscriptionModelV2, TranscriptionModelV3CallWarning, LanguageModelV3Usage, LanguageModelV3CallOptions, AISDKError, LanguageModelV3ToolCall, JSONSchema7, JSONParseError, TypeValidationError, ProviderV3, ProviderV2, NoSuchModelError, JSONObject } from '@ai-sdk/provider';
-export { AISDKError, APICallError, EmptyResponseBodyError, InvalidPromptError, InvalidResponseDataError, JSONParseError, JSONSchema7, LoadAPIKeyError, NoContentGeneratedError, NoSuchModelError, TooManyEmbeddingValuesForCallError, TypeValidationError, UnsupportedFunctionalityError } from '@ai-sdk/provider';
+export { AISDKError, APICallError, EmptyResponseBodyError, InvalidPromptError, InvalidResponseDataError, JSONParseError, JSONSchema7, LoadAPIKeyError, LoadSettingError, NoContentGeneratedError, NoSuchModelError, TooManyEmbeddingValuesForCallError, TypeValidationError, UnsupportedFunctionalityError } from '@ai-sdk/provider';
 import { ServerResponse } from 'node:http';
 import { AttributeValue, Tracer } from '@opentelemetry/api';
 import { ServerResponse as ServerResponse$1 } from 'http';
@@ -1580,18 +1580,23 @@ type asUITool<TOOL extends UITool | Tool> = TOOL extends Tool ? InferUITool<TOOL
  * UI components for the tool.
  */
 type UIToolInvocation<TOOL extends UITool | Tool> = {
+    /**
+     * ID of the tool call.
+     */
     toolCallId: string;
+    /**
+     * Whether the tool call was executed by the provider.
+     */
+    providerExecuted?: boolean;
 } & ({
     state: 'input-streaming';
     input: DeepPartial<asUITool<TOOL>['input']> | undefined;
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     approval?: never;
 } | {
     state: 'input-available';
     input: asUITool<TOOL>['input'];
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
@@ -1599,7 +1604,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
 } | {
     state: 'approval-requested';
     input: asUITool<TOOL>['input'];
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
@@ -1611,7 +1615,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
 } | {
     state: 'approval-responded';
     input: asUITool<TOOL>['input'];
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
@@ -1625,7 +1628,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
     input: asUITool<TOOL>['input'];
     output: asUITool<TOOL>['output'];
     errorText?: never;
-    providerExecuted?: boolean;
     callProviderMetadata?: ProviderMetadata;
     preliminary?: boolean;
     approval?: {
@@ -1639,7 +1641,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
     rawInput?: unknown;
     output?: never;
     errorText: string;
-    providerExecuted?: boolean;
     callProviderMetadata?: ProviderMetadata;
     approval?: {
         id: string;
@@ -1649,7 +1650,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
 } | {
     state: 'output-denied';
     input: asUITool<TOOL>['input'];
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
@@ -1666,8 +1666,18 @@ type ToolUIPart<TOOLS extends UITools = UITools> = ValueOf<{
 }>;
 type DynamicToolUIPart = {
     type: 'dynamic-tool';
+    /**
+     * Name of the tool that is being called.
+     */
     toolName: string;
+    /**
+     * ID of the tool call.
+     */
     toolCallId: string;
+    /**
+     * Whether the tool call was executed by the provider.
+     */
+    providerExecuted?: boolean;
 } & ({
     state: 'input-streaming';
     input: unknown | undefined;
@@ -2760,6 +2770,7 @@ type SingleRequestTextStreamPart<TOOLS extends ToolSet> = {
     id: string;
     toolName: string;
     providerMetadata?: ProviderMetadata;
+    dynamic?: boolean;
 } | {
     type: 'tool-input-delta';
     id: string;
@@ -4601,12 +4612,14 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
 declare function convertFileListToFileUIParts(files: FileList | undefined): Promise<Array<FileUIPart>>;
 
 /**
-Converts an array of messages from useChat into an array of CoreMessages that can be used
-with the AI core functions (e.g. `streamText`).
+Converts an array of UI messages from useChat into an array of ModelMessages that can be used
+with the AI functions (e.g. `streamText`, `generateText`).
 
-@param messages - The messages to convert.
+@param messages - The UI messages to convert.
 @param options.tools - The tools to use.
 @param options.ignoreIncompleteToolCalls - Whether to ignore incomplete tool calls. Default is `false`.
+
+@returns An array of ModelMessages.
  */
 declare function convertToModelMessages(messages: Array<Omit<UIMessage, 'id'>>, options?: {
     tools?: ToolSet;

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { Tool, InferToolInput, InferToolOutput, AssistantModelMessage, ToolModel
 export { AssistantContent, AssistantModelMessage, DataContent, FilePart, FlexibleSchema, IdGenerator, ImagePart, InferSchema, InferToolInput, InferToolOutput, ModelMessage, Schema, SystemModelMessage, TextPart, Tool, ToolApprovalRequest, ToolApprovalResponse, ToolCallOptions, ToolCallPart, ToolContent, ToolExecuteFunction, ToolModelMessage, ToolResultPart, UserContent, UserModelMessage, asSchema, createIdGenerator, dynamicTool, generateId, jsonSchema, parseJsonEventStream, tool, zodSchema } from '@ai-sdk/provider-utils';
 import * as _ai_sdk_provider from '@ai-sdk/provider';
 import { EmbeddingModelV3, EmbeddingModelV2, EmbeddingModelV3Embedding, ImageModelV3, ImageModelV3CallWarning, ImageModelV3ProviderMetadata, JSONValue as JSONValue$1, LanguageModelV3, LanguageModelV2, LanguageModelV3FinishReason, LanguageModelV3CallWarning, LanguageModelV3Source, LanguageModelV3Middleware, SharedV3ProviderMetadata, SpeechModelV3, SpeechModelV2, SpeechModelV3CallWarning, TranscriptionModelV3, TranscriptionModelV2, TranscriptionModelV3CallWarning, LanguageModelV3Usage, LanguageModelV3CallOptions, AISDKError, LanguageModelV3ToolCall, JSONSchema7, JSONParseError, TypeValidationError, ProviderV3, ProviderV2, NoSuchModelError, JSONObject } from '@ai-sdk/provider';
-export { AISDKError, APICallError, EmptyResponseBodyError, InvalidPromptError, InvalidResponseDataError, JSONParseError, JSONSchema7, LoadAPIKeyError, NoContentGeneratedError, NoSuchModelError, TooManyEmbeddingValuesForCallError, TypeValidationError, UnsupportedFunctionalityError } from '@ai-sdk/provider';
+export { AISDKError, APICallError, EmptyResponseBodyError, InvalidPromptError, InvalidResponseDataError, JSONParseError, JSONSchema7, LoadAPIKeyError, LoadSettingError, NoContentGeneratedError, NoSuchModelError, TooManyEmbeddingValuesForCallError, TypeValidationError, UnsupportedFunctionalityError } from '@ai-sdk/provider';
 import { ServerResponse } from 'node:http';
 import { AttributeValue, Tracer } from '@opentelemetry/api';
 import { ServerResponse as ServerResponse$1 } from 'http';
@@ -1580,18 +1580,23 @@ type asUITool<TOOL extends UITool | Tool> = TOOL extends Tool ? InferUITool<TOOL
  * UI components for the tool.
  */
 type UIToolInvocation<TOOL extends UITool | Tool> = {
+    /**
+     * ID of the tool call.
+     */
     toolCallId: string;
+    /**
+     * Whether the tool call was executed by the provider.
+     */
+    providerExecuted?: boolean;
 } & ({
     state: 'input-streaming';
     input: DeepPartial<asUITool<TOOL>['input']> | undefined;
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     approval?: never;
 } | {
     state: 'input-available';
     input: asUITool<TOOL>['input'];
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
@@ -1599,7 +1604,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
 } | {
     state: 'approval-requested';
     input: asUITool<TOOL>['input'];
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
@@ -1611,7 +1615,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
 } | {
     state: 'approval-responded';
     input: asUITool<TOOL>['input'];
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
@@ -1625,7 +1628,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
     input: asUITool<TOOL>['input'];
     output: asUITool<TOOL>['output'];
     errorText?: never;
-    providerExecuted?: boolean;
     callProviderMetadata?: ProviderMetadata;
     preliminary?: boolean;
     approval?: {
@@ -1639,7 +1641,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
     rawInput?: unknown;
     output?: never;
     errorText: string;
-    providerExecuted?: boolean;
     callProviderMetadata?: ProviderMetadata;
     approval?: {
         id: string;
@@ -1649,7 +1650,6 @@ type UIToolInvocation<TOOL extends UITool | Tool> = {
 } | {
     state: 'output-denied';
     input: asUITool<TOOL>['input'];
-    providerExecuted?: boolean;
     output?: never;
     errorText?: never;
     callProviderMetadata?: ProviderMetadata;
@@ -1666,8 +1666,18 @@ type ToolUIPart<TOOLS extends UITools = UITools> = ValueOf<{
 }>;
 type DynamicToolUIPart = {
     type: 'dynamic-tool';
+    /**
+     * Name of the tool that is being called.
+     */
     toolName: string;
+    /**
+     * ID of the tool call.
+     */
     toolCallId: string;
+    /**
+     * Whether the tool call was executed by the provider.
+     */
+    providerExecuted?: boolean;
 } & ({
     state: 'input-streaming';
     input: unknown | undefined;
@@ -2760,6 +2770,7 @@ type SingleRequestTextStreamPart<TOOLS extends ToolSet> = {
     id: string;
     toolName: string;
     providerMetadata?: ProviderMetadata;
+    dynamic?: boolean;
 } | {
     type: 'tool-input-delta';
     id: string;
@@ -4601,12 +4612,14 @@ declare abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
 declare function convertFileListToFileUIParts(files: FileList | undefined): Promise<Array<FileUIPart>>;
 
 /**
-Converts an array of messages from useChat into an array of CoreMessages that can be used
-with the AI core functions (e.g. `streamText`).
+Converts an array of UI messages from useChat into an array of ModelMessages that can be used
+with the AI functions (e.g. `streamText`, `generateText`).
 
-@param messages - The messages to convert.
+@param messages - The UI messages to convert.
 @param options.tools - The tools to use.
 @param options.ignoreIncompleteToolCalls - Whether to ignore incomplete tool calls. Default is `false`.
+
+@returns An array of ModelMessages.
  */
 declare function convertToModelMessages(messages: Array<Omit<UIMessage, 'id'>>, options?: {
     tools?: ToolSet;

package/dist/index.js

@@ -39,6 +39,7 @@ __export(src_exports, {
   JSONParseError: () => import_provider18.JSONParseError,
   JsonToSseTransformStream: () => JsonToSseTransformStream,
   LoadAPIKeyError: () => import_provider18.LoadAPIKeyError,
+  LoadSettingError: () => import_provider18.LoadSettingError,
   MCPClientError: () => MCPClientError,
   MessageConversionError: () => MessageConversionError,
   NoContentGeneratedError: () => import_provider18.NoContentGeneratedError,
@@ -868,7 +869,7 @@ function detectMediaType({
 var import_provider_utils2 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.0-beta.49" : "0.0.0-test";
+var VERSION = true ? "6.0.0-beta.50" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -2265,6 +2266,9 @@ async function parseToolCall({
 }) {
   try {
     if (tools == null) {
+      if (toolCall.providerExecuted && toolCall.dynamic) {
+        return await parseProviderExecutedDynamicToolCall(toolCall);
+      }
       throw new NoSuchToolError({ toolName: toolCall.toolName });
     }
     try {
@@ -2311,6 +2315,25 @@ async function parseToolCall({
     };
   }
 }
+async function parseProviderExecutedDynamicToolCall(toolCall) {
+  const parseResult = toolCall.input.trim() === "" ? { success: true, value: {} } : await (0, import_provider_utils10.safeParseJSON)({ text: toolCall.input });
+  if (parseResult.success === false) {
+    throw new InvalidToolInputError({
+      toolName: toolCall.toolName,
+      toolInput: toolCall.input,
+      cause: parseResult.error
+    });
+  }
+  return {
+    type: "tool-call",
+    toolCallId: toolCall.toolCallId,
+    toolName: toolCall.toolName,
+    input: parseResult.value,
+    providerExecuted: true,
+    dynamic: true,
+    providerMetadata: toolCall.providerMetadata
+  };
+}
 async function doParseToolCall({
   toolCall,
   tools
@@ -2318,6 +2341,9 @@ async function doParseToolCall({
   const toolName = toolCall.toolName;
   const tool3 = tools[toolName];
   if (tool3 == null) {
+    if (toolCall.providerExecuted && toolCall.dynamic) {
+      return await parseProviderExecutedDynamicToolCall(toolCall);
+    }
     throw new NoSuchToolError({
       toolName: toolCall.toolName,
       availableTools: Object.keys(tools)
@@ -2792,7 +2818,10 @@ async function generateText({
             if (toolCall.invalid) {
               continue;
             }
-            const tool3 = tools[toolCall.toolName];
+            const tool3 = tools == null ? void 0 : tools[toolCall.toolName];
+            if (tool3 == null) {
+              continue;
+            }
             if ((tool3 == null ? void 0 : tool3.onInputAvailable) != null) {
               await tool3.onInputAvailable({
                 input: toolCall.input,
@@ -3897,7 +3926,7 @@ function processUIMessageStream({
             }
           }
           function updateDynamicToolPart(options) {
-            var _a18;
+            var _a18, _b2;
             const part = state.message.parts.find(
               (part2) => part2.type === "dynamic-tool" && part2.toolCallId === options.toolCallId
             );
@@ -3911,6 +3940,7 @@ function processUIMessageStream({
               anyPart.errorText = anyOptions.errorText;
               anyPart.rawInput = (_a18 = anyOptions.rawInput) != null ? _a18 : anyPart.rawInput;
               anyPart.preliminary = anyOptions.preliminary;
+              anyPart.providerExecuted = (_b2 = anyOptions.providerExecuted) != null ? _b2 : part.providerExecuted;
               if (anyOptions.providerMetadata != null && part.state === "input-available") {
                 part.callProviderMetadata = anyOptions.providerMetadata;
               }
@@ -3924,6 +3954,7 @@ function processUIMessageStream({
                 output: anyOptions.output,
                 errorText: anyOptions.errorText,
                 preliminary: anyOptions.preliminary,
+                providerExecuted: anyOptions.providerExecuted,
                 ...anyOptions.providerMetadata != null ? { callProviderMetadata: anyOptions.providerMetadata } : {}
               });
             }
@@ -4040,7 +4071,8 @@ function processUIMessageStream({
                   toolCallId: chunk.toolCallId,
                   toolName: chunk.toolName,
                   state: "input-streaming",
-                  input: void 0
+                  input: void 0,
+                  providerExecuted: chunk.providerExecuted
                 });
               } else {
                 updateToolPart({
@@ -4085,6 +4117,7 @@ function processUIMessageStream({
                   toolName: chunk.toolName,
                   state: "input-available",
                   input: chunk.input,
+                  providerExecuted: chunk.providerExecuted,
                   providerMetadata: chunk.providerMetadata
                 });
               } else {
@@ -4113,6 +4146,7 @@ function processUIMessageStream({
                   state: "output-error",
                   input: chunk.input,
                   errorText: chunk.errorText,
+                  providerExecuted: chunk.providerExecuted,
                   providerMetadata: chunk.providerMetadata
                 });
               } else {
@@ -4152,7 +4186,8 @@ function processUIMessageStream({
                   state: "output-available",
                   input: toolInvocation.input,
                   output: chunk.output,
-                  preliminary: chunk.preliminary
+                  preliminary: chunk.preliminary,
+                  providerExecuted: chunk.providerExecuted
                 });
               } else {
                 updateToolPart({
@@ -4176,7 +4211,8 @@ function processUIMessageStream({
                   toolName: toolInvocation.toolName,
                   state: "output-error",
                   input: toolInvocation.input,
-                  errorText: chunk.errorText
+                  errorText: chunk.errorText,
+                  providerExecuted: chunk.providerExecuted
                 });
               } else {
                 updateToolPart({
@@ -4185,7 +4221,8 @@ function processUIMessageStream({
                   state: "output-error",
                   input: toolInvocation.input,
                   rawInput: toolInvocation.rawInput,
-                  errorText: chunk.errorText
+                  errorText: chunk.errorText,
+                  providerExecuted: chunk.providerExecuted
                 });
               }
               write();
@@ -4679,7 +4716,10 @@ function runToolsTransformation({
               });
               break;
             }
-            const tool3 = tools[toolCall.toolName];
+            const tool3 = tools == null ? void 0 : tools[toolCall.toolName];
+            if (tool3 == null) {
+              break;
+            }
             if (tool3.onInputAvailable != null) {
               await tool3.onInputAvailable({
                 input: toolCall.input,
@@ -4737,7 +4777,8 @@ function runToolsTransformation({
               toolName,
               input: toolInputs.get(chunk.toolCallId),
               providerExecuted: chunk.providerExecuted,
-              error: chunk.result
+              error: chunk.result,
+              dynamic: chunk.dynamic
             });
           } else {
             controller.enqueue({
@@ -4746,7 +4787,8 @@ function runToolsTransformation({
               toolName,
               input: toolInputs.get(chunk.toolCallId),
               output: chunk.result,
-              providerExecuted: chunk.providerExecuted
+              providerExecuted: chunk.providerExecuted,
+              dynamic: chunk.dynamic
             });
           }
           break;
@@ -5470,7 +5512,7 @@ var DefaultStreamTextResult = class {
             streamWithToolResults.pipeThrough(
               new TransformStream({
                 async transform(chunk, controller) {
-                  var _a18, _b2, _c2, _d2;
+                  var _a18, _b2, _c2, _d2, _e2;
                   if (chunk.type === "stream-start") {
                     warnings = chunk.warnings;
                     return;
@@ -5582,7 +5624,7 @@ var DefaultStreamTextResult = class {
                       }
                       controller.enqueue({
                         ...chunk,
-                        dynamic: (tool3 == null ? void 0 : tool3.type) === "dynamic"
+                        dynamic: (_e2 = chunk.dynamic) != null ? _e2 : (tool3 == null ? void 0 : tool3.type) === "dynamic"
                       });
                       break;
                     }
@@ -5886,12 +5928,13 @@ var DefaultStreamTextResult = class {
       originalMessages,
       responseMessageId: generateMessageId
     }) : void 0;
-    const toolNamesByCallId = {};
-    const isDynamic = (toolCallId) => {
-      var _a17, _b;
-      const toolName = toolNamesByCallId[toolCallId];
-      const dynamic = ((_b = (_a17 = this.tools) == null ? void 0 : _a17[toolName]) == null ? void 0 : _b.type) === "dynamic";
-      return dynamic ? true : void 0;
+    const isDynamic = (part) => {
+      var _a17;
+      const tool3 = (_a17 = this.tools) == null ? void 0 : _a17[part.toolName];
+      if (tool3 == null) {
+        return part.dynamic;
+      }
+      return (tool3 == null ? void 0 : tool3.type) === "dynamic" ? true : void 0;
     };
     const baseStream = this.fullStream.pipeThrough(
       new TransformStream({
@@ -5982,8 +6025,7 @@ var DefaultStreamTextResult = class {
               break;
             }
             case "tool-input-start": {
-              toolNamesByCallId[part.id] = part.toolName;
-              const dynamic = isDynamic(part.id);
+              const dynamic = isDynamic(part);
               controller.enqueue({
                 type: "tool-input-start",
                 toolCallId: part.id,
@@ -6002,8 +6044,7 @@ var DefaultStreamTextResult = class {
               break;
             }
             case "tool-call": {
-              toolNamesByCallId[part.toolCallId] = part.toolName;
-              const dynamic = isDynamic(part.toolCallId);
+              const dynamic = isDynamic(part);
               if (part.invalid) {
                 controller.enqueue({
                   type: "tool-input-error",
@@ -6037,7 +6078,7 @@ var DefaultStreamTextResult = class {
               break;
             }
             case "tool-result": {
-              const dynamic = isDynamic(part.toolCallId);
+              const dynamic = isDynamic(part);
               controller.enqueue({
                 type: "tool-output-available",
                 toolCallId: part.toolCallId,
@@ -6049,7 +6090,7 @@ var DefaultStreamTextResult = class {
               break;
             }
             case "tool-error": {
-              const dynamic = isDynamic(part.toolCallId);
+              const dynamic = isDynamic(part);
               controller.enqueue({
                 type: "tool-output-error",
                 toolCallId: part.toolCallId,
@@ -6288,32 +6329,14 @@ function convertToModelMessages(messages, options) {
                   text: part.text,
                   providerOptions: part.providerMetadata
                 });
-              } else if (part.type === "dynamic-tool") {
-                const toolName = part.toolName;
+              } else if (isToolOrDynamicToolUIPart(part)) {
+                const toolName = getToolOrDynamicToolName(part);
                 if (part.state !== "input-streaming") {
                   content.push({
                     type: "tool-call",
                     toolCallId: part.toolCallId,
                     toolName,
-                    input: part.input,
-                    ...part.callProviderMetadata != null ? { providerOptions: part.callProviderMetadata } : {}
-                  });
-                }
-                if (part.approval != null) {
-                  content.push({
-                    type: "tool-approval-request",
-                    approvalId: part.approval.id,
-                    toolCallId: part.toolCallId
-                  });
-                }
-              } else if (isToolUIPart(part)) {
-                const toolName = getToolName(part);
-                if (part.state !== "input-streaming") {
-                  content.push({
-                    type: "tool-call",
-                    toolCallId: part.toolCallId,
-                    toolName,
-                    input: part.state === "output-error" ? (_a17 = part.input) != null ? _a17 : part.rawInput : part.input,
+                    input: part.state === "output-error" ? (_a17 = part.input) != null ? _a17 : "rawInput" in part ? part.rawInput : void 0 : part.input,
                     providerExecuted: part.providerExecuted,
                     ...part.callProviderMetadata != null ? { providerOptions: part.callProviderMetadata } : {}
                   });
@@ -6347,7 +6370,7 @@ function convertToModelMessages(messages, options) {
               content
             });
             const toolParts = block.filter(
-              (part) => isToolUIPart(part) && part.providerExecuted !== true || part.type === "dynamic-tool"
+              (part) => isToolOrDynamicToolUIPart(part) && part.providerExecuted !== true
             );
             if (toolParts.length > 0) {
               modelMessages.push({
@@ -10642,6 +10665,7 @@ var uiMessagesSchema = (0, import_provider_utils35.lazySchema)(
               toolCallId: import_v410.z.string(),
               state: import_v410.z.literal("input-streaming"),
               input: import_v410.z.unknown().optional(),
+              providerExecuted: import_v410.z.boolean().optional(),
               output: import_v410.z.never().optional(),
               errorText: import_v410.z.never().optional(),
               approval: import_v410.z.never().optional()
@@ -10652,6 +10676,7 @@ var uiMessagesSchema = (0, import_provider_utils35.lazySchema)(
               toolCallId: import_v410.z.string(),
               state: import_v410.z.literal("input-available"),
               input: import_v410.z.unknown(),
+              providerExecuted: import_v410.z.boolean().optional(),
               output: import_v410.z.never().optional(),
               errorText: import_v410.z.never().optional(),
               callProviderMetadata: providerMetadataSchema.optional(),
@@ -10663,6 +10688,7 @@ var uiMessagesSchema = (0, import_provider_utils35.lazySchema)(
               toolCallId: import_v410.z.string(),
               state: import_v410.z.literal("approval-requested"),
               input: import_v410.z.unknown(),
+              providerExecuted: import_v410.z.boolean().optional(),
               output: import_v410.z.never().optional(),
               errorText: import_v410.z.never().optional(),
               callProviderMetadata: providerMetadataSchema.optional(),
@@ -10678,6 +10704,7 @@ var uiMessagesSchema = (0, import_provider_utils35.lazySchema)(
               toolCallId: import_v410.z.string(),
               state: import_v410.z.literal("approval-responded"),
               input: import_v410.z.unknown(),
+              providerExecuted: import_v410.z.boolean().optional(),
               output: import_v410.z.never().optional(),
               errorText: import_v410.z.never().optional(),
               callProviderMetadata: providerMetadataSchema.optional(),
@@ -10693,6 +10720,7 @@ var uiMessagesSchema = (0, import_provider_utils35.lazySchema)(
               toolCallId: import_v410.z.string(),
               state: import_v410.z.literal("output-available"),
               input: import_v410.z.unknown(),
+              providerExecuted: import_v410.z.boolean().optional(),
               output: import_v410.z.unknown(),
               errorText: import_v410.z.never().optional(),
               callProviderMetadata: providerMetadataSchema.optional(),
@@ -10709,6 +10737,7 @@ var uiMessagesSchema = (0, import_provider_utils35.lazySchema)(
               toolCallId: import_v410.z.string(),
               state: import_v410.z.literal("output-error"),
               input: import_v410.z.unknown(),
+              providerExecuted: import_v410.z.boolean().optional(),
               output: import_v410.z.never().optional(),
               errorText: import_v410.z.string(),
               callProviderMetadata: providerMetadataSchema.optional(),
@@ -10724,6 +10753,7 @@ var uiMessagesSchema = (0, import_provider_utils35.lazySchema)(
               toolCallId: import_v410.z.string(),
               state: import_v410.z.literal("output-denied"),
               input: import_v410.z.unknown(),
+              providerExecuted: import_v410.z.boolean().optional(),
               output: import_v410.z.never().optional(),
               errorText: import_v410.z.never().optional(),
               callProviderMetadata: providerMetadataSchema.optional(),
@@ -11104,6 +11134,7 @@ function readUIMessageStream({
   JSONParseError,
   JsonToSseTransformStream,
   LoadAPIKeyError,
+  LoadSettingError,
   MCPClientError,
   MessageConversionError,
   NoContentGeneratedError,