grepmax 0.26.43 → 0.26.45

package/dist/commands/mcp.js

@@ -79,11 +79,13 @@ 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 test_hits_1 = require("../lib/graph/test-hits");
+const embedding_generation_1 = require("../lib/index/embedding-generation");
 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 index_state_footer_1 = require("../lib/output/index-state-footer");
+const mcp_results_1 = require("../lib/output/mcp-results");
 const searcher_1 = require("../lib/search/searcher");
 const annotator_1 = require("../lib/skeleton/annotator");
 const skeletonizer_1 = require("../lib/skeleton/skeletonizer");
@@ -100,8 +102,11 @@ 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 store_context_1 = require("../lib/utils/store-context");
+const stores_1 = require("../lib/utils/stores");
 const watcher_launcher_1 = require("../lib/utils/watcher-launcher");
 const watcher_store_1 = require("../lib/utils/watcher-store");
+const pool_1 = require("../lib/workers/pool");
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -119,8 +124,8 @@ function toStringArray(val) {
     }
     return [];
 }
-function ok(text) {
-    return { content: [{ type: "text", text }] };
+function ok(text, structuredContent) {
+    return Object.assign({ content: [{ type: "text", text }] }, (structuredContent ? { structuredContent } : {}));
 }
 function err(text) {
     return { content: [{ type: "text", text }], isError: true };
@@ -143,9 +148,6 @@ function isMcpSessionFallback(error) {
 /**
  * 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.
@@ -161,7 +163,6 @@ function isMcpSessionFallback(error) {
 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,
 };
@@ -172,7 +173,6 @@ const MCP_STORE_FALLBACK = {
  */
 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));
 }
