grepmax 0.26.46 → 0.26.48

package/.claude-plugin/marketplace.json

@@ -10,7 +10,7 @@
       "name": "grepmax",
       "source": "./plugins/grepmax",
       "description": "Semantic code search for Claude Code. Automatically indexes your project and provides intelligent search capabilities.",
-      "version": "0.26.46",
+      "version": "0.26.48",
       "author": {
         "name": "Robert Owens",
         "email": "robowens@me.com"

package/README.md

@@ -130,6 +130,8 @@ MCP is local-only: the client spawns it and communicates through stdin/stdout pi
 
 `gmax mcp` uses the official MCP SDK v2.3.0 and serves both legacy (2025 handshake) and modern (2026-07-28 discovery and per-request metadata) clients over the same stdio entry. Discovery and catalog listing perform no daemon, model or watcher startup. Index-reading tools acquire watch leases lazily; one timer renews the primary projects actually used, and disconnect closes the SDK connection and its timer.
 
+Clients requesting progress receive operation-stage messages with increasing stage counts and no estimated percentage. Cancelling a daemon read closes that request's IPC connection and prevents subsequent tool operations or fallback work; concurrent requests and the session's watch leases continue. An already-running local native query finishes under its existing deadline before its store closes. Cancellation does not undo indexing writes or interrupt optional LLM work.
+
 `gmax mcp` starts a stdio-based MCP server for clients that support MCP but can't run shell commands (Cursor, Windsurf, custom agents). Search-backed tools use the singleton daemon when available, avoiding a separate embedding worker per MCP session, and use an in-process worker for supported offline/secondary-store access. An unsupported daemon command requires `gmax watch restart`.
 
 `semantic_search`, `trace_calls`, `dead`, and `index_status` also advertise output schemas and return `structuredContent` with `schemaVersion: 1`, alongside the existing text. Search matches follow the same scope and display filters and include paths, one-based start/end lines, symbols, scores (null when unavailable), and warnings. Trace results preserve caller ancestry and edge confidence; unresolved callees have no location, and omitted callee/importer counts are explicit. Graph conclusions carry `approximate: true`. Index health includes embedding identity, watcher/reconciliation state, and the last compaction result; unavailable health is null or unobserved. These four tools advertise read-only, non-destructive, closed-world annotations. Other tools retain their current contracts.

package/dist/commands/mcp.js

@@ -97,6 +97,7 @@ const daemon_client_1 = require("../lib/utils/daemon-client");
 const file_utils_1 = require("../lib/utils/file-utils");
 const format_helpers_1 = require("../lib/utils/format-helpers");
 const import_extractor_1 = require("../lib/utils/import-extractor");
+const mcp_execution_1 = require("../lib/utils/mcp-execution");
 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");
@@ -414,20 +415,26 @@ exports.mcp = new commander_1.Command("mcp")
     // Propagate project root to worker processes
     process.env.GMAX_PROJECT_ROOT = paths.root;
     // --- Store access ---
+    function sendMcpCommand(cmd, opts) {
+        return (0, mcp_execution_1.mcpOperation)(`Daemon: ${cmd.cmd}`, () => (0, daemon_client_1.sendDaemonCommand)(cmd, Object.assign(Object.assign({}, opts), { signal: (0, mcp_execution_1.mcpSignal)() })));
+    }
     /**
      * 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(Object.assign({}, opts), MCP_STORE_FALLBACK), { skipDaemon: secondary() }));
+        return (0, store_access_1.withStoreRead)(name, Object.assign(Object.assign(Object.assign({ signal: (0, mcp_execution_1.mcpSignal)() }, 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)(storeDir(), fn, storeConfig().vectorDim);
+        return (0, mcp_execution_1.mcpOperation)("Reading selected local store", () => (0, rows_handler_1.withLocalStore)(storeDir(), (deps) => __awaiter(this, void 0, void 0, function* () {
+            (0, mcp_execution_1.checkMcpCancellation)();
+            return fn(deps);
+        }), 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: Object.assign(Object.assign({}, MCP_STORE_FALLBACK), (secondary() ? { skipDaemon: true } : {})) }));
+        return (0, mcp_execution_1.mcpOperation)(`Reading ${verb}`, () => (0, graph_handler_1.callGraphVerb)(verb, Object.assign(Object.assign({}, call), { signal: (0, mcp_execution_1.mcpSignal)(), 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
@@ -457,7 +464,7 @@ exports.mcp = new commander_1.Command("mcp")
      */
     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 }); },
