grepmax 0.12.10 → 0.12.12

package/dist/commands/watch.js

@@ -44,7 +44,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watch = void 0;
 const node_child_process_1 = require("node:child_process");
-const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const commander_1 = require("commander");
 const config_1 = require("../config");
@@ -80,16 +79,6 @@ exports.watch = new commander_1.Command("watch")
         if (options.background) {
             // Skip spawn if daemon already running — prevents process accumulation
             // when SessionStart hook fires on every session/clear/resume
-            const pidFile = config_1.PATHS.daemonPidFile;
-            try {
-                const existingPid = Number.parseInt(fs.readFileSync(pidFile, "utf-8").trim(), 10);
-                if (existingPid) {
-                    process.kill(existingPid, 0); // throws if dead
-                    process.exit(0); // alive — skip
-                }
-            }
-            catch (_c) { }
-            // Also check socket as fallback
             const { isDaemonRunning } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/daemon-client")));
             if (yield isDaemonRunning()) {
                 process.exit(0);

package/dist/config.js

@@ -96,6 +96,7 @@ exports.PATHS = {
     logsDir: path.join(GLOBAL_ROOT, "logs"),
     daemonSocket: path.join(GLOBAL_ROOT, "daemon.sock"),
     daemonPidFile: path.join(GLOBAL_ROOT, "daemon.pid"),
+    daemonLockFile: path.join(GLOBAL_ROOT, "daemon.lock"),
     // Centralized index storage — one database for all indexed directories
     lancedbDir: path.join(GLOBAL_ROOT, "lancedb"),
     cacheDir: path.join(GLOBAL_ROOT, "cache"),

package/dist/lib/daemon/daemon.js

@@ -41,12 +41,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Daemon = void 0;
 const fs = __importStar(require("node:fs"));
 const net = __importStar(require("node:net"));
 const path = __importStar(require("node:path"));
 const watcher = __importStar(require("@parcel/watcher"));
+const proper_lockfile_1 = __importDefault(require("proper-lockfile"));
 const config_1 = require("../../config");
 const batch_processor_1 = require("../index/batch-processor");
 const watcher_1 = require("../index/watcher");
@@ -65,6 +69,7 @@ class Daemon {
         this.vectorDb = null;
         this.metaCache = null;
         this.server = null;
+        this.releaseLock = null;
         this.lastActivity = Date.now();
         this.startTime = Date.now();
         this.heartbeatInterval = null;
@@ -75,35 +80,37 @@ class Daemon {
     start() {
         return __awaiter(this, void 0, void 0, function* () {
             process.title = "gmax-daemon";
-            // 1. Kill existing per-project watchers
+            // 1. Acquire exclusive lock — kernel-enforced, atomic, auto-released on death
+            fs.mkdirSync(path.dirname(config_1.PATHS.daemonLockFile), { recursive: true });
+            fs.writeFileSync(config_1.PATHS.daemonLockFile, "", { flag: "a" }); // ensure file exists
+            try {
+                this.releaseLock = yield proper_lockfile_1.default.lock(config_1.PATHS.daemonLockFile, {
+                    retries: 0,
+                    stale: 30000,
+                });
+            }
+            catch (err) {
+                if (err.code === "ELOCKED") {
+                    console.error("[daemon] Another daemon is already running");
+                    process.exit(0);
+                }
+                throw err;
+            }
+            // 2. Kill existing per-project watchers
             const existing = (0, watcher_store_1.listWatchers)();
             for (const w of existing) {
                 console.log(`[daemon] Taking over from per-project watcher (PID: ${w.pid}, ${path.basename(w.projectRoot)})`);
                 yield (0, process_1.killProcess)(w.pid);
                 (0, watcher_store_1.unregisterWatcher)(w.pid);
             }
-            // 2. PID file — atomic dedup guard
-            const pidFile = config_1.PATHS.daemonPidFile;
-            try {
-                // Check if another daemon is alive
-                const existingPid = Number.parseInt(fs.readFileSync(pidFile, "utf-8").trim(), 10);
-                if (existingPid && existingPid !== process.pid) {
-                    try {
-                        process.kill(existingPid, 0); // throws if dead
-                        console.error("[daemon] Another daemon is already running (PID:", existingPid + ")");
-                        process.exit(0);
-                    }
-                    catch (_a) { }
-                }
-            }
-            catch (_b) { }
-            fs.writeFileSync(pidFile, String(process.pid));
-            // 3. Stale socket cleanup
+            // 3. Write PID file (informational only — lock is the real guard)
+            fs.writeFileSync(config_1.PATHS.daemonPidFile, String(process.pid));
+            // 4. Stale socket cleanup
             try {
                 fs.unlinkSync(config_1.PATHS.daemonSocket);
             }
-            catch (_c) { }
-            // 3. Open shared resources
+            catch (_a) { }
+            // 5. Open shared resources
             try {
                 fs.mkdirSync(config_1.PATHS.cacheDir, { recursive: true });
                 fs.mkdirSync(config_1.PATHS.lancedbDir, { recursive: true });
@@ -114,9 +121,9 @@ class Daemon {
                 console.error("[daemon] Failed to open shared resources:", err);
                 throw err;
             }
-            // 4. Register daemon (only after resources are open)
+            // 6. Register daemon (only after resources are open)
             (0, watcher_store_1.registerDaemon)(process.pid);
-            // 5. Subscribe to all registered projects (skip missing directories)
+            // 7. Subscribe to all registered projects (skip missing directories)
             const projects = (0, project_registry_1.listProjects)().filter((p) => p.status === "indexed");
             for (const p of projects) {
                 if (!fs.existsSync(p.root)) {
@@ -130,18 +137,18 @@ class Daemon {
                     console.error(`[daemon] Failed to watch ${path.basename(p.root)}:`, err);
                 }
             }
-            // 6. Heartbeat
+            // 8. Heartbeat
             this.heartbeatInterval = setInterval(() => {
                 (0, watcher_store_1.heartbeat)(process.pid);
             }, HEARTBEAT_INTERVAL_MS);
-            // 7. Idle timeout
+            // 9. Idle timeout
             this.idleInterval = setInterval(() => {
                 if (Date.now() - this.lastActivity > IDLE_TIMEOUT_MS) {
                     console.log("[daemon] Idle for 30 minutes, shutting down");
                     this.shutdown();
                 }
             }, HEARTBEAT_INTERVAL_MS);
-            // 8. Socket server
+            // 10. Socket server
             this.server = net.createServer((conn) => {
                 let buf = "";
                 conn.on("data", (chunk) => {
@@ -171,7 +178,7 @@ class Daemon {
                 this.server.on("error", (err) => {
                     const code = err.code;
                     if (code === "EADDRINUSE") {
-                        console.error("[daemon] Another daemon is already running");
+                        console.error("[daemon] Socket already in use");
                         reject(err);
                     }
                     else if (code === "EOPNOTSUPP") {
@@ -301,7 +308,7 @@ class Daemon {
                 catch (_d) { }
             }
             this.subscriptions.clear();
-            // Close server + socket + PID file
+            // Close server + socket + PID file + lock
             (_a = this.server) === null || _a === void 0 ? void 0 : _a.close();
             try {
                 fs.unlinkSync(config_1.PATHS.daemonSocket);
@@ -311,6 +318,13 @@ class Daemon {
                 fs.unlinkSync(config_1.PATHS.daemonPidFile);
             }
             catch (_f) { }
+            if (this.releaseLock) {
+                try {
+                    yield this.releaseLock();
+                }
+                catch (_g) { }
+                this.releaseLock = null;
+            }
             // Unregister all
             for (const root of this.processors.keys()) {
                 (0, watcher_store_1.unregisterWatcherByRoot)(root);
@@ -321,11 +335,11 @@ class Daemon {
             try {
                 yield ((_b = this.metaCache) === null || _b === void 0 ? void 0 : _b.close());
             }
-            catch (_g) { }
+            catch (_h) { }
             try {
                 yield ((_c = this.vectorDb) === null || _c === void 0 ? void 0 : _c.close());
             }
-            catch (_h) { }
+            catch (_j) { }
             console.log("[daemon] Shutdown complete");
         });
     }

package/dist/lib/store/vector-db.js

@@ -488,8 +488,12 @@ class VectorDB {
             (_a = this.unregisterCleanup) === null || _a === void 0 ? void 0 : _a.call(this);
             this.unregisterCleanup = undefined;
             if (this.db) {
-                if (this.db.close)
-                    yield this.db.close();
+                if (this.db.close) {
+                    yield Promise.race([
+                        this.db.close(),
+                        new Promise((resolve) => setTimeout(resolve, 5000)),
+                    ]);
+                }
             }
             this.db = null;
         });

package/dist/lib/utils/exit.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.gracefulExit = gracefulExit;
 const pool_1 = require("../workers/pool");
 const cleanup_1 = require("./cleanup");
+const EXIT_TIMEOUT_MS = 8000;
 function gracefulExit(code) {
     return __awaiter(this, void 0, void 0, function* () {
         const finalCode = typeof code === "number"
@@ -19,6 +20,12 @@ function gracefulExit(code) {
             : typeof process.exitCode === "number"
                 ? process.exitCode
                 : 0;
+        // Safety net: force-exit if cleanup hangs
+        const forceTimer = !process.env.VITEST && process.env.NODE_ENV !== "test"
+            ? setTimeout(() => process.exit(finalCode), EXIT_TIMEOUT_MS)
+            : undefined;
+        if (forceTimer)
+            forceTimer.unref();
         try {
             if ((0, pool_1.isWorkerPoolInitialized)()) {
                 yield (0, pool_1.destroyWorkerPool)();
@@ -28,6 +35,8 @@ function gracefulExit(code) {
             console.error("[exit] Failed to destroy worker pool:", err);
         }
         yield (0, cleanup_1.runCleanup)();
+        if (forceTimer)
+            clearTimeout(forceTimer);
         // Avoid exiting the process during test runs so Vitest can report results.
         if (process.env.VITEST || process.env.NODE_ENV === "test") {
             process.exitCode = finalCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grepmax",
-  "version": "0.12.10",
+  "version": "0.12.12",
   "author": "Robert Owens <robowens@me.com>",
   "homepage": "https://github.com/reowens/grepmax",
   "bugs": {
@@ -48,6 +48,7 @@
     "onnxruntime-node": "1.24.3",
     "ora": "^9.3.0",
     "piscina": "^5.1.4",
+    "proper-lockfile": "^4.1.2",
     "simsimd": "^6.5.5",
     "uuid": "^13.0.0",
     "web-tree-sitter": "^0.26.7",
@@ -57,6 +58,7 @@
     "@anthropic-ai/claude-agent-sdk": "^0.2.87",
     "@biomejs/biome": "2.4.10",
     "@types/node": "^25.5.0",
+    "@types/proper-lockfile": "^4.1.4",
     "node-gyp": "^12.1.0",
     "ts-node": "^10.9.2",
     "typescript": "^6.0.2",

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

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