chore: minor fixes and remove unused dependencies

Author: kmruiz

package-lock.json

@@ -67,7 +67,6 @@
     "@modelcontextprotocol/inspector": "^0.16.5",
     "@mongodb-js/oidc-mock-provider": "^0.11.3",
     "@redocly/cli": "^2.0.8",
-    "@testcontainers/mongodb": "^11.7.1",
     "@types/express": "^5.0.3",
     "@types/node": "^24.5.2",
     "@types/proper-lockfile": "^4.1.4",

package.json

@@ -2,6 +2,7 @@ import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import type { ToolArgs, OperationType } from "../../tool.js";
 import { DbOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
 import { formatUntrustedData } from "../../tool.js";
+import { EJSON } from "bson";
 
 export type SearchIndexStatus = {
     name: string;
@@ -26,7 +27,7 @@ export class ListSearchIndexesTool extends MongoDBToolBase {
             return {
                 content: formatUntrustedData(
                     `Found ${trimmedIndexDefinitions.length} search and vector search indexes in ${database}.${collection}`,
-                    indexes.map((index) => JSON.stringify(index)).join("\n")
+                    indexes.map((index) => EJSON.stringify(index)).join("\n")
                 ),
             };
         } else {
@@ -54,7 +55,10 @@ export class ListSearchIndexesTool extends MongoDBToolBase {
         }));
     }
 
-    protected handleError(error: unknown): Promise<CallToolResult> | CallToolResult {
+    protected handleError(
+        error: unknown,
+        { database, collection }: ToolArgs<typeof DbOperationArgs>
+    ): Promise<CallToolResult> | CallToolResult {
         if (error instanceof Error && "codeName" in error && error.codeName === "SearchNotEnabled") {
             return {
                 content: [
@@ -68,7 +72,7 @@ export class ListSearchIndexesTool extends MongoDBToolBase {
             return {
                 content: [
                     {
-                        text: "Collection does not exist",
+                        text: `Could not retrieve indexes in ${database}.${collection}: ${EJSON.stringify(error)}.`,
                         type: "text",
                     },
                 ],

src/tools/mongodb/search/listSearchIndexes.ts

@@ -11,7 +11,7 @@ import {
 import type { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import type { SearchIndexStatus } from "../../../../../src/tools/mongodb/search/listSearchIndexes.js";
 
-const SEARCH_RETRIES = 10_000;
+const SEARCH_RETRIES = 200;
 const SEARCH_TIMEOUT = 20_000;
 
 describeWithMongoDB("list search indexes tool in local MongoDB", (integration) => {
@@ -48,6 +48,17 @@ describeWithMongoDB(
             await waitUntilSearchIsReady(provider, signal);
         });
 
+        describe("when the collection does not exist", () => {
+            it("returns an empty list of indexes", async () => {
+                const response = await integration.mcpClient().callTool({
+                    name: "list-search-indexes",
+                    arguments: { database: "any", collection: "foo" },
+                });
+                const content = getResponseContent(response.content);
+                expect(content).toEqual("There are no search or vector search indexes in any.foo");
+            });
+        });
+
         describe("when there are no indexes", () => {
             it("returns an empty list of indexes", async () => {
                 const response = await integration.mcpClient().callTool({
@@ -107,8 +118,8 @@ describeWithMongoDB(
 );
 
 async function waitUntilSearchIsReady(provider: NodeDriverServiceProvider, abortSignal: AbortSignal): Promise<void> {
-    let success = true;
-    let lastError: unknown = false;
+    let success = false;
+    let lastError: unknown = null;
 
     for (let i = 0; i < SEARCH_RETRIES && !abortSignal.aborted; i++) {
         try {
@@ -135,8 +146,8 @@ async function waitUntilIndexIsQueryable(
     abortSignal: AbortSignal
 ): Promise<void> {
     let success = false;
-    let lastIndexStatus: unknown = false;
-    let lastError: unknown = false;
+    let lastIndexStatus: unknown = null;
+    let lastError: unknown = null;
 
     for (let i = 0; i < SEARCH_RETRIES && !abortSignal.aborted; i++) {
         try {