@himanshusinghs/mongodb-mcp-server 1.7.7 → 1.11.0-prerelease.2

package/dist/esm/tools/mongodb/read/aggregateDB.d.ts

@@ -0,0 +1,24 @@
+import { z } from "zod";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import { MongoDBToolBase } from "../mongodbTool.js";
+import type { ToolArgs, OperationType, ToolExecutionContext } from "../../tool.js";
+export declare const AggregateArgs: {
+    pipeline: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+};
+export declare class AggregateDBTool extends MongoDBToolBase {
+    static toolName: string;
+    description: string;
+    argsShape: {
+        responseBytesLimit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+        pipeline: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+        database: z.ZodString;
+    };
+    static operationType: OperationType;
+    protected execute({ database, pipeline, responseBytesLimit }: ToolArgs<typeof this.argsShape>, { signal }: ToolExecutionContext): Promise<CallToolResult>;
+    private safeCloseCursor;
+    private assertOnlyUsesPermittedStages;
+    private countAggregationResultDocuments;
+    private generateMessage;
+    private isWriteStage;
+}
+//# sourceMappingURL=aggregateDB.d.ts.map

package/dist/esm/tools/mongodb/read/aggregateDB.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aggregateDB.d.ts","sourceRoot":"","sources":["../../../../../src/tools/mongodb/read/aggregateDB.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,OAAO,EAAmB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAUnF,eAAO,MAAM,aAAa;;CAOzB,CAAC;AAEF,qBAAa,eAAgB,SAAQ,eAAe;IAChD,MAAM,CAAC,QAAQ,SAAkB;IAC1B,WAAW,SAAmD;IAC9D,SAAS;;;;MAKd;IACF,MAAM,CAAC,aAAa,EAAE,aAAa,CAAU;cAE7B,OAAO,CACnB,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,EAC3E,EAAE,MAAM,EAAE,EAAE,oBAAoB,GACjC,OAAO,CAAC,cAAc,CAAC;YAyEZ,eAAe;IAY7B,OAAO,CAAC,6BAA6B;YA6BvB,+BAA+B;IAqC7C,OAAO,CAAC,eAAe;IA2BvB,OAAO,CAAC,YAAY;CAGvB"}

package/dist/esm/tools/mongodb/read/aggregateDB.js

