agent-swarm-kit 1.0.75 → 1.0.77

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.
@@ -238,32 +256,39 @@ var LoggerService = /** @class */ (function () {
          * @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;
-            }
-            (_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).debug.apply(_a, __spreadArray(__spreadArray([], __read(args), false), [{ methodContext: methodContext, executionContext: executionContext }], false));
         };
         /**
          * Sets a new logger.
@@ -1523,7 +1548,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);
@@ -1568,7 +1593,7 @@ var AgentConnectionService = /** @class */ (function () {
                             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()];
                 }
             });
@@ -1582,7 +1607,7 @@ var AgentConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentConnectionService waitForOutput");
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).waitForOutput()];
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).waitForOutput()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1601,7 +1626,7 @@ var AgentConnectionService = /** @class */ (function () {
                             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()];
                 }
             });
@@ -1618,7 +1643,7 @@ var AgentConnectionService = /** @class */ (function () {
                         this.loggerService.log("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()];
                 }
             });
@@ -1635,7 +1660,7 @@ var AgentConnectionService = /** @class */ (function () {
                         this.loggerService.log("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()];
                 }
             });
@@ -1649,7 +1674,7 @@ var AgentConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentConnectionService commitAgentChange");
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitAgentChange()];
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).commitAgentChange()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1663,7 +1688,7 @@ var AgentConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentConnectionService commitFlush");
-                        return [4 /*yield*/, this.getAgent(this.contextService.context.clientId, this.contextService.context.agentName).commitFlush()];
+                        return [4 /*yield*/, this.getAgent(this.methodContextService.context.clientId, this.methodContextService.context.agentName).commitFlush()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -1678,15 +1703,15 @@ var AgentConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("agentConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName);
+                        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 +1992,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.
@@ -2000,7 +2025,7 @@ var HistoryConnectionService = /** @class */ (function () {
                         this.loggerService.log("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()];
                 }
             });
@@ -2017,7 +2042,7 @@ var HistoryConnectionService = /** @class */ (function () {
                         this.loggerService.log("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()];
                 }
             });
@@ -2031,7 +2056,7 @@ var HistoryConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("historyConnectionService toArrayForRaw");
-                        return [4 /*yield*/, this.getHistory(this.contextService.context.clientId, this.contextService.context.agentName).toArrayForRaw()];
+                        return [4 /*yield*/, this.getHistory(this.methodContextService.context.clientId, this.methodContextService.context.agentName).toArrayForRaw()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2046,15 +2071,15 @@ var HistoryConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("historyConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.agentName);
+                        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*/];
                 }
             });
