@loop_ouroboros/mcp-hub-lite 1.3.0 → 1.3.2

package/dist/server/src/services/gateway/session-manager.js

@@ -0,0 +1,256 @@
+/**
+ * Session Manager for stateful Streamable HTTP MCP transport.
+ *
+ * Each client session owns a StreamableHTTPServerTransport + McpServer pair.
+ * Sessions are identified by mcp-session-id header (generated by the SDK).
+ * Notifications are broadcast to all active sessions via their McpServer instances.
+ */
+import { logger, LOG_MODULES } from '../../utils/logger/index.js';
+import { getGatewayDebugSetting } from '../../utils/json-utils.js';
+import { configManager } from '../../config/config-manager.js';
+const CLEANUP_INTERVAL_MS = 60 * 1000; // every minute
+const PING_COOLDOWN_MS = 30 * 1000; // min interval between pings
+const PING_TIMEOUT_MS = 10 * 1000; // per-ping timeout
+export class SessionManager {
+    sessions = new Map();
+    cleanupTimer = null;
+    pendingClientMetadata = new WeakMap();
+    /**
+     * Registers a newly created session.
+     */
+    addSession(sessionId, transport, server) {
+        const pendingMeta = this.pendingClientMetadata.get(server);
+        this.pendingClientMetadata.delete(server);
+        this.sessions.set(sessionId, {
+            sessionId,
+            transport,
+            server,
+            createdAt: Date.now(),
+            lastAccessedAt: Date.now(),
+            isClosing: false,
+            activeSseCount: 0,
+            lastPingedAt: 0,
+            pingPending: false,
+            clientName: pendingMeta?.clientName,
+            clientVersion: pendingMeta?.clientVersion,
+            protocolVersion: pendingMeta?.protocolVersion,
+            createdByMethod: 'POST',
+            lastMethod: 'POST'
+        });
+        if (getGatewayDebugSetting()) {
+            logger.debug(`Session registered: ${sessionId} (total: ${this.sessions.size}, activeSseCount: 0)`, LOG_MODULES.GATEWAY);
+        }
+        this.ensureCleanupTimer();
+    }
+    /**
+     * Looks up an existing session by ID and updates lastAccessedAt.
+     */
+    getSession(sessionId) {
+        const session = this.sessions.get(sessionId);
+        if (session && !session.isClosing) {
+            session.lastAccessedAt = Date.now();
+            return session;
+        }
+        return undefined;
+    }
+    /**
+     * Marks an SSE stream as opened for the given session.
+     * Prevents the session from being cleaned up while the stream is active.
+     */
+    markSseOpened(sessionId) {
+        const session = this.sessions.get(sessionId);
+        if (session && !session.isClosing) {
+            session.activeSseCount++;
+            if (getGatewayDebugSetting()) {
+                logger.debug(`Session ${sessionId} SSE opened (activeSseCount: ${session.activeSseCount})`, LOG_MODULES.GATEWAY);
+            }
+        }
+    }
+    /**
+     * Marks an SSE stream as closed for the given session.
+     */
+    markSseClosed(sessionId) {
+        const session = this.sessions.get(sessionId);
+        if (session) {
+            session.activeSseCount = Math.max(0, session.activeSseCount - 1);
+            if (getGatewayDebugSetting()) {
+                logger.debug(`Session ${sessionId} SSE closed (activeSseCount: ${session.activeSseCount})`, LOG_MODULES.GATEWAY);
+            }
+        }
+    }
+    /**
+     * Removes a session (called on DELETE or onsessionclosed).
+     */
+    removeSession(sessionId) {
+        const session = this.sessions.get(sessionId);
+        if (!session || session.isClosing)
+            return;
+        session.isClosing = true;
+        try {
+            session.transport.close().catch((err) => {
+                logger.debug(`Error closing transport for session ${sessionId}: ${err}`, LOG_MODULES.GATEWAY);
+            });
+        }
+        catch {
+            // transport may already be closed
+        }
+        this.sessions.delete(sessionId);
+        if (getGatewayDebugSetting()) {
+            logger.debug(`Session removed: ${sessionId} (total: ${this.sessions.size}, age: ${Date.now() - session.createdAt}ms, activeSseCount: ${session.activeSseCount})`, LOG_MODULES.GATEWAY);
+        }
+    }
+    pendingBroadcasts = new Map();
+    BROADCAST_DEBOUNCE_MS = 3000;
+    /**
+     * Broadcasts a notification to all active sessions.
+     * Debounced: same-type notifications within BROADCAST_DEBOUNCE_MS are coalesced.
+     * @param method - 'tools' for sendToolListChanged, 'resources' for sendResourceListChanged
+     */
+    broadcastNotification(method) {
+        // Skip if a debounce timer for this method type is already pending
+        if (this.pendingBroadcasts.has(method))
+            return;
+        this.pendingBroadcasts.set(method, setTimeout(() => {
+            this.pendingBroadcasts.delete(method);
+            if (this.sessions.size === 0)
+                return;
+            for (const [sessionId, state] of this.sessions) {
+                if (state.isClosing)
+                    continue;
+                try {
+                    if (method === 'tools') {
+                        state.server.sendToolListChanged();
+                    }
+                    else {
+                        state.server.sendResourceListChanged();
+                    }
+                }
+                catch (error) {
+                    logger.debug(`Failed to broadcast ${method} notification to session ${sessionId}: ${error}`, LOG_MODULES.GATEWAY);
+                }
+            }
+        }, this.BROADCAST_DEBOUNCE_MS));
+    }
+    /**
+     * Removes sessions that have been idle longer than SESSION_TIMEOUT_MS.
+     */
+    cleanupStaleSessions() {
+        const now = Date.now();
+        const staleIds = [];
+        let skippedClosing = 0;
+        let skippedSse = 0;
+        let pingFailed = 0;
+        for (const [id, state] of this.sessions) {
+            if (state.isClosing) {
+                skippedClosing++;
+                continue;
+            }
+            // Ping from last cycle timed out — session is dead
+            if (state.pingPending) {
+                state.pingPending = false;
+                pingFailed++;
+                staleIds.push(id);
+                continue;
+            }
+            if (state.activeSseCount > 0) {
+                if (now - state.lastPingedAt < PING_COOLDOWN_MS) {
+                    skippedSse++;
+                    continue;
+                }
+                state.lastPingedAt = now;
+                state.pingPending = true;
+                // Fire-and-forget concurrent ping with timeout
+                const pingWithTimeout = Promise.race([
+                    state.server.server.ping(),
+                    new Promise((_, reject) => setTimeout(() => reject(new Error('Ping timeout')), PING_TIMEOUT_MS))
+                ]);
+                pingWithTimeout.then(() => {
+                    const s = this.sessions.get(id);
+                    if (s) {
+                        s.pingPending = false;
+                        s.lastAccessedAt = Date.now();
+                    }
+                }, () => {
+                    // Keep pingPending=true so the next cycle cleans up this dead session
+                });
+                skippedSse++;
+                continue;
+            }
+            if (now - state.lastAccessedAt > configManager.getConfig().security.idleConnectionTimeout) {
+                staleIds.push(id);
+            }
+        }
+        if (getGatewayDebugSetting() && (staleIds.length > 0 || skippedSse > 0 || pingFailed > 0)) {
+            logger.debug(`Stale cleanup: total=${this.sessions.size} stale=${staleIds.length} skippedClosing=${skippedClosing} skippedSse=${skippedSse} pingFailed=${pingFailed}`, LOG_MODULES.GATEWAY);
+        }
+        for (const id of staleIds) {
+            logger.info(`Removing stale session: ${id}`, LOG_MODULES.GATEWAY);
+            this.removeSession(id);
+        }
+    }
+    ensureCleanupTimer() {
+        if (this.cleanupTimer)
+            return;
+        this.cleanupTimer = setInterval(() => this.cleanupStaleSessions(), CLEANUP_INTERVAL_MS);
+        this.cleanupTimer.unref();
+    }
+    /**
+     * Shuts down all sessions. Called on server shutdown.
+     */
+    shutdownAll() {
+        if (this.cleanupTimer) {
+            clearInterval(this.cleanupTimer);
+            this.cleanupTimer = null;
+        }
+        for (const timer of this.pendingBroadcasts.values()) {
+            clearTimeout(timer);
+        }
+        this.pendingBroadcasts.clear();
+        for (const [id] of this.sessions) {
+            this.removeSession(id);
+        }
+        logger.info('All sessions shut down', LOG_MODULES.GATEWAY);
+    }
+    /** Returns the current session count (for diagnostics). */
+    get sessionCount() {
+        return this.sessions.size;
+    }
+    /**
+     * Stores client metadata against a McpServer instance so that
+     * addSession() can consume it when the session is registered later.
+     */
+    storePendingClientMetadata(server, metadata) {
+        this.pendingClientMetadata.set(server, metadata);
+    }
+    /**
+     * Returns metadata for all active sessions. Does not expose internal
+     * transport or server references.
+     */
+    getAllSessions() {
+        const result = [];
+        for (const state of this.sessions.values()) {
+            result.push({
+                sessionId: state.sessionId,
+                clientName: state.clientName,
+                clientVersion: state.clientVersion,
+                protocolVersion: state.protocolVersion,
+                createdByMethod: state.createdByMethod,
+                lastMethod: state.lastMethod,
+                createdAt: new Date(state.createdAt).toLocaleString(),
+                lastAccessedAt: new Date(state.lastAccessedAt).toLocaleString(),
+                isClosing: state.isClosing,
+                activeSseCount: state.activeSseCount
+            });
+        }
+        return result;
+    }
+    /** Updates the last HTTP method seen for a session. */
+    updateSessionMethod(sessionId, method) {
+        const session = this.sessions.get(sessionId);
+        if (session) {
+            session.lastMethod = method;
+        }
+    }
+}
+/** Singleton instance. */
+export const sessionManager = new SessionManager();

