@mhalder/qdrant-mcp-server 3.2.0 → 3.3.0

package/src/tools/collection.ts

@@ -3,10 +3,14 @@
  */
 
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import logger from "../logger.js";
 import type { EmbeddingProvider } from "../embeddings/base.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 CollectionToolDependencies {
   qdrant: QdrantManager;
   embeddings: EmbeddingProvider;
@@ -27,24 +31,31 @@ export function registerCollectionTools(
         "Create a new vector collection in Qdrant. The collection will be configured with the embedding provider's dimensions automatically. Set enableHybrid to true to enable hybrid search combining semantic and keyword search.",
       inputSchema: schemas.CreateCollectionSchema,
     },
-    async ({ name, distance, enableHybrid }) => {
-      const vectorSize = embeddings.getDimensions();
-      await qdrant.createCollection(
-        name,
-        vectorSize,
-        distance,
-        enableHybrid || false,
-      );
+    withToolLogging(
+      "create_collection",
+      async ({ name, distance, enableHybrid }) => {
+        log.info(
+          { tool: "create_collection", collection: name },
+          "Tool called",
+        );
+        const vectorSize = embeddings.getDimensions();
+        await qdrant.createCollection(
+          name,
+          vectorSize,
+          distance,
+          enableHybrid || false,
+        );
 
-      let message = `Collection "${name}" created successfully with ${vectorSize} dimensions and ${distance || "Cosine"} distance metric.`;
-      if (enableHybrid) {
-        message += " Hybrid search is enabled for this collection.";
-      }
+        let message = `Collection "${name}" created successfully with ${vectorSize} dimensions and ${distance || "Cosine"} distance metric.`;
+        if (enableHybrid) {
+          message += " Hybrid search is enabled for this collection.";
+        }
 
-      return {
-        content: [{ type: "text", text: message }],
-      };
-    },
+        return {
+          content: [{ type: "text", text: message }],
+        };
+      },
+    ),
   );
 
   // list_collections
@@ -55,12 +66,13 @@ export function registerCollectionTools(
       description: "List all available collections in Qdrant.",
       inputSchema: {},
     },
-    async () => {
+    withToolLogging("list_collections", async () => {
+      log.info({ tool: "list_collections" }, "Tool called");
       const collections = await qdrant.listCollections();
       return {
         content: [{ type: "text", text: JSON.stringify(collections, null, 2) }],
       };
-    },
+    }),
   );
 
   // get_collection_info
@@ -72,12 +84,16 @@ export function registerCollectionTools(
         "Get detailed information about a collection including vector size, point count, and distance metric.",
       inputSchema: schemas.GetCollectionInfoSchema,
     },
-    async ({ name }) => {
+    withToolLogging("get_collection_info", async ({ name }) => {
+      log.info(
+        { tool: "get_collection_info", collection: name },
+        "Tool called",
+      );
       const info = await qdrant.getCollectionInfo(name);
       return {
         content: [{ type: "text", text: JSON.stringify(info, null, 2) }],
       };
-    },
+    }),
   );
 
   // delete_collection
@@ -88,13 +104,14 @@ export function registerCollectionTools(
       description: "Delete a collection and all its documents.",
       inputSchema: schemas.DeleteCollectionSchema,
     },
-    async ({ name }) => {
+    withToolLogging("delete_collection", async ({ name }) => {
+      log.info({ tool: "delete_collection", collection: name }, "Tool called");
       await qdrant.deleteCollection(name);
       return {
         content: [
           { type: "text", text: `Collection "${name}" deleted successfully.` },
         ],
       };
-    },
+    }),
   );
 }

