agent-swarm-kit 1.0.121 → 1.0.122

package/build/index.cjs

@@ -359,6 +359,26 @@ var METHOD_NAME_USE_HISTORY_CALLBACKS = "HistoryUtils.useHistoryCallbacks";
 var METHOD_NAME_ITERATE = "HistoryUtils.iterate";
 var METHOD_NAME_PUSH = "HistoryUtils.push";
 var METHOD_NAME_DISPOSE = "HistoryUtils.dispose";
+var HISTORY_INSTANCE_WAIT_FOR_INIT_FN = function (agentName, self) { return __awaiter(void 0, void 0, void 0, function () {
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    swarm$1.loggerService.debug(INSTANCE_METHOD_NAME_WAIT_FOR_INIT, {
+                        clientId: self.clientId,
+                        agentName: agentName,
+                    });
+                if (!self.callbacks.getData) return [3 /*break*/, 2];
+                _b = self;
+                return [4 /*yield*/, self.callbacks.getData(self.clientId, agentName)];
+            case 1:
+                _b._array = _c.sent();
+                _c.label = 2;
+            case 2: return [2 /*return*/];
+        }
+    });
+}); };
 /**
  * Class representing a History Instance
  */
@@ -377,26 +397,12 @@ var HistoryInstance = /** @class */ (function () {
          * Makes the singleshot for initialization
          * @param agentName - The agent name.
          */
-        this[_a$1] = functoolsKit.singleshot(function (agentName) { return __awaiter(_this, void 0, void 0, function () {
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            swarm$1.loggerService.debug(INSTANCE_METHOD_NAME_WAIT_FOR_INIT, {
-                                clientId: this.clientId,
-                                agentName: agentName,
-                            });
-                        if (!this.callbacks.getData) return [3 /*break*/, 2];
-                        _b = this;
-                        return [4 /*yield*/, this.callbacks.getData(this.clientId, agentName)];
-                    case 1:
-                        _b._array = _c.sent();
-                        _c.label = 2;
-                    case 2: return [2 /*return*/];
-                }
-            });
-        }); });
+        this[_a$1] = functoolsKit.singleshot(function (agentName) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, HISTORY_INSTANCE_WAIT_FOR_INIT_FN(agentName, this)];
+                case 1: return [2 /*return*/, _b.sent()];
+            }
+        }); }); });
         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
             swarm$1.loggerService.debug(INSTANCE_METHOD_NAME_CTOR, {
                 clientId: this.clientId,
@@ -950,6 +956,14 @@ var nameToTitle = function (name) {
 
 var _a;
 var LOGGER_INSTANCE_WAIT_FOR_INIT = Symbol("wait-for-init");
+var LOGGER_INSTANCE_WAIT_FOR_FN = function (self) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_b) {
+        if (self.callbacks.onInit) {
+            self.callbacks.onInit(self.clientId);
+        }
+        return [2 /*return*/];
+    });
+}); };
 /**
  * @class LoggerInstance
  * @implements ILoggerInstance
@@ -960,14 +974,12 @@ var LoggerInstance = /** @class */ (function () {
         var _this = this;
         this.clientId = clientId;
         this.callbacks = callbacks;
-        this[_a] = functoolsKit.singleshot(function () { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                if (this.callbacks.onInit) {
-                    this.callbacks.onInit(this.clientId);
-                }
-                return [2 /*return*/];
-            });
-        }); });
+        this[_a] = functoolsKit.singleshot(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, LOGGER_INSTANCE_WAIT_FOR_FN(this)];
+                case 1: return [2 /*return*/, _b.sent()];
+            }
+        }); }); });
     }
     /**
      * @method waitForInit
@@ -1695,6 +1707,285 @@ var TOOL_STOP_SYMBOL = Symbol("tool-stop");
 var getPlaceholder = function () {
     return GLOBAL_CONFIG.CC_EMPTY_OUTPUT_PLACEHOLDERS[Math.floor(Math.random() * GLOBAL_CONFIG.CC_EMPTY_OUTPUT_PLACEHOLDERS.length)];
 };
+var RUN_FN = function (incoming, self) { return __awaiter(void 0, void 0, void 0, function () {
+    var messages, args, rawMessage, message, result, validation;
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0:
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " run begin"), { incoming: incoming });
+                self.params.onRun &&
+                    self.params.onRun(self.params.clientId, self.params.agentName, incoming);
+                return [4 /*yield*/, self.params.history.toArrayForAgent(self.params.prompt, self.params.system)];
+            case 1:
+                messages = _d.sent();
+                messages.push({
+                    agentName: self.params.agentName,
+                    content: incoming,
+                    mode: "user",
+                    role: "assistant",
+                });
+                args = {
+                    clientId: self.params.clientId,
+                    agentName: self.params.agentName,
+                    messages: messages,
+                    mode: "user",
+                    tools: (_a = self.params.tools) === null || _a === void 0 ? void 0 : _a.map(function (t) {
+                        return lodashEs.omit(t, "toolName", "docNote", "call", "validate", "callbacks");
+                    }),
+                };
+                return [4 /*yield*/, self.params.completion.getCompletion(args)];
+            case 2:
+                rawMessage = _d.sent();
+                ((_b = self.params.completion.callbacks) === null || _b === void 0 ? void 0 : _b.onComplete) &&
+                    ((_c = self.params.completion.callbacks) === null || _c === void 0 ? void 0 : _c.onComplete(args, rawMessage));
+                return [4 /*yield*/, self.params.map(rawMessage, self.params.clientId, self.params.agentName)];
+            case 3:
+                message = _d.sent();
+                return [4 /*yield*/, self.params.transform(message.content, self.params.clientId, self.params.agentName)];
+            case 4:
+                result = _d.sent();
+                return [4 /*yield*/, self.params.bus.emit(self.params.clientId, {
+                        type: "run",
+                        source: "agent-bus",
+                        input: {
+                            message: message,
+                        },
+                        output: {
+                            result: result,
+                        },
+                        context: {
+                            agentName: self.params.agentName,
+                        },
+                        clientId: self.params.clientId,
+                    })];
+            case 5:
+                _d.sent();
+                if (message.tool_calls) {
+                    GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                        self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " run should not call tools"), { incoming: incoming, result: result });
+                    return [2 /*return*/, ""];
+                }
+                validation = null;
+                return [4 /*yield*/, self.params.validate(result)];
+            case 6:
+                if ((validation = _d.sent())) {
+                    GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                        self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " run validation not passed: ").concat(validation), { incoming: incoming, result: result });
+                    return [2 /*return*/, ""];
+                }
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " run end result=").concat(result));
+                return [2 /*return*/, result];
+        }
+    });
+}); };
+var EXECUTE_FN = function (incoming, mode, self) { return __awaiter(void 0, void 0, void 0, function () {
+    var rawMessage, message, toolCalls, _loop_1, idx, state_1, result, validation, result1;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
+            case 0:
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute begin"), { incoming: incoming, mode: mode });
+                self.params.onExecute &&
+                    self.params.onExecute(self.params.clientId, self.params.agentName, incoming, mode);
+                return [4 /*yield*/, self.params.history.push({
+                        role: "user",
+                        mode: mode,
+                        agentName: self.params.agentName,
+                        content: incoming.trim(),
+                    })];
+            case 1:
+                _j.sent();
+                return [4 /*yield*/, self.getCompletion(mode)];
+            case 2:
+                rawMessage = _j.sent();
+                return [4 /*yield*/, self.params.map(rawMessage, self.params.clientId, self.params.agentName)];
+            case 3:
+                message = _j.sent();
+                if (!message.tool_calls) return [3 /*break*/, 9];
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " tool call begin"));
+                toolCalls = message.tool_calls.map(function (call) {
+                    var _a, _b;
+                    return ({
+                        function: call.function,
+                        id: (_a = call.id) !== null && _a !== void 0 ? _a : functoolsKit.randomString(),
+                        type: (_b = call.type) !== null && _b !== void 0 ? _b : "function",
+                    });
+                });
+                return [4 /*yield*/, self.params.history.push(__assign(__assign({}, message), { agentName: self.params.agentName }))];
+            case 4:
+                _j.sent();
+                _loop_1 = function (idx) {
+                    var tool, targetFn, result_1, result_2, status, result_3;
+                    return __generator(this, function (_k) {
+                        switch (_k.label) {
+                            case 0:
+                                tool = toolCalls[idx];
+                                targetFn = (_a = self.params.tools) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.function.name === tool.function.name; });
+                                if (!!targetFn) return [3 /*break*/, 3];
+                                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " functionName=").concat(tool.function.name, " tool function not found"), self.params.tools);
+                                return [4 /*yield*/, self._resurrectModel(mode, "No target function for ".concat(tool.function.name))];
+                            case 1:
+                                result_1 = _k.sent();
+                                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute end result=").concat(result_1));
+                                return [4 /*yield*/, self._emitOuput(mode, result_1)];
+                            case 2:
+                                _k.sent();
+                                return [2 /*return*/, { value: void 0 }];
+                            case 3:
+                                ((_b = targetFn.callbacks) === null || _b === void 0 ? void 0 : _b.onValidate) &&
+                                    ((_c = targetFn.callbacks) === null || _c === void 0 ? void 0 : _c.onValidate(self.params.clientId, self.params.agentName, tool.function.arguments));
+                                return [4 /*yield*/, functoolsKit.not(targetFn.validate({
+                                        clientId: self.params.clientId,
+                                        agentName: self.params.agentName,
+                                        params: tool.function.arguments,
+                                        toolCalls: toolCalls,
+                                    }))];
+                            case 4:
+                                if (!_k.sent()) return [3 /*break*/, 7];
+                                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " functionName=").concat(tool.function.name, " tool validation not passed"));
+                                return [4 /*yield*/, self._resurrectModel(mode, "Function validation failed: name=".concat(tool.function.name, " arguments=").concat(JSON.stringify(tool.function.arguments)))];
+                            case 5:
+                                result_2 = _k.sent();
+                                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute end result=").concat(result_2));
+                                return [4 /*yield*/, self._emitOuput(mode, result_2)];
+                            case 6:
+                                _k.sent();
+                                return [2 /*return*/, { value: void 0 }];
+                            case 7:
+                                ((_d = targetFn.callbacks) === null || _d === void 0 ? void 0 : _d.onBeforeCall) &&
+                                    ((_e = targetFn.callbacks) === null || _e === void 0 ? void 0 : _e.onBeforeCall(tool.id, self.params.clientId, self.params.agentName, tool.function.arguments));
+                                /**
+                                 * @description Do not await to avoid deadlock! The tool can send the message to other agents by emulating user messages
+                                 */
+                                Promise.resolve(targetFn.call({
+                                    toolId: tool.id,
+                                    clientId: self.params.clientId,
+                                    agentName: self.params.agentName,
+                                    params: tool.function.arguments,
+                                    isLast: idx === toolCalls.length - 1,
+                                    toolCalls: toolCalls,
+                                }))
+                                    .then(function () {
+                                    var _a, _b;
+                                    ((_a = targetFn.callbacks) === null || _a === void 0 ? void 0 : _a.onAfterCall) &&
+                                        ((_b = targetFn.callbacks) === null || _b === void 0 ? void 0 : _b.onAfterCall(tool.id, self.params.clientId, self.params.agentName, tool.function.arguments));
+                                })
+                                    .catch(function (error) {
+                                    var _a, _b;
+                                    console.error("agent-swarm tool call error functionName=".concat(tool.function.name, " error=").concat(functoolsKit.getErrorMessage(error)), {
+                                        clientId: self.params.clientId,
+                                        agentName: self.params.agentName,
+                                        tool_call_id: tool.id,
+                                        arguments: tool.function.arguments,
+                                        error: functoolsKit.errorData(error),
+                                    });
+                                    ((_a = targetFn.callbacks) === null || _a === void 0 ? void 0 : _a.onCallError) &&
+                                        ((_b = targetFn.callbacks) === null || _b === void 0 ? void 0 : _b.onCallError(tool.id, self.params.clientId, self.params.agentName, tool.function.arguments, error));
+                                    self._toolErrorSubject.next(TOOL_ERROR_SYMBOL);
+                                });
+                                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " functionName=").concat(tool.function.name, " tool call executing"));
+                                return [4 /*yield*/, Promise.race([
+                                        self._agentChangeSubject.toPromise(),
+                                        self._toolCommitSubject.toPromise(),
+                                        self._toolErrorSubject.toPromise(),
+                                        self._toolStopSubject.toPromise(),
+                                        self._outputSubject.toPromise(),
+                                    ])];
+                            case 8:
+                                status = _k.sent();
+                                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " functionName=").concat(tool.function.name, " tool call end"));
+                                if (status === AGENT_CHANGE_SYMBOL) {
+                                    GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                        self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " functionName=").concat(tool.function.name, " the next tool execution stopped due to the agent changed"));
+                                    ((_f = self.params.callbacks) === null || _f === void 0 ? void 0 : _f.onAfterToolCalls) &&
+                                        self.params.callbacks.onAfterToolCalls(self.params.clientId, self.params.agentName, toolCalls);
+                                    return [2 /*return*/, { value: void 0 }];
+                                }
+                                if (status === TOOL_STOP_SYMBOL) {
+                                    GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                        self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " functionName=").concat(tool.function.name, " the next tool execution stopped due to the commitStopTools call"));
+                                    ((_g = self.params.callbacks) === null || _g === void 0 ? void 0 : _g.onAfterToolCalls) &&
+                                        self.params.callbacks.onAfterToolCalls(self.params.clientId, self.params.agentName, toolCalls);
+                                    return [2 /*return*/, { value: void 0 }];
+                                }
+                                if (!(status === TOOL_ERROR_SYMBOL)) return [3 /*break*/, 11];
+                                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " functionName=").concat(tool.function.name, " the next tool execution stopped due to the call error"));
+                                return [4 /*yield*/, self._resurrectModel(mode, "Function call failed with error: name=".concat(tool.function.name, " arguments=").concat(JSON.stringify(tool.function.arguments)))];
+                            case 9:
+                                result_3 = _k.sent();
+                                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute end result=").concat(result_3));
+                                return [4 /*yield*/, self._emitOuput(mode, result_3)];
+                            case 10:
+                                _k.sent();
+                                return [2 /*return*/, { value: void 0 }];
+                            case 11: return [2 /*return*/];
+                        }
+                    });
+                };
+                idx = 0;
+                _j.label = 5;
+            case 5:
+                if (!(idx !== toolCalls.length)) return [3 /*break*/, 8];
+                return [5 /*yield**/, _loop_1(idx)];
+            case 6:
+                state_1 = _j.sent();
+                if (typeof state_1 === "object")
+                    return [2 /*return*/, state_1.value];
+                _j.label = 7;
+            case 7:
+                idx++;
+                return [3 /*break*/, 5];
+            case 8:
+                ((_h = self.params.callbacks) === null || _h === void 0 ? void 0 : _h.onAfterToolCalls) &&
+                    self.params.callbacks.onAfterToolCalls(self.params.clientId, self.params.agentName, toolCalls);
+                return [2 /*return*/];
+            case 9:
+                if (!message.tool_calls) {
+                    GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                        self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute no tool calls detected"));
+                }
+                return [4 /*yield*/, self.params.transform(message.content, self.params.clientId, self.params.agentName)];
+            case 10:
+                result = _j.sent();
+                return [4 /*yield*/, self.params.history.push(__assign(__assign({}, message), { agentName: self.params.agentName }))];
+            case 11:
+                _j.sent();
+                validation = null;
+                return [4 /*yield*/, self.params.validate(result)];
+            case 12:
+                if (!(validation = _j.sent())) return [3 /*break*/, 15];
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute invalid tool call detected: ").concat(validation), { result: result });
+                return [4 /*yield*/, self._resurrectModel(mode, "Invalid model output: ".concat(result))];
+            case 13:
+                result1 = _j.sent();
+                return [4 /*yield*/, self._emitOuput(mode, result1)];
+            case 14:
+                _j.sent();
+                return [2 /*return*/];
+            case 15:
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientAgent agentName=".concat(self.params.agentName, " clientId=").concat(self.params.clientId, " execute end result=").concat(result));
+                return [4 /*yield*/, self._emitOuput(mode, result)];
+            case 16:
+                _j.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
 /**
  * Represents a client agent that interacts with the system.
  * @implements {IAgent}
@@ -1713,13 +2004,42 @@ var ClientAgent = /** @class */ (function () {
         this._toolCommitSubject = new functoolsKit.Subject();
         this._outputSubject = new functoolsKit.Subject();
         /**
-         * Emits the output result after validation.
-         * @param {string} result - The result to be emitted.
+         * Executes the incoming message and processes tool calls if any.
+         * @param {string} incoming - The incoming message content.
+         * @returns {Promise<void>}
+         */
+        this.execute = functoolsKit.queued(function (incoming, mode) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, EXECUTE_FN(incoming, mode, this)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        }); }); });
+        /**
+         * Run the completion stateless and return the output
+         * @param {string} incoming - The incoming message content.
          * @returns {Promise<void>}
-         * @private
          */