@@ -192,14 +192,30 @@ function resolveMcpProject(requested, currentRoot, projects = (0, project_regist
         if (byName.length > 1)
             return undefined;
         const resolved = path.resolve(value);
-        return projects.find((project) => path.resolve(project.root) === resolved);
+        const physical = (value) => {
+            try {
+                return fs.realpathSync(value);
+            }
+            catch (_a) {
+                return path.resolve(value);
+            }
+        };
+        return projects.find((project) => physical(project.root) === physical(resolved));
     }
     const resolvedCurrent = path.resolve(currentRoot);
-    const exact = projects.find((project) => path.resolve(project.root) === resolvedCurrent);
+    const physical = (value) => {
+        try {
+            return fs.realpathSync(value);
+        }
+        catch (_a) {
+            return path.resolve(value);
+        }
+    };
+    const exact = projects.find((project) => physical(project.root) === physical(resolvedCurrent));
     if (exact)
         return exact;
     return projects
-        .filter((project) => (0, path_containment_1.isPathWithin)(project.root, resolvedCurrent))
+        .filter((project) => (0, path_containment_1.isPathWithin)(physical(project.root), physical(resolvedCurrent)))
         .sort((a, b) => b.root.length - a.root.length)[0];
 }
 function containMcpTarget(root, target) {
@@ -241,13 +257,13 @@ function searchResultPath(r) {
 }
 function searchResultStartLine(r) {
     var _a;
-    var _b, _c;
-    return Number((_c = (_b = r === null || r === void 0 ? void 0 : r.start_line) !== null && _b !== void 0 ? _b : (_a = r === null || r === void 0 ? void 0 : r.generated_metadata) === null || _a === void 0 ? void 0 : _a.start_line) !== null && _c !== void 0 ? _c : 0);
+    var _b, _c, _d;
+    return Number((_d = (_c = (_b = r === null || r === void 0 ? void 0 : r.startLine) !== null && _b !== void 0 ? _b : r === null || r === void 0 ? void 0 : r.start_line) !== null && _c !== void 0 ? _c : (_a = r === null || r === void 0 ? void 0 : r.generated_metadata) === null || _a === void 0 ? void 0 : _a.start_line) !== null && _d !== void 0 ? _d : 0);
 }
 function searchResultEndLine(r, fallbackStart = 0) {
     var _a;
-    var _b, _c;
-    return Number((_c = (_b = r === null || r === void 0 ? void 0 : r.end_line) !== null && _b !== void 0 ? _b : (_a = r === null || r === void 0 ? void 0 : r.generated_metadata) === null || _a === void 0 ? void 0 : _a.end_line) !== null && _c !== void 0 ? _c : fallbackStart);
+    var _b, _c, _d;
+    return Number((_d = (_c = (_b = r === null || r === void 0 ? void 0 : r.endLine) !== null && _b !== void 0 ? _b : r === null || r === void 0 ? void 0 : r.end_line) !== null && _c !== void 0 ? _c : (_a = r === null || r === void 0 ? void 0 : r.generated_metadata) === null || _a === void 0 ? void 0 : _a.end_line) !== null && _d !== void 0 ? _d : fallbackStart);
 }
 function filterMcpSearchResults(data, options = {}) {
     var _a, _b;
@@ -380,6 +396,11 @@ exports.mcp = new commander_1.Command("mcp")
     // --- Project context ---
     const projectRoot = (0, project_root_1.findProjectRoot)(process.cwd());
     const paths = (0, project_root_1.ensureProjectPaths)(projectRoot);
+    const currentRoot = () => { var _a; var _b; return (_b = (_a = (0, store_context_1.currentStoreContext)()) === null || _a === void 0 ? void 0 : _a.root) !== null && _b !== void 0 ? _b : projectRoot; };
+    const storeProjects = () => { var _a; var _b; return (_b = (_a = (0, store_context_1.currentStoreContext)()) === null || _a === void 0 ? void 0 : _a.projects) !== null && _b !== void 0 ? _b : (0, project_registry_1.listProjects)(); };
+    const storeConfig = () => { var _a; var _b; return (_b = (_a = (0, store_context_1.currentStoreContext)()) === null || _a === void 0 ? void 0 : _a.config) !== null && _b !== void 0 ? _b : (0, index_config_1.readGlobalConfig)(); };
+    const secondary = () => { var _a; var _b; return (_b = (_a = (0, store_context_1.currentStoreContext)()) === null || _a === void 0 ? void 0 : _a.secondary) !== null && _b !== void 0 ? _b : false; };
+    const storeDir = () => { var _a; var _b; return (_b = (_a = (0, store_context_1.currentStoreContext)()) === null || _a === void 0 ? void 0 : _a.lancedbDir) !== null && _b !== void 0 ? _b : paths.lancedbDir; };
     // Propagate project root to worker processes
     process.env.GMAX_PROJECT_ROOT = paths.root;
     // --- Store access ---
@@ -388,15 +409,15 @@ exports.mcp = new commander_1.Command("mcp")
      * `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));
+        return (0, store_access_1.withStoreRead)(name, Object.assign(Object.assign(Object.assign({}, opts), MCP_STORE_FALLBACK), { skipDaemon: secondary() }));
     }
     /** 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);
+        return (0, rows_handler_1.withLocalStore)(storeDir(), fn, storeConfig().vectorDim);
     }
     /** 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 }));
+        return (0, graph_handler_1.callGraphVerb)(verb, Object.assign(Object.assign({}, call), { fallback: Object.assign(Object.assign({}, MCP_STORE_FALLBACK), (secondary() ? { skipDaemon: true } : {})) }));
     }
     /**
      * MCP tools take no `--in`/`--exclude`, so a tool's scope is always the
@@ -440,8 +461,16 @@ exports.mcp = new commander_1.Command("mcp")
                 };
             },
             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);
+                const pool = secondary()
+                    ? new pool_1.WorkerPool((0, embedding_generation_1.resolveEmbeddingGeneration)(storeConfig()), storeConfig().embedMode)
+                    : undefined;
+                try {
+                    const searcher = new searcher_1.Searcher(deps.vectorDb, pool);
+                    return yield searcher.search(args.query, args.limit, { rerank: args.rerank, seeds: args.seeds }, args.filters, args.pathPrefix);
+                }
+                finally {
+                    yield pool === null || pool === void 0 ? void 0 : pool.destroy();
+                }
             })),
             daemonErrorMessage: (resp) => [resp.error, resp.hint]
                 .filter((value) => typeof value === "string" && value)
@@ -509,7 +538,7 @@ exports.mcp = new commander_1.Command("mcp")
      * 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));
+        return (0, rows_handler_1.readRows)(Object.assign({ name: "locate", projectRoot: root, lancedbDir: storeDir(), vectorDim: storeConfig().vectorDim, scope: projectScope(root), fallback: Object.assign(Object.assign({}, MCP_STORE_FALLBACK), { skipDaemon: secondary() }) }, req));
     }
     /**
      * Chunk and file totals for `index_status`, summed per registered project.
@@ -574,8 +603,8 @@ exports.mcp = new commander_1.Command("mcp")
         return __awaiter(this, void 0, void 0, function* () {
             if (_indexReady)
                 return;
-            const projects = (0, project_registry_1.listProjects)();
-            const isRegistered = projects.some((p) => p.root === projectRoot);
+            const projects = storeProjects();
+            const isRegistered = projects.some((p) => p.root === currentRoot());
             if (isRegistered) {
                 _indexReady = true;
             }
@@ -593,8 +622,10 @@ exports.mcp = new commander_1.Command("mcp")
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             try {
-                const watchRoot = root !== null && root !== void 0 ? root : (_a = resolveMcpProject(undefined, projectRoot)) === null || _a === void 0 ? void 0 : _a.root;
-                if (!watchRoot)
+                const watchRoot = root !== null && root !== void 0 ? root : (_a = resolveMcpProject(undefined, currentRoot(), storeProjects())) === null || _a === void 0 ? void 0 : _a.root;
+                if (!watchRoot ||
+                    secondary() ||
+                    (0, stores_1.matchStore)(watchRoot).kind !== "primary")
                     return;
                 const result = yield (0, watcher_launcher_1.launchWatcher)(watchRoot, WATCH_LEASE);
                 if (result.ok && !result.reused) {
@@ -614,10 +645,10 @@ exports.mcp = new commander_1.Command("mcp")
     // covers the cwd, and scope to it instead of silently widening to the whole
     // index. `root` is the registered project root to scope to.
     function resolveRegisteredProject(requested) {
-        const project = resolveMcpProject(requested, projectRoot);
+        const project = resolveMcpProject(requested, currentRoot(), storeProjects());
         if (project)
             return { proj: project, root: project.root };
-        return { proj: undefined, root: projectRoot };
+        return { proj: undefined, root: currentRoot() };
     }
     // --- Tool handlers ---
     function handleSemanticSearch(args_1) {
@@ -648,7 +679,7 @@ exports.mcp = new commander_1.Command("mcp")
                     if (typeof args.root === "string") {
                         return err("Project not added to gmax yet. Run `gmax add` to index it first.");
                     }
-                    const indexed = (0, project_registry_1.listProjects)().filter((p) => { var _a; return p.status !== "pending" && ((_a = p.chunkCount) !== null && _a !== void 0 ? _a : 0) > 0; });
+                    const indexed = storeProjects().filter((p) => { var _a; return p.status !== "pending" && ((_a = p.chunkCount) !== null && _a !== void 0 ? _a : 0) > 0; });
                     if (indexed.length === 0) {
                         return err("No indexed projects yet. cd into a repo and run `gmax add` to index it first.");
                     }
@@ -692,7 +723,7 @@ exports.mcp = new commander_1.Command("mcp")
                         excludeProjects: typeof args.exclude_projects === "string"
                             ? args.exclude_projects
                             : undefined,
-                    });
+                    }, storeProjects());
                     if (crossScope.projectRoots.length === 0) {
                         return err("No matching indexed projects.");
                     }
@@ -709,7 +740,7 @@ exports.mcp = new commander_1.Command("mcp")
                 const selectedRoots = searchAll
                     ? new Set((_a = filters.projectRoots) !== null && _a !== void 0 ? _a : [])
                     : new Set([resolvedRoot]);
-                (0, embedding_status_1.assertEmbeddingSearchCompatible)((0, project_registry_1.listProjects)().filter((project) => selectedRoots.has(project.root)), (0, index_config_1.readGlobalConfig)());
+                (0, embedding_status_1.assertEmbeddingSearchCompatible)(storeProjects().filter((project) => selectedRoots.has(project.root)), storeConfig());
                 // Aider-style seeding: the agent passes its open files / discussed
                 // symbols; the searcher biases candidate generation toward them.
                 const parseSeedList = (v) => {
@@ -742,6 +773,26 @@ exports.mcp = new commander_1.Command("mcp")
                     return (candidate.length > 0 &&
                         allowedRoots.some((root) => (0, path_containment_1.isPathWithin)(root, candidate)));
                 });
+                const structuredSearch = (matches) => { var _a; return ({
+                    schemaVersion: 1,
+                    query,
+                    roots: allowedRoots,
+                    warnings: ((_a = result.warnings) !== null && _a !== void 0 ? _a : []).filter(Boolean),
+                    matches: matches.map((r) => {
+                        var _a;
+                        const startLine = searchResultStartLine(r);
+                        return {
+                            path: chunkAbsPath(r),
+                            startLine: startLine + 1,
+                            endLine: searchResultEndLine(r, startLine) + 1,
+                            symbols: chunkSymbols(r),
+                            role: String((_a = r.role) !== null && _a !== void 0 ? _a : "IMPLEMENTATION"),
+                            score: typeof r.score === "number" && Number.isFinite(r.score)
+                                ? r.score
+                                : null,
+                        };
+                    }),
+                }); };
                 // Prepend any searcher warnings to whatever body we return.
                 const prefixNotes = (body) => {
                     var _a;
@@ -749,7 +800,7 @@ exports.mcp = new commander_1.Command("mcp")
                     return notes.length ? `${notes.join("\n")}\n\n${body}` : body;
                 };
                 if (!result.data || result.data.length === 0) {
-                    return ok(prefixNotes("No matches found. Try broadening your query, using fewer keywords, or check `gmax status` to verify the project is indexed."));
+                    return ok(prefixNotes("No matches found. Try broadening your query, using fewer keywords, or check `gmax status` to verify the project is indexed."), structuredSearch([]));
                 }
                 const minScore = typeof args.min_score === "number" ? args.min_score : 0;
                 const maxPerFile = typeof args.max_per_file === "number" ? args.max_per_file : 0;
@@ -779,21 +830,25 @@ exports.mcp = new commander_1.Command("mcp")
                         getImportsForFile,
                         query,
                     });
-                    return ok(prefixNotes(output));
+                    return ok(prefixNotes(output), structuredSearch(filterMcpSearchResults(result.data, {
+                        minScore,
+                        maxPerFile,
+                        namePattern,
+                    })));
                 }
                 let results = result.data.map((r) => {
-                    var _a, _b, _c;
-                    var _d, _e, _f, _g, _h, _j, _k, _l, _m;
-                    const absPath = (_e = (_d = r.path) !== null && _d !== void 0 ? _d : (_a = r.metadata) === null || _a === void 0 ? void 0 : _a.path) !== null && _e !== void 0 ? _e : "";
+                    var _a;
+                    var _b, _c, _d, _e, _f;
+                    const absPath = (_c = (_b = r.path) !== null && _b !== void 0 ? _b : (_a = r.metadata) === null || _a === void 0 ? void 0 : _a.path) !== null && _c !== void 0 ? _c : "";
                     const relPath = absPath.startsWith(displayRoot)
                         ? absPath.slice(displayRoot.length + 1)
                         : absPath;
-                    const startLine = (_g = (_f = r.startLine) !== null && _f !== void 0 ? _f : (_b = r.generated_metadata) === null || _b === void 0 ? void 0 : _b.start_line) !== null && _g !== void 0 ? _g : 0;
-                    const endLine = (_j = (_h = r.endLine) !== null && _h !== void 0 ? _h : (_c = r.generated_metadata) === null || _c === void 0 ? void 0 : _c.end_line) !== null && _j !== void 0 ? _j : 0;
-                    const defs = toStringArray((_k = r.definedSymbols) !== null && _k !== void 0 ? _k : r.defined_symbols);
-                    const refs = toStringArray((_l = r.referenced_symbols) !== null && _l !== void 0 ? _l : r.referencedSymbols);
+                    const startLine = searchResultStartLine(r);
+                    const endLine = searchResultEndLine(r, startLine);
+                    const defs = toStringArray((_d = r.definedSymbols) !== null && _d !== void 0 ? _d : r.defined_symbols);
+                    const refs = toStringArray((_e = r.referenced_symbols) !== null && _e !== void 0 ? _e : r.referencedSymbols);
                     const symbol = defs[0] || "(anonymous)";
-                    const role = ((_m = r.role) !== null && _m !== void 0 ? _m : "IMPL").slice(0, 4).toUpperCase();
+                    const role = ((_f = r.role) !== null && _f !== void 0 ? _f : "IMPL").slice(0, 4).toUpperCase();
                     const exported = r.is_exported ? "exported " : "";
                     const complexity = typeof r.complexity === "number" && r.complexity > 0
                         ? ` C:${Math.round(r.complexity)}`
@@ -825,7 +880,7 @@ exports.mcp = new commander_1.Command("mcp")
                                             .map((l, i) => `${ctxStart + i + 1}│${l}`)
                                             .join("\n");
                             }
-                            catch (_o) {
+                            catch (_g) {
                                 // Fall through to chunk content
                             }
                         }
@@ -855,6 +910,7 @@ exports.mcp = new commander_1.Command("mcp")
                         }
                     }
                     return {
+                        row: r,
                         absPath,
                         text,
                         score: typeof r.score === "number" ? r.score : 0,
@@ -927,7 +983,7 @@ exports.mcp = new commander_1.Command("mcp")
                         // Trace failed — return search results without trace
                     }
                 }
-                return ok(prefixNotes(output));
+                return ok(prefixNotes(output), structuredSearch(results.map((r) => r.row)));
             }
             catch (e) {
                 return toolError("Search failed", e);
@@ -1075,8 +1131,9 @@ exports.mcp = new commander_1.Command("mcp")
                     render: (resp) => resp.graph,
                     inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphTrace)(deps.vectorDb, { symbol, hops: depth, scope })),
                 });
+                const structured = (0, mcp_results_1.traceResult)(symbol, root, 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.`);
+                    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.`, structured);
                 }
                 const lines = [];
                 // Center
@@ -1135,7 +1192,7 @@ exports.mcp = new commander_1.Command("mcp")
                 else {
                     lines.push("Calls: none");
                 }
-                return ok(lines.join("\n"));
+                return ok(lines.join("\n"), structured);
             }
             catch (e) {
                 return toolError("Trace failed", e);
@@ -1376,16 +1433,17 @@ exports.mcp = new commander_1.Command("mcp")
                     render: (resp) => resp.dead,
                     inProcess: () => localStore((deps) => (0, graph_handler_1.runGraphDead)(deps.vectorDb, { symbol, scope })),
                 });
+                const structured = (0, mcp_results_1.deadResult)(symbol, root, facts);
                 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.`);
