grepmax 0.26.27 → 0.26.30

package/dist/commands/mcp.js

@@ -53,6 +53,7 @@ exports.mcp = void 0;
 exports.toStringArray = toStringArray;
 exports.ok = ok;
 exports.err = err;
+exports.isMcpSessionFallback = isMcpSessionFallback;
 exports.shouldFallbackMcpDaemonSearch = shouldFallbackMcpDaemonSearch;
 exports.isExplicitCrossProjectSearch = isExplicitCrossProjectSearch;
 exports.resolveMcpProject = resolveMcpProject;
@@ -74,32 +75,30 @@ const commander_1 = require("commander");
 const zod_1 = require("zod");
 const config_1 = require("../config");
 const surprising_connections_1 = require("../lib/analysis/surprising-connections");
-const languages_1 = require("../lib/core/languages");
-const graph_builder_1 = require("../lib/graph/graph-builder");
+const graph_handler_1 = require("../lib/daemon/graph-handler");
+const rows_handler_1 = require("../lib/daemon/rows-handler");
+const vector_handler_1 = require("../lib/daemon/vector-handler");
 const embedding_status_1 = require("../lib/index/embedding-status");
 const index_config_1 = require("../lib/index/index-config");
 const syncer_1 = require("../lib/index/syncer");
 const agent_search_formatter_1 = require("../lib/output/agent-search-formatter");
 const searcher_1 = require("../lib/search/searcher");
 const annotator_1 = require("../lib/skeleton/annotator");
-const retriever_1 = require("../lib/skeleton/retriever");
 const skeletonizer_1 = require("../lib/skeleton/skeletonizer");
 const symbol_extractor_1 = require("../lib/skeleton/symbol-extractor");
-const ann_config_1 = require("../lib/store/ann-config");
 const meta_cache_1 = require("../lib/store/meta-cache");
-const vector_db_1 = require("../lib/store/vector-db");
 const cross_project_1 = require("../lib/utils/cross-project");
+const daemon_client_1 = require("../lib/utils/daemon-client");
 const file_utils_1 = require("../lib/utils/file-utils");
-const filter_builder_1 = require("../lib/utils/filter-builder");
 const format_helpers_1 = require("../lib/utils/format-helpers");
 const import_extractor_1 = require("../lib/utils/import-extractor");
 const path_containment_1 = require("../lib/utils/path-containment");
 const project_registry_1 = require("../lib/utils/project-registry");
 const project_root_1 = require("../lib/utils/project-root");
 const scope_filter_1 = require("../lib/utils/scope-filter");
+const store_access_1 = require("../lib/utils/store-access");
 const watcher_launcher_1 = require("../lib/utils/watcher-launcher");
 const watcher_store_1 = require("../lib/utils/watcher-store");