@@ -2375,7 +2400,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);
         /**
@@ -2439,7 +2464,7 @@ var SwarmConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("swarmConnectionService cancelOutput");
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).cancelOutput()];
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).cancelOutput()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2453,7 +2478,7 @@ var SwarmConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("swarmConnectionService waitForOutput");
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).waitForOutput()];
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).waitForOutput()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2467,7 +2492,7 @@ var SwarmConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("swarmConnectionService getAgentName");
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).getAgentName()];
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).getAgentName()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2481,7 +2506,7 @@ var SwarmConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("swarmConnectionService getAgent");
-                        return [4 /*yield*/, this.getSwarm(this.contextService.context.clientId, this.contextService.context.swarmName).getAgent()];
+                        return [4 /*yield*/, this.getSwarm(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).getAgent()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2499,7 +2524,7 @@ var SwarmConnectionService = /** @class */ (function () {
                         this.loggerService.log("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()];
                 }
             });
@@ -2516,7 +2541,7 @@ var SwarmConnectionService = /** @class */ (function () {
                         this.loggerService.log("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()];
                 }
             });
@@ -2529,7 +2554,7 @@ var SwarmConnectionService = /** @class */ (function () {
             var key;
             return __generator(this, function (_a) {
                 this.loggerService.log("swarmConnectionService dispose");
-                key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.swarmName);
+                key = "".concat(this.methodContextService.context.clientId, "-").concat(this.methodContextService.context.swarmName);
                 if (!this.getSwarm.has(key)) {
                     return [2 /*return*/];
                 }
@@ -2934,7 +2959,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);
         /**
@@ -2962,7 +2987,7 @@ var SessionConnectionService = /** @class */ (function () {
                         this.loggerService.log("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()];
                 }
             });
@@ -2980,7 +3005,7 @@ var SessionConnectionService = /** @class */ (function () {
                             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()];
                 }
             });
@@ -2990,9 +3015,9 @@ var SessionConnectionService = /** @class */ (function () {
          * @param {SendMessageFn} connector - The function to send messages.
          * @returns {ReceiveMessageFn} The function to receive messages.
          */
-        this.connect = function (connector) {
+        this.connect = function (connector, clientId, swarmName) {
             _this.loggerService.log("sessionConnectionService connect");
-            return _this.getSession(_this.contextService.context.clientId, _this.contextService.context.swarmName).connect(connector);
+            return _this.getSession(clientId, swarmName).connect(connector);
         };
         /**
          * Commits tool output to the session.
@@ -3008,7 +3033,7 @@ var SessionConnectionService = /** @class */ (function () {
                             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()];
                 }
             });
@@ -3025,7 +3050,7 @@ var SessionConnectionService = /** @class */ (function () {
                         this.loggerService.log("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()];
                 }
             });
@@ -3042,7 +3067,7 @@ var SessionConnectionService = /** @class */ (function () {
                         this.loggerService.log("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()];
                 }
             });
@@ -3057,7 +3082,7 @@ var SessionConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService commitFlush");
-                        return [4 /*yield*/, this.getSession(this.contextService.context.clientId, this.contextService.context.swarmName).commitFlush()];
+                        return [4 /*yield*/, this.getSession(this.methodContextService.context.clientId, this.methodContextService.context.swarmName).commitFlush()];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -3072,11 +3097,11 @@ var SessionConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("sessionConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.swarmName);
+                        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 +3127,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,
+                            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 +3145,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3138,19 +3163,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,
+                            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 +3183,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3175,17 +3200,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,
+                            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 +3218,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3212,19 +3237,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,
+                            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 +3257,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3250,18 +3275,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,
+                            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 +3294,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3287,18 +3312,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,
+                            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 +3331,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3323,17 +3348,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,
+                            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 +3366,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3358,17 +3383,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,
+                            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 +3401,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3393,17 +3418,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,
+                            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 +3436,7 @@ var AgentPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3441,18 +3466,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,
+                            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 +3485,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3478,7 +3503,7 @@ var HistoryPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The agent name.
          * @returns {Promise<any[]>} A promise that resolves to an array of history items.
          */
-        this.toArrayForAgent = function (prompt, 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) {
@@ -3488,7 +3513,7 @@ var HistoryPublicService = /** @class */ (function () {
                             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 +3521,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3513,17 +3538,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,
+                            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 +3556,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3548,7 +3573,7 @@ var HistoryPublicService = /** @class */ (function () {
          * @param {AgentName} agentName - The agent name.
          * @returns {Promise<void>} A promise that resolves when the operation is complete.
          */
-        this.dispose = function (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) {
@@ -3557,7 +3582,7 @@ var HistoryPublicService = /** @class */ (function () {
                             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 +3590,7 @@ var HistoryPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 agentName: agentName,
                                 swarmName: "",
@@ -3595,7 +3620,7 @@ 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) {
@@ -3603,10 +3628,10 @@ var SessionPublicService = /** @class */ (function () {
                         this.loggerService.log("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 +3639,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3632,7 +3657,7 @@ 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) {
@@ -3643,7 +3668,7 @@ var SessionPublicService = /** @class */ (function () {
                             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 +3676,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3669,56 +3694,31 @@ var SessionPublicService = /** @class */ (function () {
          * @param {SwarmName} swarmName - The swarm name.
          * @returns {ReceiveMessageFn}
          */
-        this.connect = function (connector, requestId, clientId, swarmName) {
+        this.connect = function (connector, methodName, clientId, swarmName) {
             _this.loggerService.log("sessionPublicService connect", {
-                requestId: requestId,
-                clientId: clientId,
-                swarmName: swarmName,
-            });
-            return ContextService.runInContext(function () {
-                var receive = _this.sessionConnectionService.connect(function (outgoing) { return __awaiter(_this, void 0, void 0, function () {
-                    var _this = this;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
-                                    return __generator(this, function (_a) {
-                                        switch (_a.label) {
-                                            case 0: return [4 /*yield*/, connector(outgoing)];
-                                            case 1: return [2 /*return*/, _a.sent()];
-                                        }
-                                    });
-                                }); }, {
-                                    requestId: requestId,
-                                    clientId: clientId,
-                                    swarmName: swarmName,
-                                    agentName: "",
-                                    storageName: "",
-                                    stateName: "",
-                                })];
-                            case 1: return [2 /*return*/, _a.sent()];
-                        }
-                    });
-                }); });
-                return function (incoming) {
-                    return ContextService.runInContext(function () {
-                        return receive(incoming);
-                    }, {
-                        requestId: requestId,
-                        clientId: clientId,
-                        swarmName: swarmName,
-                        agentName: "",
-                        storageName: "",
-                        stateName: "",
-                    });
-                };
-            }, {
-                requestId: requestId,
+                methodName: methodName,
                 clientId: clientId,
                 swarmName: swarmName,
-                agentName: "",
-                storageName: "",
-                stateName: "",
             });
+            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: return [4 /*yield*/, send(incoming)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); }, {
+                            clientId: clientId,
+                            executionId: executionId,
+                        })];
+                });
+            }); };
         };
         /**
          * Commits tool output to the session.
@@ -3728,19 +3728,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,
+                            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)];
@@ -3748,7 +3748,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3766,18 +3766,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,
+                            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)];
@@ -3785,7 +3785,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3803,18 +3803,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,
+                            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)];
@@ -3822,7 +3822,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3839,7 +3839,7 @@ 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) {
@@ -3848,7 +3848,7 @@ var SessionPublicService = /** @class */ (function () {
                             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()];
@@ -3856,7 +3856,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3873,17 +3873,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,
+                            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()];
@@ -3891,7 +3891,7 @@ var SessionPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3920,7 +3920,7 @@ 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) {
@@ -3929,7 +3929,7 @@ var SwarmPublicService = /** @class */ (function () {
                             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()];
@@ -3937,7 +3937,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3954,17 +3954,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", {
                             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()];
@@ -3972,7 +3972,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -3989,7 +3989,7 @@ 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) {
@@ -3997,9 +3997,9 @@ var SwarmPublicService = /** @class */ (function () {
                         this.loggerService.log("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()];
@@ -4007,7 +4007,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4024,7 +4024,7 @@ 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) {
@@ -4033,7 +4033,7 @@ var SwarmPublicService = /** @class */ (function () {
                             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()];
@@ -4041,7 +4041,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4060,19 +4060,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,
+                            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)];
@@ -4080,7 +4080,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4098,18 +4098,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,
+                            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)];
@@ -4117,7 +4117,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -4134,17 +4134,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,
+                            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()];
@@ -4152,7 +4152,7 @@ var SwarmPublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 swarmName: swarmName,
                                 agentName: "",
@@ -5194,7 +5194,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);
@@ -5249,7 +5249,7 @@ var StorageConnectionService = /** @class */ (function () {
                             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();
@@ -5271,7 +5271,7 @@ var StorageConnectionService = /** @class */ (function () {
                         this.loggerService.log("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();
@@ -5293,7 +5293,7 @@ var StorageConnectionService = /** @class */ (function () {
                         this.loggerService.log("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();
@@ -5315,7 +5315,7 @@ var StorageConnectionService = /** @class */ (function () {
                         this.loggerService.log("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();
@@ -5335,7 +5335,7 @@ var StorageConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storageConnectionService list");
-                        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();
@@ -5354,7 +5354,7 @@ var StorageConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storageConnectionService clear");
-                        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();
@@ -5373,12 +5373,12 @@ var StorageConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("storageConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.storageName);
+                        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();
@@ -5388,7 +5388,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*/];
                 }
             });
@@ -5411,20 +5411,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,
+                            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)];
@@ -5432,7 +5432,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5448,7 +5448,7 @@ 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) {
@@ -5458,7 +5458,7 @@ var StoragePublicService = /** @class */ (function () {
                             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)];
@@ -5466,7 +5466,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5482,7 +5482,7 @@ var StoragePublicService = /** @class */ (function () {
          * @param {IStorageData["id"]} itemId - The ID of the item to remove.
          * @returns {Promise<void>}
          */
-        this.remove = function (itemId, 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) {
@@ -5492,7 +5492,7 @@ var StoragePublicService = /** @class */ (function () {
                             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)];
@@ -5500,7 +5500,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5516,18 +5516,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,
+                            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)];
@@ -5535,7 +5535,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5551,17 +5551,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,
+                            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)];
@@ -5569,7 +5569,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5584,17 +5584,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,
+                            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()];
@@ -5602,7 +5602,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5619,7 +5619,7 @@ 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) {
@@ -5628,7 +5628,7 @@ var StoragePublicService = /** @class */ (function () {
                             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()];
@@ -5636,7 +5636,7 @@ var StoragePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 storageName: storageName,
                                 agentName: "",
@@ -5974,7 +5974,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);
         /**
@@ -6066,7 +6066,7 @@ var StateConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("stateConnectionService setState");
-                        state = this.getStateRef(this.contextService.context.clientId, this.contextService.context.stateName);
+                        state = this.getStateRef(this.methodContextService.context.clientId, this.methodContextService.context.stateName);
                         return [4 /*yield*/, state.waitForInit()];
                     case 1:
                         _a.sent();
@@ -6085,7 +6085,7 @@ var StateConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("stateConnectionService getState");
-                        state = this.getStateRef(this.contextService.context.clientId, this.contextService.context.stateName);
+                        state = this.getStateRef(this.methodContextService.context.clientId, this.methodContextService.context.stateName);
                         return [4 /*yield*/, state.waitForInit()];
                     case 1:
                         _a.sent();
@@ -6104,12 +6104,12 @@ var StateConnectionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.loggerService.log("stateConnectionService dispose");
-                        key = "".concat(this.contextService.context.clientId, "-").concat(this.contextService.context.stateName);
+                        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();
@@ -6119,7 +6119,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*/];
                 }
             });
