grepmax 0.17.21 → 0.17.23

package/dist/commands/search.js

@@ -43,315 +43,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.search = void 0;
-const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const commander_1 = require("commander");
-const grammar_loader_1 = require("../lib/index/grammar-loader");
-const sync_helpers_1 = require("../lib/index/sync-helpers");
-const syncer_1 = require("../lib/index/syncer");
 const agent_search_formatter_1 = require("../lib/output/agent-search-formatter");
+const compact_results_1 = require("../lib/output/compact-results");
 const index_state_footer_1 = require("../lib/output/index-state-footer");
-const searcher_1 = require("../lib/search/searcher");
 const setup_helpers_1 = require("../lib/setup/setup-helpers");
-const skeleton_1 = require("../lib/skeleton");
-const retriever_1 = require("../lib/skeleton/retriever");
-const vector_db_1 = require("../lib/store/vector-db");
 const cross_project_1 = require("../lib/utils/cross-project");
 const exit_1 = require("../lib/utils/exit");
 const formatter_1 = require("../lib/utils/formatter");
 const import_extractor_1 = require("../lib/utils/import-extractor");
-const lock_1 = require("../lib/utils/lock");
 const project_registry_1 = require("../lib/utils/project-registry");
 const project_root_1 = require("../lib/utils/project-root");
 const server_registry_1 = require("../lib/utils/server-registry");