-const audit_1 = require("./audit");
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -123,14 +122,56 @@ function ok(text) {
 function err(text) {
     return { content: [{ type: "text", text }], isError: true };
 }
-function shouldFallbackMcpDaemonSearch(error) {
+/**
+ * The two daemon answers that mean "not usable *yet*", as opposed to "your
+ * request was wrong".
+ *
+ * `project not watched` is the daemon still picking a project up; `daemon not
+ * ready` is its store still opening. A CLI command reports both — there is a
+ * user at a prompt who can wait or re-run — but an MCP tool call gets no second
+ * attempt, so it degrades to its own store read for the life of that one call.
+ * That is why these live here and not in `withStoreRead`'s built-in set.
+ */
+function isMcpSessionFallback(error) {
     const message = String(error !== null && error !== void 0 ? error : "").toLowerCase();
-    return (message === "enoent" ||
-        message === "econnrefused" ||
-        message.includes("project not watched") ||
-        message.includes("daemon not ready") ||
-        message.includes("oversize") ||
-        message.includes("unknown command"));
+    return (message.includes("project not watched") ||
+        message.includes("daemon not ready"));
+}
+/**
+ * MCP's read-tool fallback policy, in one object so every tool shares it.
+ *
+ * - `fallbackOnUnknownVerb` — a daemon older than this build does not know the
+ *   read verbs (the live 0.26.27 daemon does not); answer from the store rather
+ *   than failing the tool call. Removed one release after the verbs ship.
+ * - `fallbackOnOversize` — the daemon's 2 MB response cap. See
+ *   `isOversizeError` for why MCP opts in and the CLI does not.
+ * - `extraFallback` — the two session-readiness answers above.
+ *
+ * Everything else (`DAEMON_BUSY`, timeouts, scope rejections, store failures) is
+ * a live daemon saying no, and is reported. Falling back there would put a
+ * second opener on the store while the daemon is working.
+ */
+/**
+ * Watch-lease cadence. Renewal is cheap (one IPC line), and the TTL is three
+ * renewals long so a slow tick or a daemon restart does not drop the project.
+ */
+const MCP_WATCH_LEASE_RENEW_MS = 5 * 60 * 1000;
+const MCP_WATCH_LEASE_TTL_MS = 3 * MCP_WATCH_LEASE_RENEW_MS;
+const MCP_STORE_FALLBACK = {
+    fallbackOnUnknownVerb: true,
+    fallbackOnOversize: true,
+    extraFallback: isMcpSessionFallback,
+};
+/**
+ * Kept as a named predicate because `daemonSearch`'s callers and its tests read
+ * as one rule; the rule itself is now assembled from `withStoreRead`'s
+ * classification rather than restated as a second string table.
+ */
+function shouldFallbackMcpDaemonSearch(error) {
+    return ((0, store_access_1.classifyDaemonError)(error) === "no-daemon" ||
+        (0, store_access_1.isUnknownCommandError)(error) ||
+        (0, store_access_1.isOversizeError)(error) ||
+        isMcpSessionFallback(error));
 }
 function isExplicitCrossProjectSearch(args, isSearchAll = false) {
     return (isSearchAll ||
@@ -239,6 +280,11 @@ function formatMcpPointerSearchResults(data, displayRoot, options = {}) {
         query: options.query,
     });
 }
+/**
+ * Takes summary + findings rather than a whole `SurpriseAnalysisResult`: the
+ * `vector.surprises` verb drops the raw `pairs` array (the bulk of the object,
+ * and nothing renders it), so this is the shape both paths can supply.
+ */
 function formatMcpSurprisingConnections(result, top = 10) {
     const { summary, findings } = result;
     const lines = [
@@ -300,24 +346,15 @@ exports.mcp = new commander_1.Command("mcp")
     .action((_optsArg, _cmd) => __awaiter(void 0, void 0, void 0, function* () {
     process.title = "gmax-mcp";
     // --- Lifecycle ---
-    let _vectorDb = null;
-    let _searcher = null;
+    // No per-session VectorDB. Every read tool goes through the daemon's read
+    // verbs, and the only store this process may open is the short-lived one
+    // `withLocalStore` opens and closes inside a `withStoreRead` fallback — so
+    // an MCP session holds no reader marker under ~/.gmax/lancedb.lease/readers/
+    // while a daemon serving the verbs is up.
     let _skeletonizer = null;
     let _indexReady = false;
-    const cleanup = () => __awaiter(void 0, void 0, void 0, function* () {
-        if (_vectorDb) {
-            try {
-                yield _vectorDb.close();
-            }
-            catch (_a) { }
-            _vectorDb = null;
-            _searcher = null;
-        }
-    });
-    const exit = () => __awaiter(void 0, void 0, void 0, function* () {
-        yield cleanup();
-        process.exit(0);
-    });
+    // Nothing to close: the tools open no store of their own.
+    const exit = () => process.exit(0);
     process.on("SIGINT", exit);
     process.on("SIGTERM", exit);
     // MCP SDK doesn't handle stdin close — exit when the client disconnects
@@ -339,38 +376,185 @@ exports.mcp = new commander_1.Command("mcp")
     const paths = (0, project_root_1.ensureProjectPaths)(projectRoot);
     // Propagate project root to worker processes
     process.env.GMAX_PROJECT_ROOT = paths.root;
-    // Lazy resource accessors — all use centralized store
-    function getVectorDb() {
-        if (!_vectorDb)
-            _vectorDb = new vector_db_1.VectorDB(paths.lancedbDir);
-        return _vectorDb;
+    // --- Store access ---
+    /**
+     * One read through the access policy, with MCP's fallback allowances. The
+     * `inProcess` branch is entered only when no daemon serves the verb.
+     */
+    function readStore(name, opts) {
+        return (0, store_access_1.withStoreRead)(name, Object.assign(Object.assign({}, opts), MCP_STORE_FALLBACK));
     }
-    function getSearcher() {
-        if (!_searcher)
-            _searcher = new searcher_1.Searcher(getVectorDb());
-        return _searcher;
+    /** Open the shared store for the duration of one fallback, then close it. */
+    function localStore(fn) {
+        return (0, rows_handler_1.withLocalStore)(paths.lancedbDir, fn);
     }
-    function daemonSearch(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { sendDaemonCommand } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/daemon-client")));
-            const response = yield sendDaemonCommand(Object.assign({ cmd: ((_a = args.filters) === null || _a === void 0 ? void 0 : _a.projectRoots) ? "search-v2" : "search" }, args), { timeoutMs: 60000 });
-            if (!response.ok) {
-                if (shouldFallbackMcpDaemonSearch(response.error))
-                    return null;
-                const detail = [response.error, response.hint]
-                    .filter((value) => typeof value === "string" && value)
-                    .join(": ");
-                throw new Error(detail || "daemon search failed");
-            }
-            return {
-                data: Array.isArray(response.data)
-                    ? response.data
-                    : [],
-                warnings: Array.isArray(response.warnings)
-                    ? response.warnings.filter((warning) => typeof warning === "string")
+    /** A graph verb with MCP's fallback allowances. */
+    function graphVerb(verb, call) {
+        return (0, graph_handler_1.callGraphVerb)(verb, Object.assign(Object.assign({}, call), { fallback: MCP_STORE_FALLBACK }));
+    }
+    /**
+     * MCP tools take no `--in`/`--exclude`, so a tool's scope is always the
+     * whole project. Building it through `resolveScope` anyway keeps the wire
+     * shape identical to the CLI's.
+     */
+    function projectScope(root) {
+        return (0, scope_filter_1.resolveScope)({ projectRoot: root });
+    }
+    /**
+     * Turn a thrown error into a tool result. A store-access refusal is already
+     * one actionable line, so it is passed through verbatim rather than buried
+     * under a `<Tool> failed:` prefix. It should never fire here — an MCP server
+     * is spawned by the editor, not from inside a sandboxed Bash tool — but the
+     * path exists so the message is right if it ever does.
+     */
+    function toolError(prefix, e) {
+        if ((0, store_access_1.isStoreAccessRefused)(e))
+            return err(e.message);
+        return err(`${prefix}: ${e instanceof Error ? e.message : String(e)}`);
+    }
+    /**
+     * Search through the daemon, falling back to a Searcher over a store this
+     * process opens only for the duration of the call. Replaces the old
+     * `daemonSearch(...) ?? getSearcher().search(...)` pair, whose null return
+     * encoded the same fallback rule `withStoreRead` now owns.
+     */
+    function searchStore(args) {
+        return readStore("search", {
+            daemon: () => {
+                var _a;
+                return (0, daemon_client_1.sendDaemonCommand)(Object.assign({ cmd: ((_a = args.filters) === null || _a === void 0 ? void 0 : _a.projectRoots) ? "search-v2" : "search" }, args), { timeoutMs: 60000 });
+            },
+            render: (resp) => ({
+                data: Array.isArray(resp.data) ? resp.data : [],
+                warnings: Array.isArray(resp.warnings)
+                    ? resp.warnings.filter((warning) => typeof warning === "string")
                     : undefined,
-            };
+            }),
+            inProcess: () => localStore((deps) => __awaiter(this, void 0, void 0, function* () {
+                const searcher = new searcher_1.Searcher(deps.vectorDb);
+                return searcher.search(args.query, args.limit, { rerank: args.rerank, seeds: args.seeds }, args.filters, args.pathPrefix);
+            })),
+            daemonErrorMessage: (resp) => [resp.error, resp.hint]
+                .filter((value) => typeof value === "string" && value)
+                .join(": ") || "daemon search failed",
+        });
+    }
+    /**
+     * `graph.peek`: the symbol's single-hop graph plus its defining chunk's
+     * metadata, and the multi-hop caller tree when `depth > 1`. Shared by
+     * `peek_symbol` and `semantic_search`'s symbol mode, which used to issue the
+     * same `buildGraph` call through their own GraphBuilder.
+     */
+    function peekSymbolGraph(root, symbol, depth) {
+        const scope = projectScope(root);
+        return graphVerb("graph.peek", {
+            projectRoot: root,
+            scope,
+            payload: { target: symbol, depth, includeTests: false },
+            render: (resp) => resp.peek,
+            inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphPeek)(deps.vectorDb, {
+                symbol,
+                depth,
+                scope,
+                includeTests: false,
+            })),
+        });
+    }
+    /**
+     * `graph.resolve`: a target (symbol name or file path) to the symbols it
+     * names. Shared by `find_tests` and `impact_analysis`.
+     */
+    function resolveTarget(root, target) {
+        const scope = projectScope(root);
+        return graphVerb("graph.resolve", {
+            projectRoot: root,
+            scope,
+            payload: { target },
+            render: (resp) => {
+                var _a, _b;
+                return ({
+                    symbols: (_a = resp.symbols) !== null && _a !== void 0 ? _a : [],
+                    resolvedAsFile: resp.resolvedAsFile === true,
+                    symbolFamilies: (_b = resp.symbolFamilies) !== null && _b !== void 0 ? _b : null,
+                });
+            },
+            inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphResolve)(deps.vectorDb, { target, projectRoot: root })),
+        });
+    }
+    /** `graph.tests`: the reverse call graph's test hits for a symbol set. */
+    function findTestsForSymbols(root, symbols, depth, families) {
+        const scope = projectScope(root);
+        return graphVerb("graph.tests", {
+            projectRoot: root,
+            scope,
+            payload: { symbols, depth, families },
+            render: (resp) => { var _a; return (_a = resp.hits) !== null && _a !== void 0 ? _a : []; },
+            inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphTests)(deps.vectorDb, {
+                symbols,
+                queryRoot: root,
+                depth,
+                excludePrefixes: scope.excludePrefixes,
+                families: (0, graph_handler_1.decodeSymbolFamilies)(families),
+            })),
+        });
+    }
+    /**
+     * `rows.locate`: a batch of row selects, one result array per matcher in
+     * order. Batched so a per-symbol loop costs one round trip, not hundreds.
+     */
+    function locateRows(root, req) {
+        return (0, rows_handler_1.readRows)(Object.assign({ name: "locate", projectRoot: root, lancedbDir: paths.lancedbDir, scope: projectScope(root), fallback: MCP_STORE_FALLBACK }, req));
+    }
+    /**
+     * Chunk and file totals for `index_status`, summed per registered project.
+     *
+     * The old code asked the store for `countRows()` and a distinct-path scan
+     * over the whole table. There is no whole-table read verb — deliberately:
+     * the daemon's `project-stats` is per project, and summing it keeps the
+     * daemon and in-process paths on the *same* per-prefix counts instead of
+     * one counting orphaned rows the other cannot see. A failed per-project
+     * call contributes nothing rather than failing the tool, exactly as
+     * `gmax status` degrades to its cached counts.
+     */
+    function indexTotals(projects) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let chunks = 0;
+            let files = 0;
+            for (const project of projects) {
+                const totals = yield readStore("project-stats", {
+                    daemon: () => (0, daemon_client_1.sendDaemonCommand)({ cmd: "project-stats", root: project.root }, { timeoutMs: 30000 }),
+                    render: (resp) => ({
+                        chunks: typeof resp.chunks === "number" ? resp.chunks : 0,
+                        files: typeof resp.files === "number" ? resp.files : 0,
+                    }),
+                    inProcess: () => localStore((deps) => __awaiter(this, void 0, void 0, function* () {
+                        const prefix = project.root.endsWith("/")
+                            ? project.root
+                            : `${project.root}/`;
+                        return {
+                            chunks: yield deps.vectorDb.countRowsForPath(prefix),
+                            files: yield deps.vectorDb.countDistinctFilesForPath(prefix),
+                        };
+                    })),
+                }).catch(() => ({ chunks: 0, files: 0 }));
+                chunks += totals.chunks;
+                files += totals.files;
+            }
+            return { chunks, files };
+        });
+    }
+    /** `rows.skeleton`: the stored per-file skeleton (and the symbol lookup). */
+    function lookupSkeleton(root, req) {
+        return readStore("skeleton", {
+            daemon: () => (0, daemon_client_1.sendDaemonCommand)(Object.assign({ cmd: "rows.skeleton", projectRoot: root }, req), { timeoutMs: 30000 }),
+            render: (resp) => {
+                var _a, _b;
+                return ({
+                    path: ((_a = resp.path) !== null && _a !== void 0 ? _a : null),
+                    skeleton: ((_b = resp.skeleton) !== null && _b !== void 0 ? _b : null),
+                });
+            },
+            inProcess: () => localStore((deps) => (0, rows_handler_1.runSkeleton)(deps, Object.assign({ projectRoot: root }, req))),
         });
     }
     function getSkeletonizer() {
@@ -395,6 +579,13 @@ exports.mcp = new commander_1.Command("mcp")
         });
     }
     // --- Background watcher ---
+    // This server's watch lease. It names our PID, so the daemon drops it the
+    // minute this session exits; the TTL only covers a wedged server.
+    const WATCH_LEASE = {
+        holder: `mcp:${process.pid}`,
+        pid: process.pid,
+        ttlMs: MCP_WATCH_LEASE_TTL_MS,
+    };
     function ensureWatcher(root) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -402,7 +593,7 @@ exports.mcp = new commander_1.Command("mcp")
                 const watchRoot = root !== null && root !== void 0 ? root : (_a = resolveMcpProject(undefined, projectRoot)) === null || _a === void 0 ? void 0 : _a.root;
                 if (!watchRoot)
                     return;
-                const result = yield (0, watcher_launcher_1.launchWatcher)(watchRoot);
+                const result = yield (0, watcher_launcher_1.launchWatcher)(watchRoot, WATCH_LEASE);
                 if (result.ok && !result.reused) {
                     console.log(`[MCP] Started background watcher for ${watchRoot} (PID: ${result.pid})`);
                 }
