ai 7.0.30 → 7.0.31

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # ai
 
+## 7.0.31
+
+### Patch Changes
+
+- 70f18c3: fix(ai): emit denied tool output state for client-rejected approvals
+- cd06458: fix(ai): call `onInputStart` before `onInputAvailable` during non-streaming tool calls
+- Updated dependencies [cd06458]
+  - @ai-sdk/provider-utils@5.0.11
+  - @ai-sdk/gateway@4.0.23
+
 ## 7.0.30
 
 ### Patch Changes

package/dist/index.js

@@ -1089,7 +1089,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.30" : "0.0.0-test";
+var VERSION = true ? "7.0.31" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2787,9 +2787,7 @@ function collectToolApprovals({
       }
     }
   }
-  const toolResults = /* @__PURE__ */ Object.create(
-    null
-  );
+  const toolResults = /* @__PURE__ */ Object.create(null);
   for (const part of lastMessage.content) {
     if (part.type === "tool-result") {
       toolResults[part.toolCallId] = part;
@@ -2807,7 +2805,8 @@ function collectToolApprovals({
         approvalId: approvalResponse.approvalId
       });
     }
-    if (toolResults[approvalRequest.toolCallId] != null) {
+    const existingToolResult = toolResults[approvalRequest.toolCallId];
+    if (existingToolResult != null && (approvalResponse.approved || existingToolResult.output.type !== "execution-denied")) {
       continue;
     }
     const toolCall = toolCallsByToolCallId[approvalRequest.toolCallId];
@@ -2820,7 +2819,8 @@ function collectToolApprovals({
     const approval = {
       approvalRequest,
       approvalResponse,
-      toolCall
+      toolCall,
+      ...existingToolResult != null ? { existingToolResult } : {}
     };
     if (approvalResponse.approved) {
       approvedToolApprovals.push(approval);
@@ -5136,7 +5136,10 @@ async function generateText({
         ...collectedDeniedToolApprovals,
         ...revalidationDeniedToolApprovals
       ];
-      if (deniedToolApprovals.length > 0 || localApprovedToolApprovals.length > 0) {
+      const deniedToolApprovalsWithoutResults = deniedToolApprovals.filter(
+        (toolApproval2) => toolApproval2.existingToolResult == null
+      );
+      if (deniedToolApprovalsWithoutResults.length > 0 || localApprovedToolApprovals.length > 0) {
         const toolResults2 = await executeTools({
           toolCalls: localApprovedToolApprovals.map(
             (toolApproval2) => toolApproval2.toolCall
@@ -5182,7 +5185,7 @@ async function generateText({
             output: modelOutput
           });
         }
-        for (const toolApproval2 of deniedToolApprovals) {
+        for (const toolApproval2 of deniedToolApprovalsWithoutResults) {
           toolContent.push({
             type: "tool-result",
             toolCallId: toolApproval2.toolCall.toolCallId,
@@ -5428,6 +5431,14 @@ async function generateText({
                 if (tool2 == null) {
                   continue;
                 }
+                if (tool2.onInputStart != null) {
+                  await tool2.onInputStart({
+                    toolCallId: toolCall.toolCallId,
+                    messages: stepMessages,
+                    abortSignal: mergedAbortSignal,
+                    context: runtimeContext
+                  });
+                }
                 if ((tool2 == null ? void 0 : tool2.onInputAvailable) != null) {
                   await tool2.onInputAvailable({
                     input: toolCall.input,
@@ -9088,6 +9099,9 @@ var DefaultStreamTextResult = class {
           ),
           ...revalidationDeniedToolApprovals
         ];
+        const localDeniedToolApprovalsWithoutResults = localDeniedToolApprovals.filter(
+          (toolApproval2) => toolApproval2.existingToolResult == null
+        );
         const deniedProviderExecutedToolApprovals = deniedToolApprovals.filter(
           (toolApproval2) => toolApproval2.toolCall.providerExecuted
         );
@@ -9141,7 +9155,7 @@ var DefaultStreamTextResult = class {
               }
             })
           );
-          if (toolOutputs.length > 0 || localDeniedToolApprovals.length > 0) {
+          if (toolOutputs.length > 0 || localDeniedToolApprovalsWithoutResults.length > 0) {
             const localToolContent = [];
             for (const output2 of toolOutputs) {
               localToolContent.push({
@@ -9157,7 +9171,7 @@ var DefaultStreamTextResult = class {
                 })
               });
             }
-            for (const toolApproval2 of localDeniedToolApprovals) {
+            for (const toolApproval2 of localDeniedToolApprovalsWithoutResults) {
               localToolContent.push({
                 type: "tool-result",
                 toolCallId: toolApproval2.toolCall.toolCallId,