-        this._emitOuput = function (mode, rawResult) { return __awaiter(_this, void 0, void 0, function () {
-            var result, validation, rawResult_1, result_1;
+        this.run = functoolsKit.queued(function (incoming) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, RUN_FN(incoming, this)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        }); }); });
+        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " CTOR"), {
+                params: params,
+            });
+        this.params.onInit && this.params.onInit(params.clientId, params.agentName);
+    }
+    /**
+     * Emits the output result after validation.
+     * @param {string} result - The result to be emitted.
+     * @returns {Promise<void>}
+     * @private
+     */
+    ClientAgent.prototype._emitOuput = function (mode, rawResult) {
+        return __awaiter(this, void 0, void 0, function () {
+            var result, validation, rawResult_1, result_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.params.transform(rawResult, this.params.clientId, this.params.agentName)];
@@ -1736,17 +2056,17 @@ var ClientAgent = /** @class */ (function () {
                         rawResult_1 = _a.sent();
                         return [4 /*yield*/, this.params.transform(rawResult_1, this.params.clientId, this.params.agentName)];
                     case 4:
-                        result_1 = _a.sent();
-                        return [4 /*yield*/, this.params.validate(result_1)];
+                        result_4 = _a.sent();
+                        return [4 /*yield*/, this.params.validate(result_4)];
                     case 5:
                         if ((validation = _a.sent())) {
                             throw new Error("agent-swarm-kit ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " model ressurect failed: ").concat(validation));
                         }
                         this.params.onOutput &&
-                            this.params.onOutput(this.params.clientId, this.params.agentName, result_1);
+                            this.params.onOutput(this.params.clientId, this.params.agentName, result_4);
                         this.params.onAssistantMessage &&
-                            this.params.onAssistantMessage(this.params.clientId, this.params.agentName, result_1);
-                        return [4 /*yield*/, this._outputSubject.next(result_1)];
+                            this.params.onAssistantMessage(this.params.clientId, this.params.agentName, result_4);
+                        return [4 /*yield*/, this._outputSubject.next(result_4)];
                     case 6:
                         _a.sent();
                         return [4 /*yield*/, this.params.bus.emit(this.params.clientId, {
@@ -1757,7 +2077,7 @@ var ClientAgent = /** @class */ (function () {
                                     rawResult: rawResult_1,
                                 },
                                 output: {
-                                    result: result_1,
+                                    result: result_4,
                                 },
                                 context: {
                                     agentName: this.params.agentName,
@@ -1793,14 +2113,16 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Resurrects the model based on the given reason.
-         * @param {string} [reason] - The reason for resurrecting the model.
-         * @returns {Promise<string>}
-         * @private
-         */
-        this._resurrectModel = function (mode, reason) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Resurrects the model based on the given reason.
+     * @param {string} [reason] - The reason for resurrecting the model.
+     * @returns {Promise<string>}
+     * @private
+     */
+    ClientAgent.prototype._resurrectModel = function (mode, reason) {
+        return __awaiter(this, void 0, void 0, function () {
             var rawMessage, message, result, validation, content;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1856,12 +2178,14 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Waits for the output to be available.
-         * @returns {Promise<string>}
-         */
-        this.waitForOutput = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Waits for the output to be available.
+     * @returns {Promise<string>}
+     */
+    ClientAgent.prototype.waitForOutput = function () {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1871,12 +2195,14 @@ var ClientAgent = /** @class */ (function () {
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
-        }); };
-        /**
-         * Gets the completion message from the model.
-         * @returns {Promise<IModelMessage>}
-         */
-        this.getCompletion = function (mode) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Gets the completion message from the model.
+     * @returns {Promise<IModelMessage>}
+     */
+    ClientAgent.prototype.getCompletion = function (mode) {
+        return __awaiter(this, void 0, void 0, function () {
             var messages, args, output;
             var _a, _b, _c;
             return __generator(this, function (_d) {
@@ -1904,13 +2230,15 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/, output];
                 }
             });
-        }); };
-        /**
-         * Commits a user message to the history without answer.
-         * @param {string} message - The message to commit.
-         * @returns {Promise<void>}
-         */
-        this.commitUserMessage = function (message) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits a user message to the history without answer.
+     * @param {string} message - The message to commit.
+     * @returns {Promise<void>}
+     */
+    ClientAgent.prototype.commitUserMessage = function (message) {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1943,12 +2271,14 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Commits flush of agent history
-         * @returns {Promise<void>}
-         */
-        this.commitFlush = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits flush of agent history
+     * @returns {Promise<void>}
+     */
+    ClientAgent.prototype.commitFlush = function () {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1979,12 +2309,14 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Commits change of agent to prevent the next tool execution from being called.
-         * @returns {Promise<void>}
-         */
-        this.commitAgentChange = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits change of agent to prevent the next tool execution from being called.
+     * @returns {Promise<void>}
+     */
+    ClientAgent.prototype.commitAgentChange = function () {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2008,12 +2340,14 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Commits change of agent to prevent the next tool execution from being called.
-         * @returns {Promise<void>}
-         */
-        this.commitStopTools = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits change of agent to prevent the next tool execution from being called.
+     * @returns {Promise<void>}
+     */
+    ClientAgent.prototype.commitStopTools = function () {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2037,13 +2371,15 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Commits a system message to the history.
-         * @param {string} message - The system message to commit.
-         * @returns {Promise<void>}
-         */
-        this.commitSystemMessage = function (message) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits a system message to the history.
+     * @param {string} message - The system message to commit.
+     * @returns {Promise<void>}
+     */
+    ClientAgent.prototype.commitSystemMessage = function (message) {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2076,13 +2412,15 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Commits an assistant message to the history without execute.
-         * @param {string} message - The system message to commit.
-         * @returns {Promise<void>}
-         */
-        this.commitAssistantMessage = function (message) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits an assistant message to the history without execute.
+     * @param {string} message - The system message to commit.
+     * @returns {Promise<void>}
+     */
+    ClientAgent.prototype.commitAssistantMessage = function (message) {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2115,13 +2453,15 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Commits the tool output to the history.
-         * @param {string} content - The tool output content.
-         * @returns {Promise<void>}
-         */
-        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits the tool output to the history.
+     * @param {string} content - The tool output content.
+     * @returns {Promise<void>}
+     */
+    ClientAgent.prototype.commitToolOutput = function (toolId, content) {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2159,303 +2499,14 @@ var ClientAgent = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Executes the incoming message and processes tool calls if any.
-         * @param {string} incoming - The incoming message content.
-         * @returns {Promise<void>}
-         */
-        this.execute = functoolsKit.queued(function (incoming, mode) { return __awaiter(_this, void 0, void 0, function () {
-            var rawMessage, message, toolCalls, _loop_1, this_1, idx, state_1, result, validation, result1;
-            var _this = this;
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
-                    case 0:
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute begin"), { incoming: incoming, mode: mode });
-                        this.params.onExecute &&
-                            this.params.onExecute(this.params.clientId, this.params.agentName, incoming, mode);
-                        return [4 /*yield*/, this.params.history.push({
-                                role: "user",
-                                mode: mode,
-                                agentName: this.params.agentName,
-                                content: incoming.trim(),
-                            })];
-                    case 1:
-                        _j.sent();
-                        return [4 /*yield*/, this.getCompletion(mode)];
-                    case 2:
-                        rawMessage = _j.sent();
-                        return [4 /*yield*/, this.params.map(rawMessage, this.params.clientId, this.params.agentName)];
-                    case 3:
-                        message = _j.sent();
-                        if (!message.tool_calls) return [3 /*break*/, 9];
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " tool call begin"));
-                        toolCalls = message.tool_calls.map(function (call) {
-                            var _a, _b;
-                            return ({
-                                function: call.function,
-                                id: (_a = call.id) !== null && _a !== void 0 ? _a : functoolsKit.randomString(),
-                                type: (_b = call.type) !== null && _b !== void 0 ? _b : "function",
-                            });
-                        });
-                        return [4 /*yield*/, this.params.history.push(__assign(__assign({}, message), { agentName: this.params.agentName }))];
-                    case 4:
-                        _j.sent();
-                        _loop_1 = function (idx) {
-                            var tool, targetFn, result_2, result_3, status, result_4;
-                            return __generator(this, function (_k) {
-                                switch (_k.label) {
-                                    case 0:
-                                        tool = toolCalls[idx];
-                                        targetFn = (_a = this_1.params.tools) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.function.name === tool.function.name; });
-                                        if (!!targetFn) return [3 /*break*/, 3];
-                                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                            this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool function not found"), this_1.params.tools);
-                                        return [4 /*yield*/, this_1._resurrectModel(mode, "No target function for ".concat(tool.function.name))];
-                                    case 1:
-                                        result_2 = _k.sent();
-                                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                            this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " execute end result=").concat(result_2));
-                                        return [4 /*yield*/, this_1._emitOuput(mode, result_2)];
-                                    case 2:
-                                        _k.sent();
-                                        return [2 /*return*/, { value: void 0 }];
-                                    case 3:
-                                        ((_b = targetFn.callbacks) === null || _b === void 0 ? void 0 : _b.onValidate) &&
-                                            ((_c = targetFn.callbacks) === null || _c === void 0 ? void 0 : _c.onValidate(this_1.params.clientId, this_1.params.agentName, tool.function.arguments));
-                                        return [4 /*yield*/, functoolsKit.not(targetFn.validate({
-                                                clientId: this_1.params.clientId,
-                                                agentName: this_1.params.agentName,
-                                                params: tool.function.arguments,
-                                                toolCalls: toolCalls,
-                                            }))];
-                                    case 4:
-                                        if (!_k.sent()) return [3 /*break*/, 7];
-                                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                            this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool validation not passed"));
-                                        return [4 /*yield*/, this_1._resurrectModel(mode, "Function validation failed: name=".concat(tool.function.name, " arguments=").concat(JSON.stringify(tool.function.arguments)))];
-                                    case 5:
-                                        result_3 = _k.sent();
-                                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                            this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " execute end result=").concat(result_3));
-                                        return [4 /*yield*/, this_1._emitOuput(mode, result_3)];
-                                    case 6:
-                                        _k.sent();
-                                        return [2 /*return*/, { value: void 0 }];
-                                    case 7:
-                                        ((_d = targetFn.callbacks) === null || _d === void 0 ? void 0 : _d.onBeforeCall) &&
-                                            ((_e = targetFn.callbacks) === null || _e === void 0 ? void 0 : _e.onBeforeCall(tool.id, this_1.params.clientId, this_1.params.agentName, tool.function.arguments));
-                                        /**
-                                         * @description Do not await to avoid deadlock! The tool can send the message to other agents by emulating user messages
-                                         */
-                                        Promise.resolve(targetFn.call({
-                                            toolId: tool.id,
-                                            clientId: this_1.params.clientId,
-                                            agentName: this_1.params.agentName,
-                                            params: tool.function.arguments,
-                                            isLast: idx === toolCalls.length - 1,
-                                            toolCalls: toolCalls,
-                                        }))
-                                            .then(function () {
-                                            var _a, _b;
-                                            ((_a = targetFn.callbacks) === null || _a === void 0 ? void 0 : _a.onAfterCall) &&
-                                                ((_b = targetFn.callbacks) === null || _b === void 0 ? void 0 : _b.onAfterCall(tool.id, _this.params.clientId, _this.params.agentName, tool.function.arguments));
-                                        })
-                                            .catch(function (error) {
-                                            var _a, _b;
-                                            console.error("agent-swarm tool call error functionName=".concat(tool.function.name, " error=").concat(functoolsKit.getErrorMessage(error)), {
-                                                clientId: _this.params.clientId,
-                                                agentName: _this.params.agentName,
-                                                tool_call_id: tool.id,
-                                                arguments: tool.function.arguments,
-                                                error: functoolsKit.errorData(error),
-                                            });
-                                            ((_a = targetFn.callbacks) === null || _a === void 0 ? void 0 : _a.onCallError) &&
-                                                ((_b = targetFn.callbacks) === null || _b === void 0 ? void 0 : _b.onCallError(tool.id, _this.params.clientId, _this.params.agentName, tool.function.arguments, error));
-                                            _this._toolErrorSubject.next(TOOL_ERROR_SYMBOL);
-                                        });
-                                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                            this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool call executing"));
-                                        return [4 /*yield*/, Promise.race([
-                                                this_1._agentChangeSubject.toPromise(),
-                                                this_1._toolCommitSubject.toPromise(),
-                                                this_1._toolErrorSubject.toPromise(),
-                                                this_1._toolStopSubject.toPromise(),
-                                                this_1._outputSubject.toPromise(),
-                                            ])];
-                                    case 8:
-                                        status = _k.sent();
-                                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                            this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " tool call end"));
-                                        if (status === AGENT_CHANGE_SYMBOL) {
-                                            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                                this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " the next tool execution stopped due to the agent changed"));
-                                            ((_f = this_1.params.callbacks) === null || _f === void 0 ? void 0 : _f.onAfterToolCalls) &&
-                                                this_1.params.callbacks.onAfterToolCalls(this_1.params.clientId, this_1.params.agentName, toolCalls);
-                                            return [2 /*return*/, { value: void 0 }];
-                                        }
-                                        if (status === TOOL_STOP_SYMBOL) {
-                                            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                                this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " the next tool execution stopped due to the commitStopTools call"));
-                                            ((_g = this_1.params.callbacks) === null || _g === void 0 ? void 0 : _g.onAfterToolCalls) &&
-                                                this_1.params.callbacks.onAfterToolCalls(this_1.params.clientId, this_1.params.agentName, toolCalls);
-                                            return [2 /*return*/, { value: void 0 }];
-                                        }
-                                        if (!(status === TOOL_ERROR_SYMBOL)) return [3 /*break*/, 11];
-                                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                            this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " functionName=").concat(tool.function.name, " the next tool execution stopped due to the call error"));
-                                        return [4 /*yield*/, this_1._resurrectModel(mode, "Function call failed with error: name=".concat(tool.function.name, " arguments=").concat(JSON.stringify(tool.function.arguments)))];
-                                    case 9:
-                                        result_4 = _k.sent();
-                                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                            this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " clientId=").concat(this_1.params.clientId, " execute end result=").concat(result_4));
-                                        return [4 /*yield*/, this_1._emitOuput(mode, result_4)];
-                                    case 10:
-                                        _k.sent();
-                                        return [2 /*return*/, { value: void 0 }];
-                                    case 11: return [2 /*return*/];
-                                }
-                            });
-                        };
-                        this_1 = this;
-                        idx = 0;
-                        _j.label = 5;
-                    case 5:
-                        if (!(idx !== toolCalls.length)) return [3 /*break*/, 8];
-                        return [5 /*yield**/, _loop_1(idx)];
-                    case 6:
-                        state_1 = _j.sent();
-                        if (typeof state_1 === "object")
-                            return [2 /*return*/, state_1.value];
-                        _j.label = 7;
-                    case 7:
-                        idx++;
-                        return [3 /*break*/, 5];
-                    case 8:
-                        ((_h = this.params.callbacks) === null || _h === void 0 ? void 0 : _h.onAfterToolCalls) &&
-                            this.params.callbacks.onAfterToolCalls(this.params.clientId, this.params.agentName, toolCalls);
-                        return [2 /*return*/];
-                    case 9:
-                        if (!message.tool_calls) {
-                            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute no tool calls detected"));
-                        }
-                        return [4 /*yield*/, this.params.transform(message.content, this.params.clientId, this.params.agentName)];
-                    case 10:
-                        result = _j.sent();
-                        return [4 /*yield*/, this.params.history.push(__assign(__assign({}, message), { agentName: this.params.agentName }))];
-                    case 11:
-                        _j.sent();
-                        validation = null;
-                        return [4 /*yield*/, this.params.validate(result)];
-                    case 12:
-                        if (!(validation = _j.sent())) return [3 /*break*/, 15];
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute invalid tool call detected: ").concat(validation), { result: result });
-                        return [4 /*yield*/, this._resurrectModel(mode, "Invalid model output: ".concat(result))];
-                    case 13:
-                        result1 = _j.sent();
-                        return [4 /*yield*/, this._emitOuput(mode, result1)];
-                    case 14:
-                        _j.sent();
-                        return [2 /*return*/];
-                    case 15:
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute end result=").concat(result));
-                        return [4 /*yield*/, this._emitOuput(mode, result)];
-                    case 16:
-                        _j.sent();
-                        return [2 /*return*/];
-                }
-            });
-        }); });
-        /**
-         * Run the completion stateless and return the output
-         * @param {string} incoming - The incoming message content.
-         * @returns {Promise<void>}
-         */
-        this.run = functoolsKit.queued(function (incoming) { return __awaiter(_this, void 0, void 0, function () {
-            var messages, args, rawMessage, message, result, validation;
-            var _a, _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " run begin"), { incoming: incoming });
-                        this.params.onRun &&
-                            this.params.onRun(this.params.clientId, this.params.agentName, incoming);
-                        return [4 /*yield*/, this.params.history.toArrayForAgent(this.params.prompt, this.params.system)];
-                    case 1:
-                        messages = _d.sent();
-                        messages.push({
-                            agentName: this.params.agentName,
-                            content: incoming,
-                            mode: "user",
-                            role: "assistant",
-                        });
-                        args = {
-                            clientId: this.params.clientId,
-                            agentName: this.params.agentName,
-                            messages: messages,
-                            mode: "user",
-                            tools: (_a = this.params.tools) === null || _a === void 0 ? void 0 : _a.map(function (t) {
-                                return lodashEs.omit(t, "toolName", "docNote", "call", "validate", "callbacks");
-                            }),
-                        };
-                        return [4 /*yield*/, this.params.completion.getCompletion(args)];
-                    case 2:
-                        rawMessage = _d.sent();
-                        ((_b = this.params.completion.callbacks) === null || _b === void 0 ? void 0 : _b.onComplete) &&
-                            ((_c = this.params.completion.callbacks) === null || _c === void 0 ? void 0 : _c.onComplete(args, rawMessage));
-                        return [4 /*yield*/, this.params.map(rawMessage, this.params.clientId, this.params.agentName)];
-                    case 3:
-                        message = _d.sent();
-                        return [4 /*yield*/, this.params.transform(message.content, this.params.clientId, this.params.agentName)];
-                    case 4:
-                        result = _d.sent();
-                        return [4 /*yield*/, this.params.bus.emit(this.params.clientId, {
-                                type: "run",
-                                source: "agent-bus",
-                                input: {
-                                    message: message,
-                                },
-                                output: {
-                                    result: result,
-                                },
-                                context: {
-                                    agentName: this.params.agentName,
-                                },
-                                clientId: this.params.clientId,
-                            })];
-                    case 5:
-                        _d.sent();
-                        if (message.tool_calls) {
-                            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " run should not call tools"), { incoming: incoming, result: result });
-                            return [2 /*return*/, ""];
-                        }
-                        validation = null;
-                        return [4 /*yield*/, this.params.validate(result)];
-                    case 6:
-                        if ((validation = _d.sent())) {
-                            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " run validation not passed: ").concat(validation), { incoming: incoming, result: result });
-                            return [2 /*return*/, ""];
-                        }
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " run end result=").concat(result));
-                        return [2 /*return*/, result];
-                }
-            });
-        }); });
-        /**
-         * Should call on agent dispose
-         * @returns {Promise<void>}
-         */
-        this.dispose = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Should call on agent dispose
+     * @returns {Promise<void>}
+     */
+    ClientAgent.prototype.dispose = function () {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                     this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " dispose"));
@@ -2463,13 +2514,8 @@ var ClientAgent = /** @class */ (function () {
                     this.params.onDispose(this.params.clientId, this.params.agentName);
                 return [2 /*return*/];
             });
