grepmax 0.21.3 → 0.22.0

package/.claude-plugin/marketplace.json

@@ -10,14 +10,12 @@
       "name": "grepmax",
       "source": "./plugins/grepmax",
       "description": "Semantic code search for Claude Code. Automatically indexes your project and provides intelligent search capabilities.",
-      "version": "0.21.3",
+      "version": "0.22.0",
       "author": {
         "name": "Robert Owens",
         "email": "robowens@me.com"
       },
-      "skills": [
-        "./skills/grepmax"
-      ]
+      "skills": ["./skills/grepmax"]
     }
   ]
 }

package/dist/commands/dead.js

@@ -44,6 +44,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dead = void 0;
 const commander_1 = require("commander");
+const languages_1 = require("../lib/core/languages");
 const graph_builder_1 = require("../lib/graph/graph-builder");
 const vector_db_1 = require("../lib/store/vector-db");
 const agent_errors_1 = require("../lib/utils/agent-errors");
@@ -147,7 +148,7 @@ exports.dead = new commander_1.Command("dead")
         const defLine = Number(defRow.start_line || 0);
         const isExported = Boolean(defRow.is_exported);
         const builder = new graph_builder_1.GraphBuilder(vectorDb, scope.pathPrefix, scope.excludePrefixes);
-        const callers = yield builder.getCallers(symbol);
+        const callers = yield builder.getCallers(symbol, (0, languages_1.languageFamilyForPath)(defPath));
         const status = callers.length === 0 ? (isExported ? "PUBLIC_EXPORT" : "DEAD") : "LIVE";
         const topCallers = callers
             .slice(0, TOP_CALLERS)

package/dist/commands/impact.js

@@ -77,7 +77,7 @@ exports.impact = new commander_1.Command("impact")
         (0, stale_hint_1.maybeWarnStaleEmbedding)(projectRoot, { agent: opts.agent });
         const paths = (0, project_root_1.ensureProjectPaths)(projectRoot);
         vectorDb = new vector_db_1.VectorDB(paths.lancedbDir);
-        const { symbols, resolvedAsFile } = yield (0, impact_1.resolveTargetSymbols)(target, vectorDb, projectRoot);
+        const { symbols, resolvedAsFile, symbolFamilies } = yield (0, impact_1.resolveTargetSymbols)(target, vectorDb, projectRoot);
         if (symbols.length === 0) {
             console.log(resolvedAsFile
                 ? `No symbols found in file: ${target}`
@@ -109,9 +109,9 @@ exports.impact = new commander_1.Command("impact")
         // traversal entirely so the affected-tests section is omitted (not just
         // empty) below.
         const [dependents, tests] = yield Promise.all([
-            (0, impact_1.findDependents)(symbols, vectorDb, queryRoot, excludePaths, undefined, scope.excludePrefixes),
+            (0, impact_1.findDependents)(symbols, vectorDb, queryRoot, excludePaths, undefined, scope.excludePrefixes, symbolFamilies),
             includeTests
-                ? (0, impact_1.findTests)(symbols, vectorDb, queryRoot, depth, scope.excludePrefixes)
+                ? (0, impact_1.findTests)(symbols, vectorDb, queryRoot, depth, scope.excludePrefixes, symbolFamilies)
                 : Promise.resolve([]),
         ]);
         // Separate test files from non-test dependents

package/dist/commands/mcp.js

@@ -65,6 +65,7 @@ const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
 const commander_1 = require("commander");
 const zod_1 = require("zod");
 const config_1 = require("../config");
+const languages_1 = require("../lib/core/languages");
 const graph_builder_1 = require("../lib/graph/graph-builder");
 const index_config_1 = require("../lib/index/index-config");
 const syncer_1 = require("../lib/index/syncer");
@@ -906,6 +907,7 @@ exports.mcp = new commander_1.Command("mcp")
                                 symbol: t.node.symbol,
                                 file: t.node.file,
                                 line: t.node.line,
+                                edgeKind: t.node.edgeKind,
                             });
                             walkCallers(t.callers);
                         }
