grepmax 0.16.6 → 0.16.10

package/dist/commands/watch.js

@@ -119,7 +119,6 @@ exports.watch = new commander_1.Command("watch")
             process.exit(0);
         }
         // Daemon foreground
-        (0, watcher_store_1.migrateFromJson)();
         const { Daemon } = yield Promise.resolve().then(() => __importStar(require("../lib/daemon/daemon")));
         const daemon = new Daemon();
         try {
@@ -176,8 +175,6 @@ exports.watch = new commander_1.Command("watch")
         process.exit(0);
     }
     // --- Per-project foreground mode ---
-    // Migrate legacy watchers.json to LMDB on first use
-    (0, watcher_store_1.migrateFromJson)();
     // Watcher requires project to be registered
     if (!(0, project_registry_1.getProject)(projectRoot)) {
         console.error(`[watch:${projectName}] Project not registered. Run: gmax add ${projectRoot}`);
@@ -309,14 +306,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 +336,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

@@ -398,11 +398,11 @@ class Daemon {
             });
             this.processors.set(root, processor);
             // Subscribe with @parcel/watcher — native backend, no polling.
-            // If the kernel refuses (e.g. FSEvents slots stuck after a prior kill -9
-            // — see docs/known-limitations.md), fall straight through to poll mode.
-            // The retry/backoff path inside recoverWatcher is for transient overflows,
-            // not hard kernel-level subscribe failures, so we skip it on startup by
-            // priming failCount past MAX before invoking it.
+            // If the kernel refuses (e.g. FSEvents slots stuck after a prior kill -9),
+            // fall straight through to poll mode. The retry/backoff path inside
+            // recoverWatcher is for transient overflows, not hard kernel-level
+            // subscribe failures, so we skip it on startup by priming failCount past
+            // MAX before invoking it.
             try {
                 yield this.subscribeWatcher(root, processor);
             }
@@ -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/dist/lib/utils/watcher-store.js

@@ -49,7 +49,6 @@ exports.unregisterWatcher = unregisterWatcher;
 exports.getWatcherForProject = getWatcherForProject;
 exports.getWatcherCoveringPath = getWatcherCoveringPath;
 exports.listWatchers = listWatchers;
-exports.migrateFromJson = migrateFromJson;
 exports.registerDaemon = registerDaemon;
 exports.unregisterDaemon = unregisterDaemon;
 exports.getDaemonInfo = getDaemonInfo;
@@ -173,30 +172,6 @@ function listWatchers() {
     }
     return alive;
 }
-/**
- * Migrate from legacy watchers.json if it exists.
- * Call once on startup.
- */
-function migrateFromJson() {
-    const jsonPath = path.join(config_1.PATHS.globalRoot, "watchers.json");
-    if (!fs.existsSync(jsonPath))
-        return;
-    try {
-        const raw = fs.readFileSync(jsonPath, "utf-8");
-        const entries = JSON.parse(raw);
-        const db = getDb();
-        for (const entry of entries) {
-            if (entry.projectRoot && isProcessRunning(entry.pid)) {
-                db.put(entry.projectRoot, Object.assign(Object.assign({}, entry), { lastHeartbeat: Date.now() }));
-            }
-        }
-        // Remove legacy file
-        fs.unlinkSync(jsonPath);
-    }
-    catch (_a) {
-        // Best effort — ignore
-    }
-}
 // --- Daemon registry ---
 exports.DAEMON_KEY = "__daemon__";
 function registerDaemon(pid) {

package/dist/lib/workers/embeddings/mlx-client.js

@@ -49,7 +49,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMlxUp = isMlxUp;
 exports.mlxEmbed = mlxEmbed;
-exports.resetMlxCache = resetMlxCache;
 const http = __importStar(require("node:http"));
 const logger_1 = require("../../utils/logger");
 const MLX_PORT = parseInt(process.env.MLX_EMBED_PORT || "8100", 10);
@@ -192,10 +191,3 @@ function mlxEmbed(texts) {
         return data.vectors.map((v) => new Float32Array(v));
     });
 }
-/**
- * Reset availability cache (e.g., after starting the server).
- */
-function resetMlxCache() {
-    mlxAvailable = null;
-    lastCheck = 0;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grepmax",
-  "version": "0.16.6",
+  "version": "0.16.10",
   "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.10",
   "description": "Semantic code search for Claude Code. Automatically indexes your project and provides intelligent search capabilities.",
   "author": {
     "name": "Robert Owens",

package/dist/lib/utils/watcher-registry.js

@@ -1,121 +0,0 @@
-"use strict";
-/**
- * Watcher registry — tracks background watcher processes per project.
- * Ensures only one watcher runs per project root.
- *
- * Stored in ~/.gmax/watchers.json
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isProcessRunning = isProcessRunning;
-exports.registerWatcher = registerWatcher;
-exports.updateWatcherStatus = updateWatcherStatus;
-exports.unregisterWatcher = unregisterWatcher;
-exports.getWatcherForProject = getWatcherForProject;
-exports.getWatcherCoveringPath = getWatcherCoveringPath;
-exports.listWatchers = listWatchers;
-const fs = __importStar(require("node:fs"));
-const path = __importStar(require("node:path"));
-const config_1 = require("../../config");
-const REGISTRY_PATH = path.join(config_1.PATHS.globalRoot, "watchers.json");
-function loadRegistry() {
-    try {
-        const raw = fs.readFileSync(REGISTRY_PATH, "utf-8");
-        return JSON.parse(raw);
-    }
-    catch (_a) {
-        return [];
-    }
-}
-function saveRegistry(entries) {
-    fs.mkdirSync(path.dirname(REGISTRY_PATH), { recursive: true });
-    fs.writeFileSync(REGISTRY_PATH, `${JSON.stringify(entries, null, 2)}\n`);
-}
-function isProcessRunning(pid) {
-    try {
-        process.kill(pid, 0);
-        return true;
-    }
-    catch (_a) {
-        return false;
-    }
-}
-function registerWatcher(info) {
-    const entries = loadRegistry().filter((e) => e.projectRoot !== info.projectRoot);
-    entries.push(info);
-    saveRegistry(entries);
-}
-function updateWatcherStatus(pid, status, lastReindex) {
-    const entries = loadRegistry();
-    const match = entries.find((e) => e.pid === pid);
-    if (match) {
-        match.status = status;
-        if (lastReindex)
-            match.lastReindex = lastReindex;
-        saveRegistry(entries);
-    }
-}
-function unregisterWatcher(pid) {
-    const entries = loadRegistry().filter((e) => e.pid !== pid);
-    saveRegistry(entries);
-}
-function getWatcherForProject(projectRoot) {
-    const entries = loadRegistry();
-    const match = entries.find((e) => e.projectRoot === projectRoot);
-    if (match && isProcessRunning(match.pid))
-        return match;
-    // Clean stale entry
-    if (match) {
-        saveRegistry(entries.filter((e) => e.pid !== match.pid));
-    }
-    return undefined;
-}
-function getWatcherCoveringPath(dir) {
-    const resolved = path.resolve(dir);
-    const entries = loadRegistry();
-    for (const e of entries) {
-        if (resolved.startsWith(e.projectRoot) && isProcessRunning(e.pid))
-            return e;
-    }
-    return undefined;
-}
-function listWatchers() {
-    const entries = loadRegistry();
-    const active = entries.filter((e) => isProcessRunning(e.pid));
-    if (active.length !== entries.length) {
-        saveRegistry(active);
-    }
-    return active;
-}