package/src/tools/document.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 DocumentToolDependencies {
   qdrant: QdrantManager;
   embeddings: EmbeddingProvider;
@@ -28,7 +32,11 @@ export function registerDocumentTools(
         "Add documents to a collection. Documents will be automatically embedded using the configured embedding provider.",
       inputSchema: schemas.AddDocumentsSchema,
     },
-    async ({ collection, documents }) => {
+    withToolLogging("add_documents", async ({ collection, documents }) => {
+      log.info(
+        { tool: "add_documents", collection, count: documents.length },
+        "Tool called",
+      );
       // Check if collection exists and get info
       const exists = await qdrant.collectionExists(collection);
       if (!exists) {
@@ -46,7 +54,7 @@ export function registerDocumentTools(
       const collectionInfo = await qdrant.getCollectionInfo(collection);
 
       // Generate embeddings for all documents
-      const texts = documents.map((doc) => doc.text);
+      const texts = documents.map((doc: { text: string }) => doc.text);
       const embeddingResults = await embeddings.embedBatch(texts);
 
       // If hybrid search is enabled, generate sparse vectors and use appropriate method
@@ -54,27 +62,45 @@ export function registerDocumentTools(
         const sparseGenerator = new BM25SparseVectorGenerator();
 
         // Prepare points with both dense and sparse vectors
-        const points = documents.map((doc, index) => ({
-          id: doc.id,
-          vector: embeddingResults[index].embedding,
-          sparseVector: sparseGenerator.generate(doc.text),
-          payload: {
-            text: doc.text,
-            ...doc.metadata,
-          },
-        }));
+        const points = documents.map(
+          (
+            doc: {
+              id: string | number;
+              text: string;
+              metadata?: Record<string, any>;
+            },
+            index: number,
+          ) => ({
+            id: doc.id,
+            vector: embeddingResults[index].embedding,
+            sparseVector: sparseGenerator.generate(doc.text),
+            payload: {
+              text: doc.text,
+              ...doc.metadata,
+            },
+          }),
+        );
 
         await qdrant.addPointsWithSparse(collection, points);
       } else {
         // Standard dense-only vectors
-        const points = documents.map((doc, index) => ({
-          id: doc.id,
-          vector: embeddingResults[index].embedding,
-          payload: {
-            text: doc.text,
-            ...doc.metadata,
-          },
-        }));
+        const points = documents.map(
+          (
+            doc: {
+              id: string | number;
+              text: string;
+              metadata?: Record<string, any>;
+            },
+            index: number,
+          ) => ({
+            id: doc.id,
+            vector: embeddingResults[index].embedding,
+            payload: {
+              text: doc.text,
+              ...doc.metadata,
+            },
+          }),
+        );
 
         await qdrant.addPoints(collection, points);
       }
@@ -87,7 +113,7 @@ export function registerDocumentTools(
           },
         ],
       };
-    },
+    }),
   );
 
   // delete_documents
@@ -98,7 +124,11 @@ export function registerDocumentTools(
       description: "Delete specific documents from a collection by their IDs.",
       inputSchema: schemas.DeleteDocumentsSchema,
     },
-    async ({ collection, ids }) => {
+    withToolLogging("delete_documents", async ({ collection, ids }) => {
+      log.info(
+        { tool: "delete_documents", collection, count: ids.length },
+        "Tool called",
+      );
       await qdrant.deletePoints(collection, ids);
       return {
         content: [
@@ -108,6 +138,6 @@ export function registerDocumentTools(
           },
         ],
       };
-    },
+    }),
   );
 }

package/src/tools/federated.test.ts

@@ -8,6 +8,18 @@ import {
   pathsMatch,
 } from "./federated.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(),
+  },
+}));
+
 // ============================================================================
 // Unit Tests for Helper Functions
 // ============================================================================

package/src/tools/federated.ts

@@ -7,12 +7,16 @@
  */
 
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import logger from "../logger.js";
 import type { CodeIndexer } from "../code/indexer.js";
 import type { CodeSearchResult } from "../code/types.js";
 import type { GitHistoryIndexer } from "../git/indexer.js";
 import type { GitSearchResult } from "../git/types.js";
+import { withToolLogging } from "./logging.js";
 import * as schemas from "./schemas.js";
 
+const log = logger.child({ component: "tools" });
+
 // ============================================================================
 // Types
 // ============================================================================
@@ -412,81 +416,88 @@ export function registerFederatedTools(
         "modified which files. Useful for understanding code evolution and finding related changes.",
       inputSchema: schemas.ContextualSearchSchema,
     },
