@youtyan/code-viewer 0.14.0 → 0.15.0

package/web/app.js

@@ -835,6 +835,281 @@ Details: ${JSON.stringify(output)}` : "";
     applyTrailingResult
   };
 
+  // web-src/core/fuzzy-search.ts
+  function basenameStart(path) {
+    const slash = path.lastIndexOf("/");
+    return slash < 0 ? 0 : slash + 1;
+  }
+  function isBoundary(path, index) {
+    if (index <= 0) return true;
+    const prev = path[index - 1];
+    return prev === "/" || prev === "-" || prev === "_" || prev === "." || prev === " ";
+  }
+  function toRanges(indices) {
+    const ranges = [];
+    for (const index of indices) {
+      const last = ranges[ranges.length - 1];
+      if (last && last.end === index) {
+        last.end = index + 1;
+      } else {
+        ranges.push({ start: index, end: index + 1 });
+      }
+    }
+    return ranges;
+  }
+  function basenameMatchTier(loweredQuery, loweredBasename) {
+    if (loweredBasename === loweredQuery) return 4;
+    if (loweredBasename.startsWith(`${loweredQuery}.`)) return 3;
+    if (loweredBasename.startsWith(loweredQuery)) return 2;
+    if (loweredBasename.includes(loweredQuery)) return 1;
+    return 0;
+  }
+  function pathMatchTier(loweredQuery, loweredPath, loweredBasename) {
+    if (loweredQuery.includes("/") && (loweredPath === loweredQuery || loweredPath.endsWith(`/${loweredQuery}`)))
+      return 4;
+    return basenameMatchTier(loweredQuery, loweredBasename);
+  }
+  function contiguousPathRange(loweredQuery, loweredPath, baseStart) {
+    const loweredBasename = loweredPath.slice(baseStart);
+    const basenameMatchStart = loweredBasename.indexOf(loweredQuery);
+    if (basenameMatchStart >= 0) {
+      const start = baseStart + basenameMatchStart;
+      return { start, end: start + loweredQuery.length };
+    }
+    if (loweredQuery.includes("/")) {
+      const pathMatchStart = loweredPath.endsWith(`/${loweredQuery}`) ? loweredPath.length - loweredQuery.length : loweredPath === loweredQuery ? 0 : -1;
+      if (pathMatchStart >= 0)
+        return {
+          start: pathMatchStart,
+          end: pathMatchStart + loweredQuery.length
+        };
+    }
+    return null;
+  }
+  function computeFuzzyMatch(query, path) {
+    const q = query.trim().toLowerCase();
+    if (!q) return { score: 0, ranges: [], tier: 0 };
+    const lowerPath = path.toLowerCase();
+    const baseStart = basenameStart(path);
+    const indices = [];
+    let from = 0;
+    let score = 0;
+    for (const ch of q) {
+      const index = lowerPath.indexOf(ch, from);
+      if (index < 0) return null;
+      indices.push(index);
+      score += 10;
+      if (index >= baseStart) score += 8;
+      if (isBoundary(path, index)) score += 6;
+      const prev = indices[indices.length - 2];
+      if (prev != null && prev + 1 === index) score += 12;
+      from = index + 1;
+    }
+    const first = indices[0];
+    score -= Math.min(first, 40);
+    if (indices[0] >= baseStart) score += 20;
+    const basename = lowerPath.slice(baseStart);
+    const tier = pathMatchTier(q, lowerPath, basename);
+    const contiguousRange = contiguousPathRange(q, lowerPath, baseStart);
+    return {
+      score,
+      ranges: contiguousRange ? [contiguousRange] : toRanges(indices),
+      tier
+    };
+  }
+  function fuzzyMatchPath(query, path) {
+    const match2 = computeFuzzyMatch(query, path);
+    return match2 ? { score: match2.score, ranges: match2.ranges } : null;
+  }
+  function rankFuzzyPaths(query, items, limit, stats) {
+    const bounded = Number.isInteger(limit) && limit !== void 0 && limit > 0 ? Math.floor(limit) : 0;
+    const compare = (a2, b2) => b2.tier - a2.tier || b2.score - a2.score || a2.item.path.localeCompare(b2.item.path);
+    if (!bounded) {
+      const ranked = items.map((item) => {
+        const match2 = computeFuzzyMatch(query, item.path);
+        return match2 ? { item, score: match2.score, ranges: match2.ranges, tier: match2.tier } : null;
+      }).filter(
+        (item) => item !== null
+      ).sort(compare).map(({ item, score, ranges }) => ({ item, score, ranges }));
+      if (stats) stats.total = ranked.length;
+      return ranked;
+    }
+    const top = [];
+    let total = 0;
+    for (const item of items) {
+      const match2 = computeFuzzyMatch(query, item.path);
+      if (!match2) continue;
+      total++;
+      const ranked = {
+        item,
+        score: match2.score,
+        ranges: match2.ranges,
+        tier: match2.tier
+      };
+      pushBoundedTop(top, ranked, bounded, compare);
+    }
+    if (stats) stats.total = total;
+    return top.sort(compare).map(({ item, score, ranges }) => ({ item, score, ranges }));
+  }
+  function pushBoundedTop(heap, item, limit, compareBestFirst) {
+    const isWorse = (a2, b2) => compareBestFirst(a2, b2) > 0;
+    const siftUp = (index) => {
+      while (index > 0) {
+        const parent = Math.floor((index - 1) / 2);
+        if (!isWorse(heap[index], heap[parent])) break;
+        [heap[index], heap[parent]] = [heap[parent], heap[index]];
+        index = parent;
+      }
+    };
+    const siftDown = (index) => {
+      while (true) {
+        const left = index * 2 + 1;
+        const right = left + 1;
+        let worst = index;
+        if (left < heap.length && isWorse(heap[left], heap[worst])) worst = left;
+        if (right < heap.length && isWorse(heap[right], heap[worst]))
+          worst = right;
+        if (worst === index) break;
+        [heap[index], heap[worst]] = [heap[worst], heap[index]];
+        index = worst;
+      }
+    };
+    if (heap.length < limit) {
+      heap.push(item);
+      siftUp(heap.length - 1);
+      return;
+    }
+    if (compareBestFirst(item, heap[0]) >= 0) return;
+    heap[0] = item;
+    siftDown(0);
+  }
+  function rankGlobPathMatches(query, items, limit, stats) {
+    const matchPath = createGlobPathMatcher(query);
+    if (!matchPath) {
+      if (stats) stats.total = 0;
+      return [];
+    }
+    const bounded = Number.isInteger(limit) && limit !== void 0 && limit > 0 ? Math.floor(limit) : 0;
+    const compare = (a2, b2) => b2.score - a2.score || a2.item.path.localeCompare(b2.item.path);
+    if (!bounded) {
+      const ranked = items.map((item) => {
+        const match2 = matchPath(item.path);
+        return match2 ? {
+          item,
+          score: match2.score,
+          ranges: match2.ranges,
+          mode: "glob"
+        } : null;
+      }).filter((item) => item !== null).sort(compare);
+      if (stats) stats.total = ranked.length;
+      return ranked;
+    }
+    const top = [];
+    let total = 0;
+    for (const item of items) {
+      const match2 = matchPath(item.path);
+      if (!match2) continue;
+      total++;
+      const ranked = {
+        item,
+        score: match2.score,
+        ranges: match2.ranges,
+        mode: "glob"
+      };
+      pushBoundedTop(top, ranked, bounded, compare);
+    }
+    if (stats) stats.total = total;
+    return top.sort(compare);
+  }
+  function rankPathMatches(query, items, limit, stats) {
+    if (isGlobPathQuery(query)) {
+      return rankGlobPathMatches(query, items, limit, stats);
+    }
+    return rankFuzzyPaths(query, items, limit, stats).map((item) => ({
+      ...item,
+      mode: "fuzzy"
+    }));
+  }
+  function isGlobPathQuery(query) {
+    return /[*?]/.test(query.trim());
+  }
+  function escapeRegexChar(ch) {
+    return /[\\^$+?.()|{}]/.test(ch) ? `\\${ch}` : ch;
+  }
+  function globToRegExp(query) {
+    const pattern = query.trim();
+    if (!pattern) return null;
+    let source = "^";
+    for (let i2 = 0; i2 < pattern.length; i2++) {
+      const ch = pattern[i2];
+      if (ch === "*") {
+        if (pattern[i2 + 1] === "*") {
+          if (pattern[i2 + 2] === "/") {
+            source += "(?:.*/)?";
+            i2 += 2;
+          } else {
+            source += ".*";
+            i2++;
+          }
+        } else {
+          source += "[^/]*";
+        }
+      } else if (ch === "?") {
+        source += "[^/]";
+      } else if (ch === "[") {
+        const close = pattern.indexOf("]", i2 + 1);
+        if (close < 0) {
+          source += "\\[";
+        } else {
+          const body = pattern.slice(i2 + 1, close).replace(/\\/g, "\\\\");
+          source += `[${body}]`;
+          i2 = close;
+        }
+      } else {
+        source += escapeRegexChar(ch);
+      }
+    }
+    source += "$";
+    try {
+      return new RegExp(source, "i");
+    } catch {
+      return null;
+    }
+  }
+  function globMatchPath(query, path) {
+    return createGlobPathMatcher(query)?.(path) ?? null;
+  }
+  function createGlobPathMatcher(query) {
+    const regex = globToRegExp(query);
+    if (!regex) return null;
+    const literal = query.replace(/[*?[\]]+/g, " ").trim().split(/\s+/).filter(Boolean);
+    const suffix = query.replace(/^\*+/, "").toLowerCase();
+    return (path) => {
+      const baseStart = basenameStart(path);
+      const basename = path.slice(baseStart);
+      if (!regex.test(path) && (query.includes("/") || !regex.test(basename)))
+        return null;
+      const ranges = [];
+      const lowerPath = path.toLowerCase();
+      for (const part of literal) {
+        const start = lowerPath.indexOf(part.toLowerCase());
+        if (start >= 0) ranges.push({ start, end: start + part.length });
+      }
+      ranges.sort((a2, b2) => a2.start - b2.start || a2.end - b2.end);
+      const mergedRanges = [];
+      for (const range of ranges) {
+        const last = mergedRanges[mergedRanges.length - 1];
+        if (last && last.end >= range.start) {
+          last.end = Math.max(last.end, range.end);
+        } else {
+          mergedRanges.push({ ...range });
+        }
+      }
+      const score = 1e3 - Math.min(path.length, 200) + (path.slice(baseStart).toLowerCase().endsWith(suffix) ? 50 : 0);
+      return { score, ranges: mergedRanges };
+    };
+  }
+
   // web-src/core/file-filter.ts
   function normalizeFileFilterQuery(value) {
     return (value || "").toLowerCase().trim();
@@ -868,6 +1143,14 @@ Details: ${JSON.stringify(output)}` : "";
         };
       }
     }
+    if (raw.startsWith("~")) {
+      const needle = raw.slice(1).trim();
+      if (!needle) return { kind: "empty", match: () => true };
+      return { kind: "fuzzy", match: (path) => !!fuzzyMatchPath(needle, path) };
+    }
+    if (isGlobPathQuery(raw)) {
+      return { kind: "glob", match: (path) => !!globMatchPath(raw, path) };
+    }
     const q = normalizeFileFilterQuery(raw.startsWith("/") ? raw.slice(1) : raw);
     return {
       kind: "substring",
@@ -894,6 +1177,8 @@ Details: ${JSON.stringify(output)}` : "";
   }
   function keymapScope(target) {
     if (target?.closest("#app-panel")) return "panel";
+    if (target?.closest("#history-panel, .gdp-file-history-panel"))
+      return "history";
     if (target?.closest("#content")) return "main";
     if (target?.closest("#sidebar")) return "sidebar";
     return "global";
@@ -1158,7 +1443,13 @@ Details: ${JSON.stringify(output)}` : "";
   }
 
   // web-src/core/keymap.ts
-  var KEYMAP_SCOPES = ["global", "sidebar", "main", "panel"];
+  var KEYMAP_SCOPES = [
+    "global",
+    "sidebar",
+    "main",
+    "panel",
+    "history"
+  ];
   var KEYMAP_ACTIONS = [
     "open-file-palette",
     "open-grep-palette",
@@ -1198,6 +1489,8 @@ Details: ${JSON.stringify(output)}` : "";
     "previous-hunk",
     "goto-diff",
     "goto-history",
+    "history-next-commit",
+    "history-previous-commit",
     "goto-repo",
     "toggle-terminal-panel",
     "toggle-sidebar",
@@ -1334,6 +1627,10 @@ Details: ${JSON.stringify(output)}` : "";
     { action: "previous-hunk", key: "{", shift: true },
     { action: "goto-diff", key: "d", pendingG: true },
     { action: "goto-history", key: "h", pendingG: true },
+    { action: "history-next-commit", key: "arrowdown" },
+    { action: "history-previous-commit", key: "arrowup" },
+    { action: "history-next-commit", key: "j", scope: "history" },
+    { action: "history-previous-commit", key: "k", scope: "history" },
     { action: "goto-repo", key: "r", pendingG: true },
     { action: "toggle-sidebar", key: "b" },
     { action: "toggle-terminal-panel", key: "`", ctrl: true },
@@ -1638,6 +1935,14 @@ Details: ${JSON.stringify(output)}` : "";
     if (remote.hostname.toLowerCase() !== "github.com") {
       return { url: base2, provider: "web" };
     }
+    if (options.kind === "commit") {
+      const sha = (options.ref || "").trim();
+      if (!sha || sha === "worktree") return { url: base2, provider: "github" };
+      return {
+        url: `${base2}/commit/${encodeURIComponent(sha)}`,
+        provider: "github"
+      };
+    }
     const ref = encodePath(resolvedRef(options.ref, options.fallbackRef));
     const path = encodePath(options.path || "");
     if (!ref || options.kind === "blob" && !path) {
@@ -1660,6 +1965,61 @@ Details: ${JSON.stringify(output)}` : "";
     return { url: `${target}${lineHash}`, provider: "github" };
   }
 
+  // web-src/core/history.ts
+  function parseHistoryLineRange(value) {
+    const match2 = /^(\d+)-(\d+)$/.exec(value || "");
+    if (!match2) return void 0;
+    const a2 = Number(match2[1]);
+    const b2 = Number(match2[2]);
+    if (!(a2 > 0) || !(b2 > 0)) return void 0;
+    return { start: Math.min(a2, b2), end: Math.max(a2, b2) };
+  }
+  function formatHistoryLineRange(range) {
+    return `${range.start}-${range.end}`;
+  }
+  var EMPTY_TREE_SHA = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
+  var HISTORY_PAGE_SIZE = 50;
+  var HISTORY_AUTO_LOAD_MAX_PAGES = 20;
+  function commitDiffRange(commit) {
+    return { from: commit.parents[0] || EMPTY_TREE_SHA, to: commit.sha };
+  }
+  function shouldContinueAutoLoad(state) {
+    if (state.found) return false;
+    if (!state.hasMore) return false;
+    return state.pagesLoaded < HISTORY_AUTO_LOAD_MAX_PAGES;
+  }
+  var MONTH_NAMES = [
+    "January",
+    "February",
+    "March",
+    "April",
+    "May",
+    "June",
+    "July",
+    "August",
+    "September",
+    "October",
+    "November",
+    "December"
+  ];
+  var DAY_MS = 24 * 60 * 60 * 1e3;
+  function historyGroupLabel(whenIso, now) {
+    const t2 = Date.parse(whenIso);
+    if (!Number.isFinite(t2)) return "Unknown date";
+    const dayStart = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate()
+    ).getTime();
+    if (t2 >= dayStart) return "Today";
+    if (t2 >= dayStart - DAY_MS) return "Yesterday";
+    if (t2 >= dayStart - 6 * DAY_MS) return "This week";
+    const d2 = new Date(t2);
+    if (d2.getFullYear() === now.getFullYear() && d2.getMonth() === now.getMonth())
+      return "This month";
+    return `${MONTH_NAMES[d2.getMonth()]} ${d2.getFullYear()}`;
+  }
+
   // web-src/core/shell.ts
   var MIN_SHELL_COLS = 20;
   var MAX_SHELL_COLS = 1e3;
@@ -1756,6 +2116,7 @@ Details: ${JSON.stringify(output)}` : "";
           };
         const rawView = params.get("view");
         const preview = params.get("preview") === "1";
+        const hl = params.get("hl") || "";
         if (rawView === "blob") {
           return {
             screen: "file",
@@ -1765,6 +2126,7 @@ Details: ${JSON.stringify(output)}` : "";
             view: "blob",
             ...preview ? { preview: true } : {},
             ...line ? { line } : {},
+            ...line && hl ? { hl } : {},
             ...params.get("virtual") === "off" ? { virtual: "off" } : {}
           };
         }
@@ -1786,6 +2148,9 @@ Details: ${JSON.stringify(output)}` : "";
             range,
             view: "history",
             ...params.get("commit") ? { commit: params.get("commit") || "" } : {},
+            ...params.get("compare") ? { compare: params.get("compare") || "" } : {},
+            ...params.get("q") ? { q: params.get("q") || "" } : {},
+            ...parseHistoryLineRange(params.get("lines")) ? { lines: parseHistoryLineRange(params.get("lines")) } : {},
             ...line ? { line } : {}
           };
         }
@@ -1829,10 +2194,18 @@ Details: ${JSON.stringify(output)}` : "";
         };
       case "/history": {
         const commit = params.get("commit") || "";
+        const compare = params.get("compare") || "";
+        const q = params.get("q") || "";
+        const path = params.get("path") || "";
+        const lines = parseHistoryLineRange(params.get("lines"));
         return {
           screen: "history",
           ref: params.get("ref") || "HEAD",
           ...commit ? { commit } : {},
+          ...compare ? { compare } : {},
+          ...q ? { q } : {},
+          ...path ? { path } : {},
+          ...path && lines ? { lines } : {},
           range
         };
       }
