dsh-locator 0.7.6 → 0.8.0

package/client.js

@@ -34,51 +34,65 @@ window.__ModuleLoader__.load({
     const NS = 'dsh-locator'
     const CSS = `
 .dsh-locator-overlay{position:fixed;inset:0;z-index:80;display:flex;align-items:flex-start;justify-content:center;
-  padding:9vh 16px 16px;background:rgba(15,17,21,.38);backdrop-filter:blur(3px);color-scheme:light dark}
-.dsh-locator-panel{display:flex;flex-direction:column;width:min(960px,94vw);max-height:76vh;overflow:hidden;
-  border-radius:14px;border:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.28));
-  background:var(--dsw-alias-bg-base,#fff);box-shadow:0 24px 64px rgba(0,0,0,.28);font:13px/1.45 system-ui,-apple-system,"Segoe UI",sans-serif}
+  padding:max(9vh,64px) 16px 16px;background:var(--dsw-alias-bg-mask-1,rgba(15,17,21,.38));color-scheme:light dark}
+.dsh-locator-panel{display:flex;flex-direction:column;width:min(920px,94vw);max-height:min(76vh,720px);overflow:hidden;
+  border-radius:var(--dsw-radius-lg,14px);border:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.28));
+  background:var(--dsw-alias-bg-base,#fff);box-shadow:0 24px 64px rgba(0,0,0,.28);font:13px/1.45 system-ui,-apple-system,"Segoe UI",sans-serif;
+  animation:dsh-locator-in 120ms ease-out}
+@keyframes dsh-locator-in{from{opacity:0;transform:translateY(4px)}to{opacity:1;transform:none}}
+@media (prefers-reduced-motion:reduce){.dsh-locator-panel{animation:none}}
 .dsh-locator-head{display:flex;align-items:center;gap:10px;padding:12px 14px;border-bottom:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.2))}
 .dsh-locator-glyph{font-size:15px;opacity:.7}
 .dsh-locator-input{flex:1;min-width:0;border:0;outline:0;background:transparent;color:inherit;font:inherit;font-size:14px;padding:2px 0}
 .dsh-locator-kbd{border:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.35));border-radius:6px;padding:1px 6px;font-size:11px;opacity:.6;white-space:nowrap}
 .dsh-locator-close{border:0;background:transparent;color:inherit;opacity:.55;cursor:pointer;font-size:16px;padding:2px 4px;border-radius:6px}
-.dsh-locator-close:hover{opacity:.9;background:rgba(120,125,135,.12)}
+.dsh-locator-close:hover{opacity:.9;background:var(--dsw-alias-interactive-bg-hover,rgba(120,125,135,.12))}
 .dsh-locator-bar{display:flex;align-items:center;gap:12px;padding:7px 14px;border-bottom:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.16));
-  font-size:12px;opacity:.85;flex-wrap:wrap}
-.dsh-locator-check{display:inline-flex;align-items:center;gap:5px;cursor:pointer;user-select:none}
-.dsh-locator-status{margin-left:auto;opacity:.65;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:55%}
-.dsh-locator-scroll{overflow:auto;flex:1;min-height:120px}
-.dsh-locator-table{width:100%;border-collapse:collapse;table-layout:fixed}
-.dsh-locator-table th{position:sticky;top:0;z-index:1;background:var(--dsw-alias-bg-base,#fff);text-align:left;font-weight:500;font-size:11px;
-  letter-spacing:.03em;text-transform:uppercase;opacity:.6;padding:6px 10px;border-bottom:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.16));
-  cursor:pointer;user-select:none;white-space:nowrap}
-.dsh-locator-table th:hover{opacity:.9}
-.dsh-locator-table th.sorted{opacity:1}
-.dsh-locator-table td{padding:5px 10px;border-bottom:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.09));
-  overflow:hidden;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle}
-.dsh-locator-row{cursor:pointer}
-.dsh-locator-row:hover td{background:rgba(120,125,135,.08)}
-.dsh-locator-row.sel td{background:rgba(64,116,255,.12)}
-.dsh-locator-name{display:flex;align-items:center;gap:7px;min-width:0}
-.dsh-locator-badge{flex:none;font-size:10px;padding:0 5px;border-radius:4px;background:rgba(120,125,135,.14);opacity:.8}
-.dsh-locator-hit{background:rgba(255,196,0,.35);border-radius:2px;color:inherit}
-.dsh-locator-path{opacity:.55;font-size:11.5px}
-.dsh-locator-size,.dsh-locator-time{opacity:.7;font-variant-numeric:tabular-nums;white-space:nowrap}
-.dsh-locator-empty{padding:36px 16px;text-align:center;opacity:.6}
-.dsh-locator-foot{display:flex;align-items:center;gap:10px;padding:7px 14px;border-top:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.16));
-  font-size:11.5px;opacity:.7;flex-wrap:wrap}
+  font-size:12px;flex-wrap:wrap}
+.dsh-locator-check{display:inline-flex;align-items:center;gap:5px;cursor:pointer;user-select:none;white-space:nowrap}
+.dsh-locator-check.disabled{opacity:.45;cursor:not-allowed}
+.dsh-locator-count{opacity:.55;font-variant-numeric:tabular-nums}
+.dsh-locator-bar .grow{flex:1}
+.dsh-locator-sort{border:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.3));border-radius:6px;background:transparent;color:inherit;font:inherit;font-size:11.5px;padding:2px 4px}
+.dsh-locator-dirbtn{border:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.3));border-radius:6px;background:transparent;color:inherit;font:inherit;font-size:11.5px;padding:2px 6px;cursor:pointer}
+.dsh-locator-status{margin-left:auto;opacity:.65;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:50%}
+.dsh-locator-scroll{overflow:auto;flex:1;min-height:160px}
+.dsh-locator-group{display:block;border-bottom:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.12))}
+.dsh-locator-grouphead{position:sticky;top:0;z-index:2;display:flex;align-items:center;gap:8px;padding:6px 14px;
+  font-size:11px;font-weight:500;letter-spacing:.03em;text-transform:uppercase;color:var(--dsw-alias-label-tertiary,rgba(120,125,135,.9));
+  background:var(--dsw-alias-menu-group-header-fill,var(--dsw-alias-bg-base,#fff));border-bottom:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.1));
+  cursor:default}
+.dsh-locator-grouphead .grow{flex:1}
+.dsh-locator-groupempty{padding:10px 14px;font-size:12px;opacity:.55}
+.dsh-locator-row{display:grid;grid-template-columns:minmax(0,1fr) auto;gap:2px 12px;align-items:baseline;
+  padding:6px 14px;border-bottom:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.07));cursor:pointer;position:relative}
+.dsh-locator-row:hover{background:var(--dsw-alias-interactive-bg-hover,rgba(120,125,135,.08))}
+.dsh-locator-row.sel{background:var(--dsw-alias-interactive-bg-active,rgba(64,116,255,.12))}
+.dsh-locator-row.sel::before{content:'';position:absolute;left:0;top:0;bottom:0;width:2px;background:#4f7cff}
+.dsh-locator-rowcontent{padding-top:8px;padding-bottom:8px}
+.dsh-locator-title{display:flex;align-items:baseline;gap:7px;min-width:0;font-size:13px}
+.dsh-locator-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.dsh-locator-badge{flex:none;font-size:10px;padding:0 5px;border-radius:4px;background:var(--dsw-alias-bg-layer-2,rgba(120,125,135,.14));opacity:.8;text-transform:uppercase;letter-spacing:.04em}
+.dsh-locator-badge.chat{background:rgba(79,124,255,.16);color:var(--dsw-alias-brand-primary,#4f7cff)}
+.dsh-locator-snippet{grid-column:1/-1;margin-top:2px;font-size:12.5px;opacity:.85;overflow:hidden;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;line-height:1.4}
+.dsh-locator-path{grid-column:1/-1;font-size:11.5px;opacity:.5;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;direction:rtl;text-align:left}
+.dsh-locator-meta{font-size:11.5px;opacity:.65;white-space:nowrap;font-variant-numeric:tabular-nums;text-align:right}
+.dsh-locator-hit{background:rgba(245,158,11,.32);border-radius:2px;color:inherit}
+.dsh-locator-empty{padding:36px 16px;text-align:center;opacity:.65;font-size:12.5px;white-space:pre-wrap}
+.dsh-locator-empty .dsh-locator-retry{margin-left:8px}
+.dsh-locator-foot{display:flex;align-items:center;gap:10px;padding:6px 14px;border-top:1px solid var(--dsw-alias-border-base,rgba(120,125,135,.16));
+  font-size:11px;opacity:.7;flex-wrap:wrap}
 .dsh-locator-foot .grow{flex:1}
-.dsh-locator-toast{color:#2e7d32}
-@media (prefers-color-scheme:dark){
-  .dsh-locator-overlay{background:rgba(0,0,0,.55)}
-  .dsh-locator-panel{box-shadow:0 24px 64px rgba(0,0,0,.6)}
-}
+.dsh-locator-toast{color:var(--dsw-alias-state-success-primary,#2e7d32)}
 .dsh-locator-launch{display:inline-flex;align-items:center;justify-content:center;width:26px;height:26px;border:0;border-radius:7px;
   background:transparent;color:inherit;opacity:.65;cursor:pointer;font-size:14px}
 .dsh-locator-launch:hover{opacity:1;background:rgba(120,125,135,.14)}
+body[data-ds-dark-theme] .dsh-locator-panel{box-shadow:0 24px 64px rgba(0,0,0,.6)}
+body[data-ds-dark-theme] .dsh-locator-overlay{background:var(--dsw-alias-bg-mask-1,rgba(0,0,0,.55))}
+.dsh-locator-target{outline:2px solid rgba(245,158,11,.75);outline-offset:2px;border-radius:6px}
+::highlight(dsh-locator-find){background-color:rgba(245,158,11,.28);color:inherit}
+::highlight(dsh-locator-find-active){background-color:rgba(245,158,11,.45);color:inherit}
 `
-
     function ensureStyles() {
       if (typeof document === 'undefined') return
       if (document.querySelector('style[data-plugin-css="' + NS + '"]') !== null) return
@@ -104,78 +118,132 @@ window.__ModuleLoader__.load({
       return data
     }
 
-
     // ── i18n ────────────────────────────────────────────────────────────────
     const STRINGS = {
       en: {
-        contentMode: 'Content', sessionBadge: 'CHAT', jumped: 'Opened session',
-        placeholder: 'Search file names or paths… e.g. ext:pdf size:>10mb dm:thisweek path:src !tmp',
+        scopeContent: 'Content', scopeFiles: 'Files', scopeDirs: 'Folders',
+        placeholder: 'Search names, paths, bodies or sessions… e.g. ext:pdf size:>10mb dm:thisweek path:src',
         searchLabel: 'Search files', dialog: 'Local file search', closeTitle: 'Close (Esc)', closeLabel: 'Close',
-        filesOnly: 'Files only', dirsOnly: 'Directories only', statusLoading: 'Reading index status…',
-        status: 'Index {entries} entries · {mode} · {roots} roots', live: 'live', snapshot: 'snapshot', usn: 'USN',
-        sortTitle: 'Click to change sorting', name: 'Name', size: 'Size', mtime: 'Modified', path: 'Path',
-        dirBadge: 'DIR', fileBadge: 'FILE', loading: 'Searching…', errorPrefix: 'Search failed: ', empty: 'No matching files',
-        results: '{total} results', showing: 'showing first {n}', indexing: 'indexing, results may be incomplete',
-        copied: 'Path copied', revealed: 'Revealed in file manager', opened: 'Opened', inserted: 'Inserted @file',
-        insertFailed: 'Insert failed; @file copied', footer: '↑↓ select · Enter copy · Ctrl+O open · Ctrl+Enter insert @file · double-click reveal · Esc close',
+        sortLabel: 'Sort', sortMtime: 'Modified', sortName: 'Name', sortSize: 'Size', sortPath: 'Path',
+        asc: 'Ascending', descOrder: 'Descending',
+        groupContent: 'Content', groupFiles: 'Files', groupDirs: 'Folders',
+        relevance: 'by relevance', contentBuilding: 'indexing… {files} files / {messages} messages',
+        contentShort: 'Type at least 2 characters to search bodies and sessions',
+        contentDisabled: 'Content index is disabled (contentIndex: false)',
+        contentCapped: 'first {n}', showing: 'first {n}', deduped: '{n} name hits merged into content', loading: 'Searching…',
+        emptyQuery: 'Type to search file names, paths, bodies and sessions',
+        emptyResults: 'No matches · try fewer scopes or another keyword',
+        emptyScopes: 'Select at least one scope (Content, Files, Folders)',
+        errorPrefix: 'Search failed: ', retry: 'Retry', indexing: 'indexing, results may be incomplete',
+        statusLoading: 'Reading index status…', status: 'Index {entries} entries · {mode} · {roots} roots',
+        live: 'live', snapshot: 'snapshot', usn: 'USN',
+        copiedPath: 'Path copied', revealed: 'Revealed in file manager', opened: 'Opened', inserted: 'Inserted @file',
+        insertFailed: 'Insert failed; @file copied', jumped: 'Opened session', jumpFailed: 'Opened the session but could not locate the match',
+        footer: '↑↓ select · Enter open/jump · Ctrl+Shift+C copy path · Ctrl+O open · Alt+1–3 scopes · Esc close',
+        results: 'content {content} · files {files} · folders {dirs} · {ms} ms',
         launcher: 'Local file search (Ctrl+Shift+F)',
         justNow: 'just now', minutesAgo: '{n} min ago', hoursAgo: '{n} h ago',
+        phraseNotFound: 'No match in the conversation (it may not be loaded yet)',
       },
       zh: {
-        contentMode: '搜内容', sessionBadge: '会话', jumped: '已打开会话',
-        placeholder: '搜索文件名或路径… 支持 ext:pdf size:>10mb dm:thisweek path:src !tmp',
+        scopeContent: '内容', scopeFiles: '文件', scopeDirs: '目录',
+        placeholder: '搜文件名、路径、正文或会话… 支持 ext:pdf size:>10mb dm:thisweek path:src',
         searchLabel: '文件搜索', dialog: '本地文件搜索', closeTitle: '关闭 (Esc)', closeLabel: '关闭',
-        filesOnly: '只看文件', dirsOnly: '只看目录', statusLoading: '索引状态读取中…',
-        status: '索引 {entries} 条 · {mode} · {roots} 个根目录', live: '实时监听', snapshot: '快照', usn: 'USN',
-        sortTitle: '点击切换排序', name: '名称', size: '大小', mtime: '修改时间', path: '路径',
-        dirBadge: '目录', fileBadge: '文件', loading: '搜索中…', errorPrefix: '搜索失败：', empty: '没有匹配的文件',
-        results: '{total} 条结果', showing: '显示前 {n} 条', indexing: '索引构建中，结果可能不完整',
-        copied: '已复制路径', revealed: '已在文件管理器中定位', opened: '已打开', inserted: '已插入 @file',
-        insertFailed: '插入失败，已复制 @file', footer: '↑↓ 选择 · Enter 复制 · Ctrl+O 打开 · Ctrl+Enter 插入 @file · 双击定位 · Esc 关闭',
+        sortLabel: '排序', sortMtime: '修改时间', sortName: '名称', sortSize: '大小', sortPath: '路径',
+        asc: '升序', descOrder: '降序',
+        groupContent: '内容', groupFiles: '文件', groupDirs: '目录',
+        relevance: '按相关度', contentBuilding: '索引构建中… {files} 文件 / {messages} 消息',
+        contentShort: '输入至少 2 个字符后搜索正文与会话',
+        contentDisabled: '内容索引已关闭（contentIndex: false）',
+        contentCapped: '前 {n} 条', showing: '前 {n} 条', deduped: '{n} 条文件命中已并入内容', loading: '搜索中…',
+        emptyQuery: '输入关键词：文件名、路径、正文或会话内容',
+        emptyResults: '没有匹配结果 · 可试试减少范围或换个关键词',
+        emptyScopes: '至少选择一个搜索范围（内容 / 文件 / 目录）',
+        errorPrefix: '搜索失败：', retry: '重试', indexing: '索引构建中，结果可能不完整',
+        statusLoading: '索引状态读取中…', status: '索引 {entries} 条 · {mode} · {roots} 个根目录',
+        live: '实时监听', snapshot: '快照', usn: 'USN',
+        copiedPath: '已复制路径', revealed: '已在文件管理器中定位', opened: '已打开', inserted: '已插入 @file',
+        insertFailed: '插入失败，已复制 @file', jumped: '已打开会话', jumpFailed: '已打开会话，但未定位到该消息',
+        footer: '↑↓ 选择 · Enter 打开/跳转 · Ctrl+Shift+C 复制路径 · Ctrl+O 打开 · Alt+1–3 切换范围 · Esc 关闭',
+        results: '内容 {content} · 文件 {files} · 目录 {dirs} · {ms} ms',
         launcher: '本地文件搜索 (Ctrl+Shift+F)',
         justNow: '刚刚', minutesAgo: '{n} 分钟前', hoursAgo: '{n} 小时前',
+        phraseNotFound: '会话里没有找到匹配内容（可能还没加载）',
       },
       es: {
-        contentMode: 'Contenido', sessionBadge: 'CHAT', jumped: 'Sesión abierta',
-        placeholder: 'Busca nombres o rutas… p. ej. ext:pdf size:>10mb dm:thisweek path:src !tmp',
+        scopeContent: 'Contenido', scopeFiles: 'Archivos', scopeDirs: 'Carpetas',
+        placeholder: 'Busca nombres, rutas, contenido o sesiones… p. ej. ext:pdf size:>10mb dm:thisweek path:src',
         searchLabel: 'Buscar archivos', dialog: 'Búsqueda local de archivos', closeTitle: 'Cerrar (Esc)', closeLabel: 'Cerrar',
-        filesOnly: 'Solo archivos', dirsOnly: 'Solo carpetas', statusLoading: 'Leyendo el estado del índice…',
-        status: 'Índice: {entries} entradas · {mode} · {roots} raíces', live: 'en vivo', snapshot: 'instantánea', usn: 'USN',
-        sortTitle: 'Clic para cambiar el orden', name: 'Nombre', size: 'Tamaño', mtime: 'Modificado', path: 'Ruta',
-        dirBadge: 'DIR', fileBadge: 'ARCH', loading: 'Buscando…', errorPrefix: 'Error de búsqueda: ', empty: 'Sin coincidencias',
-        results: '{total} resultados', showing: 'mostrando {n}', indexing: 'indexando, resultados incompletos',
-        copied: 'Ruta copiada', revealed: 'Mostrado en el gestor de archivos', opened: 'Abierto', inserted: '@file insertado',
-        insertFailed: 'No se pudo insertar; @file copiado', footer: '↑↓ elegir · Enter copiar · Ctrl+O abrir · Ctrl+Enter insertar @file · doble clic revelar · Esc cerrar',
+        sortLabel: 'Orden', sortMtime: 'Modificado', sortName: 'Nombre', sortSize: 'Tamaño', sortPath: 'Ruta',
+        asc: 'Ascendente', descOrder: 'Descendente',
+        groupContent: 'Contenido', groupFiles: 'Archivos', groupDirs: 'Carpetas',
+        relevance: 'por relevancia', contentBuilding: 'indexando… {files} archivos / {messages} mensajes',
+        contentShort: 'Escribe al menos 2 caracteres para buscar contenido y sesiones',
+        contentDisabled: 'Índice de contenido desactivado (contentIndex: false)',
+        contentCapped: 'primeros {n}', showing: 'primeros {n}', deduped: '{n} aciertos de nombre fusionados', loading: 'Buscando…',
+        emptyQuery: 'Escribe para buscar nombres, rutas, contenido y sesiones',
+        emptyResults: 'Sin coincidencias · prueba menos ámbitos u otra palabra',
+        emptyScopes: 'Elige al menos un ámbito (Contenido, Archivos, Carpetas)',
+        errorPrefix: 'Error de búsqueda: ', retry: 'Reintentar', indexing: 'indexando, resultados incompletos',
+        statusLoading: 'Leyendo el estado del índice…', status: 'Índice: {entries} entradas · {mode} · {roots} raíces',
+        live: 'en vivo', snapshot: 'instantánea', usn: 'USN',
+        copiedPath: 'Ruta copiada', revealed: 'Mostrado en el gestor de archivos', opened: 'Abierto', inserted: '@file insertado',
+        insertFailed: 'No se pudo insertar; @file copiado', jumped: 'Sesión abierta', jumpFailed: 'Sesión abierta, pero no se localizó el mensaje',
+        footer: '↑↓ elegir · Enter abrir/ir · Ctrl+Shift+C copiar ruta · Ctrl+O abrir · Alt+1–3 ámbitos · Esc cerrar',
+        results: 'contenido {content} · archivos {files} · carpetas {dirs} · {ms} ms',
         launcher: 'Búsqueda local (Ctrl+Shift+F)',
         justNow: 'ahora', minutesAgo: 'hace {n} min', hoursAgo: 'hace {n} h',
+        phraseNotFound: 'No se encontró en la conversación (quizá no está cargada)',
       },
       pt: {
-        contentMode: 'Conteúdo', sessionBadge: 'CHAT', jumped: 'Sessão aberta',
-        placeholder: 'Busque nomes ou caminhos… ex. ext:pdf size:>10mb dm:thisweek path:src !tmp',
+        scopeContent: 'Conteúdo', scopeFiles: 'Arquivos', scopeDirs: 'Pastas',
+        placeholder: 'Busque nomes, caminhos, conteúdo ou sessões… ex. ext:pdf size:>10mb dm:thisweek path:src',
         searchLabel: 'Buscar arquivos', dialog: 'Busca local de arquivos', closeTitle: 'Fechar (Esc)', closeLabel: 'Fechar',
-        filesOnly: 'Somente arquivos', dirsOnly: 'Somente pastas', statusLoading: 'Lendo o estado do índice…',
-        status: 'Índice: {entries} entradas · {mode} · {roots} raízes', live: 'ao vivo', snapshot: 'instantâneo', usn: 'USN',
-        sortTitle: 'Clique para mudar a ordem', name: 'Nome', size: 'Tamanho', mtime: 'Modificado', path: 'Caminho',
-        dirBadge: 'DIR', fileBadge: 'ARQ', loading: 'Buscando…', errorPrefix: 'Falha na busca: ', empty: 'Nenhum resultado',
-        results: '{total} resultados', showing: 'mostrando {n}', indexing: 'indexando, resultados incompletos',
-        copied: 'Caminho copiado', revealed: 'Mostrado no gerenciador de arquivos', opened: 'Aberto', inserted: '@file inserido',
-        insertFailed: 'Falha ao inserir; @file copiado', footer: '↑↓ escolher · Enter copiar · Ctrl+O abrir · Ctrl+Enter inserir @file · clique duplo revelar · Esc fechar',
+        sortLabel: 'Ordem', sortMtime: 'Modificado', sortName: 'Nome', sortSize: 'Tamanho', sortPath: 'Caminho',
+        asc: 'Ascendente', descOrder: 'Descendente',
+        groupContent: 'Conteúdo', groupFiles: 'Arquivos', groupDirs: 'Pastas',
+        relevance: 'por relevância', contentBuilding: 'indexando… {files} arquivos / {messages} mensagens',
+        contentShort: 'Digite pelo menos 2 caracteres para buscar conteúdo e sessões',
+        contentDisabled: 'Índice de conteúdo desativado (contentIndex: false)',
+        contentCapped: 'primeiros {n}', showing: 'primeiros {n}', deduped: '{n} acertos de nome mesclados', loading: 'Buscando…',
+        emptyQuery: 'Digite para buscar nomes, caminhos, conteúdo e sessões',
+        emptyResults: 'Sem resultados · tente menos escopos ou outra palavra',
+        emptyScopes: 'Escolha pelo menos um escopo (Conteúdo, Arquivos, Pastas)',
+        errorPrefix: 'Falha na busca: ', retry: 'Tentar novamente', indexing: 'indexando, resultados incompletos',
+        statusLoading: 'Lendo o estado do índice…', status: 'Índice: {entries} entradas · {mode} · {roots} raízes',
+        live: 'ao vivo', snapshot: 'instantâneo', usn: 'USN',
+        copiedPath: 'Caminho copiado', revealed: 'Mostrado no gerenciador de arquivos', opened: 'Aberto', inserted: '@file inserido',
+        insertFailed: 'Falha ao inserir; @file copiado', jumped: 'Sessão aberta', jumpFailed: 'Sessão aberta, mas a mensagem não foi localizada',
+        footer: '↑↓ escolher · Enter abrir/ir · Ctrl+Shift+C copiar caminho · Ctrl+O abrir · Alt+1–3 escopos · Esc fechar',
+        results: 'conteúdo {content} · arquivos {files} · pastas {dirs} · {ms} ms',
         launcher: 'Busca local (Ctrl+Shift+F)',
         justNow: 'agora', minutesAgo: 'há {n} min', hoursAgo: 'há {n} h',
+        phraseNotFound: 'Não encontrado na conversa (talvez ainda não carregada)',
       },
       hi: {
-        contentMode: 'सामग्री', sessionBadge: 'चैट', jumped: 'सत्र खुला',
-        placeholder: 'फ़ाइल नाम या पथ खोजें… जैसे ext:pdf size:>10mb dm:thisweek path:src !tmp',
+        scopeContent: 'सामग्री', scopeFiles: 'फ़ाइलें', scopeDirs: 'फ़ोल्डर',
+        placeholder: 'नाम, पथ, सामग्री या सत्र खोजें… जैसे ext:pdf size:>10mb dm:thisweek path:src',
         searchLabel: 'फ़ाइल खोज', dialog: 'स्थानीय फ़ाइल खोज', closeTitle: 'बंद करें (Esc)', closeLabel: 'बंद करें',
-        filesOnly: 'केवल फ़ाइलें', dirsOnly: 'केवल फ़ोल्डर', statusLoading: 'इंडेक्स स्थिति पढ़ी जा रही है…',
-        status: 'इंडेक्स {entries} प्रविष्टियाँ · {mode} · {roots} रूट', live: 'लाइव', snapshot: 'स्नैपशॉट', usn: 'USN',
-        sortTitle: 'क्रम बदलने के लिए क्लिक करें', name: 'नाम', size: 'आकार', mtime: 'संशोधित', path: 'पथ',
-        dirBadge: 'DIR', fileBadge: 'FILE', loading: 'खोज रहे हैं…', errorPrefix: 'खोज विफल: ', empty: 'कोई मेल नहीं',
-        results: '{total} परिणाम', showing: 'पहले {n} दिखाए', indexing: 'इंडेक्स बन रहा है, परिणाम अधूरे हो सकते हैं',
-        copied: 'पथ कॉपी हुआ', revealed: 'फ़ाइल मैनेजर में दिखाया', opened: 'खोला गया', inserted: '@file डाला गया',
-        insertFailed: 'डालना विफल; @file कॉपी हुआ', footer: '↑↓ चुनें · Enter कॉपी · Ctrl+O खोलें · Ctrl+Enter @file डालें · डबल-क्लिक दिखाएँ · Esc बंद',
+        sortLabel: 'क्रम', sortMtime: 'संशोधित', sortName: 'नाम', sortSize: 'आकार', sortPath: 'पथ',
+        asc: 'आरोही', descOrder: 'अवरोही',
+        groupContent: 'सामग्री', groupFiles: 'फ़ाइलें', groupDirs: 'फ़ोल्डर',
+        relevance: 'प्रासंगिकता से', contentBuilding: 'इंडेक्स बन रहा है… {files} फ़ाइलें / {messages} संदेश',
+        contentShort: 'सामग्री और सत्र खोजने के लिए कम से कम 2 अक्षर लिखें',
+        contentDisabled: 'सामग्री इंडेक्स बंद है (contentIndex: false)',
+        contentCapped: 'पहले {n}', showing: 'पहले {n}', deduped: '{n} नाम-परिणाम सामग्री में मिलाए', loading: 'खोज रहे हैं…',
+        emptyQuery: 'नाम, पथ, सामग्री और सत्र खोजने के लिए लिखें',
+        emptyResults: 'कोई मेल नहीं · कम क्षेत्र या दूसरा शब्द आज़माएँ',
+        emptyScopes: 'कम से कम एक क्षेत्र चुनें (सामग्री, फ़ाइलें, फ़ोल्डर)',
+        errorPrefix: 'खोज विफल: ', retry: 'पुन: प्रयास', indexing: 'इंडेक्स बन रहा है, परिणाम अधूरे हो सकते हैं',
+        statusLoading: 'इंडेक्स स्थिति पढ़ी जा रही है…', status: 'इंडेक्स {entries} प्रविष्टियाँ · {mode} · {roots} रूट',
+        live: 'लाइव', snapshot: 'स्नैपशॉट', usn: 'USN',
+        copiedPath: 'पथ कॉपी हुआ', revealed: 'फ़ाइल मैनेजर में दिखाया', opened: 'खोला गया', inserted: '@file डाला गया',
+        insertFailed: 'डालना विफल; @file कॉपी हुआ', jumped: 'सत्र खुला', jumpFailed: 'सत्र खुला, पर संदेश नहीं मिला',
+        footer: '↑↓ चुनें · Enter खोलें/जाएँ · Ctrl+Shift+C पथ कॉपी · Ctrl+O खोलें · Alt+1–3 क्षेत्र · Esc बंद',
+        results: 'सामग्री {content} · फ़ाइलें {files} · फ़ोल्डर {dirs} · {ms} ms',
         launcher: 'स्थानीय फ़ाइल खोज (Ctrl+Shift+F)',
         justNow: 'अभी', minutesAgo: '{n} मिनट पहले', hoursAgo: '{n} घंटे पहले',
+        phraseNotFound: 'बातचीत में नहीं मिला (शायद अभी लोड नहीं हुआ)',
       },
     }
     const LANG = (() => {
@@ -202,9 +270,7 @@ window.__ModuleLoader__.load({
     }
 
     function copyText(text) {
-      if (navigator.clipboard && typeof navigator.clipboard.writeText === 'function') {
-        return navigator.clipboard.writeText(text)
-      }
+      if (navigator.clipboard && typeof navigator.clipboard.writeText === 'function') return navigator.clipboard.writeText(text)
       return new Promise((resolve, reject) => {
         const area = document.createElement('textarea')
         area.value = text
@@ -234,7 +300,6 @@ window.__ModuleLoader__.load({
       return document.execCommand('insertText', false, text)
     }
 
-    // ── helpers ─────────────────────────────────────────────────────────────
     function formatSize(bytes) {
       if (!bytes) return ''
       if (bytes < 1024) return bytes + ' B'
@@ -262,72 +327,186 @@ window.__ModuleLoader__.load({
       return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
     }
 
-    function highlight(name, query) {
-      const words = query.split(/\s+/).filter(word => word !== '' && !word.includes(':') && !word.startsWith('!') && !word.includes('*') && !word.includes('?'))
-      if (words.length === 0) return name
+    function queryWords(query) {
+      const words = String(query || '').split(/\s+/).filter(word => word !== ''
+        && !word.includes(':') && !word.startsWith('!') && !word.includes('*') && !word.includes('?'))
+      return words.map(word => word.replace(/^"|"$/g, '')).filter(word => word.length > 0)
+    }
+
+    function highlight(text, query) {
+      const words = queryWords(query)
+      if (words.length === 0) return text
       try {
         const pattern = new RegExp('(' + words.map(escapeRegExp).join('|') + ')', 'gi')
-        const parts = name.split(pattern)
+        const parts = String(text).split(pattern)
         return parts.map((part, index) => (index % 2 === 1 ? h('mark', { className: 'dsh-locator-hit', key: index }, part) : part))
       } catch {
-        return name
+        return text
       }
     }
 
-    // ── panel ───────────────────────────────────────────────────────────────
-    let workspaceService = null
+    // ── panel preferences ───────────────────────────────────────────────────
+    const PREFS_KEY = 'dsh-locator.panel.v1'
+    const SORTS = ['mtime', 'name', 'size', 'path']
+    function readPrefs() {
+      const fallback = { scopes: { content: true, files: true, dirs: true }, sort: 'mtime', desc: true }
+      try {
+        const raw = window.localStorage.getItem(PREFS_KEY)
+        if (raw === null) return fallback
+        const value = JSON.parse(raw)
+        if (typeof value !== 'object' || value === null) return fallback
+        const scopes = value.scopes
+        return {
+          scopes: {
+            content: typeof scopes?.content === 'boolean' ? scopes.content : true,
+            files: typeof scopes?.files === 'boolean' ? scopes.files : true,
+            dirs: typeof scopes?.dirs === 'boolean' ? scopes.dirs : true,
+          },
+          sort: SORTS.includes(value.sort) ? value.sort : 'mtime',
+          desc: typeof value.desc === 'boolean' ? value.desc : true,
+        }
+      } catch {
+        return fallback
+      }
+    }
+    function writePrefs(prefs) {
+      try { window.localStorage.setItem(PREFS_KEY, JSON.stringify(prefs)) } catch { /* storage unavailable */ }
+    }
+
+    // ── find highlight: CSS Custom Highlight API ────────────────────────────
+    const HL_BASE = 'dsh-locator-find'
+    const HL_ACTIVE = 'dsh-locator-find-active'
+    const GESTURES = ['wheel', 'touchstart', 'pointerdown', 'keydown']
+    const EXCLUDED = '[hidden],[data-chat-history],[data-text-interaction-surface],[data-composer-seat],script,style'
+    const BLOCK_SELECTOR = 'p,li,pre,td,th,h1,h2,h3,h4,h5,h6,blockquote,dd,dt'
+    const legacyTargets = new Set()
+
+    function highlightsAvailable() {
+      return typeof Highlight === 'function' && typeof CSS !== 'undefined' && CSS !== null
+        && typeof CSS.highlights === 'object' && CSS.highlights !== null
+    }
+
+    function clearLegacyTargets() {
+      for (const element of legacyTargets) element.classList.remove('dsh-locator-target')
+      legacyTargets.clear()
+    }
+
+    function clearFindHighlight() {
+      clearLegacyTargets()
+      if (!highlightsAvailable()) return
+      CSS.highlights.delete(HL_BASE)
+      CSS.highlights.delete(HL_ACTIVE)
+    }
 
-    // ── chat anchors ────────────────────────────────────────────────────────
-    // The Chat flow renders one `[data-chat-node-key]` row per node and the key
-    // of a human input embeds the message id the content index stored
-    // (`"<n>:input-message<messageId>"`). Anchor on that id first: it lands on
-    // the exact message instead of whichever copy of the words comes first in
-    // the document (the sidebar title, for example).
+    function setFindHighlight(ranges) {
+      if (!highlightsAvailable()) {
+        for (const range of ranges.slice(0, 1)) {
+          const node = range.startContainer
+          const element = node instanceof Element ? node : node.parentElement
+          const row = element === null ? null : element.closest('[data-chat-node-key]')
+          if (row !== null) { row.classList.add('dsh-locator-target'); legacyTargets.add(row) }
+        }
+        return
+      }
+      if (ranges.length === 0) return
+      CSS.highlights.set(HL_BASE, new Highlight(...ranges))
+      CSS.highlights.set(HL_ACTIVE, new Highlight(ranges[0]))
+    }
+
+    function conversationScope(sessionId) {
+      const id = sessionId === undefined || sessionId === null ? '' : String(sessionId)
+      let embedded = null
+      for (const element of document.querySelectorAll('[data-conversation-content][data-conversation-session]')) {
+        if (id !== '' && element.getAttribute('data-conversation-session') !== id) continue
+        if (element.closest('[data-sidebar-chat]') === null) return element
+        embedded = element
+      }
+      return embedded
+    }
 
-    function chatScope() {
-      return document.querySelector('[data-conversation-scroll]')
-        || document.querySelector('[data-slot="conversation.chat.flow"]')
-        || null
+    function chatFlow(scope) {
+      return scope === null ? null : scope.querySelector('[data-chat-flow]')
     }
 
-    function findMessageNode(messageId) {
-      if (!messageId) return null
+    function findMessageRow(flow, messageId) {
+      if (flow === null || !messageId) return null
       const id = String(messageId)
-      if (id === '') return null
-      const rows = document.querySelectorAll('[data-chat-node-key]')
-      for (const row of rows) {
+      for (const row of flow.querySelectorAll('[data-chat-node-key]')) {
         const key = row.getAttribute('data-chat-node-key') || ''
         if (key === id || key.endsWith(id)) return row
       }
       return null
     }
 
-    function markElement(element) {
-      if (!element || typeof element.scrollIntoView !== 'function') return false
-      element.scrollIntoView({ block: 'center' })
-      const previous = element.style.outline
-      const previousOffset = element.style.outlineOffset
-      const previousRadius = element.style.borderRadius
-      element.style.outline = '2px solid #4f7cff'
-      element.style.outlineOffset = '3px'
-      element.style.borderRadius = '8px'
-      clearTimeout(element.__dshLocatorMark)
-      element.__dshLocatorMark = setTimeout(() => {
-        element.style.outline = previous
-        element.style.outlineOffset = previousOffset
-        element.style.borderRadius = previousRadius
-      }, 2400)
-      return true
+    function needlesFromQuery(query) {
+      const raw = String(query || '').trim()
+      const words = queryWords(raw).filter(word => word.length >= 1)
+      if (words.length === 0 && raw.length >= 2) return [raw]
+      return [...new Set(words)].sort((a, b) => b.length - a.length).slice(0, 8)
+    }
+
+    function inlineGroups(root) {
+      const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT)
+      const groups = new Map()
+      let node = walker.nextNode()
+      while (node !== null) {
+        const parent = node.parentElement
+        if (parent !== null && parent.closest(EXCLUDED) === null) {
+          const value = node.nodeValue || ''
+          if (value !== '') {
+            const block = parent.closest(BLOCK_SELECTOR) || root
+            let group = groups.get(block)
+            if (group === undefined) { group = { nodes: [], text: '' }; groups.set(block, group) }
+            group.nodes.push(node)
+            group.text += value
+          }
+        }
+        node = walker.nextNode()
+      }
+      return [...groups.values()]
+    }
+
+    function offsetInGroup(group, index) {
+      let consumed = 0
+      for (const node of group.nodes) {
+        const length = (node.nodeValue || '').length
+        if (index <= consumed + length) return [node, index - consumed]
+        consumed += length
+      }
+      const last = group.nodes[group.nodes.length - 1]
+      return [last, (last.nodeValue || '').length]
+    }
+
+    function rangesForNeedles(root, needles) {
+      const ranges = []
+      if (root === null || needles.length === 0) return ranges
+      for (const group of inlineGroups(root)) {
+        const lower = group.text.toLowerCase()
+        for (const needle of needles) {
+          const target = needle.toLowerCase()
+          let from = 0
+          while (ranges.length < 200) {
+            const index = lower.indexOf(target, from)
+            if (index < 0) break
+            const start = offsetInGroup(group, index)
+            const end = offsetInGroup(group, index + target.length)
+            const range = document.createRange()
+            range.setStart(start[0], start[1])
+            range.setEnd(end[0], end[1])
+            ranges.push(range)
+            from = index + target.length
+          }
+        }
+      }
+      return ranges
+    }
+
+    function normalizePhrase(text) {
+      return String(text || '').replace(/[\u0001\u0002\u2026]/g, ' ').replace(/\s+/g, ' ').trim()
     }
 
-    // Progressively shorter fallbacks: a FTS snippet may be cut mid-word or
-    // separated by ellipses, so try the whole phrase before the leading words.
     function phraseCandidates(snippet) {
-      const clean = String(snippet || '')
-        .replace(/[\u0001\u0002]/g, ' ')
-        .replace(/…/g, ' ')
-        .replace(/\s+/g, ' ')
-        .trim()
+      const clean = normalizePhrase(snippet)
       const out = []
       const push = value => {
         const text = String(value || '').trim()
@@ -346,65 +525,261 @@ window.__ModuleLoader__.load({
       return out
     }
 
-    function findPhraseNode(scope, phrase) {
-      if (!scope || phrase.length < 2) return null
-      const needle = phrase.toLowerCase()
-      const walker = document.createTreeWalker(scope, NodeFilter.SHOW_TEXT)
-      let node
-      while ((node = walker.nextNode())) {
-        const text = node.nodeValue || ''
-        if (text.toLowerCase().indexOf(needle) < 0) continue
-        // The scope is the conversation transcript, so the first match already
-        // belongs to the bubble that contains the phrase.
-        const parent = node.parentElement
-        if (parent) return parent
+    function phraseRange(root, snippet) {
+      if (root === null) return null
+      for (const phrase of phraseCandidates(snippet)) {
+        const needle = phrase.toLowerCase()
+        for (const group of inlineGroups(root)) {
+          const index = group.text.toLowerCase().indexOf(needle)
+          if (index < 0) continue
+          const start = offsetInGroup(group, index)
+          const end = offsetInGroup(group, index + needle.length)
+          const range = document.createRange()
+          range.setStart(start[0], start[1])
+          range.setEnd(end[0], end[1])
+          return range
+        }
       }
       return null
     }
 
-    function jumpHighlight(snippet, messageId) {
-      const anchor = findMessageNode(messageId)
-      if (anchor !== null) return markElement(anchor)
-      const scope = chatScope()
-      for (const phrase of phraseCandidates(snippet)) {
-        const element = findPhraseNode(scope, phrase)
-        if (element !== null) return markElement(element)
+    function rangeRect(range) {
+      for (const rect of range.getClientRects()) if (rect.width > 0 && rect.height > 0) return rect
+      const rect = range.getBoundingClientRect()
+      return rect.width > 0 && rect.height > 0 ? rect : null
+    }
+
+    function isScrollable(element) {
+      if (!(element instanceof HTMLElement)) return false
+      return /(auto|scroll|overlay)/u.test(getComputedStyle(element).overflowY)
+        && element.scrollHeight - element.clientHeight > 2
+    }
+
+    function scrollChain(element) {
+      const chain = []
+      for (let node = element; node !== null; node = node.parentElement) if (isScrollable(node)) chain.push(node)
+      return chain
+    }
+
+    function visibleBand(scroller) {
+      const rect = scroller.getBoundingClientRect()
+      const seat = scroller.querySelector('[data-composer-seat]')
+      const seatRect = seat === null ? null : seat.getBoundingClientRect()
+      const bottom = seatRect !== null && seatRect.height > 0 ? Math.min(rect.bottom, seatRect.top) : rect.bottom
+      return { top: rect.top, bottom, height: Math.max(0, bottom - rect.top) }
+    }
+
+    function centerRange(range) {
+      const start = range.startContainer
+      const element = start instanceof Element ? start : start.parentElement
+      if (element === null) return false
+      let moved = false
+      for (const scroller of scrollChain(element)) {
+        const rect = rangeRect(range)
+        if (rect === null) return moved
+        const band = visibleBand(scroller)
+        if (band.height <= 0) continue
+        const next = Math.max(0, Math.min(
+          Math.max(0, scroller.scrollHeight - scroller.clientHeight),
+          scroller.scrollTop + (rect.top + rect.height / 2) - (band.top + band.height / 2),
+        ))
+        if (Math.abs(next - scroller.scrollTop) > 1) { scroller.scrollTop = next; moved = true }
+      }
+      return moved
+    }
+
+    function expandHidden(node) {
+      let element = node instanceof Element ? node : node.parentElement
+      for (; element !== null; element = element.parentElement) {
+        if (element.getAttribute('hidden') === 'until-found') {
+          element.dispatchEvent(new Event('beforematch'))
+        }
+      }
+    }
+
+    function waitFor(scope, test, timeoutMs, intervalMs) {
+      return new Promise(resolve => {
+        let settled = false
+        const finish = value => {
+          if (settled) return
+          settled = true
+          clearInterval(timer)
+          clearTimeout(timeout)
+          resolve(value)
+        }
+        const check = () => {
+          try {
+            const value = test()
+            if (value !== null && value !== undefined) finish(value)
+          } catch { /* DOM not ready yet */ }
+        }
+        const timer = setInterval(check, intervalMs || 120)
+        const timeout = setTimeout(() => finish(null), timeoutMs)
+        check()
+      })
+    }
+
+    function waitForScope(sessionId, timeoutMs) {
+      return waitFor(document, () => conversationScope(sessionId), timeoutMs, 120)
+    }
+
+    function revealOlder(scope) {
+      const button = scope === null ? null : scope.querySelector('[data-chat-history] button')
+      if (button === null || button.disabled === true) return false
+      button.click()
+      return true
+    }
+
+    let activeJump = null
+
+    function cancelJump() {
+      clearFindHighlight()
+      if (activeJump !== null) {
+        const cancel = activeJump
+        activeJump = null
+        cancel()
+      }
+    }
+
+    async function jumpToContentHit(hit, query, notify) {
+      cancelJump()
+      if (!hit || hit.kind !== 'session' || !hit.sessionId) return false
+      if (!workspaceService || typeof workspaceService.openSession !== 'function') return false
+      try { workspaceService.openSession(hit.sessionId) } catch { return false }
+      const scope = await waitForScope(hit.sessionId, 10_000)
+      if (scope === null) { notify?.(t('jumpFailed')); return false }
+      const flow = chatFlow(scope)
+      if (flow === null) { notify?.(t('jumpFailed')); return false }
+      const needles = needlesFromQuery(query)
+      const finder = () => {
+        const row = findMessageRow(flow, hit.messageId)
+        if (row !== null) {
+          expandHidden(row)
+          const ranges = rangesForNeedles(row, needles)
+          if (ranges.length > 0) return { row, ranges }
+          const phrase = phraseRange(row, hit.snippet)
+          if (phrase !== null) return { row, ranges: [phrase] }
+          return null
+        }
+        const phrase = phraseRange(flow, hit.snippet)
+        if (phrase === null) return null
+        const phraseRow = phrase.startContainer instanceof Element
+          ? phrase.startContainer.closest('[data-chat-node-key]')
+          : phrase.startContainer.parentElement?.closest('[data-chat-node-key]') ?? null
+        if (phraseRow !== null) expandHidden(phraseRow)
+        const ranges = phraseRow === null ? [phrase] : rangesForNeedles(phraseRow, needles)
+        return { row: phraseRow, ranges: ranges.length > 0 ? ranges : [phrase] }
+      }
+      let target = await waitFor(flow, finder, 6_000, 120)
+      for (let attempt = 0; target === null && attempt < 10; attempt++) {
+        if (!revealOlder(scope)) break
+        target = await waitFor(flow, finder, 1_500, 150)
+      }
+      if (target === null) { notify?.(t('phraseNotFound')); return false }
+      setFindHighlight(target.ranges)
+      centerRange(target.ranges[0])
+      const start = target.ranges[0].startContainer
+      const chain = scrollChain(start instanceof Element ? start : start.parentElement)
+      const scroller = chain.length > 0 ? chain[chain.length - 1] : null
+      const cleanup = []
+      const release = () => {
+        while (cleanup.length > 0) {
+          const fn = cleanup.pop()
+          try { fn() } catch { /* ignore */ }
+        }
       }
-      return false
+      activeJump = release
+      if (scroller !== null) {
+        let writing = false
+        const expected = scroller.scrollTop
+        const recenter = () => {
+          if (activeJump !== release) return
+          const rect = rangeRect(target.ranges[0])
+          if (rect === null) { release(); clearFindHighlight(); activeJump = null; return }
+          writing = true
+          centerRange(target.ranges[0])
+          requestAnimationFrame(() => { writing = false })
+        }
+        for (const delay of [80, 240, 800, 1600]) {
+          const id = setTimeout(recenter, delay)
+          cleanup.push(() => clearTimeout(id))
+        }
+        const onUser = () => { if (!writing) release() }
+        for (const type of GESTURES) {
+          scroller.addEventListener(type, onUser, true)
+          cleanup.push(() => scroller.removeEventListener(type, onUser, true))
+        }
+        const onScroll = event => {
+          if (writing) return
+          if (event.target === scroller && Math.abs(scroller.scrollTop - expected) <= 2) return
+          release()
+        }
+        scroller.addEventListener('scroll', onScroll, true)
+        cleanup.push(() => scroller.removeEventListener('scroll', onScroll, true))
+      }
+      const onKey = event => {
+        if (event.key !== 'Escape') return
+        cancelJump()
+      }
+      document.addEventListener('keydown', onKey, true)
+      cleanup.push(() => document.removeEventListener('keydown', onKey, true))
+      const sessionWatch = setInterval(() => {
+        const still = target.ranges[0].startContainer.isConnected && conversationScope(hit.sessionId) !== null
+        if (!still) cancelJump()
+      }, 1_000)
+      cleanup.push(() => clearInterval(sessionWatch))
+      cleanup.push(() => clearFindHighlight())
+      notify?.(t('jumped'))
+      return true
     }
 
-    const PAGE = 100
+    // ── panel ───────────────────────────────────────────────────────────────
+    let workspaceService = null
+    const PAGE_NAME = 50
+    const PAGE_CONTENT = 30
 
     function Panel() {
       const open = useOpen()
+      const prefs = useMemo(readPrefs, [])
       const [query, setQuery] = useState('')
-      const [sort, setSort] = useState('mtime')
-      const [desc, setDesc] = useState(true)
-      const [filesOnly, setFilesOnly] = useState(false)
-      const [dirsOnly, setDirsOnly] = useState(false)
-      const [contentMode, setContentMode] = useState(false)
-      const [hits, setHits] = useState([])
-      const [total, setTotal] = useState(0)
+      const [sort, setSort] = useState(prefs.sort)
+      const [desc, setDesc] = useState(prefs.desc)
+      const [scopes, setScopes] = useState(prefs.scopes)
+      const [groups, setGroups] = useState(null)
+      const [loading, setLoading] = useState(false)
+      const [error, setError] = useState('')
       const [took, setTook] = useState(0)
-      const [truncated, setTruncated] = useState(false)
-      const [contentBuilding, setContentBuilding] = useState(false)
-      const [refreshTick, setRefreshTick] = useState(0)
       const [status, setStatus] = useState(null)
-      const [error, setError] = useState('')
-      const [loading, setLoading] = useState(false)
+      const [availableContent, setAvailableContent] = useState(true)
       const [selected, setSelected] = useState(0)
       const [toast, setToast] = useState('')
+      const [refreshTick, setRefreshTick] = useState(0)
       const inputRef = useRef(null)
+      const panelRef = useRef(null)
       const abortRef = useRef(null)
       const listRef = useRef(null)
 
       const close = useCallback(() => store.set(false), [])
+      const anyScope = scopes.content || scopes.files || scopes.dirs
+
+      useEffect(() => {
+        writePrefs({ scopes, sort, desc })
+      }, [scopes, sort, desc])
 
       useEffect(() => {
         if (!open) return undefined
+        const previous = document.activeElement
         setError('')
-        const timer = setTimeout(() => inputRef.current && inputRef.current.focus(), 30)
-        return () => clearTimeout(timer)
+        const timer = setTimeout(() => {
+          if (inputRef.current) {
+            inputRef.current.focus()
+            if (inputRef.current.value !== '') inputRef.current.select()
+          }
+        }, 30)
+        return () => {
+          clearTimeout(timer)
+          if (previous instanceof HTMLElement && previous.isConnected) previous.focus()
+        }
       }, [open])
 
       useEffect(() => {
@@ -412,10 +787,13 @@ window.__ModuleLoader__.load({
         let cancelled = false
         let timer = 0
         const load = () => {
-          const controller = new AbortController()
-          post('/dsh-locator/status', {}, controller.signal).then(next => {
+          post('/dsh-locator/status', {}).then(next => {
             if (cancelled) return
             setStatus(next)
+            if (next && next.content && next.content.enabled === false) {
+              setAvailableContent(false)
+              setScopes(value => (value.content ? { ...value, content: false } : value))
+            }
             if (next && next.scanning) timer = setTimeout(load, 1500)
           }).catch(() => {})
         }
@@ -423,63 +801,71 @@ window.__ModuleLoader__.load({
         return () => { cancelled = true; clearTimeout(timer) }
       }, [open])
 
+      // One request for every enabled scope; the server owns the grouping and
+      // de-duplication. Empty and one-character queries never start a content
+      // build (see src/combined.ts), so opening the panel stays cheap.
       useEffect(() => {
         if (!open) return undefined
+        if (!anyScope) {
+          setGroups(null)
+          setLoading(false)
+          setError('')
+          return undefined
+        }
         const timer = setTimeout(() => {
           if (abortRef.current) abortRef.current.abort()
           const controller = new AbortController()
           abortRef.current = controller
           setLoading(true)
           setError('')
-          const request = contentMode
-            ? post('/dsh-locator/content', { query, limit: PAGE }, controller.signal)
-            : post('/dsh-locator/search', { query, limit: PAGE, offset: 0, sort, desc, filesOnly, dirsOnly }, controller.signal)
-          request.then(data => {
+          post('/dsh-locator/combined', {
+            query,
+            content: scopes.content,
+            files: scopes.files,
+            dirs: scopes.dirs,
+            limit: PAGE_NAME,
+            contentLimit: PAGE_CONTENT,
+            sort,
+            desc,
+          }, controller.signal).then(data => {
             if (controller.signal.aborted) return
-            const nextHits = contentMode
-              ? (Array.isArray(data.hits) ? data.hits : []).map(hit => ({
-                  ...hit,
-                  name: hit.title || String(hit.path).split('/').pop() || hit.path,
-                  dir: false,
-                  size: 0,
-                  mtime: 0,
-                  content: true,
-                }))
-              : (Array.isArray(data.hits) ? data.hits : []).map(hit => ({ ...hit, content: false }))
-            setHits(nextHits)
-            setTotal(typeof data.total === 'number' ? data.total : nextHits.length)
+            setGroups({
+              content: data.content,
+              files: data.files,
+              dirs: data.dirs,
+            })
+            if (typeof data.availableContent === 'boolean') setAvailableContent(data.availableContent)
             setTook(typeof data.tookMs === 'number' ? data.tookMs : 0)
-            setTruncated(data.truncated === true)
-            setContentBuilding(contentMode && data.state != null && data.state.building === true)
-            setSelected(0)
             setLoading(false)
           }).catch(cause => {
             if (controller.signal.aborted) return
-            setHits([])
-            setTotal(0)
             setError(cause instanceof Error ? cause.message : String(cause))
             setLoading(false)
           })
-        }, 110)
+        }, 140)
         return () => clearTimeout(timer)
-      }, [open, query, sort, desc, filesOnly, dirsOnly, contentMode, refreshTick])
+      }, [open, query, sort, desc, scopes.content, scopes.files, scopes.dirs, refreshTick, anyScope])
 
-      // The content index is built lazily on first use; poll until it settles so
-      // the first query fills in without the user retyping it.
+      const contentBuilding = groups !== null && groups.content !== undefined && groups.content.building === true
       useEffect(() => {
-        if (!open || !contentMode || !contentBuilding) return undefined
+        if (!open || !contentBuilding) return undefined
         const timer = setTimeout(() => setRefreshTick(value => value + 1), 2500)
         return () => clearTimeout(timer)
-      }, [open, contentMode, contentBuilding, refreshTick])
+      }, [open, contentBuilding, refreshTick])
 
-      const toggleSort = useCallback(key => {
-        if (sort === key) {
-          setDesc(value => !value)
-        } else {
-          setSort(key)
-          setDesc(key === 'mtime' || key === 'size')
+      const rows = useMemo(() => {
+        if (groups === null) return []
+        const out = []
+        for (const group of ['content', 'files', 'dirs']) {
+          const hits = groups[group] && Array.isArray(groups[group].hits) ? groups[group].hits : []
+          for (const hit of hits) out.push({ group, hit })
         }
-      }, [sort])
+        return out
+      }, [groups])
+
+      useEffect(() => {
+        setSelected(value => Math.min(Math.max(0, value), Math.max(0, rows.length - 1)))
+      }, [rows.length])
 
       const notify = useCallback(message => {
         setToast(message)
@@ -488,7 +874,7 @@ window.__ModuleLoader__.load({
 
       const copy = useCallback(hit => {
         if (!hit) return
-        copyText(hit.path).then(() => notify(t('copied'))).catch(() => {})
+        copyText(hit.path).then(() => notify(t('copiedPath'))).catch(() => {})
       }, [notify])
 
       const reveal = useCallback(hit => {
@@ -496,97 +882,100 @@ window.__ModuleLoader__.load({
         post('/dsh-locator/reveal', { path: hit.path }).then(() => notify(t('revealed'))).catch(() => copy(hit))
       }, [copy, notify])
 
-      const jumpSession = useCallback(hit => {
-        if (!hit || hit.kind !== 'session' || !hit.sessionId) return
-        close()
-        if (!workspaceService || typeof workspaceService.openSession !== 'function') {
-          copy(hit)
-          return
-        }
-        try {
-          workspaceService.openSession(hit.sessionId)
-          notify(t('jumped'))
-        } catch {
-          copy(hit)
-          return
-        }
-        const snippet = hit.snippet
-        const messageId = hit.messageId
-        let tries = 0
-        let pulledEarlier = false
-        const timer = setInterval(() => {
-          tries++
-          if (jumpHighlight(snippet, messageId)) {
-            clearInterval(timer)
-            return
-          }
-          // A long session renders its tail first: nudge the transcript to the
-          // top once so paging can load the message the hit points at.
-          if (!pulledEarlier && tries === 15) {
-            pulledEarlier = true
-            const scroller = document.querySelector('[data-conversation-scroll]')
-            if (scroller !== null && scroller.scrollTop > 0) scroller.scrollTop = 0
-          }
-          if (tries > 100) clearInterval(timer)
-        }, 150)
-      }, [close, copy, notify])
-
-      const activate = useCallback(hit => {
-        if (!hit) return
-        if (hit.kind === 'session') jumpSession(hit)
-        else reveal(hit)
-      }, [jumpSession, reveal])
-
       const openFile = useCallback(hit => {
         if (!hit || hit.dir) return
         post('/dsh-locator/open', { path: hit.path }).then(() => notify(t('opened'))).catch(() => copy(hit))
       }, [copy, notify])
 
-      const insert = useCallback(hit => {
+      const activate = useCallback(hit => {
         if (!hit) return
+        if (hit.kind === 'session' && hit.sessionId) {
+          close()
+          void jumpToContentHit(hit, query, notify)
+          return
+        }
+        reveal(hit)
+      }, [close, notify, query, reveal])
+
+      const insert = useCallback(hit => {
+        if (!hit || hit.kind === 'session') return
         const mention = '@"' + hit.path.replace(/"/g, '') + '" '
         close()
         setTimeout(() => {
-          if (insertIntoComposer(mention)) {
-            notify(t('inserted'))
-          } else {
-            copyText(mention).then(() => notify(t('insertFailed'))).catch(() => {})
-          }
+          if (insertIntoComposer(mention)) notify(t('inserted'))
+          else copyText(mention).then(() => notify(t('insertFailed'))).catch(() => {})
         }, 80)
       }, [close, notify])
 
+      const toggleScope = useCallback(key => {
+        if (key === 'content' && !availableContent) return
+        setScopes(value => ({ ...value, [key]: !value[key] }))
+      }, [availableContent])
+
       const onKeyDown = useCallback(event => {
+        if (event.target instanceof HTMLSelectElement) return
         if (event.key === 'Escape') {
           event.preventDefault()
           close()
           return
         }
-        if (event.key === 'ArrowDown') {
+        if (event.key === 'Tab') {
+          const panel = panelRef.current
+          if (!panel) return
+          const focusables = [...panel.querySelectorAll('input,select,button')].filter(element => !element.disabled)
+          if (focusables.length === 0) return
+          const first = focusables[0]
+          const last = focusables[focusables.length - 1]
+          if (!event.shiftKey && document.activeElement === last) { event.preventDefault(); first.focus() }
+          if (event.shiftKey && document.activeElement === first) { event.preventDefault(); last.focus() }
+          return
+        }
+        if (event.altKey && ['1', '2', '3'].includes(event.key)) {
           event.preventDefault()
-          setSelected(value => Math.min(hits.length - 1, value + 1))
+          toggleScope(event.key === '1' ? 'content' : event.key === '2' ? 'files' : 'dirs')
           return
         }
-        if (event.key === 'ArrowUp') {
+        if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
           event.preventDefault()
-          setSelected(value => Math.max(0, value - 1))
+          setSelected(value => Math.max(0, Math.min(rows.length - 1, value + (event.key === 'ArrowDown' ? 1 : -1))))
+          return
+        }
+        if (event.key === 'Home' || event.key === 'End') {
+          event.preventDefault()
+          setSelected(event.key === 'Home' ? 0 : Math.max(0, rows.length - 1))
+          return
+        }
+        if (event.key === 'PageDown' || event.key === 'PageUp') {
+          event.preventDefault()
+          setSelected(value => Math.max(0, Math.min(rows.length - 1, value + (event.key === 'PageDown' ? 8 : -8))))
+          return
+        }
+        if (event.key === 'Enter' && !event.isComposing && !event.ctrlKey && !event.metaKey && !event.altKey) {
+          event.preventDefault()
+          activate(rows[selected]?.hit)
           return
         }
         const modifier = event.ctrlKey || event.metaKey
-        if (modifier && String(event.key).toLowerCase() === 'o') {
+        if (modifier && event.shiftKey && String(event.key).toLowerCase() === 'c') {
           event.preventDefault()
-          openFile(hits[selected])
+          copy(rows[selected]?.hit)
           return
         }
-        if (modifier && event.key === 'Enter' && !event.isComposing) {
+        if (modifier && event.shiftKey && String(event.key).toLowerCase() === 'o') {
+          event.preventDefault()
+          reveal(rows[selected]?.hit)
+          return
+        }
+        if (modifier && String(event.key).toLowerCase() === 'o') {
           event.preventDefault()
-          insert(hits[selected])
+          openFile(rows[selected]?.hit)
           return
         }
-        if (event.key === 'Enter' && !event.isComposing) {
+        if (modifier && event.key === 'Enter' && !event.isComposing) {
           event.preventDefault()
-          copy(hits[selected])
+          insert(rows[selected]?.hit)
         }
-      }, [close, copy, hits, insert, openFile, selected])
+      }, [activate, close, copy, insert, openFile, reveal, rows, selected, toggleScope])
 
       useEffect(() => {
         const list = listRef.current
@@ -597,18 +986,97 @@ window.__ModuleLoader__.load({
 
       if (!open) return null
 
-      const header = (key, label, width) => h('th', {
-        key,
-        className: sort === key ? 'sorted' : '',
-        style: { width },
-        onClick: () => toggleSort(key),
-        title: t('sortTitle'),
-      }, label + (sort === key ? (desc ? ' ↓' : ' ↑') : ''))
+      const content = groups !== null ? groups.content : undefined
+      const files = groups !== null ? groups.files : undefined
+      const dirs = groups !== null ? groups.dirs : undefined
+      const contentCount = content === undefined ? 0 : (content.returned ?? 0)
+      const filesCount = files === undefined ? 0 : (files.returned ?? files.hits?.length ?? 0)
+      const dirsCount = dirs === undefined ? 0 : (dirs.returned ?? dirs.hits?.length ?? 0)
+      const totalRows = rows.length
+
+      const scopeBox = (key, label, count) => h('label', {
+        className: 'dsh-locator-check' + (key === 'content' && !availableContent ? ' disabled' : ''),
+        title: key === 'content' && !availableContent ? t('contentDisabled') : label,
+      },
+        h('input', {
+          type: 'checkbox',
+          checked: scopes[key],
+          disabled: key === 'content' && !availableContent,
+          onChange: () => toggleScope(key),
+        }),
+        label,
+        count > 0 ? h('span', { className: 'dsh-locator-count' }, String(count)) : null,
+      )
+
+      const groupHead = (key, label, count, note) => h('div', {
+        className: 'dsh-locator-grouphead',
+        id: 'dsh-locator-group-' + key,
+      },
+        h('span', null, label),
+        h('span', { className: 'dsh-locator-count' }, String(count)),
+        h('span', { className: 'grow' }),
+        note === null ? null : h('span', { className: 'dsh-locator-count' }, note),
+      )
+
+      const rowFor = (group, hit, index) => {
+        const isContent = group === 'content'
+        const isSession = isContent && hit.kind === 'session'
+        const badge = isContent
+          ? (isSession ? t('groupContent') : (hit.title || '').split('.').pop() || t('groupFiles'))
+          : (hit.dir ? t('groupDirs') : (hit.ext || t('groupFiles')))
+        const name = isSession ? (hit.title || hit.path) : (hit.name || hit.path)
+        const meta = isContent
+          ? formatTime(hit.mtime)
+          : [formatSize(hit.size), formatTime(hit.mtime)].filter(Boolean).join(' · ')
+        return h('div', {
+          key: group + ':' + hit.path + ':' + String(hit.messageId || index),
+          id: 'dsh-locator-opt-' + index,
+          role: 'option',
+          'aria-selected': index === selected ? 'true' : 'false',
+          'data-index': index,
+          className: 'dsh-locator-row' + (isContent ? ' dsh-locator-rowcontent' : '') + (index === selected ? ' sel' : ''),
+          title: hit.path,
+          onClick: () => setSelected(index),
+          onDoubleClick: () => activate(hit),
+        },
+          h('div', { className: 'dsh-locator-title' },
+            h('span', { className: 'dsh-locator-badge' + (isSession ? ' chat' : '') }, String(badge).slice(0, 6)),
+            h('span', { className: 'dsh-locator-name' }, isSession ? name : highlight(name, query)),
+            h('span', { className: 'dsh-locator-meta', style: { marginLeft: 'auto' } }, meta),
+          ),
+          isContent && hit.snippet
+            ? h('div', { className: 'dsh-locator-snippet' }, highlight(hit.snippet, query))
+            : null,
+          h('div', { className: 'dsh-locator-path' }, hit.path),
+        )
+      }
+
+      let index = -1
+      const renderGroup = (key, label, group, extra) => {
+        if (!scopes[key] || group === undefined) return null
+        const hits = Array.isArray(group.hits) ? group.hits : []
+        const count = typeof group.returned === 'number' ? group.returned : hits.length
+        const note = key === 'content'
+          ? (contentBuilding ? t('contentBuilding', { files: content?.files ?? 0, messages: content?.messages ?? 0 })
+            : (content?.capped ? t('contentCapped', { n: count }) : (query.trim() !== '' ? t('relevance') : null)))
+          : (group.deduped > 0 ? t('deduped', { n: group.deduped }) : (group.truncated ? t('showing', { n: hits.length }) : null))
+        return h('div', { className: 'dsh-locator-group', role: 'group', 'aria-labelledby': 'dsh-locator-group-' + key },
+          groupHead(key, label, count, note),
+          extra === undefined ? null : extra,
+          hits.length === 0
+            ? h('div', { className: 'dsh-locator-groupempty' },
+                key === 'content' && scopes.content
+                  ? (query.trim().length < 2 ? t('contentShort') : (contentBuilding ? t('loading') : t('emptyResults')))
+                  : (query.trim() === '' ? t('emptyQuery') : t('emptyResults')))
+            : hits.map(hit => { index++; return rowFor(key, hit, index) }),
+        )
+      }
 
       return h('div', {
         className: 'dsh-locator-overlay',
         onMouseDown: event => { if (event.target === event.currentTarget) close() },
       }, h('div', {
+        ref: panelRef,
         className: 'dsh-locator-panel',
         role: 'dialog',
         'aria-modal': 'true',
@@ -624,22 +1092,40 @@ window.__ModuleLoader__.load({
             spellCheck: false,
             autoComplete: 'off',
             placeholder: t('placeholder'),
-            onChange: event => setQuery(event.target.value),
+            onChange: event => { setQuery(event.target.value); setSelected(0) },
             'aria-label': t('searchLabel'),
+            role: 'combobox',
+            'aria-expanded': 'true',
+            'aria-controls': 'dsh-locator-results',
+            'aria-autocomplete': 'list',
+            'aria-activedescendant': totalRows > 0 ? 'dsh-locator-opt-' + selected : undefined,
           }),
           h('span', { className: 'dsh-locator-kbd' }, 'Ctrl+Shift+F'),
           h('button', { className: 'dsh-locator-close', onClick: close, title: t('closeTitle'), 'aria-label': t('closeLabel') }, '×'),
         ),
         h('div', { className: 'dsh-locator-bar' },
-          h('label', { className: 'dsh-locator-check' },
-            h('input', { type: 'checkbox', checked: filesOnly, onChange: event => { setFilesOnly(event.target.checked); if (event.target.checked) setDirsOnly(false) } }),
-            t('filesOnly')),
-          h('label', { className: 'dsh-locator-check' },
-            h('input', { type: 'checkbox', checked: dirsOnly, onChange: event => { setDirsOnly(event.target.checked); if (event.target.checked) setFilesOnly(false) } }),
-            t('dirsOnly')),
-          h('label', { className: 'dsh-locator-check' },
-            h('input', { type: 'checkbox', checked: contentMode, onChange: event => setContentMode(event.target.checked) }),
-            t('contentMode')),
+          scopeBox('content', t('scopeContent'), contentCount),
+          scopeBox('files', t('scopeFiles'), filesCount),
+          scopeBox('dirs', t('scopeDirs'), dirsCount),
+          h('span', { className: 'grow' }),
+          h('label', { className: 'dsh-locator-check' }, t('sortLabel'),
+            h('select', {
+              className: 'dsh-locator-sort',
+              value: sort,
+              onChange: event => setSort(SORTS.includes(event.target.value) ? event.target.value : 'mtime'),
+              'aria-label': t('sortLabel'),
+            },
+              h('option', { value: 'mtime' }, t('sortMtime')),
+              h('option', { value: 'name' }, t('sortName')),
+              h('option', { value: 'size' }, t('sortSize')),
+              h('option', { value: 'path' }, t('sortPath')),
+            )),
+          h('button', {
+            className: 'dsh-locator-dirbtn',
+            onClick: () => setDesc(value => !value),
+            title: desc ? t('descOrder') : t('asc'),
+            'aria-label': desc ? t('descOrder') : t('asc'),
+          }, desc ? '↓' : '↑'),
           h('span', { className: 'dsh-locator-status' },
             status === null
               ? t('statusLoading')
@@ -647,57 +1133,32 @@ window.__ModuleLoader__.load({
                   entries: (status.entries || 0).toLocaleString(),
                   mode: status.watching ? t('live') : t('snapshot'),
                   roots: (status.roots || []).length,
-                }) + ((status.usnActive || status.usn) ? ' · ' + t('usn') : '')),
+                })),
         ),
-        h('div', { className: 'dsh-locator-scroll', ref: listRef },
-          h('table', { className: 'dsh-locator-table' },
-            h('colgroup', null,
-              h('col', { style: { width: '34%' } }),
-              h('col', { style: { width: '12%' } }),
-              h('col', { style: { width: '13%' } }),
-              h('col', { style: { width: '41%' } }),
-            ),
-            h('thead', null, h('tr', null,
-              header('name', t('name')),
-              header('size', t('size')),
-              header('mtime', t('mtime')),
-              header('path', t('path')),
-            )),
-            h('tbody', null,
-              hits.length === 0
-                ? h('tr', null, h('td', { colSpan: 4, className: 'dsh-locator-empty' },
-                    loading ? t('loading') : error !== '' ? t('errorPrefix') + error : t('empty')))
-                : hits.map((hit, index) => h('tr', {
-                    key: hit.path,
-                    'data-index': index,
-                    className: 'dsh-locator-row' + (index === selected ? ' sel' : ''),
-                    title: hit.path,
-                    onClick: () => setSelected(index),
-                    onDoubleClick: () => activate(hit),
-                  },
-                  h('td', null, h('div', { className: 'dsh-locator-name' },
-                    h('span', { className: 'dsh-locator-badge' }, hit.kind === 'session' ? t('sessionBadge') : (hit.ext || t('fileBadge')).toUpperCase()),
-                    h('span', null, hit.content ? hit.name : highlight(hit.name, query)),
-                    hit.content && hit.snippet ? h('span', { className: 'dsh-locator-snippet' }, hit.snippet.slice(0, 180)) : null,
-                  )),
-                  h('td', { className: 'dsh-locator-size' }, hit.dir ? '' : formatSize(hit.size)),
-                  h('td', { className: 'dsh-locator-time' }, formatTime(hit.mtime)),
-                  h('td', { className: 'dsh-locator-path' }, hit.path),
-                )),
-            ),
-          ),
+        h('div', { id: 'dsh-locator-results', className: 'dsh-locator-scroll', ref: listRef, role: 'listbox', 'aria-busy': loading ? 'true' : 'false' },
+          !anyScope
+            ? h('div', { className: 'dsh-locator-empty' }, t('emptyScopes'))
+            : error !== ''
+              ? h('div', { className: 'dsh-locator-empty', role: 'alert' }, t('errorPrefix') + error,
+                  h('button', { className: 'dsh-locator-dirbtn dsh-locator-retry', onClick: () => setRefreshTick(v => v + 1) }, t('retry')))
+              : groups === null
+                ? h('div', { className: 'dsh-locator-empty' }, t('loading'))
+                : [
+                    renderGroup('content', t('groupContent'), content),
+                    renderGroup('files', t('groupFiles'), files),
+                    renderGroup('dirs', t('groupDirs'), dirs),
+                  ],
         ),
         h('div', { className: 'dsh-locator-foot' },
-          h('span', null,
-            loading
-              ? t('loading')
-              : t('results', { total: total.toLocaleString() }) + (truncated ? ' (' + t('showing', { n: hits.length }) + ')' : '') + ' · ' + took.toFixed(1) + ' ms'
-                + (status && status.scanning ? ' · ' + t('indexing') : '')
-                + (contentBuilding ? ' · ' + t('indexing') : '')),
+          h('span', null, t('results', { content: contentCount, files: filesCount, dirs: dirsCount, ms: took.toFixed(1) })
+            + (status && status.scanning ? ' · ' + t('indexing') : '')
+            + (contentBuilding ? ' · ' + t('indexing') : '')),
           h('span', { className: 'grow' }),
           toast === '' ? null : h('span', { className: 'dsh-locator-toast' }, toast),
           h('span', null, t('footer')),
         ),
+        h('div', { style: { position: 'absolute', width: 1, height: 1, overflow: 'hidden', clip: 'rect(0 0 0 0)' }, role: 'status', 'aria-live': 'polite' },
+          t('results', { content: contentCount, files: filesCount, dirs: dirsCount, ms: Math.round(took) })),
       ))
     }
 
@@ -728,6 +1189,7 @@ window.__ModuleLoader__.load({
           document.addEventListener('keydown', onKey, true)
           return () => document.removeEventListener('keydown', onKey, true)
         }, 'dsh-locator: search hotkey')
+        ctx.effect(() => () => { cancelJump() }, 'dsh-locator: find highlight')
         try {
           ctx.slots.inject('shell.overlay', () => ctx.slots.register({ name: 'shell.overlay', id: 'dsh-locator-panel', order: 60 }, Panel))
         } catch (error) {