@@ -6140,17 +6140,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,
+                            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)];
@@ -6158,7 +6158,7 @@ var StatePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 stateName: stateName,
                                 agentName: "",
@@ -6175,7 +6175,7 @@ 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) {
@@ -6184,7 +6184,7 @@ var StatePublicService = /** @class */ (function () {
                             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()];
@@ -6192,7 +6192,7 @@ var StatePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 stateName: stateName,
                                 agentName: "",
@@ -6209,17 +6209,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,
+                            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()];
@@ -6227,7 +6227,7 @@ var StatePublicService = /** @class */ (function () {
                                     }
                                 });
                             }); }, {
-                                requestId: requestId,
+                                methodName: methodName,
                                 clientId: clientId,
                                 stateName: stateName,
                                 agentName: "",
@@ -6355,7 +6355,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(); });
@@ -6401,7 +6404,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),
@@ -6437,7 +6443,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();
 
 /**
@@ -6565,22 +6571,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) {
@@ -6591,7 +6596,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*/];
@@ -6607,19 +6612,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()];
         }
     });
@@ -6635,15 +6639,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;
@@ -6655,7 +6658,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)])];
@@ -6758,7 +6761,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) {
@@ -6771,7 +6774,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*/];
@@ -6780,22 +6783,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*/];
@@ -6829,11 +6832,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,
@@ -6842,7 +6845,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()];
         }
     });
