kontext-engine 0.1.4 → 0.1.5

package/dist/cli/index.js

@@ -779,6 +779,25 @@ function prepareChunkText(filePath, parent, text) {
   parts.push(text);
   return parts.join("\n");
 }
+var MAX_RETRIES = 3;
+var BASE_DELAY_MS = 500;
+async function fetchWithRetry(url, init) {
+  let lastError = null;
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+    const response = await fetch(url, init);
+    if (response.ok) return response;
+    if (response.status === 429 && attempt < MAX_RETRIES) {
+      const delay = BASE_DELAY_MS * Math.pow(2, attempt);
+      await new Promise((resolve) => setTimeout(resolve, delay));
+      lastError = new Error(`HTTP ${response.status}: ${response.statusText}`);
+      continue;
+    }
+    throw new Error(
+      `Embedding API error: HTTP ${response.status} ${response.statusText}`
+    );
+  }
+  throw lastError ?? new Error("Embedding API request failed after retries");
+}
 var LOCAL_MODEL_ID = "Xenova/all-MiniLM-L6-v2";
 var LOCAL_DIMENSIONS = 384;
 var LOCAL_BATCH_SIZE = 32;
@@ -836,6 +855,87 @@ async function createLocalEmbedder() {
     }
   };
 }
+var VOYAGE_API_URL = "https://api.voyageai.com/v1/embeddings";
+var VOYAGE_MODEL = "voyage-code-3";
+var VOYAGE_DEFAULT_DIMENSIONS = 1024;
+var VOYAGE_BATCH_SIZE = 128;
+function createVoyageEmbedder(apiKey, dimensions = VOYAGE_DEFAULT_DIMENSIONS) {
+  return {
+    name: VOYAGE_MODEL,
+    dimensions,
+    async embed(texts, onProgress) {
+      const results = [];
+      for (let i = 0; i < texts.length; i += VOYAGE_BATCH_SIZE) {
+        const batch = texts.slice(i, i + VOYAGE_BATCH_SIZE);
+        const vectors = await callVoyageAPI(apiKey, batch, "document", dimensions);
+        results.push(...vectors);
+        onProgress?.(Math.min(i + batch.length, texts.length), texts.length);
+      }
+      return results;
+    },
+    async embedSingle(text) {
+      const vectors = await callVoyageAPI(apiKey, [text], "query", dimensions);
+      return vectors[0];
+    }
+  };
+}
+async function callVoyageAPI(apiKey, texts, inputType, dimensions) {
+  const response = await fetchWithRetry(VOYAGE_API_URL, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${apiKey}`
+    },
+    body: JSON.stringify({
+      model: VOYAGE_MODEL,
+      input: texts,
+      input_type: inputType,
+      output_dimension: dimensions
+    })
+  });
+  const json = await response.json();
+  return json.data.map((d) => normalizeVector(new Float32Array(d.embedding)));
+}
+var OPENAI_API_URL = "https://api.openai.com/v1/embeddings";
+var OPENAI_MODEL = "text-embedding-3-large";
+var OPENAI_DEFAULT_DIMENSIONS = 1024;
+var OPENAI_BATCH_SIZE = 128;
+function createOpenAIEmbedder(apiKey, dimensions = OPENAI_DEFAULT_DIMENSIONS) {
+  return {
+    name: OPENAI_MODEL,
+    dimensions,
+    async embed(texts, onProgress) {
+      const results = [];
+      for (let i = 0; i < texts.length; i += OPENAI_BATCH_SIZE) {
+        const batch = texts.slice(i, i + OPENAI_BATCH_SIZE);
+        const vectors = await callOpenAIAPI(apiKey, batch, dimensions);
+        results.push(...vectors);
+        onProgress?.(Math.min(i + batch.length, texts.length), texts.length);
+      }
+      return results;
+    },
+    async embedSingle(text) {
+      const vectors = await callOpenAIAPI(apiKey, [text], dimensions);
+      return vectors[0];
+    }
+  };
+}
+async function callOpenAIAPI(apiKey, texts, dimensions) {
+  const response = await fetchWithRetry(OPENAI_API_URL, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${apiKey}`
+    },
+    body: JSON.stringify({
+      model: OPENAI_MODEL,
+      input: texts,
+      dimensions
+    })
+  });
+  const json = await response.json();
+  return json.data.map((d) => normalizeVector(new Float32Array(d.embedding)));
+}
 
 // src/utils/errors.ts
 var ErrorCode = {
@@ -877,6 +977,12 @@ var ConfigError = class extends KontextError {
     this.name = "ConfigError";
   }
 };
