@fresh-editor/fresh-editor 0.3.8 → 0.3.9

package/plugins/live_grep.ts

@@ -32,17 +32,28 @@
  */
 
 import { Finder, parseGrepOutput } from "./lib/finder.ts";
+import { button, col, raw, row, spacer, styledRow, toggle, wrappingRow } from "./lib/widgets.ts";
 
 const editor = getEditor();
 
+/** The data sources Universal Search can look in. `files` is the
+ *  classic project-file grep; the others are opt-in scopes layered on
+ *  top. Each enabled scope contributes tagged matches to one merged
+ *  result list. See `docs/internal/global-search-ux.md`. */
+type ScopeId = "files" | "ignored" | "buffers" | "terminals" | "diagnostics";
+
 // One Live Grep match. Mirrors the JSON shape ripgrep emits with
 // `--line-number --column --no-heading`; built-in non-rg providers
 // (git grep, grep) normalise to this shape via parseGrepOutput.
+// `source` tags which scope produced the match so the result row can
+// show a badge and (later) pick a scope-appropriate open action.
+// Undefined means the classic file source (`files`).
 interface GrepMatch {
   file: string;
   line: number;
   column: number;
   content: string;
+  source?: ScopeId;
 }
 
 /** Options passed to a provider's `search` callback. */
@@ -53,6 +64,19 @@ export interface SearchOpts {
    *  Returning more is allowed; the Finder caps at its own
    *  `maxResults`. */
   maxResults: number;
+  /** When true, the "Ignored & hidden" scope is on: providers should
+   *  also search `.gitignore`d / hidden files. Built-in `rg` and
+   *  `git-grep` honour this; other built-ins (ag/ack/grep) currently
+   *  ignore it and always search their default set. */
+  includeIgnored?: boolean;
+  /** When true, match whole words only (rg `-w`, git-grep/grep `-w`).
+   *  Providers should add the appropriate flag. */
+  wholeWord?: boolean;
+  /** When true (the default), the query is a regular expression; when
+   *  false, it's a literal/fixed string the provider must escape (rg
+   *  `-F`, git-grep/grep `-F`). Custom providers should honour this so
+   *  the query is interpreted consistently with the toolbar toggle. */
+  regex?: boolean;
 }
 
 /** A registered Live Grep backend. */