@@ -933,7 +935,12 @@ exports.mcp = new commander_1.Command("mcp")
                         const loc = c.file
                             ? `${rel(c.file)}:${c.line + 1}`
                             : "(not indexed)";
-                        parts.push(`  <- ${c.symbol}  ${loc}`);
+                        // `(member)`/`(type)` flag inferred edges (receiver-unverified call
+                        // or a type-position ref) so they don't read as confirmed callers.
+                        const tag = c.edgeKind === "member" || c.edgeKind === "type"
+                            ? ` (${c.edgeKind})`
+                            : "";
+                        parts.push(`  <- ${c.symbol}  ${loc}${tag}`);
                     }
                     if (callerList.length > maxCallers) {
                         parts.push(`  ... and ${callerList.length - maxCallers} more`);
@@ -993,7 +1000,7 @@ exports.mcp = new commander_1.Command("mcp")
                 const defLine = Number(defRow.start_line || 0);
                 const isExported = Boolean(defRow.is_exported);
                 const builder = new graph_builder_1.GraphBuilder(db, root);
-                const callers = yield builder.getCallers(symbol);
+                const callers = yield builder.getCallers(symbol, (0, languages_1.languageFamilyForPath)(defPath));
                 const rel = (p) => p.startsWith(root) ? p.slice(root.length + 1) : p;
                 const defLoc = `${rel(defPath)}:${defLine + 1}`;
                 if (callers.length === 0) {
@@ -1714,10 +1721,10 @@ exports.mcp = new commander_1.Command("mcp")
             try {
                 const { resolveTargetSymbols, findTests } = yield Promise.resolve().then(() => __importStar(require("../lib/graph/impact")));
                 const db = getVectorDb();
-                const { symbols } = yield resolveTargetSymbols(target, db, projectRoot);
+                const { symbols, symbolFamilies } = yield resolveTargetSymbols(target, db, projectRoot);
                 if (symbols.length === 0)
                     return ok(`No symbols found for: ${target}`);
-                const tests = yield findTests(symbols, db, projectRoot, depth);
+                const tests = yield findTests(symbols, db, projectRoot, depth, undefined, symbolFamilies);
                 if (tests.length === 0)
                     return ok(`No tests found for ${target}.`);
                 const rel = (p) => p.startsWith(`${projectRoot}/`) ? p.slice(projectRoot.length + 1) : p;
@@ -1742,7 +1749,7 @@ exports.mcp = new commander_1.Command("mcp")
             try {
                 const { resolveTargetSymbols, findTests, findDependents, isTestPath } = yield Promise.resolve().then(() => __importStar(require("../lib/graph/impact")));
                 const db = getVectorDb();
-                const { symbols, resolvedAsFile } = yield resolveTargetSymbols(target, db, projectRoot);
+                const { symbols, resolvedAsFile, symbolFamilies } = yield resolveTargetSymbols(target, db, projectRoot);
                 if (symbols.length === 0)
                     return ok(`No symbols found for: ${target}`);
                 const targetPath = resolvedAsFile
@@ -1750,8 +1757,8 @@ exports.mcp = new commander_1.Command("mcp")
                     : undefined;
                 const excludePaths = targetPath ? new Set([targetPath]) : undefined;
                 const [dependents, tests] = yield Promise.all([
-                    findDependents(symbols, db, projectRoot, excludePaths),
-                    findTests(symbols, db, projectRoot, depth),
+                    findDependents(symbols, db, projectRoot, excludePaths, undefined, undefined, symbolFamilies),
+                    findTests(symbols, db, projectRoot, depth, undefined, symbolFamilies),
                 ]);
                 const nonTestDeps = dependents.filter((d) => !isTestPath(d.file));
                 const rel = (p) => p.startsWith(`${projectRoot}/`) ? p.slice(projectRoot.length + 1) : p;

package/dist/commands/peek.js

@@ -212,7 +212,6 @@ exports.peek = new commander_1.Command("peek")
         const endLine = metaRows.length > 0
             ? Number(metaRows[0].end_line || 0)
             : center.line;
-        // Get multi-hop callers if depth > 1
         let callerList;
         if (depth > 1) {
             const multiHop = yield graphBuilder.buildGraphMultiHop(symbol, depth);
@@ -224,6 +223,7 @@ exports.peek = new commander_1.Command("peek")
                         symbol: t.node.symbol,
                         file: t.node.file,
                         line: t.node.line,
+                        edgeKind: t.node.edgeKind,
                     });
                     walkCallers(t.callers);
                 }
@@ -236,8 +236,16 @@ exports.peek = new commander_1.Command("peek")
                 symbol: c.symbol,
                 file: c.file,
                 line: c.line,
+                edgeKind: c.edgeKind,
             }));
         }
