@rekog/mcp-nest 1.8.2-alpha.1 → 1.8.2-alpha.3

package/dist/mcp/services/mcp-streamable-http.service.d.ts

@@ -1,10 +1,11 @@
+import { OnModuleDestroy } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { HttpRequest, HttpResponse } from '../interfaces/http-adapter.interface';
 import { McpOptions } from '../interfaces';
 import { McpRegistryService } from './mcp-registry.service';
-export declare class McpStreamableHttpService {
+export declare class McpStreamableHttpService implements OnModuleDestroy {
     private readonly options;
     private readonly mcpModuleId;
     private readonly moduleRef;
@@ -12,6 +13,7 @@ export declare class McpStreamableHttpService {
     private readonly logger;
     private readonly transports;
     private readonly mcpServers;
+    private readonly executors;
     private readonly isStatelessMode;
     constructor(options: McpOptions, mcpModuleId: string, moduleRef: ModuleRef, toolRegistry: McpRegistryService);
     createStatelessServer(rawReq: any): Promise<{
@@ -23,7 +25,8 @@ export declare class McpStreamableHttpService {
     handleStatefulRequest(req: HttpRequest, res: HttpResponse, body: unknown): Promise<void>;
     handleGetRequest(req: any, res: any): Promise<void>;
     handleDeleteRequest(req: any, res: any): Promise<void>;
-    isInitializeRequest(body: unknown): boolean;
-    cleanupSession(sessionId: string): void;
+    private isInitializeRequest;
+    private cleanupSession;
+    onModuleDestroy(): Promise<void>;
 }
 //# sourceMappingURL=mcp-streamable-http.service.d.ts.map

package/dist/mcp/services/mcp-streamable-http.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-streamable-http.service.d.ts","sourceRoot":"","sources":["../../../src/mcp/services/mcp-streamable-http.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,EACL,WAAW,EACX,YAAY,EACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,qBACa,wBAAwB;IASV,OAAO,CAAC,QAAQ,CAAC,OAAO;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAX/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6C;IACpE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEpB;IACP,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0C;IACrE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAGA,OAAO,EAAE,UAAU,EACjB,WAAW,EAAE,MAAM,EAC5C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,kBAAkB;IAS7C,qBAAqB,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC;QAChD,MAAM,EAAE,SAAS,CAAC;QAClB,SAAS,EAAE,6BAA6B,CAAC;KAC1C,CAAC;IAiDI,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCnE,sBAAsB,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,IAAI,CAAC;IAqCV,qBAAqB,CACzB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,IAAI,CAAC;IAkIV,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAwCnD,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC5D,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO;IAmB3C,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;CAOxC"}
+{"version":3,"file":"mcp-streamable-http.service.d.ts","sourceRoot":"","sources":["../../../src/mcp/services/mcp-streamable-http.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,EACL,WAAW,EACX,YAAY,EACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,qBACa,wBAAyB,YAAW,eAAe;IAUrC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAZ/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6C;IACpE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEpB;IACP,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0C;IACrE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmD;IAC7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAGA,OAAO,EAAE,UAAU,EACjB,WAAW,EAAE,MAAM,EAC5C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,kBAAkB;IAS7C,qBAAqB,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC;QAChD,MAAM,EAAE,SAAS,CAAC;QAClB,SAAS,EAAE,6BAA6B,CAAC;KAC1C,CAAC;IAiDI,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCnE,sBAAsB,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,IAAI,CAAC;IA6CV,qBAAqB,CACzB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,IAAI,CAAC;IAqIV,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAsDnD,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAyD5D,OAAO,CAAC,mBAAmB;YAqBb,cAAc;IAgCtB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAUvC"}

package/dist/mcp/services/mcp-streamable-http.service.js

@@ -32,6 +32,7 @@ let McpStreamableHttpService = McpStreamableHttpService_1 = class McpStreamableH
         this.logger = new common_1.Logger(McpStreamableHttpService_1.name);
         this.transports = {};
         this.mcpServers = {};
+        this.executors = {};
         this.isStatelessMode = !!options.streamableHttp?.statelessMode;
     }
     async createStatelessServer(rawReq) {
@@ -81,7 +82,7 @@ let McpStreamableHttpService = McpStreamableHttpService_1 = class McpStreamableH
         }
     }
     async handleStatelessRequest(req, res, body) {
-        this.logger.debug(`[Stateless] Handling stateless MCP request at ${req.url} with body: ${JSON.stringify(body)}`);
+        this.logger.debug(`[Stateless] Handling stateless MCP request at ${req.url}`);
         let server = null;
         let transport = null;
         try {
@@ -89,69 +90,132 @@ let McpStreamableHttpService = McpStreamableHttpService_1 = class McpStreamableH
             server = stateless.server;
             transport = stateless.transport;
             await transport.handleRequest(req.raw, res.raw, body);
-            res.on?.('close', () => {
-                this.logger.debug('[Stateless] Request closed, cleaning up');
-                void transport?.close();
-                void server?.close();
+            res.raw.on('finish', async () => {
+                this.logger.debug('[Stateless] Response sent, cleaning up');
+                try {
+                    if (transport)
+                        await transport.close();
+                    if (server)
+                        await server.close();
+                }
+                catch (error) {
+                    this.logger.error('[Stateless] Error cleaning up:', error);
+                }
             });
         }
         catch (error) {
             this.logger.error(`[Stateless] Error in stateless request handling: ${error}`);
-            void transport?.close();
-            void server?.close();
+            try {
+                if (transport)
+                    await transport.close();
+                if (server)
+                    await server.close();
+            }
+            catch (error) {
+                this.logger.error('[Stateless] Error cleaning up on error:', error);
+            }
             throw error;
         }
     }
     async handleStatefulRequest(req, res, body) {
-        this.logger.debug(`[Stateful] Handling stateful MCP request at ${req.url} with body: ${JSON.stringify(body)}`);
         const sessionId = req.headers['mcp-session-id'];
-        let transport;
-        if (sessionId && this.transports[sessionId]) {
-            transport = this.transports[sessionId];
-        }
-        else if (!sessionId && this.isInitializeRequest(body)) {
+        this.logger.debug(`[${sessionId || 'New'}] Handling stateful MCP request`);
+        if (!sessionId && this.isInitializeRequest(body)) {
+            if (Array.isArray(body) && body.length > 1) {
+                res.status(400).json({
+                    jsonrpc: '2.0',
+                    error: {
+                        code: -32600,
+                        message: 'Invalid Request: Only one initialization request is allowed',
+                    },
+                    id: null,
+                });
+                return;
+            }
             const capabilities = (0, capabilities_builder_1.buildMcpCapabilities)(this.mcpModuleId, this.toolRegistry, this.options);
-            this.logger.debug(`[${sessionId || 'New-Session'}] Built MCP capabilities: ${JSON.stringify(capabilities)}`);
             const mcpServer = new mcp_js_1.McpServer({ name: this.options.name, version: this.options.version }, {
                 capabilities,
                 instructions: this.options.instructions || '',
             });
-            transport = new streamableHttp_js_1.StreamableHTTPServerTransport({
+            const transport = new streamableHttp_js_1.StreamableHTTPServerTransport({
                 sessionIdGenerator: this.options.streamableHttp?.sessionIdGenerator ||
                     (() => (0, crypto_1.randomUUID)()),
                 enableJsonResponse: this.options.streamableHttp?.enableJsonResponse || false,
-                onsessioninitialized: (sid) => {
-                    this.logger.debug(`[${sid}] Session initialized`);
+                onsessioninitialized: async (sid) => {
+                    this.logger.debug(`[${sid}] Session initialized, storing references`);
                     this.transports[sid] = transport;
                     this.mcpServers[sid] = mcpServer;
+                    const contextId = core_1.ContextIdFactory.getByRequest(req);
+                    const executor = await this.moduleRef.resolve(mcp_executor_service_1.McpExecutorService, contextId, { strict: true });
+                    this.executors[sid] = executor;
+                    executor.registerRequestHandlers(mcpServer, req);
+                },
+                onsessionclosed: async (sid) => {
+                    this.logger.debug(`[${sid}] Session closed via DELETE`);
+                    await this.cleanupSession(sid);
                 },
             });
-            transport.onclose = () => {
-                if (transport.sessionId) {
-                    this.cleanupSession(transport.sessionId);
-                }
-            };
             await mcpServer.connect(transport);
-            const contextId = core_1.ContextIdFactory.getByRequest(req);
-            const executor = await this.moduleRef.resolve(mcp_executor_service_1.McpExecutorService, contextId, { strict: true });
-            executor.registerRequestHandlers(mcpServer, req);
             await transport.handleRequest(req.raw, res.raw, body);
-            this.logger.log(`[${transport.sessionId}] Initialized new session`);
+            this.logger.log(`[${transport.sessionId}] New session initialized`);
             return;
         }
-        else if (sessionId && !this.transports[sessionId]) {
-            res.status(404).json({
+        if (sessionId) {
+            if (!this.transports[sessionId]) {
+                this.logger.debug(`[${sessionId}] Session not found`);
+                res.status(404).json({
+                    jsonrpc: '2.0',
+                    error: {
+                        code: -32001,
+                        message: 'Session not found',
+                    },
+                    id: null,
+                });
+                return;
+            }
+            if (this.isInitializeRequest(body)) {
+                res.status(400).json({
+                    jsonrpc: '2.0',
+                    error: {
+                        code: -32600,
+                        message: 'Invalid Request: Server already initialized',
+                    },
+                    id: null,
+                });
+                return;
+            }
+            const transport = this.transports[sessionId];
+            this.logger.debug(`[${sessionId}] Handling request with existing session`);
+            await transport.handleRequest(req.raw, res.raw, body);
+            return;
+        }
+        res.status(400).json({
+            jsonrpc: '2.0',
+            error: {
+                code: -32000,
+                message: 'Bad Request: Mcp-Session-Id header is required',
+            },
+            id: null,
+        });
+    }
+    async handleGetRequest(req, res) {
+        const adapter = http_adapter_factory_1.HttpAdapterFactory.getAdapter(req, res);
+        const adaptedReq = adapter.adaptRequest(req);
+        const adaptedRes = adapter.adaptResponse(res);
+        if (this.isStatelessMode) {
+            adaptedRes.status(405).json({
                 jsonrpc: '2.0',
                 error: {
-                    code: -32001,
-                    message: 'Session not found',
+                    code: -32000,
+                    message: 'Method not allowed in stateless mode',
                 },
                 id: null,
             });
             return;
         }
-        else {
-            res.status(400).json({
+        const sessionId = adaptedReq.headers['mcp-session-id'];
+        if (!sessionId) {
+            adaptedRes.status(400).json({
                 jsonrpc: '2.0',
                 error: {
                     code: -32000,
@@ -161,10 +225,9 @@ let McpStreamableHttpService = McpStreamableHttpService_1 = class McpStreamableH
             });
             return;
         }
-        const mcpServer = this.mcpServers[sessionId];
-        if (!mcpServer) {
-            this.logger.debug(`[${sessionId}] Session not found`);
-            res.status(404).json({
+        if (!this.transports[sessionId]) {
+            this.logger.debug(`[${sessionId}] GET request - session not found`);
+            adaptedRes.status(404).json({
                 jsonrpc: '2.0',
                 error: {
                     code: -32001,
@@ -174,13 +237,11 @@ let McpStreamableHttpService = McpStreamableHttpService_1 = class McpStreamableH
             });
             return;
         }
-        const contextId = core_1.ContextIdFactory.getByRequest(req);
-        const executor = await this.moduleRef.resolve(mcp_executor_service_1.McpExecutorService, contextId, { strict: true });
-        executor.registerRequestHandlers(mcpServer, req);
-        this.logger.debug(`[${sessionId}] Handling subsequent request`);
-        await transport.handleRequest(req.raw, res.raw, body);
+        this.logger.debug(`[${sessionId}] Establishing SSE stream`);
+        const transport = this.transports[sessionId];
+        await transport.handleRequest(adaptedReq.raw, adaptedRes.raw);
     }
-    async handleGetRequest(req, res) {
+    async handleDeleteRequest(req, res) {
         const adapter = http_adapter_factory_1.HttpAdapterFactory.getAdapter(req, res);
         const adaptedReq = adapter.adaptRequest(req);
         const adaptedRes = adapter.adaptResponse(res);
@@ -196,39 +257,30 @@ let McpStreamableHttpService = McpStreamableHttpService_1 = class McpStreamableH
             return;
         }
         const sessionId = adaptedReq.headers['mcp-session-id'];
-        if (!sessionId || !this.transports[sessionId]) {
-            this.logger.debug(`[${sessionId || 'No-Session'}] GET request failed - session not found`);
-            adaptedRes
-                .status(400)
-                .send('Bad Request: Mcp-Session-Id header is required');
-            return;
-        }
-        this.logger.debug(`[${sessionId}] Establishing SSE stream`);
-        const transport = this.transports[sessionId];
-        await transport.handleRequest(adaptedReq.raw, adaptedRes.raw);
-    }
-    async handleDeleteRequest(req, res) {
-        const adapter = http_adapter_factory_1.HttpAdapterFactory.getAdapter(req, res);
-        const adaptedReq = adapter.adaptRequest(req);
-        const adaptedRes = adapter.adaptResponse(res);
-        if (this.isStatelessMode) {
-            adaptedRes.status(405).json({
+        if (!sessionId) {
+            adaptedRes.status(400).json({
                 jsonrpc: '2.0',
                 error: {
                     code: -32000,
-                    message: 'Method not allowed in stateless mode',
+                    message: 'Bad Request: Mcp-Session-Id header is required',
                 },
                 id: null,
             });
             return;
         }
-        const sessionId = adaptedReq.headers['mcp-session-id'];
-        if (!sessionId || !this.transports[sessionId]) {
-            this.logger.debug(`[${sessionId || 'No-Session'}] DELETE request failed - session not found`);
-            adaptedRes.status(400).send('Invalid or missing session ID');
+        if (!this.transports[sessionId]) {
+            this.logger.debug(`[${sessionId}] DELETE request - session not found`);
+            adaptedRes.status(404).json({
+                jsonrpc: '2.0',
+                error: {
+                    code: -32001,
+                    message: 'Session not found',
+                },
+                id: null,
+            });
             return;
         }
-        this.logger.debug(`[${sessionId}] Terminating session`);
+        this.logger.debug(`[${sessionId}] Processing DELETE request`);
         const transport = this.transports[sessionId];
         await transport.handleRequest(adaptedReq.raw, adaptedRes.raw);
     }
@@ -244,12 +296,33 @@ let McpStreamableHttpService = McpStreamableHttpService_1 = class McpStreamableH
             'method' in body &&
             body.method === 'initialize');
     }
-    cleanupSession(sessionId) {
-        if (sessionId) {
-            this.logger.debug(`[${sessionId}] Cleaning up session`);
+    async cleanupSession(sessionId) {
+        if (!sessionId || !this.transports[sessionId]) {
+            return;
+        }
+        this.logger.debug(`[${sessionId}] Cleaning up session`);
+        try {
+            const transport = this.transports[sessionId];
+            if (transport) {
+                await transport.close();
+            }
+            const server = this.mcpServers[sessionId];
+            if (server) {
+                await server.close();
+            }
             delete this.transports[sessionId];
             delete this.mcpServers[sessionId];
+            delete this.executors[sessionId];
         }
+        catch (error) {
+            this.logger.error(`[${sessionId}] Error during cleanup:`, error);
+        }
+    }
+    async onModuleDestroy() {
+        this.logger.log('Cleaning up all MCP sessions...');
+        const sessionIds = Object.keys(this.transports);
+        await Promise.all(sessionIds.map((sessionId) => this.cleanupSession(sessionId)));
+        this.logger.log(`Cleaned up ${sessionIds.length} MCP sessions`);
     }
 };
 exports.McpStreamableHttpService = McpStreamableHttpService;

package/dist/mcp/services/mcp-streamable-http.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-streamable-http.service.js","sourceRoot":"","sources":["../../../src/mcp/services/mcp-streamable-http.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,uCAA2D;AAC3D,mCAAoC;AACpC,oEAAoE;AACpE,0FAAmG;AACnG,2EAAsE;AAMtE,iEAA4D;AAC5D,iEAA4D;AAC5D,wEAAqE;AAG9D,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IAQnC,YACyB,OAAoC,EAClC,WAAoC,EAC5C,SAAoB,EACpB,YAAgC;QAHT,YAAO,GAAP,OAAO,CAAY;QACjB,gBAAW,GAAX,WAAW,CAAQ;QAC5C,cAAS,GAAT,SAAS,CAAW;QACpB,iBAAY,GAAZ,YAAY,CAAoB;QAXlC,WAAM,GAAG,IAAI,eAAM,CAAC,0BAAwB,CAAC,IAAI,CAAC,CAAC;QACnD,eAAU,GAEvB,EAAE,CAAC;QACU,eAAU,GAAuC,EAAE,CAAC;QAUnE,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,aAAa,CAAC;IACjE,CAAC;IAKD,KAAK,CAAC,qBAAqB,CAAC,MAAW;QAKrC,MAAM,SAAS,GAAG,IAAI,iDAA6B,CAAC;YAClD,kBAAkB,EAAE,SAAS;YAC7B,kBAAkB,EAChB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,kBAAkB,IAAI,KAAK;SAC3D,CAAC,CAAC;QAGH,MAAM,YAAY,GAAG,IAAA,2CAAoB,EACvC,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,OAAO,CACb,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,uCAAuC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CACtE,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,kBAAS,CAC1B,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAC1D;YACE,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE;SAC9C,CACF,CAAC;QAGF,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAGhC,MAAM,SAAS,GAAG,uBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAC3C,yCAAkB,EAClB,SAAS,EACT,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;QAGF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mEAAmE,CACpE,CAAC;QACF,QAAQ,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEjD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IAKD,KAAK,CAAC,iBAAiB,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAa;QAEvD,MAAM,OAAO,GAAG,yCAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAExC,CAAC;QAEd,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAI,SAAS,IAAI,YAAY,2BAA2B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAC/E,CAAC;QAEF,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;YACnE,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAI,SAAS,IAAI,YAAY,iCAAiC,KAAK,EAAE,CACtE,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;gBAC5B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBAC1B,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE;wBACL,IAAI,EAAE,CAAC,KAAK;wBACZ,OAAO,EAAE,uBAAuB;qBACjC;oBACD,EAAE,EAAE,IAAI;iBACT,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,sBAAsB,CAC1B,GAAQ,EACR,GAAiB,EACjB,IAAa;QAEb,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,iDAAiD,GAAG,CAAC,GAAG,eAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAC9F,CAAC;QAEF,IAAI,MAAM,GAAqB,IAAI,CAAC;QACpC,IAAI,SAAS,GAAyC,IAAI,CAAC;QAE3D,IAAI,CAAC;YAEH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;YACxD,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;YAC1B,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;YAGhC,MAAM,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAGtD,GAAG,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBAC7D,KAAK,SAAS,EAAE,KAAK,EAAE,CAAC;gBACxB,KAAK,MAAM,EAAE,KAAK,EAAE,CAAC;YACvB,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,oDAAoD,KAAK,EAAE,CAC5D,CAAC;YAEF,KAAK,SAAS,EAAE,KAAK,EAAE,CAAC;YACxB,KAAK,MAAM,EAAE,KAAK,EAAE,CAAC;YACrB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,qBAAqB,CACzB,GAAgB,EAChB,GAAiB,EACjB,IAAa;QAEb,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+CAA+C,GAAG,CAAC,GAAG,eAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAC5F,CAAC;QAGF,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAuB,CAAC;QACtE,IAAI,SAAwC,CAAC;QAE7C,IAAI,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAE5C,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;aAAM,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;YAExD,MAAM,YAAY,GAAG,IAAA,2CAAoB,EACvC,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,OAAO,CACb,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAI,SAAS,IAAI,aAAa,6BAA6B,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAC1F,CAAC;YAEF,MAAM,SAAS,GAAG,IAAI,kBAAS,CAC7B,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAC1D;gBACE,YAAY;gBACZ,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE;aAC9C,CACF,CAAC;YAGF,SAAS,GAAG,IAAI,iDAA6B,CAAC;gBAC5C,kBAAkB,EAChB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,kBAAkB;oBAC/C,CAAC,GAAG,EAAE,CAAC,IAAA,mBAAU,GAAE,CAAC;gBACtB,kBAAkB,EAChB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,kBAAkB,IAAI,KAAK;gBAE1D,oBAAoB,EAAE,CAAC,GAAW,EAAE,EAAE;oBACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,uBAAuB,CAAC,CAAC;oBAClD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;oBACjC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;gBACnC,CAAC;aACF,CAAC,CAAC;YAGH,SAAS,CAAC,OAAO,GAAG,GAAG,EAAE;gBACvB,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;oBACxB,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC,CAAC;YAGF,MAAM,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAGnC,MAAM,SAAS,GAAG,uBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACrD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAC3C,yCAAkB,EAClB,SAAS,EACT,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;YACF,QAAQ,CAAC,uBAAuB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAGjD,MAAM,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAEtD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,SAAS,2BAA2B,CAAC,CAAC;YACpE,OAAO;QACT,CAAC;aAAM,IAAI,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAEpD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,CAAC,KAAK;oBACZ,OAAO,EAAE,mBAAmB;iBAC7B;gBACD,EAAE,EAAE,IAAI;aACT,CAAC,CAAC;YACH,OAAO;QACT,CAAC;aAAM,CAAC;YAGN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,CAAC,KAAK;oBACZ,OAAO,EAAE,gDAAgD;iBAC1D;gBACD,EAAE,EAAE,IAAI;aACT,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAGD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,SAAS,qBAAqB,CAAC,CAAC;YACtD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,CAAC,KAAK;oBACZ,OAAO,EAAE,mBAAmB;iBAC7B;gBACD,EAAE,EAAE,IAAI;aACT,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAGD,MAAM,SAAS,GAAG,uBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAC3C,yCAAkB,EAClB,SAAS,EACT,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;QAGF,QAAQ,CAAC,uBAAuB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,SAAS,+BAA+B,CAAC,CAAC;QAGhE,MAAM,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAKD,KAAK,CAAC,gBAAgB,CAAC,GAAQ,EAAE,GAAQ;QAEvC,MAAM,OAAO,GAAG,yCAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAE9C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,CAAC,KAAK;oBACZ,OAAO,EAAE,sCAAsC;iBAChD;gBACD,EAAE,EAAE,IAAI;aACT,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAExC,CAAC;QAEd,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAI,SAAS,IAAI,YAAY,0CAA0C,CACxE,CAAC;YACF,UAAU;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CAAC,gDAAgD,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,SAAS,2BAA2B,CAAC,CAAC;QAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IAKD,KAAK,CAAC,mBAAmB,CAAC,GAAQ,EAAE,GAAQ;QAE1C,MAAM,OAAO,GAAG,yCAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAE9C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,CAAC,KAAK;oBACZ,OAAO,EAAE,sCAAsC;iBAChD;gBACD,EAAE,EAAE,IAAI;aACT,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAExC,CAAC;QAEd,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAI,SAAS,IAAI,YAAY,6CAA6C,CAC3E,CAAC;YACF,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,SAAS,uBAAuB,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAG7C,MAAM,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IAEhE,CAAC;IAGD,mBAAmB,CAAC,IAAa;QAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,IAAI,CACd,CAAC,GAAG,EAAE,EAAE,CACN,OAAO,GAAG,KAAK,QAAQ;gBACvB,GAAG,KAAK,IAAI;gBACZ,QAAQ,IAAI,GAAG;gBACf,GAAG,CAAC,MAAM,KAAK,YAAY,CAC9B,CAAC;QACJ,CAAC;QACD,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,KAAK,IAAI;YACb,QAAQ,IAAI,IAAI;YACf,IAAY,CAAC,MAAM,KAAK,YAAY,CACtC,CAAC;IACJ,CAAC;IAGD,cAAc,CAAC,SAAiB;QAC9B,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,SAAS,uBAAuB,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;CACF,CAAA;AAxYY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;IACrB,WAAA,IAAA,eAAM,EAAC,eAAe,CAAC,CAAA;qDACI,gBAAS;QACN,yCAAkB;GAZxC,wBAAwB,CAwYpC","sourcesContent":["import { Inject, Injectable, Logger } from '@nestjs/common';\nimport { ContextIdFactory, ModuleRef } from '@nestjs/core';\nimport { randomUUID } from 'crypto';\nimport { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';\nimport { HttpAdapterFactory } from '../adapters/http-adapter.factory';\nimport {\n  HttpRequest,\n  HttpResponse,\n} from '../interfaces/http-adapter.interface';\nimport { McpOptions } from '../interfaces';\nimport { McpExecutorService } from './mcp-executor.service';\nimport { McpRegistryService } from './mcp-registry.service';\nimport { buildMcpCapabilities } from '../utils/capabilities-builder';\n\n@Injectable()\nexport class McpStreamableHttpService {\n  private readonly logger = new Logger(McpStreamableHttpService.name);\n  private readonly transports: {\n    [sessionId: string]: StreamableHTTPServerTransport;\n  } = {};\n  private readonly mcpServers: { [sessionId: string]: McpServer } = {};\n  private readonly isStatelessMode: boolean;\n\n  constructor(\n    @Inject('MCP_OPTIONS') private readonly options: McpOptions,\n    @Inject('MCP_MODULE_ID') private readonly mcpModuleId: string,\n    private readonly moduleRef: ModuleRef,\n    private readonly toolRegistry: McpRegistryService,\n  ) {\n    // Determine if we're in stateless mode\n    this.isStatelessMode = !!options.streamableHttp?.statelessMode;\n  }\n\n  /**\n   * Create a new MCP server instance for stateless requests\n   */\n  async createStatelessServer(rawReq: any): Promise<{\n    server: McpServer;\n    transport: StreamableHTTPServerTransport;\n  }> {\n    // Create a new transport for this request (stateless = no session management)\n    const transport = new StreamableHTTPServerTransport({\n      sessionIdGenerator: undefined,\n      enableJsonResponse:\n        this.options.streamableHttp?.enableJsonResponse || false,\n    });\n\n    // Create a new MCP server instance with dynamic capabilities\n    const capabilities = buildMcpCapabilities(\n      this.mcpModuleId,\n      this.toolRegistry,\n      this.options,\n    );\n    this.logger.debug(\n      `[Stateless] Built MCP capabilities: ${JSON.stringify(capabilities)}`,\n    );\n\n    const server = new McpServer(\n      { name: this.options.name, version: this.options.version },\n      {\n        capabilities: capabilities,\n        instructions: this.options.instructions || '',\n      },\n    );\n\n    // Connect the transport to the MCP server first\n    await server.connect(transport);\n\n    // Now resolve the request-scoped tool executor service\n    const contextId = ContextIdFactory.getByRequest(rawReq);\n    const executor = await this.moduleRef.resolve(\n      McpExecutorService,\n      contextId,\n      { strict: true },\n    );\n\n    // Register request handlers after connection\n    this.logger.debug(\n      '[Stateless] Registering request handlers for stateless MCP server',\n    );\n    executor.registerRequestHandlers(server, rawReq);\n\n    return { server, transport };\n  }\n\n  /**\n   * Handle POST requests\n   */\n  async handlePostRequest(req: any, res: any, body: unknown): Promise<void> {\n    // Get the appropriate HTTP adapter for the request/response\n    const adapter = HttpAdapterFactory.getAdapter(req, res);\n    const adaptedReq = adapter.adaptRequest(req);\n    const adaptedRes = adapter.adaptResponse(res);\n    const sessionId = adaptedReq.headers['mcp-session-id'] as\n      | string\n      | undefined;\n\n    this.logger.debug(\n      `[${sessionId || 'No-Session'}] Received MCP request: ${JSON.stringify(body)}`,\n    );\n\n    try {\n      if (this.isStatelessMode) {\n        return this.handleStatelessRequest(adaptedReq, adaptedRes, body);\n      } else {\n        return this.handleStatefulRequest(adaptedReq, adaptedRes, body);\n      }\n    } catch (error) {\n      this.logger.error(\n        `[${sessionId || 'No-Session'}] Error handling MCP request: ${error}`,\n      );\n      if (!adaptedRes.headersSent) {\n        adaptedRes.status(500).json({\n          jsonrpc: '2.0',\n          error: {\n            code: -32603,\n            message: 'Internal server error',\n          },\n          id: null,\n        });\n      }\n    }\n  }\n\n  /**\n   * Handle requests in stateless mode\n   */\n  async handleStatelessRequest(\n    req: any,\n    res: HttpResponse,\n    body: unknown,\n  ): Promise<void> {\n    this.logger.debug(\n      `[Stateless] Handling stateless MCP request at ${req.url} with body: ${JSON.stringify(body)}`,\n    );\n\n    let server: McpServer | null = null;\n    let transport: StreamableHTTPServerTransport | null = null;\n\n    try {\n      // Create a new server and transport for each request\n      const stateless = await this.createStatelessServer(req);\n      server = stateless.server;\n      transport = stateless.transport;\n\n      // Handle the request\n      await transport.handleRequest(req.raw, res.raw, body);\n\n      // Clean up when the response closes\n      res.on?.('close', () => {\n        this.logger.debug('[Stateless] Request closed, cleaning up');\n        void transport?.close();\n        void server?.close();\n      });\n    } catch (error) {\n      this.logger.error(\n        `[Stateless] Error in stateless request handling: ${error}`,\n      );\n      // Clean up on error\n      void transport?.close();\n      void server?.close();\n      throw error;\n    }\n  }\n\n  /**\n   * Handle requests in stateful mode\n   */\n  async handleStatefulRequest(\n    req: HttpRequest,\n    res: HttpResponse,\n    body: unknown,\n  ): Promise<void> {\n    this.logger.debug(\n      `[Stateful] Handling stateful MCP request at ${req.url} with body: ${JSON.stringify(body)}`,\n    );\n\n    // Check for existing session ID\n    const sessionId = req.headers['mcp-session-id'] as string | undefined;\n    let transport: StreamableHTTPServerTransport;\n\n    if (sessionId && this.transports[sessionId]) {\n      // Reuse existing transport\n      transport = this.transports[sessionId];\n    } else if (!sessionId && this.isInitializeRequest(body)) {\n      // Build capabilities and create the MCP server first so the init callback can capture it\n      const capabilities = buildMcpCapabilities(\n        this.mcpModuleId,\n        this.toolRegistry,\n        this.options,\n      );\n      this.logger.debug(\n        `[${sessionId || 'New-Session'}] Built MCP capabilities: ${JSON.stringify(capabilities)}`,\n      );\n\n      const mcpServer = new McpServer(\n        { name: this.options.name, version: this.options.version },\n        {\n          capabilities,\n          instructions: this.options.instructions || '',\n        },\n      );\n\n      // Create the transport with proper session handling\n      transport = new StreamableHTTPServerTransport({\n        sessionIdGenerator:\n          this.options.streamableHttp?.sessionIdGenerator ||\n          (() => randomUUID()),\n        enableJsonResponse:\n          this.options.streamableHttp?.enableJsonResponse || false,\n        // Single source of truth for session registration to avoid races/duplication\n        onsessioninitialized: (sid: string) => {\n          this.logger.debug(`[${sid}] Session initialized`);\n          this.transports[sid] = transport;\n          this.mcpServers[sid] = mcpServer;\n        },\n      });\n\n      // Attach onclose cleanup BEFORE handling any request\n      transport.onclose = () => {\n        if (transport.sessionId) {\n          this.cleanupSession(transport.sessionId);\n        }\n      };\n\n      // Connect the transport to the MCP server BEFORE handling the request\n      await mcpServer.connect(transport);\n\n      // Register request handlers BEFORE the first handleRequest to avoid races\n      const contextId = ContextIdFactory.getByRequest(req);\n      const executor = await this.moduleRef.resolve(\n        McpExecutorService,\n        contextId,\n        { strict: true },\n      );\n      executor.registerRequestHandlers(mcpServer, req);\n\n      // Handle the initialization request\n      await transport.handleRequest(req.raw, res.raw, body);\n\n      this.logger.log(`[${transport.sessionId}] Initialized new session`);\n      return;\n    } else if (sessionId && !this.transports[sessionId]) {\n      // Provided session ID but no matching session exists → align with SDK error shape/code\n      res.status(404).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32001,\n          message: 'Session not found',\n        },\n        id: null,\n      });\n      return;\n    } else {\n      // Invalid request - no session ID or not initialization request\n      // Match SDK wording for missing session id after init\n      res.status(400).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32000,\n          message: 'Bad Request: Mcp-Session-Id header is required',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    // ---- Subsequent requests to an existing session ----\n    const mcpServer = this.mcpServers[sessionId];\n    if (!mcpServer) {\n      this.logger.debug(`[${sessionId}] Session not found`);\n      res.status(404).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32001,\n          message: 'Session not found',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    // Resolve the request-scoped tool executor service\n    const contextId = ContextIdFactory.getByRequest(req);\n    const executor = await this.moduleRef.resolve(\n      McpExecutorService,\n      contextId,\n      { strict: true },\n    );\n\n    // Register request handlers with the user context from this specific request\n    executor.registerRequestHandlers(mcpServer, req);\n\n    this.logger.debug(`[${sessionId}] Handling subsequent request`);\n\n    // Handle the request with existing transport\n    await transport.handleRequest(req.raw, res.raw, body);\n  }\n\n  /**\n   * Handle GET requests for SSE streams\n   */\n  async handleGetRequest(req: any, res: any): Promise<void> {\n    // Get the appropriate HTTP adapter for the request/response\n    const adapter = HttpAdapterFactory.getAdapter(req, res);\n    const adaptedReq = adapter.adaptRequest(req);\n    const adaptedRes = adapter.adaptResponse(res);\n\n    if (this.isStatelessMode) {\n      adaptedRes.status(405).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32000,\n          message: 'Method not allowed in stateless mode',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    const sessionId = adaptedReq.headers['mcp-session-id'] as\n      | string\n      | undefined;\n\n    if (!sessionId || !this.transports[sessionId]) {\n      this.logger.debug(\n        `[${sessionId || 'No-Session'}] GET request failed - session not found`,\n      );\n      adaptedRes\n        .status(400)\n        .send('Bad Request: Mcp-Session-Id header is required');\n      return;\n    }\n\n    this.logger.debug(`[${sessionId}] Establishing SSE stream`);\n    const transport = this.transports[sessionId];\n    await transport.handleRequest(adaptedReq.raw, adaptedRes.raw);\n  }\n\n  /**\n   * Handle DELETE requests for terminating sessions\n   */\n  async handleDeleteRequest(req: any, res: any): Promise<void> {\n    // Get the appropriate HTTP adapter for the request/response\n    const adapter = HttpAdapterFactory.getAdapter(req, res);\n    const adaptedReq = adapter.adaptRequest(req);\n    const adaptedRes = adapter.adaptResponse(res);\n\n    if (this.isStatelessMode) {\n      adaptedRes.status(405).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32000,\n          message: 'Method not allowed in stateless mode',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    const sessionId = adaptedReq.headers['mcp-session-id'] as\n      | string\n      | undefined;\n\n    if (!sessionId || !this.transports[sessionId]) {\n      this.logger.debug(\n        `[${sessionId || 'No-Session'}] DELETE request failed - session not found`,\n      );\n      adaptedRes.status(400).send('Invalid or missing session ID');\n      return;\n    }\n\n    this.logger.debug(`[${sessionId}] Terminating session`);\n    const transport = this.transports[sessionId];\n\n    // Let the transport handle termination; onclose handler will perform cleanup.\n    await transport.handleRequest(adaptedReq.raw, adaptedRes.raw);\n    // DO NOT call this.cleanupSession(sessionId) here to avoid double cleanup.\n  }\n\n  // Helper function to detect initialize requests\n  isInitializeRequest(body: unknown): boolean {\n    if (Array.isArray(body)) {\n      return body.some(\n        (msg) =>\n          typeof msg === 'object' &&\n          msg !== null &&\n          'method' in msg &&\n          msg.method === 'initialize',\n      );\n    }\n    return (\n      typeof body === 'object' &&\n      body !== null &&\n      'method' in body &&\n      (body as any).method === 'initialize'\n    );\n  }\n\n  // Clean up session resources\n  cleanupSession(sessionId: string): void {\n    if (sessionId) {\n      this.logger.debug(`[${sessionId}] Cleaning up session`);\n      delete this.transports[sessionId];\n      delete this.mcpServers[sessionId];\n    }\n  }\n}\n"]}
+{"version":3,"file":"mcp-streamable-http.service.js","sourceRoot":"","sources":["../../../src/mcp/services/mcp-streamable-http.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable, Logger, OnModuleDestroy } from '@nestjs/common';\nimport { ContextIdFactory, ModuleRef } from '@nestjs/core';\nimport { randomUUID } from 'crypto';\nimport { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';\nimport { HttpAdapterFactory } from '../adapters/http-adapter.factory';\nimport {\n  HttpRequest,\n  HttpResponse,\n} from '../interfaces/http-adapter.interface';\nimport { McpOptions } from '../interfaces';\nimport { McpExecutorService } from './mcp-executor.service';\nimport { McpRegistryService } from './mcp-registry.service';\nimport { buildMcpCapabilities } from '../utils/capabilities-builder';\n\n@Injectable()\nexport class McpStreamableHttpService implements OnModuleDestroy {\n  private readonly logger = new Logger(McpStreamableHttpService.name);\n  private readonly transports: {\n    [sessionId: string]: StreamableHTTPServerTransport;\n  } = {};\n  private readonly mcpServers: { [sessionId: string]: McpServer } = {};\n  private readonly executors: { [sessionId: string]: McpExecutorService } = {};\n  private readonly isStatelessMode: boolean;\n\n  constructor(\n    @Inject('MCP_OPTIONS') private readonly options: McpOptions,\n    @Inject('MCP_MODULE_ID') private readonly mcpModuleId: string,\n    private readonly moduleRef: ModuleRef,\n    private readonly toolRegistry: McpRegistryService,\n  ) {\n    // Determine if we're in stateless mode\n    this.isStatelessMode = !!options.streamableHttp?.statelessMode;\n  }\n\n  /**\n   * Create a new MCP server instance for stateless requests\n   */\n  async createStatelessServer(rawReq: any): Promise<{\n    server: McpServer;\n    transport: StreamableHTTPServerTransport;\n  }> {\n    // Create a new transport for this request (stateless = no session management)\n    const transport = new StreamableHTTPServerTransport({\n      sessionIdGenerator: undefined,\n      enableJsonResponse:\n        this.options.streamableHttp?.enableJsonResponse || false,\n    });\n\n    // Create a new MCP server instance with dynamic capabilities\n    const capabilities = buildMcpCapabilities(\n      this.mcpModuleId,\n      this.toolRegistry,\n      this.options,\n    );\n    this.logger.debug(\n      `[Stateless] Built MCP capabilities: ${JSON.stringify(capabilities)}`,\n    );\n\n    const server = new McpServer(\n      { name: this.options.name, version: this.options.version },\n      {\n        capabilities: capabilities,\n        instructions: this.options.instructions || '',\n      },\n    );\n\n    // Connect the transport to the MCP server first\n    await server.connect(transport);\n\n    // Now resolve the request-scoped tool executor service\n    const contextId = ContextIdFactory.getByRequest(rawReq);\n    const executor = await this.moduleRef.resolve(\n      McpExecutorService,\n      contextId,\n      { strict: true },\n    );\n\n    // Register request handlers after connection\n    this.logger.debug(\n      '[Stateless] Registering request handlers for stateless MCP server',\n    );\n    executor.registerRequestHandlers(server, rawReq);\n\n    return { server, transport };\n  }\n\n  /**\n   * Handle POST requests\n   */\n  async handlePostRequest(req: any, res: any, body: unknown): Promise<void> {\n    // Get the appropriate HTTP adapter for the request/response\n    const adapter = HttpAdapterFactory.getAdapter(req, res);\n    const adaptedReq = adapter.adaptRequest(req);\n    const adaptedRes = adapter.adaptResponse(res);\n    const sessionId = adaptedReq.headers['mcp-session-id'] as\n      | string\n      | undefined;\n\n    this.logger.debug(\n      `[${sessionId || 'No-Session'}] Received MCP request: ${JSON.stringify(body)}`,\n    );\n\n    try {\n      if (this.isStatelessMode) {\n        return this.handleStatelessRequest(adaptedReq, adaptedRes, body);\n      } else {\n        return this.handleStatefulRequest(adaptedReq, adaptedRes, body);\n      }\n    } catch (error) {\n      this.logger.error(\n        `[${sessionId || 'No-Session'}] Error handling MCP request: ${error}`,\n      );\n      if (!adaptedRes.headersSent) {\n        adaptedRes.status(500).json({\n          jsonrpc: '2.0',\n          error: {\n            code: -32603,\n            message: 'Internal server error',\n          },\n          id: null,\n        });\n      }\n    }\n  }\n\n  /**\n   * Handle requests in stateless mode\n   */\n  async handleStatelessRequest(\n    req: any,\n    res: HttpResponse,\n    body: unknown,\n  ): Promise<void> {\n    this.logger.debug(\n      `[Stateless] Handling stateless MCP request at ${req.url}`,\n    );\n\n    let server: McpServer | null = null;\n    let transport: StreamableHTTPServerTransport | null = null;\n\n    try {\n      // Create a new server and transport for each request\n      const stateless = await this.createStatelessServer(req);\n      server = stateless.server;\n      transport = stateless.transport;\n\n      // Handle the request\n      await transport.handleRequest(req.raw, res.raw, body);\n\n      // Clean up after response is sent\n      res.raw.on('finish', async () => {\n        this.logger.debug('[Stateless] Response sent, cleaning up');\n        try {\n          if (transport) await transport.close();\n          if (server) await server.close();\n        } catch (error) {\n          this.logger.error('[Stateless] Error cleaning up:', error);\n        }\n      });\n    } catch (error) {\n      this.logger.error(\n        `[Stateless] Error in stateless request handling: ${error}`,\n      );\n      // Clean up on error\n      try {\n        if (transport) await transport.close();\n        if (server) await server.close();\n      } catch (error) {\n        this.logger.error('[Stateless] Error cleaning up on error:', error);\n      }\n      throw error;\n    }\n  }\n\n  /**\n   * Handle requests in stateful mode\n   */\n  async handleStatefulRequest(\n    req: HttpRequest,\n    res: HttpResponse,\n    body: unknown,\n  ): Promise<void> {\n    const sessionId = req.headers['mcp-session-id'] as string | undefined;\n\n    this.logger.debug(`[${sessionId || 'New'}] Handling stateful MCP request`);\n\n    // Case 1: New initialization request\n    if (!sessionId && this.isInitializeRequest(body)) {\n      // Validate it's not a batch with multiple requests\n      if (Array.isArray(body) && body.length > 1) {\n        res.status(400).json({\n          jsonrpc: '2.0',\n          error: {\n            code: -32600,\n            message:\n              'Invalid Request: Only one initialization request is allowed',\n          },\n          id: null,\n        });\n        return;\n      }\n\n      // Build capabilities\n      const capabilities = buildMcpCapabilities(\n        this.mcpModuleId,\n        this.toolRegistry,\n        this.options,\n      );\n\n      // Create MCP server\n      const mcpServer = new McpServer(\n        { name: this.options.name, version: this.options.version },\n        {\n          capabilities,\n          instructions: this.options.instructions || '',\n        },\n      );\n\n      // Create transport with session management\n      const transport = new StreamableHTTPServerTransport({\n        sessionIdGenerator:\n          this.options.streamableHttp?.sessionIdGenerator ||\n          (() => randomUUID()),\n        enableJsonResponse:\n          this.options.streamableHttp?.enableJsonResponse || false,\n        onsessioninitialized: async (sid: string) => {\n          this.logger.debug(`[${sid}] Session initialized, storing references`);\n          // Store all session data\n          this.transports[sid] = transport;\n          this.mcpServers[sid] = mcpServer;\n\n          // Resolve and store the executor for this session\n          const contextId = ContextIdFactory.getByRequest(req);\n          const executor = await this.moduleRef.resolve(\n            McpExecutorService,\n            contextId,\n            { strict: true },\n          );\n          this.executors[sid] = executor;\n\n          // Register request handlers ONCE during initialization\n          executor.registerRequestHandlers(mcpServer, req);\n        },\n        onsessionclosed: async (sid: string) => {\n          this.logger.debug(`[${sid}] Session closed via DELETE`);\n          await this.cleanupSession(sid);\n        },\n      });\n\n      // Connect transport to server\n      await mcpServer.connect(transport);\n\n      // Handle the initialization request\n      await transport.handleRequest(req.raw, res.raw, body);\n\n      this.logger.log(`[${transport.sessionId}] New session initialized`);\n      return;\n    }\n\n    // Case 2: Request with session ID\n    if (sessionId) {\n      // Check if session exists\n      if (!this.transports[sessionId]) {\n        this.logger.debug(`[${sessionId}] Session not found`);\n        res.status(404).json({\n          jsonrpc: '2.0',\n          error: {\n            code: -32001,\n            message: 'Session not found',\n          },\n          id: null,\n        });\n        return;\n      }\n\n      // Reject re-initialization attempts\n      if (this.isInitializeRequest(body)) {\n        res.status(400).json({\n          jsonrpc: '2.0',\n          error: {\n            code: -32600,\n            message: 'Invalid Request: Server already initialized',\n          },\n          id: null,\n        });\n        return;\n      }\n\n      // Use existing transport - DO NOT re-register handlers\n      const transport = this.transports[sessionId];\n\n      this.logger.debug(\n        `[${sessionId}] Handling request with existing session`,\n      );\n\n      // Handle the request with existing transport and handlers\n      await transport.handleRequest(req.raw, res.raw, body);\n      return;\n    }\n\n    // Case 3: No session ID and not initialization\n    res.status(400).json({\n      jsonrpc: '2.0',\n      error: {\n        code: -32000,\n        message: 'Bad Request: Mcp-Session-Id header is required',\n      },\n      id: null,\n    });\n  }\n\n  /**\n   * Handle GET requests for SSE streams\n   */\n  async handleGetRequest(req: any, res: any): Promise<void> {\n    const adapter = HttpAdapterFactory.getAdapter(req, res);\n    const adaptedReq = adapter.adaptRequest(req);\n    const adaptedRes = adapter.adaptResponse(res);\n\n    if (this.isStatelessMode) {\n      adaptedRes.status(405).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32000,\n          message: 'Method not allowed in stateless mode',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    const sessionId = adaptedReq.headers['mcp-session-id'] as\n      | string\n      | undefined;\n\n    if (!sessionId) {\n      adaptedRes.status(400).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32000,\n          message: 'Bad Request: Mcp-Session-Id header is required',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    if (!this.transports[sessionId]) {\n      this.logger.debug(`[${sessionId}] GET request - session not found`);\n      adaptedRes.status(404).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32001,\n          message: 'Session not found',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    this.logger.debug(`[${sessionId}] Establishing SSE stream`);\n    const transport = this.transports[sessionId];\n    await transport.handleRequest(adaptedReq.raw, adaptedRes.raw);\n  }\n\n  /**\n   * Handle DELETE requests for terminating sessions\n   */\n  async handleDeleteRequest(req: any, res: any): Promise<void> {\n    const adapter = HttpAdapterFactory.getAdapter(req, res);\n    const adaptedReq = adapter.adaptRequest(req);\n    const adaptedRes = adapter.adaptResponse(res);\n\n    if (this.isStatelessMode) {\n      adaptedRes.status(405).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32000,\n          message: 'Method not allowed in stateless mode',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    const sessionId = adaptedReq.headers['mcp-session-id'] as\n      | string\n      | undefined;\n\n    if (!sessionId) {\n      adaptedRes.status(400).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32000,\n          message: 'Bad Request: Mcp-Session-Id header is required',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    if (!this.transports[sessionId]) {\n      this.logger.debug(`[${sessionId}] DELETE request - session not found`);\n      adaptedRes.status(404).json({\n        jsonrpc: '2.0',\n        error: {\n          code: -32001,\n          message: 'Session not found',\n        },\n        id: null,\n      });\n      return;\n    }\n\n    this.logger.debug(`[${sessionId}] Processing DELETE request`);\n    const transport = this.transports[sessionId];\n\n    // Let transport handle the DELETE request\n    // The onsessionclosed callback will handle cleanup\n    await transport.handleRequest(adaptedReq.raw, adaptedRes.raw);\n  }\n\n  /**\n   * Helper function to detect initialize requests\n   */\n  private isInitializeRequest(body: unknown): boolean {\n    if (Array.isArray(body)) {\n      return body.some(\n        (msg) =>\n          typeof msg === 'object' &&\n          msg !== null &&\n          'method' in msg &&\n          msg.method === 'initialize',\n      );\n    }\n    return (\n      typeof body === 'object' &&\n      body !== null &&\n      'method' in body &&\n      (body as any).method === 'initialize'\n    );\n  }\n\n  /**\n   * Clean up session resources\n   */\n  private async cleanupSession(sessionId: string): Promise<void> {\n    if (!sessionId || !this.transports[sessionId]) {\n      return;\n    }\n\n    this.logger.debug(`[${sessionId}] Cleaning up session`);\n\n    try {\n      // Close transport if still open\n      const transport = this.transports[sessionId];\n      if (transport) {\n        await transport.close();\n      }\n\n      // Close MCP server\n      const server = this.mcpServers[sessionId];\n      if (server) {\n        await server.close();\n      }\n\n      // Clean up all references\n      delete this.transports[sessionId];\n      delete this.mcpServers[sessionId];\n      delete this.executors[sessionId];\n    } catch (error) {\n      this.logger.error(`[${sessionId}] Error during cleanup:`, error);\n    }\n  }\n\n  /**\n   * Clean up all sessions on module destroy\n   */\n  async onModuleDestroy(): Promise<void> {\n    this.logger.log('Cleaning up all MCP sessions...');\n    const sessionIds = Object.keys(this.transports);\n\n    await Promise.all(\n      sessionIds.map((sessionId) => this.cleanupSession(sessionId)),\n    );\n\n    this.logger.log(`Cleaned up ${sessionIds.length} MCP sessions`);\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rekog/mcp-nest",
-  "version": "1.8.2-alpha.1",
+  "version": "1.8.2-alpha.3",
   "description": "NestJS module for creating Model Context Protocol (MCP) servers",
   "main": "dist/index.js",
   "license": "MIT",

package/src/mcp/services/mcp-streamable-http.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
+import { Inject, Injectable, Logger, OnModuleDestroy } from '@nestjs/common';
 import { ContextIdFactory, ModuleRef } from '@nestjs/core';
 import { randomUUID } from 'crypto';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
@@ -14,12 +14,13 @@ import { McpRegistryService } from './mcp-registry.service';
 import { buildMcpCapabilities } from '../utils/capabilities-builder';
 
 @Injectable()
-export class McpStreamableHttpService {
+export class McpStreamableHttpService implements OnModuleDestroy {
   private readonly logger = new Logger(McpStreamableHttpService.name);
   private readonly transports: {
     [sessionId: string]: StreamableHTTPServerTransport;
   } = {};
   private readonly mcpServers: { [sessionId: string]: McpServer } = {};
+  private readonly executors: { [sessionId: string]: McpExecutorService } = {};
   private readonly isStatelessMode: boolean;
 
   constructor(
@@ -132,7 +133,7 @@ export class McpStreamableHttpService {
     body: unknown,
   ): Promise<void> {
     this.logger.debug(
-      `[Stateless] Handling stateless MCP request at ${req.url} with body: ${JSON.stringify(body)}`,
+      `[Stateless] Handling stateless MCP request at ${req.url}`,
     );
 
     let server: McpServer | null = null;
@@ -147,19 +148,27 @@ export class McpStreamableHttpService {
       // Handle the request
       await transport.handleRequest(req.raw, res.raw, body);
 
-      // Clean up when the response closes
-      res.on?.('close', () => {
-        this.logger.debug('[Stateless] Request closed, cleaning up');
-        void transport?.close();
-        void server?.close();
+      // Clean up after response is sent
+      res.raw.on('finish', async () => {
+        this.logger.debug('[Stateless] Response sent, cleaning up');
+        try {
+          if (transport) await transport.close();
+          if (server) await server.close();
+        } catch (error) {
+          this.logger.error('[Stateless] Error cleaning up:', error);
+        }
       });
     } catch (error) {
       this.logger.error(
         `[Stateless] Error in stateless request handling: ${error}`,
       );
       // Clean up on error
-      void transport?.close();
-      void server?.close();
+      try {
+        if (transport) await transport.close();
+        if (server) await server.close();
+      } catch (error) {
+        this.logger.error('[Stateless] Error cleaning up on error:', error);
+      }
       throw error;
     }
   }
@@ -172,28 +181,34 @@ export class McpStreamableHttpService {
     res: HttpResponse,
     body: unknown,
   ): Promise<void> {
-    this.logger.debug(
-      `[Stateful] Handling stateful MCP request at ${req.url} with body: ${JSON.stringify(body)}`,
-    );
-
-    // Check for existing session ID
     const sessionId = req.headers['mcp-session-id'] as string | undefined;
-    let transport: StreamableHTTPServerTransport;
 
-    if (sessionId && this.transports[sessionId]) {
-      // Reuse existing transport
-      transport = this.transports[sessionId];
-    } else if (!sessionId && this.isInitializeRequest(body)) {
-      // Build capabilities and create the MCP server first so the init callback can capture it
+    this.logger.debug(`[${sessionId || 'New'}] Handling stateful MCP request`);
+
+    // Case 1: New initialization request
+    if (!sessionId && this.isInitializeRequest(body)) {
+      // Validate it's not a batch with multiple requests
+      if (Array.isArray(body) && body.length > 1) {
+        res.status(400).json({
+          jsonrpc: '2.0',
+          error: {
+            code: -32600,
+            message:
+              'Invalid Request: Only one initialization request is allowed',
+          },
+          id: null,
+        });
+        return;
+      }
+
+      // Build capabilities
       const capabilities = buildMcpCapabilities(
         this.mcpModuleId,
         this.toolRegistry,
         this.options,
       );
-      this.logger.debug(
-        `[${sessionId || 'New-Session'}] Built MCP capabilities: ${JSON.stringify(capabilities)}`,
-      );
 
+      // Create MCP server
       const mcpServer = new McpServer(
         { name: this.options.name, version: this.options.version },
         {
@@ -202,107 +217,103 @@ export class McpStreamableHttpService {
         },
       );
 
-      // Create the transport with proper session handling
-      transport = new StreamableHTTPServerTransport({
+      // Create transport with session management
+      const transport = new StreamableHTTPServerTransport({
         sessionIdGenerator:
           this.options.streamableHttp?.sessionIdGenerator ||
           (() => randomUUID()),
         enableJsonResponse:
           this.options.streamableHttp?.enableJsonResponse || false,
-        // Single source of truth for session registration to avoid races/duplication
-        onsessioninitialized: (sid: string) => {
-          this.logger.debug(`[${sid}] Session initialized`);
+        onsessioninitialized: async (sid: string) => {
+          this.logger.debug(`[${sid}] Session initialized, storing references`);
+          // Store all session data
           this.transports[sid] = transport;
           this.mcpServers[sid] = mcpServer;
+
+          // Resolve and store the executor for this session
+          const contextId = ContextIdFactory.getByRequest(req);
+          const executor = await this.moduleRef.resolve(
+            McpExecutorService,
+            contextId,
+            { strict: true },
+          );
+          this.executors[sid] = executor;
+
+          // Register request handlers ONCE during initialization
+          executor.registerRequestHandlers(mcpServer, req);
+        },
+        onsessionclosed: async (sid: string) => {
+          this.logger.debug(`[${sid}] Session closed via DELETE`);
+          await this.cleanupSession(sid);
         },
       });
 
-      // Attach onclose cleanup BEFORE handling any request
-      transport.onclose = () => {
-        if (transport.sessionId) {
-          this.cleanupSession(transport.sessionId);
-        }
-      };
-
-      // Connect the transport to the MCP server BEFORE handling the request
+      // Connect transport to server
       await mcpServer.connect(transport);
 
-      // Register request handlers BEFORE the first handleRequest to avoid races
-      const contextId = ContextIdFactory.getByRequest(req);
-      const executor = await this.moduleRef.resolve(
-        McpExecutorService,
-        contextId,
-        { strict: true },
-      );
-      executor.registerRequestHandlers(mcpServer, req);
-
       // Handle the initialization request
       await transport.handleRequest(req.raw, res.raw, body);
 
-      this.logger.log(`[${transport.sessionId}] Initialized new session`);
-      return;
-    } else if (sessionId && !this.transports[sessionId]) {
-      // Provided session ID but no matching session exists → align with SDK error shape/code
-      res.status(404).json({
-        jsonrpc: '2.0',
-        error: {
-          code: -32001,
-          message: 'Session not found',
-        },
-        id: null,
-      });
-      return;
-    } else {
-      // Invalid request - no session ID or not initialization request
-      // Match SDK wording for missing session id after init
-      res.status(400).json({
-        jsonrpc: '2.0',
-        error: {
-          code: -32000,
-          message: 'Bad Request: Mcp-Session-Id header is required',
-        },
-        id: null,
-      });
+      this.logger.log(`[${transport.sessionId}] New session initialized`);
       return;
     }
 
-    // ---- Subsequent requests to an existing session ----
-    const mcpServer = this.mcpServers[sessionId];
-    if (!mcpServer) {
-      this.logger.debug(`[${sessionId}] Session not found`);
-      res.status(404).json({
-        jsonrpc: '2.0',
-        error: {
-          code: -32001,
-          message: 'Session not found',
-        },
-        id: null,
-      });
-      return;
-    }
+    // Case 2: Request with session ID
+    if (sessionId) {
+      // Check if session exists
+      if (!this.transports[sessionId]) {
+        this.logger.debug(`[${sessionId}] Session not found`);
+        res.status(404).json({
+          jsonrpc: '2.0',
+          error: {
+            code: -32001,
+            message: 'Session not found',
+          },
+          id: null,
+        });
+        return;
+      }
 
-    // Resolve the request-scoped tool executor service
-    const contextId = ContextIdFactory.getByRequest(req);
-    const executor = await this.moduleRef.resolve(
-      McpExecutorService,
-      contextId,
-      { strict: true },
-    );
+      // Reject re-initialization attempts
+      if (this.isInitializeRequest(body)) {
+        res.status(400).json({
+          jsonrpc: '2.0',
+          error: {
+            code: -32600,
+            message: 'Invalid Request: Server already initialized',
+          },
+          id: null,
+        });
+        return;
+      }
 
-    // Register request handlers with the user context from this specific request
-    executor.registerRequestHandlers(mcpServer, req);
+      // Use existing transport - DO NOT re-register handlers
+      const transport = this.transports[sessionId];
 
-    this.logger.debug(`[${sessionId}] Handling subsequent request`);
+      this.logger.debug(
+        `[${sessionId}] Handling request with existing session`,
+      );
 
-    // Handle the request with existing transport
-    await transport.handleRequest(req.raw, res.raw, body);
+      // Handle the request with existing transport and handlers
+      await transport.handleRequest(req.raw, res.raw, body);
+      return;
+    }
+
+    // Case 3: No session ID and not initialization
+    res.status(400).json({
+      jsonrpc: '2.0',
+      error: {
+        code: -32000,
+        message: 'Bad Request: Mcp-Session-Id header is required',
+      },
+      id: null,
+    });
   }
 
   /**
    * Handle GET requests for SSE streams
    */
   async handleGetRequest(req: any, res: any): Promise<void> {
-    // Get the appropriate HTTP adapter for the request/response
     const adapter = HttpAdapterFactory.getAdapter(req, res);
     const adaptedReq = adapter.adaptRequest(req);
     const adaptedRes = adapter.adaptResponse(res);
@@ -323,13 +334,28 @@ export class McpStreamableHttpService {
       | string
       | undefined;
 
-    if (!sessionId || !this.transports[sessionId]) {
-      this.logger.debug(
-        `[${sessionId || 'No-Session'}] GET request failed - session not found`,
-      );
-      adaptedRes
-        .status(400)
-        .send('Bad Request: Mcp-Session-Id header is required');
+    if (!sessionId) {
+      adaptedRes.status(400).json({
+        jsonrpc: '2.0',
+        error: {
+          code: -32000,
+          message: 'Bad Request: Mcp-Session-Id header is required',
+        },
+        id: null,
+      });
+      return;
+    }
+
+    if (!this.transports[sessionId]) {
+      this.logger.debug(`[${sessionId}] GET request - session not found`);
+      adaptedRes.status(404).json({
+        jsonrpc: '2.0',
+        error: {
+          code: -32001,
+          message: 'Session not found',
+        },
+        id: null,
+      });
       return;
     }
 
@@ -342,7 +368,6 @@ export class McpStreamableHttpService {
    * Handle DELETE requests for terminating sessions
    */
   async handleDeleteRequest(req: any, res: any): Promise<void> {
-    // Get the appropriate HTTP adapter for the request/response
     const adapter = HttpAdapterFactory.getAdapter(req, res);
     const adaptedReq = adapter.adaptRequest(req);
     const adaptedRes = adapter.adaptResponse(res);
@@ -363,24 +388,43 @@ export class McpStreamableHttpService {
       | string
       | undefined;
 
-    if (!sessionId || !this.transports[sessionId]) {
-      this.logger.debug(
-        `[${sessionId || 'No-Session'}] DELETE request failed - session not found`,
-      );
-      adaptedRes.status(400).send('Invalid or missing session ID');
+    if (!sessionId) {
+      adaptedRes.status(400).json({
+        jsonrpc: '2.0',
+        error: {
+          code: -32000,
+          message: 'Bad Request: Mcp-Session-Id header is required',
+        },
+        id: null,
+      });
       return;
     }
 
-    this.logger.debug(`[${sessionId}] Terminating session`);
+    if (!this.transports[sessionId]) {
+      this.logger.debug(`[${sessionId}] DELETE request - session not found`);
+      adaptedRes.status(404).json({
+        jsonrpc: '2.0',
+        error: {
+          code: -32001,
+          message: 'Session not found',
+        },
+        id: null,
+      });
+      return;
+    }
+
+    this.logger.debug(`[${sessionId}] Processing DELETE request`);
     const transport = this.transports[sessionId];
 
-    // Let the transport handle termination; onclose handler will perform cleanup.
+    // Let transport handle the DELETE request
+    // The onsessionclosed callback will handle cleanup
     await transport.handleRequest(adaptedReq.raw, adaptedRes.raw);
-    // DO NOT call this.cleanupSession(sessionId) here to avoid double cleanup.
   }
 
-  // Helper function to detect initialize requests
-  isInitializeRequest(body: unknown): boolean {
+  /**
+   * Helper function to detect initialize requests
+   */
+  private isInitializeRequest(body: unknown): boolean {
     if (Array.isArray(body)) {
       return body.some(
         (msg) =>
@@ -398,12 +442,49 @@ export class McpStreamableHttpService {
     );
   }
 
-  // Clean up session resources
-  cleanupSession(sessionId: string): void {
-    if (sessionId) {
-      this.logger.debug(`[${sessionId}] Cleaning up session`);
+  /**
+   * Clean up session resources
+   */
+  private async cleanupSession(sessionId: string): Promise<void> {
+    if (!sessionId || !this.transports[sessionId]) {
+      return;
+    }
+
+    this.logger.debug(`[${sessionId}] Cleaning up session`);
+
+    try {
+      // Close transport if still open
+      const transport = this.transports[sessionId];
+      if (transport) {
+        await transport.close();
+      }
+
+      // Close MCP server
+      const server = this.mcpServers[sessionId];
+      if (server) {
+        await server.close();
+      }
+
+      // Clean up all references
       delete this.transports[sessionId];
       delete this.mcpServers[sessionId];
+      delete this.executors[sessionId];
+    } catch (error) {
+      this.logger.error(`[${sessionId}] Error during cleanup:`, error);
     }
   }
+
+  /**
+   * Clean up all sessions on module destroy
+   */
+  async onModuleDestroy(): Promise<void> {
+    this.logger.log('Cleaning up all MCP sessions...');
+    const sessionIds = Object.keys(this.transports);
+
+    await Promise.all(
+      sessionIds.map((sessionId) => this.cleanupSession(sessionId)),
+    );
+
+    this.logger.log(`Cleaned up ${sessionIds.length} MCP sessions`);
+  }
 }