@mhalder/qdrant-mcp-server 3.3.3 → 3.3.4

package/src/tools/federated.ts

@@ -7,11 +7,11 @@
  */
 
 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 logger from "../logger.js";
 import { withToolLogging } from "./logging.js";
 import * as schemas from "./schemas.js";
 
@@ -85,7 +85,7 @@ export interface FederatedSearchResponse {
  */
 export function buildCorrelations(
   codeResults: CodeSearchResult[],
-  gitResults: GitSearchResult[],
+  gitResults: GitSearchResult[]
 ): CodeCommitCorrelation[] {
   const correlations: CodeCommitCorrelation[] = [];
 
@@ -95,9 +95,7 @@ export function buildCorrelations(
     // Find commits that modified this file
     for (const gitResult of gitResults) {
       // Check if any file in the commit matches the code result's file path
-      const matchesFile = gitResult.files.some((file) =>
-        pathsMatch(codeResult.filePath, file),
-      );
+      const matchesFile = gitResult.files.some((file) => pathsMatch(codeResult.filePath, file));
 
       if (matchesFile) {
         relatedCommits.push({
@@ -157,9 +155,7 @@ export function pathsMatch(path1: string, path2: string): boolean {
 /**
  * Normalize scores to [0, 1] range using min-max normalization
  */
-export function normalizeScores<T extends { score: number }>(
-  results: T[],
-): T[] {
+export function normalizeScores<T extends { score: number }>(results: T[]): T[] {
   if (results.length === 0) return [];
   if (results.length === 1) return results.map((r) => ({ ...r, score: 1 }));
 
@@ -203,7 +199,7 @@ async function performContextualSearch(
     codeLimit?: number;
     gitLimit?: number;
     correlate?: boolean;
-  },
+  }
 ): Promise<ContextualSearchResult> {
   const { path, query, codeLimit = 5, gitLimit = 5, correlate = true } = params;
 
@@ -214,15 +210,11 @@ async function performContextualSearch(
   ]);
 
   if (codeStatus.status !== "indexed") {
-    throw new Error(
-      `Code index not found for "${path}". Run index_codebase first.`,
-    );
+    throw new Error(`Code index not found for "${path}". Run index_codebase first.`);
   }
 
   if (gitStatus.status !== "indexed") {
-    throw new Error(
-      `Git history index not found for "${path}". Run index_git_history first.`,
-    );
+    throw new Error(`Git history index not found for "${path}". Run index_git_history first.`);
   }
 
   // Execute searches in parallel
@@ -232,9 +224,7 @@ async function performContextualSearch(
   ]);
 
   // Build correlations if requested
-  const correlations = correlate
-    ? buildCorrelations(codeResults, gitResults)
-    : [];
+  const correlations = correlate ? buildCorrelations(codeResults, gitResults) : [];
 
   return {
     codeResults,
@@ -261,7 +251,7 @@ async function performFederatedSearch(
     query: string;
     searchType?: "code" | "git" | "both";
     limit?: number;
-  },
+  }
 ): Promise<FederatedSearchResponse> {
   const { paths, query, searchType = "both", limit = 20 } = params;
 
@@ -306,8 +296,8 @@ async function performFederatedSearch(
               ...r,
               resultType: "code" as const,
               repoPath: path,
-            })),
-          ),
+            }))
+          )
       );
     }
 
@@ -322,8 +312,8 @@ async function performFederatedSearch(
               ...r,
               resultType: "git" as const,
               repoPath: path,
-            })),
-          ),
+            }))
+          )
       );
     }
   }
