@node-llm/core 1.5.4 → 1.6.0

package/dist/chat/Chat.d.ts

@@ -44,13 +44,13 @@ export declare class Chat {
      */
     withTool(tool: ToolResolvable): this;
     /**
-   * Add multiple tools to the chat session.
-   * Supports passing Tool classes (which will be instantiated) or instances.
-   * Can replace existing tools if options.replace is true.
-   *
-   * @example
-   * chat.withTools([WeatherTool, new CalculatorTool()], { replace: true });
-   */
+     * Add multiple tools to the chat session.
+     * Supports passing Tool classes (which will be instantiated) or instances.
+     * Can replace existing tools if options.replace is true.
+     *
+     * @example
+     * chat.withTools([WeatherTool, new CalculatorTool()], { replace: true });
+     */
     withTools(tools: ToolResolvable[], options?: {
         replace?: boolean;
     }): this;
@@ -83,31 +83,31 @@ export declare class Chat {
      */
     withRequestOptions(options: {
         headers?: Record<string, string>;
-        responseFormat?: any;
+        responseFormat?: unknown;
     }): this;
     /**
      * Set provider-specific parameters.
      * These will be merged into the final request payload.
      */
-    withParams(params: Record<string, any>): this;
+    withParams(params: Record<string, unknown>): this;
     /**
      * Enforce a specific schema for the output.
      * Can accept a Schema object or a Zod schema/JSON Schema directly.
      */
-    withSchema(schema: Schema | z.ZodType<any> | Record<string, any> | null): this;
+    withSchema(schema: Schema | z.ZodType<unknown> | Record<string, unknown> | null): this;
     onNewMessage(handler: () => void): this;
     onEndMessage(handler: (message: ChatResponseString) => void): this;
-    onToolCall(handler: (toolCall: any) => void): this;
-    onToolResult(handler: (result: any) => void): this;
+    onToolCall(handler: (toolCall: unknown) => void): this;
+    onToolResult(handler: (result: unknown) => void): this;
     /**
      * Called when a tool call starts.
      */
-    onToolCallStart(handler: (toolCall: any) => void): this;
+    onToolCallStart(handler: (toolCall: unknown) => void): this;
     /**
      * Called when a tool call ends successfully.
      */
-    onToolCallEnd(handler: (toolCall: any, result: any) => void): this;
-    onToolCallError(handler: (toolCall: any, error: Error) => 'STOP' | 'CONTINUE' | void | Promise<'STOP' | 'CONTINUE' | void>): this;
+    onToolCallEnd(handler: (toolCall: unknown, result: unknown) => void): this;
+    onToolCallError(handler: (toolCall: unknown, error: Error) => "STOP" | "CONTINUE" | "RETRY" | void | Promise<"STOP" | "CONTINUE" | "RETRY" | void>): this;
     /**
      * Set the tool execution mode.
      * - "auto": (Default) Automatically execute all tool calls.
@@ -119,7 +119,7 @@ export declare class Chat {
      * Hook for confirming tool execution in "confirm" mode.
      * Return true to proceed, false to cancel the specific call.
      */
-    onConfirmToolCall(handler: (toolCall: any) => Promise<boolean> | boolean): this;
+    onConfirmToolCall(handler: (toolCall: unknown) => Promise<boolean> | boolean): this;
     /**
      * Add a hook to process messages before sending to the LLM.
      * Useful for PII detection, redaction, and input moderation.
@@ -133,7 +133,7 @@ export declare class Chat {
     /**
      * Ask the model a question
      */
-    ask(content: string | any[], options?: AskOptions): Promise<ChatResponseString>;
+    ask(content: string | ContentPart[], options?: AskOptions): Promise<ChatResponseString>;
     /**
      * Streams the model's response to a user question.
      */

package/dist/chat/Chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../src/chat/Chat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../src/chat/Chat.ts"],"names":[],"mappings":"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"}

package/dist/chat/Chat.js

@@ -65,11 +65,19 @@ export class Chat {
                 acc.output_tokens += msg.usage.output_tokens;
                 acc.total_tokens += msg.usage.total_tokens;
                 acc.cached_tokens = (acc.cached_tokens ?? 0) + (msg.usage.cached_tokens ?? 0);
-                acc.cache_creation_tokens = (acc.cache_creation_tokens ?? 0) + (msg.usage.cache_creation_tokens ?? 0);
+                acc.cache_creation_tokens =
+                    (acc.cache_creation_tokens ?? 0) + (msg.usage.cache_creation_tokens ?? 0);
                 acc.cost = (acc.cost ?? 0) + (msg.usage.cost ?? 0);
             }
             return acc;
-        }, { input_tokens: 0, output_tokens: 0, total_tokens: 0, cached_tokens: 0, cache_creation_tokens: 0, cost: 0 });
+        }, {
+            input_tokens: 0,
+            output_tokens: 0,
+            total_tokens: 0,
+            cached_tokens: 0,
+            cache_creation_tokens: 0,
+            cost: 0
+        });
     }
     /**
      * Add a tool to the chat session (fluent API)
@@ -79,13 +87,13 @@ export class Chat {
         return this.withTools([tool]);
     }
     /**
-   * Add multiple tools to the chat session.
-   * Supports passing Tool classes (which will be instantiated) or instances.
-   * Can replace existing tools if options.replace is true.
-   *
-   * @example
-   * chat.withTools([WeatherTool, new CalculatorTool()], { replace: true });
-   */
+     * Add multiple tools to the chat session.
+     * Supports passing Tool classes (which will be instantiated) or instances.
+     * Can replace existing tools if options.replace is true.
+     *
+     * @example
+     * chat.withTools([WeatherTool, new CalculatorTool()], { replace: true });
+     */
     withTools(tools, options) {
         if (options?.replace) {
             this.options.tools = [];
@@ -260,7 +268,7 @@ export class Chat {
         }
         this.messages.push({
             role: "user",
-            content: messageContent,
+            content: messageContent
         });
         // Process Schema/Structured Output
         let responseFormat = this.options.responseFormat;
@@ -273,7 +281,7 @@ export class Chat {
                     name: this.options.schema.definition.name,
                     description: this.options.schema.definition.description,
                     strict: this.options.schema.definition.strict ?? true,
-                    schema: jsonSchema,
+                    schema: jsonSchema
                 }
             };
         }