-    async ({ path, query, codeLimit, gitLimit, correlate }) => {
-      try {
-        const result = await performContextualSearch(
-          codeIndexer,
-          gitHistoryIndexer,
-          { path, query, codeLimit, gitLimit, correlate },
+    withToolLogging(
+      "contextual_search",
+      async ({ path, query, codeLimit, gitLimit, correlate }) => {
+        log.info(
+          { tool: "contextual_search", path, query: query.substring(0, 80) },
+          "Tool called",
         );
+        try {
+          const result = await performContextualSearch(
+            codeIndexer,
+            gitHistoryIndexer,
+            { path, query, codeLimit, gitLimit, correlate },
+          );
+
+          // Format output
+          const sections: string[] = [];
+
+          // Code results section
+          if (result.codeResults.length > 0) {
+            sections.push("## Code Results\n");
+            result.codeResults.forEach((r, idx) => {
+              sections.push(
+                `### ${idx + 1}. ${r.filePath}:${r.startLine}-${r.endLine} (score: ${r.score.toFixed(3)})\n` +
+                  `Language: ${r.language}\n` +
+                  "```" +
+                  r.language +
+                  "\n" +
+                  r.content +
+                  "\n```\n",
+              );
+            });
+          }
 
-        // Format output
-        const sections: string[] = [];
-
-        // Code results section
-        if (result.codeResults.length > 0) {
-          sections.push("## Code Results\n");
-          result.codeResults.forEach((r, idx) => {
-            sections.push(
-              `### ${idx + 1}. ${r.filePath}:${r.startLine}-${r.endLine} (score: ${r.score.toFixed(3)})\n` +
-                `Language: ${r.language}\n` +
-                "```" +
-                r.language +
-                "\n" +
-                r.content +
-                "\n```\n",
-            );
-          });
-        }
+          // Git results section
+          if (result.gitResults.length > 0) {
+            sections.push("\n## Git History Results\n");
+            result.gitResults.forEach((r, idx) => {
+              sections.push(
+                `### ${idx + 1}. ${r.shortHash} - ${r.subject} (score: ${r.score.toFixed(3)})\n` +
+                  `Author: ${r.author} | Date: ${r.date} | Type: ${r.commitType}\n` +
+                  `Files: ${r.files.slice(0, 5).join(", ")}${r.files.length > 5 ? ` (+${r.files.length - 5} more)` : ""}\n`,
+              );
+            });
+          }
 
-        // Git results section
-        if (result.gitResults.length > 0) {
-          sections.push("\n## Git History Results\n");
-          result.gitResults.forEach((r, idx) => {
-            sections.push(
-              `### ${idx + 1}. ${r.shortHash} - ${r.subject} (score: ${r.score.toFixed(3)})\n` +
-                `Author: ${r.author} | Date: ${r.date} | Type: ${r.commitType}\n` +
-                `Files: ${r.files.slice(0, 5).join(", ")}${r.files.length > 5 ? ` (+${r.files.length - 5} more)` : ""}\n`,
-            );
-          });
-        }
+          // Correlations section
+          if (result.correlations.length > 0) {
+            sections.push("\n## Correlations (Code ↔ Commits)\n");
+            result.correlations.forEach((c) => {
+              const commits = c.relatedCommits
+                .slice(0, 3)
+                .map((commit) => `  - ${commit.shortHash}: ${commit.subject}`)
+                .join("\n");
+              sections.push(
+                `**${c.codeResult.filePath}:${c.codeResult.startLine}** modified by:\n${commits}\n`,
+              );
+            });
+          }
 
-        // Correlations section
-        if (result.correlations.length > 0) {
-          sections.push("\n## Correlations (Code ↔ Commits)\n");
-          result.correlations.forEach((c) => {
-            const commits = c.relatedCommits
-              .slice(0, 3)
-              .map((commit) => `  - ${commit.shortHash}: ${commit.subject}`)
-              .join("\n");
-            sections.push(
-              `**${c.codeResult.filePath}:${c.codeResult.startLine}** modified by:\n${commits}\n`,
-            );
-          });
-        }
+          // Summary
+          const summary =
+            `\n---\nFound ${result.metadata.codeResultCount} code result(s), ` +
+            `${result.metadata.gitResultCount} git result(s), ` +
+            `${result.metadata.correlationCount} correlation(s).`;
+          sections.push(summary);
 
-        // Summary
-        const summary =
-          `\n---\nFound ${result.metadata.codeResultCount} code result(s), ` +
-          `${result.metadata.gitResultCount} git result(s), ` +
-          `${result.metadata.correlationCount} correlation(s).`;
-        sections.push(summary);
-
-        return {
-          content: [{ type: "text", text: sections.join("\n") }],
-        };
-      } catch (error) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error: ${error instanceof Error ? error.message : String(error)}`,
-            },
-          ],
-          isError: true,
-        };
-      }
-    },
+          return {
+            content: [{ type: "text", text: sections.join("\n") }],
+          };
+        } catch (error) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Error: ${error instanceof Error ? error.message : String(error)}`,
+              },
+            ],
+            isError: true,
+          };
+        }
+      },
+    ),
   );
 
   // federated_search