@@ -428,7 +619,7 @@ exports.mcp = new commander_1.Command("mcp")
     // --- Tool handlers ---
     function handleSemanticSearch(args_1) {
         return __awaiter(this, arguments, void 0, function* (args, isSearchAll = false) {
-            var _a, _b, _c;
+            var _a, _b;
             const query = String(args.query || "");
             if (!query)
                 return err("Missing required parameter: query");
@@ -538,10 +729,10 @@ exports.mcp = new commander_1.Command("mcp")
                     rerank: process.env.GMAX_RERANK === "1",
                     seeds,
                 };
-                const result = (_b = (yield daemonSearch(Object.assign({ projectRoot: resolvedRoot, query,
-                    limit, filters: effectiveFilters, pathPrefix }, searchOptions)))) !== null && _b !== void 0 ? _b : (yield getSearcher().search(query, limit, searchOptions, effectiveFilters, pathPrefix));
+                const result = yield searchStore(Object.assign({ projectRoot: resolvedRoot, query,
+                    limit, filters: effectiveFilters, pathPrefix }, searchOptions));
                 const allowedRoots = searchAll
-                    ? ((_c = filters.projectRoots) !== null && _c !== void 0 ? _c : [])
+                    ? ((_b = filters.projectRoots) !== null && _b !== void 0 ? _b : [])
                     : [resolvedRoot];
                 result.data = result.data.filter((chunk) => {
                     const candidate = chunkAbsPath(chunk);
@@ -684,7 +875,7 @@ exports.mcp = new commander_1.Command("mcp")
                         const regex = new RegExp(namePattern, "i");
                         results = results.filter((r) => r.symbols.some((s) => regex.test(s)));
                     }
-                    catch (_d) {
+                    catch (_c) {
                         // Invalid regex — skip filter
                     }
                 }
@@ -692,9 +883,10 @@ exports.mcp = new commander_1.Command("mcp")
                 // Symbol mode: append call graph
                 if (mode === "symbol" && !searchAll) {
                     try {
-                        const db = getVectorDb();
-                        const builder = new graph_builder_1.GraphBuilder(db, resolvedRoot);
-                        const graph = yield builder.buildGraph(query);
+                        // `graph.peek` is the single-hop `buildGraph` this used to call,
+                        // plus metadata this branch ignores — one verb rather than a second
+                        // shape for the same query.
+                        const { graph } = yield peekSymbolGraph(resolvedRoot, query, 1);
                         if (graph.center) {
                             const traceLines = ["", "--- Call graph ---"];
                             const centerRel = graph.center.file.startsWith(resolvedRoot)
@@ -727,15 +919,14 @@ exports.mcp = new commander_1.Command("mcp")
                             output += `\n${traceLines.join("\n")}`;
                         }
                     }
-                    catch (_e) {
+                    catch (_d) {
                         // Trace failed — return search results without trace
                     }
                 }
                 return ok(prefixNotes(output));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Search failed: ${msg}`);
+                return toolError("Search failed", e);
             }
         });
     }
@@ -800,10 +991,10 @@ exports.mcp = new commander_1.Command("mcp")
                 let skeleton = "";
                 let language = "";
                 let tokenEstimate = 0;
-                // Try cached skeleton first
+                // Try the stored skeleton first, via the daemon's warm store.
                 try {
-                    const db = getVectorDb();
-                    const cached = yield (0, retriever_1.getStoredSkeleton)(db, absPath);
+                    const cached = (yield lookupSkeleton(root, { path: absPath }))
+                        .skeleton;
                     if (cached) {
                         skeleton = cached;
                         tokenEstimate = Math.ceil(cached.length / 4);
@@ -871,10 +1062,15 @@ exports.mcp = new commander_1.Command("mcp")
             }
             void ensureWatcher(root);
             try {
-                const db = getVectorDb();
-                const builder = new graph_builder_1.GraphBuilder(db, root);
                 const depth = Math.min(Math.max(Number(args.depth) || 1, 1), 3);
-                const graph = yield builder.buildGraphMultiHop(symbol, depth);
+                const scope = projectScope(root);
+                const graph = yield graphVerb("graph.trace", {
+                    projectRoot: root,
+                    scope,
+                    payload: { target: symbol, hops: depth },
+                    render: (resp) => resp.graph,
+                    inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphTrace)(deps.vectorDb, { symbol, hops: depth, scope })),
+                });
                 if (!graph.center) {
                     return ok(`Symbol '${symbol}' not found in the index. Check \`gmax status\` to see which projects are indexed, or try \`gmax search ${symbol}\` to find similar symbols.`);
                 }
@@ -938,8 +1134,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(lines.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Trace failed: ${msg}`);
+                return toolError("Trace failed", e);
             }
         });
     }
@@ -953,23 +1148,21 @@ exports.mcp = new commander_1.Command("mcp")
                 const { proj, root } = resolveRegisteredProject(args.root);
                 if (!proj)
                     return err("Project not added to gmax yet.");
-                const db = getVectorDb();
-                const table = yield db.ensureTable();
-                const prefix = root.endsWith("/") ? root : `${root}/`;
-                const rows = yield table
-                    .query()
-                    .select([
-                    "path",
-                    "start_line",
-                    "end_line",
-                    "role",
-                    "is_exported",
-                    "defined_symbols",
-                ])
-                    .where(`array_contains(defined_symbols, '${(0, filter_builder_1.escapeSqlString)(symbol)}') AND ${(0, filter_builder_1.pathStartsWith)(prefix)}`)
-                    .limit(10)
-                    .toArray();
-                if (rows.length === 0) {
+                // Locations come from the daemon; the body is read below, from this
+                // process's own filesystem view — same split the `extract` CLI makes.
+                const [rows] = yield locateRows(root, {
+                    select: [
+                        "path",
+                        "start_line",
+                        "end_line",
+                        "role",
+                        "is_exported",
+                        "defined_symbols",
+                    ],
+                    matches: [{ kind: "definedSymbol", symbol }],
+                    limit: 10,
+                });
+                if (!rows || rows.length === 0) {
                     return ok(`Symbol '${symbol}' not found in the index. Check \`gmax status\` to see which projects are indexed, or try \`gmax search ${symbol}\` to find similar symbols.`);
                 }
                 // Pick best match: prefer exact first-defined, then highest role
@@ -978,7 +1171,7 @@ exports.mcp = new commander_1.Command("mcp")
                     DEFINITION: 2,
                     IMPLEMENTATION: 1,
                 };