@@ -287,7 +295,7 @@ export class Chat {
             response_format: responseFormat, // Pass to provider
             requestTimeout: options?.requestTimeout ?? this.options.requestTimeout ?? config.requestTimeout,
             signal: options?.signal,
-            ...this.options.params,
+            ...this.options.params
         };
         // --- Content Policy Hooks (Input) ---
         if (this.options.onBeforeRequest) {
@@ -298,7 +306,7 @@ export class Chat {
                 executeOptions.messages = result;
             }
         }
-        let totalUsage = { input_tokens: 0, output_tokens: 0, total_tokens: 0 };
+        const totalUsage = { input_tokens: 0, output_tokens: 0, total_tokens: 0 };
         const trackUsage = (u) => {
             if (u) {
                 totalUsage.input_tokens += u.input_tokens;
@@ -327,9 +335,9 @@ export class Chat {
         }
         this.messages.push({
             role: "assistant",
-            content: assistantMessage || null,
+            content: assistantMessage?.toString() || null,
             tool_calls: response.tool_calls,
-            usage: response.usage,
+            usage: response.usage
         });
         if (this.options.onEndMessage && (!response.tool_calls || response.tool_calls.length === 0)) {
             this.options.onEndMessage(assistantMessage);
@@ -350,37 +358,42 @@ export class Chat {
                 if (this.options.toolExecution === ToolExecutionMode.CONFIRM) {
                     const approved = await ToolHandler.requestToolConfirmation(toolCall, this.options.onConfirmToolCall);
                     if (!approved) {
-                        this.messages.push({
-                            role: "tool",
-                            tool_call_id: toolCall.id,
-                            content: "Action cancelled by user.",
-                        });
+                        this.messages.push(this.provider.formatToolResultMessage(toolCall.id, "Action cancelled by user."));
                         continue;
                     }
                 }
                 try {
                     const toolResult = await ToolHandler.execute(toolCall, this.options.tools, this.options.onToolCallStart, this.options.onToolCallEnd);
-                    this.messages.push(toolResult);
+                    this.messages.push(this.provider.formatToolResultMessage(toolResult.tool_call_id, toolResult.content));
                 }
                 catch (error) {
-                    const directive = await this.options.onToolCallError?.(toolCall, error);
-                    if (directive === 'STOP') {
-                        throw error;
+                    let currentError = error;
+                    const directive = await this.options.onToolCallError?.(toolCall, currentError);
+                    if (directive === "STOP") {
+                        throw currentError;
+                    }
+                    if (directive === "RETRY") {
+                        try {
+                            const toolResult = await ToolHandler.execute(toolCall, this.options.tools, this.options.onToolCallStart, this.options.onToolCallEnd);
+                            this.messages.push(this.provider.formatToolResultMessage(toolResult.tool_call_id, toolResult.content));
+                            continue;
+                        }
+                        catch (retryError) {
+                            // If retry also fails, fall through to default logic
+                            currentError = retryError;
+                        }
                     }
-                    this.messages.push({
-                        role: "tool",
-                        tool_call_id: toolCall.id,
-                        content: `Fatal error executing tool '${toolCall.function.name}': ${error.message}`,
-                    });
-                    if (directive === 'CONTINUE') {
+                    this.messages.push(this.provider.formatToolResultMessage(toolCall.id, `Fatal error executing tool '${toolCall.function.name}': ${currentError.message}`, { isError: true }));
+                    if (directive === "CONTINUE") {
                         continue;
                     }
                     // Default short-circuit logic
-                    const isFatal = error.fatal === true || error.status === 401 || error.status === 403;
+                    const errorObj = currentError;
+                    const isFatal = errorObj.fatal === true || errorObj.status === 401 || errorObj.status === 403;
                     if (isFatal) {
-                        throw error;
+                        throw currentError;
                     }
-                    logger.error(`Tool execution failed for '${toolCall.function.name}':`, error);
+                    logger.error(`Tool execution failed for '${toolCall.function.name}':`, currentError);
                 }
             }
             response = await this.executor.executeChat({
@@ -393,7 +406,7 @@ export class Chat {
                 response_format: responseFormat,
                 requestTimeout: options?.requestTimeout ?? this.options.requestTimeout ?? config.requestTimeout,
                 signal: options?.signal,
-                ...this.options.params,
+                ...this.options.params
             });
             trackUsage(response.usage);
             assistantMessage = new ChatResponseString(response.content ?? "", response.usage ?? { input_tokens: 0, output_tokens: 0, total_tokens: 0 }, this.model, this.provider.id, response.reasoning);
@@ -406,15 +419,15 @@ export class Chat {
             }
             this.messages.push({
                 role: "assistant",
-                content: assistantMessage || null,
+                content: assistantMessage?.toString() || null,
                 tool_calls: response.tool_calls,
-                usage: response.usage,
+                usage: response.usage
             });
             if (this.options.onEndMessage && (!response.tool_calls || response.tool_calls.length === 0)) {
                 this.options.onEndMessage(assistantMessage);
             }
         }
-        // For the final return, we might want to aggregate reasoning too if it happened in multiple turns? 
+        // For the final return, we might want to aggregate reasoning too if it happened in multiple turns?
         // Usually reasoning only happens once or we just want the last one.
         return new ChatResponseString(assistantMessage.toString() || "", totalUsage, this.model, this.provider.id, assistantMessage.reasoning, response.tool_calls);
     }
@@ -449,17 +462,18 @@ export class Chat {
         if (typeof toolInstance.toLLMTool === "function") {
             return toolInstance.toLLMTool();
         }
-        if (!toolInstance.function || !toolInstance.function.name) {
+        const toolObj = toolInstance;
+        if (!toolObj.function || !toolObj.function.name) {
             // 1. Validate structure
             throw new ConfigurationError(`[NodeLLM] Tool validation failed: 'function.name' is required for raw tool objects.`);
         }
-        if (toolInstance.type !== 'function') {
+        if (toolObj.type !== "function") {
             // 2. Ensure 'type: function' exists (standardize for providers)
-            toolInstance.type = 'function';
+            toolObj.type = "function";
         }
-        if (typeof toolInstance.handler !== 'function') {
+        if (typeof toolObj.handler !== "function") {
             // 3. Validate handler existence
-            throw new ConfigurationError(`[NodeLLM] Tool validation failed: Tool '${toolInstance.function.name}' must have a 'handler' function. (Note: Only Tool subclasses use 'execute()')`);
+            throw new ConfigurationError(`[NodeLLM] Tool validation failed: Tool '${toolObj.function.name}' must have a 'handler' function. (Note: Only Tool subclasses use 'execute()')`);
         }
         return toolInstance;
     }

package/dist/chat/ChatOptions.d.ts

@@ -3,6 +3,7 @@ import { ToolResolvable } from "./Tool.js";
 import { Schema } from "../schema/Schema.js";
 import { ChatResponseString } from "./ChatResponse.js";
 import { ToolExecutionMode } from "../constants.js";
+import { ResponseFormat } from "../providers/Provider.js";
 export interface ChatOptions {
     systemPrompt?: string;
     messages?: Message[];
@@ -10,22 +11,20 @@ export interface ChatOptions {
     temperature?: number;
     maxTokens?: number;
     onNewMessage?: () => void;
-    onEndMessage?: (message: any) => void;
-    onToolCallStart?: (toolCall: any) => void;
-    onToolCallEnd?: (toolCall: any, result: any) => void;
-    onToolCallError?: (toolCall: any, error: Error) => 'STOP' | 'CONTINUE' | void | Promise<'STOP' | 'CONTINUE' | void>;
+    onEndMessage?: (message: ChatResponseString) => void;
+    onToolCallStart?: (toolCall: unknown) => void;
+    onToolCallEnd?: (toolCall: unknown, result: unknown) => void;
+    onToolCallError?: (toolCall: unknown, error: Error) => "STOP" | "CONTINUE" | "RETRY" | void | Promise<"STOP" | "CONTINUE" | "RETRY" | void>;
     headers?: Record<string, string>;
     schema?: Schema;
-    responseFormat?: {
-        type: "json_object" | "text";
-    };
-    params?: Record<string, any>;
+    responseFormat?: ResponseFormat;
+    params?: Record<string, unknown>;
     assumeModelExists?: boolean;
     provider?: string;
     maxToolCalls?: number;
     requestTimeout?: number;
     toolExecution?: ToolExecutionMode;
-    onConfirmToolCall?: (toolCall: any) => Promise<boolean> | boolean;
+    onConfirmToolCall?: (toolCall: unknown) => Promise<boolean> | boolean;
     onBeforeRequest?: (messages: Message[]) => Promise<Message[] | void>;
     onAfterResponse?: (response: ChatResponseString) => Promise<ChatResponseString | void>;
 }

package/dist/chat/ChatOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatOptions.d.ts","sourceRoot":"","sources":["../../src/chat/ChatOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAkB,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IACtC,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IACrD,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,KAAK,MAAM,GAAG,UAAU,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC,CAAC;IACpH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE;QAAE,IAAI,EAAE,aAAa,GAAG,MAAM,CAAA;KAAE,CAAC;IAClD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAClE,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrE,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;CACxF"}
+{"version":3,"file":"ChatOptions.d.ts","sourceRoot":"","sources":["../../src/chat/ChatOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACrD,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IAC9C,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7D,eAAe,CAAC,EAAE,CAChB,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,KAAK,KACT,MAAM,GAAG,UAAU,GAAG,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,UAAU,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC;IAC1F,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACtE,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrE,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;CACxF"}

package/dist/chat/ChatResponse.d.ts

@@ -29,6 +29,6 @@ export declare class ChatResponseString extends String {
      * Attempt to parse the content as JSON.
      * Returns the parsed object or null if parsing fails.
      */
-    get parsed(): any;
+    get parsed(): unknown;
 }
 //# sourceMappingURL=ChatResponse.d.ts.map

package/dist/chat/ChatResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatResponse.d.ts","sourceRoot":"","sources":["../../src/chat/ChatResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,MAAM;aAG1B,KAAK,EAAE,KAAK;aACZ,KAAK,EAAE,MAAM;aACb,QAAQ,EAAE,MAAM;aAChB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;aACzB,UAAU,CAAC,EAAE,QAAQ,EAAE;gBALvC,OAAO,EAAE,MAAM,EACC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,YAAA,EACzB,UAAU,CAAC,EAAE,QAAQ,EAAE,YAAA;IAKzC,IAAI,YAAY,WAAsC;IACtD,IAAI,aAAa,WAAuC;IACxD,IAAI,YAAY,WAAsC;IACtD,IAAI,aAAa,uBAAuC;IACxD,IAAI,IAAI,uBAA8B;IACtC,IAAI,UAAU,uBAAoC;IAClD,IAAI,WAAW,uBAAqC;IAEpD,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,QAAQ;IAIR;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB;IAWnD;;;OAGG;IACH,IAAI,MAAM,IAAI,GAAG,CAMhB;CACF"}
+{"version":3,"file":"ChatResponse.d.ts","sourceRoot":"","sources":["../../src/chat/ChatResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,MAAM;aAG1B,KAAK,EAAE,KAAK;aACZ,KAAK,EAAE,MAAM;aACb,QAAQ,EAAE,MAAM;aAChB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;aACzB,UAAU,CAAC,EAAE,QAAQ,EAAE;gBALvC,OAAO,EAAE,MAAM,EACC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,YAAA,EACzB,UAAU,CAAC,EAAE,QAAQ,EAAE,YAAA;IAKzC,IAAI,YAAY,WAEf;IACD,IAAI,aAAa,WAEhB;IACD,IAAI,YAAY,WAEf;IACD,IAAI,aAAa,uBAEhB;IACD,IAAI,IAAI,uBAEP;IACD,IAAI,UAAU,uBAEb;IACD,IAAI,WAAW,uBAEd;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,QAAQ;IAIR;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB;IAWnD;;;OAGG;IACH,IAAI,MAAM,IAAI,OAAO,CAMpB;CACF"}

package/dist/chat/ChatResponse.js

@@ -16,13 +16,27 @@ export class ChatResponseString extends String {
         this.reasoning = reasoning;
         this.tool_calls = tool_calls;
     }
-    get input_tokens() { return this.usage.input_tokens; }
-    get output_tokens() { return this.usage.output_tokens; }
-    get total_tokens() { return this.usage.total_tokens; }
-    get cached_tokens() { return this.usage.cached_tokens; }
-    get cost() { return this.usage.cost; }
-    get input_cost() { return this.usage.input_cost; }
-    get output_cost() { return this.usage.output_cost; }
+    get input_tokens() {
+        return this.usage.input_tokens;
+    }
+    get output_tokens() {
+        return this.usage.output_tokens;
+    }
+    get total_tokens() {
+        return this.usage.total_tokens;
+    }
+    get cached_tokens() {
+        return this.usage.cached_tokens;
+    }
+    get cost() {
+        return this.usage.cost;
+    }
+    get input_cost() {
+        return this.usage.input_cost;
+    }
+    get output_cost() {
+        return this.usage.output_cost;
+    }
     get content() {
         return this.valueOf();
     }
@@ -46,7 +60,7 @@ export class ChatResponseString extends String {
         try {
             return JSON.parse(this.valueOf());
         }
-        catch (e) {
+        catch {
             return null;
         }
     }

package/dist/chat/ChatStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatStream.d.ts","sourceRoot":"","sources":["../../src/chat/ChatStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAA4C,MAAM,cAAc,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAS,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAQvC;;;GAGG;AACH,qBAAa,UAAU;IAKnB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN1B,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,cAAc,CAAY;gBAGf,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,WAAgB,EAC1C,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,cAAc,CAAC,EAAE,OAAO,EAAE;IA6B5B,IAAI,OAAO,IAAI,SAAS,OAAO,EAAE,CAEhC;IAED,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,EAAE,EAAE,OAAO,GAAE,UAAe,GAAG,MAAM,CAAC,SAAS,CAAC;CAsOrF"}
+{"version":3,"file":"ChatStream.d.ts","sourceRoot":"","sources":["../../src/chat/ChatStream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAA4D,MAAM,cAAc,CAAC;AACrG,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAS,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AASvC;;;GAGG;AACH,qBAAa,UAAU;IAKnB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN1B,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,cAAc,CAAY;gBAGf,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,WAAgB,EAC1C,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,cAAc,CAAC,EAAE,OAAO,EAAE;IA6B5B,IAAI,OAAO,IAAI,SAAS,OAAO,EAAE,CAEhC;IAED,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,EAAE,EAAE,OAAO,GAAE,UAAe,GAAG,MAAM,CAAC,SAAS,CAAC;CAsPrF"}

package/dist/chat/ChatStream.js

@@ -28,7 +28,7 @@ export class ChatStream {
             if (options.systemPrompt) {
                 this.systemMessages.push({
                     role: "system",
-                    content: options.systemPrompt,
+                    content: options.systemPrompt
                 });
             }
             if (options.messages) {
@@ -84,7 +84,7 @@ export class ChatStream {
                         name: options.schema.definition.name,
                         description: options.schema.definition.description,
                         strict: options.schema.definition.strict ?? true,
-                        schema: jsonSchema,
+                        schema: jsonSchema
                     }
                 };
             }
@@ -94,7 +94,7 @@ export class ChatStream {
             let isFirst = true;
             const maxToolCalls = options.maxToolCalls ?? 5;
             let stepCount = 0;
-            let totalUsage = { input_tokens: 0, output_tokens: 0, total_tokens: 0 };
+            const totalUsage = { input_tokens: 0, output_tokens: 0, total_tokens: 0 };
             const trackUsage = (u) => {
                 if (u) {
                     totalUsage.input_tokens += u.input_tokens;
@@ -132,7 +132,7 @@ export class ChatStream {
                         headers: options.headers,
                         requestTimeout: options.requestTimeout ?? config.requestTimeout,
                         signal: abortController.signal,
-                        ...options.params,
+                        ...options.params
                     })) {
                         if (isFirst) {
                             if (options.onNewMessage)
@@ -182,41 +182,34 @@ export class ChatStream {
                         if (options.toolExecution === ToolExecutionMode.CONFIRM) {
                             const approved = await ToolHandler.requestToolConfirmation(toolCall, options.onConfirmToolCall);
                             if (!approved) {
-                                messages.push({
-                                    role: "tool",
-                                    tool_call_id: toolCall.id,
-                                    content: "Action cancelled by user.",
-                                });
+                                messages.push(provider.formatToolResultMessage(toolCall.id, "Action cancelled by user."));
                                 continue;
                             }
                         }
                         try {
                             const toolResult = await ToolHandler.execute(toolCall, options.tools, options.onToolCallStart, options.onToolCallEnd);
-                            messages.push(toolResult);
+                            messages.push(provider.formatToolResultMessage(toolResult.tool_call_id, toolResult.content));
                         }
                         catch (error) {
-                            const directive = await options.onToolCallError?.(toolCall, error);
-                            if (directive === 'STOP') {
+                            const err = error;
+                            const directive = await options.onToolCallError?.(toolCall, err);
+                            if (directive === "STOP") {
                                 throw error;
                             }
-                            messages.push({
-                                role: "tool",
-                                tool_call_id: toolCall.id,
-                                content: `Fatal error executing tool '${toolCall.function.name}': ${error.message}`,
-                            });
-                            if (directive === 'CONTINUE') {
+                            messages.push(provider.formatToolResultMessage(toolCall.id, `Fatal error executing tool '${toolCall.function.name}': ${err.message}`, { isError: true }));
+                            if (directive === "CONTINUE") {
                                 continue;
                             }
-                            const isFatal = error.fatal === true || error.status === 401 || error.status === 403;
+                            const isFatal = err.fatal === true || err.status === 401 || err.status === 403;
                             if (isFatal) {
-                                throw error;
+                                throw err;
                             }
                             logger.error(`Tool execution failed for '${toolCall.function.name}':`, error);
                         }
                     }
                 }
                 catch (error) {
-                    if (error instanceof Error && error.name === 'AbortError') {
+                    if (error instanceof Error && error.name === "AbortError") {
                         // Aborted
                     }
                     throw error;

package/dist/chat/Content.d.ts

@@ -21,12 +21,12 @@ export type ContentPart = {
 export declare const isBinaryContent: (part: ContentPart) => boolean;
 export declare const isTextContent: (part: ContentPart) => boolean;
 export declare const partitionContentParts: (parts: ContentPart[]) => {
-    textParts: ({
+    textParts: {
         type: "text";
         text: string;
-    })[];
+    }[];
     binaryParts: ContentPart[];
 };
 export declare const formatMultimodalContent: (content: string | ContentPart[], parts: ContentPart[]) => MessageContent;
-export type MessageContent = string | String | ContentPart[];
+export type MessageContent = string | string | ContentPart[];
 //# sourceMappingURL=Content.d.ts.map

package/dist/chat/Content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Content.d.ts","sourceRoot":"","sources":["../../src/chat/Content.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACtE;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAEtD,eAAO,MAAM,eAAe,GAAI,MAAM,WAAW,KAAG,OACmC,CAAC;AAExF,eAAO,MAAM,aAAa,GAAI,MAAM,WAAW,KAAG,OAC5B,CAAC;AAEvB,eAAO,MAAM,qBAAqB,GAAI,OAAO,WAAW,EAAE;eAEZ,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;;CAG/E,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,SAAS,MAAM,GAAG,WAAW,EAAE,EAAE,OAAO,WAAW,EAAE,KAAG,cA2B/F,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,EAAE,CAAC"}
+{"version":3,"file":"Content.d.ts","sourceRoot":"","sources":["../../src/chat/Content.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACtE;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAEtD,eAAO,MAAM,eAAe,GAAI,MAAM,WAAW,KAAG,OACmC,CAAC;AAExF,eAAO,MAAM,aAAa,GAAI,MAAM,WAAW,KAAG,OAA+B,CAAC;AAElF,eAAO,MAAM,qBAAqB,GAAI,OAAO,WAAW,EAAE;eAEZ;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE;;CAG7E,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,GAAG,WAAW,EAAE,EAC/B,OAAO,WAAW,EAAE,KACnB,cAwBF,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,EAAE,CAAC"}

package/dist/chat/Content.js

@@ -9,9 +9,9 @@ export const partitionContentParts = (parts) => {
 export const formatMultimodalContent = (content, parts) => {
     const { textParts, binaryParts } = partitionContentParts(parts);
     let fullText = typeof content === "string" ? content : "";
-    let currentParts = typeof content === "string" ? [] : content;
+    const currentParts = typeof content === "string" ? [] : content;
     if (textParts.length > 0) {
-        const additionalText = textParts.map(f => f.text).join("\n");
+        const additionalText = textParts.map((f) => f.text).join("\n");
         if (typeof content === "string") {
             fullText += "\n" + additionalText;
         }
@@ -21,10 +21,7 @@ export const formatMultimodalContent = (content, parts) => {
     }
     if (binaryParts.length > 0) {
         if (typeof content === "string") {
-            return [
-                { type: "text", text: fullText },
-                ...binaryParts
-            ];
+            return [{ type: "text", text: fullText }, ...binaryParts];
         }
         else {
             return [...currentParts, ...binaryParts];

package/dist/chat/Message.d.ts

@@ -2,13 +2,15 @@ import { Role } from "./Role.js";
 import { ToolCall } from "./Tool.js";
 import { MessageContent } from "./Content.js";
 import { Usage } from "../providers/Provider.js";
+import { ChatResponseString } from "./ChatResponse.js";
 export interface Message {
     role: Role;
-    content: MessageContent | null;
+    content: MessageContent | ChatResponseString | null;
     tool_calls?: ToolCall[];
     tool_call_id?: string;
     name?: string;
     usage?: Usage;
     reasoning?: string;
+    isError?: boolean;
 }
 //# sourceMappingURL=Message.d.ts.map

package/dist/chat/Message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Message.d.ts","sourceRoot":"","sources":["../../src/chat/Message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAEjD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,cAAc,GAAG,IAAI,CAAC;IAC/B,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}
+{"version":3,"file":"Message.d.ts","sourceRoot":"","sources":["../../src/chat/Message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,cAAc,GAAG,kBAAkB,GAAG,IAAI,CAAC;IACpD,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}

package/dist/chat/Role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Role.d.ts","sourceRoot":"","sources":["../../src/chat/Role.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,GACZ,QAAQ,GACR,WAAW,GACX,MAAM,GACN,WAAW,GACX,MAAM,CAAC"}
+{"version":3,"file":"Role.d.ts","sourceRoot":"","sources":["../../src/chat/Role.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,GAAG,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC"}