grepmax 0.5.4 → 0.6.0

package/dist/commands/index.js

@@ -43,6 +43,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.index = void 0;
+const node_child_process_1 = require("node:child_process");
 const path = __importStar(require("node:path"));
 const commander_1 = require("commander");
 const grammar_loader_1 = require("../lib/index/grammar-loader");
@@ -52,6 +53,7 @@ const setup_helpers_1 = require("../lib/setup/setup-helpers");
 const vector_db_1 = require("../lib/store/vector-db");
 const exit_1 = require("../lib/utils/exit");
 const project_root_1 = require("../lib/utils/project-root");
+const watcher_registry_1 = require("../lib/utils/watcher-registry");
 exports.index = new commander_1.Command("index")
     .description("Index the current directory and create searchable store")
     .option("-d, --dry-run", "Dry run the indexing process (no actual file syncing)", false)
@@ -77,6 +79,27 @@ exports.index = new commander_1.Command("index")
         }
         // Ensure grammars are present before indexing (silent if already exist)
         yield (0, grammar_loader_1.ensureGrammars)(console.log, { silent: true });
+        // Stop any watcher that covers this project — it holds the shared lock
+        const watcher = (0, watcher_registry_1.getWatcherCoveringPath)(projectRoot);
+        let restartWatcher = null;
+        if (watcher) {
+            console.log(`Stopping watcher (PID: ${watcher.pid}) for ${path.basename(watcher.projectRoot)}...`);
+            try {
+                process.kill(watcher.pid, "SIGTERM");
+            }
+            catch (_b) { }
+            // Wait for process to exit (up to 5s)
+            for (let i = 0; i < 50; i++) {
+                if (!(0, watcher_registry_1.isProcessRunning)(watcher.pid))
+                    break;
+                yield new Promise((r) => setTimeout(r, 100));
+            }
+            (0, watcher_registry_1.unregisterWatcher)(watcher.pid);
+            restartWatcher = {
+                pid: watcher.pid,
+                projectRoot: watcher.projectRoot,
+            };
+        }
         const { spinner, onProgress } = (0, sync_helpers_1.createIndexingSpinner)(projectRoot, "Indexing...", { verbose: options.verbose });
         try {
             const result = yield (0, syncer_1.initialSync)({
@@ -100,6 +123,19 @@ exports.index = new commander_1.Command("index")
             spinner.fail("Indexing failed");
             throw e;
         }
+        finally {
+            // Restart the watcher if we stopped one
+            if (restartWatcher) {
+                try {
+                    const child = (0, node_child_process_1.spawn)(process.argv[0], [process.argv[1], "watch", "--path", restartWatcher.projectRoot], { detached: true, stdio: "ignore" });
+                    child.unref();
+                    console.log(`Restarted watcher for ${path.basename(restartWatcher.projectRoot)} (PID: ${child.pid})`);
+                }
+                catch (_c) {
+                    console.log(`Note: could not restart watcher. Run: gmax watch --path ${restartWatcher.projectRoot} -b`);
+                }
+            }
+        }
     }
     catch (error) {
         const message = error instanceof Error ? error.message : "Unknown error";

package/dist/commands/mcp.js

@@ -308,7 +308,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return;
             try {
                 const db = getVectorDb();
-                const hasIndex = yield db.hasAnyRows();
+                const hasIndex = yield db.hasRowsForPath(projectRoot);
                 if (!hasIndex) {
                     console.log("[MCP] No index found, running initial sync...");
                     yield (0, syncer_1.initialSync)({ projectRoot });
@@ -318,7 +318,6 @@ exports.mcp = new commander_1.Command("mcp")
                     console.log("[MCP] Index exists, ready.");
                 }
                 _indexReady = true;
-                ensureWatcher();
             }
             catch (e) {
                 console.error("[MCP] Index sync failed:", e);
@@ -326,33 +325,15 @@ exports.mcp = new commander_1.Command("mcp")
         });
     }
     // --- Background watcher ---
-    function findIndexedParent(dir) {
-        const resolved = path.resolve(dir);
-        const projects = (0, project_registry_1.listProjects)();
-        // Find indexed directories that are parents of `dir`, pick broadest
-        let broadest;
-        for (const p of projects) {
-            if (resolved.startsWith(p.root) && p.root !== resolved) {
-                if (!broadest || p.root.length < broadest.length) {
-                    broadest = p.root;
-                }
-            }
-        }
-        return broadest;
-    }
     function ensureWatcher() {
-        var _a;
         if ((0, watcher_registry_1.getWatcherCoveringPath)(projectRoot))
             return;
-        const watchRoot = (_a = findIndexedParent(projectRoot)) !== null && _a !== void 0 ? _a : projectRoot;
-        if ((0, watcher_registry_1.getWatcherCoveringPath)(watchRoot))
-            return;
-        const child = (0, node_child_process_1.spawn)("gmax", ["watch", "-b", "--path", watchRoot], {
+        const child = (0, node_child_process_1.spawn)("gmax", ["watch", "-b", "--path", projectRoot], {
             detached: true,
             stdio: "ignore",
         });
         child.unref();
-        console.log(`[MCP] Started background watcher for ${watchRoot}`);
+        console.log(`[MCP] Started background watcher for ${projectRoot}`);
     }
     // --- Tool handlers ---
     function handleSemanticSearch(args_1) {
@@ -362,6 +343,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return err("Missing required parameter: query");
             const limit = Math.min(Math.max(Number(args.limit) || 3, 1), 50);
             yield ensureIndexReady();
+            ensureWatcher();
             try {
                 const searcher = getSearcher();
                 // Determine path prefix and display root for relative paths
@@ -609,7 +591,7 @@ exports.mcp = new commander_1.Command("mcp")
     }
     function handleIndexStatus() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f;
             try {
                 const config = (0, index_config_1.readIndexConfig)(config_1.PATHS.configPath);
                 const globalConfig = (0, index_config_1.readGlobalConfig)();
@@ -633,7 +615,7 @@ exports.mcp = new commander_1.Command("mcp")
                 }
                 const lines = [
                     `Index: ~/.gmax/lancedb (${stats.chunks} chunks, ${fileCount} files)`,
-                    `Model: ${(_b = config === null || config === void 0 ? void 0 : config.embedModel) !== null && _b !== void 0 ? _b : "unknown"} (${(_c = config === null || config === void 0 ? void 0 : config.vectorDim) !== null && _c !== void 0 ? _c : "?"}d, ${globalConfig.embedMode})`,
+                    `Model: ${globalConfig.embedMode === "gpu" ? ((_d = (_c = (_b = config_1.MODEL_TIERS[globalConfig.modelTier]) === null || _b === void 0 ? void 0 : _b.mlxModel) !== null && _c !== void 0 ? _c : config === null || config === void 0 ? void 0 : config.embedModel) !== null && _d !== void 0 ? _d : "unknown") : ((_e = config === null || config === void 0 ? void 0 : config.embedModel) !== null && _e !== void 0 ? _e : "unknown")} (${(_f = config === null || config === void 0 ? void 0 : config.vectorDim) !== null && _f !== void 0 ? _f : "?"}d, ${globalConfig.embedMode})`,
                     (config === null || config === void 0 ? void 0 : config.indexedAt)
                         ? `Last indexed: ${config.indexedAt}`
                         : "",
@@ -714,6 +696,7 @@ exports.mcp = new commander_1.Command("mcp")
         }
     }));
     yield server.connect(transport);