+        // Confidence per caller symbol: getCallers sorts free calls first, so the
+        // first edgeKind seen for a symbol is its highest-confidence one.
+        const edgeKindBySym = new Map();
+        for (const c of callerList) {
+            if (!edgeKindBySym.has(c.symbol))
+                edgeKindBySym.set(c.symbol, c.edgeKind);
+        }
         // Re-anchor chunk-level caller rows to actual call sites and dedupe —
         // getCallers() returns one row per chunk, which multiplies callers for
         // classes split across many chunks (verified: 3 real call sites → 66).
@@ -247,6 +255,7 @@ exports.peek = new commander_1.Command("peek")
                 symbol: c.symbol,
                 file: c.file,
                 line: (_a = c.snippetLine) !== null && _a !== void 0 ? _a : c.line,
+                edgeKind: edgeKindBySym.get(c.symbol),
             });
         });
         // Builtins listed as "(not indexed)" callees (trunc, now, filter, …)
@@ -266,6 +275,10 @@ exports.peek = new commander_1.Command("peek")
             file: c.file,
             line: c.line,
         }));
+        // Inferred-caller marker: `member` = receiver-unverified `x.T()`, `type` =
+        // a type-position reference (not a call). Free calls render clean — the
+        // trustworthy default — so only guesses carry a tag.
+        const kindTag = (k) => k === "member" || k === "type" ? ` (${k})` : "";
         if (opts.agent) {
             // Compact TSV output
             const exportedStr = exported ? "exported" : "";
@@ -290,7 +303,7 @@ exports.peek = new commander_1.Command("peek")
             console.log(`sig: ${sigOnly}`);
             // Callers
             for (const c of resolvedCallers.slice(0, MAX_CALLERS)) {
-                console.log(`<- ${c.symbol}\t${c.file ? `${rel(c.file)}:${c.line + 1}` : "(not indexed)"}`);
+                console.log(`<- ${c.symbol}\t${c.file ? `${rel(c.file)}:${c.line + 1}` : "(not indexed)"}${kindTag(c.edgeKind)}`);
             }
             if (resolvedCallers.length > MAX_CALLERS) {
                 console.log(`<- ... ${resolvedCallers.length - MAX_CALLERS} more`);
@@ -338,10 +351,10 @@ exports.peek = new commander_1.Command("peek")
                 console.log(style.bold(`callers (${resolvedCallers.length}):`));
                 for (const c of shown) {
                     if (c.file) {
-                        console.log(`  ${style.blue("\u2190")} ${style.green(c.symbol.padEnd(25))} ${style.dim(`${rel(c.file)}:${c.line + 1}`)}`);
+                        console.log(`  ${style.blue("\u2190")} ${style.green(c.symbol.padEnd(25))} ${style.dim(`${rel(c.file)}:${c.line + 1}`)}${style.dim(kindTag(c.edgeKind))}`);
                     }
                     else {
-                        console.log(`  ${style.blue("\u2190")} ${c.symbol.padEnd(25)} ${style.dim("(not indexed)")}`);
+                        console.log(`  ${style.blue("\u2190")} ${c.symbol.padEnd(25)} ${style.dim("(not indexed)")}${style.dim(kindTag(c.edgeKind))}`);
                     }
                 }
                 if (resolvedCallers.length > MAX_CALLERS) {

package/dist/commands/plugin.js

@@ -174,33 +174,40 @@ function installAll() {
     });
 }
 // --- Subcommands ---
-const addCmd = new commander_1.Command("add")
-    .description("Install or update gmax plugins")
-    .argument("[client]", "Client to install (claude, opencode, codex, droid, all)")
-    .action((clientArg) => __awaiter(void 0, void 0, void 0, function* () {
-    const clients = getClients();
-    const onlyId = clientArg && clientArg !== "all" ? clientArg : undefined;
-    if (onlyId) {
-        const client = clients.find((c) => c.id === onlyId);
-        if (!client) {
-            console.error(`Unknown client: ${onlyId}`);
-            console.error(`Available: ${clients.map((c) => c.id).join(", ")}`);
-            yield (0, exit_1.gracefulExit)(1);
-            return;
-        }
-        if (!client.detect()) {
-            console.error(`${client.name} not found on this system`);
-            yield (0, exit_1.gracefulExit)(1);
+function installAction(clientArg) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const clients = getClients();
+        const onlyId = clientArg && clientArg !== "all" ? clientArg : undefined;
+        if (onlyId) {
+            const client = clients.find((c) => c.id === onlyId);
+            if (!client) {
+                console.error(`Unknown client: ${onlyId}`);
+                console.error(`Available: ${clients.map((c) => c.id).join(", ")}`);
+                yield (0, exit_1.gracefulExit)(1);
+                return;
+            }
+            if (!client.detect()) {
+                console.error(`${client.name} not found on this system`);
+                yield (0, exit_1.gracefulExit)(1);
+                return;
+            }
+            yield client.install();
+            yield (0, exit_1.gracefulExit)();
             return;
         }
-        yield client.install();
+        // Install all detected
+        yield installAll();
         yield (0, exit_1.gracefulExit)();
-        return;
-    }
-    // Install all detected
-    yield installAll();
-    yield (0, exit_1.gracefulExit)();
-}));
+    });
+}
+const addCmd = new commander_1.Command("add")
+    .description("Install or update gmax plugins")
+    .argument("[client]", "Client to install (claude, opencode, codex, droid, all)")
+    .action(installAction);
+const updateCmd = new commander_1.Command("update")
+    .description("Update gmax plugins")
+    .argument("[client]", "Client to update (claude, opencode, codex, droid, all)")
+    .action(installAction);
 const removeCmd = new commander_1.Command("remove")
     .description("Remove gmax plugins")
     .argument("[client]", "Client to remove (claude, opencode, codex, droid, all)")
