grepmax 0.26.67 → 0.26.68

package/.claude-plugin/marketplace.json

@@ -10,7 +10,7 @@
       "name": "grepmax",
       "source": "./plugins/grepmax",
       "description": "Semantic code search for Claude Code. Automatically indexes your project and provides intelligent search capabilities.",
-      "version": "0.26.67",
+      "version": "0.26.68",
       "author": {
         "name": "Robert Owens",
         "email": "robowens@me.com"

package/README.md

@@ -240,7 +240,7 @@ gmax status                   # See all projects + watcher status
 
 Adding or indexing a project can start the daemon automatically. MCP acquires primary-project watch leases lazily when an index-reading tool is used; discovery and catalog listing start no background work. It shuts down after 4 hours of inactivity, and hands off to a fresh daemon after 24 hours or once its memory footprint passes 2.5 GB. File-change batches are processed on up to four worker processes by default, added only when work backs up, with one kept free for searches; full-table compaction and new FTS/ANN index builds are disabled by containment. Existing indexes remain readable. Host safety stops persist across restart and block heavy operations.
 
-`gmax watch status` reports failed files, native watcher recovery or polling, dropped-event counts, and the last complete filesystem reconciliation. FSEvents dropped-event warnings keep the native stream attached and preserve the accompanying events. A reconciliation covers the gap; repeated warnings coalesce into one later scan, with a 30-second scan interval. Recovery stays visible until a complete scan covers the latest gap. Other backend errors still trigger subscription recovery; repeated terminal failures fall back to five-minute polling, where recent edits can lag. Search and MCP responses retain health warnings even after the file queue drains. A complete reconciliation means the filesystem scan completed; queued embedding work can still be pending.
+`gmax watch status` reports failed files, native watcher recovery or polling, dropped-event counts, and the last complete filesystem reconciliation. FSEvents dropped-event warnings keep the native stream attached and preserve the accompanying events. A reconciliation covers the gap; repeated warnings coalesce into one later scan, with a 30-second scan interval. Recovery stays visible until a complete scan covers the latest gap. Other backend errors still trigger subscription recovery; repeated terminal failures fall back to five-minute polling, where recent edits can lag. Search and MCP responses retain health warnings even after the file queue drains. Live edit batches can run during reconciliation instead of waiting for the full filesystem walk. Whole-project reindex and removal still quiesce the watcher and drain its work before changing the project. A complete reconciliation means the filesystem scan completed; queued embedding work can still be pending.
 
 Live filesystem edits take priority over background catchup and cleanup. Background batches dispatch one file at a time, with at most four catchup files or 50 cleanup paths. They yield between files when a live edit arrives or the two-second dispatch window is reached; an active file or store commit finishes before yielding. Catchup and cleanup alternate, and one background file is admitted after three consecutive live batches so cleanup continues during sustained editing. Existing retry backoff and worker limits remain in effect.
 

package/dist/lib/daemon/daemon.js

@@ -192,7 +192,14 @@ class Daemon {
             evictSearcher: (root) => {
                 this.searchers.delete(root);
             },
-            runProjectOperation: (root, name, signal, fn) => this.withProjectLock(root, signal, () => this.runSharedOperation(name, signal, fn)),
+            runProjectOperation: (root, name, signal, fn) => {
+                // A filesystem walk can take minutes. Keep it lifecycle-tracked and
+                // admitted, but let live batches hold the project's write lock while
+                // the scan yields. Project removal/reindex quiesces the watcher first.
+                if (name === "watch-catchup")
+                    return this.runSharedOperation(name, signal, fn);
+                return this.withProjectLock(root, signal, () => this.runSharedOperation(name, signal, fn));
+            },
         });
         this.projectMutex = new keyed_mutex_1.KeyedMutex();
         // Tests construct daemons against the real HOME; keep their leases in memory.
@@ -1237,7 +1244,15 @@ class Daemon {
             this.vectorDb.pauseMaintenanceLoop();
             const stopHeartbeat = (0, ipc_handler_1.startHeartbeat)(conn);
             let lastProgressTime = 0;
+            const wasWatching = this.processors.has(root);
+            let watcherQuiesced = false;
             try {
+                // Re-adding a watched project is also a full sync. A catchup scan no
+                // longer holds the write lock, so explicitly drain it before syncing.
+                if (wasWatching) {
+                    yield this.unwatchProjectWithinOperation(root);
+                    watcherQuiesced = true;
+                }
                 const result = yield (0, syncer_1.initialSync)({
                     projectRoot: root,
                     vectorDb: this.vectorDb,
@@ -1287,6 +1302,7 @@ class Daemon {
                     });
                 }
                 yield this.watchProjectWithinOperation(root);
+                watcherQuiesced = false;
                 (0, ipc_handler_1.writeDone)(conn, {
                     ok: true,
                     processed: result.processed,
@@ -1316,6 +1332,15 @@ class Daemon {
             }
             finally {
                 stopHeartbeat();
+                if (watcherQuiesced && !this.shuttingDown) {
+                    try {
+                        this.assertHeavyOperationAdmission("watch");
+                        yield this.watchProjectWithinOperation(root);
+                    }
+                    catch (error) {
+                        console.error("[daemon] Could not restore watcher after add:", error);
+                    }
+                }
                 (_a = this.vectorDb) === null || _a === void 0 ? void 0 : _a.resumeMaintenanceLoop();
             }
         });

package/dist/lib/daemon/watcher-manager.js

@@ -653,6 +653,7 @@ class WatcherManager {
                             // Fast path: if only mtime changed but size is identical and we have a hash,
                             // just verify the hash in-process instead of sending to a worker.
                             if ((cached === null || cached === void 0 ? void 0 : cached.hash) && cached.size === stats.size) {
+                                const observed = Object.assign({}, cached);
                                 const snapshot = yield (0, file_utils_1.readFileSnapshot)(absPath, {
                                     projectRoot: root,
                                 });
@@ -664,11 +665,21 @@ class WatcherManager {
                                     continue;
                                 }
                                 const hash = (0, file_utils_1.computeContentHash)(snapshot.buffer, absPath);
-                                if (hash === cached.hash) {
+                                if (hash === observed.hash) {
                                     // Content unchanged — update mtime in cache and skip worker
                                     if (signal.aborted)
                                         return false;
-                                    metaCache.put(absPath, Object.assign(Object.assign({}, cached), { mtimeMs: stats.mtimeMs }));
+                                    // A live batch can finish while this read yields. Never replace
+                                    // newer metadata or resurrect a cache entry it removed.
+                                    const current = metaCache.get(absPath);
+                                    if (current &&
+                                        current.hash === observed.hash &&
+                                        current.mtimeMs === observed.mtimeMs &&
+                                        current.size === observed.size &&
+                                        current.hashVersion === observed.hashVersion &&
+                                        current.hasVectors === observed.hasVectors) {
+                                        metaCache.put(absPath, Object.assign(Object.assign({}, observed), { mtimeMs: stats.mtimeMs }));
+                                    }
                                     skipped++;
                                     continue;
                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grepmax",
-  "version": "0.26.67",
+  "version": "0.26.68",
   "author": "Robert Owens <78518764+reowens@users.noreply.github.com>",
   "homepage": "https://github.com/reowens/grepmax",
   "bugs": {

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

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