@jaypie/llm 1.3.7 → 1.3.8

package/dist/cjs/index.d.cts

@@ -227,9 +227,21 @@ declare class Toolkit {
     private readonly log;
     constructor(tools: LlmTool[], options?: ToolkitOptions);
     get tools(): Omit<LlmTool, "call">[];
-    call({ name, arguments: args }: {
+    private parseArgs;
+    /**
+     * Resolve a tool's `message` (static string or function of args) without
+     * calling the tool. Returns undefined when the tool is missing or defines
+     * no message. Never throws; resolution errors log at warn.
+     */
+    resolveMessage({ name, arguments: args, }: {
+        name: string;
+        arguments: string;
+    }): Promise<string | undefined>;
+    call({ name, arguments: args, message: resolvedMessage, }: {
         name: string;
         arguments: string;
+        /** Pre-resolved tool message; skips re-resolving `tool.message` for logging */
+        message?: string;
     }): Promise<_jaypie_types.AnyValue>;
     extend(tools: LlmTool[], options?: {
         warn?: boolean;
@@ -415,6 +427,8 @@ declare enum LlmProgressEventType {
 interface LlmProgressToolCall {
     /** JSON string of arguments (tool_call events only) */
     arguments?: string;
+    /** Resolved `LlmTool.message`, when the tool defines one (tool_call events only) */
+    message?: string;
     /** Tool name */
     name: string;
 }
@@ -461,19 +475,23 @@ interface LlmOperateOptions {
             content: string | JsonObject;
             usage: LlmUsage;
         }) => unknown | Promise<unknown>;
-        afterEachTool?: ({ result, toolName, args, }: {
+        afterEachTool?: ({ result, toolName, args, message, }: {
             result: unknown;
             toolName: string;
             args: string;
+            /** Resolved `LlmTool.message`, when the tool defines one */
+            message?: string;
         }) => unknown | Promise<unknown>;
         beforeEachModelRequest?: ({ input, options, providerRequest, }: {
             input: string | LlmHistory | LlmInputMessage;
             options?: LlmOperateOptions;
             providerRequest: any;
         }) => unknown | Promise<unknown>;
-        beforeEachTool?: ({ toolName, args, }: {
+        beforeEachTool?: ({ toolName, args, message, }: {
             toolName: string;
             args: string;
+            /** Resolved `LlmTool.message`, when the tool defines one */
+            message?: string;
         }) => unknown | Promise<unknown>;
         onRetryableModelError?: ({ input, options, providerRequest, error, }: {
             input: string | LlmHistory | LlmInputMessage;
@@ -481,10 +499,12 @@ interface LlmOperateOptions {
             providerRequest: any;
             error: any;
         }) => unknown | Promise<unknown>;
-        onToolError?: ({ error, toolName, args, }: {
+        onToolError?: ({ error, toolName, args, message, }: {
             error: Error;
             toolName: string;
             args: string;
+            /** Resolved `LlmTool.message`, when the tool defines one */
+            message?: string;
         }) => unknown | Promise<unknown>;
         onUnrecoverableModelError?: ({ input, options, providerRequest, error, }: {
             input: string | LlmHistory | LlmInputMessage;

package/dist/cjs/src/operate/hooks/HookRunner.d.ts

@@ -15,16 +15,19 @@ export interface AfterModelResponseContext {
 }
 export interface BeforeToolContext {
     args: string;
+    message?: string;
     toolName: string;
 }
 export interface AfterToolContext {
     args: string;
+    message?: string;
     result: unknown;
     toolName: string;
 }
 export interface ToolErrorContext {
     args: string;
     error: Error;
+    message?: string;
     toolName: string;
 }
 export interface RetryableErrorContext {

package/dist/cjs/src/tools/Toolkit.class.d.ts

@@ -14,9 +14,21 @@ export declare class Toolkit {
     private readonly log;
     constructor(tools: LlmTool[], options?: ToolkitOptions);
     get tools(): Omit<LlmTool, "call">[];
-    call({ name, arguments: args }: {
+    private parseArgs;
+    /**
+     * Resolve a tool's `message` (static string or function of args) without
+     * calling the tool. Returns undefined when the tool is missing or defines
+     * no message. Never throws; resolution errors log at warn.
+     */
+    resolveMessage({ name, arguments: args, }: {
         name: string;
         arguments: string;
+    }): Promise<string | undefined>;
+    call({ name, arguments: args, message: resolvedMessage, }: {
+        name: string;
+        arguments: string;
+        /** Pre-resolved tool message; skips re-resolving `tool.message` for logging */
+        message?: string;
     }): Promise<import("@jaypie/types").AnyValue>;
     extend(tools: LlmTool[], options?: {
         warn?: boolean;

package/dist/cjs/src/types/LlmProvider.interface.d.ts

@@ -179,6 +179,8 @@ export declare enum LlmProgressEventType {
 export interface LlmProgressToolCall {
     /** JSON string of arguments (tool_call events only) */
     arguments?: string;
+    /** Resolved `LlmTool.message`, when the tool defines one (tool_call events only) */
+    message?: string;
     /** Tool name */
     name: string;
 }
@@ -225,19 +227,23 @@ export interface LlmOperateOptions {
             content: string | JsonObject;
             usage: LlmUsage;
         }) => unknown | Promise<unknown>;
-        afterEachTool?: ({ result, toolName, args, }: {
+        afterEachTool?: ({ result, toolName, args, message, }: {
             result: unknown;
             toolName: string;
             args: string;
+            /** Resolved `LlmTool.message`, when the tool defines one */
+            message?: string;
         }) => unknown | Promise<unknown>;
         beforeEachModelRequest?: ({ input, options, providerRequest, }: {
             input: string | LlmHistory | LlmInputMessage;
             options?: LlmOperateOptions;
             providerRequest: any;
         }) => unknown | Promise<unknown>;
-        beforeEachTool?: ({ toolName, args, }: {
+        beforeEachTool?: ({ toolName, args, message, }: {
             toolName: string;
             args: string;
+            /** Resolved `LlmTool.message`, when the tool defines one */
+            message?: string;
         }) => unknown | Promise<unknown>;
         onRetryableModelError?: ({ input, options, providerRequest, error, }: {
             input: string | LlmHistory | LlmInputMessage;
@@ -245,10 +251,12 @@ export interface LlmOperateOptions {
             providerRequest: any;
             error: any;
         }) => unknown | Promise<unknown>;
-        onToolError?: ({ error, toolName, args, }: {
+        onToolError?: ({ error, toolName, args, message, }: {
             error: Error;
             toolName: string;
             args: string;
+            /** Resolved `LlmTool.message`, when the tool defines one */
+            message?: string;
         }) => unknown | Promise<unknown>;
         onUnrecoverableModelError?: ({ input, options, providerRequest, error, }: {
             input: string | LlmHistory | LlmInputMessage;

package/dist/esm/index.d.ts

@@ -227,9 +227,21 @@ declare class Toolkit {
     private readonly log;
     constructor(tools: LlmTool[], options?: ToolkitOptions);
     get tools(): Omit<LlmTool, "call">[];
-    call({ name, arguments: args }: {
+    private parseArgs;
+    /**
+     * Resolve a tool's `message` (static string or function of args) without
+     * calling the tool. Returns undefined when the tool is missing or defines
+     * no message. Never throws; resolution errors log at warn.
+     */
+    resolveMessage({ name, arguments: args, }: {
+        name: string;
+        arguments: string;
+    }): Promise<string | undefined>;
+    call({ name, arguments: args, message: resolvedMessage, }: {
         name: string;
         arguments: string;
+        /** Pre-resolved tool message; skips re-resolving `tool.message` for logging */
+        message?: string;
     }): Promise<_jaypie_types.AnyValue>;
     extend(tools: LlmTool[], options?: {
         warn?: boolean;
@@ -415,6 +427,8 @@ declare enum LlmProgressEventType {
 interface LlmProgressToolCall {
     /** JSON string of arguments (tool_call events only) */
     arguments?: string;
+    /** Resolved `LlmTool.message`, when the tool defines one (tool_call events only) */
+    message?: string;
     /** Tool name */
     name: string;
 }
@@ -461,19 +475,23 @@ interface LlmOperateOptions {
             content: string | JsonObject;
             usage: LlmUsage;
         }) => unknown | Promise<unknown>;
-        afterEachTool?: ({ result, toolName, args, }: {
+        afterEachTool?: ({ result, toolName, args, message, }: {
             result: unknown;
             toolName: string;
             args: string;
+            /** Resolved `LlmTool.message`, when the tool defines one */
+            message?: string;
         }) => unknown | Promise<unknown>;
         beforeEachModelRequest?: ({ input, options, providerRequest, }: {
             input: string | LlmHistory | LlmInputMessage;
             options?: LlmOperateOptions;
             providerRequest: any;
         }) => unknown | Promise<unknown>;
-        beforeEachTool?: ({ toolName, args, }: {
+        beforeEachTool?: ({ toolName, args, message, }: {
             toolName: string;
             args: string;
+            /** Resolved `LlmTool.message`, when the tool defines one */
+            message?: string;
         }) => unknown | Promise<unknown>;
         onRetryableModelError?: ({ input, options, providerRequest, error, }: {
             input: string | LlmHistory | LlmInputMessage;
@@ -481,10 +499,12 @@ interface LlmOperateOptions {
             providerRequest: any;
             error: any;
         }) => unknown | Promise<unknown>;
-        onToolError?: ({ error, toolName, args, }: {
+        onToolError?: ({ error, toolName, args, message, }: {
             error: Error;
             toolName: string;
             args: string;
+            /** Resolved `LlmTool.message`, when the tool defines one */
+            message?: string;
         }) => unknown | Promise<unknown>;
         onUnrecoverableModelError?: ({ input, options, providerRequest, error, }: {
             input: string | LlmHistory | LlmInputMessage;

package/dist/esm/index.js

@@ -5417,11 +5417,7 @@ class Toolkit {
             return toolCopy;
         });
     }
-    async call({ name, arguments: args }) {
-        const tool = this._tools.find((t) => t.name === name);
-        if (!tool) {
-            throw new Error(`Tool '${name}' not found`);
-        }
+    parseArgs(args) {
         let parsedArgs;
         try {
             parsedArgs = JSON.parse(args);
@@ -5432,35 +5428,53 @@ class Toolkit {
         catch {
             parsedArgs = args;
         }
+        return parsedArgs;
+    }
+    /**
+     * Resolve a tool's `message` (static string or function of args) without
+     * calling the tool. Returns undefined when the tool is missing or defines
+     * no message. Never throws; resolution errors log at warn.
+     */
+    async resolveMessage({ name, arguments: args, }) {
+        const tool = this._tools.find((t) => t.name === name);
+        if (!tool || !tool.message) {
+            return undefined;
+        }
+        try {
+            if (typeof tool.message === "string") {
+                return tool.message;
+            }
+            const parsedArgs = this.parseArgs(args);
+            if (typeof tool.message === "function") {
+                return await resolveValue(tool.message(parsedArgs, { name }));
+            }
+            log.warn("[Toolkit] Tool provided unknown message type");
+            return String(tool.message);
+        }
+        catch (error) {
+            log.warn("[Toolkit] Caught error resolving tool message");
+            log.var({ error });
+            return undefined;
+        }
+    }
+    async call({ name, arguments: args, message: resolvedMessage, }) {
+        const tool = this._tools.find((t) => t.name === name);
+        if (!tool) {
+            throw new Error(`Tool '${name}' not found`);
+        }
+        const parsedArgs = this.parseArgs(args);
         if (this.log !== false) {
             try {
                 const context = {
                     name,
                     args: parsedArgs,
                 };
-                let message;
                 if (this.explain) {
                     context.explanation = parsedArgs.__Explanation;
                 }
-                if (tool.message) {
-                    if (typeof tool.message === "string") {
-                        log.trace("[Toolkit] Tool provided string message");
-                        message = tool.message;
-                    }
-                    else if (typeof tool.message === "function") {
-                        log.trace("[Toolkit] Tool provided function message");
-                        log.trace("[Toolkit] Resolving message result");
-                        message = await resolveValue(tool.message(parsedArgs, { name }));
-                    }
-                    else {
-                        log.warn("[Toolkit] Tool provided unknown message type");
-                        message = String(tool.message);
-                    }
-                }
-                else {
-                    log.trace("[Toolkit] Log tool call with default message");
-                    message = `${tool.name}:${JSON.stringify(parsedArgs)}`;
-                }
+                const message = resolvedMessage ??
+                    (await this.resolveMessage({ arguments: args, name })) ??
+                    `${tool.name}:${JSON.stringify(parsedArgs)}`;
                 if (typeof this.log === "function") {
                     log.trace("[Toolkit] Log tool call with custom logger");
                     await resolveValue(this.log(message, context));
@@ -6875,10 +6889,19 @@ class OperateLoop {
                 this.appendResponseItemsToRequest(currentProviderRequest, responseItems);
                 // Process each tool call
                 for (const toolCall of toolCalls) {
+                    // Resolved once per call; never throws (undefined when tool has no message)
+                    const toolMessage = await state.toolkit.resolveMessage({
+                        arguments: toolCall.arguments,
+                        name: toolCall.name,
+                    });
                     try {
                         await emitProgress({
                             event: {
-                                tool: { arguments: toolCall.arguments, name: toolCall.name },
+                                tool: {
+                                    arguments: toolCall.arguments,
+                                    message: toolMessage,
+                                    name: toolCall.name,
+                                },
                                 turn: state.currentTurn,
                                 type: LlmProgressEventType.ToolCall,
                             },
@@ -6887,6 +6910,7 @@ class OperateLoop {
                         // Execute beforeEachTool hook
                         await this.hookRunnerInstance.runBeforeTool(context.hooks, {
                             args: toolCall.arguments,
+                            message: toolMessage,
                             toolName: toolCall.name,
                         });
                         // Call the tool inside a child tool span (no-op when disabled)
@@ -6894,6 +6918,7 @@ class OperateLoop {
                         const result = await withLlmObsSpan({ kind: "tool", name: toolCall.name }, async () => {
                             const result = await state.toolkit.call({
                                 arguments: toolCall.arguments,
+                                message: toolMessage,
                                 name: toolCall.name,
                             });
                             annotateLlmObs({
@@ -6914,6 +6939,7 @@ class OperateLoop {
                         // Execute afterEachTool hook
                         await this.hookRunnerInstance.runAfterTool(context.hooks, {
                             args: toolCall.arguments,
+                            message: toolMessage,
                             result,
                             toolName: toolCall.name,
                         });
@@ -6947,6 +6973,7 @@ class OperateLoop {
                         await this.hookRunnerInstance.runOnToolError(context.hooks, {
                             args: toolCall.arguments,
                             error: error,
+                            message: toolMessage,
                             toolName: toolCall.name,
                         });
                         // Set error on response
@@ -7457,10 +7484,16 @@ class StreamLoop {
     async *processToolCalls(toolCalls, state, context) {
         const log = getLogger$6();
         for (const toolCall of toolCalls) {
+            // Resolved once per call; never throws (undefined when tool has no message)
+            const toolMessage = await state.toolkit.resolveMessage({
+                arguments: toolCall.arguments,
+                name: toolCall.name,
+            });
             try {
                 // Execute beforeEachTool hook
                 await this.hookRunnerInstance.runBeforeTool(context.hooks, {
                     args: toolCall.arguments,
+                    message: toolMessage,
                     toolName: toolCall.name,
                 });
                 // Call the tool inside a child tool span (no-op when disabled)
@@ -7468,6 +7501,7 @@ class StreamLoop {
                 const result = await withLlmObsSpan({ kind: "tool", name: toolCall.name }, async () => {
                     const result = await state.toolkit.call({
                         arguments: toolCall.arguments,
+                        message: toolMessage,
                         name: toolCall.name,
                     });
                     annotateLlmObs({
@@ -7480,6 +7514,7 @@ class StreamLoop {
                 // Execute afterEachTool hook
                 await this.hookRunnerInstance.runAfterTool(context.hooks, {
                     args: toolCall.arguments,
+                    message: toolMessage,
                     result,
                     toolName: toolCall.name,
                 });
@@ -7507,6 +7542,7 @@ class StreamLoop {
                 await this.hookRunnerInstance.runOnToolError(context.hooks, {
                     args: toolCall.arguments,
                     error: error,
+                    message: toolMessage,
                     toolName: toolCall.name,
                 });
                 // Yield error chunk