@mastra/mcp 0.4.1-alpha.3 → 0.4.1-alpha.5

package/dist/index.cjs

@@ -10,6 +10,7 @@ var streamableHttp_js = require('@modelcontextprotocol/sdk/client/streamableHttp
 var protocol_js = require('@modelcontextprotocol/sdk/shared/protocol.js');
 var types_js = require('@modelcontextprotocol/sdk/types.js');
 var exitHook = require('exit-hook');
+var equal = require('fast-deep-equal');
 var uuid = require('uuid');
 var core = require('@mastra/core');
 var index_js$1 = require('@modelcontextprotocol/sdk/server/index.js');
@@ -19,6 +20,8 @@ var fs = require('fs');
 var os = require('os');
 var path = require('path');
 
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   var n = Object.create(null);
@@ -37,6 +40,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
+var equal__default = /*#__PURE__*/_interopDefault(equal);
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 var os__namespace = /*#__PURE__*/_interopNamespace(os);
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
@@ -4118,12 +4122,13 @@ function convertLogLevelToLoggerMethod(level) {
       return "info";
   }
 }
-var MastraMCPClient = class extends base.MastraBase {
+var InternalMastraMCPClient = class _InternalMastraMCPClient extends base.MastraBase {
   name;
   client;
   timeout;
   logHandler;
   enableServerLogs;
+  static hasWarned = false;
   serverConfig;
   transport;
   constructor({
@@ -4134,6 +4139,12 @@ var MastraMCPClient = class extends base.MastraBase {
     timeout = protocol_js.DEFAULT_REQUEST_TIMEOUT_MSEC
   }) {
     super({ name: "MastraMCPClient" });
+    if (!_InternalMastraMCPClient.hasWarned) {
+      console.warn(
+        "[DEPRECATION] MastraMCPClient is deprecated and will be removed in a future release. Please use MCPClient instead."
+      );
+      _InternalMastraMCPClient.hasWarned = true;
+    }
     this.name = name;
     this.timeout = timeout;
     this.logHandler = server.logger;
@@ -4350,48 +4361,74 @@ var MastraMCPClient = class extends base.MastraBase {
     return toolsRes;
   }
 };
-var mastraMCPConfigurationInstances = /* @__PURE__ */ new Map();
-var MCPConfiguration = class extends base.MastraBase {
+var MastraMCPClient = InternalMastraMCPClient;
+var mcpClientInstances = /* @__PURE__ */ new Map();
+var MCPClient = class extends base.MastraBase {
   serverConfigs = {};
   id;
   defaultTimeout;
+  mcpClientsById = /* @__PURE__ */ new Map();
+  disconnectPromise = null;
   constructor(args) {
-    super({ name: "MCPConfiguration" });
+    super({ name: "MCPClient" });
     this.defaultTimeout = args.timeout ?? protocol_js.DEFAULT_REQUEST_TIMEOUT_MSEC;
     this.serverConfigs = args.servers;
     this.id = args.id ?? this.makeId();
-    const existingInstance = mastraMCPConfigurationInstances.get(this.id);
+    if (args.id) {
+      this.id = args.id;
+      const cached = mcpClientInstances.get(this.id);
+      if (cached && !equal__default.default(cached.serverConfigs, args.servers)) {
+        const existingInstance2 = mcpClientInstances.get(this.id);
+        if (existingInstance2) {
+          void existingInstance2.disconnect();
+        }
+      }
+    } else {
+      this.id = this.makeId();
+    }
+    const existingInstance = mcpClientInstances.get(this.id);
     if (existingInstance) {
       if (!args.id) {
-        throw new Error(`MCPConfiguration was initialized multiple times with the same configuration options.
+        throw new Error(`MCPClient was initialized multiple times with the same configuration options.
 
 This error is intended to prevent memory leaks.
 
 To fix this you have three different options:
-1. If you need multiple MCPConfiguration class instances with identical server configurations, set an id when configuring: new MCPConfiguration({ id: "my-unique-id" })
-2. Call "await configuration.disconnect()" after you're done using the configuration and before you recreate another instance with the same options. If the identical MCPConfiguration instance is already closed at the time of re-creating it, you will not see this error.
-3. If you only need one instance of MCPConfiguration in your app, refactor your code so it's only created one time (ex. move it out of a loop into a higher scope code block)
+1. If you need multiple MCPClient class instances with identical server configurations, set an id when configuring: new MCPClient({ id: "my-unique-id" })
+2. Call "await client.disconnect()" after you're done using the client and before you recreate another instance with the same options. If the identical MCPClient instance is already closed at the time of re-creating it, you will not see this error.
+3. If you only need one instance of MCPClient in your app, refactor your code so it's only created one time (ex. move it out of a loop into a higher scope code block)
 `);
       }
       return existingInstance;
     }
+    mcpClientInstances.set(this.id, this);
     this.addToInstanceCache();
     return this;
   }
   addToInstanceCache() {
-    if (!mastraMCPConfigurationInstances.has(this.id)) {
-      mastraMCPConfigurationInstances.set(this.id, this);
+    if (!mcpClientInstances.has(this.id)) {
+      mcpClientInstances.set(this.id, this);
     }
   }
   makeId() {
     const text = JSON.stringify(this.serverConfigs).normalize("NFKC");
-    const idNamespace = uuid.v5(`MCPConfiguration`, uuid.v5.DNS);
+    const idNamespace = uuid.v5(`MCPClient`, uuid.v5.DNS);
     return uuid.v5(text, idNamespace);
   }
   async disconnect() {
-    mastraMCPConfigurationInstances.delete(this.id);
-    await Promise.all(Array.from(this.mcpClientsById.values()).map((client) => client.disconnect()));
-    this.mcpClientsById.clear();
+    if (this.disconnectPromise) {
+      return this.disconnectPromise;
+    }
+    this.disconnectPromise = (async () => {
+      try {
+        mcpClientInstances.delete(this.id);
+        await Promise.all(Array.from(this.mcpClientsById.values()).map((client) => client.disconnect()));
+        this.mcpClientsById.clear();
+      } finally {
+        this.disconnectPromise = null;
+      }
+    })();
+    return this.disconnectPromise;
   }
   async getTools() {
     this.addToInstanceCache();
@@ -4426,16 +4463,21 @@ To fix this you have three different options:
     }
     return sessionIds;
   }
-  mcpClientsById = /* @__PURE__ */ new Map();
   async getConnectedClient(name, config) {
+    if (this.disconnectPromise) {
+      await this.disconnectPromise;
+    }
     const exists = this.mcpClientsById.has(name);
+    const existingClient = this.mcpClientsById.get(name);
     if (exists) {
-      const mcpClient2 = this.mcpClientsById.get(name);
-      await mcpClient2.connect();
-      return mcpClient2;
+      if (!existingClient) {
+        throw new Error(`Client ${name} exists but is undefined`);
+      }
+      await existingClient.connect();
+      return existingClient;
     }
     this.logger.debug(`Connecting to ${name} MCP server`);
-    const mcpClient = new MastraMCPClient({
+    const mcpClient = new InternalMastraMCPClient({
       name,
       server: config,
       timeout: config.timeout ?? this.defaultTimeout
@@ -4445,7 +4487,7 @@ To fix this you have three different options:
       await mcpClient.connect();
     } catch (e) {
       this.mcpClientsById.delete(name);
-      this.logger.error(`MCPConfiguration errored connecting to MCP server ${name}`, {
+      this.logger.error(`MCPClient errored connecting to MCP server ${name}`, {
         error: e instanceof Error ? e.message : String(e)
       });
       throw new Error(
@@ -4465,6 +4507,14 @@ To fix this you have three different options:
     );
   }
 };
+var MCPConfiguration = class extends MCPClient {
+  constructor(args) {
+    super(args);
+    this.logger.warn(
+      `MCPConfiguration has been renamed to MCPClient and MCPConfiguration is deprecated. The API is identical but the MCPConfiguration export will be removed in the future. Update your imports now to prevent future errors.`
+    );
+  }
+};
 
 // ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/esm/parsers/parseAnyOf.js
 var parseAnyOf = (schema, refs) => {
@@ -6585,6 +6635,7 @@ var MCPServer = class {
   }
 };
 
+exports.MCPClient = MCPClient;
 exports.MCPConfiguration = MCPConfiguration;
 exports.MCPServer = MCPServer;
 exports.MastraMCPClient = MastraMCPClient;

package/dist/index.d.cts

@@ -3,6 +3,8 @@ export { LogMessage_alias_1 as LogMessage } from './_tsup-dts-rollup.cjs';
 export { LogHandler_alias_1 as LogHandler } from './_tsup-dts-rollup.cjs';
 export { MastraMCPServerDefinition_alias_1 as MastraMCPServerDefinition } from './_tsup-dts-rollup.cjs';
 export { MastraMCPClient_alias_1 as MastraMCPClient } from './_tsup-dts-rollup.cjs';
+export { MCPClientOptions_alias_1 as MCPClientOptions } from './_tsup-dts-rollup.cjs';
+export { MCPClient_alias_1 as MCPClient } from './_tsup-dts-rollup.cjs';
 export { MCPConfigurationOptions_alias_1 as MCPConfigurationOptions } from './_tsup-dts-rollup.cjs';
 export { MCPConfiguration_alias_1 as MCPConfiguration } from './_tsup-dts-rollup.cjs';
 export { MCPServer } from './_tsup-dts-rollup.cjs';

package/dist/index.d.ts

@@ -3,6 +3,8 @@ export { LogMessage_alias_1 as LogMessage } from './_tsup-dts-rollup.js';
 export { LogHandler_alias_1 as LogHandler } from './_tsup-dts-rollup.js';
 export { MastraMCPServerDefinition_alias_1 as MastraMCPServerDefinition } from './_tsup-dts-rollup.js';
 export { MastraMCPClient_alias_1 as MastraMCPClient } from './_tsup-dts-rollup.js';
+export { MCPClientOptions_alias_1 as MCPClientOptions } from './_tsup-dts-rollup.js';
+export { MCPClient_alias_1 as MCPClient } from './_tsup-dts-rollup.js';
 export { MCPConfigurationOptions_alias_1 as MCPConfigurationOptions } from './_tsup-dts-rollup.js';
 export { MCPConfiguration_alias_1 as MCPConfiguration } from './_tsup-dts-rollup.js';
 export { MCPServer } from './_tsup-dts-rollup.js';

package/dist/index.js

@@ -8,6 +8,7 @@ import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/
 import { DEFAULT_REQUEST_TIMEOUT_MSEC } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import { ListResourcesResultSchema, CallToolResultSchema, ListToolsRequestSchema, CallToolRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import { asyncExitHook, gracefulExit } from 'exit-hook';
+import equal from 'fast-deep-equal';
 import { v5 } from 'uuid';
 import { isVercelTool, isZodType, resolveSerializedZodOutput } from '@mastra/core';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
@@ -4094,12 +4095,13 @@ function convertLogLevelToLoggerMethod(level) {
       return "info";
   }
 }
-var MastraMCPClient = class extends MastraBase {
+var InternalMastraMCPClient = class _InternalMastraMCPClient extends MastraBase {
   name;
   client;
   timeout;
   logHandler;
   enableServerLogs;
+  static hasWarned = false;
   serverConfig;
   transport;
   constructor({
@@ -4110,6 +4112,12 @@ var MastraMCPClient = class extends MastraBase {
     timeout = DEFAULT_REQUEST_TIMEOUT_MSEC
   }) {
     super({ name: "MastraMCPClient" });
+    if (!_InternalMastraMCPClient.hasWarned) {
+      console.warn(
+        "[DEPRECATION] MastraMCPClient is deprecated and will be removed in a future release. Please use MCPClient instead."
+      );
+      _InternalMastraMCPClient.hasWarned = true;
+    }
     this.name = name;
     this.timeout = timeout;
     this.logHandler = server.logger;
@@ -4326,48 +4334,74 @@ var MastraMCPClient = class extends MastraBase {
     return toolsRes;
   }
 };
-var mastraMCPConfigurationInstances = /* @__PURE__ */ new Map();
-var MCPConfiguration = class extends MastraBase {
+var MastraMCPClient = InternalMastraMCPClient;
+var mcpClientInstances = /* @__PURE__ */ new Map();
+var MCPClient = class extends MastraBase {
   serverConfigs = {};
   id;
   defaultTimeout;
+  mcpClientsById = /* @__PURE__ */ new Map();
+  disconnectPromise = null;
   constructor(args) {
-    super({ name: "MCPConfiguration" });
+    super({ name: "MCPClient" });
     this.defaultTimeout = args.timeout ?? DEFAULT_REQUEST_TIMEOUT_MSEC;
     this.serverConfigs = args.servers;
     this.id = args.id ?? this.makeId();
-    const existingInstance = mastraMCPConfigurationInstances.get(this.id);
+    if (args.id) {
+      this.id = args.id;
+      const cached = mcpClientInstances.get(this.id);
+      if (cached && !equal(cached.serverConfigs, args.servers)) {
+        const existingInstance2 = mcpClientInstances.get(this.id);
+        if (existingInstance2) {
+          void existingInstance2.disconnect();
+        }
+      }
+    } else {
+      this.id = this.makeId();
+    }
+    const existingInstance = mcpClientInstances.get(this.id);
     if (existingInstance) {
       if (!args.id) {
-        throw new Error(`MCPConfiguration was initialized multiple times with the same configuration options.
+        throw new Error(`MCPClient was initialized multiple times with the same configuration options.
 
 This error is intended to prevent memory leaks.
 
 To fix this you have three different options:
-1. If you need multiple MCPConfiguration class instances with identical server configurations, set an id when configuring: new MCPConfiguration({ id: "my-unique-id" })
-2. Call "await configuration.disconnect()" after you're done using the configuration and before you recreate another instance with the same options. If the identical MCPConfiguration instance is already closed at the time of re-creating it, you will not see this error.
-3. If you only need one instance of MCPConfiguration in your app, refactor your code so it's only created one time (ex. move it out of a loop into a higher scope code block)
+1. If you need multiple MCPClient class instances with identical server configurations, set an id when configuring: new MCPClient({ id: "my-unique-id" })
+2. Call "await client.disconnect()" after you're done using the client and before you recreate another instance with the same options. If the identical MCPClient instance is already closed at the time of re-creating it, you will not see this error.
+3. If you only need one instance of MCPClient in your app, refactor your code so it's only created one time (ex. move it out of a loop into a higher scope code block)
 `);
       }
       return existingInstance;
     }
+    mcpClientInstances.set(this.id, this);
     this.addToInstanceCache();
     return this;
   }
   addToInstanceCache() {
-    if (!mastraMCPConfigurationInstances.has(this.id)) {
-      mastraMCPConfigurationInstances.set(this.id, this);
+    if (!mcpClientInstances.has(this.id)) {
+      mcpClientInstances.set(this.id, this);
     }
   }
   makeId() {
     const text = JSON.stringify(this.serverConfigs).normalize("NFKC");
-    const idNamespace = v5(`MCPConfiguration`, v5.DNS);
+    const idNamespace = v5(`MCPClient`, v5.DNS);
     return v5(text, idNamespace);
   }
   async disconnect() {
-    mastraMCPConfigurationInstances.delete(this.id);
-    await Promise.all(Array.from(this.mcpClientsById.values()).map((client) => client.disconnect()));
-    this.mcpClientsById.clear();
+    if (this.disconnectPromise) {
+      return this.disconnectPromise;
+    }
+    this.disconnectPromise = (async () => {
+      try {
+        mcpClientInstances.delete(this.id);
+        await Promise.all(Array.from(this.mcpClientsById.values()).map((client) => client.disconnect()));
+        this.mcpClientsById.clear();
+      } finally {
+        this.disconnectPromise = null;
+      }
+    })();
+    return this.disconnectPromise;
   }
   async getTools() {
     this.addToInstanceCache();
@@ -4402,16 +4436,21 @@ To fix this you have three different options:
     }
     return sessionIds;
   }
-  mcpClientsById = /* @__PURE__ */ new Map();
   async getConnectedClient(name, config) {
+    if (this.disconnectPromise) {
+      await this.disconnectPromise;
+    }
     const exists = this.mcpClientsById.has(name);
+    const existingClient = this.mcpClientsById.get(name);
     if (exists) {
-      const mcpClient2 = this.mcpClientsById.get(name);
-      await mcpClient2.connect();
-      return mcpClient2;
+      if (!existingClient) {
+        throw new Error(`Client ${name} exists but is undefined`);
+      }
+      await existingClient.connect();
+      return existingClient;
     }
     this.logger.debug(`Connecting to ${name} MCP server`);
-    const mcpClient = new MastraMCPClient({
+    const mcpClient = new InternalMastraMCPClient({
       name,
       server: config,
       timeout: config.timeout ?? this.defaultTimeout
@@ -4421,7 +4460,7 @@ To fix this you have three different options:
       await mcpClient.connect();
     } catch (e) {
       this.mcpClientsById.delete(name);
-      this.logger.error(`MCPConfiguration errored connecting to MCP server ${name}`, {
+      this.logger.error(`MCPClient errored connecting to MCP server ${name}`, {
         error: e instanceof Error ? e.message : String(e)
       });
       throw new Error(
@@ -4441,6 +4480,14 @@ To fix this you have three different options:
     );
   }
 };
+var MCPConfiguration = class extends MCPClient {
+  constructor(args) {
+    super(args);
+    this.logger.warn(
+      `MCPConfiguration has been renamed to MCPClient and MCPConfiguration is deprecated. The API is identical but the MCPConfiguration export will be removed in the future. Update your imports now to prevent future errors.`
+    );
+  }
+};
 
 // ../../node_modules/.pnpm/json-schema-to-zod@2.6.0/node_modules/json-schema-to-zod/dist/esm/parsers/parseAnyOf.js
 var parseAnyOf = (schema, refs) => {
@@ -6561,4 +6608,4 @@ var MCPServer = class {
   }
 };
 
-export { MCPConfiguration, MCPServer, MastraMCPClient };
+export { MCPClient, MCPConfiguration, MCPServer, MastraMCPClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.4.1-alpha.3",
+  "version": "0.4.1-alpha.5",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -25,19 +25,20 @@
     "@modelcontextprotocol/sdk": "^1.10.2",
     "date-fns": "^4.1.0",
     "exit-hook": "^4.0.0",
+    "fast-deep-equal": "^3.1.3",
     "uuid": "^11.1.0",
-    "@mastra/core": "^0.9.1-alpha.3"
+    "@mastra/core": "^0.9.1-alpha.4"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^1.1.15",
-    "@microsoft/api-extractor": "^7.52.1",
+    "@microsoft/api-extractor": "^7.52.5",
     "@types/node": "^20.17.27",
     "eslint": "^9.23.0",
     "json-schema-to-zod": "^2.6.0",
     "tsup": "^8.4.0",
     "tsx": "^4.19.3",
     "typescript": "^5.8.2",
-    "vitest": "^3.0.9",
+    "vitest": "^3.1.2",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.22.4",
     "@internal/lint": "0.0.2"

package/src/client.ts

@@ -89,12 +89,13 @@ function convertLogLevelToLoggerMethod(level: LoggingLevel): 'debug' | 'info' |
   }
 }
 
-export class MastraMCPClient extends MastraBase {
+export class InternalMastraMCPClient extends MastraBase {
   name: string;
   private client: Client;
   private readonly timeout: number;
   private logHandler?: LogHandler;
   private enableServerLogs?: boolean;
+  private static hasWarned = false;
   private serverConfig: MastraMCPServerDefinition;
   private transport?: Transport;
 
@@ -112,6 +113,13 @@ export class MastraMCPClient extends MastraBase {
     timeout?: number;
   }) {
     super({ name: 'MastraMCPClient' });
+    if (!InternalMastraMCPClient.hasWarned) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        '[DEPRECATION] MastraMCPClient is deprecated and will be removed in a future release. Please use MCPClient instead.',
+      );
+      InternalMastraMCPClient.hasWarned = true;
+    }
     this.name = name;
     this.timeout = timeout;
     this.logHandler = server.logger;
@@ -362,3 +370,8 @@ export class MastraMCPClient extends MastraBase {
     return toolsRes;
   }
 }
+
+/**
+ * @deprecated MastraMCPClient is deprecated and will be removed in a future release. Please use MCPClient instead.
+ */
+export const MastraMCPClient = InternalMastraMCPClient;

package/src/configuration.test.ts

@@ -1,12 +1,12 @@
 import { spawn } from 'child_process';
 import path from 'path';
 import { describe, it, expect, beforeEach, afterEach, afterAll, beforeAll, vi } from 'vitest';
-import { MCPConfiguration } from './configuration';
+import { MCPClient } from './configuration';
 
 vi.setConfig({ testTimeout: 80000, hookTimeout: 80000 });
 
-describe('MCPConfiguration', () => {
-  let mcp: MCPConfiguration;
+describe('MCPClient', () => {
+  let mcp: MCPClient;
   let weatherProcess: ReturnType<typeof spawn>;
 
   beforeAll(async () => {
@@ -36,7 +36,7 @@ describe('MCPConfiguration', () => {
   });
 
   beforeEach(async () => {
-    mcp = new MCPConfiguration({
+    mcp = new MCPClient({
       servers: {
         stockPrice: {
           command: 'npx',
@@ -95,7 +95,7 @@ describe('MCPConfiguration', () => {
   });
 
   it('should handle connection errors gracefully', async () => {
-    const badConfig = new MCPConfiguration({
+    const badConfig = new MCPClient({
       servers: {
         badServer: {
           command: 'nonexistent-command',
@@ -110,7 +110,7 @@ describe('MCPConfiguration', () => {
 
   describe('Instance Management', () => {
     it('should allow multiple instances with different IDs', async () => {
-      const config2 = new MCPConfiguration({
+      const config2 = new MCPClient({
         id: 'custom-id',
         servers: {
           stockPrice: {
@@ -130,7 +130,7 @@ describe('MCPConfiguration', () => {
     it('should allow reuse of configuration after closing', async () => {
       await mcp.disconnect();
 
-      const config2 = new MCPConfiguration({
+      const config2 = new MCPClient({
         servers: {
           stockPrice: {
             command: 'npx',
@@ -150,7 +150,7 @@ describe('MCPConfiguration', () => {
     });
 
     it('should throw error when creating duplicate instance without ID', async () => {
-      const existingConfig = new MCPConfiguration({
+      const existingConfig = new MCPClient({
         servers: {
           stockPrice: {
             command: 'npx',
@@ -164,7 +164,7 @@ describe('MCPConfiguration', () => {
 
       expect(
         () =>
-          new MCPConfiguration({
+          new MCPClient({
             servers: {
               stockPrice: {
                 command: 'npx',
@@ -175,14 +175,14 @@ describe('MCPConfiguration', () => {
               },
             },
           }),
-      ).toThrow(/MCPConfiguration was initialized multiple times/);
+      ).toThrow(/MCPClient was initialized multiple times/);
 
       await existingConfig.disconnect();
     });
   });
-  describe('MCPConfiguration Operation Timeouts', () => {
+  describe('MCPClient Operation Timeouts', () => {
     it('should respect custom timeout in configuration', async () => {
-      const config = new MCPConfiguration({
+      const config = new MCPClient({
         id: 'test-timeout-config',
         timeout: 3000, // 3 second timeout
         servers: {
@@ -208,7 +208,7 @@ describe('MCPConfiguration', () => {
     });
 
     it('should respect per-server timeout override', async () => {
-      const config = new MCPConfiguration({
+      const config = new MCPClient({
         id: 'test-server-timeout-config',
         timeout: 500, // Global timeout of 500ms
         servers: {
@@ -236,9 +236,9 @@ describe('MCPConfiguration', () => {
     });
   });
 
-  describe('MCPConfiguration Connection Timeout', () => {
+  describe('MCPClient Connection Timeout', () => {
     it('should throw timeout error for slow starting server', async () => {
-      const slowConfig = new MCPConfiguration({
+      const slowConfig = new MCPClient({
         id: 'test-slow-server',
         servers: {
           slowServer: {
@@ -254,7 +254,7 @@ describe('MCPConfiguration', () => {
     });
 
     it('timeout should be longer than configured timeout', async () => {
-      const slowConfig = new MCPConfiguration({
+      const slowConfig = new MCPClient({
         id: 'test-slow-server',
         timeout: 2000,
         servers: {
@@ -272,7 +272,7 @@ describe('MCPConfiguration', () => {
     });
 
     it('should respect per-server timeout configuration', async () => {
-      const mixedConfig = new MCPConfiguration({
+      const mixedConfig = new MCPClient({
         id: 'test-mixed-timeout',
         timeout: 1000, // Short global timeout
         servers: {