-        }); };
-        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " CTOR"), {
-                params: params,
-            });
-        this.params.onInit && this.params.onInit(params.clientId, params.agentName);
-    }
+        });
+    };
     return ClientAgent;
 }());
 
@@ -2723,14 +2769,20 @@ var ClientHistory = /** @class */ (function () {
      * @param {IHistoryParams} params - The parameters for the history.
      */
     function ClientHistory(params) {
-        var _this = this;
         this.params = params;
-        /**
-         * Pushes a message to the history.
-         * @param {IModelMessage} message - The message to push.
-         * @returns {Promise<void>}
-         */
-        this.push = function (message) { return __awaiter(_this, void 0, void 0, function () {
+        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+            this.params.logger.debug("ClientHistory agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " CTOR"), {
+                params: params,
+            });
+        this._filterCondition = GLOBAL_CONFIG.CC_AGENT_HISTORY_FILTER(this.params.agentName);
+    }
+    /**
+     * Pushes a message to the history.
+     * @param {IModelMessage} message - The message to push.
+     * @returns {Promise<void>}
+     */
+    ClientHistory.prototype.push = function (message) {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2756,12 +2808,14 @@ var ClientHistory = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Converts the history to an array of raw messages.
-         * @returns {Promise<IModelMessage[]>} - The array of raw messages.
-         */
-        this.toArrayForRaw = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Converts the history to an array of raw messages.
+     * @returns {Promise<IModelMessage[]>} - The array of raw messages.
+     */
+    ClientHistory.prototype.toArrayForRaw = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var result, _a, _b, _c, item, e_1_1;
             var _d, e_1, _e, _f;
             return __generator(this, function (_g) {
@@ -2806,14 +2860,16 @@ var ClientHistory = /** @class */ (function () {
                     case 12: return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Converts the history to an array of messages for the agent.
-         * @param {string} prompt - The prompt message.
-         * @param {string} system - The tool calling protocol
-         * @returns {Promise<IModelMessage[]>} - The array of messages for the agent.
-         */
-        this.toArrayForAgent = function (prompt, system) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Converts the history to an array of messages for the agent.
+     * @param {string} prompt - The prompt message.
+     * @param {string} system - The tool calling protocol
+     * @returns {Promise<IModelMessage[]>} - The array of messages for the agent.
+     */
+    ClientHistory.prototype.toArrayForAgent = function (prompt, system) {
+        return __awaiter(this, void 0, void 0, function () {
             var commonMessagesRaw, systemMessagesRaw, _a, _b, _c, content, message, e_2_1, systemMessages, commonMessages, assistantToolOutputCallSet, assistantRawMessages, assistantToolCallSet, assistantMessages, promptMessages;
             var _this = this;
             var _d, e_2, _e, _f;
@@ -2954,12 +3010,14 @@ var ClientHistory = /** @class */ (function () {
                         return [2 /*return*/, __spreadArray(__spreadArray(__spreadArray([], __read(promptMessages), false), __read(systemMessages), false), __read(assistantMessages), false)];
                 }
             });
-        }); };
-        /**
-         * Should call on agent dispose
-         * @returns {Promise<void>}
-         */
-        this.dispose = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Should call on agent dispose
+     * @returns {Promise<void>}
+     */
+    ClientHistory.prototype.dispose = function () {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2971,13 +3029,8 @@ var ClientHistory = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-            this.params.logger.debug("ClientHistory agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " CTOR"), {
-                params: params,
-            });
-        this._filterCondition = GLOBAL_CONFIG.CC_AGENT_HISTORY_FILTER(this.params.agentName);
-    }
+        });
+    };
     return ClientHistory;
 }());
 
@@ -3146,6 +3199,77 @@ var ToolSchemaService = /** @class */ (function () {
 
 var AGENT_NEED_FETCH = Symbol("agent-need-fetch");
 var STACK_NEED_FETCH = Symbol("stack-need-fetch");
+var WAIT_FOR_OUTPUT_FN = function (self) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, awaiter, resolve, getOutput, handleOutput, un, _b, agentName, output, expectAgent;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientSwarm swarmName=".concat(self.params.swarmName, " clientId=").concat(self.params.clientId, " waitForOutput"));
+                _a = __read(functoolsKit.createAwaiter(), 2), awaiter = _a[0], resolve = _a[1].resolve;
+                getOutput = functoolsKit.cancelable(function () { return __awaiter(void 0, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, Promise.race(self._agentList
+                                    .map(function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
+                                    var _c;
+                                    var _d = __read(_b, 2), agentName = _d[0], agent = _d[1];
+                                    return __generator(this, function (_e) {
+                                        switch (_e.label) {
+                                            case 0:
+                                                _c = {
+                                                    agentName: agentName
+                                                };
+                                                return [4 /*yield*/, agent.waitForOutput()];
+                                            case 1: return [2 /*return*/, (_c.output = _e.sent(),
+                                                    _c)];
+                                        }
+                                    });
+                                }); })
+                                    .concat(self._cancelOutputSubject.toPromise()))];
+                            case 1: return [2 /*return*/, _a.sent()];
+                        }
+                    });
+                }); });
+                handleOutput = function () {
+                    getOutput.cancel();
+                    getOutput().then(function (value) {
+                        if (value === functoolsKit.CANCELED_PROMISE_SYMBOL) {
+                            return;
+                        }
+                        resolve(value);
+                    });
+                };
+                un = self._agentChangedSubject.subscribe(handleOutput);
+                handleOutput();
+                return [4 /*yield*/, awaiter];
+            case 1:
+                _b = _c.sent(), agentName = _b.agentName, output = _b.output;
+                un();
+                return [4 /*yield*/, self.getAgentName()];
+            case 2:
+                expectAgent = _c.sent();
+                agentName !== expectAgent &&
+                    GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientSwarm swarmName=".concat(self.params.swarmName, " clientId=").concat(self.params.clientId, " waitForAgent agent miss"), { agentName: agentName, expectAgent: expectAgent });
+                return [4 /*yield*/, self.params.bus.emit(self.params.clientId, {
+                        type: "wait-for-output",
+                        source: "swarm-bus",
+                        input: {},
+                        output: {
+                            result: output,
+                        },
+                        context: {
+                            swarmName: self.params.swarmName,
+                        },
+                        clientId: self.params.clientId,
+                    })];
+            case 3:
+                _c.sent();
+                return [2 /*return*/, output];
+        }
+    });
+}); };
 /**
  * ClientSwarm class implements the ISwarm interface and manages agents within a swarm.
  */
