@loop_ouroboros/mcp-hub-lite 1.2.9 → 1.3.1

package/dist/server/src/services/connection/connection-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../../../../src/services/connection/connection-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../../../../src/services/connection/connection-manager.ts"],"names":[],"mappings":"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"}

package/dist/server/src/services/connection/connection-manager.js

@@ -2,7 +2,7 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { TransportFactory } from '../../utils/transports/transport-factory.js';
 import { UnauthorizedError, auth } from '@modelcontextprotocol/sdk/client/auth.js';
 import { StreamableHttpTransport } from '../../utils/transports/streamable-http-transport.js';
-import { logger, LOG_MODULES, formatMcpMessageForLogging, logNotificationMessage } from '../../utils/logger.js';
+import { logger, LOG_MODULES, formatMcpMessageForLogging, logNotificationMessage } from '../../utils/logger/index.js';
 import { getAppVersion } from '../../utils/version.js';
 import { getMcpCommDebugSetting } from '../../utils/json-utils.js';
 import { logStorage } from '../log-storage.service.js';
@@ -117,7 +117,7 @@ export class McpConnectionManager {
                 // 4. Get server info
                 const serverInfo = this.getServerInfo(serverId);
                 // 5. Create transport and set up callbacks
-                const { transport, pid } = this.initializeTransport(server, serverInfo, compositeKey, serverName, serverIndex, oauthProvider ?? undefined);
+                const { transport } = this.initializeTransport(server, serverInfo, compositeKey, serverName, serverIndex, oauthProvider ?? undefined);
                 // Capture OAuth provider from the transport (reuse across retries)
                 if (!oauthProvider && transport instanceof StreamableHttpTransport) {
                     const provider = transport.getOAuthProvider();
@@ -134,16 +134,28 @@ export class McpConnectionManager {
                 }
                 // 6. Establish client connection
                 const client = await this.establishClientConnection(transport);
-                // 7. Register connection
+                // 7. Extract PID after transport is started
+                const pid = (() => {
+                    if ('pid' in transport && typeof transport.pid === 'number') {
+                        return transport.pid;
+                    }
+                    return undefined;
+                })();
+                // 8. Register connection
                 this.registerConnection(compositeKey, serverName, client, transport);
-                // 8. Update connected status
+                // 9. Update connected status
                 this.updateConnectedStatus(compositeKey, client, pid);
                 // 9. Publish connection events
                 this.publishConnectionEvents(serverName, serverIndex);
-                // 10. Refresh resources
-                await this.refreshServerResources(serverName, serverIndex, server.type);
-                // 11. Request log notifications from downstream server
-                await this.requestLoggingFromServer(compositeKey, client, server.type);
+                // 10. Refresh tools and resources (skip resources if server capability is absent)
+                const capabilities = typeof client.getServerCapabilities === 'function'
+                    ? client.getServerCapabilities()
+                    : undefined;
+                await this.refreshServerResources(serverName, serverIndex, !capabilities?.resources);
+                // 11. Request log notifications from downstream server (only if logging capability present)
+                if (capabilities?.logging) {
+                    await this.requestLoggingFromServer(compositeKey, client);
+                }
                 return true;
             }
             catch (error) {
@@ -249,7 +261,7 @@ export class McpConnectionManager {
             transport.send = async (message, options) => {
                 try {
                     const logMessage = formatMcpMessageForLogging(message);
-                    logger.debug(`MCP message sent: ${logMessage}`, LOG_MODULES.CONNECTION_MANAGER);
+                    logger.debug(`MCP message sent to [${compositeKey}]: ${logMessage}`, LOG_MODULES.CONNECTION_MANAGER);
                 }
                 catch {
                     logger.debug(`MCP message sent: [Error formatting response]`, LOG_MODULES.CONNECTION_MANAGER);
@@ -308,12 +320,7 @@ export class McpConnectionManager {
                 logStorage.append(compositeKey, 'error', `[${serverName}] [STDERR] ${data}`);
             };
         }
-        // Get PID if available (only for stdio transport)
-        let pid;
-        if ('pid' in transport && typeof transport.pid === 'number') {
-            pid = transport.pid;
-        }
-        return { transport, pid };
+        return { transport };
     }
     /**
      * Creates Client and connects to transport.
@@ -377,14 +384,12 @@ export class McpConnectionManager {
     }
     /**
      * Refreshes server tools and resources (only for bidirectional transports).
+     *
+     * @param skipResources - Skip resources/list request when server doesn't support resources capability
      */
-    async refreshServerResources(serverName, serverIndex, serverType) {
-        if (serverType === 'sse') {
-            logger.info('SSE transport is unidirectional, skipping tool/resource refresh', LOG_MODULES.CONNECTION_MANAGER);
-            return;
-        }
+    async refreshServerResources(serverName, serverIndex, skipResources = false) {
         const tools = await this.refreshTools(serverName, serverIndex);
-        const resources = await this.refreshResources(serverName, serverIndex);
+        const resources = skipResources ? [] : await this.refreshResources(serverName, serverIndex);
         eventBus.publish(EventTypes.TOOLS_UPDATED, {
             serverName,
             serverIndex,
@@ -400,10 +405,7 @@ export class McpConnectionManager {
      * Sends logging/setLevel request to downstream server to start receiving log notifications.
      * This is a best-effort request — servers that don't support logging will silently ignore it.
      */
-    async requestLoggingFromServer(compositeKey, client, serverType) {
-        // SSE is unidirectional — cannot send requests to the server
-        if (serverType === 'sse')
-            return;
+    async requestLoggingFromServer(compositeKey, client) {
         try {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             await client.request({ method: 'logging/setLevel', params: { level: 'info' } }, { timeout: 5000 });

package/dist/server/src/services/connection/tool-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-cache.d.ts","sourceRoot":"","sources":["../../../../../src/services/connection/tool-cache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAIzD;;;;;;GAMG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,qBAAqB,CAAkC;IAE/D;;;;;OAKG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAI9D;;;;OAIG;IACH,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAI3C;;;;OAIG;IACH,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IASjD;;;;;OAKG;IACH,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIvD;;;;;OAKG;IACH,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAS/C;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAWtE;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE;IAWzD;;;;;OAKG;IACH,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE;IAIhD;;;;;;OAMG;IACH,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAM/D;;;;OAIG;IACH,WAAW,IAAI,IAAI,EAAE;IAQrB;;;;OAIG;IACH,uBAAuB,IAAI,IAAI,EAAE;IAQjC;;;;OAIG;IACH,mBAAmB,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE;IAIzC;;;;;;OAMG;IACH,OAAO,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAI7C;;;;;OAKG;IACH,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAWzD;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;OAIG;IACH,IAAI,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAE3C;CACF"}
+{"version":3,"file":"tool-cache.d.ts","sourceRoot":"","sources":["../../../../../src/services/connection/tool-cache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAIzD;;;;;;GAMG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,qBAAqB,CAAkC;IAE/D;;;;;OAKG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAI9D;;;;OAIG;IACH,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAI3C;;;;OAIG;IACH,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IASjD;;;;;OAKG;IACH,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIvD;;;;;OAKG;IACH,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAS/C;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAWtE;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE;IAWzD;;;;;OAKG;IACH,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE;IAIhD;;;;;;OAMG;IACH,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAM/D;;;;OAIG;IACH,WAAW,IAAI,IAAI,EAAE;IAIrB;;;;OAIG;IACH,uBAAuB,IAAI,IAAI,EAAE;IAQjC;;;;OAIG;IACH,mBAAmB,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE;IAIzC;;;;;;OAMG;IACH,OAAO,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAI7C;;;;;OAKG;IACH,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAWzD;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAuB7B;;;;OAIG;IACH,IAAI,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAE3C;CACF"}

package/dist/server/src/services/connection/tool-cache.js

@@ -1,4 +1,4 @@
-import { logger, LOG_MODULES } from '../../utils/logger.js';
+import { logger, LOG_MODULES } from '../../utils/logger/index.js';
 import { getCompositeKey } from '../../utils/composite-key.js';
 import { normalizeToolName } from '../../utils/name-converter.js';
 /**
@@ -119,11 +119,7 @@ export class ToolCache {
      * @returns Array of all tools from all servers
      */
     getAllTools() {
-        const allTools = [];
-        for (const tools of this.toolCache.values()) {
-            allTools.push(...tools);
-        }
-        return allTools;
+        return this.getAllToolsByServerName();
     }
     /**
      * Gets all tools from the server name-level cache.
@@ -174,13 +170,19 @@ export class ToolCache {
      * @param serverName - The server name to update
      */
     updateServerNameCache(serverName) {
-        const allToolsForServer = [];
+        const toolMap = new Map();
         for (const [compositeKey, cachedTools] of this.toolCache.entries()) {
             const instanceServerName = this.getServerNameById(compositeKey);
             if (instanceServerName === serverName) {
-                allToolsForServer.push(...cachedTools);
+                for (const tool of cachedTools) {
+                    const key = normalizeToolName(tool.name);
+                    if (!toolMap.has(key)) {
+                        toolMap.set(key, tool);
+                    }
+                }
             }
         }
+        const allToolsForServer = Array.from(toolMap.values());
         if (allToolsForServer.length > 0) {
             this.serverNameToolCache.set(serverName, allToolsForServer);
         }

package/dist/server/src/services/event-bus.service.d.ts

@@ -22,7 +22,7 @@
  * automatically manages memory by cleaning up empty event type entries when all listeners
  * are unsubscribed.
  */
-import type { EventData } from '../models/event.model.js';
+type EventData = unknown;
 /**
  * Interface representing a published event with its type and associated data.
  *
@@ -154,6 +154,7 @@ export declare const EventTypes: {
     readonly SERVER_INSTANCE_UPDATED: "server-instance-updated";
     readonly SERVER_INSTANCE_DELETED: "server-instance-deleted";
     readonly TOOLS_UPDATED: "tools";
+    readonly AGGREGATED_TOOLS_CHANGED: "aggregated-tools-changed";
     readonly TOOL_CALL_STARTED: "tool-call-started";
     readonly TOOL_CALL_COMPLETED: "tool-call-completed";
     readonly TOOL_CALL_ERROR: "tool-call-error";
@@ -162,4 +163,5 @@ export declare const EventTypes: {
     readonly CONFIGURATION_UPDATED: "configuration-updated";
 };
 export declare const eventBus: EventBusService;
+export {};
 //# sourceMappingURL=event-bus.service.d.ts.map

package/dist/server/src/services/event-bus.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-bus.service.d.ts","sourceRoot":"","sources":["../../../../src/services/event-bus.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,SAAS,CAAqD;IAEtE;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IAajD;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,GAAG,MAAM,IAAI;IAU7E;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,WAAW;IAWnB;;;;;;;;;;;;;;OAcG;IACH,cAAc,IAAI,IAAI;IAItB;;;;;;;;;;;;;;OAcG;IACH,aAAa,IAAI,MAAM,EAAE;IAIzB;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAI5C;AAGD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;CA4Bb,CAAC;AAGX,eAAO,MAAM,QAAQ,iBAAwB,CAAC"}
+{"version":3,"file":"event-bus.service.d.ts","sourceRoot":"","sources":["../../../../src/services/event-bus.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,KAAK,SAAS,GAAG,OAAO,CAAC;AAEzB;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,SAAS,CAAqD;IAEtE;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IAajD;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,GAAG,MAAM,IAAI;IAU7E;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,WAAW;IAWnB;;;;;;;;;;;;;;OAcG;IACH,cAAc,IAAI,IAAI;IAItB;;;;;;;;;;;;;;OAcG;IACH,aAAa,IAAI,MAAM,EAAE;IAIzB;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAI5C;AAGD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;CA6Bb,CAAC;AAGX,eAAO,MAAM,QAAQ,iBAAwB,CAAC"}

package/dist/server/src/services/event-bus.service.js

@@ -181,6 +181,7 @@ export const EventTypes = {
     SERVER_INSTANCE_DELETED: 'server-instance-deleted',
     // Tool related events
     TOOLS_UPDATED: 'tools',
+    AGGREGATED_TOOLS_CHANGED: 'aggregated-tools-changed',
     TOOL_CALL_STARTED: 'tool-call-started',
     TOOL_CALL_COMPLETED: 'tool-call-completed',
     TOOL_CALL_ERROR: 'tool-call-error',

package/dist/server/src/services/gateway/gateway.service.d.ts

@@ -23,6 +23,7 @@ export declare class GatewayService {
     private transport;
     private readonly appVersion;
     constructor();
+    private initToolCache;
     private createServerWithHandlers;
     private registerHandlers;
     /**
@@ -52,6 +53,19 @@ export declare class GatewayService {
      * @returns {McpServer} New MCP server instance with all handlers registered
      */
     createConnectionServer(): McpServer;
+    /**
+     * Returns the singleton McpServer instance used for HTTP transport.
+     */
+    getServer(): McpServer;
+    /**
+     * Subscribes to EventBus events and pushes MCP notifications
+     * (notifications/resources/list_changed, notifications/tools/list_changed)
+     * to connected SSE clients via the singleton transport.
+     *
+     * Tools are aggregated by ServerName (multi-instance deduplication).
+     * Resources are per-instance (Category 1: hub://servers/{name}, Category 2: hub://servers/{name}/{idx}/{path}).
+     */
+    private initNotifications;
     /**
      * Starts the MCP gateway service on stdio transport.
      *

package/dist/server/src/services/gateway/gateway.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.service.d.ts","sourceRoot":"","sources":["../../../../../src/services/gateway/gateway.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAepE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5D,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAAqC;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;;IAOpC,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,gBAAgB;IAuDxB;;;;;OAKG;IACI,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC;IAIvF;;;;;OAKG;IACI,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM;IAI5C;;;;;OAKG;IACI,kBAAkB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM;IAIpD;;;;OAIG;IACI,sBAAsB,IAAI,SAAS;IAI1C;;;;OAIG;IACU,KAAK;CAKnB;AAED,eAAO,MAAM,OAAO,gBAAuB,CAAC"}
+{"version":3,"file":"gateway.service.d.ts","sourceRoot":"","sources":["../../../../../src/services/gateway/gateway.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAwBpE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5D,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAAqC;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;;IASpC,OAAO,CAAC,aAAa;IA0BrB,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,gBAAgB;IAkDxB;;;;;OAKG;IACI,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC;IAIvF;;;;;OAKG;IACI,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM;IAI5C;;;;;OAKG;IACI,kBAAkB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM;IAIpD;;;;OAIG;IACI,sBAAsB,IAAI,SAAS;IAI1C;;OAEG;IACI,SAAS,IAAI,SAAS;IAI7B;;;;;;;OAOG;IACH,OAAO,CAAC,iBAAiB;IAgEzB;;;;OAIG;IACU,KAAK;CAKnB;AAED,eAAO,MAAM,OAAO,gBAAuB,CAAC"}

package/dist/server/src/services/gateway/gateway.service.js

@@ -24,7 +24,11 @@ import { getGatewayDebugSetting } from '../../utils/json-utils.js';
 import { MCP_HUB_LITE_SERVER } from '../../models/system-tools.constants.js';
 import { registerInitializeHandlers, registerResourcesHandlers, registerSystemToolsHandlers, registerCallToolHandler } from './request-handlers/index.js';
 import { getAppVersion } from '../../utils/version.js';
-import { generateGatewayToolsList } from './tool-list-generator.js';
+import { eventBus, EventTypes } from '../event-bus.service.js';
+import { hubManager } from '../hub-manager.service.js';
+import { mcpConnectionManager } from '../connection/index.js';
+import { sessionManager } from './session-manager.js';
+import { generateGatewayToolsList, rebuildFromScratch, addToCache, removeFromCache } from './tool-list-generator.js';
 import { formatToolArgs, formatToolResponse } from './log-formatter.js';
 export class GatewayService {
     server;
@@ -33,6 +37,32 @@ export class GatewayService {
     constructor() {
         this.appVersion = getAppVersion();
         this.server = this.createServerWithHandlers();
+        this.initToolCache();
+        this.initNotifications();
+    }
+    initToolCache() {
+        rebuildFromScratch();
+        eventBus.subscribe(EventTypes.TOOLS_UPDATED, (rawData) => {
+            const data = rawData;
+            const serverConfig = hubManager.getServerByName(data.serverName);
+            if (serverConfig?.template?.aggregatedTools?.length) {
+                rebuildFromScratch();
+            }
+        });
+        eventBus.subscribe(EventTypes.SERVER_DISCONNECTED, (rawData) => {
+            const data = rawData;
+            const serverConfig = hubManager.getServerByName(data.serverName);
+            if (!serverConfig || serverConfig.template?.aggregatedTools?.length) {
+                rebuildFromScratch();
+            }
+        });
+        eventBus.subscribe(EventTypes.AGGREGATED_TOOLS_CHANGED, (rawData) => {
+            const data = rawData;
+            if (data.added.length > 0)
+                addToCache(data.name, data.added);
+            if (data.removed.length > 0)
+                removeFromCache(data.name, data.removed);
+        });
     }
     createServerWithHandlers() {
         if (getGatewayDebugSetting()) {
@@ -60,11 +90,6 @@ export class GatewayService {
         if (getGatewayDebugSetting()) {
             logger.debug('Registering handlers on MCP server', LOG_MODULES.GATEWAY_SERVICE);
         }
-        // Local toolMap for this connection
-        const toolMap = new Map();
-        if (getGatewayDebugSetting()) {
-            logger.debug('Created local toolMap for connection', LOG_MODULES.GATEWAY_SERVICE);
-        }
         try {
             registerInitializeHandlers(server);
             if (getGatewayDebugSetting()) {
@@ -96,7 +121,7 @@ export class GatewayService {
             throw error;
         }
         try {
-            registerCallToolHandler(server, toolMap);
+            registerCallToolHandler(server);
             if (getGatewayDebugSetting()) {
                 logger.debug('Call tool handler registered successfully', LOG_MODULES.GATEWAY_SERVICE);
             }
@@ -144,6 +169,75 @@ export class GatewayService {
     createConnectionServer() {
         return this.createServerWithHandlers();
     }
+    /**
+     * Returns the singleton McpServer instance used for HTTP transport.
+     */
+    getServer() {
+        return this.server;
+    }
+    /**
+     * Subscribes to EventBus events and pushes MCP notifications
+     * (notifications/resources/list_changed, notifications/tools/list_changed)
+     * to connected SSE clients via the singleton transport.
+     *
+     * Tools are aggregated by ServerName (multi-instance deduplication).
+     * Resources are per-instance (Category 1: hub://servers/{name}, Category 2: hub://servers/{name}/{idx}/{path}).
+     */
+    initNotifications() {
+        // --- Resources list_changed ---
+        // Category 1: new/removed server config
+        eventBus.subscribe(EventTypes.SERVER_ADDED, () => {
+            sessionManager.broadcastNotification('resources');
+        });
+        eventBus.subscribe(EventTypes.SERVER_DELETED, () => {
+            sessionManager.broadcastNotification('resources');
+        });
+        // Category 1 + 2: any instance connect/disconnect changes resource list
+        eventBus.subscribe(EventTypes.SERVER_CONNECTED, () => {
+            sessionManager.broadcastNotification('resources');
+        });
+        eventBus.subscribe(EventTypes.SERVER_DISCONNECTED, () => {
+            sessionManager.broadcastNotification('resources');
+        });
+        // Category 2: backend server resources refreshed
+        eventBus.subscribe(EventTypes.RESOURCES_UPDATED, () => {
+            sessionManager.broadcastNotification('resources');
+        });
+        // --- Tools list_changed ---
+        // Only notify when the first instance connects or last instance disconnects
+        eventBus.subscribe(EventTypes.SERVER_CONNECTED, (rawData) => {
+            const data = rawData;
+            const indexes = mcpConnectionManager.getConnectedIndexes(data.serverName);
+            if (indexes.length === 1) {
+                const serverConfig = hubManager.getServerByName(data.serverName);
+                if (serverConfig?.template?.aggregatedTools?.length) {
+                    sessionManager.broadcastNotification('tools');
+                }
+            }
+        });
+        eventBus.subscribe(EventTypes.SERVER_DISCONNECTED, (rawData) => {
+            const data = rawData;
+            const indexes = mcpConnectionManager.getConnectedIndexes(data.serverName);
+            if (indexes.length === 0) {
+                const serverConfig = hubManager.getServerByName(data.serverName);
+                if (serverConfig?.template?.aggregatedTools?.length) {
+                    sessionManager.broadcastNotification('tools');
+                }
+            }
+        });
+        // Backend server tools refreshed while connected
+        eventBus.subscribe(EventTypes.TOOLS_UPDATED, (rawData) => {
+            const data = rawData;
+            const serverConfig = hubManager.getServerByName(data.serverName);
+            if (serverConfig?.template?.aggregatedTools?.length) {
+                sessionManager.broadcastNotification('tools');
+            }
+        });
+        // Aggregated tools config changed
+        eventBus.subscribe(EventTypes.AGGREGATED_TOOLS_CHANGED, () => {
+            sessionManager.broadcastNotification('tools');
+        });
+    }
     /**
      * Starts the MCP gateway service on stdio transport.
      *

package/dist/server/src/services/gateway/global-transport.d.ts

@@ -1,19 +1,29 @@
 /**
- * MCP transport factory for per-request transport instances.
+ * MCP transport utilities — stateful session-based mode.
  *
- * This module provides a factory function to create isolated MCP transport and server instances
- * for each HTTP request, ensuring proper state isolation between concurrent clients.
+ * Each client session owns a StreamableHTTPServerTransport + McpServer pair.
+ * SDK's stateful mode (sessionIdGenerator) handles SSE stream setup and session management.
+ * Notifications are broadcast via SessionManager across all active sessions.
  */
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 /**
- * Creates a new MCP transport and server instance for a single request session.
- * Each call returns isolated instances that should be cleaned up after the request completes.
- *
- * @returns {Promise<{ transport: StreamableHTTPServerTransport, server: import('@modelcontextprotocol/sdk/server/mcp.js').McpServer }>}
- *          Object containing the transport and server instances
+ * Sets up debug logging on a transport instance.
+ */
+export declare function setupTransportLogging(transport: StreamableHTTPServerTransport): void;
+/**
+ * Initializes the global transport layer.
+ * With stateful session-based transport, this is a no-op.
+ * Kept for backward compatibility with app.ts startup sequence.
+ */
+export declare function initGlobalTransport(): void;
+/**
+ * Creates a new MCP transport and server instance for a single request (stateless mode).
+ * Each call returns isolated instances that should be GC'd after the request completes.
+ * This restores the v1.3.0 per-request transport pattern for clients like CherryStudio
+ * that do not properly support stateful sessions.
  */
-export declare function createSessionTransport(): Promise<{
+export declare function createPerRequestTransport(): Promise<{
     transport: StreamableHTTPServerTransport;
-    server: import("@modelcontextprotocol/sdk/server/mcp").McpServer;
+    server: import('@modelcontextprotocol/sdk/server/mcp.js').McpServer;
 }>;
 //# sourceMappingURL=global-transport.d.ts.map

package/dist/server/src/services/gateway/global-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-transport.d.ts","sourceRoot":"","sources":["../../../../../src/services/gateway/global-transport.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAUnG;;;;;;GAMG;AACH,wBAAsB,sBAAsB;;;GAqE3C"}
+{"version":3,"file":"global-transport.d.ts","sourceRoot":"","sources":["../../../../../src/services/gateway/global-transport.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAuBnG;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,6BAA6B,GAAG,IAAI,CAmCpF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAI1C;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,IAAI,OAAO,CAAC;IACzD,SAAS,EAAE,6BAA6B,CAAC;IACzC,MAAM,EAAE,OAAO,yCAAyC,EAAE,SAAS,CAAC;CACrE,CAAC,CAWD"}

package/dist/server/src/services/gateway/global-transport.js

@@ -1,72 +1,88 @@
 /**
- * MCP transport factory for per-request transport instances.
+ * MCP transport utilities — stateful session-based mode.
  *
- * This module provides a factory function to create isolated MCP transport and server instances
- * for each HTTP request, ensuring proper state isolation between concurrent clients.
+ * Each client session owns a StreamableHTTPServerTransport + McpServer pair.
+ * SDK's stateful mode (sessionIdGenerator) handles SSE stream setup and session management.
+ * Notifications are broadcast via SessionManager across all active sessions.
  */
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import { gateway } from './gateway.service.js';
 import { logger, LOG_MODULES } from '../../utils/logger/index.js';
 import { stringifyForLogging, getMcpCommDebugSetting, getGatewayDebugSetting } from '../../utils/json-utils.js';
 import { formatMcpMessageForLogging, logNotificationMessage } from '../../utils/logger/log-output.js';
+import { gateway } from './gateway.service.js';
 /**
- * Creates a new MCP transport and server instance for a single request session.
- * Each call returns isolated instances that should be cleaned up after the request completes.
- *
- * @returns {Promise<{ transport: StreamableHTTPServerTransport, server: import('@modelcontextprotocol/sdk/server/mcp.js').McpServer }>}
- *          Object containing the transport and server instances
+ * Build log options from trace context stored on transport.
+ * Trace context is injected by gateway.ts before handleRequest() as an ALS fallback
+ * because the MCP SDK defers send()/onmessage calls and ALS context is lost.
  */
-export async function createSessionTransport() {
-    const transport = new StreamableHTTPServerTransport();
-    const server = gateway.createConnectionServer();
-    // Set up message logging (use empty string for sessionId in per-request mode)
+function traceLogOpts(transport) {
+    const ctx = transport;
+    const sid = ctx._traceSessionId;
+    const tid = ctx._traceId;
+    if (!sid && !tid)
+        return LOG_MODULES.COMMUNICATION;
+    return { module: 'Communication', ...(sid && { sessionId: sid }), ...(tid && { traceId: tid }) };
+}
+/**
+ * Sets up debug logging on a transport instance.
+ */
+export function setupTransportLogging(transport) {
     transport.onmessage = (message) => {
         try {
             if (getMcpCommDebugSetting()) {
-                logger.debug(`Session transport onmessage called with: ${stringifyForLogging(message)}`, LOG_MODULES.COMMUNICATION);
+                const opts = traceLogOpts(transport);
+                logger.debug(`Transport onmessage: ${stringifyForLogging(message)}`, opts);
                 const logMessage = formatMcpMessageForLogging(message);
-                logger.debug(`MCP message received: ${logMessage}`, LOG_MODULES.COMMUNICATION);
+                logger.debug(`MCP message received: ${logMessage}`, opts);
             }
-            logNotificationMessage(message, ''); // Empty sessionId for per-request
+            logNotificationMessage(message, '');
             if (getGatewayDebugSetting()) {
-                logger.debug(`Session transport onmessage completed successfully`, LOG_MODULES.GATEWAY);
+                logger.debug('Transport onmessage completed', LOG_MODULES.GATEWAY);
             }
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
-            logger.error(`Error in session transport onmessage handler: ${errorMessage}`, LOG_MODULES.GATEWAY);
+            logger.error(`Error in transport onmessage: ${errorMessage}`, LOG_MODULES.GATEWAY);
             logger.error(`Message that caused error: ${stringifyForLogging(message)}`, LOG_MODULES.GATEWAY);
         }
     };
-    // Wrap send method for debug logging
     if (getMcpCommDebugSetting()) {
         const originalSend = transport.send;
         transport.send = async (message, options) => {
             try {
                 const logMessage = formatMcpMessageForLogging(message);
-                logger.debug(`MCP message sent: ${logMessage}`, LOG_MODULES.COMMUNICATION);
+                logger.debug(`MCP message sent: ${logMessage}`, traceLogOpts(transport));
             }
             catch {
-                logger.debug(`MCP message sent: [Error formatting response]`, LOG_MODULES.COMMUNICATION);
+                logger.debug('MCP message sent: [Error formatting response]', LOG_MODULES.COMMUNICATION);
             }
             return await originalSend.call(transport, message, options);
         };
     }
-    // Connect server to transport
+}
+/**
+ * Initializes the global transport layer.
+ * With stateful session-based transport, this is a no-op.
+ * Kept for backward compatibility with app.ts startup sequence.
+ */
+export function initGlobalTransport() {
     if (getGatewayDebugSetting()) {
-        logger.debug('About to connect session server to transport', LOG_MODULES.GATEWAY);
-    }
-    try {
-        await server.connect(transport);
-        if (getGatewayDebugSetting()) {
-            logger.debug('MCP session transport initialized (per-request mode)', LOG_MODULES.GATEWAY);
-        }
+        logger.debug('Global transport layer initialized (stateful session mode)', LOG_MODULES.GATEWAY);
     }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        logger.error(`Failed to connect session server to transport: ${errorMessage}`, LOG_MODULES.GATEWAY);
-        logger.error(`Transport connection error details: ${stringifyForLogging(error)}`, LOG_MODULES.GATEWAY);
-        throw error;
+}
+/**
+ * Creates a new MCP transport and server instance for a single request (stateless mode).
+ * Each call returns isolated instances that should be GC'd after the request completes.
+ * This restores the v1.3.0 per-request transport pattern for clients like CherryStudio
+ * that do not properly support stateful sessions.
+ */
+export async function createPerRequestTransport() {
+    const transport = new StreamableHTTPServerTransport();
+    const server = gateway.createConnectionServer();
+    setupTransportLogging(transport);
+    await server.connect(transport);
+    if (getGatewayDebugSetting()) {
+        logger.debug('MCP per-request transport initialized (stateless mode)', LOG_MODULES.GATEWAY);
     }
     return { transport, server };
 }

package/dist/server/src/services/gateway/request-handlers/call-tool-handler.d.ts

@@ -2,12 +2,11 @@
  * Call tool request handler for Gateway service.
  */
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { ToolMapEntry } from '../types.js';
 /**
  * Register call tool handler on the MCP server.
  *
  * @param server - MCP server instance to register handlers on
  * @param toolMap - Tool map for routing tool calls
  */
-export declare function registerCallToolHandler(server: McpServer, toolMap: Map<string, ToolMapEntry>): void;
+export declare function registerCallToolHandler(server: McpServer): void;
 //# sourceMappingURL=call-tool-handler.d.ts.map

package/dist/server/src/services/gateway/request-handlers/call-tool-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call-tool-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/services/gateway/request-handlers/call-tool-handler.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAezE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAgFhD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GACjC,IAAI,CA8FN"}
+{"version":3,"file":"call-tool-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/services/gateway/request-handlers/call-tool-handler.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA4FzE;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAwG/D"}