@@ -6860,23 +6863,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
@@ -6884,10 +6886,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*/];
@@ -6905,7 +6907,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*/];
@@ -6923,7 +6925,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*/];
@@ -6950,17 +6952,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];
@@ -6994,23 +6996,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,
+                    })];
         }
     });
 }); };
@@ -7026,11 +7038,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");
@@ -7043,12 +7056,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,
+                    })];
             });
         }); }),
         /**
@@ -7059,7 +7078,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()];
                 }
             });
@@ -7169,23 +7188,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)];
@@ -7202,19 +7220,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)];
@@ -7248,23 +7265,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) {
@@ -7276,7 +7293,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*/];
@@ -7293,22 +7310,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) {
@@ -7319,7 +7335,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*/];
@@ -7335,21 +7351,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) {
@@ -7360,7 +7375,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*/];
@@ -7378,22 +7393,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) {
@@ -7404,8 +7421,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,
+                    })];
         }
     });
 }); };
@@ -7421,16 +7447,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));
@@ -7439,7 +7464,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) {
@@ -7450,7 +7475,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()];
         }
     });
@@ -7464,21 +7489,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*/];
@@ -7494,20 +7518,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*/];
@@ -7522,19 +7545,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*/];
@@ -7550,20 +7573,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*/];
@@ -7582,15 +7604,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));
@@ -7598,7 +7619,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()];
         }
     });
@@ -7615,22 +7636,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,
+            })];
     });
 }); };
 
@@ -7718,16 +7746,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) {
@@ -7746,16 +7773,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) {
@@ -7773,16 +7799,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) {
@@ -7800,16 +7825,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) {
@@ -7828,16 +7852,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) {
@@ -7941,21 +7964,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) {
@@ -7966,7 +7988,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*/];
@@ -7982,19 +8004,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*/];
@@ -8280,24 +8301,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())];
                 }
             });
@@ -8312,22 +8332,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()];
                 }
             });
@@ -8341,22 +8360,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()];
                 }
             });
@@ -8371,22 +8389,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())];
                 }
             });
@@ -8401,21 +8418,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())];
                 }
             });
@@ -8428,21 +8444,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()];
                 }
             });
@@ -8470,20 +8485,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()];
                 }
             });
@@ -8500,26 +8514,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()];
                 }
             });
@@ -8552,11 +8565,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;