brainbank 0.2.2 → 0.3.0

package/dist/{chunk-ZJ5LLMGM.js → chunk-2BEWWQL2.js}

@@ -2,12 +2,12 @@ import {
   isIgnoredDir,
   isIgnoredFile,
   isSupported
-} from "./chunk-4DM3XWO6.js";
+} from "./chunk-MGIFEPYZ.js";
 import {
   normalizeBM25,
   reciprocalRankFusion,
   sanitizeFTS
-} from "./chunk-FEAMUZGJ.js";
+} from "./chunk-E6WQM4DN.js";
 import {
   cosineSimilarity
 } from "./chunk-QNHBCOKB.js";
@@ -51,7 +51,7 @@ function resolveConfig(partial = {}) {
 }
 __name(resolveConfig, "resolveConfig");
 
-// src/app/collection.ts
+// src/core/collection.ts
 var Collection = class {
   constructor(_name, _db, _embedding, _hnsw, _vecs, _reranker) {
     this._name = _name;
@@ -131,14 +131,15 @@ var Collection = class {
       Promise.resolve(this._searchBM25(query, k, 0))
     ]);
     const fused = reciprocalRankFusion([
-      vectorHits.map((h) => ({ type: "document", score: h.score ?? 0, content: h.content, metadata: { id: h.id } })),
-      bm25Hits.map((h) => ({ type: "document", score: h.score ?? 0, content: h.content, metadata: { id: h.id } }))
+      vectorHits.map((h) => ({ type: "collection", score: h.score ?? 0, content: h.content, metadata: { id: h.id } })),
+      bm25Hits.map((h) => ({ type: "collection", score: h.score ?? 0, content: h.content, metadata: { id: h.id } }))
     ]);
     const allById = /* @__PURE__ */ new Map();
     for (const h of [...vectorHits, ...bm25Hits]) allById.set(h.id, h);
     const results = [];
     for (const r of fused) {
-      const item = allById.get(r.metadata.id);
+      const meta = r.metadata;
+      const item = allById.get(meta?.id);
       if (!item) continue;
       const scored = { ...item, score: r.score };
       if (scored.score >= minScore) results.push(scored);
@@ -306,7 +307,7 @@ function parseDuration(s) {
 }
 __name(parseDuration, "parseDuration");
 
-// src/providers/vector/hnsw.ts
+// src/providers/vector/hnsw-index.ts
 var HNSWIndex = class {
   constructor(_dims, _maxElements = 2e6, _M = 16, _efConstruction = 200, _efSearch = 50) {
     this._dims = _dims;
@@ -399,7 +400,7 @@ var HNSWIndex = class {
   }
 };
 
-// src/providers/embeddings/local.ts
+// src/providers/embeddings/local-embedding.ts
 var LocalEmbedding = class {
   static {
     __name(this, "LocalEmbedding");
@@ -446,13 +447,21 @@ var LocalEmbedding = class {
     return output.data;
   }
   /**
-   * Embed multiple texts.
-   * Processes sequentially to avoid OOM on large batches.
+   * Embed multiple texts using real batch processing.
+   * Chunks into groups of BATCH_SIZE to balance throughput vs memory.
    */
   async embedBatch(texts) {
+    if (texts.length === 0) return [];
+    const BATCH_SIZE = 32;
+    const pipe = await this._getPipeline();
     const results = [];
-    for (const text of texts) {
-      results.push(await this.embed(text));
+    for (let i = 0; i < texts.length; i += BATCH_SIZE) {
+      const batch = texts.slice(i, i + BATCH_SIZE);
+      const output = await pipe(batch, { pooling: "mean", normalize: true });
+      for (let j = 0; j < batch.length; j++) {
+        const start = j * this.dims;
+        results.push(new Float32Array(output.data.buffer, start * 4, this.dims));
+      }
     }
     return results;
   }
@@ -493,19 +502,32 @@ function searchMMR(index, query, vectorCache, k, lambda = 0.7) {
 }
 __name(searchMMR, "searchMMR");
 
-// src/search/vector/multi-index.ts
-var MultiIndexSearch = class {
+// src/search/vector/rerank.ts
+async function rerank(query, results, reranker) {
+  const documents = results.map((r) => r.content);
+  const scores = await reranker.rank(query, documents);
+  const blended = results.map((r, i) => {
+    const pos = i + 1;
+    const rrfWeight = pos <= 3 ? 0.75 : pos <= 10 ? 0.6 : 0.4;
+    return {
+      ...r,
+      score: rrfWeight * r.score + (1 - rrfWeight) * (scores[i] ?? 0)
+    };
+  });
+  return blended.sort((a, b) => b.score - a.score);
+}
+__name(rerank, "rerank");
+
+// src/search/vector/vector-search.ts
+var VectorSearch = class {
   static {
-    __name(this, "MultiIndexSearch");
+    __name(this, "VectorSearch");
   }
   _config;
   constructor(config) {
     this._config = config;
   }
-  /**
-   * Search across all indices.
-   * Returns combined results sorted by score.
-   */
+  /** Search across all indices. Returns combined results sorted by score. */
   async search(query, options = {}) {
     const {
       codeK = 6,
@@ -517,272 +539,257 @@ var MultiIndexSearch = class {
     } = options;
     const queryVec = await this._config.embedding.embed(query);
     const results = [];
-    if (this._config.codeHnsw && this._config.codeHnsw.size > 0) {
-      const hits = useMMR ? searchMMR(this._config.codeHnsw, queryVec, this._config.codeVecs, codeK, mmrLambda) : this._config.codeHnsw.search(queryVec, codeK);
-      if (hits.length > 0) {
-        const ids = hits.map((h) => h.id);
-        const scoreMap = new Map(hits.map((h) => [h.id, h.score]));
-        const placeholders = ids.map(() => "?").join(",");
-        const rows = this._config.db.prepare(
-          `SELECT * FROM code_chunks WHERE id IN (${placeholders})`
-        ).all(...ids);
-        for (const r of rows) {
-          const score = scoreMap.get(r.id) ?? 0;
-          if (score >= minScore) {
-            results.push({
-              type: "code",
-              score,
-              filePath: r.file_path,
-              content: r.content,
-              metadata: {
-                chunkType: r.chunk_type,
-                name: r.name,
-                startLine: r.start_line,
-                endLine: r.end_line,
-                language: r.language
-              }
-            });
+    this._searchCode(queryVec, codeK, minScore, useMMR, mmrLambda, results);
+    this._searchGit(queryVec, gitK, minScore, results);
+    this._searchPatterns(queryVec, patternK, minScore, useMMR, mmrLambda, results);
+    results.sort((a, b) => b.score - a.score);
+    if (this._config.reranker && results.length > 1) {
+      return rerank(query, results, this._config.reranker);
+    }
+    return results;
+  }
+  /** Vector search across code chunks. */
+  _searchCode(queryVec, k, minScore, useMMR, mmrLambda, results) {
+    const { codeHnsw, codeVecs, db } = this._config;
+    if (!codeHnsw || codeHnsw.size === 0) return;
+    const hits = useMMR ? searchMMR(codeHnsw, queryVec, codeVecs, k, mmrLambda) : codeHnsw.search(queryVec, k);
+    if (hits.length === 0) return;
+    const ids = hits.map((h) => h.id);
+    const scoreMap = new Map(hits.map((h) => [h.id, h.score]));
+    const placeholders = ids.map(() => "?").join(",");
+    const rows = db.prepare(
+      `SELECT * FROM code_chunks WHERE id IN (${placeholders})`
+    ).all(...ids);
+    for (const r of rows) {
+      const score = scoreMap.get(r.id) ?? 0;
+      if (score >= minScore) {
+        results.push({
+          type: "code",
+          score,
+          filePath: r.file_path,
+          content: r.content,
+          metadata: {
+            chunkType: r.chunk_type,
+            name: r.name,
+            startLine: r.start_line,
+            endLine: r.end_line,
+            language: r.language
           }
-        }
+        });
       }
     }
-    if (this._config.gitHnsw && this._config.gitHnsw.size > 0) {
-      const hits = this._config.gitHnsw.search(queryVec, gitK * 2);
-      if (hits.length > 0) {
-        const ids = hits.map((h) => h.id);
-        const scoreMap = new Map(hits.map((h) => [h.id, h.score]));
-        const placeholders = ids.map(() => "?").join(",");
-        const rows = this._config.db.prepare(
-          `SELECT * FROM git_commits WHERE id IN (${placeholders}) AND is_merge = 0`
-        ).all(...ids);
-        for (const r of rows) {
-          const score = scoreMap.get(r.id) ?? 0;
-          if (score >= minScore) {
-            results.push({
-              type: "commit",
-              score,
-              content: r.message,
-              metadata: {
-                hash: r.hash,
-                shortHash: r.short_hash,
-                author: r.author,
-                date: r.date,
-                files: JSON.parse(r.files_json ?? "[]"),
-                additions: r.additions,
-                deletions: r.deletions,
-                diff: r.diff
-              }
-            });
+  }
+  /** Vector search across git commits. */
+  _searchGit(queryVec, k, minScore, results) {
+    const { gitHnsw, db } = this._config;
+    if (!gitHnsw || gitHnsw.size === 0) return;
+    const hits = gitHnsw.search(queryVec, k * 2);
+    if (hits.length === 0) return;
+    const ids = hits.map((h) => h.id);
+    const scoreMap = new Map(hits.map((h) => [h.id, h.score]));
+    const placeholders = ids.map(() => "?").join(",");
+    const rows = db.prepare(
+      `SELECT * FROM git_commits WHERE id IN (${placeholders}) AND is_merge = 0`
+    ).all(...ids);
+    for (const r of rows) {
+      const score = scoreMap.get(r.id) ?? 0;
+      if (score >= minScore) {
+        results.push({
+          type: "commit",
+          score,
+          content: r.message,
+          metadata: {
+            hash: r.hash,
+            shortHash: r.short_hash,
+            author: r.author,
+            date: r.date,
+            files: JSON.parse(r.files_json ?? "[]"),
+            additions: r.additions,
+            deletions: r.deletions,
+            diff: r.diff
           }
-        }
+        });
       }
     }
-    if (this._config.patternHnsw && this._config.patternHnsw.size > 0) {
-      const hits = useMMR ? searchMMR(this._config.patternHnsw, queryVec, this._config.patternVecs, patternK, mmrLambda) : this._config.patternHnsw.search(queryVec, patternK);
-      if (hits.length > 0) {
-        const ids = hits.map((h) => h.id);
-        const scoreMap = new Map(hits.map((h) => [h.id, h.score]));
-        const placeholders = ids.map(() => "?").join(",");
-        const rows = this._config.db.prepare(
-          `SELECT * FROM memory_patterns WHERE id IN (${placeholders}) AND success_rate >= 0.5`
-        ).all(...ids);
-        for (const r of rows) {
-          const score = scoreMap.get(r.id) ?? 0;
-          if (score >= minScore) {
-            results.push({
-              type: "pattern",
-              score,
-              content: r.approach,
-              metadata: {
-                taskType: r.task_type,
-                task: r.task,
-                outcome: r.outcome,
-                successRate: r.success_rate,
-                critique: r.critique
-              }
-            });
+  }
+  /** Vector search across memory patterns. */
+  _searchPatterns(queryVec, k, minScore, useMMR, mmrLambda, results) {
+    const { patternHnsw, patternVecs, db } = this._config;
+    if (!patternHnsw || patternHnsw.size === 0) return;
+    const hits = useMMR ? searchMMR(patternHnsw, queryVec, patternVecs, k, mmrLambda) : patternHnsw.search(queryVec, k);
+    if (hits.length === 0) return;
+    const ids = hits.map((h) => h.id);
+    const scoreMap = new Map(hits.map((h) => [h.id, h.score]));
+    const placeholders = ids.map(() => "?").join(",");
+    const rows = db.prepare(
+      `SELECT * FROM memory_patterns WHERE id IN (${placeholders}) AND success_rate >= 0.5`
+    ).all(...ids);
+    for (const r of rows) {
+      const score = scoreMap.get(r.id) ?? 0;
+      if (score >= minScore) {
+        results.push({
+          type: "pattern",
+          score,
+          content: r.approach,
+          metadata: {
+            taskType: r.task_type,
+            task: r.task,
+            outcome: r.outcome,
+            successRate: r.success_rate,
+            critique: r.critique
           }
-        }
+        });
       }
     }
-    results.sort((a, b) => b.score - a.score);
-    if (this._config.reranker && results.length > 1) {
-      return this._rerank(query, results);
-    }
-    return results;
-  }
-  /**
-   * Re-rank results using position-aware blending.
-   * 
-   * Top 1-3:  75% retrieval / 25% reranker (preserves exact matches)
-   * Top 4-10: 60% retrieval / 40% reranker
-   * Top 11+:  40% retrieval / 60% reranker (trust reranker more)
-   */
-  async _rerank(query, results) {
-    const reranker = this._config.reranker;
-    const documents = results.map((r) => r.content);
-    const scores = await reranker.rank(query, documents);
-    const blended = results.map((r, i) => {
-      const pos = i + 1;
-      const rrfWeight = pos <= 3 ? 0.75 : pos <= 10 ? 0.6 : 0.4;
-      return {
-        ...r,
-        score: rrfWeight * r.score + (1 - rrfWeight) * (scores[i] ?? 0)
-      };
-    });
-    return blended.sort((a, b) => b.score - a.score);
   }
 };
 
-// src/search/keyword/bm25.ts
-var BM25Search = class {
+// src/search/keyword/keyword-search.ts
+var KeywordSearch = class {
   constructor(_db) {
     this._db = _db;
   }
   static {
-    __name(this, "BM25Search");
+    __name(this, "KeywordSearch");
   }
   /**
    * Full-text keyword search across all FTS5 indices.
    * Uses BM25 scoring — lower scores = better matches.
-   * Query syntax: simple words, OR, NOT, "exact phrases", prefix*
    */
-  search(query, options = {}) {
+  async search(query, options = {}) {
     const { codeK = 8, gitK = 5, patternK = 4 } = options;
-    const results = [];
     const ftsQuery = sanitizeFTS(query);
     if (!ftsQuery) return [];
+    const results = [];
+    if (codeK > 0) this._searchCode(ftsQuery, query, codeK, results);
+    if (gitK > 0) this._searchGit(ftsQuery, gitK, results);
+    if (patternK > 0) this._searchPatterns(ftsQuery, patternK, results);
+    return results.sort((a, b) => b.score - a.score);
+  }
+  /** FTS5 search across code chunks + file-path fallback. */
+  _searchCode(ftsQuery, rawQuery, k, results) {
     const seenIds = /* @__PURE__ */ new Set();
-    if (codeK > 0) {
-      try {
-        const rows = this._db.prepare(`
-                    SELECT c.id, c.file_path, c.chunk_type, c.name, c.start_line, c.end_line,
-                           c.content, c.language, bm25(fts_code, 5.0, 3.0, 1.0) AS score
-                    FROM fts_code f
-                    JOIN code_chunks c ON c.id = f.rowid
-                    WHERE fts_code MATCH ?
-                    ORDER BY score ASC
-                    LIMIT ?
-                `).all(ftsQuery, codeK);
-        for (const r of rows) {
+    try {
+      const rows = this._db.prepare(`
+                SELECT c.id, c.file_path, c.chunk_type, c.name, c.start_line, c.end_line,
+                       c.content, c.language, bm25(fts_code, 5.0, 3.0, 1.0) AS score
+                FROM fts_code f
+                JOIN code_chunks c ON c.id = f.rowid
+                WHERE fts_code MATCH ?
+                ORDER BY score ASC
+                LIMIT ?
+            `).all(ftsQuery, k);
+      for (const r of rows) {
+        seenIds.add(r.id);
+        results.push(this._toCodeResult(r, normalizeBM25(r.score), "bm25"));
+      }
+    } catch {
+    }
+    this._searchCodeByPath(rawQuery, seenIds, results);
+  }
+  /** File-path fallback: match filenames via LIKE. */
+  _searchCodeByPath(rawQuery, seenIds, results) {
+    try {
+      const words = rawQuery.replace(/[^a-zA-Z0-9]/g, " ").split(/\s+/).filter((w) => w.length > 2);
+      for (const word of words.slice(0, 3)) {
+        const pathRows = this._db.prepare(`
+                    SELECT id, file_path, chunk_type, name, start_line, end_line, content, language
+                    FROM code_chunks
+                    WHERE file_path LIKE ? AND chunk_type = 'file'
+                    LIMIT 3
+                `).all(`%${word}%`);
+        for (const r of pathRows) {
+          if (seenIds.has(r.id)) continue;
           seenIds.add(r.id);
-          results.push({
-            type: "code",
-            score: normalizeBM25(r.score),
-            filePath: r.file_path,
-            content: r.content,
-            metadata: {
-              chunkType: r.chunk_type,
-              name: r.name,
-              startLine: r.start_line,
-              endLine: r.end_line,
-              language: r.language,
-              searchType: "bm25"
-            }
-          });
+          results.push(this._toCodeResult(r, 0.6, "bm25-path"));
         }
-      } catch {
       }
-      try {
-        const words = query.replace(/[^a-zA-Z0-9]/g, " ").split(/\s+/).filter((w) => w.length > 2);
-        for (const word of words.slice(0, 3)) {
-          const pathRows = this._db.prepare(`
-                        SELECT id, file_path, chunk_type, name, start_line, end_line, content, language
-                        FROM code_chunks
-                        WHERE file_path LIKE ? AND chunk_type = 'file'
-                        LIMIT 3
-                    `).all(`%${word}%`);
-          for (const r of pathRows) {
-            if (seenIds.has(r.id)) continue;
-            seenIds.add(r.id);
-            results.push({
-              type: "code",
-              score: 0.6,
-              filePath: r.file_path,
-              content: r.content,
-              metadata: {
-                chunkType: r.chunk_type,
-                name: r.name,
-                startLine: r.start_line,
-                endLine: r.end_line,
-                language: r.language,
-                searchType: "bm25-path"
-              }
-            });
+    } catch {
+    }
+  }
+  /** FTS5 search across git commits. */
+  _searchGit(ftsQuery, k, results) {
+    try {
+      const rows = this._db.prepare(`
+                SELECT c.id, c.hash, c.short_hash, c.message, c.author, c.date,
+                       c.files_json, c.diff, c.additions, c.deletions,
+                       bm25(fts_commits, 5.0, 2.0, 1.0) AS score
+                FROM fts_commits f
+                JOIN git_commits c ON c.id = f.rowid
+                WHERE fts_commits MATCH ? AND c.is_merge = 0
+                ORDER BY score ASC
+                LIMIT ?
+            `).all(ftsQuery, k);
+      for (const r of rows) {
+        results.push({
+          type: "commit",
+          score: normalizeBM25(r.score),
+          content: r.message,
+          metadata: {
+            hash: r.hash,
+            shortHash: r.short_hash,
+            author: r.author,
+            date: r.date,
+            files: JSON.parse(r.files_json ?? "[]"),
+            additions: r.additions,
+            deletions: r.deletions,
+            diff: r.diff,
+            searchType: "bm25"
           }
-        }
-      } catch {
+        });
       }
+    } catch {
     }
-    if (gitK > 0) {
-      try {
-        const rows = this._db.prepare(`
-                    SELECT c.id, c.hash, c.short_hash, c.message, c.author, c.date,
-                           c.files_json, c.diff, c.additions, c.deletions,
-                           bm25(fts_commits, 5.0, 2.0, 1.0) AS score
-                    FROM fts_commits f
-                    JOIN git_commits c ON c.id = f.rowid
-                    WHERE fts_commits MATCH ? AND c.is_merge = 0
-                    ORDER BY score ASC
-                    LIMIT ?
-                `).all(ftsQuery, gitK);
-        for (const r of rows) {
-          results.push({
-            type: "commit",
-            score: normalizeBM25(r.score),
-            content: r.message,
-            metadata: {
-              hash: r.hash,
-              shortHash: r.short_hash,
-              author: r.author,
-              date: r.date,
-              files: JSON.parse(r.files_json ?? "[]"),
-              additions: r.additions,
-              deletions: r.deletions,
-              diff: r.diff,
-              searchType: "bm25"
-            }
-          });
-        }
-      } catch {
+  }
+  /** FTS5 search across memory patterns. */
+  _searchPatterns(ftsQuery, k, results) {
+    try {
+      const rows = this._db.prepare(`
+                SELECT p.id, p.task_type, p.task, p.approach, p.outcome,
+                       p.success_rate, p.critique,
+                       bm25(fts_patterns, 3.0, 5.0, 5.0, 1.0) AS score
+                FROM fts_patterns f
+                JOIN memory_patterns p ON p.id = f.rowid
+                WHERE fts_patterns MATCH ? AND p.success_rate >= 0.5
+                ORDER BY score ASC
+                LIMIT ?
+            `).all(ftsQuery, k);
+      for (const r of rows) {
+        results.push({
+          type: "pattern",
+          score: normalizeBM25(r.score),
+          content: r.approach,
+          metadata: {
+            taskType: r.task_type,
+            task: r.task,
+            outcome: r.outcome,
+            successRate: r.success_rate,
+            critique: r.critique,
+            searchType: "bm25"
+          }
+        });
       }
+    } catch {
     }
-    if (patternK > 0) {
-      try {
-        const rows = this._db.prepare(`
-                    SELECT p.id, p.task_type, p.task, p.approach, p.outcome,
-                           p.success_rate, p.critique,
-                           bm25(fts_patterns, 3.0, 5.0, 5.0, 1.0) AS score
-                    FROM fts_patterns f
-                    JOIN memory_patterns p ON p.id = f.rowid
-                    WHERE fts_patterns MATCH ? AND p.success_rate >= 0.5
-                    ORDER BY score ASC
-                    LIMIT ?
-                `).all(ftsQuery, patternK);
-        for (const r of rows) {
-          results.push({
-            type: "pattern",
-            score: normalizeBM25(r.score),
-            content: r.approach,
-            metadata: {
-              taskType: r.task_type,
-              task: r.task,
-              outcome: r.outcome,
-              successRate: r.success_rate,
-              critique: r.critique,
-              searchType: "bm25"
-            }
-          });
-        }
-      } catch {
+  }
+  /** Map a code_chunks row to a CodeResult. */
+  _toCodeResult(r, score, searchType) {
+    return {
+      type: "code",
+      score,
+      filePath: r.file_path,
+      content: r.content,
+      metadata: {
+        chunkType: r.chunk_type,
+        name: r.name,
+        startLine: r.start_line,
+        endLine: r.end_line,
+        language: r.language,
+        searchType
       }
-    }
-    return results.sort((a, b) => b.score - a.score);
+    };
   }
-  /**
-   * Rebuild the FTS index from scratch.
-   * Call this after bulk imports or if FTS gets out of sync.
-   */
+  /** Rebuild the FTS index from scratch. */
   rebuild() {
     try {
       this._db.prepare("INSERT INTO fts_code(fts_code) VALUES('rebuild')").run();
@@ -793,7 +800,7 @@ var BM25Search = class {
   }
 };
 
-// src/app/context-builder.ts
+// src/core/context-builder.ts
 var ContextBuilder = class {
   constructor(_search, _coEdits) {
     this._search = _search;
@@ -802,10 +809,7 @@ var ContextBuilder = class {
   static {
     __name(this, "ContextBuilder");
   }
-  /**
-   * Build a full context block for a task.
-   * Returns clean markdown ready for system prompt injection.
-   */
+  /** Build a full context block for a task. Returns markdown for system prompt. */
   async build(task, options = {}) {
     const {
       codeResults = 6,
@@ -826,85 +830,97 @@ var ContextBuilder = class {
     });
     const parts = [`# Context for: "${task}"
 `];
-    const codeHits = results.filter((r) => r.type === "code").slice(0, codeResults);
-    if (codeHits.length > 0) {
-      parts.push("## Relevant Code\n");
-      const byFile = /* @__PURE__ */ new Map();
-      for (const r of codeHits) {
-        const key = r.filePath ?? "unknown";
-        if (!byFile.has(key)) byFile.set(key, []);
-        byFile.get(key).push(r);
-      }
-      for (const [file, chunks] of byFile) {
-        parts.push(`### ${file}`);
-        for (const c of chunks) {
-          const m = c.metadata;
-          const label = m.name ? `${m.chunkType} \`${m.name}\` (L${m.startLine}-${m.endLine})` : `L${m.startLine}-${m.endLine}`;
-          parts.push(`**${label}** \u2014 ${Math.round(c.score * 100)}% match`);
-          parts.push("```" + (m.language || ""));
-          parts.push(c.content);
-          parts.push("```\n");
-        }
-      }
+    this._formatCodeResults(results, codeResults, parts);
+    this._formatGitResults(results, gitResults, parts);
+    this._formatCoEdits(affectedFiles, parts);
+    this._formatPatternResults(results, patternResults, parts);
+    return parts.join("\n");
+  }
+  /** Format code search results grouped by file. */
+  _formatCodeResults(results, limit, parts) {
+    const codeHits = results.filter((r) => r.type === "code").slice(0, limit);
+    if (codeHits.length === 0) return;
+    parts.push("## Relevant Code\n");
+    const byFile = /* @__PURE__ */ new Map();
+    for (const r of codeHits) {
+      const key = r.filePath ?? "unknown";
+      if (!byFile.has(key)) byFile.set(key, []);
+      byFile.get(key).push(r);
     }
-    const gitHits = results.filter((r) => r.type === "commit").slice(0, gitResults);
-    if (gitHits.length > 0) {
-      parts.push("## Related Git History\n");
-      for (const c of gitHits) {
+    for (const [file, chunks] of byFile) {
+      parts.push(`### ${file}`);
+      for (const c of chunks) {
         const m = c.metadata;
-        const score = Math.round(c.score * 100);
-        const files = (m.files ?? []).slice(0, 4).join(", ");
-        parts.push(`**[${m.shortHash}]** ${c.content} *(${m.author}, ${m.date?.slice(0, 10)}, ${score}%)*`);
-        if (files) parts.push(`  Files: ${files}`);
-        if (m.diff) {
-          const snippet = m.diff.split("\n").filter((l) => l.startsWith("+") || l.startsWith("-") || l.startsWith("@@")).slice(0, 10).join("\n");
-          if (snippet) {
-            parts.push("```diff");
-            parts.push(snippet);
-            parts.push("```");
-          }
-        }
-        parts.push("");
+        const label = m.name ? `${m.chunkType} \`${m.name}\` (L${m.startLine}-${m.endLine})` : `L${m.startLine}-${m.endLine}`;
+        parts.push(`**${label}** \u2014 ${Math.round(c.score * 100)}% match`);
+        parts.push("```" + (m.language || ""));
+        parts.push(c.content);
+        parts.push("```\n");
       }
     }
-    if (affectedFiles.length > 0 && this._coEdits) {
-      const coEditLines = [];
-      for (const file of affectedFiles.slice(0, 3)) {
-        const suggestions = this._coEdits.suggest(file, 4);
-        if (suggestions.length > 0) {
-          coEditLines.push(
-            `- **${file}** \u2192 also tends to change: ${suggestions.map((s) => `${s.file} (${s.count}x)`).join(", ")}`
-          );
+  }
+  /** Format git commit results with diff snippets. */
+  _formatGitResults(results, limit, parts) {
+    const gitHits = results.filter((r) => r.type === "commit").slice(0, limit);
+    if (gitHits.length === 0) return;
+    parts.push("## Related Git History\n");
+    for (const c of gitHits) {
+      const m = c.metadata;
+      const score = Math.round(c.score * 100);
+      const files = (m.files ?? []).slice(0, 4).join(", ");
+      parts.push(`**[${m.shortHash}]** ${c.content} *(${m.author}, ${m.date?.slice(0, 10)}, ${score}%)*`);
+      if (files) parts.push(`  Files: ${files}`);
+      if (m.diff) {
+        const snippet = m.diff.split("\n").filter((l) => l.startsWith("+") || l.startsWith("-") || l.startsWith("@@")).slice(0, 10).join("\n");
+        if (snippet) {
+          parts.push("```diff");
+          parts.push(snippet);
+          parts.push("```");
         }
       }
-      if (coEditLines.length > 0) {
-        parts.push("## Co-Edit Patterns\n");
-        parts.push(...coEditLines);
-        parts.push("");
-      }
+      parts.push("");
     }
-    const memHits = results.filter((r) => r.type === "pattern").slice(0, patternResults);
-    if (memHits.length > 0) {
-      parts.push("## Learned Patterns\n");
-      for (const p of memHits) {
-        const m = p.metadata;
-        const score = Math.round(p.score * 100);
-        const success = Math.round((m.successRate ?? 0) * 100);
-        parts.push(`**${m.taskType}** \u2014 ${success}% success, ${score}% match`);
-        parts.push(`Task: ${m.task}`);
-        parts.push(`Approach: ${p.content}`);
-        if (m.critique) parts.push(`Lesson: ${m.critique}`);
-        parts.push("");
+  }
+  /** Format co-edit suggestions for affected files. */
+  _formatCoEdits(affectedFiles, parts) {
+    if (affectedFiles.length === 0 || !this._coEdits) return;
+    const coEditLines = [];
+    for (const file of affectedFiles.slice(0, 3)) {
+      const suggestions = this._coEdits.suggest(file, 4);
+      if (suggestions.length > 0) {
+        coEditLines.push(
+          `- **${file}** \u2192 also tends to change: ${suggestions.map((s) => `${s.file} (${s.count}x)`).join(", ")}`
+        );
       }
     }
-    return parts.join("\n");
+    if (coEditLines.length > 0) {
+      parts.push("## Co-Edit Patterns\n");
+      parts.push(...coEditLines);
+      parts.push("");
+    }
+  }
+  /** Format memory pattern results. */
+  _formatPatternResults(results, limit, parts) {
+    const memHits = results.filter((r) => r.type === "pattern").slice(0, limit);
+    if (memHits.length === 0) return;
+    parts.push("## Learned Patterns\n");
+    for (const p of memHits) {
+      const m = p.metadata;
+      const score = Math.round(p.score * 100);
+      const success = Math.round((m.successRate ?? 0) * 100);
+      parts.push(`**${m.taskType}** \u2014 ${success}% success, ${score}% match`);
+      parts.push(`Task: ${m.task}`);
+      parts.push(`Approach: ${p.content}`);
+      if (m.critique) parts.push(`Lesson: ${m.critique}`);
+      parts.push("");
+    }
   }
 };
 
-// src/app/brainbank.ts
+// src/brainbank.ts
 import { EventEmitter } from "events";
 
-// src/app/registry.ts
+// src/core/registry.ts
 var ALIASES = {};
 var IndexerRegistry = class {
   static {
@@ -1315,6 +1331,7 @@ var Database = class {
     }
     this.db = new BetterSqlite3(dbPath);
     this.db.pragma("journal_mode = WAL");
+    this.db.pragma("busy_timeout = 5000");
     this.db.pragma("synchronous = NORMAL");
     this.db.pragma("foreign_keys = ON");
     createSchema(this.db);
@@ -1467,7 +1484,10 @@ async function reembedTable(db, embedding, table, batchSize, onProgress) {
     `SELECT COUNT(*) as c FROM ${table.textTable}`
   ).get().c;
   if (totalCount === 0) return 0;
-  const allNewVectors = [];
+  const insertVec = db.prepare(
+    `INSERT INTO ${table.vectorTable} (${table.fkColumn}, embedding) VALUES (?, ?)`
+  );
+  db.prepare(`DELETE FROM ${table.vectorTable}`).run();
   let processed = 0;
   for (let offset = 0; offset < totalCount; offset += batchSize) {
     const batch = db.prepare(
@@ -1475,21 +1495,14 @@ async function reembedTable(db, embedding, table, batchSize, onProgress) {
     ).all(batchSize, offset);
     const texts = batch.map((r) => table.textBuilder(r));
     const vectors = await embedding.embedBatch(texts);
-    for (let j = 0; j < batch.length; j++) {
-      allNewVectors.push({ id: batch[j][table.idColumn], vec: vectors[j] });
-    }
+    db.transaction(() => {
+      for (let j = 0; j < batch.length; j++) {
+        insertVec.run(batch[j][table.idColumn], Buffer.from(vectors[j].buffer));
+      }
+    });
     processed += batch.length;
     onProgress?.(table.name, processed, totalCount);
   }
-  const insertVec = db.prepare(
-    `INSERT INTO ${table.vectorTable} (${table.fkColumn}, embedding) VALUES (?, ?)`
-  );
-  db.transaction(() => {
-    db.prepare(`DELETE FROM ${table.vectorTable}`).run();
-    for (const { id, vec } of allNewVectors) {
-      insertVec.run(id, Buffer.from(vec.buffer));
-    }
-  });
   return processed;
 }
 __name(reembedTable, "reembedTable");
@@ -1544,19 +1557,16 @@ function detectProviderMismatch(db, embedding) {
 }
 __name(detectProviderMismatch, "detectProviderMismatch");
 
-// src/app/initializer.ts
-async function earlyInit(config, emit) {
+// src/core/initializer.ts
+async function earlyInit(config, emit, options = {}) {
   const db = new Database(config.dbPath);
   const embedding = config.embeddingProvider ?? new LocalEmbedding();
   const mismatch = detectProviderMismatch(db, embedding);
-  const skipVectorLoad = !!mismatch?.mismatch;
-  if (skipVectorLoad) {
-    emit("warning", {
-      type: "provider_mismatch",
-      previous: mismatch.stored,
-      current: mismatch.current,
-      message: "Embedding provider changed \u2014 vectors not loaded. Run brain.reembed() to regenerate."
-    });
+  if (mismatch?.mismatch && !options.force) {
+    db.close();
+    throw new Error(
+      `BrainBank: Embedding dimension mismatch (stored: ${mismatch.stored}, current: ${mismatch.current}). Run brain.reembed() to re-index with the new provider, or switch back to the original provider.`
+    );
   }
   setEmbeddingMeta(db, embedding);
   const kvHnsw = new HNSWIndex(
@@ -1567,6 +1577,7 @@ async function earlyInit(config, emit) {
     config.hnswEfSearch
   );
   await kvHnsw.init();
+  const skipVectorLoad = !!(options.force && mismatch?.mismatch);
   return { db, embedding, kvHnsw, skipVectorLoad };
 }
 __name(earlyInit, "earlyInit");
@@ -1575,7 +1586,15 @@ async function lateInit(early, config, registry, sharedHnsw, kvVecs, getCollecti
   if (!skipVectorLoad) {
     loadVectors(db, "kv_vectors", "data_id", kvHnsw, kvVecs);
   }
-  const ctx = {
+  const ctx = buildIndexerContext(db, embedding, config, sharedHnsw, skipVectorLoad, getCollection);
+  for (const mod of registry.all) {
+    await mod.initialize(ctx);
+  }
+  return buildSearchLayer(db, embedding, config, registry, sharedHnsw);
+}
+__name(lateInit, "lateInit");
+function buildIndexerContext(db, embedding, config, sharedHnsw, skipVectorLoad, getCollection) {
+  return {
     db,
     embedding,
     config,
@@ -1606,36 +1625,30 @@ async function lateInit(early, config, registry, sharedHnsw, kvVecs, getCollecti
     }, "getOrCreateSharedHnsw"),
     collection: getCollection
   };
-  for (const mod of registry.all) {
-    await mod.initialize(ctx);
-  }
+}
+__name(buildIndexerContext, "buildIndexerContext");
+function buildSearchLayer(db, embedding, config, registry, sharedHnsw) {
   const codeMod = sharedHnsw.get("code");
   const gitMod = sharedHnsw.get("git");
   const memMod = registry.firstByType("memory");
-  let search;
-  let bm25;
-  let contextBuilder;
-  if (codeMod || gitMod || memMod) {
-    search = new MultiIndexSearch({
-      db,
-      codeHnsw: codeMod?.hnsw,
-      gitHnsw: gitMod?.hnsw,
-      patternHnsw: memMod?.hnsw,
-      codeVecs: codeMod?.vecCache ?? /* @__PURE__ */ new Map(),
-      gitVecs: gitMod?.vecCache ?? /* @__PURE__ */ new Map(),
-      patternVecs: memMod?.vecCache ?? /* @__PURE__ */ new Map(),
-      embedding,
-      reranker: config.reranker
-    });
-    bm25 = new BM25Search(db);
-  }
-  if (search) {
-    const firstGit = registry.firstByType("git");
-    contextBuilder = new ContextBuilder(search, firstGit?.coEdits);
-  }
+  if (!codeMod && !gitMod && !memMod) return {};
+  const search = new VectorSearch({
+    db,
+    codeHnsw: codeMod?.hnsw,
+    gitHnsw: gitMod?.hnsw,
+    patternHnsw: memMod?.hnsw,
+    codeVecs: codeMod?.vecCache ?? /* @__PURE__ */ new Map(),
+    gitVecs: gitMod?.vecCache ?? /* @__PURE__ */ new Map(),
+    patternVecs: memMod?.vecCache ?? /* @__PURE__ */ new Map(),
+    embedding,
+    reranker: config.reranker
+  });
+  const bm25 = new KeywordSearch(db);
+  const firstGit = registry.firstByType("git");
+  const contextBuilder = new ContextBuilder(search, firstGit?.coEdits);
   return { search, bm25, contextBuilder };
 }
-__name(lateInit, "lateInit");
+__name(buildSearchLayer, "buildSearchLayer");
 function loadVectors(db, table, idCol, hnsw, cache) {
   const rows = db.prepare(`SELECT ${idCol}, embedding FROM ${table}`).all();
   for (const row of rows) {
@@ -1651,7 +1664,7 @@ function loadVectors(db, table, idCol, hnsw, cache) {
 }
 __name(loadVectors, "loadVectors");
 
-// src/app/search-api.ts
+// src/core/search-api.ts
 var SearchAPI = class {
   constructor(_d) {
     this._d = _d;
@@ -1698,6 +1711,13 @@ var SearchAPI = class {
       const docs = await this._d.searchDocs(query, { k: docsK });
       if (docs.length > 0) resultLists.push(docs);
     }
+    await this._searchKvCollections(query, cols, resultLists);
+    if (resultLists.length === 0) return [];
+    const fused = reciprocalRankFusion(resultLists);
+    return this._applyReranking(query, fused);
+  }
+  /** Search non-reserved KV collections and push results. */
+  async _searchKvCollections(query, cols, resultLists) {
     const reserved = /* @__PURE__ */ new Set(["code", "git", "docs"]);
     for (const [name, k] of Object.entries(cols)) {
       if (reserved.has(name)) continue;
@@ -1711,23 +1731,22 @@ var SearchAPI = class {
         })));
       }
     }
-    if (resultLists.length === 0) return [];
-    const fused = reciprocalRankFusion(resultLists);
-    if (this._d.config.reranker && fused.length > 1) {
-      const scores = await this._d.config.reranker.rank(query, fused.map((r) => r.content));
-      return fused.map((r, i) => {
-        const w = i < 3 ? 0.75 : i < 10 ? 0.6 : 0.4;
-        return { ...r, score: w * r.score + (1 - w) * (scores[i] ?? 0) };
-      }).sort((a, b) => b.score - a.score);
-    }
-    return fused;
+  }
+  /** Apply reranking if a reranker is configured. */
+  async _applyReranking(query, fused) {
+    if (!this._d.config.reranker || fused.length <= 1) return fused;
+    const scores = await this._d.config.reranker.rank(query, fused.map((r) => r.content));
+    return fused.map((r, i) => {
+      const w = i < 3 ? 0.75 : i < 10 ? 0.6 : 0.4;
+      return { ...r, score: w * r.score + (1 - w) * (scores[i] ?? 0) };
+    }).sort((a, b) => b.score - a.score);
   }
   // ── Keyword ─────────────────────────────────────
-  searchBM25(query, options) {
+  async searchBM25(query, options) {
     return this._d.bm25?.search(query, options) ?? [];
   }
   rebuildFTS() {
-    this._d.bm25?.rebuild();
+    this._d.bm25?.rebuild?.();
   }
   // ── Context ─────────────────────────────────────
   async getContext(task, options = {}) {
@@ -1755,7 +1774,7 @@ ${body}`);
   }
 };
 
-// src/app/index-api.ts
+// src/core/index-api.ts
 var IndexAPI = class {
   constructor(_d) {
     this._d = _d;
@@ -1963,7 +1982,7 @@ function createWatcher(reindexFn, indexers, repoPath, options = {}) {
 }
 __name(createWatcher, "createWatcher");
 
-// src/app/brainbank.ts
+// src/brainbank.ts
 var BrainBank = class extends EventEmitter {
   static {
     __name(this, "BrainBank");
@@ -2018,10 +2037,10 @@ var BrainBank = class extends EventEmitter {
    * Only initializes registered modules.
    * Automatically called by index/search methods if not yet initialized.
    */
-  async initialize() {
+  async initialize(options = {}) {
     if (this._initialized) return;
     if (this._initPromise) return this._initPromise;
-    this._initPromise = this._runInitialize().catch((err) => {
+    this._initPromise = this._runInitialize(options).catch((err) => {
       for (const { hnsw } of this._sharedHnsw.values()) try {
         hnsw.reinit();
       } catch {
@@ -2045,9 +2064,9 @@ var BrainBank = class extends EventEmitter {
     });
     return this._initPromise;
   }
-  async _runInitialize() {
+  async _runInitialize(options = {}) {
     if (this._initialized) return;
-    const early = await earlyInit(this._config, (e, d) => this.emit(e, d));
+    const early = await earlyInit(this._config, (e, d) => this.emit(e, d), options);
     this._db = early.db;
     this._embedding = early.embedding;
     this._kvHnsw = early.kvHnsw;
@@ -2115,21 +2134,25 @@ var BrainBank = class extends EventEmitter {
   /** Register a document collection. */
   async addCollection(collection) {
     await this.initialize();
+    this._requireDocs("addCollection");
     this.indexer("docs").addCollection(collection);
   }
   /** Remove a collection and all its indexed data. */
   async removeCollection(name) {
     await this.initialize();
+    this._requireDocs("removeCollection");
     this.indexer("docs").removeCollection(name);
   }
   /** List all registered collections. */
   listCollections() {
     this._requireInit("listCollections");
+    this._requireDocs("listCollections");
     return this.indexer("docs").listCollections();
   }
   /** Index all (or specific) document collections. */
   async indexDocs(options = {}) {
     await this.initialize();
+    this._requireDocs("indexDocs");
     const results = await this.indexer("docs").indexCollections(options);
     this.emit("docsIndexed", results);
     return results;
@@ -2137,19 +2160,23 @@ var BrainBank = class extends EventEmitter {
   /** Search documents only. */
   async searchDocs(query, options) {
     await this.initialize();
+    if (!this.has("docs")) return [];
     return this.indexer("docs").search(query, options);
   }
   // ── Context metadata ─────────────────────────────
   /** Add context description for a collection path. */
   addContext(collection, path4, context) {
+    this._requireDocs("addContext");
     this.indexer("docs").addContext(collection, path4, context);
   }
   /** Remove context for a collection path. */
   removeContext(collection, path4) {
+    this._requireDocs("removeContext");
     this.indexer("docs").removeContext(collection, path4);
   }
   /** List all context entries. */
   listContexts() {
+    this._requireDocs("listContexts");
     return this.indexer("docs").listContexts();
   }
   // ── Search (delegated to SearchAPI) ─────────────
@@ -2185,7 +2212,7 @@ var BrainBank = class extends EventEmitter {
     return this._searchAPI.hybridSearch(query, options);
   }
   /** BM25 keyword search only (no embeddings needed). */
-  searchBM25(query, options) {
+  async searchBM25(query, options) {
     this._requireInit("searchBM25");
     return this._searchAPI.searchBM25(query, options);
   }
@@ -2197,20 +2224,15 @@ var BrainBank = class extends EventEmitter {
   // ── Queries ──────────────────────────────────────
   /** Get git history for a specific file. */
   async fileHistory(filePath, limit = 20) {
-    this.indexer("git");
     await this.initialize();
-    return this._db.prepare(`
-            SELECT c.short_hash, c.message, c.author, c.date, c.additions, c.deletions
-            FROM git_commits c
-            INNER JOIN commit_files cf ON c.id = cf.commit_id
-            WHERE cf.file_path LIKE ? AND c.is_merge = 0
-            ORDER BY c.timestamp DESC LIMIT ?
-        `).all(`%${filePath}%`, limit);
+    const gitPlugin = this.indexer("git");
+    return gitPlugin.fileHistory(filePath, limit);
   }
   /** Get co-edit suggestions for a file. */
   coEdits(filePath, limit = 5) {
     this._requireInit("coEdits");
-    return this.indexer("git").suggestCoEdits(filePath, limit);
+    const gitPlugin = this.indexer("git");
+    return gitPlugin.suggestCoEdits(filePath, limit);
   }
   // ── Stats ────────────────────────────────────────
   /** Get statistics for all loaded modules. */
@@ -2218,24 +2240,13 @@ var BrainBank = class extends EventEmitter {
     this._requireInit("stats");
     const result = {};
     if (this.has("code")) {
-      const sh = this._sharedHnsw.get("code");
-      result.code = {
-        files: this._db.prepare("SELECT COUNT(DISTINCT file_path) as c FROM code_chunks").get().c,
-        chunks: this._db.prepare("SELECT COUNT(*) as c FROM code_chunks").get().c,
-        hnswSize: sh?.hnsw.size ?? 0
-      };
+      result.code = this._registry.firstByType("code").stats();
     }
     if (this.has("git")) {
-      const sh = this._sharedHnsw.get("git");
-      result.git = {
-        commits: this._db.prepare("SELECT COUNT(*) as c FROM git_commits").get().c,
-        filesTracked: this._db.prepare("SELECT COUNT(DISTINCT file_path) as c FROM commit_files").get().c,
-        coEdits: this._db.prepare("SELECT COUNT(*) as c FROM co_edits").get().c,
-        hnswSize: sh?.hnsw.size ?? 0
-      };
+      result.git = this._registry.firstByType("git").stats();
     }
     if (this.has("docs")) {
-      result.documents = this.indexer("docs").stats();
+      result.documents = this._registry.firstByType("docs").stats();
     }
     return result;
   }
@@ -2282,6 +2293,8 @@ var BrainBank = class extends EventEmitter {
   close() {
     this._watcher?.close();
     for (const indexer of this._registry.all) indexer.close?.();
+    this._embedding?.close().catch(() => {
+    });
     this._db?.close();
     this._initialized = false;
     this._collections.clear();
@@ -2305,6 +2318,10 @@ var BrainBank = class extends EventEmitter {
     if (!this._initialized)
       throw new Error(`BrainBank: Not initialized. Call await brain.initialize() before ${method}().`);
   }
+  _requireDocs(method) {
+    if (!this.has("docs"))
+      throw new Error(`BrainBank: Docs indexer not loaded. Add .use(docs()) before calling ${method}().`);
+  }
 };
 
 export {
@@ -2314,9 +2331,9 @@ export {
   HNSWIndex,
   LocalEmbedding,
   searchMMR,
-  MultiIndexSearch,
-  BM25Search,
+  VectorSearch,
+  KeywordSearch,
   ContextBuilder,
   BrainBank
 };
-//# sourceMappingURL=chunk-ZJ5LLMGM.js.map
+//# sourceMappingURL=chunk-2BEWWQL2.js.map