package/dist/server/src/services/hub-tools/resource-generator.d.ts

@@ -58,5 +58,5 @@ export declare function generateDynamicResources(): Resource[];
  * const tools = await readResource('hub://servers/my-mcp-server/tools');
  * ```
  */
-export declare function readResource(uri: string): Promise<ServerMetadata | Resource[] | string | unknown>;
+export declare function readResource(uri: string, language?: string): Promise<ServerMetadata | Resource[] | string | unknown>;
 //# sourceMappingURL=resource-generator.d.ts.map

package/dist/server/src/services/hub-tools/resource-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-generator.d.ts","sourceRoot":"","sources":["../../../../../src/services/hub-tools/resource-generator.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAiLlE;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,IAAI,QAAQ,EAAE,CAqErD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,cAAc,GAAG,QAAQ,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC,CAyGzD"}
+{"version":3,"file":"resource-generator.d.ts","sourceRoot":"","sources":["../../../../../src/services/hub-tools/resource-generator.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAmLlE;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,IAAI,QAAQ,EAAE,CAqErD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,GAAG,QAAQ,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC,CAyGzD"}

package/dist/server/src/services/hub-tools/resource-generator.js

@@ -104,27 +104,29 @@ function parseHubUri(uri) {
  */
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const USE_GUIDE_PATH = join(__dirname, 'use-guide.md');
+const USE_GUIDE_PATH_ZH = join(__dirname, 'use-guide-zh.md');
+const USE_GUIDE_PATH_EN = join(__dirname, 'use-guide-en.md');
 /**
  * Loads the use guide content from the Markdown file.
  *
- * @returns {string} Markdown formatted use guide content
+ * @param language - Language code ('zh' for Chinese, defaults to 'en')
+ * @returns Markdown formatted use guide content
  */
-function loadUseGuideContent() {
+function loadUseGuideContent(language) {
+    const path = language === 'zh' ? USE_GUIDE_PATH_ZH : USE_GUIDE_PATH_EN;
     try {
-        return fs.readFileSync(USE_GUIDE_PATH, 'utf-8');
+        return fs.readFileSync(path, 'utf-8');
     }
     catch {
-        // Fallback in case the file can't be read
         return `# MCP Hub Lite Use Guide
 
 ## Overview
 
 MCP Hub Lite is a lightweight MCP (Model Context Protocol) gateway that acts as a unified interface between AI assistants and multiple backend MCP servers.
 