+                    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.`, structured);
                 }
                 const rel = (p) => p.startsWith(root) ? p.slice(root.length + 1) : p;
                 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(`PUBLIC EXPORT  ${defLoc} defines ${symbol} — no internal callers found; check external usage`, structured);
                     }
-                    return ok(`DEAD  ${defLoc} defines ${symbol}`);
+                    return ok(`DEAD  ${defLoc} defines ${symbol}`, structured);
                 }
                 const top = facts.topCallers;
                 const lines = [
@@ -1394,7 +1452,7 @@ exports.mcp = new commander_1.Command("mcp")
                 for (const c of top) {
                     lines.push(`  ${rel(c.file)}:${c.line + 1}`);
                 }
-                return ok(lines.join("\n"));
+                return ok(lines.join("\n"), structured);
             }
             catch (e) {
                 return toolError("Dead check failed", e);
@@ -1711,26 +1769,38 @@ exports.mcp = new commander_1.Command("mcp")
         });
     }
     function handleListProjects() {
-        return __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, arguments, void 0, function* (args = {}) {
             var _a;
             try {
-                const projects = (0, project_registry_1.listProjects)();
-                if (projects.length === 0) {
+                const inventory = args.root === undefined ? (0, store_context_1.storeInventory)() : [];
+                const projects = [
+                    ...storeProjects(),
+                    ...inventory
+                        .filter((store) => { var _a; var _b; return store.home !==
+                        ((_b = (_a = (0, store_context_1.currentStoreContext)()) === null || _a === void 0 ? void 0 : _a.home) !== null && _b !== void 0 ? _b : config_1.PATHS.globalRoot); })
+                        .flatMap((store) => store.projects),
+                ];
+                if (projects.length === 0 && inventory.length === 0) {
                     return ok("No projects indexed yet. cd into a repo and run `gmax add` to index it.");
                 }
-                const currentName = (_a = resolveMcpProject(undefined, projectRoot)) === null || _a === void 0 ? void 0 : _a.name;
-                const globalConfig = (0, index_config_1.readGlobalConfig)();
+                const currentName = (_a = resolveMcpProject(undefined, currentRoot(), storeProjects())) === null || _a === void 0 ? void 0 : _a.name;
+                const globalConfig = storeConfig();
                 const lines = projects.map((p) => {
                     const here = p.name === currentName ? " (current)" : "";
                     const chunks = typeof p.chunkCount === "number"
                         ? `\t(${p.chunkCount} chunks)`
                         : "";
-                    const identity = (0, embedding_status_1.projectEmbeddingStatus)(p, globalConfig);
+                    const matching = inventory.find((store) => store.projects.some((project) => project.root === p.root));
+                    const identity = (0, embedding_status_1.projectEmbeddingStatus)(p, matching ? (0, index_config_1.readGlobalConfig)(matching.home) : globalConfig);
                     return `${p.name}${here}\t${p.root}\t${p.status}\tembedding=${identity.state}${chunks}`;
                 });
                 return ok(`${projects.length} indexed project(s). ` +
                     `Pass a name to semantic_search via projects:"name", or use scope:"all".\n\n` +
-                    lines.join("\n"));
+                    lines.join("\n") +
+                    inventory
+                        .filter((store) => store.state !== "mounted")
+                        .map((store) => `\nStore ${store.home}: ${store.state}${store.error ? ` — ${store.error}` : ""}`)
+                        .join(""));
             }
             catch (e) {
                 const msg = e instanceof Error ? e.message : String(e);
@@ -1740,20 +1810,22 @@ exports.mcp = new commander_1.Command("mcp")
     }
     function handleIndexStatus() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c, _d, _e;
             try {
-                const globalConfig = (0, index_config_1.readGlobalConfig)();
-                const projects = (0, project_registry_1.listProjects)();
-                const currentProject = resolveMcpProject(undefined, projectRoot);
+                const globalConfig = storeConfig();
+                const projects = storeProjects();
+                const currentProject = resolveMcpProject(undefined, currentRoot(), storeProjects());
                 const identity = (0, embedding_status_1.projectEmbeddingStatus)(currentProject, globalConfig);
                 const { chunks, files } = yield indexTotals(projects);
-                const daemonStatus = yield (0, daemon_client_1.sendDaemonCommand)({ cmd: "status" });
+                const daemonStatus = secondary()
+                    ? { ok: true, projects: [] }
+                    : yield (0, daemon_client_1.sendDaemonCommand)({ cmd: "status" });
                 const watched = (Array.isArray(daemonStatus.projects) ? daemonStatus.projects : []);
                 const daemonProject = watched.find((p) => p.root === (currentProject === null || currentProject === void 0 ? void 0 : currentProject.root));
                 // Only use the registry when no daemon answered; sandboxed reads stay IPC-only.
                 const watcher = daemonStatus.ok
                     ? undefined
-                    : (0, watcher_store_1.getWatcherCoveringPath)(projectRoot);
+                    : (0, watcher_store_1.getWatcherCoveringPath)(currentRoot());
                 let watcherLine = "Watcher: not running";
                 if (watcher) {
                     const status = (_a = watcher.status) !== null && _a !== void 0 ? _a : "unknown";
@@ -1778,7 +1850,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 (${chunks} chunks, ${files} files)`,
+                    `Index: ${storeDir()} (${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})`
@@ -1790,7 +1862,36 @@ exports.mcp = new commander_1.Command("mcp")
                     (0, compaction_result_1.formatCompactionStatus)(daemonStatus.compaction),
                     `Projects: ${projects.length} indexed (call list_projects for names + per-project chunk counts)`,
                 ].filter(Boolean);
