feat: Implement Ollama-powered embedding engine with adaptive input handling, caching, and process shutdown hooks.

Author: ForLoopCodes

src/core/embedding-tracker.ts

@@ -25,7 +25,8 @@ export interface EmbeddingTrackerControllerOptions extends EmbeddingTrackerOptio
 const MIN_FILES_PER_TICK = 5;
 const MAX_FILES_PER_TICK = 10;
 const DEFAULT_FILES_PER_TICK = 8;
-const DEFAULT_DEBOUNCE_MS = 700;
+const DEFAULT_DEBOUNCE_MS = 1500;
+const MAX_PENDING_FILES = 50;
 
 const IGNORE_PREFIXES = [
   ".mcp_data/",
@@ -52,7 +53,7 @@ function clampFilesPerTick(value: number | undefined): number {
 
 function clampDebounceMs(value: number | undefined): number {
   if (!Number.isFinite(value)) return DEFAULT_DEBOUNCE_MS;
-  return Math.max(100, Math.floor(value ?? DEFAULT_DEBOUNCE_MS));
+  return Math.max(500, Math.floor(value ?? DEFAULT_DEBOUNCE_MS));
 }
 
 export function parseEmbeddingTrackerMode(value: string | undefined): "off" | "lazy" | "eager" {
@@ -78,6 +79,7 @@ export function startEmbeddingTracker(options: EmbeddingTrackerOptions): () => v
     timer = setTimeout(() => {
       void flushPending();
     }, delay);
+    timer.unref();
   };
 
   const flushPending = async (): Promise<void> => {
@@ -111,6 +113,7 @@ export function startEmbeddingTracker(options: EmbeddingTrackerOptions): () => v
       if (closed || !fileName) return;
       const relativePath = normalizeRelativePath(String(fileName));
       if (!shouldTrack(relativePath)) return;
+      if (pendingFiles.size >= MAX_PENDING_FILES) return;
       pendingFiles.add(relativePath);
       schedule();
     });

src/core/embeddings.ts

@@ -5,6 +5,14 @@ import { Ollama } from "ollama";
 import { readFile, writeFile, mkdir } from "fs/promises";
 import { join } from "path";
 
+const EMBED_TIMEOUT_MS = 60_000;
+let embedAbortController = new AbortController();
+
+export function cancelAllEmbeddings(): void {
+  embedAbortController.abort();
+  embedAbortController = new AbortController();
+}
+
 export interface SearchDocument {
   path: string;
   header: string;
@@ -120,6 +128,12 @@ function buildEmbedRequest(input: string[]): { model: string; input: string[]; o
   return options ? { model: EMBED_MODEL, input, options } : { model: EMBED_MODEL, input };
 }
 
+async function embedWithTimeout(request: ReturnType<typeof buildEmbedRequest>): Promise<{ embeddings: number[][] }> {
+  const timeoutCtrl = AbortSignal.timeout(EMBED_TIMEOUT_MS);
+  const signal = AbortSignal.any([embedAbortController.signal, timeoutCtrl]);
+  return ollama.embed({ ...request, signal } as Parameters<typeof ollama.embed>[0]);
+}
+
 export function getEmbeddingBatchSize(): number {
   const requested = toIntegerOr(process.env.CONTEXTPLUS_EMBED_BATCH_SIZE, DEFAULT_EMBED_BATCH_SIZE);
   return Math.min(MAX_EMBED_BATCH_SIZE, Math.max(MIN_EMBED_BATCH_SIZE, requested));
@@ -153,7 +167,7 @@ async function embedSingleAdaptive(input: string): Promise<number[]> {
 
   for (let attempt = 0; attempt <= MAX_SINGLE_INPUT_RETRIES; attempt++) {
     try {
-      const response = await ollama.embed(buildEmbedRequest([candidate]));
+      const response = await embedWithTimeout(buildEmbedRequest([candidate]));
       if (!response.embeddings[0]) throw new Error("Missing embedding vector in Ollama response");
       return response.embeddings[0];
     } catch (error) {
@@ -169,7 +183,7 @@ async function embedSingleAdaptive(input: string): Promise<number[]> {
 
 async function embedBatchAdaptive(batch: string[]): Promise<number[][]> {
   try {
-    const response = await ollama.embed(buildEmbedRequest(batch));
+    const response = await embedWithTimeout(buildEmbedRequest(batch));
     if (response.embeddings.length !== batch.length) {
       throw new Error(`Embedding response size mismatch: expected ${batch.length}, got ${response.embeddings.length}`);
     }

src/core/process-lifecycle.ts

@@ -12,6 +12,7 @@ const DEFAULT_PARENT_POLL_MS = 5 * 1000;
 const MIN_PARENT_POLL_MS = 1 * 1000;
 
 export interface CleanupOptions {
+  cancelEmbeddings?: () => void;
   stopTracker: () => void;
   closeServer: () => Promise<void> | void;
   closeTransport: () => Promise<void> | void;
@@ -133,6 +134,7 @@ export function startParentMonitor(options: ParentMonitorOptions): () => void {
 }
 
 export async function runCleanup(options: CleanupOptions): Promise<void> {
+  options.cancelEmbeddings?.();
   options.stopMonitors?.();
   options.stopTracker();
   await Promise.allSettled([

src/index.ts

@@ -11,7 +11,7 @@ import { createEmbeddingTrackerController } from "./core/embedding-tracker.js";
 import { createIdleMonitor, getIdleShutdownMs, getParentPollMs, isBrokenPipeError, runCleanup, startParentMonitor } from "./core/process-lifecycle.js";
 import { getContextTree } from "./tools/context-tree.js";
 import { getFileSkeleton } from "./tools/file-skeleton.js";
-import { ensureMcpDataDir } from "./core/embeddings.js";
+import { ensureMcpDataDir, cancelAllEmbeddings } from "./core/embeddings.js";
 import { semanticCodeSearch, invalidateSearchCache } from "./tools/semantic-search.js";
 import { semanticIdentifierSearch, invalidateIdentifierSearchCache } from "./tools/semantic-identifiers.js";
 import { getBlastRadius } from "./tools/blast-radius.js";
@@ -571,6 +571,7 @@ async function main() {
     shuttingDown = true;
     console.error(`Context+ MCP shutdown requested: ${reason}`);
     await runCleanup({
+      cancelEmbeddings: cancelAllEmbeddings,
       stopTracker: trackerController.stop,
       closeServer,
       closeTransport,