ai 7.0.43 → 7.0.45

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # ai
 
+## 7.0.45
+
+### Patch Changes
+
+- d6ce0ee: feat(ai): support experimental_toolCallers in streamText
+- fa95504: feat(ai): support experimental tool callers in ToolLoopAgent
+- 349afe7: Warn when `generateText` receives streaming-only `firstChunkMs` or `chunkMs` timeout settings.
+- Updated dependencies [fa95504]
+  - @ai-sdk/provider-utils@5.0.17
+  - @ai-sdk/gateway@4.0.34
+
+## 7.0.44
+
+### Patch Changes
+
+- 015acb4: fix telemetry attribution for language model calls that resolve to a different response model
+
 ## 7.0.43
 
 ### Patch Changes

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export { AISDKError, APICallError, EmptyResponseBodyError, InvalidPromptError, I
 import { GatewayModelId } from '@ai-sdk/gateway';
 export { GatewayModelId, createGateway, gateway } from '@ai-sdk/gateway';
 import * as _ai_sdk_provider_utils from '@ai-sdk/provider-utils';
-import { ModelMessage, AssistantModelMessage, ToolModelMessage, ProviderOptions, ToolSet, SystemModelMessage, UserModelMessage, DataContent, FlexibleSchema, InferSchema, Context, Arrayable, InferToolSetContext, InferToolInput, InferToolOutput, ReasoningPart, ReasoningFilePart, Experimental_SandboxSession, Tool, ToolCall, IdGenerator, ToolExecutionOptions, MaybePromiseLike, InferToolContext, HasRequiredKey, Experimental_ToolCallerTool, TextPart, FilePart, Resolvable, FetchFunction } from '@ai-sdk/provider-utils';
+import { ModelMessage, AssistantModelMessage, ToolModelMessage, ProviderOptions, ToolSet, SystemModelMessage, UserModelMessage, DataContent, FlexibleSchema, InferSchema, Context, Arrayable, InferToolSetContext, InferToolInput, InferToolOutput, ReasoningPart, ReasoningFilePart, Experimental_SandboxSession, Tool, ToolCall, IdGenerator, ToolExecutionOptions, MaybePromiseLike, InferToolContext, Experimental_ToolCallerTool, HasRequiredKey, TextPart, FilePart, Resolvable, FetchFunction } from '@ai-sdk/provider-utils';
 export { AssistantContent, AssistantModelMessage, DataContent, DownloadError, Experimental_SandboxProcess, Experimental_SandboxSession, Experimental_ToolCallerTool, FilePart, FlexibleSchema, IdGenerator, ImagePart, InferSchema, InferToolInput, InferToolOutput, ModelMessage, Schema, SystemModelMessage, TextPart, Tool, ToolApprovalRequest, ToolApprovalResponse, ToolCallPart, ToolContent, ToolExecuteFunction, ToolExecutionOptions, ToolModelMessage, ToolResultPart, ToolSet, UserContent, UserModelMessage, asSchema, createIdGenerator, dynamicTool, experimental_toolCaller, generateId, jsonSchema, parseJsonEventStream, tool, zodSchema } from '@ai-sdk/provider-utils';
 import { ServerResponse } from 'node:http';
 import { ServerResponse as ServerResponse$1 } from 'http';
@@ -3019,6 +3019,21 @@ type ToolApprovalConfiguration<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Co
     [key in keyof TOOLS]?: ToolApprovalStatus | SingleToolApprovalFunction<InferToolInput<TOOLS[key]>, InferToolContext<TOOLS[key]>, RUNTIME_CONTEXT>;
 };
 
