opencode-rag-plugin 1.2.11 → 1.3.1

package/dist/retriever/retriever.js

@@ -6,11 +6,49 @@ export async function retrieve(query, embedder, store, options = {}) {
     if (!embedding || embedding.length === 0) {
         return [];
     }
-    // Guard against malformed provider output before searching.
     if (typeof embedding[0] !== "number") {
         return [];
     }
-    const results = await store.search(embedding, topK);
-    return results.filter((r) => r.score >= minScore);
+    const vectorFactor = 3;
+    const vectorResults = await store.search(embedding, topK * vectorFactor);
+    let keywordResults = [];
+    if (options.keywordIndex) {
+        keywordResults = options.keywordIndex.search(query, topK * vectorFactor);
+    }
+    if (keywordResults.length === 0) {
+        return vectorResults.filter((r) => r.score >= minScore);
+    }
+    const kwTopScore = keywordResults.length > 0 ? keywordResults[0].score : 1;
+    const combined = new Map();
+    for (const r of vectorResults) {
+        combined.set(r.chunk.id, {
+            chunk: r.chunk,
+            vScore: r.score,
+            kScore: 0,
+        });
+    }
+    for (const r of keywordResults) {
+        const existing = combined.get(r.chunk.id);
+        if (existing) {
+            existing.kScore = kwTopScore > 0 ? r.score / kwTopScore : 0;
+        }
+        else {
+            combined.set(r.chunk.id, {
+                chunk: r.chunk,
+                vScore: 0,
+                kScore: kwTopScore > 0 ? r.score / kwTopScore : 0,
+            });
+        }
+    }
+    const kw = options.keywordWeight ?? 0.4;
+    const combinedResults = [...combined.values()]
+        .map((entry) => ({
+        chunk: entry.chunk,
+        score: (1 - kw) * entry.vScore + kw * entry.kScore,
+    }))
+        .filter((r) => r.score >= minScore)
+        .sort((a, b) => b.score - a.score)
+        .slice(0, topK);
+    return combinedResults;
 }
 //# sourceMappingURL=retriever.js.map

package/dist/retriever/retriever.js.map

@@ -1 +1 @@
-{"version":3,"file":"retriever.js","sourceRoot":"","sources":["../../src/retriever/retriever.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,KAAa,EACb,QAA2B,EAC3B,KAAkB,EAClB,UAA2B,EAAE;IAE7B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;IAEvC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,4DAA4D;IAC5D,IAAI,OAAO,SAAS,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,SAAqB,EAAE,IAAI,CAAC,CAAC;IAChE,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"retriever.js","sourceRoot":"","sources":["../../src/retriever/retriever.ts"],"names":[],"mappings":"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"}

package/dist/watcher.d.ts

@@ -1,5 +1,5 @@
 import type { RagConfig } from "./core/config.js";
-import type { EmbeddingProvider, VectorStore } from "./core/interfaces.js";
+import type { EmbeddingProvider, KeywordIndex, VectorStore } from "./core/interfaces.js";
 export interface BackgroundIndexer {
     close(): Promise<void>;
 }
@@ -10,5 +10,6 @@ export interface CreateBackgroundIndexerOptions {
     store: VectorStore;
     embedder: EmbeddingProvider;
     logFilePath: string;
+    keywordIndex?: KeywordIndex;
 }
 export declare function createBackgroundIndexer(options: CreateBackgroundIndexerOptions): BackgroundIndexer;

package/dist/watcher.js

@@ -2,7 +2,7 @@ import chokidar from "chokidar";
 import { appendDebugLog } from "./core/fileLogger.js";
 import { createWatchPassScheduler, createWatchIgnore, runIndexPass, } from "./indexer.js";
 export function createBackgroundIndexer(options) {
-    const { cwd, storePath, config, store, embedder, logFilePath } = options;
+    const { cwd, storePath, config, store, embedder, logFilePath, keywordIndex } = options;
     // Fire-and-forget initial index pass
     runIndexPass({
         cwd,
@@ -10,6 +10,7 @@ export function createBackgroundIndexer(options) {
         config,
         store,
         embedder,
+        keywordIndex,
         logger: {
             //info: (message) => appendDebugLog(logFilePath, { scope: "autoIndex", message }),
             warn: (message) => appendDebugLog(logFilePath, { scope: "autoIndex", message }),
@@ -29,6 +30,7 @@ export function createBackgroundIndexer(options) {
                 config,
                 store,
                 embedder,
+                keywordIndex,
                 logger: {
                     //info: (message) => appendDebugLog(logFilePath, { scope: "autoIndex", message }),
                     warn: (message) => appendDebugLog(logFilePath, { scope: "autoIndex", message }),

package/dist/watcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-rag-plugin",
-  "version": "1.2.11",
+  "version": "1.3.1",
   "description": "OpenCode plugin for local-first RAG-based semantic code search",
   "type": "module",
   "main": "./dist/plugin-entry.js",