@@ -1891,14 +2264,14 @@ Details: ${JSON.stringify(output)}` : "";
       }
       case "file":
         if (route.view === "blob") {
-          return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(route.ref || "worktree") + "&view=blob" + (route.preview ? "&preview=1" : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "") + (route.virtual === "off" ? "&virtual=off" : "");
+          return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(route.ref || "worktree") + "&view=blob" + (route.preview ? "&preview=1" : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "") + (route.line && route.hl ? `&hl=${encodeURIComponent(route.hl)}` : "") + (route.virtual === "off" ? "&virtual=off" : "");
         }
         if (route.view === "blame") {
           const ref = route.ref || "worktree";
           return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(ref) + "&view=blame" + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "");
         }
         if (route.view === "history") {
-          return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(route.ref || "worktree") + "&view=history" + (route.commit ? `&commit=${encodeURIComponent(route.commit)}` : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "");
+          return "/file?path=" + encodeURIComponent(route.path) + "&target=" + encodeURIComponent(route.ref || "worktree") + "&view=history" + (route.commit ? `&commit=${encodeURIComponent(route.commit)}` : "") + (route.compare ? `&compare=${encodeURIComponent(route.compare)}` : "") + (route.q ? `&q=${encodeURIComponent(route.q)}` : "") + (route.lines ? `&lines=${encodeURIComponent(formatHistoryLineRange(route.lines))}` : "") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "");
         }
         return "/file?path=" + encodeURIComponent(route.path) + "&ref=" + encodeURIComponent(route.ref || "worktree") + "&from=" + encodeURIComponent(route.range.from || "") + "&to=" + encodeURIComponent(route.range.to || "worktree") + (route.line ? `&line=${encodeURIComponent(formatLineTarget(route.line))}` : "") + (route.virtual === "off" ? "&virtual=off" : "");
       case "diff":
@@ -1922,7 +2295,12 @@ Details: ${JSON.stringify(output)}` : "";
       case "history": {
         const params = new URLSearchParams();
         if (route.ref && route.ref !== "HEAD") params.set("ref", route.ref);
+        if (route.path) params.set("path", route.path);
+        if (route.path && route.lines)
+          params.set("lines", formatHistoryLineRange(route.lines));
         if (route.commit) params.set("commit", route.commit);
+        if (route.compare) params.set("compare", route.compare);
+        if (route.q) params.set("q", route.q);
         const qs = params.toString();
         return `/history${qs ? `?${qs}` : ""}`;
       }
