@loop_ouroboros/mcp-hub-lite 1.3.2 → 1.3.3

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.3.3] - 2026-06-10
+
+### Hub
+
+- fix tag-match-unique error when reading server-level resources
+- return per-instance tags array instead of merged object
+- remove dead strictMode parameter from server-selector
+- remove L1 fallback in call-tool, route directly to RANDOM
+- remove gateway mode in call-tool, simplify tool validation
+
+### Docs
+
+- update hub-tools CLAUDE.md with current architecture
+
 ## [1.3.2] - 2026-06-09
 
 ### Search

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

@@ -5,4 +5,5 @@ export { getSystemTools } from './system-tool-definitions.js';
 export type { ToolAnnotations, SystemToolDefinition } from './system-tool-definitions.js';
 export { generateDynamicResources, readResource } from './resource-generator.js';
 export type { ServerMetadata } from './resource-generator.js';
+export { serverMetadataCache } from './server-metadata-cache.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/services/hub-tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG3E,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACjF,YAAY,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/services/hub-tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG3E,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACjF,YAAY,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC"}

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

@@ -3,3 +3,4 @@ export { HubToolsService, hubToolsService } from '../hub-tools.service.js';
 export { hasValidId, selectBestInstance, getServerDescription } from './server-selector.js';
 export { getSystemTools } from './system-tool-definitions.js';
 export { generateDynamicResources, readResource } from './resource-generator.js';
+export { serverMetadataCache } from './server-metadata-cache.js';

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