@@ -3162,10 +3286,33 @@ var ClientSwarm = /** @class */ (function () {
         this._navigationStack = STACK_NEED_FETCH;
         this._cancelOutputSubject = new functoolsKit.Subject();
         /**
-         * Pop the navigation stack or return default agent
-         * @returns {Promise<string>} - The pending agent for navigation
+         * Waits for output from the active agent.
+         * @returns {Promise<string>} - The output from the active agent.
          */
-        this.navigationPop = function () { return __awaiter(_this, void 0, void 0, function () {
+        this.waitForOutput = functoolsKit.queued(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, WAIT_FOR_OUTPUT_FN(this)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        }); }); });
+        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+            this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " CTOR"), {
+                params: params,
+            });
+    }
+    Object.defineProperty(ClientSwarm.prototype, "_agentList", {
+        get: function () {
+            return Object.entries(this.params.agentMap);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /**
+     * Pop the navigation stack or return default agent
+     * @returns {Promise<string>} - The pending agent for navigation
+     */
+    ClientSwarm.prototype.navigationPop = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _a, prevAgent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -3186,12 +3333,14 @@ var ClientSwarm = /** @class */ (function () {
                         return [2 /*return*/, prevAgent ? prevAgent : this.params.defaultAgent];
                 }
             });
-        }); };
-        /**
-         * Cancel the await of output by emit of empty string
-         * @returns {Promise<string>} - The output from the active agent.
-         */
-        this.cancelOutput = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Cancel the await of output by emit of empty string
+     * @returns {Promise<string>} - The output from the active agent.
+     */
+    ClientSwarm.prototype.cancelOutput = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _a, _b;
             var _c;
             return __generator(this, function (_d) {
@@ -3222,89 +3371,14 @@ var ClientSwarm = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Waits for output from the active agent.
-         * @returns {Promise<string>} - The output from the active agent.
-         */
-        this.waitForOutput = functoolsKit.queued(function () { return __awaiter(_this, void 0, void 0, function () {
-            var _a, awaiter, resolve, getOutput, handleOutput, un, _b, agentName, output, expectAgent;
-            var _this = this;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " waitForOutput"));
-                        _a = __read(functoolsKit.createAwaiter(), 2), awaiter = _a[0], resolve = _a[1].resolve;
-                        getOutput = functoolsKit.cancelable(function () { return __awaiter(_this, void 0, void 0, function () {
-                            var _this = this;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, Promise.race(this._agentList
-                                            .map(function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
-                                            var _c;
-                                            var _d = __read(_b, 2), agentName = _d[0], agent = _d[1];
-                                            return __generator(this, function (_e) {
-                                                switch (_e.label) {
-                                                    case 0:
-                                                        _c = {
-                                                            agentName: agentName
-                                                        };
-                                                        return [4 /*yield*/, agent.waitForOutput()];
-                                                    case 1: return [2 /*return*/, (_c.output = _e.sent(),
-                                                            _c)];
-                                                }
-                                            });
-                                        }); })
-                                            .concat(this._cancelOutputSubject.toPromise()))];
-                                    case 1: return [2 /*return*/, _a.sent()];
-                                }
-                            });
-                        }); });
-                        handleOutput = function () {
-                            getOutput.cancel();
-                            getOutput().then(function (value) {
-                                if (value === functoolsKit.CANCELED_PROMISE_SYMBOL) {
-                                    return;
-                                }
-                                resolve(value);
-                            });
-                        };
-                        un = this._agentChangedSubject.subscribe(handleOutput);
-                        handleOutput();
-                        return [4 /*yield*/, awaiter];
-                    case 1:
-                        _b = _c.sent(), agentName = _b.agentName, output = _b.output;
-                        un();
-                        return [4 /*yield*/, this.getAgentName()];
-                    case 2:
-                        expectAgent = _c.sent();
-                        agentName !== expectAgent &&
-                            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " waitForAgent agent miss"), { agentName: agentName, expectAgent: expectAgent });
-                        return [4 /*yield*/, this.params.bus.emit(this.params.clientId, {
-                                type: "wait-for-output",
-                                source: "swarm-bus",
-                                input: {},
-                                output: {
-                                    result: output,
-                                },
-                                context: {
-                                    swarmName: this.params.swarmName,
-                                },
-                                clientId: this.params.clientId,
-                            })];
-                    case 3:
-                        _c.sent();
-                        return [2 /*return*/, output];
-                }
-            });
-        }); });
-        /**
-         * Gets the name of the active agent.
-         * @returns {Promise<AgentName>} - The name of the active agent.
-         */
-        this.getAgentName = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Gets the name of the active agent.
+     * @returns {Promise<AgentName>} - The name of the active agent.
+     */
+    ClientSwarm.prototype.getAgentName = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -3334,12 +3408,14 @@ var ClientSwarm = /** @class */ (function () {
                         return [2 /*return*/, this._activeAgent];
                 }
             });