@@ -261,6 +268,8 @@ function statusAction() {
         console.log("\nCommands:");
         console.log("  gmax plugin add               Install all detected clients");
         console.log("  gmax plugin add <client>      Install a specific client");
+        console.log("  gmax plugin update            Update all detected clients");
+        console.log("  gmax plugin update <client>   Update a specific client");
         console.log("  gmax plugin remove            Remove all installed plugins");
         console.log("  gmax plugin remove <client>   Remove a specific plugin");
         yield (0, exit_1.gracefulExit)();
@@ -270,4 +279,5 @@ exports.plugin = new commander_1.Command("plugin")
     .description("Manage gmax plugins for AI coding clients")
     .action(statusAction)
     .addCommand(addCmd)
+    .addCommand(updateCmd)
     .addCommand(removeCmd);

package/dist/commands/search-run.js

@@ -44,6 +44,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runSearch = runSearch;
 const path = __importStar(require("node:path"));
+const config_1 = require("../config");
 const grammar_loader_1 = require("../lib/index/grammar-loader");
 const sync_helpers_1 = require("../lib/index/sync-helpers");
 const syncer_1 = require("../lib/index/syncer");
@@ -188,6 +189,7 @@ function runSearch(params) {
                             lastIndexed: new Date().toISOString(),
                             chunkCount: result.indexed,
                             status: "indexed",
+                            chunkerVersion: config_1.CONFIG.CHUNKER_VERSION,
                         });
                         const failedSuffix = result.failedFiles > 0 ? ` • ${result.failedFiles} failed` : "";
                         spinner.succeed(`${options.sync ? "Indexing" : "Initial indexing"} complete (${result.processed}/${result.total}) • indexed ${result.indexed}${failedSuffix}`);

