agent-swarm-kit 1.0.7 → 1.0.9

package/build/index.mjs

@@ -1,5 +1,5 @@
 import { scoped } from 'di-scoped';
-import { ToolRegistry, Subject, queued, not, trycatch, memoize, PubsubArrayAdapter, ttl, singleshot } from 'functools-kit';
+import { ToolRegistry, PubsubArrayAdapter, Subject, queued, not, trycatch, memoize, ttl, singleshot } from 'functools-kit';
 import { createActivator } from 'di-kit';
 import { omit } from 'lodash-es';
 import xml2js from 'xml2js';
@@ -233,11 +233,13 @@ var CC_EMPTY_OUTPUT_PLACEHOLDERS = [
 ];
 var CC_KEEP_MESSAGES = 5;
 var CC_ANSWER_TIMEOUT_SECONDS = 120000;
+var CC_GET_AGENT_HISTORY = function () { return new PubsubArrayAdapter(); };
 var GLOBAL_CONFIG = {
     CC_TOOL_CALL_EXCEPTION_PROMPT: CC_TOOL_CALL_EXCEPTION_PROMPT,
     CC_EMPTY_OUTPUT_PLACEHOLDERS: CC_EMPTY_OUTPUT_PLACEHOLDERS,
     CC_KEEP_MESSAGES: CC_KEEP_MESSAGES,
     CC_ANSWER_TIMEOUT_SECONDS: CC_ANSWER_TIMEOUT_SECONDS,
+    CC_GET_AGENT_HISTORY: CC_GET_AGENT_HISTORY,
 };
 var setConfig = function (config) {
     Object.assign(GLOBAL_CONFIG, config);
@@ -257,7 +259,7 @@ var ClientAgent = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " _emitOuput"));
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _emitOuput"));
                         validation = null;
                         return [4 /*yield*/, this.params.validate(result)];
                     case 1:
@@ -268,7 +270,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.validate(result_1)];
                     case 3:
                         if (validation = _a.sent()) {
-                            throw new Error("agent-swarm-kit ClientAgent agentName=".concat(this.params.agentName, " model ressurect failed: ").concat(validation));
+                            throw new Error("agent-swarm-kit ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " model ressurect failed: ").concat(validation));
                         }
                         return [4 /*yield*/, this._outputSubject.next(result_1)];
                     case 4:
@@ -286,7 +288,7 @@ var ClientAgent = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " _resurrectModel"));
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel"));
                         return [4 /*yield*/, this.params.history.push({
                                 role: "resque",
                                 agentName: this.params.agentName,
@@ -309,7 +311,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.validate(result)];
                     case 4:
                         if (!(validation = _a.sent())) return [3 /*break*/, 6];
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " _resurrectModel validation error: ").concat(validation));
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " _resurrectModel validation error: ").concat(validation));
                         content = getPlaceholder();
                         return [4 /*yield*/, this.params.history.push({
                                 agentName: this.params.agentName,
@@ -330,7 +332,7 @@ var ClientAgent = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " waitForOutput"));
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " waitForOutput"));
                         return [4 /*yield*/, this._outputSubject.toPromise()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -342,7 +344,7 @@ var ClientAgent = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " getCompletion"));
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " getCompletion"));
                         return [4 /*yield*/, this.params.history.toArrayForAgent(this.params.prompt)];
                     case 1:
                         messages = _b.sent();