@@ -104,6 +128,129 @@ declare global {
 // stream the entire codebase into the overlay.
 const MAX_RESULTS = 1000;
 
+// ── Scopes (Universal Search) ─────────────────────────────────────
+//
+// Live Grep is growing into a one-stop search: the user toggles which
+// data sources to look in from the overlay toolbar. `files` is the
+// classic project grep; `ignored`, `buffers`, `diagnostics` layer on
+// top. Toggles are wired through prompt-context keybindings (Alt+…)
+// that resolve to the plugin handlers registered below — no core
+// Action is required (the host dispatches unknown action names as
+// plugin actions). See `docs/internal/global-search-ux.md`.
+
+interface ScopeDef {
+  id: ScopeId;
+  /** i18n key for the toolbar label. */
+  labelKey: string;
+  /** Plugin action / handler name a keybinding resolves to. */
+  action: string;
+  /** Short badge shown on a result row from this scope (omitted for
+   *  `files`, whose rows are the unprefixed default). */
+  badge?: string;
+}
+
+const SCOPES: ScopeDef[] = [
+  { id: "files", labelKey: "scope.files", action: "live_grep_toggle_files" },
+  { id: "ignored", labelKey: "scope.ignored", action: "live_grep_toggle_ignored", badge: "ign" },
+  { id: "buffers", labelKey: "scope.buffers", action: "live_grep_toggle_buffers", badge: "buf" },
+  { id: "terminals", labelKey: "scope.terminals", action: "live_grep_toggle_terminals", badge: "term" },
+  { id: "diagnostics", labelKey: "scope.diagnostics", action: "live_grep_toggle_diagnostics", badge: "diag" },
+];
+
+// Default scope set: same as the classic Live Grep, *minus* ignored
+// files (off — they were noisy) and *plus* unsaved open buffers and
+// terminal scrollback (on). `files` on, `ignored` off, `buffers` on,
+// `terminals` on, `diagnostics` off.
+const scopeEnabled: Record<ScopeId, boolean> = {
+  files: true,
+  ignored: false,
+  buffers: true,
+  terminals: true,
+  diagnostics: false,
+};
+
+// True only while our floating overlay is open. The scope-toggle
+// keybindings live in the shared `prompt` context, so they can fire
+// inside *any* prompt; the handlers no-op unless our overlay owns the
+// screen.
+let overlayActive = false;
+
+// The most recent query, so Resume can re-open the *same* flow with it
+// pre-filled (rather than a bespoke cached-results overlay).
+let lastQuery = "";
+
+// ── Search modes ──────────────────────────────────────────────────
+//
+// Separate from *where* we search (scopes): these control *how* the
+// query is interpreted, and are threaded to every provider (and the
+// JS-side scopes) so each can escape/format it correctly. `regex` is
+// on by default (matches the historical rg/git-grep behaviour);
+// `wholeWord` is off.
+type ModeId = "word" | "regex";
+
+interface ModeDef {
+  id: ModeId;
+  /** Stable widget key for the toolbar toggle. */
+  key: string;
+  /** i18n key for the toggle label. */
+  labelKey: string;
+  /** Plugin action a keybinding resolves to (drives the inline accelerator
+   *  and the Alt+… shortcut, like the scope toggles). */
+  action: string;
+}
+
+const MODES: ModeDef[] = [
+  { id: "word", key: "mode_word", labelKey: "mode.word", action: "live_grep_toggle_word" },
+  { id: "regex", key: "mode_regex", labelKey: "mode.regex", action: "live_grep_toggle_regex" },
+];
+
+const searchModes: Record<ModeId, boolean> = {
+  word: false,
+  regex: true,
+};
+
+/** A compiled matcher for the JS-side scopes (buffers, diagnostics).
+ *  Returns the 1-based column of the first match on a line, or -1. */
+type LineMatcher = (line: string) => number;
+
+/** Build a line matcher honouring the current `searchModes`. Smart-case:
+ *  case-insensitive unless the query has an uppercase letter. An invalid
+ *  regex matches nothing (the provider scopes surface the rg/grep error;
+ *  the JS scopes just contribute no rows). */
+function buildLineMatcher(query: string): LineMatcher {
+  const smartCaseInsensitive = query === query.toLowerCase();
+  if (searchModes.regex) {
+    const flags = smartCaseInsensitive ? "i" : "";
+    const pattern = searchModes.word ? `\\b(?:${query})\\b` : query;
+    let re: RegExp;
+    try {
+      re = new RegExp(pattern, flags);
+    } catch {
+      return () => -1;
+    }
+    return (line) => {
+      const m = re.exec(line);
+      return m ? m.index + 1 : -1;
+    };
+  }
+  // Literal (fixed-string) matching.
+  const needle = smartCaseInsensitive ? query.toLowerCase() : query;
+  const isWord = (ch: string) => /[A-Za-z0-9_]/.test(ch);
+  return (line) => {
+    const hay = smartCaseInsensitive ? line.toLowerCase() : line;
+    let from = 0;
+    for (;;) {
+      const idx = hay.indexOf(needle, from);
+      if (idx < 0) return -1;
+      if (!searchModes.word) return idx + 1;
+      const before = idx > 0 ? hay[idx - 1] : "";
+      const after = idx + needle.length < hay.length ? hay[idx + needle.length] : "";
+      if (!isWord(before) && !isWord(after)) return idx + 1;
+      from = idx + 1;
+    }
+  };
+}
+
 // ── Registry ──────────────────────────────────────────────────────
 
 const providers: LiveGrepProvider[] = [];
@@ -154,58 +301,101 @@ function unregisterProvider(name: string): boolean {
   return removed;
 }
 
-function updateOverlayTitle(provider: LiveGrepProvider | null): void {
-  // The input row's prefix already says "Live grep: …", so the
-  // frame title doesn't repeat the feature name — it's reserved
-  // for the active provider plus shortcut hints. Shortcuts come
-  // from the keybinding registry (not hardcoded) so labels match
-  // the user's actual binds. Each segment carries its own theme
-  // key (`ui.help_key_fg` for keys, `ui.popup_border_fg` for
-  // separators) so the renderer doesn't have to parse the title.
-  // `resume_live_grep` is intentionally NOT shown here — it only
-  // matters once the prompt is closed; it's surfaced in the
-  // status bar at that point instead.
-  const sepStyle = { fg: "ui.popup_border_fg" };
+// Build the scope toolbar as real `Toggle` widgets (themed + clickable),
+// each keyed to the plugin action it fires on click — the host maps a click
+// straight to that action, the same one the Alt+… binding triggers. The
+// per-control accelerator (`⌥L` etc.) is rendered right after its toggle in
+// the keybinding-hint colour, so the affordance sits at the control rather
+// than in a footer list.
+function buildToolbarSpec(provider: LiveGrepProvider | null): WidgetSpec {
+  // Three stacked rows: the search *sources* ("Search in: …"), the search
+  // *modes* ("Match: …"), and a *meta* row (active provider, match-count,
+  // provider-cycle / save hints). Each toggle is a nested non-wrapping row —
+  // an atomic group of `toggle + accelerator` — so the wrapping parent never
+  // splits a label from its `Alt+…` hint across lines.
+  const prefix = (text: string): WidgetSpec =>
+    raw([styledRow([{ text, style: { fg: "ui.popup_border_fg" } }])]);
+
+  const sources: WidgetSpec[] = [spacer(1), prefix(editor.t("label.search_in"))];
+  SCOPES.forEach((s) => {
+    sources.push(spacer(2));
+    const parts: WidgetSpec[] = [
+      toggle(scopeEnabled[s.id], editor.t(s.labelKey), { key: s.id }),
+    ];
+    const accel = editor.getKeybindingLabel(s.action, "prompt");
+    if (accel) {
+      parts.push(raw([styledRow([{ text: ` ${accel}`, style: { fg: "ui.help_key_fg" } }])]));
+    }
+    sources.push(row(...parts));
+  });
+
+  const modes: WidgetSpec[] = [spacer(1), prefix(editor.t("label.match"))];
+  MODES.forEach((m) => {
+    modes.push(spacer(2));
+    const parts: WidgetSpec[] = [
+      toggle(searchModes[m.id], editor.t(m.labelKey), { key: m.key }),
+    ];
+    const accel = editor.getKeybindingLabel(m.action, "prompt");
+    if (accel) {
+      parts.push(raw([styledRow([{ text: ` ${accel}`, style: { fg: "ui.help_key_fg" } }])]));
+    }
+    modes.push(row(...parts));
+  });
+
+  const rows: WidgetSpec[] = [wrappingRow(...sources), wrappingRow(...modes)];
+  const metaRow = buildMetaRow(provider);
+  if (metaRow) rows.push(metaRow);
+  return col(...rows);
+}
+
+// Meta row (beneath the toggles): the active provider as a focusable/clickable
+// button (cycles backends) with its Alt+P accelerator inline, plus the
+// truncation indicator and the save-matches hint as text. Returns null when
+// there's nothing to show.
+function buildMetaRow(provider: LiveGrepProvider | null): WidgetSpec | null {
   const hintStyle = { fg: "ui.help_key_fg" };
-  const segments: StyledText[] = [];
-  const pushSegment = (parts: StyledText[]) => {
-    if (segments.length > 0) {
-      segments.push({ text: " · ", style: sepStyle });
+  const sepStyle = { fg: "ui.popup_border_fg" };
+  const parts: WidgetSpec[] = [];
+
+  // Provider button — only when a file-backed scope is on (irrelevant when
+  // searching only buffers/terminals/diagnostics). The button is keyed
+  // "provider"; activating it (click / Space / Alt+P) cycles the backend.
+  if (provider && (scopeEnabled.files || scopeEnabled.ignored)) {
+    parts.push(raw([styledRow([{ text: "Provider: ", style: sepStyle }])]));
+    parts.push(button(provider.name, { key: "provider" }));
+    const pAccel = editor.getKeybindingLabel("cycle_live_grep_provider", "prompt");
+    if (pAccel) {
+      parts.push(raw([styledRow([{ text: ` ${pAccel}`, style: hintStyle }])]));
     }
-    segments.push(...parts);
-  };
-  if (provider) {
-    pushSegment([
-      { text: "Provider: " },
-      { text: provider.name, style: { bold: true } },
-    ]);
   }
-  // Match-count indicator goes BEFORE the keybinding hints so a
-  // narrow terminal that truncates the toolbar still shows it —
-  // the trailing hints are easier to lose than the result-set
-  // status.
+
+  // Trailing text: truncation indicator + save-matches hint.
+  const tail: StyledText[] = [];
   if (lastSearchTruncated) {
-    pushSegment([{ text: `${MAX_RESULTS}+ matches` }]);
+    tail.push({ text: `${MAX_RESULTS}+ matches` });
   }
-  const pushHint = (key: string | null, label: string) => {
-    if (!key) return;
-    pushSegment([
-      { text: key, style: hintStyle },
-      { text: ` ${label}` },
-    ]);
-  };
-  pushHint(
-    editor.getKeybindingLabel("cycle_live_grep_provider", "prompt"),
-    "switch grep provider"
-  );
-  pushHint(
-    editor.getKeybindingLabel("live_grep_export_quickfix", "prompt"),
-    "save matches"
-  );
-  if (segments.length > 0) {
-    segments.push({ text: " " });
+  const saveKey = editor.getKeybindingLabel("live_grep_export_quickfix", "prompt");
+  if (saveKey) {
+    if (tail.length > 0) tail.push({ text: " · ", style: sepStyle });
+    tail.push({ text: saveKey, style: hintStyle }, { text: " save matches" });
   }
-  editor.setPromptTitle(segments);
+  if (tail.length > 0) {
+    if (parts.length > 0) tail.unshift({ text: " · ", style: sepStyle });
+    parts.push(raw([styledRow(tail)]));
+  }
+
+  return parts.length > 0 ? row(...parts) : null;
+}
+
+// Refresh the overlay chrome: the scope toolbar (header band) and the footer
+// hints. Name kept as `updateOverlayTitle` for its many call sites; it no
+// longer sets a styled-text title — the widget toolbar replaces it.
+function updateOverlayTitle(provider: LiveGrepProvider | null): void {
+  // The provider/meta line lives in the header band (third toolbar row). The
+  // footer is left for the Finder's search-status line ("Searching…",
+  // "Found N matches", …), which is shown inside the overlay rather than the
+  // easy-to-miss editor status bar — so don't touch it here.
+  editor.setPromptToolbar(buildToolbarSpec(provider));
 }
 
 async function selectProvider(): Promise<LiveGrepProvider | null> {
@@ -244,25 +434,31 @@ registerProvider({
       return false;
     }
   },
-  search: async (query, { cwd, maxResults }) => {
-    const r = await editor.spawnProcess(
-      "rg",
-      [
-        "--line-number",
-        "--column",
-        "--no-heading",
-        "--color=never",
-        "--smart-case",
-        `--max-count=${maxResults}`,
-        "-g", "!.git",
-        "-g", "!node_modules",
-        "-g", "!target",
-        "-g", "!*.lock",
-        "--",
-        query,
-      ],
-      cwd
-    );
+  search: async (query, { cwd, maxResults, includeIgnored, wholeWord, regex }) => {
+    const args = [
+      "--line-number",
+      "--column",
+      "--no-heading",
+      "--color=never",
+      "--smart-case",
+      `--max-count=${maxResults}`,
+      // Always skip the VCS metadata dir — even with the Ignored scope
+      // on, `.git` internals are never what the user is looking for.
+      "-g", "!.git",
+    ];
+    if (regex === false) args.push("--fixed-strings");
+    if (wholeWord) args.push("--word-regexp");
+    if (includeIgnored) {
+      // Search ignored *and* hidden files (dotfiles). `.git` stays
+      // excluded via the glob above.
+      args.push("--no-ignore", "--hidden");
+    } else {
+      // Default: respect ignore files, plus prune the usual heavy
+      // build/vendor dirs and lockfiles that bury real hits.
+      args.push("-g", "!node_modules", "-g", "!target", "-g", "!*.lock");
+    }
+    args.push("--", query);
+    const r = await editor.spawnProcess("rg", args, cwd);
     if (r.exit_code === 0) {
       return parseGrepOutput(r.stdout, maxResults, (msg) => editor.debug(msg)) as GrepMatch[];
     }
@@ -281,24 +477,22 @@ registerProvider({
       return false;
     }
   },
-  search: async (query, { cwd, maxResults }) => {
-    const r = await editor.spawnProcess(
-      "ag",
-      [
-        "--column",
-        "--numbers",
-        "--nogroup",
-        "--nocolor",
-        "--smart-case",
-        "--ignore", ".git",
-        "--ignore", "node_modules",
-        "--ignore", "target",
-        "--ignore", "*.lock",
-        "--",
-        query,
-      ],
-      cwd
-    );
+  search: async (query, { cwd, maxResults, wholeWord, regex }) => {
+    const args = [
+      "--column",
+      "--numbers",
+      "--nogroup",
+      "--nocolor",
+      "--smart-case",
+      "--ignore", ".git",
+      "--ignore", "node_modules",
+      "--ignore", "target",
+      "--ignore", "*.lock",
+    ];
+    if (regex === false) args.push("--literal");
+    if (wholeWord) args.push("--word-regexp");
+    args.push("--", query);
+    const r = await editor.spawnProcess("ag", args, cwd);
     if (r.exit_code === 0 || r.exit_code === 1) {
       return parseGrepOutput(r.stdout, maxResults, (msg) => editor.debug(msg)) as GrepMatch[];
     }
@@ -329,12 +523,20 @@ registerProvider({
       return false;
     }
   },
-  search: async (query, { cwd, maxResults }) => {
-    const r = await editor.spawnProcess(
-      "git",
-      ["grep", "-n", "--column", "-I", "-e", query],
-      cwd
-    );
+  search: async (query, { cwd, maxResults, includeIgnored, wholeWord, regex }) => {
+    const args = ["grep", "-n", "--column", "-I"];
+    // Default git-grep is basic regex; use extended when regex is on, or
+    // fixed-strings when it's off so the query is matched literally.
+    args.push(regex === false ? "-F" : "-E");
+    if (wholeWord) args.push("-w");
+    if (includeIgnored) {
+      // Widen beyond tracked files: include untracked, and stop
+      // honouring the standard ignore files so `.gitignore`d content
+      // is searched too.
+      args.push("--untracked", "--no-exclude-standard");
+    }
+    args.push("-e", query);
+    const r = await editor.spawnProcess("git", args, cwd);
     // git grep exits 1 when no matches — treat as empty, not error.
     if (r.exit_code === 0 || r.exit_code === 1) {
       return parseGrepOutput(r.stdout, maxResults, (msg) => editor.debug(msg)) as GrepMatch[];
@@ -357,18 +559,12 @@ registerProvider({
       return false;
     }
   },
-  search: async (query, { cwd, maxResults }) => {
-    const r = await editor.spawnProcess(
-      "ack",
-      [
-        "--nocolor",
-        "--column",
-        "--smart-case",
-        "--",
-        query,
-      ],
-      cwd
-    );
+  search: async (query, { cwd, maxResults, wholeWord, regex }) => {
+    const args = ["--nocolor", "--column", "--smart-case"];
+    if (regex === false) args.push("--literal");
+    if (wholeWord) args.push("--word-regexp");
+    args.push("--", query);
+    const r = await editor.spawnProcess("ack", args, cwd);
     if (r.exit_code === 0 || r.exit_code === 1) {
       return parseGrepOutput(r.stdout, maxResults, (msg) => editor.debug(msg)) as GrepMatch[];
     }
@@ -397,21 +593,18 @@ registerProvider({
       return false;
     }
   },
-  search: async (query, { cwd, maxResults }) => {
-    const r = await editor.spawnProcess(
-      "grep",
-      [
-        "-rn",
-        "-I",
-        "--exclude-dir=.git",
-        "--exclude-dir=node_modules",
-        "--exclude-dir=target",
-        "--",
-        query,
-        ".",
-      ],
-      cwd
-    );
+  search: async (query, { cwd, maxResults, wholeWord, regex }) => {
+    const args = [
+      "-rn",
+      "-I",
+      "--exclude-dir=.git",
+      "--exclude-dir=node_modules",
+      "--exclude-dir=target",
+    ];
+    args.push(regex === false ? "-F" : "-E");
+    if (wholeWord) args.push("-w");
+    args.push("--", query, ".");
+    const r = await editor.spawnProcess("grep", args, cwd);
     if (r.exit_code === 0 || r.exit_code === 1) {
       // grep emits `path:line:content` (no column). parseGrepOutput's
       // 3-field fallback handles the missing column (defaults to 1).
@@ -423,10 +616,16 @@ registerProvider({
 
 // ── Wiring ──────────────────────────────────────────────────────
 
+function badgeFor(source: ScopeId | undefined): string {
+  if (!source || source === "files") return "";
+  const def = SCOPES.find((s) => s.id === source);
+  return def?.badge ? `[${def.badge}] ` : "";
+}
+
 const finder = new Finder<GrepMatch>(editor, {
   id: "live-grep",
   format: (match) => ({
-    label: `${match.file}:${match.line}`,
+    label: `${badgeFor(match.source)}${match.file}:${match.line}`,
     description:
       match.content.length > 60
         ? match.content.substring(0, 57).trim() + "..."
@@ -437,6 +636,9 @@ const finder = new Finder<GrepMatch>(editor, {
       column: match.column,
     },
   }),
+  onClose: () => {
+    overlayActive = false;
+  },
   // Override the Finder's default "open file + status: Opened X"
   // so we can surface the resume shortcut here. The shortcut is
   // hidden inside the overlay (it can't apply while the overlay
@@ -531,41 +733,272 @@ editor.registerCommand(
   null
 );
 
-async function search(query: string): Promise<GrepMatch[]> {
-  const provider = await selectProvider();
-  if (!provider) {
-    // Throw rather than return [] — the Finder catches and shows
-    // the message inside the overlay. Returning [] would be
-    // indistinguishable from a real "no matches" result.
-    throw new Error(
-      "no search backend available — install ripgrep, or register a provider via init.ts (`editor.getPluginApi(\"live-grep\")?.registerProvider(...)`)."
-    );
+// Don't pull whole multi-MB buffers across the FFI boundary to grep
+// them line-by-line in JS — cap at a sane size and skip the rest.
+const MAX_BUFFER_SCAN_BYTES = 2_000_000;
+
+// Strip ANSI escape sequences so terminal scrollback (stored with
+// colour codes in the backing file) shows as plain text in results.
+function stripAnsi(s: string): string {
+  return s
+    // CSI … final byte (colours, cursor moves, etc.)
+    .replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "")
+    // OSC … terminated by BEL or ST
+    .replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, "")
+    // Remaining two-byte escapes
+    .replace(/\x1b[@-Z\\-_]/g, "");
+}
+
+/** Search terminal scrollback. Terminal backing files live under the
+ *  current working directory's terminal subdir
+ *  (`getTerminalDir()` → `<data_dir>/terminals/<encoded-cwd>/`) — open
+ *  terminals stream their scrollback there live, and closed terminals
+ *  are retained there too (renamed `*-closed-*.txt`). Scoping to that
+ *  subdir keeps the search to *this* project / worktree. We grep it
+ *  with rg (falling back to grep), then strip ANSI for display.
+ *  Opening a hit opens the backing file at the matched line. */
+async function searchTerminals(query: string, limit: number): Promise<GrepMatch[]> {
+  if (limit <= 0) return [];
+  const dir = editor.getTerminalDir();
+  const cwd = editor.getCwd();
+  let raw: GrepMatch[] = [];
+  try {
+    const rgArgs = [
+      "--line-number", "--column", "--no-heading", "--color=never",
+      "--smart-case", "--text", `--max-count=${limit}`,
+      // Only the rendered `.txt` backing files — not the raw `.log`
+      // replay logs, which would double every hit.
+      "-g", "*.txt",
+    ];
+    if (searchModes.regex === false) rgArgs.push("--fixed-strings");
+    if (searchModes.word) rgArgs.push("--word-regexp");
+    rgArgs.push("--", query, dir);
+    const r = await editor.spawnProcess("rg", rgArgs, cwd);
+    if (r.exit_code === 0) {
+      raw = parseGrepOutput(r.stdout, limit, (m) => editor.debug(m)) as GrepMatch[];
+    } else if (r.exit_code !== 1) {
+      // rg missing or path error → fall back to grep (-a: treat the
+      // ANSI-laden logs as text rather than skipping them as binary).
+      const gArgs = ["-rn", "-a", "--include=*.txt"];
+      gArgs.push(searchModes.regex === false ? "-F" : "-E");
+      if (searchModes.word) gArgs.push("-w");
+      gArgs.push("--", query, dir);
+      const g = await editor.spawnProcess("grep", gArgs, cwd);
+      if (g.exit_code === 0) {
+        raw = parseGrepOutput(g.stdout, limit, (m) => editor.debug(m)) as GrepMatch[];
+      }
+    }
+  } catch (e) {
+    editor.debug(`[live_grep:terminals] ${e}`);
   }
-  const wasTruncated = lastSearchTruncated;
+  return raw.slice(0, limit).map((m) => ({
+    ...m,
+    source: "terminals" as const,
+    content: stripAnsi(m.content),
+  }));
+}
+
+/** Search the text of currently-open, modified file buffers.
+ *  Scoped to *modified* buffers on purpose: unmodified buffers are
+ *  already covered by the on-disk file scan, so this surfaces exactly
+ *  the unsaved edits a disk grep would miss, without double-reporting. */
+async function searchOpenBuffers(
+  query: string,
+  limit: number,
+  includeUnmodified: boolean,
+): Promise<GrepMatch[]> {
+  if (limit <= 0) return [];
+  const out: GrepMatch[] = [];
+  const matchCol = buildLineMatcher(query);
+  for (const b of editor.listBuffers()) {
+    if (out.length >= limit) break;
+    // Virtual buffers (terminals, panels) and bufferless/unnamed buffers
+    // have no on-disk file to navigate to. When the file scan is also
+    // running, restrict to *modified* buffers so saved buffers aren't
+    // double-reported (the disk grep already covers them); when buffers is
+    // the only file-backed scope, search every open buffer so the user
+    // actually finds matches.
+    if (b.is_virtual || !b.path) continue;
+    if (!includeUnmodified && !b.modified) continue;
+    if (b.length > MAX_BUFFER_SCAN_BYTES) continue;
+    let text: string;
+    try {
+      text = await editor.getBufferText(b.id, 0, b.length);
+    } catch {
+      continue;
+    }
+    const lines = text.split("\n");
+    for (let i = 0; i < lines.length && out.length < limit; i++) {
+      const col = matchCol(lines[i]);
+      if (col > 0) {
+        out.push({ file: b.path, line: i + 1, column: col, content: lines[i], source: "buffers" });
+      }
+    }
+  }
+  return out;
+}
+
+function severityLabel(sev: number | null | undefined): string {
+  switch (sev) {
+    case 1: return "error";
+    case 2: return "warning";
+    case 3: return "info";
+    case 4: return "hint";
+    default: return "diagnostic";
+  }
+}
+
+/** Search active LSP diagnostics by message text. Matches jump to the
+ *  diagnostic's range like any other location. */
+function searchDiagnostics(query: string, limit: number): GrepMatch[] {
+  if (limit <= 0) return [];
+  const out: GrepMatch[] = [];
+  const matchCol = buildLineMatcher(query);
+  for (const d of editor.getAllDiagnostics()) {
+    if (out.length >= limit) break;
+    if (matchCol(d.message) <= 0) continue;
+    const file = d.uri.startsWith("file://") ? decodeURIComponent(d.uri.slice("file://".length)) : d.uri;
+    out.push({
+      file,
+      line: (d.range?.start?.line ?? 0) + 1,
+      column: (d.range?.start?.character ?? 0) + 1,
+      content: `${severityLabel(d.severity)}: ${d.message}`,
+      source: "diagnostics",
+    });
+  }
+  return out;
+}
+
+// Run the project-file grep for the enabled file-backed scopes
+// (`files` / `ignored`). Returns null when no provider is available so
+// the caller can decide whether that's fatal (no other scope on) or
+// merely a skipped source.
+async function searchFiles(query: string): Promise<GrepMatch[] | null> {
+  const provider = await selectProvider();
+  if (!provider) return null;
   try {
     const results = await provider.search(query, {
       cwd: editor.getCwd(),
       maxResults: MAX_RESULTS,
+      includeIgnored: scopeEnabled.ignored,
+      wholeWord: searchModes.word,
+      regex: searchModes.regex,
     });
-    lastSearchTruncated = results.length >= MAX_RESULTS;
-    // Refresh the toolbar whenever the truncation indicator
-    // changes so it appears (or disappears) alongside the new
-    // results in the same render.
-    if (lastSearchTruncated !== wasTruncated) {
-      updateOverlayTitle(provider);
-    }
-    return results;
+    return results.map((m) => ({ ...m, source: "files" as const }));
   } catch (e) {
-    // Log to tracing for diagnostics, then re-throw so the Finder
-    // surfaces the failure in the overlay itself.
     editor.error(`[live_grep:${provider.name}] ${e}`);
-    throw new Error(
-      `${provider.name}: ${e instanceof Error ? e.message : String(e)}`
-    );
+    throw new Error(`${provider.name}: ${e instanceof Error ? e.message : String(e)}`);
   }
 }
 
-function start_live_grep(): void {
+// Fan the query out across every enabled scope and merge into one
+// capped, tagged result list. Order is files → buffers → diagnostics
+// so the most common hits lead.
+async function search(query: string): Promise<GrepMatch[]> {
+  lastQuery = query;
+  const wasTruncated = lastSearchTruncated;
+  const results: GrepMatch[] = [];
+  const remaining = () => MAX_RESULTS - results.length;
+
+  if (scopeEnabled.files || scopeEnabled.ignored) {
+    const fileMatches = await searchFiles(query);
+    if (fileMatches === null) {
+      // No grep backend. Only fatal if there's nothing else to search.
+      if (!scopeEnabled.buffers && !scopeEnabled.diagnostics) {
+        throw new Error(
+          "no search backend available — install ripgrep, or register a provider via init.ts (`editor.getPluginApi(\"live-grep\")?.registerProvider(...)`)."
+        );
+      }
+    } else {
+      for (const m of fileMatches) {
+        if (results.length >= MAX_RESULTS) break;
+        results.push(m);
+      }
+    }
+  }
+
+  if (scopeEnabled.buffers && remaining() > 0) {
+    const filesActive = scopeEnabled.files || scopeEnabled.ignored;
+    results.push(...await searchOpenBuffers(query, remaining(), !filesActive));
+  }
+
+  if (scopeEnabled.terminals && remaining() > 0) {
+    results.push(...await searchTerminals(query, remaining()));
+  }
+
+  if (scopeEnabled.diagnostics && remaining() > 0) {
+    results.push(...searchDiagnostics(query, remaining()));
+  }
+
+  lastSearchTruncated = results.length >= MAX_RESULTS;
+  // Refresh the toolbar whenever the truncation indicator changes so
+  // it appears (or disappears) alongside the new results.
+  if (lastSearchTruncated !== wasTruncated) {
+    updateOverlayTitle(cachedSelected ?? null);
+  }
+  return results;
+}
+
+// Scope/mode toggling is host-owned: the host flips the toggle's checked
+// state (on click, Space on the focused toggle, or the Alt+… shortcuts) and
+// emits a `widget_event`; we react here by syncing the scope/mode set,
+// refreshing the meta row, and re-running the search.
+editor.on("widget_event", (args) => {
+  if (!overlayActive) return;
+  // The provider button (click / Space / Alt+P) cycles the search backend.
+  if (args.event_type === "activate" && args.widget_key === "provider") {
+    void cycleProvider();
+    return;
+  }
+  if (args.event_type !== "toggle") return;
+  const payload = args.payload as { checked?: boolean } | undefined;
+  const scope = SCOPES.find((s) => s.id === args.widget_key);
+  const mode = MODES.find((m) => m.key === args.widget_key);
+  let label: string;
+  let on: boolean;
+  if (scope) {
+    on = payload?.checked ?? !scopeEnabled[scope.id];
+    scopeEnabled[scope.id] = on;
+    label = editor.t(scope.labelKey);
+  } else if (mode) {
+    on = payload?.checked ?? !searchModes[mode.id];
+    searchModes[mode.id] = on;
+    label = editor.t(mode.labelKey);
+  } else {
+    return;
+  }
+  // Rebuild the toolbar so the meta row's provider line tracks the file
+  // scopes. The host already flipped the toggle visual, but scopeEnabled/
+  // searchModes were just synced above, so the rebuilt spec keeps the same
+  // checked state (and toolbar_focus persists across setPromptToolbar).
+  updateOverlayTitle(cachedSelected ?? null);
+  void finder.refresh();
+  editor.setStatus(`Search: ${label} ${on ? "on" : "off"}`);
+});
+
+// The per-toggle Alt+… shortcuts (and palette entries) just route through the
+// host toggle path, so click / Space / shortcut all converge on the same
+// widget_event above. The action's keybinding label is what the toolbar
+// shows as each toggle's inline accelerator. Sources are keyed by scope id;
+// modes by their widget key.
+for (const s of SCOPES) {
+  registerHandler(s.action, () => {
+    editor.toggleOverlayToolbarWidget(s.id);
+  });
+  editor.registerCommand(`%cmd.${s.action}`, `%cmd.${s.action}_desc`, s.action, null);
+}
+for (const m of MODES) {
+  registerHandler(m.action, () => {
+    editor.toggleOverlayToolbarWidget(m.key);
+  });
+  editor.registerCommand(`%cmd.${m.action}`, `%cmd.${m.action}_desc`, m.action, null);
+}
+
+// Shared open flow for both fresh start and resume. `initialQuery`
+// pre-fills the input (Resume passes the last query) — Resume is just the
+// same flow with prepopulated data, no bespoke overlay.
+function openLiveGrep(initialQuery: string): void {
+  overlayActive = true;
   finder.prompt({
     title: editor.t("prompt.live_grep"),
     source: {
@@ -575,6 +1008,7 @@ function start_live_grep(): void {
       minQueryLength: 2,
     },
     floatingOverlay: true,
+    ...(initialQuery ? { initialQuery } : {}),
   });
   // Pre-populate the overlay's frame title with the cached
   // provider name (if any) before the user types — avoids the
@@ -589,8 +1023,29 @@ function start_live_grep(): void {
     void selectProvider();
   }
 }
+
+function start_live_grep(): void {
+  openLiveGrep("");
+}
 registerHandler("start_live_grep", start_live_grep);
 
+// Resume: identical flow, just seeded with the last query so the user
+// picks up where they left off — same overlay, same toolbar, same scopes.
+function resume_live_grep(): void {
+  openLiveGrep(lastQuery);
+}
+registerHandler("resume_live_grep", resume_live_grep);
+// Register the action→plugin-context mapping so the core `resume_live_grep`
+// action (Alt+R / the built-in "Resume Live Grep" palette command) resolves
+// to this handler. A never-activated custom context keeps it out of the
+// palette so it doesn't duplicate the core entry.
+editor.registerCommand(
+  "Live Grep: Resume (internal)",
+  "",
+  "resume_live_grep",
+  "live-grep-internal"
+);
+
 editor.registerCommand(
   "%cmd.live_grep",
   "%cmd.live_grep_desc",