@@ -333,11 +323,10 @@ async function performFederatedSearch(
 
   // Normalize scores per result type to ensure fair comparison
   const codeResults = allResults.filter(
-    (r): r is FederatedResult & { resultType: "code" } =>
-      r.resultType === "code",
+    (r): r is FederatedResult & { resultType: "code" } => r.resultType === "code"
   );
   const gitResults = allResults.filter(
-    (r): r is FederatedResult & { resultType: "git" } => r.resultType === "git",
+    (r): r is FederatedResult & { resultType: "git" } => r.resultType === "git"
   );
 
   const normalizedCode = normalizeScores(codeResults);
@@ -353,7 +342,7 @@ async function performFederatedSearch(
     if (!groupedResults.has(key)) {
       groupedResults.set(key, []);
     }
-    groupedResults.get(key)!.push(result);
+    groupedResults.get(key)?.push(result);
   }
 
   // Sort each group by score and create rank lookup
@@ -399,10 +388,7 @@ async function performFederatedSearch(
 /**
  * Register federated search tools on the MCP server
  */
-export function registerFederatedTools(
-  server: McpServer,
-  deps: FederatedToolDependencies,
-): void {
+export function registerFederatedTools(server: McpServer, deps: FederatedToolDependencies): void {
   const { codeIndexer, gitHistoryIndexer } = deps;
 
   // contextual_search
@@ -419,16 +405,15 @@ export function registerFederatedTools(
     withToolLogging(
       "contextual_search",
       async ({ path, query, codeLimit, gitLimit, correlate }) => {
-        log.info(
-          { tool: "contextual_search", path, query: query.substring(0, 80) },
-          "Tool called",
-        );
+        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 },
-          );
+          const result = await performContextualSearch(codeIndexer, gitHistoryIndexer, {
+            path,
+            query,
+            codeLimit,
+            gitLimit,
+            correlate,
+          });
 
           // Format output
           const sections: string[] = [];
@@ -444,7 +429,7 @@ export function registerFederatedTools(
                   r.language +
                   "\n" +
                   r.content +
-                  "\n```\n",
+                  "\n```\n"
               );
             });
           }
@@ -456,7 +441,7 @@ export function registerFederatedTools(
               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`,
+                  `Files: ${r.files.slice(0, 5).join(", ")}${r.files.length > 5 ? ` (+${r.files.length - 5} more)` : ""}\n`
               );
             });
           }
@@ -470,7 +455,7 @@ export function registerFederatedTools(
                 .map((commit) => `  - ${commit.shortHash}: ${commit.subject}`)
                 .join("\n");
               sections.push(
-                `**${c.codeResult.filePath}:${c.codeResult.startLine}** modified by:\n${commits}\n`,
+                `**${c.codeResult.filePath}:${c.codeResult.startLine}** modified by:\n${commits}\n`
               );
             });
           }
@@ -496,8 +481,8 @@ export function registerFederatedTools(
             isError: true,
           };
         }
-      },
-    ),
+      }
+    )
   );
 
   // federated_search
@@ -511,77 +496,72 @@ export function registerFederatedTools(
         "Supports code-only, git-only, or combined search modes.",
       inputSchema: schemas.FederatedSearchSchema,
     },
-    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).`,
-                },
-              ],
-            };
-          }
-
-          // 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).`,
-          );
+    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,
+        });
 
-          return {
-            content: [{ type: "text", text: sections.join("\n") }],
-          };
-        } catch (error) {
+        if (response.results.length === 0) {
           return {
             content: [
               {
                 type: "text",
-                text: `Error: ${error instanceof Error ? error.message : String(error)}`,
+                text: `No results found for query "${query}" across ${paths.length} repository(ies).`,
               },
             ],
-            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,
+        };
+      }
+    })
   );
 }

package/src/tools/git-history.ts

@@ -3,8 +3,8 @@
  */
 
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import logger from "../logger.js";
 import type { GitHistoryIndexer } from "../git/indexer.js";
+import logger from "../logger.js";
 import { withToolLogging } from "./logging.js";
 import * as schemas from "./schemas.js";
 
@@ -14,10 +14,7 @@ export interface GitHistoryToolDependencies {
   gitHistoryIndexer: GitHistoryIndexer;
 }
 
-export function registerGitHistoryTools(
-  server: McpServer,
-  deps: GitHistoryToolDependencies,
-): void {
+export function registerGitHistoryTools(server: McpServer, deps: GitHistoryToolDependencies): void {
   const { gitHistoryIndexer } = deps;
 
   // index_git_history
@@ -32,20 +29,14 @@ export function registerGitHistoryTools(
     withToolLogging(
       "index_git_history",
       async ({ path, forceReindex, sinceDate, maxCommits }, extra) => {
-        log.info(
-          { tool: "index_git_history", path, forceReindex },
-          "Tool called",
-        );
+        log.info({ tool: "index_git_history", path, forceReindex }, "Tool called");
         const progressToken = extra._meta?.progressToken;
 
         const stats = await gitHistoryIndexer.indexHistory(
           path,
           { forceReindex, sinceDate, maxCommits },
           (progress) => {
-            log.debug(
-              { phase: progress.phase, percentage: progress.percentage },
-              progress.message,
-            );
+            log.debug({ phase: progress.phase, percentage: progress.percentage }, progress.message);
             if (progressToken !== undefined) {
               extra.sendNotification({
                 method: "notifications/progress",
@@ -57,7 +48,7 @@ export function registerGitHistoryTools(
                 },
               });
             }
-          },
+          }
         );
 
         let statusMessage = `Indexed ${stats.commitsIndexed}/${stats.commitsScanned} commits (${stats.chunksCreated} chunks) in ${(stats.durationMs / 1000).toFixed(1)}s`;
@@ -72,8 +63,8 @@ export function registerGitHistoryTools(
           content: [{ type: "text", text: statusMessage }],
           isError: stats.status === "failed",
         };
-      },
-    ),
+      }
+    )
   );
 
   // search_git_history
