@loop_ouroboros/mcp-hub-lite 1.1.0 → 1.2.0

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

@@ -1,10 +1,19 @@
 /**
- * Global stateless MCP transport and server.
+ * MCP transport factory for per-request transport instances.
  *
- * This module provides a shared, stateless MCP transport and server instance
- * that can be used across all requests without session isolation.
+ * 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.
  */
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
-export declare const globalTransport: StreamableHTTPServerTransport;
-export declare const globalServer: import("@modelcontextprotocol/sdk/server/mcp.js").McpServer;
+/**
+ * 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
+ */
+export declare function createSessionTransport(): Promise<{
+    transport: StreamableHTTPServerTransport;
+    server: import("@modelcontextprotocol/sdk/server/mcp").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;AAwCnG,eAAO,MAAM,eAAe,+BAAY,CAAC;AACzC,eAAO,MAAM,YAAY,6DAAS,CAAC"}
+{"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;AAMnG;;;;;;GAMG;AACH,wBAAsB,sBAAsB;;;GA+D3C"}

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

@@ -1,42 +1,66 @@
 /**
- * Global stateless MCP transport and server.
+ * MCP transport factory for per-request transport instances.
  *
- * This module provides a shared, stateless MCP transport and server instance
- * that can be used across all requests without session isolation.
+ * 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.
  */
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { gateway } from './gateway.service.js';
 import { logger, LOG_MODULES } from '../../utils/logger/index.js';
-import { getMcpCommDebugSetting } from '../../utils/json-utils.js';
+import { stringifyForLogging, getMcpCommDebugSetting } from '../../utils/json-utils.js';
 import { formatMcpMessageForLogging, logNotificationMessage } from '../../utils/logger/log-output.js';
-// Create shared transport in STATELESS MODE - NO PARAMETERS NEEDED!
-const transport = new StreamableHTTPServerTransport();
-// Create shared server
-const server = gateway.createConnectionServer();
-// Set up message logging (use empty string for sessionId in stateless mode)
-transport.onmessage = (message) => {
-    if (getMcpCommDebugSetting()) {
-        const logMessage = formatMcpMessageForLogging(message);
-        logger.debug(`MCP message received: ${logMessage}`, LOG_MODULES.COMMUNICATION);
-    }
-    logNotificationMessage(message, ''); // Empty sessionId for stateless
-};
-// Wrap send method for debug logging
-if (getMcpCommDebugSetting()) {
-    const originalSend = transport.send;
-    transport.send = async (message, options) => {
+/**
+ * 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
+ */
+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)
+    transport.onmessage = (message) => {
+        logger.debug(`Session transport onmessage called with: ${stringifyForLogging(message)}`, LOG_MODULES.GATEWAY);
         try {
-            const logMessage = formatMcpMessageForLogging(message);
-            logger.debug(`MCP message sent: ${logMessage}`, LOG_MODULES.COMMUNICATION);
+            if (getMcpCommDebugSetting()) {
+                const logMessage = formatMcpMessageForLogging(message);
+                logger.debug(`MCP message received: ${logMessage}`, LOG_MODULES.COMMUNICATION);
+            }
+            logNotificationMessage(message, ''); // Empty sessionId for per-request
+            logger.debug(`Session transport onmessage completed successfully`, LOG_MODULES.GATEWAY);
         }
-        catch {
-            logger.debug(`MCP message sent: [Error formatting response]`, LOG_MODULES.COMMUNICATION);
+        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(`Message that caused error: ${stringifyForLogging(message)}`, LOG_MODULES.GATEWAY);
         }
-        return await originalSend.call(transport, message, options);
     };
+    // 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);
+            }
+            catch {
+                logger.debug(`MCP message sent: [Error formatting response]`, LOG_MODULES.COMMUNICATION);
+            }
+            return await originalSend.call(transport, message, options);
+        };
+    }
+    // Connect server to transport
+    logger.debug('About to connect session server to transport', LOG_MODULES.GATEWAY);
+    try {
+        await server.connect(transport);
+        logger.info('MCP session transport initialized (per-request 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;
+    }
+    return { transport, server };
 }