-    // Kick off index readiness check in background
+    // Kick off index readiness check and watcher in background
     ensureIndexReady();
+    ensureWatcher();
 }));

package/dist/commands/watch.js

@@ -63,15 +63,15 @@ exports.watch = new commander_1.Command("watch")
     .option("-p, --path <dir>", "Directory to watch (defaults to project root)")
     .option("--no-idle-timeout", "Disable the 30-minute idle shutdown")
     .action((options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+    var _a, _b;
     const projectRoot = options.path
         ? path.resolve(options.path)
         : (_a = (0, project_root_1.findProjectRoot)(process.cwd())) !== null && _a !== void 0 ? _a : process.cwd();
     const projectName = path.basename(projectRoot);
-    // Check if watcher already running
-    const existing = (0, watcher_registry_1.getWatcherForProject)(projectRoot);
+    // Check if watcher already running (exact match or parent covering this dir)
+    const existing = (_b = (0, watcher_registry_1.getWatcherForProject)(projectRoot)) !== null && _b !== void 0 ? _b : (0, watcher_registry_1.getWatcherCoveringPath)(projectRoot);
     if (existing && (0, watcher_registry_1.isProcessRunning)(existing.pid)) {
-        console.log(`Watcher already running for ${projectName} (PID: ${existing.pid})`);
+        console.log(`Watcher already running for ${path.basename(existing.projectRoot)} (PID: ${existing.pid})`);
         return;
     }
     // Background spawn

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

@@ -285,6 +285,19 @@ class VectorDB {
             return rows.length > 0;
         });
     }
+    hasRowsForPath(pathPrefix) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const table = yield this.ensureTable();
+            const prefix = pathPrefix.endsWith("/") ? pathPrefix : `${pathPrefix}/`;
+            const rows = yield table
+                .query()
+                .select(["id"])
+                .where(`path LIKE '${prefix.replace(/'/g, "''")}%'`)
+                .limit(1)
+                .toArray();
+            return rows.length > 0;
+        });
+    }
     getStats() {
         return __awaiter(this, void 0, void 0, function* () {
             const table = yield this.ensureTable();

package/dist/lib/utils/lock.js

@@ -108,7 +108,7 @@ function acquireWriterLock(lockDir) {
                 const holderDesc = pid
                     ? `${pid}${startedAt ? ` @ ${startedAt}` : ""}`
                     : "unknown";
-                throw new Error(`.gmax lock already held (${holderDesc}). Another indexing process is running or the lock must be cleared.`);
+                throw new Error(`.gmax lock already held (${holderDesc}). Another process is using the index. Try: gmax watch stop --all`);
             }
         }
         return {

package/package.json

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

package/plugins/grepmax/hooks/start.js

@@ -39,6 +39,15 @@ function startPythonServer(scriptName, logName) {
   child.unref();
 }
 
+function startWatcher() {
+  try {
+    const { execFileSync } = require("node:child_process");
+    execFileSync("gmax", ["watch", "-b"], { timeout: 5000, stdio: "ignore" });
+  } catch {
+    // Watcher may already be running or gmax not in PATH — ignore
+  }
+}
+
 async function main() {
   const embedMode =
     process.env.GMAX_EMBED_MODE || process.env.OSGREP_EMBED_MODE || "auto";
@@ -55,6 +64,9 @@ async function main() {
     }
   }
 
+  // Start a file watcher for the current project (30-min idle timeout)
+  startWatcher();
+
   const response = {
     hookSpecificOutput: {
       hookEventName: "SessionStart",

package/plugins/grepmax/hooks/stop.js

@@ -1,3 +1,6 @@
-// No-op: let gmax serve persist across sessions.
-// The start hook ensures exactly one is running.
-// Use `gmax serve stop` to explicitly shut it down.
+try {
+  const { execFileSync } = require("node:child_process");
+  execFileSync("gmax", ["watch", "stop"], { timeout: 5000, stdio: "ignore" });
+} catch {
+  // Watcher may not be running or gmax not in PATH — ignore
+}