@node-llm/core 1.16.2 → 1.17.0

package/dist/chat/Chat.js

@@ -12,8 +12,10 @@ import { ToolExecutionMode } from "../constants.js";
 import { ConfigurationError } from "../errors/index.js";
 import { ChatValidator } from "./Validation.js";
 import { ToolHandler } from "./ToolHandler.js";
+import { shouldRunToolCallsConcurrently, executeToolCallOutcomes } from "./ToolCallOutcome.js";
 import { logger } from "../utils/logger.js";
 import { runMiddleware } from "../utils/middleware-runner.js";
+import { collectHandlers, runAllHandlers, runDirectiveHandlers, runConfirmHandlers, runChainHandlers } from "../utils/handler-stacking.js";
 import { ChatResponseString } from "./ChatResponse.js";
 export class Chat {
     provider;
@@ -45,6 +47,9 @@ export class Chat {
         if (!this.options.toolExecution) {
             this.options.toolExecution = config.toolExecution || ToolExecutionMode.AUTO;
         }
+        if (this.options.toolConcurrency === undefined) {
+            this.options.toolConcurrency = config.toolConcurrency;
+        }
         if (options.tools) {
             const toolList = options.tools;
             this.options.tools = []; // Clear and re-add via normalized method
@@ -285,11 +290,11 @@ export class Chat {
     }
     // --- Event Handlers ---
     onNewMessage(handler) {
-        this.options.onNewMessage = handler;
+        this.options.onNewMessageHandlers = [...(this.options.onNewMessageHandlers ?? []), handler];
         return this;
     }
     onEndMessage(handler) {
-        this.options.onEndMessage = handler;
+        this.options.onEndMessageHandlers = [...(this.options.onEndMessageHandlers ?? []), handler];
         return this;
     }
     onToolCall(handler) {
@@ -299,21 +304,29 @@ export class Chat {
         return this.onToolCallEnd((_call, result) => handler(result));
     }
     /**
-     * Called when a tool call starts.
+     * Called when a tool call starts. Calling this more than once registers
+     * additional handlers rather than replacing the previous one.
      */
     onToolCallStart(handler) {
-        this.options.onToolCallStart = handler;
+        this.options.onToolCallStartHandlers = [
+            ...(this.options.onToolCallStartHandlers ?? []),
+            handler
+        ];
         return this;
     }
     /**
-     * Called when a tool call ends successfully.
+     * Called when a tool call ends successfully. Calling this more than once
+     * registers additional handlers rather than replacing the previous one.
      */
     onToolCallEnd(handler) {
-        this.options.onToolCallEnd = handler;
+        this.options.onToolCallEndHandlers = [...(this.options.onToolCallEndHandlers ?? []), handler];
         return this;
     }
     onToolCallError(handler) {
-        this.options.onToolCallError = handler;
+        this.options.onToolCallErrorHandlers = [
+            ...(this.options.onToolCallErrorHandlers ?? []),
+            handler
+        ];
         return this;
     }
     /**
@@ -326,28 +339,49 @@ export class Chat {
         this.options.toolExecution = mode;
         return this;
     }
+    /**
+     * Enable or disable concurrent execution of independent tool calls
+     * returned in the same turn. Disabled ("confirm" mode always runs
+     * sequentially since approval is interactive).
+     */
+    withToolConcurrency(enabled) {
+        this.options.toolConcurrency = enabled;
+        return this;
+    }
     /**
      * Hook for confirming tool execution in "confirm" mode.
-     * Return true to proceed, false to cancel the specific call.
+     * Return true to proceed, false to cancel the specific call. When multiple
+     * handlers are registered, every one of them must approve.
      */
     onConfirmToolCall(handler) {
-        this.options.onConfirmToolCall = handler;
+        this.options.onConfirmToolCallHandlers = [
+            ...(this.options.onConfirmToolCallHandlers ?? []),
+            handler
+        ];
         return this;
     }
     /**
      * Add a hook to process messages before sending to the LLM.
-     * Useful for PII detection, redaction, and input moderation.
+     * Useful for PII detection, redaction, and input moderation. Multiple
+     * hooks chain: each one's output feeds the next.
      */
     beforeRequest(handler) {
-        this.options.onBeforeRequest = handler;
+        this.options.onBeforeRequestHandlers = [
+            ...(this.options.onBeforeRequestHandlers ?? []),
+            handler
+        ];
         return this;
     }
     /**
      * Add a hook to process the response before returning it.
-     * Useful for output redaction, compliance, and post-moderation.
+     * Useful for output redaction, compliance, and post-moderation. Multiple
+     * hooks chain: each one's output feeds the next.
      */
     afterResponse(handler) {
-        this.options.onAfterResponse = handler;
+        this.options.onAfterResponseHandlers = [
+            ...(this.options.onAfterResponseHandlers ?? []),
+            handler
+        ];
         return this;
     }
     /**
@@ -398,6 +432,23 @@ export class Chat {
             options: this.options,
             state
         };
+        const newMessageHandlers = collectHandlers(this.options.onNewMessage, this.options.onNewMessageHandlers);
+        const endMessageHandlers = collectHandlers(this.options.onEndMessage, this.options.onEndMessageHandlers);
+        const beforeRequestHandlers = collectHandlers(this.options.onBeforeRequest, this.options.onBeforeRequestHandlers);
+        const afterResponseHandlers = collectHandlers(this.options.onAfterResponse, this.options.onAfterResponseHandlers);
+        const toolCallStartHandlers = collectHandlers(this.options.onToolCallStart, this.options.onToolCallStartHandlers);
+        const toolCallEndHandlers = collectHandlers(this.options.onToolCallEnd, this.options.onToolCallEndHandlers);
+        const toolCallErrorHandlers = collectHandlers(this.options.onToolCallError, this.options.onToolCallErrorHandlers);
+        const confirmToolCallHandlers = collectHandlers(this.options.onConfirmToolCall, this.options.onConfirmToolCallHandlers);
+        const combinedToolCallStart = toolCallStartHandlers.length
+            ? (call) => toolCallStartHandlers.forEach((handler) => handler(call))
+            : undefined;
+        const combinedToolCallEnd = toolCallEndHandlers.length
+            ? (call, result) => toolCallEndHandlers.forEach((handler) => handler(call, result))
+            : undefined;
+        const combinedConfirmToolCall = confirmToolCallHandlers.length
+            ? (call) => runConfirmHandlers(confirmToolCallHandlers, call)
+            : undefined;
         try {
             // 1. onRequest Hook
             await runMiddleware(this.middlewares, "onRequest", context);
@@ -426,12 +477,7 @@ export class Chat {
                     ...this.options.params
                 };
                 // --- Content Policy Hooks (Input) ---
-                if (this.options.onBeforeRequest) {
-                    const result = await this.options.onBeforeRequest(executeOptions.messages);
-                    if (result) {
-                        executeOptions.messages = result;
-                    }
-                }
+                executeOptions.messages = await runChainHandlers(beforeRequestHandlers, executeOptions.messages);
                 const trackUsage = (u) => {
                     if (u) {
                         if (u.cost === undefined) {
@@ -458,18 +504,12 @@ export class Chat {
                     }
                 };
                 // Start generation
-                if (this.options.onNewMessage)
-                    this.options.onNewMessage();
+                await runAllHandlers(newMessageHandlers);
                 let response = await this.executor.executeChat(executeOptions);
                 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.thinking, response.reasoning, response.tool_calls, response.finish_reason, this.options.schema, response.metadata, response.attachments);
                 // --- Content Policy Hooks (Output - Turn 1) ---
-                if (this.options.onAfterResponse) {
-                    const result = await this.options.onAfterResponse(assistantMessage);
-                    if (result) {
-                        assistantMessage = result;
-                    }
-                }
+                assistantMessage = await runChainHandlers(afterResponseHandlers, assistantMessage);
                 // Add to history (temporary, might be rolled back on retry)
                 this.messages.push({
                     role: "assistant",
@@ -477,9 +517,8 @@ export class Chat {
                     tool_calls: response.tool_calls,
                     usage: response.usage
                 });
-                if (this.options.onEndMessage &&
-                    (!response.tool_calls || response.tool_calls.length === 0)) {
-                    this.options.onEndMessage(assistantMessage);
+                if (!response.tool_calls || response.tool_calls.length === 0) {
+                    await runAllHandlers(endMessageHandlers, assistantMessage);
                 }
                 const maxToolCalls = options?.maxToolCalls ?? this.options.maxToolCalls ?? 5;
                 let stepCount = 0;
@@ -493,55 +532,56 @@ export class Chat {
                     if (stepCount > maxToolCalls) {
                         throw new Error(`[NodeLLM] Maximum tool execution calls (${maxToolCalls}) exceeded.`);
                     }
-                    for (const toolCall of response.tool_calls) {
-                        if (this.options.toolExecution === ToolExecutionMode.CONFIRM) {
-                            const approved = await ToolHandler.requestToolConfirmation(toolCall, this.options.onConfirmToolCall);
-                            if (!approved) {
-                                this.messages.push(this.provider.formatToolResultMessage(toolCall.id, "Action cancelled by user."));
-                                continue;
-                            }
+                    const runConcurrently = shouldRunToolCallsConcurrently(this.options.toolConcurrency, this.options.toolExecution, response.tool_calls.length);
+                    const outcomes = await executeToolCallOutcomes(response.tool_calls, {
+                        ...this.options,
+                        tools: this.options.tools,
+                        onToolCallStart: combinedToolCallStart,
+                        onToolCallEnd: combinedToolCallEnd,
+                        onConfirmToolCall: combinedConfirmToolCall
+                    }, this.middlewares, context, runConcurrently);
+                    for (const outcome of outcomes) {
+                        const toolCall = outcome.toolCall;
+                        if (outcome.kind === "cancelled") {
+                            this.messages.push(this.provider.formatToolResultMessage(toolCall.id, "Action cancelled by user."));
+                            continue;
                         }
-                        await runMiddleware(this.middlewares, "onToolCallStart", context, toolCall);
-                        try {
-                            const toolResult = await ToolHandler.execute(toolCall, this.options.tools, this.options.onToolCallStart, this.options.onToolCallEnd);
-                            await runMiddleware(this.middlewares, "onToolCallEnd", context, toolCall, toolResult.content);
+                        if (outcome.kind === "success") {
+                            const { toolResult } = outcome;
                             this.messages.push(this.provider.formatToolResultMessage(toolResult.tool_call_id, toolResult.content));
                             if (toolResult.halted) {
                                 haltTriggered = true;
                                 assistantMessage = new ChatResponseString(toolResult.content, totalUsage, this.model, this.provider.id, undefined, undefined, undefined, "tool_halt");
-                                if (this.options.onEndMessage) {
-                                    this.options.onEndMessage(assistantMessage);
-                                }
+                                await runAllHandlers(endMessageHandlers, assistantMessage);
                                 break;
                             }
+                            continue;
                         }
-                        catch (error) {
-                            let currentError = error;
-                            const middlewareDirective = await runMiddleware(this.middlewares, "onToolCallError", context, toolCall, currentError);
-                            const directive = middlewareDirective ||
-                                (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);
-                                    await runMiddleware(this.middlewares, "onToolCallEnd", context, toolCall, toolResult.content);
-                                    this.messages.push(this.provider.formatToolResultMessage(toolResult.tool_call_id, toolResult.content));
-                                    continue;
-                                }
-                                catch (retryError) {
-                                    currentError = retryError;
-                                    await runMiddleware(this.middlewares, "onToolCallError", context, toolCall, currentError);
-                                }
-                            }
-                            this.messages.push(this.provider.formatToolResultMessage(toolCall.id, `Fatal error executing tool '${toolCall.function.name}': ${currentError.message}`, { isError: true }));
-                            if (directive === "CONTINUE")
+                        let currentError = outcome.error;
+                        const middlewareDirective = await runMiddleware(this.middlewares, "onToolCallError", context, toolCall, currentError);
+                        const directive = middlewareDirective ||
+                            (await runDirectiveHandlers(toolCallErrorHandlers, toolCall, currentError));
+                        if (directive === "STOP")
+                            throw currentError;
+                        if (directive === "RETRY") {
+                            try {
+                                const toolResult = await ToolHandler.execute(toolCall, this.options.tools, combinedToolCallStart, combinedToolCallEnd);
+                                await runMiddleware(this.middlewares, "onToolCallEnd", context, toolCall, toolResult.content);
+                                this.messages.push(this.provider.formatToolResultMessage(toolResult.tool_call_id, toolResult.content));
                                 continue;
-                            const errorObj = currentError;
-                            if (errorObj.fatal || errorObj.status === 401 || errorObj.status === 403)
-                                throw currentError;
-                            logger.error(`Tool execution failed:`, currentError);
+                            }
+                            catch (retryError) {
+                                currentError = retryError;
+                                await runMiddleware(this.middlewares, "onToolCallError", context, toolCall, currentError);
+                            }
                         }
+                        this.messages.push(this.provider.formatToolResultMessage(toolCall.id, `Fatal error executing tool '${toolCall.function.name}': ${currentError.message}`, { isError: true }));
+                        if (directive === "CONTINUE")
+                            continue;
+                        const errorObj = currentError;
+                        if (errorObj.fatal || errorObj.status === 401 || errorObj.status === 403)
+                            throw currentError;
+                        logger.error(`Tool execution failed:`, currentError);
                     }
                     if (haltTriggered)
                         break;
@@ -562,23 +602,18 @@ export class Chat {
                     });
                     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.thinking, response.reasoning, response.tool_calls, response.finish_reason, this.options.schema, response.metadata, response.attachments);
-                    if (this.options.onAfterResponse) {
-                        const result = await this.options.onAfterResponse(assistantMessage);
-                        if (result)
-                            assistantMessage = result;
-                    }
+                    assistantMessage = await runChainHandlers(afterResponseHandlers, assistantMessage);
                     this.messages.push({
                         role: "assistant",
                         content: assistantMessage?.toString() || null,
                         tool_calls: response.tool_calls,
                         usage: response.usage
                     });
-                    if (this.options.onEndMessage &&
-                        (!response.tool_calls || response.tool_calls.length === 0)) {
-                        this.options.onEndMessage(assistantMessage);
+                    if (!response.tool_calls || response.tool_calls.length === 0) {
+                        await runAllHandlers(endMessageHandlers, assistantMessage);
                     }
                 }
-                finalResponse = new ChatResponseString(assistantMessage.toString() || "", totalUsage, this.model, this.provider.id, assistantMessage.thinking, assistantMessage.reasoning, response.tool_calls, assistantMessage.finish_reason, this.options.schema);
+                finalResponse = new ChatResponseString(assistantMessage.toString() || "", totalUsage, this.model, this.provider.id, assistantMessage.thinking, assistantMessage.reasoning, response.tool_calls, assistantMessage.finish_reason, this.options.schema, assistantMessage.metadata, assistantMessage.attachments);
                 // 5. onResponse Hook
                 const requestDirective = await runMiddleware(this.middlewares, "onResponse", context, finalResponse);
                 if (requestDirective && typeof requestDirective === "object") {

package/dist/chat/ChatOptions.d.ts

@@ -18,6 +18,17 @@ export interface ChatOptions {
     onToolCallStart?: (toolCall: unknown) => void;
     onToolCallEnd?: (toolCall: unknown, result: unknown) => void;
     onToolCallError?: (toolCall: unknown, error: Error) => "STOP" | "CONTINUE" | "RETRY" | void | Promise<"STOP" | "CONTINUE" | "RETRY" | void>;
+    /**
+     * Additional handlers registered via the fluent on*() methods. Each on*()
+     * call appends here instead of overwriting the single onX field above, so
+     * e.g. calling chat.onToolCallStart() twice runs both handlers instead of
+     * silently dropping the first.
+     */
+    onNewMessageHandlers?: Array<() => void>;
+    onEndMessageHandlers?: Array<(message: ChatResponseString) => void>;
+    onToolCallStartHandlers?: Array<(toolCall: unknown) => void>;
+    onToolCallEndHandlers?: Array<(toolCall: unknown, result: unknown) => void>;
+    onToolCallErrorHandlers?: Array<(toolCall: unknown, error: Error) => "STOP" | "CONTINUE" | "RETRY" | void | Promise<"STOP" | "CONTINUE" | "RETRY" | void>>;
     headers?: Record<string, string>;
     responseFormat?: ResponseFormat;
     thinking?: ThinkingConfig;
@@ -29,10 +40,18 @@ export interface ChatOptions {
     maxToolCalls?: number;
     requestTimeout?: number;
     toolExecution?: ToolExecutionMode;
+    /**
+     * When true, independent tool calls returned in the same turn are executed
+     * concurrently instead of one at a time. Defaults to `config.toolConcurrency`.
+     */
+    toolConcurrency?: boolean;
     toolChoice?: ToolChoice;
     toolCalls?: "one" | "many" | number;
     onConfirmToolCall?: (toolCall: unknown) => Promise<boolean> | boolean;
     onBeforeRequest?: (messages: Message[]) => Promise<Message[] | void>;
     onAfterResponse?: (response: ChatResponseString) => Promise<ChatResponseString | void>;
+    onConfirmToolCallHandlers?: Array<(toolCall: unknown) => Promise<boolean> | boolean>;
+    onBeforeRequestHandlers?: Array<(messages: Message[]) => Promise<Message[] | void>>;
+    onAfterResponseHandlers?: Array<(response: ChatResponseString) => Promise<ChatResponseString | void>>;
 }
 //# sourceMappingURL=ChatOptions.d.ts.map

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,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,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,cAAc,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtF,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,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,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,WAAW,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,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,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACpC,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"}
+{"version":3,"file":"ChatOptions.d.ts","sourceRoot":"","sources":["../../src/chat/ChatOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,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,cAAc,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtF,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,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;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;IACzC,oBAAoB,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,kBAAkB,KAAK,IAAI,CAAC,CAAC;IACpE,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC;IAC7D,qBAAqB,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC;IAC5E,uBAAuB,CAAC,EAAE,KAAK,CAC7B,CACE,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,CAC1F,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,WAAW,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,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;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACpC,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;IACvF,yBAAyB,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;IACrF,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IACpF,uBAAuB,CAAC,EAAE,KAAK,CAC7B,CAAC,QAAQ,EAAE,kBAAkB,KAAK,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CACrE,CAAC;CACH"}

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,EACL,WAAW,EAIZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAyB,MAAM,0BAA0B,CAAC;AAEtF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAavC;;;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;CAwXrF"}
+{"version":3,"file":"ChatStream.d.ts","sourceRoot":"","sources":["../../src/chat/ChatStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACL,WAAW,EAIZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAyB,MAAM,0BAA0B,CAAC;AAEtF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAqBvC;;;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;IAiC5B,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;CAuZrF"}

package/dist/chat/ChatStream.js

@@ -11,6 +11,8 @@ import { logger } from "../utils/logger.js";
 import { ModelRegistry } from "../models/ModelRegistry.js";
 import { runMiddleware } from "../utils/middleware-runner.js";
 import { randomUUID } from "node:crypto";
+import { shouldRunToolCallsConcurrently, executeToolCallOutcomes } from "./ToolCallOutcome.js";
+import { collectHandlers, runAllHandlers, runDirectiveHandlers, runConfirmHandlers, runChainHandlers } from "../utils/handler-stacking.js";
 /**
  * Internal handler for chat streaming logic.
  * Wraps the provider's stream with side effects like history updates and events.
@@ -48,6 +50,9 @@ export class ChatStream {
         if (!this.options.toolExecution) {
             this.options.toolExecution = config.toolExecution || ToolExecutionMode.AUTO;
         }
+        if (this.options.toolConcurrency === undefined) {
+            this.options.toolConcurrency = config.toolConcurrency;
+        }
     }
     get history() {
         return [...this.systemMessages, ...this.messages];
@@ -63,6 +68,23 @@ export class ChatStream {
             const requestId = randomUUID();
             const state = {};
             const middlewares = options.middlewares || [];
+            const newMessageHandlers = collectHandlers(options.onNewMessage, options.onNewMessageHandlers);
+            const endMessageHandlers = collectHandlers(options.onEndMessage, options.onEndMessageHandlers);
+            const beforeRequestHandlers = collectHandlers(options.onBeforeRequest, options.onBeforeRequestHandlers);
+            const afterResponseHandlers = collectHandlers(options.onAfterResponse, options.onAfterResponseHandlers);
+            const toolCallStartHandlers = collectHandlers(options.onToolCallStart, options.onToolCallStartHandlers);
+            const toolCallEndHandlers = collectHandlers(options.onToolCallEnd, options.onToolCallEndHandlers);
+            const toolCallErrorHandlers = collectHandlers(options.onToolCallError, options.onToolCallErrorHandlers);
+            const confirmToolCallHandlers = collectHandlers(options.onConfirmToolCall, options.onConfirmToolCallHandlers);
+            const combinedToolCallStart = toolCallStartHandlers.length
+                ? (call) => toolCallStartHandlers.forEach((handler) => handler(call))
+                : undefined;
+            const combinedToolCallEnd = toolCallEndHandlers.length
+                ? (call, result) => toolCallEndHandlers.forEach((handler) => handler(call, result))
+                : undefined;
+            const combinedConfirmToolCall = confirmToolCallHandlers.length
+                ? (call) => runConfirmHandlers(confirmToolCallHandlers, call)
+                : undefined;
             // Process Multimodal Content
             let messageContent = content;
             const files = [...(requestOptions.images ?? []), ...(requestOptions.files ?? [])];
@@ -143,12 +165,7 @@ export class ChatStream {
                     let currentTurnUsage;
                     context.messages = [...systemMessages, ...messages];
                     let requestMessages = context.messages; // Use up-to-date messages from context
-                    if (options.onBeforeRequest) {
-                        const result = await options.onBeforeRequest(requestMessages);
-                        if (result) {
-                            requestMessages = result;
-                        }
-                    }
+                    requestMessages = await runChainHandlers(beforeRequestHandlers, requestMessages);
                     const streamRequest = {
                         model,
                         messages: requestMessages,
@@ -170,8 +187,7 @@ export class ChatStream {
                     }
                     for await (const chunk of provider.stream(streamRequest)) {
                         if (isFirst) {
-                            if (options.onNewMessage)
-                                options.onNewMessage();
+                            await runAllHandlers(newMessageHandlers);
                             isFirst = false;
                         }
                         if (chunk.content) {
@@ -204,12 +220,7 @@ export class ChatStream {
                     }
                     assistantResponse = new ChatResponseString(fullContent || "", currentTurnUsage || { input_tokens: 0, output_tokens: 0, total_tokens: 0 }, model, provider.id, thinking.text || thinking.signature ? thinking : undefined, fullReasoning || undefined, toolCalls, undefined, // finish_reason
                     options.schema);
-                    if (options.onAfterResponse) {
-                        const result = await options.onAfterResponse(assistantResponse);
-                        if (result) {
-                            assistantResponse = result;
-                        }
-                    }
+                    assistantResponse = await runChainHandlers(afterResponseHandlers, assistantResponse);
                     messages.push({
                         role: "assistant",
                         content: assistantResponse || null,
@@ -218,62 +229,62 @@ export class ChatStream {
                         usage: currentTurnUsage
                     });
                     if (!toolCalls || toolCalls.length === 0) {
-                        if (options.onEndMessage) {
-                            options.onEndMessage(assistantResponse);
-                        }
+                        await runAllHandlers(endMessageHandlers, assistantResponse);
                         break;
                     }
                     if (!ToolHandler.shouldExecuteTools(toolCalls, options.toolExecution)) {
                         break;
                     }
-                    for (const toolCall of toolCalls) {
-                        if (options.toolExecution === ToolExecutionMode.CONFIRM) {
-                            const approved = await ToolHandler.requestToolConfirmation(toolCall, options.onConfirmToolCall);
-                            if (!approved) {
-                                messages.push(provider.formatToolResultMessage(toolCall.id, "Action cancelled by user."));
-                                continue;
-                            }
+                    const runConcurrently = shouldRunToolCallsConcurrently(options.toolConcurrency, options.toolExecution, toolCalls.length);
+                    const outcomes = await executeToolCallOutcomes(toolCalls, {
+                        ...options,
+                        tools: options.tools,
+                        onToolCallStart: combinedToolCallStart,
+                        onToolCallEnd: combinedToolCallEnd,
+                        onConfirmToolCall: combinedConfirmToolCall
+                    }, middlewares, context, runConcurrently);
+                    for (const outcome of outcomes) {
+                        const toolCall = outcome.toolCall;
+                        if (outcome.kind === "cancelled") {
+                            messages.push(provider.formatToolResultMessage(toolCall.id, "Action cancelled by user."));
+                            continue;
                         }
-                        // 2. onToolCallStart Hook
-                        await runMiddleware(middlewares, "onToolCallStart", context, toolCall);
-                        try {
-                            const toolResult = await ToolHandler.execute(toolCall, options.tools, options.onToolCallStart, options.onToolCallEnd);
-                            // 3. onToolCallEnd Hook
-                            await runMiddleware(middlewares, "onToolCallEnd", context, toolCall, toolResult.content);
+                        if (outcome.kind === "success") {
+                            const { toolResult } = outcome;
                             messages.push(provider.formatToolResultMessage(toolResult.tool_call_id, toolResult.content));
+                            continue;
                         }
-                        catch (error) {
-                            let currentError = error;
-                            // 4. onToolCallError Hook
-                            const middlewareDirective = await runMiddleware(middlewares, "onToolCallError", context, toolCall, currentError);
-                            const directive = middlewareDirective || (await options.onToolCallError?.(toolCall, currentError));
-                            if (directive === "STOP") {
-                                throw error;
-                            }
-                            if (directive === "RETRY") {
-                                try {
-                                    const toolResult = await ToolHandler.execute(toolCall, options.tools, options.onToolCallStart, options.onToolCallEnd);
-                                    await runMiddleware(middlewares, "onToolCallEnd", context, toolCall, toolResult.content);
-                                    messages.push(provider.formatToolResultMessage(toolResult.tool_call_id, toolResult.content));
-                                    continue;
-                                }
-                                catch (retryError) {
-                                    currentError = retryError;
-                                    await runMiddleware(middlewares, "onToolCallError", context, toolCall, currentError);
-                                }
-                            }
-                            messages.push(provider.formatToolResultMessage(toolCall.id, `Fatal error executing tool '${toolCall.function.name}': ${currentError.message}`, { isError: true }));
-                            if (directive === "CONTINUE") {
+                        let currentError = outcome.error;
+                        // 4. onToolCallError Hook
+                        const middlewareDirective = await runMiddleware(middlewares, "onToolCallError", context, toolCall, currentError);
+                        const directive = middlewareDirective ||
+                            (await runDirectiveHandlers(toolCallErrorHandlers, toolCall, currentError));
+                        if (directive === "STOP") {
+                            throw currentError;
+                        }
+                        if (directive === "RETRY") {
+                            try {
+                                const toolResult = await ToolHandler.execute(toolCall, options.tools, combinedToolCallStart, combinedToolCallEnd);
+                                await runMiddleware(middlewares, "onToolCallEnd", context, toolCall, toolResult.content);
+                                messages.push(provider.formatToolResultMessage(toolResult.tool_call_id, toolResult.content));
                                 continue;
                             }
-                            const isFatal = currentError.fatal === true ||
-                                currentError.status === 401 ||
-                                currentError.status === 403;
-                            if (isFatal) {
-                                throw currentError;
+                            catch (retryError) {
+                                currentError = retryError;
+                                await runMiddleware(middlewares, "onToolCallError", context, toolCall, currentError);
                             }
-                            logger.error(`Tool execution failed for '${toolCall.function.name}':`, currentError);
                         }
+                        messages.push(provider.formatToolResultMessage(toolCall.id, `Fatal error executing tool '${toolCall.function.name}': ${currentError.message}`, { isError: true }));
+                        if (directive === "CONTINUE") {
+                            continue;
+                        }
+                        const isFatal = currentError.fatal === true ||
+                            currentError.status === 401 ||
+                            currentError.status === 403;
+                        if (isFatal) {
+                            throw currentError;
+                        }
+                        logger.error(`Tool execution failed for '${toolCall.function.name}':`, currentError);
                     }
                     // Loop continues -> streaming next chunk
                 }

package/dist/chat/ToolCallOutcome.d.ts

@@ -0,0 +1,30 @@
+import { ToolCall, ToolDefinition } from "./Tool.js";
+import { ToolExecutionMode } from "../constants.js";
+import { ToolExecutionResult } from "./ToolHandler.js";
+import { Middleware, MiddlewareContext } from "../types/Middleware.js";
+export type ToolCallOutcome = {
+    kind: "cancelled";
+    toolCall: ToolCall;
+} | {
+    kind: "success";
+    toolCall: ToolCall;
+    toolResult: ToolExecutionResult;
+} | {
+    kind: "error";
+    toolCall: ToolCall;
+    error: unknown;
+};
+export interface ToolCallExecutionOptions {
+    tools?: ToolDefinition[];
+    toolExecution?: ToolExecutionMode;
+    onConfirmToolCall?: (toolCall: unknown) => Promise<boolean> | boolean;
+    onToolCallStart?: (toolCall: unknown) => void;
+    onToolCallEnd?: (toolCall: unknown, result: unknown) => void;
+}
+/**
+ * Confirm mode stays sequential since approval is interactive; concurrency
+ * only kicks in for AUTO/DRY_RUN turns with more than one independent call.
+ */
+export declare function shouldRunToolCallsConcurrently(toolConcurrency: boolean | undefined, toolExecution: ToolExecutionMode | undefined, callCount: number): boolean;
+export declare function executeToolCallOutcomes(toolCalls: ToolCall[], options: ToolCallExecutionOptions, middlewares: Middleware[], context: MiddlewareContext, concurrent: boolean): Promise<ToolCallOutcome[]>;
+//# sourceMappingURL=ToolCallOutcome.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ToolCallOutcome.d.ts","sourceRoot":"","sources":["../../src/chat/ToolCallOutcome.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAe,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAGvE,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAC;IAAC,UAAU,EAAE,mBAAmB,CAAA;CAAE,GACxE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,wBAAwB;IACvC,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,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,KAAK,IAAI,CAAC;IAC9C,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CAC9D;AAuCD;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,eAAe,EAAE,OAAO,GAAG,SAAS,EACpC,aAAa,EAAE,iBAAiB,GAAG,SAAS,EAC5C,SAAS,EAAE,MAAM,GAChB,OAAO,CAET;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,QAAQ,EAAE,EACrB,OAAO,EAAE,wBAAwB,EACjC,WAAW,EAAE,UAAU,EAAE,EACzB,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,eAAe,EAAE,CAAC,CAY5B"}