ai 7.0.0-beta.78 → 7.0.0-beta.79

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ai
 
+## 7.0.0-beta.79
+
+### Patch Changes
+
+- 6866afe: fix(ai): fix `lastAssistantMessageIsCompleteWithApprovalResponses` to no longer ignore `providerExecuted` tool approvals
+
 ## 7.0.0-beta.78
 
 ### Patch Changes

package/dist/index.d.mts

@@ -958,6 +958,11 @@ type DownloadFunction = (options: Array<{
     mediaType: string | undefined;
 } | null>>;
 
+/**
+ * A callback function that can be used to notify listeners.
+ */
+type Listener<EVENT> = (event: EVENT) => PromiseLike<void> | void;
+
 /**
  * Function that you can use to provide different settings for a step.
  *
@@ -1119,7 +1124,7 @@ type GenerateTextIncludeSettings = {
  *
  * @param event - The event object containing generation configuration.
  */
-type GenerateTextOnStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>, OUTPUT extends Output = Output> = (event: OnStartEvent<TOOLS, CONTEXT, OUTPUT, GenerateTextIncludeSettings>) => PromiseLike<void> | void;
+type GenerateTextOnStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>, OUTPUT extends Output = Output> = Listener<OnStartEvent<TOOLS, CONTEXT, OUTPUT, GenerateTextIncludeSettings>>;
 /**
  * Callback that is set using the `experimental_onStepStart` option.
  *
@@ -1129,7 +1134,7 @@ type GenerateTextOnStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extend
  *
  * @param event - The event object containing step configuration.
  */
-type GenerateTextOnStepStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>, OUTPUT extends Output = Output> = (event: OnStepStartEvent<TOOLS, CONTEXT, OUTPUT, GenerateTextIncludeSettings>) => PromiseLike<void> | void;
+type GenerateTextOnStepStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>, OUTPUT extends Output = Output> = Listener<OnStepStartEvent<TOOLS, CONTEXT, OUTPUT, GenerateTextIncludeSettings>>;
 /**
  * Callback that is set using the `experimental_onToolCallStart` option.
  *
@@ -1138,7 +1143,7 @@ type GenerateTextOnStepStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT ex
  *
  * @param event - The event object containing tool call information.
  */
-type GenerateTextOnToolCallStartCallback<TOOLS extends ToolSet = ToolSet> = (event: OnToolCallStartEvent<TOOLS>) => PromiseLike<void> | void;
+type GenerateTextOnToolCallStartCallback<TOOLS extends ToolSet = ToolSet> = Listener<OnToolCallStartEvent<TOOLS>>;
 /**
  * Callback that is set using the `experimental_onToolCallFinish` option.
  *
@@ -1151,7 +1156,7 @@ type GenerateTextOnToolCallStartCallback<TOOLS extends ToolSet = ToolSet> = (eve
  *
  * @param event - The event object containing tool call result information.
  */
-type GenerateTextOnToolCallFinishCallback<TOOLS extends ToolSet = ToolSet> = (event: OnToolCallFinishEvent<TOOLS>) => PromiseLike<void> | void;
+type GenerateTextOnToolCallFinishCallback<TOOLS extends ToolSet = ToolSet> = Listener<OnToolCallFinishEvent<TOOLS>>;
 /**
  * Callback that is set using the `onStepFinish` option.
  *
@@ -1160,7 +1165,7 @@ type GenerateTextOnToolCallFinishCallback<TOOLS extends ToolSet = ToolSet> = (ev
  *
  * @param stepResult - The result of the step.
  */
-type GenerateTextOnStepFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>> = (event: OnStepFinishEvent<TOOLS, CONTEXT>) => Promise<void> | void;
+type GenerateTextOnStepFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>> = Listener<OnStepFinishEvent<TOOLS, CONTEXT>>;
 /**
  * Callback that is set using the `onFinish` option.
  *
@@ -1170,7 +1175,7 @@ type GenerateTextOnStepFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT e
  *
  * @param event - The final result along with aggregated step data.
  */
-type GenerateTextOnFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>> = (event: OnFinishEvent<TOOLS, CONTEXT>) => PromiseLike<void> | void;
+type GenerateTextOnFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>> = Listener<OnFinishEvent<TOOLS, CONTEXT>>;
 /**
  * Generate a text and call tools for a given prompt using a language model.
  *
@@ -3426,11 +3431,6 @@ interface RerankFinishEvent {
     }>;
 }
 
-/**
- * A callback function that can be used to notify listeners.
- */
-type Listener<EVENT> = (event: EVENT) => PromiseLike<void> | void;
-
 /**
  * Implement this interface to create custom telemetry integrations.
  * Methods can be sync or return a PromiseLike.
@@ -4415,7 +4415,6 @@ declare class ToolLoopAgent<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, CO
      */
     get tools(): TOOLS;
     private prepareCall;
-    private mergeCallbacks;
     /**
      * Generates an output from the agent (non-streaming).
      */

package/dist/index.d.ts

@@ -958,6 +958,11 @@ type DownloadFunction = (options: Array<{
     mediaType: string | undefined;
 } | null>>;
 
+/**
+ * A callback function that can be used to notify listeners.
+ */
+type Listener<EVENT> = (event: EVENT) => PromiseLike<void> | void;
+
 /**
  * Function that you can use to provide different settings for a step.
  *
@@ -1119,7 +1124,7 @@ type GenerateTextIncludeSettings = {
  *
  * @param event - The event object containing generation configuration.
  */
-type GenerateTextOnStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>, OUTPUT extends Output = Output> = (event: OnStartEvent<TOOLS, CONTEXT, OUTPUT, GenerateTextIncludeSettings>) => PromiseLike<void> | void;
+type GenerateTextOnStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>, OUTPUT extends Output = Output> = Listener<OnStartEvent<TOOLS, CONTEXT, OUTPUT, GenerateTextIncludeSettings>>;
 /**
  * Callback that is set using the `experimental_onStepStart` option.
  *
@@ -1129,7 +1134,7 @@ type GenerateTextOnStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extend
  *
  * @param event - The event object containing step configuration.
  */
-type GenerateTextOnStepStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>, OUTPUT extends Output = Output> = (event: OnStepStartEvent<TOOLS, CONTEXT, OUTPUT, GenerateTextIncludeSettings>) => PromiseLike<void> | void;
+type GenerateTextOnStepStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>, OUTPUT extends Output = Output> = Listener<OnStepStartEvent<TOOLS, CONTEXT, OUTPUT, GenerateTextIncludeSettings>>;
 /**
  * Callback that is set using the `experimental_onToolCallStart` option.
  *
@@ -1138,7 +1143,7 @@ type GenerateTextOnStepStartCallback<TOOLS extends ToolSet = ToolSet, CONTEXT ex
  *
  * @param event - The event object containing tool call information.
  */
-type GenerateTextOnToolCallStartCallback<TOOLS extends ToolSet = ToolSet> = (event: OnToolCallStartEvent<TOOLS>) => PromiseLike<void> | void;
+type GenerateTextOnToolCallStartCallback<TOOLS extends ToolSet = ToolSet> = Listener<OnToolCallStartEvent<TOOLS>>;
 /**
  * Callback that is set using the `experimental_onToolCallFinish` option.
  *
@@ -1151,7 +1156,7 @@ type GenerateTextOnToolCallStartCallback<TOOLS extends ToolSet = ToolSet> = (eve
  *
  * @param event - The event object containing tool call result information.
  */
-type GenerateTextOnToolCallFinishCallback<TOOLS extends ToolSet = ToolSet> = (event: OnToolCallFinishEvent<TOOLS>) => PromiseLike<void> | void;
+type GenerateTextOnToolCallFinishCallback<TOOLS extends ToolSet = ToolSet> = Listener<OnToolCallFinishEvent<TOOLS>>;
 /**
  * Callback that is set using the `onStepFinish` option.
  *
@@ -1160,7 +1165,7 @@ type GenerateTextOnToolCallFinishCallback<TOOLS extends ToolSet = ToolSet> = (ev
  *
  * @param stepResult - The result of the step.
  */
-type GenerateTextOnStepFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>> = (event: OnStepFinishEvent<TOOLS, CONTEXT>) => Promise<void> | void;
+type GenerateTextOnStepFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>> = Listener<OnStepFinishEvent<TOOLS, CONTEXT>>;
 /**
  * Callback that is set using the `onFinish` option.
  *
@@ -1170,7 +1175,7 @@ type GenerateTextOnStepFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT e
  *
  * @param event - The final result along with aggregated step data.
  */
-type GenerateTextOnFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>> = (event: OnFinishEvent<TOOLS, CONTEXT>) => PromiseLike<void> | void;
+type GenerateTextOnFinishCallback<TOOLS extends ToolSet = ToolSet, CONTEXT extends GenerationContext<TOOLS> = GenerationContext<TOOLS>> = Listener<OnFinishEvent<TOOLS, CONTEXT>>;
 /**
  * Generate a text and call tools for a given prompt using a language model.
  *
@@ -3426,11 +3431,6 @@ interface RerankFinishEvent {
     }>;
 }
 
-/**
- * A callback function that can be used to notify listeners.
- */
-type Listener<EVENT> = (event: EVENT) => PromiseLike<void> | void;
-
 /**
  * Implement this interface to create custom telemetry integrations.
  * Methods can be sync or return a PromiseLike.
@@ -4415,7 +4415,6 @@ declare class ToolLoopAgent<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, CO
      */
     get tools(): TOOLS;
     private prepareCall;
-    private mergeCallbacks;
     /**
      * Generates an output from the agent (non-streaming).
      */

package/dist/index.js

@@ -1401,7 +1401,7 @@ var import_provider_utils3 = require("@ai-sdk/provider-utils");
 var import_provider_utils4 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "7.0.0-beta.78" : "0.0.0-test";
+var VERSION = true ? "7.0.0-beta.79" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2475,6 +2475,17 @@ Learn more: \x1B[34m${moreInfoURL}\x1B[0m
   );
 }
 
+// src/util/merge-listeners.ts
+function mergeListeners(...listeners) {
+  return async (event) => {
+    await Promise.allSettled(
+      listeners.map(async (listener) => {
+        await (listener == null ? void 0 : listener(event));
+      })
+    );
+  };
+}
+
 // src/telemetry/telemetry-integration-registry.ts
 function registerTelemetryIntegration(integration) {
   if (!globalThis.AI_SDK_TELEMETRY_INTEGRATIONS) {
@@ -2519,14 +2530,7 @@ function getGlobalTelemetryIntegration() {
     );
     function createTelemetryComposite(getListenerFromIntegration) {
       const listeners = allIntegrations.map(getListenerFromIntegration).filter(Boolean);
-      return async (event) => {
-        for (const listener of listeners) {
-          try {
-            await listener(event);
-          } catch (_ignored) {
-          }
-        }
-      };
+      return mergeListeners(...listeners);
     }
     const executeWrappers = allIntegrations.map((integration) => integration.executeTool).filter(Boolean);
     return {
@@ -7180,10 +7184,6 @@ var DefaultStreamTextResult = class {
       const initialResponseMessages = [];
       const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({ messages: initialMessages });
       if (deniedToolApprovals.length > 0 || approvedToolApprovals.length > 0) {
-        const providerExecutedToolApprovals = [
-          ...approvedToolApprovals,
-          ...deniedToolApprovals
-        ].filter((toolApproval) => toolApproval.toolCall.providerExecuted);
         const localApprovedToolApprovals = approvedToolApprovals.filter(
           (toolApproval) => !toolApproval.toolCall.providerExecuted
         );
@@ -8247,15 +8247,6 @@ var ToolLoopAgent = class {
       ...{ system: instructions, messages, prompt }
     };
   }
-  mergeCallbacks(settingsCallback, methodCallback) {
-    if (methodCallback && settingsCallback) {
-      return async (event) => {
-        await settingsCallback(event);
-        await methodCallback(event);
-      };
-    }
-    return methodCallback != null ? methodCallback : settingsCallback;
-  }
   /**
    * Generates an output from the agent (non-streaming).
    */
@@ -8274,27 +8265,24 @@ var ToolLoopAgent = class {
       ...await this.prepareCall(options),
       abortSignal,
       timeout,
-      experimental_onStart: this.mergeCallbacks(
+      experimental_onStart: mergeListeners(
         this.settings.experimental_onStart,
         experimental_onStart
       ),
-      experimental_onStepStart: this.mergeCallbacks(
+      experimental_onStepStart: mergeListeners(
         this.settings.experimental_onStepStart,
         experimental_onStepStart
       ),
-      experimental_onToolCallStart: this.mergeCallbacks(
+      experimental_onToolCallStart: mergeListeners(
         this.settings.experimental_onToolCallStart,
         experimental_onToolCallStart
       ),
-      experimental_onToolCallFinish: this.mergeCallbacks(
+      experimental_onToolCallFinish: mergeListeners(
         this.settings.experimental_onToolCallFinish,
         experimental_onToolCallFinish
       ),
-      onStepFinish: this.mergeCallbacks(
-        this.settings.onStepFinish,
-        onStepFinish
-      ),
-      onFinish: this.mergeCallbacks(this.settings.onFinish, onFinish)
+      onStepFinish: mergeListeners(this.settings.onStepFinish, onStepFinish),
+      onFinish: mergeListeners(this.settings.onFinish, onFinish)
     });
   }
   /**
@@ -8317,27 +8305,24 @@ var ToolLoopAgent = class {
       abortSignal,
       timeout,
       experimental_transform,
-      experimental_onStart: this.mergeCallbacks(
+      experimental_onStart: mergeListeners(
         this.settings.experimental_onStart,
         experimental_onStart
       ),
-      experimental_onStepStart: this.mergeCallbacks(
+      experimental_onStepStart: mergeListeners(
         this.settings.experimental_onStepStart,
         experimental_onStepStart
       ),
-      experimental_onToolCallStart: this.mergeCallbacks(
+      experimental_onToolCallStart: mergeListeners(
         this.settings.experimental_onToolCallStart,
         experimental_onToolCallStart
       ),
-      experimental_onToolCallFinish: this.mergeCallbacks(
+      experimental_onToolCallFinish: mergeListeners(
         this.settings.experimental_onToolCallFinish,
         experimental_onToolCallFinish
       ),
-      onStepFinish: this.mergeCallbacks(
-        this.settings.onStepFinish,
-        onStepFinish
-      ),
-      onFinish: this.mergeCallbacks(this.settings.onFinish, onFinish)
+      onStepFinish: mergeListeners(this.settings.onStepFinish, onStepFinish),
+      onFinish: mergeListeners(this.settings.onFinish, onFinish)
     });
   }
 };
@@ -13592,7 +13577,7 @@ function lastAssistantMessageIsCompleteWithApprovalResponses({
   const lastStepStartIndex = message.parts.reduce((lastIndex, part, index) => {
     return part.type === "step-start" ? index : lastIndex;
   }, -1);
-  const lastStepToolInvocations = message.parts.slice(lastStepStartIndex + 1).filter(isToolUIPart).filter((part) => !part.providerExecuted);
+  const lastStepToolInvocations = message.parts.slice(lastStepStartIndex + 1).filter(isToolUIPart);
   return (
     // has at least one tool approval response
     lastStepToolInvocations.filter((part) => part.state === "approval-responded").length > 0 && // all tool approvals must have a response