@@ -9,7 +9,7 @@ export interface ServerMetadata {
     toolsCount: number;
     tools: Record<string, string>;
     resourcesCount: number;
-    tags: Record<string, string>;
+    tags: Array<Record<string, string>>;
     lastHeartbeat: number;
     uptime: number;
     description: string;

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;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"}
+{"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;AAoLlE;;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,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACpC,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,CAkFzD"}

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

@@ -3,7 +3,8 @@ import { dirname, join } from 'path';
 import fs from 'fs';
 import { hubManager } from '../hub-manager.service.js';
 import { mcpConnectionManager } from '../connection/index.js';
-import { hasValidId, selectBestInstance, getServerDescription } from './server-selector.js';
+import { hasValidId, getServerDescription } from './server-selector.js';
+import { serverMetadataCache } from './server-metadata-cache.js';
 /**
  * Maps Hub URI to original MCP URI for resource forwarding.
  * Key: Hub URI (e.g., "hub://servers/exa-ai/0/tools/list")
@@ -280,43 +281,24 @@ export async function readResource(uri, language) {
     if (instanceIndex === undefined) {
         // Handle list requests first
         if (listType) {
-            // Use selectBestInstance to get an instance for the list
-            const serverInfo = selectBestInstance(serverName);
-            if (!serverInfo) {
+            // Read from aggregated cache for server-level list queries
+            const metadata = serverMetadataCache.get(serverName);
+            if (!metadata) {
                 throw new Error(`Server not found or not connected: ${serverName}`);
             }
-            const instanceIndex = serverInfo.instance.index;
             if (listType === 'tools') {
-                return mcpConnectionManager.getTools(serverName, instanceIndex);
+                return mcpConnectionManager.getToolsByServerName(serverName);
             }
             else {
-                return mcpConnectionManager.getResources(serverName, instanceIndex);
+                return mcpConnectionManager.getResourcesByName(serverName);
             }
         }
-        // Server metadata request - use selectBestInstance to get runtime properties
-        const serverInfo = selectBestInstance(serverName);
-        if (!serverInfo) {
+        // Server metadata request — read from aggregated cache (no instance selection needed)
+        const metadata = serverMetadataCache.get(serverName);
+        if (!metadata) {
             throw new Error(`Server not found or not connected: ${serverName}`);
         }
-        const instanceIndex = serverInfo.instance.index;
-        const tools = mcpConnectionManager.getTools(serverName, instanceIndex);
-        const resources = mcpConnectionManager.getResources(serverName, instanceIndex);
-        // Build tool name to description map
-        const toolsMap = {};
-        for (const tool of tools) {
-            toolsMap[tool.name] = tool.description || '';
-        }
-        return {
-            name: serverName,
-            status: serverInfo.instance.status,
-            toolsCount: tools.length,
-            tools: toolsMap,
-            resourcesCount: resources.length,
-            tags: serverInfo.instance.tags || {},
-            lastHeartbeat: serverInfo.instance.lastHeartbeat,
-            uptime: serverInfo.instance.uptime,
-            description: getServerDescription(serverConfig, serverName)
-        };
+        return metadata;
     }
     // MCP native resource forwarding: hub://servers/{name}/{instanceIndex}/{mcpPath}
     // Find the specific instance by index

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

@@ -0,0 +1,19 @@
+import type { ServerMetadata } from './resource-generator.js';
+/**
+ * Cached server-level metadata aggregated across all connected instances.
+ * Updated reactively via EventBus subscriptions — no I/O, all synchronous cache lookups.
+ */
+declare class ServerMetadataCache {
+    private cache;
+    private unsubscribers;
+    private initialized;
+    initialize(): void;
+    destroy(): void;
+    get(serverName: string): ServerMetadata | undefined;
+    refresh(serverName: string): void;
+    refreshAll(): void;
+    private buildMetadata;
+}
+export declare const serverMetadataCache: ServerMetadataCache;
+export {};
+//# sourceMappingURL=server-metadata-cache.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"server-metadata-cache.d.ts","sourceRoot":"","sources":["../../../../../src/services/hub-tools/server-metadata-cache.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAO9D;;;GAGG;AACH,cAAM,mBAAmB;IACvB,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,WAAW,CAAS;IAE5B,UAAU,IAAI,IAAI;IA4BlB,OAAO,IAAI,IAAI;IASf,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAYnD,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IASjC,UAAU,IAAI,IAAI;IASlB,OAAO,CAAC,aAAa;CAkDtB;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}

package/dist/server/src/services/hub-tools/server-metadata-cache.js

@@ -0,0 +1,117 @@
+import { hubManager } from '../hub-manager.service.js';
+import { mcpConnectionManager } from '../connection/index.js';
+import { eventBus, EventTypes } from '../event-bus.service.js';
+import { getServerDescription } from './server-selector.js';
+/**
+ * Cached server-level metadata aggregated across all connected instances.
+ * Updated reactively via EventBus subscriptions — no I/O, all synchronous cache lookups.
+ */
+class ServerMetadataCache {
+    cache = new Map();
+    unsubscribers = [];
+    initialized = false;
+    initialize() {
+        if (this.initialized)
+            return;
+        this.initialized = true;
+        this.unsubscribers.push(eventBus.subscribe(EventTypes.SERVER_CONNECTED, (data) => {
+            this.refresh(data.serverName);
+        }));
+        this.unsubscribers.push(eventBus.subscribe(EventTypes.SERVER_DISCONNECTED, (data) => {
+            this.refresh(data.serverName);
+        }));
+        this.unsubscribers.push(eventBus.subscribe(EventTypes.TOOLS_UPDATED, (data) => {
+            this.refresh(data.serverName);
+        }));
+        this.unsubscribers.push(eventBus.subscribe(EventTypes.RESOURCES_UPDATED, (data) => {
+            this.refresh(data.serverName);
+        }));
+        // Cache populates lazily on first get() — avoids init-order issues in tests
+    }
+    destroy() {
+        for (const unsub of this.unsubscribers) {
+            unsub();
+        }
+        this.unsubscribers = [];
+        this.cache.clear();
+        this.initialized = false;
+    }
+    get(serverName) {
+        // Lazy build on first access — no pre-population needed
+        if (!this.cache.has(serverName)) {
+            const metadata = this.buildMetadata(serverName);
+            if (metadata) {
+                this.cache.set(serverName, metadata);
+            }
+            return metadata;
+        }
+        return this.cache.get(serverName);
+    }
+    refresh(serverName) {
+        const metadata = this.buildMetadata(serverName);
+        if (metadata) {
+            this.cache.set(serverName, metadata);
+        }
+        else {
+            this.cache.delete(serverName);
+        }
+    }
+    refreshAll() {
+        const servers = hubManager.getAllServers();
+        for (const server of servers) {
+            if (server.name) {
+                this.refresh(server.name);
+            }
+        }
+    }
+    buildMetadata(serverName) {
+        const serverConfig = hubManager.getServerByName(serverName);
+        if (!serverConfig)
+            return undefined;
+        const connectedIndexes = mcpConnectionManager.getConnectedIndexes(serverName);
+        if (connectedIndexes.length === 0)
+            return undefined;
+        // Aggregate tools across all instances (ToolCache already deduplicates by name)
+        const tools = mcpConnectionManager.getToolsByServerName(serverName) || [];
+        const toolsMap = {};
+        for (const tool of tools) {
+            toolsMap[tool.name] = tool.description || '';
+        }
+        // Aggregate resources across all instances
+        const resources = mcpConnectionManager.getResourcesByName(serverName) || [];
+        // Collect tags from all connected instances
+        const tags = [];
+        const instances = hubManager.getServerInstancesByName(serverName);
+        for (const instance of instances) {
+            if (instance.index !== undefined && connectedIndexes.includes(instance.index)) {
+                tags.push(instance.tags || {});
+            }
+        }
+        // Aggregate heartbeat (max) and uptime (min startTime) across instances
+        let lastHeartbeat = 0;
+        let uptime = Infinity;
+        for (const idx of connectedIndexes) {
+            const status = mcpConnectionManager.getStatus(serverName, idx);
+            if (status) {
+                if (status.lastCheck > lastHeartbeat)
+                    lastHeartbeat = status.lastCheck;
+                if (status.startTime && status.startTime < uptime)
+                    uptime = status.startTime;
+            }
+        }
+        if (uptime === Infinity)
+            uptime = 0;
+        return {
+            name: serverName,
+            status: 'online',
+            toolsCount: tools.length,
+            tools: toolsMap,
+            resourcesCount: resources.length,
+            tags,
+            lastHeartbeat,
+            uptime,
+            description: getServerDescription(serverConfig, serverName)
+        };
+    }
+}
+export const serverMetadataCache = new ServerMetadataCache();

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

@@ -72,5 +72,5 @@ export declare function hasValidId(server: unknown): server is ValidServer;
  * const serverInfoNonStrict = selectBestInstance('my-mcp-server', undefined, false);
  * ```
  */
-export declare function selectBestInstance(serverName: string, requestOptions?: RequestOptions, strictMode?: boolean): ServerInstanceInfo | undefined;
+export declare function selectBestInstance(serverName: string, requestOptions?: RequestOptions): ServerInstanceInfo | undefined;
 //# sourceMappingURL=server-selector.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"server-selector.d.ts","sourceRoot":"","sources":["../../../../../src/services/hub-tools/server-selector.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAElF;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE;IAAE,QAAQ,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GAAG,SAAS,EACjE,UAAU,EAAE,MAAM,GACjB,MAAM,CAKR;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,WAAW,CAMjE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,cAAc,EAC/B,UAAU,GAAE,OAAc,GACzB,kBAAkB,GAAG,SAAS,CA8ChC"}
+{"version":3,"file":"server-selector.d.ts","sourceRoot":"","sources":["../../../../../src/services/hub-tools/server-selector.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAElF;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE;IAAE,QAAQ,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GAAG,SAAS,EACjE,UAAU,EAAE,MAAM,GACjB,MAAM,CAKR;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,WAAW,CAMjE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,cAAc,GAC9B,kBAAkB,GAAG,SAAS,CAyChC"}

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

@@ -80,19 +80,16 @@ export function hasValidId(server) {
  * const serverInfoNonStrict = selectBestInstance('my-mcp-server', undefined, false);
  * ```
  */
-export function selectBestInstance(serverName, requestOptions, strictMode = true) {
-    // Get all instances of the server
+export function selectBestInstance(serverName, requestOptions) {
     const instances = hubManager.getServerInstancesByName(serverName);
     if (instances.length === 0) {
         return undefined;
     }
-    // Get server configuration
     const serverConfig = hubManager.getServerByName(serverName);
     if (!serverConfig) {
         return undefined;
     }
     try {
-        // Use the new instance selector
         const selectedInstance = InstanceSelector.selectInstance(serverName, serverConfig, requestOptions);
         if (!selectedInstance) {
             return undefined;
@@ -104,12 +101,10 @@ export function selectBestInstance(serverName, requestOptions, strictMode = true
         };
     }
     catch (error) {
-        // In strict mode, re-throw tag matching errors to maintain correct semantics
-        if (strictMode && error instanceof TagMatchUniqueError) {
-            // Re-throw with server context added to message
+        // Re-throw tag matching errors with server context
+        if (error instanceof TagMatchUniqueError) {
             throw new Error(`[${serverName}] ${error.message}`);
         }
-        // Handle other errors or non-strict mode gracefully
         logger.error(`Instance selection failed for server ${serverName}:`, error, LOG_MODULES.SERVER_SELECTOR);
         return undefined;
     }

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,CA+LvD"}
+{"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,CAgMvD"}

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

@@ -111,7 +111,7 @@ export function getSystemTools() {
                         properties: {
                             serverName: {
                                 type: 'string',
-                                description: 'Name of the MCP server (must be an external server, not mcp-hub-lite)'
+                                description: 'Name of the target MCP server. Use the exact server name from list_servers results. If you already know the server name (e.g., from previous list_tools or search_tools calls), call directly without re-searching.'
                             },
                             toolName: { type: 'string', description: 'Name of the tool to call' },
                             toolArgs: { type: 'object', description: 'Arguments to pass to the 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":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAQjE,OAAO,EAEL,iBAAiB,EACjB,eAAe,EACf,aAAa,EACb,cAAc,EACd,8BAA8B,EAC9B,cAAc,EACd,iBAAiB,EAElB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EACV,cAAc,EACd,iBAAiB,EACjB,uBAAuB,EACvB,aAAa,EACb,cAAc,EACd,6BAA6B,EAC7B,cAAc,EACd,iBAAiB,EAClB,MAAM,mCAAmC,CAAC;AAe3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,qBAAa,eAAe;;IAM1B;;;;;;;;;OASG;IACH,cAAc;IAId;;;;;;;;;OASG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAkBpD;;;;;;;;;;;OAWG;IACG,iBAAiB,CAAC,IAAI,EAAE,uBAAuB,GAAG,OAAO,CAAC;QAC9D,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,WAAW,EAAE,CAAC;KACtB,CAAC;IAqDF;;;;;;;;;;OAUG;IACG,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IA+B7D;;;;;;;;;;OAUG;IACG,uBAAuB,CAAC,IAAI,EAAE,6BAA6B,GAAG,OAAO,CAAC;QAC1E,OAAO,EAAE,OAAO,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAkCF;;;;;;;;;;OAUG;IACG,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC;QAC5C,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,KAAK,CAAC;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;SAAE,CAAC,CAAC;KAC/E,CAAC;IAmBF;;;;;;;;;;;OAWG;IACG,cAAc,CAAC,CAAC,SAAS,cAAc,EAC3C,QAAQ,EAAE,CAAC,EACX,QAAQ,EAAE,CAAC,SAAS,OAAO,iBAAiB,GACxC,iBAAiB,GACjB,CAAC,SAAS,OAAO,eAAe,GAC9B,uBAAuB,GACvB,CAAC,SAAS,OAAO,aAAa,GAC5B,aAAa,GACb,CAAC,SAAS,OAAO,cAAc,GAC7B,cAAc,GACd,CAAC,SAAS,OAAO,8BAA8B,GAC7C,6BAA6B,GAC7B,CAAC,SAAS,OAAO,cAAc,GAC7B,cAAc,GACd,CAAC,SAAS,OAAO,iBAAiB,GAChC,iBAAiB,GACjB,KAAK,GACpB,OAAO,CACR,CAAC,SAAS,OAAO,iBAAiB,GAC9B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,CAAC,SAAS,OAAO,eAAe,GAC9B;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,EAAE,CAAA;KAAE,GAC5C,CAAC,SAAS,OAAO,aAAa,GAC5B,IAAI,GAAG,SAAS,GAChB,CAAC,SAAS,OAAO,cAAc,GAC7B,OAAO,GACP,CAAC,SAAS,OAAO,8BAA8B,GAC7C;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAC7D,CAAC,SAAS,OAAO,cAAc,GAC7B;QACE,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,KAAK,CAAC;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;SAAE,CAAC,CAAC;KAC/E,GACD,CAAC,SAAS,OAAO,iBAAiB,GAChC,MAAM,CAAC,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC,GAC7D,KAAK,CACtB;IAkFD;;;;;;;;;;;OAWG;IACG,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAkQtD;;;;;;;;OAQG;IACG,YAAY,IAAI,OAAO,CAC3B,MAAM,CACJ,MAAM,EACN;QACE,KAAK,EAAE,WAAW,EAAE,CAAC;KACtB,CACF,CACF;IAuCD;;;;;;;;;OASG;IACG,WAAW,CACf,KAAK,EAAE,MAAM,EACb,KAAK,GAAE,MAAU,GAChB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC,CAAC;IAsDzE;;;;;;;;OAQG;IACG,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAK1C;;;;;;;;;;;;;OAaG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CACpC;QACE,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,cAAc,EAAE,MAAM,CAAC;QACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;KACrB,GACD,IAAI,EAAE,GACN,QAAQ,EAAE,GACV,MAAM,CACT;CAkBF;AAED,eAAO,MAAM,eAAe,iBAAwB,CAAC"}

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

@@ -10,7 +10,7 @@ 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';
-import { hasValidId, selectBestInstance, getServerDescription, getSystemTools, generateDynamicResources, readResource as readResourceUtil } from './hub-tools/index.js';
+import { hasValidId, selectBestInstance, getServerDescription, getSystemTools, generateDynamicResources, readResource as readResourceUtil, serverMetadataCache } from './hub-tools/index.js';
 import { InstanceSelector } from './hub-tools/instance-selector.js';
 import { InstanceSelectionStrategy } from '../models/server.model.js';
 /**
@@ -64,7 +64,7 @@ import { InstanceSelectionStrategy } from '../models/server.model.js';
 export class HubToolsService {
     // Cache removed - listResources() now calls generateDynamicResources() directly
     constructor() {
-        // No cache-related initialization needed
+        serverMetadataCache.initialize();
     }
     /**
      * Retrieves the complete list of system tools provided by this service.
@@ -372,86 +372,54 @@ export class HubToolsService {
                 throw new McpError(-32801, `System tools cannot be called via 'call_tool'. Use 'tools/call' with the system tool name directly. ` +
                     `Example: use 'list_servers' directly instead of call_tool(serverName: "mcp-hub-lite", toolName: "list_servers").`);
             }
-            // Not a system tool - find it in all connected servers
-            logger.info(`Looking for tool '${toolName}' in all connected servers (gateway mode)`, LOG_MODULES.HUB_TOOLS);
-            // Find all servers that have this tool
-            const matchingServers = [];
-            const servers = hubManager.getAllServers();
-            for (const server of servers) {
-                if (!hasValidId(server)) {
-                    continue;
-                }
-                const serverInfo = selectBestInstance(server.name, requestOptions, true);
-                if (serverInfo && serverInfo.instance.id) {
-                    const instanceIndex = serverInfo.instance.index;
-                    const tools = mcpConnectionManager.getTools(server.name, instanceIndex);
-                    if (tools.some((tool) => normalizeToolName(tool.name) === normalizeToolName(toolName))) {
-                        matchingServers.push(server.name);
-                    }
-                }
-            }
-            if (matchingServers.length === 0) {
-                logger.error(`Tool '${toolName}' not found in any connected server`, LOG_MODULES.HUB_TOOLS);
-                throw new Error(`Tool '${toolName}' not found`);
-            }
-            if (matchingServers.length > 1) {
-                logger.warn(`Tool '${toolName}' found in multiple servers: ${matchingServers.join(', ')}. Using first match.`, LOG_MODULES.HUB_TOOLS);
-            }
-            // Use the first matching server
-            serverName = matchingServers[0];
+            // Not a system tool — reject with actionable guidance
+            // The aggregated gateway tools (wrapped by tool-list-generator) already hardcode
+            // the correct serverName, so this path should only be hit when LLM manually fills
+            // "mcp-hub-lite" incorrectly. Guide them to use search_tools instead.
+            throw new McpError(-32602, `Cannot call external tool '${toolName}' with serverName "mcp-hub-lite". ` +
+                `Use 'search_tools' to find which server provides this tool, ` +
+                `then call it with the correct serverName.`);
         }
         logger.debug(`Tool call received: serverName=${serverName}, toolName=${toolName}, args=${stringifyForLogging(toolArgs)}`, LOG_MODULES.HUB_TOOLS);
-        // 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);
-            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(serverName: "${serverName}") to see available tools.`);
-            }
-            actualToolName = matchedTool.name;
+        // Validate tool exists using server-name-level aggregation (no instance selection needed)
+        const aggregatedTools = mcpConnectionManager.getToolsByServerName(serverName);
+        const matchedTool = aggregatedTools.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.`);
         }
-        const serverInfo = selectBestInstance(serverName, requestOptions, true);
+        let actualToolName = matchedTool.name;
+        const serverInfo = selectBestInstance(serverName, requestOptions);
         const requestId = `tool-call-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
         if (!serverInfo) {
             // Server not found in hubManager, try direct call by name through mcpConnectionManager
             logger.debug(`Server not found in hubManager, trying direct call by name: ${serverName}`, LOG_MODULES.HUB_TOOLS);
-            // Use selectBestInstance with non-strict mode to find an available instance
-            let fallbackServerInfo = selectBestInstance(serverName, undefined, false);
-            // If selectBestInstance returns undefined (e.g., TAG_MATCH_UNIQUE strategy without tags),
-            // fall back to directly selecting an enabled instance with RANDOM strategy
-            if (!fallbackServerInfo) {
-                logger.debug(`selectBestInstance returned undefined for ${serverName}, trying direct instance selection with RANDOM strategy`, LOG_MODULES.HUB_TOOLS);
-                const serverConfig = hubManager.getServerByName(serverName);
-                if (serverConfig && serverConfig.instances.length > 0) {
-                    // Filter: use runtime connected status, NOT config enabled flag
-                    // enabled=false means "do not auto-start" but user can manually start it
-                    const connectedInstances = serverConfig.instances.filter((instance) => {
-                        if (instance.index === undefined)
-                            return false;
-                        const status = mcpConnectionManager.getStatus(serverName, instance.index);
-                        return status?.connected;
-                    });
-                    if (connectedInstances.length > 0) {
-                        // Use RANDOM strategy regardless of server's configured strategy
-                        const selectedInstance = InstanceSelector.selectInstance(serverName, {
-                            ...serverConfig,
-                            template: {
-                                ...serverConfig.template,
-                                instanceSelectionStrategy: InstanceSelectionStrategy.RANDOM
-                            }
-                        }, undefined);
-                        if (selectedInstance) {
-                            fallbackServerInfo = {
-                                name: serverName,
-                                config: serverConfig,
-                                instance: selectedInstance
-                            };
+            // Fallback: force RANDOM strategy on any connected instance
+            // (selectBestInstance may fail for TAG_MATCH_UNIQUE without tags)
+            let fallbackServerInfo;
+            const serverConfig = hubManager.getServerByName(serverName);
+            if (serverConfig && serverConfig.instances.length > 0) {
+                // Filter: use runtime connected status, NOT config enabled flag
+                const connectedInstances = serverConfig.instances.filter((instance) => {
+                    if (instance.index === undefined)
+                        return false;
+                    const status = mcpConnectionManager.getStatus(serverName, instance.index);
+                    return status?.connected;
+                });
+                if (connectedInstances.length > 0) {
+                    const selectedInstance = InstanceSelector.selectInstance(serverName, {
+                        ...serverConfig,
+                        template: {
+                            ...serverConfig.template,
+                            instanceSelectionStrategy: InstanceSelectionStrategy.RANDOM
                         }
+                    }, undefined);
+                    if (selectedInstance) {
+                        fallbackServerInfo = {
+                            name: serverName,
+                            config: serverConfig,
+                            instance: selectedInstance
+                        };
                     }
                 }
             }

package/dist/server/tests/unit/services/hub-tools.service.test.js

@@ -1084,15 +1084,17 @@ describe('HubToolsService', () => {
         });
         it('should throw error for non-existent server', async () => {
             // Arrange
+            vi.mocked(hubManager.getServerByName).mockReturnValue(undefined);
             vi.mocked(hubManager.getServerInstancesByName).mockReturnValue([]);
             // Act & Assert
-            await expect(hubToolsService.readResource('hub://servers/NonExistent')).rejects.toThrow('Server not found or not connected');
+            await expect(hubToolsService.readResource('hub://servers/NonExistent')).rejects.toThrow('Server not found');
         });
         it('should return server metadata for server URI with tools field', async () => {
             // Arrange
             const serverName = 'Test Server';
             const mockInstance = {
                 id: 'test-instance',
+                index: 0,
                 enabled: true,
                 args: [],
                 env: {},
@@ -1134,13 +1136,20 @@ describe('HubToolsService', () => {
             const mockTools = [
                 { name: 'testTool', description: 'Test tool description', serverName: 'test-server' }
             ];
+            const mockResources = [{ uri: 'test://resource', name: 'Test Resource' }];
             // @ts-expect-error - Mocking for test purposes with extra fields
             vi.mocked(hubManager.getServerInstancesByName).mockReturnValue([mockInstance]);
             vi.mocked(hubManager.getServerByName).mockReturnValue(mockConfig);
-            vi.mocked(mcpConnectionManager.getTools).mockReturnValue(mockTools);
-            vi.mocked(mcpConnectionManager.getResources).mockReturnValue([
-                { uri: 'test://resource', name: 'Test Resource' }
-            ]);
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockReturnValue([0]);
+            vi.mocked(mcpConnectionManager.getToolsByServerName).mockReturnValue(mockTools);
+            vi.mocked(mcpConnectionManager.getResourcesByName).mockReturnValue(mockResources);
+            vi.mocked(mcpConnectionManager.getStatus).mockReturnValue({
+                connected: true,
+                lastCheck: mockInstance.lastHeartbeat,
+                startTime: mockInstance.uptime,
+                toolsCount: 1,
+                resourcesCount: 1
+            });
             // Act
             const result = await hubToolsService.readResource(`hub://servers/${serverName}`);
             // Assert
@@ -1150,7 +1159,7 @@ describe('HubToolsService', () => {
                 toolsCount: 1,
                 tools: { testTool: 'Test tool description' },
                 resourcesCount: 1,
-                tags: { env: 'test' },
+                tags: [{ env: 'test' }],
                 // @ts-expect-error - Accessing extra fields on mock
                 lastHeartbeat: mockInstance.lastHeartbeat,
                 // @ts-expect-error - Accessing extra fields on mock
@@ -1176,9 +1185,32 @@ describe('HubToolsService', () => {
                 uptime: 1000
             };
             const mockTools = [{ name: 'testTool', description: 'Test tool', serverName: 'test-server' }];
+            const mockConfig = {
+                template: {
+                    type: 'stdio',
+                    command: '',
+                    args: [],
+                    env: {},
+                    headers: {},
+                    aggregatedTools: [],
+                    timeout: 30000
+                },
+                instances: [mockInstance],
+                tagDefinitions: []
+            };
             // @ts-expect-error - Mocking for test purposes with extra fields
             vi.mocked(hubManager.getServerInstancesByName).mockReturnValue([mockInstance]);
-            vi.mocked(mcpConnectionManager.getTools).mockReturnValue(mockTools);
+            // @ts-expect-error - Mock config with simplified mock instance
+            vi.mocked(hubManager.getServerByName).mockReturnValue(mockConfig);
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockReturnValue([0]);
+            vi.mocked(mcpConnectionManager.getStatus).mockReturnValue({
+                connected: true,
+                lastCheck: mockInstance.lastHeartbeat,
+                startTime: mockInstance.uptime,
+                toolsCount: 1,
+                resourcesCount: 0
+            });
+            vi.mocked(mcpConnectionManager.getToolsByServerName).mockReturnValue(mockTools);
             // Act
             const result = await hubToolsService.readResource(`hub://servers/${serverName}/tools`);
             // Assert
@@ -1202,9 +1234,32 @@ describe('HubToolsService', () => {
                 uptime: 1000
             };
             const mockResources = [{ uri: 'test://resource', name: 'Test Resource' }];
+            const mockConfig = {
+                template: {
+                    type: 'stdio',
+                    command: '',
+                    args: [],
+                    env: {},
+                    headers: {},
+                    aggregatedTools: [],
+                    timeout: 30000
+                },
+                instances: [mockInstance],
+                tagDefinitions: []
+            };
             // @ts-expect-error - Mocking for test purposes with extra fields
             vi.mocked(hubManager.getServerInstancesByName).mockReturnValue([mockInstance]);
-            vi.mocked(mcpConnectionManager.getResources).mockReturnValue(mockResources);
+            // @ts-expect-error - Mock config with simplified mock instance
+            vi.mocked(hubManager.getServerByName).mockReturnValue(mockConfig);
+            vi.mocked(mcpConnectionManager.getConnectedIndexes).mockReturnValue([0]);
+            vi.mocked(mcpConnectionManager.getStatus).mockReturnValue({
+                connected: true,
+                lastCheck: mockInstance.lastHeartbeat,
+                startTime: mockInstance.uptime,
+                toolsCount: 0,
+                resourcesCount: 1
+            });
+            vi.mocked(mcpConnectionManager.getResourcesByName).mockReturnValue(mockResources);
             // Act
             const result = await hubToolsService.readResource(`hub://servers/${serverName}/resources`);
             // Assert

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loop_ouroboros/mcp-hub-lite",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "A lightweight MCP management platform designed for independent developers",
   "license": "MIT",
   "author": "loop_ouroboros",