ai 7.0.30 → 7.0.31

package/docs/03-ai-sdk-core/15-tools-and-tool-calling.mdx

@@ -1043,7 +1043,7 @@ The following tool input lifecycle hooks are available:
 - **`onInputDelta`**: Called for each chunk of text as the input is streamed
 - **`onInputAvailable`**: Called when the complete input is available and validated
 
-`onInputStart` and `onInputDelta` are only called in streaming contexts (when using `streamText`). They are not called when using `generateText`.
+`onInputStart` is always called before `onInputAvailable`, including when using `generateText`. `onInputDelta` is only called in streaming contexts (when using `streamText`).
 
 ### Example
 

package/docs/07-reference/01-ai-sdk-core/20-tool.mdx

@@ -171,7 +171,7 @@ export const weatherTool = tool({
               isOptional: true,
               type: '(options: ToolExecutionOptions<CONTEXT>) => void | PromiseLike<void>',
               description:
-                'Optional function that is called when the argument streaming starts. Only called when the tool is used in a streaming context.',
+                'Optional function that is called when the model starts generating the tool input. In non-streaming contexts, it is called immediately before onInputAvailable.',
             },
             {
               name: 'onInputDelta',

package/docs/07-reference/01-ai-sdk-core/22-dynamic-tool.mdx

@@ -130,7 +130,7 @@ export const customTool = dynamicTool({
               isOptional: true,
               type: '(options: ToolExecutionOptions<Context>) => void | PromiseLike<void>',
               description:
-                'Optional function that is called when the argument streaming starts. Only called when the tool is used in a streaming context.'
+                'Optional function that is called when the model starts generating the tool input. In non-streaming contexts, it is called immediately before onInputAvailable.'
             },
             {
               name: 'onInputDelta',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "7.0.30",
+  "version": "7.0.31",
   "type": "module",
   "description": "AI SDK by Vercel - build apps like ChatGPT, Claude, Gemini, and more with a single interface for any model using the Vercel AI Gateway or go direct to OpenAI, Anthropic, Google, or any other model provider.",
   "license": "Apache-2.0",
@@ -42,9 +42,9 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/gateway": "4.0.22",
+    "@ai-sdk/gateway": "4.0.23",
     "@ai-sdk/provider": "4.0.3",
-    "@ai-sdk/provider-utils": "5.0.10"
+    "@ai-sdk/provider-utils": "5.0.11"
   },
   "devDependencies": {
     "@edge-runtime/vm": "^5.0.0",

package/src/generate-text/collect-tool-approvals.ts

@@ -2,17 +2,18 @@ import type {
   ModelMessage,
   ToolApprovalRequest,
   ToolApprovalResponse,
+  ToolResultPart,
   ToolSet,
 } from '@ai-sdk/provider-utils';
 import { InvalidToolApprovalError } from '../error/invalid-tool-approval-error';
 import { ToolCallNotFoundForApprovalError } from '../error/tool-call-not-found-for-approval-error';
 import type { TypedToolCall } from './tool-call';
-import type { TypedToolResult } from './tool-result';
 
 export type CollectedToolApprovals<TOOLS extends ToolSet> = {
   approvalRequest: ToolApprovalRequest;
   approvalResponse: ToolApprovalResponse;
   toolCall: TypedToolCall<TOOLS>;
+  existingToolResult?: ToolResultPart;
 };
 
 /**
@@ -75,12 +76,10 @@ export function collectToolApprovals<TOOLS extends ToolSet>({
   }
 
   // gather tool results from the last tool message
-  const toolResults: Record<string, TypedToolResult<TOOLS>> = Object.create(
-    null,
-  );
+  const toolResults: Record<string, ToolResultPart> = Object.create(null);
   for (const part of lastMessage.content) {
     if (part.type === 'tool-result') {
-      toolResults[part.toolCallId] = part as TypedToolResult<TOOLS>;
+      toolResults[part.toolCallId] = part;
     }
   }
 
@@ -100,7 +99,12 @@ export function collectToolApprovals<TOOLS extends ToolSet>({
       });
     }
 
-    if (toolResults[approvalRequest.toolCallId] != null) {
+    const existingToolResult = toolResults[approvalRequest.toolCallId];
+    if (
+      existingToolResult != null &&
+      (approvalResponse.approved ||
+        existingToolResult.output.type !== 'execution-denied')
+    ) {
       continue;
     }
 
@@ -116,6 +120,7 @@ export function collectToolApprovals<TOOLS extends ToolSet>({
       approvalRequest,
       approvalResponse,
       toolCall,
+      ...(existingToolResult != null ? { existingToolResult } : {}),
     };
 
     if (approvalResponse.approved) {

package/src/generate-text/generate-text.ts

@@ -682,9 +682,12 @@ export async function generateText<
         ...collectedDeniedToolApprovals,
         ...revalidationDeniedToolApprovals,
       ];
+      const deniedToolApprovalsWithoutResults = deniedToolApprovals.filter(
+        toolApproval => toolApproval.existingToolResult == null,
+      );
 
       if (
-        deniedToolApprovals.length > 0 ||
+        deniedToolApprovalsWithoutResults.length > 0 ||
         localApprovedToolApprovals.length > 0
       ) {
         const toolResults = await executeTools({
@@ -741,7 +744,7 @@ export async function generateText<
         }
 
         // add execution denied tool results for all denied tool approvals:
-        for (const toolApproval of deniedToolApprovals) {
+        for (const toolApproval of deniedToolApprovalsWithoutResults) {
           toolContent.push({
             type: 'tool-result' as const,
             toolCallId: toolApproval.toolCall.toolCallId,
@@ -1057,6 +1060,15 @@ export async function generateText<
                   continue;
                 }
 
+                if (tool.onInputStart != null) {
+                  await tool.onInputStart({
+                    toolCallId: toolCall.toolCallId,
+                    messages: stepMessages,
+                    abortSignal: mergedAbortSignal,
+                    context: runtimeContext,
+                  });
+                }
+
                 if (tool?.onInputAvailable != null) {
                   await tool.onInputAvailable({
                     input: toolCall.input,

package/src/generate-text/stream-text.ts

@@ -1637,6 +1637,10 @@ class DefaultStreamTextResult<
           ),
           ...revalidationDeniedToolApprovals,
         ];
+        const localDeniedToolApprovalsWithoutResults =
+          localDeniedToolApprovals.filter(
+            toolApproval => toolApproval.existingToolResult == null,
+          );
 
         const deniedProviderExecutedToolApprovals = deniedToolApprovals.filter(
           toolApproval => toolApproval.toolCall.providerExecuted,
@@ -1703,7 +1707,10 @@ class DefaultStreamTextResult<
           );
 
           // Local tool results (approved + denied) are sent as tool results:
-          if (toolOutputs.length > 0 || localDeniedToolApprovals.length > 0) {
+          if (
+            toolOutputs.length > 0 ||
+            localDeniedToolApprovalsWithoutResults.length > 0
+          ) {
             const localToolContent: ToolContent = [];
 
             // add regular tool results for approved tool calls:
@@ -1726,7 +1733,7 @@ class DefaultStreamTextResult<
             }
 
             // add execution denied tool results for denied local tool approvals:
-            for (const toolApproval of localDeniedToolApprovals) {
+            for (const toolApproval of localDeniedToolApprovalsWithoutResults) {
               localToolContent.push({
                 type: 'tool-result' as const,
                 toolCallId: toolApproval.toolCall.toolCallId,