wip

Author: nirinchev

src/server.ts

@@ -12,6 +12,7 @@ import { type ServerCommand } from "./telemetry/types.js";
 import { CallToolRequestSchema, CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import assert from "assert";
 import { detectContainerEnv } from "./common/container.js";
+import { ToolBase } from "./tools/tool.js";
 
 export interface ServerOptions {
     session: Session;
@@ -25,6 +26,7 @@ export class Server {
     private readonly mcpServer: McpServer;
     private readonly telemetry: Telemetry;
     public readonly userConfig: UserConfig;
+    public readonly tools: ToolBase[] = [];
     private readonly startTime: number;
 
     constructor({ session, mcpServer, userConfig, telemetry }: ServerOptions) {
@@ -141,8 +143,11 @@ export class Server {
     }
 
     private registerTools() {
-        for (const tool of [...AtlasTools, ...MongoDbTools]) {
-            new tool(this.session, this.userConfig, this.telemetry).register(this.mcpServer);
+        for (const toolConstructor of [...AtlasTools, ...MongoDbTools]) {
+            const tool = new toolConstructor(this.session, this.userConfig, this.telemetry);
+            if (tool.register(this.mcpServer)) {
+                this.tools.push(tool);
+            }
         }
     }
 

src/tools/atlas/metadata/connectCluster.ts renamed to src/tools/atlas/connect/connectCluster.ts

@@ -8,7 +8,7 @@ import { ListDBUsersTool } from "./read/listDBUsers.js";
 import { CreateDBUserTool } from "./create/createDBUser.js";
 import { CreateProjectTool } from "./create/createProject.js";
 import { ListOrganizationsTool } from "./read/listOrgs.js";
-import { ConnectClusterTool } from "./metadata/connectCluster.js";
+import { ConnectClusterTool } from "./connect/connectCluster.js";
 import { ListAlertsTool } from "./read/listAlerts.js";
 
 export const AtlasTools = [

src/tools/atlas/tools.ts

@@ -42,7 +42,7 @@ export class ConnectTool extends MongoDBToolBase {
         connectionString: z.string().optional(),
     };
 
-    protected operationType: OperationType = "metadata";
+    protected operationType: OperationType = "connect";
 
     constructor(session: Session, config: UserConfig, telemetry: Telemetry) {
         super(session, config, telemetry);
@@ -72,10 +72,13 @@ export class ConnectTool extends MongoDBToolBase {
         };
     }
 
-    public register(server: McpServer): void {
-        super.register(server);
+    public register(server: McpServer): boolean {
+        if (super.register(server)) {
+            this.updateMetadata();
+            return true;
+        }
 
-        this.updateMetadata();
+        return false;
     }
 
     private updateMetadata(): void {

src/tools/mongodb/metadata/connect.ts renamed to src/tools/mongodb/connect/connect.ts

@@ -1,4 +1,4 @@
-import { ConnectTool } from "./metadata/connect.js";
+import { ConnectTool } from "./connect/connect.js";
 import { ListCollectionsTool } from "./metadata/listCollections.js";
 import { CollectionIndexesTool } from "./read/collectionIndexes.js";
 import { ListDatabasesTool } from "./metadata/listDatabases.js";

src/tools/mongodb/tools.ts

@@ -9,7 +9,7 @@ import { UserConfig } from "../config.js";
 
 export type ToolArgs<Args extends ZodRawShape> = z.objectOutputType<Args, ZodNever>;
 
-export type OperationType = "metadata" | "read" | "create" | "delete" | "update";
+export type OperationType = "metadata" | "read" | "create" | "delete" | "update" | "connect";
 export type ToolCategory = "mongodb" | "atlas";
 export type TelemetryToolMetadata = {
     projectId?: string;
@@ -36,6 +36,7 @@ export abstract class ToolBase {
         switch (this.operationType) {
             case "read":
             case "metadata":
+            case "connect":
                 annotations.readOnlyHint = true;
                 annotations.destructiveHint = false;
                 break;
@@ -63,9 +64,9 @@ export abstract class ToolBase {
         protected readonly telemetry: Telemetry
     ) {}
 
-    public register(server: McpServer): void {
+    public register(server: McpServer): boolean {
         if (!this.verifyAllowed()) {
-            return;
+            return false;
         }
 
         const callback: ToolCallback<typeof this.argsShape> = async (...args) => {
@@ -120,6 +121,8 @@ export abstract class ToolBase {
 
             server.sendToolListChanged();
         };
+
+        return true;
     }
 
     protected update?: (updates: { name?: string; description?: string; inputSchema?: AnyZodObject }) => void;