@@ -87,18 +78,10 @@ export function registerGitHistoryTools(
     },
     withToolLogging(
       "search_git_history",
-      async ({
-        path,
-        query,
-        limit,
-        commitTypes,
-        authors,
-        dateFrom,
-        dateTo,
-      }) => {
+      async ({ path, query, limit, commitTypes, authors, dateFrom, dateTo }) => {
         log.info(
           { tool: "search_git_history", path, query: query.substring(0, 80) },
-          "Tool called",
+          "Tool called"
         );
         const results = await gitHistoryIndexer.searchHistory(path, query, {
           limit,
@@ -110,9 +93,7 @@ export function registerGitHistoryTools(
 
         if (results.length === 0) {
           return {
-            content: [
-              { type: "text", text: `No results found for query: "${query}"` },
-            ],
+            content: [{ type: "text", text: `No results found for query: "${query}"` }],
           };
         }
 
@@ -127,7 +108,7 @@ export function registerGitHistoryTools(
               `Date: ${r.date.split("T")[0]}\n` +
               `Subject: ${r.subject}\n` +
               `Files: ${r.files.slice(0, 5).join(", ")}${r.files.length > 5 ? ` (+${r.files.length - 5} more)` : ""}\n\n` +
-              `${r.content.substring(0, 500)}${r.content.length > 500 ? "..." : ""}\n`,
+              `${r.content.substring(0, 500)}${r.content.length > 500 ? "..." : ""}\n`
           )
           .join("\n");
 
@@ -139,8 +120,8 @@ export function registerGitHistoryTools(
             },
           ],
         };
-      },
-    ),
+      }
+    )
   );
 
   // index_new_commits
@@ -156,26 +137,20 @@ export function registerGitHistoryTools(
       log.info({ tool: "index_new_commits", path }, "Tool called");
       const progressToken = extra._meta?.progressToken;
 
-      const stats = await gitHistoryIndexer.indexNewCommits(
-        path,
-        (progress) => {
-          log.debug(
-            { phase: progress.phase, percentage: progress.percentage },
-            progress.message,
-          );
-          if (progressToken !== undefined) {
-            extra.sendNotification({
-              method: "notifications/progress",
-              params: {
-                progressToken,
-                progress: progress.percentage,
-                total: 100,
-                message: `[${progress.phase}] ${progress.message}`,
-              },
-            });
-          }
-        },
-      );
+      const stats = await gitHistoryIndexer.indexNewCommits(path, (progress) => {
+        log.debug({ phase: progress.phase, percentage: progress.percentage }, progress.message);
+        if (progressToken !== undefined) {
+          extra.sendNotification({
+            method: "notifications/progress",
+            params: {
+              progressToken,
+              progress: progress.percentage,
+              total: 100,
+              message: `[${progress.phase}] ${progress.message}`,
+            },
+          });
+        }
+      });
 
       let message: string;
       if (stats.newCommits === 0) {
@@ -189,7 +164,7 @@ export function registerGitHistoryTools(
       return {
         content: [{ type: "text", text: message }],
       };
-    }),
+    })
   );
 
   // get_git_index_status
@@ -197,8 +172,7 @@ export function registerGitHistoryTools(
     "get_git_index_status",
     {
       title: "Get Git Index Status",
-      description:
-        "Get the indexing status and statistics for a repository's git history index.",
+      description: "Get the indexing status and statistics for a repository's git history index.",
       inputSchema: schemas.GetGitIndexStatusSchema,
     },
     withToolLogging("get_git_index_status", async ({ path }) => {
@@ -240,7 +214,7 @@ export function registerGitHistoryTools(
       return {
         content: [{ type: "text", text: JSON.stringify(statusInfo, null, 2) }],
       };
-    }),
+    })
   );
 
   // clear_git_index
@@ -256,10 +230,8 @@ export function registerGitHistoryTools(
       log.info({ tool: "clear_git_index", path }, "Tool called");
       await gitHistoryIndexer.clearIndex(path);
       return {
-        content: [
-          { type: "text", text: `Git history index cleared for "${path}".` },
-        ],
+        content: [{ type: "text", text: `Git history index cleared for "${path}".` }],
       };
-    }),
+    })
   );
 }

package/src/tools/index.ts