-function toTextResults(data) {
-    return data.map((r) => {
-        var _a, _b, _c, _d, _e, _f;
-        const rawPath = typeof ((_a = r.metadata) === null || _a === void 0 ? void 0 : _a.path) === "string"
-            ? r.metadata.path
-            : "Unknown path";
-        const start = typeof ((_b = r.generated_metadata) === null || _b === void 0 ? void 0 : _b.start_line) === "number"
-            ? r.generated_metadata.start_line
-            : 0;
-        const end = typeof ((_c = r.generated_metadata) === null || _c === void 0 ? void 0 : _c.end_line) === "number"
-            ? r.generated_metadata.end_line
-            : start + Math.max(0, ((_e = (_d = r.generated_metadata) === null || _d === void 0 ? void 0 : _d.num_lines) !== null && _e !== void 0 ? _e : 1) - 1);
-        return {
-            path: rawPath,
-            score: r.score,
-            content: r.text || "",
-            chunk_type: (_f = r.generated_metadata) === null || _f === void 0 ? void 0 : _f.type,
-            start_line: start,
-            end_line: end,
-        };
-    });
-}
-function getPreviewText(chunk) {
-    var _a, _b, _c, _d, _e;
-    const maxLen = 140;
-    const lines = (_b = (_a = chunk.text) === null || _a === void 0 ? void 0 : _a.split("\n").map((l) => l.trim()).filter(Boolean)) !== null && _b !== void 0 ? _b : [];
-    let preview = (_c = lines[0]) !== null && _c !== void 0 ? _c : "";
-    if (!preview && ((_d = chunk.defined_symbols) === null || _d === void 0 ? void 0 : _d.length)) {
-        preview = (_e = chunk.defined_symbols[0]) !== null && _e !== void 0 ? _e : "";
-    }
-    if (preview.length > maxLen) {
-        preview = `${preview.slice(0, maxLen)}...`;
-    }
-    return preview;
-}
-function toCompactHits(data) {
-    return data.map((chunk) => {
-        var _a, _b, _c, _d, _e, _f;
-        const rawPath = typeof ((_a = chunk.metadata) === null || _a === void 0 ? void 0 : _a.path) === "string"
-            ? chunk.metadata.path
-            : "Unknown path";
-        const start = typeof ((_b = chunk.generated_metadata) === null || _b === void 0 ? void 0 : _b.start_line) === "number"
-            ? chunk.generated_metadata.start_line
-            : 0;
-        const end = typeof ((_c = chunk.generated_metadata) === null || _c === void 0 ? void 0 : _c.end_line) === "number"
-            ? chunk.generated_metadata.end_line
-            : start + Math.max(0, ((_e = (_d = chunk.generated_metadata) === null || _d === void 0 ? void 0 : _d.num_lines) !== null && _e !== void 0 ? _e : 1) - 1);
-        return {
-            path: rawPath,
-            range: `${start + 1}-${end + 1}`,
-            start_line: start,
-            end_line: end,
-            role: chunk.role,
-            confidence: chunk.confidence,
-            score: chunk.score,
-            defined: Array.isArray(chunk.defined_symbols)
-                ? chunk.defined_symbols.slice(0, 3)
-                : typeof chunk.defined_symbols === "string"
-                    ? [chunk.defined_symbols]
-                    : typeof ((_f = chunk.defined_symbols) === null || _f === void 0 ? void 0 : _f.toArray) === "function"
-                        ? chunk.defined_symbols.toArray().slice(0, 3)
-                        : [],
-            preview: getPreviewText(chunk),
-            summary: typeof chunk.summary === "string" ? chunk.summary : undefined,
-        };
-    });
-}
-function compactRole(role) {
-    if (!role)
-        return "UNK";
-    if (role.startsWith("ORCH"))
-        return "ORCH";
-    if (role.startsWith("DEF"))
-        return "DEF";
-    if (role.startsWith("IMP"))
-        return "IMPL";
-    return role.slice(0, 4).toUpperCase();
-}
-function compactConf(conf) {
-    if (!conf)
-        return "U";
-    const c = conf.toUpperCase();
-    if (c.startsWith("H"))
-        return "H";
-    if (c.startsWith("M"))
-        return "M";
-    if (c.startsWith("L"))
-        return "L";
-    return "U";
-}
-function compactScore(score) {
-    if (typeof score !== "number")
-        return "";
-    const fixed = score.toFixed(3);
-    return fixed
-        .replace(/^0\./, ".")
-        .replace(/\.?0+$/, (m) => (m.startsWith(".") ? "" : m));
-}
-function truncateEnd(s, max) {
-    if (max <= 0)
-        return "";
-    if (s.length <= max)
-        return s;
-    if (max <= 3)
-        return s.slice(0, max);
-    return `${s.slice(0, max - 3)}...`;
-}
-function padR(s, w) {
-    const n = Math.max(0, w - s.length);
-    return s + " ".repeat(n);
-}
-function padL(s, w) {
-    const n = Math.max(0, w - s.length);
-    return " ".repeat(n) + s;
-}
-function formatCompactTSV(hits, projectRoot, query) {
-    var _a, _b;
-    if (!hits.length)
-        return "No matches found.";
-    const lines = [];
-    lines.push(`gmax hits\tquery=${query}\tcount=${hits.length}`);
-    lines.push("path\tlines\tscore\trole\tconf\tdefined\tsummary");
-    for (const hit of hits) {
-        const relPath = path.isAbsolute(hit.path)
-            ? path.relative(projectRoot, hit.path)
-            : hit.path;
-        const score = compactScore(hit.score);
-        const role = compactRole(hit.role);
-        const conf = compactConf(hit.confidence);
-        const defs = ((_a = hit.defined) !== null && _a !== void 0 ? _a : []).join(",");
-        const summary = (_b = hit.summary) !== null && _b !== void 0 ? _b : "";
-        lines.push([relPath, hit.range, score, role, conf, defs, summary].join("\t"));
-    }
-    return lines.join("\n");
-}
-function formatCompactPretty(hits, projectRoot, query, termWidth, useAnsi) {
-    var _a;
-    if (!hits.length)
-        return "No matches found.";
-    const dim = (s) => (useAnsi ? `\x1b[90m${s}\x1b[0m` : s);
-    const bold = (s) => (useAnsi ? `\x1b[1m${s}\x1b[0m` : s);
-    const wLines = 9;
-    const wScore = 6;
-    const wRole = 4;
-    const wConf = 1;
-    const wDef = 20;
-    const gutters = 5;
-    const fixed = wLines + wScore + wRole + wConf + wDef + gutters;
-    const wPath = Math.max(24, Math.min(64, termWidth - fixed));
-    const header = `gmax hits  count=${hits.length}  query="${query}"`;
-    const cols = [
-        padR("path", wPath),
-        padR("lines", wLines),
-        padL("score", wScore),
-        padR("role", wRole),
-        padR("c", wConf),
-        padR("defined", wDef),
-    ].join(" ");
-    const out = [];
-    out.push(bold(header));
-    out.push(dim(cols));
-    for (const hit of hits) {
-        const relPath = path.isAbsolute(hit.path)
-            ? path.relative(projectRoot, hit.path)
-            : hit.path;
-        const score = compactScore(hit.score);
-        const role = compactRole(hit.role);
-        const conf = compactConf(hit.confidence);
-        const defs = ((_a = hit.defined) !== null && _a !== void 0 ? _a : []).join(",") || "-";
-        const displayPath = `${relPath}:${hit.start_line + 1}`;
-        const paddedPath = padR(displayPath, wPath);
-        const row = [
-            paddedPath,
-            padR(hit.range, wLines),
-            padL(score || "", wScore),
-            padR(role, wRole),
-            padR(conf, wConf),
-            padR(truncateEnd(defs, wDef), wDef),
-        ].join(" ");
-        out.push(row);
-    }
-    return out.join("\n");
-}
-function formatCompactTable(hits, projectRoot, query, opts) {
-    var _a;
-    if (!hits.length)
-        return "No matches found.";
-    if (!opts.isTTY || opts.plain) {
-        return formatCompactTSV(hits, projectRoot, query);
-    }
-    const termWidth = Math.max(80, (_a = process.stdout.columns) !== null && _a !== void 0 ? _a : 120);
-    return formatCompactPretty(hits, projectRoot, query, termWidth, true);
-}
-// Reuse Skeletonizer instance
-let globalSkeletonizer = null;
-function outputSkeletons(results, projectRoot, limit, db, precomputed) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const seenPaths = new Set();
-        const filesToProcess = [];
-        for (const result of results) {
-            const p = (_a = result.metadata) === null || _a === void 0 ? void 0 : _a.path;
-            if (typeof p === "string" && !seenPaths.has(p)) {
-                seenPaths.add(p);
-                filesToProcess.push(p);
-                if (filesToProcess.length >= limit)
-                    break;
-            }
-        }
-        if (filesToProcess.length === 0) {
-            console.log("No skeleton matches found.");
-            console.log("\nTry: broaden your query, or use `gmax skeleton <path>` to view a specific file's structure.");
-            process.exitCode = 1;
-            return;
-        }
-        // Reuse or init skeletonizer for fallbacks
-        if (!globalSkeletonizer) {
-            globalSkeletonizer = new skeleton_1.Skeletonizer();
-            // Lazy init only if we actually fallback
-        }
-        const skeletonOpts = { includeSummary: true };
-        const skeletonResults = [];
-        for (const filePath of filesToProcess) {
-            // Paths from search results are now absolute (centralized index)
-            const absPath = path.isAbsolute(filePath)
-                ? filePath
-                : path.resolve(projectRoot, filePath);
-            // 0. Daemon-supplied (preferred — already-warm DB lookup, no cold open)
-            const fromDaemon = (_b = precomputed === null || precomputed === void 0 ? void 0 : precomputed[absPath]) !== null && _b !== void 0 ? _b : precomputed === null || precomputed === void 0 ? void 0 : precomputed[filePath];
-            if (fromDaemon) {
-                skeletonResults.push({
-                    file: filePath,
-                    skeleton: fromDaemon,
-                    tokens: Math.ceil(fromDaemon.length / 4),
-                });
-                continue;
-            }
-            // 1. Try DB cache
-            if (db) {
-                const cached = yield (0, retriever_1.getStoredSkeleton)(db, absPath);
-                if (cached) {
-                    skeletonResults.push({
-                        file: filePath,
-                        skeleton: cached,
-                        tokens: Math.ceil(cached.length / 4), // Rough estimate
-                    });
-                    continue;
-                }
-            }
-            // 2. Fallback to fresh generation
-            yield globalSkeletonizer.init();
-            if (!fs.existsSync(absPath)) {
-                skeletonResults.push({
-                    file: filePath,
-                    skeleton: `// File not found: ${filePath}`,
-                    tokens: 0,
-                    error: "File not found",
-                });
-                continue;
-            }
-            const content = fs.readFileSync(absPath, "utf-8");
-            const res = yield globalSkeletonizer.skeletonizeFile(absPath, content, skeletonOpts);
-            skeletonResults.push({
-                file: filePath,
-                skeleton: res.skeleton,
-                tokens: res.tokenEstimate,
-                error: res.error,
-            });
-        }
-        // Since search doesn't support --json explicitly yet, we just print text.
-        // But if we ever add it, we have the structure.
-        for (const res of skeletonResults) {
-            console.log(res.skeleton);
-            console.log(""); // Separator
-        }
-    });
-}
-function resultCountHeader(results, maxCount) {
-    var _a, _b, _c;
-    const files = new Set();
-    for (const r of results) {
-        const p = (_c = (_a = r.path) !== null && _a !== void 0 ? _a : (_b = r.metadata) === null || _b === void 0 ? void 0 : _b.path) !== null && _c !== void 0 ? _c : "";
-        if (p)
-            files.add(p);
-    }
-    const showing = results.length < maxCount ? `${results.length}` : `top ${results.length}`;
-    return `Found ${results.length} match${results.length === 1 ? "" : "es"} (showing ${showing}) across ${files.size} file${files.size === 1 ? "" : "s"}`;
-}
+const search_run_1 = require("./search-run");
+const search_skeletons_1 = require("./search-skeletons");
 exports.search = new commander_1.Command("search")
     .description("Search code by meaning (default command)")
     .option("-m <max_count>, --max-count <max_count>", "The maximum number of results to return (total)", "5")