-        }); };
-        /**
-         * Gets the active agent.
-         * @returns {Promise<IAgent>} - The active agent.
-         */
-        this.getAgent = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Gets the active agent.
+     * @returns {Promise<IAgent>} - The active agent.
+     */
+    ClientSwarm.prototype.getAgent = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var agent, result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3367,14 +3443,16 @@ var ClientSwarm = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Sets the reference of an agent in the swarm.
-         * @param {AgentName} agentName - The name of the agent.
-         * @param {IAgent} agent - The agent instance.
-         * @throws {Error} - If the agent is not in the swarm.
-         */
-        this.setAgentRef = function (agentName, agent) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Sets the reference of an agent in the swarm.
+     * @param {AgentName} agentName - The name of the agent.
+     * @param {IAgent} agent - The agent instance.
+     * @throws {Error} - If the agent is not in the swarm.
+     */
+    ClientSwarm.prototype.setAgentRef = function (agentName, agent) {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -3405,12 +3483,14 @@ var ClientSwarm = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Sets the active agent by name.
-         * @param {AgentName} agentName - The name of the agent to set as active.
-         */
-        this.setAgentName = function (agentName) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Sets the active agent by name.
+     * @param {AgentName} agentName - The name of the agent to set as active.
+     */
+    ClientSwarm.prototype.setAgentName = function (agentName) {
+        return __awaiter(this, void 0, void 0, function () {
             var _a;
             var _b;
             return __generator(this, function (_c) {
@@ -3453,19 +3533,8 @@ var ClientSwarm = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-            this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " CTOR"), {
-                params: params,
-            });
-    }
-    Object.defineProperty(ClientSwarm.prototype, "_agentList", {
-        get: function () {
-            return Object.entries(this.params.agentMap);
-        },
-        enumerable: false,
-        configurable: true
-    });
+        });
+    };
     return ClientSwarm;
 }());
 