package/dist/commands/search.js

@@ -144,7 +144,17 @@ Examples:
     // Check for running server. The per-project HTTP server can't answer
     // cross-project queries, so cross-project mode skips it and uses the
     // daemon-mediated / in-process path (both query the shared table).
-    const execPathForServer = exec_path ? path.resolve(exec_path) : root;
+    let resolvedOptionRoot;
+    if (options.root && !crossProject.active) {
+        resolvedOptionRoot = (0, project_registry_1.resolveRootOrExit)(options.root);
+        if (resolvedOptionRoot === null)
+            return;
+    }
+    const execPathForServer = resolvedOptionRoot
+        ? resolvedOptionRoot
+        : exec_path
+            ? path.resolve(exec_path)
+            : root;
     const projectRootForServer = (_a = (0, project_root_1.findProjectRoot)(execPathForServer)) !== null && _a !== void 0 ? _a : execPathForServer;
     const server = crossProject.active
         ? null
@@ -167,21 +177,21 @@ Examples:
     try {
         yield (0, setup_helpers_1.ensureSetup)();
         const searchRoot = exec_path ? path.resolve(exec_path) : root;
-        const projectRoot = (_b = (0, project_root_1.findProjectRoot)(searchRoot)) !== null && _b !== void 0 ? _b : searchRoot;
-        const paths = (0, project_root_1.ensureProjectPaths)(projectRoot);
-        // Propagate project root to worker processes
-        process.env.GMAX_PROJECT_ROOT = projectRoot;
-        // Check if project is registered
-        let checkRoot;
+        const cwdProjectRoot = (_b = (0, project_root_1.findProjectRoot)(searchRoot)) !== null && _b !== void 0 ? _b : searchRoot;
+        let checkRoot = cwdProjectRoot;
         if (options.root) {
-            const resolved = (0, project_registry_1.resolveRootOrExit)(options.root);
+            const resolved = resolvedOptionRoot !== undefined
+                ? resolvedOptionRoot
+                : (0, project_registry_1.resolveRootOrExit)(options.root);
             if (resolved === null)
                 return;
             checkRoot = (_c = (0, project_root_1.findProjectRoot)(resolved)) !== null && _c !== void 0 ? _c : resolved;
         }
-        else {
-            checkRoot = projectRoot;
-        }
+        const projectRoot = crossProject.active ? cwdProjectRoot : checkRoot;
+        const paths = (0, project_root_1.ensureProjectPaths)(projectRoot);
+        // Propagate project root to worker processes
+        process.env.GMAX_PROJECT_ROOT = projectRoot;
+        // Check if project is registered
         const project = (0, project_registry_1.getProject)(checkRoot);
         if (!project) {
             console.error(`This project hasn't been added to gmax yet.\n\nRun: gmax add ${checkRoot}\n`);

package/dist/commands/test-find.js

@@ -72,7 +72,7 @@ exports.testFind = new commander_1.Command("test")
         (0, stale_hint_1.maybeWarnStaleEmbedding)(projectRoot, { agent: opts.agent });
         const paths = (0, project_root_1.ensureProjectPaths)(projectRoot);
         vectorDb = new vector_db_1.VectorDB(paths.lancedbDir);
-        const { symbols, resolvedAsFile } = yield (0, impact_1.resolveTargetSymbols)(target, vectorDb, projectRoot);
+        const { symbols, resolvedAsFile, symbolFamilies } = yield (0, impact_1.resolveTargetSymbols)(target, vectorDb, projectRoot);
         if (symbols.length === 0) {
             console.log(resolvedAsFile
                 ? `No symbols found in file: ${target}`
@@ -89,7 +89,7 @@ exports.testFind = new commander_1.Command("test")
         const queryRoot = opts.in && opts.in.length > 0
             ? scope.pathPrefix.replace(/\/$/, "")
             : projectRoot;
-        const tests = yield (0, impact_1.findTests)(symbols, vectorDb, queryRoot, depth, scope.excludePrefixes);
+        const tests = yield (0, impact_1.findTests)(symbols, vectorDb, queryRoot, depth, scope.excludePrefixes, symbolFamilies);
         if (tests.length === 0) {
             console.log(`No tests found for ${target}.`);
             return;

package/dist/commands/trace.js

@@ -56,6 +56,10 @@ const stale_hint_1 = require("../lib/utils/stale-hint");
 const useColors = process.stdout.isTTY && !process.env.NO_COLOR;
 const dim = (s) => (useColors ? `\x1b[2m${s}\x1b[22m` : s);
 const bold = (s) => (useColors ? `\x1b[1m${s}\x1b[22m` : s);
+// Inferred-edge marker for caller rows: `member` = receiver-unverified `x.T()`,
+// `type` = a type-position reference (not a call). Free calls stay unmarked —
+// the trustworthy default — so only guesses carry a tag.
+const kindTag = (k) => k === "member" || k === "type" ? ` (${k})` : "";
 function formatTraceAgent(graph, projectRoot, raw = false) {
     if (!graph.center)
         return "(not found)";
@@ -71,7 +75,7 @@ function formatTraceAgent(graph, projectRoot, raw = false) {
     function walkCallers(tree, depth) {
         if (raw) {
             for (const t of tree) {
-                lines.push(`${"  ".repeat(depth)}<- ${t.node.symbol}\t${rel(t.node.file)}:${t.node.line}`);
+                lines.push(`${"  ".repeat(depth)}<- ${t.node.symbol}\t${rel(t.node.file)}:${t.node.line}${kindTag(t.node.edgeKind)}`);
                 walkCallers(t.callers, depth + 1);
             }
             return;
@@ -92,6 +96,9 @@ function formatTraceAgent(graph, projectRoot, raw = false) {
                     file: t.node.file,
                     lineSet: new Set(),
                     sub: [],
+                    // Callers arrive free-first (getCallers sorts), so the first edgeKind
+                    // seen for this group is its highest-confidence one.
+                    edgeKind: t.node.edgeKind,
                 };
                 groups.set(key, g);
                 order.push(key);
@@ -103,7 +110,7 @@ function formatTraceAgent(graph, projectRoot, raw = false) {
             const g = groups.get(key);
             const locs = [...g.lineSet].sort((a, b) => a - b).join(",");
             const loc = g.file ? `${rel(g.file)}:${locs}` : "(not indexed)";
-            lines.push(`${"  ".repeat(depth)}<- ${g.symbol}\t${loc}`);
+            lines.push(`${"  ".repeat(depth)}<- ${g.symbol}\t${loc}${kindTag(g.edgeKind)}`);
             walkCallers(g.sub, depth + 1);
         }
     }
@@ -139,6 +146,7 @@ function buildInboundTree(callerTree, targetSymbol, fileCache, withSnippets, lim
             line: t.node.line,
             snippet: (_b = snippet === null || snippet === void 0 ? void 0 : snippet.snippet) !== null && _b !== void 0 ? _b : null,
             snippetLine: (_c = snippet === null || snippet === void 0 ? void 0 : snippet.snippetLine) !== null && _c !== void 0 ? _c : null,
+            edgeKind: t.node.edgeKind,
             callers: buildInboundTree(t.callers, t.node.symbol, fileCache, withSnippets, limit),
         });
         if (out.length >= limit)
@@ -158,8 +166,8 @@ function formatInboundAgent(center, tree, projectRoot, withSnippets) {
                 ? `${rel(n.file)}:${((_a = n.snippetLine) !== null && _a !== void 0 ? _a : n.line) + 1}`
                 : "(not indexed)";
             const cols = withSnippets
-                ? `${loc}\t${n.symbol}\t${(_b = n.snippet) !== null && _b !== void 0 ? _b : ""}`
-                : `${loc}\t${n.symbol}`;
+                ? `${loc}\t${n.symbol}${kindTag(n.edgeKind)}\t${(_b = n.snippet) !== null && _b !== void 0 ? _b : ""}`
+                : `${loc}\t${n.symbol}${kindTag(n.edgeKind)}`;
             lines.push(`${prefix}${cols}`);
             walk(n.callers, depth + 1);
         }
@@ -194,7 +202,7 @@ function formatInboundHuman(center, tree, projectRoot, withSnippets) {
             const loc = n.file
                 ? `${rel(n.file)}:${((_a = n.snippetLine) !== null && _a !== void 0 ? _a : n.line) + 1}`
                 : "(not indexed)";
-            lines.push(`${indent}${n.symbol}  ${dim(loc)}`);
+            lines.push(`${indent}${n.symbol}  ${dim(loc)}${dim(kindTag(n.edgeKind))}`);
             if (withSnippets && n.snippet) {
                 lines.push(`${indent}  ${dim(n.snippet)}`);
             }

package/dist/lib/daemon/ipc-handler.js

@@ -115,6 +115,7 @@ function handleCommand(daemon, cmd, conn) {
                 case "ping":
                     return {
                         ok: true,
+                        ready: daemon.isReady(),
                         pid: process.pid,
                         uptime: daemon.uptime(),
                         version: DAEMON_VERSION,

package/dist/lib/daemon/mlx-server-manager.js

@@ -147,22 +147,66 @@ class MlxServerManager {
             const env = Object.assign({}, process.env);
             if (mlxModel)
                 env.MLX_EMBED_MODEL = mlxModel;
-            this.mlxChild = (0, node_child_process_1.spawn)("uv", ["run", "python", "server.py"], {
-                cwd: serverDir,
-                detached: true,
-                stdio: ["ignore", logFd, logFd],
-                env,
+            const closeLogFd = () => {
+                try {
+                    fs.closeSync(logFd);
+                }
+                catch (_a) { }
+            };
+            try {
+                this.mlxChild = (0, node_child_process_1.spawn)("uv", ["run", "python", "server.py"], {
+                    cwd: serverDir,
+                    detached: true,
+                    stdio: ["ignore", logFd, logFd],
+                    env,
+                });
+            }
+            catch (err) {
+                closeLogFd();
+                console.error(`[daemon] MLX embed server failed to spawn: ${err instanceof Error ? err.message : String(err)} — falling back to CPU embeddings`);
+                this.mlxChild = null;
+                return;
+            }
+            const child = this.mlxChild;
+            let startupSettled = false;
+            let resolveStartupError;
+            const startupError = new Promise((resolve) => {
+                resolveStartupError = resolve;
             });
-            this.mlxChild.unref();
-            console.log(`[daemon] Starting MLX embed server (PID: ${this.mlxChild.pid})`);
+            const onChildError = (err) => {
+                if (!startupSettled) {
+                    resolveStartupError(err);
+                    return;
+                }
+                console.error(`[daemon] MLX embed server process error: ${err.message}`);
+                if (this.mlxChild === child)
+                    this.mlxChild = null;
+            };
+            child.on("error", onChildError);
+            child.unref();
+            console.log(`[daemon] Starting MLX embed server (PID: ${child.pid})`);
             // Poll for readiness (up to 30s)
             for (let i = 0; i < 30; i++) {
-                yield new Promise((r) => setTimeout(r, 1000));
+                const spawnError = yield Promise.race([
+                    startupError,
+                    new Promise((r) => setTimeout(() => r(null), 1000)),
+                ]);
+                if (spawnError) {
+                    startupSettled = true;
+                    child.off("error", onChildError);
+                    closeLogFd();
+                    console.error(`[daemon] MLX embed server failed to spawn: ${spawnError.message} — falling back to CPU embeddings`);
+                    if (this.mlxChild === child)
+                        this.mlxChild = null;
+                    return;
+                }
                 if (yield this.isMlxServerUp()) {
+                    startupSettled = true;
                     console.log("[daemon] MLX embed server ready");
                     return;
                 }
             }
+            startupSettled = true;
             console.error("[daemon] MLX embed server failed to start within 30s — falling back to CPU embeddings");
             this.mlxChild = null;
         });

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

@@ -84,7 +84,7 @@ class ProcessManager {
         return __awaiter(this, void 0, void 0, function* () {
             // 1. Check for other daemon processes
             const daemonPids = this.findProcessesByTitle("gmax-daemon").filter((pid) => pid !== process.pid);
-            const workerPids = this.findProcessesByTitle("gmax-worker");
+            let workerPids = this.findProcessesByTitle("gmax-worker");
             if (daemonPids.length === 0 && workerPids.length === 0) {
                 (0, logger_1.log)("daemon", "No stale processes found");
                 return;
@@ -92,15 +92,21 @@ class ProcessManager {
             // A peer that's gracefully shutting down has already dropped its
             // socket/PID/lock (so the liveness probes below read "stale") yet is still
             // mid-cleanup — destroying workers, closing LanceDB. Killing it now corrupts
-            // that teardown. Defer to its draining marker: don't kill it, and don't
-            // sweep its workers (it's reaping them itself); just take over the free lock.
-            let anyDraining = false;
+            // that teardown. Defer to its draining marker until the process exits; only
+            // after the marker grace elapses do we treat it like any other stale daemon.
             for (const pid of daemonPids) {
                 (0, logger_1.log)("daemon", `found daemon PID:${pid}, checking liveness...`);
                 if ((0, daemon_client_1.isDaemonDraining)(pid)) {
-                    anyDraining = true;
-                    (0, logger_1.log)("daemon", `daemon PID:${pid} is gracefully draining — leaving it to exit, taking over`);
-                    continue;
+                    (0, logger_1.log)("daemon", `daemon PID:${pid} is gracefully draining — waiting for it to exit`);
+                    const exited = yield (0, daemon_client_1.waitForDaemonDrain)(pid);
+                    if (exited) {
+                        (0, logger_1.log)("daemon", `daemon PID:${pid} finished draining`);
+                        // The peer may have reaped its workers while we waited. Rescan before
+                        // sweeping so we don't act on a stale process snapshot.
+                        workerPids = this.findProcessesByTitle("gmax-worker");
+                        continue;
+                    }
+                    (0, logger_1.log)("daemon", `daemon PID:${pid} still exists after drain grace — checking stale probes`);
                 }
                 // A busy daemon (mid-index, compaction, big LMDB write) can block the
                 // event loop long enough to miss a ping. Two independent liveness
@@ -120,16 +126,9 @@ class ProcessManager {
             }
             // 2. Kill orphaned workers from previous daemon instances.
             // Safe because this runs before the new daemon's worker pool is initialized.
-            // Skipped while a peer is draining — those workers belong to it and it's
-            // tearing them down; sweeping them here would race its own cleanup.
-            if (anyDraining) {
-                (0, logger_1.log)("daemon", "skipping orphan-worker sweep — a peer is draining its own workers");
-            }
-            else {
-                for (const pid of workerPids) {
-                    (0, logger_1.log)("daemon", `killing orphaned worker PID:${pid}`);
-                    yield (0, process_1.killProcess)(pid);
-                }
+            for (const pid of workerPids) {
+                (0, logger_1.log)("daemon", `killing orphaned worker PID:${pid}`);
+                yield (0, process_1.killProcess)(pid);
             }
             (0, logger_1.log)("daemon", `Cleaned up ${daemonPids.length} stale daemon(s), ${workerPids.length} orphaned worker(s)`);
         });