@@ -397,7 +103,7 @@ Examples:
   gmax "auth middleware" --projects api,gateway --plain
 `)
     .action((pattern, exec_path, _options, cmd) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const options = cmd.optsWithGlobals();
     const root = process.cwd();
     const minScore = Number.isFinite(Number.parseFloat(options.minScore))
@@ -465,7 +171,7 @@ Examples:
                 const searchResult = { data: body.results };
                 const filteredData = searchResult.data.filter((r) => typeof r.score !== "number" || r.score >= minScore);
                 if (options.skeleton) {
-                    yield outputSkeletons(filteredData, projectRootForServer, parseInt(options.m, 10), 
+                    yield (0, search_skeletons_1.outputSkeletons)(filteredData, projectRootForServer, parseInt(options.m, 10), 
                     // Server doesn't easily expose DB instance here in HTTP client mode,
                     // but we are in client. Wait, this text implies "Server Search" block.
                     // Client talks to server. The server returns JSON.
@@ -476,7 +182,7 @@ Examples:
                     return;
                 }
                 const compactHits = options.compact
-                    ? toCompactHits(filteredData)
+                    ? (0, compact_results_1.toCompactHits)(filteredData)
                     : [];
                 if (options.compact) {
                     if (!compactHits.length) {
@@ -485,7 +191,7 @@ Examples:
                         process.exitCode = 1;
                     }
                     else {
-                        console.log(formatCompactTable(compactHits, projectRootForServer, pattern, {
+                        console.log((0, compact_results_1.formatCompactTable)(compactHits, projectRootForServer, pattern, {
                             isTTY: !!process.stdout.isTTY,
                             plain: !!options.plain,
                         }));
@@ -511,6 +217,7 @@ Examples:
                     };
                     console.log((0, agent_search_formatter_1.formatAgentSearchResults)(filteredData, projectRootForServer, {
                         includeImports: options.imports,
+                        query: pattern,
                         getImportsForFile,
                         explain: options.explain,
                     }));
@@ -520,11 +227,11 @@ Examples:
                 const shouldBePlain = options.plain || !isTTY;
                 _searchResultCount = filteredData.length;
                 if (!options.agent && !options.compact) {
-                    console.log(resultCountHeader(filteredData, parseInt(options.m, 10)));
+                    console.log((0, compact_results_1.resultCountHeader)(filteredData, parseInt(options.m, 10)));
                     console.log();
                 }
                 if (shouldBePlain) {
-                    const mappedResults = toTextResults(filteredData);
+                    const mappedResults = (0, compact_results_1.toTextResults)(filteredData);
                     const output = (0, formatter_1.formatTextResults)(mappedResults, pattern, projectRootForServer, {
                         isPlain: true,
                         compact: options.compact,
@@ -643,138 +350,25 @@ Examples:
         const seedFiles = splitSeeds(options.seedFile);
         const seedSymbols = splitSeeds(options.seedSymbol);
         const seeds = seedFiles || seedSymbols ? { files: seedFiles, symbols: seedSymbols } : undefined;
-        // Daemon-mediated search: ships query+args over IPC, daemon runs the
-        // hybrid+rerank against its already-warm VectorDB and worker pool.
-        // Drops cold-start cost (~17s wall, 6GB RAM in the CLI) to <1s. Falls
-        // back to in-process on any failure.
-        let searchResult = null;
-        let precomputedSkeletons;
-        let precomputedGraph;
-        let indexState;
-        if (!options.sync && !options.dryRun) {
-            try {
-                const { isDaemonRunning, sendDaemonCommand } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/daemon-client")));
-                if (yield isDaemonRunning()) {
-                    const resp = yield sendDaemonCommand({
-                        cmd: "search",
-                        projectRoot: effectiveRoot,
-                        query: pattern,
-                        limit: parseInt(options.m, 10),
-                        filters: Object.keys(searchFilters).length > 0
-                            ? searchFilters
-                            : undefined,
-                        pathPrefix: pathFilter,
-                        rerank: process.env.GMAX_RERANK === "1",
-                        explain: options.explain,
-                        seeds,
-                        includeSkeletons: options.skeleton,
-                        includeGraph: options.symbol,
-                    }, { timeoutMs: 60000 });
-                    if (resp.ok) {
-                        searchResult = {
-                            data: resp.data,
-                            warnings: resp.warnings,
-                        };
-                        precomputedSkeletons = resp.skeletons;
-                        precomputedGraph = resp.graph;
-                        indexState = resp.indexState;
-                    }
-                    else if (process.env.GMAX_DEBUG === "1") {
-                        console.error(`[search] daemon path unavailable: ${(_e = resp.error) !== null && _e !== void 0 ? _e : "unknown"}`);
-                    }
-                }
-            }
-            catch (err) {
-                if (process.env.GMAX_DEBUG === "1") {
-                    console.error("[search] daemon attempt threw:", err);
-                }
-            }
-        }
-        // In-process fallback: open VectorDB, ensure index, run Searcher.
-        // Only entered when the daemon path didn't produce results.
-        if (!searchResult) {
-            vectorDb = new vector_db_1.VectorDB(paths.lancedbDir);
-            // Check for active indexing lock and warn if present
-            const locked = (0, lock_1.isLocked)(paths.dataDir);
-            if (!options.agent && locked) {
-                console.warn("⚠️  Warning: Indexing in progress... search results may be incomplete.");
-            }
-            // No daemon here, so no precise pending count — surface the coarse
-            // signal (active lock or initial index not yet complete) so agent mode
-            // still gets a partial-index footer.
-            if (!indexState && (locked || project.status === "pending")) {
-                indexState = { indexing: true, pendingFiles: 0 };
-            }
-            const hasRows = yield vectorDb.hasAnyRows();
-            const needsSync = options.sync || !hasRows;
-            if (needsSync) {
-                const isTTY = process.stdout.isTTY;
-                let abortController;
-                let signal;
-                if (!isTTY) {
-                    abortController = new AbortController();
-                    signal = abortController.signal;
-                    setTimeout(() => {
-                        abortController === null || abortController === void 0 ? void 0 : abortController.abort();
-                    }, 60000); // 60 seconds timeout for non-TTY auto-indexing
-                }
-                const { spinner, onProgress } = (0, sync_helpers_1.createIndexingSpinner)(projectRoot, options.sync ? "Indexing..." : "Indexing repository (first run)...");
-                try {
-                    yield (0, grammar_loader_1.ensureGrammars)(console.log, { silent: true });
-                    const result = yield (0, syncer_1.initialSync)({
-                        projectRoot,
-                        dryRun: options.dryRun,
-                        onProgress,
-                        signal,
-                    });
-                    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                        spinner.warn(`Indexing timed out (${result.processed}/${result.total}). Results may be partial.`);
-                    }
-                    if (options.dryRun) {
-                        spinner.succeed(`Dry run complete (${result.processed}/${result.total}) • would have indexed ${result.indexed}`);
-                        console.log((0, sync_helpers_1.formatDryRunSummary)(result, {
-                            actionDescription: "would have indexed",
-                            includeTotal: true,
-                        }));
-                        return;
-                    }
-                    yield vectorDb.createFTSIndex();
-                    // Update registry after sync
-                    const { readGlobalConfig } = yield Promise.resolve().then(() => __importStar(require("../lib/index/index-config")));
-                    const { registerProject } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/project-registry")));
-                    const gc = readGlobalConfig();
-                    registerProject({
-                        root: projectRoot,
-                        name: path.basename(projectRoot),
-                        vectorDim: gc.vectorDim,
-                        modelTier: gc.modelTier,
-                        embedMode: gc.embedMode,
-                        lastIndexed: new Date().toISOString(),
-                        chunkCount: result.indexed,
-                        status: "indexed",
-                    });
-                    const failedSuffix = result.failedFiles > 0 ? ` • ${result.failedFiles} failed` : "";
-                    spinner.succeed(`${options.sync ? "Indexing" : "Initial indexing"} complete (${result.processed}/${result.total}) • indexed ${result.indexed}${failedSuffix}`);
-                }
-                catch (e) {
-                    spinner.fail("Indexing failed");
-                    throw e;
-                }
-            }
-            // Ensure a watcher is running for live reindexing
-            if (!process.env.VITEST && !((_f = process.env.NODE_ENV) === null || _f === void 0 ? void 0 : _f.includes("test"))) {
-                const { launchWatcher } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/watcher-launcher")));
-                const launched = yield launchWatcher(projectRoot);
-                if (!launched.ok && launched.reason === "spawn-failed") {
-                    console.warn(`[search] ${launched.message}`);
-                }
-            }
-            const searcher = new searcher_1.Searcher(vectorDb);
-            searchResult = yield searcher.search(pattern, parseInt(options.m, 10), { rerank: process.env.GMAX_RERANK === "1", explain: options.explain, seeds }, Object.keys(searchFilters).length > 0
-                ? searchFilters
-                : undefined, pathFilter);
-        } // end if (!searchResult) — in-process fallback
-        if (!options.agent && ((_g = searchResult.warnings) === null || _g === void 0 ? void 0 : _g.length)) {
+        // Acquire results: daemon-mediated first, in-process fallback otherwise.
+        // The render stage below is shared across both. `runSearch` reports the
+        // VectorDB it opens via the callback so the `finally` can close it.
+        const acquired = yield (0, search_run_1.runSearch)({
+            pattern,
+            options,
+            projectRoot,
+            effectiveRoot,
+            paths,
+            projectStatus: project.status,
+            searchFilters,
+            pathFilter,
+            seeds,
+        });
+        vectorDb = acquired.vectorDb;
+        if (acquired.kind === "dry-run")
+            return;
+        const { searchResult, precomputedSkeletons, precomputedGraph, indexState } = acquired;
+        if (!options.agent && ((_e = searchResult.warnings) === null || _e === void 0 ? void 0 : _e.length)) {
             for (const w of searchResult.warnings) {
                 console.warn(`Warning: ${w}`);
             }
@@ -799,7 +393,7 @@ Examples:
                     return defs.some((d) => regex.test(d));
                 });
             }
-            catch (_q) {
+            catch (_o) {
                 // Invalid regex — skip
             }
         }
@@ -851,18 +445,19 @@ Examples:
                 if (options.agent) {
                     body = (0, agent_search_formatter_1.formatAgentSearchResults)(g.items, g.root, {
                         includeImports: options.imports,
+                        query: pattern,
                         getImportsForFile,
                         explain: options.explain,
                     });
                 }
                 else if (options.compact) {
-                    body = formatCompactTable(toCompactHits(g.items), g.root, pattern, {
+                    body = (0, compact_results_1.formatCompactTable)((0, compact_results_1.toCompactHits)(g.items), g.root, pattern, {
                         isTTY: !!isTTY,
                         plain: !!options.plain,
                     });
                 }
                 else if (shouldBePlain) {
-                    body = (0, formatter_1.formatTextResults)(toTextResults(g.items), pattern, g.root, {
+                    body = (0, formatter_1.formatTextResults)((0, compact_results_1.toTextResults)(g.items), pattern, g.root, {
                         isPlain: true,
                         compact: options.compact,
                         content: options.content,
@@ -894,6 +489,7 @@ Examples:
             else {
                 console.log((0, agent_search_formatter_1.formatAgentSearchResults)(filteredData, effectiveRoot, {
                     includeImports: options.imports,
+                    query: pattern,
                     getImportsForFile,
                     explain: options.explain,
                 }));
@@ -927,7 +523,7 @@ Examples:
                         }
                     }
                 }
-                catch (_r) { }
+                catch (_p) { }
             }
             // Partial-index footer last, so it's the final line the agent reads —
             // and emitted even on "(none)", where an empty result may just mean the
@@ -938,7 +534,7 @@ Examples:
             return;
         }
         if (options.skeleton) {
-            yield outputSkeletons(filteredData, projectRoot, parseInt(options.m, 10), vectorDb, precomputedSkeletons);
+            yield (0, search_skeletons_1.outputSkeletons)(filteredData, projectRoot, parseInt(options.m, 10), vectorDb, precomputedSkeletons);
             return;
         }
         if (!filteredData.length) {
@@ -948,8 +544,8 @@ Examples:
             return;
         }
         if (options.compact) {
-            const compactHits = toCompactHits(filteredData);
-            console.log(formatCompactTable(compactHits, projectRoot, pattern, {
+            const compactHits = (0, compact_results_1.toCompactHits)(filteredData);
+            console.log((0, compact_results_1.formatCompactTable)(compactHits, projectRoot, pattern, {
                 isTTY: !!process.stdout.isTTY,
                 plain: !!options.plain,
             }));
@@ -962,7 +558,7 @@ Examples:
             const { extractImportsFromContent } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/import-extractor")));
             const { packByBudget } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/budget-pack")));
             const budget = parseInt(options.budget, 10) || 8000;
-            console.log(resultCountHeader(filteredData, parseInt(options.m, 10)));
+            console.log((0, compact_results_1.resultCountHeader)(filteredData, parseInt(options.m, 10)));
             // Build every candidate blob up front (token cost needs the rendered
             // text), then pack to budget. Token-aware packing skips an oversized
             // chunk and keeps filling with smaller, still-relevant ones rather than
@@ -1018,14 +614,14 @@ Examples:
         const isTTY = process.stdout.isTTY;
         const shouldBePlain = options.plain || !isTTY;
         if (!options.agent && !options.compact) {
-            console.log(resultCountHeader(filteredData, parseInt(options.m, 10)));
+            console.log((0, compact_results_1.resultCountHeader)(filteredData, parseInt(options.m, 10)));
             console.log();
         }
         // Print imports per unique file before results when --imports is used
         if (options.imports) {
             const seenFiles = new Set();
             for (const r of filteredData) {
-                const absP = (_k = (_h = r.path) !== null && _h !== void 0 ? _h : (_j = r.metadata) === null || _j === void 0 ? void 0 : _j.path) !== null && _k !== void 0 ? _k : "";
+                const absP = (_h = (_f = r.path) !== null && _f !== void 0 ? _f : (_g = r.metadata) === null || _g === void 0 ? void 0 : _g.path) !== null && _h !== void 0 ? _h : "";
                 if (absP && !seenFiles.has(absP)) {
                     seenFiles.add(absP);
                     const imports = getImportsForFile(absP);
@@ -1039,7 +635,7 @@ Examples:
             }
         }
         if (shouldBePlain) {
-            const mappedResults = toTextResults(filteredData);
+            const mappedResults = (0, compact_results_1.toTextResults)(filteredData);
             const output = (0, formatter_1.formatTextResults)(mappedResults, pattern, projectRoot, {
                 isPlain: true,
                 compact: options.compact,
@@ -1052,7 +648,7 @@ Examples:
                 for (const r of filteredData) {
                     const b = r.scoreBreakdown;
                     if (b) {
-                        const absP = (_o = (_l = r.path) !== null && _l !== void 0 ? _l : (_m = r.metadata) === null || _m === void 0 ? void 0 : _m.path) !== null && _o !== void 0 ? _o : "";
+                        const absP = (_l = (_j = r.path) !== null && _j !== void 0 ? _j : (_k = r.metadata) === null || _k === void 0 ? void 0 : _k.path) !== null && _l !== void 0 ? _l : "";
                         const relPath = absP.startsWith(projectRoot)
                             ? absP.slice(projectRoot.length + 1)
                             : absP;
@@ -1114,7 +710,7 @@ Examples:
                     console.log(lines.join("\n"));
                 }
             }
-            catch (_s) {
+            catch (_q) {
                 // Trace failed — skip silently
             }
         }
@@ -1134,13 +730,13 @@ Examples:
                 source: "cli",
                 tool: "search",
                 query: pattern,
-                project: (_p = (0, project_root_1.findProjectRoot)(root)) !== null && _p !== void 0 ? _p : root,
+                project: (_m = (0, project_root_1.findProjectRoot)(root)) !== null && _m !== void 0 ? _m : root,
                 results: _searchResultCount,
                 ms: Date.now() - _searchStartMs,
                 error: _searchError,
             });
         }
-        catch (_t) { }
+        catch (_r) { }
         if (vectorDb) {
             try {
                 yield vectorDb.close();