@loop_ouroboros/mcp-hub-lite 1.2.9 → 1.3.1

package/dist/server/src/utils/request-context.js

@@ -1,73 +1,14 @@
-/**
- * Request context management using AsyncLocalStorage for request-scoped data.
- *
- * This module provides a way to store and access request-specific context data
- * across asynchronous operations without having to pass context objects through
- * every function call. It uses Node.js AsyncLocalStorage to maintain context
- * throughout the request lifecycle.
- *
- * The primary use case is storing session context information (sessionId, clientName,
- * cwd, project, etc.) that needs to be accessible from any part of the application
- * during request processing.
- *
- * @module utils/request-context
- */
 import { AsyncLocalStorage } from 'async_hooks';
-/**
- * AsyncLocalStorage instance for storing request context.
- *
- * This storage holds the SessionContext object for the current request and
- * makes it available throughout the entire request processing chain,
- * including asynchronous operations and nested function calls.
- *
- * @example
- * ```typescript
- * // In route handler
- * await requestContext.run(sessionContext, async () => {
- *   // Any code executed here can access the session context
- *   const ctx = getSessionContext();
- *   console.log(ctx.sessionId);
- * });
- * ```
- */
-export const requestContext = new AsyncLocalStorage();
-/**
- * Retrieves the current request's session context.
- *
- * This function returns the SessionContext object stored in the AsyncLocalStorage
- * for the current request. It should only be called within a request context
- * that has been established using requestContext.run().
- *
- * @returns {SessionContext | undefined} The current request's session context, or undefined if not in a request context
- *
- * @example
- * ```typescript
- * const context = getSessionContext();
- * if (context) {
- *   console.log(`Processing request for session: ${context.sessionId}`);
- * }
- * ```
- */
-export function getSessionContext() {
-    return requestContext.getStore();
+const als = new AsyncLocalStorage();
+export function runWithRequestContext(context, fn) {
+    return als.run(context, fn);
 }
-/**
- * Retrieves the current request's working directory (cwd).
- *
- * This is a convenience function that extracts the cwd property from the
- * current request's session context. It's commonly used in file operations
- * that need to respect the session's current working directory.
- *
- * @returns {string | undefined} The current request's working directory, or undefined if not available
- *
- * @example
- * ```typescript
- * const cwd = getSessionCwd();
- * if (cwd) {
- *   const fullPath = path.join(cwd, relativePath);
- * }
- * ```
- */
-export function getSessionCwd() {
-    return requestContext.getStore()?.cwd;
+export function getSessionIdFromContext() {
+    return als.getStore()?.sessionId;
+}
+export function getTraceIdFromContext() {
+    return als.getStore()?.traceId;
+}
+export function isInRequestContext() {
+    return als.getStore() !== undefined;
 }

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

@@ -1,5 +1,5 @@
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { logger, LOG_MODULES } from '../logger.js';
+import { logger, LOG_MODULES } from '../logger/index.js';
 import { PassThrough } from 'stream';
 /**
  * A transport implementation for communicating with MCP (Model Context Protocol) servers

package/dist/server/src/utils/transports/streamable-http-transport.js

@@ -1,4 +1,4 @@
-import { logger, LOG_MODULES } from '../logger.js';
+import { logger, LOG_MODULES } from '../logger/index.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { URL } from 'url';
 import { ProxyAgent, fetch as undiciFetch } from 'undici';

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

@@ -1 +1 @@
-{"version":3,"file":"transport-factory.d.ts","sourceRoot":"","sources":["../../../../../src/utils/transports/transport-factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAKtE;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CACpB,MAAM,EAAE,mBAAmB,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAC9C,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,sBAAsB,CAAC;KACvC,GACA,OAAO,+CAA+C,EAAE,SAAS;IA4EpE;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAW7B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAW9B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;CA8CxC"}
+{"version":3,"file":"transport-factory.d.ts","sourceRoot":"","sources":["../../../../../src/utils/transports/transport-factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAMtE;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CACpB,MAAM,EAAE,mBAAmB,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAC9C,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,sBAAsB,CAAC;KACvC,GACA,OAAO,+CAA+C,EAAE,SAAS;IA8FpE;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAW7B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAW9B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;CA8CxC"}

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

@@ -1,8 +1,9 @@
 import { StdioTransport } from './stdio-transport.js';
-import { SseTransport } from './sse-transport.js';
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { StreamableHttpTransport } from './streamable-http-transport.js';
 import { logStorage } from '../../services/log-storage.service.js';
 import { McpOAuthClientProvider } from '../../services/mcp-oauth/index.js';
+import { ProxyAgent, fetch as undiciFetch } from 'undici';
 import { createHash } from 'node:crypto';
 import path from 'node:path';
 import os from 'node:os';
@@ -39,11 +40,33 @@ export class TransportFactory {
                     readyPatterns: options?.readyPatterns,
                     readyTimeout: options?.readyTimeout ?? 120000
                 });
-            case 'sse':
+            case 'sse': {
                 if (!config.url) {
                     throw new Error('SSE transport requires a URL');
                 }
-                return new SseTransport(config.url, config.headers, config.reconnectInterval, config.maxReconnectAttempts, config.proxy, server.name, compositeKey);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const sseOpts = {};
+                // Headers shared between SSE GET (eventSourceInit) and POST (requestInit)
+                if (config.headers && Object.keys(config.headers).length > 0) {
+                    sseOpts.requestInit = { headers: config.headers };
+                    sseOpts.eventSourceInit = { headers: config.headers };
+                }
+                // OAuth provider
+                if (options?.authProvider) {
+                    sseOpts.authProvider = options.authProvider;
+                }
+                // Proxy support via custom fetch
+                if (config.proxy?.url) {
+                    const agent = new ProxyAgent(config.proxy.url);
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    sseOpts.fetch = (input, init) => {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        const fetchOptions = { ...init, dispatcher: agent };
+                        return undiciFetch(input, fetchOptions);
+                    };
+                }
+                return new SSEClientTransport(new URL(config.url), sseOpts);
+            }
             case 'streamable-http':
             case 'http': {
                 // Compatibility with http type, treat as streamable-http

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

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { mcpConnectionManager } from '../../../src/services/mcp-connection-manager.js';
+import { mcpConnectionManager } from '../../../src/services/connection/index.js';
 import { hubManager } from '../../../src/services/hub-manager.service.js';
 import { resolveInstanceConfig } from '../../../src/config/config-migrator.js';
 // Mock MCP SDK

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

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { mcpConnectionManager } from '../../../src/services/mcp-connection-manager.js';
+import { mcpConnectionManager } from '../../../src/services/connection/index.js';
 import { hubManager } from '../../../src/services/hub-manager.service.js';
 import { resolveInstanceConfig } from '../../../src/config/config-migrator.js';
 // Mock MCP SDK

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

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { mcpConnectionManager } from '../../../src/services/mcp-connection-manager.js';
+import { mcpConnectionManager } from '../../../src/services/connection/index.js';
 import { hubManager } from '../../../src/services/hub-manager.service.js';
 import { resolveInstanceConfig } from '../../../src/config/config-migrator.js';
 // Mock MCP SDK

package/dist/server/tests/integration/gateway/fault-tolerance.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { mcpConnectionManager } from '../../../src/services/mcp-connection-manager.js';
+import { mcpConnectionManager } from '../../../src/services/connection/index.js';
 import { hubManager } from '../../../src/services/hub-manager.service.js';
 import { configManager } from '../../../src/config/config-manager.js';
 import { resolveInstanceConfig } from '../../../src/config/config-migrator.js';

package/dist/server/tests/integration/gateway/mcp-connection.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { mcpConnectionManager } from '../../../src/services/mcp-connection-manager.js';
+import { mcpConnectionManager } from '../../../src/services/connection/index.js';
 import { hubManager } from '../../../src/services/hub-manager.service.js';
 import { configManager } from '../../../src/config/config-manager.js';
 import { resolveInstanceConfig } from '../../../src/config/config-migrator.js';

package/dist/server/tests/types/logger-test-helpers.d.ts

@@ -2,7 +2,7 @@
  * Logger test helper types for accessing private methods in tests
  */
 import type { LogLevel } from '../../shared/types/common.types.js';
-import type { LogContext } from '../../src/utils/logger.js';
+import type { LogContext } from '../../src/utils/logger/index.js';
 import type { WriteStream } from 'node:fs';
 export interface LoggerWithPrivateMethods {
     shouldLog: (level: string) => boolean;

package/dist/server/tests/types/logger-test-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger-test-helpers.d.ts","sourceRoot":"","sources":["../../../../tests/types/logger-test-helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAG3C,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IACtC,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC;IACxC,cAAc,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,MAAM,CAAC;IAC5C,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,uBAAuB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,KAAK,MAAM,CAAC;IAC5F,gBAAgB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,KAAK,MAAM,CAAC;IACrF,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IACxC,aAAa,EAAE,WAAW,GAAG,IAAI,CAAC;CACnC"}
+{"version":3,"file":"logger-test-helpers.d.ts","sourceRoot":"","sources":["../../../../tests/types/logger-test-helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAG3C,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IACtC,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC;IACxC,cAAc,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,MAAM,CAAC;IAC5C,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,uBAAuB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,KAAK,MAAM,CAAC;IAC5F,gBAAgB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,KAAK,MAAM,CAAC;IACrF,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IACxC,aAAa,EAAE,WAAW,GAAG,IAAI,CAAC;CACnC"}

package/dist/server/tests/unit/config/config-migrator.test.js

@@ -2,7 +2,7 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
-import { dryRunMigration, checkMigrationStatus, migrateConfig, rollbackMigration, resolveInstanceConfig, getEnabledInstances } from '../../../src/config/config-migrator.js';
+import { migrateConfig, resolveInstanceConfig } from '../../../src/config/config-migrator.js';
 import { SystemConfigSchema, isLegacyV1Config } from '../../../src/config/config.schema.js';
 describe('Config Migrator', () => {
     let tempDir;
@@ -85,59 +85,15 @@ describe('Config Migrator', () => {
         const config = createLegacyV1Config();
         fs.writeFileSync(testConfigPath, JSON.stringify(config, null, 2));
     };
-    describe('checkMigrationStatus', () => {
-        it('should return "not found" for non-existent file', () => {
-            const result = checkMigrationStatus(testConfigPath);
-            expect(result.exists).toBe(false);
-            expect(result.version).toBe('unknown');
-            expect(result.canMigrate).toBe(false);
-        });
-        it('should detect v1.0 configuration', () => {
-            writeLegacyV1Config();
-            const result = checkMigrationStatus(testConfigPath);
-            expect(result.exists).toBe(true);
-            expect(result.version).toBe('v1');
-            expect(result.canMigrate).toBe(true);
-        });
-        it('should detect v1.1 configuration', () => {
-            const v1_1Config = {
-                version: '1.1.0',
-                system: {
-                    host: 'localhost',
-                    port: 7788,
-                    language: 'zh',
-                    theme: 'system',
-                    logging: {
-                        level: 'info',
-                        rotationAge: '7d',
-                        jsonPretty: true,
-                        mcpCommDebug: false,
-                        apiDebug: false,
-                        gatewayDebug: false
-                    }
-                },
-                security: {
-                    allowedNetworks: ['127.0.0.1'],
-                    maxConcurrentConnections: 50,
-                    connectionTimeout: 30000,
-                    idleConnectionTimeout: 300000,
-                    maxConnections: 50
-                },
-                servers: {},
-                tagDefinitions: []
-            };
-            fs.writeFileSync(testConfigPath, JSON.stringify(v1_1Config, null, 2));
-            const result = checkMigrationStatus(testConfigPath);
-            expect(result.exists).toBe(true);
-            expect(result.version).toBe('v1.1');
-            expect(result.canMigrate).toBe(false);
-        });
-    });
-    describe('dryRunMigration', () => {
-        it('should perform migration without modifying files', () => {
+    describe('migrateConfig (actual migration)', () => {
+        it('should perform dry run without modifying files', () => {
             writeLegacyV1Config();
             const originalContent = fs.readFileSync(testConfigPath, 'utf8');
-            const result = dryRunMigration(testConfigPath);
+            const result = migrateConfig(testConfigPath, {
+                dryRun: true,
+                createBackup: false,
+                validateAfterMigration: true
+            });
             expect(result.success).toBe(true);
             expect(result.migratedConfig).toBeDefined();
             expect(result.backupPath).toBeUndefined();
@@ -145,9 +101,13 @@ describe('Config Migrator', () => {
             const currentContent = fs.readFileSync(testConfigPath, 'utf8');
             expect(currentContent).toBe(originalContent);
         });
-        it('should convert servers to servers correctly', () => {
+        it('should convert servers correctly (dry run)', () => {
             writeLegacyV1Config();
-            const result = dryRunMigration(testConfigPath);
+            const result = migrateConfig(testConfigPath, {
+                dryRun: true,
+                createBackup: false,
+                validateAfterMigration: true
+            });
             expect(result.success).toBe(true);
             expect(result.migratedConfig).toBeDefined();
             const migrated = result.migratedConfig;
@@ -156,7 +116,6 @@ describe('Config Migrator', () => {
             expect(Object.keys(migrated.servers)).toHaveLength(2);
             expect(migrated.servers['test-server-1']).toBeDefined();
             expect(migrated.servers['test-server-2']).toBeDefined();
-            // Check server 1
             const server1 = migrated.servers['test-server-1'];
             expect(server1.template.command).toBe('npx test-server-1');
             expect(server1.template.args).toEqual(['--verbose']);
@@ -167,17 +126,19 @@ describe('Config Migrator', () => {
             expect(server1.instances[0].id).toMatch(/test-server-1-[0-9a-f]{8}/);
             expect(server1.instances[0].enabled).toBe(true);
         });
-        it('should preserve system and security config', () => {
+        it('should preserve system and security config (dry run)', () => {
             writeLegacyV1Config();
             const v1Config = createLegacyV1Config();
-            const result = dryRunMigration(testConfigPath);
+            const result = migrateConfig(testConfigPath, {
+                dryRun: true,
+                createBackup: false,
+                validateAfterMigration: true
+            });
             expect(result.success).toBe(true);
             const migrated = result.migratedConfig;
             expect(migrated.system).toEqual(v1Config.system);
             expect(migrated.security).toEqual(v1Config.security);
         });
-    });
-    describe('migrateConfig (actual migration)', () => {
         it('should perform actual migration and validate the result', () => {
             writeLegacyV1Config();
             const originalContent = fs.readFileSync(testConfigPath, 'utf8');
@@ -208,40 +169,15 @@ describe('Config Migrator', () => {
             expect(validation.success).toBe(true);
         });
     });
-    describe('rollbackMigration', () => {
-        it('should rollback to v1.0 using backup', () => {
-            writeLegacyV1Config();
-            const originalContent = fs.readFileSync(testConfigPath, 'utf8');
-            // Perform migration first
-            const migrationResult = migrateConfig(testConfigPath, {
-                createBackup: true,
-                validateAfterMigration: true
-            });
-            expect(migrationResult.success).toBe(true);
-            expect(migrationResult.backupPath).toBeDefined();
-            // Verify file is v1.1
-            const migratedContent = fs.readFileSync(testConfigPath, 'utf8');
-            expect(migratedContent).not.toBe(originalContent);
-            // Rollback
-            const rollbackResult = rollbackMigration(testConfigPath, migrationResult.backupPath);
-            expect(rollbackResult.success).toBe(true);
-            // Verify file is back to original
-            const rolledBackContent = fs.readFileSync(testConfigPath, 'utf8');
-            expect(rolledBackContent).toBe(originalContent);
-        });
-        it('should fail rollback for non-existent backup', () => {
-            writeLegacyV1Config();
-            const nonExistentBackup = path.join(tempDir, 'non-existent-backup.json');
-            const result = rollbackMigration(testConfigPath, nonExistentBackup);
-            expect(result.success).toBe(false);
-            expect(result.error).toContain('not found');
-        });
-    });
     describe('v1.1 Configuration Helpers', () => {
         describe('resolveInstanceConfig', () => {
             it('should resolve instance configuration by merging template and instance', () => {
                 writeLegacyV1Config();
-                const migrationResult = dryRunMigration(testConfigPath);
+                const migrationResult = migrateConfig(testConfigPath, {
+                    dryRun: true,
+                    createBackup: false,
+                    validateAfterMigration: true
+                });
                 expect(migrationResult.success).toBe(true);
                 const serverConfig = migrationResult.migratedConfig.servers['test-server-1'];
                 const resolved = resolveInstanceConfig(serverConfig);
@@ -255,7 +191,11 @@ describe('Config Migrator', () => {
             });
             it('should resolve specific instance by ID', () => {
                 writeLegacyV1Config();
-                const migrationResult = dryRunMigration(testConfigPath);
+                const migrationResult = migrateConfig(testConfigPath, {
+                    dryRun: true,
+                    createBackup: false,
+                    validateAfterMigration: true
+                });
                 expect(migrationResult.success).toBe(true);
                 const serverConfig = migrationResult.migratedConfig.servers['test-server-1'];
                 const instanceId = serverConfig.instances[0].id;
@@ -265,25 +205,17 @@ describe('Config Migrator', () => {
             });
             it('should return null for non-existent instance ID', () => {
                 writeLegacyV1Config();
-                const migrationResult = dryRunMigration(testConfigPath);
+                const migrationResult = migrateConfig(testConfigPath, {
+                    dryRun: true,
+                    createBackup: false,
+                    validateAfterMigration: true
+                });
                 expect(migrationResult.success).toBe(true);
                 const serverConfig = migrationResult.migratedConfig.servers['test-server-1'];
                 const resolved = resolveInstanceConfig(serverConfig, 'non-existent-id');
                 expect(resolved).toBeNull();
             });
         });
-        describe('getEnabledInstances', () => {
-            it('should return only enabled instances', () => {
-                writeLegacyV1Config();
-                const migrationResult = dryRunMigration(testConfigPath);
-                expect(migrationResult.success).toBe(true);
-                const serverConfig = migrationResult.migratedConfig.servers['test-server-1'];
-                const enabledInstances = getEnabledInstances(serverConfig);
-                expect(enabledInstances).toHaveLength(1);
-                expect(enabledInstances[0].instance.enabled).toBe(true);
-                expect(enabledInstances[0].resolved).not.toBeNull();
-            });
-        });
     });
     describe('Migration Edge Cases', () => {
         it('should handle empty servers list', () => {
@@ -292,7 +224,11 @@ describe('Config Migrator', () => {
                 servers: {}
             };
             fs.writeFileSync(testConfigPath, JSON.stringify(emptyV1Config, null, 2));
-            const result = dryRunMigration(testConfigPath);
+            const result = migrateConfig(testConfigPath, {
+                dryRun: true,
+                createBackup: false,
+                validateAfterMigration: true
+            });
             expect(result.success).toBe(true);
             expect(result.migratedConfig.servers).toEqual({});
         });
@@ -310,7 +246,11 @@ describe('Config Migrator', () => {
                 }
             };
             fs.writeFileSync(testConfigPath, JSON.stringify(minimalV1Config, null, 2));
-            const result = dryRunMigration(testConfigPath);
+            const result = migrateConfig(testConfigPath, {
+                dryRun: true,
+                createBackup: false,
+                validateAfterMigration: true
+            });
             expect(result.success).toBe(true);
             expect(result.migratedConfig.servers['minimal-server']).toBeDefined();
         });

package/dist/server/tests/unit/config/config-saver.test.js

@@ -5,7 +5,7 @@ import path from 'path';
 // Mock fs module
 vi.mock('fs');
 vi.mock('path');
-vi.mock('@utils/logger.js', () => ({
+vi.mock('@utils/logger/index.js', () => ({
     logger: {
         debug: vi.fn(),
         error: vi.fn()

package/dist/server/tests/unit/config/config.schema.test.js

@@ -218,7 +218,8 @@ describe('Config Schema (v1.1)', () => {
                         jsonPretty: true,
                         mcpCommDebug: false,
                         apiDebug: false,
-                        gatewayDebug: false
+                        gatewayDebug: false,
+                        showTraceContext: true
                     }
                 },
                 security: {

package/dist/server/tests/unit/server/runner.test.js

@@ -2,8 +2,8 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { runServer } from '../../../src/server/runner.js';
 import { buildApp } from '../../../src/app.js';
 import { configManager } from '../../../src/config/config-manager.js';
-import { logger } from '../../../src/utils/logger.js';
-import { mcpConnectionManager } from '../../../src/services/mcp-connection-manager.js';
+import { logger } from '../../../src/utils/logger/index.js';
+import { mcpConnectionManager } from '../../../src/services/connection/index.js';
 import { PidManager } from '../../../src/pid/manager.js';
 import { checkPort, checkPortWithExit } from '../../../src/utils/port-checker.js';
 // Mock resolveInstanceConfig to return a valid resolved config
@@ -16,8 +16,7 @@ vi.mock('@config/config-migrator.js', () => ({
         aggregatedTools: [],
         tags: {},
         enabled: true
-    })),
-    getEnabledInstances: vi.fn()
+    }))
 }));
 // Mock all dependencies
 vi.mock('@src/app.js', () => ({
@@ -31,7 +30,7 @@ vi.mock('@config/config-manager.js', () => ({
         addServerInstance: vi.fn()
     }
 }));
-vi.mock('@utils/logger.js', () => ({
+vi.mock('@utils/logger/index.js', () => ({
     logger: {
         info: vi.fn(),
         error: vi.fn(),
@@ -43,7 +42,7 @@ vi.mock('@utils/logger.js', () => ({
         SERVER: { module: 'Server' }
     }
 }));
-vi.mock('@services/mcp-connection-manager.js', () => ({
+vi.mock('@services/connection/index.js', () => ({
     mcpConnectionManager: {
         connect: vi.fn(() => Promise.resolve(true)),
         disconnectAll: vi.fn()
@@ -96,7 +95,8 @@ describe('Server Runner', () => {
                         jsonPretty: true,
                         mcpCommDebug: false,
                         apiDebug: false,
-                        gatewayDebug: false
+                        gatewayDebug: false,
+                        showTraceContext: true
                     }
                 },
                 security: {
@@ -137,7 +137,8 @@ describe('Server Runner', () => {
                         jsonPretty: true,
                         mcpCommDebug: false,
                         apiDebug: false,
-                        gatewayDebug: false
+                        gatewayDebug: false,
+                        showTraceContext: true
                     }
                 },
                 security: {
@@ -187,7 +188,8 @@ describe('Server Runner', () => {
                         jsonPretty: true,
                         mcpCommDebug: false,
                         apiDebug: false,
-                        gatewayDebug: false
+                        gatewayDebug: false,
+                        showTraceContext: true
                     }
                 },
                 security: {
@@ -242,7 +244,8 @@ describe('Server Runner', () => {
                         jsonPretty: true,
                         mcpCommDebug: false,
                         apiDebug: false,
-                        gatewayDebug: false
+                        gatewayDebug: false,
+                        showTraceContext: true
                     }
                 },
                 security: {
@@ -360,7 +363,8 @@ describe('Server Runner', () => {
                         jsonPretty: true,
                         mcpCommDebug: false,
                         apiDebug: false,
-                        gatewayDebug: false
+                        gatewayDebug: false,
+                        showTraceContext: true
                     }
                 },
                 security: {
@@ -415,7 +419,8 @@ describe('Server Runner', () => {
                         jsonPretty: true,
                         mcpCommDebug: false,
                         apiDebug: false,
-                        gatewayDebug: false
+                        gatewayDebug: false,
+                        showTraceContext: true
                     }
                 },
                 security: {
@@ -466,7 +471,8 @@ describe('Server Runner', () => {
                         jsonPretty: true,
                         mcpCommDebug: false,
                         apiDebug: false,
-                        gatewayDebug: false
+                        gatewayDebug: false,
+                        showTraceContext: true
                     }
                 },
                 security: {

package/dist/server/tests/unit/services/gateway-logging.test.js

@@ -1,5 +1,5 @@
 import { describe, test, expect } from 'vitest';
-import { GatewayService } from '../../../src/services/gateway.service.js';
+import { GatewayService } from '../../../src/services/gateway/index.js';
 describe('GatewayService Logging Helpers', () => {
     // Access private methods using type assertion for testing
     const gateway = new GatewayService();

package/dist/server/tests/unit/services/gateway-session-mode.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=gateway-session-mode.test.d.ts.map

package/dist/server/tests/unit/services/gateway-session-mode.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gateway-session-mode.test.d.ts","sourceRoot":"","sources":["../../../../../tests/unit/services/gateway-session-mode.test.ts"],"names":[],"mappings":""}