-                const sorted = rows.sort((a, b) => {
+                const sorted = [...rows].sort((a, b) => {
                     const aDefs = Array.isArray(a.defined_symbols)
                         ? a.defined_symbols
                         : [];
@@ -1031,13 +1224,13 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(parts.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Extract failed: ${msg}`);
+                return toolError("Extract failed", e);
             }
         });
     }
     function handlePeekSymbol(args) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g;
             ensureWatcher();
             const symbol = String(args.symbol || "");
             if (!symbol)
@@ -1047,31 +1240,21 @@ exports.mcp = new commander_1.Command("mcp")
                 if (!proj)
                     return err("Project not added to gmax yet.");
                 const depth = Math.min(Math.max(Number(args.depth || 1), 1), 3);
-                const db = getVectorDb();
-                const { GraphBuilder } = yield Promise.resolve().then(() => __importStar(require("../lib/graph/graph-builder")));
-                const builder = new GraphBuilder(db, root);
-                const graph = yield builder.buildGraph(symbol);
+                // One verb for the whole tool: the graph, the defining chunk's
+                // is_exported/start_line/end_line, and (when depth > 1) the multi-hop
+                // caller tree. Four queries became one round trip.
+                const peek = yield peekSymbolGraph(root, symbol, depth);
+                const graph = peek.graph;
                 if (!graph.center) {
                     return ok(`Symbol '${symbol}' not found in the index. Check \`gmax status\` to see which projects are indexed, or try \`gmax search ${symbol}\` to find similar symbols.`);
                 }
                 const center = graph.center;
                 const rel = (p) => p.startsWith(root) ? p.slice(root.length + 1) : p;
-                // Get chunk metadata for is_exported and end_line
-                const table = yield db.ensureTable();
-                const prefix = root.endsWith("/") ? root : `${root}/`;
-                const metaRows = yield table
-                    .query()
-                    .select(["is_exported", "start_line", "end_line"])
-                    .where(`array_contains(defined_symbols, '${(0, filter_builder_1.escapeSqlString)(symbol)}') AND ${(0, filter_builder_1.pathStartsWith)(prefix)}`)
-                    .limit(1)
-                    .toArray();
-                const exported = metaRows.length > 0 && Boolean(metaRows[0].is_exported);
-                const startLine = metaRows.length > 0
-                    ? Number(metaRows[0].start_line || 0)
-                    : center.line;
-                const endLine = metaRows.length > 0
-                    ? Number(metaRows[0].end_line || 0)
-                    : center.line;
+                // Chunk metadata for is_exported and end_line; null when the symbol has
+                // no defining chunk, in which case the center's own line stands in.
+                const exported = (_b = (_a = peek.meta) === null || _a === void 0 ? void 0 : _a.isExported) !== null && _b !== void 0 ? _b : false;
+                const startLine = (_d = (_c = peek.meta) === null || _c === void 0 ? void 0 : _c.startLine) !== null && _d !== void 0 ? _d : center.line;
+                const endLine = (_f = (_e = peek.meta) === null || _e === void 0 ? void 0 : _e.endLine) !== null && _f !== void 0 ? _f : center.line;
                 // Get signature from source
                 const fs = yield Promise.resolve().then(() => __importStar(require("node:fs")));
                 let sigText = "(source not available)";
@@ -1090,11 +1273,10 @@ exports.mcp = new commander_1.Command("mcp")
                     }
                     sigText = sigLines.join("\n").trim();
                 }
-                catch (_a) { }
+                catch (_h) { }
                 // Get callers
                 let callerList;
                 if (depth > 1) {
-                    const multiHop = yield builder.buildGraphMultiHop(symbol, depth);
                     const flat = [];
                     function walkCallers(tree) {
                         for (const t of tree) {
@@ -1107,7 +1289,7 @@ exports.mcp = new commander_1.Command("mcp")
                             walkCallers(t.callers);
                         }
                     }
-                    walkCallers(multiHop.callerTree);
+                    walkCallers((_g = peek.callerTree) !== null && _g !== void 0 ? _g : []);
                     callerList = flat;
                 }
                 else {
@@ -1165,8 +1347,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(parts.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Peek failed: ${msg}`);
+                return toolError("Peek failed", e);
             }
         });
     }
@@ -1180,35 +1361,28 @@ exports.mcp = new commander_1.Command("mcp")
                 const { proj, root } = resolveRegisteredProject(args.root);
                 if (!proj)
                     return err("Project not added to gmax yet.");
-                const db = getVectorDb();
-                const table = yield db.ensureTable();
-                const prefix = root.endsWith("/") ? root : `${root}/`;
-                const defRows = yield table
-                    .query()
-                    .select(["path", "start_line", "is_exported"])
-                    .where(`array_contains(defined_symbols, '${(0, filter_builder_1.escapeSqlString)(symbol)}') AND ${(0, filter_builder_1.pathStartsWith)(prefix)}`)
-                    .limit(1)
-                    .toArray();
-                if (defRows.length === 0) {
+                const scope = projectScope(root);
+                const facts = yield graphVerb("graph.dead", {
+                    projectRoot: root,
+                    scope,
+                    payload: { target: symbol },
+                    render: (resp) => resp.dead,
+                    inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphDead)(deps.vectorDb, { symbol, scope })),
+                });
+                if (!facts.found) {
                     return ok(`Symbol '${symbol}' not found in the index. Check \`gmax status\` to see which projects are indexed, or try \`gmax search ${symbol}\` to find similar symbols.`);
                 }
-                const defRow = defRows[0];
-                const defPath = String(defRow.path || "");
-                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, (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) {
-                    if (isExported) {
+                const defLoc = `${rel(facts.defPath)}:${facts.defLine + 1}`;
+                if (facts.callerCount === 0) {
+                    if (facts.isExported) {
                         return ok(`PUBLIC EXPORT  ${defLoc} defines ${symbol} — no internal callers found; check external usage`);
                     }
                     return ok(`DEAD  ${defLoc} defines ${symbol}`);
                 }
-                const top = callers.slice(0, 3);
+                const top = facts.topCallers;
                 const lines = [
-                    `LIVE  ${defLoc} defines ${symbol} — ${callers.length} inbound caller${callers.length === 1 ? "" : "s"} (top ${top.length}):`,
+                    `LIVE  ${defLoc} defines ${symbol} — ${facts.callerCount} inbound caller${facts.callerCount === 1 ? "" : "s"} (top ${top.length}):`,
                 ];
                 for (const c of top) {
                     lines.push(`  ${rel(c.file)}:${c.line + 1}`);
@@ -1216,8 +1390,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(lines.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Dead check failed: ${msg}`);
+                return toolError("Dead check failed", e);
             }
         });
     }
@@ -1227,39 +1400,25 @@ exports.mcp = new commander_1.Command("mcp")
             const { proj, root } = resolveRegisteredProject(args.root);
             if (!proj)
                 return err("Project not added to gmax yet.");
-            const prefix = root.endsWith("/") ? root : `${root}/`;
             const top = Math.min(Math.max(Number(args.top) || 10, 1), 50);
             try {
-                const db = getVectorDb();
-                const table = yield db.ensureTable();
-                const rows = yield table
-                    .query()
-                    .select([
-                    "path",
-                    "start_line",
-                    "defined_symbols",
-                    "referenced_symbols",
-                    "type_referenced_symbols",
-                    "is_exported",
-                ])
-                    .where((0, filter_builder_1.pathStartsWith)(prefix))
-                    .limit(500000)
-                    .toArray();
-                if (rows.length === 0) {
+                // The 500k-row read and its aggregation stay wherever the store is
+                // open; what crosses the socket is the finished report.
+                const scope = projectScope(root);
+                const audit = yield graphVerb("graph.audit", {
+                    projectRoot: root,
+                    scope,
+                    payload: { top },
+                    render: (resp) => { var _a; return (_a = resp.audit) !== null && _a !== void 0 ? _a : null; },
+                    inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphAudit)(deps.vectorDb, {
+                        projectRoot: root,
+                        scope,
+                        top,
+                    })),
+                });
+                if (!audit) {
                     return ok(`No indexed data found for ${root}. Run: gmax index --path ${root}`);
                 }
-                const audit = (0, audit_1.computeAudit)(rows.map((r) => ({
-                    path: String(r.path || ""),
-                    start_line: Number(r.start_line || 0),
-                    is_exported: Boolean(r.is_exported),
-                    defined_symbols: toStringArray(r.defined_symbols),
-                    referenced_symbols: [
-                        ...new Set([
-                            ...toStringArray(r.referenced_symbols),
-                            ...toStringArray(r.type_referenced_symbols),
-                        ]),
-                    ],
-                })), prefix, top);
                 const lines = [];
                 lines.push(`Audit — ${audit.scannedChunks} chunks across ${audit.scannedFiles} files`);
                 lines.push("");
@@ -1298,8 +1457,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(lines.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Audit failed: ${msg}`);
+                return toolError("Audit failed", e);
             }
         });
     }
@@ -1318,25 +1476,35 @@ exports.mcp = new commander_1.Command("mcp")
             const dirDepth = Math.min(Math.max(Number(args.dir_depth) || surprising_connections_1.DEFAULT_SURPRISE_OPTIONS.dirDepth, 1), 20);
             const minSimilarity = Math.max(Number(args.min_similarity) || surprising_connections_1.DEFAULT_SURPRISE_OPTIONS.minSimilarity, 0);
             const maxRows = Math.min(Math.max(Number(args.max_rows) || surprising_connections_1.DEFAULT_SURPRISE_OPTIONS.maxRows, 1), surprising_connections_1.MAX_SURPRISE_ROWS);
+            const options = {
+                sample,
+                neighbors,
+                dirDepth,
+                minSimilarity,
+                maxRows,
+                includeTests: Boolean(args.include_tests),
+                includeEval: Boolean(args.include_eval),
+                in: typeof args.in === "string" ? [args.in] : undefined,
+                exclude: typeof args.exclude === "string" ? [args.exclude] : undefined,
+            };
             try {
-                const db = getVectorDb();
-                const table = yield db.ensureTable();
-                const result = yield (0, surprising_connections_1.analyzeSurprisingConnections)(table, root, {
-                    sample,
-                    neighbors,
-                    dirDepth,
-                    minSimilarity,
-                    maxRows,
-                    includeTests: Boolean(args.include_tests),
-                    includeEval: Boolean(args.include_eval),
-                    in: typeof args.in === "string" ? args.in : undefined,
-                    exclude: typeof args.exclude === "string" ? args.exclude : undefined,
+                // The scan can touch 50k rows and every one of their vectors; the verb
+                // returns the summary plus the findings this will print, and drops the
+                // raw `pairs` array entirely.
+                const result = yield readStore("surprises", {
+                    daemon: () => (0, daemon_client_1.sendDaemonCommand)({
+                        cmd: "vector.surprises",
+                        projectRoot: root,
+                        options,
+                        top,
+                    }, { timeoutMs: 120000 }),
+                    render: (resp) => resp,
+                    inProcess: () => localStore((deps) => (0, vector_handler_1.runSurprises)(deps, { projectRoot: root, options, top })),
                 });
                 return ok(formatMcpSurprisingConnections(result, top));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Surprising connections failed: ${msg}`);
+                return toolError("Surprising connections failed", e);
             }
         });
     }
@@ -1352,8 +1520,19 @@ exports.mcp = new commander_1.Command("mcp")
                 const { proj, root } = resolveRegisteredProject(args.root);
                 if (!proj)
                     return err("Project not added to gmax yet.");
-                const builder = new graph_builder_1.GraphBuilder(getVectorDb(), root);
-                const hits = yield builder.getNeighbors(symbol, direction, maxHops);
+                const scope = projectScope(root);
+                const hits = yield graphVerb("graph.neighbors", {
+                    projectRoot: root,
+                    scope,
+                    payload: { symbol, direction, maxHops },
+                    render: (resp) => { var _a; return (_a = resp.hits) !== null && _a !== void 0 ? _a : []; },
+                    inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphNeighbors)(deps.vectorDb, {
+                        symbol,
+                        direction,
+                        maxHops,
+                        scope,
+                    })),
+                });
                 if (hits.length === 0) {
                     return ok(`No ${direction} found for '${symbol}' within ${maxHops} hop(s). Check it is indexed (\`gmax status\`) or try the \`dead\` tool.`);
                 }
@@ -1370,8 +1549,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(lines.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`get_neighbors failed: ${msg}`);
+                return toolError("get_neighbors failed", e);
             }
         });
     }
@@ -1389,8 +1567,20 @@ exports.mcp = new commander_1.Command("mcp")
                 const { proj, root } = resolveRegisteredProject(args.root);
                 if (!proj)
                     return err("Project not added to gmax yet.");