+interface Experimental_ToolCallerReference<NAME extends string = string> {
+    readonly toolName: NAME;
+}
+type ToolCallerName<TOOLS extends ToolSet> = {
+    [NAME in keyof TOOLS]: TOOLS[NAME] extends Experimental_ToolCallerTool ? NAME : never;
+}[keyof TOOLS] & string;
+type ToolCallerReferenceUnion<TOOLS extends ToolSet> = {
+    [NAME in ToolCallerName<TOOLS>]: Experimental_ToolCallerReference<NAME>;
+}[ToolCallerName<TOOLS>];
+type Experimental_ToolCallers<TOOLS extends ToolSet> = (callers: {
+    [NAME in ToolCallerName<TOOLS>]: Experimental_ToolCallerReference<NAME>;
+}) => {
+    [NAME in keyof TOOLS]?: ReadonlyArray<'direct' | ToolCallerReferenceUnion<TOOLS>>;
+};
+
 declare const symbol$l: unique symbol;
 declare class InvalidToolInputError extends AISDKError {
     private readonly [symbol$l];
@@ -3373,7 +3388,7 @@ type StreamTextOnAbortCallback<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Co
  * @returns
  * A result object for accessing different stream types and additional information.
  */
-declare function streamText<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Context = Context, OUTPUT extends Output = Output<string, string, never>>({ model, tools, toolChoice, instructions, system, prompt, messages, allowSystemInMessages, maxRetries, abortSignal, timeout, headers, stopWhen, experimental_sandbox: sandbox, output, toolApproval, experimental_toolApprovalSecret, experimental_telemetry, telemetry, prepareStep, providerOptions, activeTools, toolOrder, experimental_repairToolCall, repairToolCall, experimental_refineToolInput: refineToolInput, experimental_transform: transform, experimental_download: download, includeRawChunks, onChunk, onError, onFinish, onEnd, onAbort, onStepEnd, onStepFinish, onStart, experimental_onStart, onStepStart, experimental_onStepStart, onLanguageModelCallStart, experimental_onLanguageModelCallStart, onLanguageModelCallEnd, experimental_onLanguageModelCallEnd, onToolExecutionStart, onToolExecutionEnd, experimental_onToolCallStart, experimental_onToolCallFinish, runtimeContext, toolsContext, experimental_include, include, _internal: { now, generateId, generateCallId, }, ...settings }: LanguageModelCallOptions & RequestOptions<TOOLS> & Prompt & ToolsContextParameter<TOOLS> & {
+declare function streamText<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Context = Context, OUTPUT extends Output = Output<string, string, never>>({ model, tools, toolChoice, instructions, system, prompt, messages, allowSystemInMessages, maxRetries, abortSignal, timeout, headers, stopWhen, experimental_sandbox: sandbox, output, toolApproval, experimental_toolCallers, experimental_toolApprovalSecret, experimental_telemetry, telemetry, prepareStep, providerOptions, activeTools, toolOrder, experimental_repairToolCall, repairToolCall, experimental_refineToolInput: refineToolInput, experimental_transform: transform, experimental_download: download, includeRawChunks, onChunk, onError, onFinish, onEnd, onAbort, onStepEnd, onStepFinish, onStart, experimental_onStart, onStepStart, experimental_onStepStart, onLanguageModelCallStart, experimental_onLanguageModelCallStart, onLanguageModelCallEnd, experimental_onLanguageModelCallEnd, onToolExecutionStart, onToolExecutionEnd, experimental_onToolCallStart, experimental_onToolCallFinish, runtimeContext, toolsContext, experimental_include, include, _internal: { now, generateId, generateCallId, }, ...settings }: LanguageModelCallOptions & RequestOptions<TOOLS> & Prompt & ToolsContextParameter<TOOLS> & {
     /**
      * The language model to use.
      */
@@ -3437,6 +3452,10 @@ declare function streamText<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Conte
      * This configuration takes precedence over tool-defined approval settings.
      */
     toolApproval?: ToolApprovalConfiguration<TOOLS, RUNTIME_CONTEXT>;
+    /**
+     * Configures which caller tools may invoke each tool.
+     */
+    experimental_toolCallers?: Experimental_ToolCallers<NoInfer<TOOLS>>;
     /**
      * Secret for HMAC-signing tool approval requests. When set, the server
      * signs each approval request at issuance and verifies the signature when
@@ -4452,8 +4471,10 @@ interface GenerateTextResult<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Cont
      */
     readonly finalStep: StepResult<TOOLS, RUNTIME_CONTEXT>;
     /**
-     * The generated structured output. It uses the `output` specification.
+     * The generated output according to the `output` specification.
      *
+     * @throws {NoOutputGeneratedError} When no output is available, for example
+     * when the final step does not finish with a `stop` reason.
      */
     readonly output: InferCompleteOutput<OUTPUT>;
 }
@@ -4610,21 +4631,6 @@ interface Agent<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, RUNTIME_CONTEX
     stream(options: AgentStreamParameters<CALL_OPTIONS, TOOLS, RUNTIME_CONTEXT>): PromiseLike<StreamTextResult<TOOLS, RUNTIME_CONTEXT, OUTPUT>>;
 }
 
-interface Experimental_ToolCallerReference<NAME extends string = string> {
-    readonly toolName: NAME;
-}
-type ToolCallerName<TOOLS extends ToolSet> = {
-    [NAME in keyof TOOLS]: TOOLS[NAME] extends Experimental_ToolCallerTool ? NAME : never;
-}[keyof TOOLS] & string;
-type ToolCallerReferenceUnion<TOOLS extends ToolSet> = {
-    [NAME in ToolCallerName<TOOLS>]: Experimental_ToolCallerReference<NAME>;
-}[ToolCallerName<TOOLS>];
-type Experimental_ToolCallers<TOOLS extends ToolSet> = (callers: {
-    [NAME in ToolCallerName<TOOLS>]: Experimental_ToolCallerReference<NAME>;
-}) => {
-    [NAME in keyof TOOLS]?: ReadonlyArray<'direct' | ToolCallerReferenceUnion<TOOLS>>;
-};
-
 type GenerateTextInclude = {
     /**
      * Whether to retain the request body in step results.
@@ -5002,6 +5008,10 @@ type ToolLoopAgentSettings<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, RUN
      * This configuration takes precedence over tool-defined approval settings.
      */
     toolApproval?: ToolApprovalConfiguration<NoInfer<TOOLS>, RUNTIME_CONTEXT>;
+    /**
+     * Configures which caller tools may invoke each tool.
+     */
+    experimental_toolCallers?: Experimental_ToolCallers<NoInfer<TOOLS>>;
     /**
      * Optional function that you can use to provide different settings for a step.
      */
@@ -5118,9 +5128,9 @@ type ToolLoopAgentSettings<CALL_OPTIONS = never, TOOLS extends ToolSet = {}, RUN
      *   }),
      * ```
      */
-    prepareCall?: (options: Omit<AgentCallParameters<CALL_OPTIONS, NoInfer<TOOLS>, NoInfer<RUNTIME_CONTEXT>>, 'onStepEnd' | 'onStepFinish'> & Pick<ToolLoopAgentSettings<CALL_OPTIONS, TOOLS, RUNTIME_CONTEXT, NoInfer<OUTPUT>>, 'model' | 'tools' | 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed' | 'headers' | 'instructions' | 'allowSystemInMessages' | 'stopWhen' | 'telemetry' | 'experimental_telemetry' | 'activeTools' | 'toolOrder' | 'toolApproval' | 'providerOptions' | 'experimental_download' | 'experimental_refineToolInput' | 'include' | 'runtimeContext' | '_internal'> & {
+    prepareCall?: (options: Omit<AgentCallParameters<CALL_OPTIONS, NoInfer<TOOLS>, NoInfer<RUNTIME_CONTEXT>>, 'onStepEnd' | 'onStepFinish'> & Pick<ToolLoopAgentSettings<CALL_OPTIONS, TOOLS, RUNTIME_CONTEXT, NoInfer<OUTPUT>>, 'model' | 'tools' | 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed' | 'headers' | 'instructions' | 'allowSystemInMessages' | 'stopWhen' | 'telemetry' | 'experimental_telemetry' | 'activeTools' | 'toolOrder' | 'toolApproval' | 'experimental_toolCallers' | 'providerOptions' | 'experimental_download' | 'experimental_refineToolInput' | 'include' | 'runtimeContext' | '_internal'> & {
         toolsContext: InferToolSetContext<TOOLS>;
-    }) => MaybePromiseLike<Pick<ToolLoopAgentSettings<CALL_OPTIONS, TOOLS, RUNTIME_CONTEXT, NoInfer<OUTPUT>>, 'model' | 'tools' | 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed' | 'headers' | 'instructions' | 'allowSystemInMessages' | 'stopWhen' | 'telemetry' | 'experimental_telemetry' | 'activeTools' | 'toolOrder' | 'toolApproval' | 'providerOptions' | 'experimental_download' | 'experimental_refineToolInput' | 'include' | 'runtimeContext' | '_internal'> & Omit<Prompt, 'system'> & {
+    }) => MaybePromiseLike<Pick<ToolLoopAgentSettings<CALL_OPTIONS, TOOLS, RUNTIME_CONTEXT, NoInfer<OUTPUT>>, 'model' | 'tools' | 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed' | 'headers' | 'instructions' | 'allowSystemInMessages' | 'stopWhen' | 'telemetry' | 'experimental_telemetry' | 'activeTools' | 'toolOrder' | 'toolApproval' | 'experimental_toolCallers' | 'providerOptions' | 'experimental_download' | 'experimental_refineToolInput' | 'include' | 'runtimeContext' | '_internal'> & Omit<Prompt, 'system'> & {
         toolsContext: InferToolSetContext<TOOLS>;
     }>;
 };

package/dist/index.js

@@ -1143,7 +1143,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.43" : "0.0.0-test";
+var VERSION = true ? "7.0.45" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -5279,6 +5279,28 @@ async function generateText({
   const resolvedOnToolExecutionStart = onToolExecutionStart != null ? onToolExecutionStart : experimental_onToolCallStart;
   const resolvedOnToolExecutionEnd = onToolExecutionEnd != null ? onToolExecutionEnd : experimental_onToolCallFinish;
   const resolvedOnStepEnd = onStepEnd != null ? onStepEnd : onStepFinish;
+  const unsupportedTimeoutWarnings = [];
+  if (getFirstChunkTimeoutMs(timeout) != null) {
+    unsupportedTimeoutWarnings.push({
+      type: "unsupported",
+      feature: "timeout.firstChunkMs",
+      details: "The firstChunkMs timeout is only supported by streaming functions."
+    });
+  }
+  if (getChunkTimeoutMs(timeout) != null) {
+    unsupportedTimeoutWarnings.push({
+      type: "unsupported",
+      feature: "timeout.chunkMs",
+      details: "The chunkMs timeout is only supported by streaming functions."
+    });
+  }
+  if (unsupportedTimeoutWarnings.length > 0) {
+    logWarnings({
+      warnings: unsupportedTimeoutWarnings,
+      provider: model.provider,
+      model: model.modelId
+    });
+  }
   const totalTimeoutMs = getTotalTimeoutMs(timeout);
   const stepTimeoutMs = getStepTimeoutMs(timeout);
   const stepAbortController = stepTimeoutMs != null ? new AbortController() : void 0;
@@ -5642,7 +5664,7 @@ async function generateText({
                 event: {
                   callId,
                   provider: stepModel.provider,
-                  modelId: stepModel.modelId,
+                  modelId: currentModelResponse.response.modelId,
                   finishReason: currentModelResponse.finishReason.unified,
                   usage: stepUsage,
                   content: modelCallContent,
@@ -8360,12 +8382,13 @@ function createLanguageModelV4StreamPartToLanguageModelStreamPartTransform({
   const textPartIndexes = /* @__PURE__ */ new Map();
   const reasoningPartIndexes = /* @__PURE__ */ new Map();
   let responseId = generateId2();
+  let responseModelId = modelId;
   let timeToFirstOutputMs;
   let previousOutputChunkTimestampMs;
   const timeBetweenOutputChunksMs = [];
   return new TransformStream({
     async transform(chunk, controller) {
-      var _a23, _b;
+      var _a23, _b, _c;
       if (isOutputChunk(chunk)) {
         const outputChunkTimestampMs = now2();
         if (timeToFirstOutputMs == null) {
@@ -8498,7 +8521,7 @@ function createLanguageModelV4StreamPartToLanguageModelStreamPartTransform({
             event: {
               callId,
               provider,
-              modelId,
+              modelId: responseModelId,
               finishReason: chunk.finishReason.unified,
               usage,
               content: modelCallContent,
@@ -8618,6 +8641,7 @@ function createLanguageModelV4StreamPartToLanguageModelStreamPartTransform({
         }
         case "response-metadata": {
           responseId = (_b = chunk.id) != null ? _b : responseId;
+          responseModelId = (_c = chunk.modelId) != null ? _c : responseModelId;
           controller.enqueue({
             type: "model-call-response-metadata",
             id: chunk.id,
@@ -8750,6 +8774,7 @@ function streamText({
   experimental_sandbox: sandbox,
   output,
   toolApproval,
+  experimental_toolCallers,
   experimental_toolApprovalSecret,
   experimental_telemetry,
   telemetry = experimental_telemetry,
@@ -8847,6 +8872,7 @@ function streamText({
     stopConditions: asArray6(stopWhen),
     output,
     toolApproval,
+    experimental_toolCallers,
     experimental_toolApprovalSecret,
     providerOptions,
     prepareStep,
@@ -8976,6 +9002,7 @@ var DefaultStreamTextResult = class {
     stopConditions,
     output,
     toolApproval,
+    experimental_toolCallers,
     experimental_toolApprovalSecret,
     providerOptions,
     prepareStep,
@@ -9006,6 +9033,10 @@ var DefaultStreamTextResult = class {
     this._initialResponseMessages = new DelayedPromise();
     this.outputSpecification = output;
     this.tools = tools;
+    const resolvedToolCallers = resolveToolCallerConfiguration({
+      tools,
+      toolCallers: experimental_toolCallers
+    });
     const telemetryDispatcher = createRestrictedTelemetryDispatcher({
       telemetry,
       includeRuntimeContext: telemetry == null ? void 0 : telemetry.includeRuntimeContext,
@@ -9619,9 +9650,16 @@ var DefaultStreamTextResult = class {
             tools,
             activeTools: (_f = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _f : activeTools
           });
+          const {
+            executionTools: stepExecutionTools,
+            modelTools: stepModelTools
+          } = prepareToolsForToolCallers({
+            tools: stepActiveTools,
+            toolCallers: resolvedToolCallers
+          });
           const stepToolOrder = (_g = prepareStepResult == null ? void 0 : prepareStepResult.toolOrder) != null ? _g : toolOrder;
           const stepTools = await prepareTools({
-            tools: stepActiveTools,
+            tools: stepModelTools,
             toolOrder: stepToolOrder,
             // active tools context is a subset of the tools context, so we can cast to the unknown type
             toolsContext,
@@ -9654,7 +9692,7 @@ var DefaultStreamTextResult = class {
                 var _a25, _b2;
                 return streamLanguageModelCall({
                   model: (_a25 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a25 : model,
-                  tools: stepActiveTools,
+                  tools: stepModelTools,
                   toolOrder: stepToolOrder,
                   toolChoice: (_b2 = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _b2 : toolChoice,
                   instructions: stepInstructions,
@@ -9717,7 +9755,7 @@ var DefaultStreamTextResult = class {
           startFirstChunkTimeout();
           const streamAfterToolCallbackInvocation = invokeToolCallbacksFromStream({
             stream: languageModelStream,
-            tools,
+            tools: stepExecutionTools,
             stepInputMessages: stepMessages,
             abortSignal,
             runtimeContext
@@ -9727,7 +9765,7 @@ var DefaultStreamTextResult = class {
           );
           const streamWithToolResults = executeToolsFromStream({
             stream: streamAfterToolCallbackInvocation,
-            tools,
+            tools: stepExecutionTools,
             callId,
             messages: stepMessages,
             abortSignal,
@@ -9937,7 +9975,7 @@ var DefaultStreamTextResult = class {
                   for (const toolCall of stepToolCalls) {
                     if (toolCall.providerExecuted !== true)
                       continue;
-                    const tool2 = getOwn(tools, toolCall.toolName);
+                    const tool2 = getOwn(stepExecutionTools, toolCall.toolName);
                     if ((tool2 == null ? void 0 : tool2.type) === "provider" && tool2.supportsDeferredResults) {
                       const hasResultInStep = stepToolOutputs.some(
                         (output2) => (output2.type === "tool-result" || output2.type === "tool-error") && output2.toolCallId === toolCall.toolCallId