ai 3.1.17 → 3.1.19

package/dist/index.d.mts

@@ -728,34 +728,6 @@ onlyBar('bar');
 */
 type ValueOf<ObjectType, ValueType extends keyof ObjectType = keyof ObjectType> = ObjectType[ValueType];
 
-/**
-Typed tool call that is returned by generateText and streamText.
-It contains the tool call ID, the tool name, and the tool arguments.
- */
-interface ToolCall$1<NAME extends string, ARGS> {
-    /**
-  ID of the tool call. This ID is used to match the tool call with the tool result.
-   */
-    toolCallId: string;
-    /**
-  Name of the tool that is being called.
-   */
-    toolName: NAME;
-    /**
-  Arguments of the tool call. This is a JSON-serializable object that matches the tool's input schema.
-     */
-    args: ARGS;
-}
-type ToToolCall<TOOLS extends Record<string, CoreTool>> = ValueOf<{
-    [NAME in keyof TOOLS]: {
-        type: 'tool-call';
-        toolCallId: string;
-        toolName: NAME & string;
-        args: z.infer<TOOLS[NAME]['parameters']>;
-    };
-}>;
-type ToToolCallArray<TOOLS extends Record<string, CoreTool>> = Array<ToToolCall<TOOLS>>;
-
 /**
 Typed tool result that is returned by generateText and streamText.
 It contains the tool call ID, the tool name, the tool arguments, and the tool result.
@@ -798,6 +770,44 @@ type ToToolResultObject<TOOLS extends Record<string, CoreTool>> = ValueOf<{
 type ToToolResult<TOOLS extends Record<string, CoreTool>> = ToToolResultObject<ToToolsWithDefinedExecute<ToToolsWithExecute<TOOLS>>>;
 type ToToolResultArray<TOOLS extends Record<string, CoreTool>> = Array<ToToolResult<TOOLS>>;
 
+/**
+Converts an array of messages from useChat into an array of CoreMessages that can be used
+with the AI core functions (e.g. `streamText`).
+ */
+declare function convertToCoreMessages(messages: Array<{
+    role: 'user' | 'assistant';
+    content: string;
+    toolInvocations?: Array<ToolResult<string, unknown, unknown>>;
+}>): CoreMessage[];
+
+/**
+Typed tool call that is returned by generateText and streamText.
+It contains the tool call ID, the tool name, and the tool arguments.
+ */
+interface ToolCall$1<NAME extends string, ARGS> {
+    /**
+  ID of the tool call. This ID is used to match the tool call with the tool result.
+   */
+    toolCallId: string;
+    /**
+  Name of the tool that is being called.
+   */
+    toolName: NAME;
+    /**
+  Arguments of the tool call. This is a JSON-serializable object that matches the tool's input schema.
+     */
+    args: ARGS;
+}
+type ToToolCall<TOOLS extends Record<string, CoreTool>> = ValueOf<{
+    [NAME in keyof TOOLS]: {
+        type: 'tool-call';
+        toolCallId: string;
+        toolName: NAME & string;
+        args: z.infer<TOOLS[NAME]['parameters']>;
+    };
+}>;
+type ToToolCallArray<TOOLS extends Record<string, CoreTool>> = Array<ToToolCall<TOOLS>>;
+
 /**
 Generate a text and call tools for a given prompt using a language model.
 
@@ -876,6 +886,14 @@ declare class GenerateTextResult<TOOLS extends Record<string, CoreTool>> {
      */
     readonly warnings: CallWarning[] | undefined;
     /**
+  The response messages that were generated during the call. It consists of an assistant message,
+  potentially containing tool calls.
+  When there are tool results, there is an additional tool message with the tool results that are available.
+  If there are tools that do not have execute functions, they are not included in the tool results and
+  need to be added separately.
+     */
+    readonly responseMessages: Array<CoreAssistantMessage | CoreToolMessage>;
+    /**
   Optional raw response data.
      */
     rawResponse?: {
@@ -1143,16 +1161,6 @@ declare class StreamTextResult<TOOLS extends Record<string, CoreTool>> {
  */
 declare const experimental_streamText: typeof streamText;
 
-/**
-Converts an array of messages from useChat into an array of CoreMessages that can be used
-with the AI core functions (e.g. `streamText`).
- */
-declare function convertToCoreMessages(messages: Array<{
-    role: 'user' | 'assistant';
-    content: string;
-    toolInvocations?: Array<ToolResult<string, unknown, unknown>>;
-}>): CoreMessage[];
-
 type AssistantStatus = 'in_progress' | 'awaiting_message';
 type UseAssistantOptions = {
     /**

package/dist/index.d.ts

@@ -728,34 +728,6 @@ onlyBar('bar');
 */
 type ValueOf<ObjectType, ValueType extends keyof ObjectType = keyof ObjectType> = ObjectType[ValueType];
 
-/**
-Typed tool call that is returned by generateText and streamText.
-It contains the tool call ID, the tool name, and the tool arguments.
- */
-interface ToolCall$1<NAME extends string, ARGS> {
-    /**
-  ID of the tool call. This ID is used to match the tool call with the tool result.
-   */
-    toolCallId: string;
-    /**
-  Name of the tool that is being called.
-   */
-    toolName: NAME;
-    /**
-  Arguments of the tool call. This is a JSON-serializable object that matches the tool's input schema.
-     */
-    args: ARGS;
-}
-type ToToolCall<TOOLS extends Record<string, CoreTool>> = ValueOf<{
-    [NAME in keyof TOOLS]: {
-        type: 'tool-call';
-        toolCallId: string;
-        toolName: NAME & string;
-        args: z.infer<TOOLS[NAME]['parameters']>;
-    };
-}>;
-type ToToolCallArray<TOOLS extends Record<string, CoreTool>> = Array<ToToolCall<TOOLS>>;
-
 /**
 Typed tool result that is returned by generateText and streamText.
 It contains the tool call ID, the tool name, the tool arguments, and the tool result.
@@ -798,6 +770,44 @@ type ToToolResultObject<TOOLS extends Record<string, CoreTool>> = ValueOf<{
 type ToToolResult<TOOLS extends Record<string, CoreTool>> = ToToolResultObject<ToToolsWithDefinedExecute<ToToolsWithExecute<TOOLS>>>;
 type ToToolResultArray<TOOLS extends Record<string, CoreTool>> = Array<ToToolResult<TOOLS>>;
 
+/**
+Converts an array of messages from useChat into an array of CoreMessages that can be used
+with the AI core functions (e.g. `streamText`).
+ */
+declare function convertToCoreMessages(messages: Array<{
+    role: 'user' | 'assistant';
+    content: string;
+    toolInvocations?: Array<ToolResult<string, unknown, unknown>>;
+}>): CoreMessage[];
+
+/**
+Typed tool call that is returned by generateText and streamText.
+It contains the tool call ID, the tool name, and the tool arguments.
+ */
+interface ToolCall$1<NAME extends string, ARGS> {
+    /**
+  ID of the tool call. This ID is used to match the tool call with the tool result.
+   */
+    toolCallId: string;
+    /**
+  Name of the tool that is being called.
+   */
+    toolName: NAME;
+    /**
+  Arguments of the tool call. This is a JSON-serializable object that matches the tool's input schema.
+     */
+    args: ARGS;
+}
+type ToToolCall<TOOLS extends Record<string, CoreTool>> = ValueOf<{
+    [NAME in keyof TOOLS]: {
+        type: 'tool-call';
+        toolCallId: string;
+        toolName: NAME & string;
+        args: z.infer<TOOLS[NAME]['parameters']>;
+    };
+}>;
+type ToToolCallArray<TOOLS extends Record<string, CoreTool>> = Array<ToToolCall<TOOLS>>;
+
 /**
 Generate a text and call tools for a given prompt using a language model.
 
@@ -876,6 +886,14 @@ declare class GenerateTextResult<TOOLS extends Record<string, CoreTool>> {
      */
     readonly warnings: CallWarning[] | undefined;
     /**
+  The response messages that were generated during the call. It consists of an assistant message,
+  potentially containing tool calls.
+  When there are tool results, there is an additional tool message with the tool results that are available.
+  If there are tools that do not have execute functions, they are not included in the tool results and
+  need to be added separately.
+     */
+    readonly responseMessages: Array<CoreAssistantMessage | CoreToolMessage>;
+    /**
   Optional raw response data.
      */
     rawResponse?: {
@@ -1143,16 +1161,6 @@ declare class StreamTextResult<TOOLS extends Record<string, CoreTool>> {
  */
 declare const experimental_streamText: typeof streamText;
 
-/**
-Converts an array of messages from useChat into an array of CoreMessages that can be used
-with the AI core functions (e.g. `streamText`).
- */
-declare function convertToCoreMessages(messages: Array<{
-    role: 'user' | 'assistant';
-    content: string;
-    toolInvocations?: Array<ToolResult<string, unknown, unknown>>;
-}>): CoreMessage[];
-
 type AssistantStatus = 'in_progress' | 'awaiting_message';
 type UseAssistantOptions = {
     /**

package/dist/index.js

@@ -1408,8 +1408,32 @@ var GenerateTextResult = class {
     this.warnings = options.warnings;
     this.rawResponse = options.rawResponse;
     this.logprobs = options.logprobs;
+    this.responseMessages = toResponseMessages(options);
   }
 };
+function toResponseMessages({
+  text,
+  toolCalls,
+  toolResults
+}) {
+  const responseMessages = [];
+  responseMessages.push({
+    role: "assistant",
+    content: [{ type: "text", text }, ...toolCalls]
+  });
+  if (toolResults.length > 0) {
+    responseMessages.push({
+      role: "tool",
+      content: toolResults.map((result) => ({
+        type: "tool-result",
+        toolCallId: result.toolCallId,
+        toolName: result.toolName,
+        result: result.result
+      }))
+    });
+  }
+  return responseMessages;
+}
 var experimental_generateText = generateText;
 
 // core/generate-text/run-tools-transformation.ts
@@ -3346,9 +3370,7 @@ async function parseComplexResponse({
       }
       prefixMap.text.toolInvocations.push(value);
       if (onToolCall) {
-        console.log("onToolCall", value);
         const result = await onToolCall({ toolCall: value });
-        console.log("onToolCall result", result);
         if (result != null) {
           prefixMap.text.toolInvocations[prefixMap.text.toolInvocations.length - 1] = { ...value, result };
         }