ai 6.0.134 → 6.0.136

package/src/agent/agent.ts

@@ -5,14 +5,7 @@ import { StreamTextTransform } from '../generate-text/stream-text';
 import { StreamTextResult } from '../generate-text/stream-text-result';
 import { ToolSet } from '../generate-text/tool-set';
 import { TimeoutConfiguration } from '../prompt/call-settings';
-import type {
-  ToolLoopAgentOnFinishCallback,
-  ToolLoopAgentOnStartCallback,
-  ToolLoopAgentOnStepFinishCallback,
-  ToolLoopAgentOnStepStartCallback,
-  ToolLoopAgentOnToolCallFinishCallback,
-  ToolLoopAgentOnToolCallStartCallback,
-} from './tool-loop-agent-settings';
+import type { ToolLoopAgentOnStepFinishCallback } from './tool-loop-agent-settings';
 
 /**
  * Parameters for calling an agent.
@@ -64,35 +57,10 @@ export type AgentCallParameters<CALL_OPTIONS, TOOLS extends ToolSet = {}> = ([
      */
     timeout?: TimeoutConfiguration;
 
-    /**
-     * Callback that is called when the agent operation begins, before any LLM calls.
-     */
-    experimental_onStart?: ToolLoopAgentOnStartCallback<TOOLS>;
-
-    /**
-     * Callback that is called when a step (LLM call) begins, before the provider is called.
-     */
-    experimental_onStepStart?: ToolLoopAgentOnStepStartCallback<TOOLS>;
-
-    /**
-     * Callback that is called before each tool execution begins.
-     */
-    experimental_onToolCallStart?: ToolLoopAgentOnToolCallStartCallback<TOOLS>;
-
-    /**
-     * Callback that is called after each tool execution completes.
-     */
-    experimental_onToolCallFinish?: ToolLoopAgentOnToolCallFinishCallback<TOOLS>;
-
     /**
      * Callback that is called when each step (LLM call) is finished, including intermediate steps.
      */
     onStepFinish?: ToolLoopAgentOnStepFinishCallback<TOOLS>;
-
-    /**
-     * Callback that is called when all steps are finished and the response is complete.
-     */
-    onFinish?: ToolLoopAgentOnFinishCallback<TOOLS>;
   };
 
 /**

package/src/agent/index.ts

@@ -5,11 +5,7 @@ export {
 } from './agent';
 export {
   type ToolLoopAgentOnFinishCallback,
-  type ToolLoopAgentOnStartCallback,
   type ToolLoopAgentOnStepFinishCallback,
-  type ToolLoopAgentOnStepStartCallback,
-  type ToolLoopAgentOnToolCallFinishCallback,
-  type ToolLoopAgentOnToolCallStartCallback,
   type ToolLoopAgentSettings,
 
   /**

package/src/agent/tool-loop-agent-settings.ts

@@ -6,11 +6,7 @@ import {
 } from '@ai-sdk/provider-utils';
 import type {
   OnFinishEvent,
-  OnStartEvent,
   OnStepFinishEvent,
-  OnStepStartEvent,
-  OnToolCallFinishEvent,
-  OnToolCallStartEvent,
 } from '../generate-text/callback-events';
 import { Output } from '../generate-text/output';
 import { PrepareStepFunction } from '../generate-text/prepare-step';
@@ -24,24 +20,6 @@ import { LanguageModel, ToolChoice } from '../types/language-model';
 import { DownloadFunction } from '../util/download/download-function';
 import { AgentCallParameters } from './agent';
 
-export type ToolLoopAgentOnStartCallback<
-  TOOLS extends ToolSet = ToolSet,
-  OUTPUT extends Output = Output,
-> = (event: OnStartEvent<TOOLS, OUTPUT>) => PromiseLike<void> | void;
-
-export type ToolLoopAgentOnStepStartCallback<
-  TOOLS extends ToolSet = ToolSet,
-  OUTPUT extends Output = Output,
-> = (event: OnStepStartEvent<TOOLS, OUTPUT>) => PromiseLike<void> | void;
-
-export type ToolLoopAgentOnToolCallStartCallback<
-  TOOLS extends ToolSet = ToolSet,
-> = (event: OnToolCallStartEvent<TOOLS>) => PromiseLike<void> | void;
-
-export type ToolLoopAgentOnToolCallFinishCallback<
-  TOOLS extends ToolSet = ToolSet,
-> = (event: OnToolCallFinishEvent<TOOLS>) => PromiseLike<void> | void;
-
 export type ToolLoopAgentOnStepFinishCallback<TOOLS extends ToolSet = {}> = (
   stepResult: OnStepFinishEvent<TOOLS>,
 ) => Promise<void> | void;
@@ -121,33 +99,6 @@ export type ToolLoopAgentSettings<
    */
   experimental_repairToolCall?: ToolCallRepairFunction<NoInfer<TOOLS>>;
 