@@ -1989,6 +2367,64 @@ Details: ${JSON.stringify(output)}` : "";
   function withTerminalOverlay(url, state) {
     return withQueryParam(url, "terminal", state);
   }
+  function parseSearchResultsOverlay(search) {
+    return new URLSearchParams(search).get("results");
+  }
+  function withSearchResultsOverlay(url, query) {
+    return withQueryParam(url, "results", query);
+  }
+
+  // web-src/core/search-palette.ts
+  var PALETTE_RESULT_LIMIT = 50;
+  var GREP_SELECTION_HISTORY_LIMIT = 100;
+  var MIN_GREP_PALETTE_WIDTH = 720;
+  var MAX_GREP_PALETTE_WIDTH = 2400;
+  var MIN_GREP_PALETTE_HEIGHT = 420;
+  var MAX_GREP_PALETTE_HEIGHT = 1400;
+  function limitPaletteResults(items) {
+    return items.slice(0, PALETTE_RESULT_LIMIT);
+  }
+  function movePaletteSelection(index, count, direction) {
+    if (count <= 0) return -1;
+    if (index < 0) return direction > 0 ? 0 : count - 1;
+    return Math.max(0, Math.min(count - 1, index + direction));
+  }
+  function rememberPaletteSelection(history2, path) {
+    const next = history2.filter((entry) => entry !== path);
+    next.push(path);
+    return next.slice(-GREP_SELECTION_HISTORY_LIMIT);
+  }
+  function rankPaletteResultsByHistory(items, history2) {
+    const priority = new Map(history2.map((path, index) => [path, index + 1]));
+    return items.map((item, index) => ({ item, index })).sort(
+      (a2, b2) => (priority.get(b2.item.path) ?? 0) - (priority.get(a2.item.path) ?? 0) || a2.index - b2.index
+    ).map(({ item }) => item);
+  }
+  function parseGrepQuery(raw) {
+    const paths = [];
+    const words = [];
+    for (const token of raw.trim().split(/\s+/)) {
+      if (!token) continue;
+      const scoped = /^path:(.*)$/.exec(token);
+      if (scoped) {
+        if (scoped[1]) paths.push(scoped[1]);
+        continue;
+      }
+      words.push(token);
+    }
+    return { term: words.join(" "), paths };
+  }
+  function buildGrepRequestParams(options) {
+    const params = new URLSearchParams();
+    params.set("ref", options.ref);
+    params.set("q", options.term);
+    params.set("max", String(options.max));
+    if (options.regex) params.set("regex", "1");
+    if (options.caseSensitive) params.set("case", "1");
+    if (options.wholeWord) params.set("word", "1");
+    if (options.hideTests) params.set("exclude_tests", "1");
+    return params;
+  }
 
   // web-src/views/media-player.ts
   var PLAYBACK_RATES = [1, 1.25, 1.5, 2];
@@ -11534,6 +11970,8 @@ ${frontmatter.yaml}
     header.appendChild(name);
     const repositoryWebLink = deps.createRepositoryWebLink?.(target);
     if (repositoryWebLink) header.appendChild(repositoryWebLink);
+    const revisionNav = deps.createRevisionNav?.(target, activeTab);
+    if (revisionNav) header.appendChild(revisionNav);
     sticky.appendChild(header);
     const tabsHost = document.createElement("div");
     tabsHost.className = "gdp-file-detail-tabs";
@@ -11753,7 +12191,8 @@ ${frontmatter.yaml}
           setRoute: deps.setRoute,
           setPreferredSourceTab: deps.setPreferredSourceTab,
           createFileBreadcrumb: deps.createFileBreadcrumb,
-          createRepositoryWebLink: deps.createRepositoryWebLink
+          createRepositoryWebLink: deps.createRepositoryWebLink,
+          createRevisionNav: deps.createRevisionNav
         },
         target,
         "blame"
@@ -27301,50 +27740,6 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     deps.setStatus("live");
   }
 
-  // web-src/core/history.ts
-  var EMPTY_TREE_SHA = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
-  var HISTORY_PAGE_SIZE = 50;
-  var HISTORY_AUTO_LOAD_MAX_PAGES = 20;
-  function commitDiffRange(commit) {
-    return { from: commit.parents[0] || EMPTY_TREE_SHA, to: commit.sha };
-  }
-  function shouldContinueAutoLoad(state) {
-    if (state.found) return false;
-    if (!state.hasMore) return false;
-    return state.pagesLoaded < HISTORY_AUTO_LOAD_MAX_PAGES;
-  }
-  var MONTH_NAMES = [
-    "January",
-    "February",
-    "March",
-    "April",
-    "May",
-    "June",
-    "July",
-    "August",
-    "September",
-    "October",
-    "November",
-    "December"
-  ];
-  var DAY_MS = 24 * 60 * 60 * 1e3;
-  function historyGroupLabel(whenIso, now) {
-    const t2 = Date.parse(whenIso);
-    if (!Number.isFinite(t2)) return "Unknown date";
-    const dayStart = new Date(
-      now.getFullYear(),
-      now.getMonth(),
-      now.getDate()
-    ).getTime();
-    if (t2 >= dayStart) return "Today";
-    if (t2 >= dayStart - DAY_MS) return "Yesterday";
-    if (t2 >= dayStart - 6 * DAY_MS) return "This week";
-    const d2 = new Date(t2);
-    if (d2.getFullYear() === now.getFullYear() && d2.getMonth() === now.getMonth())
-      return "This month";
-    return `${MONTH_NAMES[d2.getMonth()]} ${d2.getFullYear()}`;
-  }
-
   // web-src/views/history-view.ts
   var HISTORY_BODY_COLLAPSE_LINES = 10;
   var HISTORY_WORKTREE_COMMIT = "worktree";
@@ -27357,7 +27752,21 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       refreshTitle: "Refresh commit history",
       refreshTitlePending: "History may have changed. Refresh",
       filterClearLabel: "Clear",
-      filterClearTitle: "Clear commit filter"
+      filterClearTitle: "Clear commit filter",
+      filterPlaceholder: "filter… text author: path: since: code:",
+      filterTitle: 'Filter commits. Words match the message ("quoted" keeps spaces), sha prefixes match commits, author:<name>, path:<part>, since:/after:<date>, until:/before:<date>, code:<text> (lines added or removed), merges:no / merges:only. Kinds combine with AND.',
+      commitsTitle: "Commits",
+      commitsIn: (path) => `Commits · ${path}`,
+      commitsForLines: (start, end) => start === end ? `Commits · line ${start}` : `Commits · lines ${start}-${end}`,
+      copyShaTitle: "Copy full commit sha",
+      copiedTitle: "Copied",
+      copyFailedTitle: "Copy failed",
+      mergeBadge: "merge",
+      compareWith: "Compare with",
+      parentLabel: (index, shortSha) => `parent ${index} (${shortSha})`,
+      comparing: (from, to) => `Comparing ${from}..${to}`,
+      clearCompare: "Clear",
+      refTitle: (kind, name) => kind === "tag" ? `Tag ${name}` : kind === "head" ? "HEAD" : `Branch ${name}`
     },
     ja: {
       worktreeLabel: "未コミット変更 (Working tree)",
@@ -27367,7 +27776,21 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       refreshTitle: "コミット履歴を更新",
       refreshTitlePending: "新しい履歴がある可能性があります。更新",
       filterClearLabel: "解除",
-      filterClearTitle: "コミットフィルタを解除"
+      filterClearTitle: "コミットフィルタを解除",
+      filterPlaceholder: "絞り込み… 文字列 author: path: since: code:",
+      filterTitle: 'コミットを絞り込みます。語はメッセージに一致（"引用" で空白を含む句）、sha の前方一致、author:<名前>、path:<一部>、since:/after:<日付>、until:/before:<日付>、code:<文字列>（追加・削除された行）、merges:no / merges:only。種類が違う条件は AND。',
+      commitsTitle: "コミット",
+      commitsIn: (path) => `コミット · ${path}`,
+      commitsForLines: (start, end) => start === end ? `コミット · ${start} 行目` : `コミット · ${start}-${end} 行`,
+      copyShaTitle: "コミットの sha をコピー",
+      copiedTitle: "コピーしました",
+      copyFailedTitle: "コピーに失敗しました",
+      mergeBadge: "merge",
+      compareWith: "比較対象",
+      parentLabel: (index, shortSha) => `親 ${index} (${shortSha})`,
+      comparing: (from, to) => `${from}..${to} を比較中`,
+      clearCompare: "解除",
+      refTitle: (kind, name) => kind === "tag" ? `タグ ${name}` : kind === "head" ? "HEAD" : `ブランチ ${name}`
     }
   };
   function historyText(lang) {
@@ -27387,6 +27810,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       panel.className = "gdp-file-history-panel";
     }
     panel.setAttribute("aria-label", "Commit history");
+    panel.tabIndex = -1;
     const panelHead = document.createElement("div");
     panelHead.className = "history-head";
     const title = document.createElement("span");
@@ -27422,8 +27846,12 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     if (page) filterInput.id = "history-filter";
     else filterInput.className = "history-filter";
     filterInput.type = "search";
-    filterInput.placeholder = page ? "filter commits… (message, sha, author:name, path:file)" : "filter commits… (message, sha, author:name)";
+    filterInput.placeholder = HISTORY_TEXT.en.filterPlaceholder;
+    filterInput.title = HISTORY_TEXT.en.filterTitle;
     filterInput.autocomplete = "off";
+    const authorList = document.createElement("datalist");
+    authorList.id = page ? "history-filter-authors" : `history-filter-authors-${Math.random().toString(36).slice(2, 8)}`;
+    filterInput.setAttribute("list", authorList.id);
     const filterClearButton = document.createElement("button");
     filterClearButton.type = "button";
     if (page) filterClearButton.id = "history-filter-clear";
@@ -27435,7 +27863,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       "aria-label",
       HISTORY_TEXT.en.filterClearTitle
     );
-    filterWrap.append(filterInput, filterClearButton);
+    filterWrap.append(filterInput, filterClearButton, authorList);
     const banner = document.createElement("div");
     if (page) banner.id = "history-banner";
     banner.className = "history-banner";
@@ -27462,6 +27890,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       sentinel,
       filterInput,
       filterClearButton,
+      authorList,
       refreshButton,
       refreshResult
     };
@@ -27485,7 +27914,9 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     const date = document.createElement("span");
     if (page) date.id = "hci-date";
     date.className = "hci-date";
-    head.append(sha, author, date);
+    const actions = document.createElement("span");
+    actions.className = "hci-actions";
+    head.append(sha, author, date, actions);
     const subject = document.createElement("h2");
     if (page) subject.id = "hci-subject";
     subject.className = "hci-subject";
@@ -27587,6 +28018,12 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     let pathFilter = "";
     let refreshStatus = { type: "none" };
     let freshSha = "";
+    let compareSha = "";
+    let authorsLoadedFor = "";
+    let lineRange2;
+    function lineRangeKey(range) {
+      return range ? formatHistoryLineRange(range) : "";
+    }
     function historyScopeFromRoute(route = deps.getRoute()) {
       if (route.screen === "history") {
         const nextRef = route.ref || "HEAD";
@@ -27594,8 +28031,11 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           mode: "history",
           logRef: nextRef,
           routeRef: nextRef,
-          pathFilter: "",
-          commit: route.commit
+          pathFilter: route.path || "",
+          query: route.q || "",
+          lines: route.path ? route.lines : void 0,
+          commit: route.commit,
+          compare: route.compare
         };
       }
       if (route.screen === "file" && route.view === "history") {
@@ -27605,11 +28045,51 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           logRef: nextRouteRef === "worktree" ? "HEAD" : nextRouteRef,
           routeRef: nextRouteRef,
           pathFilter: route.path,
-          commit: route.commit
+          query: route.q || "",
+          lines: route.lines,
+          commit: route.commit,
+          compare: route.compare
         };
       }
       return null;
     }
+    function routeFor(options) {
+      const commit = options.commit;
+      const compare = options.compare || void 0;
+      const q = (options.query ?? query) || void 0;
+      const range = commit && commit !== HISTORY_WORKTREE_COMMIT ? diffRangeFor(commit, compare) : worktreeDiffRange();
+      if (mode === "file") {
+        return {
+          screen: "file",
+          path: pathFilter,
+          ref: options.ref ?? routeRef,
+          view: "history",
+          ...commit ? { commit } : {},
+          ...compare ? { compare } : {},
+          ...q ? { q } : {},
+          ...lineRange2 ? { lines: lineRange2 } : {},
+          range
+        };
+      }
+      return {
+        screen: "history",
+        ref: options.ref ?? ref,
+        ...pathFilter ? { path: pathFilter } : {},
+        ...pathFilter && lineRange2 ? { lines: lineRange2 } : {},
+        ...commit ? { commit } : {},
+        ...compare ? { compare } : {},
+        ...q ? { q } : {},
+        range
+      };
+    }
+    function diffRangeFor(sha, compare) {
+      const commit = commits.find((item) => item.sha === sha);
+      if (compare) return { from: compare, to: sha };
+      return commit ? commitDiffRange(commit) : { from: `${sha}^`, to: sha };
+    }
+    function shortSha(sha) {
+      return sha.slice(0, 7);
+    }
     function currentRefreshScopeKey() {
       const scope = historyScopeFromRoute();
       if (!scope) return "";
@@ -27618,6 +28098,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         scope.logRef,
         scope.routeRef,
         scope.pathFilter,
+        lineRangeKey(scope.lines),
         query
       ].join("\0");
     }
@@ -27699,6 +28180,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       if (query) params.set("q", query);
       if (pathFilter) {
         params.set("path", pathFilter);
+        if (lineRange2) params.set("lines", formatHistoryLineRange(lineRange2));
         if (routeRef === "worktree") params.set("worktree", "1");
       }
       const url = `/_log?${params.toString()}`;
@@ -27715,10 +28197,43 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         return null;
       });
     }
-    function commitRow(commit) {
+    function refChipsHtml(commit) {
+      const text3 = historyText(deps.getLanguage());
+      const chips = [];
+      for (const ref2 of commit.refs ?? []) {
+        const classes = [
+          "history-ref",
+          `history-ref-${ref2.kind}`,
+          ref2.head ? "history-ref-head" : ""
+        ].filter(Boolean).join(" ");
+        chips.push(
+          `<span class="${classes}" title="${deps.escapeHtml(text3.refTitle(ref2.kind, ref2.name))}">${deps.escapeHtml(ref2.name)}</span>`
+        );
+      }
+      if (commit.parents.length > 1) {
+        chips.push(
+          `<span class="history-ref history-ref-merge" title="${deps.escapeHtml(text3.mergeBadge)}">${deps.escapeHtml(text3.mergeBadge)}</span>`
+        );
+      }
+      return chips.length ? `<span class="history-refs">${chips.join("")}</span>` : "";
+    }
+    function commitRow(commit, inRange) {
       const active = commit.sha === selectedSha ? " active" : "";
       const fresh = commit.sha === freshSha ? " history-item-fresh" : "";
-      return `<li class="history-item${active}${fresh}" data-sha="${deps.escapeHtml(commit.sha)}"><span class="subject" title="${deps.escapeHtml(commit.subject)}">${deps.escapeHtml(commit.subject)}</span><span class="meta2"><span class="sha">${deps.escapeHtml(commit.sha.slice(0, 7))}</span><span class="author">${deps.escapeHtml(commit.author)}</span><span class="when">${deps.escapeHtml(displayWhen(commit.when))}</span></span></li>`;
+      const ranged = inRange ? " history-item-in-range" : "";
+      return `<li class="history-item${active}${fresh}${ranged}" data-sha="${deps.escapeHtml(commit.sha)}"><span class="subject" title="${deps.escapeHtml(commit.subject)}">${deps.escapeHtml(commit.subject)}</span><span class="meta2"><span class="sha">${deps.escapeHtml(shortSha(commit.sha))}</span><span class="author">${deps.escapeHtml(commit.author)}</span><span class="when">${deps.escapeHtml(displayWhen(commit.when))}</span>` + refChipsHtml(commit) + `</span></li>`;
+    }
+    function rangeShas() {
+      const shas = /* @__PURE__ */ new Set();
+      if (!compareSha || !selectedSha) return shas;
+      const start = commits.findIndex((commit) => commit.sha === selectedSha);
+      if (start < 0) return shas;
+      const end = commits.findIndex(
+        (commit, index) => index >= start && commit.parents[0] === compareSha
+      );
+      if (end < 0) return shas;
+      for (let index = start; index <= end; index++) shas.add(commits[index].sha);
+      return shas;
     }
     function worktreeRow() {
       const active = selectedSha === HISTORY_WORKTREE_COMMIT ? " active" : "";
@@ -27729,6 +28244,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       syncRefreshResult(activeMount.refreshResult);
       const now = /* @__PURE__ */ new Date();
       const html = mode === "history" ? [worktreeRow()] : [];
+      const inRange = rangeShas();
       let lastGroup = "";
       for (const commit of commits) {
         if (commit.sha === HISTORY_WORKTREE_COMMIT) {
@@ -27742,7 +28258,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           );
           lastGroup = group;
         }
-        html.push(commitRow(commit));
+        html.push(commitRow(commit, inRange.has(commit.sha)));
       }
       list2.innerHTML = html.join("");
       activeHistoryRow = list2.querySelector(".history-item.active");
@@ -27792,6 +28308,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       info.querySelector(".hci-head")?.removeAttribute("hidden");
       set2(".hci-sha", commit.sha);
       set2(".hci-author", commit.author);
+      renderCommitActions(info, commit);
       const t2 = Date.parse(commit.when);
       set2(
         ".hci-date",
@@ -27818,6 +28335,80 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       }
       info.hidden = false;
     }
+    function renderCommitActions(info, commit) {
+      const actions = info.querySelector(".hci-actions");
+      if (!actions) return;
+      actions.replaceChildren();
+      const text3 = historyText(deps.getLanguage());
+      if (deps.copyText) {
+        const copy = document.createElement("button");
+        copy.type = "button";
+        copy.className = "gdp-btn gdp-btn-sm hci-copy";
+        copy.title = text3.copyShaTitle;
+        copy.setAttribute("aria-label", text3.copyShaTitle);
+        copy.innerHTML = iconSvg("octicon-copy", COPY_16_PATHS);
+        let resetTimer = null;
+        const copyText = deps.copyText;
+        copy.addEventListener("click", () => {
+          void copyText(commit.sha).then(() => {
+            copy.innerHTML = iconSvg("octicon-check", CHECK_16_PATHS);
+            copy.title = text3.copiedTitle;
+            copy.classList.add("copied");
+          }).catch((err) => {
+            console.error("Failed to copy commit sha", err);
+            copy.title = text3.copyFailedTitle;
+            copy.classList.add("failed");
+          }).finally(() => {
+            if (resetTimer) clearTimeout(resetTimer);
+            resetTimer = setTimeout(() => {
+              copy.innerHTML = iconSvg("octicon-copy", COPY_16_PATHS);
+              copy.title = text3.copyShaTitle;
+              copy.classList.remove("copied", "failed");
+            }, 1200);
+          });
+        });
+        actions.appendChild(copy);
+      }
+      const link2 = deps.commitWebLink?.(commit.sha);
+      if (link2) {
+        link2.classList.add("hci-link");
+        actions.appendChild(link2);
+      }
+      if (commit.parents.length > 1) {
+        const label = document.createElement("span");
+        label.className = "hci-compare-label";
+        label.textContent = text3.compareWith;
+        actions.appendChild(label);
+        commit.parents.forEach((parent, index) => {
+          const button = document.createElement("button");
+          button.type = "button";
+          button.className = "gdp-btn gdp-btn-sm hci-parent";
+          button.textContent = text3.parentLabel(index + 1, shortSha(parent));
+          const active = compareSha ? compareSha === parent : index === 0;
+          button.setAttribute("aria-pressed", String(active));
+          button.addEventListener("click", () => {
+            void selectCommit(commit, { compare: index === 0 ? "" : parent });
+          });
+          actions.appendChild(button);
+        });
+      }
+      if (compareSha && !commit.parents.includes(compareSha)) {
+        const label = document.createElement("span");
+        label.className = "hci-compare-label";
+        label.textContent = text3.comparing(
+          shortSha(compareSha),
+          shortSha(commit.sha)
+        );
+        const clear = document.createElement("button");
+        clear.type = "button";
+        clear.className = "gdp-btn gdp-btn-sm hci-compare-clear";
+        clear.textContent = text3.clearCompare;
+        clear.addEventListener("click", () => {
+          void selectCommit(commit, { compare: "" });
+        });
+        actions.append(label, clear);
+      }
+    }
     function updateWorktreeInfo() {
       const info = commitInfoElement();
       if (!info) return;
@@ -27843,11 +28434,16 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       }
       activeHistoryRow = selectedSha ? list2.querySelector(historyItemSelector(selectedSha)) : null;
       activeHistoryRow?.classList.add("active");
+      updateRangeRows();
     }
-    function isEditableTarget(target) {
-      return typeof Element === "function" && target instanceof Element && !!target.closest(
-        'input, textarea, select, button, [contenteditable="true"]'
-      );
+    function updateRangeRows() {
+      const inRange = rangeShas();
+      list2.querySelectorAll(".history-item").forEach((row) => {
+        row.classList.toggle(
+          "history-item-in-range",
+          inRange.has(row.dataset.sha || "")
+        );
+      });
     }
     function selectableShas() {
       const shas = mode === "history" ? [HISTORY_WORKTREE_COMMIT] : [];
@@ -27909,63 +28505,46 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       const selectionGen = ++selectionGeneration;
       const gen = generation;
       selectedSha = commit.sha;
+      compareSha = options.compare ?? "";
+      if (compareSha === commit.parents[0]) compareSha = "";
       updateActiveRow();
       await updateCommitInfo(commit);
       if (selectionGen !== selectionGeneration || gen !== generation) return;
+      const range = compareSha ? { from: compareSha, to: commit.sha } : commitDiffRange(commit);
       if (options.updateUrl !== false) {
-        const range = commitDiffRange(commit);
-        if (mode === "file") {
-          deps.setRoute(
-            {
-              screen: "file",
-              path: pathFilter,
-              ref: routeRef,
-              view: "history",
-              commit: commit.sha,
-              range
-            },
-            true
-          );
-        } else {
-          deps.setRoute(
-            { screen: "history", ref, commit: commit.sha, range },
-            true
-          );
-        }
+        deps.setRoute(
+          routeFor({ commit: commit.sha, compare: compareSha }),
+          true
+        );
       }
       if (selectionGen !== selectionGeneration || gen !== generation) return;
-      await deps.applyCommitRange(
-        commitDiffRange(commit),
-        pathFilter || void 0
-      );
+      await deps.applyCommitRange(range, pathFilter || void 0);
       if (selectionGen !== selectionGeneration || gen !== generation) return;
     }
+    async function selectRange(clicked) {
+      const anchor = commits.find((item) => item.sha === selectedSha);
+      if (!anchor || anchor.sha === clicked.sha) {
+        await selectCommit(clicked, { compare: "" });
+        return;
+      }
+      const anchorIndex = commits.indexOf(anchor);
+      const clickedIndex = commits.indexOf(clicked);
+      const newer = anchorIndex < clickedIndex ? anchor : clicked;
+      const older = newer === anchor ? clicked : anchor;
+      await selectCommit(newer, {
+        compare: older.parents[0] || EMPTY_TREE_SHA
+      });
+    }
     async function selectWorktree(options = {}) {
       const selectionGen = ++selectionGeneration;
       const gen = generation;
       selectedSha = HISTORY_WORKTREE_COMMIT;
+      compareSha = "";
       updateActiveRow();
       updateWorktreeInfo();
       const range = worktreeDiffRange();
       if (options.updateUrl !== false) {
-        if (mode === "file") {
-          deps.setRoute(
-            {
-              screen: "file",
-              path: pathFilter,
-              ref: routeRef,
-              view: "history",
-              commit: selectedSha,
-              range
-            },
-            true
-          );
-        } else {
-          deps.setRoute(
-            { screen: "history", ref, commit: selectedSha, range },
-            true
-          );
-        }
+        deps.setRoute(routeFor({ commit: selectedSha }), true);
       }
       if (selectionGen !== selectionGeneration || gen !== generation) return;
       await deps.applyCommitRange(range, pathFilter || void 0);
@@ -28003,10 +28582,11 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       } else {
         pagesLoaded = 1;
       }
+      const compare = historyScopeFromRoute()?.compare || "";
       for (; ; ) {
         const found = commits.find((c2) => c2.sha.startsWith(sha));
         if (found) {
-          await selectCommit(found, { updateUrl: false });
+          await selectCommit(found, { updateUrl: false, compare });
           scrollToSelected();
           return;
         }
@@ -28030,7 +28610,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       setBanner(`showing commit outside the loaded ${ref} log`);
       commits = [single, ...commits];
       renderList();
-      await selectCommit(single, { updateUrl: false });
+      await selectCommit(single, { updateUrl: false, compare });
       scrollToSelected();
     }
     function scrollToSelected() {
@@ -28047,14 +28627,19 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     async function doEnterHistory(force = false) {
       const scope = historyScopeFromRoute();
       if (!scope) return;
-      const scopeChanged = scope.logRef !== ref || scope.routeRef !== routeRef || scope.pathFilter !== pathFilter || scope.mode !== mode;
+      const scopeChanged = scope.logRef !== ref || scope.routeRef !== routeRef || scope.pathFilter !== pathFilter || lineRangeKey(scope.lines) !== lineRangeKey(lineRange2) || scope.query !== query || scope.mode !== mode;
       if (scopeChanged || force || commits.length === 0) {
         generation++;
         const gen = generation;
         ref = scope.logRef;
         routeRef = scope.routeRef;
         pathFilter = scope.pathFilter;
+        lineRange2 = scope.lines;
+        query = scope.query;
         mode = scope.mode;
+        compareSha = "";
+        syncFilterInputValue();
+        syncPanelTitle();
         commits = [];
         hasMore = false;
         loading = false;
@@ -28084,33 +28669,19 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     }
     function onRefPicked(nextRef) {
       const value = nextRef && nextRef !== "worktree" ? nextRef : "HEAD";
-      if (mode === "file" && pathFilter) {
-        deps.setRoute(
-          {
-            screen: "file",
-            path: pathFilter,
-            ref: nextRef || "worktree",
-            view: "history",
-            range: { from: "HEAD", to: "worktree" }
-          },
-          false
-        );
-      } else {
-        deps.setRoute(
-          {
-            screen: "history",
-            ref: value,
-            range: { from: "HEAD", to: "worktree" }
-          },
-          false
-        );
-      }
+      deps.setRoute(
+        routeFor({
+          ref: mode === "file" ? nextRef || "worktree" : value
+        }),
+        false
+      );
       void enterHistory({ force: true });
     }
     function leaveHistory() {
       generation++;
       loading = false;
       inFlight = null;
+      compareSha = "";
       if (filterTimer) {
         clearTimeout(filterTimer);
         filterTimer = void 0;
@@ -28125,17 +28696,33 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     function handleListClick(e2) {
       const row = e2.target.closest(".history-item");
       if (!row?.dataset.sha) return;
+      panel.focus?.();
       if (row.dataset.sha === HISTORY_WORKTREE_COMMIT) {
         void selectWorktree();
         return;
       }
       const commit = commits.find((c2) => c2.sha === row.dataset.sha);
-      if (commit) selectCommit(commit);
+      if (!commit) return;
+      if (e2.shiftKey && selectedSha && selectedSha !== HISTORY_WORKTREE_COMMIT) {
+        void selectRange(commit);
+        return;
+      }
+      void selectCommit(commit, { compare: "" });
     }
     function applyFilter(next) {
       const value = next.trim();
       if (value === query) return;
       query = value;
+      if (historyScopeFromRoute()) {
+        deps.setRoute(
+          routeFor({
+            commit: selectedSha || void 0,
+            compare: compareSha,
+            query: value
+          }),
+          true
+        );
+      }
       generation++;
       selectionGeneration++;
       clearRefreshResult();
@@ -28224,6 +28811,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         attachedFilterInput.removeEventListener("input", handleFilterInput);
         attachedFilterInput.removeEventListener("change", handleFilterInput);
         attachedFilterInput.removeEventListener("keydown", handleFilterKeydown);
+        attachedFilterInput.removeEventListener("focus", handleFilterFocus);
         attachedFilterInput = null;
       }
       if (attachedFilterClearButton) {
@@ -28256,8 +28844,11 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         input2.addEventListener("input", handleFilterInput);
         input2.addEventListener("change", handleFilterInput);
         input2.addEventListener("keydown", handleFilterKeydown);
+        input2.addEventListener("focus", handleFilterFocus);
         attachedFilterInput = input2;
       }
+      syncPanelTitle();
+      syncFilterChrome();
       const filterClearButton = mount.filterClearButton ?? null;
       if (filterClearButton) {
         syncFilterClearButton(filterClearButton);
@@ -28281,14 +28872,50 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       );
       observer.observe(sentinel);
     }
+    function syncFilterInputValue() {
+      const input2 = activeMount.filterInput ?? null;
+      if (input2 && input2.value !== query) input2.value = query;
+      syncFilterClearButton();
+    }
+    function syncFilterChrome() {
+      const input2 = activeMount.filterInput ?? null;
+      if (!input2) return;
+      const text3 = historyText(deps.getLanguage());
+      input2.placeholder = text3.filterPlaceholder;
+      input2.title = text3.filterTitle;
+    }
+    function syncPanelTitle() {
+      const title = panel.querySelector?.(".history-title");
+      if (!title) return;
+      const text3 = historyText(deps.getLanguage());
+      title.textContent = lineRange2 ? text3.commitsForLines(lineRange2.start, lineRange2.end) : mode === "history" && pathFilter ? text3.commitsIn(pathFilter) : text3.commitsTitle;
+    }
+    function handleFilterFocus() {
+      const list3 = activeMount.authorList ?? null;
+      if (!list3 || typeof fetch !== "function") return;
+      const key = ref;
+      if (authorsLoadedFor === key) return;
+      authorsLoadedFor = key;
+      void deps.trackLoad(
+        fetch(`/_authors?ref=${encodeURIComponent(ref)}`).then(async (r2) => {
+          if (!r2.ok) throw new Error(await r2.text());
+          return await r2.json();
+        })
+      ).then((res) => {
+        if (activeMount.authorList !== list3 || key !== ref) return;
+        list3.replaceChildren(
+          ...res.authors.map((author) => {
+            const option = document.createElement("option");
+            option.value = `author:${author.name}`;
+            return option;
+          })
+        );
+      }).catch((err) => {
+        authorsLoadedFor = "";
+        console.error("Failed to load history authors", err);
+      });
+    }
     const docWithEvents = document;
-    docWithEvents.addEventListener?.("keydown", (e2) => {
-      if (isImeComposing(e2) || isEditableTarget(e2.target)) return;
-      if (e2.key !== "ArrowDown" && e2.key !== "ArrowUp") return;
-      if (!historyScopeFromRoute()) return;
-      e2.preventDefault();
-      void moveSelection(e2.key === "ArrowDown" ? 1 : -1);
-    });
     docWithEvents.addEventListener?.("input", (e2) => {
       if (e2.target !== activeMount.filterInput) return;
       handleFilterInput(e2);
@@ -28306,8 +28933,13 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         syncRefreshButton(activeMount.refreshButton);
         syncRefreshResult(activeMount.refreshResult);
         syncFilterClearButton(activeMount.filterClearButton);
+        syncFilterChrome();
+        syncPanelTitle();
         renderList();
       },
+      // Keyboard stepping through the commit list (keymap actions
+      // history-next-commit / history-previous-commit).
+      moveCommitSelection: (delta) => moveSelection(delta),
       // Called from the SSE "update" listener when a history panel is on
       // screen. Only updates existing local UI hints — no fetch, no list redraw,
       // no generation bump, so it can't race with trackLoad/cancelInFlightRequests.
@@ -28563,8 +29195,28 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         {
           selectors: [{ action: "goto-history" }],
           description: {
-            en: "Go to the history screen",
-            ja: "履歴画面へ移動"
+            en: "Go to the history screen (keeps the ref you are viewing)",
+            ja: "履歴画面へ移動（見ている ref を引き継ぐ）"
+          }
+        },
+        {
+          selectors: [
+            { action: "history-next-commit", key: "arrowdown" },
+            { action: "history-previous-commit", key: "arrowup" }
+          ],
+          description: {
+            en: "Select the next / previous commit in the history list",
+            ja: "履歴一覧で次 / 前のコミットを選ぶ"
+          }
+        },
+        {
+          selectors: [
+            { action: "history-next-commit", scope: "history" },
+            { action: "history-previous-commit", scope: "history" }
+          ],
+          description: {
+            en: "Same, while the commit list has focus",
+            ja: "同上（コミット一覧にフォーカスがあるとき）"
           }
         },
         {
@@ -29247,6 +29899,23 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
                 }
               ]
             },
+            {
+              title: "Search and history",
+              blocks: [
+                {
+                  kind: "paragraph",
+                  text: "Ctrl+K opens the file palette and Ctrl+G the text palette; the search button at the left of the header icons does the same (Shift+click for text). The two share one window: switching keeps what you typed, and reopening restores the last query, selected so typing replaces it. With an empty query the file palette lists the files you opened most recently, and the result line says when the ranking was cut at 50. The text palette has regex (Alt+R), match-case (Alt+C) and whole-word (Alt+W) toggles, and path:<dir or glob> tokens in the query narrow the search; matching is case-insensitive on every engine unless match-case is on. Opening a hit marks the matched text on the target line, and in a large virtualized file it pre-fills the in-file find bar. Pin (or Ctrl+Enter) moves the query into the bottom panel's Search tab, where the grouped result list stays open while you browse files; the query is part of the URL (?results=) so a reload re-runs it."
+                },
+                {
+                  kind: "paragraph",
+                  text: "The sidebar filter takes plain text (anywhere in the path), /pattern/ for a regex, ~text for a fuzzy match and *.ts or src/** for a glob, and shows matching / all file counts while active."
+                },
+                {
+                  kind: "paragraph",
+                  text: `The History screen filter understands words (message text, "quoted" keeps spaces), sha prefixes, author:<name>, path:<part>, since:/after:<date>, until:/before:<date>, code:<text> (lines added or removed) and merges:no / merges:only; different kinds combine with AND, author: offers the repository's authors as suggestions, and the filter is part of the URL (?q=) so a reload or shared link keeps it. Rows show branch and tag labels and a merge marker. The selected commit can be copied (sha) or opened on GitHub, Shift+click a second commit to diff the whole range between them, and a merge commit lets you pick which parent to compare against. ↑ / ↓ step commits anywhere on the screen, j / k do when the commit list has focus, and g h opens the history of the ref you are looking at. A folder page has a History button that opens the log restricted to that folder; selected source lines offer a Line history action (git log -L) in the line-reference pill, file pages have older / newer revision buttons that step through the commits that touched that file, and the ref picker keeps the refs you picked last as quick chips.`
+                }
+              ]
+            },
             {
               title: "Scratch on pasted text",
               blocks: [
@@ -30014,6 +30683,23 @@ code-viewer annotate add-db --db app.db --tab query \\
                 }
               ]
             },