@@ -3768,15 +3837,21 @@ var ClientSession = /** @class */ (function () {
      * @param {ISessionParams} params - The session parameters.
      */
     function ClientSession(params) {
-        var _this = this;
         this.params = params;
         this._emitSubject = new functoolsKit.Subject();
-        /**
-         * Emits a message.
-         * @param {string} message - The message to emit.
-         * @returns {Promise<void>}
-         */
-        this.emit = function (message) { return __awaiter(_this, void 0, void 0, function () {
+        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+            this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " CTOR"), {
+                params: params,
+            });
+        this.params.onInit && this.params.onInit(params.clientId, params.swarmName);
+    }
+    /**
+     * Emits a message.
+     * @param {string} message - The message to emit.
+     * @returns {Promise<void>}
+     */
+    ClientSession.prototype.emit = function (message) {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -3806,14 +3881,16 @@ var ClientSession = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Executes a message and optionally emits the output.
-         * @param {string} message - The message to execute.
-         * @param {boolean} [noEmit=false] - Whether to emit the output or not.
-         * @returns {Promise<string>} - The output of the execution.
-         */
-        this.execute = function (message, mode) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Executes a message and optionally emits the output.
+     * @param {string} message - The message to execute.
+     * @param {boolean} [noEmit=false] - Whether to emit the output or not.
+     * @returns {Promise<string>} - The output of the execution.
+     */
+    ClientSession.prototype.execute = function (message, mode) {
+        return __awaiter(this, void 0, void 0, function () {
             var agent, outputAwaiter, output;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3853,13 +3930,15 @@ var ClientSession = /** @class */ (function () {
                         return [2 /*return*/, output];
                 }
             });
-        }); };
-        /**
-         * Run the completion stateless
-         * @param {string} message - The message to run.
-         * @returns {Promise<string>} - The output of the execution.
-         */
-        this.run = function (message) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Run the completion stateless
+     * @param {string} message - The message to run.
+     * @returns {Promise<string>} - The output of the execution.
+     */
+    ClientSession.prototype.run = function (message) {
+        return __awaiter(this, void 0, void 0, function () {
             var agent, output;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3895,14 +3974,16 @@ var ClientSession = /** @class */ (function () {
                         return [2 /*return*/, output];
                 }
             });
-        }); };
-        /**
-         * Commits tool output.
-         * @param {string} toolId - The `tool_call_id` for openai history
-         * @param {string} content - The content to commit.
-         * @returns {Promise<void>}
-         */
-        this.commitToolOutput = function (toolId, content) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits tool output.
+     * @param {string} toolId - The `tool_call_id` for openai history
+     * @param {string} content - The content to commit.
+     * @returns {Promise<void>}
+     */
+    ClientSession.prototype.commitToolOutput = function (toolId, content) {
+        return __awaiter(this, void 0, void 0, function () {
             var agent, result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3936,13 +4017,15 @@ var ClientSession = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Commits user message without answer.
-         * @param {string} message - The message to commit.
-         * @returns {Promise<void>}
-         */
-        this.commitUserMessage = function (message) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits user message without answer.
+     * @param {string} message - The message to commit.
+     * @returns {Promise<void>}
+     */
+    ClientSession.prototype.commitUserMessage = function (message) {
+        return __awaiter(this, void 0, void 0, function () {
             var agent, result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3974,12 +4057,14 @@ var ClientSession = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Commits flush of agent history
-         * @returns {Promise<void>}
-         */
-        this.commitFlush = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits flush of agent history
+     * @returns {Promise<void>}
+     */
+    ClientSession.prototype.commitFlush = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var agent, result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -4007,12 +4092,14 @@ var ClientSession = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Commits stop of the nexttool execution
-         * @returns {Promise<void>}
-         */
-        this.commitStopTools = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits stop of the nexttool execution
+     * @returns {Promise<void>}
+     */
+    ClientSession.prototype.commitStopTools = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var agent, result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -4040,13 +4127,15 @@ var ClientSession = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Commits a system message.
-         * @param {string} message - The system message to commit.
-         * @returns {Promise<void>}
-         */
-        this.commitSystemMessage = function (message) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits a system message.
+     * @param {string} message - The system message to commit.
+     * @returns {Promise<void>}
+     */
+    ClientSession.prototype.commitSystemMessage = function (message) {
+        return __awaiter(this, void 0, void 0, function () {
             var agent, result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -4078,13 +4167,15 @@ var ClientSession = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Commits an assistant message.
-         * @param {string} message - The assistant message to commit.
-         * @returns {Promise<void>}
-         */
-        this.commitAssistantMessage = function (message) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Commits an assistant message.
+     * @param {string} message - The assistant message to commit.
+     * @returns {Promise<void>}
+     */
+    ClientSession.prototype.commitAssistantMessage = function (message) {
+        return __awaiter(this, void 0, void 0, function () {
             var agent, result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -4116,79 +4207,82 @@ var ClientSession = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Connects the session to a connector function.
-         * @param {SendMessageFn} connector - The connector function.
-         * @returns {ReceiveMessageFn<string>} - The function to receive messages.
-         */
-        this.connect = function (connector) {
-            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                _this.params.logger.debug("ClientSession clientId=".concat(_this.params.clientId, " connect"));
-            _this.params.onConnect &&
-                _this.params.onConnect(_this.params.clientId, _this.params.swarmName);
-            _this._emitSubject.subscribe(function (data) { return __awaiter(_this, void 0, void 0, function () {
-                var _a;
-                var _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            _a = connector;
-                            _b = {
-                                data: data
-                            };
-                            return [4 /*yield*/, this.params.swarm.getAgentName()];
-                        case 1: return [4 /*yield*/, _a.apply(void 0, [(_b.agentName = _c.sent(),
-                                    _b.clientId = this.params.clientId,
-                                    _b)])];
-                        case 2: return [2 /*return*/, _c.sent()];
-                    }
-                });
-            }); });
-            _this.params.bus.emit(_this.params.clientId, {
-                type: "connect",
-                source: "session-bus",
-                input: {},
-                output: {},
-                context: {
-                    swarmName: _this.params.swarmName,
-                },
-                clientId: _this.params.clientId,
+        });
+    };
+    /**
+     * Connects the session to a connector function.
+     * @param {SendMessageFn} connector - The connector function.
+     * @returns {ReceiveMessageFn<string>} - The function to receive messages.
+     */
+    ClientSession.prototype.connect = function (connector) {
+        var _this = this;
+        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+            this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " connect"));
+        this.params.onConnect &&
+            this.params.onConnect(this.params.clientId, this.params.swarmName);
+        this._emitSubject.subscribe(function (data) { return __awaiter(_this, void 0, void 0, function () {
+            var _a;
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _a = connector;
+                        _b = {
+                            data: data
+                        };
+                        return [4 /*yield*/, this.params.swarm.getAgentName()];
+                    case 1: return [4 /*yield*/, _a.apply(void 0, [(_b.agentName = _c.sent(),
+                                _b.clientId = this.params.clientId,
+                                _b)])];
+                    case 2: return [2 /*return*/, _c.sent()];
+                }
             });
-            return function (incoming) { return __awaiter(_this, void 0, void 0, function () {
-                var data, _a;
-                var _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " connect call"));
-                            return [4 /*yield*/, this.execute(incoming.data, "user")];
-                        case 1:
-                            data = _c.sent();
-                            if (!data) {
-                                return [2 /*return*/];
-                            }
-                            _a = connector;
-                            _b = {
-                                data: data
-                            };
-                            return [4 /*yield*/, this.params.swarm.getAgentName()];
-                        case 2: return [4 /*yield*/, _a.apply(void 0, [(_b.agentName = _c.sent(),
-                                    _b.clientId = incoming.clientId,
-                                    _b)])];
-                        case 3:
-                            _c.sent();
-                            return [2 /*return*/, data];
-                    }
-                });
-            }); };
-        };
-        /**
-         * Should call on session dispose
-         * @returns {Promise<void>}
-         */
-        this.dispose = function () { return __awaiter(_this, void 0, void 0, function () {
+        }); });
+        this.params.bus.emit(this.params.clientId, {
+            type: "connect",
+            source: "session-bus",
+            input: {},
+            output: {},
+            context: {
+                swarmName: this.params.swarmName,
+            },
+            clientId: this.params.clientId,
+        });
+        return function (incoming) { return __awaiter(_this, void 0, void 0, function () {
+            var data, _a;
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                            this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " connect call"));
+                        return [4 /*yield*/, this.execute(incoming.data, "user")];
+                    case 1:
+                        data = _c.sent();
+                        if (!data) {
+                            return [2 /*return*/];
+                        }
+                        _a = connector;
+                        _b = {
+                            data: data
+                        };
+                        return [4 /*yield*/, this.params.swarm.getAgentName()];
+                    case 2: return [4 /*yield*/, _a.apply(void 0, [(_b.agentName = _c.sent(),
+                                _b.clientId = incoming.clientId,
+                                _b)])];
+                    case 3:
+                        _c.sent();
+                        return [2 /*return*/, data];
+                }
+            });
+        }); };
+    };
+    /**
+     * Should call on session dispose
+     * @returns {Promise<void>}
+     */
+    ClientSession.prototype.dispose = function () {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
                     this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " dispose"));
