ai 5.0.6 → 5.0.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ai
 
+## 5.0.7
+
+### Patch Changes
+
+- 8e72304: fix (ai): handle invalid tool calls
+
 ## 5.0.6
 
 ### Patch Changes

package/dist/index.d.mts

@@ -428,6 +428,8 @@ type StaticToolCall<TOOLS extends ToolSet> = ValueOf<{
         input: TOOLS[NAME] extends Tool<infer PARAMETERS> ? PARAMETERS : never;
         providerExecuted?: boolean;
         dynamic?: false | undefined;
+        invalid?: false | undefined;
+        error?: never;
         providerMetadata?: ProviderMetadata;
     };
 }>;
@@ -439,6 +441,15 @@ type DynamicToolCall = {
     providerExecuted?: boolean;
     dynamic: true;
     providerMetadata?: ProviderMetadata;
+    /**
+     * True if this is caused by an unparsable tool call or
+     * a tool that does not exist.
+     */
+    invalid?: boolean;
+    /**
+     * The error that caused the tool call to be invalid.
+     */
+    error?: unknown;
 };
 type TypedToolCall<TOOLS extends ToolSet> = StaticToolCall<TOOLS> | DynamicToolCall;
 
@@ -1450,7 +1461,8 @@ type ToolUIPart<TOOLS extends UITools = UITools> = ValueOf<{
         callProviderMetadata?: ProviderMetadata;
     } | {
         state: 'output-error';
-        input: TOOLS[NAME]['input'];
+        input: TOOLS[NAME]['input'] | undefined;
+        rawInput?: unknown;
         output?: never;
         errorText: string;
         providerExecuted?: boolean;
@@ -1545,6 +1557,15 @@ type UIMessageChunk<METADATA = unknown, DATA_TYPES extends UIDataTypes = UIDataT
     providerExecuted?: boolean;
     providerMetadata?: ProviderMetadata;
     dynamic?: boolean;
+} | {
+    type: 'tool-input-error';
+    toolCallId: string;
+    toolName: string;
+    input: unknown;
+    providerExecuted?: boolean;
+    providerMetadata?: ProviderMetadata;
+    dynamic?: boolean;
+    errorText: string;
 } | {
     type: 'tool-output-available';
     toolCallId: string;

package/dist/index.d.ts

@@ -428,6 +428,8 @@ type StaticToolCall<TOOLS extends ToolSet> = ValueOf<{
         input: TOOLS[NAME] extends Tool<infer PARAMETERS> ? PARAMETERS : never;
         providerExecuted?: boolean;
         dynamic?: false | undefined;
+        invalid?: false | undefined;
+        error?: never;
         providerMetadata?: ProviderMetadata;
     };
 }>;
@@ -439,6 +441,15 @@ type DynamicToolCall = {
     providerExecuted?: boolean;
     dynamic: true;
     providerMetadata?: ProviderMetadata;
+    /**
+     * True if this is caused by an unparsable tool call or
+     * a tool that does not exist.
+     */
+    invalid?: boolean;
+    /**
+     * The error that caused the tool call to be invalid.
+     */
+    error?: unknown;
 };
 type TypedToolCall<TOOLS extends ToolSet> = StaticToolCall<TOOLS> | DynamicToolCall;
 
