ai 5.0.0-alpha.13 → 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,
@@ -160,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) {
@@ -328,7 +326,7 @@ var symbol10 = Symbol.for(marker10);
 var _a10;
 var ToolExecutionError = class extends import_provider10.AISDKError {
   constructor({
-    toolArgs,
+    toolInput,
     toolName,
     toolCallId,
     cause,
@@ -336,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;
   }
@@ -550,25 +548,25 @@ var uiMessageStreamPartSchema = import_zod.z.union([
     errorText: import_zod.z.string()
   }),
   import_zod.z.strictObject({
-    type: import_zod.z.literal("tool-call-streaming-start"),
+    type: import_zod.z.literal("tool-input-start"),
     toolCallId: import_zod.z.string(),
     toolName: import_zod.z.string()
   }),
   import_zod.z.strictObject({
-    type: import_zod.z.literal("tool-call-delta"),
+    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.strictObject({
-    type: import_zod.z.literal("tool-call"),
+    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.strictObject({
-    type: import_zod.z.literal("tool-result"),
+    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.strictObject({
@@ -1355,15 +1353,15 @@ function processUIMessageStream({
             );
             if (part2 != null) {
               part2.state = options.state;
-              part2.args = options.args;
-              part2.result = options.result;
+              part2.input = options.input;
+              part2.output = options.output;
             } else {
               state.message.parts.push({
                 type: `tool-${options.toolName}`,
                 toolCallId: options.toolCallId,
                 state: options.state,
-                args: options.args,
-                result: options.result
+                input: options.input,
+                output: options.output
               });
             }
           }
@@ -1446,7 +1444,7 @@ function processUIMessageStream({
               write();
               break;
             }
-            case "tool-call-streaming-start": {
+            case "tool-input-start": {
               const toolInvocations = state.message.parts.filter(isToolUIPart);
               state.partialToolCalls[part.toolCallId] = {
                 text: "",
@@ -1456,33 +1454,33 @@ function processUIMessageStream({
               updateToolInvocationPart({
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                state: "partial-call",
-                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({
                 toolCallId: part.toolCallId,
                 toolName: partialToolCall.toolName,
-                state: "partial-call",
-                args: partialArgs
+                state: "input-streaming",
+                input: partialArgs
               });
               write();
               break;
             }
-            case "tool-call": {
+            case "tool-input-available": {
               updateToolInvocationPart({
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                state: "call",
-                args: part.args
+                state: "input-available",
+                input: part.input
               });
               write();
               if (onToolCall) {
@@ -1493,16 +1491,16 @@ function processUIMessageStream({
                   updateToolInvocationPart({
                     toolCallId: part.toolCallId,
                     toolName: part.toolName,
-                    state: "result",
-                    args: part.args,
-                    result
+                    state: "output-available",
+                    input: part.input,
+                    output: result
                   });
                   write();
                 }
               }
               break;
             }
-            case "tool-result": {
+            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");
@@ -1521,9 +1519,9 @@ function processUIMessageStream({
               updateToolInvocationPart({
                 toolCallId: part.toolCallId,
                 toolName,
-                state: "result",
-                args: toolInvocations[toolInvocationIndex].args,
-                result: part.result
+                state: "output-available",
+                input: toolInvocations[toolInvocationIndex].input,
+                output: part.output
               });
               write();
               break;
@@ -1619,7 +1617,7 @@ function isAssistantMessageWithCompletedToolCalls(message) {
     return part.type === "step-start" ? index : lastIndex;
   }, -1);
   const lastStepToolInvocations = message.parts.slice(lastStepStartIndex + 1).filter(isToolUIPart);
-  return lastStepToolInvocations.length > 0 && lastStepToolInvocations.every((part) => part.state === "result");
+  return lastStepToolInvocations.length > 0 && lastStepToolInvocations.every((part) => part.state === "output-available");
 }
 
 // src/ui/chat.ts
@@ -1693,13 +1691,13 @@ var AbstractChat = class {
     };
     this.addToolResult = async ({
       toolCallId,
-      result
+      output
     }) => {
       this.jobExecutor.run(async () => {
-        updateToolResult({
+        updateToolOutput({
           messages: this.state.messages,
           toolCallId,
-          toolResult: result
+          output
         });
         this.messages = this.state.messages;
         if (this.status === "submitted" || this.status === "streaming") {
@@ -1859,10 +1857,10 @@ var AbstractChat = class {
     }
   }
 };
-function updateToolResult({
+function updateToolOutput({
   messages,
   toolCallId,
-  toolResult: result
+  output
 }) {
   const lastMessage = messages[messages.length - 1];
   const toolPart = lastMessage.parts.find(
@@ -1871,8 +1869,8 @@ function updateToolResult({
   if (toolPart == null) {
     return;
   }
-  toolPart.state = "result";
-  toolPart.result = result;
+  toolPart.state = "output-available";
+  toolPart.output = output;
 }
 
 // src/ui/convert-to-model-messages.ts
@@ -1929,17 +1927,17 @@ function convertToModelMessages(messages, options) {
                 });
               } else if (isToolUIPart(part)) {
                 const toolName = getToolName(part);
-                if (part.state === "partial-call") {
+                if (part.state === "input-streaming") {
                   throw new MessageConversionError({
                     originalMessage: message,
-                    message: `Partial tool call is not supported: ${part.toolCallId}`
+                    message: `incomplete tool input is not supported: ${part.toolCallId}`
                   });
                 } else {
                   content.push({
                     type: "tool-call",
                     toolCallId: part.toolCallId,
                     toolName,
-                    args: part.args
+                    input: part.input
                   });
                 }
               } else {
@@ -1956,26 +1954,26 @@ function convertToModelMessages(messages, options) {
               modelMessages.push({
                 role: "tool",
                 content: toolParts.map((toolPart) => {
-                  if (toolPart.state !== "result") {
+                  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, result } = toolPart;
+                  const { toolCallId, output } = toolPart;
                   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)
+                    output: tool2.experimental_toToolResultContent(output),
+                    experimental_content: tool2.experimental_toToolResultContent(output)
                   } : {
                     type: "tool-result",
                     toolCallId,
                     toolName,
-                    result
+                    output
                   };
                 })
               });
@@ -3509,7 +3507,7 @@ function convertToLanguageModelMessage(message, downloadedAssets) {
                 type: "tool-call",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                args: part.args,
+                input: part.input,
                 providerOptions
               };
             }
@@ -3525,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
@@ -3812,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()
@@ -5412,11 +5410,18 @@ function prepareToolsAndToolChoice({
             type: "function",
             name: name17,
             description: tool2.description,
-            parameters: (0, import_provider_utils17.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
@@ -5496,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;
@@ -5504,9 +5509,9 @@ async function parseToolCall({
       repairedToolCall = await repairToolCall({
         toolCall,
         tools,
-        parameterSchema: ({ toolName }) => {
-          const { parameters } = tools[toolName];
-          return (0, import_provider_utils18.asSchema)(parameters).jsonSchema;
+        inputSchema: ({ toolName }) => {
+          const { inputSchema } = tools[toolName];
+          return (0, import_provider_utils18.asSchema)(inputSchema).jsonSchema;
         },
         system,
         messages,
@@ -5536,12 +5541,12 @@ async function doParseToolCall({
       availableTools: Object.keys(tools)
     });
   }
-  const schema = (0, import_provider_utils18.asSchema)(tool2.parameters);
-  const parseResult = toolCall.args.trim() === "" ? await (0, import_provider_utils18.safeValidateTypes)({ value: {}, schema }) : await (0, import_provider_utils18.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
     });
   }
@@ -5549,7 +5554,7 @@ async function doParseToolCall({
     type: "tool-call",
     toolCallId: toolCall.toolCallId,
     toolName,
-    args: parseResult == null ? void 0 : parseResult.value
+    input: parseResult.value
   };
 }
 
@@ -5652,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) {
@@ -5966,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
@@ -5990,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
@@ -6021,7 +6026,7 @@ async function executeTools({
             throw new ToolExecutionError({
               toolCallId,
               toolName,
-              toolArgs: args,
+              toolInput: input,
               cause: error
             });
           }
@@ -6031,8 +6036,8 @@ async function executeTools({
         type: "tool-result",
         toolCallId,
         toolName,
-        args,
-        result
+        input,
+        output: result
       };
     })
   );
@@ -6122,7 +6127,7 @@ function asToolCalls(content) {
     toolCallType: toolCall.toolCallType,
     toolCallId: toolCall.toolCallId,
     toolName: toolCall.toolName,
-    args: toolCall.args
+    input: toolCall.input
   }));
 }
 
@@ -6346,7 +6351,7 @@ function runToolsTransformation({
             type: "tool-call-delta",
             toolCallId: chunk.toolCallId,
             toolName: chunk.toolName,
-            argsTextDelta: chunk.argsTextDelta
+            inputTextDelta: chunk.inputTextDelta
           });
           break;
         }
@@ -6361,9 +6366,9 @@ 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
@@ -6383,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();
@@ -6407,8 +6412,8 @@ function runToolsTransformation({
                         selectTelemetryAttributes({
                           telemetry,
                           attributes: {
-                            "ai.toolCall.result": {
-                              output: () => JSON.stringify(result)
+                            "ai.toolCall.output": {
+                              output: () => JSON.stringify(output)
                             }
                           }
                         })
@@ -6422,7 +6427,7 @@ function runToolsTransformation({
                       error: new ToolExecutionError({
                         toolCallId: toolCall.toolCallId,
                         toolName: toolCall.toolName,
-                        toolArgs: toolCall.args,
+                        toolInput: toolCall.input,
                         cause: error
                       })
                     });
@@ -7074,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
@@ -7086,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
@@ -7403,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
               });
@@ -7411,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;
             }
@@ -8437,15 +8442,14 @@ var MCPClient = class {
         if (schemas !== "automatic" && !(name17 in schemas)) {
           continue;
         }
-        const parameters = schemas === "automatic" ? (0, import_provider_utils25.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();
@@ -8578,7 +8582,7 @@ var DefaultTranscriptionResult = class {
   InvalidPromptError,
   InvalidResponseDataError,
   InvalidStreamPartError,
-  InvalidToolArgumentsError,
+  InvalidToolInputError,
   JSONParseError,
   JsonToSseTransformStream,
   LoadAPIKeyError,