agent-swarm-kit 1.0.76 → 1.0.78

package/build/index.cjs

@@ -154,12 +154,12 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 };
 
 /**
- * Service providing context information.
+ * Service providing method call context information.
  */
-var ContextService = diScoped.scoped(/** @class */ (function () {
+var MethodContextService = diScoped.scoped(/** @class */ (function () {
     /**
-     * Creates an instance of ContextService.
-     * @param {IContext} context - The context object.
+     * Creates an instance of MethodContextService.
+     * @param {IMethodContext} context - The context object.
      */
     function class_1(context) {
         this.context = context;
@@ -173,7 +173,10 @@ var init = (_a = diKit.createActivator("agent-swarm"), _a.init), inject = _a.inj
 var baseServices$1 = {
     busService: Symbol('busService'),
     loggerService: Symbol('loggerService'),
-    contextService: Symbol('contextService'),
+};
+var contextServices$1 = {
+    methodContextService: Symbol('methodContextService'),
+    executionContextService: Symbol('executionContextService'),
 };
 var connectionServices$1 = {
     agentConnectionService: Symbol('agentConnectionService'),
@@ -209,7 +212,21 @@ var validationServices$1 = {
     embeddingValidationService: Symbol('embeddingValidationService'),
     storageValidationService: Symbol('storageValidationService'),
 };
-var TYPES = __assign(__assign(__assign(__assign(__assign({}, baseServices$1), schemaServices$1), connectionServices$1), publicServices$1), validationServices$1);
+var TYPES = __assign(__assign(__assign(__assign(__assign(__assign({}, baseServices$1), contextServices$1), schemaServices$1), connectionServices$1), publicServices$1), validationServices$1);
+
+/**
+ * Service providing execution context information.
+ */
+var ExecutionContextService = diScoped.scoped(/** @class */ (function () {
+    /**
+     * Creates an instance of ExecutionContextService.
+     * @param {IExecutionContext} context - The context object.
+     */
+    function class_1(context) {
+        this.context = context;
+    }
+    return class_1;
+}()));
 
 /**
  * LoggerService class that implements the ILogger interface.
@@ -218,7 +235,8 @@ var TYPES = __assign(__assign(__assign(__assign(__assign({}, baseServices$1), sc
 var LoggerService = /** @class */ (function () {
     function LoggerService() {
         var _this = this;
-        this.contextService = inject(TYPES.contextService);
+        this.methodContextService = inject(TYPES.methodContextService);
+        this.executionContextService = inject(TYPES.executionContextService);
         this._logger = {
             /**
              * Logs messages.
@@ -232,38 +250,69 @@ var LoggerService = /** @class */ (function () {
              */
             debug: function () {
             },
+            /**
+             * Logs info messages.
+             * @param {...any} args - The info messages to log.
+             */
+            info: function () {
+            },
         };
         /**
          * Logs messages using the current logger.
          * @param {...any} args - The messages to log.
          */
         this.log = function () {
-            var _a, _b;
+            var _a;
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            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));
+            var methodContext = MethodContextService.hasContext()
+                ? _this.methodContextService.context
+                : null;
+            var executionContext = ExecutionContextService.hasContext()
+                ? _this.executionContextService.context
+                : null;
+            (_a = _this._logger).log.apply(_a, __spreadArray(__spreadArray([], __read(args), false), [{
+                    methodContext: methodContext,
+                    executionContext: executionContext,
+                }], false));
         };
         /**
          * Logs debug messages using the current logger.
          * @param {...any} args - The debug messages to log.
          */
         this.debug = function () {
-            var _a, _b;
+            var _a;
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            if (ContextService.hasContext()) {
-                (_a = _this._logger).debug.apply(_a, __spreadArray(__spreadArray([], __read(args), false), [_this.contextService.context], false));
-                return;
+            var methodContext = MethodContextService.hasContext()
+                ? _this.methodContextService.context
+                : null;
+            var executionContext = ExecutionContextService.hasContext()
+                ? _this.executionContextService.context
+                : null;
+            (_a = _this._logger).debug.apply(_a, __spreadArray(__spreadArray([], __read(args), false), [{ methodContext: methodContext, executionContext: executionContext }], false));
+        };
+        /**
+         * Logs info messages using the current logger.
+         * @param {...any} args - The info messages to log.
+         */
+        this.info = function () {
+            var _a;
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
             }
-            (_b = _this._logger).debug.apply(_b, __spreadArray([], __read(args), false));
+            var methodContext = MethodContextService.hasContext()
+                ? _this.methodContextService.context
+                : null;
+            var executionContext = ExecutionContextService.hasContext()
+                ? _this.executionContextService.context
+                : null;
+            (_a = _this._logger).info.apply(_a, __spreadArray(__spreadArray([], __read(args), false), [{ methodContext: methodContext, executionContext: executionContext }], false));
         };
         /**
          * Sets a new logger.
@@ -290,7 +339,7 @@ var AgentSchemaService = /** @class */ (function () {
          * @param {IAgentSchema} value - The schema of the agent.
          */
         this.register = function (key, value) {
-            _this.loggerService.log("agentSchemaService register", { key: key });
+            _this.loggerService.info("agentSchemaService register", { key: key });
             _this.registry = _this.registry.register(key, value);
         };
         /**
@@ -299,7 +348,7 @@ var AgentSchemaService = /** @class */ (function () {
          * @returns {IAgentSchema} The schema of the agent.
          */
         this.get = function (key) {
-            _this.loggerService.log("agentSchemaService get", { key: key });
+            _this.loggerService.info("agentSchemaService get", { key: key });
             return _this.registry.get(key);
         };
     }
@@ -1523,7 +1572,7 @@ var AgentConnectionService = /** @class */ (function () {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
         this.busService = inject(TYPES.busService);
-        this.contextService = inject(TYPES.contextService);
+        this.methodContextService = inject(TYPES.methodContextService);
         this.sessionValidationService = inject(TYPES.sessionValidationService);
         this.historyConnectionService = inject(TYPES.historyConnectionService);
         this.storageConnectionService = inject(TYPES.storageConnectionService);
@@ -1564,11 +1613,11 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService execute", {
+                        this.loggerService.info("agentConnectionService execute", {
                             input: input,
                             mode: mode,
                         });
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).execute(input, mode)];
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).execute(input, mode)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1581,8 +1630,8 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService waitForOutput");
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).waitForOutput()];
+                        this.loggerService.info("agentConnectionService waitForOutput");
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).waitForOutput()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1597,11 +1646,11 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService commitToolOutput", {
+                        this.loggerService.info("agentConnectionService commitToolOutput", {
                             content: content,
                             toolId: toolId,
                         });
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitToolOutput(toolId, content)];
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).commitToolOutput(toolId, content)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1615,10 +1664,10 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService commitSystemMessage", {
+                        this.loggerService.info("agentConnectionService commitSystemMessage", {
                             message: message,
                         });
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitSystemMessage(message)];
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).commitSystemMessage(message)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1632,10 +1681,10 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService commitUserMessage", {
+                        this.loggerService.info("agentConnectionService commitUserMessage", {
                             message: message,
                         });
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitUserMessage(message)];
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).commitUserMessage(message)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1648,8 +1697,8 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService commitAgentChange");
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitAgentChange()];
+                        this.loggerService.info("agentConnectionService commitAgentChange");
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).commitAgentChange()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1662,8 +1711,8 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService commitFlush");
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitFlush()];
+                        this.loggerService.info("agentConnectionService commitFlush");
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).commitFlush()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1677,16 +1726,16 @@ var AgentConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("agentConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName);
+                        this.loggerService.info("agentConnectionService dispose");
+                        key = "".concat(this.methodContextService.context.clientId, "-").concat(this.methodContextService.context.agentName);
                         if (!this.getAgent.has(key)) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).dispose()];
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).dispose()];
                     case 1:
                         _a.sent();
                         this.getAgent.clear(key);
-                        this.sessionValidationService.removeAgentUsage(this.contextService.context.clientId, this.contextService.context.agentName);
+                        this.sessionValidationService.removeAgentUsage(this.methodContextService.context.clientId, this.methodContextService.context.agentName);
                         return [2 /*return*/];
                 }
             });