-                const builder = new graph_builder_1.GraphBuilder(getVectorDb(), root);
-                const pathSyms = yield builder.findPaths(from, to, direction, maxHops);
+                const scope = projectScope(root);
+                const pathSyms = yield graphVerb("graph.paths", {
+                    projectRoot: root,
+                    scope,
+                    payload: { from, to, direction, maxHops },
+                    render: (resp) => { var _a; return (_a = resp.path) !== null && _a !== void 0 ? _a : null; },
+                    inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphPaths)(deps.vectorDb, {
+                        from,
+                        to,
+                        direction,
+                        maxHops,
+                        scope,
+                    })),
+                });
                 if (!pathSyms) {
                     return ok(`No ${direction} path from '${from}' to '${to}' within ${maxHops} hops.`);
                 }
@@ -1399,8 +1589,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(`Path (${hops} hop${hops === 1 ? "" : "s"}): ${pathSyms.join(arrow)}`);
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`find_paths failed: ${msg}`);
+                return toolError("find_paths failed", e);
             }
         });
     }
@@ -1417,9 +1606,18 @@ exports.mcp = new commander_1.Command("mcp")
                 const { proj, root } = resolveRegisteredProject(args.root);
                 if (!proj)
                     return err("Project not added to gmax yet.");
+                // Resolved here, not daemon-side: verifyExistingTarget looks at this
+                // process's filesystem view, and a path outside the project must fail
+                // with the containment error before anything reaches the store.
                 const abs = filesIn.map((f) => (0, path_containment_1.resolveContainedPath)(root, f, { verifyExistingTarget: true }));
-                const builder = new graph_builder_1.GraphBuilder(getVectorDb(), root);
-                const sg = yield builder.subgraphForFiles(abs);
+                const scope = projectScope(root);
+                const sg = yield graphVerb("graph.subgraph", {
+                    projectRoot: root,
+                    scope,
+                    payload: { files: abs },
+                    render: (resp) => resp.subgraph,
+                    inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphSubgraph)(deps.vectorDb, { files: abs, scope })),
+                });
                 if (sg.symbols.length === 0) {
                     return ok(`No indexed symbols found in: ${filesIn.join(", ")}. Check the paths and \`gmax status\`.`);
                 }
@@ -1447,8 +1645,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(lines.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`subgraph_for_files failed: ${msg}`);
+                return toolError("subgraph_for_files failed", e);
             }
         });
     }
@@ -1463,60 +1660,29 @@ exports.mcp = new commander_1.Command("mcp")
                 return err("Project not added to gmax yet. Run `gmax add` to index it first.");
             }
             try {
-                const db = getVectorDb();
-                const table = yield db.ensureTable();
-                const rootPrefix = root.endsWith("/") ? root : `${root}/`;
-                let where = `array_length(defined_symbols) > 0 AND ${(0, filter_builder_1.pathStartsWith)(rootPrefix)}`;
-                if (pathPrefix) {
-                    const absPrefix = (0, path_containment_1.resolveContainedPath)(root, pathPrefix);
-                    where += ` AND ${(0, filter_builder_1.pathStartsWith)((0, filter_builder_1.normalizePath)(absPrefix))}`;
-                }
-                const query = table
-                    .query()
-                    .select([
-                    "defined_symbols",
-                    "path",
-                    "start_line",
-                    "role",
-                    "is_exported",
-                ])
-                    .where(where)
-                    .limit(pattern ? 10000 : Math.max(limit * 50, 2000));
-                const rows = yield query.toArray();
-                const map = new Map();
-                for (const row of rows) {
-                    const defs = toStringArray(row.defined_symbols);
-                    const rowPath = String(row.path || "");
-                    const line = Number(row.start_line || 0);
-                    const role = String(row.role || "");
-                    const exported = Boolean(row.is_exported);
-                    for (const sym of defs) {
-                        if (pattern && !sym.toLowerCase().includes(pattern.toLowerCase())) {
-                            continue;
-                        }
-                        const existing = map.get(sym);
-                        if (existing) {
-                            existing.count += 1;
-                        }
-                        else {
-                            map.set(sym, {
-                                symbol: sym,
-                                count: 1,
-                                path: rowPath,
-                                line: Math.max(1, line + 1),
-                                role,
-                                exported,
-                            });
-                        }
-                    }
-                }
-                const entries = Array.from(map.values())
-                    .sort((a, b) => {
-                    if (b.count !== a.count)
-                        return b.count - a.count;
-                    return a.symbol.localeCompare(b.symbol);
-                })
-                    .slice(0, limit);
+                // A single absolute prefix carries both scopes: the sub-path when one
+                // was asked for (it is already inside the root), the root otherwise.
+                const absPrefix = pathPrefix
+                    ? (0, path_containment_1.resolveContainedPath)(root, pathPrefix)
+                    : root.endsWith("/")
+                        ? root
+                        : `${root}/`;
+                const entries = yield readStore("symbols", {
+                    daemon: () => (0, daemon_client_1.sendDaemonCommand)({
+                        cmd: "rows.symbols",
+                        projectRoot: root,
+                        pathPrefix: absPrefix,
+                        pattern,
+                        limit,
+                    }, { timeoutMs: 60000 }),
+                    render: (resp) => { var _a; return ((_a = resp.entries) !== null && _a !== void 0 ? _a : []); },
+                    inProcess: () => localStore((deps) => (0, rows_handler_1.runSymbols)(deps, {
+                        projectRoot: root,
+                        pathPrefix: absPrefix,
+                        pattern,
+                        limit,
+                    })),
+                });
                 if (entries.length === 0) {
                     return ok("No symbols found. Run `gmax status` to verify the project is indexed, or `gmax index` to rebuild.");
                 }
@@ -1526,13 +1692,14 @@ exports.mcp = new commander_1.Command("mcp")
                         : e.path;
                     const roleTag = e.role ? ` [${e.role.slice(0, 4)}]` : "";
                     const expTag = e.exported ? " exported" : "";
-                    return `${e.symbol}${roleTag}${expTag}\t${rel}:${e.line}`;
+                    // SymbolEntry.line is the 0-based start_line the store holds; this
+                    // tool has always printed a 1-based line, floored at 1.
+                    return `${e.symbol}${roleTag}${expTag}\t${rel}:${Math.max(1, e.line + 1)}`;
                 });
                 return ok(lines.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Symbol listing failed: ${msg}`);
+                return toolError("Symbol listing failed", e);
             }
         });
     }
@@ -1572,9 +1739,7 @@ exports.mcp = new commander_1.Command("mcp")
                 const projects = (0, project_registry_1.listProjects)();
                 const currentProject = resolveMcpProject(undefined, projectRoot);
                 const identity = (0, embedding_status_1.projectEmbeddingStatus)(currentProject, globalConfig);
-                const db = getVectorDb();
-                const stats = yield db.getStats();
-                const fileCount = yield db.getDistinctFileCount();
+                const { chunks, files } = yield indexTotals(projects);
                 // Watcher status
                 const watcher = (0, watcher_store_1.getWatcherCoveringPath)(projectRoot);
                 let watcherLine = "Watcher: not running";
@@ -1593,7 +1758,7 @@ exports.mcp = new commander_1.Command("mcp")
                 // per-project chunk counts) lives in `list_projects` — keep this tool
                 // focused on index health and avoid the N-project LanceDB scans.
                 const lines = [
-                    `Index: ~/.gmax/lancedb (${stats.chunks} chunks, ${fileCount} files)`,
+                    `Index: ~/.gmax/lancedb (${chunks} chunks, ${files} files)`,
                     `Configured embedding: ${identity.configured.tier} ${identity.configured.vectorDim}d [${(0, embedding_status_1.embeddingFingerprintLabel)(identity.configured.fingerprint)}] (${globalConfig.embedMode})`,
                     identity.built
                         ? `Built embedding: ${identity.built.tier} ${identity.built.vectorDim}d [${(0, embedding_status_1.embeddingFingerprintLabel)(identity.built.fingerprint)}] (${identity.state})`
@@ -1607,8 +1772,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(lines.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Status check failed: ${msg}`);
+                return toolError("Status check failed", e);
             }
         });
     }
