ai 6.0.95 → 6.0.97

package/dist/index.js

@@ -1211,7 +1211,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 ? "6.0.95" : "0.0.0-test";
+var VERSION = true ? "6.0.97" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2779,6 +2779,16 @@ async function executeToolCall({
   if ((tool2 == null ? void 0 : tool2.execute) == null) {
     return void 0;
   }
+  const baseCallbackEvent = {
+    stepNumber,
+    model,
+    toolCall,
+    messages,
+    abortSignal,
+    functionId: telemetry == null ? void 0 : telemetry.functionId,
+    metadata: telemetry == null ? void 0 : telemetry.metadata,
+    experimental_context
+  };
   return recordSpan({
     name: "ai.toolCall",
     attributes: selectTelemetryAttributes({
@@ -2799,16 +2809,7 @@ async function executeToolCall({
     fn: async (span) => {
       let output;
       try {
-        await (onToolCallStart == null ? void 0 : onToolCallStart({
-          stepNumber,
-          model,
-          toolCall,
-          messages,
-          abortSignal,
-          functionId: telemetry == null ? void 0 : telemetry.functionId,
-          metadata: telemetry == null ? void 0 : telemetry.metadata,
-          experimental_context
-        }));
+        await (onToolCallStart == null ? void 0 : onToolCallStart(baseCallbackEvent));
       } catch (_ignored) {
       }
       const startTime = now();
@@ -2839,17 +2840,10 @@ async function executeToolCall({
         const durationMs2 = now() - startTime;
         try {
           await (onToolCallFinish == null ? void 0 : onToolCallFinish({
-            stepNumber,
-            model,
-            toolCall,
-            messages,
-            abortSignal,
+            ...baseCallbackEvent,
             success: false,
             error,
-            durationMs: durationMs2,
-            functionId: telemetry == null ? void 0 : telemetry.functionId,
-            metadata: telemetry == null ? void 0 : telemetry.metadata,
-            experimental_context
+            durationMs: durationMs2
           }));
         } catch (_ignored) {
         }
@@ -2867,17 +2861,10 @@ async function executeToolCall({
       const durationMs = now() - startTime;
       try {
         await (onToolCallFinish == null ? void 0 : onToolCallFinish({
-          stepNumber,
-          model,
-          toolCall,
-          messages,
-          abortSignal,
+          ...baseCallbackEvent,
           success: true,
           output,
-          durationMs,
-          functionId: telemetry == null ? void 0 : telemetry.functionId,
-          metadata: telemetry == null ? void 0 : telemetry.metadata,
-          experimental_context
+          durationMs
         }));
       } catch (_ignored) {
       }
@@ -4080,6 +4067,7 @@ async function generateText({
     headers: headersWithUserAgent,
     settings: { ...callSettings, maxRetries }
   });
+  const modelInfo = { provider: model.provider, modelId: model.modelId };
   const initialPrompt = await standardizePrompt({
     system,
     prompt,
@@ -4087,7 +4075,7 @@ async function generateText({
   });
   try {
     await (onStart == null ? void 0 : onStart({
-      model: { provider: model.provider, modelId: model.modelId },
+      model: modelInfo,
       system,
       prompt,
       messages,
@@ -4158,7 +4146,7 @@ async function generateText({
             abortSignal: mergedAbortSignal,
             experimental_context,
             stepNumber: 0,
-            model: { provider: model.provider, modelId: model.modelId },
+            model: modelInfo,
             onToolCallStart,
             onToolCallFinish
           });
@@ -4240,6 +4228,10 @@ async function generateText({
             const stepModel = resolveLanguageModel(
               (_a21 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a21 : model
             );
+            const stepModelInfo = {
+              provider: stepModel.provider,
+              modelId: stepModel.modelId
+            };
             const promptMessages = await convertToLanguageModelPrompt({
               prompt: {
                 system: (_b = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _b : initialPrompt.system,
@@ -4264,10 +4256,7 @@ async function generateText({
             try {
               await (onStepStart == null ? void 0 : onStepStart({
                 stepNumber: steps.length,
-                model: {
-                  provider: stepModel.provider,
-                  modelId: stepModel.modelId
-                },
+                model: stepModelInfo,
                 system: stepSystem,
                 messages: stepMessages,
                 tools,
@@ -4462,10 +4451,7 @@ async function generateText({
                   abortSignal: mergedAbortSignal,
                   experimental_context,
                   stepNumber: steps.length,
-                  model: {
-                    provider: stepModel.provider,
-                    modelId: stepModel.modelId
-                  },
+                  model: stepModelInfo,
                   onToolCallStart,
                   onToolCallFinish
                 })
@@ -4515,10 +4501,7 @@ async function generateText({
             const stepNumber = steps.length;
             const currentStepResult = new DefaultStepResult({
               stepNumber,
-              model: {
-                provider: stepModel.provider,
-                modelId: stepModel.modelId
-              },
+              model: stepModelInfo,
               functionId: telemetry == null ? void 0 : telemetry.functionId,
               metadata: telemetry == null ? void 0 : telemetry.metadata,
               experimental_context,
@@ -4533,8 +4516,8 @@ async function generateText({
             });
             logWarnings({
               warnings: (_m = currentModelResponse.warnings) != null ? _m : [],
-              provider: stepModel.provider,
-              model: stepModel.modelId
+              provider: stepModelInfo.provider,
+              model: stepModelInfo.modelId
             });
             steps.push(currentStepResult);
             await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
@@ -6062,7 +6045,11 @@ function runToolsTransformation({
   abortSignal,
   repairToolCall,
   experimental_context,
-  generateId: generateId2
+  generateId: generateId2,
+  stepNumber,
+  model,
+  onToolCallStart,
+  onToolCallFinish
 }) {
   let toolResultsStreamController = null;
   const toolResultsStream = new ReadableStream({
@@ -6204,6 +6191,10 @@ function runToolsTransformation({
                 messages,
                 abortSignal,
                 experimental_context,
+                stepNumber,
+                model,
+                onToolCallStart,
+                onToolCallFinish,
                 onPreliminaryToolResult: (result) => {
                   toolResultsStreamController.enqueue(result);
                 }
@@ -6322,6 +6313,10 @@ function streamText({
   onFinish,
   onAbort,
   onStepFinish,
+  experimental_onStart: onStart,
+  experimental_onStepStart: onStepStart,
+  experimental_onToolCallStart: onToolCallStart,
+  experimental_onToolCallFinish: onToolCallFinish,
   experimental_context,
   experimental_include: include,
   _internal: { now: now2 = now, generateId: generateId2 = originalGenerateId2 } = {},
@@ -6361,11 +6356,18 @@ function streamText({
     providerOptions,
     prepareStep,
     includeRawChunks,
+    timeout,
+    stopWhen,
+    originalAbortSignal: abortSignal,
     onChunk,
     onError,
     onFinish,
     onAbort,
     onStepFinish,
+    onStart,
+    onStepStart,
+    onToolCallStart,
+    onToolCallFinish,
     now: now2,
     generateId: generateId2,
     experimental_context,
@@ -6462,11 +6464,18 @@ var DefaultStreamTextResult = class {
     includeRawChunks,
     now: now2,
     generateId: generateId2,
+    timeout,
+    stopWhen,
+    originalAbortSignal,
     onChunk,
     onError,
     onFinish,
     onAbort,
     onStepFinish,
+    onStart,
+    onStepStart,
+    onToolCallStart,
+    onToolCallFinish,
     experimental_context,
     download: download2,
     include
@@ -6610,12 +6619,8 @@ var DefaultStreamTextResult = class {
           });
           const currentStepResult = new DefaultStepResult({
             stepNumber: recordedSteps.length,
-            model: {
-              provider: model.provider,
-              modelId: model.modelId
-            },
-            functionId: telemetry == null ? void 0 : telemetry.functionId,
-            metadata: telemetry == null ? void 0 : telemetry.metadata,
+            model: modelInfo,
+            ...callbackTelemetryProps,
             experimental_context,
             content: recordedContent,
             finishReason: part.finishReason,
@@ -6632,8 +6637,8 @@ var DefaultStreamTextResult = class {
           await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
           logWarnings({
             warnings: recordedWarnings,
-            provider: model.provider,
-            model: model.modelId
+            provider: modelInfo.provider,
+            model: modelInfo.modelId
           });
           recordedSteps.push(currentStepResult);
           recordedResponseMessages.push(...stepMessages);
@@ -6792,6 +6797,11 @@ var DefaultStreamTextResult = class {
       settings: { ...callSettings, maxRetries }
     });
     const self = this;
+    const modelInfo = { provider: model.provider, modelId: model.modelId };
+    const callbackTelemetryProps = {
+      functionId: telemetry == null ? void 0 : telemetry.functionId,
+      metadata: telemetry == null ? void 0 : telemetry.metadata
+    };
     recordSpan({
       name: "ai.streamText",
       attributes: selectTelemetryAttributes({
@@ -6814,6 +6824,36 @@ var DefaultStreamTextResult = class {
           prompt,
           messages
         });
+        try {
+          await (onStart == null ? void 0 : onStart({
+            model: modelInfo,
+            system,
+            prompt,
+            messages,
+            tools,
+            toolChoice,
+            activeTools,
+            maxOutputTokens: callSettings.maxOutputTokens,
+            temperature: callSettings.temperature,
+            topP: callSettings.topP,
+            topK: callSettings.topK,
+            presencePenalty: callSettings.presencePenalty,
+            frequencyPenalty: callSettings.frequencyPenalty,
+            stopSequences: callSettings.stopSequences,
+            seed: callSettings.seed,
+            maxRetries,
+            timeout,
+            headers,
+            providerOptions,
+            stopWhen,
+            output,
+            abortSignal: originalAbortSignal,
+            include,
+            ...callbackTelemetryProps,
+            experimental_context
+          }));
+        } catch (_ignored) {
+        }
         const initialMessages = initialPrompt.messages;
         const initialResponseMessages = [];
         const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({ messages: initialMessages });
@@ -6860,6 +6900,10 @@ var DefaultStreamTextResult = class {
                   messages: initialMessages,
                   abortSignal,
                   experimental_context,
+                  stepNumber: recordedSteps.length,
+                  model: modelInfo,
+                  onToolCallStart,
+                  onToolCallFinish,
                   onPreliminaryToolResult: (result2) => {
                     toolExecutionStepStreamController == null ? void 0 : toolExecutionStepStreamController.enqueue(result2);
                   }
@@ -6926,7 +6970,7 @@ var DefaultStreamTextResult = class {
           responseMessages,
           usage
         }) {
-          var _a21, _b, _c, _d, _e, _f, _g;
+          var _a21, _b, _c, _d, _e, _f, _g, _h, _i;
           const includeRawChunks2 = self.includeRawChunks;
           const stepTimeoutId = stepTimeoutMs != null ? setTimeout(() => stepAbortController.abort(), stepTimeoutMs) : void 0;
           let chunkTimeoutId = void 0;
@@ -6965,6 +7009,10 @@ var DefaultStreamTextResult = class {
             const stepModel = resolveLanguageModel(
               (_a21 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a21 : model
             );
+            const stepModelInfo = {
+              provider: stepModel.provider,
+              modelId: stepModel.modelId
+            };
             const promptMessages = await convertToLanguageModelPrompt({
               prompt: {
                 system: (_b = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _b : initialPrompt.system,
@@ -6973,16 +7021,41 @@ var DefaultStreamTextResult = class {
               supportedUrls: await stepModel.supportedUrls,
               download: download2
             });
+            const stepActiveTools = (_d = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _d : activeTools;
             const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
               tools,
-              toolChoice: (_d = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _d : toolChoice,
-              activeTools: (_e = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _e : activeTools
+              toolChoice: (_e = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _e : toolChoice,
+              activeTools: stepActiveTools
             });
             experimental_context = (_f = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _f : experimental_context;
+            const stepMessages = (_g = prepareStepResult == null ? void 0 : prepareStepResult.messages) != null ? _g : stepInputMessages;
+            const stepSystem = (_h = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _h : initialPrompt.system;
             const stepProviderOptions = mergeObjects(
               providerOptions,
               prepareStepResult == null ? void 0 : prepareStepResult.providerOptions
             );
+            try {
+              await (onStepStart == null ? void 0 : onStepStart({
+                stepNumber: recordedSteps.length,
+                model: stepModelInfo,
+                system: stepSystem,
+                messages: stepMessages,
+                tools,
+                toolChoice: stepToolChoice,
+                activeTools: stepActiveTools,
+                steps: [...recordedSteps],
+                providerOptions: stepProviderOptions,
+                timeout,
+                headers,
+                stopWhen,
+                output,
+                abortSignal: originalAbortSignal,
+                include,
+                ...callbackTelemetryProps,
+                experimental_context
+              }));
+            } catch (_ignored) {
+            }
             const {
               result: { stream: stream2, response, request },
               doStreamSpan,
@@ -7054,9 +7127,13 @@ var DefaultStreamTextResult = class {
               repairToolCall,
               abortSignal,
               experimental_context,
-              generateId: generateId2
+              generateId: generateId2,
+              stepNumber: recordedSteps.length,
+              model: stepModelInfo,
+              onToolCallStart,
+              onToolCallFinish
             });
-            const stepRequest = ((_g = include == null ? void 0 : include.requestBody) != null ? _g : true) ? request != null ? request : {} : { ...request, body: void 0 };
+            const stepRequest = ((_i = include == null ? void 0 : include.requestBody) != null ? _i : true) ? request != null ? request : {} : { ...request, body: void 0 };
             const stepToolCalls = [];
             const stepToolOutputs = [];
             let warnings;
@@ -7069,7 +7146,7 @@ var DefaultStreamTextResult = class {
             let stepResponse = {
               id: generateId2(),
               timestamp: /* @__PURE__ */ new Date(),
-              modelId: model.modelId
+              modelId: modelInfo.modelId
             };
             let activeText = "";
             self.addStream(
@@ -7908,9 +7985,17 @@ var ToolLoopAgent = class {
   }
   async prepareCall(options) {
     var _a21, _b, _c, _d;
-    const { onStepFinish: _settingsOnStepFinish, ...settingsWithoutCallback } = this.settings;
+    const {
+      experimental_onStart: _settingsOnStart,
+      experimental_onStepStart: _settingsOnStepStart,
+      experimental_onToolCallStart: _settingsOnToolCallStart,
+      experimental_onToolCallFinish: _settingsOnToolCallFinish,
+      onStepFinish: _settingsOnStepFinish,
+      onFinish: _settingsOnFinish,
+      ...settingsWithoutCallbacks
+    } = this.settings;
     const baseCallArgs = {
-      ...settingsWithoutCallback,
+      ...settingsWithoutCallbacks,
       stopWhen: (_a21 = this.settings.stopWhen) != null ? _a21 : stepCountIs(20),
       ...options
     };
@@ -7925,15 +8010,14 @@ var ToolLoopAgent = class {
       ...{ system: instructions, messages, prompt }
     };
   }
-  mergeOnStepFinishCallbacks(methodCallback) {
-    const constructorCallback = this.settings.onStepFinish;
-    if (methodCallback && constructorCallback) {
-      return async (stepResult) => {
-        await constructorCallback(stepResult);
-        await methodCallback(stepResult);
+  mergeCallbacks(settingsCallback, methodCallback) {
+    if (methodCallback && settingsCallback) {
+      return async (event) => {
+        await settingsCallback(event);
+        await methodCallback(event);
       };
     }
-    return methodCallback != null ? methodCallback : constructorCallback;
+    return methodCallback != null ? methodCallback : settingsCallback;
   }
   /**
    * Generates an output from the agent (non-streaming).
@@ -7941,14 +8025,39 @@ var ToolLoopAgent = class {
   async generate({
     abortSignal,
     timeout,
+    experimental_onStart,
+    experimental_onStepStart,
+    experimental_onToolCallStart,
+    experimental_onToolCallFinish,
     onStepFinish,
+    onFinish,
     ...options
   }) {
     return generateText({
       ...await this.prepareCall(options),
       abortSignal,
       timeout,
-      onStepFinish: this.mergeOnStepFinishCallbacks(onStepFinish)
+      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)
     });
   }
   /**
@@ -7958,7 +8067,12 @@ var ToolLoopAgent = class {
     abortSignal,
     timeout,
     experimental_transform,
+    experimental_onStart,
+    experimental_onStepStart,
+    experimental_onToolCallStart,
+    experimental_onToolCallFinish,
     onStepFinish,
+    onFinish,
     ...options
   }) {
     return streamText({
@@ -7966,7 +8080,27 @@ var ToolLoopAgent = class {
       abortSignal,
       timeout,
       experimental_transform,
-      onStepFinish: this.mergeOnStepFinishCallbacks(onStepFinish)
+      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)
     });
   }
 };