Merge branch 'main' into telemetry

Author: blva

src/tools/mongodb/create/createIndex.ts

@@ -10,22 +10,29 @@ export class CreateIndexTool extends MongoDBToolBase {
     protected argsShape = {
         ...DbOperationArgs,
         keys: z.record(z.string(), z.custom<IndexDirection>()).describe("The index definition"),
+        name: z.string().optional().describe("The name of the index"),
     };
 
     protected operationType: OperationType = "create";
 
-    protected async execute({ database, collection, keys }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
+    protected async execute({
+        database,
+        collection,
+        keys,
+        name,
+    }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();
         const indexes = await provider.createIndexes(database, collection, [
             {
                 key: keys,
+                name,
             },
         ]);
 
         return {
             content: [
                 {
-                    text: `Created the index \`${indexes[0]}\``,
+                    text: `Created the index "${indexes[0]}" on collection "${collection}" in database "${database}"`,
                     type: "text",
                 },
             ],

src/tools/mongodb/create/insertMany.ts

@@ -27,7 +27,7 @@ export class InsertManyTool extends MongoDBToolBase {
         return {
             content: [
                 {
-                    text: `Inserted \`${result.insertedCount}\` documents into collection \`${collection}\``,
+                    text: `Inserted \`${result.insertedCount}\` document(s) into collection "${collection}"`,
                     type: "text",
                 },
                 {

src/tools/mongodb/create/insertOne.ts

@@ -29,7 +29,7 @@ export class DeleteManyTool extends MongoDBToolBase {
         return {
             content: [
                 {
-                    text: `Deleted \`${result.deletedCount}\` documents from collection \`${collection}\``,
+                    text: `Deleted \`${result.deletedCount}\` document(s) from collection "${collection}"`,
                     type: "text",
                 },
             ],

src/tools/mongodb/delete/deleteMany.ts

@@ -18,7 +18,7 @@ export class DropCollectionTool extends MongoDBToolBase {
         return {
             content: [
                 {
-                    text: `${result ? "Successfully dropped" : "Failed to drop"} collection \`${collection}\` from database \`${database}\``,
+                    text: `${result ? "Successfully dropped" : "Failed to drop"} collection "${collection}" from database "${database}"`,
                     type: "text",
                 },
             ],

src/tools/mongodb/delete/deleteOne.ts

@@ -17,7 +17,7 @@ export class DropDatabaseTool extends MongoDBToolBase {
         return {
             content: [
                 {
-                    text: `${result.ok ? "Successfully dropped" : "Failed to drop"} database \`${database}\``,
+                    text: `${result.ok ? "Successfully dropped" : "Failed to drop"} database "${database}"`,
                     type: "text",
                 },
             ],

src/tools/mongodb/delete/dropCollection.ts

@@ -2,7 +2,6 @@ import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { MongoDBToolBase } from "../mongodbTool.js";
 import { ToolArgs, OperationType } from "../../tool.js";
-import { ErrorCodes, MongoDBError } from "../../../errors.js";
 import config from "../../../config.js";
 import { MongoError as DriverError } from "mongodb";
 
@@ -37,25 +36,23 @@ export class ConnectTool extends MongoDBToolBase {
 
         let connectionString: string;
 
-        if (typeof connectionStringOrClusterName === "string") {
-            if (
-                connectionStringOrClusterName.startsWith("mongodb://") ||
-                connectionStringOrClusterName.startsWith("mongodb+srv://")
-            ) {
-                connectionString = connectionStringOrClusterName;
-            } else {
-                // TODO:
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `Connecting via cluster name not supported yet. Please provide a connection string.`,
-                        },
-                    ],
-                };
-            }
+        if (
+            connectionStringOrClusterName.startsWith("mongodb://") ||
+            connectionStringOrClusterName.startsWith("mongodb+srv://")
+        ) {
+            connectionString = connectionStringOrClusterName;
         } else {
-            throw new MongoDBError(ErrorCodes.InvalidParams, "Invalid connection options");
+            // TODO: https://github.com/mongodb-js/mongodb-mcp-server/issues/19
+            // We don't support connecting via cluster name since we'd need to obtain the user credentials
+            // and fill in the connection string.
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `Connecting via cluster name not supported yet. Please provide a connection string.`,
+                    },
+                ],
+            };
         }
 
         try {

src/tools/mongodb/delete/dropDatabase.ts

@@ -19,16 +19,15 @@ export abstract class MongoDBToolBase extends ToolBase {
     protected category: ToolCategory = "mongodb";
 
     protected async ensureConnected(): Promise<NodeDriverServiceProvider> {
-        const provider = this.session.serviceProvider;
-        if (!provider && config.connectionString) {
+        if (!this.session.serviceProvider && config.connectionString) {
             await this.connectToMongoDB(config.connectionString);
         }
 
-        if (!provider) {
+        if (!this.session.serviceProvider) {
             throw new MongoDBError(ErrorCodes.NotConnectedToMongoDB, "Not connected to MongoDB");
         }
 
-        return provider;
+        return this.session.serviceProvider;
     }
 
     protected handleError(error: unknown): Promise<CallToolResult> | CallToolResult {

src/tools/mongodb/metadata/connect.ts

@@ -4,16 +4,13 @@ import { CollectionIndexesTool } from "./read/collectionIndexes.js";
 import { ListDatabasesTool } from "./metadata/listDatabases.js";
 import { CreateIndexTool } from "./create/createIndex.js";
 import { CollectionSchemaTool } from "./metadata/collectionSchema.js";
-import { InsertOneTool } from "./create/insertOne.js";
 import { FindTool } from "./read/find.js";
 import { InsertManyTool } from "./create/insertMany.js";
 import { DeleteManyTool } from "./delete/deleteMany.js";
-import { DeleteOneTool } from "./delete/deleteOne.js";
 import { CollectionStorageSizeTool } from "./metadata/collectionStorageSize.js";
 import { CountTool } from "./read/count.js";
 import { DbStatsTool } from "./metadata/dbStats.js";
 import { AggregateTool } from "./read/aggregate.js";
-import { UpdateOneTool } from "./update/updateOne.js";
 import { UpdateManyTool } from "./update/updateMany.js";
 import { RenameCollectionTool } from "./update/renameCollection.js";
 import { DropDatabaseTool } from "./delete/dropDatabase.js";
@@ -28,16 +25,13 @@ export const MongoDbTools = [
     CollectionIndexesTool,
     CreateIndexTool,
     CollectionSchemaTool,
-    InsertOneTool,
     FindTool,
     InsertManyTool,
     DeleteManyTool,
-    DeleteOneTool,
     CollectionStorageSizeTool,
     CountTool,
     DbStatsTool,
     AggregateTool,
-    UpdateOneTool,
     UpdateManyTool,
     RenameCollectionTool,
     DropDatabaseTool,