@@ -1623,8 +1787,15 @@ exports.mcp = new commander_1.Command("mcp")
             const prefix = dir.endsWith("/") ? dir : `${dir}/`;
             const limit = Math.min(Math.max(Number(args.limit) || 200, 1), 5000);
             try {
-                const db = getVectorDb();
-                const { summarized, remaining } = yield (0, syncer_1.generateSummaries)(db, prefix, (done, total) => {
+                // `generateSummaries` is a deliberate no-op stub — the summarizer is
+                // decommissioned (see the HARD STOP at the top of CLAUDE.md) — and it
+                // touches neither the VectorDB it is handed nor any other store.
+                // Opening one here would take a reader lease under ~/.gmax purely to
+                // reach a function that returns {0, 0}, which is precisely the
+                // per-session reader this tool set no longer holds. It is still called
+                // rather than inlined so the stub stays the single source of truth.
+                const noStoreNeeded = null;
+                const { summarized, remaining } = yield (0, syncer_1.generateSummaries)(noStoreNeeded, prefix, (done, total) => {
                     console.log(`[summarize] ${done}/${total} chunks`);
                 }, limit);
                 if (summarized === 0) {
@@ -1636,8 +1807,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(`Summarized ${summarized} chunks in ${path.basename(dir)}/${remainMsg}`);
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Summarization failed: ${msg}`);
+                return toolError("Summarization failed", e);
             }
         });
     }
@@ -1647,117 +1817,54 @@ exports.mcp = new commander_1.Command("mcp")
             const { proj, root } = resolveRegisteredProject(args.root);
             if (!proj)
                 return err("Project not added to gmax yet.");
-            const prefix = root.endsWith("/") ? root : `${root}/`;
             const projectName = path.basename(root);
             try {
-                const db = getVectorDb();
-                const table = yield db.ensureTable();
-                const rows = yield table
-                    .query()
-                    .select([
-                    "path",
-                    "role",
-                    "is_exported",
-                    "complexity",
-                    "defined_symbols",
-                    "referenced_symbols",
-                ])
-                    .where((0, filter_builder_1.pathStartsWith)(prefix))
-                    .limit(200000)
-                    .toArray();
-                if (rows.length === 0) {
+                // `rows.project` returns the finished overview, not the up-to-200 000
+                // rows it was computed from — the same aggregation `gmax project` runs,
+                // in whichever process holds the store.
+                const overview = yield readStore("project", {
+                    daemon: () => (0, daemon_client_1.sendDaemonCommand)({ cmd: "rows.project", projectRoot: root }, { timeoutMs: 120000 }),
+                    render: (resp) => resp.overview,
+                    inProcess: () => localStore((deps) => (0, rows_handler_1.runProject)(deps, root)),
+                });
+                if (overview.chunks === 0) {
                     return ok(`No indexed data found for ${root}. Run: gmax index --path ${root}`);
                 }
-                const files = new Set();
-                const extCounts = new Map();
-                const dirCounts = new Map();
-                const roleCounts = new Map();
-                const symbolRefs = new Map();
-                const entryPoints = [];
-                for (const row of rows) {
-                    const p = String(row.path || "");
-                    const role = String(row.role || "IMPLEMENTATION");
-                    const exported = Boolean(row.is_exported);
-                    const complexity = Number(row.complexity || 0);
-                    const defs = toStringArray(row.defined_symbols);
-                    const refs = toStringArray(row.referenced_symbols);
-                    files.add(p);
-                    const ext = path.extname(p).toLowerCase() || path.basename(p);
-                    extCounts.set(ext, (extCounts.get(ext) || 0) + 1);
-                    const rel = p.startsWith(prefix) ? p.slice(prefix.length) : p;
-                    const parts = rel.split("/");
-                    const dir = parts.length > 2
-                        ? `${parts.slice(0, 2).join("/")}/`
-                        : parts.length > 1
-                            ? `${parts[0]}/`
-                            : "(root)";
-                    if (!dirCounts.has(dir)) {
-                        dirCounts.set(dir, { files: new Set(), chunks: 0 });
-                    }
-                    const dc = dirCounts.get(dir);
-                    dc.files.add(p);
-                    dc.chunks++;
-                    roleCounts.set(role, (roleCounts.get(role) || 0) + 1);
-                    for (const ref of refs) {
-                        symbolRefs.set(ref, (symbolRefs.get(ref) || 0) + 1);
-                    }
-                    if (exported &&
-                        role === "ORCHESTRATION" &&
-                        complexity >= 5 &&
-                        defs.length > 0) {
-                        const relPath = p.startsWith(prefix) ? p.slice(prefix.length) : p;
-                        entryPoints.push({ symbol: defs[0], path: relPath });
-                    }
-                }
+                const pct = (count) => Math.round((count / overview.chunks) * 100);
                 const lines = [];
-                const projects = (0, project_registry_1.listProjects)();
-                const proj = projects.find((p) => p.root === root);
                 lines.push(`Project: ${projectName} (${root})`);
-                lines.push(`Last indexed: ${(_a = proj === null || proj === void 0 ? void 0 : proj.lastIndexed) !== null && _a !== void 0 ? _a : "unknown"} • ${rows.length} chunks • ${files.size} files`);
+                lines.push(`Last indexed: ${(_a = proj.lastIndexed) !== null && _a !== void 0 ? _a : "unknown"} • ${overview.chunks} chunks • ${overview.files} files`);
                 lines.push("");
-                const extEntries = Array.from(extCounts.entries())
-                    .sort((a, b) => b[1] - a[1])
-                    .slice(0, 8);
-                const langLine = extEntries
-                    .map(([ext, count]) => `${ext} (${Math.round((count / rows.length) * 100)}%)`)
-                    .join(", ");
-                lines.push(`Languages: ${langLine}`);
+                lines.push(`Languages: ${overview.extEntries
+                    .map(([ext, count]) => `${ext} (${pct(count)}%)`)
+                    .join(", ")}`);
                 lines.push("");
                 lines.push("Directory structure:");
-                const dirEntries = Array.from(dirCounts.entries())
-                    .sort((a, b) => b[1].chunks - a[1].chunks)
-                    .slice(0, 12);
-                for (const [dir, data] of dirEntries) {
-                    lines.push(`  ${dir.padEnd(25)} (${data.files.size} files, ${data.chunks} chunks)`);
+                for (const [dir, data] of overview.dirEntries) {
+                    lines.push(`  ${dir.padEnd(25)} (${data.files} files, ${data.chunks} chunks)`);
                 }
                 lines.push("");
-                const roleEntries = Array.from(roleCounts.entries()).sort((a, b) => b[1] - a[1]);
-                const roleLine = roleEntries
-                    .map(([role, count]) => `${Math.round((count / rows.length) * 100)}% ${role}`)
-                    .join(", ");
-                lines.push(`Roles: ${roleLine}`);
+                lines.push(`Roles: ${overview.roleEntries
+                    .map(([role, count]) => `${pct(count)}% ${role}`)
+                    .join(", ")}`);
                 lines.push("");
-                const topSymbols = Array.from(symbolRefs.entries())
-                    .sort((a, b) => b[1] - a[1])
-                    .slice(0, 8);
-                if (topSymbols.length > 0) {
+                if (overview.topSymbols.length > 0) {
                     lines.push("Key symbols (by reference count):");
-                    for (const [sym, count] of topSymbols) {
+                    for (const [sym, count] of overview.topSymbols) {
                         lines.push(`  ${sym.padEnd(25)} (referenced ${count}x)`);
                     }
                     lines.push("");
                 }
-                if (entryPoints.length > 0) {
+                if (overview.entryPoints.length > 0) {
                     lines.push("Entry points (exported orchestration):");
-                    for (const ep of entryPoints.slice(0, 10)) {
+                    for (const ep of overview.entryPoints) {
                         lines.push(`  ${ep.symbol.padEnd(25)} ${ep.path}`);
                     }
                 }
                 return ok(lines.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Project summary failed: ${msg}`);
+                return toolError("Project summary failed", e);
             }
         });
     }
@@ -1776,14 +1883,13 @@ exports.mcp = new commander_1.Command("mcp")
             });
             const rootPrefix = root.endsWith("/") ? root : `${root}/`;
             try {
-                const db = getVectorDb();
-                const table = yield db.ensureTable();
-                const fileChunks = yield table
-                    .query()
-                    .select(["defined_symbols", "referenced_symbols"])
-                    .where(`path = '${(0, filter_builder_1.escapeSqlString)(absPath)}'`)
-                    .toArray();
-                if (fileChunks.length === 0) {
+                // The file's own chunks, unscoped: the file was named explicitly.
+                const [fileChunks] = yield locateRows(root, {
+                    select: ["defined_symbols", "referenced_symbols"],
+                    matches: [{ kind: "path", path: absPath }],
+                    scoped: false,
+                });
+                if (!fileChunks || fileChunks.length === 0) {
                     return ok(`File not found in index: ${file}. Check that the path is relative to the project root. Run \`gmax status\` to see indexed projects.`);
                 }
                 const definedHere = new Set();
@@ -1794,17 +1900,19 @@ exports.mcp = new commander_1.Command("mcp")
                     for (const s of toStringArray(chunk.referenced_symbols))
                         referencedHere.add(s);
                 }
-                // Dependencies: files that DEFINE symbols this file REFERENCES
+                // Dependencies: files that DEFINE symbols this file REFERENCES. One
+                // batched round trip instead of one per symbol — the daemon runs the
+                // same N selects, the socket carries one request.
+                const depSymbols = [...referencedHere].filter((s) => !definedHere.has(s));
                 const depCounts = new Map();
-                for (const sym of referencedHere) {
-                    if (definedHere.has(sym))
-                        continue;
-                    const rows = yield table
-                        .query()
-                        .select(["path"])
-                        .where(`array_contains(defined_symbols, '${(0, filter_builder_1.escapeSqlString)(sym)}') AND ${(0, filter_builder_1.pathStartsWith)(rootPrefix)}`)
-                        .limit(3)
-                        .toArray();
+                for (const rows of yield locateRows(root, {
+                    select: ["path"],
+                    matches: depSymbols.map((symbol) => ({
+                        kind: "definedSymbol",
+                        symbol,
+                    })),
+                    limit: 3,
+                })) {
                     for (const row of rows) {
                         const p = String(row.path || "");
                         if (p === absPath)
@@ -1812,15 +1920,16 @@ exports.mcp = new commander_1.Command("mcp")
                         depCounts.set(p, (depCounts.get(p) || 0) + 1);
                     }
                 }
-                // Dependents: files that REFERENCE symbols this file DEFINES
+                // Dependents: files that REFERENCE symbols this file DEFINES.
                 const revCounts = new Map();
-                for (const sym of definedHere) {
-                    const rows = yield table
-                        .query()
-                        .select(["path"])
-                        .where(`array_contains(referenced_symbols, '${(0, filter_builder_1.escapeSqlString)(sym)}') AND ${(0, filter_builder_1.pathStartsWith)(rootPrefix)}`)
-                        .limit(20)
-                        .toArray();
+                for (const rows of yield locateRows(root, {
+                    select: ["path"],
+                    matches: [...definedHere].map((symbol) => ({
+                        kind: "referencedSymbol",
+                        symbol,
+                    })),
+                    limit: 20,
+                })) {
                     for (const row of rows) {
                         const p = String(row.path || "");
                         if (p === absPath)
@@ -1864,8 +1973,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(lines.join("\n"));
             }
             catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                return err(`Related files failed: ${msg}`);
+                return toolError("Related files failed", e);
             }
         });
     }
