grepmax 0.16.6 → 0.16.9

package/dist/commands/watch.js

@@ -309,14 +309,28 @@ exports.watch
     var _a;
     const { isDaemonRunning, sendDaemonCommand } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/daemon-client")));
     let stoppedDaemon = false;
+    let daemonPid;
     // Try shutting down daemon first
     if (yield isDaemonRunning()) {
+        // Capture PID before IPC shutdown so the --all loop below can skip the
+        // daemon's own watcher-store entries (it registers itself under every
+        // watched project's PID — racing killProcess against the in-flight
+        // graceful shutdown is what produced "did not exit after SIGKILL"
+        // storms and the orphaned pid/sock/lock files this code path used to
+        // leave behind).
+        try {
+            const pidRaw = yield fs.promises.readFile(config_1.PATHS.daemonPidFile, "utf-8");
+            const parsed = parseInt(pidRaw.trim(), 10);
+            if (Number.isFinite(parsed) && parsed > 0)
+                daemonPid = parsed;
+        }
+        catch (_b) { }
         let parentCmd = "?";
         try {
             const { execSync } = yield Promise.resolve().then(() => __importStar(require("node:child_process")));
             parentCmd = execSync(`ps -o command= -p ${process.ppid}`, { encoding: "utf8" }).trim();
         }
-        catch (_b) { }
+        catch (_c) { }
         yield sendDaemonCommand({
             cmd: "shutdown",
             reason: "gmax-watch-stop",
@@ -325,20 +339,38 @@ exports.watch
             from_argv: process.argv.slice(0, 4),
             from_parent_cmd: parentCmd,
         });
+        // Wait for the daemon to actually exit before we start killing watcher
+        // entries — many of those entries share the daemon's PID. Poll for up
+        // to 10s; shutdown work can take a few seconds on large indexes.
+        if (daemonPid) {
+            for (let i = 0; i < 100; i++) {
+                if (!(0, watcher_store_1.isProcessRunning)(daemonPid))
+                    break;
+                yield new Promise((r) => setTimeout(r, 100));
+            }
+        }
         console.log("Daemon stopped.");
         stoppedDaemon = true;
     }
     if (options.all) {
         const watchers = (0, watcher_store_1.listWatchers)();
+        const seenPids = new Set();
+        let projectStops = 0;
         for (const w of watchers) {
+            if (daemonPid && w.pid === daemonPid)
+                continue;
+            if (seenPids.has(w.pid))
+                continue;
+            seenPids.add(w.pid);
             const killed = yield (0, process_1.killProcess)(w.pid);
             (0, watcher_store_1.unregisterWatcher)(w.pid);
+            projectStops++;
             if (!killed) {
                 console.warn(`Warning: PID ${w.pid} did not exit after SIGKILL`);
             }
         }
-        if (watchers.length > 0) {
-            console.log(`Stopped ${watchers.length} per-project watcher(s).`);
+        if (projectStops > 0) {
+            console.log(`Stopped ${projectStops} per-project watcher(s).`);
         }
         else if (!stoppedDaemon) {
             console.log("No running watchers.");

package/dist/lib/daemon/daemon.js

@@ -1310,6 +1310,24 @@ class Daemon {
                 return;
             this.shuttingDown = true;
             console.log("[daemon] Shutting down...");
+            // Drop external liveness markers FIRST so the next daemon start isn't
+            // fooled by leftover state if the long cleanup below is interrupted
+            // (uncaught exception, second SIGTERM, OOM kill mid-shutdown). The
+            // fresh-lock check in isDaemonHeartbeatFresh keyed on these — orphans
+            // here used to cause silent no-op spawns for up to 150s.
+            try {
+                fs.unlinkSync(config_1.PATHS.daemonSocket);
+            }
+            catch (_e) { }
+            try {
+                fs.unlinkSync(config_1.PATHS.daemonPidFile);
+            }
+            catch (_f) { }
+            if (this.releaseLock) {
+                const release = this.releaseLock;
+                this.releaseLock = null;
+                release().catch(() => { });
+            }
             if (this.heartbeatInterval)
                 clearInterval(this.heartbeatInterval);
             if (this.idleInterval)
@@ -1332,7 +1350,7 @@ class Daemon {
             try {
                 yield ((_a = this.llmServer) === null || _a === void 0 ? void 0 : _a.stop());
             }
-            catch (_e) { }
+            catch (_g) { }
             // Stop MLX embed server if we started it
             this.stopMlxServer();
             // Destroy worker pool to prevent orphaned child processes
@@ -1340,7 +1358,7 @@ class Daemon {
                 try {
                     yield (0, pool_1.destroyWorkerPool)();
                 }
-                catch (_f) { }
+                catch (_h) { }
             }
             // Stop poll intervals + their FSEvents recovery probes
             for (const interval of this.pollIntervals.values()) {
@@ -1356,26 +1374,11 @@ class Daemon {
                 try {
                     yield sub.unsubscribe();
                 }
-                catch (_g) { }
+                catch (_j) { }
             }
             this.subscriptions.clear();
-            // Close server + socket + PID file + lock
+            // Close server (socket/pid/lock already dropped at the top of shutdown)
             (_b = this.server) === null || _b === void 0 ? void 0 : _b.close();
-            try {
-                fs.unlinkSync(config_1.PATHS.daemonSocket);
-            }
-            catch (_h) { }
-            try {
-                fs.unlinkSync(config_1.PATHS.daemonPidFile);
-            }
-            catch (_j) { }
-            if (this.releaseLock) {
-                try {
-                    yield this.releaseLock();
-                }
-                catch (_k) { }
-                this.releaseLock = null;
-            }
             // Unregister all
             for (const root of this.processors.keys()) {
                 (0, watcher_store_1.unregisterWatcherByRoot)(root);
@@ -1386,11 +1389,11 @@ class Daemon {
             try {
                 yield ((_c = this.metaCache) === null || _c === void 0 ? void 0 : _c.close());
             }
-            catch (_l) { }
+            catch (_k) { }
             try {
                 yield ((_d = this.vectorDb) === null || _d === void 0 ? void 0 : _d.close());
             }
-            catch (_m) { }
+            catch (_l) { }
             console.log("[daemon] Shutdown complete");
         });
     }

package/dist/lib/utils/daemon-client.js

@@ -122,13 +122,30 @@ function isDaemonRunning(opts) {
  * Lock-file-based liveness probe. A running daemon refreshes daemon.lock's
  * mtime every 60s via its heartbeat loop; a fresh mtime means the daemon is
  * alive even if its socket ping times out under load.
+ *
+ * A fresh mtime alone is not proof of life — a SIGKILL'd (or OOM-killed,
+ * panicked, power-lost) daemon leaves the lock file behind with its last
+ * heartbeat mtime, fooling this check for up to HEARTBEAT_FRESH_THRESHOLD_MS.
+ * Cross-check that the PID file points at an actually-running process.
  */
 function isDaemonHeartbeatFresh() {
     try {
         const stats = fs.statSync(config_1.PATHS.daemonLockFile);
-        return Date.now() - stats.mtimeMs < HEARTBEAT_FRESH_THRESHOLD_MS;
+        if (Date.now() - stats.mtimeMs >= HEARTBEAT_FRESH_THRESHOLD_MS)
+            return false;
+        const pidRaw = fs.readFileSync(config_1.PATHS.daemonPidFile, "utf-8").trim();
+        const pid = parseInt(pidRaw, 10);
+        if (!Number.isFinite(pid) || pid <= 0)
+            return false;
+        try {
+            process.kill(pid, 0);
+            return true;
+        }
+        catch (_a) {
+            return false;
+        }
     }
-    catch (_a) {
+    catch (_b) {
         return false;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grepmax",
-  "version": "0.16.6",
+  "version": "0.16.9",
   "author": "Robert Owens <78518764+reowens@users.noreply.github.com>",
   "homepage": "https://github.com/reowens/grepmax",
   "bugs": {
@@ -14,6 +14,27 @@
   "bin": {
     "gmax": "dist/index.js"
   },
+  "scripts": {
+    "postinstall": "node scripts/postinstall.js",
+    "prebuild": "mkdir -p dist",
+    "build": "tsc",
+    "postbuild": "chmod +x dist/index.js",
+    "dev": "npx tsc && node dist/index.js",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "benchmark": "./run-benchmark.sh",
+    "benchmark:index": "./run-benchmark.sh $HOME/gmax-benchmarks --index",
+    "benchmark:agent": "npx tsx src/bench/benchmark-agent.ts",
+    "benchmark:chart": "npx tsx src/bench/generate-benchmark-chart.ts",
+    "format": "biome check --write .",
+    "format:check": "biome check .",
+    "lint": "biome lint .",
+    "typecheck": "tsc --noEmit",
+    "prepublishOnly": "pnpm build",
+    "preversion": "pnpm test && pnpm typecheck",
+    "version": "bash scripts/sync-versions.sh && git add -A",
+    "postversion": "git push origin main && git push origin v$npm_package_version && gh release create v$npm_package_version --generate-notes --title v$npm_package_version && sleep 5 && gh run watch $(gh run list --workflow=release.yml --branch v$npm_package_version --limit 1 --json databaseId --jq '.[0].databaseId') --exit-status && sleep 30 && npm cache clean --force && npm install -g grepmax@$npm_package_version"
+  },
   "keywords": [
     "grepmax",
     "grep",
@@ -65,25 +86,5 @@
     "typescript": "^6.0.2",
     "vite": "^8.0.3",
     "vitest": "^4.1.2"
-  },
-  "scripts": {
-    "postinstall": "node scripts/postinstall.js",
-    "prebuild": "mkdir -p dist",
-    "build": "tsc",
-    "postbuild": "chmod +x dist/index.js",
-    "dev": "npx tsc && node dist/index.js",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "benchmark": "./run-benchmark.sh",
-    "benchmark:index": "./run-benchmark.sh $HOME/gmax-benchmarks --index",
-    "benchmark:agent": "npx tsx src/bench/benchmark-agent.ts",
-    "benchmark:chart": "npx tsx src/bench/generate-benchmark-chart.ts",
-    "format": "biome check --write .",
-    "format:check": "biome check .",
-    "lint": "biome lint .",
-    "typecheck": "tsc --noEmit",
-    "preversion": "pnpm test && pnpm typecheck",
-    "version": "bash scripts/sync-versions.sh && git add -A",
-    "postversion": "git push origin main && git push origin v$npm_package_version && gh release create v$npm_package_version --generate-notes --title v$npm_package_version && sleep 5 && gh run watch $(gh run list --workflow=release.yml --branch v$npm_package_version --limit 1 --json databaseId --jq '.[0].databaseId') --exit-status && sleep 30 && npm cache clean --force && npm install -g grepmax@$npm_package_version"
   }
-}
+}

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

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