-## Note
+Use \`resources/list\` to discover servers, then \`list_tools\` / \`get_tool\` / \`call_tool\` to interact with them.
 
-The complete use guide is currently unavailable. Please check the MCP Hub Lite documentation at https://github.com/your-org/mcp-hub-lite for more information.
+The complete use guide is currently unavailable. Please check the documentation for more information.
 `;
     }
 }
@@ -248,14 +250,14 @@ export function generateDynamicResources() {
  * const tools = await readResource('hub://servers/my-mcp-server/tools');
  * ```
  */
-export async function readResource(uri) {
+export async function readResource(uri, language) {
     // Validate URI format
     if (!uri.startsWith('hub://')) {
         throw new Error(`Invalid Hub resource URI: ${uri}. Must start with 'hub://'`);
     }
     // Check for use-guide resource first
     if (uri === USE_GUIDE_URI) {
-        return loadUseGuideContent();
+        return loadUseGuideContent(language);
     }
     // Parse URI
     const parsed = parseHubUri(uri);

package/dist/server/src/services/hub-tools/system-tool-definitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system-tool-definitions.d.ts","sourceRoot":"","sources":["../../../../../src/services/hub-tools/system-tool-definitions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAY/D;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,cAAc,IAAI,oBAAoB,EAAE,CAwLvD"}
+{"version":3,"file":"system-tool-definitions.d.ts","sourceRoot":"","sources":["../../../../../src/services/hub-tools/system-tool-definitions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAY/D;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,cAAc,IAAI,oBAAoB,EAAE,CA+LvD"}

package/dist/server/src/services/hub-tools/system-tool-definitions.js

@@ -185,6 +185,13 @@ export function getSystemTools() {
                             query: {
                                 type: 'string',
                                 description: 'Search query to match against tool names and descriptions'
+                            },
+                            limit: {
+                                type: 'integer',
+                                description: 'Maximum number of results to return per server (1-10, default 5)',
+                                minimum: 1,
+                                maximum: 10,
+                                default: 5
                             }
                         },
                         required: ['query']

package/dist/server/src/services/hub-tools.service.d.ts

@@ -202,7 +202,7 @@ export declare class HubToolsService {
      * @returns {Promise<Record<string, { description: string; tools: ToolSummary[] }>>}
      * Object mapping server names to their descriptions and matching tools
      */
-    searchTools(query: string): Promise<Record<string, {
+    searchTools(query: string, limit?: number): Promise<Record<string, {
         description: string;
         tools: ToolSummary[];
     }>>;

package/dist/server/src/services/hub-tools.service.d.ts.map

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

package/dist/server/src/services/hub-tools.service.js

@@ -1,10 +1,12 @@
 import { hubManager } from './hub-manager.service.js';
 import { mcpConnectionManager } from './connection/index.js';
+import { configManager } from '../config/config-manager.js';
 import { eventBus, EventTypes } from './event-bus.service.js';
 import { generateGatewayToolsList } from './gateway/tool-list-generator.js';
 import { logger, LOG_MODULES } from '../utils/logger/index.js';
 import { stringifyForLogging } from '../utils/json-utils.js';
 import { normalizeToolName } from '../utils/name-converter.js';
+import { countMatchingTokens } from '../utils/search-matcher.js';
 import { McpError } from '@modelcontextprotocol/sdk/types.js';
 import { MCP_HUB_LITE_SERVER, LIST_SERVERS_TOOL, LIST_TOOLS_TOOL, GET_TOOL_TOOL, CALL_TOOL_TOOL, UPDATE_SERVER_DESCRIPTION_TOOL, LIST_TAGS_TOOL, SEARCH_TOOLS_TOOL, SYSTEM_TOOL_NAMES } from '../models/system-tools.constants.js';
 import { ToolArgsParser } from '../utils/tool-args-parser.js';
@@ -600,11 +602,11 @@ export class HubToolsService {
      * @returns {Promise<Record<string, { description: string; tools: ToolSummary[] }>>}
      * Object mapping server names to their descriptions and matching tools
      */
-    async searchTools(query) {
+    async searchTools(query, limit = 5) {
         if (!query || typeof query !== 'string') {
             throw new Error('query is required and must be a non-empty string');
         }
-        const normalizedQuery = query.toLowerCase();
+        const effectiveLimit = Math.min(Math.max(1, limit), 10);
         const servers = hubManager.getAllServers();
         const result = {};
         for (const server of servers) {
@@ -620,21 +622,26 @@ export class HubToolsService {
             if (tools.length === 0) {
                 continue;
             }
-            const matchingTools = tools
-                .filter((tool) => {
-                const nameMatch = tool.name.toLowerCase().includes(normalizedQuery);
-                const descMatch = tool.description?.toLowerCase().includes(normalizedQuery);
-                return nameMatch || descMatch;
+            const scored = tools
+                .map((tool) => {
+                const matchCount = countMatchingTokens(query, [tool.name, tool.description || '']);
+                return {
+                    tool,
+                    matchCount,
+                    summary: {
+                        name: tool.name,
+                        description: tool.description,
+                        serverName: server.name
+                    }
+                };
             })
-                .map((tool) => ({
-                name: tool.name,
-                description: tool.description,
-                serverName: server.name
-            }));
-            if (matchingTools.length > 0) {
+                .filter((item) => item.matchCount > 0)
+                .sort((a, b) => b.matchCount - a.matchCount)
+                .slice(0, effectiveLimit);
+            if (scored.length > 0) {
                 result[server.name] = {
                     description,
-                    tools: matchingTools
+                    tools: scored.map((item) => item.summary)
                 };
             }
         }
@@ -668,7 +675,8 @@ export class HubToolsService {
      * @throws {Error} If URI format is invalid, server not found, or resource type unknown
      */
     async readResource(uri) {
-        return readResourceUtil(uri);
+        const language = configManager.getConfig().system.language;
+        return readResourceUtil(uri, language);
     }
 }
 export const hubToolsService = new HubToolsService();

package/dist/server/src/services/system-tool-handler.js

@@ -63,7 +63,7 @@ export class SystemToolHandler {
                     if (!searchArgs.query) {
                         throw new McpError(-32802, 'query is required for search_tools');
                     }
-                    result = await hubToolsService.searchTools(searchArgs.query);
+                    result = await hubToolsService.searchTools(searchArgs.query, searchArgs.limit);
                     break;
                 }
                 default:

package/dist/server/src/utils/json-utils.d.ts

@@ -25,6 +25,7 @@ type ConfigGetter = () => {
             mcpCommDebug: boolean;
             apiDebug: boolean;
             gatewayDebug: boolean;
+            showTraceContext?: boolean;
         };
     };
 };
@@ -72,6 +73,14 @@ export declare function getApiDebugSetting(): boolean;
  * @returns boolean indicating whether to enable Gateway debug logging
  */
 export declare function getGatewayDebugSetting(): boolean;
+/**
+ * Get the showTraceContext configuration value.
+ * Controls whether [SSN]/[TID]/[SID] trace context markers appear in log output.
+ * Defaults to true.
+ *
+ * @returns boolean indicating whether to show trace context in logs
+ */
+export declare function getShowTraceContextSetting(): boolean;
 /**
  * Stringify object for logging with dynamic pretty formatting based on LOG_JSON_PRETTY environment variable
  * @param obj Object to stringify

package/dist/server/src/utils/json-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/json-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAExD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAiED;;GAEG;AACH,KAAK,YAAY,GAAG,MAAM;IACxB,MAAM,EAAE;QACN,OAAO,EAAE;YACP,UAAU,EAAE,OAAO,CAAC;YACpB,YAAY,EAAE,OAAO,CAAC;YACtB,QAAQ,EAAE,OAAO,CAAC;YAClB,YAAY,EAAE,OAAO,CAAC;SACvB,CAAC;KACH,CAAC;CACH,CAAC;AAQF;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI,CAE3E;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAU/E;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAG1E;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAiB9C;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAUhD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAU5C;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAUhD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAOxD;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,OAAO,EACZ,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,GAClD,MAAM,CAOR"}
+{"version":3,"file":"json-utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/json-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAExD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAiED;;GAEG;AACH,KAAK,YAAY,GAAG,MAAM;IACxB,MAAM,EAAE;QACN,OAAO,EAAE;YACP,UAAU,EAAE,OAAO,CAAC;YACpB,YAAY,EAAE,OAAO,CAAC;YACtB,QAAQ,EAAE,OAAO,CAAC;YAClB,YAAY,EAAE,OAAO,CAAC;YACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;SAC5B,CAAC;KACH,CAAC;CACH,CAAC;AAQF;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI,CAE3E;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAU/E;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAG1E;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAiB9C;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAUhD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAU5C;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAUhD;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAUpD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAOxD;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,OAAO,EACZ,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,GAClD,MAAM,CAOR"}

package/dist/server/src/utils/json-utils.js

@@ -198,6 +198,25 @@ export function getGatewayDebugSetting() {
     }
     return getDefaultForDevMode(false);
 }
+/**
+ * Get the showTraceContext configuration value.
+ * Controls whether [SSN]/[TID]/[SID] trace context markers appear in log output.
+ * Defaults to true.
+ *
+ * @returns boolean indicating whether to show trace context in logs
+ */
+export function getShowTraceContextSetting() {
+    if (_configGetter) {
+        try {
+            const config = _configGetter();
+            return config.system.logging.showTraceContext ?? true;
+        }
+        catch {
+            // Fall through to default if config getter fails
+        }
+    }
+    return true; // default enabled
+}
 /**
  * Stringify object for logging with dynamic pretty formatting based on LOG_JSON_PRETTY environment variable
  * @param obj Object to stringify

package/dist/server/src/utils/logger/index.d.ts

@@ -7,7 +7,7 @@ export { LOG_MODULES } from './log-modules.js';
 export type { LogModuleKey, LogModule } from './log-modules.js';
 export { COLORS, getColorCodeForLevel, getResetColor } from './log-colors.js';
 export { formatTimestamp, formatLogLevel, formatPid, createColoredLogMessage, createLogMessage, formatError } from './log-formatter.js';
-export { isToolsListResponse, simplifyToolsListResponse, hasImageContent, simplifyImageContent, formatMcpMessageForLogging, isNotificationMessage, logNotificationMessage } from './log-output.js';
+export { isToolsListResponse, simplifyToolsListResponse, hasImageContent, simplifyImageContent, hasDataUriImage, simplifyDataUriImages, formatMcpMessageForLogging, isNotificationMessage, logNotificationMessage } from './log-output.js';
 export { Logger } from './logger.js';
 import { Logger } from './logger.js';
 export declare const logger: Logger;

package/dist/server/src/utils/logger/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/utils/logger/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGhE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG9E,OAAO,EACL,eAAe,EACf,cAAc,EACd,SAAS,EACT,uBAAuB,EACvB,gBAAgB,EAChB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,eAAe,EACf,oBAAoB,EACpB,0BAA0B,EAC1B,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,eAAO,MAAM,MAAM,QAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/utils/logger/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGhE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG9E,OAAO,EACL,eAAe,EACf,cAAc,EACd,SAAS,EACT,uBAAuB,EACvB,gBAAgB,EAChB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,qBAAqB,EACrB,0BAA0B,EAC1B,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,eAAO,MAAM,MAAM,QAAe,CAAC"}

package/dist/server/src/utils/logger/index.js

@@ -9,7 +9,7 @@ export { COLORS, getColorCodeForLevel, getResetColor } from './log-colors.js';
 // Re-export formatter utilities
 export { formatTimestamp, formatLogLevel, formatPid, createColoredLogMessage, createLogMessage, formatError } from './log-formatter.js';
 // Re-export output utilities
-export { isToolsListResponse, simplifyToolsListResponse, hasImageContent, simplifyImageContent, formatMcpMessageForLogging, isNotificationMessage, logNotificationMessage } from './log-output.js';
+export { isToolsListResponse, simplifyToolsListResponse, hasImageContent, simplifyImageContent, hasDataUriImage, simplifyDataUriImages, formatMcpMessageForLogging, isNotificationMessage, logNotificationMessage } from './log-output.js';
 // Re-export main Logger class
 export { Logger } from './logger.js';
 // Create and export the default logger instance

package/dist/server/src/utils/logger/log-context.d.ts

@@ -6,6 +6,7 @@ export interface LogContext {
     pid?: number;
     serverName?: string;
     module?: string;
+    sessionId?: string;
     traceId?: string;
     spanId?: string;
     caller?: string;

package/dist/server/src/utils/logger/log-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log-context.d.ts","sourceRoot":"","sources":["../../../../../src/utils/logger/log-context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,UAAU;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,YAAY,CAAC,CAAC"}
+{"version":3,"file":"log-context.d.ts","sourceRoot":"","sources":["../../../../../src/utils/logger/log-context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,UAAU;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,YAAY,CAAC,CAAC"}

package/dist/server/src/utils/logger/log-formatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log-formatter.d.ts","sourceRoot":"","sources":["../../../../../src/utils/logger/log-formatter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAMnD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAsED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,UAAU,SAAI,GAAG,UAAU,GAAG,IAAI,CAQ/D;AA2HD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAK/D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CASlD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAatD;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAM7C;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,UAAU,GACnB,MAAM,CAsCR;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,MAAM,CA6B/F;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAyHlD"}
+{"version":3,"file":"log-formatter.d.ts","sourceRoot":"","sources":["../../../../../src/utils/logger/log-formatter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAOnD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAsED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,UAAU,SAAI,GAAG,UAAU,GAAG,IAAI,CAQ/D;AA2HD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAK/D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CASlD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAatD;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAM7C;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,UAAU,GACnB,MAAM,CA2CR;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,MAAM,CAkC/F;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CA4HlD"}

package/dist/server/src/utils/logger/log-formatter.js

@@ -4,6 +4,7 @@
  */
 import { stringifyForLogging } from '../json-utils.js';
 import { getColorCodeForLevel, getResetColor, COLORS } from './log-colors.js';
+import { getShowTraceContextSetting } from '../json-utils.js';
 // PID formatting configuration
 const PID_WIDTH = 8;
 /**
@@ -272,11 +273,16 @@ export function createColoredLogMessage(level, message, context) {
     const callerColor = COLORS.brightBlue;
     const resetColor = getResetColor();
     let result = `${timestampColor}[${timestamp}]${resetColor} ${levelColor}[${formattedLevel}]${resetColor} ${pidColor}[${formattedPid}]${resetColor}`;
-    if (context?.traceId) {
-        result += ` ${traceColor}[TID:${context.traceId}]${resetColor}`;
-    }
-    if (context?.spanId) {
-        result += ` ${traceColor}[SID:${context.spanId}]${resetColor}`;
+    if (getShowTraceContextSetting()) {
+        if (context?.sessionId) {
+            result += ` ${traceColor}[SSN:${context.sessionId}]${resetColor}`;
+        }
+        if (context?.traceId) {
+            result += ` ${traceColor}[TID:${context.traceId}]${resetColor}`;
+        }
+        if (context?.spanId) {
+            result += ` ${traceColor}[SID:${context.spanId}]${resetColor}`;
+        }
     }
     result += ` ${serverColor}[${actualServerName}]${resetColor}`;
     if (context?.module) {
@@ -302,11 +308,16 @@ export function createLogMessage(level, message, context) {
     const pidStr = processPid.toString().padStart(PID_WIDTH, ' ');
     const serverIdentifier = context?.serverName || 'mcp-hub';
     let result = `[${timestamp}] [${formattedLevel}] [PID:${pidStr}]`;
-    if (context?.traceId) {
-        result += ` [TID:${context.traceId}]`;
-    }
-    if (context?.spanId) {
-        result += ` [SID:${context.spanId}]`;
+    if (getShowTraceContextSetting()) {
+        if (context?.sessionId) {
+            result += ` [SSN:${context.sessionId}]`;
+        }
+        if (context?.traceId) {
+            result += ` [TID:${context.traceId}]`;
+        }
+        if (context?.spanId) {
+            result += ` [SID:${context.spanId}]`;
+        }
     }
     result += ` [${serverIdentifier}]`;
     if (context?.module) {
@@ -336,7 +347,10 @@ export function formatError(error) {
             if (typeof element === 'object' &&
                 element !== null &&
                 !Array.isArray(element) &&
-                ('module' in element || 'traceId' in element || 'spanId' in element)) {
+                ('module' in element ||
+                    'traceId' in element ||
+                    'spanId' in element ||
+                    'sessionId' in element)) {
                 return '';
             }
             // Otherwise format the single element