@@ -1930,7 +2038,6 @@ exports.mcp = new commander_1.Command("mcp")
     // --- New command handlers (Phase 4) ---
     function handleDiffChanges(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             ensureWatcher();
             const { getChangedFiles } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/git")));
             const ref = typeof args.ref === "string" ? args.ref : undefined;
@@ -1953,8 +2060,8 @@ exports.mcp = new commander_1.Command("mcp")
                     const searchOptions = {
                         rerank: process.env.GMAX_RERANK === "1",
                     };
-                    const response = (_a = (yield daemonSearch(Object.assign({ projectRoot: root, query,
-                        limit, filters: {}, pathPrefix: root }, searchOptions)))) !== null && _a !== void 0 ? _a : (yield getSearcher().search(query, limit, searchOptions, {}, root));
+                    const response = yield searchStore(Object.assign({ projectRoot: root, query,
+                        limit, filters: {}, pathPrefix: root }, searchOptions));
                     const changedSet = new Set(changedFiles);
                     // searcher.search() returns mapped chunks (path under metadata.path);
                     // changedFiles are absolute, so match on the resolved absolute path.
@@ -1972,25 +2079,32 @@ exports.mcp = new commander_1.Command("mcp")
                     });
                     return ok(lines.join("\n"));
                 }
-                const db = getVectorDb();
-                const table = yield db.ensureTable();
-                const lines = [];
-                for (const file of changedFiles) {
-                    const chunks = yield table
-                        .query()
-                        .select(["defined_symbols", "role"])
-                        .where(`path = '${(0, filter_builder_1.escapeSqlString)(file)}'`)
-                        .limit(50)
-                        .toArray();
-                    const symbols = chunks.flatMap((c) => toStringArray(c.defined_symbols));
-                    lines.push(symbols.length > 0
+                // One matcher per changed file, batched. `rows.locate` accepts up to
+                // 2000 matchers per request, so a very large diff is sent in chunks
+                // rather than one oversized line.
+                const MATCH_BATCH = 500;
+                const perFile = [];
+                for (let i = 0; i < changedFiles.length; i += MATCH_BATCH) {
+                    perFile.push(...(yield locateRows(root, {
+                        select: ["defined_symbols", "role"],
+                        matches: changedFiles
+                            .slice(i, i + MATCH_BATCH)
+                            .map((file) => ({ kind: "path", path: file })),
+                        limit: 50,
+                        scoped: false,
+                    })));
+                }
+                const lines = changedFiles.map((file, i) => {
+                    var _a;
+                    const symbols = ((_a = perFile[i]) !== null && _a !== void 0 ? _a : []).flatMap((c) => toStringArray(c.defined_symbols));
+                    return symbols.length > 0
                         ? `${rel(file)} (${symbols.slice(0, 5).join(", ")}${symbols.length > 5 ? "..." : ""})`
-                        : rel(file));
-                }
+                        : rel(file);
+                });
                 return ok(`${changedFiles.length} changed file${changedFiles.length === 1 ? "" : "s"}${ref ? ` (vs ${ref})` : ""}:\n${lines.join("\n")}`);
             }
             catch (e) {
-                return err(`Diff failed: ${e instanceof Error ? e.message : String(e)}`);
+                return toolError("Diff failed", e);
             }
         });
     }
@@ -2006,12 +2120,10 @@ exports.mcp = new commander_1.Command("mcp")
                 if (!proj)
                     return err("Project not added to gmax yet.");
                 const scopedTarget = containMcpTarget(root, target);
-                const { resolveTargetSymbols, findTests } = yield Promise.resolve().then(() => __importStar(require("../lib/graph/impact")));
-                const db = getVectorDb();
-                const { symbols, symbolFamilies } = yield resolveTargetSymbols(scopedTarget, db, mcpRootPrefix(root));
+                const { symbols, symbolFamilies } = yield resolveTarget(root, scopedTarget);
                 if (symbols.length === 0)
                     return ok(`No symbols found for: ${target}`);
-                const tests = yield findTests(symbols, db, root, depth, undefined, symbolFamilies);
+                const tests = yield findTestsForSymbols(root, symbols, depth, symbolFamilies);
                 if (tests.length === 0)
                     return ok(`No tests found for ${target}.`);
                 const rel = (p) => p.startsWith(`${root}/`) ? p.slice(root.length + 1) : p;
@@ -2022,7 +2134,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(`Tests for ${target}:\n${lines.join("\n")}`);
             }
             catch (e) {
-                return err(`Find tests failed: ${e instanceof Error ? e.message : String(e)}`);
+                return toolError("Find tests failed", e);
             }
         });
     }
@@ -2040,22 +2152,47 @@ exports.mcp = new commander_1.Command("mcp")
                 if (!proj)
                     return err("Project not added to gmax yet.");
                 const scopedTarget = containMcpTarget(root, target);
-                const { resolveTargetSymbols, findTests, findDependents, findDependentsDetailed, isTestPath, } = yield Promise.resolve().then(() => __importStar(require("../lib/graph/impact")));
+                const { isTestPath } = yield Promise.resolve().then(() => __importStar(require("../lib/graph/impact")));
                 const { buildImpactRollup, formatImpactRollupAgent } = yield Promise.resolve().then(() => __importStar(require("../lib/graph/impact-rollup")));
-                const db = getVectorDb();
-                const { symbols, resolvedAsFile, symbolFamilies } = yield resolveTargetSymbols(scopedTarget, db, root);
+                const { symbols, resolvedAsFile, symbolFamilies } = yield resolveTarget(root, scopedTarget);
                 if (symbols.length === 0)
                     return ok(`No symbols found for: ${target}`);
                 const targetPath = resolvedAsFile
                     ? (0, path_containment_1.resolveContainedPath)(root, scopedTarget)
                     : undefined;
-                const excludePaths = targetPath ? new Set([targetPath]) : undefined;
-                const rollupLimit = Math.min(Math.max(top * 10, 100), 500);
+                const excludePaths = targetPath ? [targetPath] : undefined;
+                // The flat (non-rollup) call keeps findDependents' own default of 10;
+                // `undefined` on the wire is what preserves it.
+                const limit = rollup
+                    ? Math.min(Math.max(top * 10, 100), 500)
+                    : undefined;
+                const scope = projectScope(root);
                 const [dependents, tests] = yield Promise.all([
-                    rollup
-                        ? findDependentsDetailed(symbols, db, root, excludePaths, rollupLimit, undefined, symbolFamilies)
-                        : findDependents(symbols, db, root, excludePaths, undefined, undefined, symbolFamilies),
-                    findTests(symbols, db, root, depth, undefined, symbolFamilies),
+                    graphVerb("graph.dependents", {
+                        projectRoot: root,
+                        scope,
+                        payload: {
+                            symbols,
+                            detailed: rollup,
+                            excludePaths,
+                            limit,
+                            families: symbolFamilies,
+                        },
+                        render: (resp) => {
+                            var _a;
+                            return (_a = resp.dependents) !== null && _a !== void 0 ? _a : [];
+                        },
+                        inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphDependents)(deps.vectorDb, {
+                            symbols,
+                            queryRoot: root,
+                            detailed: rollup,
+                            excludePaths,
+                            limit,
+                            excludePrefixes: scope.excludePrefixes,
+                            families: (0, graph_handler_1.decodeSymbolFamilies)(symbolFamilies),
+                        })),
+                    }),
+                    findTestsForSymbols(root, symbols, depth, symbolFamilies),
                 ]);
                 if (rollup) {
                     const detailedDependents = dependents;
@@ -2097,7 +2234,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(sections.join("\n"));
             }
             catch (e) {
-                return err(`Impact analysis failed: ${e instanceof Error ? e.message : String(e)}`);
+                return toolError("Impact analysis failed", e);
             }
         });
     }
@@ -2114,67 +2251,60 @@ exports.mcp = new commander_1.Command("mcp")
                 if (!proj)
                     return err("Project not added to gmax yet.");
                 (0, embedding_status_1.assertEmbeddingSearchCompatible)([proj], (0, index_config_1.readGlobalConfig)());
-                const db = getVectorDb();
-                const table = yield db.ensureTable();
                 const isFile = target.includes("/") ||
                     (target.includes(".") && !target.includes(" "));
