grepmax 0.7.39 → 0.7.41

package/dist/commands/watch.js

@@ -58,6 +58,7 @@ const project_root_1 = require("../lib/utils/project-root");
 const watcher_registry_1 = require("../lib/utils/watcher-registry");
 const IDLE_TIMEOUT_MS = 30 * 60 * 1000; // 30 minutes
 const IDLE_CHECK_INTERVAL_MS = 60 * 1000; // check every minute
+const MAX_LOG_BYTES = 5 * 1024 * 1024; // 5 MB — rotate log when exceeded
 exports.watch = new commander_1.Command("watch")
     .description("Start background file watcher for live reindexing")
     .option("-b, --background", "Run watcher in background and exit")
@@ -84,6 +85,15 @@ exports.watch = new commander_1.Command("watch")
         fs.mkdirSync(logDir, { recursive: true });
         const safeName = projectName.replace(/[^a-zA-Z0-9._-]/g, "_");
         const logFile = path.join(logDir, `watch-${safeName}.log`);
+        // Rotate log if it exceeds MAX_LOG_BYTES
+        try {
+            const logStat = fs.statSync(logFile);
+            if (logStat.size > MAX_LOG_BYTES) {
+                const prev = `${logFile}.prev`;
+                fs.renameSync(logFile, prev);
+            }
+        }
+        catch (_c) { }
         const out = fs.openSync(logFile, "a");
         const child = (0, node_child_process_1.spawn)(process.argv[0], [process.argv[1], ...args], {
             detached: true,

package/dist/lib/index/watcher-batch.js

@@ -48,7 +48,7 @@ exports.computeRetryAction = computeRetryAction;
 const fs = __importStar(require("node:fs"));
 const cache_check_1 = require("../utils/cache-check");
 const file_utils_1 = require("../utils/file-utils");
-function processBatchCore(batch, metaCache, pool) {
+function processBatchCore(batch, metaCache, pool, signal) {
     return __awaiter(this, void 0, void 0, function* () {
         let reindexed = 0;
         const changedIds = [];
@@ -57,6 +57,8 @@ function processBatchCore(batch, metaCache, pool) {
         const metaUpdates = new Map();
         const metaDeletes = [];
         for (const [absPath, event] of batch) {
+            if (signal === null || signal === void 0 ? void 0 : signal.aborted)
+                break;
             if (event === "unlink") {
                 deletes.push(absPath);
                 metaDeletes.push(absPath);
@@ -74,7 +76,7 @@ function processBatchCore(batch, metaCache, pool) {
                 const result = yield pool.processFile({
                     path: absPath,
                     absolutePath: absPath,
-                });
+                }, signal);
                 const metaEntry = {
                     hash: result.hash,
                     mtimeMs: result.mtimeMs,

package/dist/lib/index/watcher.js

@@ -55,6 +55,7 @@ const logger_1 = require("../utils/logger");
 const lock_1 = require("../utils/lock");
 const pool_1 = require("../workers/pool");
 const llm_client_1 = require("../workers/summarize/llm-client");
+const watcher_batch_1 = require("./watcher-batch");
 // Chokidar ignored — must exclude heavy directories to keep FD count low.
 // On macOS, chokidar uses FSEvents (single FD) but falls back to fs.watch()
 // (one FD per directory) if FSEvents isn't available or for some subdirs.
@@ -85,6 +86,8 @@ function startWatcher(opts) {
     let processing = false;
     let closed = false;
     let consecutiveLockFailures = 0;
+    let currentBatchAc = null;
+    let summarizationAc = null;
     const MAX_RETRIES = 5;
     const watcher = (0, chokidar_1.watch)(projectRoot, {
         ignored: exports.WATCHER_IGNORE_PATTERNS,
@@ -112,19 +115,19 @@ function startWatcher(opts) {
     })();
     const BATCH_TIMEOUT_MS = Math.max(Math.ceil(taskTimeoutMs * 1.5), 120000);
     const processBatch = () => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         if (closed || processing || pending.size === 0)
             return;
         processing = true;
+        const batchAc = new AbortController();
+        currentBatchAc = batchAc;
         const batchTimeout = setTimeout(() => {
-            if (processing) {
-                console.error(`[${wtag}] Batch processing timed out after 120s, resetting`);
-                processing = false;
-            }
+            (0, logger_1.log)(wtag, `Batch timed out after ${BATCH_TIMEOUT_MS}ms, aborting`);
+            batchAc.abort();
         }, BATCH_TIMEOUT_MS);
         const batch = new Map(pending);
         pending.clear();
-        (0, logger_1.log)(wtag, `Processing ${batch.size} changed files`);
+        const filenames = [...batch.keys()].map((p) => path.basename(p));
+        (0, logger_1.log)(wtag, `Processing ${batch.size} changed files: ${filenames.join(", ")}`);
         const start = Date.now();
         let reindexed = 0;
         const changedIds = [];
@@ -140,6 +143,8 @@ function startWatcher(opts) {
                 const metaUpdates = new Map();
                 const metaDeletes = [];
                 for (const [absPath, event] of batch) {
+                    if (batchAc.signal.aborted)
+                        break;
                     if (event === "unlink") {
                         deletes.push(absPath);
                         metaDeletes.push(absPath);
@@ -159,7 +164,7 @@ function startWatcher(opts) {
                         const result = yield pool.processFile({
                             path: absPath,
                             absolutePath: absPath,
-                        });
+                        }, batchAc.signal);
                         const metaEntry = {
                             hash: result.hash,
                             mtimeMs: result.mtimeMs,
@@ -188,6 +193,8 @@ function startWatcher(opts) {
                         reindexed++;
                     }
                     catch (err) {
+                        if (batchAc.signal.aborted)
+                            break;
                         const code = err === null || err === void 0 ? void 0 : err.code;
                         if (code === "ENOENT") {
                             deletes.push(absPath);
@@ -243,23 +250,16 @@ function startWatcher(opts) {
                 consecutiveLockFailures++;
             }
             console.error(`[${wtag}] Batch processing failed:`, err);
-            let dropped = 0;
-            for (const [absPath, event] of batch) {
-                const count = ((_a = retryCount.get(absPath)) !== null && _a !== void 0 ? _a : 0) + 1;
-                if (count >= MAX_RETRIES) {
-                    retryCount.delete(absPath);
-                    dropped++;
-                }
-                else if (!pending.has(absPath)) {
+            const { requeued, dropped, backoffMs } = (0, watcher_batch_1.computeRetryAction)(batch, retryCount, MAX_RETRIES, isLockError, consecutiveLockFailures, DEBOUNCE_MS);
+            for (const [absPath, event] of requeued) {
+                if (!pending.has(absPath)) {
                     pending.set(absPath, event);
-                    retryCount.set(absPath, count);
                 }
             }
             if (dropped > 0) {
                 console.warn(`[${wtag}] Dropped ${dropped} file(s) after ${MAX_RETRIES} failed retries`);
             }
             if (pending.size > 0) {
-                const backoffMs = Math.min(DEBOUNCE_MS * Math.pow(2, consecutiveLockFailures), 30000);
                 if (debounceTimer)
                     clearTimeout(debounceTimer);
                 debounceTimer = setTimeout(() => processBatch(), backoffMs);
@@ -267,18 +267,24 @@ function startWatcher(opts) {
         }
         finally {
             clearTimeout(batchTimeout);
+            currentBatchAc = null;
             processing = false;
             // Process any events that came in while we were processing
             if (pending.size > 0) {
                 scheduleBatch();
             }
         }
-        // Fire-and-forget summarization — doesn't block the next batch
+        // Cancel previous summarization before starting a new one
+        summarizationAc === null || summarizationAc === void 0 ? void 0 : summarizationAc.abort();
+        summarizationAc = new AbortController();
+        const sumSignal = summarizationAc.signal;
         if (changedIds.length > 0) {
             (() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const table = yield vectorDb.ensureTable();
                     for (const id of changedIds) {
+                        if (sumSignal.aborted)
+                            break;
                         const escaped = (0, filter_builder_1.escapeSqlString)(id);
                         const rows = yield table
                             .query()
@@ -298,13 +304,15 @@ function startWatcher(opts) {
                                 file: String(r.path || ""),
                             },
                         ]);
+                        if (sumSignal.aborted)
+                            break;
                         if (summaries === null || summaries === void 0 ? void 0 : summaries[0]) {
                             yield vectorDb.updateRows([id], "summary", [summaries[0]]);
                         }
                     }
                 }
                 catch (_a) {
-                    // Summarizer unavailable — skip
+                    // Summarizer unavailable or aborted — skip
                 }
             }))();
         }
@@ -339,6 +347,8 @@ function startWatcher(opts) {
     return {
         close: () => __awaiter(this, void 0, void 0, function* () {
             closed = true;
+            currentBatchAc === null || currentBatchAc === void 0 ? void 0 : currentBatchAc.abort();
+            summarizationAc === null || summarizationAc === void 0 ? void 0 : summarizationAc.abort();
             if (debounceTimer)
                 clearTimeout(debounceTimer);
             clearInterval(ftsInterval);

package/dist/lib/workers/pool.js

@@ -317,9 +317,8 @@ class WorkerPool {
         }
         this.dispatch();
     }
-    processFile(input) {
-        // ProcessFile doesn't currently use cancellation, but we could add it later
-        return this.enqueue("processFile", input);
+    processFile(input, signal) {
+        return this.enqueue("processFile", input, signal);
     }
     encodeQuery(text, signal) {
         return this.enqueue("encodeQuery", { text }, signal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grepmax",
-  "version": "0.7.39",
+  "version": "0.7.41",
   "author": "Robert Owens <robowens@me.com>",
   "homepage": "https://github.com/reowens/grepmax",
   "bugs": {

package/plugins/grepmax/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "grepmax",
-  "version": "0.7.39",
+  "version": "0.7.41",
   "description": "Semantic code search for Claude Code. Automatically indexes your project and provides intelligent search capabilities.",
   "author": {
     "name": "Robert Owens",