@@ -0,0 +1,169 @@
+import { z } from "zod";
+import { DBOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
+import { formatUntrustedData } from "../../tool.js";
+import { EJSON } from "bson";
+import { ErrorCodes, MongoDBError } from "../../../common/errors.js";
+import { collectCursorUntilMaxBytesLimit } from "../../../helpers/collectCursorUntilMaxBytes.js";
+import { operationWithFallback } from "../../../helpers/operationWithFallback.js";
+import { AGG_COUNT_MAX_TIME_MS_CAP, ONE_MB, CURSOR_LIMITS_TO_LLM_TEXT } from "../../../helpers/constants.js";
+import { LogId } from "../../../common/logging/index.js";
+import { AnyAggregateStage, DB_AGGREGATE_STAGE_OPERATORS } from "../mongodbSchemas.js";
+export const AggregateArgs = {
+    pipeline: z
+        .array(AnyAggregateStage)
+        .min(1)
+        .describe(`An array of aggregation stages to execute. The first stage must be a database-level aggregation stage (one of ${DB_AGGREGATE_STAGE_OPERATORS.map((op) => `\`${op}\``).join(", ")}). https://www.mongodb.com/docs/manual/reference/mql/aggregation-stages/#db.aggregate---stages`),
+};
+export class AggregateDBTool extends MongoDBToolBase {
+    constructor() {
+        super(...arguments);
+        this.description = "Run an aggregation against a MongoDB database";
+        this.argsShape = {
+            ...DBOperationArgs,
+            ...AggregateArgs,
+            responseBytesLimit: z.number().optional().default(ONE_MB).describe(`\
+The maximum number of bytes to return in the response. This value is capped by the server's configured maxBytesPerQuery and cannot be exceeded.`),
+        };
+    }
+    async execute({ database, pipeline, responseBytesLimit }, { signal }) {
+        let aggregationCursor = undefined;
+        try {
+            const provider = await this.ensureConnected();
+            this.assertOnlyUsesPermittedStages(pipeline);
+            let successMessage;
+            let documents;
+            if (pipeline.some((stage) => this.isWriteStage(stage))) {
+                // This is a write pipeline, so special-case it and don't attempt to apply limits or caps
+                aggregationCursor = provider.aggregateDb(database, pipeline, {
+                    ...this.getOperationOptions(signal),
+                });
+                documents = await aggregationCursor.toArray();
+                successMessage = "The aggregation pipeline executed successfully.";
+            }
+            else {
+                const cappedResultsPipeline = [...pipeline];
+                if (this.config.maxDocumentsPerQuery > 0) {
+                    cappedResultsPipeline.push({ $limit: this.config.maxDocumentsPerQuery });
+                }
+                aggregationCursor = provider.aggregateDb(database, cappedResultsPipeline, {
+                    ...this.getOperationOptions(signal),
+                });
+                const [totalDocuments, cursorResults] = await Promise.all([
+                    this.countAggregationResultDocuments({
+                        provider,
+                        database,
+                        pipeline,
+                        abortSignal: signal,
+                    }),
+                    collectCursorUntilMaxBytesLimit({
+                        cursor: aggregationCursor,
+                        configuredMaxBytesPerQuery: this.config.maxBytesPerQuery,
+                        toolResponseBytesLimit: responseBytesLimit,
+                        abortSignal: signal,
+                    }),
+                ]);
+                // If the total number of documents that the aggregation would've
+                // resulted in would be greater than the configured
+                // maxDocumentsPerQuery then we know for sure that the results were
+                // capped.
+                const aggregationResultsCappedByMaxDocumentsLimit = this.config.maxDocumentsPerQuery > 0 &&
+                    !!totalDocuments &&
+                    totalDocuments > this.config.maxDocumentsPerQuery;
+                documents = cursorResults.documents;
+                successMessage = this.generateMessage({
+                    aggResultsCount: totalDocuments,
+                    documents: cursorResults.documents,
+                    appliedLimits: [
+                        aggregationResultsCappedByMaxDocumentsLimit ? "config.maxDocumentsPerQuery" : undefined,
+                        cursorResults.cappedBy,
+                    ].filter((limit) => !!limit),
+                });
+            }
+            return {
+                content: formatUntrustedData(successMessage, ...(documents.length > 0 ? [EJSON.stringify(documents)] : [])),
+            };
+        }
+        finally {
+            if (aggregationCursor) {
+                void this.safeCloseCursor(aggregationCursor);
+            }
+        }
+    }
+    async safeCloseCursor(cursor) {
+        try {
+            await cursor.close();
+        }
+        catch (error) {
+            this.session.logger.warning({
+                id: LogId.mongodbCursorCloseError,
+                context: "aggregate-db tool",
+                message: `Error when closing the cursor - ${error instanceof Error ? error.message : String(error)}`,
+            });
+        }
+    }
+    assertOnlyUsesPermittedStages(pipeline) {
+        const firstStage = pipeline[0];
+        if (!firstStage || !DB_AGGREGATE_STAGE_OPERATORS.some((op) => op in firstStage)) {
+            throw new MongoDBError(ErrorCodes.InvalidPipeline, `The first stage of the pipeline must be a database-level aggregation stage (one of ${DB_AGGREGATE_STAGE_OPERATORS.join(", ")})`);
+        }
+        const writeOperations = ["update", "create", "delete"];
+        let writeStageForbiddenError = "";
+        if (this.config.readOnly) {
+            writeStageForbiddenError = "In readOnly mode you can not run pipelines with $out or $merge stages.";
+        }
+        else if (this.config.disabledTools.some((t) => writeOperations.includes(t))) {
+            writeStageForbiddenError =
+                "When 'create', 'update', or 'delete' operations are disabled, you can not run pipelines with $out or $merge stages.";
+        }
+        for (const stage of pipeline) {
+            // This validates that in readOnly mode or "write" operations are disabled, we can't use $out or $merge.
+            // This is really important because aggregates are the only "multi-faceted" tool in the MQL, where you
+            // can both read and write.
+            if (this.isWriteStage(stage) && writeStageForbiddenError) {
+                throw new MongoDBError(ErrorCodes.ForbiddenWriteOperation, writeStageForbiddenError);
+            }
+        }
+    }
+    async countAggregationResultDocuments({ provider, database, pipeline, abortSignal, }) {
+        const resultsCountAggregation = [...pipeline, { $count: "totalDocuments" }];
+        return await operationWithFallback(async () => {
+            const aggregationResults = await provider
+                .aggregateDb(database, resultsCountAggregation, {
+                signal: abortSignal,
+            })
+                .maxTimeMS(this.config.maxTimeMS !== undefined
+                ? Math.min(this.config.maxTimeMS, AGG_COUNT_MAX_TIME_MS_CAP)
+                : AGG_COUNT_MAX_TIME_MS_CAP)
+                .toArray();
+            const documentWithCount = aggregationResults.length === 1 ? aggregationResults[0] : undefined;
+            const totalDocuments = documentWithCount &&
+                typeof documentWithCount === "object" &&
+                "totalDocuments" in documentWithCount &&
+                typeof documentWithCount.totalDocuments === "number"
+                ? documentWithCount.totalDocuments
+                : 0;
+            return totalDocuments;
+        }, undefined);
+    }
+    generateMessage({ aggResultsCount, documents, appliedLimits, }) {
+        let message = `The aggregation resulted in ${aggResultsCount === undefined ? "indeterminable number of" : aggResultsCount} documents.`;
+        // If we applied a limit or the count is different from the aggregation result count,
+        // communicate what is the actual number of returned documents
+        if (documents.length !== aggResultsCount || appliedLimits.length) {
+            message += ` Returning ${documents.length} documents`;
+            if (appliedLimits.length) {
+                message += ` while respecting the applied limits of ${appliedLimits
+                    .map((limit) => CURSOR_LIMITS_TO_LLM_TEXT[limit])
+                    .join(", ")}`;
+            }
+            message += ".";
+        }
+        return message;
+    }
+    isWriteStage(stage) {
+        return "$out" in stage || "$merge" in stage;
+    }
+}
+AggregateDBTool.toolName = "aggregate-db";
+AggregateDBTool.operationType = "read";
+//# sourceMappingURL=aggregateDB.js.map