@@ -500,70 +511,77 @@ export function registerFederatedTools(
         "Supports code-only, git-only, or combined search modes.",
       inputSchema: schemas.FederatedSearchSchema,
     },
-    async ({ paths, query, searchType, limit }) => {
-      try {
-        const response = await performFederatedSearch(
-          codeIndexer,
-          gitHistoryIndexer,
-          { paths, query, searchType, limit },
+    withToolLogging(
+      "federated_search",
+      async ({ paths, query, searchType, limit }) => {
+        log.info(
+          { tool: "federated_search", paths, query: query.substring(0, 80) },
+          "Tool called",
         );
+        try {
+          const response = await performFederatedSearch(
+            codeIndexer,
+            gitHistoryIndexer,
+            { paths, query, searchType, limit },
+          );
+
+          if (response.results.length === 0) {
+            return {
+              content: [
+                {
+                  type: "text",
+                  text: `No results found for query "${query}" across ${paths.length} repository(ies).`,
+                },
+              ],
+            };
+          }
 
-        if (response.results.length === 0) {
+          // Format results
+          const sections: string[] = [
+            `# Federated Search Results\n` +
+              `Query: "${query}" | Type: ${response.metadata.searchType} | ` +
+              `Repositories: ${response.metadata.repositoriesSearched.length}\n`,
+          ];
+
+          response.results.forEach((r, idx) => {
+            if (r.resultType === "code") {
+              sections.push(
+                `## ${idx + 1}. [CODE] ${r.filePath}:${r.startLine}-${r.endLine}\n` +
+                  `Repository: ${r.repoPath} | Language: ${r.language} | Score: ${r.score.toFixed(3)}\n` +
+                  "```" +
+                  r.language +
+                  "\n" +
+                  r.content +
+                  "\n```\n",
+              );
+            } else {
+              sections.push(
+                `## ${idx + 1}. [GIT] ${r.shortHash} - ${r.subject}\n` +
+                  `Repository: ${r.repoPath} | Author: ${r.author} | Date: ${r.date} | Score: ${r.score.toFixed(3)}\n` +
+                  `Type: ${r.commitType} | Files: ${r.files.slice(0, 3).join(", ")}${r.files.length > 3 ? ` (+${r.files.length - 3} more)` : ""}\n`,
+              );
+            }
+          });
+
+          sections.push(
+            `\n---\nTotal: ${response.metadata.totalResults} result(s) from ${response.metadata.repositoriesSearched.length} repository(ies).`,
+          );
+
+          return {
+            content: [{ type: "text", text: sections.join("\n") }],
+          };
+        } catch (error) {
           return {
             content: [
               {
                 type: "text",
-                text: `No results found for query "${query}" across ${paths.length} repository(ies).`,
+                text: `Error: ${error instanceof Error ? error.message : String(error)}`,
               },
             ],
+            isError: true,
           };
         }
-
-        // Format results
-        const sections: string[] = [
-          `# Federated Search Results\n` +
-            `Query: "${query}" | Type: ${response.metadata.searchType} | ` +
-            `Repositories: ${response.metadata.repositoriesSearched.length}\n`,
-        ];
-
-        response.results.forEach((r, idx) => {
-          if (r.resultType === "code") {
-            sections.push(
-              `## ${idx + 1}. [CODE] ${r.filePath}:${r.startLine}-${r.endLine}\n` +
-                `Repository: ${r.repoPath} | Language: ${r.language} | Score: ${r.score.toFixed(3)}\n` +
-                "```" +
-                r.language +
-                "\n" +
-                r.content +
-                "\n```\n",
-            );
-          } else {
-            sections.push(
-              `## ${idx + 1}. [GIT] ${r.shortHash} - ${r.subject}\n` +
-                `Repository: ${r.repoPath} | Author: ${r.author} | Date: ${r.date} | Score: ${r.score.toFixed(3)}\n` +
-                `Type: ${r.commitType} | Files: ${r.files.slice(0, 3).join(", ")}${r.files.length > 3 ? ` (+${r.files.length - 3} more)` : ""}\n`,
-            );
-          }
-        });
-
-        sections.push(
-          `\n---\nTotal: ${response.metadata.totalResults} result(s) from ${response.metadata.repositoriesSearched.length} repository(ies).`,
-        );
-
-        return {
-          content: [{ type: "text", text: sections.join("\n") }],
-        };
-      } catch (error) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error: ${error instanceof Error ? error.message : String(error)}`,
-            },
-          ],
-          isError: true,
-        };
-      }
-    },
+      },
+    ),
   );
 }