+            {
+              title: "検索と履歴",
+              blocks: [
+                {
+                  kind: "paragraph",
+                  text: "Ctrl+K でファイルパレット、Ctrl+G でコード検索パレットが開きます。ヘッダのアイコン列の左端にある検索ボタンでも同じです（Shift+クリックでコード検索）。2 つは 1 つのウィンドウを共有し、切り替えても入力中の検索語は残り、閉じて開き直すと前回の検索語が選択状態で戻ります。ファイルパレットは空のとき最近開いたファイルを並べ、結果が 50 件で切られたときはその旨を表示します。コード検索には正規表現（Alt+R）・大文字小文字の区別（Alt+C）・単語単位（Alt+W）の切り替えがあり、検索語の中の path:<ディレクトリ or glob> で対象を絞れます。大文字小文字は「区別する」を押さない限りどのエンジンでも区別しません。ヒットを開くと該当行の一致箇所が強調され、大きな仮想表示のファイルではファイル内検索バーに検索語が入ります。「固定」（または Ctrl+Enter）を押すと検索語が下パネルの「検索」タブに移り、ファイルを開いて回る間も結果一覧が残ります。検索語は URL（?results=）に載るのでリロードしても同じ検索が走ります。"
+                },
+                {
+                  kind: "paragraph",
+                  text: "サイドバーの絞り込みは文字列（パスの部分一致）、/pattern/（正規表現）、~text（あいまい一致）、*.ts や src/**（glob）を受け付け、絞り込み中は「一致 / 全体」の件数を表示します。"
+                },
+                {
+                  kind: "paragraph",
+                  text: '履歴画面の絞り込みは、語（メッセージ本文。"引用" で空白を含む句）、sha の前方一致、author:<名前>、path:<一部>、since:/after:<日付>、until:/before:<日付>、code:<文字列>（追加・削除された行）、merges:no / merges:only を解釈し、種類の違う条件は AND で組み合わさります。author: にはリポジトリの著者名が候補として出て、絞り込みは URL（?q=）に載るのでリロードや共有でも残ります。各行にはブランチ / タグのラベルとマージ印が付きます。選択したコミットは sha をコピーしたり GitHub で開いたりでき、別のコミットを Shift+クリックするとその区間全体の差分、マージコミットでは比較する親を選べます。↑ / ↓ は画面のどこでも、j / k はコミット一覧にフォーカスがあるときにコミットを送り、g h は見ている ref の履歴を開きます。フォルダページの「履歴」ボタンでそのフォルダに絞った履歴が開きます。ソースの行を選択すると行参照ピルに「この行の履歴」（git log -L）が出て、ファイルページには前後のリビジョンへ移るボタン、ref ピッカーには最近使った ref のチップが並びます。'
+                }
+              ]
+            },
             {
               title: "貼り付けたテキストを扱う",
               blocks: [
@@ -33373,7 +34059,12 @@ code-viewer annotate add-db --db app.db --tab query \\
     githubCopy.type = "button";
     githubCopy.innerHTML = `<span class="lrp-github-copy-icon">${iconSvg("octicon-copy", COPY_16_PATHS)}</span><span class="lrp-github-copy-label"></span>`;
     githubActions.append(githubOpen, githubCopy);
-    pill.append(copyButton, githubActions, closeButton);
+    const historyButton = document.createElement("button");
+    historyButton.id = "line-ref-pill-history";
+    historyButton.type = "button";
+    historyButton.hidden = !deps.openLineHistory;
+    historyButton.innerHTML = iconSvg("octicon-git-branch", GIT_BRANCH_16_PATH) + '<span class="lrp-history-label"></span>';
+    pill.append(copyButton, githubActions, historyButton, closeButton);
     document.body.appendChild(pill);
     let refText = "";
     let currentPath = "";
@@ -33382,6 +34073,14 @@ code-viewer annotate add-db --db app.db --tab query \\
     let githubUrl = "";
     let feedbackTimer = null;
     let githubFeedbackTimer = null;
+    function renderHistoryAction() {
+      if (!deps.openLineHistory) return;
+      const title = deps.lineHistoryTitle?.() ?? "Line history";
+      historyButton.title = title;
+      historyButton.setAttribute("aria-label", title);
+      const label = historyButton.querySelector(".lrp-history-label");
+      if (label) label.textContent = title;
+    }
     function renderGithubActions() {
       const openTitle = deps.githubOpenTitle();
       const copyTitle = deps.githubCopyTitle();
@@ -33473,6 +34172,10 @@ code-viewer annotate add-db --db app.db --tab query \\
         if (icon) icon.innerHTML = iconSvg("octicon-copy", COPY_16_PATHS);
       }, 1200);
     });
+    historyButton.addEventListener("click", () => {
+      if (!currentPath || !deps.openLineHistory) return;
+      deps.openLineHistory(currentPath, currentStart, currentEnd);
+    });
     closeButton.addEventListener("click", () => {
       deps.onClose();
     });
@@ -33487,6 +34190,7 @@ code-viewer annotate add-db --db app.db --tab query \\
         currentEnd = Math.max(1, Math.floor(Math.max(start, end)));
         githubUrl = deps.githubUrlForSelection(currentPath, currentStart, currentEnd) || "";
         renderGithubActions();
+        renderHistoryAction();
         if (feedbackTimer) {
           clearTimeout(feedbackTimer);
           feedbackTimer = null;
@@ -33594,6 +34298,7 @@ code-viewer annotate add-db --db app.db --tab query \\
   }
 
   // web-src/views/ref-picker.ts
+  var QUICK_REF_VALUES = /* @__PURE__ */ new Set(["worktree", "HEAD", "--staged"]);
   function createRefPicker(deps) {
     function wireRefSelectorInput(input2, onPick) {
       const wrap = input2.closest("[data-ref-selector]");
@@ -33613,6 +34318,37 @@ code-viewer annotate add-db --db app.db --tab query \\
       });
       if (onPick)
         input2.addEventListener("change", () => onPick(input2.value || "worktree"));
