ai 7.0.4 → 7.0.6

package/dist/internal/index.js

@@ -83,7 +83,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.4" : "0.0.0-test";
+var VERSION = true ? "7.0.6" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "7.0.4",
+  "version": "7.0.6",
   "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.4",
-    "@ai-sdk/provider": "4.0.0",
-    "@ai-sdk/provider-utils": "5.0.1"
+    "@ai-sdk/gateway": "4.0.5",
+    "@ai-sdk/provider-utils": "5.0.1",
+    "@ai-sdk/provider": "4.0.0"
   },
   "devDependencies": {
     "@edge-runtime/vm": "^5.0.0",

package/src/agent/agent.ts

@@ -106,11 +106,25 @@ export type AgentCallParameters<
      */
     onToolExecutionStart?: OnToolExecutionStartCallback<TOOLS>;
 
+    /**
+     * Callback that is called before each tool execution begins.
+     *
+     * @deprecated Use `onToolExecutionStart` instead.
+     */
+    experimental_onToolCallStart?: OnToolExecutionStartCallback<TOOLS>;
+
     /**
      * Callback that is called after each tool execution completes.
      */
     onToolExecutionEnd?: OnToolExecutionEndCallback<TOOLS>;
 
+    /**
+     * Callback that is called after each tool execution completes.
+     *
+     * @deprecated Use `onToolExecutionEnd` instead.
+     */
+    experimental_onToolCallFinish?: OnToolExecutionEndCallback<TOOLS>;
+
     /**
      * Callback that is called when each step (LLM call) ends, including intermediate steps.
      */

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

@@ -100,6 +100,44 @@ export function pruneMessages({
       }
     }
 
+    // Build global maps from tool call id and approval id to tool name.
+    // These must be global (not per-message) because a `tool-approval-response`
+    // lives in a separate `tool` message from its `tool-approval-request`
+    // (assistant message), so the tool name of a response can only be resolved
+    // by looking across messages. Resolving names per-message left responses
+    // unresolved, which caused them to be kept while their request was pruned,
+    // producing orphaned approval responses.
+    const toolCallIdToToolName = new Map<string, string>();
+    for (const message of messages) {
+      if (
+        (message.role === 'assistant' || message.role === 'tool') &&
+        typeof message.content !== 'string'
+      ) {
+        for (const part of message.content) {
+          if (part.type === 'tool-call' || part.type === 'tool-result') {
+            toolCallIdToToolName.set(part.toolCallId, part.toolName);
+          }
+        }
+      }
+    }
+
+    const approvalIdToToolName = new Map<string, string>();
+    for (const message of messages) {
+      if (
+        (message.role === 'assistant' || message.role === 'tool') &&
+        typeof message.content !== 'string'
+      ) {
+        for (const part of message.content) {
+          if (part.type === 'tool-approval-request') {
+            const toolName = toolCallIdToToolName.get(part.toolCallId);
+            if (toolName != null) {
+              approvalIdToToolName.set(part.approvalId, toolName);
+            }
+          }
+        }
+      }
+    }
+
     messages = messages.map((message, messageIndex) => {
       if (
         (message.role !== 'assistant' && message.role !== 'tool') ||
@@ -110,9 +148,6 @@ export function pruneMessages({
         return message;
       }
 
-      const toolCallIdToToolName: Record<string, string> = {};
-      const approvalIdToToolName: Record<string, string> = {};
-
       return {
         ...message,
         content: message.content.filter(part => {
@@ -126,14 +161,6 @@ export function pruneMessages({
             return true;
           }
 
-          // track tool calls and approvals:
-          if (part.type === 'tool-call') {
-            toolCallIdToToolName[part.toolCallId] = part.toolName;
-          } else if (part.type === 'tool-approval-request') {
-            approvalIdToToolName[part.approvalId] =
-              toolCallIdToToolName[part.toolCallId];
-          }
-
           // keep parts that are associated with a tool call or approval that needs to be kept:
           if (
             ((part.type === 'tool-call' || part.type === 'tool-result') &&
@@ -146,13 +173,15 @@ export function pruneMessages({
           }
 
           // keep parts that are not associated with a tool that should be removed:
+          const partToolName =
+            part.type === 'tool-call' || part.type === 'tool-result'
+              ? part.toolName
+              : approvalIdToToolName.get(part.approvalId);
+
           return (
             toolCall.tools != null &&
-            !toolCall.tools.includes(
-              part.type === 'tool-call' || part.type === 'tool-result'
-                ? part.toolName
-                : approvalIdToToolName[part.approvalId],
-            )
+            partToolName != null &&
+            !toolCall.tools.includes(partToolName)
           );
         }),
       } as AssistantModelMessage | ToolModelMessage;