don't hardcode tool names

Author: nirinchev

src/tools/atlas/connect/connectCluster.ts

@@ -12,10 +12,8 @@ function sleep(ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-export const name = "atlas-connect-cluster";
-
 export class ConnectClusterTool extends AtlasToolBase {
-    public name = name;
+    public name = "atlas-connect-cluster";
     protected description = "Connect to MongoDB Atlas cluster";
     public operationType: OperationType = "connect";
     protected argsShape = {

src/tools/mongodb/mongodbTool.ts

@@ -5,7 +5,6 @@ import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { ErrorCodes, MongoDBError } from "../../errors.js";
 import logger, { LogId } from "../../logger.js";
 import { Server } from "../../server.js";
-import { name as AtlasConnectToolName } from "../atlas/connect/connectCluster.js";
 
 export const DbOperationArgs = {
     database: z.string().describe("Database name"),
@@ -49,12 +48,16 @@ export abstract class MongoDBToolBase extends ToolBase {
         if (error instanceof MongoDBError) {
             const connectTools = this.server?.tools
                 .filter((t) => t.operationType === "connect")
-                .sort((a, b) => a.category.localeCompare(b.category)) // Sort Altas tools before MongoDB tools
-                .map((t) => t.name)
-                .join(", ");
-            const llmConnectHint = connectTools?.includes(AtlasConnectToolName)
-                ? `Note to LLM: prefer using the ${AtlasConnectToolName} tool to connect to an Atlas cluster over using a connection string. Make sure to ask the user to specify a cluster name they want to connect to or ask them if they want to use the "list-clusters" tool to list all their clusters. Do not invent cluster names or connection strings unless the user has explicitly specified them. If they've previously connected to MongoDB using MCP, you can ask them if they want to reconnect using the same cluster/connection.`
+                .sort((a, b) => a.category.localeCompare(b.category)); // Sort Altas tools before MongoDB tools
+
+            // Find the first Atlas connect tool if available and suggest to the LLM to use it.
+            // Note: if we ever have multiple Atlas connect tools, we may want to refine this logic to select the most appropriate one.
+            const atlasConnectTool = connectTools?.find((t) => t.category === "atlas");
+            const llmConnectHint = atlasConnectTool
+                ? `Note to LLM: prefer using the ${atlasConnectTool.name} tool to connect to an Atlas cluster over using a connection string. Make sure to ask the user to specify a cluster name they want to connect to or ask them if they want to use the "list-clusters" tool to list all their clusters. Do not invent cluster names or connection strings unless the user has explicitly specified them. If they've previously connected to MongoDB using MCP, you can ask them if they want to reconnect using the same cluster/connection.`
                 : "Note to LLM: do not invent connection strings and explicitly ask the user to provide one. If they have previously connected to MongoDB using MCP, you can ask them if they want to reconnect using the same connection string.";
+
+            const connectToolsNames = connectTools?.map((t) => t.name).join(", ");
             switch (error.code) {
                 case ErrorCodes.NotConnectedToMongoDB:
                     return {
@@ -66,7 +69,7 @@ export abstract class MongoDBToolBase extends ToolBase {
                             {
                                 type: "text",
                                 text: connectTools
-                                    ? `Please use one of the following tools: ${connectTools} to connect to a MongoDB instance or update the MCP server configuration to include a connection string. ${llmConnectHint}`
+                                    ? `Please use one of the following tools: ${connectToolsNames} to connect to a MongoDB instance or update the MCP server configuration to include a connection string. ${llmConnectHint}`
                                     : "There are no tools available to connect. Please update the configuration to include a connection string and restart the server.",
                             },
                         ],
@@ -82,7 +85,7 @@ export abstract class MongoDBToolBase extends ToolBase {
                             {
                                 type: "text",
                                 text: connectTools
-                                    ? `Alternatively, you can use one of the following tools: ${connectTools} to connect to a MongoDB instance. ${llmConnectHint}`
+                                    ? `Alternatively, you can use one of the following tools: ${connectToolsNames} to connect to a MongoDB instance. ${llmConnectHint}`
                                     : "Please update the configuration to use a valid connection string and restart the server.",
                             },
                         ],