Revert "fix: updates count tool"

This reverts commit 873560f.

Author: blva

src/tools/mongodb/read/count.ts

@@ -4,16 +4,12 @@ import { ToolArgs, OperationType } from "../../tool.js";
 import { z } from "zod";
 
 export const CountArgs = {
-    filter: z
+    query: z
         .record(z.string(), z.unknown())
         .optional()
         .describe(
-            "The query filter to count documents. Matches the syntax of the filter argument of db.collection.countDocuments()"
+            "The query filter to count documents. Matches the syntax of the filter argument of db.collection.count()"
         ),
-    query: z
-        .record(z.string(), z.unknown())
-        .optional()
-        .describe("Alternative old name for filter. Will be used in db.collection.countDocuments()"),
 };
 
 export class CountTool extends MongoDBToolBase {
@@ -26,16 +22,9 @@ export class CountTool extends MongoDBToolBase {
 
     protected operationType: OperationType = "read";
 
-    protected async execute({
-        database,
-        collection,
-        query,
-        filter,
-    }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
+    protected async execute({ database, collection, query }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();
-        // use either filter or query, since we're using countDocuments, prefer filter
-        const queryFilter = filter || query;
-        const count = await provider.countDocuments(database, collection, queryFilter);
+        const count = await provider.count(database, collection, query);
 
         return {
             content: [

tests/integration/tools/mongodb/read/count.test.ts

@@ -16,12 +16,6 @@ describeWithMongoDB("count tool", (integration) => {
             type: "object",
             required: false,
         },
-        {
-            name: "filter",
-            description: "Alternative name for query parameter. The query filter to count documents.",
-            type: "object",
-            required: false,
-        },
         ...databaseCollectionParameters,
     ]);
 
@@ -85,43 +79,6 @@ describeWithMongoDB("count tool", (integration) => {
                 expect(content).toEqual(`Found ${testCase.expectedCount} documents in the collection "foo"`);
             });
         }
-
-        it("correctly filters documents when using 'filter' parameter", async () => {
-            await integration.connectMcpClient();
-
-            // Using 'filter' parameter - should work correctly after the fix
-            const response = await integration.mcpClient().callTool({
-                name: "count",
-                arguments: {
-                    database: integration.randomDbName(),
-                    collection: "foo",
-                    filter: { age: { $lt: 15 } },
-                },
-            });
-
-            const content = getResponseContent(response.content);
-            expect(content).toEqual('Found 2 documents in the collection "foo"');
-        });
-
-        it("prioritizes filter over query when both are provided", async () => {
-            await integration.connectMcpClient();
-
-            // Using both 'filter' and 'query' parameters
-            const response = await integration.mcpClient().callTool({
-                name: "count",
-                arguments: {
-                    database: integration.randomDbName(),
-                    collection: "foo",
-                    filter: { age: { $lt: 15 } },
-                    query: { age: { $gt: 10 } },
-                },
-            });
-
-            const content = getResponseContent(response.content);
-            // Filter takes precedence over query
-            // Filter is { age: { $lt: 15 } } which matches 2 documents
-            expect(content).toEqual('Found 2 documents in the collection "foo"');
-        });
     });
 
     validateAutoConnectBehavior(integration, "count", () => {