ai 6.0.91 → 6.0.93

package/dist/index.mjs

@@ -1104,7 +1104,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.91" : "0.0.0-test";
+var VERSION = true ? "6.0.93" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2653,6 +2653,14 @@ function collectToolApprovals({
 
 // src/generate-text/execute-tool-call.ts
 import { executeTool } from "@ai-sdk/provider-utils";
+
+// src/util/now.ts
+function now() {
+  var _a21, _b;
+  return (_b = (_a21 = globalThis == null ? void 0 : globalThis.performance) == null ? void 0 : _a21.now()) != null ? _b : Date.now();
+}
+
+// src/generate-text/execute-tool-call.ts
 async function executeToolCall({
   toolCall,
   tools,
@@ -2661,7 +2669,11 @@ async function executeToolCall({
   messages,
   abortSignal,
   experimental_context,
-  onPreliminaryToolResult
+  stepNumber,
+  model,
+  onPreliminaryToolResult,
+  onToolCallStart,
+  onToolCallFinish
 }) {
   const { toolName, toolCallId, input } = toolCall;
   const tool2 = tools == null ? void 0 : tools[toolName];
@@ -2687,6 +2699,20 @@ async function executeToolCall({
     tracer,
     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
+        }));
+      } catch (_ignored) {
+      }
+      const startTime = now();
       try {
         const stream = executeTool({
           execute: tool2.execute.bind(tool2),
@@ -2711,6 +2737,23 @@ async function executeToolCall({
           }
         }
       } catch (error) {
+        const durationMs2 = now() - startTime;
+        try {
+          await (onToolCallFinish == null ? void 0 : onToolCallFinish({
+            stepNumber,
+            model,
+            toolCall,
+            messages,
+            abortSignal,
+            success: false,
+            error,
+            durationMs: durationMs2,
+            functionId: telemetry == null ? void 0 : telemetry.functionId,
+            metadata: telemetry == null ? void 0 : telemetry.metadata,
+            experimental_context
+          }));
+        } catch (_ignored) {
+        }
         recordErrorOnSpan(span, error);
         return {
           type: "tool-error",
@@ -2722,6 +2765,23 @@ async function executeToolCall({
           ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {}
         };
       }
+      const durationMs = now() - startTime;
+      try {
+        await (onToolCallFinish == null ? void 0 : onToolCallFinish({
+          stepNumber,
+          model,
+          toolCall,
+          messages,
+          abortSignal,
+          success: true,
+          output,
+          durationMs,
+          functionId: telemetry == null ? void 0 : telemetry.functionId,
+          metadata: telemetry == null ? void 0 : telemetry.metadata,
+          experimental_context
+        }));
+      } catch (_ignored) {
+      }
       try {
         span.setAttributes(
           await selectTelemetryAttributes({
@@ -3626,6 +3686,11 @@ async function doParseToolCall({
 // src/generate-text/step-result.ts
 var DefaultStepResult = class {
   constructor({
+    stepNumber,
+    model,
+    functionId,
+    metadata,
+    experimental_context,
     content,
     finishReason,
     rawFinishReason,
@@ -3635,6 +3700,11 @@ var DefaultStepResult = class {
     response,
     providerMetadata
   }) {
+    this.stepNumber = stepNumber;
+    this.model = model;
+    this.functionId = functionId;
+    this.metadata = metadata;
+    this.experimental_context = experimental_context;
     this.content = content;
     this.finishReason = finishReason;
     this.rawFinishReason = rawFinishReason;
@@ -3892,6 +3962,10 @@ async function generateText({
   experimental_context,
   experimental_include: include,
   _internal: { generateId: generateId2 = originalGenerateId } = {},
+  experimental_onStart: onStart,
+  experimental_onStepStart: onStepStart,
+  experimental_onToolCallStart: onToolCallStart,
+  experimental_onToolCallFinish: onToolCallFinish,
   onStepFinish,
   onFinish,
   ...settings
@@ -3926,6 +4000,37 @@ async function generateText({
     prompt,
     messages
   });
+  try {
+    await (onStart == null ? void 0 : onStart({
+      model: { provider: model.provider, modelId: model.modelId },
+      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,
+      include,
+      functionId: telemetry == null ? void 0 : telemetry.functionId,
+      metadata: telemetry == null ? void 0 : telemetry.metadata,
+      experimental_context
+    }));
+  } catch (_ignored) {
+  }
   const tracer = getTracer(telemetry);
   try {
     return await recordSpan({
@@ -3949,7 +4054,7 @@ async function generateText({
       }),
       tracer,
       fn: async (span) => {
-        var _a21, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+        var _a21, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
         const initialMessages = initialPrompt.messages;
         const responseMessages = [];
         const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({ messages: initialMessages });
@@ -3966,7 +4071,11 @@ async function generateText({
             telemetry,
             messages: initialMessages,
             abortSignal: mergedAbortSignal,
-            experimental_context
+            experimental_context,
+            stepNumber: 0,
+            model: { provider: model.provider, modelId: model.modelId },
+            onToolCallStart,
+            onToolCallFinish
           });
           const toolContent = [];
           for (const output2 of toolOutputs) {
@@ -4055,11 +4164,44 @@ async function generateText({
               download: download2
             });
             experimental_context = (_d = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _d : experimental_context;
+            const stepActiveTools = (_e = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _e : activeTools;
             const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
               tools,
-              toolChoice: (_e = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _e : toolChoice,
-              activeTools: (_f = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _f : activeTools
+              toolChoice: (_f = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _f : toolChoice,
+              activeTools: stepActiveTools
             });
+            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: steps.length,
+                model: {
+                  provider: stepModel.provider,
+                  modelId: stepModel.modelId
+                },
+                system: stepSystem,
+                messages: stepMessages,
+                tools,
+                toolChoice: stepToolChoice,
+                activeTools: stepActiveTools,
+                steps: [...steps],
+                providerOptions: stepProviderOptions,
+                timeout,
+                headers,
+                stopWhen,
+                output,
+                abortSignal,
+                include,
+                functionId: telemetry == null ? void 0 : telemetry.functionId,
+                metadata: telemetry == null ? void 0 : telemetry.metadata,
+                experimental_context
+              }));
+            } catch (_ignored) {
+            }
             currentModelResponse = await retry(
               () => {
                 var _a22;
@@ -4102,10 +4244,6 @@ async function generateText({
                   tracer,
                   fn: async (span2) => {
                     var _a23, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
-                    const stepProviderOptions = mergeObjects(
-                      providerOptions,
-                      prepareStepResult == null ? void 0 : prepareStepResult.providerOptions
-                    );
                     const result = await stepModel.doGenerate({
                       ...callSettings2,
                       tools: stepTools,
@@ -4237,7 +4375,14 @@ async function generateText({
                   telemetry,
                   messages: stepInputMessages,
                   abortSignal: mergedAbortSignal,
-                  experimental_context
+                  experimental_context,
+                  stepNumber: steps.length,
+                  model: {
+                    provider: stepModel.provider,
+                    modelId: stepModel.modelId
+                  },
+                  onToolCallStart,
+                  onToolCallFinish
                 })
               );
             }
@@ -4274,15 +4419,24 @@ async function generateText({
                 tools
               })
             );
-            const stepRequest = ((_g = include == null ? void 0 : include.requestBody) != null ? _g : true) ? (_h = currentModelResponse.request) != null ? _h : {} : { ...currentModelResponse.request, body: void 0 };
+            const stepRequest = ((_i = include == null ? void 0 : include.requestBody) != null ? _i : true) ? (_j = currentModelResponse.request) != null ? _j : {} : { ...currentModelResponse.request, body: void 0 };
             const stepResponse = {
               ...currentModelResponse.response,
               // deep clone msgs to avoid mutating past messages in multi-step:
               messages: structuredClone(responseMessages),
               // Conditionally include response body:
-              body: ((_i = include == null ? void 0 : include.responseBody) != null ? _i : true) ? (_j = currentModelResponse.response) == null ? void 0 : _j.body : void 0
+              body: ((_k = include == null ? void 0 : include.responseBody) != null ? _k : true) ? (_l = currentModelResponse.response) == null ? void 0 : _l.body : void 0
             };
+            const stepNumber = steps.length;
             const currentStepResult = new DefaultStepResult({
+              stepNumber,
+              model: {
+                provider: stepModel.provider,
+                modelId: stepModel.modelId
+              },
+              functionId: telemetry == null ? void 0 : telemetry.functionId,
+              metadata: telemetry == null ? void 0 : telemetry.metadata,
+              experimental_context,
               content: stepContent,
               finishReason: currentModelResponse.finishReason.unified,
               rawFinishReason: currentModelResponse.finishReason.raw,
@@ -4293,7 +4447,7 @@ async function generateText({
               response: stepResponse
             });
             logWarnings({
-              warnings: (_k = currentModelResponse.warnings) != null ? _k : [],
+              warnings: (_m = currentModelResponse.warnings) != null ? _m : [],
               provider: stepModel.provider,
               model: stepModel.modelId
             });
@@ -4351,6 +4505,11 @@ async function generateText({
           }
         );
         await (onFinish == null ? void 0 : onFinish({
+          stepNumber: lastStep.stepNumber,
+          model: lastStep.model,
+          functionId: lastStep.functionId,
+          metadata: lastStep.metadata,
+          experimental_context: lastStep.experimental_context,
           finishReason: lastStep.finishReason,
           rawFinishReason: lastStep.rawFinishReason,
           usage: lastStep.usage,
@@ -4371,8 +4530,7 @@ async function generateText({
           warnings: lastStep.warnings,
           providerMetadata: lastStep.providerMetadata,
           steps,
-          totalUsage,
-          experimental_context
+          totalUsage
         }));
         let resolvedOutput;
         if (lastStep.finishReason === "stop") {
@@ -4404,7 +4562,11 @@ async function executeTools({
   telemetry,
   messages,
   abortSignal,
-  experimental_context
+  experimental_context,
+  stepNumber,
+  model,
+  onToolCallStart,
+  onToolCallFinish
 }) {
   const toolOutputs = await Promise.all(
     toolCalls.map(
@@ -4415,7 +4577,11 @@ async function executeTools({
         telemetry,
         messages,
         abortSignal,
-        experimental_context
+        experimental_context,
+        stepNumber,
+        model,
+        onToolCallStart,
+        onToolCallFinish
       })
     )
   );
@@ -5806,12 +5972,6 @@ function createStitchableStream() {
   };
 }
 
-// src/util/now.ts
-function now() {
-  var _a21, _b;
-  return (_b = (_a21 = globalThis == null ? void 0 : globalThis.performance) == null ? void 0 : _a21.now()) != null ? _b : Date.now();
-}
-
 // src/generate-text/run-tools-transformation.ts
 import {
   getErrorMessage as getErrorMessage6
@@ -6373,6 +6533,14 @@ var DefaultStreamTextResult = class {
             tools
           });
           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,
+            experimental_context,
             content: recordedContent,
             finishReason: part.finishReason,
             rawFinishReason: part.rawFinishReason,
@@ -6421,6 +6589,11 @@ var DefaultStreamTextResult = class {
           self._steps.resolve(recordedSteps);
           const finalStep = recordedSteps[recordedSteps.length - 1];
           await (onFinish == null ? void 0 : onFinish({
+            stepNumber: finalStep.stepNumber,
+            model: finalStep.model,
+            functionId: finalStep.functionId,
+            metadata: finalStep.metadata,
+            experimental_context: finalStep.experimental_context,
             finishReason: finalStep.finishReason,
             rawFinishReason: finalStep.rawFinishReason,
             totalUsage,
@@ -6441,8 +6614,7 @@ var DefaultStreamTextResult = class {
             response: finalStep.response,
             warnings: finalStep.warnings,
             providerMetadata: finalStep.providerMetadata,
-            steps: recordedSteps,
-            experimental_context
+            steps: recordedSteps
           }));
           rootSpan.setAttributes(
             await selectTelemetryAttributes({