@mhalder/qdrant-mcp-server 3.2.1 → 3.3.0

package/src/embeddings/ollama.test.ts

@@ -4,6 +4,18 @@ import { OllamaEmbeddings } from "./ollama.js";
 // Mock fetch globally
 global.fetch = vi.fn();
 
+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("OllamaEmbeddings", () => {
   let embeddings: OllamaEmbeddings;
   let mockFetch: any;

package/src/embeddings/ollama.ts

@@ -1,4 +1,5 @@
 import Bottleneck from "bottleneck";
+import logger from "../logger.js";
 import { EmbeddingProvider, EmbeddingResult, RateLimitConfig } from "./base.js";
 
 interface OllamaError {
@@ -11,6 +12,7 @@ interface OllamaEmbedResponse {
 }
 
 export class OllamaEmbeddings implements EmbeddingProvider {
+  private log = logger.child({ component: "embeddings", provider: "ollama" });
   private model: string;
   private dimensions: number;
   private limiter: Bottleneck;
@@ -76,8 +78,13 @@ export class OllamaEmbeddings implements EmbeddingProvider {
       if (isRateLimitError && attempt < this.retryAttempts) {
         const delayMs = this.retryDelayMs * Math.pow(2, attempt);
         const waitTimeSeconds = (delayMs / 1000).toFixed(1);
-        console.error(
-          `Rate limit reached. Retrying in ${waitTimeSeconds}s (attempt ${attempt + 1}/${this.retryAttempts})...`,
+        this.log.warn(
+          {
+            waitTimeSeconds,
+            attempt: attempt + 1,
+            maxAttempts: this.retryAttempts,
+          },
+          "Rate limit reached, retrying",
         );
 
         await new Promise((resolve) => setTimeout(resolve, delayMs));
@@ -169,6 +176,7 @@ export class OllamaEmbeddings implements EmbeddingProvider {
   }
 
   async embedBatch(texts: string[]): Promise<EmbeddingResult[]> {
+    this.log.debug({ batchSize: texts.length }, "embedBatch");
     // Ollama doesn't support batch embeddings natively, so we process in parallel
     // Process in chunks to avoid overwhelming Ollama and prevent memory issues
     const CHUNK_SIZE = 50;

package/src/embeddings/openai.test.ts

@@ -14,6 +14,18 @@ vi.mock("openai", () => ({
   }),
 }));
 
+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("OpenAIEmbeddings", () => {
   let embeddings: OpenAIEmbeddings;
 

package/src/embeddings/openai.ts

@@ -1,5 +1,6 @@
 import OpenAI from "openai";
 import Bottleneck from "bottleneck";
+import logger from "../logger.js";
 import {
   EmbeddingProvider,
   EmbeddingResult,
@@ -18,6 +19,7 @@ interface OpenAIError {
 }
 
 export class OpenAIEmbeddings implements EmbeddingProvider {
+  private log = logger.child({ component: "embeddings", provider: "openai" });
   private client: OpenAI;
   private model: string;
   private dimensions: number;
@@ -95,8 +97,13 @@ export class OpenAIEmbeddings implements EmbeddingProvider {
         }
 
         const waitTimeSeconds = (delayMs / 1000).toFixed(1);
-        console.error(
-          `Rate limit reached. Retrying in ${waitTimeSeconds}s (attempt ${attempt + 1}/${this.retryAttempts})...`,
+        this.log.warn(
+          {
+            waitTimeSeconds,
+            attempt: attempt + 1,
+            maxAttempts: this.retryAttempts,
+          },
+          "Rate limit reached, retrying",
         );
 
         await new Promise((resolve) => setTimeout(resolve, delayMs));
@@ -132,6 +139,7 @@ export class OpenAIEmbeddings implements EmbeddingProvider {
   }
 
   async embedBatch(texts: string[]): Promise<EmbeddingResult[]> {
+    this.log.debug({ batchSize: texts.length }, "embedBatch");
     return this.limiter.schedule(() =>
       this.retryWithBackoff(async () => {
         const response = await this.client.embeddings.create({

package/src/embeddings/voyage.test.ts

@@ -4,6 +4,18 @@ import { VoyageEmbeddings } from "./voyage.js";
 // Mock fetch globally
 global.fetch = vi.fn();
 
+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("VoyageEmbeddings", () => {
   let embeddings: VoyageEmbeddings;
   let mockFetch: any;

package/src/embeddings/voyage.ts

@@ -1,4 +1,5 @@
 import Bottleneck from "bottleneck";
+import logger from "../logger.js";
 import { EmbeddingProvider, EmbeddingResult, RateLimitConfig } from "./base.js";
 
 interface VoyageError {
@@ -15,6 +16,7 @@ interface VoyageEmbedResponse {
 }
 
 export class VoyageEmbeddings implements EmbeddingProvider {
+  private log = logger.child({ component: "embeddings", provider: "voyage" });
   private apiKey: string;
   private model: string;
   private dimensions: number;
@@ -76,8 +78,13 @@ export class VoyageEmbeddings implements EmbeddingProvider {
       if (isRateLimitError && attempt < this.retryAttempts) {
         const delayMs = this.retryDelayMs * Math.pow(2, attempt);
         const waitTimeSeconds = (delayMs / 1000).toFixed(1);
-        console.error(
-          `Rate limit reached. Retrying in ${waitTimeSeconds}s (attempt ${attempt + 1}/${this.retryAttempts})...`,
+        this.log.warn(
+          {
+            waitTimeSeconds,
+            attempt: attempt + 1,
+            maxAttempts: this.retryAttempts,
+          },
+          "Rate limit reached, retrying",
         );
 
         await new Promise((resolve) => setTimeout(resolve, delayMs));
@@ -142,6 +149,7 @@ export class VoyageEmbeddings implements EmbeddingProvider {
   }
 
   async embedBatch(texts: string[]): Promise<EmbeddingResult[]> {
+    this.log.debug({ batchSize: texts.length }, "embedBatch");
     return this.limiter.schedule(() =>
       this.retryWithBackoff(async () => {
         const response = await this.callApi(texts);

package/src/git/indexer.test.ts

@@ -76,6 +76,18 @@ vi.mock("node:fs", () => ({
   },
 }));
 
+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("GitHistoryIndexer", () => {
   let indexer: GitHistoryIndexer;
   let mockQdrant: any;
@@ -622,10 +634,6 @@ describe("GitHistoryIndexer", () => {
     });
 
     it("should handle snapshot save failure gracefully", async () => {
-      const consoleSpy = vi
-        .spyOn(console, "error")
-        .mockImplementation(() => {});
-
       const mockCommits = [
         {
           hash: "abc123",
@@ -653,14 +661,12 @@ describe("GitHistoryIndexer", () => {
 
       expect(stats.status).toBe("completed");
       expect(stats.errors?.some((e) => e.includes("Snapshot"))).toBe(true);
-
-      consoleSpy.mockRestore();
     });
 
     it("should handle storeIndexingMarker errors silently", async () => {
-      const consoleSpy = vi
-        .spyOn(console, "error")
-        .mockImplementation(() => {});
+      const loggerMod = await import("../logger.js");
+      const logError = loggerMod.default.error as ReturnType<typeof vi.fn>;
+      logError.mockClear();
 
       mockExtractorInstance.validateRepository.mockResolvedValue(true);
       mockExtractorInstance.getLatestCommitHash.mockResolvedValue("abc123");
@@ -670,9 +676,7 @@ describe("GitHistoryIndexer", () => {
       const stats = await indexer.indexHistory("/test/repo");
 
       expect(stats.status).toBe("completed");
-      expect(consoleSpy).toHaveBeenCalled();
-
-      consoleSpy.mockRestore();
+      expect(logError).toHaveBeenCalled();
     });
 
     it("should use hybrid search for indexing when enabled", async () => {
@@ -1072,7 +1076,9 @@ describe("GitHistoryIndexer", () => {
       mockChunkerInstance.generateChunkId.mockReturnValue("chunk-1");
 
       // All retries fail
-      mockEmbeddings.embedBatch.mockRejectedValue(new Error("Persistent error"));
+      mockEmbeddings.embedBatch.mockRejectedValue(
+        new Error("Persistent error"),
+      );
 
       mockQdrant.collectionExists.mockResolvedValue(false);
       mockQdrant.getCollectionInfo.mockResolvedValue({ hybridEnabled: false });
@@ -1081,9 +1087,9 @@ describe("GitHistoryIndexer", () => {
 
       expect(stats.status).toBe("partial");
       expect(stats.errors).toBeDefined();
-      expect(
-        stats.errors?.some((e) => e.includes("after 3 attempts")),
-      ).toBe(true);
+      expect(stats.errors?.some((e) => e.includes("after 3 attempts"))).toBe(
+        true,
+      );
     });
   });
 });

package/src/git/indexer.ts

@@ -5,6 +5,7 @@
 import { createHash } from "node:crypto";
 import { promises as fs } from "node:fs";
 import { resolve } from "node:path";
+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";
@@ -25,6 +26,8 @@ import type {
 } from "./types.js";
 
 export class GitHistoryIndexer {
+  private log = logger.child({ component: "git-indexer" });
+
   constructor(
     private qdrant: QdrantManager,
     private embeddings: EmbeddingProvider,
@@ -66,6 +69,11 @@ export class GitHistoryIndexer {
     const absolutePath = await this.validatePath(path);
     const collectionName = await this.getCollectionName(absolutePath);
 
+    this.log.info(
+      { path: absolutePath, collectionName },
+      "Git indexing started",
+    );
+
     try {
       // 1. Validate repository
       const extractor = new GitExtractor(absolutePath, this.config);
@@ -119,6 +127,7 @@ export class GitHistoryIndexer {
       });
 
       stats.commitsScanned = commits.length;
+      this.log.info({ commitsExtracted: commits.length }, "Commits extracted");
 
       if (commits.length === 0) {
         await this.storeIndexingMarker(collectionName, true);
@@ -175,6 +184,10 @@ export class GitHistoryIndexer {
 
       // 5. Generate embeddings and store in batches
       const batchSize = this.config.batchSize;
+      this.log.debug(
+        { totalChunks: allChunks.length, batchSize },
+        "Starting embedding generation",
+      );
       for (let i = 0; i < allChunks.length; i += batchSize) {
         const batch = allChunks.slice(i, i + batchSize);
 
@@ -232,7 +245,9 @@ export class GitHistoryIndexer {
               const sparseGenerator = new BM25SparseVectorGenerator();
               const hybridPoints = points.map((point, idx) => ({
                 ...point,
-                sparseVector: sparseGenerator.generate(batch[idx].chunk.content),
+                sparseVector: sparseGenerator.generate(
+                  batch[idx].chunk.content,
+                ),
               }));
               await this.qdrant.addPointsWithSparse(
                 collectionName,
@@ -245,7 +260,8 @@ export class GitHistoryIndexer {
             success = true;
             break;
           } catch (error) {
-            lastError = error instanceof Error ? error : new Error(String(error));
+            lastError =
+              error instanceof Error ? error : new Error(String(error));
             if (attempt < this.config.batchRetryAttempts) {
               // Exponential backoff: 1s, 2s, 4s...
               const delay = Math.pow(2, attempt - 1) * 1000;
@@ -270,7 +286,7 @@ export class GitHistoryIndexer {
       } catch (error) {
         const errorMessage =
           error instanceof Error ? error.message : String(error);
-        console.error("Failed to save snapshot:", errorMessage);
+        this.log.error({ err: error }, "Failed to save snapshot");
         stats.errors?.push(`Snapshot save failed: ${errorMessage}`);
       }
 
@@ -278,6 +294,14 @@ export class GitHistoryIndexer {
       await this.storeIndexingMarker(collectionName, true);
 
       stats.durationMs = Date.now() - startTime;
+      this.log.info(
+        {
+          commitsIndexed: stats.commitsIndexed,
+          chunksCreated: stats.chunksCreated,
+          durationMs: stats.durationMs,
+        },
+        "Git indexing complete",
+      );
       return stats;
     } catch (error) {
       const errorMessage =
@@ -509,6 +533,7 @@ export class GitHistoryIndexer {
     });
 
     stats.newCommits = newCommits.length;
+    this.log.info({ newCommits: newCommits.length }, "New commits found");
 
     if (newCommits.length === 0) {
       stats.durationMs = Date.now() - startTime;
@@ -612,6 +637,7 @@ export class GitHistoryIndexer {
    * Clear all indexed data for a repository
    */
   async clearIndex(path: string): Promise<void> {
+    this.log.info({ path }, "Clearing git index");
     const absolutePath = await this.validatePath(path);
     const collectionName = await this.getCollectionName(absolutePath);
     const exists = await this.qdrant.collectionExists(collectionName);
@@ -670,7 +696,7 @@ export class GitHistoryIndexer {
         ]);
       }
     } catch (error) {
-      console.error("Failed to store indexing marker:", error);
+      this.log.error({ err: error }, "Failed to store indexing marker");
     }
   }