ai 3.2.26 → 3.2.28

package/dist/index.d.mts

@@ -706,15 +706,12 @@ The result of a `streamObject` call that contains the partial object stream and
  */
 declare class StreamObjectResult<T> {
     private readonly originalStream;
+    private readonly objectPromise;
     /**
   Warnings from the model provider (e.g. unsupported settings)
      */
     readonly warnings: CallWarning[] | undefined;
     /**
-  The generated object (typed according to the schema). Resolved when the response is finished.
-     */
-    readonly object: Promise<T>;
-    /**
   The token usage of the generated response. Resolved when the response is finished.
      */
     readonly usage: Promise<CompletionTokenUsage$1>;
@@ -737,6 +734,10 @@ declare class StreamObjectResult<T> {
         onFinish: Parameters<typeof streamObject<T>>[0]['onFinish'];
     });
     /**
+  The generated object (typed according to the schema). Resolved when the response is finished.
+     */
+    get object(): Promise<T>;
+    /**
   Stream of partial objects. It gets more complete as the stream progresses.
     
   Note that the partial object is not validated.
@@ -909,7 +910,7 @@ Converts an array of messages from useChat into an array of CoreMessages that ca
 with the AI core functions (e.g. `streamText`).
  */
 declare function convertToCoreMessages(messages: Array<{
-    role: 'user' | 'assistant';
+    role: 'user' | 'assistant' | 'system';
     content: string;
     toolInvocations?: Array<ToolResult<string, unknown, unknown>>;
     experimental_attachments?: Attachment[];
@@ -1183,7 +1184,7 @@ If set and supported by the model, calls will generate deterministic results.
 @return
 A result object for accessing different stream types and additional information.
  */
-declare function streamText<TOOLS extends Record<string, CoreTool>>({ model, tools, toolChoice, system, prompt, messages, maxRetries, abortSignal, headers, experimental_telemetry: telemetry, onFinish, ...settings }: CallSettings & Prompt & {
+declare function streamText<TOOLS extends Record<string, CoreTool>>({ model, tools, toolChoice, system, prompt, messages, maxRetries, abortSignal, headers, experimental_telemetry: telemetry, experimental_toolCallStreaming: toolCallStreaming, onFinish, ...settings }: CallSettings & Prompt & {
     /**
 The language model to use.
      */
@@ -1197,10 +1198,14 @@ The tool choice strategy. Default: 'auto'.
      */
     toolChoice?: CoreToolChoice<TOOLS>;
     /**
-     * Optional telemetry configuration (experimental).
+Optional telemetry configuration (experimental).
      */
     experimental_telemetry?: TelemetrySettings;
     /**
+Enable streaming of tool call deltas as they are generated. Disabled by default.
+     */
+    experimental_toolCallStreaming?: boolean;
+    /**
 Callback that is called when the LLM response and all request tool executions
 (for tools that have an `execute` function) are finished.
      */
@@ -1246,8 +1251,14 @@ type TextStreamPart<TOOLS extends Record<string, CoreTool>> = {
 } | ({
     type: 'tool-call';
 } & ToToolCall<TOOLS>) | {
-    type: 'error';
-    error: unknown;
+    type: 'tool-call-streaming-start';
+    toolCallId: string;
+    toolName: string;
+} | {
+    type: 'tool-call-delta';
+    toolCallId: string;
+    toolName: string;
+    argsTextDelta: string;
 } | ({
     type: 'tool-result';
 } & ToToolResult<TOOLS>) | {
@@ -1259,6 +1270,9 @@ type TextStreamPart<TOOLS extends Record<string, CoreTool>> = {
         completionTokens: number;
         totalTokens: number;
     };
+} | {
+    type: 'error';
+    error: unknown;
 };
 /**
 A result object for accessing different stream types and additional information.

package/dist/index.d.ts

@@ -706,15 +706,12 @@ The result of a `streamObject` call that contains the partial object stream and
  */
 declare class StreamObjectResult<T> {
     private readonly originalStream;
+    private readonly objectPromise;
     /**
   Warnings from the model provider (e.g. unsupported settings)
      */
     readonly warnings: CallWarning[] | undefined;
     /**
-  The generated object (typed according to the schema). Resolved when the response is finished.
-     */
-    readonly object: Promise<T>;
-    /**
   The token usage of the generated response. Resolved when the response is finished.
      */
     readonly usage: Promise<CompletionTokenUsage$1>;
@@ -737,6 +734,10 @@ declare class StreamObjectResult<T> {
         onFinish: Parameters<typeof streamObject<T>>[0]['onFinish'];
     });
     /**
+  The generated object (typed according to the schema). Resolved when the response is finished.
+     */
+    get object(): Promise<T>;
+    /**
   Stream of partial objects. It gets more complete as the stream progresses.
     
   Note that the partial object is not validated.
@@ -909,7 +910,7 @@ Converts an array of messages from useChat into an array of CoreMessages that ca
 with the AI core functions (e.g. `streamText`).
  */
 declare function convertToCoreMessages(messages: Array<{
-    role: 'user' | 'assistant';
+    role: 'user' | 'assistant' | 'system';
     content: string;
     toolInvocations?: Array<ToolResult<string, unknown, unknown>>;
     experimental_attachments?: Attachment[];
@@ -1183,7 +1184,7 @@ If set and supported by the model, calls will generate deterministic results.
 @return
 A result object for accessing different stream types and additional information.
  */
-declare function streamText<TOOLS extends Record<string, CoreTool>>({ model, tools, toolChoice, system, prompt, messages, maxRetries, abortSignal, headers, experimental_telemetry: telemetry, onFinish, ...settings }: CallSettings & Prompt & {
+declare function streamText<TOOLS extends Record<string, CoreTool>>({ model, tools, toolChoice, system, prompt, messages, maxRetries, abortSignal, headers, experimental_telemetry: telemetry, experimental_toolCallStreaming: toolCallStreaming, onFinish, ...settings }: CallSettings & Prompt & {
     /**
 The language model to use.
      */
@@ -1197,10 +1198,14 @@ The tool choice strategy. Default: 'auto'.
      */
     toolChoice?: CoreToolChoice<TOOLS>;
     /**
-     * Optional telemetry configuration (experimental).
+Optional telemetry configuration (experimental).
      */
     experimental_telemetry?: TelemetrySettings;
     /**
+Enable streaming of tool call deltas as they are generated. Disabled by default.
+     */
+    experimental_toolCallStreaming?: boolean;
+    /**
 Callback that is called when the LLM response and all request tool executions
 (for tools that have an `execute` function) are finished.
      */
@@ -1246,8 +1251,14 @@ type TextStreamPart<TOOLS extends Record<string, CoreTool>> = {
 } | ({
     type: 'tool-call';
 } & ToToolCall<TOOLS>) | {
-    type: 'error';
-    error: unknown;
+    type: 'tool-call-streaming-start';
+    toolCallId: string;
+    toolName: string;
+} | {
+    type: 'tool-call-delta';
+    toolCallId: string;
+    toolName: string;
+    argsTextDelta: string;
 } | ({
     type: 'tool-result';
 } & ToToolResult<TOOLS>) | {
@@ -1259,6 +1270,9 @@ type TextStreamPart<TOOLS extends Record<string, CoreTool>> = {
         completionTokens: number;
         totalTokens: number;
     };
+} | {
+    type: 'error';
+    error: unknown;
 };
 /**
 A result object for accessing different stream types and additional information.

package/dist/index.js

@@ -841,6 +841,44 @@ function createAsyncIterableStream(source, transformer) {
   return transformedStream;
 }
 
+// core/util/delayed-promise.ts
+var DelayedPromise = class {
+  constructor() {
+    this.status = { type: "pending" };
+    this._resolve = void 0;
+    this._reject = void 0;
+  }
+  get value() {
+    if (this.promise) {
+      return this.promise;
+    }
+    this.promise = new Promise((resolve, reject) => {
+      if (this.status.type === "resolved") {
+        resolve(this.status.value);
+      } else if (this.status.type === "rejected") {
+        reject(this.status.error);
+      }
+      this._resolve = resolve;
+      this._reject = reject;
+    });
+    return this.promise;
+  }
+  resolve(value) {
+    var _a;
+    this.status = { type: "resolved", value };
+    if (this.promise) {
+      (_a = this._resolve) == null ? void 0 : _a.call(this, value);
+    }
+  }
+  reject(error) {
+    var _a;
+    this.status = { type: "rejected", error };
+    if (this.promise) {
+      (_a = this._reject) == null ? void 0 : _a.call(this, error);
+    }
+  }
+};
+
 // core/generate-object/stream-object.ts
 async function streamObject({
   model,
@@ -985,12 +1023,7 @@ var StreamObjectResult = class {
   }) {
     this.warnings = warnings;
     this.rawResponse = rawResponse;
-    let resolveObject;
-    let rejectObject;
-    this.object = new Promise((resolve, reject) => {
-      resolveObject = resolve;
-      rejectObject = reject;
-    });
+    this.objectPromise = new DelayedPromise();
     let resolveUsage;
     this.usage = new Promise((resolve) => {
       resolveUsage = resolve;
@@ -1001,6 +1034,7 @@ var StreamObjectResult = class {
     let accumulatedText = "";
     let delta = "";
     let latestObject = void 0;
+    const self = this;
     this.originalStream = stream.pipeThrough(
       new TransformStream({
         async transform(chunk, controller) {
@@ -1041,10 +1075,10 @@ var StreamObjectResult = class {
               });
               if (validationResult.success) {
                 object = validationResult.value;
-                resolveObject(object);
+                self.objectPromise.resolve(object);
               } else {
                 error = validationResult.error;
-                rejectObject(error);
+                self.objectPromise.reject(error);
               }
               break;
             }
@@ -1076,6 +1110,12 @@ var StreamObjectResult = class {
     );
   }
   /**
+  The generated object (typed according to the schema). Resolved when the response is finished.
+     */
+  get object() {
+    return this.objectPromise.value;
+  }
+  /**
   Stream of partial objects. It gets more complete as the stream progresses.
     
   Note that the partial object is not validated. 
@@ -1457,6 +1497,11 @@ async function generateText({
       let roundtripCount = 0;
       const responseMessages = [];
       const roundtrips = [];
+      const usage = {
+        completionTokens: 0,
+        promptTokens: 0,
+        totalTokens: 0
+      };
       do {
         const currentInputFormat = roundtripCount === 0 ? validatedPrompt.type : "messages";
         currentModelResponse = await retry(
@@ -1496,12 +1541,18 @@ async function generateText({
           tools,
           tracer
         });
+        const currentUsage = calculateCompletionTokenUsage(
+          currentModelResponse.usage
+        );
+        usage.completionTokens += currentUsage.completionTokens;
+        usage.promptTokens += currentUsage.promptTokens;
+        usage.totalTokens += currentUsage.totalTokens;
         roundtrips.push({
           text: (_b = currentModelResponse.text) != null ? _b : "",
           toolCalls: currentToolCalls,
           toolResults: currentToolResults,
           finishReason: currentModelResponse.finishReason,
-          usage: calculateCompletionTokenUsage(currentModelResponse.usage),
+          usage: currentUsage,
           warnings: currentModelResponse.warnings,
           logprobs: currentModelResponse.logprobs
         });
@@ -1535,7 +1586,7 @@ async function generateText({
         toolCalls: currentToolCalls,
         toolResults: currentToolResults,
         finishReason: currentModelResponse.finishReason,
-        usage: calculateCompletionTokenUsage(currentModelResponse.usage),
+        usage,
         warnings: currentModelResponse.warnings,
         rawResponse: currentModelResponse.rawResponse,
         logprobs: currentModelResponse.logprobs,
@@ -1632,6 +1683,7 @@ var import_ui_utils2 = require("@ai-sdk/ui-utils");
 function runToolsTransformation({
   tools,
   generatorStream,
+  toolCallStreaming,
   tracer
 }) {
   let canClose = false;
@@ -1642,6 +1694,7 @@ function runToolsTransformation({
       toolResultsStreamController = controller;
     }
   });
+  const activeToolCalls = {};
   const forwardStream = new TransformStream({
     transform(chunk, controller) {
       const chunkType = chunk.type;
@@ -1651,6 +1704,25 @@ function runToolsTransformation({
           controller.enqueue(chunk);
           break;
         }
+        case "tool-call-delta": {
+          if (toolCallStreaming) {
+            if (!activeToolCalls[chunk.toolCallId]) {
+              controller.enqueue({
+                type: "tool-call-streaming-start",
+                toolCallId: chunk.toolCallId,
+                toolName: chunk.toolName
+              });
+              activeToolCalls[chunk.toolCallId] = true;
+            }
+            controller.enqueue({
+              type: "tool-call-delta",
+              toolCallId: chunk.toolCallId,
+              toolName: chunk.toolName,
+              argsTextDelta: chunk.argsTextDelta
+            });
+          }
+          break;
+        }
         case "tool-call": {
           const toolName = chunk.toolName;
           if (tools == null) {
@@ -1736,9 +1808,6 @@ function runToolsTransformation({
           });
           break;
         }
-        case "tool-call-delta": {
-          break;
-        }
         default: {
           const _exhaustiveCheck = chunkType;
           throw new Error(`Unhandled chunk type: ${_exhaustiveCheck}`);
@@ -1791,6 +1860,7 @@ async function streamText({
   abortSignal,
   headers,
   experimental_telemetry: telemetry,
+  experimental_toolCallStreaming: toolCallStreaming = false,
   onFinish,
   ...settings
 }) {
@@ -1851,6 +1921,7 @@ async function streamText({
         stream: runToolsTransformation({
           tools,
           generatorStream: stream,
+          toolCallStreaming,
           tracer
         }),
         warnings,
@@ -1928,6 +1999,8 @@ var StreamTextResult = class {
               resolveText(text);
               resolveToolCalls(toolCalls);
               break;
+            case "tool-call-streaming-start":
+            case "tool-call-delta":
             case "error":
               break;
             default: {
@@ -2071,10 +2144,27 @@ var StreamTextResult = class {
     });
     const streamDataTransformer = new TransformStream({
       transform: async (chunk, controller) => {
-        switch (chunk.type) {
+        const chunkType = chunk.type;
+        switch (chunkType) {
           case "text-delta":
             controller.enqueue((0, import_ui_utils6.formatStreamPart)("text", chunk.textDelta));
             break;
+          case "tool-call-streaming-start":
+            controller.enqueue(
+              (0, import_ui_utils6.formatStreamPart)("tool_call_streaming_start", {
+                toolCallId: chunk.toolCallId,
+                toolName: chunk.toolName
+              })
+            );
+            break;
+          case "tool-call-delta":
+            controller.enqueue(
+              (0, import_ui_utils6.formatStreamPart)("tool_call_delta", {
+                toolCallId: chunk.toolCallId,
+                argsTextDelta: chunk.argsTextDelta
+              })
+            );
+            break;
           case "tool-call":
             controller.enqueue(
               (0, import_ui_utils6.formatStreamPart)("tool_call", {
@@ -2099,6 +2189,12 @@ var StreamTextResult = class {
               (0, import_ui_utils6.formatStreamPart)("error", JSON.stringify(chunk.error))
             );
             break;
+          case "finish":
+            break;
+          default: {
+            const exhaustiveCheck = chunkType;
+            throw new Error(`Unknown chunk type: ${exhaustiveCheck}`);
+          }
         }
       }
     });
@@ -2261,6 +2357,13 @@ function convertToCoreMessages(messages) {
     experimental_attachments
   } of messages) {
     switch (role) {
+      case "system": {
+        coreMessages.push({
+          role: "system",
+          content
+        });
+        break;
+      }
       case "user": {
         coreMessages.push({
           role: "user",