ai 4.0.0 → 4.0.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ai
 
+## 4.0.1
+
+### Patch Changes
+
+- b117255: feat (ai/core): add messages to tool call options
+
 ## 4.0.0
 
 ### Major Changes

package/dist/index.d.mts

@@ -1203,6 +1203,14 @@ type CoreTool<PARAMETERS extends Parameters = any, RESULT = any> = {
   @options.abortSignal is a signal that can be used to abort the tool call.
      */
     execute?: (args: inferParameters<PARAMETERS>, options: {
+        /**
+         * Messages that were sent to the language model to initiate the response that contained the tool call.
+         * The messages **do not** include the system prompt nor the assistant response that contained the tool call.
+         */
+        messages: CoreMessage[];
+        /**
+         * An optional abort signal that indicates that the overall operation should be aborted.
+         */
         abortSignal?: AbortSignal;
     }) => PromiseLike<RESULT>;
 } & ({
@@ -1233,10 +1241,12 @@ Helper function for inferring the execute args of a tool.
  */
 declare function tool<PARAMETERS extends Parameters, RESULT>(tool: CoreTool<PARAMETERS, RESULT> & {
     execute: (args: inferParameters<PARAMETERS>, options: {
+        messages: CoreMessage[];
         abortSignal?: AbortSignal;
     }) => PromiseLike<RESULT>;
 }): CoreTool<PARAMETERS, RESULT> & {
     execute: (args: inferParameters<PARAMETERS>, options: {
+        messages: CoreMessage[];
         abortSignal?: AbortSignal;
     }) => PromiseLike<RESULT>;
 };

package/dist/index.d.ts

@@ -1203,6 +1203,14 @@ type CoreTool<PARAMETERS extends Parameters = any, RESULT = any> = {
   @options.abortSignal is a signal that can be used to abort the tool call.
      */
     execute?: (args: inferParameters<PARAMETERS>, options: {
+        /**
+         * Messages that were sent to the language model to initiate the response that contained the tool call.
+         * The messages **do not** include the system prompt nor the assistant response that contained the tool call.
+         */
+        messages: CoreMessage[];
+        /**
+         * An optional abort signal that indicates that the overall operation should be aborted.
+         */
         abortSignal?: AbortSignal;
     }) => PromiseLike<RESULT>;
 } & ({
@@ -1233,10 +1241,12 @@ Helper function for inferring the execute args of a tool.
  */
 declare function tool<PARAMETERS extends Parameters, RESULT>(tool: CoreTool<PARAMETERS, RESULT> & {
     execute: (args: inferParameters<PARAMETERS>, options: {
+        messages: CoreMessage[];
         abortSignal?: AbortSignal;
     }) => PromiseLike<RESULT>;
 }): CoreTool<PARAMETERS, RESULT> & {
     execute: (args: inferParameters<PARAMETERS>, options: {
+        messages: CoreMessage[];
         abortSignal?: AbortSignal;
     }) => PromiseLike<RESULT>;
 };

package/dist/index.js

@@ -3324,15 +3324,16 @@ async function generateText({
       };
       let stepType = "initial";
       do {
-        if (stepCount === 1) {
-          initialPrompt.type = "messages";
-        }
         const promptFormat = stepCount === 0 ? initialPrompt.type : "messages";
+        const stepInputMessages = [
+          ...initialPrompt.messages,
+          ...responseMessages
+        ];
         const promptMessages = await convertToLanguageModelPrompt({
           prompt: {
             type: promptFormat,
             system: initialPrompt.system,
-            messages: [...initialPrompt.messages, ...responseMessages]
+            messages: stepInputMessages
           },
           modelSupportsImageUrls: model.supportsImageUrls,
           modelSupportsUrl: model.supportsUrl
@@ -3428,6 +3429,7 @@ async function generateText({
           tools,
           tracer,
           telemetry,
+          messages: stepInputMessages,
           abortSignal
         });
         const currentUsage = calculateLanguageModelUsage(
@@ -3538,6 +3540,7 @@ async function executeTools({
   tools,
   tracer,
   telemetry,
+  messages,
   abortSignal
 }) {
   const toolResults = await Promise.all(
@@ -3564,7 +3567,10 @@ async function executeTools({
         }),
         tracer,
         fn: async (span) => {
-          const result2 = await tool2.execute(toolCall.args, { abortSignal });
+          const result2 = await tool2.execute(toolCall.args, {
+            messages,
+            abortSignal
+          });
           try {
             span.setAttributes(
               selectTelemetryAttributes({
@@ -3709,6 +3715,7 @@ function runToolsTransformation({
   toolCallStreaming,
   tracer,
   telemetry,
+  messages,
   abortSignal
 }) {
   let toolResultsStreamController = null;
@@ -3804,7 +3811,10 @@ function runToolsTransformation({
                   }
                 }),
                 tracer,
-                fn: async (span) => tool2.execute(toolCall.args, { abortSignal }).then(
+                fn: async (span) => tool2.execute(toolCall.args, {
+                  messages,
+                  abortSignal
+                }).then(
                   (result) => {
                     toolResultsStreamController.enqueue({
                       ...toolCall,
@@ -4030,11 +4040,15 @@ var DefaultStreamTextResult = class {
           hasLeadingWhitespace
         }) {
           const promptFormat = responseMessages.length === 0 ? initialPrompt.type : "messages";
+          const stepInputMessages = [
+            ...initialPrompt.messages,
+            ...responseMessages
+          ];
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: {
               type: promptFormat,
               system: initialPrompt.system,
-              messages: [...initialPrompt.messages, ...responseMessages]
+              messages: stepInputMessages
             },
             modelSupportsImageUrls: model.supportsImageUrls,
             modelSupportsUrl: model.supportsUrl
@@ -4110,6 +4124,7 @@ var DefaultStreamTextResult = class {
             toolCallStreaming,
             tracer,
             telemetry,
+            messages: stepInputMessages,
             abortSignal
           });
           const stepRequest = request != null ? request : {};