@@ -1967,7 +2016,7 @@ var HistoryConnectionService = /** @class */ (function () {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
         this.busService = inject(TYPES.busService);
-        this.contextService = inject(TYPES.contextService);
+        this.methodContextService = inject(TYPES.methodContextService);
         this.sessionValidationService = inject(TYPES.sessionValidationService);
         /**
          * Retrieves the history for a given client and agent.
@@ -1997,10 +2046,10 @@ var HistoryConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("historyConnectionService push", {
+                        this.loggerService.info("historyConnectionService push", {
                             message: message,
                         });
-                        return [4 /*yield*/, this.getHistory(this.contextService.context.clientId, this.contextService.context.agentName).push(message)];
+                        return [4 /*yield*/, this.getHistory(this.methodContextService.context.clientId, this.methodContextService.context.agentName).push(message)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2014,10 +2063,10 @@ var HistoryConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("historyConnectionService toArrayForAgent", {
+                        this.loggerService.info("historyConnectionService toArrayForAgent", {
                             prompt: prompt,
                         });
-                        return [4 /*yield*/, this.getHistory(this.contextService.context.clientId, this.contextService.context.agentName).toArrayForAgent(prompt)];
+                        return [4 /*yield*/, this.getHistory(this.methodContextService.context.clientId, this.methodContextService.context.agentName).toArrayForAgent(prompt)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2030,8 +2079,8 @@ var HistoryConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("historyConnectionService toArrayForRaw");
-                        return [4 /*yield*/, this.getHistory(this.contextService.context.clientId, this.contextService.context.agentName).toArrayForRaw()];
+                        this.loggerService.info("historyConnectionService toArrayForRaw");
+                        return [4 /*yield*/, this.getHistory(this.methodContextService.context.clientId, this.methodContextService.context.agentName).toArrayForRaw()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2045,16 +2094,16 @@ var HistoryConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("historyConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName);
+                        this.loggerService.info("historyConnectionService dispose");
+                        key = "".concat(this.methodContextService.context.clientId, "-").concat(this.methodContextService.context.agentName);
                         if (!this.getHistory.has(key)) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, this.getHistory(this.contextService.context.clientId, this.contextService.context.agentName).dispose()];
+                        return [4 /*yield*/, this.getHistory(this.methodContextService.context.clientId, this.methodContextService.context.agentName).dispose()];
                     case 1:
                         _a.sent();
                         this.getHistory.clear(key);
-                        this.sessionValidationService.removeHistoryUsage(this.contextService.context.clientId, this.contextService.context.agentName);
+                        this.sessionValidationService.removeHistoryUsage(this.methodContextService.context.clientId, this.methodContextService.context.agentName);
                         return [2 /*return*/];
                 }
             });
@@ -2077,7 +2126,7 @@ var ToolSchemaService = /** @class */ (function () {
          * @param {IAgentTool} value - The tool to register.
          */
         this.register = function (key, value) {
-            _this.loggerService.log('toolSchemaService register');
+            _this.loggerService.info('toolSchemaService register');
             _this.registry = _this.registry.register(key, value);
         };
         /**
@@ -2086,7 +2135,7 @@ var ToolSchemaService = /** @class */ (function () {
          * @returns {IAgentTool} The tool associated with the given key.
          */
         this.get = function (key) {
-            _this.loggerService.log('toolSchemaService get', { key: key });
+            _this.loggerService.info('toolSchemaService get', { key: key });
             return _this.registry.get(key);
         };
     }
@@ -2375,7 +2424,7 @@ var SwarmConnectionService = /** @class */ (function () {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
         this.busService = inject(TYPES.busService);
-        this.contextService = inject(TYPES.contextService);
+        this.methodContextService = inject(TYPES.methodContextService);
         this.agentConnectionService = inject(TYPES.agentConnectionService);
         this.swarmSchemaService = inject(TYPES.swarmSchemaService);
         /**
@@ -2438,8 +2487,8 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService cancelOutput");
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).cancelOutput()];
+                        this.loggerService.info("swarmConnectionService cancelOutput");
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).cancelOutput()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2452,8 +2501,8 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService waitForOutput");
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).waitForOutput()];
+                        this.loggerService.info("swarmConnectionService waitForOutput");
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).waitForOutput()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2466,8 +2515,8 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService getAgentName");
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).getAgentName()];
+                        this.loggerService.info("swarmConnectionService getAgentName");
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).getAgentName()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2480,8 +2529,8 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService getAgent");
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).getAgent()];
+                        this.loggerService.info("swarmConnectionService getAgent");
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).getAgent()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2496,10 +2545,10 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService setAgentRef", {
+                        this.loggerService.info("swarmConnectionService setAgentRef", {
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).setAgentRef(agentName, agent)];
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).setAgentRef(agentName, agent)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2513,10 +2562,10 @@ var SwarmConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("swarmConnectionService setAgentName", {
+                        this.loggerService.info("swarmConnectionService setAgentName", {
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).setAgentName(agentName)];
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).setAgentName(agentName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2528,8 +2577,8 @@ 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");
-                key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.swarmName);
+                this.loggerService.info("swarmConnectionService dispose");
+                key = "".concat(this.methodContextService.context.clientId, "-").concat(this.methodContextService.context.swarmName);
                 if (!this.getSwarm.has(key)) {
                     return [2 /*return*/];
                 }
@@ -2555,7 +2604,7 @@ var SwarmSchemaService = /** @class */ (function () {
          * @param {ISwarmSchema} value - The schema of the swarm.
          */
         this.register = function (key, value) {
-            _this.loggerService.log("swarmSchemaService register", { key: key });
+            _this.loggerService.info("swarmSchemaService register", { key: key });
             _this.registry = _this.registry.register(key, value);
         };
         /**
@@ -2564,7 +2613,7 @@ var SwarmSchemaService = /** @class */ (function () {
          * @returns {ISwarmSchema} The schema of the swarm.
          */
         this.get = function (key) {
-            _this.loggerService.log("swarmSchemaService get", { key: key });
+            _this.loggerService.info("swarmSchemaService get", { key: key });
             return _this.registry.get(key);
         };
     }
@@ -2585,7 +2634,7 @@ var CompletionSchemaService = /** @class */ (function () {
          * @param {ICompletionSchema} value - The schema to register.
          */
         this.register = function (key, value) {
-            _this.loggerService.log("completionSchemaService register", { key: key });
+            _this.loggerService.info("completionSchemaService register", { key: key });
             _this.registry = _this.registry.register(key, value);
         };
         /**
@@ -2594,7 +2643,7 @@ var CompletionSchemaService = /** @class */ (function () {
          * @returns {ICompletionSchema} The retrieved schema.
          */
         this.get = function (key) {
-            _this.loggerService.log("completionSchemaService get", { key: key });
+            _this.loggerService.info("completionSchemaService get", { key: key });
             return _this.registry.get(key);
         };
     }
@@ -2934,7 +2983,7 @@ var SessionConnectionService = /** @class */ (function () {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
         this.busService = inject(TYPES.busService);
-        this.contextService = inject(TYPES.contextService);
+        this.methodContextService = inject(TYPES.methodContextService);
         this.swarmConnectionService = inject(TYPES.swarmConnectionService);
         this.swarmSchemaService = inject(TYPES.swarmSchemaService);
         /**
@@ -2959,10 +3008,10 @@ var SessionConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("sessionConnectionService emit", {
+                        this.loggerService.info("sessionConnectionService emit", {
                             content: content,
                         });
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).emit(content)];
+                        return [4 /*yield*/, this.getSession(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).emit(content)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2976,11 +3025,11 @@ var SessionConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("sessionConnectionService execute", {
+                        this.loggerService.info("sessionConnectionService execute", {
                             content: content,
                             mode: mode,
                         });
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).execute(content, mode)];
+                        return [4 /*yield*/, this.getSession(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).execute(content, mode)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2991,7 +3040,7 @@ var SessionConnectionService = /** @class */ (function () {
          * @returns {ReceiveMessageFn} The function to receive messages.
          */
         this.connect = function (connector, clientId, swarmName) {
-            _this.loggerService.log("sessionConnectionService connect");
+            _this.loggerService.info("sessionConnectionService connect");
             return _this.getSession(clientId, swarmName).connect(connector);
         };
         /**
@@ -3004,11 +3053,11 @@ var SessionConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("sessionConnectionService commitToolOutput", {
+                        this.loggerService.info("sessionConnectionService commitToolOutput", {
                             content: content,
                             toolId: toolId,
                         });
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitToolOutput(toolId, content)];
+                        return [4 /*yield*/, this.getSession(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).commitToolOutput(toolId, content)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -3022,10 +3071,10 @@ var SessionConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("sessionConnectionService commitSystemMessage", {
+                        this.loggerService.info("sessionConnectionService commitSystemMessage", {
                             message: message,
                         });
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitSystemMessage(message)];
+                        return [4 /*yield*/, this.getSession(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).commitSystemMessage(message)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -3039,10 +3088,10 @@ var SessionConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("sessionConnectionService commitUserMessage", {
+                        this.loggerService.info("sessionConnectionService commitUserMessage", {
                             message: message,
                         });
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitUserMessage(message)];
+                        return [4 /*yield*/, this.getSession(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).commitUserMessage(message)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -3056,8 +3105,8 @@ var SessionConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("sessionConnectionService commitFlush");
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitFlush()];
+                        this.loggerService.info("sessionConnectionService commitFlush");
+                        return [4 /*yield*/, this.getSession(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).commitFlush()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -3071,12 +3120,12 @@ var SessionConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("sessionConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.swarmName);
+                        this.loggerService.info("sessionConnectionService dispose");
+                        key = "".concat(this.methodContextService.context.clientId, "-").concat(this.methodContextService.context.swarmName);
                         if (!this.getSession.has(key)) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).dispose()];
+                        return [4 /*yield*/, this.getSession(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).dispose()];
                     case 1:
                         _a.sent();
                         this.getSession.clear(key);
@@ -3102,17 +3151,17 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The agent reference.
          */
-        this.createAgentRef = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.createAgentRef = function (methodName, 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,
+                        this.loggerService.info("agentPublicService createAgentRef", {
+                            methodName: methodName,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.agentConnectionService.getAgent(clientId, agentName)];
@@ -3120,7 +3169,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3138,19 +3187,19 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The execution result.
          */
-        this.execute = function (input, mode, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (input, mode, methodName, 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,
+                        this.loggerService.info("agentPublicService execute", {
+                            methodName: methodName,
                             input: input,
                             clientId: clientId,
                             agentName: agentName,
                             mode: mode,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.agentConnectionService.execute(input, mode)];
@@ -3158,7 +3207,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3175,17 +3224,17 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The output result.
          */
-        this.waitForOutput = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.waitForOutput = function (methodName, 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,
+                        this.loggerService.info("agentPublicService waitForOutput", {
+                            methodName: methodName,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.agentConnectionService.waitForOutput()];
@@ -3193,7 +3242,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3212,19 +3261,19 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitToolOutput = function (toolId, content, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content, methodName, 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,
+                        this.loggerService.info("agentPublicService commitToolOutput", {
+                            methodName: methodName,
                             content: content,
                             clientId: clientId,
                             toolId: toolId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.agentConnectionService.commitToolOutput(toolId, content)];
@@ -3232,7 +3281,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3250,18 +3299,18 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitSystemMessage = function (message, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitSystemMessage = function (message, methodName, 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,
+                        this.loggerService.info("agentPublicService commitSystemMessage", {
+                            methodName: methodName,
                             message: message,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.agentConnectionService.commitSystemMessage(message)];
@@ -3269,7 +3318,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3287,18 +3336,18 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitUserMessage = function (message, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitUserMessage = function (message, methodName, 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,
+                        this.loggerService.info("agentPublicService commitUserMessage", {
+                            methodName: methodName,
                             message: message,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.agentConnectionService.commitUserMessage(message)];
@@ -3306,7 +3355,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3323,17 +3372,17 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitFlush = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitFlush = function (methodName, 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,
+                        this.loggerService.info("agentPublicService commitFlush", {
+                            methodName: methodName,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.agentConnectionService.commitFlush()];
@@ -3341,7 +3390,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3358,17 +3407,17 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The commit result.
          */
-        this.commitAgentChange = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitAgentChange = function (methodName, 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,
+                        this.loggerService.info("agentPublicService commitAgentChange", {
+                            methodName: methodName,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.agentConnectionService.commitAgentChange()];
@@ -3376,7 +3425,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3393,17 +3442,17 @@ var AgentPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          * @returns {Promise<unknown>} The dispose result.
          */
-        this.dispose = function (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (methodName, 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,
+                        this.loggerService.info("agentPublicService dispose", {
+                            methodName: methodName,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.agentConnectionService.dispose()];
@@ -3411,7 +3460,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3441,18 +3490,18 @@ 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, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.push = function (message, methodName, 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,
+                        this.loggerService.info("historyPublicService push", {
+                            methodName: methodName,
                             message: message,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.historyConnectionService.push(message)];
@@ -3460,7 +3509,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3478,17 +3527,17 @@ 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, requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.toArrayForAgent = function (prompt, methodName, 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 toArrayForAgent", {
+                        this.loggerService.info("historyPublicService toArrayForAgent", {
                             prompt: prompt,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.historyConnectionService.toArrayForAgent(prompt)];
@@ -3496,7 +3545,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3513,17 +3562,17 @@ 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 (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.toArrayForRaw = function (methodName, 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,
+                        this.loggerService.info("historyPublicService toArrayForRaw", {
+                            methodName: methodName,
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.historyConnectionService.toArrayForRaw()];
@@ -3531,7 +3580,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3548,16 +3597,16 @@ 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 (requestId, clientId, agentName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (methodName, 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 dispose", {
+                        this.loggerService.info("historyPublicService dispose", {
                             clientId: clientId,
                             agentName: agentName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.historyConnectionService.dispose()];
@@ -3565,7 +3614,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3595,18 +3644,18 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.emit = function (content, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.emit = function (content, methodName, 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 emit", {
+                        this.loggerService.info("sessionPublicService emit", {
                             content: content,
                             clientId: clientId,
-                            requestId: requestId,
+                            methodName: methodName,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.sessionConnectionService.emit(content)];
@@ -3614,7 +3663,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3632,18 +3681,18 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.execute = function (content, mode, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.execute = function (content, mode, methodName, 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 execute", {
+                        this.loggerService.info("sessionPublicService execute", {
                             content: content,
                             mode: mode,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.sessionConnectionService.execute(content, mode)];
@@ -3651,7 +3700,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3669,13 +3718,38 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {ReceiveMessageFn}
          */
-        this.connect = function (connector, requestId, clientId, swarmName) {
-            _this.loggerService.log("sessionPublicService connect", {
-                requestId: requestId,
+        this.connect = function (connector, methodName, clientId, swarmName) {
+            _this.loggerService.info("sessionPublicService connect", {
+                methodName: methodName,
                 clientId: clientId,
                 swarmName: swarmName,
             });
-            return _this.sessionConnectionService.connect(connector, clientId, swarmName);
+            var send = _this.sessionConnectionService.connect(connector, clientId, swarmName);
+            return function (incoming) { return __awaiter(_this, void 0, void 0, function () {
+                var executionId;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    executionId = functoolsKit.randomString();
+                    return [2 /*return*/, ExecutionContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        this.loggerService.log("sessionPublicService connect execute", {
+                                            content: incoming,
+                                            methodName: methodName,
+                                            clientId: clientId,
+                                            executionId: executionId,
+                                        });
+                                        return [4 /*yield*/, send(incoming)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); }, {
+                            clientId: clientId,
+                            executionId: executionId,
+                        })];
+                });
+            }); };
         };
         /**
          * Commits tool output to the session.
@@ -3685,19 +3759,19 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitToolOutput = function (toolId, content, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitToolOutput = function (toolId, content, methodName, 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,
+                        this.loggerService.info("sessionPublicService commitToolOutput", {
+                            methodName: methodName,
                             toolId: toolId,
                             content: content,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.sessionConnectionService.commitToolOutput(toolId, content)];
@@ -3705,7 +3779,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3723,18 +3797,18 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitSystemMessage = function (message, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitSystemMessage = function (message, methodName, 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,
+                        this.loggerService.info("sessionPublicService commitSystemMessage", {
+                            methodName: methodName,
                             message: message,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.sessionConnectionService.commitSystemMessage(message)];
@@ -3742,7 +3816,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3760,18 +3834,18 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitUserMessage = function (message, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitUserMessage = function (message, methodName, 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,
+                        this.loggerService.info("sessionPublicService commitUserMessage", {
+                            methodName: methodName,
                             message: message,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.sessionConnectionService.commitUserMessage(message)];
@@ -3779,7 +3853,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3796,16 +3870,16 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.commitFlush = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.commitFlush = function (methodName, 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 commitFlush", {
+                        this.loggerService.info("sessionPublicService commitFlush", {
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.sessionConnectionService.commitFlush()];
@@ -3813,7 +3887,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3830,17 +3904,17 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.dispose = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (methodName, 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,
+                        this.loggerService.info("sessionPublicService dispose", {
+                            methodName: methodName,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.sessionConnectionService.dispose()];
@@ -3848,7 +3922,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3877,16 +3951,16 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.cancelOutput = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.cancelOutput = function (methodName, 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 cancelOutput", {
+                        this.loggerService.info("swarmPublicService cancelOutput", {
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.swarmConnectionService.cancelOutput()];
@@ -3894,7 +3968,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3911,17 +3985,17 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.waitForOutput = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.waitForOutput = function (methodName, 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", {
+                        this.loggerService.info("swarmPublicService waitForOutput", {
                             clientId: clientId,
-                            requestId: requestId,
+                            methodName: methodName,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.swarmConnectionService.waitForOutput()];
@@ -3929,7 +4003,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3946,17 +4020,17 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<string>}
          */
-        this.getAgentName = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.getAgentName = function (methodName, 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 getAgentName", {
+                        this.loggerService.info("swarmPublicService getAgentName", {
                             clientId: clientId,
                             swarmName: swarmName,
-                            requestId: requestId,
+                            methodName: methodName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.swarmConnectionService.getAgentName()];
@@ -3964,7 +4038,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3981,16 +4055,16 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<IAgent>}
          */
-        this.getAgent = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.getAgent = function (methodName, 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 getAgent", {
+                        this.loggerService.info("swarmPublicService getAgent", {
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.swarmConnectionService.getAgent()];
@@ -3998,7 +4072,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4017,19 +4091,19 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {IAgent} agent - The agent instance.
          * @returns {Promise<void>}
          */
-        this.setAgentRef = function (requestId, clientId, swarmName, agentName, agent) { return __awaiter(_this, void 0, void 0, function () {
+        this.setAgentRef = function (methodName, 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,
+                        this.loggerService.info("swarmPublicService setAgentRef", {
+                            methodName: methodName,
                             agentName: agentName,
                             agent: agent,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.swarmConnectionService.setAgentRef(agentName, agent)];
@@ -4037,7 +4111,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4055,18 +4129,18 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.setAgentName = function (agentName, requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.setAgentName = function (agentName, methodName, 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,
+                        this.loggerService.info("swarmPublicService setAgentName", {
+                            methodName: methodName,
                             agentName: agentName,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.swarmConnectionService.setAgentName(agentName)];
@@ -4074,7 +4148,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4091,17 +4165,17 @@ var SwarmPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {Promise<void>}
          */
-        this.dispose = function (requestId, clientId, swarmName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (methodName, 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,
+                        this.loggerService.info("swarmPublicService dispose", {
+                            methodName: methodName,
                             clientId: clientId,
                             swarmName: swarmName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.swarmConnectionService.dispose()];
@@ -4109,7 +4183,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4166,7 +4240,7 @@ var AgentValidationService = /** @class */ (function () {
          * @throws {Error} If the agent already exists.
          */
         this.addAgent = function (agentName, agentSchema) {
-            _this.loggerService.log("agentValidationService addAgent", {
+            _this.loggerService.info("agentValidationService addAgent", {
                 agentName: agentName,
                 agentSchema: agentSchema,
             });
@@ -4182,7 +4256,7 @@ var AgentValidationService = /** @class */ (function () {
             var _b = __read(_a, 2), agentName = _b[0], storageName = _b[1];
             return "".concat(agentName, "-").concat(storageName);
         }, function (agentName, storageName) {
-            _this.loggerService.log("agentValidationService hasStorage", {
+            _this.loggerService.info("agentValidationService hasStorage", {
                 agentName: agentName,
                 storageName: storageName,
             });
@@ -4199,7 +4273,7 @@ var AgentValidationService = /** @class */ (function () {
             var _b = __read(_a, 2), agentName = _b[0], stateName = _b[1];
             return "".concat(agentName, "-").concat(stateName);
         }, function (agentName, stateName) {
-            _this.loggerService.log("agentValidationService hasState", {
+            _this.loggerService.info("agentValidationService hasState", {
                 agentName: agentName,
                 stateName: stateName,
             });
@@ -4220,7 +4294,7 @@ var AgentValidationService = /** @class */ (function () {
             return agentName;
         }, function (agentName, source) {
             var _a, _b;
-            _this.loggerService.log("agentValidationService validate", {
+            _this.loggerService.info("agentValidationService validate", {
                 agentName: agentName,
                 source: source,
             });
@@ -4261,7 +4335,7 @@ var CompletionValidationService = /** @class */ (function () {
          * @throws Will throw an error if the completion name already exists.
          */
         this.addCompletion = function (completionName) {
-            _this.loggerService.log("completionValidationService addCompletion", {
+            _this.loggerService.info("completionValidationService addCompletion", {
                 completionName: completionName,
             });
             if (_this._completionSet.has(completionName)) {
@@ -4279,7 +4353,7 @@ var CompletionValidationService = /** @class */ (function () {
             var _b = __read(_a, 1), completionName = _b[0];
             return completionName;
         }, function (completionName, source) {
-            _this.loggerService.log("completionValidationService validate", {
+            _this.loggerService.info("completionValidationService validate", {
                 completionName: completionName,
                 source: source,
             });
@@ -4313,7 +4387,7 @@ var SessionValidationService = /** @class */ (function () {
          * @throws Will throw an error if the session already exists.
          */
         this.addSession = function (clientId, swarmName, sessionMode) {
-            _this.loggerService.log("sessionValidationService addSession", {
+            _this.loggerService.info("sessionValidationService addSession", {
                 clientId: clientId,
             });
             if (_this._sessionSwarmMap.has(clientId)) {
@@ -4328,7 +4402,7 @@ var SessionValidationService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          */
         this.addAgentUsage = function (sessionId, agentName) {
-            _this.loggerService.log("sessionValidationService addAgentUsage", {
+            _this.loggerService.info("sessionValidationService addAgentUsage", {
                 sessionId: sessionId,
                 agentName: agentName,
             });
@@ -4348,7 +4422,7 @@ var SessionValidationService = /** @class */ (function () {
          * @param {AgentName} agentName - The name of the agent.
          */
         this.addHistoryUsage = function (sessionId, agentName) {
-            _this.loggerService.log("sessionValidationService addHistoryUsage", {
+            _this.loggerService.info("sessionValidationService addHistoryUsage", {
                 sessionId: sessionId,
                 agentName: agentName,
             });
@@ -4368,7 +4442,7 @@ var SessionValidationService = /** @class */ (function () {
          * @param {StorageName} storageName - The name of the storage.
          */
         this.addStorageUsage = function (sessionId, storageName) {
-            _this.loggerService.log("sessionValidationService addStorageUsage", {
+            _this.loggerService.info("sessionValidationService addStorageUsage", {
                 sessionId: sessionId,
                 storageName: storageName,
             });
@@ -4388,7 +4462,7 @@ var SessionValidationService = /** @class */ (function () {
          * @param {StateName} stateName - The name of the state.
          */
         this.addStateUsage = function (sessionId, stateName) {
-            _this.loggerService.log("sessionValidationService addStateUsage", {
+            _this.loggerService.info("sessionValidationService addStateUsage", {
                 sessionId: sessionId,
                 stateName: stateName,
             });
@@ -4409,7 +4483,7 @@ var SessionValidationService = /** @class */ (function () {
          * @throws Will throw an error if no agents are found for the session.
          */
         this.removeAgentUsage = function (sessionId, agentName) {
-            _this.loggerService.log("sessionValidationService removeAgentUsage", {
+            _this.loggerService.info("sessionValidationService removeAgentUsage", {
                 sessionId: sessionId,
                 agentName: agentName,
             });
@@ -4434,7 +4508,7 @@ var SessionValidationService = /** @class */ (function () {
          * @throws Will throw an error if no agents are found for the session.
          */
         this.removeHistoryUsage = function (sessionId, agentName) {
-            _this.loggerService.log("sessionValidationService removeHistoryUsage", {
+            _this.loggerService.info("sessionValidationService removeHistoryUsage", {
                 sessionId: sessionId,
                 agentName: agentName,
             });
@@ -4459,7 +4533,7 @@ var SessionValidationService = /** @class */ (function () {
          * @throws Will throw an error if no storages are found for the session.
          */
         this.removeStorageUsage = function (sessionId, storageName) {
-            _this.loggerService.log("sessionValidationService removeStorageUsage", {
+            _this.loggerService.info("sessionValidationService removeStorageUsage", {
                 sessionId: sessionId,
                 storageName: storageName,
             });
@@ -4484,7 +4558,7 @@ var SessionValidationService = /** @class */ (function () {
          * @throws Will throw an error if no states are found for the session.
          */
         this.removeStateUsage = function (sessionId, stateName) {
-            _this.loggerService.log("sessionValidationService removeStateUsage", {
+            _this.loggerService.info("sessionValidationService removeStateUsage", {
                 sessionId: sessionId,
                 stateName: stateName,
             });
@@ -4509,7 +4583,7 @@ var SessionValidationService = /** @class */ (function () {
          * @throws Will throw an error if the session does not exist.
          */
         this.getSessionMode = function (clientId) {
-            _this.loggerService.log("sessionValidationService getSessionMode", {
+            _this.loggerService.info("sessionValidationService getSessionMode", {
                 clientId: clientId,
             });
             if (!_this._sessionModeMap.has(clientId)) {
@@ -4522,7 +4596,7 @@ var SessionValidationService = /** @class */ (function () {
          * @returns {boolean}
          */
         this.hasSession = function (clientId) {
-            _this.loggerService.log("sessionValidationService hasSession");
+            _this.loggerService.info("sessionValidationService hasSession");
             return _this._sessionSwarmMap.has(clientId);
         };
         /**
@@ -4530,7 +4604,7 @@ var SessionValidationService = /** @class */ (function () {
          * @returns {SessionId[]} The list of session IDs.
          */
         this.getSessionList = function () {
-            _this.loggerService.log("sessionValidationService getSessionList");
+            _this.loggerService.info("sessionValidationService getSessionList");
             return __spreadArray([], __read(_this._sessionSwarmMap.keys()), false);
         };
         /**
@@ -4540,7 +4614,7 @@ var SessionValidationService = /** @class */ (function () {
          */
         this.getSessionAgentList = function (clientId) {
             var _a;
-            _this.loggerService.log("sessionValidationService getSessionAgentList", {
+            _this.loggerService.info("sessionValidationService getSessionAgentList", {
                 clientId: clientId,
             });
             return (_a = _this._agentSwarmMap.get(clientId)) !== null && _a !== void 0 ? _a : [];
@@ -4552,7 +4626,7 @@ var SessionValidationService = /** @class */ (function () {
          */
         this.getSessionHistoryList = function (clientId) {
             var _a;
-            _this.loggerService.log("sessionValidationService getSessionHistoryList", {
+            _this.loggerService.info("sessionValidationService getSessionHistoryList", {
                 clientId: clientId,
             });
             return (_a = _this._agentSwarmMap.get(clientId)) !== null && _a !== void 0 ? _a : [];
@@ -4564,7 +4638,7 @@ var SessionValidationService = /** @class */ (function () {
          * @throws Will throw an error if the session does not exist.
          */
         this.getSwarm = function (clientId) {
-            _this.loggerService.log("sessionValidationService getSwarm", {
+            _this.loggerService.info("sessionValidationService getSwarm", {
                 clientId: clientId,
             });
             var session = _this._sessionSwarmMap.get(clientId);
@@ -4580,7 +4654,7 @@ var SessionValidationService = /** @class */ (function () {
          * @throws Will throw an error if the session does not exist.
          */
         this.validate = function (clientId, source) {
-            _this.loggerService.log("sessionValidationService validate", { clientId: clientId });
+            _this.loggerService.info("sessionValidationService validate", { clientId: clientId });
             if (!_this._sessionSwarmMap.has(clientId)) {
                 throw new Error("agent-swarm session clientId=".concat(clientId, " not exist source=").concat(source));
             }
@@ -4591,7 +4665,7 @@ var SessionValidationService = /** @class */ (function () {
          * @param {SessionId} clientId - The ID of the client.
          */
         this.removeSession = function (clientId) {
-            _this.loggerService.log("sessionValidationService addSession", {
+            _this.loggerService.info("sessionValidationService addSession", {
                 clientId: clientId,
             });
             _this._sessionSwarmMap.delete(clientId);
@@ -4617,7 +4691,7 @@ var SwarmValidationService = /** @class */ (function () {
          * @throws Will throw an error if the swarm already exists.
          */
         this.addSwarm = function (swarmName, swarmSchema) {
-            _this.loggerService.log("swarmValidationService addSwarm", {
+            _this.loggerService.info("swarmValidationService addSwarm", {
                 swarmName: swarmName,
                 swarmSchema: swarmSchema,
             });
@@ -4633,7 +4707,7 @@ var SwarmValidationService = /** @class */ (function () {
          * @throws Will throw an error if the swarm is not found.
          */
         this.getAgentList = function (swarmName) {
-            _this.loggerService.log("swarmValidationService getAgentList", {
+            _this.loggerService.info("swarmValidationService getAgentList", {
                 swarmName: swarmName,
             });
             var swarm = _this._swarmMap.get(swarmName);
@@ -4652,7 +4726,7 @@ var SwarmValidationService = /** @class */ (function () {
             var _b = __read(_a, 1), swarmName = _b[0];
             return swarmName;
         }, function (swarmName, source) {
-            _this.loggerService.log("swarmValidationService validate", {
+            _this.loggerService.info("swarmValidationService validate", {
                 swarmName: swarmName,
                 source: source,
             });
@@ -4687,7 +4761,7 @@ var ToolValidationService = /** @class */ (function () {
          * @throws Will throw an error if the tool already exists.
          */
         this.addTool = function (toolName, toolSchema) {
-            _this.loggerService.log("toolValidationService addTool", {
+            _this.loggerService.info("toolValidationService addTool", {
                 toolName: toolName,
                 toolSchema: toolSchema,
             });
@@ -4706,7 +4780,7 @@ var ToolValidationService = /** @class */ (function () {
             var _b = __read(_a, 1), toolName = _b[0];
             return toolName;
         }, function (toolName, source) {
-            _this.loggerService.log("toolValidationService validate", {
+            _this.loggerService.info("toolValidationService validate", {
                 toolName: toolName,
                 source: source,
             });
@@ -4733,7 +4807,7 @@ var EmbeddingSchemaService = /** @class */ (function () {
          * @param {IAgentTool} value - The embedding to register.
          */
         this.register = function (key, value) {
-            _this.loggerService.log('embeddingSchemaService register');
+            _this.loggerService.info('embeddingSchemaService register');
             _this.registry = _this.registry.register(key, value);
         };
         /**
@@ -4742,7 +4816,7 @@ var EmbeddingSchemaService = /** @class */ (function () {
          * @returns {IAgentTool} The embedding associated with the given key.
          */
         this.get = function (key) {
-            _this.loggerService.log('embeddingSchemaService get', { key: key });
+            _this.loggerService.info('embeddingSchemaService get', { key: key });
             return _this.registry.get(key);
         };
     }
@@ -4763,7 +4837,7 @@ var StorageSchemaService = /** @class */ (function () {
          * @param {IStorageSchema} value - The schema to register.
          */
         this.register = function (key, value) {
-            _this.loggerService.log("storageSchemaService register", { key: key });
+            _this.loggerService.info("storageSchemaService register", { key: key });
             _this.registry = _this.registry.register(key, value);
         };
         /**
@@ -4772,7 +4846,7 @@ var StorageSchemaService = /** @class */ (function () {
          * @returns {IStorageSchema} The retrieved schema.
          */
         this.get = function (key) {
-            _this.loggerService.log("storageSchemaService get", { key: key });
+            _this.loggerService.info("storageSchemaService get", { key: key });
             return _this.registry.get(key);
         };
     }
@@ -5151,7 +5225,7 @@ var StorageConnectionService = /** @class */ (function () {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
         this.busService = inject(TYPES.busService);
-        this.contextService = inject(TYPES.contextService);
+        this.methodContextService = inject(TYPES.methodContextService);
         this.storageSchemaService = inject(TYPES.storageSchemaService);
         this.sessionValidationService = inject(TYPES.sessionValidationService);
         this.embeddingSchemaService = inject(TYPES.embeddingSchemaService);
@@ -5201,12 +5275,12 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService take", {
+                        this.loggerService.info("storageConnectionService take", {
                             search: search,
                             total: total,
                             score: score,
                         });
-                        storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
+                        storage = this.getStorage(this.methodContextService.context.clientId, this.methodContextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
                         _a.sent();
@@ -5225,10 +5299,10 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService upsert", {
+                        this.loggerService.info("storageConnectionService upsert", {
                             item: item,
                         });
-                        storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
+                        storage = this.getStorage(this.methodContextService.context.clientId, this.methodContextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
                         _a.sent();
@@ -5247,10 +5321,10 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService remove", {
+                        this.loggerService.info("storageConnectionService remove", {
                             itemId: itemId,
                         });
-                        storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
+                        storage = this.getStorage(this.methodContextService.context.clientId, this.methodContextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
                         _a.sent();
@@ -5269,10 +5343,10 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService get", {
+                        this.loggerService.info("storageConnectionService get", {
                             itemId: itemId,
                         });
-                        storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
+                        storage = this.getStorage(this.methodContextService.context.clientId, this.methodContextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
                         _a.sent();
@@ -5291,8 +5365,8 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService list");
-                        storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
+                        this.loggerService.info("storageConnectionService list");
+                        storage = this.getStorage(this.methodContextService.context.clientId, this.methodContextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
                         _a.sent();
@@ -5310,8 +5384,8 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService clear");
-                        storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
+                        this.loggerService.info("storageConnectionService clear");
+                        storage = this.getStorage(this.methodContextService.context.clientId, this.methodContextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
                         _a.sent();
@@ -5329,13 +5403,13 @@ var StorageConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("storageConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.storageName);
+                        this.loggerService.info("storageConnectionService dispose");
+                        key = "".concat(this.methodContextService.context.clientId, "-").concat(this.methodContextService.context.storageName);
                         if (!this.getStorage.has(key)) {
                             return [2 /*return*/];
                         }
-                        if (!!this.getSharedStorage.has(this.contextService.context.storageName)) return [3 /*break*/, 3];
-                        storage = this.getSharedStorage(this.contextService.context.clientId, this.contextService.context.storageName);
+                        if (!!this.getSharedStorage.has(this.methodContextService.context.storageName)) return [3 /*break*/, 3];
+                        storage = this.getSharedStorage(this.methodContextService.context.clientId, this.methodContextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
                         _a.sent();
@@ -5345,7 +5419,7 @@ var StorageConnectionService = /** @class */ (function () {
                         _a.label = 3;
                     case 3:
                         this.getStorage.clear(key);
-                        this.sessionValidationService.removeStorageUsage(this.contextService.context.clientId, this.contextService.context.storageName);
+                        this.sessionValidationService.removeStorageUsage(this.methodContextService.context.clientId, this.methodContextService.context.storageName);
                         return [2 /*return*/];
                 }
             });
@@ -5368,20 +5442,20 @@ 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, requestId, clientId, storageName, score) { return __awaiter(_this, void 0, void 0, function () {
+        this.take = function (search, total, methodName, 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,
+                        this.loggerService.info("storagePublicService take", {
+                            methodName: methodName,
                             search: search,
                             total: total,
                             clientId: clientId,
                             storageName: storageName,
                             score: score,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.storageConnectionService.take(search, total, score)];
@@ -5389,7 +5463,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5405,17 +5479,17 @@ var StoragePublicService = /** @class */ (function () {
          * @param {IStorageData} item - The item to upsert.
          * @returns {Promise<void>}
          */
-        this.upsert = function (item, requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.upsert = function (item, methodName, 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 upsert", {
+                        this.loggerService.info("storagePublicService upsert", {
                             item: item,
                             clientId: clientId,
                             storageName: storageName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.storageConnectionService.upsert(item)];
@@ -5423,7 +5497,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5439,17 +5513,17 @@ var StoragePublicService = /** @class */ (function () {
          * @param {IStorageData["id"]} itemId - The ID of the item to remove.
          * @returns {Promise<void>}
          */
-        this.remove = function (itemId, requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.remove = function (itemId, methodName, 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 remove", {
+                        this.loggerService.info("storagePublicService remove", {
                             itemId: itemId,
                             clientId: clientId,
                             storageName: storageName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.storageConnectionService.remove(itemId)];
@@ -5457,7 +5531,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5473,18 +5547,18 @@ 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, requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.get = function (itemId, methodName, 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,
+                        this.loggerService.info("storagePublicService get", {
+                            methodName: methodName,
                             itemId: itemId,
                             clientId: clientId,
                             storageName: storageName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.storageConnectionService.get(itemId)];
@@ -5492,7 +5566,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5508,17 +5582,17 @@ var StoragePublicService = /** @class */ (function () {
          * @param {function(IStorageData): boolean} [filter] - The optional filter function.
          * @returns {Promise<IStorageData[]>} The list of items.
          */
-        this.list = function (requestId, clientId, storageName, filter) { return __awaiter(_this, void 0, void 0, function () {
+        this.list = function (methodName, 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,
+                        this.loggerService.info("storagePublicService list", {
+                            methodName: methodName,
                             clientId: clientId,
                             storageName: storageName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.storageConnectionService.list(filter)];
@@ -5526,7 +5600,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5541,17 +5615,17 @@ var StoragePublicService = /** @class */ (function () {
          * Clears all items from the storage.
          * @returns {Promise<void>}
          */
-        this.clear = function (requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.clear = function (methodName, 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,
+                        this.loggerService.info("storagePublicService clear", {
+                            methodName: methodName,
                             clientId: clientId,
                             storageName: storageName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.storageConnectionService.clear()];
@@ -5559,7 +5633,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5576,16 +5650,16 @@ var StoragePublicService = /** @class */ (function () {
          * @param {StorageName} storageName - The storage name.
          * @returns {Promise<void>}
          */
-        this.dispose = function (requestId, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (methodName, 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 dispose", {
+                        this.loggerService.info("storagePublicService dispose", {
                             clientId: clientId,
                             storageName: storageName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.storageConnectionService.dispose()];
@@ -5593,7 +5667,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5624,7 +5698,7 @@ var StorageValidationService = /** @class */ (function () {
          * @throws {Error} If the storage already exists.
          */
         this.addStorage = function (storageName, storageSchema) {
-            _this.loggerService.log("storageValidationService addStorage", {
+            _this.loggerService.info("storageValidationService addStorage", {
                 storageName: storageName,
                 storageSchema: storageSchema,
             });
@@ -5643,7 +5717,7 @@ var StorageValidationService = /** @class */ (function () {
             var _b = __read(_a, 1), storageName = _b[0];
             return storageName;
         }, function (storageName, source) {
-            _this.loggerService.log("storageValidationService validate", {
+            _this.loggerService.info("storageValidationService validate", {
                 storageName: storageName,
                 source: source,
             });
@@ -5673,7 +5747,7 @@ var EmbeddingValidationService = /** @class */ (function () {
          * @throws Will throw an error if the embedding already exists.
          */
         this.addEmbedding = function (embeddingName, embeddingSchema) {
-            _this.loggerService.log("embeddingValidationService addEmbedding", {
+            _this.loggerService.info("embeddingValidationService addEmbedding", {
                 embeddingName: embeddingName,
                 embeddingSchema: embeddingSchema,
             });
@@ -5692,7 +5766,7 @@ var EmbeddingValidationService = /** @class */ (function () {
             var _b = __read(_a, 1), embeddingName = _b[0];
             return embeddingName;
         }, function (embeddingName, source) {
-            _this.loggerService.log("embeddingValidationService validate", {
+            _this.loggerService.info("embeddingValidationService validate", {
                 embeddingName: embeddingName,
                 source: source,
             });
@@ -5719,7 +5793,7 @@ var StateSchemaService = /** @class */ (function () {
          * @param {IStateSchema} value - The schema to register.
          */
         this.register = function (key, value) {
-            _this.loggerService.log("stateSchemaService register", { key: key });
+            _this.loggerService.info("stateSchemaService register", { key: key });
             _this.registry = _this.registry.register(key, value);
         };
         /**
@@ -5728,7 +5802,7 @@ var StateSchemaService = /** @class */ (function () {
          * @returns {IStateSchema} The retrieved schema.
          */
         this.get = function (key) {
-            _this.loggerService.log("stateSchemaService get", { key: key });
+            _this.loggerService.info("stateSchemaService get", { key: key });
             return _this.registry.get(key);
         };
     }
@@ -5931,7 +6005,7 @@ var StateConnectionService = /** @class */ (function () {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
         this.busService = inject(TYPES.busService);
-        this.contextService = inject(TYPES.contextService);
+        this.methodContextService = inject(TYPES.methodContextService);
         this.stateSchemaService = inject(TYPES.stateSchemaService);
         this.sessionValidationService = inject(TYPES.sessionValidationService);
         /**
@@ -6022,8 +6096,8 @@ var StateConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("stateConnectionService setState");
-                        state = this.getStateRef(this.contextService.context.clientId, this.contextService.context.stateName);
+                        this.loggerService.info("stateConnectionService setState");
+                        state = this.getStateRef(this.methodContextService.context.clientId, this.methodContextService.context.stateName);
                         return [4 /*yield*/, state.waitForInit()];
                     case 1:
                         _a.sent();
@@ -6041,8 +6115,8 @@ var StateConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("stateConnectionService getState");
-                        state = this.getStateRef(this.contextService.context.clientId, this.contextService.context.stateName);
+                        this.loggerService.info("stateConnectionService getState");
+                        state = this.getStateRef(this.methodContextService.context.clientId, this.methodContextService.context.stateName);
                         return [4 /*yield*/, state.waitForInit()];
                     case 1:
                         _a.sent();
@@ -6060,13 +6134,13 @@ var StateConnectionService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.loggerService.log("stateConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.stateName);
+                        this.loggerService.info("stateConnectionService dispose");
+                        key = "".concat(this.methodContextService.context.clientId, "-").concat(this.methodContextService.context.stateName);
                         if (!this.getStateRef.has(key)) {
                             return [2 /*return*/];
                         }
-                        if (!!this.getSharedStateRef.has(this.contextService.context.stateName)) return [3 /*break*/, 3];
-                        state = this.getStateRef(this.contextService.context.clientId, this.contextService.context.stateName);
+                        if (!!this.getSharedStateRef.has(this.methodContextService.context.stateName)) return [3 /*break*/, 3];
+                        state = this.getStateRef(this.methodContextService.context.clientId, this.methodContextService.context.stateName);
                         return [4 /*yield*/, state.waitForInit()];
                     case 1:
                         _a.sent();
@@ -6076,7 +6150,7 @@ var StateConnectionService = /** @class */ (function () {
                         _a.label = 3;
                     case 3:
                         this.getStateRef.clear(key);
-                        this.sessionValidationService.removeStateUsage(this.contextService.context.clientId, this.contextService.context.stateName);
+                        this.sessionValidationService.removeStateUsage(this.methodContextService.context.clientId, this.methodContextService.context.stateName);
                         return [2 /*return*/];
                 }
             });
@@ -6097,17 +6171,17 @@ var StatePublicService = /** @class */ (function () {
          * @param {StateName} stateName - The name of the state.
          * @returns {Promise<T>} - The updated state.
          */
-        this.setState = function (dispatchFn, requestId, clientId, stateName) { return __awaiter(_this, void 0, void 0, function () {
+        this.setState = function (dispatchFn, methodName, 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,
+                        this.loggerService.info("statePublicService setState", {
+                            methodName: methodName,
                             clientId: clientId,
                             stateName: stateName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.stateConnectionService.setState(dispatchFn)];
@@ -6115,7 +6189,7 @@ var StatePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 stateName: stateName,
                                 agentName: "",
@@ -6132,16 +6206,16 @@ var StatePublicService = /** @class */ (function () {
          * @param {StateName} stateName - The name of the state.
          * @returns {Promise<T>} - The current state.
          */
-        this.getState = function (requestId, clientId, stateName) { return __awaiter(_this, void 0, void 0, function () {
+        this.getState = function (methodName, 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 getState", {
+                        this.loggerService.info("statePublicService getState", {
                             clientId: clientId,
                             stateName: stateName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.stateConnectionService.getState()];
@@ -6149,7 +6223,7 @@ var StatePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 stateName: stateName,
                                 agentName: "",
@@ -6166,17 +6240,17 @@ 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 (requestId, clientId, stateName) { return __awaiter(_this, void 0, void 0, function () {
+        this.dispose = function (methodName, 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,
+                        this.loggerService.info("statePublicService dispose", {
+                            methodName: methodName,
                             clientId: clientId,
                             stateName: stateName,
                         });
-                        return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, MethodContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.stateConnectionService.dispose()];
@@ -6184,7 +6258,7 @@ var StatePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 stateName: stateName,
                                 agentName: "",
@@ -6217,7 +6291,7 @@ var BusService = /** @class */ (function () {
          * @param {(event: T) => void} fn - The callback function to handle the event.
          */
         this.subscribe = function (clientId, source, fn) {
-            _this.loggerService.log("busService subscribe", {
+            _this.loggerService.info("busService subscribe", {
                 clientId: clientId,
                 source: source,
             });
@@ -6236,7 +6310,7 @@ var BusService = /** @class */ (function () {
          * @returns {Subscription} The subscription object.
          */
         this.once = function (clientId, source, filterFn, fn) {
-            _this.loggerService.log("busService once", {
+            _this.loggerService.info("busService once", {
                 clientId: clientId,
                 source: source,
             });
@@ -6284,7 +6358,7 @@ var BusService = /** @class */ (function () {
          */
         this.dispose = function (clientId) {
             var e_1, _a;
-            _this.loggerService.log("busService dispose", {
+            _this.loggerService.info("busService dispose", {
                 clientId: clientId,
             });
             try {
@@ -6312,7 +6386,10 @@ var BusService = /** @class */ (function () {
 {
     provide(TYPES.busService, function () { return new BusService(); });
     provide(TYPES.loggerService, function () { return new LoggerService(); });
-    provide(TYPES.contextService, function () { return new ContextService(); });
+}
+{
+    provide(TYPES.methodContextService, function () { return new MethodContextService(); });
+    provide(TYPES.executionContextService, function () { return new ExecutionContextService(); });
 }
 {
     provide(TYPES.agentConnectionService, function () { return new AgentConnectionService(); });
@@ -6358,7 +6435,10 @@ var BusService = /** @class */ (function () {
 var baseServices = {
     busService: inject(TYPES.busService),
     loggerService: inject(TYPES.loggerService),
-    contextService: inject(TYPES.contextService),
+};
+var contextServices = {
+    methodContextService: inject(TYPES.methodContextService),
+    executionContextService: inject(TYPES.executionContextService),
 };
 var connectionServices = {
     agentConnectionService: inject(TYPES.agentConnectionService),
@@ -6394,7 +6474,7 @@ var validationServices = {
     storageValidationService: inject(TYPES.storageValidationService),
     embeddingValidationService: inject(TYPES.embeddingValidationService),
 };
-var swarm = __assign(__assign(__assign(__assign(__assign({}, baseServices), connectionServices), schemaServices), publicServices), validationServices);
+var swarm = __assign(__assign(__assign(__assign(__assign(__assign({}, baseServices), contextServices), connectionServices), schemaServices), publicServices), validationServices);
 init();
 
 /**
@@ -6522,22 +6602,21 @@ 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 requestId, swarmName, currentAgentName;
+    var methodName, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function commitSystemMessage';
                 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(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -6548,7 +6627,7 @@ var commitUserMessage = function (content, clientId, agentName) { return __await
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitUserMessage(content, requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitUserMessage(content, methodName, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -6564,19 +6643,18 @@ 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 requestId, swarmName;
+    var methodName, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function getAgentName";
                 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(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
             case 1: return [2 /*return*/, _a.sent()];
         }
     });
@@ -6592,15 +6670,14 @@ 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();
+    var methodName = "function makeConnection";
     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, requestId, clientId, swarmName);
+    var send = swarm.sessionPublicService.connect(connector, methodName, clientId, swarmName);
     return functoolsKit.queued(function (outgoing) { return __awaiter(void 0, void 0, void 0, function () {
         var _a;
         var _b;
@@ -6612,7 +6689,7 @@ var makeConnection = function (connector, clientId, swarmName) {
                     _b = {
                         data: outgoing
                     };
-                    return [4 /*yield*/, swarm.swarmPublicService.getAgentName(requestId, clientId, swarmName)];
+                    return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
                 case 1: return [4 /*yield*/, _a.apply(void 0, [(_b.agentName = _c.sent(),
                             _b.clientId = clientId,
                             _b)])];
@@ -6715,7 +6792,7 @@ var CHANGE_AGENT_GC = 60 * 1000;
  * @returns {TChangeAgentRun} - The change agent function.
  */
 var createChangeAgent = functoolsKit.ttl(function (clientId) {
-    return functoolsKit.queued(function (requestId, agentName) { return __awaiter(void 0, void 0, void 0, function () {
+    return functoolsKit.queued(function (methodName, agentName) { return __awaiter(void 0, void 0, void 0, function () {
         var swarmName, _a, _b, _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
@@ -6728,7 +6805,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(requestId, clientId, agentName)];
+                                    case 0: return [4 /*yield*/, swarm.agentPublicService.commitAgentChange(methodName, clientId, agentName)];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -6737,22 +6814,22 @@ var createChangeAgent = functoolsKit.ttl(function (clientId) {
                         }); }))];
                 case 1:
                     _d.sent();
-                    return [4 /*yield*/, swarm.agentPublicService.dispose(requestId, clientId, agentName)];
+                    return [4 /*yield*/, swarm.agentPublicService.dispose(methodName, clientId, agentName)];
                 case 2:
                     _d.sent();
-                    return [4 /*yield*/, swarm.historyPublicService.dispose(requestId, clientId, agentName)];
+                    return [4 /*yield*/, swarm.historyPublicService.dispose(methodName, clientId, agentName)];
                 case 3:
                     _d.sent();
                     _b = (_a = swarm.swarmPublicService).setAgentRef;
-                    _c = [requestId,
+                    _c = [methodName,
                         clientId,
                         swarmName,
                         agentName];
-                    return [4 /*yield*/, swarm.agentPublicService.createAgentRef(requestId, clientId, agentName)];
+                    return [4 /*yield*/, swarm.agentPublicService.createAgentRef(methodName, 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, requestId, clientId, swarmName)];
+                    return [4 /*yield*/, swarm.swarmPublicService.setAgentName(agentName, methodName, clientId, swarmName)];
                 case 6:
                     _d.sent();
                     return [2 /*return*/];
@@ -6786,11 +6863,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 requestId, run;
+    var methodName, run;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function changeAgent";
                 swarm.loggerService.log("function changeAgent", {
                     agentName: agentName,
                     clientId: clientId,
@@ -6799,7 +6876,7 @@ var changeAgent = function (agentName, clientId) { return __awaiter(void 0, void
             case 1:
                 run = _a.sent();
                 createGc$1();
-                return [4 /*yield*/, run(requestId, agentName)];
+                return [4 /*yield*/, run(methodName, agentName)];
             case 2: return [2 /*return*/, _a.sent()];
         }
     });
@@ -6817,23 +6894,22 @@ var disposeConnection = function (clientId_1, swarmName_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 __awaiter(void 0, __spreadArray([clientId_1, swarmName_1], __read(args_1), false), void 0, function (clientId, swarmName, methodName) {
+        if (methodName === void 0) { methodName = "function disposeConnection"; }
         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)];
+                    return [4 /*yield*/, swarm.sessionPublicService.dispose(methodName, clientId, swarmName)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, swarm.swarmPublicService.dispose(requestId, clientId, swarmName)];
+                    return [4 /*yield*/, swarm.swarmPublicService.dispose(methodName, clientId, swarmName)];
                 case 2:
                     _a.sent();
                     return [4 /*yield*/, Promise.all(swarm.swarmValidationService
@@ -6841,10 +6917,10 @@ var disposeConnection = function (clientId_1, swarmName_1) {
                             .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 0: return [4 /*yield*/, swarm.agentPublicService.dispose(methodName, clientId, agentName)];
                                     case 1:
                                         _a.sent();
-                                        return [4 /*yield*/, swarm.historyPublicService.dispose(requestId, clientId, agentName)];
+                                        return [4 /*yield*/, swarm.historyPublicService.dispose(methodName, clientId, agentName)];
                                     case 2:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -6862,7 +6938,7 @@ var disposeConnection = function (clientId_1, swarmName_1) {
                             .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 0: return [4 /*yield*/, swarm.storagePublicService.dispose(methodName, clientId, storageName)];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -6880,7 +6956,7 @@ var disposeConnection = function (clientId_1, swarmName_1) {
                             .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 0: return [4 /*yield*/, swarm.statePublicService.dispose(methodName, clientId, stateName)];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -6907,17 +6983,17 @@ var COMPLETE_GC = 60 * 1000;
  * @returns {TCompleteRun} The complete run function.
  */
 var createComplete = functoolsKit.ttl(function (clientId, swarmName) {
-    return functoolsKit.queued(function (requestId, content) { return __awaiter(void 0, void 0, void 0, function () {
+    return functoolsKit.queued(function (methodName, 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", requestId, clientId, swarmName)];
+                    return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", methodName, clientId, swarmName)];
                 case 1:
                     result = _a.sent();
-                    return [4 /*yield*/, disposeConnection(clientId, swarmName, requestId)];
+                    return [4 /*yield*/, disposeConnection(clientId, swarmName, methodName)];
                 case 2:
                     _a.sent();
                     return [2 /*return*/, result];
@@ -6951,23 +7027,33 @@ 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 requestId, run;
+    var methodName, executionId, run;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function complete";
+                executionId = functoolsKit.randomString();
                 swarm.loggerService.log("function complete", {
                     content: content,
                     clientId: clientId,
+                    executionId: executionId,
                     swarmName: swarmName,
-                    requestId: requestId,
                 });
                 return [4 /*yield*/, createComplete(clientId, swarmName)];
             case 1:
                 run = _a.sent();
                 createGc();
-                return [4 /*yield*/, run(requestId, content)];
-            case 2: return [2 /*return*/, _a.sent()];
+                return [2 /*return*/, ExecutionContextService.runInContext(function () { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, run(methodName, content)];
+                                case 1: return [2 /*return*/, _a.sent()];
+                            }
+                        });
+                    }); }, {
+                        clientId: clientId,
+                        executionId: executionId,
+                    })];
         }
     });
 }); };
@@ -6983,11 +7069,12 @@ var SCHEDULED_DELAY = 1000;
  * @returns {Function} dispose - A function to dispose of the session.
  */
 var session = function (clientId, swarmName) {
-    var requestId = functoolsKit.randomString();
+    var methodName = "function session";
+    var executionId = functoolsKit.randomString();
     swarm.loggerService.log("function session", {
         clientId: clientId,
         swarmName: swarmName,
-        requestId: requestId,
+        executionId: executionId,
     });
     swarm.swarmValidationService.validate(swarmName, "session");
     swarm.sessionValidationService.addSession(clientId, swarmName, "session");
@@ -7000,12 +7087,18 @@ var session = function (clientId, swarmName) {
          */
         complete: functoolsKit.queued(function (content) { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        swarm.sessionValidationService.validate(clientId, "session");
-                        return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", requestId, clientId, swarmName)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
+                swarm.sessionValidationService.validate(clientId, "session");
+                return [2 /*return*/, ExecutionContextService.runInContext(function () { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, swarm.sessionPublicService.execute(content, "user", methodName, clientId, swarmName)];
+                                case 1: return [2 /*return*/, _a.sent()];
+                            }
+                        });
+                    }); }, {
+                        clientId: clientId,
+                        executionId: executionId,
+                    })];
             });
         }); }),
         /**
@@ -7016,7 +7109,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, requestId)];
+                    case 0: return [4 /*yield*/, disposeConnection(clientId, swarmName, methodName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -7126,23 +7219,22 @@ var getRawHistory = function (clientId_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) {
+    return __awaiter(void 0, __spreadArray([clientId_1], __read(args_1), false), void 0, function (clientId, methodName) {
         var swarmName, agentName, history;
-        if (requestId === void 0) { requestId = functoolsKit.randomString(); }
+        if (methodName === void 0) { methodName = "function getRawHistory"; }
         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)];
+                    return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
                 case 1:
                     agentName = _a.sent();
-                    return [4 /*yield*/, swarm.historyPublicService.toArrayForRaw(requestId, clientId, agentName)];
+                    return [4 /*yield*/, swarm.historyPublicService.toArrayForRaw(methodName, clientId, agentName)];
                 case 2:
                     history = _a.sent();
                     return [2 /*return*/, __spreadArray([], __read(history), false)];
@@ -7159,19 +7251,18 @@ var getRawHistory = function (clientId_1) {
  * @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 requestId, prompt, history;
+    var methodName, prompt, history;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function getAgentHistory";
                 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, requestId, clientId, agentName)];
+                return [4 /*yield*/, swarm.historyPublicService.toArrayForAgent(prompt, methodName, clientId, agentName)];
             case 1:
                 history = _a.sent();
                 return [2 /*return*/, __spreadArray([], __read(history), false)];
@@ -7205,23 +7296,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 requestId, swarmName, currentAgentName;
+    var methodName, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function commitToolOutput';
                 swarm.loggerService.log('function commitToolOutput', {
                     toolId: toolId,
                     content: content,
                     clientId: clientId,
                     agentName: agentName,
-                    requestId: requestId,
+                    methodName: methodName,
                 });
                 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(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7233,7 +7324,7 @@ var commitToolOutput = function (toolId, content, clientId, agentName) { return
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(toolId, content, requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(toolId, content, methodName, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -7250,22 +7341,21 @@ 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 requestId, swarmName, currentAgentName;
+    var methodName, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function commitSystemMessage';
                 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(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7276,7 +7366,7 @@ var commitSystemMessage = function (content, clientId, agentName) { return __awa
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitSystemMessage(content, requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitSystemMessage(content, methodName, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -7292,21 +7382,20 @@ 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 requestId, swarmName, currentAgentName;
+    var methodName, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function commitFlush';
                 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(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7317,7 +7406,7 @@ var commitFlush = function (clientId, agentName) { return __awaiter(void 0, void
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.commitFlush(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitFlush(methodName, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -7335,22 +7424,24 @@ 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 requestId, swarmName, currentAgentName;
+    var methodName, executionId, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function execute";
+                executionId = functoolsKit.randomString();
                 swarm.loggerService.log("function execute", {
                     content: content,
                     clientId: clientId,
                     agentName: agentName,
-                    requestId: requestId,
+                    methodName: methodName,
+                    executionId: executionId,
                 });
                 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(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7361,8 +7452,17 @@ var execute = function (content, clientId, agentName) { return __awaiter(void 0,
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", requestId, clientId, swarmName)];
-            case 2: return [2 /*return*/, _a.sent()];
+                return [2 /*return*/, ExecutionContextService.runInContext(function () { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", methodName, clientId, swarmName)];
+                                case 1: return [2 /*return*/, _a.sent()];
+                            }
+                        });
+                    }); }, {
+                        clientId: clientId,
+                        executionId: executionId,
+                    })];
         }
     });
 }); };
@@ -7378,16 +7478,15 @@ 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 requestId, swarmName, currentAgentName;
+    var methodName, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function emit";
                 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));
@@ -7396,7 +7495,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(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7407,7 +7506,7 @@ var emit = function (content, clientId, agentName) { return __awaiter(void 0, vo
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.sessionPublicService.emit(content, requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.emit(content, methodName, clientId, swarmName)];
             case 2: return [2 /*return*/, _a.sent()];
         }
     });
@@ -7421,21 +7520,20 @@ 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 requestId, swarmName;
+    var methodName, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function commitToolOutputForce';
                 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, requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitToolOutput(toolId, content, methodName, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -7451,20 +7549,19 @@ 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 requestId, swarmName;
+    var methodName, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function commitSystemMessageForce';
                 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, requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitSystemMessage(content, methodName, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -7479,19 +7576,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 requestId, swarmName;
+    var methodName, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function commitFlushForce';
                 swarm.loggerService.log('function commitFlushForce', {
                     clientId: clientId,
-                    requestId: requestId,
+                    methodName: methodName,
                 });
                 swarm.sessionValidationService.validate(clientId, "commitFlushForce");
                 swarmName = swarm.sessionValidationService.getSwarm(clientId);
                 swarm.swarmValidationService.validate(swarmName, "commitFlushForce");
-                return [4 /*yield*/, swarm.sessionPublicService.commitFlush(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitFlush(methodName, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -7507,20 +7604,19 @@ 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 requestId, swarmName;
+    var methodName, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function commitSystemMessage';
                 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, requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.commitUserMessage(content, methodName, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -7539,15 +7635,14 @@ 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 requestId, swarmName;
+    var methodName, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function emitForce";
                 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));
@@ -7555,7 +7650,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, requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.sessionPublicService.emit(content, methodName, clientId, swarmName)];
             case 1: return [2 /*return*/, _a.sent()];
         }
     });
@@ -7572,22 +7667,29 @@ 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 requestId, swarmName;
+    var methodName, executionId, 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,
+        methodName = "function executeForce";
+        executionId = functoolsKit.randomString();
+        swarm.loggerService.log("function executeForce", {
+            content: content,
+            clientId: clientId,
+            executionId: executionId,
+        });
+        swarm.sessionValidationService.validate(clientId, "executeForce");
+        swarmName = swarm.sessionValidationService.getSwarm(clientId);
+        swarm.swarmValidationService.validate(swarmName, "executeForce");
+        return [2 /*return*/, ExecutionContextService.runInContext(function () { return __awaiter(void 0, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", methodName, clientId, swarmName)];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
                 });
-                swarm.sessionValidationService.validate(clientId, "executeForce");
-                swarmName = swarm.sessionValidationService.getSwarm(clientId);
-                swarm.swarmValidationService.validate(swarmName, "executeForce");
-                return [4 /*yield*/, swarm.sessionPublicService.execute(content, "tool", requestId, clientId, swarmName)];
-            case 1: return [2 /*return*/, _a.sent()];
-        }
+            }); }, {
+                clientId: clientId,
+                executionId: executionId,
+            })];
     });
 }); };
 
@@ -7675,16 +7777,15 @@ var listenEventOnce = function (clientId, topicName, filterFn, 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 requestId, history, last;
+    var methodName, history, last;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function getLastUserMessage";
                 swarm.loggerService.log("function getLastUserMessage", {
                     clientId: clientId,
-                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId, requestId)];
+                return [4 /*yield*/, getRawHistory(clientId, methodName)];
             case 1:
                 history = _a.sent();
                 last = history.findLast(function (_a) {
@@ -7703,16 +7804,15 @@ 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 requestId, history;
+    var methodName, history;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function getUserHistory";
                 swarm.loggerService.log("function getUserHistory", {
                     clientId: clientId,
-                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId, requestId)];
+                return [4 /*yield*/, getRawHistory(clientId, methodName)];
             case 1:
                 history = _a.sent();
                 return [2 /*return*/, history.filter(function (_a) {
@@ -7730,16 +7830,15 @@ 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 requestId, history;
+    var methodName, history;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function getAssistantHistory";
                 swarm.loggerService.log("function getAssistantHistory", {
                     clientId: clientId,
-                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId, requestId)];
+                return [4 /*yield*/, getRawHistory(clientId, methodName)];
             case 1:
                 history = _a.sent();
                 return [2 /*return*/, history.filter(function (_a) {
@@ -7757,16 +7856,15 @@ 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 requestId, history, last;
+    var methodName, history, last;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function getLastAssistantMessage";
                 swarm.loggerService.log("function getLastAssistantMessage", {
                     clientId: clientId,
-                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId, requestId)];
+                return [4 /*yield*/, getRawHistory(clientId, methodName)];
             case 1:
                 history = _a.sent();
                 last = history.findLast(function (_a) {
@@ -7785,16 +7883,15 @@ 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 requestId, history, last;
+    var methodName, history, last;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = "function getLastSystemMessage";
                 swarm.loggerService.log("function getLastSystemMessage", {
                     clientId: clientId,
-                    requestId: requestId,
                 });
-                return [4 /*yield*/, getRawHistory(clientId, requestId)];
+                return [4 /*yield*/, getRawHistory(clientId, methodName)];
             case 1:
                 history = _a.sent();
                 last = history.findLast(function (_a) {
@@ -7898,21 +7995,20 @@ 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 requestId, swarmName, currentAgentName;
+    var methodName, swarmName, currentAgentName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function cancelOutput';
                 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(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.getAgentName(methodName, clientId, swarmName)];
             case 1:
                 currentAgentName = _a.sent();
                 if (currentAgentName !== agentName) {
@@ -7923,7 +8019,7 @@ var cancelOutput = function (clientId, agentName) { return __awaiter(void 0, voi
                     });
                     return [2 /*return*/];
                 }
-                return [4 /*yield*/, swarm.swarmPublicService.cancelOutput(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.cancelOutput(methodName, clientId, swarmName)];
             case 2:
                 _a.sent();
                 return [2 /*return*/];
@@ -7939,19 +8035,18 @@ 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 requestId, swarmName;
+    var methodName, swarmName;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                requestId = functoolsKit.randomString();
+                methodName = 'function cancelOutputForce';
                 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(requestId, clientId, swarmName)];
+                return [4 /*yield*/, swarm.swarmPublicService.cancelOutput(methodName, clientId, swarmName)];
             case 1:
                 _a.sent();
                 return [2 /*return*/];
@@ -8237,24 +8332,23 @@ var StorageUtils = /** @class */ (function () {
          * @template T
          */
         this.take = function (payload) { return __awaiter(_this, void 0, void 0, function () {
-            var requestId;
+            var methodName;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        requestId = functoolsKit.randomString();
+                        methodName = "StorageUtils take";
                         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, requestId, payload.clientId, payload.storageName, payload.score)];
+                        return [4 /*yield*/, swarm.storagePublicService.take(payload.search, payload.total, methodName, payload.clientId, payload.storageName, payload.score)];
                     case 1: return [2 /*return*/, (_a.sent())];
                 }
             });
@@ -8269,22 +8363,21 @@ var StorageUtils = /** @class */ (function () {
          * @template T
          */
         this.upsert = function (payload) { return __awaiter(_this, void 0, void 0, function () {
-            var requestId;
+            var methodName;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        requestId = functoolsKit.randomString();
+                        methodName = "StorageUtils upsert";
                         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, requestId, payload.clientId, payload.storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.upsert(payload.item, methodName, payload.clientId, payload.storageName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8298,22 +8391,21 @@ 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;
+            var methodName;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        requestId = functoolsKit.randomString();
+                        methodName = "StorageUtils remove";
                         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, requestId, payload.clientId, payload.storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.remove(payload.itemId, methodName, payload.clientId, payload.storageName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8328,22 +8420,21 @@ var StorageUtils = /** @class */ (function () {
          * @template T
          */
         this.get = function (payload) { return __awaiter(_this, void 0, void 0, function () {
-            var requestId;
+            var methodName;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        requestId = functoolsKit.randomString();
+                        methodName = "StorageUtils get";
                         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, requestId, payload.clientId, payload.storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.get(payload.itemId, methodName, payload.clientId, payload.storageName)];
                     case 1: return [2 /*return*/, (_a.sent())];
                 }
             });
@@ -8358,21 +8449,20 @@ var StorageUtils = /** @class */ (function () {
          * @template T
          */
         this.list = function (payload) { return __awaiter(_this, void 0, void 0, function () {
-            var requestId;
+            var methodName;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        requestId = functoolsKit.randomString();
+                        methodName = "StorageUtils list";
                         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(requestId, payload.clientId, payload.storageName, payload.filter)];
+                        return [4 /*yield*/, swarm.storagePublicService.list(methodName, payload.clientId, payload.storageName, payload.filter)];
                     case 1: return [2 /*return*/, (_a.sent())];
                 }
             });
@@ -8385,21 +8475,20 @@ 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;
+            var methodName;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        requestId = functoolsKit.randomString();
+                        methodName = "StorageUtils clear";
                         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(requestId, payload.clientId, payload.storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.clear(methodName, payload.clientId, payload.storageName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8427,20 +8516,19 @@ 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;
+            var methodName;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        requestId = functoolsKit.randomString();
+                        methodName = "StateUtils getState";
                         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(requestId, payload.clientId, payload.stateName)];
+                        return [4 /*yield*/, swarm.statePublicService.getState(methodName, payload.clientId, payload.stateName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8457,26 +8545,25 @@ 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 methodName;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        requestId = functoolsKit.randomString();
+                        methodName = "StateUtils setState";
                         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, requestId, payload.clientId, payload.stateName)];
+                        return [4 /*yield*/, swarm.statePublicService.setState(dispatchFn, methodName, 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];
-                        }); }); }, requestId, payload.clientId, payload.stateName)];
+                        }); }); }, methodName, payload.clientId, payload.stateName)];
                     case 3: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -8509,11 +8596,12 @@ var LoggerUtils = /** @class */ (function () {
  */
 var Logger = new LoggerUtils();
 
-exports.ContextService = ContextService;
+exports.ExecutionContextService = ExecutionContextService;
 exports.History = History;
 exports.HistoryAdapter = HistoryAdapter;
 exports.HistoryInstance = HistoryInstance;
 exports.Logger = Logger;
+exports.MethodContextService = MethodContextService;
 exports.State = State;
 exports.Storage = Storage;
 exports.addAgent = addAgent;