@loop_ouroboros/mcp-hub-lite 1.0.2 → 1.1.0

package/dist/server/src/utils/transports/transport-factory.js

@@ -9,11 +9,11 @@ export class TransportFactory {
     /**
      * Create transport client
      * @param server Server configuration, including base configuration and instance configuration
-     * @param serverId Optional server ID for log storage integration
+     * @param compositeKey Optional composite key (serverName-serverIndex) for log storage integration
      * @returns Transport client instance
      * @throws Error if server type is not supported or configuration is invalid
      */
-    static createTransport(server, serverId) {
+    static createTransport(server, compositeKey) {
         const transportConfig = this.validateAndConvertConfig(server);
         // Use type assertion to ensure TypeScript can correctly infer types
         const config = transportConfig;
@@ -29,20 +29,20 @@ export class TransportFactory {
                     cwd: process.cwd(),
                     stderr: 'pipe'
                 }, server.name, {
-                    serverId,
-                    logStorage: serverId ? logStorage : undefined
+                    compositeKey,
+                    logStorage: compositeKey ? logStorage : undefined
                 });
             case 'sse':
                 if (!config.url) {
                     throw new Error('SSE transport requires a URL');
                 }
-                return new SseTransport(config.url, config.headers, config.reconnectInterval, config.maxReconnectAttempts);
+                return new SseTransport(config.url, config.headers, config.reconnectInterval, config.maxReconnectAttempts, config.proxy, server.name, compositeKey);
             case 'streamable-http':
             case 'http': // Compatibility with http type, treat as streamable-http
                 if (!config.url) {
                     throw new Error('Streamable HTTP transport requires a URL');
                 }
-                return new StreamableHttpTransport(config.url, config.headers, config.timeout);
+                return new StreamableHttpTransport(config.url, config.headers, config.timeout, config.proxy, server.name, compositeKey);
             default:
                 throw new Error(`Unsupported transport type: ${config.type || 'undefined'}`);
         }
@@ -51,8 +51,26 @@ export class TransportFactory {
      * Build system environment variables
      * Add necessary system environment variables for stdio transport
      */
-    static buildSystemEnv() {
-        return {};
+    static buildSystemEnv(command) {
+        const env = {};
+        // For Python-related commands, set PYTHONUTF8=1 to ensure proper UTF-8 handling
+        if (command && this.isPythonCommand(command)) {
+            env.PYTHONUTF8 = '1';
+        }
+        return env;
+    }
+    /**
+     * Check if a command is related to Python execution
+     * Detects python, python3, py, uv, uvx, and similar commands
+     */
+    static isPythonCommand(command) {
+        const trimmedCommand = command.trim();
+        if (!trimmedCommand)
+            return false;
+        // Extract the basename (last part after / or \)
+        const parts = trimmedCommand.split(/[\\/]/);
+        const basename = parts[parts.length - 1].toLowerCase();
+        return basename.includes('python') || basename.startsWith('uv') || basename.startsWith('py');
     }
     /**
      * Validate and convert server configuration to transport configuration
@@ -65,7 +83,7 @@ export class TransportFactory {
                 command: server.command || '',
                 args: server.args,
                 env: {
-                    ...this.buildSystemEnv(), // System environment variables
+                    ...this.buildSystemEnv(server.command), // System environment variables
                     ...(server.env || {}) // User-defined environment variables (can override system defaults)
                 },
                 cwd: process.cwd(),
@@ -78,7 +96,8 @@ export class TransportFactory {
                 url: server.url || '',
                 headers: server.headers || server.env, // Prefer headers, fallback to env for backward compatibility
                 reconnectInterval: 3000,
-                maxReconnectAttempts: 5
+                maxReconnectAttempts: 5,
+                proxy: server.proxy
             };
         }
         else if (type === 'streamable-http' || type === 'http') {
@@ -86,7 +105,8 @@ export class TransportFactory {
                 type: 'streamable-http', // Unified conversion to streamable-http
                 url: server.url || '',
                 headers: server.headers || server.env, // Prefer headers, fallback to env for backward compatibility
-                timeout: server.timeout || 30000
+                timeout: server.timeout || 30000,
+                proxy: server.proxy
             };
         }
         else {

package/dist/server/src/utils/transports/transport.interface.d.ts

@@ -18,6 +18,9 @@ export interface SseTransportConfig {
     headers?: Record<string, string>;
     reconnectInterval?: number;
     maxReconnectAttempts?: number;
+    proxy?: {
+        url: string;
+    };
 }
 /**
  * Streamable HTTP transport configuration
@@ -27,6 +30,9 @@ export interface StreamableHttpTransportConfig {
     url: string;
     headers?: Record<string, string>;
     timeout?: number;
+    proxy?: {
+        url: string;
+    };
 }
 /**
  * Generic server configuration

package/dist/server/src/utils/transports/transport.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transport.interface.d.ts","sourceRoot":"","sources":["../../../../../src/utils/transports/transport.interface.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,KAAK,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAC7B,oBAAoB,GACpB,kBAAkB,GAClB,6BAA6B,CAAC"}
+{"version":3,"file":"transport.interface.d.ts","sourceRoot":"","sources":["../../../../../src/utils/transports/transport.interface.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,KAAK,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAC7B,oBAAoB,GACpB,kBAAkB,GAClB,6BAA6B,CAAC"}

package/dist/server/src/utils/version.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Get the application version from package.json.
+ *
+ * @returns The package version string or a safe fallback on failure.
+ */
+export declare function getAppVersion(): string;
+/**
+ * Get the MCP protocol version used by the gateway.
+ */
+export declare function getProtocolVersion(): string;
+//# sourceMappingURL=version.d.ts.map

package/dist/server/src/utils/version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../../src/utils/version.ts"],"names":[],"mappings":"AA8CA;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAMtC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C"}

package/dist/server/src/utils/version.js

@@ -0,0 +1,57 @@
+import fs from 'fs';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+const FALLBACK_VERSION = '0.0.0';
+const MCP_PROTOCOL_VERSION = '2024-11-05';
+let cachedAppVersion;
+/**
+ * Resolve package version from package.json with multiple fallback paths.
+ */
+function resolvePackageVersion() {
+    const baseDirs = [
+        process.cwd(),
+        path.dirname(fileURLToPath(import.meta.url)),
+        path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', '..')
+    ];
+    for (const baseDir of baseDirs) {
+        let currentDir = baseDir;
+        for (let depth = 0; depth < 6; depth += 1) {
+            const candidate = path.join(currentDir, 'package.json');
+            try {
+                if (fs.existsSync(candidate)) {
+                    const packageText = fs.readFileSync(candidate, 'utf-8');
+                    const parsed = JSON.parse(packageText);
+                    if (parsed.version && typeof parsed.version === 'string') {
+                        return parsed.version;
+                    }
+                }
+            }
+            catch {
+                // Ignore parsing/file read errors and continue searching.
+            }
+            const parent = path.dirname(currentDir);
+            if (parent === currentDir) {
+                break;
+            }
+            currentDir = parent;
+        }
+    }
+    return FALLBACK_VERSION;
+}
+/**
+ * Get the application version from package.json.
+ *
+ * @returns The package version string or a safe fallback on failure.
+ */
+export function getAppVersion() {
+    if (!cachedAppVersion) {
+        cachedAppVersion = resolvePackageVersion();
+    }
+    return cachedAppVersion;
+}
+/**
+ * Get the MCP protocol version used by the gateway.
+ */
+export function getProtocolVersion() {
+    return MCP_PROTOCOL_VERSION;
+}

package/dist/server/tests/contract/mcp-protocol/initialize.test.js

@@ -1,6 +1,7 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { mcpConnectionManager } from '../../../src/services/mcp-connection-manager.js';
 import { hubManager } from '../../../src/services/hub-manager.service.js';
+import { resolveInstanceConfig } from '../../../src/config/config-migrator.js';
 // Mock MCP SDK
 vi.mock('@modelcontextprotocol/sdk/client/index.js', () => {
     return {
@@ -39,22 +40,23 @@ vi.mock('@utils/transports/transport-factory.js', () => {
 describe('MCP Protocol Contract - initialize (with SDK)', () => {
     const serverName = 'test-sdk-server';
     let serverId;
+    let serverIndex;
     beforeEach(async () => {
-        // Add to hub manager
+        // Add to hub manager (v1.1 format)
         await hubManager.addServer(serverName, {
             command: 'node',
             args: [],
-            enabled: true,
             type: 'stdio',
             timeout: 60000,
-            allowedTools: []
+            aggregatedTools: []
         });
         // Add server instance
         const instance = await hubManager.addServerInstance(serverName, {});
         serverId = instance.id;
+        serverIndex = instance.index ?? 0;
     });
     afterEach(async () => {
-        await mcpConnectionManager.disconnect(serverId);
+        await mcpConnectionManager.disconnect(serverName, serverIndex);
         hubManager.removeServer(serverName);
     });
     it('should correctly initialize MCP connection with SDK', async () => {
@@ -63,18 +65,17 @@ describe('MCP Protocol Contract - initialize (with SDK)', () => {
         if (!serverInfo) {
             throw new Error('Server not found');
         }
-        await mcpConnectionManager.connect({
+        // Resolve the complete configuration using v1.1 resolveInstanceConfig
+        const resolvedConfig = resolveInstanceConfig(serverInfo.config, serverId);
+        if (!resolvedConfig) {
+            throw new Error('Failed to resolve server configuration');
+        }
+        await mcpConnectionManager.connect(serverName, serverIndex, {
+            ...resolvedConfig,
             id: serverId,
-            command: serverInfo.config.command,
-            args: serverInfo.config.args,
-            enabled: serverInfo.config.enabled,
-            type: serverInfo.config.type,
-            timeout: serverInfo.config.timeout,
-            allowedTools: serverInfo.config.allowedTools,
-            timestamp: serverInfo.instance.timestamp,
-            hash: serverInfo.instance.hash
+            timestamp: Date.now()
         });
-        const status = mcpConnectionManager.getStatus(serverId);
+        const status = mcpConnectionManager.getStatus(serverName, serverIndex);
         expect(status?.connected).toBe(true);
         expect(status?.version).toBe('1.0.0');
     });
@@ -84,18 +85,17 @@ describe('MCP Protocol Contract - initialize (with SDK)', () => {
         if (!serverInfo) {
             throw new Error('Server not found');
         }
-        await mcpConnectionManager.connect({
+        // Resolve the complete configuration using v1.1 resolveInstanceConfig
+        const resolvedConfig = resolveInstanceConfig(serverInfo.config, serverId);
+        if (!resolvedConfig) {
+            throw new Error('Failed to resolve server configuration');
+        }
+        await mcpConnectionManager.connect(serverName, serverIndex, {
+            ...resolvedConfig,
             id: serverId,
-            command: serverInfo.config.command,
-            args: serverInfo.config.args,
-            enabled: serverInfo.config.enabled,
-            type: serverInfo.config.type,
-            timeout: serverInfo.config.timeout,
-            allowedTools: serverInfo.config.allowedTools,
-            timestamp: serverInfo.instance.timestamp,
-            hash: serverInfo.instance.hash
+            timestamp: Date.now()
         });
-        const tools = mcpConnectionManager.getTools(serverId);
+        const tools = mcpConnectionManager.getTools(serverName, serverIndex);
         expect(tools).toHaveLength(1);
         expect(tools[0].name).toBe('echo');
         expect(tools[0].description).toBe('Echo the input');

package/dist/server/tests/contract/mcp-protocol/tools-call.test.js

@@ -1,12 +1,15 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { mcpConnectionManager } from '../../../src/services/mcp-connection-manager.js';
 import { hubManager } from '../../../src/services/hub-manager.service.js';
+import { resolveInstanceConfig } from '../../../src/config/config-migrator.js';
 // Mock MCP SDK
+const mockListTools = vi.fn().mockResolvedValue({ tools: [] });
 vi.mock('@modelcontextprotocol/sdk/client/index.js', () => {
     return {
         Client: class {
             connect = vi.fn().mockResolvedValue(undefined);
             close = vi.fn().mockResolvedValue(undefined);
+            listTools = mockListTools;
             callTool = vi.fn().mockImplementation((toolCall) => {
                 if (toolCall.name === 'calculator') {
                     const { a, b, operation } = toolCall.arguments;
@@ -67,22 +70,23 @@ vi.mock('@utils/transports/transport-factory.js', () => {
 describe('MCP Protocol Contract - tools/call (with SDK)', () => {
     const serverName = 'test-sdk-server';
     let serverId;
+    let serverIndex;
     beforeEach(async () => {
-        // Add to hub manager
+        // Add to hub manager (v1.1 format)
         await hubManager.addServer(serverName, {
             command: 'node',
             args: [],
-            enabled: true,
             type: 'stdio',
             timeout: 60000,
-            allowedTools: []
+            aggregatedTools: []
         });
         // Add server instance
         const instance = await hubManager.addServerInstance(serverName, {});
         serverId = instance.id;
+        serverIndex = instance.index ?? 0;
     });
     afterEach(async () => {
-        await mcpConnectionManager.disconnect(serverId);
+        await mcpConnectionManager.disconnect(serverName, serverIndex);
         hubManager.removeServer(serverName);
     });
     it('should execute tool with correct arguments', async () => {
@@ -91,18 +95,17 @@ describe('MCP Protocol Contract - tools/call (with SDK)', () => {
         if (!serverInfo) {
             throw new Error('Server not found');
         }
-        await mcpConnectionManager.connect({
+        // Resolve the complete configuration using v1.1 resolveInstanceConfig
+        const resolvedConfig = resolveInstanceConfig(serverInfo.config, serverId);
+        if (!resolvedConfig) {
+            throw new Error('Failed to resolve server configuration');
+        }
+        await mcpConnectionManager.connect(serverName, serverIndex, {
+            ...resolvedConfig,
             id: serverId,
-            command: serverInfo.config.command,
-            args: serverInfo.config.args,
-            enabled: serverInfo.config.enabled,
-            type: serverInfo.config.type,
-            timeout: serverInfo.config.timeout,
-            allowedTools: serverInfo.config.allowedTools,
-            timestamp: serverInfo.instance.timestamp,
-            hash: serverInfo.instance.hash
+            timestamp: Date.now()
         });
-        const result = (await mcpConnectionManager.callTool(serverId, 'calculator', {
+        const result = (await mcpConnectionManager.callTool(serverName, serverIndex, 'calculator', {
             a: 5,
             b: 3,
             operation: 'add'
@@ -116,18 +119,17 @@ describe('MCP Protocol Contract - tools/call (with SDK)', () => {
         if (!serverInfo) {
             throw new Error('Server not found');
         }
-        await mcpConnectionManager.connect({
+        // Resolve the complete configuration using v1.1 resolveInstanceConfig
+        const resolvedConfig = resolveInstanceConfig(serverInfo.config, serverId);
+        if (!resolvedConfig) {
+            throw new Error('Failed to resolve server configuration');
+        }
+        await mcpConnectionManager.connect(serverName, serverIndex, {
+            ...resolvedConfig,
             id: serverId,
-            command: serverInfo.config.command,
-            args: serverInfo.config.args,
-            enabled: serverInfo.config.enabled,
-            type: serverInfo.config.type,
-            timeout: serverInfo.config.timeout,
-            allowedTools: serverInfo.config.allowedTools,
-            timestamp: serverInfo.instance.timestamp,
-            hash: serverInfo.instance.hash
+            timestamp: Date.now()
         });
-        await expect(mcpConnectionManager.callTool(serverId, 'calculator', {
+        await expect(mcpConnectionManager.callTool(serverName, serverIndex, 'calculator', {
             a: 'invalid',
             b: 3,
             operation: 'add'
@@ -139,18 +141,17 @@ describe('MCP Protocol Contract - tools/call (with SDK)', () => {
         if (!serverInfo) {
             throw new Error('Server not found');
         }
-        await mcpConnectionManager.connect({
+        // Resolve the complete configuration using v1.1 resolveInstanceConfig
+        const resolvedConfig = resolveInstanceConfig(serverInfo.config, serverId);
+        if (!resolvedConfig) {
+            throw new Error('Failed to resolve server configuration');
+        }
+        await mcpConnectionManager.connect(serverName, serverIndex, {
+            ...resolvedConfig,
             id: serverId,
-            command: serverInfo.config.command,
-            args: serverInfo.config.args,
-            enabled: serverInfo.config.enabled,
-            type: serverInfo.config.type,
-            timeout: serverInfo.config.timeout,
-            allowedTools: serverInfo.config.allowedTools,
-            timestamp: serverInfo.instance.timestamp,
-            hash: serverInfo.instance.hash
+            timestamp: Date.now()
         });
-        await expect(mcpConnectionManager.callTool(serverId, 'unknown_tool', {})).rejects.toThrow();
+        await expect(mcpConnectionManager.callTool(serverName, serverIndex, 'unknown_tool', {})).rejects.toThrow();
     });
     it('should support multiple concurrent tool calls', async () => {
         // Get server configuration and instance configuration
@@ -158,20 +159,23 @@ describe('MCP Protocol Contract - tools/call (with SDK)', () => {
         if (!serverInfo) {
             throw new Error('Server not found');
         }
-        await mcpConnectionManager.connect({
+        // Resolve the complete configuration using v1.1 resolveInstanceConfig
+        const resolvedConfig = resolveInstanceConfig(serverInfo.config, serverId);
+        if (!resolvedConfig) {
+            throw new Error('Failed to resolve server configuration');
+        }
+        await mcpConnectionManager.connect(serverName, serverIndex, {
+            ...resolvedConfig,
             id: serverId,
-            command: serverInfo.config.command,
-            args: serverInfo.config.args,
-            enabled: serverInfo.config.enabled,
-            type: serverInfo.config.type,
-            timeout: serverInfo.config.timeout,
-            allowedTools: serverInfo.config.allowedTools,
-            timestamp: serverInfo.instance.timestamp,
-            hash: serverInfo.instance.hash
+            timestamp: Date.now()
         });
         const [result1, result2] = await Promise.all([
-            mcpConnectionManager.callTool(serverId, 'get_weather', { location: 'New York' }),
-            mcpConnectionManager.callTool(serverId, 'search_news', { query: 'technology' })
+            mcpConnectionManager.callTool(serverName, serverIndex, 'get_weather', {
+                location: 'New York'
+            }),
+            mcpConnectionManager.callTool(serverName, serverIndex, 'search_news', {
+                query: 'technology'
+            })
         ]);
         expect(result1).toHaveProperty('temperature');
         expect(result1).toHaveProperty('condition');

package/dist/server/tests/contract/mcp-protocol/tools-list.test.js

@@ -1,8 +1,9 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { mcpConnectionManager } from '../../../src/services/mcp-connection-manager.js';
 import { hubManager } from '../../../src/services/hub-manager.service.js';
+import { resolveInstanceConfig } from '../../../src/config/config-migrator.js';
 // Mock MCP SDK
-const mockListTools = vi.fn();
+const mockListTools = vi.fn().mockResolvedValue({ tools: [] });
 vi.mock('@modelcontextprotocol/sdk/client/index.js', () => {
     return {
         Client: class {
@@ -29,22 +30,23 @@ vi.mock('@utils/transports/transport-factory.js', () => {
 describe('MCP Protocol Contract - tools/list (with SDK)', () => {
     const serverName = 'test-sdk-server';
     let serverId;
+    let serverIndex;
     beforeEach(async () => {
-        // Add to hub manager
+        // Add to hub manager (v1.1 format)
         await hubManager.addServer(serverName, {
             command: 'node',
             args: [],
-            enabled: true,
             type: 'stdio',
             timeout: 60000,
-            allowedTools: []
+            aggregatedTools: []
         });
         // Add server instance
         const instance = await hubManager.addServerInstance(serverName, {});
         serverId = instance.id;
+        serverIndex = instance.index ?? 0;
     });
     afterEach(async () => {
-        await mcpConnectionManager.disconnect(serverId);
+        await mcpConnectionManager.disconnect(serverName, serverIndex);
         hubManager.removeServer(serverName);
     });
     it('should return tools with correct MCP schema', async () => {
@@ -82,18 +84,17 @@ describe('MCP Protocol Contract - tools/list (with SDK)', () => {
         if (!serverInfo) {
             throw new Error('Server not found');
         }
-        await mcpConnectionManager.connect({
+        // Resolve the complete configuration using v1.1 resolveInstanceConfig
+        const resolvedConfig = resolveInstanceConfig(serverInfo.config, serverId);
+        if (!resolvedConfig) {
+            throw new Error('Failed to resolve server configuration');
+        }
+        await mcpConnectionManager.connect(serverName, serverIndex, {
+            ...resolvedConfig,
             id: serverId,
-            command: serverInfo.config.command,
-            args: serverInfo.config.args,
-            enabled: serverInfo.config.enabled,
-            type: serverInfo.config.type,
-            timeout: serverInfo.config.timeout,
-            allowedTools: serverInfo.config.allowedTools,
-            timestamp: serverInfo.instance.timestamp,
-            hash: serverInfo.instance.hash
+            timestamp: Date.now()
         });
-        const tools = mcpConnectionManager.getTools(serverId);
+        const tools = mcpConnectionManager.getTools(serverName, serverIndex);
         expect(tools).toHaveLength(2);
         // Verify calculator tool
         const calculator = tools.find((t) => t.name === 'calculator');
@@ -114,19 +115,18 @@ describe('MCP Protocol Contract - tools/list (with SDK)', () => {
         if (!serverInfo) {
             throw new Error('Server not found');
         }
-        await mcpConnectionManager.connect({
+        // Resolve the complete configuration using v1.1 resolveInstanceConfig
+        const resolvedConfig = resolveInstanceConfig(serverInfo.config, serverId);
+        if (!resolvedConfig) {
+            throw new Error('Failed to resolve server configuration');
+        }
+        await mcpConnectionManager.connect(serverName, serverIndex, {
+            ...resolvedConfig,
             id: serverId,
-            command: serverInfo.config.command,
-            args: serverInfo.config.args,
-            enabled: serverInfo.config.enabled,
-            type: serverInfo.config.type,
-            timeout: serverInfo.config.timeout,
-            allowedTools: serverInfo.config.allowedTools,
-            timestamp: serverInfo.instance.timestamp,
-            hash: serverInfo.instance.hash
+            timestamp: Date.now()
         });
-        const tools1 = mcpConnectionManager.getTools(serverId);
-        const tools2 = mcpConnectionManager.getTools(serverId);
+        const tools1 = mcpConnectionManager.getTools(serverName, serverIndex);
+        const tools2 = mcpConnectionManager.getTools(serverName, serverIndex);
         expect(tools1).toEqual(tools2);
         expect(tools1[0]).toBe(tools2[0]); // Reference equality
     });
@@ -138,18 +138,17 @@ describe('MCP Protocol Contract - tools/list (with SDK)', () => {
         if (!serverInfo) {
             throw new Error('Server not found');
         }
-        await mcpConnectionManager.connect({
+        // Resolve the complete configuration using v1.1 resolveInstanceConfig
+        const resolvedConfig = resolveInstanceConfig(serverInfo.config, serverId);
+        if (!resolvedConfig) {
+            throw new Error('Failed to resolve server configuration');
+        }
+        await mcpConnectionManager.connect(serverName, serverIndex, {
+            ...resolvedConfig,
             id: serverId,
-            command: serverInfo.config.command,
-            args: serverInfo.config.args,
-            enabled: serverInfo.config.enabled,
-            type: serverInfo.config.type,
-            timeout: serverInfo.config.timeout,
-            allowedTools: serverInfo.config.allowedTools,
-            timestamp: serverInfo.instance.timestamp,
-            hash: serverInfo.instance.hash
+            timestamp: Date.now()
         });
-        const tools = mcpConnectionManager.getTools(serverId);
+        const tools = mcpConnectionManager.getTools(serverName, serverIndex);
         expect(tools).toHaveLength(0);
     });
 });

package/dist/server/tests/evaluation/evaluation.test.js

@@ -84,19 +84,20 @@ describe('MCP Evaluation Tests', () => {
             expect(hasDestructiveIndicator, `Answer ${index + 1} may contain destructive operations: "${answer}"`).toBe(false);
         });
     });
-    it('should reference valid tools', () => {
+    it('should reference valid MCP tools', () => {
         const validTools = [
-            'list-servers',
-            'find-servers',
-            'list-all-tools-in-server',
-            'find-tools-in-server',
-            'get-tool',
-            'call-tool',
-            'find-tools'
+            'list_servers',
+            'find_servers',
+            'list_all_tools_in_server',
+            'find_tools_in_server',
+            'get_tool',
+            'call_tool',
+            'find_tools'
         ];
         const content = fs.readFileSync(evaluationFile, 'utf-8');
+        const normalizedContent = content.replace(/\b[a-z]+(?:-[a-z]+)+\b/g, (match) => match.replace(/-/g, '_'));
         validTools.forEach((tool) => {
-            expect(content).toContain(tool);
+            expect(normalizedContent).toContain(tool);
         });
     });
 });

package/dist/server/tests/integration/api/gateway.test.js

@@ -127,7 +127,7 @@ describe('GatewayService', () => {
         vi.mocked(mocks.getServerById).mockReturnValue({
             name: 'Test Server',
             id: 'server1',
-            config: { allowedTools: ['testTool'] },
+            config: { template: { aggregatedTools: ['testTool'] } },
             instance: { id: 'server1', timestamp: Date.now(), hash: 'abc123' }
         });
         // Populate toolCache for the test
@@ -170,7 +170,7 @@ describe('GatewayService', () => {
         vi.mocked(mocks.getServerById).mockReturnValue({
             name: 'Test Server',
             id: 'server1',
-            config: { allowedTools: ['testTool'] },
+            config: { template: { aggregatedTools: ['testTool'] } },
             instance: { id: 'server1', timestamp: Date.now(), hash: 'abc123' }
         });
         // Find list tools handler to populate tool map