@@ -24,10 +24,7 @@ export interface ToolDependencies {
 /**
  * Register all MCP tools on the server
  */
-export function registerAllTools(
-  server: McpServer,
-  deps: ToolDependencies,
-): void {
+export function registerAllTools(server: McpServer, deps: ToolDependencies): void {
   registerCollectionTools(server, {
     qdrant: deps.qdrant,
     embeddings: deps.embeddings,

package/src/tools/logging.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { withToolLogging } from "./logging.js";
 
 vi.mock("../logger.js", () => ({
@@ -45,7 +45,7 @@ describe("withToolLogging", () => {
         tool: "create_collection",
         durationMs: expect.any(Number),
       }),
-      "Tool completed",
+      "Tool completed"
     );
   });
 
@@ -65,7 +65,7 @@ describe("withToolLogging", () => {
         durationMs: expect.any(Number),
         error: "Error: Collection not found",
       }),
-      "Tool failed",
+      "Tool failed"
     );
     expect(mockLog.info).not.toHaveBeenCalled();
   });
@@ -83,7 +83,7 @@ describe("withToolLogging", () => {
         durationMs: expect.any(Number),
         err: testError,
       }),
-      "Tool threw an error",
+      "Tool threw an error"
     );
   });
 
@@ -100,7 +100,7 @@ describe("withToolLogging", () => {
         tool: "semantic_search",
         durationMs: expect.any(Number),
       }),
-      "Tool completed with no results",
+      "Tool completed with no results"
     );
     expect(mockLog.info).not.toHaveBeenCalled();
   });
@@ -115,7 +115,7 @@ describe("withToolLogging", () => {
 
     expect(mockLog.warn).toHaveBeenCalledWith(
       expect.objectContaining({ tool: "hybrid_search" }),
-      "Tool completed with no results",
+      "Tool completed with no results"
     );
   });
 
@@ -129,7 +129,7 @@ describe("withToolLogging", () => {
 
     expect(mockLog.warn).toHaveBeenCalledWith(
       expect.objectContaining({ tool: "search_code" }),
-      "Tool completed with no results",
+      "Tool completed with no results"
     );
   });
 
@@ -144,7 +144,7 @@ describe("withToolLogging", () => {
     // Should log info, not warn, because get_index_status is not a search tool
     expect(mockLog.info).toHaveBeenCalledWith(
       expect.objectContaining({ tool: "get_index_status" }),
-      "Tool completed",
+      "Tool completed"
     );
     expect(mockLog.warn).not.toHaveBeenCalled();
   });
@@ -159,7 +159,7 @@ describe("withToolLogging", () => {
 
     expect(mockLog.info).toHaveBeenCalledWith(
       expect.objectContaining({ tool: "search_code" }),
-      "Tool completed",
+      "Tool completed"
     );
     expect(mockLog.warn).not.toHaveBeenCalled();
   });
@@ -200,7 +200,7 @@ describe("withToolLogging", () => {
 
     expect(mockLog.warn).toHaveBeenCalledWith(
       expect.objectContaining({ tool: "search_git_history" }),
-      "Tool completed with no results",
+      "Tool completed with no results"
     );
   });
 });

package/src/tools/logging.ts

@@ -29,9 +29,7 @@ function isEmptySearchResult(result: CallToolResult): boolean {
   if (first.type === "text") {
     const text = (first as { type: "text"; text: string }).text;
     return (
-      text.startsWith("No results found") ||
-      text === "[]" ||
-      text.includes("Found 0 result(s)")
+      text.startsWith("No results found") || text === "[]" || text.includes("Found 0 result(s)")
     );
   }
   return false;
@@ -44,9 +42,10 @@ function isEmptySearchResult(result: CallToolResult): boolean {
  * - Logs "Tool completed with no results" at warn level for search tools
  * - Logs "Tool threw an error" at error level when handler throws (re-throws)
  */
-export function withToolLogging<
-  T extends (...args: any[]) => Promise<CallToolResult>,
->(toolName: string, handler: T): T {
+export function withToolLogging<T extends (...args: any[]) => Promise<CallToolResult>>(
+  toolName: string,
+  handler: T
+): T {
   const wrapped = async (...args: Parameters<T>): Promise<CallToolResult> => {
     const startTime = Date.now();
     try {
@@ -58,15 +57,9 @@ export function withToolLogging<
           result.content?.[0]?.type === "text"
             ? (result.content[0] as { type: "text"; text: string }).text
             : "Unknown error";
-        log.error(
-          { tool: toolName, durationMs, error: errorText },
-          "Tool failed",
-        );
+        log.error({ tool: toolName, durationMs, error: errorText }, "Tool failed");
       } else if (SEARCH_TOOLS.has(toolName) && isEmptySearchResult(result)) {
-        log.warn(
-          { tool: toolName, durationMs },
-          "Tool completed with no results",
-        );
+        log.warn({ tool: toolName, durationMs }, "Tool completed with no results");
       } else {
         log.info({ tool: toolName, durationMs }, "Tool completed");
       }
@@ -74,10 +67,7 @@ export function withToolLogging<
       return result;
     } catch (error) {
       const durationMs = Date.now() - startTime;
-      log.error(
-        { tool: toolName, durationMs, err: error },
-        "Tool threw an error",
-      );
+      log.error({ tool: toolName, durationMs, err: error }, "Tool threw an error");
       throw error;
     }
   };