package/dist/esm/tools/mongodb/read/aggregateDB.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aggregateDB.js","sourceRoot":"","sources":["../../../../../src/tools/mongodb/read/aggregateDB.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAiB,KAAK,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,+BAA+B,EAAE,MAAM,gDAAgD,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC7G,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEvF,MAAM,CAAC,MAAM,aAAa,GAAG;IACzB,QAAQ,EAAE,CAAC;SACN,KAAK,CAAC,iBAAiB,CAAC;SACxB,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CACL,iHAAiH,4BAA4B,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gGAAgG,CACpR;CACR,CAAC;AAEF,MAAM,OAAO,eAAgB,SAAQ,eAAe;IAApD;;QAEW,gBAAW,GAAG,+CAA+C,CAAC;QAC9D,cAAS,GAAG;YACf,GAAG,eAAe;YAClB,GAAG,aAAa;YAChB,kBAAkB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gJACqE,CAAC;SAC5I,CAAC;IA2LN,CAAC;IAxLa,KAAK,CAAC,OAAO,CACnB,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAmC,EAC3E,EAAE,MAAM,EAAwB;QAEhC,IAAI,iBAAiB,GAAkC,SAAS,CAAC;QACjE,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC9C,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,CAAC;YAE7C,IAAI,cAAsB,CAAC;YAC3B,IAAI,SAAoB,CAAC;YACzB,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACrD,yFAAyF;gBACzF,iBAAiB,GAAG,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE;oBACzD,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;iBACtC,CAAC,CAAC;gBAEH,SAAS,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBAC9C,cAAc,GAAG,iDAAiD,CAAC;YACvE,CAAC;iBAAM,CAAC;gBACJ,MAAM,qBAAqB,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;gBAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,GAAG,CAAC,EAAE,CAAC;oBACvC,qBAAqB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC;gBAC7E,CAAC;gBACD,iBAAiB,GAAG,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE;oBACtE,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;iBACtC,CAAC,CAAC;gBAEH,MAAM,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACtD,IAAI,CAAC,+BAA+B,CAAC;wBACjC,QAAQ;wBACR,QAAQ;wBACR,QAAQ;wBACR,WAAW,EAAE,MAAM;qBACtB,CAAC;oBACF,+BAA+B,CAAC;wBAC5B,MAAM,EAAE,iBAAiB;wBACzB,0BAA0B,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;wBACxD,sBAAsB,EAAE,kBAAkB;wBAC1C,WAAW,EAAE,MAAM;qBACtB,CAAC;iBACL,CAAC,CAAC;gBAEH,iEAAiE;gBACjE,mDAAmD;gBACnD,mEAAmE;gBACnE,UAAU;gBACV,MAAM,2CAA2C,GAC7C,IAAI,CAAC,MAAM,CAAC,oBAAoB,GAAG,CAAC;oBACpC,CAAC,CAAC,cAAc;oBAChB,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;gBAEtD,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;gBACpC,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC;oBAClC,eAAe,EAAE,cAAc;oBAC/B,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,aAAa,EAAE;wBACX,2CAA2C,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,SAAS;wBACvF,aAAa,CAAC,QAAQ;qBACzB,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmD,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;iBAChF,CAAC,CAAC;YACP,CAAC;YAED,OAAO;gBACH,OAAO,EAAE,mBAAmB,CACxB,cAAc,EACd,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAChE;aACJ,CAAC;QACN,CAAC;gBAAS,CAAC;YACP,IAAI,iBAAiB,EAAE,CAAC;gBACpB,KAAK,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;YACjD,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAAkC;QAC5D,IAAI,CAAC;YACD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;gBACxB,EAAE,EAAE,KAAK,CAAC,uBAAuB;gBACjC,OAAO,EAAE,mBAAmB;gBAC5B,OAAO,EAAE,mCAAmC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;aACvG,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAEO,6BAA6B,CAAC,QAAmC;QACrE,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,UAAU,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,UAAU,CAAC,EAAE,CAAC;YAC9E,MAAM,IAAI,YAAY,CAClB,UAAU,CAAC,eAAe,EAC1B,sFAAsF,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACnI,CAAC;QACN,CAAC;QAED,MAAM,eAAe,GAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACxE,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAElC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvB,wBAAwB,GAAG,wEAAwE,CAAC;QACxG,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAkB,CAAC,CAAC,EAAE,CAAC;YAC7F,wBAAwB;gBACpB,qHAAqH,CAAC;QAC9H,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC3B,wGAAwG;YACxG,sGAAsG;YACtG,2BAA2B;YAC3B,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,wBAAwB,EAAE,CAAC;gBACvD,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,uBAAuB,EAAE,wBAAwB,CAAC,CAAC;YACzF,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,+BAA+B,CAAC,EAC1C,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,WAAW,GAMd;QACG,MAAM,uBAAuB,GAAG,CAAC,GAAG,QAAQ,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC5E,OAAO,MAAM,qBAAqB,CAAC,KAAK,IAAiC,EAAE;YACvE,MAAM,kBAAkB,GAAG,MAAM,QAAQ;iBACpC,WAAW,CAAC,QAAQ,EAAE,uBAAuB,EAAE;gBAC5C,MAAM,EAAE,WAAW;aACtB,CAAC;iBACD,SAAS,CACN,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS;gBAC/B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,yBAAyB,CAAC;gBAC5D,CAAC,CAAC,yBAAyB,CAClC;iBACA,OAAO,EAAE,CAAC;YAEf,MAAM,iBAAiB,GAAY,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACvG,MAAM,cAAc,GAChB,iBAAiB;gBACjB,OAAO,iBAAiB,KAAK,QAAQ;gBACrC,gBAAgB,IAAI,iBAAiB;gBACrC,OAAO,iBAAiB,CAAC,cAAc,KAAK,QAAQ;gBAChD,CAAC,CAAC,iBAAiB,CAAC,cAAc;gBAClC,CAAC,CAAC,CAAC,CAAC;YAEZ,OAAO,cAAc,CAAC;QAC1B,CAAC,EAAE,SAAS,CAAC,CAAC;IAClB,CAAC;IAEO,eAAe,CAAC,EACpB,eAAe,EACf,SAAS,EACT,aAAa,GAKhB;QACG,IAAI,OAAO,GAAG,+BAA+B,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,eAAe,aAAa,CAAC;QAEvI,qFAAqF;QACrF,8DAA8D;QAC9D,IAAI,SAAS,CAAC,MAAM,KAAK,eAAe,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YAC/D,OAAO,IAAI,cAAc,SAAS,CAAC,MAAM,YAAY,CAAC;YACtD,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;gBACvB,OAAO,IAAI,2CAA2C,aAAa;qBAC9D,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;qBAChD,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,CAAC;YAED,OAAO,IAAI,GAAG,CAAC;QACnB,CAAC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,YAAY,CAAC,KAA8B;QAC/C,OAAO,MAAM,IAAI,KAAK,IAAI,QAAQ,IAAI,KAAK,CAAC;IAChD,CAAC;;AAjMM,wBAAQ,GAAG,cAAc,AAAjB,CAAkB;AAQ1B,6BAAa,GAAkB,MAAM,AAAxB,CAAyB"}