-// Connect server to transport
-await server.connect(transport);
-logger.info('Global MCP transport initialized (stateless mode)', LOG_MODULES.GATEWAY);
-export const globalTransport = transport;
-export const globalServer = server;

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

@@ -1 +1 @@
-{"version":3,"file":"initialize-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/services/gateway/request-handlers/initialize-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAWpE;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA4ClE"}
+{"version":3,"file":"initialize-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/services/gateway/request-handlers/initialize-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAWpE;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA+DlE"}

package/dist/server/src/services/gateway/request-handlers/initialize-handler.js

@@ -40,7 +40,18 @@ export function registerInitializeHandlers(server) {
     server.server.setRequestHandler(PingRequestSchema, async () => {
         return { pong: true };
     });
-    server.server.setNotificationHandler(InitializedNotificationSchema, async () => {
+    server.server.setNotificationHandler(InitializedNotificationSchema, async (notification) => {
         logger.debug('Received initialized notification from client', LOG_MODULES.GATEWAY);
+        logger.debug(`Initialized notification details: ${JSON.stringify(notification)}`, LOG_MODULES.GATEWAY);
+        try {
+            // Process the notification
+            logger.debug('Successfully processed initialized notification', LOG_MODULES.GATEWAY);
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            logger.error(`Error processing initialized notification: ${errorMessage}`, LOG_MODULES.GATEWAY);
+            logger.error(`Notification that caused error: ${JSON.stringify(notification)}`, LOG_MODULES.GATEWAY);
+            throw error; // Re-throw to see if this is the source of the problem
+        }
     });
 }

package/dist/server/src/services/gateway/request-handlers/system-tools-handler.js

@@ -6,7 +6,7 @@ import { McpError } from '@modelcontextprotocol/sdk/types.js';
 import { logger } from '../../../utils/index.js';
 import { LOG_MODULES } from '../../../utils/logger/log-modules.js';
 import { hubToolsService } from '../../hub-tools.service.js';
-import { LIST_SERVERS_TOOL, LIST_TOOLS_IN_SERVER_TOOL, GET_TOOL_TOOL, CALL_TOOL_TOOL, UPDATE_SERVER_DESCRIPTION_TOOL } from '../../../models/system-tools.constants.js';
+import { LIST_SERVERS_TOOL, LIST_TOOLS_TOOL, GET_TOOL_TOOL, CALL_TOOL_TOOL, UPDATE_SERVER_DESCRIPTION_TOOL } from '../../../models/system-tools.constants.js';
 /**
  * Register system tools handlers on the MCP server.
  *
@@ -26,7 +26,7 @@ export function registerSystemToolsHandlers(server) {
     });
     // List all tools in a specific server
     const ListToolsInServerRequestSchema = z.object({
-        method: z.literal(LIST_TOOLS_IN_SERVER_TOOL),
+        method: z.literal(LIST_TOOLS_TOOL),
         params: z.object({
             serverName: z.string(),
             requestOptions: z

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

@@ -1 +1 @@
-{"version":3,"file":"tools-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/services/gateway/request-handlers/tools-handler.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAqE7D"}
+{"version":3,"file":"tools-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/services/gateway/request-handlers/tools-handler.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAMzE;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAqE7D"}

package/dist/server/src/services/gateway/request-handlers/tools-handler.js

@@ -4,7 +4,6 @@
 import { z } from 'zod';
 import { McpError } from '@modelcontextprotocol/sdk/types.js';
 import { logger } from '../../../utils/index.js';
-import { LOG_MODULES } from '../../../utils/logger/log-modules.js';
 import { searchCoreService } from '../../search/search-core.service.js';
 import { hubManager } from '../../hub-manager.service.js';
 /**
@@ -43,7 +42,7 @@ export function registerToolsHandlers(server) {
                 filters: {}
             };
             if (filters.serverName) {
-                const serverInstances = hubManager.getServerInstancesByName(filters.serverName);
+                const serverInstances = hubManager.getServerInstanceByName(filters.serverName);
                 if (serverInstances.length > 0) {
                     // Use the first instance's ID as filter condition
                     searchOptions.filters.serverId = serverInstances[0].id;
@@ -68,11 +67,11 @@ export function registerToolsHandlers(server) {
         }
         catch (error) {
             if (error instanceof Error) {
-                logger.error(`Search tools error:`, error, LOG_MODULES.TOOLS_HANDLER);
+                logger.error(`Search tools error:`, error);
                 throw new McpError(-32802, `Search failed: ${error.message}`);
             }
             else {
-                logger.error(`Search tools error:`, error, LOG_MODULES.TOOLS_HANDLER);
+                logger.error(`Search tools error:`, error);
                 throw new McpError(-32802, `Search failed: ${String(error)}`);
             }
         }

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

@@ -30,6 +30,7 @@ export interface SystemToolDefinition {
  * - list-tools-in-server: List tools from a specific server
  * - get-tool: Get complete tool schema
  * - call-tool: Call a specific tool from a specific server
+ * - update-server-description: Update the description of a specific MCP server
  *
  * @returns {Array<{ name: string; description: string; inputSchema: JsonSchema; annotations?: ToolAnnotations }>}
  * Array of system tool configurations

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;AAU/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;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,cAAc,IAAI,oBAAoB,EAAE,CA6IvD"}
+{"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;AAU/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;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,cAAc,IAAI,oBAAoB,EAAE,CA6IvD"}

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

@@ -1,4 +1,4 @@
-import { SYSTEM_TOOL_NAMES, LIST_SERVERS_TOOL, LIST_TOOLS_IN_SERVER_TOOL, GET_TOOL_TOOL, CALL_TOOL_TOOL, UPDATE_SERVER_DESCRIPTION_TOOL } from '../../models/system-tools.constants.js';
+import { SYSTEM_TOOL_NAMES, LIST_SERVERS_TOOL, LIST_TOOLS_TOOL, GET_TOOL_TOOL, CALL_TOOL_TOOL, UPDATE_SERVER_DESCRIPTION_TOOL } from '../../models/system-tools.constants.js';
 /**
  * Retrieves the complete list of system tools provided by this service.
  *
@@ -11,6 +11,7 @@ import { SYSTEM_TOOL_NAMES, LIST_SERVERS_TOOL, LIST_TOOLS_IN_SERVER_TOOL, GET_TO
  * - list-tools-in-server: List tools from a specific server
  * - get-tool: Get complete tool schema
  * - call-tool: Call a specific tool from a specific server
+ * - update-server-description: Update the description of a specific MCP server
  *
  * @returns {Array<{ name: string; description: string; inputSchema: JsonSchema; annotations?: ToolAnnotations }>}
  * Array of system tool configurations
@@ -43,7 +44,7 @@ export function getSystemTools() {
                     }
                 });
                 break;
-            case LIST_TOOLS_IN_SERVER_TOOL:
+            case LIST_TOOLS_TOOL:
                 systemTools.push({
                     name: toolName,
                     description: 'List all tools from a specific server',
@@ -102,7 +103,7 @@ export function getSystemTools() {
                 systemTools.push({
                     name: toolName,
                     description: 'Call a specific tool from an external MCP server. ' +
-                        'System tools (list_servers, list_tools_in_server, get_tool, update_server_description) ' +
+                        'System tools (list_servers, list_tools, get_tool, update_server_description) ' +
                         'must be called directly via tools/call, not through this tool.',
                     inputSchema: {
                         type: 'object',

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

@@ -1,6 +1,6 @@
 import type { Tool, ToolSummary } from '../../shared/models/tool.model.js';
 import type { Resource } from '../../shared/models/resource.model.js';
-import { LIST_SERVERS_TOOL, LIST_TOOLS_IN_SERVER_TOOL, GET_TOOL_TOOL, CALL_TOOL_TOOL, UPDATE_SERVER_DESCRIPTION_TOOL } from '../models/system-tools.constants.js';
+import { LIST_SERVERS_TOOL, LIST_TOOLS_TOOL, GET_TOOL_TOOL, CALL_TOOL_TOOL, UPDATE_SERVER_DESCRIPTION_TOOL } from '../models/system-tools.constants.js';
 import type { SystemToolName, ListServersParams, ListToolsInServerParams, GetToolParams, CallToolParams, UpdateServerDescriptionParams } from '../models/system-tools.constants.js';
 /**
  * Central service for managing system tools and MCP server interactions in the MCP Hub Lite gateway.
@@ -26,6 +26,7 @@ import type { SystemToolName, ListServersParams, ListToolsInServerParams, GetToo
  * - `list-tools-in-server`: List all tools from a specific server
  * - `get-tool`: Retrieve complete schema for a specific tool
  * - `call-tool`: Execute a tool on a specific server
+ * - `update-server-description`: Update the description of a specific MCP server
  *
  * ## Architecture Integration
  *
@@ -133,7 +134,7 @@ export declare class HubToolsService {
      * @returns {Promise<ConditionalReturnType>} Tool execution result with accurate type safety matching actual method return types
      * @throws {Error} If the system tool is not found or execution fails
      */
-    callSystemTool<T extends SystemToolName>(toolName: T, toolArgs: T extends typeof LIST_SERVERS_TOOL ? ListServersParams : T extends typeof LIST_TOOLS_IN_SERVER_TOOL ? ListToolsInServerParams : T extends typeof GET_TOOL_TOOL ? GetToolParams : T extends typeof CALL_TOOL_TOOL ? CallToolParams : T extends typeof UPDATE_SERVER_DESCRIPTION_TOOL ? UpdateServerDescriptionParams : never): Promise<T extends typeof LIST_SERVERS_TOOL ? Record<string, string> : T extends typeof LIST_TOOLS_IN_SERVER_TOOL ? {
+    callSystemTool<T extends SystemToolName>(toolName: T, toolArgs: T extends typeof LIST_SERVERS_TOOL ? ListServersParams : T extends typeof LIST_TOOLS_TOOL ? ListToolsInServerParams : T extends typeof GET_TOOL_TOOL ? GetToolParams : T extends typeof CALL_TOOL_TOOL ? CallToolParams : T extends typeof UPDATE_SERVER_DESCRIPTION_TOOL ? UpdateServerDescriptionParams : never): Promise<T extends typeof LIST_SERVERS_TOOL ? Record<string, string> : T extends typeof LIST_TOOLS_TOOL ? {
         serverName: string;
         tools: ToolSummary[];
     } : T extends typeof GET_TOOL_TOOL ? Tool | undefined : T extends typeof CALL_TOOL_TOOL ? unknown : T extends typeof UPDATE_SERVER_DESCRIPTION_TOOL ? {

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

@@ -4,8 +4,9 @@ import { eventBus, EventTypes } from './event-bus.service.js';
 import { gateway } from './gateway.service.js';
 import { logger, LOG_MODULES } from '../utils/logger.js';
 import { stringifyForLogging } from '../utils/json-utils.js';
+import { normalizeToolName } from '../utils/name-converter.js';
 import { McpError } from '@modelcontextprotocol/sdk/types.js';
-import { MCP_HUB_LITE_SERVER, LIST_SERVERS_TOOL, LIST_TOOLS_IN_SERVER_TOOL, GET_TOOL_TOOL, CALL_TOOL_TOOL, UPDATE_SERVER_DESCRIPTION_TOOL, SYSTEM_TOOL_NAMES } from '../models/system-tools.constants.js';
+import { MCP_HUB_LITE_SERVER, LIST_SERVERS_TOOL, LIST_TOOLS_TOOL, GET_TOOL_TOOL, CALL_TOOL_TOOL, UPDATE_SERVER_DESCRIPTION_TOOL, SYSTEM_TOOL_NAMES } from '../models/system-tools.constants.js';
 import { ToolArgsParser } from '../utils/tool-args-parser.js';
 import { hasValidId, selectBestInstance, getServerDescription, getSystemTools, generateDynamicResources, readResource as readResourceUtil } from './hub-tools/index.js';
 /**
@@ -32,6 +33,7 @@ import { hasValidId, selectBestInstance, getServerDescription, getSystemTools, g
  * - `list-tools-in-server`: List all tools from a specific server
  * - `get-tool`: Retrieve complete schema for a specific tool
  * - `call-tool`: Execute a tool on a specific server
+ * - `update-server-description`: Update the description of a specific MCP server
  *
  * ## Architecture Integration
  *
@@ -182,7 +184,7 @@ export class HubToolsService {
         // Handle MCP Hub Lite server (return system tool)
         if (typeof args.serverName === 'string' && args.serverName === MCP_HUB_LITE_SERVER) {
             const systemTools = getSystemTools();
-            const found = systemTools.find((tool) => tool.name === args.toolName);
+            const found = systemTools.find((tool) => normalizeToolName(tool.name) === normalizeToolName(args.toolName));
             if (found) {
                 return {
                     ...found,
@@ -197,7 +199,7 @@ export class HubToolsService {
         if (tools.length === 0) {
             throw new Error(`Server not found: ${args.serverName}`);
         }
-        return tools.find((t) => t.name === args.toolName);
+        return tools.find((t) => normalizeToolName(t.name) === normalizeToolName(args.toolName));
     }
     /**
      * Updates the description of a specific MCP server.
@@ -251,7 +253,7 @@ export class HubToolsService {
                 case LIST_SERVERS_TOOL:
                     result = await this.listServers();
                     break;
-                case LIST_TOOLS_IN_SERVER_TOOL: {
+                case LIST_TOOLS_TOOL: {
                     result = await this.listToolsInServer(toolArgs);
                     break;
                 }
@@ -335,7 +337,7 @@ export class HubToolsService {
                 if (serverInfo && serverInfo.instance.id) {
                     const instanceIndex = serverInfo.instance.index;
                     const tools = mcpConnectionManager.getTools(server.name, instanceIndex);
-                    if (tools.some((tool) => tool.name === toolName)) {
+                    if (tools.some((tool) => normalizeToolName(tool.name) === normalizeToolName(toolName))) {
                         matchingServers.push(server.name);
                     }
                 }
@@ -354,13 +356,16 @@ export class HubToolsService {
         // Validate tool exists before doing strict instance selection
         // Use strictMode=false to get serverInfo without triggering tag-match-unique errors
         const validationServerInfo = selectBestInstance(serverName, requestOptions, false);
+        let actualToolName;
         if (validationServerInfo && validationServerInfo.instance.id) {
             const instanceIndex = validationServerInfo.instance.index;
             const tools = mcpConnectionManager.getTools(serverName, instanceIndex);
-            if (!tools.some((tool) => tool.name === toolName)) {
+            const matchedTool = tools.find((tool) => normalizeToolName(tool.name) === normalizeToolName(toolName));
+            if (!matchedTool) {
                 throw new Error(`Tool '${toolName}' not found in server '${serverName}'. ` +
-                    `Use list_tools_in_server(serverName: "${serverName}") to see available tools.`);
+                    `Use list_tools(serverName: "${serverName}") to see available tools.`);
             }
+            actualToolName = matchedTool.name;
         }
         const serverInfo = selectBestInstance(serverName, requestOptions, true);
         const requestId = `tool-call-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
@@ -374,27 +379,38 @@ export class HubToolsService {
                 throw new Error(`Server not found: ${serverName}`);
             }
             const instanceIndex = fallbackServerInfo.instance.index;
+            // If actualToolName not set yet, find it now
+            if (!actualToolName) {
+                const fallbackTools = mcpConnectionManager.getTools(serverName, instanceIndex);
+                const matchedTool = fallbackTools.find((tool) => normalizeToolName(tool.name) === normalizeToolName(toolName));
+                if (!matchedTool) {
+                    throw new Error(`Tool '${toolName}' not found in server '${serverName}'. ` +
+                        `Use list_tools(serverName: "${serverName}") to see available tools.`);
+                }
+                actualToolName = matchedTool.name;
+            }
+            const toolNameToUse = actualToolName || toolName;
             // Publish tool call started event with the resolved serverIndex
             eventBus.publish(EventTypes.TOOL_CALL_STARTED, {
                 requestId,
                 serverName,
                 serverIndex: instanceIndex,
-                toolName,
+                toolName: toolNameToUse,
                 timestamp: Date.now(),
                 args: toolArgs
             });
             try {
-                const result = await mcpConnectionManager.callTool(serverName, instanceIndex, toolName, toolArgs);
+                const result = await mcpConnectionManager.callTool(serverName, instanceIndex, toolNameToUse, toolArgs);
                 // Publish tool call completed event
                 eventBus.publish(EventTypes.TOOL_CALL_COMPLETED, {
                     requestId,
                     serverName,
                     serverIndex: instanceIndex,
-                    toolName,
+                    toolName: toolNameToUse,
                     timestamp: Date.now(),
                     result
                 });
-                logger.debug(`Tool call SUCCESS: serverName=${serverName}, toolName=${toolName}`, LOG_MODULES.HUB_TOOLS);
+                logger.debug(`Tool call SUCCESS: serverName=${serverName}, toolName=${toolNameToUse}`, LOG_MODULES.HUB_TOOLS);
                 return result;
             }
             catch (error) {
@@ -403,37 +419,38 @@ export class HubToolsService {
                     requestId,
                     serverName,
                     serverIndex: instanceIndex,
-                    toolName,
+                    toolName: toolNameToUse,
                     timestamp: Date.now(),
                     error: error instanceof Error ? error.message : String(error),
                     stack: error instanceof Error ? error.stack : undefined
                 });
-                logger.error(`Tool call FAILED: serverName=${serverName}, toolName=${toolName}, error=${error instanceof Error ? error.message : String(error)}`, error, LOG_MODULES.HUB_TOOLS);
+                logger.error(`Tool call FAILED: serverName=${serverName}, toolName=${toolNameToUse}, error=${error instanceof Error ? error.message : String(error)}`, error, LOG_MODULES.HUB_TOOLS);
                 throw error;
             }
         }
         const instanceIndex = serverInfo.instance.index;
+        const toolNameToUse = actualToolName || toolName;
         // Publish tool call started event
         eventBus.publish(EventTypes.TOOL_CALL_STARTED, {
             requestId,
             serverName,
             serverIndex: instanceIndex,
-            toolName,
+            toolName: toolNameToUse,
             timestamp: Date.now(),
             args: toolArgs
         });
         try {
-            const result = await mcpConnectionManager.callTool(serverName, instanceIndex, toolName, toolArgs);
+            const result = await mcpConnectionManager.callTool(serverName, instanceIndex, toolNameToUse, toolArgs);
             // Publish tool call completed event
             eventBus.publish(EventTypes.TOOL_CALL_COMPLETED, {
                 requestId,
                 serverName,
                 serverIndex: instanceIndex,
-                toolName,
+                toolName: toolNameToUse,
                 timestamp: Date.now(),
                 result
             });
-            logger.debug(`Tool call SUCCESS: serverName=${serverName}, toolName=${toolName}`, LOG_MODULES.HUB_TOOLS);
+            logger.debug(`Tool call SUCCESS: serverName=${serverName}, toolName=${toolNameToUse}`, LOG_MODULES.HUB_TOOLS);
             return result;
         }
         catch (error) {
@@ -442,12 +459,12 @@ export class HubToolsService {
                 requestId,
                 serverName,
                 serverIndex: instanceIndex,
-                toolName,
+                toolName: toolNameToUse,
                 timestamp: Date.now(),
                 error: error instanceof Error ? error.message : String(error),
                 stack: error instanceof Error ? error.stack : undefined
             });
-            logger.error(`Tool call FAILED: serverName=${serverName}, toolName=${toolName}, error=${error instanceof Error ? error.message : String(error)}`, error, LOG_MODULES.HUB_TOOLS);
+            logger.error(`Tool call FAILED: serverName=${serverName}, toolName=${toolNameToUse}, error=${error instanceof Error ? error.message : String(error)}`, error, LOG_MODULES.HUB_TOOLS);
             throw error;
         }
     }

package/dist/server/src/services/search/search-core.service.d.ts

@@ -60,16 +60,16 @@ export declare class SearchCoreService {
      *
      * This method first checks if tools are available in the cache. If cached data exists,
      * it returns the cached tools immediately. Otherwise, it fetches tools from all connected
-     * MCP servers, applies server-level filtering based on aggregatedTools configuration,
+     * MCP servers, applies server-level filtering based on allowedTools configuration,
      * caches the result, and returns the filtered tools.
      *
      * @returns A promise that resolves to an array of Tool objects from all connected servers.
      *
      * @remarks
-     * - Tools are filtered based on each server's aggregatedTools configuration
-     * - If aggregatedTools is null or undefined, all tools from that server are included
-     * - If aggregatedTools is an empty array, no tools from that server are included
-     * - Tools are filtered using strict name matching against the aggregatedTools list
+     * - Tools are filtered based on each server's allowedTools configuration
+     * - If allowedTools is null or undefined, all tools from that server are included
+     * - If allowedTools is an empty array, no tools from that server are included
+     * - Tools are filtered using strict name matching against the allowedTools list
      */
     private getToolsWithCache;
     /**

package/dist/server/src/services/search/search-core.service.js

@@ -101,16 +101,16 @@ export class SearchCoreService {
      *
      * This method first checks if tools are available in the cache. If cached data exists,
      * it returns the cached tools immediately. Otherwise, it fetches tools from all connected
-     * MCP servers, applies server-level filtering based on aggregatedTools configuration,
+     * MCP servers, applies server-level filtering based on allowedTools configuration,
      * caches the result, and returns the filtered tools.
      *
      * @returns A promise that resolves to an array of Tool objects from all connected servers.
      *
      * @remarks
-     * - Tools are filtered based on each server's aggregatedTools configuration
-     * - If aggregatedTools is null or undefined, all tools from that server are included
-     * - If aggregatedTools is an empty array, no tools from that server are included
-     * - Tools are filtered using strict name matching against the aggregatedTools list
+     * - Tools are filtered based on each server's allowedTools configuration
+     * - If allowedTools is null or undefined, all tools from that server are included
+     * - If allowedTools is an empty array, no tools from that server are included
+     * - Tools are filtered using strict name matching against the allowedTools list
      */
     async getToolsWithCache() {
         const cached = this.cacheService.get();
@@ -119,17 +119,17 @@ export class SearchCoreService {
         }
         // Use new server name-level cache to get all tools
         const tools = mcpConnectionManager.getAllToolsByServerName();
-        // Get configuration based on server name and apply aggregatedTools filtering
+        // Get configuration based on server name and apply allowedTools filtering
         const filteredTools = tools.filter((tool) => {
             const serverConfig = hubManager.getServerByName(tool.serverName);
             if (!serverConfig)
                 return true;
-            const aggregated = serverConfig.template.aggregatedTools;
-            if (aggregated == null)
-                return false; // No aggregatedTools configured, don't show any tools
-            if (aggregated.length === 0)
+            const allowed = serverConfig.allowedTools;
+            if (allowed == null)
+                return true; // No allowedTools configured, show all tools
+            if (allowed.length === 0)
                 return false; // Empty array, don't show any tools
-            return aggregated.includes(tool.name); // Strict filtering
+            return allowed.includes(tool.name); // Strict filtering
         });
         this.cacheService.set(filteredTools);
         return filteredTools;