@@ -360,7 +362,7 @@ var ClientAgent = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " commitSystemMessage"));
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " commitSystemMessage"));
                         return [4 /*yield*/, this.params.history.push({
                                 role: "system",
                                 agentName: this.params.agentName,
@@ -376,7 +378,7 @@ var ClientAgent = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " commitToolOutput content=").concat(content));
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " commitToolOutput content=").concat(content));
                         return [4 /*yield*/, this.params.history.push({
                                 role: "tool",
                                 agentName: this.params.agentName,
@@ -398,7 +400,7 @@ var ClientAgent = /** @class */ (function () {
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " execute begin"), { incoming: incoming });
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute begin"), { incoming: incoming });
                         return [4 /*yield*/, this.params.history.push({
                                 role: "user",
                                 agentName: this.params.agentName,
@@ -410,7 +412,7 @@ var ClientAgent = /** @class */ (function () {
                     case 2:
                         message = _e.sent();
                         if (!message.tool_calls) return [3 /*break*/, 11];
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " tool call begin"));
+                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " tool call begin"));
                         _loop_1 = function (tool) {
                             var targetFn, result_2, result_3;
                             return __generator(this, function (_f) {
@@ -421,11 +423,11 @@ var ClientAgent = /** @class */ (function () {
                                     case 1:
                                         _f.sent();
                                         if (!!targetFn) return [3 /*break*/, 4];
-                                        this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " functionName=").concat(tool.function.name, " tool function not found"));
+                                        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"));
                                         return [4 /*yield*/, this_1._resurrectModel("No target function for ".concat(tool.function.name))];
                                     case 2:
                                         result_2 = _f.sent();
-                                        this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " execute end result=").concat(result_2));
+                                        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(result_2)];
                                     case 3:
                                         _f.sent();
@@ -433,11 +435,11 @@ var ClientAgent = /** @class */ (function () {
                                     case 4: return [4 /*yield*/, not(targetFn.validate(this_1.params.clientId, this_1.params.agentName, tool.function.arguments))];
                                     case 5:
                                         if (!_f.sent()) return [3 /*break*/, 8];
-                                        this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " functionName=").concat(tool.function.name, " tool validation not passed"));
+                                        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("Function validation failed: name=".concat(tool.function.name, " arguments=").concat(JSON.stringify(tool.function.arguments)))];
                                     case 6:
                                         result_3 = _f.sent();
-                                        this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " execute end result=").concat(result_3));
+                                        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(result_3)];
                                     case 7:
                                         _f.sent();
@@ -447,14 +449,14 @@ var ClientAgent = /** @class */ (function () {
                                          * @description Do not await to avoid deadlock! The tool can send the message to other agents by emulating user messages
                                          */
                                         targetFn.call(this_1.params.clientId, this_1.params.agentName, tool.function.arguments);
-                                        this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " functionName=").concat(tool.function.name, " tool call executing"));
+                                        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._toolCommitSubject.toPromise(),
                                                 this_1._outputSubject.toPromise(),
                                             ])];
                                     case 9:
                                         _f.sent();
-                                        this_1.params.logger.debug("ClientAgent agentName=".concat(this_1.params.agentName, " functionName=").concat(tool.function.name, " tool call end"));
+                                        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"));
                                         return [2 /*return*/];
                                 }
                             });
@@ -491,7 +493,7 @@ var ClientAgent = /** @class */ (function () {
                     case 10: return [2 /*return*/];
                     case 11:
                         if (!message.tool_calls) {
-                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " execute no tool calls detected"));
+                            this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " execute no tool calls detected"));
                         }
                         result = message.content;
                         return [4 /*yield*/, this.params.history.push(__assign(__assign({}, message), { agentName: this.params.agentName }))];
@@ -501,7 +503,7 @@ var ClientAgent = /** @class */ (function () {
                         return [4 /*yield*/, this.params.validate(result)];
                     case 13:
                         if (!(validation = _e.sent())) return [3 /*break*/, 16];
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " execute invalid tool call detected: ").concat(validation), { result: result });
+                        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("Invalid model output: ".concat(result))];
                     case 14:
                         result1 = _e.sent();
@@ -510,7 +512,7 @@ var ClientAgent = /** @class */ (function () {
                         _e.sent();
                         return [2 /*return*/];
                     case 16:
-                        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " execute end result=").concat(result));
+                        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(result)];
                     case 17:
                         _e.sent();
@@ -518,6 +520,7 @@ var ClientAgent = /** @class */ (function () {
                 }
             });
         }); });
+        this.params.logger.debug("ClientAgent agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " CTOR"));
     }
     return ClientAgent;
 }());
