From 85955b03372dd21754040d413f4a7cf006f2903e Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Thu, 17 Jul 2025 19:40:55 +0200
Subject: [PATCH 1/2] tweak the arg shape for find and count

---
 src/tools/mongodb/read/count.ts |  3 ++-
 src/tools/mongodb/read/find.ts  | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/tools/mongodb/read/count.ts b/src/tools/mongodb/read/count.ts
index df3664b5..5f5f44c0 100644
--- a/src/tools/mongodb/read/count.ts
+++ b/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()."
diff --git a/src/tools/mongodb/read/find.ts b/src/tools/mongodb/read/find.ts
index 02c337ed..0649e62d 100644
--- a/src/tools/mongodb/read/find.ts
+++ b/src/tools/mongodb/read/find.ts
@@ -8,18 +8,23 @@ 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 {

From 39b428d9a7fbe24ecdd93d6aedcf0eed1b7875d7 Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Thu, 17 Jul 2025 20:09:38 +0200
Subject: [PATCH 2/2] fix more tests

---
 src/tools/mongodb/metadata/explain.ts | 2 +-
 src/tools/mongodb/read/aggregate.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/mongodb/metadata/explain.ts b/src/tools/mongodb/metadata/explain.ts
index a686d9cc..ae9eb822 100644
--- a/src/tools/mongodb/metadata/explain.ts
+++ b/src/tools/mongodb/metadata/explain.ts
@@ -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),
diff --git a/src/tools/mongodb/read/aggregate.ts b/src/tools/mongodb/read/aggregate.ts
index f9868dba..b74dd786 100644
--- a/src/tools/mongodb/read/aggregate.ts
+++ b/src/tools/mongodb/read/aggregate.ts
@@ -6,7 +6,7 @@ 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 {