mongodb-mcp-server 0.1.3 → 0.2.0

package/src/tools/mongodb/metadata/collectionSchema.ts

@@ -4,11 +4,11 @@ import { ToolArgs, OperationType } from "../../tool.js";
 import { getSimplifiedSchema } from "mongodb-schema";
 
 export class CollectionSchemaTool extends MongoDBToolBase {
-    protected name = "collection-schema";
+    public name = "collection-schema";
     protected description = "Describe the schema for a collection";
     protected argsShape = DbOperationArgs;
 
-    protected operationType: OperationType = "metadata";
+    public operationType: OperationType = "metadata";
 
     protected async execute({ database, collection }: ToolArgs<typeof DbOperationArgs>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();

package/src/tools/mongodb/metadata/collectionStorageSize.ts

@@ -3,11 +3,11 @@ import { DbOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
 import { ToolArgs, OperationType } from "../../tool.js";
 
 export class CollectionStorageSizeTool extends MongoDBToolBase {
-    protected name = "collection-storage-size";
+    public name = "collection-storage-size";
     protected description = "Gets the size of the collection";
     protected argsShape = DbOperationArgs;
 
-    protected operationType: OperationType = "metadata";
+    public operationType: OperationType = "metadata";
 
     protected async execute({ database, collection }: ToolArgs<typeof DbOperationArgs>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();

package/src/tools/mongodb/metadata/dbStats.ts

@@ -4,13 +4,13 @@ import { ToolArgs, OperationType } from "../../tool.js";
 import { EJSON } from "bson";
 
 export class DbStatsTool extends MongoDBToolBase {
-    protected name = "db-stats";
+    public name = "db-stats";
     protected description = "Returns statistics that reflect the use state of a single database";
     protected argsShape = {
         database: DbOperationArgs.database,
     };
 
-    protected operationType: OperationType = "metadata";
+    public operationType: OperationType = "metadata";
 
     protected async execute({ database }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();

package/src/tools/mongodb/metadata/explain.ts

@@ -8,7 +8,7 @@ import { FindArgs } from "../read/find.js";
 import { CountArgs } from "../read/count.js";
 
 export class ExplainTool extends MongoDBToolBase {
-    protected name = "explain";
+    public name = "explain";
     protected description =
         "Returns statistics describing the execution of the winning plan chosen by the query optimizer for the evaluated method";
 
@@ -16,7 +16,7 @@ export class ExplainTool extends MongoDBToolBase {
         ...DbOperationArgs,
         method: z
             .array(
-                z.union([
+                z.discriminatedUnion("name", [
                     z.object({
                         name: z.literal("aggregate"),
                         arguments: z.object(AggregateArgs),
@@ -34,7 +34,7 @@ export class ExplainTool extends MongoDBToolBase {
             .describe("The method and its arguments to run"),
     };
 
-    protected operationType: OperationType = "metadata";
+    public operationType: OperationType = "metadata";
 
     static readonly defaultVerbosity = ExplainVerbosity.queryPlanner;
 

package/src/tools/mongodb/metadata/listCollections.ts

@@ -3,13 +3,13 @@ import { DbOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
 import { ToolArgs, OperationType } from "../../tool.js";
 
 export class ListCollectionsTool extends MongoDBToolBase {
-    protected name = "list-collections";
+    public name = "list-collections";
     protected description = "List all collections for a given database";
     protected argsShape = {
         database: DbOperationArgs.database,
     };
 
-    protected operationType: OperationType = "metadata";
+    public operationType: OperationType = "metadata";
 
     protected async execute({ database }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();

package/src/tools/mongodb/metadata/listDatabases.ts

@@ -4,10 +4,10 @@ import * as bson from "bson";
 import { OperationType } from "../../tool.js";
 
 export class ListDatabasesTool extends MongoDBToolBase {
-    protected name = "list-databases";
+    public name = "list-databases";
     protected description = "List all databases for a MongoDB connection";
     protected argsShape = {};
-    protected operationType: OperationType = "metadata";
+    public operationType: OperationType = "metadata";
 
     protected async execute(): Promise<CallToolResult> {
         const provider = await this.ensureConnected();

package/src/tools/mongodb/metadata/logs.ts

@@ -4,7 +4,7 @@ import { ToolArgs, OperationType } from "../../tool.js";
 import { z } from "zod";
 
 export class LogsTool extends MongoDBToolBase {
-    protected name = "mongodb-logs";
+    public name = "mongodb-logs";
     protected description = "Returns the most recent logged mongod events";
     protected argsShape = {
         type: z
@@ -24,7 +24,7 @@ export class LogsTool extends MongoDBToolBase {
             .describe("The maximum number of log entries to return."),
     };
 
-    protected operationType: OperationType = "metadata";
+    public operationType: OperationType = "metadata";
 
     protected async execute({ type, limit }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();

package/src/tools/mongodb/mongodbTool.ts

@@ -2,8 +2,9 @@ import { z } from "zod";
 import { ToolArgs, ToolBase, ToolCategory, TelemetryToolMetadata } from "../tool.js";
 import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { ErrorCodes, MongoDBError } from "../../errors.js";
-import logger, { LogId } from "../../logger.js";
+import { ErrorCodes, MongoDBError } from "../../common/errors.js";
+import logger, { LogId } from "../../common/logger.js";
+import { Server } from "../../server.js";
 
 export const DbOperationArgs = {
     database: z.string().describe("Database name"),
@@ -11,19 +12,29 @@ export const DbOperationArgs = {
 };
 
 export abstract class MongoDBToolBase extends ToolBase {
-    protected category: ToolCategory = "mongodb";
+    private server?: Server;
+    public category: ToolCategory = "mongodb";
 
     protected async ensureConnected(): Promise<NodeDriverServiceProvider> {
-        if (!this.session.serviceProvider && this.config.connectionString) {
-            try {
-                await this.connectToMongoDB(this.config.connectionString);
-            } catch (error) {
-                logger.error(
-                    LogId.mongodbConnectFailure,
-                    "mongodbTool",
-                    `Failed to connect to MongoDB instance using the connection string from the config: ${error as string}`
+        if (!this.session.serviceProvider) {
+            if (this.session.connectedAtlasCluster) {
+                throw new MongoDBError(
+                    ErrorCodes.NotConnectedToMongoDB,
+                    `Attempting to connect to Atlas cluster "${this.session.connectedAtlasCluster.clusterName}", try again in a few seconds.`
                 );
-                throw new MongoDBError(ErrorCodes.MisconfiguredConnectionString, "Not connected to MongoDB.");
+            }
+
+            if (this.config.connectionString) {
+                try {
+                    await this.connectToMongoDB(this.config.connectionString);
+                } catch (error) {
+                    logger.error(
+                        LogId.mongodbConnectFailure,
+                        "mongodbTool",
+                        `Failed to connect to MongoDB instance using the connection string from the config: ${error as string}`
+                    );
+                    throw new MongoDBError(ErrorCodes.MisconfiguredConnectionString, "Not connected to MongoDB.");
+                }
             }
         }
 
@@ -34,11 +45,28 @@ export abstract class MongoDBToolBase extends ToolBase {
         return this.session.serviceProvider;
     }
 
+    public register(server: Server): boolean {
+        this.server = server;
+        return super.register(server);
+    }
+
     protected handleError(
         error: unknown,
         args: ToolArgs<typeof this.argsShape>
     ): Promise<CallToolResult> | CallToolResult {
         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
+
+            // 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 {
@@ -49,7 +77,9 @@ export abstract class MongoDBToolBase extends ToolBase {
                             },
                             {
                                 type: "text",
-                                text: "Please use the 'connect' or 'switch-connection' tool to connect to a MongoDB instance.",
+                                text: connectToolsNames
+                                    ? `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.",
                             },
                         ],
                         isError: true,
@@ -59,7 +89,13 @@ export abstract class MongoDBToolBase extends ToolBase {
                         content: [
                             {
                                 type: "text",
-                                text: "The configured connection string is not valid. Please check the connection string and confirm it points to a valid MongoDB instance. Alternatively, use the 'switch-connection' tool to connect to a different instance.",
+                                text: "The configured connection string is not valid. Please check the connection string and confirm it points to a valid MongoDB instance.",
+                            },
+                            {
+                                type: "text",
+                                text: connectTools
+                                    ? `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.",
                             },
                         ],
                         isError: true,

package/src/tools/mongodb/read/aggregate.ts

@@ -6,17 +6,17 @@ import { EJSON } from "bson";
 import { checkIndexUsage } from "../../../helpers/indexCheck.js";
 
 export const AggregateArgs = {
-    pipeline: z.array(z.record(z.string(), z.unknown())).describe("An array of aggregation stages to execute"),
+    pipeline: z.array(z.object({}).passthrough()).describe("An array of aggregation stages to execute"),
 };
 
 export class AggregateTool extends MongoDBToolBase {
-    protected name = "aggregate";
+    public name = "aggregate";
     protected description = "Run an aggregation against a MongoDB collection";
     protected argsShape = {
         ...DbOperationArgs,
         ...AggregateArgs,
     };
-    protected operationType: OperationType = "read";
+    public operationType: OperationType = "read";
 
     protected async execute({
         database,

package/src/tools/mongodb/read/collectionIndexes.ts

@@ -3,10 +3,10 @@ import { DbOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
 import { ToolArgs, OperationType } from "../../tool.js";
 
 export class CollectionIndexesTool extends MongoDBToolBase {
-    protected name = "collection-indexes";
+    public name = "collection-indexes";
     protected description = "Describe the indexes for a collection";
     protected argsShape = DbOperationArgs;
-    protected operationType: OperationType = "read";
+    public operationType: OperationType = "read";
 
     protected async execute({ database, collection }: ToolArgs<typeof DbOperationArgs>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();

package/src/tools/mongodb/read/count.ts

@@ -6,7 +6,8 @@ import { checkIndexUsage } from "../../../helpers/indexCheck.js";
 
 export const CountArgs = {
     query: z
-        .record(z.string(), z.unknown())
+        .object({})
+        .passthrough()
         .optional()
         .describe(
             "A filter/query parameter. Allows users to filter the documents to count. Matches the syntax of the filter argument of db.collection.count()."
@@ -14,7 +15,7 @@ export const CountArgs = {
 };
 
 export class CountTool extends MongoDBToolBase {
-    protected name = "count";
+    public name = "count";
     protected description =
         "Gets the number of documents in a MongoDB collection using db.collection.count() and query as an optional filter parameter";
     protected argsShape = {
@@ -22,7 +23,7 @@ export class CountTool extends MongoDBToolBase {
         ...CountArgs,
     };
 
-    protected operationType: OperationType = "read";
+    public operationType: OperationType = "read";
 
     protected async execute({ database, collection, query }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();

package/src/tools/mongodb/read/find.ts

@@ -8,28 +8,33 @@ import { checkIndexUsage } from "../../../helpers/indexCheck.js";
 
 export const FindArgs = {
     filter: z
-        .record(z.string(), z.unknown())
+        .object({})
+        .passthrough()
         .optional()
         .describe("The query filter, matching the syntax of the query argument of db.collection.find()"),
     projection: z
-        .record(z.string(), z.unknown())
+        .object({})
+        .passthrough()
         .optional()
         .describe("The projection, matching the syntax of the projection argument of db.collection.find()"),
     limit: z.number().optional().default(10).describe("The maximum number of documents to return"),
     sort: z
-        .record(z.string(), z.custom<SortDirection>())
+        .object({})
+        .catchall(z.custom<SortDirection>())
         .optional()
-        .describe("A document, describing the sort order, matching the syntax of the sort argument of cursor.sort()"),
+        .describe(
+            "A document, describing the sort order, matching the syntax of the sort argument of cursor.sort(). The keys of the object are the fields to sort on, while the values are the sort directions (1 for ascending, -1 for descending)."
+        ),
 };
 
 export class FindTool extends MongoDBToolBase {
-    protected name = "find";
+    public name = "find";
     protected description = "Run a find query against a MongoDB collection";
     protected argsShape = {
         ...DbOperationArgs,
         ...FindArgs,
     };
-    protected operationType: OperationType = "read";
+    public operationType: OperationType = "read";
 
     protected async execute({
         database,

package/src/tools/mongodb/tools.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";

package/src/tools/mongodb/update/renameCollection.ts

@@ -4,14 +4,14 @@ import { DbOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
 import { ToolArgs, OperationType } from "../../tool.js";
 
 export class RenameCollectionTool extends MongoDBToolBase {
-    protected name = "rename-collection";
+    public name = "rename-collection";
     protected description = "Renames a collection in a MongoDB database";
     protected argsShape = {
         ...DbOperationArgs,
         newName: z.string().describe("The new name for the collection"),
         dropTarget: z.boolean().optional().default(false).describe("If true, drops the target collection if it exists"),
     };
-    protected operationType: OperationType = "update";
+    public operationType: OperationType = "update";
 
     protected async execute({
         database,

package/src/tools/mongodb/update/updateMany.ts

@@ -5,25 +5,27 @@ import { ToolArgs, OperationType } from "../../tool.js";
 import { checkIndexUsage } from "../../../helpers/indexCheck.js";
 
 export class UpdateManyTool extends MongoDBToolBase {
-    protected name = "update-many";
+    public name = "update-many";
     protected description = "Updates all documents that match the specified filter for a collection";
     protected argsShape = {
         ...DbOperationArgs,
         filter: z
-            .record(z.string(), z.unknown())
+            .object({})
+            .passthrough()
             .optional()
             .describe(
                 "The selection criteria for the update, matching the syntax of the filter argument of db.collection.updateOne()"
             ),
         update: z
-            .record(z.string(), z.unknown())
+            .object({})
+            .passthrough()
             .describe("An update document describing the modifications to apply using update operator expressions"),
         upsert: z
             .boolean()
             .optional()
             .describe("Controls whether to insert a new document if no documents match the filter"),
     };
-    protected operationType: OperationType = "update";
+    public operationType: OperationType = "update";
 
     protected async execute({
         database,

package/src/tools/tool.ts

@@ -1,15 +1,16 @@
 import { z, type ZodRawShape, type ZodNever, AnyZodObject } from "zod";
-import type { McpServer, RegisteredTool, ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { RegisteredTool, ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
 import type { CallToolResult, ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
-import { Session } from "../session.js";
-import logger, { LogId } from "../logger.js";
+import { Session } from "../common/session.js";
+import logger, { LogId } from "../common/logger.js";
 import { Telemetry } from "../telemetry/telemetry.js";
 import { type ToolEvent } from "../telemetry/types.js";
-import { UserConfig } from "../config.js";
+import { UserConfig } from "../common/config.js";
+import { Server } from "../server.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;
@@ -17,11 +18,11 @@ export type TelemetryToolMetadata = {
 };
 
 export abstract class ToolBase {
-    protected abstract name: string;
+    public abstract name: string;
 
-    protected abstract category: ToolCategory;
+    public abstract category: ToolCategory;
 
-    protected abstract operationType: OperationType;
+    public abstract operationType: OperationType;
 
     protected abstract description: string;
 
@@ -36,6 +37,7 @@ export abstract class ToolBase {
         switch (this.operationType) {
             case "read":
             case "metadata":
+            case "connect":
                 annotations.readOnlyHint = true;
                 annotations.destructiveHint = false;
                 break;
@@ -63,9 +65,9 @@ export abstract class ToolBase {
         protected readonly telemetry: Telemetry
     ) {}
 
-    public register(server: McpServer): void {
+    public register(server: Server): boolean {
         if (!this.verifyAllowed()) {
-            return;
+            return false;
         }
 
         const callback: ToolCallback<typeof this.argsShape> = async (...args) => {
@@ -84,14 +86,15 @@ export abstract class ToolBase {
             }
         };
 
-        server.tool(this.name, this.description, this.argsShape, this.annotations, callback);
+        server.mcpServer.tool(this.name, this.description, this.argsShape, this.annotations, callback);
 
         // This is very similar to RegisteredTool.update, but without the bugs around the name.
         // In the upstream update method, the name is captured in the closure and not updated when
         // the tool name changes. This means that you only get one name update before things end up
         // in a broken state.
+        // See https://github.com/modelcontextprotocol/typescript-sdk/issues/414 for more details.
         this.update = (updates: { name?: string; description?: string; inputSchema?: AnyZodObject }) => {
-            const tools = server["_registeredTools"] as { [toolName: string]: RegisteredTool };
+            const tools = server.mcpServer["_registeredTools"] as { [toolName: string]: RegisteredTool };
             const existingTool = tools[this.name];
 
             if (!existingTool) {
@@ -118,8 +121,10 @@ export abstract class ToolBase {
                 existingTool.inputSchema = updates.inputSchema;
             }
 
-            server.sendToolListChanged();
+            server.mcpServer.sendToolListChanged();
         };
+
+        return true;
     }
 
     protected update?: (updates: { name?: string; description?: string; inputSchema?: AnyZodObject }) => void;

package/src/transports/base.ts

@@ -0,0 +1,34 @@
+import { UserConfig } from "../common/config.js";
+import { packageInfo } from "../common/packageInfo.js";
+import { Server } from "../server.js";
+import { Session } from "../common/session.js";
+import { Telemetry } from "../telemetry/telemetry.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+
+export abstract class TransportRunnerBase {
+    protected setupServer(userConfig: UserConfig): Server {
+        const session = new Session({
+            apiBaseUrl: userConfig.apiBaseUrl,
+            apiClientId: userConfig.apiClientId,
+            apiClientSecret: userConfig.apiClientSecret,
+        });
+
+        const telemetry = Telemetry.create(session, userConfig);
+
+        const mcpServer = new McpServer({
+            name: packageInfo.mcpServerName,
+            version: packageInfo.version,
+        });
+
+        return new Server({
+            mcpServer,
+            session,
+            telemetry,
+            userConfig,
+        });
+    }
+
+    abstract start(): Promise<void>;
+
+    abstract close(): Promise<void>;
+}

package/src/{helpers/EJsonTransport.ts → transports/stdio.ts}

@@ -1,6 +1,10 @@
+import logger, { LogId } from "../common/logger.js";
+import { Server } from "../server.js";
+import { TransportRunnerBase } from "./base.js";
 import { JSONRPCMessage, JSONRPCMessageSchema } from "@modelcontextprotocol/sdk/types.js";
 import { EJSON } from "bson";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { UserConfig } from "../common/config.js";
 
 // This is almost a copy of ReadBuffer from @modelcontextprotocol/sdk
 // but it uses EJSON.parse instead of JSON.parse to handle BSON types
@@ -39,9 +43,34 @@ export class EJsonReadBuffer {
 //
 // This function creates a StdioServerTransport and replaces the internal readBuffer with EJsonReadBuffer
 // that uses EJson.parse instead.
-export function createEJsonTransport(): StdioServerTransport {
+export function createStdioTransport(): StdioServerTransport {
     const server = new StdioServerTransport();
     server["_readBuffer"] = new EJsonReadBuffer();
 
     return server;
 }
+
+export class StdioRunner extends TransportRunnerBase {
+    private server: Server | undefined;
+
+    constructor(private userConfig: UserConfig) {
+        super();
+    }
+
+    async start() {
+        try {
+            this.server = this.setupServer(this.userConfig);
+
+            const transport = createStdioTransport();
+
+            await this.server.connect(transport);
+        } catch (error: unknown) {
+            logger.emergency(LogId.serverStartFailure, "server", `Fatal error running server: ${error as string}`);
+            process.exit(1);
+        }
+    }
+
+    async close(): Promise<void> {
+        await this.server?.close();
+    }
+}