@@ -613,6 +616,7 @@ var AgentConnectionService = /** @class */ (function () {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
         this.contextService = inject(TYPES.contextService);
+        this.sessionValidationService = inject(TYPES.sessionValidationService);
         this.historyConnectionService = inject(TYPES.historyConnectionService);
         this.agentSchemaService = inject(TYPES.agentSchemaService);
         this.toolSchemaService = inject(TYPES.toolSchemaService);
@@ -623,6 +627,7 @@ var AgentConnectionService = /** @class */ (function () {
         }, function (clientId, agentName) {
             var _a = _this.agentSchemaService.get(agentName), prompt = _a.prompt, tools = _a.tools, completionName = _a.completion, _b = _a.validate, validate = _b === void 0 ? validateDefault : _b;
             var completion = _this.completionSchemaService.get(completionName);
+            _this.sessionValidationService.addAgentUsage(clientId, agentName);
             return new ClientAgent({
                 clientId: clientId,
                 agentName: agentName,
@@ -691,6 +696,7 @@ var AgentConnectionService = /** @class */ (function () {
                     context: this.contextService.context,
                 });
                 this.getAgent.clear("".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName));
+                this.sessionValidationService.removeAgentUsage(this.contextService.context.clientId, this.contextService.context.agentName);
                 return [2 /*return*/];
             });
         }); };
@@ -840,6 +846,7 @@ var ClientHistory = /** @class */ (function () {
                 }
             });
         }); };
+        this.params.logger.debug("ClientHistory agentName=".concat(this.params.agentName, " clientId=").concat(this.params.clientId, " CTOR"));
     }
     return ClientHistory;
 }());
@@ -849,18 +856,22 @@ var HistoryConnectionService = /** @class */ (function () {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
         this.contextService = inject(TYPES.contextService);
+        this.sessionValidationService = inject(TYPES.sessionValidationService);
         this.getItems = memoize(function (_a) {
             var _b = __read(_a, 1), clientId = _b[0];
             return clientId;
-        }, function () { return new PubsubArrayAdapter(); });
+        }, function (clientId, agentName) {
+            return GLOBAL_CONFIG.CC_GET_AGENT_HISTORY(clientId, agentName);
+        });
         this.getHistory = memoize(function (_a) {
             var _b = __read(_a, 2), clientId = _b[0], agentName = _b[1];
             return "".concat(clientId, "-").concat(agentName);
         }, function (clientId, agentName) {
+            _this.sessionValidationService.addHistoryUsage(clientId, agentName);
             return new ClientHistory({
                 clientId: clientId,
                 agentName: agentName,
-                items: _this.getItems(clientId),
+                items: _this.getItems(clientId, agentName),
                 logger: _this.loggerService,
             });
         });
@@ -907,11 +918,12 @@ var HistoryConnectionService = /** @class */ (function () {
                         this.loggerService.log("historyConnectionService dispose", {
                             context: this.contextService.context,
                         });
-                        return [4 /*yield*/, this.getItems(this.contextService.context.clientId).clear()];
+                        return [4 /*yield*/, this.getItems(this.contextService.context.clientId, this.contextService.context.agentName).clear()];
                     case 1:
                         _a.sent();
                         this.getItems.clear(this.contextService.context.clientId);
                         this.getHistory.clear("".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName));
+                        this.sessionValidationService.removeHistoryUsage(this.contextService.context.clientId, this.contextService.context.agentName);
                         return [2 /*return*/];
                 }
             });
@@ -941,13 +953,13 @@ var ClientSwarm = /** @class */ (function () {
     function ClientSwarm(params) {
         var _this = this;
         this.params = params;
-        this.waitForOutput = function () { return __awaiter(_this, void 0, void 0, function () {
+        this.waitForOutput = queued(function () { return __awaiter(_this, void 0, void 0, function () {
             var START_TIME, _a, agentName, output, _b;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        this.params.logger.debug("BaseConnection waitForOutput");
+                        this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " waitForOutput"));
                         START_TIME = Date.now();
                         _c.label = 1;
                     case 1:
@@ -980,10 +992,10 @@ var ClientSwarm = /** @class */ (function () {
                     case 4: return [2 /*return*/];
                 }
             });
-        }); };
+        }); });
         this.getAgentName = function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                this.params.logger.debug("ClientSwarm getAgentName");
+                this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " getAgentName"));
                 return [2 /*return*/, this._activeAgent];
             });
         }); };
@@ -992,7 +1004,7 @@ var ClientSwarm = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("ClientSwarm getAgent");
+                        this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " getAgent"));
                         return [4 /*yield*/, this.getAgentName()];
                     case 1:
                         agent = _a.sent();
@@ -1002,11 +1014,12 @@ var ClientSwarm = /** @class */ (function () {
         }); };
         this.setAgentName = function (agentName) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                this.params.logger.debug("ClientSwarm setAgentName agentName=".concat(agentName));
+                this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " setAgentName agentName=").concat(agentName));
                 this._activeAgent = agentName;
                 return [2 /*return*/];
             });
         }); };
