fix(memory): keep keyword search available when embeddings time out

Author: virattt

src/memory/embeddings.ts

@@ -7,9 +7,26 @@ const DEFAULT_OPENAI_MODEL = 'text-embedding-3-small';
 const DEFAULT_GEMINI_MODEL = 'gemini-embedding-001';
 const DEFAULT_OLLAMA_MODEL = 'nomic-embed-text';
 const EMBEDDING_BATCH_SIZE = 64;
+const EMBEDDING_TIMEOUT_MS = 15_000;
 
 type ResolvedProvider = Exclude<EmbeddingProviderId, 'auto' | 'none'>;
 
+function withTimeout<T>(promise: Promise<T>, ms: number, message: string): Promise<T> {
+  return new Promise<T>((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error(message)), ms);
+    promise.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (error) => {
+        clearTimeout(timer);
+        reject(error);
+      },
+    );
+  });
+}
+
 function resolveProvider(preferred: EmbeddingProviderId): ResolvedProvider | null {
   if (preferred === 'openai' && process.env.OPENAI_API_KEY) {
     return 'openai';
@@ -43,7 +60,7 @@ async function embedInBatches(
   const vectors: number[][] = [];
   for (let i = 0; i < texts.length; i += EMBEDDING_BATCH_SIZE) {
     const batch = texts.slice(i, i + EMBEDDING_BATCH_SIZE);
-    const result = await embedBatch(batch);
+    const result = await withTimeout(embedBatch(batch), EMBEDDING_TIMEOUT_MS, 'Embedding API timed out');
     vectors.push(...result);
   }
   return vectors;
@@ -106,6 +123,6 @@ export async function embedSingleQuery(
   if (!client) {
     return null;
   }
-  const vectors = await client.embed([query]);
+  const vectors = await withTimeout(client.embed([query]), EMBEDDING_TIMEOUT_MS, 'Embedding query timed out');
   return vectors[0] ?? null;
 }

src/memory/index.ts

@@ -87,25 +87,32 @@ export class MemoryManager {
 
     try {
       this.db = await MemoryDatabase.create(`${this.store.getMemoryDir()}/index.sqlite`);
-      const fingerprint = client ? `${client.provider}:${client.model}` : 'none:none';
-      if (this.db.getProviderFingerprint() !== fingerprint) {
-        this.db.clearEmbeddings();
-        this.db.setProviderFingerprint(fingerprint);
-      }
-
-      this.indexer = new MemoryIndexer(this.store, this.db, {
-        chunkTokens: this.config.chunkTokens,
-        overlapTokens: this.config.chunkOverlapTokens,
-        watchDebounceMs: this.config.watchDebounceMs,
-        embeddingClient: client,
-        indexSessions: this.config.indexSessions,
-      });
-      this.indexer.startWatching();
-      await this.indexer.sync({ force: false });
     } catch (error) {
       this.initError = error instanceof Error ? error.message : String(error);
       this.db = null;
       this.indexer = null;
+      return;
+    }
+
+    const fingerprint = client ? `${client.provider}:${client.model}` : 'none:none';
+    if (this.db.getProviderFingerprint() !== fingerprint) {
+      this.db.clearEmbeddings();
+      this.db.setProviderFingerprint(fingerprint);
+    }
+
+    this.indexer = new MemoryIndexer(this.store, this.db, {
+      chunkTokens: this.config.chunkTokens,
+      overlapTokens: this.config.chunkOverlapTokens,
+      watchDebounceMs: this.config.watchDebounceMs,
+      embeddingClient: client,
+      indexSessions: this.config.indexSessions,
+    });
+    this.indexer.startWatching();
+
+    try {
+      await this.indexer.sync({ force: false });
+    } catch (error) {
+      this.initError = error instanceof Error ? error.message : String(error);
     }
   }