chore: account for cursor close errors

Author: himanshusinghs

src/common/logger.ts

@@ -44,6 +44,7 @@ export const LogId = {
     mongodbConnectFailure: mongoLogId(1_004_001),
     mongodbDisconnectFailure: mongoLogId(1_004_002),
     mongodbConnectTry: mongoLogId(1_004_003),
+    mongodbCursorCloseError: mongoLogId(1_004_004),
 
     toolUpdateFailure: mongoLogId(1_005_001),
     resourceUpdateFailure: mongoLogId(1_005_002),

src/tools/mongodb/read/aggregate.ts

@@ -12,6 +12,7 @@ import { collectCursorUntilMaxBytesLimit } from "../../../helpers/collectCursorU
 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 { zEJSON } from "../../args.js";
+import { LogId } from "../../../common/logger.js";
 
 export const AggregateArgs = {
     pipeline: z.array(zEJSON()).describe("An array of aggregation stages to execute"),
@@ -88,10 +89,25 @@ export class AggregateTool extends MongoDBToolBase {
                 ),
             };
         } finally {
+            if (aggregationCursor) {
+                void this.safeCloseCursor(aggregationCursor);
+            }
             await aggregationCursor?.close();
         }
     }
 
+    private async safeCloseCursor(cursor: AggregationCursor<unknown>): Promise<void> {
+        try {
+            await cursor.close();
+        } catch (error) {
+            this.session.logger.warning({
+                id: LogId.mongodbCursorCloseError,
+                context: "aggregate tool",
+                message: `Error when closing the cursor - ${error instanceof Error ? error.message : String(error)}`,
+            });
+        }
+    }
+
     private assertOnlyUsesPermittedStages(pipeline: Record<string, unknown>[]): void {
         const writeOperations: OperationType[] = ["update", "create", "delete"];
         let writeStageForbiddenError = "";

src/tools/mongodb/read/find.ts

@@ -10,6 +10,7 @@ import { collectCursorUntilMaxBytesLimit } from "../../../helpers/collectCursorU
 import { operationWithFallback } from "../../../helpers/operationWithFallback.js";
 import { ONE_MB, QUERY_COUNT_MAX_TIME_MS_CAP, CURSOR_LIMITS_TO_LLM_TEXT } from "../../../helpers/constants.js";
 import { zEJSON } from "../../args.js";
+import { LogId } from "../../../common/logger.js";
 
 export const FindArgs = {
     filter: zEJSON()
@@ -101,7 +102,21 @@ export class FindTool extends MongoDBToolBase {
                 ),
             };
         } finally {
-            await findCursor?.close();
+            if (findCursor) {
+                void this.safeCloseCursor(findCursor);
+            }
+        }
+    }
+
+    private async safeCloseCursor(cursor: FindCursor<unknown>): Promise<void> {
+        try {
+            await cursor.close();
+        } catch (error) {
+            this.session.logger.warning({
+                id: LogId.mongodbCursorCloseError,
+                context: "find tool",
+                message: `Error when closing the cursor - ${error instanceof Error ? error.message : String(error)}`,
+            });
         }
     }