package/dist/esm/tools/mongodb/read/count.d.ts

@@ -2,15 +2,15 @@ import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { MongoDBToolBase } from "../mongodbTool.js";
 import type { ToolArgs, OperationType, ToolExecutionContext } from "../../tool.js";
 export declare const CountArgs: {
-    query: import("zod").ZodOptional<import("zod").AnyZodObject>;
+    query: import("zod").ZodOptional<import("zod").ZodRecord<import("zod").ZodString, import("zod").ZodUnknown>>;
 };
 export declare class CountTool extends MongoDBToolBase {
     static toolName: string;
     description: string;
     argsShape: {
-        query: import("zod").ZodOptional<import("zod").AnyZodObject>;
-        database: import("zod").ZodString;
+        query: import("zod").ZodOptional<import("zod").ZodRecord<import("zod").ZodString, import("zod").ZodUnknown>>;
         collection: import("zod").ZodString;
+        database: import("zod").ZodString;
     };
     static operationType: OperationType;
     protected execute({ database, collection, query }: ToolArgs<typeof this.argsShape>, { signal }: ToolExecutionContext): Promise<CallToolResult>;

package/dist/esm/tools/mongodb/read/count.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../../../src/tools/mongodb/read/count.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAmB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAInF,eAAO,MAAM,SAAS;;CAMrB,CAAC;AAEF,qBAAa,SAAU,SAAQ,eAAe;IAC1C,MAAM,CAAC,QAAQ,SAAW;IACnB,WAAW,SAC+G;IAC1H,SAAS;;;;MAGd;IAEF,MAAM,CAAC,aAAa,EAAE,aAAa,CAAU;cAE7B,OAAO,CACnB,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,EAChE,EAAE,MAAM,EAAE,EAAE,oBAAoB,GACjC,OAAO,CAAC,cAAc,CAAC;CAyC7B"}
+{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../../../src/tools/mongodb/read/count.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAqB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAInF,eAAO,MAAM,SAAS;;CAMrB,CAAC;AAEF,qBAAa,SAAU,SAAQ,eAAe;IAC1C,MAAM,CAAC,QAAQ,SAAW;IACnB,WAAW,SAC+G;IAC1H,SAAS;;;;MAGd;IAEF,MAAM,CAAC,aAAa,EAAE,aAAa,CAAU;cAE7B,OAAO,CACnB,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,EAChE,EAAE,MAAM,EAAE,EAAE,oBAAoB,GACjC,OAAO,CAAC,cAAc,CAAC;CA0C7B"}

package/dist/esm/tools/mongodb/read/count.js

@@ -1,4 +1,4 @@
-import { DbOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
+import { CollOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
 import { checkIndexUsage } from "../../../helpers/indexCheck.js";
 import { zEJSON } from "../../args.js";
 export const CountArgs = {
@@ -11,7 +11,7 @@ export class CountTool extends MongoDBToolBase {
         super(...arguments);
         this.description = "Gets the number of documents in a MongoDB collection using db.collection.count() and query as an optional filter parameter";
         this.argsShape = {
-            ...DbOperationArgs,
+            ...CollOperationArgs,
             ...CountArgs,
         };
     }
@@ -30,6 +30,7 @@ export class CountTool extends MongoDBToolBase {
                             query,
                         },
                         verbosity: "queryPlanner",
+                        ...(this.config.maxTimeMS !== undefined && { maxTimeMS: this.config.maxTimeMS }),
                     }, {
                         signal,
                     });
@@ -38,7 +39,7 @@ export class CountTool extends MongoDBToolBase {
             });
         }
         const count = await provider.countDocuments(database, collection, query, {
-            signal,
+            ...this.getOperationOptions(signal),
         });
         return {
             content: [

package/dist/esm/tools/mongodb/read/count.js.map

@@ -1 +1 @@
-{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../../../src/tools/mongodb/read/count.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,KAAK,EAAE,MAAM,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CACL,8IAA8I,CACjJ;CACR,CAAC;AAEF,MAAM,OAAO,SAAU,SAAQ,eAAe;IAA9C;;QAEW,gBAAW,GACd,4HAA4H,CAAC;QAC1H,cAAS,GAAG;YACf,GAAG,eAAe;YAClB,GAAG,SAAS;SACf,CAAC;IAgDN,CAAC;IA5Ca,KAAK,CAAC,OAAO,CACnB,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAmC,EAChE,EAAE,MAAM,EAAwB;QAEhC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE9C,oDAAoD;QACpD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACzB,MAAM,eAAe,CAAC;gBAClB,QAAQ;gBACR,UAAU;gBACV,SAAS,EAAE,OAAO;gBAClB,eAAe,EAAE,KAAK,IAAI,EAAE;oBACxB,OAAO,QAAQ,CAAC,mBAAmB,CAC/B,QAAQ,EACR;wBACI,OAAO,EAAE;4BACL,KAAK,EAAE,UAAU;4BACjB,KAAK;yBACR;wBACD,SAAS,EAAE,cAAc;qBAC5B,EACD;wBACI,MAAM;qBACT,CACJ,CAAC;gBACN,CAAC;gBACD,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;aAC9B,CAAC,CAAC;QACP,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE;YACrE,MAAM;SACT,CAAC,CAAC;QAEH,OAAO;YACH,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,SAAS,KAAK,iCAAiC,UAAU,IAAI,KAAK,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,GAAG;oBAC5G,IAAI,EAAE,MAAM;iBACf;aACJ;SACJ,CAAC;IACN,CAAC;;AArDM,kBAAQ,GAAG,OAAO,AAAV,CAAW;AAQnB,uBAAa,GAAkB,MAAM,AAAxB,CAAyB"}
+{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../../../src/tools/mongodb/read/count.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEvE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,KAAK,EAAE,MAAM,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CACL,8IAA8I,CACjJ;CACR,CAAC;AAEF,MAAM,OAAO,SAAU,SAAQ,eAAe;IAA9C;;QAEW,gBAAW,GACd,4HAA4H,CAAC;QAC1H,cAAS,GAAG;YACf,GAAG,iBAAiB;YACpB,GAAG,SAAS;SACf,CAAC;IAiDN,CAAC;IA7Ca,KAAK,CAAC,OAAO,CACnB,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAmC,EAChE,EAAE,MAAM,EAAwB;QAEhC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE9C,oDAAoD;QACpD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACzB,MAAM,eAAe,CAAC;gBAClB,QAAQ;gBACR,UAAU;gBACV,SAAS,EAAE,OAAO;gBAClB,eAAe,EAAE,KAAK,IAAI,EAAE;oBACxB,OAAO,QAAQ,CAAC,mBAAmB,CAC/B,QAAQ,EACR;wBACI,OAAO,EAAE;4BACL,KAAK,EAAE,UAAU;4BACjB,KAAK;yBACR;wBACD,SAAS,EAAE,cAAc;wBACzB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;qBACnF,EACD;wBACI,MAAM;qBACT,CACJ,CAAC;gBACN,CAAC;gBACD,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;aAC9B,CAAC,CAAC;QACP,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE;YACrE,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;SACtC,CAAC,CAAC;QAEH,OAAO;YACH,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,SAAS,KAAK,iCAAiC,UAAU,IAAI,KAAK,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,GAAG;oBAC5G,IAAI,EAAE,MAAM;iBACf;aACJ;SACJ,CAAC;IACN,CAAC;;AAtDM,kBAAQ,GAAG,OAAO,AAAV,CAAW;AAQnB,uBAAa,GAAkB,MAAM,AAAxB,CAAyB"}