ai 7.0.77 → 7.0.78

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # ai
 
+## 7.0.78
+
+### Patch Changes
+
+- 96970bb: Continue approved `generateText`, `streamText`, and `WorkflowAgent` turns with a model-visible tool error when revalidated tool input is invalid.
+- Updated dependencies [e12e068]
+  - @ai-sdk/gateway@4.0.63
+
 ## 7.0.77
 
 ### Patch Changes

package/dist/index.js

@@ -1143,7 +1143,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.77" : "0.0.0-test";
+var VERSION = true ? "7.0.78" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -5163,6 +5163,7 @@ async function validateApprovedToolApprovals({
   var _a23;
   const approved = [];
   const denied = [];
+  const invalid = [];
   for (const approval of approvedToolApprovals) {
     const { toolCall, approvalRequest } = approval;
     const tool2 = getOwn(tools, toolCall.toolName);
@@ -5196,11 +5197,15 @@ async function validateApprovedToolApprovals({
         schema: asSchema4(tool2.inputSchema)
       });
       if (!validation.success) {
-        throw new InvalidToolInputError({
-          toolName: toolCall.toolName,
-          toolInput: JSON.stringify(toolCall.input),
-          cause: validation.error
+        invalid.push({
+          ...approval,
+          error: new InvalidToolInputError({
+            toolName: toolCall.toolName,
+            toolInput: JSON.stringify(toolCall.input),
+            cause: validation.error
+          })
         });
+        continue;
       }
     }
     const approvalStatus = await resolveToolApproval({
@@ -5224,7 +5229,11 @@ async function validateApprovedToolApprovals({
       approved.push(approval);
     }
   }
-  return { approvedToolApprovals: approved, deniedToolApprovals: denied };
+  return {
+    approvedToolApprovals: approved,
+    deniedToolApprovals: denied,
+    invalidToolApprovals: invalid
+  };
 }
 
 // src/generate-text/generate-text.ts
@@ -5407,7 +5416,8 @@ async function generateText({
       } = collectToolApprovals({ messages: initialMessages });
       const {
         approvedToolApprovals: localApprovedToolApprovals,
-        deniedToolApprovals: revalidationDeniedToolApprovals
+        deniedToolApprovals: revalidationDeniedToolApprovals,
+        invalidToolApprovals
       } = await validateApprovedToolApprovals({
         approvedToolApprovals: approvedToolApprovals.filter(
           (toolApproval2) => !toolApproval2.toolCall.providerExecuted
@@ -5426,7 +5436,7 @@ async function generateText({
       const deniedToolApprovalsWithoutResults = deniedToolApprovals.filter(
         (toolApproval2) => toolApproval2.existingToolResult == null
       );
-      if (deniedToolApprovalsWithoutResults.length > 0 || localApprovedToolApprovals.length > 0) {
+      if (deniedToolApprovalsWithoutResults.length > 0 || localApprovedToolApprovals.length > 0 || invalidToolApprovals.length > 0) {
         const toolResults2 = await executeTools({
           toolCalls: localApprovedToolApprovals.map(
             (toolApproval2) => toolApproval2.toolCall
@@ -5472,6 +5482,20 @@ async function generateText({
             output: modelOutput
           });
         }
+        for (const toolApproval2 of invalidToolApprovals) {
+          toolContent.push({
+            type: "tool-result",
+            toolCallId: toolApproval2.toolCall.toolCallId,
+            toolName: toolApproval2.toolCall.toolName,
+            output: await createToolModelOutput({
+              toolCallId: toolApproval2.toolCall.toolCallId,
+              input: toolApproval2.toolCall.input,
+              tool: getOwn(tools, toolApproval2.toolCall.toolName),
+              output: toolApproval2.error,
+              errorMode: "text"
+            })
+          });
+        }
         for (const toolApproval2 of deniedToolApprovalsWithoutResults) {
           toolContent.push({
             type: "tool-result",
@@ -9533,7 +9557,8 @@ var DefaultStreamTextResult = class {
       if (deniedToolApprovals.length > 0 || approvedToolApprovals.length > 0) {
         const {
           approvedToolApprovals: localApprovedToolApprovals,
-          deniedToolApprovals: revalidationDeniedToolApprovals
+          deniedToolApprovals: revalidationDeniedToolApprovals,
+          invalidToolApprovals
         } = await validateApprovedToolApprovals({
           approvedToolApprovals: approvedToolApprovals.filter(
             (toolApproval2) => !toolApproval2.toolCall.providerExecuted
@@ -9575,6 +9600,18 @@ var DefaultStreamTextResult = class {
               toolName: toolApproval2.toolCall.toolName
             });
           }
+          for (const toolApproval2 of invalidToolApprovals) {
+            toolExecutionStepStreamController == null ? void 0 : toolExecutionStepStreamController.enqueue({
+              type: "tool-error",
+              toolCallId: toolApproval2.toolCall.toolCallId,
+              toolName: toolApproval2.toolCall.toolName,
+              input: toolApproval2.toolCall.input,
+              error: getErrorMessage6(toolApproval2.error),
+              title: toolApproval2.toolCall.title,
+              ...toolApproval2.toolCall.dynamic === true ? { dynamic: true } : {},
+              ...toolApproval2.toolCall.toolMetadata != null ? { toolMetadata: toolApproval2.toolCall.toolMetadata } : {}
+            });
+          }
           const toolOutputs = [];
           await Promise.all(
             localApprovedToolApprovals.map(async (toolApproval2) => {
@@ -9607,7 +9644,7 @@ var DefaultStreamTextResult = class {
               }
             })
           );
-          if (toolOutputs.length > 0 || localDeniedToolApprovalsWithoutResults.length > 0) {
+          if (toolOutputs.length > 0 || localDeniedToolApprovalsWithoutResults.length > 0 || invalidToolApprovals.length > 0) {
             const localToolContent = [];
             for (const output2 of toolOutputs) {
               localToolContent.push({
@@ -9623,6 +9660,20 @@ var DefaultStreamTextResult = class {
                 })
               });
             }
+            for (const toolApproval2 of invalidToolApprovals) {
+              localToolContent.push({
+                type: "tool-result",
+                toolCallId: toolApproval2.toolCall.toolCallId,
+                toolName: toolApproval2.toolCall.toolName,
+                output: await createToolModelOutput({
+                  toolCallId: toolApproval2.toolCall.toolCallId,
+                  input: toolApproval2.toolCall.input,
+                  tool: getOwn(tools, toolApproval2.toolCall.toolName),
+                  output: toolApproval2.error,
+                  errorMode: "text"
+                })
+              });
+            }
             for (const toolApproval2 of localDeniedToolApprovalsWithoutResults) {
               localToolContent.push({
                 type: "tool-result",