+        this.params.logger.debug("ClientSwarm swarmName=".concat(this.params.swarmName, " clientId=").concat(this.params.clientId, " CTOR"));
         this._activeAgent = params.defaultAgent;
     }
     return ClientSwarm;
@@ -1147,30 +1160,48 @@ var ClientSession = /** @class */ (function () {
     function ClientSession(params) {
         var _this = this;
         this.params = params;
-        this.execute = function (message) { return __awaiter(_this, void 0, void 0, function () {
-            var agent, output;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.params.logger.debug("BaseSession execute", {
-                            message: message,
-                        });
-                        return [4 /*yield*/, this.params.swarm.getAgent()];
-                    case 1:
-                        agent = _a.sent();
-                        output = this.params.swarm.waitForOutput();
-                        agent.execute(message);
-                        return [4 /*yield*/, output];
-                    case 2: return [2 /*return*/, _a.sent()];
-                }
+        this._emitSubject = new Subject();
+        this.execute = function (message_1) {
+            var args_1 = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args_1[_i - 1] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([message_1], __read(args_1), false), void 0, function (message, noEmit) {
+                var agent, outputAwaiter, output, _a;
+                if (noEmit === void 0) { noEmit = false; }
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " execute"), {
+                                message: message,
+                                noEmit: noEmit,
+                            });
+                            return [4 /*yield*/, this.params.swarm.getAgent()];
+                        case 1:
+                            agent = _b.sent();
+                            outputAwaiter = this.params.swarm.waitForOutput();
+                            agent.execute(message);
+                            return [4 /*yield*/, outputAwaiter];
+                        case 2:
+                            output = _b.sent();
+                            _a = !noEmit;
+                            if (!_a) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this._emitSubject.next(output)];
+                        case 3:
+                            _a = (_b.sent());
+                            _b.label = 4;
+                        case 4:
+                            return [2 /*return*/, output];
+                    }
+                });
             });
-        }); };
+        };
         this.commitToolOutput = function (content) { return __awaiter(_this, void 0, void 0, function () {
             var agent;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("BaseSession commitToolOutput", {
+                        this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " commitToolOutput"), {
                             content: content,
                         });
                         return [4 /*yield*/, this.params.swarm.getAgent()];
@@ -1186,7 +1217,7 @@ var ClientSession = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.params.logger.debug("BaseSession commitSystemMessage", {
+                        this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " commitSystemMessage"), {
                             message: message,
                         });
                         return [4 /*yield*/, this.params.swarm.getAgent()];
@@ -1198,17 +1229,35 @@ var ClientSession = /** @class */ (function () {
             });
         }); };
         this.connect = function (connector) {
-            _this.params.logger.debug("BaseSession connect");
+            _this.params.logger.debug("ClientSession clientId=".concat(_this.params.clientId, " connect"));
+            _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 _a;
                 var _b;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            this.params.logger.debug("BaseSession connect call");
+                            this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " connect call"));
                             _a = connector;
                             _b = {};
-                            return [4 /*yield*/, this.execute(incoming.data)];
+                            return [4 /*yield*/, this.execute(incoming.data, true)];
                         case 1:
                             _b.data = _c.sent();
                             return [4 /*yield*/, this.params.swarm.getAgentName()];
@@ -1222,6 +1271,7 @@ var ClientSession = /** @class */ (function () {
                 });
             }); };
         };
+        this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " CTOR"));
     }
     return ClientSession;
 }());