-  /**
-   * Callback that is called when the agent operation begins, before any LLM calls.
-   */
-  experimental_onStart?: ToolLoopAgentOnStartCallback<NoInfer<TOOLS>, OUTPUT>;
-
-  /**
-   * Callback that is called when a step (LLM call) begins, before the provider is called.
-   */
-  experimental_onStepStart?: ToolLoopAgentOnStepStartCallback<
-    NoInfer<TOOLS>,
-    OUTPUT
-  >;
-
-  /**
-   * Callback that is called before each tool execution begins.
-   */
-  experimental_onToolCallStart?: ToolLoopAgentOnToolCallStartCallback<
-    NoInfer<TOOLS>
-  >;
-
-  /**
-   * Callback that is called after each tool execution completes.
-   */
-  experimental_onToolCallFinish?: ToolLoopAgentOnToolCallFinishCallback<
-    NoInfer<TOOLS>
-  >;
-
   /**
    * Callback that is called when each step (LLM call) is finished, including intermediate steps.
    */

package/src/agent/tool-loop-agent.ts

@@ -1,13 +1,17 @@
 import { generateText } from '../generate-text/generate-text';
 import { GenerateTextResult } from '../generate-text/generate-text-result';
 import { Output } from '../generate-text/output';
+import { StepResult } from '../generate-text/step-result';
 import { stepCountIs } from '../generate-text/stop-condition';
 import { streamText } from '../generate-text/stream-text';
 import { StreamTextResult } from '../generate-text/stream-text-result';
 import { ToolSet } from '../generate-text/tool-set';
 import { Prompt } from '../prompt';
 import { Agent, AgentCallParameters, AgentStreamParameters } from './agent';