-                let sourceRows;
-                if (isFile) {
-                    const absPath = (0, path_containment_1.resolveContainedPath)(root, target);
-                    sourceRows = yield table
-                        .query()
-                        .select(["vector", "path", "start_line"])
-                        .where(`path = '${(0, filter_builder_1.escapeSqlString)(absPath)}'`)
-                        .limit(1)
-                        .toArray();
-                }
-                else {
-                    sourceRows = yield table
-                        .query()
-                        .select(["vector", "path", "start_line"])
-                        .where(`array_contains(defined_symbols, '${(0, filter_builder_1.escapeSqlString)(target)}') AND ${(0, filter_builder_1.pathStartsWith)(`${root}/`)}`)
-                        .limit(1)
-                        .toArray();
-                }
-                if (sourceRows.length === 0)
+                // Resolved here: containment is this process's filesystem question.
+                const absPath = isFile ? (0, path_containment_1.resolveContainedPath)(root, target) : undefined;
+                const scope = projectScope(root);
+                // The source chunk's vector never leaves the store: the daemon looks it
+                // up, runs the vector search, and returns the ranked chunks.
+                const result = yield readStore("similar", {
+                    daemon: () => (0, daemon_client_1.sendDaemonCommand)({
+                        cmd: "vector.similar",
+                        projectRoot: root,
+                        absPath,
+                        symbol: isFile ? undefined : target,
+                        scope: (0, rows_handler_1.scopeToWire)(scope),
+                        limit,
+                        threshold,
+                    }, { timeoutMs: 60000 }),
+                    render: (resp) => resp,
+                    inProcess: () => localStore((deps) => (0, vector_handler_1.runSimilar)(deps, {
+                        projectRoot: root,
+                        absPath,
+                        symbol: isFile ? undefined : target,
+                        scope,
+                        limit,
+                        threshold,
+                    })),
+                });
+                if (result.status === "not-found") {
                     return ok(isFile
                         ? `File not found: ${target}`
                         : `Symbol not found: ${target}`);
-                const source = sourceRows[0];
-                if (!source.vector || source.vector.length === 0)
+                }
+                if (result.status === "no-vector") {
                     return ok("Source chunk has no embedding.");
-                const results = yield (0, ann_config_1.configureAnnVectorQuery)(table.vectorSearch(source.vector))
-                    .select([
-                    "path",
-                    "start_line",
-                    "defined_symbols",
-                    "role",
-                    "_distance",
-                ])
-                    .where((0, filter_builder_1.pathStartsWith)(`${root}/`))
-                    .limit(limit + 5)
-                    .toArray();
-                let filtered = results.filter((r) => !(r.path === source.path && r.start_line === source.start_line));
-                if (threshold > 0)
-                    filtered = filtered.filter((r) => { var _a; return 1 / (1 + ((_a = r._distance) !== null && _a !== void 0 ? _a : 0)) >= threshold; });
-                if (filtered.length === 0)
+                }
+                if (result.results.length === 0) {
                     return ok(`No similar code found for ${target}.`);
+                }
                 const rel = (p) => p.startsWith(`${root}/`) ? p.slice(root.length + 1) : p;
-                const lines = filtered.slice(0, limit).map((r) => {
-                    var _a, _b, _c, _d;
-                    const sym = (_b = (_a = toStringArray(r.defined_symbols)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : "";
-                    return `${rel(r.path)}:${Number((_c = r.start_line) !== null && _c !== void 0 ? _c : 0) + 1} ${sym} [${r.role || "IMPL"}] d=${((_d = r._distance) !== null && _d !== void 0 ? _d : 0).toFixed(3)}`;
+                const lines = result.results.slice(0, limit).map((r) => {
+                    var _a;
+                    const sym = (_a = r.defined_symbols[0]) !== null && _a !== void 0 ? _a : "";
+                    return `${rel(r.path)}:${r.start_line + 1} ${sym} [${r.role || "IMPL"}] d=${r._distance.toFixed(3)}`;
                 });
                 return ok(`Similar to ${target}:\n${lines.join("\n")}`);
             }
             catch (e) {
-                return err(`Similar search failed: ${e instanceof Error ? e.message : String(e)}`);
+                return toolError("Similar search failed", e);
             }
         });
     }
     function handleBuildContext(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b;
             ensureWatcher();
             const topic = String(args.topic || "");
             if (!topic)
@@ -2187,7 +2317,7 @@ exports.mcp = new commander_1.Command("mcp")
                     return err("Project not added to gmax yet.");
                 (0, embedding_status_1.assertEmbeddingSearchCompatible)([proj], (0, index_config_1.readGlobalConfig)());
                 const searchOptions = { rerank: process.env.GMAX_RERANK === "1" };
-                const response = (_a = (yield daemonSearch(Object.assign({ projectRoot: root, query: topic, limit, filters: {}, pathPrefix: root }, searchOptions)))) !== null && _a !== void 0 ? _a : (yield getSearcher().search(topic, limit, searchOptions, {}, root));
+                const response = yield searchStore(Object.assign({ projectRoot: root, query: topic, limit, filters: {}, pathPrefix: root }, searchOptions));
                 if (response.data.length === 0)
                     return ok(`No results found for "${topic}".`);
                 const rel = (p) => p.startsWith(`${root}/`) ? p.slice(root.length + 1) : p;
@@ -2209,7 +2339,7 @@ exports.mcp = new commander_1.Command("mcp")
                     const absP = searchResultPath(r);
                     const startLine = searchResultStartLine(r);
                     const endLine = searchResultEndLine(r, startLine);
-                    const sym = (_c = (_b = toStringArray(r.defined_symbols)) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : "";
+                    const sym = (_b = (_a = toStringArray(r.defined_symbols)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : "";
                     try {
                         const sourcePath = (0, path_containment_1.resolveContainedFile)(root, absP);
                         const content = fs.readFileSync(sourcePath, "utf-8");
@@ -2223,7 +2353,7 @@ exports.mcp = new commander_1.Command("mcp")
                         sections.push(blob);
                         tokensUsed += estTokens(blob);
                     }
-                    catch (_d) {
+                    catch (_c) {
                         /* skip unreadable */
                     }
                 }
@@ -2231,7 +2361,7 @@ exports.mcp = new commander_1.Command("mcp")
                 return ok(sections.join("\n"));
             }
             catch (e) {
-                return err(`Context generation failed: ${e instanceof Error ? e.message : String(e)}`);
+                return toolError("Context generation failed", e);
             }
         });
     }
@@ -2301,20 +2431,51 @@ exports.mcp = new commander_1.Command("mcp")
             ensureWatcher();
             const commitRef = String(args.commit || "HEAD");
             try {
-                const db = getVectorDb();
-                const builder = new graph_builder_1.GraphBuilder(db, projectRoot);
-                const { gatherRiskInputs, computeRiskTable, formatRiskTable } = yield Promise.resolve().then(() => __importStar(require("../lib/review/risk")));
-                const inputs = yield gatherRiskInputs(commitRef, projectRoot, {
-                    vectorDb: db,
-                    graphBuilder: builder,
+                // `gatherRiskInputs` mixes git and the graph. The git half stays here —
+                // the diff and the churn count both need a working tree — and only the
+                // graph half (callers, definition, tests) goes to the daemon, the same
+                // split `extract` makes when it reads a body locally after the daemon
+                // returns the location.
+                const { extractDiff, extractSymbols, fileChurn } = yield Promise.resolve().then(() => __importStar(require("../lib/llm/diff")));
+                const { computeRiskTable, formatRiskTable } = yield Promise.resolve().then(() => __importStar(require("../lib/review/risk")));
+                const diff = extractDiff(commitRef, projectRoot);
+                const symbols = diff ? extractSymbols(diff) : [];
+                if (symbols.length === 0) {
+                    return ok("(no changed symbols in this diff)");
+                }
+                const scope = projectScope(projectRoot);
+                const facts = yield graphVerb("graph.risk", {
+                    projectRoot,
+                    scope,
+                    payload: { symbols },
+                    render: (resp) => { var _a; return (_a = resp.facts) !== null && _a !== void 0 ? _a : []; },
+                    inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphRisk)(deps.vectorDb, {
+                        symbols,
+                        queryRoot: projectRoot,
+                        scope,
+                    })),
                 });
-                const rows = computeRiskTable(inputs);
+                const prefix = projectRoot.endsWith("/")
+                    ? projectRoot
+                    : `${projectRoot}/`;
+                const rows = computeRiskTable(facts.map((fact) => ({
+                    symbol: fact.symbol,
+                    file: fact.file
+                        ? fact.file.startsWith(prefix)
+                            ? fact.file.slice(prefix.length)
+                            : fact.file
+                        : "(unindexed)",
+                    line: fact.line,
+                    callerCount: fact.callerCount,
+                    hasTests: fact.hasTests,
+                    churn: fileChurn(fact.file, projectRoot),
+                })));
                 return rows.length === 0
                     ? ok("(no changed symbols in this diff)")
                     : ok(formatRiskTable(rows, { agent: true }));
             }
             catch (e) {
-                return err(`Risk ranking failed: ${e instanceof Error ? e.message : String(e)}`);
+                return toolError("Risk ranking failed", e);
             }
         });
     }
@@ -2817,4 +2978,7 @@ exports.mcp = new commander_1.Command("mcp")
     // Kick off index readiness check and watcher in background
     ensureIndexReady().catch((e) => console.error("[MCP] Index readiness check failed:", e));
     ensureWatcher();
+    // Keep this session's project leased while the session lives. The daemon
+    // only watches projects some session holds.
+    setInterval(() => void ensureWatcher(), MCP_WATCH_LEASE_RENEW_MS).unref();
 }));