@@ -1450,7 +1461,8 @@ type ToolUIPart<TOOLS extends UITools = UITools> = ValueOf<{
         callProviderMetadata?: ProviderMetadata;
     } | {
         state: 'output-error';
-        input: TOOLS[NAME]['input'];
+        input: TOOLS[NAME]['input'] | undefined;
+        rawInput?: unknown;
         output?: never;
         errorText: string;
         providerExecuted?: boolean;
@@ -1545,6 +1557,15 @@ type UIMessageChunk<METADATA = unknown, DATA_TYPES extends UIDataTypes = UIDataT
     providerExecuted?: boolean;
     providerMetadata?: ProviderMetadata;
     dynamic?: boolean;
+} | {
+    type: 'tool-input-error';
+    toolCallId: string;
+    toolName: string;
+    input: unknown;
+    providerExecuted?: boolean;
+    providerMetadata?: ProviderMetadata;
+    dynamic?: boolean;
+    errorText: string;
 } | {
     type: 'tool-output-available';
     toolCallId: string;

package/dist/index.js

@@ -1765,38 +1765,50 @@ async function parseToolCall({
   system,
   messages
 }) {
-  if (tools == null) {
-    throw new NoSuchToolError({ toolName: toolCall.toolName });
-  }
   try {
-    return await doParseToolCall({ toolCall, tools });
-  } catch (error) {
-    if (repairToolCall == null || !(NoSuchToolError.isInstance(error) || InvalidToolInputError.isInstance(error))) {
-      throw error;
+    if (tools == null) {
+      throw new NoSuchToolError({ toolName: toolCall.toolName });
     }
-    let repairedToolCall = null;
     try {
-      repairedToolCall = await repairToolCall({
-        toolCall,
-        tools,
-        inputSchema: ({ toolName }) => {
-          const { inputSchema } = tools[toolName];
-          return (0, import_provider_utils8.asSchema)(inputSchema).jsonSchema;
-        },
-        system,
-        messages,
-        error
-      });
-    } catch (repairError) {
-      throw new ToolCallRepairError({
-        cause: repairError,
-        originalError: error
-      });
-    }
-    if (repairedToolCall == null) {
-      throw error;
+      return await doParseToolCall({ toolCall, tools });
+    } catch (error) {
+      if (repairToolCall == null || !(NoSuchToolError.isInstance(error) || InvalidToolInputError.isInstance(error))) {
+        throw error;
+      }
+      let repairedToolCall = null;
+      try {
+        repairedToolCall = await repairToolCall({
+          toolCall,
+          tools,
+          inputSchema: ({ toolName }) => {
+            const { inputSchema } = tools[toolName];
+            return (0, import_provider_utils8.asSchema)(inputSchema).jsonSchema;
+          },
+          system,
+          messages,
+          error
+        });
+      } catch (repairError) {
+        throw new ToolCallRepairError({
+          cause: repairError,
+          originalError: error
+        });
+      }
+      if (repairedToolCall == null) {
+        throw error;
+      }
+      return await doParseToolCall({ toolCall: repairedToolCall, tools });
     }
-    return await doParseToolCall({ toolCall: repairedToolCall, tools });
+  } catch (error) {
+    return {
+      type: "tool-call",
+      toolCallId: toolCall.toolCallId,
+      toolName: toolCall.toolName,
+      input: toolCall.input,
+      dynamic: true,
+      invalid: true,
+      error
+    };
   }
 }
 async function doParseToolCall({
@@ -2246,6 +2258,9 @@ async function generateText({
             )
           );
           for (const toolCall of stepToolCalls) {
+            if (toolCall.invalid) {
+              continue;
+            }
             const tool3 = tools[toolCall.toolName];
             if ((tool3 == null ? void 0 : tool3.onInputAvailable) != null) {
               await tool3.onInputAvailable({
@@ -2257,18 +2272,38 @@ async function generateText({
               });
             }
           }
+          const invalidToolCalls = stepToolCalls.filter(
+            (toolCall) => toolCall.invalid && toolCall.dynamic
+          );
+          clientToolOutputs = [];
+          for (const toolCall of invalidToolCalls) {
+            clientToolOutputs.push({
+              type: "tool-error",
+              toolCallId: toolCall.toolCallId,
+              toolName: toolCall.toolName,
+              input: toolCall.input,
+              error: (0, import_provider_utils9.getErrorMessage)(toolCall.error),
+              dynamic: true
+            });
+          }
           clientToolCalls = stepToolCalls.filter(
-            (toolCall) => toolCall.providerExecuted !== true
+            (toolCall) => !toolCall.providerExecuted
           );
-          clientToolOutputs = tools == null ? [] : await executeTools({
-            toolCalls: clientToolCalls,
-            tools,
-            tracer,
-            telemetry,
-            messages: stepInputMessages,
-            abortSignal,
-            experimental_context
-          });
+          if (tools != null) {
+            clientToolOutputs.push(
+              ...await executeTools({
+                toolCalls: clientToolCalls.filter(
+                  (toolCall) => !toolCall.invalid
+                ),
+                tools,
+                tracer,
+                telemetry,
+                messages: stepInputMessages,
+                abortSignal,
+                experimental_context
+              })
+            );
+          }
           const stepContent = asContent({
             content: currentModelResponse.content,
             toolCalls: stepToolCalls,
@@ -2760,6 +2795,16 @@ var uiMessageChunkSchema = import_v47.z.union([
     providerMetadata: providerMetadataSchema.optional(),
     dynamic: import_v47.z.boolean().optional()
   }),
+  import_v47.z.strictObject({
+    type: import_v47.z.literal("tool-input-error"),
+    toolCallId: import_v47.z.string(),
+    toolName: import_v47.z.string(),
+    input: import_v47.z.unknown(),
+    providerExecuted: import_v47.z.boolean().optional(),
+    providerMetadata: providerMetadataSchema.optional(),
+    dynamic: import_v47.z.boolean().optional(),
+    errorText: import_v47.z.string()
+  }),
   import_v47.z.strictObject({
     type: import_v47.z.literal("tool-output-available"),
     toolCallId: import_v47.z.string(),
@@ -3299,6 +3344,7 @@ function processUIMessageStream({
               anyPart.input = anyOptions.input;
               anyPart.output = anyOptions.output;
               anyPart.errorText = anyOptions.errorText;
+              anyPart.rawInput = anyOptions.rawInput;
               anyPart.providerExecuted = (_a17 = anyOptions.providerExecuted) != null ? _a17 : part.providerExecuted;
               if (anyOptions.providerMetadata != null && part.state === "input-available") {
                 part.callProviderMetadata = anyOptions.providerMetadata;
@@ -3310,6 +3356,7 @@ function processUIMessageStream({
                 state: options.state,
                 input: anyOptions.input,
                 output: anyOptions.output,
+                rawInput: anyOptions.rawInput,
                 errorText: anyOptions.errorText,
                 providerExecuted: anyOptions.providerExecuted,
                 ...anyOptions.providerMetadata != null ? { callProviderMetadata: anyOptions.providerMetadata } : {}
@@ -3317,6 +3364,7 @@ function processUIMessageStream({
             }
           }
           function updateDynamicToolPart(options) {
+            var _a17;
             const part = state.message.parts.find(
               (part2) => part2.type === "dynamic-tool" && part2.toolCallId === options.toolCallId
             );
@@ -3328,6 +3376,7 @@ function processUIMessageStream({
               anyPart.input = anyOptions.input;
               anyPart.output = anyOptions.output;
               anyPart.errorText = anyOptions.errorText;
+              anyPart.rawInput = (_a17 = anyOptions.rawInput) != null ? _a17 : anyPart.rawInput;
               if (anyOptions.providerMetadata != null && part.state === "input-available") {
                 part.callProviderMetadata = anyOptions.providerMetadata;
               }
@@ -3521,6 +3570,31 @@ function processUIMessageStream({
               }
               break;
             }
+            case "tool-input-error": {
+              if (chunk.dynamic) {
+                updateDynamicToolPart({
+                  toolCallId: chunk.toolCallId,
+                  toolName: chunk.toolName,
+                  state: "output-error",
+                  input: chunk.input,
+                  errorText: chunk.errorText,
+                  providerMetadata: chunk.providerMetadata
+                });
+              } else {
+                updateToolPart({
+                  toolCallId: chunk.toolCallId,
+                  toolName: chunk.toolName,
+                  state: "output-error",
+                  input: void 0,
+                  rawInput: chunk.input,
+                  errorText: chunk.errorText,
+                  providerExecuted: chunk.providerExecuted,
+                  providerMetadata: chunk.providerMetadata
+                });
+              }
+              write();
+              break;
+            }
             case "tool-output-available": {
               if (chunk.dynamic) {
                 const toolInvocation = getDynamicToolInvocation(
@@ -3566,6 +3640,7 @@ function processUIMessageStream({
                   toolName: getToolName(toolInvocation),
                   state: "output-error",
                   input: toolInvocation.input,
+                  rawInput: toolInvocation.rawInput,
                   errorText: chunk.errorText
                 });
               }
@@ -4015,6 +4090,17 @@ function runToolsTransformation({
               messages
             });
             controller.enqueue(toolCall);
+            if (toolCall.invalid) {
+              toolResultsStreamController.enqueue({
+                type: "tool-error",
+                toolCallId: toolCall.toolCallId,
+                toolName: toolCall.toolName,
+                input: toolCall.input,
+                error: (0, import_provider_utils12.getErrorMessage)(toolCall.error),
+                dynamic: true
+              });
+              break;
+            }
             const tool3 = tools[toolCall.toolName];
             toolInputs.set(toolCall.toolCallId, toolCall.input);
             if (tool3.onInputAvailable != null) {
@@ -4327,6 +4413,7 @@ var DefaultStreamTextResult = class {
     this._steps = new DelayedPromise();
     this.output = output;
     this.includeRawChunks = includeRawChunks;
+    this.tools = tools;
     let stepFinish;
     let recordedContent = [];
     const recordedResponseMessages = [];
@@ -5135,6 +5222,13 @@ var DefaultStreamTextResult = class {
       originalMessages,
       responseMessageId: generateMessageId
     }) : void 0;
+    const toolNamesByCallId = {};
+    const isDynamic = (toolCallId) => {
+      var _a16, _b;
+      const toolName = toolNamesByCallId[toolCallId];
+      const dynamic = ((_b = (_a16 = this.tools) == null ? void 0 : _a16[toolName]) == null ? void 0 : _b.type) === "dynamic";
+      return dynamic ? true : void 0;
+    };
     const baseStream = this.fullStream.pipeThrough(
       new TransformStream({
         transform: async (part, controller) => {
@@ -5224,12 +5318,14 @@ var DefaultStreamTextResult = class {
               break;
             }
             case "tool-input-start": {
+              toolNamesByCallId[part.id] = part.toolName;
+              const dynamic = isDynamic(part.id);
               controller.enqueue({
                 type: "tool-input-start",
                 toolCallId: part.id,
                 toolName: part.toolName,
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
-                ...part.dynamic != null ? { dynamic: part.dynamic } : {}
+                ...dynamic != null ? { dynamic } : {}
               });
               break;
             }
@@ -5242,34 +5338,51 @@ var DefaultStreamTextResult = class {
               break;
             }
             case "tool-call": {
-              controller.enqueue({
-                type: "tool-input-available",
-                toolCallId: part.toolCallId,
-                toolName: part.toolName,
-                input: part.input,
-                ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
-                ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
-                ...part.dynamic != null ? { dynamic: part.dynamic } : {}
-              });
+              toolNamesByCallId[part.toolCallId] = part.toolName;
+              const dynamic = isDynamic(part.toolCallId);
+              if (part.invalid) {
+                controller.enqueue({
+                  type: "tool-input-error",
+                  toolCallId: part.toolCallId,
+                  toolName: part.toolName,
+                  input: part.input,
+                  ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
+                  ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+                  ...dynamic != null ? { dynamic } : {},
+                  errorText: onError(part.error)
+                });
+              } else {
+                controller.enqueue({
+                  type: "tool-input-available",
+                  toolCallId: part.toolCallId,
+                  toolName: part.toolName,
+                  input: part.input,
+                  ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
+                  ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+                  ...dynamic != null ? { dynamic } : {}
+                });
+              }
               break;
             }
             case "tool-result": {
+              const dynamic = isDynamic(part.toolCallId);
               controller.enqueue({
                 type: "tool-output-available",
                 toolCallId: part.toolCallId,
                 output: part.output,
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
-                ...part.dynamic != null ? { dynamic: part.dynamic } : {}
+                ...dynamic != null ? { dynamic } : {}
               });
               break;
             }
             case "tool-error": {
+              const dynamic = isDynamic(part.toolCallId);
               controller.enqueue({
                 type: "tool-output-error",
                 toolCallId: part.toolCallId,
                 errorText: onError(part.error),
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
-                ...part.dynamic != null ? { dynamic: part.dynamic } : {}
+                ...dynamic != null ? { dynamic } : {}
               });
               break;
             }
@@ -9292,7 +9405,7 @@ function convertToModelMessages(messages, options) {
       case "assistant": {
         if (message.parts != null) {
           let processBlock2 = function() {
-            var _a16;
+            var _a16, _b;
             if (block.length === 0) {
               return;
             }
@@ -9344,7 +9457,7 @@ function convertToModelMessages(messages, options) {
                     type: "tool-call",
                     toolCallId: part.toolCallId,
                     toolName,
-                    input: part.input,
+                    input: part.state === "output-error" ? (_a16 = part.input) != null ? _a16 : part.rawInput : part.input,
                     providerExecuted: part.providerExecuted,
                     ...part.callProviderMetadata != null ? { providerOptions: part.callProviderMetadata } : {}
                   });
@@ -9355,7 +9468,7 @@ function convertToModelMessages(messages, options) {
                       toolName,
                       output: createToolModelOutput({
                         output: part.state === "output-error" ? part.errorText : part.output,
-                        tool: (_a16 = options == null ? void 0 : options.tools) == null ? void 0 : _a16[toolName],
+                        tool: (_b = options == null ? void 0 : options.tools) == null ? void 0 : _b[toolName],
                         errorMode: part.state === "output-error" ? "json" : "none"
                       })
                     });