@mastra/mcp 2.2.1-alpha.0 → 2.3.0-alpha.1

package/dist/index.js

@@ -23241,7 +23241,7 @@ var InternalMastraMCPClient = class extends MastraBase {
 	/**
 	* @internal
 	*/
-	constructor({ name, version = "1.0.0", server, timeout = DEFAULT_REQUEST_TIMEOUT_MSEC }) {
+	constructor({ name, version = "1.0.0", clientInfo, server, timeout = DEFAULT_REQUEST_TIMEOUT_MSEC }) {
 		super({ name: "MastraMCPClient" });
 		this.name = name;
 		this.timeout = timeout;
@@ -23262,8 +23262,8 @@ var InternalMastraMCPClient = class extends MastraBase {
 			}
 		};
 		this.client = new Client({
-			name,
-			version
+			name: clientInfo?.name ?? name,
+			version: clientInfo?.version ?? version
 		}, {
 			capabilities: clientCapabilities,
 			...server.jsonSchemaValidator ? { jsonSchemaValidator: server.jsonSchemaValidator } : {},
@@ -24870,6 +24870,7 @@ var MCPClient = class extends MastraBase {
 	serverConfigs = {};
 	id;
 	defaultTimeout;
+	defaultClientInfo;
 	mcpClientsById = /* @__PURE__ */ new Map();
 	disconnectPromise = null;
 	authFlowsByServer = /* @__PURE__ */ new Map();
@@ -24912,12 +24913,13 @@ var MCPClient = class extends MastraBase {
 	constructor(args) {
 		super({ name: "MCPClient" });
 		this.defaultTimeout = args.timeout ?? DEFAULT_REQUEST_TIMEOUT_MSEC;
+		this.defaultClientInfo = args.clientInfo && { ...args.clientInfo };
 		this.serverConfigs = args.servers;
 		this.id = args.id ?? this.makeId();
 		if (args.id) {
 			this.id = args.id;
 			const cached = mcpClientInstances.get(this.id);
-			if (cached && !equal(cached.serverConfigs, args.servers)) {
+			if (cached && (!equal(cached.serverConfigs, args.servers) || !equal(cached.defaultClientInfo, args.clientInfo))) {
 				const existingInstance = mcpClientInstances.get(this.id);
 				if (existingInstance) {
 					existingInstance.disconnect();
@@ -25343,7 +25345,10 @@ onListChanged: async (serverName, handler) => {
 		if (!mcpClientInstances.has(this.id)) mcpClientInstances.set(this.id, this);
 	}
 	makeId() {
-		const text = JSON.stringify(this.serverConfigs).normalize("NFKC");
+		const text = JSON.stringify(this.defaultClientInfo === void 0 ? this.serverConfigs : {
+			servers: this.serverConfigs,
+			clientInfo: this.defaultClientInfo
+		}).normalize("NFKC");
 		return createHash("sha256").update("MCPClient").update(text).digest("hex");
 	}
 	/**
@@ -25365,7 +25370,7 @@ onListChanged: async (serverName, handler) => {
 		if (this.disconnectPromise) return this.disconnectPromise;
 		this.disconnectPromise = (async () => {
 			try {
-				mcpClientInstances.delete(this.id);
+				if (mcpClientInstances.get(this.id) === this) mcpClientInstances.delete(this.id);
 				const pendingFlows = Array.from(this.authFlowsByServer.values());
 				for (const controller of this.authAbortControllersByServer.values()) controller.abort();
 				await Promise.allSettled(Array.from(this.authCallbackServersByServer.values()).map((server) => server.close()));
@@ -25996,7 +26001,11 @@ onListChanged: async (serverName, handler) => {
 		const mcpClient = new InternalMastraMCPClient({
 			name,
 			server: config,
-			timeout: config.timeout ?? this.defaultTimeout
+			timeout: config.timeout ?? this.defaultTimeout,
+			clientInfo: {
+				name: config.clientInfo?.name ?? this.defaultClientInfo?.name,
+				version: config.clientInfo?.version ?? this.defaultClientInfo?.version
+			}
 		});
 		mcpClient.__setLogger(this.logger);
 		this.mcpClientsById.set(name, mcpClient);