@hsingjui/contextweaver 0.0.4 → 0.0.5

package/dist/{SearchService-DYGJT2DZ.js → SearchService-SRT2KP6A.js}

@@ -1,7 +1,7 @@
 import {
   getIndexer,
   getVectorStore
-} from "./chunk-WWYSLCNZ.js";
+} from "./chunk-5MZUQNOD.js";
 import {
   initDb,
   isChunksFtsInitialized,

package/dist/{chunk-WWYSLCNZ.js → chunk-5MZUQNOD.js}

@@ -259,15 +259,21 @@ var ProgressTracker = class {
   startTime;
   lastLogTime = 0;
   logIntervalMs = 2e3;
-  // 每 3 秒输出一次
-  constructor(total) {
+  // 每 2 秒输出一次
+  onProgress;
+  /** 是否跳过日志（单批次时跳过，避免与索引日志混淆） */
+  skipLogs;
+  constructor(total, onProgress) {
     this.total = total;
     this.startTime = Date.now();
+    this.onProgress = onProgress;
+    this.skipLogs = total <= 1;
   }
   /** 记录一个批次完成 */
   recordBatch(tokens) {
     this.completed++;
     this.totalTokens += tokens;
+    this.onProgress?.(this.completed, this.total);
     const now = Date.now();
     if (now - this.lastLogTime >= this.logIntervalMs) {
       this.logProgress();
@@ -276,6 +282,7 @@ var ProgressTracker = class {
   }
   /** 输出进度 */
   logProgress() {
+    if (this.skipLogs) return;
     const elapsed = (Date.now() - this.startTime) / 1e3;
     const percent = Math.round(this.completed / this.total * 100);
     const rate = this.completed / elapsed;
@@ -293,6 +300,7 @@ var ProgressTracker = class {
   }
   /** 完成时输出最终统计 */
   complete() {
+    if (this.skipLogs) return;
     const elapsed = (Date.now() - this.startTime) / 1e3;
     logger.info(
       {
@@ -447,8 +455,9 @@ var EmbeddingClient = class {
    * 批量获取 Embedding
    * @param texts 待处理的文本数组
    * @param batchSize 每批次发送的文本数量（默认 20）
+   * @param onProgress 可选的进度回调 (completed, total) => void
    */
-  async embedBatch(texts, batchSize = 20) {
+  async embedBatch(texts, batchSize = 20, onProgress) {
     if (texts.length === 0) {
       return [];
     }
@@ -456,7 +465,7 @@ var EmbeddingClient = class {
     for (let i = 0; i < texts.length; i += batchSize) {
       batches.push(texts.slice(i, i + batchSize));
     }
-    const progress = new ProgressTracker(batches.length);
+    const progress = new ProgressTracker(batches.length, onProgress);
     const batchResults = await Promise.all(
       batches.map(
         (batch, batchIndex) => this.processWithRateLimit(batch, batchIndex * batchSize, progress)
@@ -625,8 +634,9 @@ var Indexer = class {
    *
    * @param db SQLite 数据库实例
    * @param results 文件处理结果
+   * @param onProgress 可选的进度回调 (indexed, total) => void
    */
-  async indexFiles(db, results) {
+  async indexFiles(db, results, onProgress) {
     if (!this.vectorStore) {
       await this.init();
     }
@@ -670,7 +680,7 @@ var Indexer = class {
       stats.deleted = toDelete.length;
     }
     if (toIndex.length > 0) {
-      const indexResult = await this.batchIndex(db, toIndex);
+      const indexResult = await this.batchIndex(db, toIndex, onProgress);
       stats.indexed = indexResult.success;
       stats.errors = indexResult.errors;
     }
@@ -694,7 +704,7 @@ var Indexer = class {
    * 3. FTS 写入批量化：N 次删除+插入 → 1 次批量删除 + 1 次批量插入
    * 4. 日志汇总化：逐文件日志 → 汇总日志
    */
-  async batchIndex(db, files) {
+  async batchIndex(db, files, onProgress) {
     if (files.length === 0) {
       return { success: 0, errors: 0 };
     }
@@ -715,7 +725,7 @@ var Indexer = class {
     logger.info({ count: allTexts.length, files: files.length }, "\u5F00\u59CB\u6279\u91CF Embedding");
     let embeddings;
     try {
-      const results = await this.embeddingClient.embedBatch(allTexts);
+      const results = await this.embeddingClient.embedBatch(allTexts, 20, onProgress);
       embeddings = results.map((r) => r.embedding);
     } catch (err) {
       const error = err;

package/dist/{chunk-QWQ64TBE.js → chunk-T337P433.js}

@@ -2,7 +2,7 @@ import {
   closeAllIndexers,
   closeAllVectorStores,
   getIndexer
-} from "./chunk-WWYSLCNZ.js";
+} from "./chunk-5MZUQNOD.js";
 import {
   batchDelete,
   batchUpdateMtime,
@@ -1065,15 +1065,12 @@ async function scan(rootPath, options = {}) {
     const scannedPaths = new Set(
       filePaths.map((p) => path3.relative(rootPath, p).replace(/\\/g, "/"))
     );
-    let processedCount = 0;
     const results = [];
     const batchSize = 100;
     for (let i = 0; i < filePaths.length; i += batchSize) {
       const batch = filePaths.slice(i, i + batchSize);
       const batchResults = await processFiles(rootPath, batch, knownFiles);
       results.push(...batchResults);
-      processedCount += batch.length;
-      options.onProgress?.(processedCount, filePaths.length);
     }
     const toAdd = [];
     const toUpdateMtime = [];
@@ -1124,15 +1121,19 @@ async function scan(rootPath, options = {}) {
       errors: results.filter((r) => r.status === "error").length
     };
     if (options.vectorIndex !== false) {
+      options.onProgress?.(45, 100, "\u6B63\u5728\u51C6\u5907\u5411\u91CF\u7D22\u5F15...");
       const embeddingConfig = getEmbeddingConfig();
       const indexer = await getIndexer(projectId, embeddingConfig.dimensions);
       const needsVectorIndex = results.filter(
         (r) => r.status === "added" || r.status === "modified"
       );
       const healingPathSet = new Set(getFilesNeedingVectorIndex(db));
-      const healingFiles = results.filter((r) => r.status === "unchanged" && healingPathSet.has(r.relPath)).map((r) => ({ ...r, status: "modified" }));
-      if (healingFiles.length > 0) {
-        logger.info({ count: healingFiles.length }, "\u81EA\u6108\uFF1A\u53D1\u73B0\u9700\u8981\u8865\u7D22\u5F15\u7684\u6587\u4EF6");
+      const healingFilePaths = results.filter((r) => r.status === "unchanged" && healingPathSet.has(r.relPath)).map((r) => r.absPath);
+      let healingFiles = [];
+      if (healingFilePaths.length > 0) {
+        logger.info({ count: healingFilePaths.length }, "\u81EA\u6108\uFF1A\u53D1\u73B0\u9700\u8981\u8865\u7D22\u5F15\u7684\u6587\u4EF6");
+        const processedHealingFiles = await processFiles(rootPath, healingFilePaths, /* @__PURE__ */ new Map());
+        healingFiles = processedHealingFiles.filter((r) => r.status === "added" || r.status === "modified").map((r) => ({ ...r, status: "modified" }));
       }
       const deletedResults = deletedPaths.map((path4) => ({
         absPath: "",
@@ -1147,7 +1148,11 @@ async function scan(rootPath, options = {}) {
       }));
       const allToIndex = [...needsVectorIndex, ...healingFiles, ...deletedResults];
       if (allToIndex.length > 0) {
-        const indexStats = await indexer.indexFiles(db, allToIndex);
+        options.onProgress?.(45, 100, `\u6B63\u5728\u751F\u6210\u5411\u91CF\u5D4C\u5165... (${allToIndex.length} \u4E2A\u6587\u4EF6)`);
+        const indexStats = await indexer.indexFiles(db, allToIndex, (completed, total) => {
+          const progress = 45 + Math.floor(completed / total * 54);
+          options.onProgress?.(progress, 100, `\u6B63\u5728\u751F\u6210\u5411\u91CF\u5D4C\u5165... (${completed}/${total} \u6279\u6B21)`);
+        });
         stats.vectorIndex = {
           indexed: indexStats.indexed,
           deleted: indexStats.deleted,
@@ -1155,6 +1160,7 @@ async function scan(rootPath, options = {}) {
         };
       }
     }
+    options.onProgress?.(100, 100, "\u7D22\u5F15\u5B8C\u6210");
     return stats;
   } finally {
     closeDb(db);

package/dist/{chunk-O3HDM3CF.js → chunk-XHJNV3MK.js}

@@ -67,9 +67,9 @@ function isProjectIndexed(projectId) {
   const dbPath = path.join(BASE_DIR, projectId, "index.db");
   return fs.existsSync(dbPath);
 }
-async function ensureIndexed(repoPath, projectId) {
+async function ensureIndexed(repoPath, projectId, onProgress) {
   const { withLock } = await import("./lock-PX2BX2YN.js");
-  const { scan } = await import("./scanner-HYP3L57R.js");
+  const { scan } = await import("./scanner-7AZ4CHAR.js");
   await withLock(projectId, "index", async () => {
     const wasIndexed = isProjectIndexed(projectId);
     if (!wasIndexed) {
@@ -77,11 +77,12 @@ async function ensureIndexed(repoPath, projectId) {
         { repoPath, projectId: projectId.slice(0, 10) },
         "\u4EE3\u7801\u5E93\u672A\u521D\u59CB\u5316\uFF0C\u5F00\u59CB\u9996\u6B21\u7D22\u5F15..."
       );
+      onProgress?.(0, 100, "\u4EE3\u7801\u5E93\u672A\u7D22\u5F15\uFF0C\u5F00\u59CB\u9996\u6B21\u7D22\u5F15...");
     } else {
       logger.debug({ projectId: projectId.slice(0, 10) }, "\u6267\u884C\u589E\u91CF\u7D22\u5F15...");
     }
     const startTime = Date.now();
-    const stats = await scan(repoPath, { vectorIndex: true });
+    const stats = await scan(repoPath, { vectorIndex: true, onProgress });
     const elapsed = Date.now() - startTime;
     logger.info(
       {
@@ -98,7 +99,7 @@ async function ensureIndexed(repoPath, projectId) {
     );
   });
 }
-async function handleCodebaseRetrieval(args, configOverride = ZEN_CONFIG_OVERRIDE) {
+async function handleCodebaseRetrieval(args, configOverride = ZEN_CONFIG_OVERRIDE, onProgress) {
   const { repo_path, information_request, technical_terms } = args;
   logger.info(
     {
@@ -118,7 +119,7 @@ async function handleCodebaseRetrieval(args, configOverride = ZEN_CONFIG_OVERRID
     return formatEnvMissingResponse(allMissingVars);
   }
   const projectId = generateProjectId(repo_path);
-  await ensureIndexed(repo_path, projectId);
+  await ensureIndexed(repo_path, projectId, onProgress);
   const query = [information_request, ...technical_terms || []].filter(Boolean).join(" ");
   logger.info(
     {
@@ -128,7 +129,7 @@ async function handleCodebaseRetrieval(args, configOverride = ZEN_CONFIG_OVERRID
     },
     "MCP \u67E5\u8BE2\u6784\u5EFA"
   );
-  const { SearchService } = await import("./SearchService-DYGJT2DZ.js");
+  const { SearchService } = await import("./SearchService-SRT2KP6A.js");
   const service = new SearchService(projectId, repo_path, configOverride);
   await service.init();
   logger.debug("SearchService \u521D\u59CB\u5316\u5B8C\u6210");
@@ -176,16 +177,16 @@ async function handleCodebaseRetrieval(args, configOverride = ZEN_CONFIG_OVERRID
     },
     "MCP codebase-retrieval \u5B8C\u6210"
   );
-  return formatMcpResponse(contextPack, information_request);
+  return formatMcpResponse(contextPack);
 }
-function formatMcpResponse(pack, originalRequest) {
+function formatMcpResponse(pack) {
   const { files, seeds } = pack;
   const fileBlocks = files.map((file) => {
     const segments = file.segments.map((seg) => formatSegment(seg)).join("\n\n");
     return segments;
   }).join("\n\n---\n\n");
   const summary = [
-    `Found ${seeds.length} relevant code blocks for: "${originalRequest}"`,
+    `Found ${seeds.length} relevant code blocks`,
     `Files: ${files.length}`,
     `Total segments: ${files.reduce((acc, f) => acc + f.segments.length, 0)}`
   ].join(" | ");

package/dist/{codebaseRetrieval-AV4GK6FT.js → codebaseRetrieval-7SCFUVKL.js}

@@ -1,7 +1,7 @@
 import {
   codebaseRetrievalSchema,
   handleCodebaseRetrieval
-} from "./chunk-O3HDM3CF.js";
+} from "./chunk-XHJNV3MK.js";
 import "./chunk-VW5RACJC.js";
 import "./chunk-C7XDGBT5.js";
 import "./chunk-SKBAE26T.js";

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   scan
-} from "./chunk-QWQ64TBE.js";
-import "./chunk-WWYSLCNZ.js";
+} from "./chunk-T337P433.js";
+import "./chunk-5MZUQNOD.js";
 import {
   generateProjectId
 } from "./chunk-VW5RACJC.js";
@@ -82,9 +82,15 @@ cli.command("index [path]", "\u626B\u63CF\u4EE3\u7801\u5E93\u5E76\u5EFA\u7ACB\u7
   try {
     const stats = await scan(rootPath, {
       force: options.force,
-      onProgress: (current, total) => {
-        const percent = (current / total * 100).toFixed(1);
-        logger.info({ current, total, percent: `${percent}%` }, "\u626B\u63CF\u8FDB\u5EA6");
+      onProgress: (current, total, message) => {
+        if (total !== void 0) {
+          const percent = (current / total * 100).toFixed(1);
+          logger.info({ current, total, percent: `${percent}%`, message }, "\u626B\u63CF\u8FDB\u5EA6");
+        } else if (message) {
+          logger.info({ current, message }, "\u626B\u63CF\u8FDB\u5EA6");
+        } else {
+          logger.info({ current }, "\u626B\u63CF\u8FDB\u5EA6");
+        }
       }
     });
     process.stdout.write("\n");
@@ -105,7 +111,7 @@ cli.command("index [path]", "\u626B\u63CF\u4EE3\u7801\u5E93\u5E76\u5EFA\u7ACB\u7
   }
 });
 cli.command("mcp", "\u542F\u52A8 MCP \u670D\u52A1\u5668").action(async () => {
-  const { startMcpServer } = await import("./server-7PYHHTOM.js");
+  const { startMcpServer } = await import("./server-GSXFZX6I.js");
   try {
     await startMcpServer();
   } catch (err) {
@@ -127,7 +133,7 @@ cli.command("search", "\u672C\u5730\u68C0\u7D22\uFF08\u53C2\u6570\u5BF9\u9F50 MC
     }
     const technicalTerms = (options.technicalTerms || "").split(",").map((t) => t.trim()).filter(Boolean);
     const useZen = options.zen !== false;
-    const { handleCodebaseRetrieval } = await import("./codebaseRetrieval-AV4GK6FT.js");
+    const { handleCodebaseRetrieval } = await import("./codebaseRetrieval-7SCFUVKL.js");
     const response = await handleCodebaseRetrieval(
       {
         repo_path: repoPath,

package/dist/{scanner-HYP3L57R.js → scanner-7AZ4CHAR.js}

@@ -1,7 +1,7 @@
 import {
   scan
-} from "./chunk-QWQ64TBE.js";
-import "./chunk-WWYSLCNZ.js";
+} from "./chunk-T337P433.js";
+import "./chunk-5MZUQNOD.js";
 import "./chunk-VW5RACJC.js";
 import "./chunk-C7XDGBT5.js";
 import "./chunk-SKBAE26T.js";

package/dist/{server-7PYHHTOM.js → server-GSXFZX6I.js}

@@ -1,7 +1,7 @@
 import {
   codebaseRetrievalSchema,
   handleCodebaseRetrieval
-} from "./chunk-O3HDM3CF.js";
+} from "./chunk-XHJNV3MK.js";
 import "./chunk-VW5RACJC.js";
 import {
   logger
@@ -94,14 +94,31 @@ async function startMcpServer() {
     logger.debug("\u6536\u5230 list_tools \u8BF7\u6C42");
     return { tools: TOOLS };
   });
-  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
     const { name, arguments: args } = request.params;
     logger.info({ tool: name }, "\u6536\u5230 call_tool \u8BF7\u6C42");
+    const rawToken = extra._meta?.progressToken;
+    const progressToken = typeof rawToken === "string" || typeof rawToken === "number" ? rawToken : void 0;
+    const onProgress = progressToken ? async (current, total, message) => {
+      try {
+        await extra.sendNotification({
+          method: "notifications/progress",
+          params: {
+            progressToken,
+            progress: current,
+            total,
+            message
+          }
+        });
+      } catch (err) {
+        logger.debug({ error: err.message }, "\u53D1\u9001\u8FDB\u5EA6\u901A\u77E5\u5931\u8D25");
+      }
+    } : void 0;
     try {
       switch (name) {
         case "codebase-retrieval": {
           const parsed = codebaseRetrievalSchema.parse(args);
-          return await handleCodebaseRetrieval(parsed);
+          return await handleCodebaseRetrieval(parsed, void 0, onProgress);
         }
         default:
           throw new Error(`Unknown tool: ${name}`);
@@ -121,8 +138,8 @@ async function startMcpServer() {
     }
   });
   const transport = new StdioServerTransport();
-  await server.connect(transport);
   logger.info("MCP \u670D\u52A1\u5668\u5DF2\u542F\u52A8\uFF0C\u7B49\u5F85\u8FDE\u63A5...");
+  await server.connect(transport);
 }
 export {
   startMcpServer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hsingjui/contextweaver",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A context weaving tool for LLMs",
   "license": "MIT",
   "author": "hsingjui",