@@ -1906,25 +1956,109 @@ var SessionValidationService = /** @class */ (function () {
     function SessionValidationService() {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
-        this._sessionMap = new Map();
+        this._historySwarmMap = new Map();
+        this._sessionSwarmMap = new Map();
+        this._agentSwarmMap = new Map();
         this.addSession = function (clientId, swarmName) {
             _this.loggerService.log("sessionValidationService addSession", {
                 clientId: clientId,
             });
-            if (_this._sessionMap.has(clientId)) {
+            if (_this._sessionSwarmMap.has(clientId)) {
                 throw new Error("agent-swarm session clientId=".concat(clientId, " already exist"));
             }
-            _this._sessionMap.set(clientId, swarmName);
+            _this._sessionSwarmMap.set(clientId, swarmName);
+        };
+        this.addAgentUsage = function (sessionId, agentName) {
+            _this.loggerService.log("sessionValidationService addAgentUsage", {
+                sessionId: sessionId,
+                agentName: agentName,
+            });
+            if (_this._agentSwarmMap.has(sessionId)) {
+                var agents = _this._agentSwarmMap.get(sessionId);
+                if (!agents.includes(agentName)) {
+                    agents.push(agentName);
+                }
+            }
+            else {
+                _this._agentSwarmMap.set(sessionId, [agentName]);
+            }
+        };
+        this.addHistoryUsage = function (sessionId, agentName) {
+            _this.loggerService.log("sessionValidationService addHistoryUsage", {
+                sessionId: sessionId,
+                agentName: agentName,
+            });
+            if (_this._historySwarmMap.has(sessionId)) {
+                var agents = _this._historySwarmMap.get(sessionId);
+                if (!agents.includes(agentName)) {
+                    agents.push(agentName);
+                }
+            }
+            else {
+                _this._historySwarmMap.set(sessionId, [agentName]);
+            }
+        };
+        this.removeAgentUsage = function (sessionId, agentName) {
+            _this.loggerService.log("sessionValidationService removeAgentUsage", {
+                sessionId: sessionId,
+                agentName: agentName,
+            });
+            if (_this._agentSwarmMap.has(sessionId)) {
+                var agents = _this._agentSwarmMap.get(sessionId);
+                var agentIndex = agents.indexOf(agentName);
+                if (agentIndex !== -1) {
+                    agents.splice(agentIndex, 1);
+                }
+                if (agents.length === 0) {
+                    _this._agentSwarmMap.delete(sessionId);
+                }
+            }
+            else {
+                throw new Error("No agents found for sessionId=".concat(sessionId));
+            }
+        };
+        this.removeHistoryUsage = function (sessionId, agentName) {
+            _this.loggerService.log("sessionValidationService removeHistoryUsage", {
+                sessionId: sessionId,
+                agentName: agentName,
+            });
+            if (_this._historySwarmMap.has(sessionId)) {
+                var agents = _this._historySwarmMap.get(sessionId);
+                var agentIndex = agents.indexOf(agentName);
+                if (agentIndex !== -1) {
+                    agents.splice(agentIndex, 1);
+                }
+                if (agents.length === 0) {
+                    _this._historySwarmMap.delete(sessionId);
+                }
+            }
+            else {
+                throw new Error("No agents found for sessionId=".concat(sessionId));
+            }
         };
         this.getSessionList = function () {
             _this.loggerService.log("sessionValidationService getSessionList");
-            return __spreadArray([], __read(_this._sessionMap.keys()), false);
+            return __spreadArray([], __read(_this._sessionSwarmMap.keys()), false);
+        };
+        this.getSessionAgentList = function (clientId) {
+            var _a;
+            _this.loggerService.log("sessionValidationService getSessionAgentList", {
+                clientId: clientId,
+            });
+            return (_a = _this._agentSwarmMap.get(clientId)) !== null && _a !== void 0 ? _a : [];
+        };
+        this.getSessionHistoryList = function (clientId) {
+            var _a;
+            _this.loggerService.log("sessionValidationService getSessionHistoryList", {
+                clientId: clientId,
+            });
+            return (_a = _this._agentSwarmMap.get(clientId)) !== null && _a !== void 0 ? _a : [];
         };
         this.getSwarm = function (clientId) {
             _this.loggerService.log("sessionValidationService getSwarm", {
                 clientId: clientId,
             });
-            var session = _this._sessionMap.get(clientId);
+            var session = _this._sessionSwarmMap.get(clientId);
             if (session === undefined) {
                 throw new Error("agent-swarm session clientId=".concat(clientId, " not found"));
             }
@@ -1932,7 +2066,7 @@ var SessionValidationService = /** @class */ (function () {
         };
         this.validate = function (clientId, source) {
             _this.loggerService.log("sessionValidationService validate", { clientId: clientId });
-            if (!_this._sessionMap.has(clientId)) {
+            if (!_this._sessionSwarmMap.has(clientId)) {
                 throw new Error("agent-swarm session clientId=".concat(clientId, " not exist source=").concat(source));
             }
         };
@@ -1940,7 +2074,7 @@ var SessionValidationService = /** @class */ (function () {
             _this.loggerService.log("sessionValidationService addSession", {
                 clientId: clientId,
             });
-            _this._sessionMap.delete(clientId);
+            _this._sessionSwarmMap.delete(clientId);
         };
     }
     return SessionValidationService;
@@ -2123,12 +2257,21 @@ var makeConnection = function (connector, clientId, swarmName) {
     swarm.sessionValidationService.addSession(clientId, swarmName);
     var send = swarm.sessionPublicService.connect(connector, clientId, swarmName);
     return queued(function (outgoing) { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var _a;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     swarm.sessionValidationService.validate(clientId, "makeConnection");
-                    return [4 /*yield*/, send(outgoing)];
-                case 1: return [2 /*return*/, _a.sent()];
+                    _a = send;
+                    _b = {
+                        data: outgoing
+                    };
+                    return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+                case 1: return [4 /*yield*/, _a.apply(void 0, [(_b.agentName = _c.sent(),
+                            _b.clientId = clientId,
+                            _b)])];
+                case 2: return [2 /*return*/, _c.sent()];
             }
         });
     }); });
@@ -2292,30 +2435,81 @@ var getAgentHistory = function (clientId, agentName) { return __awaiter(void 0,
     });
 }); };
 
