@chiway/contextweaver 1.1.0 → 1.4.0

package/dist/{SearchService-MYPOCM3B.js → SearchService-OS7CYHNJ.js}

@@ -1,9 +1,13 @@
 import {
+  ChunkContentLoader,
+  bootstrap,
   getGraphExpander,
   getIndexer,
-  getVectorStore,
   scoreChunkTokenOverlap
-} from "./chunk-6QMYML5V.js";
+} from "./chunk-AB24E3Z7.js";
+import {
+  getVectorStore
+} from "./chunk-ZOMGPIU6.js";
 import {
   initDb,
   isChunksFtsInitialized,
@@ -11,15 +15,15 @@ import {
   searchChunksFts,
   searchFilesFts,
   segmentQuery
-} from "./chunk-6Z4JEEVJ.js";
+} from "./chunk-RGJSXUFS.js";
 import {
   isDebugEnabled,
   logger
-} from "./chunk-AMQQK4P7.js";
+} from "./chunk-JVKVSTQ3.js";
 import {
   getEmbeddingConfig,
   getRerankerConfig
-} from "./chunk-RJURH22T.js";
+} from "./chunk-SKBAE26T.js";
 
 // src/api/reranker.ts
 var RerankerClient = class {
@@ -350,6 +354,12 @@ var SearchService = class {
     this.indexer = await getIndexer(this.projectId, embeddingConfig.dimensions);
     this.vectorStore = await getVectorStore(this.projectId, embeddingConfig.dimensions);
     this.db = initDb(this.projectId);
+    try {
+      await bootstrap(this.db, this.vectorStore);
+    } catch (err) {
+      const error = err;
+      logger.warn({ error: error.message }, "bootstrap \u5931\u8D25\uFF0C\u7EE7\u7EED\u542F\u52A8");
+    }
   }
   // 公开接口
   /**
@@ -517,6 +527,20 @@ var SearchService = class {
     const allFilePaths = fileResults.map((r) => r.path);
     const chunksMap = await this.vectorStore?.getFilesChunks(allFilePaths);
     if (!chunksMap) return [];
+    const allChunkSlices = [];
+    for (const filePath of allFilePaths) {
+      const chunks = chunksMap.get(filePath);
+      if (!chunks) continue;
+      for (const c of chunks) {
+        allChunkSlices.push({
+          filePath: c.file_path,
+          start_index: c.start_index,
+          end_index: c.end_index
+        });
+      }
+    }
+    const contentLoader = new ChunkContentLoader(this.db);
+    const codeMap = contentLoader.loadMany(allChunkSlices);
     const allChunks = [];
     let totalChunks = 0;
     let skippedFiles = 0;
@@ -524,10 +548,19 @@ var SearchService = class {
       if (totalChunks >= this.config.lexTotalChunks) break;
       const chunks = chunksMap.get(filePath);
       if (!chunks || chunks.length === 0) continue;
-      const scoredChunks = chunks.map((chunk) => ({
-        chunk,
-        overlapScore: scoreChunkTokenOverlap(chunk, queryTokens)
-      }));
+      const scoredChunks = chunks.map((chunk) => {
+        const code = codeMap.get(
+          ChunkContentLoader.key({
+            filePath: chunk.file_path,
+            start_index: chunk.start_index,
+            end_index: chunk.end_index
+          })
+        ) ?? "";
+        return {
+          chunk,
+          overlapScore: scoreChunkTokenOverlap(chunk, code, queryTokens)
+        };
+      });
       const maxOverlap = Math.max(...scoredChunks.map((c) => c.overlapScore));
       if (maxOverlap === 0) {
         skippedFiles++;
@@ -647,12 +680,26 @@ var SearchService = class {
       return candidates;
     }
     const queryTokens = this.extractQueryTokens(query);
+    const loader = new ChunkContentLoader(this.db);
+    const codeMap = loader.loadMany(
+      candidates.map((c) => ({
+        filePath: c.filePath,
+        start_index: c.record.start_index,
+        end_index: c.record.end_index
+      }))
+    );
     const textExtractor = (chunk) => {
       const bc = this.truncateMiddle(chunk.record.breadcrumb, this.config.maxBreadcrumbChars);
+      const key = ChunkContentLoader.key({
+        filePath: chunk.filePath,
+        start_index: chunk.record.start_index,
+        end_index: chunk.record.end_index
+      });
+      const code = codeMap.get(key) ?? "";
       const budget = Math.max(0, this.config.maxRerankChars - bc.length - 1);
-      const code = this.extractAroundHit(chunk.record.display_code, queryTokens, budget);
+      const trimmed = this.extractAroundHit(code, queryTokens, budget);
       return `${bc}
-${code}`;
+${trimmed}`;
     };
     try {
       const reranked = await reranker.rerankWithData(query, candidates, textExtractor, {
@@ -883,4 +930,3 @@ ${code}`;
 export {
   SearchService
 };
-//# sourceMappingURL=SearchService-MYPOCM3B.js.map