@@ -4196,13 +4290,8 @@ var ClientSession = /** @class */ (function () {
                     this.params.onDispose(this.params.clientId, this.params.swarmName);
                 return [2 /*return*/];
             });
-        }); };
-        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-            this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " CTOR"), {
-                params: params,
-            });
-        this.params.onInit && this.params.onInit(params.clientId, params.swarmName);
-    }
+        });
+    };
     return ClientSession;
 }());
 
@@ -6585,6 +6674,30 @@ var StorageSchemaService = /** @class */ (function () {
     return StorageSchemaService;
 }());
 
+var WAIT_FOR_INIT_FN$1 = function (self) { return __awaiter(void 0, void 0, void 0, function () {
+    var data;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientStorage storageName=".concat(self.params.storageName, " clientId=").concat(self.params.clientId, " shared=").concat(self.params.shared, " waitForInit"));
+                if (!self.params.getData) {
+                    return [2 /*return*/];
+                }
+                return [4 /*yield*/, self.params.getData(self.params.clientId, self.params.storageName)];
+            case 1:
+                data = _a.sent();
+                return [4 /*yield*/, Promise.all(data.map(functoolsKit.execpool(self._createEmbedding, {
+                        delay: 10,
+                        maxExec: GLOBAL_CONFIG.CC_STORAGE_SEARCH_POOL,
+                    })))];
+            case 2:
+                _a.sent();
+                self._itemMap = new Map(data.map(function (item) { return [item.id, item]; }));
+                return [2 /*return*/];
+        }
+    });
+}); };
 /**
  * ClientStorage class to manage storage operations.
  * @template T - The type of storage data.
@@ -6633,121 +6746,108 @@ var ClientStorage = /** @class */ (function () {
          * Waits for the initialization of the storage.
          * @returns {Promise<void>}
          */
-        this.waitForInit = functoolsKit.singleshot(function () { return __awaiter(_this, void 0, void 0, function () {
-            var data;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+        this.waitForInit = functoolsKit.singleshot(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, WAIT_FOR_INIT_FN$1(this)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        }); }); });
+        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+            this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " CTOR"), {
+                params: params,
+            });
+        if ((_a = this.params.callbacks) === null || _a === void 0 ? void 0 : _a.onInit) {
+            this.params.callbacks.onInit(this.params.clientId, this.params.storageName);
+        }
+    }
+    /**
+     * Takes a specified number of items based on the search criteria.
+     * @param {string} search - The search string.
+     * @param {number} total - The total number of items to take.
+     * @param {number} [score=GLOBAL_CONFIG.CC_STORAGE_SEARCH_SIMILARITY] - The similarity score.
+     * @returns {Promise<T[]>} - The list of items.
+     */
+    ClientStorage.prototype.take = function (search_1, total_1) {
+        return __awaiter(this, arguments, void 0, function (search, total, score) {
+            var indexed, searchEmbeddings;
+            var _this = this;
+            var _a, _b;
+            if (score === void 0) { score = GLOBAL_CONFIG.CC_STORAGE_SEARCH_SIMILARITY; }
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " waitForInit"));
-                        if (!this.params.getData) {
-                            return [2 /*return*/];
-                        }
-                        return [4 /*yield*/, this.params.getData(this.params.clientId, this.params.storageName)];
+                            this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " take"), {
+                                search: search,
+                                total: total,
+                            });
+                        indexed = new functoolsKit.SortedArray();
+                        return [4 /*yield*/, this.params.createEmbedding(search)];
                     case 1:
-                        data = _a.sent();
-                        return [4 /*yield*/, Promise.all(data.map(functoolsKit.execpool(this._createEmbedding, {
+                        searchEmbeddings = _c.sent();
+                        if (this.params.onCreate) {
+                            this.params.onCreate(search, searchEmbeddings, this.params.clientId, this.params.embedding);
+                        }
+                        return [4 /*yield*/, Promise.all(Array.from(this._itemMap.values()).map(functoolsKit.execpool(function (item) { return __awaiter(_this, void 0, void 0, function () {
+                                var _a, targetEmbeddings, index, score;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0: return [4 /*yield*/, this._createEmbedding(item)];
+                                        case 1:
+                                            _a = __read.apply(void 0, [_b.sent(), 2]), targetEmbeddings = _a[0], index = _a[1];
+                                            return [4 /*yield*/, this.params.calculateSimilarity(searchEmbeddings, targetEmbeddings)];
+                                        case 2:
+                                            score = _b.sent();
+                                            if (this.params.onCompare) {
+                                                this.params.onCompare(search, index, score, this.params.clientId, this.params.embedding);
+                                            }
+                                            indexed.push(item, score);
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); }, {
                                 delay: 10,
                                 maxExec: GLOBAL_CONFIG.CC_STORAGE_SEARCH_POOL,
                             })))];
                     case 2:
-                        _a.sent();
-                        this._itemMap = new Map(data.map(function (item) { return [item.id, item]; }));
-                        return [2 /*return*/];
-                }
-            });
-        }); });
-        /**
-         * Takes a specified number of items based on the search criteria.
-         * @param {string} search - The search string.
-         * @param {number} total - The total number of items to take.
-         * @param {number} [score=GLOBAL_CONFIG.CC_STORAGE_SEARCH_SIMILARITY] - The similarity score.
-         * @returns {Promise<T[]>} - The list of items.
-         */
-        this.take = function (search_1, total_1) {
-            var args_1 = [];
-            for (var _i = 2; _i < arguments.length; _i++) {
-                args_1[_i - 2] = arguments[_i];
-            }
-            return __awaiter(_this, __spreadArray([search_1, total_1], __read(args_1), false), void 0, function (search, total, score) {
-                var indexed, searchEmbeddings;
-                var _this = this;
-                var _a, _b;
-                if (score === void 0) { score = GLOBAL_CONFIG.CC_STORAGE_SEARCH_SIMILARITY; }
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " take"), {
+                        _c.sent();
+                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                            this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " take indexed"), {
+                                indexed: indexed.getEntries(),
+                            });
+                        if ((_a = this.params.callbacks) === null || _a === void 0 ? void 0 : _a.onSearch) {
+                            (_b = this.params.callbacks) === null || _b === void 0 ? void 0 : _b.onSearch(search, indexed, this.params.clientId, this.params.storageName);
+                        }
+                        return [4 /*yield*/, this.params.bus.emit(this.params.clientId, {
+                                type: "take",
+                                source: "storage-bus",
+                                input: {
                                     search: search,
                                     total: total,
-                                });
-                            indexed = new functoolsKit.SortedArray();
-                            return [4 /*yield*/, this.params.createEmbedding(search)];
-                        case 1:
-                            searchEmbeddings = _c.sent();
-                            if (this.params.onCreate) {
-                                this.params.onCreate(search, searchEmbeddings, this.params.clientId, this.params.embedding);
-                            }
-                            return [4 /*yield*/, Promise.all(Array.from(this._itemMap.values()).map(functoolsKit.execpool(function (item) { return __awaiter(_this, void 0, void 0, function () {
-                                    var _a, targetEmbeddings, index, score;
-                                    return __generator(this, function (_b) {
-                                        switch (_b.label) {
-                                            case 0: return [4 /*yield*/, this._createEmbedding(item)];
-                                            case 1:
-                                                _a = __read.apply(void 0, [_b.sent(), 2]), targetEmbeddings = _a[0], index = _a[1];
-                                                return [4 /*yield*/, this.params.calculateSimilarity(searchEmbeddings, targetEmbeddings)];
-                                            case 2:
-                                                score = _b.sent();
-                                                if (this.params.onCompare) {
-                                                    this.params.onCompare(search, index, score, this.params.clientId, this.params.embedding);
-                                                }
-                                                indexed.push(item, score);
-                                                return [2 /*return*/];
-                                        }
-                                    });
-                                }); }, {
-                                    delay: 10,
-                                    maxExec: GLOBAL_CONFIG.CC_STORAGE_SEARCH_POOL,
-                                })))];
-                        case 2:
-                            _c.sent();
-                            GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                                this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " take indexed"), {
-                                    indexed: indexed.getEntries(),
-                                });
-                            if ((_a = this.params.callbacks) === null || _a === void 0 ? void 0 : _a.onSearch) {
-                                (_b = this.params.callbacks) === null || _b === void 0 ? void 0 : _b.onSearch(search, indexed, this.params.clientId, this.params.storageName);
-                            }
-                            return [4 /*yield*/, this.params.bus.emit(this.params.clientId, {
-                                    type: "take",
-                                    source: "storage-bus",
-                                    input: {
-                                        search: search,
-                                        total: total,
-                                        score: score,
-                                    },
-                                    output: {
-                                        indexed: indexed,
-                                    },
-                                    context: {
-                                        storageName: this.params.storageName,
-                                    },
-                                    clientId: this.params.clientId,
-                                })];
-                        case 3:
-                            _c.sent();
-                            return [2 /*return*/, indexed.take(total, score)];
-                    }
-                });
+                                    score: score,
+                                },
+                                output: {
+                                    indexed: indexed,
+                                },
+                                context: {
+                                    storageName: this.params.storageName,
+                                },
+                                clientId: this.params.clientId,
+                            })];
+                    case 3:
+                        _c.sent();
+                        return [2 /*return*/, indexed.take(total, score)];
+                }
             });