+      input2.addEventListener("change", () => rememberRef(input2.value));
+    }
+    function rememberRef(value) {
+      const ref = (value || "").trim();
+      if (!ref || QUICK_REF_VALUES.has(ref)) return;
+      deps.rememberRecentRef?.(ref);
+    }
+    function renderRecentChips(current) {
+      let row = popover.querySelector(".rp-recent");
+      const recent = (deps.getRecentRefs?.() ?? []).filter((ref) => ref && !QUICK_REF_VALUES.has(ref)).reverse();
+      if (!row) {
+        row = document.createElement("div");
+        row.className = "rp-recent";
+        const quick = popover.querySelector(".rp-quick");
+        if (quick) quick.after(row);
+        else popover.prepend(row);
+      }
+      row.replaceChildren();
+      row.hidden = recent.length === 0;
+      const title = deps.recentRefTitle?.() ?? "";
+      for (const ref of recent) {
+        const chip = document.createElement("button");
+        chip.type = "button";
+        chip.className = "rp-chip rp-chip-recent";
+        chip.dataset.val = ref;
+        chip.textContent = ref;
+        if (title) chip.title = title;
+        chip.classList.toggle("current", ref === current);
+        chip.addEventListener("click", () => handlePicked(ref));
+        row.appendChild(chip);
+      }
     }
     const REFS = {
       branches: [],
@@ -33837,6 +34573,7 @@ code-viewer annotate add-db --db app.db --tab query \\
       popover.querySelectorAll(".rp-chip").forEach((c2) => {
         c2.classList.toggle("current", c2.dataset.val === cur);
       });
+      renderRecentChips(cur);
       popover.hidden = false;
       const r2 = input2.getBoundingClientRect();
       const popWidth = Math.min(560, Math.floor(window.innerWidth * 0.9));
@@ -34720,6 +35457,8 @@ code-viewer annotate add-db --db app.db --tab query \\
       input2.title = invalid ? filter.error || "invalid regular expression" : "";
       const filterActive = filter.kind !== "empty" && !invalid;
       const matches2 = invalid ? () => true : filter.match;
+      let totalFiles = 0;
+      let visibleFiles = 0;
       const walk = (node, depth) => {
         let subtreeVisible = false;
         const rows = [];
@@ -34744,7 +35483,9 @@ code-viewer annotate add-db --db app.db --tab query \\
           } else {
             const testHidden = STATE.hideTests && !isRepositorySidebarMode() && isTestPath(item.file.path || "");
             const visible = !testHidden && matches2(item.file.path || "");
+            if (!testHidden) totalFiles++;
             if (visible) {
+              visibleFiles++;
               rows.push({
                 kind: "file",
                 path: item.file.path,
@@ -34759,6 +35500,31 @@ code-viewer annotate add-db --db app.db --tab query \\
         return { visible: subtreeVisible, rows };
       };
       SIDEBAR_VISIBLE_ROWS = walk(SIDEBAR_TREE_ROOT, 0).rows;
+      syncSidebarFilterCount(filterActive, visibleFiles, totalFiles);
+    }
+    let SIDEBAR_TOTALS_BASE = "";
+    let SIDEBAR_TOTALS_FILTER_TEXT = "";
+    function setSidebarTotals(text3) {
+      SIDEBAR_TOTALS_BASE = text3;
+      const el2 = $("#totals");
+      if (el2.textContent === SIDEBAR_TOTALS_FILTER_TEXT) el2.textContent = text3;
+      if (!SIDEBAR_TOTALS_FILTER_TEXT) el2.textContent = text3;
+    }
+    function syncSidebarFilterCount(active, visible, total) {
+      const el2 = document.querySelector("#totals");
+      if (!el2) return;
+      if (!active) {
+        if (SIDEBAR_TOTALS_FILTER_TEXT) {
+          if (el2.textContent === SIDEBAR_TOTALS_FILTER_TEXT)
+            el2.textContent = SIDEBAR_TOTALS_BASE;
+          el2.removeAttribute("title");
+          SIDEBAR_TOTALS_FILTER_TEXT = "";
+        }
+        return;
+      }
+      SIDEBAR_TOTALS_FILTER_TEXT = `${visible} / ${total}`;
+      el2.textContent = SIDEBAR_TOTALS_FILTER_TEXT;
+      el2.title = deps.filterCountTitle(visible, total);
     }
     function sidebarVirtualRange() {
       const sidebar = document.querySelector("#sidebar");
@@ -35028,7 +35794,9 @@ code-viewer annotate add-db --db app.db --tab query \\
       } else {
         renderFlat(files, ul, onFileClick);
       }
-      $("#totals").textContent = !repoSidebar && files.length ? `${files.length} file${files.length === 1 ? "" : "s"}` : "";
+      setSidebarTotals(
+        !repoSidebar && files.length ? `${files.length} file${files.length === 1 ? "" : "s"}` : ""
+      );
       const effectiveView = treeMode ? "tree" : STATE.sbView;
       $$(".sb-view-seg button").forEach((b2) => {
         b2.classList.toggle("active", b2.dataset.view === effectiveView);
@@ -35143,10 +35911,16 @@ code-viewer annotate add-db --db app.db --tab query \\
       input2.title = invalid ? filter.error || "invalid regular expression" : "";
       const matches2 = invalid ? () => true : filter.match;
       const filterActive = filter.kind !== "empty" && !invalid;
+      let totalFiles = 0;
+      let visibleFiles = 0;
       $$("#filelist li[data-path]").forEach((li) => {
         const match2 = matches2(li.dataset.path || "");
         li.classList.toggle("hidden", !match2);
+        if (li.classList.contains("hidden-by-tests")) return;
+        totalFiles++;
+        if (match2) visibleFiles++;
       });
+      syncSidebarFilterCount(filterActive, visibleFiles, totalFiles);
       if (!isRepositorySidebarMode()) {
         document.querySelectorAll(".gdp-file-shell").forEach((card) => {
           const match2 = matches2(card.dataset.path || "");
@@ -35652,6 +36426,9 @@ code-viewer annotate add-db --db app.db --tab query \\
       repositoryWebTarget,
       openGithubLabel,
       openRepositoryWebLabel,
+      folderHistoryLabel,
+      folderHistoryTitle,
+      openFolderHistory,
       fileBadge
     } = deps;
     let REPO_SORT = {
@@ -36068,6 +36845,15 @@ code-viewer annotate add-db --db app.db --tab query \\
         meta.ref
       );
       if (repositoryWebLink) toolbar.appendChild(repositoryWebLink);
+      const historyButton = document.createElement("button");
+      historyButton.type = "button";
+      historyButton.className = "gdp-btn gdp-btn-sm gdp-repo-history-btn";
+      historyButton.textContent = folderHistoryLabel();
+      historyButton.title = folderHistoryTitle();
+      historyButton.addEventListener("click", () => {
+        openFolderHistory(meta.ref, meta.path || "");
+      });
+      toolbar.appendChild(historyButton);
       if (canTrashWorktreeRef(meta.ref)) {
         toolbar.appendChild(
           createNewFolderButton(meta.path || "", () => loadRepo())
@@ -36633,294 +37419,12 @@ code-viewer annotate add-db --db app.db --tab query \\
     };
   }
 
-  // web-src/core/fuzzy-search.ts
-  function basenameStart(path) {
-    const slash = path.lastIndexOf("/");
-    return slash < 0 ? 0 : slash + 1;
-  }
-  function isBoundary(path, index) {
-    if (index <= 0) return true;
-    const prev = path[index - 1];
-    return prev === "/" || prev === "-" || prev === "_" || prev === "." || prev === " ";
-  }
-  function toRanges(indices) {
-    const ranges = [];
-    for (const index of indices) {
-      const last = ranges[ranges.length - 1];
-      if (last && last.end === index) {
-        last.end = index + 1;
-      } else {
-        ranges.push({ start: index, end: index + 1 });
-      }
-    }
-    return ranges;
-  }
-  function basenameMatchTier(loweredQuery, loweredBasename) {
-    if (loweredBasename === loweredQuery) return 4;
-    if (loweredBasename.startsWith(`${loweredQuery}.`)) return 3;
-    if (loweredBasename.startsWith(loweredQuery)) return 2;
-    if (loweredBasename.includes(loweredQuery)) return 1;
-    return 0;
-  }
-  function pathMatchTier(loweredQuery, loweredPath, loweredBasename) {
-    if (loweredQuery.includes("/") && (loweredPath === loweredQuery || loweredPath.endsWith(`/${loweredQuery}`)))
-      return 4;
-    return basenameMatchTier(loweredQuery, loweredBasename);
-  }
-  function contiguousPathRange(loweredQuery, loweredPath, baseStart) {
-    const loweredBasename = loweredPath.slice(baseStart);
-    const basenameMatchStart = loweredBasename.indexOf(loweredQuery);
-    if (basenameMatchStart >= 0) {
-      const start = baseStart + basenameMatchStart;
-      return { start, end: start + loweredQuery.length };
-    }
-    if (loweredQuery.includes("/")) {
-      const pathMatchStart = loweredPath.endsWith(`/${loweredQuery}`) ? loweredPath.length - loweredQuery.length : loweredPath === loweredQuery ? 0 : -1;
-      if (pathMatchStart >= 0)
-        return {
-          start: pathMatchStart,
-          end: pathMatchStart + loweredQuery.length
-        };
-    }
-    return null;
-  }
-  function computeFuzzyMatch(query, path) {
-    const q = query.trim().toLowerCase();
-    if (!q) return { score: 0, ranges: [], tier: 0 };
-    const lowerPath = path.toLowerCase();
-    const baseStart = basenameStart(path);
-    const indices = [];
-    let from = 0;
-    let score = 0;
-    for (const ch of q) {
-      const index = lowerPath.indexOf(ch, from);
-      if (index < 0) return null;
-      indices.push(index);
-      score += 10;
-      if (index >= baseStart) score += 8;
-      if (isBoundary(path, index)) score += 6;
-      const prev = indices[indices.length - 2];
-      if (prev != null && prev + 1 === index) score += 12;
-      from = index + 1;
-    }
-    const first = indices[0];
-    score -= Math.min(first, 40);
-    if (indices[0] >= baseStart) score += 20;
-    const basename = lowerPath.slice(baseStart);
-    const tier = pathMatchTier(q, lowerPath, basename);
-    const contiguousRange = contiguousPathRange(q, lowerPath, baseStart);
-    return {
-      score,
-      ranges: contiguousRange ? [contiguousRange] : toRanges(indices),
-      tier
-    };
-  }
-  function fuzzyMatchPath(query, path) {
-    const match2 = computeFuzzyMatch(query, path);
-    return match2 ? { score: match2.score, ranges: match2.ranges } : null;
-  }
-  function rankFuzzyPaths(query, items, limit) {
-    const bounded = Number.isInteger(limit) && limit !== void 0 && limit > 0 ? Math.floor(limit) : 0;
-    const compare = (a2, b2) => b2.tier - a2.tier || b2.score - a2.score || a2.item.path.localeCompare(b2.item.path);
-    if (!bounded) {
-      return items.map((item) => {
-        const match2 = computeFuzzyMatch(query, item.path);
-        return match2 ? { item, score: match2.score, ranges: match2.ranges, tier: match2.tier } : null;
-      }).filter(
-        (item) => item !== null
-      ).sort(compare).map(({ item, score, ranges }) => ({ item, score, ranges }));
-    }
-    const top = [];
-    for (const item of items) {
-      const match2 = computeFuzzyMatch(query, item.path);
-      if (!match2) continue;
-      const ranked = {
-        item,
-        score: match2.score,
-        ranges: match2.ranges,
-        tier: match2.tier
-      };
-      pushBoundedTop(top, ranked, bounded, compare);
-    }
-    return top.sort(compare).map(({ item, score, ranges }) => ({ item, score, ranges }));
-  }
-  function pushBoundedTop(heap, item, limit, compareBestFirst) {
-    const isWorse = (a2, b2) => compareBestFirst(a2, b2) > 0;
-    const siftUp = (index) => {
-      while (index > 0) {
-        const parent = Math.floor((index - 1) / 2);
-        if (!isWorse(heap[index], heap[parent])) break;
-        [heap[index], heap[parent]] = [heap[parent], heap[index]];
-        index = parent;
-      }
-    };
-    const siftDown = (index) => {
-      while (true) {
-        const left = index * 2 + 1;
-        const right = left + 1;
-        let worst = index;
-        if (left < heap.length && isWorse(heap[left], heap[worst])) worst = left;
-        if (right < heap.length && isWorse(heap[right], heap[worst]))
-          worst = right;
-        if (worst === index) break;
-        [heap[index], heap[worst]] = [heap[worst], heap[index]];
-        index = worst;
-      }
-    };
-    if (heap.length < limit) {
-      heap.push(item);
-      siftUp(heap.length - 1);
-      return;
-    }
-    if (compareBestFirst(item, heap[0]) >= 0) return;
-    heap[0] = item;
-    siftDown(0);
-  }
-  function rankGlobPathMatches(query, items, limit) {
-    const matchPath = createGlobPathMatcher(query);
-    if (!matchPath) return [];
-    const bounded = Number.isInteger(limit) && limit !== void 0 && limit > 0 ? Math.floor(limit) : 0;
-    const compare = (a2, b2) => b2.score - a2.score || a2.item.path.localeCompare(b2.item.path);
-    if (!bounded) {
-      return items.map((item) => {
-        const match2 = matchPath(item.path);
-        return match2 ? {
-          item,
-          score: match2.score,
-          ranges: match2.ranges,
-          mode: "glob"
-        } : null;
-      }).filter((item) => item !== null).sort(compare);
-    }
-    const top = [];
-    for (const item of items) {
-      const match2 = matchPath(item.path);
-      if (!match2) continue;
-      const ranked = {
-        item,
-        score: match2.score,
-        ranges: match2.ranges,
-        mode: "glob"
-      };
-      pushBoundedTop(top, ranked, bounded, compare);
-    }
-    return top.sort(compare);
-  }
-  function rankPathMatches(query, items, limit) {
-    if (isGlobPathQuery(query)) {
-      return rankGlobPathMatches(query, items, limit);
-    }
-    return rankFuzzyPaths(query, items, limit).map((item) => ({
-      ...item,
-      mode: "fuzzy"
-    }));
-  }
-  function isGlobPathQuery(query) {
-    return /[*?]/.test(query.trim());
-  }
-  function escapeRegexChar(ch) {
-    return /[\\^$+?.()|{}]/.test(ch) ? `\\${ch}` : ch;
-  }
-  function globToRegExp(query) {
-    const pattern = query.trim();
-    if (!pattern) return null;
-    let source = "^";
-    for (let i2 = 0; i2 < pattern.length; i2++) {
-      const ch = pattern[i2];
-      if (ch === "*") {
-        if (pattern[i2 + 1] === "*") {
-          source += ".*";
-          i2++;
-        } else {
-          source += "[^/]*";
-        }
-      } else if (ch === "?") {
-        source += "[^/]";
-      } else if (ch === "[") {
-        const close = pattern.indexOf("]", i2 + 1);
-        if (close < 0) {
-          source += "\\[";
-        } else {
-          const body = pattern.slice(i2 + 1, close).replace(/\\/g, "\\\\");
-          source += `[${body}]`;
-          i2 = close;
-        }
-      } else {
-        source += escapeRegexChar(ch);
-      }
-    }
-    source += "$";
-    try {
-      return new RegExp(source, "i");
-    } catch {
-      return null;
-    }
-  }
-  function globMatchPath(query, path) {
-    return createGlobPathMatcher(query)?.(path) ?? null;
-  }
-  function createGlobPathMatcher(query) {
-    const regex = globToRegExp(query);
-    if (!regex) return null;
-    const literal = query.replace(/[*?[\]]+/g, " ").trim().split(/\s+/).filter(Boolean);
-    const suffix = query.replace(/^\*+/, "").toLowerCase();
-    return (path) => {
-      const baseStart = basenameStart(path);
-      const basename = path.slice(baseStart);
-      if (!regex.test(path) && (query.includes("/") || !regex.test(basename)))
-        return null;
-      const ranges = [];
-      const lowerPath = path.toLowerCase();
-      for (const part of literal) {
-        const start = lowerPath.indexOf(part.toLowerCase());
-        if (start >= 0) ranges.push({ start, end: start + part.length });
-      }
-      ranges.sort((a2, b2) => a2.start - b2.start || a2.end - b2.end);
-      const mergedRanges = [];
-      for (const range of ranges) {
-        const last = mergedRanges[mergedRanges.length - 1];
-        if (last && last.end >= range.start) {
-          last.end = Math.max(last.end, range.end);
-        } else {
-          mergedRanges.push({ ...range });
-        }
-      }
-      const score = 1e3 - Math.min(path.length, 200) + (path.slice(baseStart).toLowerCase().endsWith(suffix) ? 50 : 0);
-      return { score, ranges: mergedRanges };
-    };
-  }
-
-  // web-src/core/search-palette.ts
-  var PALETTE_RESULT_LIMIT = 50;
-  var GREP_SELECTION_HISTORY_LIMIT = 100;
-  var MIN_GREP_PALETTE_WIDTH = 720;
-  var MAX_GREP_PALETTE_WIDTH = 2400;
-  var MIN_GREP_PALETTE_HEIGHT = 420;
-  var MAX_GREP_PALETTE_HEIGHT = 1400;
-  function limitPaletteResults(items) {
-    return items.slice(0, PALETTE_RESULT_LIMIT);
-  }
-  function movePaletteSelection(index, count, direction) {
-    if (count <= 0) return -1;
-    if (index < 0) return direction > 0 ? 0 : count - 1;
-    return Math.max(0, Math.min(count - 1, index + direction));
-  }
-  function rememberPaletteSelection(history2, path) {
-    const next = history2.filter((entry) => entry !== path);
-    next.push(path);
-    return next.slice(-GREP_SELECTION_HISTORY_LIMIT);
-  }
-  function rankPaletteResultsByHistory(items, history2) {
-    const priority = new Map(history2.map((path, index) => [path, index + 1]));
-    return items.map((item, index) => ({ item, index })).sort(
-      (a2, b2) => (priority.get(b2.item.path) ?? 0) - (priority.get(a2.item.path) ?? 0) || a2.index - b2.index
-    ).map(({ item }) => item);
-  }
-
   // web-src/views/search-palette-i18n.ts
   var EN2 = {
     files: "Files",
     grep: "Grep",
+    switchToFiles: "Switch to file search (Ctrl+K)",
+    switchToGrep: "Switch to text search (Ctrl+G)",
     searchFiles: "Search files",
     searchText: "Search text",
     fileCodePreview: "File code preview",
@@ -36931,14 +37435,20 @@ code-viewer annotate add-db --db app.db --tab query \\
     fuzzyHint: "Fuzzy path search",
     plain: "Plain",
     regex: ".* Regex",
+    matchCase: "Aa",
+    matchCaseTitle: "Match case (Alt+C)",
+    wholeWord: "Word",
+    wholeWordTitle: "Match whole words only (Alt+W)",
     excludeTests: "No test",
     excludeTestsTitle: "Exclude test/spec files",
     groupFiles: "Group files",
     groupFilesTitle: "Group matching lines by file",
-    regexHint: "Alt+R regex",
+    grepHint: "path:<dir or glob> narrows · Alt+R regex",
     windowWidth: "window width",
     windowHeight: "window height",
     regexMode: "regex mode",
+    caseSensitivity: "case sensitivity",
+    wordMatching: "whole-word matching",
     fileGrouping: "file grouping",
     testExclusion: "test exclusion",
     saveFailed: (label, error2) => `Failed to save ${label}: ${error2}`,
@@ -36952,22 +37462,42 @@ code-viewer annotate add-db --db app.db --tab query \\
     line: (line, column) => `Line ${line}:${column}`,
     diffFiles: (count) => `${count} diff files`,
     typeToSearchFiles: "Type to search repository files",
+    recentFiles: (count) => `Recent files - ${count}`,
     loadingFiles: "Loading files...",
-    results: (count) => `${count} results`,
+    results: (count, total, candidatesTruncated) => (total === void 0 ? `${count} results` : `${count} of ${total} results`) + (candidatesTruncated ? " · file list truncated" : ""),
     noResults: "No results",
     typeToGrep: "Type to grep",
     invalidRegex: "Invalid regular expression",
     searching: "Searching...",
     repositoryChanged: "Repository changed; search again",
-    grepSummary: ({ engine, regex, testsExcluded, truncated, count }) => engine + (regex ? " regex" : " plain") + (testsExcluded ? " · tests excluded" : "") + (truncated ? " truncated" : "") + ` - ${count} results`,
+    grepSummary: ({
+      engine,
+      regex,
+      caseSensitive,
+      wholeWord,
+      testsExcluded,
+      truncated,
+      count,
+      paths
+    }) => engine + (regex ? " regex" : " plain") + (caseSensitive ? " · match case" : "") + (wholeWord ? " · whole word" : "") + (testsExcluded ? " · tests excluded" : "") + (paths.length ? ` · in ${paths.join(" ")}` : "") + (truncated ? " truncated" : "") + ` - ${count} results`,
     searchFailed: (error2) => `Search failed: ${error2}`,
     savingSelection: "Saving selection...",
     selectionSaveFailed: (error2) => `Failed to save selection: ${error2}`,
-    unknownError: "unknown error"
+    unknownError: "unknown error",
+    pinResults: "Pin",
+    pinResultsTitle: "Keep these results open in the bottom panel while you browse (Ctrl+Enter)",
+    resultsTitle: "Search",
+    resultsOpen: "Open the search results panel",
+    resultsRun: "Search",
+    resultsPlaceholder: "Search text (path:<dir or glob> narrows)",
+    resultsIdle: "Type a search and press Enter",
+    resultsScope: (ref) => `in ${ref}`
   };
   var JA2 = {
     files: "ファイル",
     grep: "GREP",
+    switchToFiles: "ファイル名検索に切り替え (Ctrl+K)",
+    switchToGrep: "コード検索に切り替え (Ctrl+G)",
     searchFiles: "ファイルを検索",
     searchText: "コードを検索",
     fileCodePreview: "ファイルのコード表示",
@@ -36978,14 +37508,20 @@ code-viewer annotate add-db --db app.db --tab query \\
     fuzzyHint: "パスのあいまい検索",
     plain: "通常",
     regex: ".* 正規表現",
+    matchCase: "Aa",
+    matchCaseTitle: "大文字と小文字を区別 (Alt+C)",
+    wholeWord: "単語",
+    wholeWordTitle: "単語単位で一致 (Alt+W)",
     excludeTests: "テスト除外",
     excludeTestsTitle: "test/spec ファイルを除外",
     groupFiles: "ファイル別",
     groupFilesTitle: "一致した行をファイル別に表示",
-    regexHint: "Alt+R 正規表現",
+    grepHint: "path:<ディレクトリ or glob> で絞り込み · Alt+R 正規表現",
     windowWidth: "ウィンドウの幅",
     windowHeight: "ウィンドウの高さ",
     regexMode: "正規表現モード",
+    caseSensitivity: "大文字小文字の区別",
+    wordMatching: "単語単位の一致",
     fileGrouping: "ファイル別表示",
     testExclusion: "テスト除外",
     saveFailed: (label, error2) => `${label}を保存できませんでした: ${error2}`,
@@ -36999,23 +37535,92 @@ code-viewer annotate add-db --db app.db --tab query \\
     line: (line, column) => `${line} 行:${column}`,
     diffFiles: (count) => `差分ファイル ${count} 件`,
     typeToSearchFiles: "リポジトリ内のファイル名を入力してください",
+    recentFiles: (count) => `最近開いたファイル - ${count} 件`,
     loadingFiles: "ファイルを読み込み中...",
-    results: (count) => `${count} 件`,
+    results: (count, total, candidatesTruncated) => (total === void 0 ? `${count} 件` : `${total} 件中 ${count} 件`) + (candidatesTruncated ? "・ファイル一覧は上限で打ち切り" : ""),
     noResults: "該当なし",
     typeToGrep: "検索するコードを入力してください",
     invalidRegex: "正規表現が正しくありません",
     searching: "検索中...",
     repositoryChanged: "リポジトリが変更されました。もう一度検索してください",
-    grepSummary: ({ engine, regex, testsExcluded, truncated, count }) => engine + (regex ? "・正規表現" : "・通常") + (testsExcluded ? "・テスト除外" : "") + (truncated ? "・一部表示" : "") + ` - ${count} 件`,
+    grepSummary: ({
+      engine,
+      regex,
+      caseSensitive,
+      wholeWord,
+      testsExcluded,
+      truncated,
+      count,
+      paths
+    }) => engine + (regex ? "・正規表現" : "・通常") + (caseSensitive ? "・大文字小文字を区別" : "") + (wholeWord ? "・単語単位" : "") + (testsExcluded ? "・テスト除外" : "") + (paths.length ? `・${paths.join(" ")} 内` : "") + (truncated ? "・一部表示" : "") + ` - ${count} 件`,
     searchFailed: (error2) => `検索に失敗しました: ${error2}`,
     savingSelection: "選択履歴を保存中...",
     selectionSaveFailed: (error2) => `選択履歴を保存できませんでした: ${error2}`,
-    unknownError: "不明なエラー"
+    unknownError: "不明なエラー",
+    pinResults: "固定",
+    pinResultsTitle: "この結果を下パネルに出したまま閲覧を続ける (Ctrl+Enter)",
+    resultsTitle: "検索",
+    resultsOpen: "検索結果パネルを開く",
+    resultsRun: "検索",
+    resultsPlaceholder: "検索するコード（path:<ディレクトリ or glob> で絞り込み）",
+    resultsIdle: "検索語を入力して Enter",
+    resultsScope: (ref) => `${ref} 内`
   };
   function searchPaletteText(language) {
     return language === "ja" ? JA2 : EN2;
   }
 
+  // web-src/views/text-mark.ts
+  function findTextRange(lineText, needle, options = {}) {
+    if (!needle) return null;
+    const haystack = options.caseSensitive ? lineText : lineText.toLowerCase();
+    const target = options.caseSensitive ? needle : needle.toLowerCase();
+    const expectedStart = Math.max(0, (options.nearColumn ?? 1) - 1);
+    let bestStart = -1;
+    let cursor = haystack.indexOf(target);
+    while (cursor >= 0) {
+      if (bestStart < 0 || Math.abs(cursor - expectedStart) < Math.abs(bestStart - expectedStart))
+        bestStart = cursor;
+      cursor = haystack.indexOf(target, cursor + Math.max(1, target.length));
+    }
+    return bestStart < 0 ? null : { start: bestStart, end: bestStart + needle.length };
+  }
+  function markTextRange(cell, start, end, className) {
+    if (end <= start) return;
+    const walker = document.createTreeWalker(cell, NodeFilter.SHOW_TEXT);
+    const parts = [];
+    let offset = 0;
+    for (let node = walker.nextNode(); node; node = walker.nextNode()) {
+      const textNode = node;
+      const nextOffset = offset + textNode.data.length;
+      const partStart = Math.max(start, offset);
+      const partEnd = Math.min(end, nextOffset);
+      if (partStart < partEnd)
+        parts.push({
+          node: textNode,
+          start: partStart - offset,
+          end: partEnd - offset
+        });
+      offset = nextOffset;
+    }
+    for (const part of parts.reverse()) {
+      const selected = part.node.splitText(part.start);
+      selected.splitText(part.end - part.start);
+      const mark = document.createElement("mark");
+      mark.className = className;
+      const parent = selected.parentNode;
+      if (!parent) throw new Error("marked text is detached");
+      parent.insertBefore(mark, selected);
+      mark.appendChild(selected);
+    }
+  }
+  function markNeedleInCell(cell, lineText, needle, className, options = {}) {
+    const range = findTextRange(lineText, needle, options);
+    if (!range) return false;
+    markTextRange(cell, range.start, range.end, className);
+    return true;
+  }
+
   // web-src/views/search-palette-ui.ts
   function createSearchPalette(deps) {
     const {
@@ -37039,14 +37644,18 @@ code-viewer annotate add-db --db app.db --tab query \\
       getFileSelectionHistory,
       getGrepSelectionHistory,
       getGrepRegex,
+      getGrepCaseSensitive,
+      getGrepWholeWord,
       getGrepHideTests,
       getGrepGroupByFile,
       getGrepPaletteWidth,
       getGrepPaletteHeight,
       persistGrepSettings,
-      applyGrepHideTests
+      applyGrepHideTests,
+      openSearchResults
     } = deps;
     let PALETTE = null;
+    const LAST_QUERY = { file: "", grep: "" };
     let repoFileRequestGeneration = 0;
     const GREP_CONTEXT_RADIUS = 5;
     const FILE_PREVIEW_LINE_LIMIT = 200;
@@ -37083,6 +37692,7 @@ code-viewer annotate add-db --db app.db --tab query \\
     }
     function closeSearchPalette() {
       if (!PALETTE) return;
+      LAST_QUERY[PALETTE.mode] = PALETTE.input.value;
       const previousFocusScope = PALETTE.previousFocusScope;
       PALETTE.controller?.abort();
       PALETTE.previewController?.abort();
@@ -37094,6 +37704,7 @@ code-viewer annotate add-db --db app.db --tab query \\
     }
     function createPalette(mode) {
       const previousFocusScope = PALETTE ? PALETTE.previousFocusScope : getPanelFocusScope();
+      const initialQuery = PALETTE ? PALETTE.input.value : LAST_QUERY[mode];
       closeSearchPalette();
       const root = document.createElement("div");
       root.className = "gdp-palette-backdrop";
@@ -37112,7 +37723,19 @@ code-viewer annotate add-db --db app.db --tab query \\
         dialog.style.height = `${clampGrepPaletteHeight(savedHeight)}px`;
       const label = document.createElement("div");
       label.className = "gdp-palette-label";
-      label.textContent = mode === "file" ? text3().files : text3().grep;
+      for (const switchMode of ["file", "grep"]) {
+        const button = document.createElement("button");
+        button.type = "button";
+        button.className = "gdp-palette-mode-button gdp-palette-mode-switch";
+        button.setAttribute("aria-pressed", String(switchMode === mode));
+        button.textContent = switchMode === "file" ? text3().files : text3().grep;
+        button.title = switchMode === "file" ? text3().switchToFiles : text3().switchToGrep;
+        button.addEventListener("mousedown", (event) => {
+          event.preventDefault();
+          if (switchMode !== mode) createPalette(switchMode);
+        });
+        label.appendChild(button);
+      }
       const input2 = document.createElement("input");
       input2.className = "gdp-palette-input";
       input2.type = "search";
@@ -37122,6 +37745,7 @@ code-viewer annotate add-db --db app.db --tab query \\
       input2.setAttribute("role", "combobox");
       input2.setAttribute("aria-expanded", "true");
       input2.setAttribute("aria-controls", "gdp-palette-list");
+      input2.value = initialQuery;
       const status = document.createElement("div");
       status.className = "gdp-palette-status";
       const controls = document.createElement("div");
@@ -37165,6 +37789,8 @@ code-viewer annotate add-db --db app.db --tab query \\
         preview,
         mode,
         grepRegex: getGrepRegex(),
+        grepCaseSensitive: getGrepCaseSensitive(),
+        grepWholeWord: getGrepWholeWord(),
         grepHideTests: getGrepHideTests(),
         grepGroupByFile: getGrepGroupByFile(),
         grepPaletteWidth: clampGrepPaletteWidth(savedWidth ?? dialogRect.width),
@@ -37236,6 +37862,7 @@ code-viewer annotate add-db --db app.db --tab query \\
       input2.addEventListener("input", () => updatePaletteResults(state));
       input2.addEventListener("keydown", (e2) => handlePaletteKeydown(e2, state));
       input2.focus();
+      if (input2.value) input2.select();
       updatePaletteResults(state);
       return state;
     }
@@ -37283,6 +37910,38 @@ code-viewer annotate add-db --db app.db --tab query \\
         e2.preventDefault();
         void updateGrepRegex(state, true);
       });
+      const matchCase = document.createElement("button");
+      matchCase.type = "button";
+      matchCase.className = "gdp-palette-mode-button";
+      matchCase.setAttribute("aria-pressed", String(state.grepCaseSensitive));
+      matchCase.textContent = text3().matchCase;
+      matchCase.title = text3().matchCaseTitle;
+      matchCase.disabled = state.settingsPending;
+      matchCase.addEventListener("mousedown", (e2) => {
+        e2.preventDefault();
+        void updateGrepFlag(
+          state,
+          "grepCaseSensitive",
+          !state.grepCaseSensitive,
+          text3().caseSensitivity
+        );
+      });
+      const wholeWord = document.createElement("button");
+      wholeWord.type = "button";
+      wholeWord.className = "gdp-palette-mode-button";
+      wholeWord.setAttribute("aria-pressed", String(state.grepWholeWord));
+      wholeWord.textContent = text3().wholeWord;
+      wholeWord.title = text3().wholeWordTitle;
+      wholeWord.disabled = state.settingsPending;
+      wholeWord.addEventListener("mousedown", (e2) => {
+        e2.preventDefault();
+        void updateGrepFlag(
+          state,
+          "grepWholeWord",
+          !state.grepWholeWord,
+          text3().wordMatching
+        );
+      });
       const excludeTests = createExcludeTestsButton(state);
       const groupFiles = document.createElement("button");
       groupFiles.type = "button";
@@ -37297,8 +37956,62 @@ code-viewer annotate add-db --db app.db --tab query \\
       });
       const hint = document.createElement("span");
       hint.className = "gdp-palette-mode-hint";
-      hint.textContent = text3().regexHint;
-      state.controls.append(plain, regex, excludeTests, groupFiles, hint);
+      hint.textContent = text3().grepHint;
+      state.controls.append(
+        plain,
+        regex,
+        matchCase,
+        wholeWord,
+        excludeTests,
+        groupFiles
+      );
+      if (openSearchResults) {
+        const pin = document.createElement("button");
+        pin.type = "button";
+        pin.className = "gdp-palette-mode-button gdp-palette-pin";
+        pin.textContent = text3().pinResults;
+        pin.title = text3().pinResultsTitle;
+        pin.addEventListener("mousedown", (e2) => {
+          e2.preventDefault();
+          pinResults(state);
+        });
+        state.controls.append(pin);
+      }
+      state.controls.append(hint);
+    }
+    function pinResults(state) {
+      if (!openSearchResults) return;
+      const query = state.input.value;
+      closeSearchPalette();
+      openSearchResults(query);
+    }
+    async function updateGrepFlag(state, flag, value, label) {
+      if (state.settingsPending || value === state[flag]) return;
+      const previous = state[flag];
+      state[flag] = value;
+      state.settingsPending = true;
+      renderPaletteControls(state);
+      try {
+        await persistGrepSettings(
+          flag === "grepCaseSensitive" ? { grepCaseSensitive: value } : { grepWholeWord: value }
+        );
+        if (PALETTE === state) updatePaletteResults(state);
+      } catch (err) {
+        console.error(`Failed to save grep ${label}`, err);
+        state[flag] = previous;
+        if (PALETTE === state) {
+          state.status.textContent = text3().saveFailed(
+            label,
+            errorMessage2(err, text3().unknownError)
+          );
+        }
+      } finally {
+        state.settingsPending = false;
+        if (PALETTE === state) {
+          renderPaletteControls(state);
+          state.input.focus();
+        }
+      }
     }
     function errorMessage2(err, fallback) {
       return err instanceof Error && err.message ? err.message : fallback;
@@ -37423,51 +38136,16 @@ code-viewer annotate add-db --db app.db --tab query \\
       if (cursor < path.length)
         parent.appendChild(document.createTextNode(path.slice(cursor)));
     }
-    function grepMatchRange(lineText, item) {
-      const matchText = item.matchText || (item.regex ? "" : item.query);
-      if (!matchText) return null;
-      const caseSensitive = item.regex || /[A-Z]/.test(item.query);
-      const haystack = caseSensitive ? lineText : lineText.toLowerCase();
-      const needle = caseSensitive ? matchText : matchText.toLowerCase();
-      const expectedStart = Math.max(0, item.column - 1);
-      let bestStart = -1;
-      let cursor = haystack.indexOf(needle);
-      while (cursor >= 0) {
-        if (bestStart < 0 || Math.abs(cursor - expectedStart) < Math.abs(bestStart - expectedStart))
-          bestStart = cursor;
-        cursor = haystack.indexOf(needle, cursor + Math.max(1, needle.length));
-      }
-      return bestStart < 0 ? null : { start: bestStart, end: bestStart + matchText.length };
+    function grepHighlightText(item) {
+      return item.matchText || (item.regex ? "" : item.term);
     }
     function highlightGrepMatch(cell, lineText, item) {
-      const match2 = grepMatchRange(lineText, item);
-      if (!match2) return;
-      const walker = document.createTreeWalker(cell, NodeFilter.SHOW_TEXT);
-      const parts = [];
-      let offset = 0;
-      for (let node = walker.nextNode(); node; node = walker.nextNode()) {
-        const textNode = node;
-        const nextOffset = offset + textNode.data.length;
-        const start = Math.max(match2.start, offset);
-        const end = Math.min(match2.end, nextOffset);
-        if (start < end)
-          parts.push({
-            node: textNode,
-            start: start - offset,
-            end: end - offset
-          });
-        offset = nextOffset;
-      }
-      for (const part of parts.reverse()) {
-        const selected = part.node.splitText(part.start);
-        selected.splitText(part.end - part.start);
-        const mark = document.createElement("mark");
-        mark.className = "gdp-grep-match";
-        const parent = selected.parentNode;
-        if (!parent) throw new Error("grep match text is detached");
-        parent.insertBefore(mark, selected);
-        mark.appendChild(selected);
-      }
+      const needle = grepHighlightText(item);
+      if (!needle) return;
+      markNeedleInCell(cell, lineText, needle, "gdp-grep-match", {
+        caseSensitive: item.caseSensitive,
+        nearColumn: item.column
+      });
     }
     function palettePreviewTarget(item) {
       return item.kind === "file" ? {
@@ -37769,27 +38447,73 @@ code-viewer annotate add-db --db app.db --tab query \\
       ).sort(
         (a2, b2) => b2.match.score - a2.match.score || a2.file.path.localeCompare(b2.file.path)
       );
-      return limitPaletteResults(
-        rankPaletteResultsByHistory(
-          candidates.map((candidate) => ({
-            kind: "file",
-            path: candidate.file.path,
-            old_path: candidate.file.old_path,
-            displayPath: candidate.displayPath,
-            ref: paletteRef("diff"),
-            targetPath: fileSourceTarget(candidate.file).path,
-            targetRef: fileSourceTarget(candidate.file).ref,
-            source: "diff",
-            ranges: candidate.match.ranges
-          })),
-          state.fileHistory
+      return {
+        total: candidates.length,
+        items: limitPaletteResults(
+          rankPaletteResultsByHistory(
+            candidates.map((candidate) => ({
+              kind: "file",
+              path: candidate.file.path,
+              old_path: candidate.file.old_path,
+              displayPath: candidate.displayPath,
+              ref: paletteRef("diff"),
+              targetPath: fileSourceTarget(candidate.file).path,
+              targetRef: fileSourceTarget(candidate.file).ref,
+              source: "diff",
+              ranges: candidate.match.ranges
+            })),
+            state.fileHistory
+          )
         )
+      };
+    }
+    async function updateRecentFilePalette(state, source) {
+      const recent = [...state.fileHistory].reverse();
+      if (recent.length === 0) {
+        state.items = [];
+        state.selected = -1;
+        state.status.textContent = text3().typeToSearchFiles;
+        renderPalette(state);
+        return;
+      }
+      state.status.textContent = text3().loadingFiles;
+      const ref = paletteRef(source);
+      const requestGeneration = ++repoFileRequestGeneration;
+      let response;
+      try {
+        response = await repoPaletteFiles(ref);
+      } catch (err) {
+        if (requestGeneration !== repoFileRequestGeneration) return;
+        throw err;
+      }
+      if (PALETTE !== state || state.input.value.trim() !== "" || requestGeneration !== repoFileRequestGeneration)
+        return;
+      REPO_FILE_CACHE.set(repoFileCacheKey(ref), response);
+      const existing = new Set(response.files.map((file) => file.path));
+      state.items = limitPaletteResults(
+        recent.filter(
+          (path) => existing.has(path) && (!state.grepHideTests || !isTestFilePath(path))
+        ).map((path) => ({
+          kind: "file",
+          path,
+          displayPath: path,
+          ref,
+          source,
+          ranges: []
+        }))
       );
+      state.selected = state.items.length ? 0 : -1;
+      state.status.textContent = state.items.length ? text3().recentFiles(state.items.length) : text3().typeToSearchFiles;
+      renderPalette(state);
     }
     async function updateFilePalette(state, query) {
       renderPaletteControls(state);
       const source = paletteSource();
       if (!query.trim()) {
+        if (source === "repo") {
+          await updateRecentFilePalette(state, source);
+          return;
+        }
         const base2 = source === "diff" ? state.diffSnapshot.filter(
           (file) => !state.grepHideTests || !isTestFilePath(file.path)
         ).map((file) => {
@@ -37814,8 +38538,12 @@ code-viewer annotate add-db --db app.db --tab query \\
         renderPalette(state);
         return;
       }
+      let totalMatches = 0;
+      let candidatesTruncated = false;
       if (source === "diff") {
-        state.items = diffFilePaletteItems(state, query);
+        const ranked = diffFilePaletteItems(state, query);
+        state.items = ranked.items;
+        totalMatches = ranked.total;
       } else {
         state.status.textContent = text3().loadingFiles;
         const ref = paletteRef(source);
@@ -37833,9 +38561,10 @@ code-viewer annotate add-db --db app.db --tab query \\
         const visibleFiles = response.files.filter(
           (file) => !state.grepHideTests || !isTestFilePath(file.path)
         );
+        const stats = { total: 0 };
         state.items = limitPaletteResults(
           rankPaletteResultsByHistory(
-            rankPathMatches(query, visibleFiles, PALETTE_RESULT_LIMIT).map(
+            rankPathMatches(query, visibleFiles, PALETTE_RESULT_LIMIT, stats).map(
               (match2) => ({
                 kind: "file",
                 path: match2.item.path,
@@ -37848,23 +38577,37 @@ code-viewer annotate add-db --db app.db --tab query \\
             state.fileHistory
           )
         );
+        totalMatches = stats.total;
+        candidatesTruncated = response.truncated;
       }
       state.selected = state.items.length ? 0 : -1;
-      state.status.textContent = state.items.length ? text3().results(state.items.length) : text3().noResults;
+      state.status.textContent = state.items.length ? text3().results(
+        state.items.length,
+        totalMatches > state.items.length ? totalMatches : void 0,
+        candidatesTruncated
+      ) : text3().noResults;
       renderPalette(state);
     }
+    function diffPathInScope(path, scopes) {
+      if (scopes.length === 0) return true;
+      return scopes.some(
+        (scope) => isGlobPathQuery(scope) ? !!globMatchPath(scope, path) : path === scope || path.startsWith(`${scope.replace(/\/+$/, "")}/`)
+      );
+    }
     function updateGrepPalette(state, query) {
       renderPaletteControls(state);
       state.controller?.abort();
       if (state.debounce) window.clearTimeout(state.debounce);
-      if (!query.trim()) {
+      const parsed = parseGrepQuery(query);
+      const term = parsed.term;
+      if (!term) {
         state.items = [];
         state.selected = -1;
         state.status.textContent = text3().typeToGrep;
         renderPalette(state);
         return;
       }
-      if (state.grepRegex && !regexQueryIsValid(query)) {
+      if (state.grepRegex && !regexQueryIsValid(term)) {
         state.controller?.abort();
         state.items = [];
         state.selected = -1;
@@ -37880,16 +38623,30 @@ code-viewer annotate add-db --db app.db --tab query \\
         const source = paletteSource();
         const ref = paletteRef(source);
         const regex = state.grepRegex;
+        const caseSensitive = state.grepCaseSensitive;
+        const wholeWord = state.grepWholeWord;
         const hideTests = state.grepHideTests;
-        const params = new URLSearchParams();
-        params.set("ref", ref);
-        params.set("q", query);
-        params.set("max", "200");
-        if (regex) params.set("regex", "1");
-        if (hideTests) params.set("exclude_tests", "1");
+        const params = buildGrepRequestParams({
+          term,
+          ref,
+          regex,
+          caseSensitive,
+          wholeWord,
+          hideTests,
+          max: 200
+        });
         appendScopeParams(params);
         if (source === "diff") {
-          for (const file of state.diffSnapshot) params.append("path", file.path);
+          const scoped = state.diffSnapshot.filter(
+            (file) => diffPathInScope(file.path, parsed.paths)
+          );
+          if (scoped.length === 0) {
+            state.status.textContent = text3().noResults;
+            return;
+          }
+          for (const file of scoped) params.append("path", file.path);
+        } else {
+          for (const scope of parsed.paths) params.append("path", scope);
         }
         const controller = new AbortController();
         state.controller = controller;
@@ -37904,7 +38661,7 @@ code-viewer annotate add-db --db app.db --tab query \\
             return r2.json();
           })
         ).then((response) => {
-          if (PALETTE !== state || controller.signal.aborted || state.input.value !== query || state.grepRegex !== regex || state.grepHideTests !== hideTests)
+          if (PALETTE !== state || controller.signal.aborted || state.input.value !== query || state.grepRegex !== regex || state.grepCaseSensitive !== caseSensitive || state.grepWholeWord !== wholeWord || state.grepHideTests !== hideTests)
             return;
           if (responseGenerationIsStale(response.generation)) {
             state.items = [];
@@ -37925,7 +38682,9 @@ code-viewer annotate add-db --db app.db --tab query \\
               preview: match2.preview,
               matchText: match2.matchText,
               query,
+              term,
               regex,
+              caseSensitive,
               ref,
               source
             }))
@@ -37934,9 +38693,12 @@ code-viewer annotate add-db --db app.db --tab query \\
           state.status.textContent = text3().grepSummary({
             engine: response.engine,
             regex,
+            caseSensitive,
+            wholeWord,
             testsExcluded: hideTests,
             truncated: response.truncated,
-            count: state.items.length
+            count: state.items.length,
+            paths: parsed.paths
           });
           renderPalette(state);
         }).catch((err) => {
@@ -38027,12 +38789,14 @@ code-viewer annotate add-db --db app.db --tab query \\
         });
         scrollToFile(item.path, item.line);
       } else {
+        const hl = grepHighlightText(item);
         setRoute({
           screen: "file",
           path: item.path,
           ref: item.ref,
           view: "blob",
           line: item.line,
+          ...hl ? { hl } : {},
           range: currentRange()
         });
         void renderStandaloneSource({ path: item.path, ref: item.ref });
@@ -38048,6 +38812,10 @@ code-viewer annotate add-db --db app.db --tab query \\
       if (e2.key === "Enter") {
         if (state.composing) return;
         e2.preventDefault();
+        if (state.mode === "grep" && (e2.ctrlKey || e2.metaKey) && openSearchResults) {
+          pinResults(state);
+          return;
+        }
         void selectPaletteItem(state);
         return;
       }
@@ -38056,6 +38824,26 @@ code-viewer annotate add-db --db app.db --tab query \\
         void updateGrepRegex(state, !state.grepRegex);
         return;
       }
+      if (state.mode === "grep" && e2.altKey && e2.key.toLowerCase() === "c") {
+        e2.preventDefault();
+        void updateGrepFlag(
+          state,
+          "grepCaseSensitive",
+          !state.grepCaseSensitive,
+          text3().caseSensitivity
+        );
+        return;
+      }
+      if (state.mode === "grep" && e2.altKey && e2.key.toLowerCase() === "w") {
+        e2.preventDefault();
+        void updateGrepFlag(
+          state,
+          "grepWholeWord",
+          !state.grepWholeWord,
+          text3().wordMatching
+        );
+        return;
+      }
       const direction = e2.key === "ArrowDown" || e2.ctrlKey && e2.key.toLowerCase() === "n" ? 1 : e2.key === "ArrowUp" || e2.ctrlKey && e2.key.toLowerCase() === "p" ? -1 : 0;
       if (direction) {
         e2.preventDefault();
@@ -38088,6 +38876,317 @@ code-viewer annotate add-db --db app.db --tab query \\
     };
   }
 
+  // web-src/views/search-results-view.ts
+  var RESULTS_MAX = 500;
+  function createSearchResultsView(deps) {
+    let mounted = false;
+    let input2 = null;
+    let runButton = null;
+    let controls = null;
+    let status = null;
+    let list2 = null;
+    let query = "";
+    let controller = null;
+    let generation = 0;
+    let settingsPending = false;
+    let lastResponse = null;
+    let activeKey = "";
+    const text3 = () => searchPaletteText(deps.getLanguage());
+    function host() {
+      return deps.$("#search-sheet");
+    }
+    function toggleButton(label, title, pressed, onToggle) {
+      const button = document.createElement("button");
+      button.type = "button";
+      button.className = "gdp-palette-mode-button";
+      button.textContent = label;
+      button.title = title;
+      button.setAttribute("aria-pressed", String(pressed));
+      button.disabled = settingsPending;
+      button.addEventListener("click", (event) => {
+        event.preventDefault();
+        onToggle();
+      });
+      return button;
+    }
+    async function updateFlag(patch) {
+      if (settingsPending) return;
+      settingsPending = true;
+      renderControls();
+      try {
+        await deps.persistGrepSettings(patch);
+      } catch (err) {
+        console.error("Failed to save search option", err);
+        if (status)
+          status.textContent = text3().saveFailed(
+            text3().regexMode,
+            err instanceof Error && err.message ? err.message : text3().unknownError
+          );
+      } finally {
+        settingsPending = false;
+        renderControls();
+        if (query) run();
+      }
+    }
+    function renderControls() {
+      if (!controls) return;
+      const current = text3();
+      controls.replaceChildren(
+        toggleButton(
+          current.plain,
+          current.plain,
+          !deps.getGrepRegex(),
+          () => void updateFlag({ grepRegex: false })
+        ),
+        toggleButton(
+          current.regex,
+          "Alt+R",
+          deps.getGrepRegex(),
+          () => void updateFlag({ grepRegex: true })
+        ),
+        toggleButton(
+          current.matchCase,
+          current.matchCaseTitle,
+          deps.getGrepCaseSensitive(),
+          () => void updateFlag({ grepCaseSensitive: !deps.getGrepCaseSensitive() })
+        ),
+        toggleButton(
+          current.wholeWord,
+          current.wholeWordTitle,
+          deps.getGrepWholeWord(),
+          () => void updateFlag({ grepWholeWord: !deps.getGrepWholeWord() })
+        ),
+        toggleButton(
+          current.excludeTests,
+          current.excludeTestsTitle,
+          deps.getGrepHideTests(),
+          () => void updateFlag({ hideTests: !deps.getGrepHideTests() })
+        )
+      );
+    }
+    function mount() {
+      const el2 = host();
+      if (!el2 || mounted) return;
+      mounted = true;
+      el2.replaceChildren();
+      const head = document.createElement("div");
+      head.className = "search-results-head";
+      input2 = document.createElement("input");
+      input2.type = "search";
+      input2.className = "search-results-input";
+      input2.autocomplete = "off";
+      input2.spellcheck = false;
+      input2.addEventListener("keydown", (event) => {
+        if (event.key === "Enter") {
+          event.preventDefault();
+          run(input2?.value ?? "");
+        }
+      });
+      runButton = document.createElement("button");
+      runButton.type = "button";
+      runButton.className = "gdp-btn gdp-btn-sm search-results-run";
+      runButton.addEventListener("click", () => run(input2?.value ?? ""));
+      controls = document.createElement("div");
+      controls.className = "gdp-palette-controls search-results-controls";
+      status = document.createElement("div");
+      status.className = "gdp-palette-status search-results-status";
+      head.append(input2, runButton);
+      list2 = document.createElement("div");
+      list2.className = "gdp-palette-list search-results-list";
+      list2.setAttribute("role", "listbox");
+      el2.append(head, controls, status, list2);
+      localize();
+    }
+    function renderResults() {
+      if (!list2 || !status) return;
+      list2.replaceChildren();
+      if (!lastResponse) {
+        status.textContent = text3().resultsIdle;
+        return;
+      }
+      const { response, term } = lastResponse;
+      const grouped = /* @__PURE__ */ new Map();
+      for (const match2 of response.matches) {
+        const bucket = grouped.get(match2.path) ?? [];
+        bucket.push(match2);
+        grouped.set(match2.path, bucket);
+      }
+      for (const [path, matches2] of grouped) {
+        const group = document.createElement("section");
+        group.className = "gdp-palette-file-group";
+        group.setAttribute("role", "group");
+        group.setAttribute("aria-label", path);
+        const heading2 = document.createElement("div");
+        heading2.className = "gdp-palette-file-heading";
+        const name = document.createElement("span");
+        name.className = "gdp-palette-file-heading-name";
+        name.textContent = path;
+        name.title = path;
+        const count = document.createElement("span");
+        count.className = "gdp-palette-file-heading-count";
+        count.textContent = String(matches2.length);
+        heading2.append(name, count);
+        const rows = document.createElement("div");
+        rows.className = "gdp-palette-file-matches";
+        for (const match2 of matches2) {
+          const key = `${match2.path}\0${match2.line}`;
+          const row = document.createElement("button");
+          row.type = "button";
+          row.className = "gdp-palette-row";
+          row.setAttribute("role", "option");
+          row.dataset.resultKey = key;
+          row.setAttribute("aria-selected", String(key === activeKey));
+          const title = document.createElement("span");
+          title.className = "gdp-palette-row-title";
+          title.textContent = text3().line(match2.line, match2.column);
+          const detail = document.createElement("span");
+          detail.className = "gdp-palette-row-detail";
+          detail.textContent = match2.preview;
+          row.append(title, detail);
+          row.addEventListener("click", () => {
+            setActiveRow(key);
+            const hl = match2.matchText || (deps.getGrepRegex() ? "" : term);
+            deps.openMatch({
+              path: match2.path,
+              line: match2.line,
+              ...hl ? { hl } : {}
+            });
+          });
+          rows.appendChild(row);
+        }
+        group.append(heading2, rows);
+        list2.appendChild(group);
+      }
+    }
+    function setActiveRow(key) {
+      activeKey = key;
+      list2?.querySelectorAll(".gdp-palette-row").forEach((row) => {
+        row.setAttribute("aria-selected", String(row.dataset.resultKey === key));
+      });
+    }
+    function run(nextQuery) {
+      if (!mounted) return;
+      if (nextQuery !== void 0) query = nextQuery.trim();
+      if (input2 && input2.value !== query) input2.value = query;
+      controller?.abort();
+      controller = null;
+      const parsed = parseGrepQuery(query);
+      deps.onQueryChange?.(query);
+      if (!parsed.term) {
+        lastResponse = null;
+        renderResults();
+        return;
+      }
+      const myGeneration = ++generation;
+      if (status) status.textContent = text3().searching;
+      const ref = deps.getRef();
+      const regex = deps.getGrepRegex();
+      const caseSensitive = deps.getGrepCaseSensitive();
+      const wholeWord = deps.getGrepWholeWord();
+      const hideTests = deps.getGrepHideTests();
+      const params = buildGrepRequestParams({
+        term: parsed.term,
+        ref,
+        regex,
+        caseSensitive,
+        wholeWord,
+        hideTests,
+        max: RESULTS_MAX
+      });
+      deps.appendScopeParams(params);
+      for (const scope of parsed.paths) params.append("path", scope);
+      const abort = new AbortController();
+      controller = abort;
+      void deps.trackLoad(
+        fetch(`/_grep?${params.toString()}`, { signal: abort.signal }).then(
+          async (r2) => {
+            if (!r2.ok)
+              throw new Error(
+                `grep request failed (${r2.status}): ${await r2.text()}`
+              );
+            return r2.json();
+          }
+        )
+      ).then((response) => {
+        if (myGeneration !== generation || abort.signal.aborted) return;
+        const current = deps.getServerGeneration();
+        if (response.generation !== void 0 && current > 0 && response.generation < current) {
+          lastResponse = null;
+          renderResults();
+          if (status) status.textContent = text3().repositoryChanged;
+          return;
+        }
+        lastResponse = { response, term: parsed.term };
+        renderResults();
+        if (status)
+          status.textContent = `${text3().grepSummary({
+            engine: response.engine,
+            regex,
+            caseSensitive,
+            wholeWord,
+            testsExcluded: hideTests,
+            truncated: response.truncated,
+            count: response.matches.length,
+            paths: parsed.paths
+          })} · ${text3().resultsScope(ref)}`;
+      }).catch((err) => {
+        if (deps.isAbortError(err) || abort.signal.aborted) return;
+        if (myGeneration !== generation) return;
+        console.error("Search results request failed", err);
+        lastResponse = null;
+        renderResults();
+        if (status)
+          status.textContent = text3().searchFailed(
+            err instanceof Error && err.message ? err.message : text3().unknownError
+          );
+      });
+    }
+    function localize() {
+      if (!mounted) return;
+      const current = text3();
+      if (input2) input2.placeholder = current.resultsPlaceholder;
+      if (runButton) {
+        runButton.textContent = current.resultsRun;
+        runButton.title = current.resultsRun;
+      }
+      host()?.setAttribute("aria-label", current.resultsTitle);
+      renderControls();
+      renderResults();
+    }
+    function isOpen() {
+      const el2 = host();
+      return !!el2 && !el2.hidden;
+    }
+    return {
+      open(nextQuery) {
+        const el2 = host();
+        if (!el2) return;
+        mount();
+        el2.hidden = false;
+        el2.setAttribute("aria-hidden", "false");
+        el2.removeAttribute("inert");
+        document.body.classList.add("search-sheet-open");
+        if (nextQuery !== void 0 && nextQuery !== query) run(nextQuery);
+        else if (nextQuery === void 0 && !lastResponse && query) run(query);
+        else renderResults();
+        input2?.focus();
+      },
+      close() {
+        const el2 = host();
+        if (!el2) return;
+        el2.hidden = true;
+        el2.setAttribute("aria-hidden", "true");
+        el2.setAttribute("inert", "");
+        document.body.classList.remove("search-sheet-open");
+        controller?.abort();
+        controller = null;
+      },
+      isOpen,
+      getQuery: () => query,
+      localize
+    };
+  }
+
   // web-src/views/source-view.ts
   function createSourceView(deps) {
     const {
@@ -38106,6 +39205,7 @@ code-viewer annotate add-db --db app.db --tab query \\
       placeSidebarToggle,
       createFileBreadcrumb,
       createRepositoryWebLink: createRepositoryWebLink2,
+      createRevisionNav,
       createFileDetailMeta,
       createOpenPathButton,
       createMoveToTrashButton,
@@ -38396,10 +39496,17 @@ code-viewer annotate add-db --db app.db --tab query \\
           const cells = table2.querySelectorAll(
             ".gdp-source-line-code"
           );
+          const sourceLines = textValue.split("\n");
           cells.forEach((cell, index) => {
             if (highlightedLines[index] == null) return;
             cell.innerHTML = highlightedLines[index] || " ";
             cell.classList.add("shiki");
+            markSourceHighlightTerm(
+              cell,
+              sourceLines[index] ?? "",
+              index + 1,
+              target
+            );
           });
         }).catch((err) => {
           console.error("Failed to apply source syntax highlighting", err);
@@ -38814,6 +39921,7 @@ code-viewer annotate add-db --db app.db --tab query \\
         const code2 = document.createElement("td");
         code2.className = "gdp-source-line-code";
         code2.textContent = line || " ";
+        markSourceHighlightTerm(code2, line, index + 1, target);
         tr.appendChild(num);
         tr.appendChild(code2);
         tbody.appendChild(tr);
@@ -38959,6 +40067,45 @@ code-viewer annotate add-db --db app.db --tab query \\
       const routeTarget = sourceTargetFromRoute();
       return sourceTargetsEqual(routeTarget, target) && STATE.route.screen === "file" ? STATE.route.line : void 0;
     }
+    function currentSourceHighlightTerm(target) {
+      const routeTarget = sourceTargetFromRoute();
+      return sourceTargetsEqual(routeTarget, target) && STATE.route.screen === "file" && STATE.route.line && STATE.route.hl ? STATE.route.hl : void 0;
+    }
+    function syncSourceHighlightMarks(card, target) {
+      card.querySelectorAll("mark.gdp-grep-match").forEach((mark) => {
+        const parent = mark.parentElement;
+        if (!parent) return;
+        while (mark.firstChild) parent.insertBefore(mark.firstChild, mark);
+        parent.removeChild(mark);
+        parent.normalize();
+      });
+      const term = currentSourceHighlightTerm(target);
+      const virtual = card.querySelector(
+        ".gdp-source-virtual"
+      );
+      if (virtual?.__gdpVirtualSourceSearch) {
+        if (term) virtual.__gdpVirtualSourceSearch.open(term);
+        return;
+      }
+      if (!term) return;
+      card.querySelectorAll(".gdp-source-table tr[data-line]").forEach((row) => {
+        const cell = row.querySelector(".gdp-source-line-code");
+        if (!cell) return;
+        markSourceHighlightTerm(
+          cell,
+          cell.textContent ?? "",
+          Number(row.dataset.line || "0"),
+          target
+        );
+      });
+    }
+    function markSourceHighlightTerm(cell, lineText, lineNumber, target) {
+      const term = currentSourceHighlightTerm(target);
+      if (!term) return;
+      if (!lineInSourceTarget(lineNumber, currentSourceLineTarget(target)))
+        return;
+      markNeedleInCell(cell, lineText, term, "gdp-grep-match");
+    }
     function lineTargetStart(line) {
       if (!line) return void 0;
       return typeof line === "number" ? line : line.start;
@@ -39166,8 +40313,9 @@ code-viewer annotate add-db --db app.db --tab query \\
       next.addEventListener("click", () => move(1));
       close.addEventListener("click", hide);
       return {
-        open: () => {
+        open: (query) => {
           bar.hidden = false;
+          if (query !== void 0) input2.value = query;
           input2.focus();
           input2.select();
           sync();
@@ -39335,6 +40483,13 @@ code-viewer annotate add-db --db app.db --tab query \\
         render
       );
       wrap.__gdpVirtualSourceSearch = search;
+      const initialHighlightTerm = currentSourceHighlightTerm(target);
+      if (initialHighlightTerm) {
+        const searchHandle = search;
+        setTimeout(() => {
+          if (wrap.isConnected) searchHandle.open(initialHighlightTerm);
+        }, 0);
+      }
       let resizeObserver = null;
       resizeObserver = typeof ResizeObserver === "function" ? new ResizeObserver(() => {
         if (!scroller.isConnected) {
@@ -39588,6 +40743,13 @@ code-viewer annotate add-db --db app.db --tab query \\
         render
       );
       wrap.__gdpVirtualSourceSearch = search;
+      const initialHighlightTerm = currentSourceHighlightTerm(target);
+      if (initialHighlightTerm) {
+        const searchHandle = search;
+        setTimeout(() => {
+          if (wrap.isConnected) searchHandle.open(initialHighlightTerm);
+        }, 0);
+      }
       let resizeObserver = null;
       resizeObserver = typeof ResizeObserver === "function" ? new ResizeObserver(() => {
         if (!scroller.isConnected) {
@@ -39737,6 +40899,8 @@ code-viewer annotate add-db --db app.db --tab query \\
         const mounted = mountedStandaloneSourceCard(target);
         const state = mounted?.dataset.sourceState;
         if (mounted && state === "done") {
+          syncRenderedSourceLineHighlights(mounted, target);
+          syncSourceHighlightMarks(mounted, target);
           scrollStandaloneSourceLine(
             mounted,
             lineTargetStart(
@@ -39772,7 +40936,8 @@ code-viewer annotate add-db --db app.db --tab query \\
           setRoute,
           setPreferredSourceTab,
           createFileBreadcrumb,
-          createRepositoryWebLink: createRepositoryWebLink2
+          createRepositoryWebLink: createRepositoryWebLink2,
+          createRevisionNav
         },
         target,
         activeTab,
@@ -45455,6 +46620,7 @@ ${t2.files.overlapTitle(others)}`;
       if (name) name.textContent = branch;
       el2.title = branch ? `Current branch: ${branch}` : "";
     }
+    const MAX_RECENT_REFS = 8;
     function mergeLocalSettings(patch) {
       const next = { ...APP_SETTINGS };
       for (const [key, value] of Object.entries(patch)) {
@@ -46021,7 +47187,20 @@ ${error2.stack}` : ""}`
       copyReferenceLabel: () => uiText().global.copyLineReference,
       lineCountLabel: (count) => uiText().global.selectedLineCount(count),
       githubOpenTitle: () => uiText().global.githubSelectionOpen,
-      githubCopyTitle: () => uiText().global.githubSelectionCopy
+      githubCopyTitle: () => uiText().global.githubSelectionCopy,
+      lineHistoryTitle: () => uiText().global.lineHistory,
+      openLineHistory: (path, start, end) => {
+        const route = STATE.route;
+        const ref = route.screen === "file" ? route.commit || route.ref || "worktree" : route.screen === "diff" && route.range.to ? route.range.to : "worktree";
+        navigateToRoute({
+          screen: "file",
+          path,
+          ref,
+          view: "history",
+          lines: { start, end },
+          range: currentRange()
+        });
+      }
     });
     const DIFF_LINE_SELECT = createDiffLineSelect({ pill: LINE_REF_PILL });
     function clearRenderedSourceLineTargets() {
@@ -46091,6 +47270,7 @@ ${error2.stack}` : ""}`
         REPO_SIDEBAR_REF = ref;
       },
       isTestPath: isTestFilePath,
+      filterCountTitle: (visible, total) => uiText().sidebar.filterCountTitle(visible, total),
       sidebarToggleTitle: (hidden) => hidden ? uiText().sidebar.show : uiText().sidebar.hide,
       openDirectoryInOsTitle: () => uiText().sidebar.openDirectoryInOs,
       omittedDirectoryBadge: (reason) => {
@@ -46169,6 +47349,7 @@ ${error2.stack}` : ""}`
       placeSidebarToggle,
       createFileBreadcrumb: (path, ref) => DIFF_VIEW.createFileBreadcrumb(path, ref),
       createRepositoryWebLink: createFileRepositoryWebLink,
+      createRevisionNav: createFileRevisionNav,
       createFileDetailMeta: (target, meta) => REPO_VIEW.createFileDetailMeta(target, meta),
       createOpenPathButton,
       createMoveToTrashButton: (path, onDeleted) => REPO_VIEW.createMoveToTrashButton(path, onDeleted),
@@ -46212,6 +47393,7 @@ ${error2.stack}` : ""}`
       setPreferredSourceTab: (tab) => SOURCE_VIEW.setPreferredSourceTab(tab),
       createFileBreadcrumb: (path, ref) => DIFF_VIEW.createFileBreadcrumb(path, ref),
       createRepositoryWebLink: createFileRepositoryWebLink,
+      createRevisionNav: createFileRevisionNav,
       removeStandaloneSource,
       placeSidebarToggle,
       escapeHtml: escapeHtml3,
@@ -46295,6 +47477,17 @@ ${error2.stack}` : ""}`
       }),
       openGithubLabel: () => uiText().repo.openGithub,
       openRepositoryWebLabel: () => uiText().repo.openRepositoryWeb,
+      folderHistoryLabel: () => uiText().repo.folderHistory,
+      folderHistoryTitle: () => uiText().repo.folderHistoryTitle,
+      openFolderHistory: (ref, path) => {
+        const dir = path.replace(/\/+$/, "");
+        navigateToRoute({
+          screen: "history",
+          ref: ref && ref !== "worktree" ? ref : "HEAD",
+          ...dir ? { path: `${dir}/` } : {},
+          range: currentRange()
+        });
+      },
       fileBadge: (status) => DIFF_VIEW.fileBadge(status)
     });
     const {
@@ -46328,6 +47521,8 @@ ${error2.stack}` : ""}`
       getFileSelectionHistory: () => APP_SETTINGS.fileSelectionHistory || [],
       getGrepSelectionHistory: () => APP_SETTINGS.grepSelectionHistory || [],
       getGrepRegex: () => APP_SETTINGS.grepRegex === true,
+      getGrepCaseSensitive: () => APP_SETTINGS.grepCaseSensitive === true,
+      getGrepWholeWord: () => APP_SETTINGS.grepWholeWord === true,
       getGrepHideTests: () => STATE.hideTests,
       getGrepGroupByFile: () => APP_SETTINGS.grepGroupByFile === true,
       getGrepPaletteWidth: () => APP_SETTINGS.grepPaletteWidth,
@@ -46336,7 +47531,8 @@ ${error2.stack}` : ""}`
       applyGrepHideTests: (hidden) => {
         STATE.hideTests = hidden;
         applyHideTests();
-      }
+      },
+      openSearchResults: (query) => openSearchSheet(query)
     });
     const { openSearchPalette, isPaletteOpen, paletteMode, clearRepoFileCache } = SEARCH_PALETTE;
     const UI_TEXT = {
@@ -46366,6 +47562,11 @@ ${error2.stack}` : ""}`
           queryHistory: "query history",
           settings: "viewer settings",
           theme: "toggle theme",
+          search: "Search files (Ctrl+K) · Shift+click: grep (Ctrl+G)",
+          lineHistory: "Line history",
+          recentRef: "Recently used ref",
+          olderRevision: "Older revision of this file",
+          newerRevision: "Newer revision of this file",
           copyAiContext: "Copy AI context (Shift+Click to include code)",
           copyAiContextCopied: "Copied AI context",
           copyAiContextCopiedWithCode: (lines) => `Copied AI context + code (${lines} line${lines === 1 ? "" : "s"})`,
@@ -46454,7 +47655,8 @@ ${error2.stack}` : ""}`
           treeTitle: "tree view",
           flatTitle: "flat list",
           filter: "Filter files…  /  ⌘K",
-          filterTitle: "Filter files. Use /pattern/ for regex. Press / to focus this field, Cmd/Ctrl+K for the full-file palette, Ctrl+G for grep, ? for help.",
+          filterTitle: "Filter files. Plain text matches anywhere in the path; /pattern/ is a regex, ~text is a fuzzy match, *.ts or src/** is a glob. Press / to focus this field, Cmd/Ctrl+K for the full-file palette, Ctrl+G for grep, ? for help.",
+          filterCountTitle: (visible, total) => `${visible} of ${total} files match the filter`,
           filterClear: "Clear",
           filterClearTitle: "Clear file filter",
           hide: "hide sidebar",
@@ -46490,7 +47692,9 @@ ${error2.stack}` : ""}`
           submoduleLabel: "submodule",
           submoduleTitle: "Git submodule pinned to a commit",
           openGithub: "Open on GitHub",
-          openRepositoryWeb: "Open repository web page"
+          openRepositoryWeb: "Open repository web page",
+          folderHistory: "History",
+          folderHistoryTitle: "Commits that touched this folder"
         },
         history: {
           title: "Commits",
@@ -46702,6 +47906,11 @@ ${error2.stack}` : ""}`
           queryHistory: "クエリ履歴",
           settings: "ビューア設定",
           theme: "テーマ切り替え",
+          search: "ファイルを検索 (Ctrl+K)・Shift+クリックで grep (Ctrl+G)",
+          lineHistory: "この行の履歴",
+          recentRef: "最近使った ref",
+          olderRevision: "このファイルの 1 つ前のリビジョン",
+          newerRevision: "このファイルの 1 つ後のリビジョン",
           copyAiContext: "AI 用コンテキストをコピー（Shift+Click でコードも添付）",
           copyAiContextCopied: "コピーしました",
           copyAiContextCopiedWithCode: (lines) => `コピーしました（コード付き・${lines}行）`,
@@ -46790,7 +47999,8 @@ ${error2.stack}` : ""}`
           treeTitle: "ツリー表示",
           flatTitle: "一覧表示",
           filter: "ファイル絞り込み…  /  ⌘K",
-          filterTitle: "ファイルを絞り込みます。/pattern/ は正規表現。/ でこの欄にフォーカス、Cmd/Ctrl+K で全ファイルパレット、Ctrl+G で grep、? でヘルプ。",
+          filterTitle: "ファイルを絞り込みます。文字列はパスの部分一致、/pattern/ は正規表現、~text はあいまい一致、*.ts や src/** は glob。/ でこの欄にフォーカス、Cmd/Ctrl+K で全ファイルパレット、Ctrl+G で grep、? でヘルプ。",
+          filterCountTitle: (visible, total) => `${total} ファイル中 ${visible} 件が一致`,
           filterClear: "解除",
           filterClearTitle: "ファイル絞り込みを解除",
           hide: "サイドバーを隠す",
@@ -46826,7 +48036,9 @@ ${error2.stack}` : ""}`
           submoduleLabel: "サブモジュール",
           submoduleTitle: "Git サブモジュール: 特定のコミットに固定されています。直接は開けません。",
           openGithub: "GitHubで開く",
-          openRepositoryWeb: "リポジトリのウェブページを開く"
+          openRepositoryWeb: "リポジトリのウェブページを開く",
+          folderHistory: "履歴",
+          folderHistoryTitle: "このフォルダを変更したコミット"
         },
         history: {
           title: "コミット",
@@ -47054,6 +48266,11 @@ ${error2.stack}` : ""}`
         quickHelpBtn.title = text3.quickHelp.buttonTitle;
         quickHelpBtn.setAttribute("aria-label", text3.quickHelp.buttonTitle);
       }
+      const searchBtn = document.querySelector("#search-btn");
+      if (searchBtn) {
+        searchBtn.title = text3.global.search;
+        searchBtn.setAttribute("aria-label", text3.global.search);
+      }
       QUICK_HELP?.localize();
       const doctorTitle = doctorText(STATE.language).title;
       const doctorBtn = document.querySelector("#doctor-btn");
@@ -47080,6 +48297,13 @@ ${error2.stack}` : ""}`
       }
       document.querySelector("#terminal-sheet")?.setAttribute("aria-label", terminalChrome.title);
       relocalizeTerminal?.();
+      const searchChrome = searchPaletteText(STATE.language);
+      const searchTabBtn = document.querySelector("#panel-tab-search");
+      if (searchTabBtn) {
+        searchTabBtn.textContent = searchChrome.resultsTitle;
+        searchTabBtn.title = searchChrome.resultsOpen;
+      }
+      relocalizeSearchResults?.();
       document.querySelector(".app-panel-tabs")?.setAttribute("aria-label", text3.appPanel.tabs);
       const panelLayout = document.querySelector(
         ".app-panel-layout-switch"
@@ -47242,6 +48466,7 @@ ${error2.stack}` : ""}`
     let relocalizeTools = null;
     let relocalizeViewerSettings = null;
     let relocalizeTerminal = null;
+    let relocalizeSearchResults = null;
     let relocalizeDatabase = null;
     let QUICK_HELP = null;
     function setViewerLanguage(language, persist = true) {
@@ -47592,6 +48817,18 @@ ${error2.stack}` : ""}`
     function isHistoryPanelRoute(route) {
       return route.screen === "history" || isFileHistoryRoute(route);
     }
+    function historyRefForCurrentView() {
+      const route = STATE.route;
+      if (route.screen === "history") return route.ref || "HEAD";
+      if (route.screen === "repo" || route.screen === "file") {
+        return route.ref && route.ref !== "worktree" ? route.ref : "HEAD";
+      }
+      if (route.screen === "diff") {
+        const to = route.range.to;
+        return to && to !== "worktree" ? to : "HEAD";
+      }
+      return "HEAD";
+    }
     function normalizeInternalFileRoute(route) {
       if (route.screen !== "file") return route;
       if (sourceInternalPathKind(route.path) === null) return route;
@@ -47640,6 +48877,7 @@ ${error2.stack}` : ""}`
           setPreferredSourceTab: (tab) => SOURCE_VIEW.setPreferredSourceTab(tab),
           createFileBreadcrumb: (path, ref) => DIFF_VIEW.createFileBreadcrumb(path, ref),
           createRepositoryWebLink: createFileRepositoryWebLink,
+          createRevisionNav: createFileRevisionNav,
           emptyText: () => uiText().diff
         },
         historyRoute,
@@ -47659,15 +48897,21 @@ ${error2.stack}` : ""}`
       return ANNOTATIONS_UI ? ANNOTATIONS_UI.withSessionParam(rawUrl) : rawUrl;
     }
     function withOverlayState(url) {
-      return withTerminalOverlay(
-        withToolsOverlay(
-          withDoctorOverlay(
-            url,
-            parseDoctorOverlay(window.location.pathname, window.location.search)
+      return withSearchResultsOverlay(
+        withTerminalOverlay(
+          withToolsOverlay(
+            withDoctorOverlay(
+              url,
+              parseDoctorOverlay(
+                window.location.pathname,
+                window.location.search
+              )
+            ),
+            parseToolsOverlay(window.location.search)
           ),
-          parseToolsOverlay(window.location.search)
+          parseTerminalOverlay(window.location.search)
         ),
-        parseTerminalOverlay(window.location.search)
+        parseSearchResultsOverlay(window.location.search)
       );
     }
     function urlForRoute(route) {
@@ -48058,6 +49302,61 @@ ${error2.stack}` : ""}`
       });
       return button;
     }
+    function createFileRevisionNav(target, activeTab) {
+      if (activeTab === "history") return null;
+      const nav = document.createElement("span");
+      nav.className = "gdp-file-revision-nav";
+      const text3 = uiText().global;
+      const make = (title, paths) => {
+        const button = document.createElement("button");
+        button.type = "button";
+        button.className = "gdp-file-header-icon gdp-file-revision-btn";
+        button.title = title;
+        button.setAttribute("aria-label", title);
+        button.disabled = true;
+        button.innerHTML = iconSvg("octicon-revision", paths);
+        return button;
+      };
+      const older = make(text3.olderRevision, PREVIOUS_16_PATHS);
+      const newer = make(text3.newerRevision, NEXT_16_PATHS);
+      nav.append(older, newer);
+      const goTo = (sha) => {
+        const view = STATE.route.screen === "file" && STATE.route.view === "blame" ? "blame" : "blob";
+        navigateToRoute({
+          screen: "file",
+          path: target.path,
+          ref: sha,
+          view,
+          range: currentRange()
+        });
+      };
+      const params = new URLSearchParams({
+        path: target.path,
+        ref: target.ref || "worktree"
+      });
+      void trackLoad(
+        fetch(`/_file_revisions?${params.toString()}`).then(async (r2) => {
+          if (!r2.ok) throw new Error(await r2.text());
+          return r2.json();
+        })
+      ).then((neighbors) => {
+        if (!nav.isConnected) return;
+        if (neighbors.previous) {
+          const sha = neighbors.previous;
+          older.disabled = false;
+          older.addEventListener("click", () => goTo(sha));
+        }
+        if (neighbors.next) {
+          const sha = neighbors.next;
+          newer.disabled = false;
+          newer.addEventListener("click", () => goTo(sha));
+        }
+      }).catch((err) => {
+        if (isAbortError3(err)) return;
+        console.error("Failed to load file revision neighbours", err);
+      });
+      return nav;
+    }
     function createFileRepositoryWebLink(target) {
       const webTarget = buildRepositoryWebTarget(REPO_WEB_URL, {
         ref: target.ref,
@@ -48259,6 +49558,12 @@ ${error2.stack}` : ""}`
       if (quickHelpIcon) {
         quickHelpIcon.innerHTML = iconSvg("octicon-question", QUESTION_16_PATH);
       }
+      const searchIcon = document.querySelector(
+        "#search-btn .goi-icon"
+      );
+      if (searchIcon) {
+        searchIcon.innerHTML = iconSvg("octicon-search", SEARCH_16_PATH);
+      }
       const branchIcon = document.querySelector(
         "#project-branch .goi-icon"
       );
@@ -48313,6 +49618,10 @@ ${error2.stack}` : ""}`
       event.preventDefault();
       openTerminalSheet();
     });
+    $("#panel-tab-search")?.addEventListener("click", (event) => {
+      event.preventDefault();
+      openSearchSheet();
+    });
     $("#app-panel-close")?.addEventListener("click", (event) => {
       event.preventDefault();
       closeAppPanel();
@@ -48548,6 +49857,9 @@ ${error2.stack}` : ""}`
       syncSidebarFilterClearButton();
       sbFilterClear.addEventListener("click", clearSidebarFilter);
     }
+    document.querySelector("#search-btn")?.addEventListener("click", (event) => {
+      openSearchPalette(event.shiftKey ? "grep" : "file");
+    });
     function focusFileFilter() {
       const input2 = $("#sb-filter");
       input2.focus();
@@ -48738,11 +50050,18 @@ ${error2.stack}` : ""}`
       if (action === "goto-history") {
         navigateToRoute({
           screen: "history",
-          ref: "HEAD",
+          ref: historyRefForCurrentView(),
           range: currentRange()
         });
         return true;
       }
+      if (action === "history-next-commit" || action === "history-previous-commit") {
+        if (!isHistoryPanelRoute(STATE.route)) return false;
+        void HISTORY_VIEW.moveCommitSelection(
+          action === "history-next-commit" ? 1 : -1
+        );
+        return true;
+      }
       if (action === "goto-repo") {
         navigateToRoute({
           screen: "repo",
@@ -49060,6 +50379,7 @@ ${error2.stack}` : ""}`
       syncDoctorSheetFromUrl();
       syncToolsSheetFromUrl();
       syncTerminalSheetFromUrl();
+      syncSearchSheetFromUrl();
     });
     function syncRefInputs() {
       const fi = $("#ref-from"), ti = $("#ref-to");
@@ -49151,7 +50471,19 @@ ${error2.stack}` : ""}`
       },
       getSyntaxHighlight: () => STATE.syntaxHighlight,
       getLanguage: () => STATE.language,
-      trackLoad
+      trackLoad,
+      commitWebLink: (sha) => {
+        const target = buildRepositoryWebTarget(REPO_WEB_URL, {
+          ref: sha,
+          kind: "commit"
+        });
+        if (!target) return null;
+        return createRepositoryWebLink(
+          target,
+          target.provider === "github" ? uiText().repo.openGithub : uiText().repo.openRepositoryWeb
+        );
+      },
+      copyText: (text3) => navigator.clipboard.writeText(text3)
     });
     relocalizeHistory = () => HISTORY_VIEW.localize();
     function helpSectionDeps() {
@@ -49252,14 +50584,16 @@ ${error2.stack}` : ""}`
     function syncAppPanel() {
       const tools = parseToolsOverlay(window.location.search) !== null;
       const terminal = parseTerminalOverlay(window.location.search) !== null;
-      const open2 = tools || terminal;
+      const search = parseSearchResultsOverlay(window.location.search) !== null;
+      const open2 = tools || terminal || search;
       const panel = document.getElementById("app-panel");
       if (panel) {
         panel.classList.toggle("app-panel-open", open2);
       }
       for (const [id, selected] of [
         ["#panel-tab-tools", tools],
-        ["#panel-tab-terminal", terminal]
+        ["#panel-tab-terminal", terminal],
+        ["#panel-tab-search", search]
       ]) {
         const tab = document.querySelector(id);
         if (!tab) continue;
@@ -49284,6 +50618,8 @@ ${error2.stack}` : ""}`
       syncAppPanelLayout();
     }
     function closeAppPanel() {
+      if (parseSearchResultsOverlay(window.location.search) !== null || SEARCH_RESULTS_VIEW.isOpen())
+        closeSearchSheet();
       if (parseToolsOverlay(window.location.search) !== null || TOOLS_VIEW.isOpen())
         closeToolsSheet();
       if (parseTerminalOverlay(window.location.search) !== null || TERMINAL_VIEW.isOpen())
@@ -49332,6 +50668,8 @@ ${error2.stack}` : ""}`
     function openToolsSheet(tool) {
       if (parseTerminalOverlay(window.location.search) !== null || TERMINAL_VIEW.isOpen())
         closeTerminalSheet();
+      if (parseSearchResultsOverlay(window.location.search) !== null || SEARCH_RESULTS_VIEW.isOpen())
+        closeSearchSheet();
       updateUrlForToolsOverlay(tool ?? TOOLS_VIEW.getActiveTool());
       void TOOLS_VIEW.open(tool);
       syncAppPanel();
@@ -49349,6 +50687,77 @@ ${error2.stack}` : ""}`
       else if (!tool && open2) TOOLS_VIEW.close();
       syncAppPanel();
     }
+    const SEARCH_RESULTS_VIEW = createSearchResultsView({
+      $: (sel) => document.querySelector(sel),
+      trackLoad,
+      getLanguage: () => STATE.language,
+      appendScopeParams,
+      getRef: () => {
+        const route = STATE.route;
+        if (route.screen === "repo" || route.screen === "file")
+          return route.ref || "worktree";
+        return STATE.repoRef || "worktree";
+      },
+      getServerGeneration: () => SERVER_GENERATION,
+      isAbortError: isAbortError3,
+      getGrepRegex: () => APP_SETTINGS.grepRegex === true,
+      getGrepCaseSensitive: () => APP_SETTINGS.grepCaseSensitive === true,
+      getGrepWholeWord: () => APP_SETTINGS.grepWholeWord === true,
+      getGrepHideTests: () => STATE.hideTests,
+      persistGrepSettings: async (patch) => {
+        await persistSettingsPatch(patch);
+        if (patch.hideTests !== void 0) {
+          STATE.hideTests = patch.hideTests;
+          applyHideTests();
+        }
+      },
+      openMatch: ({ path, line, hl }) => {
+        const route = STATE.route;
+        const ref = route.screen === "repo" || route.screen === "file" ? route.ref || "worktree" : STATE.repoRef || "worktree";
+        setRoute({
+          screen: "file",
+          path,
+          ref,
+          view: "blob",
+          line,
+          ...hl ? { hl } : {},
+          range: currentRange()
+        });
+        void renderStandaloneSource({ path, ref });
+      },
+      onQueryChange: (query) => updateUrlForSearchResultsOverlay(query)
+    });
+    relocalizeSearchResults = () => SEARCH_RESULTS_VIEW.localize();
+    function updateUrlForSearchResultsOverlay(query) {
+      const current = window.location.pathname + window.location.search;
+      const next = withSearchResultsOverlay(current, query);
+      if (next !== current) {
+        history.replaceState(history.state, "", next + window.location.hash);
+      }
+      syncHeaderMenu();
+    }
+    function openSearchSheet(query) {
+      if (parseTerminalOverlay(window.location.search) !== null || TERMINAL_VIEW.isOpen())
+        closeTerminalSheet();
+      if (parseToolsOverlay(window.location.search) !== null || TOOLS_VIEW.isOpen())
+        closeToolsSheet();
+      updateUrlForSearchResultsOverlay(query ?? SEARCH_RESULTS_VIEW.getQuery());
+      SEARCH_RESULTS_VIEW.open(query);
+      syncAppPanel();
+    }
+    function closeSearchSheet() {
+      SEARCH_RESULTS_VIEW.close();
+      updateUrlForSearchResultsOverlay(null);
+      syncAppPanel();
+    }
+    function syncSearchSheetFromUrl() {
+      const query = parseSearchResultsOverlay(window.location.search);
+      const open2 = SEARCH_RESULTS_VIEW.isOpen();
+      if (query !== null && (!open2 || SEARCH_RESULTS_VIEW.getQuery() !== query))
+        SEARCH_RESULTS_VIEW.open(query);
+      else if (query === null && open2) SEARCH_RESULTS_VIEW.close();
+      syncAppPanel();
+    }
     const TERMINAL_VIEW = createTerminalView({
       $: (sel) => document.querySelector(sel),
       trackLoad,
@@ -49377,6 +50786,8 @@ ${error2.stack}` : ""}`
     function openTerminalSheet(id) {
       if (parseToolsOverlay(window.location.search) !== null || TOOLS_VIEW.isOpen())
         closeToolsSheet();
+      if (parseSearchResultsOverlay(window.location.search) !== null || SEARCH_RESULTS_VIEW.isOpen())
+        closeSearchSheet();
       const target = id ?? TERMINAL_VIEW.getActiveTarget();
       updateUrlForTerminalOverlay(target ?? "open");
       void TERMINAL_VIEW.open(target);
@@ -49454,7 +50865,17 @@ ${error2.stack}` : ""}`
       getFrom: () => STATE.from,
       getTo: () => STATE.to,
       getRepoRef: () => STATE.repoRef,
-      getRoute: () => STATE.route
+      getRoute: () => STATE.route,
+      getRecentRefs: () => APP_SETTINGS.recentRefs || [],
+      rememberRecentRef: (ref) => {
+        const current = APP_SETTINGS.recentRefs || [];
+        const next = rememberPaletteSelection(current, ref).slice(
+          -MAX_RECENT_REFS
+        );
+        if (next.join("\0") === current.join("\0")) return;
+        patchSettings({ recentRefs: next });
+      },
+      recentRefTitle: () => uiText().global.recentRef
     });
     if (REF_PICKER) {
       const historyRefInput = document.querySelector("#history-ref");
@@ -49511,6 +50932,7 @@ ${error2.stack}` : ""}`
       syncDoctorSheetFromUrl();
       syncToolsSheetFromUrl();
       syncTerminalSheetFromUrl();
+      syncSearchSheetFromUrl();
       if (isSameBlobFileRoute(previousRoute, STATE.route) && routeBlobPreview(previousRoute) !== routeBlobPreview(STATE.route) && switchSourceTab(routeBlobPreview(STATE.route) ? "preview" : "code", {
         updateRoute: false
       })) {