+            daemon: () => { var _a; return sendMcpCommand(Object.assign({ cmd: ((_a = args.filters) === null || _a === void 0 ? void 0 : _a.projectRoots) ? "search-v2" : "search" }, args), { timeoutMs: 60000 }); },
             render: (resp) => {
                 const warnings = Array.isArray(resp.warnings)
                     ? resp.warnings.filter((w) => typeof w === "string")
@@ -476,7 +483,7 @@ exports.mcp = new commander_1.Command("mcp")
                     : 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);
+                    return yield searcher.search(args.query, args.limit, { rerank: args.rerank, seeds: args.seeds }, args.filters, args.pathPrefix, undefined, (0, mcp_execution_1.mcpSignal)());
                 }
                 finally {
                     yield pool === null || pool === void 0 ? void 0 : pool.destroy();
@@ -548,7 +555,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: storeDir(), vectorDim: storeConfig().vectorDim, scope: projectScope(root), fallback: Object.assign(Object.assign({}, MCP_STORE_FALLBACK), { skipDaemon: secondary() }) }, req));
+        return (0, mcp_execution_1.mcpOperation)("Locating indexed rows", () => (0, rows_handler_1.readRows)(Object.assign({ signal: (0, mcp_execution_1.mcpSignal)(), 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.
@@ -566,8 +573,9 @@ exports.mcp = new commander_1.Command("mcp")
             let chunks = 0;
             let files = 0;
             for (const project of projects) {
+                (0, mcp_execution_1.checkMcpCancellation)();
                 const totals = yield readStore("project-stats", {
-                    daemon: () => (0, daemon_client_1.sendDaemonCommand)({ cmd: "project-stats", root: project.root }, { timeoutMs: 30000 }),
+                    daemon: () => sendMcpCommand({ 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,
@@ -591,7 +599,7 @@ exports.mcp = new commander_1.Command("mcp")
     /** `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 }),
+            daemon: () => sendMcpCommand(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),
@@ -618,32 +626,34 @@ exports.mcp = new commander_1.Command("mcp")
     };
     function ensureWatcher(root) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            try {
-                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 (closing)
-                    return;
-                if (result.ok) {
-                    watchedRoots.add(watchRoot);
-                    // Discovery/catalog requests never reach this path. Renew only roots
-                    // actually read by this session, with one timer for the whole process.
-                    watchTimer !== null && watchTimer !== void 0 ? watchTimer : (watchTimer = setInterval(() => {
-                        for (const root of watchedRoots)
-                            void ensureWatcher(root);
-                    }, MCP_WATCH_LEASE_RENEW_MS).unref());
-                }
-                if (result.ok && !result.reused) {
-                    console.log(`[MCP] Started background watcher for ${watchRoot} (PID: ${result.pid})`);
-                }
-            }
-            catch (err) {
-                console.error("[MCP] Watcher startup failed:", err);
-            }
+            return (0, mcp_execution_1.withoutMcpExecution)(() => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                try {
+                    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 (closing)
+                        return;
+                    if (result.ok) {
+                        watchedRoots.add(watchRoot);
+                        // Discovery/catalog requests never reach this path. Renew only roots
+                        // actually read by this session, with one timer for the whole process.
+                        watchTimer !== null && watchTimer !== void 0 ? watchTimer : (watchTimer = setInterval(() => {
+                            for (const root of watchedRoots)
+                                void ensureWatcher(root);
+                        }, MCP_WATCH_LEASE_RENEW_MS).unref());
+                    }
+                    if (result.ok && !result.reused) {
+                        console.log(`[MCP] Started background watcher for ${watchRoot} (PID: ${result.pid})`);
+                    }
+                }
+                catch (err) {
+                    console.error("[MCP] Watcher startup failed:", err);
+                }
+            }));
         });
     }
     // Resolve the registered project this server scopes to. The server pins to
@@ -1566,7 +1576,7 @@ exports.mcp = new commander_1.Command("mcp")
                 // 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)({
+                    daemon: () => sendMcpCommand({
                         cmd: "vector.surprises",
                         projectRoot: root,
                         options,
@@ -1742,7 +1752,7 @@ exports.mcp = new commander_1.Command("mcp")
                         ? root
                         : `${root}/`;
                 const entries = yield readStore("symbols", {
-                    daemon: () => (0, daemon_client_1.sendDaemonCommand)({
+                    daemon: () => sendMcpCommand({
                         cmd: "rows.symbols",
                         projectRoot: root,
                         pathPrefix: absPrefix,
@@ -1828,7 +1838,7 @@ exports.mcp = new commander_1.Command("mcp")
                 const { chunks, files } = yield indexTotals(projects);
                 const daemonStatus = secondary()
                     ? { ok: true, projects: [] }
-                    : yield (0, daemon_client_1.sendDaemonCommand)({ cmd: "status" });
+                    : yield sendMcpCommand({ 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.
@@ -1954,7 +1964,7 @@ exports.mcp = new commander_1.Command("mcp")
                 // 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 }),
+                    daemon: () => sendMcpCommand({ cmd: "rows.project", projectRoot: root }, { timeoutMs: 120000 }),
                     render: (resp) => resp.overview,
                     inProcess: () => localStore((deps) => (0, rows_handler_1.runProject)(deps, root)),
                 });
@@ -2390,7 +2400,7 @@ exports.mcp = new commander_1.Command("mcp")
                 // 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)({
+                    daemon: () => sendMcpCommand({
                         cmd: "vector.similar",
                         projectRoot: root,
                         absPath,
@@ -2663,7 +2673,7 @@ exports.mcp = new commander_1.Command("mcp")
         });
         // Best-effort query logging, applied uniformly to every tool exactly as the
         // old single CallToolRequestSchema dispatch did before each return.
-        const logToolCall = (name, toolArgs, startMs, result) => __awaiter(this, void 0, void 0, function* () {
+        const logToolCall = (name_1, toolArgs_1, startMs_1, result_1, ...args_1) => __awaiter(this, [name_1, toolArgs_1, startMs_1, result_1, ...args_1], void 0, function* (name, toolArgs, startMs, result, root = currentRoot()) {
             var _a, _b;
             var _c;
             try {
@@ -2675,7 +2685,7 @@ exports.mcp = new commander_1.Command("mcp")
                     source: "mcp",
                     tool: name,
                     query: mcpLogQuery(name, toolArgs),
-                    project: currentRoot(),
+                    project: root,
                     results: resultLines,
                     ms: Date.now() - startMs,
                     error: result.isError ? text.slice(0, 200) : undefined,
@@ -2696,42 +2706,47 @@ exports.mcp = new commander_1.Command("mcp")
                         openWorldHint: false,
                     },
                 }
-                : {})), { inputSchema: zod_1.z.object(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();
-                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;
+                : {})), { inputSchema: zod_1.z.object(Object.assign({ root: zod_1.z.string().optional() }, config.inputSchema)) }), (rawArgs, context) => __awaiter(this, void 0, void 0, function* () {
+                return (0, mcp_execution_1.withMcpExecution)(context === null || context === void 0 ? void 0 : context.mcpReq, () => __awaiter(this, void 0, void 0, function* () {
+                    let args = (rawArgs !== null && rawArgs !== void 0 ? rawArgs : {});
+                    const startMs = Date.now();
+                    let target = projectRoot;
+                    try {
+                        (0, mcp_execution_1.checkMcpCancellation)();
+                        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 (0, mcp_execution_1.mcpOperation)(`Starting ${name}`, () => handler(args));
+                            yield logToolCall(name, args, startMs, result);
+                            return result;
+                        }));
                     }
-                    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);
+                    catch (error) {
+                        const result = toolError("Tool failed", error);
+                        yield logToolCall(name, args, startMs, result, target);
                         return result;
-                    }));
-                }
-                catch (error) {
-                    return toolError("Tool failed", error);
-                }
+                    }
+                }));
             }));
         }
         tool("semantic_search", {

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

@@ -856,5 +856,5 @@ exports.GRAPH_VERB_TIMEOUT_MS = 60000;
  * project skips the daemon outright — see isDaemonReadableProject.
  */
 function callGraphVerb(verb, call) {
-    return (0, store_access_1.withStoreRead)(verb, Object.assign({ skipDaemon: !isDaemonReadableProject(call.projectRoot), daemon: () => (0, daemon_client_1.sendDaemonCommand)(Object.assign(Object.assign({ cmd: verb }, encodeScope(call.projectRoot, call.scope)), call.payload), { timeoutMs: exports.GRAPH_VERB_TIMEOUT_MS }), render: call.render, inProcess: call.inProcess }, call.fallback));
+    return (0, store_access_1.withStoreRead)(verb, Object.assign({ signal: call.signal, skipDaemon: !isDaemonReadableProject(call.projectRoot), daemon: () => (0, daemon_client_1.sendDaemonCommand)(Object.assign(Object.assign({ cmd: verb }, encodeScope(call.projectRoot, call.scope)), call.payload), { timeoutMs: exports.GRAPH_VERB_TIMEOUT_MS, signal: call.signal }), render: call.render, inProcess: call.inProcess }, call.fallback));
 }

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

@@ -570,7 +570,7 @@ function readRows(opts) {
             return [];
         const { sendDaemonCommand } = yield Promise.resolve().then(() => __importStar(require("../utils/daemon-client")));
         const { withStoreRead } = yield Promise.resolve().then(() => __importStar(require("../utils/store-access")));
-        return withStoreRead(opts.name, Object.assign({ daemon: () => { var _a; return sendDaemonCommand({
+        return withStoreRead(opts.name, Object.assign({ signal: opts.signal, daemon: () => { var _a; return sendDaemonCommand({
                 cmd: "rows.locate",
                 projectRoot: opts.projectRoot,
                 scope: scopeToWire(opts.scope),
@@ -578,14 +578,18 @@ function readRows(opts) {
                 matches: opts.matches,
                 limit: opts.limit,
                 scoped: opts.scoped,
-            }, { timeoutMs: (_a = opts.timeoutMs) !== null && _a !== void 0 ? _a : 60000 }); }, render: (resp) => { var _a; return ((_a = resp.rows) !== null && _a !== void 0 ? _a : []); }, inProcess: () => withLocalStore(opts.lancedbDir, (deps) => runLocate(deps, {
-                projectRoot: opts.projectRoot,
-                scope: opts.scope,
-                select: opts.select,
-                matches: opts.matches,
-                limit: opts.limit,
-                scoped: opts.scoped,
-            }), opts.vectorDim) }, opts.fallback));
+            }, { timeoutMs: (_a = opts.timeoutMs) !== null && _a !== void 0 ? _a : 60000, signal: opts.signal }); }, render: (resp) => { var _a; return ((_a = resp.rows) !== null && _a !== void 0 ? _a : []); }, inProcess: () => withLocalStore(opts.lancedbDir, (deps) => {
+                var _a;
+                (_a = opts.signal) === null || _a === void 0 ? void 0 : _a.throwIfAborted();
+                return runLocate(deps, {
+                    projectRoot: opts.projectRoot,
+                    scope: opts.scope,
+                    select: opts.select,
+                    matches: opts.matches,
+                    limit: opts.limit,
+                    scoped: opts.scoped,
+                });
+            }, opts.vectorDim) }, opts.fallback));
     });
 }
 function handleRowsSkeleton(deps, payload) {

package/dist/lib/search/searcher.js

@@ -699,8 +699,12 @@ class Searcher {
             }
             const envMaxPerFile = Number.parseInt((_m = process.env.GMAX_MAX_PER_FILE) !== null && _m !== void 0 ? _m : "", 10);
             const MAX_PER_FILE = Number.isFinite(envMaxPerFile) && envMaxPerFile > 0 ? envMaxPerFile : 3;
-            const displayWindow = Math.min(stage2Candidates.length, Math.max(finalLimit * MAX_PER_FILE, finalLimit, RERANK_TOP));
-            const displayCandidates = stage2Candidates.slice(0, displayWindow);
+            // Rank the entire bounded candidate pool before trimming the result count.
+            // A limit-dependent cut here discarded contenders before structure boosts
+            // and dedup, so requesting three results could hide the top match returned
+            // by a ten-result request. Expensive reranking stays independently bounded;
+            // display columns are still fetched only for the final results below.
+            const displayCandidates = [...stage2Candidates];
             const rerankCandidates = stage2Candidates.slice(0, RERANK_TOP);
             // Symbol-definition promotion (1/2): membership. For a bare-symbol query,
             // ensure the chunk(s) that actually DEFINE the symbol reach the rerank set

package/dist/lib/utils/daemon-client.js

@@ -69,7 +69,10 @@ const HEARTBEAT_FRESH_THRESHOLD_MS = 150000;
  */
 function sendDaemonCommand(cmd, opts) {
     var _a;
-    const timeout = (_a = opts === null || opts === void 0 ? void 0 : opts.timeoutMs) !== null && _a !== void 0 ? _a : DEFAULT_TIMEOUT_MS;
+    var _b;
+    if ((_a = opts === null || opts === void 0 ? void 0 : opts.signal) === null || _a === void 0 ? void 0 : _a.aborted)
+        return Promise.resolve({ ok: false, error: "aborted" });
+    const timeout = (_b = opts === null || opts === void 0 ? void 0 : opts.timeoutMs) !== null && _b !== void 0 ? _b : DEFAULT_TIMEOUT_MS;
     return new Promise((resolve) => {
         var _a, _b;
         let settled = false;

package/dist/lib/utils/mcp-execution.js

@@ -0,0 +1,67 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withoutMcpExecution = withoutMcpExecution;
+exports.mcpSignal = mcpSignal;
+exports.checkMcpCancellation = checkMcpCancellation;
+exports.mcpOperation = mcpOperation;
+exports.withMcpExecution = withMcpExecution;
+const node_async_hooks_1 = require("node:async_hooks");
+const executions = new node_async_hooks_1.AsyncLocalStorage();
+/** Session background work must not retain the triggering request's signal. */
+function withoutMcpExecution(work) {
+    return executions.exit(work);
+}
+function mcpSignal() {
+    var _a;
+    return (_a = executions.getStore()) === null || _a === void 0 ? void 0 : _a.request.signal;
+}
+/** Check between operations, never race a native query against store close. */
+function checkMcpCancellation() {
+    var _a;
+    (_a = mcpSignal()) === null || _a === void 0 ? void 0 : _a.throwIfAborted();
+}
+/** Counts started operation stages, not completion percentages. No timers. */
+function mcpOperation(message, work) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        checkMcpCancellation();
+        const execution = executions.getStore();
+        const progressToken = (_a = execution === null || execution === void 0 ? void 0 : execution.request._meta) === null || _a === void 0 ? void 0 : _a.progressToken;
+        if (execution && progressToken !== undefined) {
+            const progress = ++execution.stages;
+            execution.notifications = execution.notifications.then(() => __awaiter(this, void 0, void 0, function* () {
+                if (execution.request.signal.aborted)
+                    return;
+                try {
+                    yield execution.request.notify({
+                        method: "notifications/progress",
+                        params: { progressToken, progress, message },
+                    });
+                }
+                catch (_a) {
+                    // Progress is advisory; a peer declining it must not break a read.
+                }
+            }));
+            yield execution.notifications;
+        }
+        checkMcpCancellation();
+        const result = yield work();
+        checkMcpCancellation();
+        return result;
+    });
+}
+function withMcpExecution(request, work) {
+    // Non-protocol callers (including the catalog's unit fixtures) have no context.
+    if (!request)
+        return work();
+    return executions.run({ request, stages: 0, notifications: Promise.resolve() }, work);
+}

package/dist/lib/utils/store-access.js

@@ -271,11 +271,16 @@ function isDaemonBypassed() {
  */
 function withStoreRead(name, opts) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        var _b;
+        var _a, _b, _c, _d;
+        var _e;
+        (_a = opts.signal) === null || _a === void 0 ? void 0 : _a.throwIfAborted();
         const runInProcess = () => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            (_a = opts.signal) === null || _a === void 0 ? void 0 : _a.throwIfAborted();
             try {
-                return yield opts.inProcess();
+                const result = yield opts.inProcess();
+                (_b = opts.signal) === null || _b === void 0 ? void 0 : _b.throwIfAborted();
+                return result;
             }
             catch (err) {
                 throw asStoreAccessError(err);
@@ -288,6 +293,7 @@ function withStoreRead(name, opts) {
             resp = yield opts.daemon();
         }
         catch (err) {
+            (_b = opts.signal) === null || _b === void 0 ? void 0 : _b.throwIfAborted();
             if (isStoreAccessRefused(err))
                 throw err;
             const cls = classifyDaemonError(err === null || err === void 0 ? void 0 : err.code);
@@ -297,6 +303,7 @@ function withStoreRead(name, opts) {
                 throw err;
             return runInProcess();
         }
+        (_c = opts.signal) === null || _c === void 0 ? void 0 : _c.throwIfAborted();
         if (resp.ok) {
             return opts.render ? yield opts.render(resp) : resp;
         }
@@ -308,13 +315,13 @@ function withStoreRead(name, opts) {
         }
         if (cls === "no-daemon" ||
             (opts.fallbackOnOversize && isOversizeError(resp.error)) ||
-            ((_a = opts.extraFallback) === null || _a === void 0 ? void 0 : _a.call(opts, resp.error)) === true) {
+            ((_d = opts.extraFallback) === null || _d === void 0 ? void 0 : _d.call(opts, resp.error)) === true) {
             if (process.env.GMAX_DEBUG === "1") {
                 console.error(`[${name}] daemon path unavailable: ${resp.error}`);
             }
             return runInProcess();
         }
-        throw new Error(((_b = opts.daemonErrorMessage) !== null && _b !== void 0 ? _b : ((r) => defaultDaemonErrorMessage(name, r)))(resp));
+        throw new Error(((_e = opts.daemonErrorMessage) !== null && _e !== void 0 ? _e : ((r) => defaultDaemonErrorMessage(name, r)))(resp));
     });
 }
 // --- Spawn guard -----------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grepmax",
-  "version": "0.26.46",
+  "version": "0.26.48",
   "author": "Robert Owens <78518764+reowens@users.noreply.github.com>",
   "homepage": "https://github.com/reowens/grepmax",
   "bugs": {

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

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