agent-swarm-kit 1.0.74 → 1.0.75

package/build/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 var diScoped = require('di-scoped');
-var functoolsKit = require('functools-kit');
 var diKit = require('di-kit');
+var functoolsKit = require('functools-kit');
 var lodashEs = require('lodash-es');
 var xml2js = require('xml2js');
 
@@ -167,6 +167,50 @@ var ContextService = diScoped.scoped(/** @class */ (function () {
     return class_1;
 }()));
 
+var _a;
+var init = (_a = diKit.createActivator("agent-swarm"), _a.init), inject = _a.inject, provide = _a.provide;
+
+var baseServices$1 = {
+    busService: Symbol('busService'),
+    loggerService: Symbol('loggerService'),
+    contextService: Symbol('contextService'),
+};
+var connectionServices$1 = {
+    agentConnectionService: Symbol('agentConnectionService'),
+    historyConnectionService: Symbol('historyConnectionService'),
+    swarmConnectionService: Symbol('swarmConnectionService'),
+    sessionConnectionService: Symbol('sessionConnectionService'),
+    storageConnectionService: Symbol('storageConnectionService'),
+    stateConnectionService: Symbol('stateConnectionService'),
+};
+var schemaServices$1 = {
+    completionSchemaService: Symbol('completionSchemaService'),
+    agentSchemaService: Symbol('agentSchemaService'),
+    swarmSchemaService: Symbol('swarmSchemaService'),
+    toolSchemaService: Symbol('toolSchemaService'),
+    embeddingSchemaService: Symbol('embeddingSchemaService'),
+    storageSchemaService: Symbol('storageSchemaService'),
+    stateSchemaService: Symbol('stateSchemaService'),
+};
+var publicServices$1 = {
+    agentPublicService: Symbol('agentPublicService'),
+    historyPublicService: Symbol('historyPublicService'),
+    sessionPublicService: Symbol('sessionPublicService'),
+    swarmPublicService: Symbol('swarmPublicService'),
+    storagePublicService: Symbol('storagePublicService'),
+    statePublicService: Symbol('statePublicService'),
+};
+var validationServices$1 = {
+    agentValidationService: Symbol('agentValidationService'),
+    toolValidationService: Symbol('toolValidationService'),
+    sessionValidationService: Symbol('sessionValidationService'),
+    swarmValidationService: Symbol('swarmValidationService'),
+    completionValidationService: Symbol('completionValidationService'),
+    embeddingValidationService: Symbol('embeddingValidationService'),
+    storageValidationService: Symbol('storageValidationService'),
+};
+var TYPES = __assign(__assign(__assign(__assign(__assign({}, baseServices$1), schemaServices$1), connectionServices$1), publicServices$1), validationServices$1);
+
 /**
  * LoggerService class that implements the ILogger interface.
  * Provides methods to log and debug messages.
@@ -174,6 +218,7 @@ var ContextService = diScoped.scoped(/** @class */ (function () {
 var LoggerService = /** @class */ (function () {
     function LoggerService() {
         var _this = this;
+        this.contextService = inject(TYPES.contextService);
         this._logger = {
             /**
              * Logs messages.
@@ -193,24 +238,32 @@ var LoggerService = /** @class */ (function () {
          * @param {...any} args - The messages to log.
          */
         this.log = function () {
-            var _a;
+            var _a, _b;
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            (_a = _this._logger).log.apply(_a, __spreadArray([], __read(args), false));
+            if (ContextService.hasContext()) {
+                (_a = _this._logger).log.apply(_a, __spreadArray(__spreadArray([], __read(args), false), [_this.contextService.context], false));
+                return;
+            }
+            (_b = _this._logger).log.apply(_b, __spreadArray([], __read(args), false));
         };
         /**
          * Logs debug messages using the current logger.
          * @param {...any} args - The debug messages to log.
          */
         this.debug = function () {
-            var _a;
+            var _a, _b;
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            (_a = _this._logger).debug.apply(_a, __spreadArray([], __read(args), false));
+            if (ContextService.hasContext()) {
+                (_a = _this._logger).debug.apply(_a, __spreadArray(__spreadArray([], __read(args), false), [_this.contextService.context], false));
+                return;
+            }
+            (_b = _this._logger).debug.apply(_b, __spreadArray([], __read(args), false));
         };
         /**
          * Sets a new logger.
@@ -223,50 +276,6 @@ var LoggerService = /** @class */ (function () {
     return LoggerService;
 }());
 
-var _a;
-var init = (_a = diKit.createActivator("agent-swarm"), _a.init), inject = _a.inject, provide = _a.provide;
-
-var baseServices$1 = {
-    busService: Symbol('busService'),
-    loggerService: Symbol('loggerService'),
-    contextService: Symbol('contextService'),
-};
-var connectionServices$1 = {
-    agentConnectionService: Symbol('agentConnectionService'),
-    historyConnectionService: Symbol('historyConnectionService'),
-    swarmConnectionService: Symbol('swarmConnectionService'),
-    sessionConnectionService: Symbol('sessionConnectionService'),
-    storageConnectionService: Symbol('storageConnectionService'),
-    stateConnectionService: Symbol('stateConnectionService'),
-};
-var schemaServices$1 = {
-    completionSchemaService: Symbol('completionSchemaService'),
-    agentSchemaService: Symbol('agentSchemaService'),
-    swarmSchemaService: Symbol('swarmSchemaService'),
-    toolSchemaService: Symbol('toolSchemaService'),
-    embeddingSchemaService: Symbol('embeddingSchemaService'),
-    storageSchemaService: Symbol('storageSchemaService'),
-    stateSchemaService: Symbol('stateSchemaService'),
-};
-var publicServices$1 = {
-    agentPublicService: Symbol('agentPublicService'),
-    historyPublicService: Symbol('historyPublicService'),
-    sessionPublicService: Symbol('sessionPublicService'),
-    swarmPublicService: Symbol('swarmPublicService'),
-    storagePublicService: Symbol('storagePublicService'),
-    statePublicService: Symbol('statePublicService'),
-};
-var validationServices$1 = {
-    agentValidationService: Symbol('agentValidationService'),
-    toolValidationService: Symbol('toolValidationService'),
-    sessionValidationService: Symbol('sessionValidationService'),
-    swarmValidationService: Symbol('swarmValidationService'),
-    completionValidationService: Symbol('completionValidationService'),
-    embeddingValidationService: Symbol('embeddingValidationService'),
-    storageValidationService: Symbol('storageValidationService'),
-};
-var TYPES = __assign(__assign(__assign(__assign(__assign({}, baseServices$1), schemaServices$1), connectionServices$1), publicServices$1), validationServices$1);
-
 /**
  * Service for managing agent schemas.
  */
@@ -1558,7 +1567,6 @@ var AgentConnectionService = /** @class */ (function () {
                         this.loggerService.log("agentConnectionService execute", {
                             input: input,
                             mode: mode,
-                            context: this.contextService.context,
                         });
                         return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).execute(input, mode)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -1573,9 +1581,7 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService waitForOutput", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("agentConnectionService waitForOutput");
                         return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).waitForOutput()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -1594,7 +1600,6 @@ var AgentConnectionService = /** @class */ (function () {
                         this.loggerService.log("agentConnectionService commitToolOutput", {
                             content: content,
                             toolId: toolId,
-                            context: this.contextService.context,
                         });
                         return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitToolOutput(toolId, content)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -1612,7 +1617,6 @@ var AgentConnectionService = /** @class */ (function () {
                     case 0:
                         this.loggerService.log("agentConnectionService commitSystemMessage", {
                             message: message,
-                            context: this.contextService.context,
                         });
                         return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitSystemMessage(message)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -1630,7 +1634,6 @@ var AgentConnectionService = /** @class */ (function () {
                     case 0:
                         this.loggerService.log("agentConnectionService commitUserMessage", {
                             message: message,
-                            context: this.contextService.context,
                         });
                         return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitUserMessage(message)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -1645,9 +1648,7 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService commitAgentChange", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("agentConnectionService commitAgentChange");
                         return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitAgentChange()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -1661,9 +1662,7 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService commitFlush", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("agentConnectionService commitFlush");
                         return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitFlush()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -1678,9 +1677,7 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService dispose", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("agentConnectionService dispose");
                         key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName);
                         if (!this.getAgent.has(key)) {
                             return [2 /*return*/];
@@ -2001,7 +1998,7 @@ var HistoryConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("historyConnectionService push", {
-                            context: this.contextService.context,
+                            message: message,
                         });
                         return [4 /*yield*/, this.getHistory(this.contextService.context.clientId, this.contextService.context.agentName).push(message)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -2018,7 +2015,7 @@ var HistoryConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("historyConnectionService toArrayForAgent", {
-                            context: this.contextService.context,
+                            prompt: prompt,
                         });
                         return [4 /*yield*/, this.getHistory(this.contextService.context.clientId, this.contextService.context.agentName).toArrayForAgent(prompt)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -2033,9 +2030,7 @@ var HistoryConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("historyConnectionService toArrayForRaw", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("historyConnectionService toArrayForRaw");
                         return [4 /*yield*/, this.getHistory(this.contextService.context.clientId, this.contextService.context.agentName).toArrayForRaw()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -2050,9 +2045,7 @@ var HistoryConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("historyConnectionService dispose", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("historyConnectionService dispose");
                         key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName);
                         if (!this.getHistory.has(key)) {
                             return [2 /*return*/];
@@ -2445,9 +2438,7 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService cancelOutput", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("swarmConnectionService cancelOutput");
                         return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).cancelOutput()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -2461,9 +2452,7 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService waitForOutput", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("swarmConnectionService waitForOutput");
                         return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).waitForOutput()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -2477,9 +2466,7 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService getAgentName", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("swarmConnectionService getAgentName");
                         return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).getAgentName()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -2493,9 +2480,7 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService getAgent", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("swarmConnectionService getAgent");
                         return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).getAgent()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -2512,7 +2497,7 @@ var SwarmConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("swarmConnectionService setAgentRef", {
-                            context: this.contextService.context,
+                            agentName: agentName,
                         });
                         return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).setAgentRef(agentName, agent)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -2530,7 +2515,6 @@ var SwarmConnectionService = /** @class */ (function () {
                     case 0:
                         this.loggerService.log("swarmConnectionService setAgentName", {
                             agentName: agentName,
-                            context: this.contextService.context,
                         });
                         return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).setAgentName(agentName)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -2544,9 +2528,7 @@ var SwarmConnectionService = /** @class */ (function () {
         this.dispose = function () { return __awaiter(_this, void 0, void 0, function () {
             var key;
             return __generator(this, function (_a) {
-                this.loggerService.log("swarmConnectionService dispose", {
-                    context: this.contextService.context,
-                });
+                this.loggerService.log("swarmConnectionService dispose");
                 key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.swarmName);
                 if (!this.getSwarm.has(key)) {
                     return [2 /*return*/];
@@ -2896,17 +2878,22 @@ var ClientSession = /** @class */ (function () {
                 clientId: _this.params.clientId,
             });
             return function (incoming) { return __awaiter(_this, void 0, void 0, function () {
-                var _a;
+                var data, _a;
                 var _b;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
                             this.params.logger.debug("ClientSession clientId=".concat(this.params.clientId, " connect call"));
-                            _a = connector;
-                            _b = {};
                             return [4 /*yield*/, this.execute(incoming.data, "user")];
                         case 1:
-                            _b.data = _c.sent();
+                            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,
@@ -2973,7 +2960,7 @@ var SessionConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService emit", {
-                            context: this.contextService.context,
+                            content: content,
                         });
                         return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).emit(content)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -2990,7 +2977,6 @@ var SessionConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService execute", {
-                            context: this.contextService.context,
                             content: content,
                             mode: mode,
                         });
@@ -3005,9 +2991,7 @@ var SessionConnectionService = /** @class */ (function () {
          * @returns {ReceiveMessageFn} The function to receive messages.
          */
         this.connect = function (connector) {
-            _this.loggerService.log("sessionConnectionService connect", {
-                context: _this.contextService.context,
-            });
+            _this.loggerService.log("sessionConnectionService connect");
             return _this.getSession(_this.contextService.context.clientId, _this.contextService.context.swarmName).connect(connector);
         };
         /**
@@ -3021,7 +3005,6 @@ var SessionConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService commitToolOutput", {
-                            context: this.contextService.context,
                             content: content,
                             toolId: toolId,
                         });
@@ -3040,7 +3023,6 @@ var SessionConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService commitSystemMessage", {
-                            context: this.contextService.context,
                             message: message,
                         });
                         return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitSystemMessage(message)];
@@ -3058,7 +3040,6 @@ var SessionConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService commitUserMessage", {
-                            context: this.contextService.context,
                             message: message,
                         });
                         return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitUserMessage(message)];
@@ -3075,9 +3056,7 @@ var SessionConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("sessionConnectionService commitFlush", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("sessionConnectionService commitFlush");
                         return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitFlush()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
@@ -3092,9 +3071,7 @@ var SessionConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("sessionConnectionService dispose", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("sessionConnectionService dispose");
                         key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.swarmName);
                         if (!this.getSession.has(key)) {
                             return [2 /*return*/];
@@ -3125,12 +3102,13 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The agent reference.
          */
-        this.createAgentRef = function (clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.createAgentRef = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentPublicService createAgentRef", {
+                            requestId: requestId,
                             clientId: clientId,
                             agentName: agentName,
                         });
@@ -3142,6 +3120,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3159,12 +3138,13 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The execution result.
          */
-        this.execute = function (input, mode, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (input, mode, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentPublicService execute", {
+                            requestId: requestId,
                             input: input,
                             clientId: clientId,
                             agentName: agentName,
@@ -3178,6 +3158,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3194,12 +3175,13 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The output result.
          */
-        this.waitForOutput = function (clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.waitForOutput = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentPublicService waitForOutput", {
+                            requestId: requestId,
                             clientId: clientId,
                             agentName: agentName,
                         });
@@ -3211,6 +3193,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3229,12 +3212,13 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitToolOutput = function (toolId, content, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentPublicService commitToolOutput", {
+                            requestId: requestId,
                             content: content,
                             clientId: clientId,
                             toolId: toolId,
@@ -3248,6 +3232,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3265,12 +3250,13 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitSystemMessage = function (message, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitSystemMessage = function (message, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentPublicService commitSystemMessage", {
+                            requestId: requestId,
                             message: message,
                             clientId: clientId,
                             agentName: agentName,
@@ -3283,6 +3269,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3300,12 +3287,13 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitUserMessage = function (message, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitUserMessage = function (message, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentPublicService commitUserMessage", {
+                            requestId: requestId,
                             message: message,
                             clientId: clientId,
                             agentName: agentName,
@@ -3318,6 +3306,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3334,12 +3323,13 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitFlush = function (clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitFlush = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentPublicService commitFlush", {
+                            requestId: requestId,
                             clientId: clientId,
                             agentName: agentName,
                         });
@@ -3351,6 +3341,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3367,12 +3358,13 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitAgentChange = function (clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitAgentChange = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentPublicService commitAgentChange", {
+                            requestId: requestId,
                             clientId: clientId,
                             agentName: agentName,
                         });
@@ -3384,6 +3376,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3400,12 +3393,13 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The dispose result.
          */
-        this.dispose = function (clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentPublicService dispose", {
+                            requestId: requestId,
                             clientId: clientId,
                             agentName: agentName,
                         });
@@ -3417,6 +3411,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3446,12 +3441,13 @@ var HistoryPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The agent name.
          * @returns {Promise<void>} A promise that resolves when the operation is complete.
          */
-        this.push = function (message, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.push = function (message, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("historyPublicService push", {
+                            requestId: requestId,
                             message: message,
                             clientId: clientId,
                             agentName: agentName,
@@ -3464,6 +3460,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3481,7 +3478,7 @@ var HistoryPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The agent name.
          * @returns {Promise<any[]>} A promise that resolves to an array of history items.
          */
-        this.toArrayForAgent = function (prompt, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.toArrayForAgent = function (prompt, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3499,6 +3496,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3515,12 +3513,13 @@ var HistoryPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The agent name.
          * @returns {Promise<any[]>} A promise that resolves to a raw array of history items.
          */
-        this.toArrayForRaw = function (clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.toArrayForRaw = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("historyPublicService toArrayForRaw", {
+                            requestId: requestId,
                             clientId: clientId,
                             agentName: agentName,
                         });
@@ -3532,6 +3531,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3548,7 +3548,7 @@ var HistoryPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The agent name.
          * @returns {Promise<void>} A promise that resolves when the operation is complete.
          */
-        this.dispose = function (clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3565,6 +3565,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3594,7 +3595,7 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.emit = function (content, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.emit = function (content, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3602,6 +3603,7 @@ var SessionPublicService = /** @class */ (function () {
                         this.loggerService.log("sessionPublicService emit", {
                             content: content,
                             clientId: clientId,
+                            requestId: requestId,
                             swarmName: swarmName,
                         });
                         return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
@@ -3612,6 +3614,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3629,7 +3632,7 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.execute = function (content, mode, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (content, mode, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3648,6 +3651,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3665,8 +3669,9 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {ReceiveMessageFn}
          */
-        this.connect = function (connector, clientId, swarmName) {
+        this.connect = function (connector, requestId, clientId, swarmName) {
             _this.loggerService.log("sessionPublicService connect", {
+                requestId: requestId,
                 clientId: clientId,
                 swarmName: swarmName,
             });
@@ -3683,6 +3688,7 @@ var SessionPublicService = /** @class */ (function () {
                                         }
                                     });
                                 }); }, {
+                                    requestId: requestId,
                                     clientId: clientId,
                                     swarmName: swarmName,
                                     agentName: "",
@@ -3697,6 +3703,7 @@ var SessionPublicService = /** @class */ (function () {
                     return ContextService.runInContext(function () {
                         return receive(incoming);
                     }, {
+                        requestId: requestId,
                         clientId: clientId,
                         swarmName: swarmName,
                         agentName: "",
@@ -3705,6 +3712,7 @@ var SessionPublicService = /** @class */ (function () {
                     });
                 };
             }, {
+                requestId: requestId,
                 clientId: clientId,
                 swarmName: swarmName,
                 agentName: "",
@@ -3720,12 +3728,13 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitToolOutput = function (toolId, content, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionPublicService commitToolOutput", {
+                            requestId: requestId,
                             toolId: toolId,
                             content: content,
                             clientId: clientId,
@@ -3739,6 +3748,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3756,12 +3766,13 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitSystemMessage = function (message, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitSystemMessage = function (message, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionPublicService commitSystemMessage", {
+                            requestId: requestId,
                             message: message,
                             clientId: clientId,
                             swarmName: swarmName,
@@ -3774,6 +3785,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3791,12 +3803,13 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitUserMessage = function (message, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitUserMessage = function (message, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionPublicService commitUserMessage", {
+                            requestId: requestId,
                             message: message,
                             clientId: clientId,
                             swarmName: swarmName,
@@ -3809,6 +3822,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3825,7 +3839,7 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitFlush = function (clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitFlush = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3842,6 +3856,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3858,12 +3873,13 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.dispose = function (clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionPublicService dispose", {
+                            requestId: requestId,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
@@ -3875,6 +3891,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3903,7 +3920,7 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.cancelOutput = function (clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.cancelOutput = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3920,6 +3937,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3936,13 +3954,14 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.waitForOutput = function (clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.waitForOutput = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("swarmPublicService waitForOutput", {
                             clientId: clientId,
+                            requestId: requestId,
                             swarmName: swarmName,
                         });
                         return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
@@ -3953,6 +3972,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3969,7 +3989,7 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<string>}
          */
-        this.getAgentName = function (clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.getAgentName = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3977,6 +3997,7 @@ var SwarmPublicService = /** @class */ (function () {
                         this.loggerService.log("swarmPublicService getAgentName", {
                             clientId: clientId,
                             swarmName: swarmName,
+                            requestId: requestId,
                         });
                         return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
@@ -3986,6 +4007,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4002,7 +4024,7 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<IAgent>}
          */
-        this.getAgent = function (clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.getAgent = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -4019,6 +4041,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4037,12 +4060,13 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {IAgent} agent - The agent instance.
          * @returns {Promise<void>}
          */
-        this.setAgentRef = function (clientId, swarmName, agentName, agent) { return __awaiter(_this, void 0, void 0, function () {
+        this.setAgentRef = function (requestId, clientId, swarmName, agentName, agent) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("swarmPublicService setAgentRef", {
+                            requestId: requestId,
                             agentName: agentName,
                             agent: agent,
                             clientId: clientId,
@@ -4056,6 +4080,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4073,12 +4098,13 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.setAgentName = function (agentName, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.setAgentName = function (agentName, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("swarmPublicService setAgentName", {
+                            requestId: requestId,
                             agentName: agentName,
                             clientId: clientId,
                             swarmName: swarmName,
@@ -4091,6 +4117,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4107,12 +4134,13 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.dispose = function (clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("swarmPublicService dispose", {
+                            requestId: requestId,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
@@ -4124,6 +4152,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -5216,7 +5245,6 @@ var StorageConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storageConnectionService take", {
-                            context: this.contextService.context,
                             search: search,
                             total: total,
                             score: score,
@@ -5241,7 +5269,6 @@ var StorageConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storageConnectionService upsert", {
-                            context: this.contextService.context,
                             item: item,
                         });
                         storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
@@ -5264,7 +5291,6 @@ var StorageConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storageConnectionService remove", {
-                            context: this.contextService.context,
                             itemId: itemId,
                         });
                         storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
@@ -5287,7 +5313,6 @@ var StorageConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storageConnectionService get", {
-                            context: this.contextService.context,
                             itemId: itemId,
                         });
                         storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
@@ -5309,9 +5334,7 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService list", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("storageConnectionService list");
                         storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
@@ -5330,9 +5353,7 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService clear", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("storageConnectionService clear");
                         storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
@@ -5351,9 +5372,7 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService dispose", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("storageConnectionService dispose");
                         key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.storageName);
                         if (!this.getStorage.has(key)) {
                             return [2 /*return*/];
@@ -5392,12 +5411,13 @@ var StoragePublicService = /** @class */ (function () {
          * @param {number} total - The total number of items to retrieve.
          * @returns {Promise<IStorageData[]>} The list of storage data.
          */
-        this.take = function (search, total, clientId, storageName, score) { return __awaiter(_this, void 0, void 0, function () {
+        this.take = function (search, total, requestId, clientId, storageName, score) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storagePublicService take", {
+                            requestId: requestId,
                             search: search,
                             total: total,
                             clientId: clientId,
@@ -5412,6 +5432,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5427,7 +5448,7 @@ var StoragePublicService = /** @class */ (function () {
          * @param {IStorageData} item - The item to upsert.
          * @returns {Promise<void>}
          */
-        this.upsert = function (item, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.upsert = function (item, requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -5445,6 +5466,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5460,7 +5482,7 @@ var StoragePublicService = /** @class */ (function () {
          * @param {IStorageData["id"]} itemId - The ID of the item to remove.
          * @returns {Promise<void>}
          */
-        this.remove = function (itemId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.remove = function (itemId, requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -5478,6 +5500,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5493,12 +5516,13 @@ var StoragePublicService = /** @class */ (function () {
          * @param {IStorageData["id"]} itemId - The ID of the item to retrieve.
          * @returns {Promise<IStorageData>} The retrieved item.
          */
-        this.get = function (itemId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.get = function (itemId, requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storagePublicService get", {
+                            requestId: requestId,
                             itemId: itemId,
                             clientId: clientId,
                             storageName: storageName,
@@ -5511,6 +5535,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5526,12 +5551,13 @@ var StoragePublicService = /** @class */ (function () {
          * @param {function(IStorageData): boolean} [filter] - The optional filter function.
          * @returns {Promise<IStorageData[]>} The list of items.
          */
-        this.list = function (clientId, storageName, filter) { return __awaiter(_this, void 0, void 0, function () {
+        this.list = function (requestId, clientId, storageName, filter) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storagePublicService list", {
+                            requestId: requestId,
                             clientId: clientId,
                             storageName: storageName,
                         });
@@ -5543,6 +5569,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5557,12 +5584,13 @@ var StoragePublicService = /** @class */ (function () {
          * Clears all items from the storage.
          * @returns {Promise<void>}
          */
-        this.clear = function (clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.clear = function (requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storagePublicService clear", {
+                            requestId: requestId,
                             clientId: clientId,
                             storageName: storageName,
                         });
@@ -5574,6 +5602,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5590,7 +5619,7 @@ var StoragePublicService = /** @class */ (function () {
          * @param {StorageName} storageName - The storage name.
          * @returns {Promise<void>}
          */
-        this.dispose = function (clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -5607,6 +5636,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -6035,9 +6065,7 @@ var StateConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("stateConnectionService setState", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("stateConnectionService setState");
                         state = this.getStateRef(this.contextService.context.clientId, this.contextService.context.stateName);
                         return [4 /*yield*/, state.waitForInit()];
                     case 1:
@@ -6056,9 +6084,7 @@ var StateConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("stateConnectionService getState", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("stateConnectionService getState");
                         state = this.getStateRef(this.contextService.context.clientId, this.contextService.context.stateName);
                         return [4 /*yield*/, state.waitForInit()];
                     case 1:
@@ -6077,9 +6103,7 @@ var StateConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("stateConnectionService dispose", {
-                            context: this.contextService.context,
-                        });
+                        this.loggerService.log("stateConnectionService dispose");
                         key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.stateName);
                         if (!this.getStateRef.has(key)) {
                             return [2 /*return*/];
@@ -6116,12 +6140,13 @@ var StatePublicService = /** @class */ (function () {
          * @param {StateName} stateName - The name of the state.
          * @returns {Promise<T>} - The updated state.
          */
-        this.setState = function (dispatchFn, clientId, stateName) { return __awaiter(_this, void 0, void 0, function () {
+        this.setState = function (dispatchFn, requestId, clientId, stateName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("statePublicService setState", {
+                            requestId: requestId,
                             clientId: clientId,
                             stateName: stateName,
                         });
@@ -6133,6 +6158,7 @@ var StatePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 stateName: stateName,
                                 agentName: "",
@@ -6149,7 +6175,7 @@ var StatePublicService = /** @class */ (function () {
          * @param {StateName} stateName - The name of the state.
          * @returns {Promise<T>} - The current state.
          */
-        this.getState = function (clientId, stateName) { return __awaiter(_this, void 0, void 0, function () {
+        this.getState = function (requestId, clientId, stateName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -6166,6 +6192,7 @@ var StatePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 stateName: stateName,
                                 agentName: "",
@@ -6182,12 +6209,13 @@ var StatePublicService = /** @class */ (function () {
          * @param {StateName} stateName - The name of the state.
          * @returns {Promise<void>} - A promise that resolves when the state is disposed.
          */
-        this.dispose = function (clientId, stateName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (requestId, clientId, stateName) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("statePublicService dispose", {
+                            requestId: requestId,
                             clientId: clientId,
                             stateName: stateName,
                         });
@@ -6199,6 +6227,7 @@ var StatePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
+                                requestId: requestId,
                                 clientId: clientId,
                                 stateName: stateName,
                                 agentName: "",
@@ -6239,7 +6268,7 @@ var BusService = /** @class */ (function () {
                 _this._eventWildcardMap.set(source, true);
             }
             _this._eventSourceSet.add(source);
-            _this.getEventSubject(clientId, source).subscribe(fn);
+            return _this.getEventSubject(clientId, source).subscribe(fn);
         };
         /**
          * Subscribes to a single event for a specific client and source.
@@ -6536,20 +6565,22 @@ var addStorage = function (storageSchema) {
  * @returns {Promise<void>} - A promise that resolves when the message is committed.
  */
 var commitUserMessage = function (content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName, currentAgentName;
+    var requestId, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function commitSystemMessage', {
                     content: content,
                     clientId: clientId,
                     agentName: agentName,
+                    requestId: requestId,
                 });
                 swarm.agentValidationService.validate(agentName, "commitUserMessage");
                 swarm.sessionValidationService.validate(clientId, "commitUserMessage");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "commitUserMessage");
-                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -6560,7 +6591,7 @@ var commitUserMessage = function (content, clientId, agentName) { return __await
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitUserMessage(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitUserMessage(content, requestId, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -6576,17 +6607,19 @@ var commitUserMessage = function (content, clientId, agentName) { return __await
  * @throws Will throw an error if the client ID is invalid or if the swarm validation fails.
  */
 var getAgentName = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName;
+    var requestId, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function getAgentName", {
                     clientId: clientId,
+                    requestId: requestId,
                 });
                 swarm.sessionValidationService.validate(clientId, "getAgentName");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "getAgentName");
-                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
             case 1: return [2 /*return*/, _a.sent()];
         }
     });
@@ -6602,13 +6635,15 @@ var SCHEDULED_DELAY$1 = 1000;
  * @returns {SendMessageFn} - A function to send messages to the swarm.
  */
 var makeConnection = function (connector, clientId, swarmName) {
+    var requestId = functoolsKit.randomString();
     swarm.loggerService.log("function makeConnection", {
         clientId: clientId,
         swarmName: swarmName,
+        requestId: requestId,
     });
     swarm.swarmValidationService.validate(swarmName, "makeConnection");
     swarm.sessionValidationService.addSession(clientId, swarmName, "makeConnection");
-    var send = swarm.sessionPublicService.connect(connector, clientId, swarmName);
+    var send = swarm.sessionPublicService.connect(connector, requestId, clientId, swarmName);
     return functoolsKit.queued(function (outgoing) { return __awaiter(void 0, void 0, void 0, function () {
         var _a;
         var _b;
@@ -6620,7 +6655,7 @@ var makeConnection = function (connector, clientId, swarmName) {
                     _b = {
                         data: outgoing
                     };
-                    return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+                    return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
                 case 1: return [4 /*yield*/, _a.apply(void 0, [(_b.agentName = _c.sent(),
                             _b.clientId = clientId,
                             _b)])];
@@ -6723,7 +6758,7 @@ var CHANGE_AGENT_GC = 60 * 1000;
  * @returns {TChangeAgentRun} - The change agent function.
  */
 var createChangeAgent = functoolsKit.ttl(function (clientId) {
-    return functoolsKit.queued(function (agentName) { return __awaiter(void 0, void 0, void 0, function () {
+    return functoolsKit.queued(function (requestId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
         var swarmName, _a, _b, _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
@@ -6736,7 +6771,7 @@ var createChangeAgent = functoolsKit.ttl(function (clientId) {
                             .map(function (agentName) { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, swarm.agentPublicService.commitAgentChange(clientId, agentName)];
+                                    case 0: return [4 /*yield*/, swarm.agentPublicService.commitAgentChange(requestId, clientId, agentName)];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -6745,21 +6780,22 @@ var createChangeAgent = functoolsKit.ttl(function (clientId) {
                         }); }))];
                 case 1:
                     _d.sent();
-                    return [4 /*yield*/, swarm.agentPublicService.dispose(clientId, agentName)];
+                    return [4 /*yield*/, swarm.agentPublicService.dispose(requestId, clientId, agentName)];
                 case 2:
                     _d.sent();
-                    return [4 /*yield*/, swarm.historyPublicService.dispose(clientId, agentName)];
+                    return [4 /*yield*/, swarm.historyPublicService.dispose(requestId, clientId, agentName)];
                 case 3:
                     _d.sent();
                     _b = (_a = swarm.swarmPublicService).setAgentRef;
-                    _c = [clientId,
+                    _c = [requestId,
+                        clientId,
                         swarmName,
                         agentName];
-                    return [4 /*yield*/, swarm.agentPublicService.createAgentRef(clientId, agentName)];
+                    return [4 /*yield*/, swarm.agentPublicService.createAgentRef(requestId, clientId, agentName)];
                 case 4: return [4 /*yield*/, _b.apply(_a, _c.concat([_d.sent()]))];
                 case 5:
                     _d.sent();
-                    return [4 /*yield*/, swarm.swarmPublicService.setAgentName(agentName, clientId, swarmName)];
+                    return [4 /*yield*/, swarm.swarmPublicService.setAgentName(agentName, requestId, clientId, swarmName)];
                 case 6:
                     _d.sent();
                     return [2 /*return*/];
@@ -6793,10 +6829,11 @@ var createGc$1 = functoolsKit.singleshot(function () { return __awaiter(void 0,
  * @returns {Promise<void>} - A promise that resolves when the agent is changed.
  */
 var changeAgent = function (agentName, clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var run;
+    var requestId, run;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function changeAgent", {
                     agentName: agentName,
                     clientId: clientId,
@@ -6805,7 +6842,7 @@ var changeAgent = function (agentName, clientId) { return __awaiter(void 0, void
             case 1:
                 run = _a.sent();
                 createGc$1();
-                return [4 /*yield*/, run(agentName)];
+                return [4 /*yield*/, run(requestId, agentName)];
             case 2: return [2 /*return*/, _a.sent()];
         }
     });
@@ -6818,83 +6855,91 @@ var changeAgent = function (agentName, clientId) { return __awaiter(void 0, void
  * @param {SwarmName} swarmName - The name of the swarm.
  * @returns {Promise<void>} A promise that resolves when the connection is disposed.
  */
-var disposeConnection = function (clientId, swarmName) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                swarm.loggerService.log("function disposeConnection", {
-                    clientId: clientId,
-                    swarmName: swarmName,
-                });
-                swarm.swarmValidationService.validate(swarmName, "disposeConnection");
-                swarm.sessionValidationService.removeSession(clientId);
-                swarm.busService.dispose(clientId);
-                return [4 /*yield*/, swarm.sessionPublicService.dispose(clientId, swarmName)];
-            case 1:
-                _a.sent();
-                return [4 /*yield*/, swarm.swarmPublicService.dispose(clientId, swarmName)];
-            case 2:
-                _a.sent();
-                return [4 /*yield*/, Promise.all(swarm.swarmValidationService
-                        .getAgentList(swarmName)
-                        .map(function (agentName) { return __awaiter(void 0, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, swarm.agentPublicService.dispose(clientId, agentName)];
-                                case 1:
-                                    _a.sent();
-                                    return [4 /*yield*/, swarm.historyPublicService.dispose(clientId, agentName)];
-                                case 2:
-                                    _a.sent();
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); }))];
-            case 3:
-                _a.sent();
-                return [4 /*yield*/, Promise.all(swarm.swarmValidationService
-                        .getAgentList(swarmName)
-                        .flatMap(function (agentName) {
-                        return swarm.agentValidationService.getStorageList(agentName);
-                    })
-                        .filter(function (storageName) { return !!storageName; })
-                        .map(function (storageName) { return __awaiter(void 0, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, swarm.storagePublicService.dispose(clientId, storageName)];
-                                case 1:
-                                    _a.sent();
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); }))];
-            case 4:
-                _a.sent();
-                return [4 /*yield*/, Promise.all(swarm.swarmValidationService
-                        .getAgentList(swarmName)
-                        .flatMap(function (agentName) {
-                        return swarm.agentValidationService.getStateList(agentName);
-                    })
-                        .filter(function (stateName) { return !!stateName; })
-                        .map(function (stateName) { return __awaiter(void 0, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, swarm.statePublicService.dispose(clientId, stateName)];
-                                case 1:
-                                    _a.sent();
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); }))];
-            case 5:
-                _a.sent();
-                return [4 /*yield*/, HistoryAdapter.dispose(clientId, null)];
-            case 6:
-                _a.sent();
-                return [2 /*return*/];
-        }
+var disposeConnection = function (clientId_1, swarmName_1) {
+    var args_1 = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        args_1[_i - 2] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([clientId_1, swarmName_1], __read(args_1), false), void 0, function (clientId, swarmName, requestId) {
+        if (requestId === void 0) { requestId = functoolsKit.randomString(); }
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    swarm.loggerService.log("function disposeConnection", {
+                        clientId: clientId,
+                        swarmName: swarmName,
+                        requestId: requestId,
+                    });
+                    swarm.swarmValidationService.validate(swarmName, "disposeConnection");
+                    swarm.sessionValidationService.removeSession(clientId);
+                    swarm.busService.dispose(clientId);
+                    return [4 /*yield*/, swarm.sessionPublicService.dispose(requestId, clientId, swarmName)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, swarm.swarmPublicService.dispose(requestId, clientId, swarmName)];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, Promise.all(swarm.swarmValidationService
+                            .getAgentList(swarmName)
+                            .map(function (agentName) { return __awaiter(void 0, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, swarm.agentPublicService.dispose(requestId, clientId, agentName)];
+                                    case 1:
+                                        _a.sent();
+                                        return [4 /*yield*/, swarm.historyPublicService.dispose(requestId, clientId, agentName)];
+                                    case 2:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); }))];
+                case 3:
+                    _a.sent();
+                    return [4 /*yield*/, Promise.all(swarm.swarmValidationService
+                            .getAgentList(swarmName)
+                            .flatMap(function (agentName) {
+                            return swarm.agentValidationService.getStorageList(agentName);
+                        })
+                            .filter(function (storageName) { return !!storageName; })
+                            .map(function (storageName) { return __awaiter(void 0, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, swarm.storagePublicService.dispose(requestId, clientId, storageName)];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); }))];
+                case 4:
+                    _a.sent();
+                    return [4 /*yield*/, Promise.all(swarm.swarmValidationService
+                            .getAgentList(swarmName)
+                            .flatMap(function (agentName) {
+                            return swarm.agentValidationService.getStateList(agentName);
+                        })
+                            .filter(function (stateName) { return !!stateName; })
+                            .map(function (stateName) { return __awaiter(void 0, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, swarm.statePublicService.dispose(requestId, clientId, stateName)];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); }))];
+                case 5:
+                    _a.sent();
+                    return [4 /*yield*/, HistoryAdapter.dispose(clientId, null)];
+                case 6:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
     });
-}); };
+};
 
 var COMPLETE_TTL = 15 * 60 * 1000;
 var COMPLETE_GC = 60 * 1000;
@@ -6905,17 +6950,17 @@ var COMPLETE_GC = 60 * 1000;
  * @returns {TCompleteRun} The complete run function.
  */
 var createComplete = functoolsKit.ttl(function (clientId, swarmName) {
-    return functoolsKit.queued(function (content) { return __awaiter(void 0, void 0, void 0, function () {
+    return functoolsKit.queued(function (requestId, content) { return __awaiter(void 0, void 0, void 0, function () {
         var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     swarm.swarmValidationService.validate(swarmName, "complete");
                     swarm.sessionValidationService.addSession(clientId, swarmName, "complete");
-                    return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", clientId, swarmName)];
+                    return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", requestId, clientId, swarmName)];
                 case 1:
                     result = _a.sent();
-                    return [4 /*yield*/, disposeConnection(clientId, swarmName)];
+                    return [4 /*yield*/, disposeConnection(clientId, swarmName, requestId)];
                 case 2:
                     _a.sent();
                     return [2 /*return*/, result];
@@ -6949,20 +6994,22 @@ var createGc = functoolsKit.singleshot(function () { return __awaiter(void 0, vo
  * @returns {Promise<string>} The result of the complete function.
  */
 var complete = function (content, clientId, swarmName) { return __awaiter(void 0, void 0, void 0, function () {
-    var run;
+    var requestId, run;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function complete", {
                     content: content,
                     clientId: clientId,
                     swarmName: swarmName,
+                    requestId: requestId,
                 });
                 return [4 /*yield*/, createComplete(clientId, swarmName)];
             case 1:
                 run = _a.sent();
                 createGc();
-                return [4 /*yield*/, run(content)];
+                return [4 /*yield*/, run(requestId, content)];
             case 2: return [2 /*return*/, _a.sent()];
         }
     });
@@ -6979,9 +7026,11 @@ var SCHEDULED_DELAY = 1000;
  * @returns {Function} dispose - A function to dispose of the session.
  */
 var session = function (clientId, swarmName) {
+    var requestId = functoolsKit.randomString();
     swarm.loggerService.log("function session", {
         clientId: clientId,
         swarmName: swarmName,
+        requestId: requestId,
     });
     swarm.swarmValidationService.validate(swarmName, "session");
     swarm.sessionValidationService.addSession(clientId, swarmName, "session");
@@ -6997,7 +7046,7 @@ var session = function (clientId, swarmName) {
                 switch (_a.label) {
                     case 0:
                         swarm.sessionValidationService.validate(clientId, "session");
-                        return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", clientId, swarmName)];
+                        return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", requestId, clientId, swarmName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -7010,7 +7059,7 @@ var session = function (clientId, swarmName) {
         dispose: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, disposeConnection(clientId, swarmName)];
+                    case 0: return [4 /*yield*/, disposeConnection(clientId, swarmName, requestId)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -7115,27 +7164,35 @@ session.scheduled = function (clientId, swarmName, _a) {
  * @param {string} clientId - The ID of the client whose history is to be retrieved.
  * @returns {Promise<Array>} A promise that resolves to an array containing the raw history.
  */
-var getRawHistory = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName, agentName, history;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                swarm.loggerService.log("function getRawHistory", {
-                    clientId: clientId,
-                });
-                swarm.sessionValidationService.validate(clientId, "getRawHistory");
-                swarmName = swarm.sessionValidationService.getSwarm(clientId);
-                swarm.swarmValidationService.validate(swarmName, "getRawHistory");
-                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
-            case 1:
-                agentName = _a.sent();
-                return [4 /*yield*/, swarm.historyPublicService.toArrayForRaw(clientId, agentName)];
-            case 2:
-                history = _a.sent();
-                return [2 /*return*/, __spreadArray([], __read(history), false)];
-        }
+var getRawHistory = function (clientId_1) {
+    var args_1 = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args_1[_i - 1] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([clientId_1], __read(args_1), false), void 0, function (clientId, requestId) {
+        var swarmName, agentName, history;
+        if (requestId === void 0) { requestId = functoolsKit.randomString(); }
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    swarm.loggerService.log("function getRawHistory", {
+                        clientId: clientId,
+                        requestId: requestId,
+                    });
+                    swarm.sessionValidationService.validate(clientId, "getRawHistory");
+                    swarmName = swarm.sessionValidationService.getSwarm(clientId);
+                    swarm.swarmValidationService.validate(swarmName, "getRawHistory");
+                    return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
+                case 1:
+                    agentName = _a.sent();
+                    return [4 /*yield*/, swarm.historyPublicService.toArrayForRaw(requestId, clientId, agentName)];
+                case 2:
+                    history = _a.sent();
+                    return [2 /*return*/, __spreadArray([], __read(history), false)];
+            }
+        });
     });
-}); };
+};
 
 /**
  * Retrieves the history prepared for a specific agent with resque algorithm tweaks
@@ -7145,17 +7202,19 @@ var getRawHistory = function (clientId) { return __awaiter(void 0, void 0, void
  * @returns {Promise<Array>} - A promise that resolves to an array containing the agent's history.
  */
 var getAgentHistory = function (clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var prompt, history;
+    var requestId, prompt, history;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function getAgentHistory", {
                     clientId: clientId,
                     agentName: agentName,
+                    requestId: requestId,
                 });
                 swarm.agentValidationService.validate(agentName, "getAgentHistory");
                 prompt = swarm.agentSchemaService.get(agentName).prompt;
-                return [4 /*yield*/, swarm.historyPublicService.toArrayForAgent(prompt, clientId, agentName)];
+                return [4 /*yield*/, swarm.historyPublicService.toArrayForAgent(prompt, requestId, clientId, agentName)];
             case 1:
                 history = _a.sent();
                 return [2 /*return*/, __spreadArray([], __read(history), false)];
@@ -7189,21 +7248,23 @@ var getSessionMode = function (clientId) { return __awaiter(void 0, void 0, void
  * @returns {Promise<void>} - A promise that resolves when the operation is complete.
  */
 var commitToolOutput = function (toolId, content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName, currentAgentName;
+    var requestId, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function commitToolOutput', {
                     toolId: toolId,
                     content: content,
                     clientId: clientId,
                     agentName: agentName,
+                    requestId: requestId,
                 });
                 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)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7215,7 +7276,7 @@ var commitToolOutput = function (toolId, content, clientId, agentName) { return
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(toolId, content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(toolId, content, requestId, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -7232,20 +7293,22 @@ var commitToolOutput = function (toolId, content, clientId, agentName) { return
  * @returns {Promise<void>} - A promise that resolves when the message is committed.
  */
 var commitSystemMessage = function (content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName, currentAgentName;
+    var requestId, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function commitSystemMessage', {
                     content: content,
                     clientId: clientId,
                     agentName: agentName,
+                    requestId: requestId,
                 });
                 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)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7256,7 +7319,7 @@ var commitSystemMessage = function (content, clientId, agentName) { return __awa
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitSystemMessage(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitSystemMessage(content, requestId, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -7272,19 +7335,21 @@ var commitSystemMessage = function (content, clientId, agentName) { return __awa
  * @returns {Promise<void>} - A promise that resolves when the message is committed.
  */
 var commitFlush = function (clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName, currentAgentName;
+    var requestId, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function commitFlush', {
                     clientId: clientId,
                     agentName: agentName,
+                    requestId: requestId,
                 });
                 swarm.agentValidationService.validate(agentName, "commitFlush");
                 swarm.sessionValidationService.validate(clientId, "commitFlush");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "commitFlush");
-                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7295,7 +7360,7 @@ var commitFlush = function (clientId, agentName) { return __awaiter(void 0, void
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitFlush(clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitFlush(requestId, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -7313,20 +7378,22 @@ var commitFlush = function (clientId, agentName) { return __awaiter(void 0, void
  * @returns {Promise<void>} - A promise that resolves when the execution is complete.
  */
 var execute = function (content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName, currentAgentName;
+    var requestId, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function execute", {
                     content: content,
                     clientId: clientId,
                     agentName: agentName,
+                    requestId: requestId,
                 });
                 swarm.agentValidationService.validate(agentName, "execute");
                 swarm.sessionValidationService.validate(clientId, "execute");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "execute");
-                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7337,7 +7404,7 @@ var execute = function (content, clientId, agentName) { return __awaiter(void 0,
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", requestId, clientId, swarmName)];
             case 2: return [2 /*return*/, _a.sent()];
         }
     });
@@ -7354,14 +7421,16 @@ var execute = function (content, clientId, agentName) { return __awaiter(void 0,
  * @returns {Promise<void>} A promise that resolves when the content is emitted.
  */
 var emit = function (content, clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName, currentAgentName;
+    var requestId, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function emit", {
                     content: content,
                     clientId: clientId,
                     agentName: agentName,
+                    requestId: requestId,
                 });
                 if (swarm.sessionValidationService.getSessionMode(clientId) !== "makeConnection") {
                     throw new Error("agent-swarm-kit emit session is not makeConnection clientId=".concat(clientId));
@@ -7370,7 +7439,7 @@ var emit = function (content, clientId, agentName) { return __awaiter(void 0, vo
                 swarm.sessionValidationService.validate(clientId, "emit");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "emit");
-                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7381,7 +7450,7 @@ var emit = function (content, clientId, agentName) { return __awaiter(void 0, vo
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.emit(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.emit(content, requestId, clientId, swarmName)];
             case 2: return [2 /*return*/, _a.sent()];
         }
     });
@@ -7395,19 +7464,21 @@ var emit = function (content, clientId, agentName) { return __awaiter(void 0, vo
  * @returns {Promise<void>} - A promise that resolves when the operation is complete.
  */
 var commitToolOutputForce = function (toolId, content, clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName;
+    var requestId, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function commitToolOutputForce', {
                     toolId: toolId,
                     content: content,
                     clientId: clientId,
+                    requestId: requestId,
                 });
                 swarm.sessionValidationService.validate(clientId, "commitToolOutputForce");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "commitToolOutputForce");
-                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(toolId, content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(toolId, content, requestId, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -7423,18 +7494,20 @@ var commitToolOutputForce = function (toolId, content, clientId) { return __awai
  * @returns {Promise<void>} - A promise that resolves when the message is committed.
  */
 var commitSystemMessageForce = function (content, clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName;
+    var requestId, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function commitSystemMessageForce', {
                     content: content,
                     clientId: clientId,
+                    requestId: requestId,
                 });
                 swarm.sessionValidationService.validate(clientId, "commitSystemMessageForce");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "commitSystemMessageForce");
-                return [4 /*yield*/, swarm.sessionPublicService.commitSystemMessage(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitSystemMessage(content, requestId, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -7449,17 +7522,19 @@ var commitSystemMessageForce = function (content, clientId) { return __awaiter(v
  * @returns {Promise<void>} - A promise that resolves when the message is committed.
  */
 var commitFlushForce = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName;
+    var requestId, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function commitFlushForce', {
                     clientId: clientId,
+                    requestId: requestId,
                 });
                 swarm.sessionValidationService.validate(clientId, "commitFlushForce");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "commitFlushForce");
-                return [4 /*yield*/, swarm.sessionPublicService.commitFlush(clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitFlush(requestId, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -7475,18 +7550,20 @@ var commitFlushForce = function (clientId) { return __awaiter(void 0, void 0, vo
  * @returns {Promise<void>} - A promise that resolves when the message is committed.
  */
 var commitUserMessageForce = function (content, clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName;
+    var requestId, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function commitSystemMessage', {
                     content: content,
                     clientId: clientId,
+                    requestId: requestId,
                 });
                 swarm.sessionValidationService.validate(clientId, "commitUserMessageForce");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "commitUserMessageForce");
-                return [4 /*yield*/, swarm.sessionPublicService.commitUserMessage(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitUserMessage(content, requestId, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -7505,13 +7582,15 @@ var commitUserMessageForce = function (content, clientId) { return __awaiter(voi
  * @returns {Promise<void>} A promise that resolves when the content is emitted.
  */
 var emitForce = function (content, clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName;
+    var requestId, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function emitForce", {
                     content: content,
                     clientId: clientId,
+                    requestId: requestId,
                 });
                 if (swarm.sessionValidationService.getSessionMode(clientId) !== "makeConnection") {
                     throw new Error("agent-swarm-kit emitForce session is not makeConnection clientId=".concat(clientId));
@@ -7519,7 +7598,7 @@ var emitForce = function (content, clientId) { return __awaiter(void 0, void 0,
                 swarm.sessionValidationService.validate(clientId, "emitForce");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "emitForce");
-                return [4 /*yield*/, swarm.sessionPublicService.emit(content, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.emit(content, requestId, clientId, swarmName)];
             case 1: return [2 /*return*/, _a.sent()];
         }
     });
@@ -7536,24 +7615,26 @@ var emitForce = function (content, clientId) { return __awaiter(void 0, void 0,
  * @returns {Promise<void>} - A promise that resolves when the execution is complete.
  */
 var executeForce = function (content, clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName;
+    var requestId, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function executeForce", {
                     content: content,
                     clientId: clientId,
+                    requestId: requestId,
                 });
                 swarm.sessionValidationService.validate(clientId, "executeForce");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "executeForce");
-                return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", requestId, clientId, swarmName)];
             case 1: return [2 /*return*/, _a.sent()];
         }
     });
 }); };
 
-var DISALLOWED_EVENT_SOURCE_LIST$1 = new Set([
+var DISALLOWED_EVENT_SOURCE_LIST$2 = new Set([
     "agent-bus",
     "history-bus",
     "session-bus",
@@ -7561,7 +7642,7 @@ var DISALLOWED_EVENT_SOURCE_LIST$1 = new Set([
     "storage-bus",
     "swarm-bus",
 ]);
-var validateClientId$6 = function (clientId) {
+var validateClientId$d = function (clientId) {
     if (clientId === "*") {
         return;
     }
@@ -7580,16 +7661,56 @@ var listenEvent = function (clientId, topicName, fn) {
     swarm.loggerService.log("function listenEvent", {
         clientId: clientId,
     });
-    if (DISALLOWED_EVENT_SOURCE_LIST$1.has(topicName)) {
+    if (DISALLOWED_EVENT_SOURCE_LIST$2.has(topicName)) {
         throw new Error("agent-swarm listenEvent topic is reserved topicName=".concat(topicName));
     }
-    validateClientId$6(clientId);
+    validateClientId$d(clientId);
     return swarm.busService.subscribe(clientId, topicName, function (_a) {
         var payload = _a.payload;
         return fn(payload);
     });
 };
 
+var DISALLOWED_EVENT_SOURCE_LIST$1 = new Set([
+    "agent-bus",
+    "history-bus",
+    "session-bus",
+    "state-bus",
+    "storage-bus",
+    "swarm-bus",
+]);
+var validateClientId$c = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenEventOnce session not found for clientId=".concat(clientId));
+    }
+};
+/**
+ * Listens for an event on the swarm bus service and executes a callback function when the event is received.
+ *
+ * @template T - The type of the data payload.
+ * @param {string} clientId - The ID of the client to listen for events from.
+ * @param {(data: T) => void} fn - The callback function to execute when the event is received. The data payload is passed as an argument to this function.
+ */
+var listenEventOnce = function (clientId, topicName, filterFn, fn) {
+    swarm.loggerService.log("function listenEventOnce", {
+        clientId: clientId,
+    });
+    if (DISALLOWED_EVENT_SOURCE_LIST$1.has(topicName)) {
+        throw new Error("agent-swarm listenEventOnce topic is reserved topicName=".concat(topicName));
+    }
+    validateClientId$c(clientId);
+    return swarm.busService.once(clientId, topicName, function (_a) {
+        var payload = _a.payload;
+        return filterFn(payload);
+    }, function (_a) {
+        var payload = _a.payload;
+        return fn(payload);
+    });
+};
+
 /**
  * Retrieves the last message sent by the user from the client's message history.
  *
@@ -7597,14 +7718,16 @@ var listenEvent = function (clientId, topicName, fn) {
  * @returns {Promise<string | null>} - The content of the last user message, or null if no user message is found.
  */
 var getLastUserMessage = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var history, last;
+    var requestId, history, last;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function getLastUserMessage", {
                     clientId: clientId,
+                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId)];
+                return [4 /*yield*/, getRawHistory(clientId, requestId)];
             case 1:
                 history = _a.sent();
                 last = history.findLast(function (_a) {
@@ -7623,14 +7746,16 @@ var getLastUserMessage = function (clientId) { return __awaiter(void 0, void 0,
  * @returns {Promise<Array>} A promise that resolves to an array of history objects filtered by user role.
  */
 var getUserHistory = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var history;
+    var requestId, history;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function getUserHistory", {
                     clientId: clientId,
+                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId)];
+                return [4 /*yield*/, getRawHistory(clientId, requestId)];
             case 1:
                 history = _a.sent();
                 return [2 /*return*/, history.filter(function (_a) {
@@ -7648,14 +7773,16 @@ var getUserHistory = function (clientId) { return __awaiter(void 0, void 0, void
  * @returns {Promise<Array>} - A promise that resolves to an array of history objects where the role is "assistant".
  */
 var getAssistantHistory = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var history;
+    var requestId, history;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function getAssistantHistory", {
                     clientId: clientId,
+                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId)];
+                return [4 /*yield*/, getRawHistory(clientId, requestId)];
             case 1:
                 history = _a.sent();
                 return [2 /*return*/, history.filter(function (_a) {
@@ -7673,14 +7800,16 @@ var getAssistantHistory = function (clientId) { return __awaiter(void 0, void 0,
  * @returns {Promise<string | null>} - The content of the last assistant message, or null if no user message is found.
  */
 var getLastAssistantMessage = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var history, last;
+    var requestId, history, last;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function getLastAssistantMessage", {
                     clientId: clientId,
+                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId)];
+                return [4 /*yield*/, getRawHistory(clientId, requestId)];
             case 1:
                 history = _a.sent();
                 last = history.findLast(function (_a) {
@@ -7699,14 +7828,16 @@ var getLastAssistantMessage = function (clientId) { return __awaiter(void 0, voi
  * @returns {Promise<string | null>} - The content of the last system message, or null if no user message is found.
  */
 var getLastSystemMessage = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var history, last;
+    var requestId, history, last;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log("function getLastSystemMessage", {
                     clientId: clientId,
+                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId)];
+                return [4 /*yield*/, getRawHistory(clientId, requestId)];
             case 1:
                 history = _a.sent();
                 last = history.findLast(function (_a) {
@@ -7810,19 +7941,21 @@ var event = function (clientId, topicName, payload) {
  * @returns {Promise<void>} - A promise that resolves when the output is canceled
  */
 var cancelOutput = function (clientId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName, currentAgentName;
+    var requestId, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function cancelOutput', {
                     clientId: clientId,
                     agentName: agentName,
+                    requestId: requestId,
                 });
                 swarm.agentValidationService.validate(agentName, "cancelOutput");
                 swarm.sessionValidationService.validate(clientId, "cancelOutput");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "cancelOutput");
-                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7833,7 +7966,7 @@ var cancelOutput = function (clientId, agentName) { return __awaiter(void 0, voi
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.swarmPublicService.cancelOutput(clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.cancelOutput(requestId, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -7849,17 +7982,19 @@ var cancelOutput = function (clientId, agentName) { return __awaiter(void 0, voi
  * @returns {Promise<void>} - A promise that resolves when the output is canceled
  */
 var cancelOutputForce = function (clientId) { return __awaiter(void 0, void 0, void 0, function () {
-    var swarmName;
+    var requestId, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                requestId = functoolsKit.randomString();
                 swarm.loggerService.log('function cancelOutputForce', {
                     clientId: clientId,
+                    requestId: requestId
                 });
                 swarm.sessionValidationService.validate(clientId, "cancelOutputForce");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "cancelOutputForce");
-                return [4 /*yield*/, swarm.swarmPublicService.cancelOutput(clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.cancelOutput(requestId, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -7867,7 +8002,7 @@ var cancelOutputForce = function (clientId) { return __awaiter(void 0, void 0, v
     });
 }); };
 
-var validateClientId$5 = function (clientId) {
+var validateClientId$b = function (clientId) {
     if (clientId === "*") {
         return;
     }
@@ -7885,11 +8020,11 @@ var listenAgentEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenAgentEvent", {
         clientId: clientId,
     });
-    validateClientId$5(clientId);
-    swarm.busService.subscribe(clientId, "agent-bus", fn);
+    validateClientId$b(clientId);
+    return swarm.busService.subscribe(clientId, "agent-bus", fn);
 };
 
-var validateClientId$4 = function (clientId) {
+var validateClientId$a = function (clientId) {
     if (clientId === "*") {
         return;
     }
@@ -7907,11 +8042,11 @@ var listenHistoryEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenHistoryEvent", {
         clientId: clientId,
     });
-    validateClientId$4(clientId);
-    swarm.busService.subscribe(clientId, "history-bus", fn);
+    validateClientId$a(clientId);
+    return swarm.busService.subscribe(clientId, "history-bus", fn);
 };
 
-var validateClientId$3 = function (clientId) {
+var validateClientId$9 = function (clientId) {
     if (clientId === "*") {
         return;
     }
@@ -7929,11 +8064,11 @@ var listenSessionEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenSessionEvent", {
         clientId: clientId,
     });
-    validateClientId$3(clientId);
-    swarm.busService.subscribe(clientId, "session-bus", fn);
+    validateClientId$9(clientId);
+    return swarm.busService.subscribe(clientId, "session-bus", fn);
 };
 
-var validateClientId$2 = function (clientId) {
+var validateClientId$8 = function (clientId) {
     if (clientId === "*") {
         return;
     }
@@ -7951,11 +8086,11 @@ var listenStateEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenStateEvent", {
         clientId: clientId,
     });
-    validateClientId$2(clientId);
-    swarm.busService.subscribe(clientId, "state-bus", fn);
+    validateClientId$8(clientId);
+    return swarm.busService.subscribe(clientId, "state-bus", fn);
 };
 
-var validateClientId$1 = function (clientId) {
+var validateClientId$7 = function (clientId) {
     if (clientId === "*") {
         return;
     }
@@ -7973,11 +8108,11 @@ var listenStorageEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenStorageEvent", {
         clientId: clientId,
     });
-    validateClientId$1(clientId);
-    swarm.busService.subscribe(clientId, "storage-bus", fn);
+    validateClientId$7(clientId);
+    return swarm.busService.subscribe(clientId, "storage-bus", fn);
 };
 
-var validateClientId = function (clientId) {
+var validateClientId$6 = function (clientId) {
     if (clientId === "*") {
         return;
     }
@@ -7995,8 +8130,140 @@ var listenSwarmEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenSwarmEvent", {
         clientId: clientId,
     });
+    validateClientId$6(clientId);
+    return swarm.busService.subscribe(clientId, "swarm-bus", fn);
+};
+
+var validateClientId$5 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenAgentEventOnce session not found for clientId=".concat(clientId));
+    }
+};
+/**
+ * Hook to subscribe to agent events for a specific client.
+ *
+ * @param {string} clientId - The ID of the client to subscribe to events for.
+ * @param {function} fn - The callback function to handle the event.
+ */
+var listenAgentEventOnce = function (clientId, filterFn, fn) {
+    swarm.loggerService.log("middleware listenAgentEventOnce", {
+        clientId: clientId,
+    });
+    validateClientId$5(clientId);
+    return swarm.busService.once(clientId, "agent-bus", filterFn, fn);
+};
+
+var validateClientId$4 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenHistoryEventOnce session not found for clientId=".concat(clientId));
+    }
+};
+/**
+ * Hook to subscribe to history events for a specific client.
+ *
+ * @param {string} clientId - The ID of the client to subscribe to.
+ * @param {(event: IBusEvent) => void} fn - The callback function to handle the event.
+ */
+var listenHistoryEventOnce = function (clientId, filterFn, fn) {
+    swarm.loggerService.log("middleware listenHistoryEventOnce", {
+        clientId: clientId,
+    });
+    validateClientId$4(clientId);
+    return swarm.busService.once(clientId, "history-bus", filterFn, fn);
+};
+
+var validateClientId$3 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenSessionEventOnce session not found for clientId=".concat(clientId));
+    }
+};
+/**
+ * Hook to subscribe to session events for a specific client.
+ *
+ * @param {string} clientId - The ID of the client to subscribe to session events for.
+ * @param {function} fn - The callback function to handle the session events.
+ */
+var listenSessionEventOnce = function (clientId, filterFn, fn) {
+    swarm.loggerService.log("middleware listenSessionEventOnce", {
+        clientId: clientId,
+    });
+    validateClientId$3(clientId);
+    return swarm.busService.once(clientId, "session-bus", filterFn, fn);
+};
+
+var validateClientId$2 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenStateEventOnce session not found for clientId=".concat(clientId));
+    }
+};
+/**
+ * Hook to subscribe to state events for a specific client.
+ *
+ * @param {string} clientId - The ID of the client to subscribe to.
+ * @param {function} fn - The callback function to handle the event.
+ */
+var listenStateEventOnce = function (clientId, filterFn, fn) {
+    swarm.loggerService.log("middleware listenStateEventOnce", {
+        clientId: clientId,
+    });
+    validateClientId$2(clientId);
+    return swarm.busService.once(clientId, "state-bus", filterFn, fn);
+};
+
+var validateClientId$1 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenStorageEventOnce session not found for clientId=".concat(clientId));
+    }
+};
+/**
+ * Hook to subscribe to storage events for a specific client.
+ *
+ * @param {string} clientId - The ID of the client to subscribe to storage events for.
+ * @param {function} fn - The callback function to handle the storage event.
+ */
+var listenStorageEventOnce = function (clientId, filterFn, fn) {
+    swarm.loggerService.log("middleware listenStorageEventOnce", {
+        clientId: clientId,
+    });
+    validateClientId$1(clientId);
+    return swarm.busService.once(clientId, "storage-bus", filterFn, fn);
+};
+
+var validateClientId = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenSwarmEventOnce session not found for clientId=".concat(clientId));
+    }
+};
+/**
+ * Hook to subscribe to swarm events for a specific client.
+ *
+ * @param {string} clientId - The ID of the client to subscribe to events for.
+ * @param {(event: IBusEvent) => void} fn - The callback function to handle the event.
+ */
+var listenSwarmEventOnce = function (clientId, filterFn, fn) {
+    swarm.loggerService.log("middleware listenSwarmEventOnce", {
+        clientId: clientId,
+    });
     validateClientId(clientId);
-    swarm.busService.subscribe(clientId, "swarm-bus", fn);
+    return swarm.busService.once(clientId, "swarm-bus", filterFn, fn);
 };
 
 var StorageUtils = /** @class */ (function () {
@@ -8013,21 +8280,24 @@ var StorageUtils = /** @class */ (function () {
          * @template T
          */
         this.take = function (payload) { return __awaiter(_this, void 0, void 0, function () {
+            var requestId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        requestId = functoolsKit.randomString();
                         swarm.loggerService.log("StorageUtils take", {
                             search: payload.search,
                             total: payload.total,
                             clientId: payload.clientId,
                             storageName: payload.storageName,
                             score: payload.score,
+                            requestId: requestId,
                         });
                         swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (take)"));
                         }
-                        return [4 /*yield*/, swarm.storagePublicService.take(payload.search, payload.total, payload.clientId, payload.storageName, payload.score)];
+                        return [4 /*yield*/, swarm.storagePublicService.take(payload.search, payload.total, requestId, payload.clientId, payload.storageName, payload.score)];
                     case 1: return [2 /*return*/, (_a.sent())];
                 }
             });
@@ -8042,19 +8312,22 @@ var StorageUtils = /** @class */ (function () {
          * @template T
          */
         this.upsert = function (payload) { return __awaiter(_this, void 0, void 0, function () {
+            var requestId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        requestId = functoolsKit.randomString();
                         swarm.loggerService.log("StorageUtils upsert", {
                             item: payload.item,
                             clientId: payload.clientId,
                             storageName: payload.storageName,
+                            requestId: requestId,
                         });
                         swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (upsert)"));
                         }
-                        return [4 /*yield*/, swarm.storagePublicService.upsert(payload.item, payload.clientId, payload.storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.upsert(payload.item, requestId, payload.clientId, payload.storageName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8068,19 +8341,22 @@ var StorageUtils = /** @class */ (function () {
          * @returns {Promise<void>} - A promise that resolves when the operation is complete.
          */
         this.remove = function (payload) { return __awaiter(_this, void 0, void 0, function () {
+            var requestId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        requestId = functoolsKit.randomString();
                         swarm.loggerService.log("StorageUtils remove", {
                             itemId: payload.itemId,
                             clientId: payload.clientId,
                             storageName: payload.storageName,
+                            requestId: requestId,
                         });
                         swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (remove)"));
                         }
-                        return [4 /*yield*/, swarm.storagePublicService.remove(payload.itemId, payload.clientId, payload.storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.remove(payload.itemId, requestId, payload.clientId, payload.storageName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8095,19 +8371,22 @@ var StorageUtils = /** @class */ (function () {
          * @template T
          */
         this.get = function (payload) { return __awaiter(_this, void 0, void 0, function () {
+            var requestId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        requestId = functoolsKit.randomString();
                         swarm.loggerService.log("StorageUtils get", {
                             itemId: payload.itemId,
                             clientId: payload.clientId,
                             storageName: payload.storageName,
+                            requestId: requestId,
                         });
                         swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (get)"));
                         }
-                        return [4 /*yield*/, swarm.storagePublicService.get(payload.itemId, payload.clientId, payload.storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.get(payload.itemId, requestId, payload.clientId, payload.storageName)];
                     case 1: return [2 /*return*/, (_a.sent())];
                 }
             });
@@ -8122,18 +8401,21 @@ var StorageUtils = /** @class */ (function () {
          * @template T
          */
         this.list = function (payload) { return __awaiter(_this, void 0, void 0, function () {
+            var requestId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        requestId = functoolsKit.randomString();
                         swarm.loggerService.log("StorageUtils list", {
                             clientId: payload.clientId,
                             storageName: payload.storageName,
+                            requestId: requestId,
                         });
                         swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (list)"));
                         }
-                        return [4 /*yield*/, swarm.storagePublicService.list(payload.clientId, payload.storageName, payload.filter)];
+                        return [4 /*yield*/, swarm.storagePublicService.list(requestId, payload.clientId, payload.storageName, payload.filter)];
                     case 1: return [2 /*return*/, (_a.sent())];
                 }
             });
@@ -8146,18 +8428,21 @@ var StorageUtils = /** @class */ (function () {
          * @returns {Promise<void>} - A promise that resolves when the operation is complete.
          */
         this.clear = function (payload) { return __awaiter(_this, void 0, void 0, function () {
+            var requestId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        requestId = functoolsKit.randomString();
                         swarm.loggerService.log("StorageUtils clear", {
                             clientId: payload.clientId,
                             storageName: payload.storageName,
+                            requestId: requestId,
                         });
                         swarm.storageValidationService.validate(payload.storageName, "StorageUtils");
                         if (!swarm.agentValidationService.hasStorage(payload.agentName, payload.storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(payload.storageName, " not registered in ").concat(payload.agentName, " (clear)"));
                         }
-                        return [4 /*yield*/, swarm.storagePublicService.clear(payload.clientId, payload.storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.clear(requestId, payload.clientId, payload.storageName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8185,17 +8470,20 @@ var StateUtils = /** @class */ (function () {
          * @throws Will throw an error if the state is not registered in the agent.
          */
         this.getState = function (payload) { return __awaiter(_this, void 0, void 0, function () {
+            var requestId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        requestId = functoolsKit.randomString();
                         swarm.loggerService.log("StateUtils getState", {
                             clientId: payload.clientId,
                             stateName: payload.stateName,
+                            requestId: requestId,
                         });
                         if (!swarm.agentValidationService.hasState(payload.agentName, payload.stateName)) {
                             throw new Error("agent-swarm StateUtils ".concat(payload.stateName, " not registered in ").concat(payload.agentName, " (getState)"));
                         }
-                        return [4 /*yield*/, swarm.statePublicService.getState(payload.clientId, payload.stateName)];
+                        return [4 /*yield*/, swarm.statePublicService.getState(requestId, payload.clientId, payload.stateName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8212,23 +8500,26 @@ var StateUtils = /** @class */ (function () {
          * @throws Will throw an error if the state is not registered in the agent.
          */
         this.setState = function (dispatchFn, payload) { return __awaiter(_this, void 0, void 0, function () {
+            var requestId;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        requestId = functoolsKit.randomString();
                         swarm.loggerService.log("StateUtils setState", {
                             clientId: payload.clientId,
                             stateName: payload.stateName,
+                            requestId: requestId,
                         });
                         if (!swarm.agentValidationService.hasState(payload.agentName, payload.stateName)) {
                             throw new Error("agent-swarm StateUtils ".concat(payload.stateName, " not registered in ").concat(payload.agentName, " (setState)"));
                         }
                         if (!(typeof dispatchFn === "function")) return [3 /*break*/, 2];
-                        return [4 /*yield*/, swarm.statePublicService.setState(dispatchFn, payload.clientId, payload.stateName)];
+                        return [4 /*yield*/, swarm.statePublicService.setState(dispatchFn, requestId, payload.clientId, payload.stateName)];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2: return [4 /*yield*/, swarm.statePublicService.setState(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                             return [2 /*return*/, dispatchFn];
-                        }); }); }, payload.clientId, payload.stateName)];
+                        }); }); }, requestId, payload.clientId, payload.stateName)];
                     case 3: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8242,10 +8533,30 @@ var StateUtils = /** @class */ (function () {
  */
 var State = new StateUtils();
 
+var LoggerUtils = /** @class */ (function () {
+    function LoggerUtils() {
+        /**
+         * Sets the provided logger to the logger service.
+         * @param {ILogger} logger - The logger instance to be used.
+         */
+        this.useLogger = function (logger) {
+            swarm.loggerService.log("HistoryInstance useLogger");
+            swarm.loggerService.setLogger(logger);
+        };
+    }
+    return LoggerUtils;
+}());
+/**
+ * Instance of LoggerUtils to be used for logging.
+ * @type {LoggerUtils}
+ */
+var Logger = new LoggerUtils();
+
 exports.ContextService = ContextService;
 exports.History = History;
 exports.HistoryAdapter = HistoryAdapter;
 exports.HistoryInstance = HistoryInstance;
+exports.Logger = Logger;
 exports.State = State;
 exports.Storage = Storage;
 exports.addAgent = addAgent;
@@ -8283,12 +8594,19 @@ exports.getRawHistory = getRawHistory;
 exports.getSessionMode = getSessionMode;
 exports.getUserHistory = getUserHistory;
 exports.listenAgentEvent = listenAgentEvent;
+exports.listenAgentEventOnce = listenAgentEventOnce;
 exports.listenEvent = listenEvent;
+exports.listenEventOnce = listenEventOnce;
 exports.listenHistoryEvent = listenHistoryEvent;
+exports.listenHistoryEventOnce = listenHistoryEventOnce;
 exports.listenSessionEvent = listenSessionEvent;
+exports.listenSessionEventOnce = listenSessionEventOnce;
 exports.listenStateEvent = listenStateEvent;
+exports.listenStateEventOnce = listenStateEventOnce;
 exports.listenStorageEvent = listenStorageEvent;
+exports.listenStorageEventOnce = listenStorageEventOnce;
 exports.listenSwarmEvent = listenSwarmEvent;
+exports.listenSwarmEventOnce = listenSwarmEventOnce;
 exports.makeAutoDispose = makeAutoDispose;
 exports.makeConnection = makeConnection;
 exports.session = session;