@mhalder/qdrant-mcp-server 3.2.0 → 3.3.0

package/src/tools/search.ts

@@ -3,11 +3,15 @@
  */
 
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import logger from "../logger.js";
 import type { EmbeddingProvider } from "../embeddings/base.js";
 import { BM25SparseVectorGenerator } from "../embeddings/sparse.js";
 import type { QdrantManager } from "../qdrant/client.js";
+import { withToolLogging } from "./logging.js";
 import * as schemas from "./schemas.js";
 
+const log = logger.child({ component: "tools" });
+
 export interface SearchToolDependencies {
   qdrant: QdrantManager;
   embeddings: EmbeddingProvider;
@@ -28,36 +32,47 @@ export function registerSearchTools(
         "Search for documents using natural language queries. Returns the most semantically similar documents.",
       inputSchema: schemas.SemanticSearchSchema,
     },
-    async ({ collection, query, limit, filter }) => {
-      // Check if collection exists
-      const exists = await qdrant.collectionExists(collection);
-      if (!exists) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error: Collection "${collection}" does not exist.`,
-            },
-          ],
-          isError: true,
-        };
-      }
+    withToolLogging(
+      "semantic_search",
+      async ({ collection, query, limit, filter }) => {
+        log.info(
+          {
+            tool: "semantic_search",
+            collection,
+            query: query.substring(0, 80),
+          },
+          "Tool called",
+        );
+        // Check if collection exists
+        const exists = await qdrant.collectionExists(collection);
+        if (!exists) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Error: Collection "${collection}" does not exist.`,
+              },
+            ],
+            isError: true,
+          };
+        }
 
-      // Generate embedding for query
-      const { embedding } = await embeddings.embed(query);
+        // Generate embedding for query
+        const { embedding } = await embeddings.embed(query);
 
-      // Search
-      const results = await qdrant.search(
-        collection,
-        embedding,
-        limit || 5,
-        filter,
-      );
+        // Search
+        const results = await qdrant.search(
+          collection,
+          embedding,
+          limit || 5,
+          filter,
+        );
 
-      return {
-        content: [{ type: "text", text: JSON.stringify(results, null, 2) }],
-      };
-    },
+        return {
+          content: [{ type: "text", text: JSON.stringify(results, null, 2) }],
+        };
+      },
+    ),
   );
 
   // hybrid_search
@@ -69,54 +84,61 @@ export function registerSearchTools(
         "Perform hybrid search combining semantic vector search with keyword search using BM25. This provides better results by combining the strengths of both approaches. The collection must be created with enableHybrid set to true.",
       inputSchema: schemas.HybridSearchSchema,
     },
-    async ({ collection, query, limit, filter }) => {
-      // Check if collection exists
-      const exists = await qdrant.collectionExists(collection);
-      if (!exists) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error: Collection "${collection}" does not exist.`,
-            },
-          ],
-          isError: true,
-        };
-      }
+    withToolLogging(
+      "hybrid_search",
+      async ({ collection, query, limit, filter }) => {
+        log.info(
+          { tool: "hybrid_search", collection, query: query.substring(0, 80) },
+          "Tool called",
+        );
+        // Check if collection exists
+        const exists = await qdrant.collectionExists(collection);
+        if (!exists) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Error: Collection "${collection}" does not exist.`,
+              },
+            ],
+            isError: true,
+          };
+        }
 
-      // Check if collection has hybrid search enabled
-      const collectionInfo = await qdrant.getCollectionInfo(collection);
-      if (!collectionInfo.hybridEnabled) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error: Collection "${collection}" does not have hybrid search enabled. Create a new collection with enableHybrid set to true.`,
-            },
-          ],
-          isError: true,
-        };
-      }
+        // Check if collection has hybrid search enabled
+        const collectionInfo = await qdrant.getCollectionInfo(collection);
+        if (!collectionInfo.hybridEnabled) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Error: Collection "${collection}" does not have hybrid search enabled. Create a new collection with enableHybrid set to true.`,
+              },
+            ],
+            isError: true,
+          };
+        }
 
-      // Generate dense embedding for query
-      const { embedding } = await embeddings.embed(query);
+        // Generate dense embedding for query
+        const { embedding } = await embeddings.embed(query);
 
-      // Generate sparse vector for query
-      const sparseGenerator = new BM25SparseVectorGenerator();
-      const sparseVector = sparseGenerator.generate(query);
+        // Generate sparse vector for query
+        const sparseGenerator = new BM25SparseVectorGenerator();
+        const sparseVector = sparseGenerator.generate(query);
 
-      // Perform hybrid search
-      const results = await qdrant.hybridSearch(
-        collection,
-        embedding,
-        sparseVector,
-        limit || 5,
-        filter,
-      );
+        // Perform hybrid search
+        const results = await qdrant.hybridSearch(
+          collection,
+          embedding,
+          sparseVector,
+          limit || 5,
+          filter,
+        );
 
-      return {
-        content: [{ type: "text", text: JSON.stringify(results, null, 2) }],
-      };
-    },
+        return {
+          content: [{ type: "text", text: JSON.stringify(results, null, 2) }],
+        };
+      },
+    ),
   );
 }

package/tests/code/chunker/tree-sitter-chunker.test.ts

@@ -1,7 +1,19 @@
-import { beforeEach, describe, expect, it } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { TreeSitterChunker } from "../../../src/code/chunker/tree-sitter-chunker.js";
 import type { ChunkerConfig } from "../../../src/code/types.js";
 
+vi.mock("../../logger.js", () => ({
+  default: {
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+    fatal: vi.fn(),
+    trace: vi.fn(),
+    child: vi.fn().mockReturnThis(),
+  },
+}));
+
 describe("TreeSitterChunker", () => {
   let chunker: TreeSitterChunker;
   let config: ChunkerConfig;

package/tests/code/indexer.test.ts

@@ -7,6 +7,18 @@ import type { CodeConfig } from "../../src/code/types.js";
 import type { EmbeddingProvider } from "../../src/embeddings/base.js";
 import type { QdrantManager } from "../../src/qdrant/client.js";
 
+vi.mock("../logger.js", () => ({
+  default: {
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+    fatal: vi.fn(),
+    trace: vi.fn(),
+    child: vi.fn().mockReturnThis(),
+  },
+}));
+
 // Mock implementations
 class MockQdrantManager implements Partial<QdrantManager> {
   private collections = new Map<string, any>();

package/tests/code/integration.test.ts

@@ -1,7 +1,20 @@
 import { promises as fs } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("../../src/logger.js", () => ({
+  default: {
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+    fatal: vi.fn(),
+    trace: vi.fn(),
+    child: vi.fn().mockReturnThis(),
+  },
+}));
+
 import { CodeIndexer } from "../../src/code/indexer.js";
 import type { CodeConfig } from "../../src/code/types.js";
 import type { EmbeddingProvider } from "../../src/embeddings/base.js";