+var DatabaseError = class extends KontextError {
+  constructor(message, code, cause) {
+    super(message, code, cause);
+    this.name = "DatabaseError";
+  }
+};
 
 // src/utils/error-boundary.ts
 function handleCommandError(err, logger, verbose) {
@@ -1051,7 +1157,8 @@ function searchVectors(db, query, limit) {
 
 // src/storage/db.ts
 var DEFAULT_DIMENSIONS = 384;
-function createDatabase(dbPath, dimensions = DEFAULT_DIMENSIONS) {
+var VECTOR_DIMENSIONS_META_KEY = "vector_dimensions";
+function createDatabase(dbPath, dimensions) {
   const dir = path3.dirname(dbPath);
   if (!fs4.existsSync(dir)) {
     fs4.mkdirSync(dir, { recursive: true });
@@ -1060,7 +1167,8 @@ function createDatabase(dbPath, dimensions = DEFAULT_DIMENSIONS) {
   db.pragma("journal_mode = WAL");
   db.pragma("foreign_keys = ON");
   sqliteVec.load(db);
-  initializeSchema(db, dimensions);
+  initializeSchema(db, dimensions ?? DEFAULT_DIMENSIONS);
+  ensureVectorDimensions(db, dimensions);
   const stmtUpsertFile = db.prepare(`
     INSERT INTO files (path, language, hash, last_indexed, size)
     VALUES (@path, @language, @hash, @lastIndexed, @size)
@@ -1069,6 +1177,7 @@ function createDatabase(dbPath, dimensions = DEFAULT_DIMENSIONS) {
       hash = excluded.hash,
       last_indexed = excluded.last_indexed,
       size = excluded.size
+    RETURNING id
   `);
   const stmtGetFile = db.prepare(
     "SELECT id, path, language, hash, last_indexed as lastIndexed, size FROM files WHERE path = ?"
@@ -1112,18 +1221,20 @@ function createDatabase(dbPath, dimensions = DEFAULT_DIMENSIONS) {
   );
   return {
     upsertFile(file) {
-      const result = stmtUpsertFile.run({
+      const row = stmtUpsertFile.get({
         path: file.path,
         language: file.language,
         hash: file.hash,
         lastIndexed: Date.now(),
         size: file.size
       });
-      if (result.changes > 0 && result.lastInsertRowid) {
-        return Number(result.lastInsertRowid);
+      if (!row?.id) {
+        throw new DatabaseError(
+          `Failed to upsert file: ${file.path}`,
+          ErrorCode.DB_WRITE_FAILED
+        );
       }
-      const existing = stmtGetFile.get(file.path);
-      return existing?.id ?? 0;
+      return row.id;
     },
     getFile(filePath) {
       const row = stmtGetFile.get(filePath);
@@ -1166,15 +1277,17 @@ function createDatabase(dbPath, dimensions = DEFAULT_DIMENSIONS) {
       return row.lastIndexed;
     },
     deleteFile(filePath) {
-      const file = stmtGetFile.get(filePath);
-      if (file) {
-        const chunkRows = stmtGetChunkIdsByFile.all(file.id);
-        const chunkIds = chunkRows.map((r) => r.id);
-        if (chunkIds.length > 0) {
-          deleteVectorsByChunkIds(db, chunkIds);
+      db.transaction(() => {
+        const file = stmtGetFile.get(filePath);
+        if (file) {
+          const chunkRows = stmtGetChunkIdsByFile.all(file.id);
+          const chunkIds = chunkRows.map((r) => r.id);
+          if (chunkIds.length > 0) {
+            deleteVectorsByChunkIds(db, chunkIds);
+          }
         }
-      }
-      stmtDeleteFile.run(filePath);
+        stmtDeleteFile.run(filePath);
+      })();
     },
     insertChunks(fileId, chunks) {
       const ids = [];
@@ -1269,12 +1382,14 @@ function createDatabase(dbPath, dimensions = DEFAULT_DIMENSIONS) {
       }));
     },
     deleteChunksByFile(fileId) {
-      const chunkRows = stmtGetChunkIdsByFile.all(fileId);
-      const chunkIds = chunkRows.map((r) => r.id);
-      if (chunkIds.length > 0) {
-        deleteVectorsByChunkIds(db, chunkIds);
-      }
-      stmtDeleteChunksByFile.run(fileId);
+      db.transaction(() => {
+        const chunkRows = stmtGetChunkIdsByFile.all(fileId);
+        const chunkIds = chunkRows.map((r) => r.id);
+        if (chunkIds.length > 0) {
+          deleteVectorsByChunkIds(db, chunkIds);
+        }
+        stmtDeleteChunksByFile.run(fileId);
+      })();
     },
     insertDependency(sourceChunkId, targetChunkId, type) {
       stmtInsertDep.run(sourceChunkId, targetChunkId, type);
@@ -1336,6 +1451,59 @@ function getMetaVersion(db) {
     return 0;
   }
 }
+function ensureVectorDimensions(db, expectedDimensions) {
+  const actual = getExistingVectorDimensions(db);
+  const stored = db.prepare("SELECT value FROM meta WHERE key = ?").get(VECTOR_DIMENSIONS_META_KEY);
+  const storedValue = stored?.value;
+  const storedDimensions = storedValue ? Number.parseInt(storedValue, 10) : void 0;
+  if (storedDimensions !== void 0 && (!Number.isInteger(storedDimensions) || storedDimensions <= 0)) {
+    throw new DatabaseError(
+      `Invalid stored vector dimensions metadata: ${storedValue ?? "unknown"}`,
+      ErrorCode.DB_CORRUPTED
+    );
+  }
+  if (actual !== null && storedDimensions !== void 0 && storedDimensions !== actual) {
+    throw new DatabaseError(
+      `Vector dimensions metadata mismatch: meta=${storedDimensions}, table=${actual}.`,
+      ErrorCode.DB_CORRUPTED
+    );
+  }
+  if (expectedDimensions === void 0) {
+    if (storedDimensions !== void 0) return;
+    const dimensions = actual ?? DEFAULT_DIMENSIONS;
+    db.prepare(
+      "INSERT OR REPLACE INTO meta (key, value) VALUES (?, ?)"
+    ).run(VECTOR_DIMENSIONS_META_KEY, String(dimensions));
+    return;
+  }
+  if (!stored) {
+    const dimensions = actual ?? expectedDimensions;
+    db.prepare(
+      "INSERT OR REPLACE INTO meta (key, value) VALUES (?, ?)"
+    ).run(VECTOR_DIMENSIONS_META_KEY, String(dimensions));
+    if (actual !== null && actual !== expectedDimensions) {
+      throw new DatabaseError(
+        `Vector dimension mismatch: index uses ${actual} dims, but config requests ${expectedDimensions} dims. Rebuild the index.`,
+        ErrorCode.CONFIG_INVALID
+      );
+    }
+    return;
+  }
+  if (storedDimensions !== expectedDimensions) {
+    throw new DatabaseError(
+      `Vector dimension mismatch: index uses ${storedDimensions} dims, but config requests ${expectedDimensions} dims. Rebuild the index.`,
+      ErrorCode.CONFIG_INVALID
+    );
+  }
+}
+function getExistingVectorDimensions(db) {
+  const row = db.prepare("SELECT sql FROM sqlite_master WHERE name = 'chunk_vectors'").get();
+  const sql = row?.sql;
+  if (!sql) return null;
+  const match = sql.match(/embedding\s+float\[(\d+)\]/i);
+  if (!match) return null;
+  return Number.parseInt(match[1], 10);
+}
 
 // src/cli/commands/config.ts
 import fs5 from "fs";
@@ -1451,6 +1619,20 @@ function setNestedValue(obj, key, value) {
   }
   current[parts[parts.length - 1]] = value;
 }
+function hasNestedKey(obj, key) {
+  const parts = key.split(".");
+  let current = obj;
+  for (const part of parts) {
+    if (current === null || current === void 0 || typeof current !== "object") {
+      return false;
+    }
+    if (!(part in current)) {
+      return false;
+    }
+    current = current[part];
+  }
+  return true;
+}
 function parseValue(rawValue) {
   if (rawValue === "null") return null;
   if (rawValue === "true") return true;
@@ -1489,9 +1671,26 @@ function runConfigSet(projectPath, key, rawValue) {
   setNestedValue(config, key, value);
   writeConfig(ctxDir, config);
 }
-function runConfigReset(projectPath) {
+function runConfigReset(projectPath, key) {
   const ctxDir = resolveCtxDir(projectPath);
-  writeConfig(ctxDir, structuredClone(DEFAULT_CONFIG));
+  if (!key) {
+    writeConfig(ctxDir, structuredClone(DEFAULT_CONFIG));
+    return;
+  }
+  if (!hasNestedKey(DEFAULT_CONFIG, key)) {
+    throw new ConfigError(`Invalid config key: ${key}`, ErrorCode.CONFIG_INVALID);
+  }
+  const config = readConfig(ctxDir);
+  const defaultValue = getNestedValue(
+    DEFAULT_CONFIG,
+    key
+  );
+  setNestedValue(
+    config,
+    key,
+    structuredClone(defaultValue)
+  );
+  writeConfig(ctxDir, config);
 }
 function registerConfigCommand(program2) {
   const cmd = program2.command("config").description("Show or modify configuration");
@@ -1526,16 +1725,69 @@ function registerConfigCommand(program2) {
       configErrorHandler(err);
     }
   });
-  cmd.command("reset").description("Reset configuration to defaults").action(() => {
+  cmd.command("reset [key]").description("Reset configuration to defaults or reset a specific key").action((key) => {
     try {
-      runConfigReset(process.cwd());
-      console.log("Configuration reset to defaults.");
+      runConfigReset(process.cwd(), key);
+      if (key) {
+        console.log(`Reset ${key} to default.`);
+      } else {
+        console.log("Configuration reset to defaults.");
+      }
     } catch (err) {
       configErrorHandler(err);
     }
   });
 }
 
+// src/cli/embedder.ts
+function getProjectEmbedderConfig(projectPath) {
+  const { config } = runConfigShow(projectPath);
+  return config.embedder;
+}
+async function createProjectEmbedder(projectPath) {
+  const config = getProjectEmbedderConfig(projectPath);
+  validateProjectEmbedderConfig(config);
+  switch (config.provider) {
+    case "local":
+      return await createLocalEmbedder();
+    case "voyage": {
+      const apiKey = requireApiKey("CTX_VOYAGE_KEY", "voyage");
+      return createVoyageEmbedder(apiKey, config.dimensions);
+    }
+    case "openai": {
+      const apiKey = requireApiKey("CTX_OPENAI_KEY", "openai");
+      return createOpenAIEmbedder(apiKey, config.dimensions);
+    }
+    default:
+      throw new ConfigError(
+        `Unsupported embedder provider "${config.provider}". Use local, voyage, or openai.`,
+        ErrorCode.CONFIG_INVALID
+      );
+  }
+}
+function requireApiKey(envVar, provider) {
+  const value = process.env[envVar];
+  if (typeof value === "string" && value.length > 0) return value;
+  throw new ConfigError(
+    `Embedder provider "${provider}" requires ${envVar}. Export ${envVar} before running this command.`,
+    ErrorCode.CONFIG_INVALID
+  );
+}
+function validateProjectEmbedderConfig(config) {
+  if (!Number.isInteger(config.dimensions) || config.dimensions <= 0) {
+    throw new ConfigError(
+      `Invalid embedder.dimensions (${String(config.dimensions)}). Must be a positive integer.`,
+      ErrorCode.CONFIG_INVALID
+    );
+  }
+  if (config.provider === "local" && config.dimensions !== 384) {
+    throw new ConfigError(
+      'Local embedder requires "embedder.dimensions" = 384. Update config or switch provider.',
+      ErrorCode.CONFIG_INVALID
+    );
+  }
+}
+
 // src/cli/commands/init.ts
 var CTX_DIR2 = ".ctx";
 var DB_FILENAME = "index.db";
@@ -1584,8 +1836,9 @@ async function runInit(projectPath, options = {}) {
   if (!fs6.existsSync(ctxDir)) fs6.mkdirSync(ctxDir, { recursive: true });
   ensureGitignore(absoluteRoot);
   ensureConfig(ctxDir);
+  const embedderConfig = getProjectEmbedderConfig(absoluteRoot);
   const dbPath = path5.join(ctxDir, DB_FILENAME);
-  const db = createDatabase(dbPath);
+  const db = createDatabase(dbPath, embedderConfig.dimensions);
   try {
     const discovered = await discoverFiles({
       root: absoluteRoot,
@@ -1673,7 +1926,7 @@ async function runInit(projectPath, options = {}) {
     log(`  ${allChunksWithMeta.length} chunks created`);
     let vectorsCreated = 0;
     if (!options.skipEmbedding && allChunksWithMeta.length > 0) {
-      const embedder = await createEmbedder();
+      const embedder = await createEmbedder(absoluteRoot);
       const texts = allChunksWithMeta.map(
         (cm) => prepareChunkText(cm.fileRelPath, cm.chunk.parent, cm.chunk.text)
       );
@@ -1711,8 +1964,8 @@ async function runInit(projectPath, options = {}) {
     db.close();
   }
 }
-async function createEmbedder() {
-  return createLocalEmbedder();
+async function createEmbedder(projectPath) {
+  return createProjectEmbedder(projectPath);
 }
 function registerInitCommand(program2) {
   program2.command("init [path]").description("Index current directory or specified path").action(async (inputPath) => {
@@ -2340,9 +2593,13 @@ async function runQuery(projectPath, query, options) {
     );
   }
   const start = performance.now();
-  const db = createDatabase(dbPath);
+  const embedderConfig = getProjectEmbedderConfig(absoluteRoot);
+  const db = createDatabase(dbPath, embedderConfig.dimensions);
   try {
-    const strategyResults = await runStrategies(db, query, { ...options, limit });
+    const strategyResults = await runStrategies(db, absoluteRoot, query, {
+      ...options,
+      limit
+    });
     const pathBoostTerms = extractPathBoostTerms(query);
     const fused = fusionMergeWithPathBoost(strategyResults, limit, pathBoostTerms);
     const outputResults = fused.map(toOutputResult);
@@ -2362,7 +2619,7 @@ async function runQuery(projectPath, query, options) {
     db.close();
   }
 }
-async function runStrategies(db, query, options) {
+async function runStrategies(db, projectPath, query, options) {
   const results = [];
   const filters = options.language ? { language: options.language } : void 0;
   const limit = options.limit * 3;
@@ -2371,6 +2628,7 @@ async function runStrategies(db, query, options) {
     const weight = effectiveWeights[strategy];
     const searchResults = await executeStrategy(
       db,
+      projectPath,
       strategy,
       query,
       limit,
@@ -2382,10 +2640,10 @@ async function runStrategies(db, query, options) {
   }
   return results;
 }
-async function executeStrategy(db, strategy, query, limit, filters) {
+async function executeStrategy(db, projectPath, strategy, query, limit, filters) {
   switch (strategy) {
     case "vector": {
-      const embedder = await loadEmbedder();
+      const embedder = await loadEmbedder(projectPath);
       return vectorSearch(db, embedder, query, limit, filters);
     }
     case "fts":
@@ -2418,9 +2676,16 @@ async function executeStrategy(db, strategy, query, limit, filters) {
   }
 }
 var embedderInstance = null;
-async function loadEmbedder() {
-  if (embedderInstance) return embedderInstance;
-  embedderInstance = await createLocalEmbedder();
+var embedderKey = null;
+function getCacheKey(projectPath) {
+  const config = getProjectEmbedderConfig(projectPath);
+  return `${projectPath}:${config.provider}:${config.model}:${config.dimensions}`;
+}
+async function loadEmbedder(projectPath) {
+  const cacheKey = getCacheKey(projectPath);
+  if (embedderInstance && embedderKey === cacheKey) return embedderInstance;
+  embedderInstance = await createProjectEmbedder(projectPath);
+  embedderKey = cacheKey;
   return embedderInstance;
 }
 function registerQueryCommand(program2) {
@@ -2838,7 +3103,9 @@ var COMMON_STEMS = {
   transformer: "transform",
   transformation: "transform",
   connection: "connect",
+  connecting: "connect",
   connector: "connect",
+  migrating: "migrate",
   migration: "migrate",
   scheduling: "schedule",
   scheduler: "schedule",
@@ -2847,7 +3114,8 @@ var COMMON_STEMS = {
   routing: "route",
   router: "route",
   indexing: "index",
-  indexer: "index"
+  indexer: "index",
+  subscribing: "subscribe"
 };
 var STEM_SUFFIXES = [
   "tion",
@@ -3127,13 +3395,13 @@ function formatTextOutput2(output) {
   );
   return lines.join("\n");
 }
-function createSearchExecutor(db, query) {
+function createSearchExecutor(db, projectPath, query) {
   const pathBoostTerms = extractPathBoostTerms(query);
   return async (strategies, limit) => {
     const strategyResults = [];
     const fetchLimit = limit * 3;
     for (const plan of strategies) {
-      const results = await executeStrategy2(db, plan, fetchLimit);
+      const results = await executeStrategy2(db, projectPath, plan, fetchLimit);
       if (results.length > 0) {
         strategyResults.push({
           strategy: plan.strategy,
@@ -3152,10 +3420,10 @@ function extractSymbolNames2(query) {
 function isPathLike2(query) {
   return query.includes("/") || query.includes("*") || query.includes(".");
 }
-async function executeStrategy2(db, plan, limit) {
+async function executeStrategy2(db, projectPath, plan, limit) {
   switch (plan.strategy) {
     case "vector": {
-      const embedder = await loadEmbedder2();
+      const embedder = await loadEmbedder2(projectPath);
       return vectorSearch(db, embedder, plan.query, limit);
     }
     case "fts":
@@ -3184,13 +3452,20 @@ async function executeStrategy2(db, plan, limit) {
   }
 }
 var embedderInstance2 = null;
-async function loadEmbedder2() {
-  if (embedderInstance2) return embedderInstance2;
-  embedderInstance2 = await createLocalEmbedder();
+var embedderKey2 = null;
+function getCacheKey2(projectPath) {
+  const config = getProjectEmbedderConfig(projectPath);
+  return `${projectPath}:${config.provider}:${config.model}:${config.dimensions}`;
+}
+async function loadEmbedder2(projectPath) {
+  const cacheKey = getCacheKey2(projectPath);
+  if (embedderInstance2 && embedderKey2 === cacheKey) return embedderInstance2;
+  embedderInstance2 = await createProjectEmbedder(projectPath);
+  embedderKey2 = cacheKey;
   return embedderInstance2;
 }
-async function fallbackSearch(db, query, limit) {
-  const executor = createSearchExecutor(db, query);
+async function fallbackSearch(db, projectPath, query, limit) {
+  const executor = createSearchExecutor(db, projectPath, query);
   const fallbackStrategies = buildFallbackStrategies(query);
   const results = await executor(fallbackStrategies, limit);
   return {
@@ -3217,18 +3492,19 @@ async function runAsk(projectPath, query, options) {
       ErrorCode.NOT_INITIALIZED
     );
   }
-  const db = createDatabase(dbPath);
+  const embedderConfig = getProjectEmbedderConfig(absoluteRoot);
+  const db = createDatabase(dbPath, embedderConfig.dimensions);
   try {
     const provider = options.provider ?? null;
     if (!provider) {
-      const output = await fallbackSearch(db, query, limit);
+      const output = await fallbackSearch(db, absoluteRoot, query, limit);
       output.warning = FALLBACK_NOTICE;
       if (options.format === "text") {
         output.text = formatTextOutput2(output);
       }
       return output;
     }
-    const executor = createSearchExecutor(db, query);
+    const executor = createSearchExecutor(db, absoluteRoot, query);
     if (options.noExplain) {
       return await runNoExplain(provider, query, limit, options, executor);
     }
@@ -3430,8 +3706,8 @@ async function reindexChanges(db, changes, projectPath, options) {
     const language = detectLanguage(change.path);
     if (change.type === "unlink") {
       log(`[${timestamp()}] Deleted: ${change.path}`);
-      const existingFile2 = db.getFile(change.path);
-      if (existingFile2) {
+      const existingFile = db.getFile(change.path);
+      if (existingFile) {
         db.deleteFile(change.path);
       }
       filesProcessed++;
@@ -3441,10 +3717,6 @@ async function reindexChanges(db, changes, projectPath, options) {
     if (!fs9.existsSync(absolutePath)) continue;
     const label = change.type === "add" ? "Added" : "Changed";
     log(`[${timestamp()}] ${label}: ${change.path}`);
-    const existingFile = db.getFile(change.path);
-    if (existingFile) {
-      db.deleteChunksByFile(existingFile.id);
-    }
     let nodes;
     try {
       nodes = await parseFile(absolutePath, language);
@@ -3455,26 +3727,31 @@ async function reindexChanges(db, changes, projectPath, options) {
     const chunks = chunkFile(nodes, change.path);
     const hash = await hashFile(absolutePath);
     const size = fs9.statSync(absolutePath).size;
-    const fileId = db.upsertFile({
-      path: change.path,
-      language,
-      hash,
-      size
+    const chunkRows = chunks.map((c) => ({
+      lineStart: c.lineStart,
+      lineEnd: c.lineEnd,
+      type: c.type,
+      name: c.name,
+      parent: c.parent,
+      text: c.text,
+      imports: c.imports,
+      exports: c.exports,
+      hash: c.hash
+    }));
+    let chunkIds = [];
+    db.transaction(() => {
+      const existingFile = db.getFile(change.path);
+      if (existingFile) {
+        db.deleteChunksByFile(existingFile.id);
+      }
+      const fileId = db.upsertFile({
+        path: change.path,
+        language,
+        hash,
+        size
+      });
+      chunkIds = db.insertChunks(fileId, chunkRows);
     });
-    const chunkIds = db.insertChunks(
-      fileId,
-      chunks.map((c) => ({
-        lineStart: c.lineStart,
-        lineEnd: c.lineEnd,
-        type: c.type,
-        name: c.name,
-        parent: c.parent,
-        text: c.text,
-        imports: c.imports,
-        exports: c.exports,
-        hash: c.hash
-      }))
-    );
     for (let i = 0; i < chunks.length; i++) {
       allChunksWithMeta.push({
         fileRelPath: change.path,
@@ -3485,7 +3762,7 @@ async function reindexChanges(db, changes, projectPath, options) {
     filesProcessed++;
   }
   if (!options.skipEmbedding && allChunksWithMeta.length > 0) {
-    const embedder = await loadEmbedder3();
+    const embedder = await loadEmbedder3(projectPath);
     const texts = allChunksWithMeta.map(
       (cm) => prepareChunkText(cm.fileRelPath, cm.chunk.parent, cm.chunk.text)
     );
@@ -3501,9 +3778,16 @@ async function reindexChanges(db, changes, projectPath, options) {
   return { filesProcessed, chunksUpdated, durationMs };
 }
 var embedderInstance3 = null;
-async function loadEmbedder3() {
-  if (embedderInstance3) return embedderInstance3;
-  embedderInstance3 = await createLocalEmbedder();
+var embedderKey3 = null;
+function getCacheKey3(projectPath) {
+  const config = getProjectEmbedderConfig(projectPath);
+  return `${projectPath}:${config.provider}:${config.model}:${config.dimensions}`;
+}
+async function loadEmbedder3(projectPath) {
+  const cacheKey = getCacheKey3(projectPath);
+  if (embedderInstance3 && embedderKey3 === cacheKey) return embedderInstance3;
+  embedderInstance3 = await createProjectEmbedder(projectPath);
+  embedderKey3 = cacheKey;
   return embedderInstance3;
 }
 async function runWatch(projectPath, options = {}) {
@@ -3520,8 +3804,10 @@ async function runWatch(projectPath, options = {}) {
     );
   }
   await initParser();
-  const db = createDatabase(dbPath);
+  const embedderConfig = getProjectEmbedderConfig(absoluteRoot);
+  const db = createDatabase(dbPath, embedderConfig.dimensions);
   let watcherHandle = null;
+  let reindexQueue = Promise.resolve();
   const watcher = createWatcher(
     {
       projectPath: absoluteRoot,
@@ -3530,7 +3816,7 @@ async function runWatch(projectPath, options = {}) {
     },
     {
       onChange: (changes) => {
-        void (async () => {
+        reindexQueue = reindexQueue.then(async () => {
           try {
             const result = await reindexChanges(db, changes, absoluteRoot, {
               skipEmbedding: options.skipEmbedding,
@@ -3546,7 +3832,7 @@ async function runWatch(projectPath, options = {}) {
               `[${timestamp()}] Error: ${err instanceof Error ? err.message : String(err)}`
             );
           }
-        })();
+        });
       },
       onError: (err) => {
         log(`[${timestamp()}] Watcher error: ${err.message}`);
@@ -3562,6 +3848,7 @@ async function runWatch(projectPath, options = {}) {
         await watcherHandle.stop();
         watcherHandle = null;
       }
+      await reindexQueue;
       db.close();
       log("Stopped watching. Database saved.");
     }
@@ -3623,6 +3910,7 @@ function readConfig2(ctxDir) {
     const parsed = JSON.parse(raw);
     const embedder = parsed.embedder;
     return {
+      provider: embedder?.provider ?? parsed.provider ?? "unknown",
       model: embedder?.model ?? parsed.model ?? "unknown",
       dimensions: embedder?.dimensions ?? parsed.dimensions ?? 0
     };
@@ -3666,7 +3954,7 @@ function formatStatus(projectPath, output) {
   if (output.config) {
     lines.push("");
     lines.push(
-      `  Embedder: local (${output.config.model}, ${output.config.dimensions} dims)`
+      `  Embedder: ${output.config.provider} (${output.config.model}, ${output.config.dimensions} dims)`
     );
   }
   lines.push("");