-var commitToolOutput = function (content, clientId) {
-    swarm.sessionValidationService.validate(clientId, "commitToolOutput");
-    var swarmName = swarm.sessionValidationService.getSwarm(clientId);
-    swarm.swarmValidationService.validate(swarmName, "commitToolOutput");
-    swarm.sessionPublicService.commitToolOutput(content, clientId, swarmName);
-};
+var commitToolOutput = function (content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
+    var swarmName, currentAgentName;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                swarm.agentValidationService.validate(agentName, "commitSystemMessage");
+                swarm.sessionValidationService.validate(clientId, "commitToolOutput");
+                swarmName = swarm.sessionValidationService.getSwarm(clientId);
+                swarm.swarmValidationService.validate(swarmName, "commitToolOutput");
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+            case 1:
+                currentAgentName = _a.sent();
+                if (currentAgentName !== agentName) {
+                    swarm.loggerService.log('function "commitToolOutput" skipped due to the agent change', {
+                        currentAgentName: currentAgentName,
+                        agentName: agentName,
+                    });
+                    return [2 /*return*/];
+                }
+                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(content, clientId, swarmName)];
+            case 2:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
 
-var commitSystemMessage = function (content, clientId) {
-    swarm.sessionValidationService.validate(clientId, "commitSystemMessage");
-    var swarmName = swarm.sessionValidationService.getSwarm(clientId);
-    swarm.swarmValidationService.validate(swarmName, "commitSystemMessage");
-    swarm.sessionPublicService.commitSystemMessage(content, clientId, swarmName);
-};
+var commitSystemMessage = function (content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
+    var swarmName, currentAgentName;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                swarm.agentValidationService.validate(agentName, "commitSystemMessage");
+                swarm.sessionValidationService.validate(clientId, "commitSystemMessage");
+                swarmName = swarm.sessionValidationService.getSwarm(clientId);
+                swarm.swarmValidationService.validate(swarmName, "commitSystemMessage");
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+            case 1:
+                currentAgentName = _a.sent();
+                if (currentAgentName !== agentName) {
+                    swarm.loggerService.log('function "commitSystemMessage" skipped due to the agent change', {
+                        currentAgentName: currentAgentName,
+                        agentName: agentName,
+                    });
+                    return [2 /*return*/];
+                }
+                return [4 /*yield*/, swarm.sessionPublicService.commitSystemMessage(content, clientId, swarmName)];
+            case 2:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
 
-var execute = function (content, clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName;
+var execute = function (content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
+    var swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                swarm.agentValidationService.validate(agentName, "commitSystemMessage");
                 swarm.sessionValidationService.validate(clientId, "execute");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "execute");
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+            case 1:
+                currentAgentName = _a.sent();
+                if (currentAgentName !== agentName) {
+                    swarm.loggerService.log('function "execute" skipped due to the agent change', {
+                        currentAgentName: currentAgentName,
+                        agentName: agentName,
+                    });
+                    return [2 /*return*/];
+                }
                 return [4 /*yield*/, swarm.sessionPublicService.execute(content, clientId, swarmName)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 2: return [2 /*return*/, _a.sent()];
         }
     });
 }); };