-                return ok(lines.join("\n"));
+                const compaction = mcp_results_1.compactionSchema.safeParse(daemonStatus.compaction);
+                return ok(lines.join("\n"), {
+                    schemaVersion: 1,
+                    root: currentRoot(),
+                    store: storeDir(),
+                    secondary: secondary(),
+                    chunks,
+                    files,
+                    projects: projects.length,
+                    embedding: {
+                        state: identity.state,
+                        configured: {
+                            tier: identity.configured.tier,
+                            vectorDim: identity.configured.vectorDim,
+                            fingerprint: identity.configured.fingerprint,
+                        },
+                        built: identity.built
+                            ? {
+                                tier: identity.built.tier,
+                                vectorDim: identity.built.vectorDim,
+                                fingerprint: identity.built.fingerprint,
+                            }
+                            : null,
+                    },
+                    watcher: {
+                        status: (_d = (_c = daemonProject === null || daemonProject === void 0 ? void 0 : daemonProject.status) !== null && _c !== void 0 ? _c : watcher === null || watcher === void 0 ? void 0 : watcher.status) !== null && _d !== void 0 ? _d : (secondary() || !daemonStatus.ok ? "unobserved" : "not_running"),
+                        indexState: (_e = daemonProject === null || daemonProject === void 0 ? void 0 : daemonProject.indexState) !== null && _e !== void 0 ? _e : null,
+                    },
+                    compaction: compaction.success ? compaction.data : null,
+                });
             }
             catch (e) {
                 return toolError("Status check failed", e);
@@ -2001,6 +2102,8 @@ exports.mcp = new commander_1.Command("mcp")
     function handleRecentChanges(args) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, e_1, _b, _c;
+            var _d;
+            var _e;
             ensureWatcher();
             const limit = Math.min(Math.max(Number(args.limit) || 20, 1), 50);
             const { proj, root } = resolveRegisteredProject(args.root);
@@ -2008,13 +2111,13 @@ exports.mcp = new commander_1.Command("mcp")
                 return err("Project not added to gmax yet.");
             const prefix = root.endsWith("/") ? root : `${root}/`;
             try {
-                const metaCache = new meta_cache_1.MetaCache(config_1.PATHS.lmdbPath);
+                const metaCache = new meta_cache_1.MetaCache((_e = (_d = (0, store_context_1.currentStoreContext)()) === null || _d === void 0 ? void 0 : _d.lmdbPath) !== null && _e !== void 0 ? _e : config_1.PATHS.lmdbPath);
                 try {
                     const files = [];
                     try {
-                        for (var _d = true, _e = __asyncValues(metaCache.entries()), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
-                            _c = _f.value;
-                            _d = false;
+                        for (var _f = true, _g = __asyncValues(metaCache.entries()), _h; _h = yield _g.next(), _a = _h.done, !_a; _f = true) {
+                            _c = _h.value;
+                            _f = false;
                             const { path: p, entry } = _c;
                             if (p.startsWith(prefix)) {
                                 files.push({ path: p, mtimeMs: entry.mtimeMs });
@@ -2024,7 +2127,7 @@ exports.mcp = new commander_1.Command("mcp")
                     catch (e_1_1) { e_1 = { error: e_1_1 }; }
                     finally {
                         try {
-                            if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
+                            if (!_f && !_a && (_b = _g.return)) yield _b.call(_g);
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
@@ -2069,7 +2172,7 @@ exports.mcp = new commander_1.Command("mcp")
                 const { proj, root } = resolveRegisteredProject();
                 if (!proj)
                     return err("Project not added to gmax yet.");
-                (0, embedding_status_1.assertEmbeddingSearchCompatible)([proj], (0, index_config_1.readGlobalConfig)());
+                (0, embedding_status_1.assertEmbeddingSearchCompatible)([proj], storeConfig());
                 const changedFiles = getChangedFiles(ref, root);
                 if (changedFiles.length === 0) {
                     return ok(ref
@@ -2269,7 +2372,7 @@ exports.mcp = new commander_1.Command("mcp")
                 const { proj, root } = resolveRegisteredProject();
                 if (!proj)
                     return err("Project not added to gmax yet.");
-                (0, embedding_status_1.assertEmbeddingSearchCompatible)([proj], (0, index_config_1.readGlobalConfig)());
+                (0, embedding_status_1.assertEmbeddingSearchCompatible)([proj], storeConfig());
                 const isFile = target.includes("/") ||
                     (target.includes(".") && !target.includes(" "));
                 // Resolved here: containment is this process's filesystem question.
@@ -2335,7 +2438,7 @@ exports.mcp = new commander_1.Command("mcp")
                 const { proj, root } = resolveRegisteredProject();
                 if (!proj)
                     return err("Project not added to gmax yet.");
-                (0, embedding_status_1.assertEmbeddingSearchCompatible)([proj], (0, index_config_1.readGlobalConfig)());
+                (0, embedding_status_1.assertEmbeddingSearchCompatible)([proj], storeConfig());
                 const searchOptions = { rerank: process.env.GMAX_RERANK === "1" };
                 const response = yield searchStore(Object.assign({ projectRoot: root, query: topic, limit, filters: {}, pathPrefix: root }, searchOptions));
                 if (response.data.length === 0)
@@ -2405,7 +2508,11 @@ exports.mcp = new commander_1.Command("mcp")
                     return err("LLM server not available. Run `gmax llm on && gmax llm start`.");
                 }
                 const { investigate } = yield Promise.resolve().then(() => __importStar(require("../lib/llm/investigate")));
-                const inv = yield investigate({ question, projectRoot, maxRounds });
+                const inv = yield investigate({
+                    question,
+                    projectRoot: currentRoot(),
+                    maxRounds,
+                });
                 return ok(inv.answer);
             }
             catch (e) {
@@ -2429,12 +2536,15 @@ exports.mcp = new commander_1.Command("mcp")
                     return err("LLM server not available. Run `gmax llm on && gmax llm start`.");
                 }
                 const { reviewCommit } = yield Promise.resolve().then(() => __importStar(require("../lib/llm/review")));
-                const rev = yield reviewCommit({ commitRef, projectRoot });
+                const rev = yield reviewCommit({
+                    commitRef,
+                    projectRoot: currentRoot(),
+                });
                 if (rev.clean) {
                     return ok(`Clean commit (${rev.commit}) — no issues found in ${rev.duration}s.`);
                 }
                 const { readReport } = yield Promise.resolve().then(() => __importStar(require("../lib/llm/report")));
-                const report = readReport(projectRoot);
+                const report = readReport(currentRoot());
                 const entry = report === null || report === void 0 ? void 0 : report.reviews.find((r) => r.commit === rev.commit);
                 return ok(JSON.stringify({
                     commit: rev.commit,
@@ -2459,26 +2569,26 @@ exports.mcp = new commander_1.Command("mcp")
                 // 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 diff = extractDiff(commitRef, currentRoot());
                 const symbols = diff ? extractSymbols(diff) : [];
                 if (symbols.length === 0) {
                     return ok("(no changed symbols in this diff)");
                 }
-                const scope = projectScope(projectRoot);
+                const scope = projectScope(currentRoot());
                 const facts = yield graphVerb("graph.risk", {
-                    projectRoot,
+                    projectRoot: currentRoot(),
                     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,
+                        queryRoot: currentRoot(),
                         scope,
                     })),
                 });
-                const prefix = projectRoot.endsWith("/")
-                    ? projectRoot
-                    : `${projectRoot}/`;
+                const prefix = currentRoot().endsWith("/")
+                    ? currentRoot()
+                    : `${currentRoot()}/`;
                 const rows = computeRiskTable(facts.map((fact) => ({
                     symbol: fact.symbol,
                     file: fact.file
@@ -2489,7 +2599,7 @@ exports.mcp = new commander_1.Command("mcp")
                     line: fact.line,
                     callerCount: fact.callerCount,
                     hasTests: fact.hasTests,
-                    churn: fileChurn(fact.file, projectRoot),
+                    churn: fileChurn(fact.file, currentRoot()),
                 })));
                 return rows.length === 0
                     ? ok("(no changed symbols in this diff)")
@@ -2504,7 +2614,7 @@ exports.mcp = new commander_1.Command("mcp")
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const { readReport, formatReportText } = yield Promise.resolve().then(() => __importStar(require("../lib/llm/report")));
-                const report = readReport(projectRoot);
+                const report = readReport(currentRoot());
                 if (!report || report.reviews.length === 0) {
                     return ok("No review findings yet.");
                 }
@@ -2519,6 +2629,7 @@ exports.mcp = new commander_1.Command("mcp")
         });
     }
     // --- MCP server setup ---
+    // Local-only MCP: client-owned pipes, no HTTP/SSE/TCP listener or host option.
     const transport = new stdio_js_1.StdioServerTransport();
     const server = new mcp_js_1.McpServer({
         name: "gmax",
@@ -2554,7 +2665,7 @@ exports.mcp = new commander_1.Command("mcp")
                 source: "mcp",
                 tool: name,
                 query: mcpLogQuery(name, toolArgs),
-                project: projectRoot,
+                project: currentRoot(),
                 results: resultLines,
                 ms: Date.now() - startMs,
                 error: result.isError ? text.slice(0, 200) : undefined,
@@ -2566,21 +2677,51 @@ exports.mcp = new commander_1.Command("mcp")
     // shapes give us free input validation (the SDK rejects calls that violate
     // the schema before the handler runs); handlers stay defensively coded.
     function tool(name, config, handler) {
-        server.registerTool(name, config, (rawArgs) => __awaiter(this, void 0, void 0, function* () {
+        server.registerTool(name, Object.assign(Object.assign(Object.assign({}, config), (mcp_results_1.MCP_READ_OUTPUT_SCHEMAS[name]
+            ? {
+                outputSchema: mcp_results_1.MCP_READ_OUTPUT_SCHEMAS[name],
+                annotations: {
+                    readOnlyHint: true,
+                    destructiveHint: false,
+                    openWorldHint: false,
+                },
+            }
+            : {})), { inputSchema: Object.assign({ root: zod_1.z.string().optional() }, config.inputSchema) }), (rawArgs) => __awaiter(this, void 0, void 0, function* () {
             let args = (rawArgs !== null && rawArgs !== void 0 ? rawArgs : {});
             const startMs = Date.now();
-            if (typeof args.root === "string" && args.root.trim()) {
-                const selected = resolveMcpProject(args.root, projectRoot);
-                if (!selected) {
-                    const result = err(`Unknown registered project: ${args.root}. Use list_projects to select a project name or exact root.`);
+            let target = projectRoot;
+            try {
+                if (typeof args.root === "string" && args.root.trim()) {
+                    const raw = args.root.trim();
+                    if (path.isAbsolute(raw) || raw.includes(path.sep))
+                        target = path.resolve(raw);
+                    else {
+                        const projects = [
+                            ...(0, project_registry_1.listProjects)(),
+                            ...(0, store_context_1.storeInventory)().flatMap((store) => store.projects),
+                        ].filter((project, i, all) => all.findIndex((p) => p.root === project.root) === i);
+                        const selected = resolveMcpProject(raw, projectRoot, projects);
+                        if (!selected)
+                            return err(`Unknown or ambiguous registered project: ${raw}. Use list_projects or an exact root.`);
+                        target = selected.root;
+                    }
+                }
+                return yield (0, store_context_1.withStoreContext)(target, () => __awaiter(this, void 0, void 0, function* () {
+                    if (args.root !== undefined) {
+                        const selected = resolveMcpProject(args.root, currentRoot(), storeProjects());
+                        if (!selected)
+                            return err(`Unknown registered project: ${args.root}. Use list_projects to select a project name or exact root.`);
+                        args = Object.assign(Object.assign({}, args), { root: selected.root });
+                        (0, store_context_1.currentStoreContext)().root = selected.root;
+                    }
+                    const result = yield handler(args);
                     yield logToolCall(name, args, startMs, result);
                     return result;
-                }
-                args = Object.assign(Object.assign({}, args), { root: selected.root });
+                }));
+            }
+            catch (error) {
+                return toolError("Tool failed", error);
             }
-            const result = yield handler(args);
-            yield logToolCall(name, args, startMs, result);
-            return result;
         }));
     }
     tool("semantic_search", {