-        };
-        /**
-         * Upserts an item into the storage.
-         * @param {T} item - The item to upsert.
-         * @returns {Promise<void>}
-         */
-        this.upsert = function (item) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Upserts an item into the storage.
+     * @param {T} item - The item to upsert.
+     * @returns {Promise<void>}
+     */
+    ClientStorage.prototype.upsert = function (item) {
+        return __awaiter(this, void 0, void 0, function () {
             var _a, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -6781,13 +6881,15 @@ var ClientStorage = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Removes an item from the storage.
-         * @param {IStorageData["id"]} itemId - The ID of the item to remove.
-         * @returns {Promise<void>}
-         */
-        this.remove = function (itemId) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Removes an item from the storage.
+     * @param {IStorageData["id"]} itemId - The ID of the item to remove.
+     * @returns {Promise<void>}
+     */
+    ClientStorage.prototype.remove = function (itemId) {
+        return __awaiter(this, void 0, void 0, function () {
             var _a, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -6818,12 +6920,14 @@ var ClientStorage = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Clears all items from the storage.
-         * @returns {Promise<void>}
-         */
-        this.clear = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Clears all items from the storage.
+     * @returns {Promise<void>}
+     */
+    ClientStorage.prototype.clear = function () {
+        return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -6846,13 +6950,15 @@ var ClientStorage = /** @class */ (function () {
                         return [2 /*return*/];
                 }
             });
-        }); };
-        /**
-         * Gets an item by its ID.
-         * @param {IStorageData["id"]} itemId - The ID of the item to get.
-         * @returns {Promise<T | null>} - The item or null if not found.
-         */
-        this.get = function (itemId) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Gets an item by its ID.
+     * @param {IStorageData["id"]} itemId - The ID of the item to get.
+     * @returns {Promise<T | null>} - The item or null if not found.
+     */
+    ClientStorage.prototype.get = function (itemId) {
+        return __awaiter(this, void 0, void 0, function () {
             var result;
             var _a;
             return __generator(this, function (_b) {
@@ -6882,13 +6988,15 @@ var ClientStorage = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Lists all items in the storage, optionally filtered by a predicate.
-         * @param {(item: T) => boolean} [filter] - The filter predicate.
-         * @returns {Promise<T[]>} - The list of items.
-         */
-        this.list = function (filter) { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Lists all items in the storage, optionally filtered by a predicate.
+     * @param {(item: T) => boolean} [filter] - The filter predicate.
+     * @returns {Promise<T[]>} - The list of items.
+     */
+    ClientStorage.prototype.list = function (filter) {
+        return __awaiter(this, void 0, void 0, function () {
             var result, _a, _b, item;
             var e_1, _c;
             return __generator(this, function (_d) {
@@ -6932,12 +7040,14 @@ var ClientStorage = /** @class */ (function () {
                         return [2 /*return*/, result];
                 }
             });
-        }); };
-        /**
-         * Disposes of the state.
-         * @returns {Promise<void>}
-         */
-        this.dispose = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Disposes of the state.
+     * @returns {Promise<void>}
+     */
+    ClientStorage.prototype.dispose = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
                 GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
@@ -6947,15 +7057,8 @@ var ClientStorage = /** @class */ (function () {
                 }
                 return [2 /*return*/];
             });
-        }); };
-        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-            this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " CTOR"), {
-                params: params,
-            });
-        if ((_a = this.params.callbacks) === null || _a === void 0 ? void 0 : _a.onInit) {
-            this.params.callbacks.onInit(this.params.clientId, this.params.storageName);
-        }
-    }
+        });
+    };
     return ClientStorage;
 }());
 
@@ -7581,6 +7684,44 @@ var StateSchemaService = /** @class */ (function () {
     return StateSchemaService;
 }());
 
+var DISPATCH_FN = function (action, self, payload) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                if (action === "read") {
+                    return [2 /*return*/, self._state];
+                }
+                if (!(action === "write")) return [3 /*break*/, 2];
+                console.assert(payload, "agent-swarm ClientState write action undefined payload");
+                _a = self;
+                return [4 /*yield*/, payload(self._state)];
+            case 1: return [2 /*return*/, (_a._state = _b.sent())];
+            case 2: throw new Error("agent-swarm ClientState unknown action");
+        }
+    });
+}); };
+var WAIT_FOR_INIT_FN = function (self) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientState stateName=".concat(self.params.stateName, " clientId=").concat(self.params.clientId, " shared=").concat(self.params.shared, " waitForInit"));
+                _a = self;
+                return [4 /*yield*/, self.params.getState(self.params.clientId, self.params.stateName)];
+            case 1:
+                _a._state = _c.sent();
+                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+                    self.params.logger.debug("ClientState stateName=".concat(self.params.stateName, " clientId=").concat(self.params.clientId, " shared=").concat(self.params.shared, " waitForInit output"), { initialState: self._state });
+                if ((_b = self.params.callbacks) === null || _b === void 0 ? void 0 : _b.onLoad) {
+                    self.params.callbacks.onLoad(self._state, self.params.clientId, self.params.stateName);
+                }
+                return [2 /*return*/];
+        }
+    });
+}); };
 /**
  * Class representing the client state.
  * @template State - The type of the state data.
@@ -7596,54 +7737,37 @@ var ClientState = /** @class */ (function () {
         var _a;
         this.params = params;
         this._state = null;
-        this.dispatch = functoolsKit.queued(function (action, payload) { return __awaiter(_this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (action === "read") {
-                            return [2 /*return*/, this._state];
-                        }
-                        if (!(action === "write")) return [3 /*break*/, 2];
-                        console.assert(payload, "agent-swarm ClientState write action undefined payload");
-                        _a = this;
-                        return [4 /*yield*/, payload(this._state)];
-                    case 1: return [2 /*return*/, (_a._state = _b.sent())];
-                    case 2: throw new Error("agent-swarm ClientState unknown action");
-                }
-            });
-        }); });
+        this.dispatch = functoolsKit.queued(function (action, payload) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, DISPATCH_FN(action, this, payload)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        }); }); });
         /**
          * Waits for the state to initialize.
          * @returns {Promise<void>}
          */
-        this.waitForInit = functoolsKit.singleshot(function () { return __awaiter(_this, void 0, void 0, function () {
-            var _a;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientState stateName=".concat(this.params.stateName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " waitForInit"));
-                        _a = this;
-                        return [4 /*yield*/, this.params.getState(this.params.clientId, this.params.stateName)];
-                    case 1:
-                        _a._state = _c.sent();
-                        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                            this.params.logger.debug("ClientState stateName=".concat(this.params.stateName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " waitForInit output"), { initialState: this._state });
-                        if ((_b = this.params.callbacks) === null || _b === void 0 ? void 0 : _b.onLoad) {
-                            this.params.callbacks.onLoad(this._state, this.params.clientId, this.params.stateName);
-                        }
-                        return [2 /*return*/];
-                }
+        this.waitForInit = functoolsKit.singleshot(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, WAIT_FOR_INIT_FN(this)];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        }); }); });
+        GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
+            this.params.logger.debug("ClientState stateName=".concat(this.params.stateName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " CTOR"), {
+                params: params,
             });
-        }); });
-        /**
-         * Sets the state using the provided dispatch function.
-         * @param {DispatchFn<State>} dispatchFn - The dispatch function.
-         * @returns {Promise<State>}
-         */
-        this.setState = function (dispatchFn) { return __awaiter(_this, void 0, void 0, function () {
+        if ((_a = this.params.callbacks) === null || _a === void 0 ? void 0 : _a.onInit) {
+            this.params.callbacks.onInit(this.params.clientId, this.params.stateName);
+        }
+    }
+    /**
+     * Sets the state using the provided dispatch function.
+     * @param {DispatchFn<State>} dispatchFn - The dispatch function.
+     * @returns {Promise<State>}
+     */
+    ClientState.prototype.setState = function (dispatchFn) {
+        return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             var _a;
             return __generator(this, function (_b) {
@@ -7715,12 +7839,14 @@ var ClientState = /** @class */ (function () {
                         return [2 /*return*/, this._state];
                 }
             });
-        }); };
-        /**
-         * Sets the to initial value
-         * @returns {Promise<State>}
-         */
-        this.clearState = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Sets the to initial value
+     * @returns {Promise<State>}
+     */
+    ClientState.prototype.clearState = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             var _a;
             return __generator(this, function (_b) {
@@ -7762,12 +7888,14 @@ var ClientState = /** @class */ (function () {
                         return [2 /*return*/, this._state];
                 }
             });
-        }); };
-        /**
-         * Gets the current state.
-         * @returns {Promise<State>}
-         */
-        this.getState = function () { return __awaiter(_this, void 0, void 0, function () {
+        });
+    };
+    /**
+     * Gets the current state.
+     * @returns {Promise<State>}
+     */
+    ClientState.prototype.getState = function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -7797,30 +7925,20 @@ var ClientState = /** @class */ (function () {
                         return [2 /*return*/, this._state];
                 }
             });
-        }); };
-        /**
-         * Disposes of the state.
-         * @returns {Promise<void>}
-         */
-        this.dispose = function () { return __awaiter(_this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-                    this.params.logger.debug("ClientState stateName=".concat(this.params.stateName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " dispose"));
-                if ((_a = this.params.callbacks) === null || _a === void 0 ? void 0 : _a.onDispose) {
-                    this.params.callbacks.onDispose(this.params.clientId, this.params.stateName);
-                }
-                return [2 /*return*/];
-            });
-        }); };
+        });
+    };
+    /**
+     * Disposes of the state.
+     * @returns {Promise<void>}
+     */
+    ClientState.prototype.dispose = function () {
+        var _a;
         GLOBAL_CONFIG.CC_LOGGER_ENABLE_DEBUG &&
-            this.params.logger.debug("ClientState stateName=".concat(this.params.stateName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " CTOR"), {
-                params: params,
-            });
-        if ((_a = this.params.callbacks) === null || _a === void 0 ? void 0 : _a.onInit) {
-            this.params.callbacks.onInit(this.params.clientId, this.params.stateName);
+            this.params.logger.debug("ClientState stateName=".concat(this.params.stateName, " clientId=").concat(this.params.clientId, " shared=").concat(this.params.shared, " dispose"));
+        if ((_a = this.params.callbacks) === null || _a === void 0 ? void 0 : _a.onDispose) {
+            this.params.callbacks.onDispose(this.params.clientId, this.params.stateName);
         }
-    }
+    };
     return ClientState;
 }());