-import { ToolLoopAgentSettings } from './tool-loop-agent-settings';
+import {
+  ToolLoopAgentOnStepFinishCallback,
+  ToolLoopAgentSettings,
+} from './tool-loop-agent-settings';
 
 /**
  * A tool loop agent is an agent that runs tools in a loop. In each step,
@@ -54,29 +58,14 @@ export class ToolLoopAgent<
   }): Promise<
     Omit<
       ToolLoopAgentSettings<CALL_OPTIONS, TOOLS, OUTPUT>,
-      | 'prepareCall'
-      | 'instructions'
-      | 'experimental_onStart'
-      | 'experimental_onStepStart'
-      | 'experimental_onToolCallStart'
-      | 'experimental_onToolCallFinish'
-      | 'onStepFinish'
-      | 'onFinish'
+      'prepareCall' | 'instructions' | 'onStepFinish'
     > &
       Prompt
   > {
-    const {
-      experimental_onStart: _settingsOnStart,
-      experimental_onStepStart: _settingsOnStepStart,
-      experimental_onToolCallStart: _settingsOnToolCallStart,
-      experimental_onToolCallFinish: _settingsOnToolCallFinish,
-      onStepFinish: _settingsOnStepFinish,
-      onFinish: _settingsOnFinish,
-      ...settingsWithoutCallbacks
-    } = this.settings;
-
+    const { onStepFinish: _settingsOnStepFinish, ...settingsWithoutCallback } =
+      this.settings;
     const baseCallArgs = {
-      ...settingsWithoutCallbacks,
+      ...settingsWithoutCallback,
       stopWhen: this.settings.stopWhen ?? stepCountIs(20),
       ...options,
     };
@@ -100,17 +89,19 @@ export class ToolLoopAgent<
     };
   }
 
-  private mergeCallbacks<T extends (event: any) => PromiseLike<void> | void>(
-    settingsCallback: T | undefined,
-    methodCallback: T | undefined,
-  ): T | undefined {
-    if (methodCallback && settingsCallback) {
-      return (async (event: Parameters<T>[0]) => {
-        await settingsCallback(event);
-        await methodCallback(event);
-      }) as unknown as T;
+  private mergeOnStepFinishCallbacks(
+    methodCallback: ToolLoopAgentOnStepFinishCallback<TOOLS> | undefined,
+  ): ToolLoopAgentOnStepFinishCallback<TOOLS> | undefined {
+    const constructorCallback = this.settings.onStepFinish;
+
+    if (methodCallback && constructorCallback) {
+      return async (stepResult: StepResult<TOOLS>) => {
+        await constructorCallback(stepResult);
+        await methodCallback(stepResult);
+      };
     }
-    return methodCallback ?? settingsCallback;
+
+    return methodCallback ?? constructorCallback;
   }
 
   /**
@@ -119,12 +110,7 @@ export class ToolLoopAgent<
   async generate({
     abortSignal,
     timeout,
-    experimental_onStart,
-    experimental_onStepStart,
-    experimental_onToolCallStart,
-    experimental_onToolCallFinish,
     onStepFinish,
-    onFinish,
     ...options
   }: AgentCallParameters<CALL_OPTIONS, TOOLS>): Promise<
     GenerateTextResult<TOOLS, OUTPUT>
@@ -133,27 +119,7 @@ export class ToolLoopAgent<
       ...(await this.prepareCall(options)),
       abortSignal,
       timeout,
-      experimental_onStart: this.mergeCallbacks(
-        this.settings.experimental_onStart,
-        experimental_onStart,
-      ),
-      experimental_onStepStart: this.mergeCallbacks(
-        this.settings.experimental_onStepStart,
-        experimental_onStepStart,
-      ),
-      experimental_onToolCallStart: this.mergeCallbacks(
-        this.settings.experimental_onToolCallStart,
-        experimental_onToolCallStart,
-      ),
-      experimental_onToolCallFinish: this.mergeCallbacks(
-        this.settings.experimental_onToolCallFinish,
-        experimental_onToolCallFinish,
-      ),
-      onStepFinish: this.mergeCallbacks(
-        this.settings.onStepFinish,
-        onStepFinish,
-      ),
-      onFinish: this.mergeCallbacks(this.settings.onFinish, onFinish),
+      onStepFinish: this.mergeOnStepFinishCallbacks(onStepFinish),
     });
   }
 
@@ -164,12 +130,7 @@ export class ToolLoopAgent<
     abortSignal,
     timeout,
     experimental_transform,
-    experimental_onStart,
-    experimental_onStepStart,
-    experimental_onToolCallStart,
-    experimental_onToolCallFinish,
     onStepFinish,
-    onFinish,
     ...options
   }: AgentStreamParameters<CALL_OPTIONS, TOOLS>): Promise<
     StreamTextResult<TOOLS, OUTPUT>
@@ -179,27 +140,7 @@ export class ToolLoopAgent<
       abortSignal,
       timeout,
       experimental_transform,
-      experimental_onStart: this.mergeCallbacks(
-        this.settings.experimental_onStart,
-        experimental_onStart,
-      ),
-      experimental_onStepStart: this.mergeCallbacks(
-        this.settings.experimental_onStepStart,
-        experimental_onStepStart,
-      ),
-      experimental_onToolCallStart: this.mergeCallbacks(
-        this.settings.experimental_onToolCallStart,
-        experimental_onToolCallStart,
-      ),
-      experimental_onToolCallFinish: this.mergeCallbacks(
-        this.settings.experimental_onToolCallFinish,
-        experimental_onToolCallFinish,
-      ),
-      onStepFinish: this.mergeCallbacks(
-        this.settings.onStepFinish,
-        onStepFinish,
-      ),
-      onFinish: this.mergeCallbacks(this.settings.onFinish, onFinish),
+      onStepFinish: this.mergeOnStepFinishCallbacks(onStepFinish),
     });
   }
 }