dsh-ide-git 0.25.0 → 0.27.0

package/README.md

@@ -16,7 +16,7 @@ DSH 自带的 Git 面板覆盖「暂存 / 提交 / 还原 / 看历史」;`dsh-id
 - **想指给 AI 一段代码**:在 diff 窗里选中几行、右键,把「哪个文件哪几行」(附提交或工作区上下文)直接发进当前会话的输入框。
 - **想比较分支**:分支右键即可与当前分支比较,结果按文件与提交数汇报。
 - **操作要够全**:签出、从任意分支/提交新建分支、重命名、删除、合并到当前、变基当前到此、新建标签、cherry-pick、还原提交、重置(保留/丢弃)、fetch / pull --ff-only / push(确认后)。
-- **输入框里就能看 Git**:输入框工具条上有仓库与分支胶囊(着色的未提交 / 可拉取 / 待推送计数),点击即可切换,多仓库工作区两边都能切;切换与面板实时联动,设置里可关(默认开)。切到新会话也不用等——插件会在你点开会话时就预热首屏数据,面板秒开。
+- **输入框里就能看 Git**:输入框工具条上有仓库与分支胶囊(着色的未提交 / 可拉取 / 待推送计数),点击弹出可搜索的切换器——仓库按名称/路径过滤,分支按 `/` 折成文件夹树(`fix/xxx` 一眼看清),输入即滤、方向键 + Enter 可选;多仓库工作区两边都能切,切换与面板实时联动,设置里可关(默认开)。切到新会话也不用等——插件会在你点开会话时就预热首屏数据,面板秒开。
 
 ## 效果
 
@@ -85,19 +85,22 @@ DSH 自带的 Git 面板覆盖「暂存 / 提交 / 还原 / 看历史」;`dsh-id
 
 | 面 | 形态 | 本插件的布局 |
 |---|---|---|
-| 右侧栏(原生的,或底座桥接过来的) | 窄而高 | `stack`:变更区在提交历史之上,分支树可收起,详情/差异占满主区 |
+| 右侧栏(原生的,或底座桥接过来的) | 窄而高 | `stack`:变更区在上,下方是「历史 / 差异」双页签(点变更文件自动切到差异),分支树可收起 |
 | 底部工作台(底座自有) | 宽而扁 | `columns`:分支树 · 提交图谱 · 变更与提交框,三栏并排——就是 JetBrains Git 工具窗口的样子 |
+| 侧栏被拖得很窄(< 400px) | 窄 | `compact`:变更列表在上,下方是「历史 / 差异」双页签,分支树可收起 |
 
-插件不猜自己在哪儿,而是用 `ResizeObserver` 量自己的容器:宽 ≥ 600px 且宽 ≥ 高 × 1.15 走三栏,否则走纵向堆叠(宽度说了算,高度没有否决权)。自由浮窗、移动端抽屉同样自适应。
+插件不猜自己在哪儿,而是用 `ResizeObserver` 量自己的容器:宽 ≥ 600px 且宽 ≥ 高 × 1.15 走三栏,宽 < 400px 走紧凑页签,其余走纵向堆叠(宽度说了算,高度没有否决权);两种纵向布局都把「历史 / 差异」做成页签,点变更文件自动切到差异。自由浮窗、移动端抽屉同样自适应。
 
 ## 功能一览
 
 | 区域 | 能力 |
 |---|---|
 | 动作条 | IDEA 式左侧竖排(底部工作台)/ 顶栏下一行横排(右侧栏):刷新、新建分支、签出、删除、比较、显示差异、贮藏、新建标签、收藏、抓取、拉取、推送。**按可用空间自动决定放几个**,放不下的收进 `⋯ 更多`;末尾 `⚙ 设置` 可拖动排序、逐项显隐(存 `dsh-ide-git.rail.v1`)。每个按钮按当前状态点亮/置灰(没有其他分支就不能删除/签出/比较,没有远程就不能抓取/推送,没有上游就不能拉取,没有变更就没有差异可看) |
+| 窄栏页签 | 宽度 < 600px 的两种纵向布局里:变更列表固定在上方,下方是「历史 / 差异」两个页签——点变更文件自动切到「差异」,历史列表与它的滚动位置都不再被顶走;两区之间的分隔条可拖动、双击复位(尺寸与 `dsh-ide-git.panes.v1` 其它面板同一份存储) |
 | 悬停提示 | 鼠标停在图标按钮上 120ms,指针旁弹出它的操作名——竖排动作条里在图标右侧(跟着该行垂直居中,贴窗口右缘时翻到左侧),其余在下方;置灰的动作连原因一起给出(如 `隐藏 · 当前状态不可用`)。提示卡挂在窗口层,底部工作台裁不到;扫过一排图标不闪,按住鼠标拖拽 / 滚动 / 缩放时立即收起 |
 | 状态行 | 当前分支、上游、`↑ahead ↓behind`、stash 数量、忙碌指示 |
 | 输入框状态条 | 宿主输入框工具条里的仓库/分支胶囊(着色 ±未提交 / ↓可拉取 / ↑待推送),点击切换仓库与分支,与面板双向联动;单仓库只切分支,多仓库两边都切;设置可关(默认开) |
+| 仓库/分支切换器 | 面板顶部与输入框胶囊共用同一个可搜索选择器:仓库按名称、路径、克隆目录或当前分支过滤,并标出各仓当前分支;分支按 `/` 折成文件夹树,输入时自动展开命中的目录,方向键 + Enter 可选,过滤器为空时目录可手动折叠 |
 | 分支树 | `HEAD / 本地 / 远程 / 标签` 分组(可折叠)、过滤框、星标当前分支、ahead/behind 角标、worktree 占用标记;本地蓝 / 远程紫 / 标签黄 / HEAD 绿 |
 | 工作树 | 动作条新增「工作树」视图:列出主工作树与全部链接工作树(当前 / 主工作树 / 已锁定 / 可清理标记、分支、短 HEAD、路径),可新建(新分支或挂已有分支,可指定起点)、在面板中打开、复制路径、移除(有未提交改动需二次强制确认)、清理失效记录;与官方「变更请求」面板并存 |
 | 分支右键 | 签出、将当前分支变基到此、合并到当前分支、与当前分支比较、从该分支新建分支、重命名、删除(当前分支禁用)、更新(Fetch)、推送、发送到对话(分支名 + 仓库) |

package/README_EN.md

@@ -75,17 +75,20 @@ The same panel shows up on surfaces of very different shapes, so the layout meas
 
 | Surface | Shape | Layout here |
 |---|---|---|
-| Right sidebar (native, or bridged by better-sidebar) | narrow + tall | `stack`: changes above the graph, collapsible branch pane |
+| Right sidebar (native, or bridged by better-sidebar) | narrow + tall | `stack`: changes on top, history and diff as two tabs below (a click on a file switches to `Diff`), collapsible branch pane |
 | Bottom workbench (better-sidebar only) | wide + flat | `columns`: tree / graph / changes — the JetBrains Git tool window shape |
+| Sidebar dragged very narrow (< 400px) | narrow | `compact`: changes on top, history and diff as two tabs below, collapsible tree |
 
-The panel never guesses: it measures itself with a `ResizeObserver` (width ≥ 600px and width ≥ 1.15 × height → columns, otherwise stack — width decides, height has no veto), so free-floating windows and the mobile drawer adapt too.
+The panel never guesses: it measures itself with a `ResizeObserver` (width ≥ 600px and width ≥ 1.15 × height → columns, width < 400px → the compact tabs, otherwise stack — width decides, height has no veto); both stacked layouts make history and diff tabs, and a click on a changed file flips to `Diff`. Free-floating windows and the mobile drawer adapt too.
 
 ## Features
 
 - Action rail: the JetBrains-style vertical strip in the bottom workbench (and one horizontal row under the header in the right sidebar) with refresh, new branch, checkout, delete, compare, show diff, stash, new tag, favorite, fetch, pull and push. **It shows as many buttons as fit**, folds the rest into a `⋯ more` menu, and pins a `⚙ settings` button that lets you reorder actions and toggle each of them (stored in `dsh-ide-git.rail.v1`). Every action lights up or greys out with the current state (no other branch → delete / checkout / compare off, no remote → fetch / push off, no upstream → pull off, no changes → diff off).
+- Tabs in the stacked layouts: below 600px (both `stack` and `compact`) the changes list keeps the top of the panel and the lower window is a `History` / `Diff` tab pair — opening a changed file switches to `Diff`, so the history list (and its scroll position) is never pushed away; the divider above that window drags and double-click resets (same store as the other panes, `dsh-ide-git.panes.v1`).
 - Hover hints: rest the pointer on an icon button for 120ms and its action name appears beside it — to the RIGHT of a vertical rail icon (centred on that row, flipping to the left when the window's right edge is in the way) and below everywhere else; greyed-out actions explain themselves too (e.g. `Hide · Not available in the current state`). The hint card lives on the window layer, so the bottom workbench cannot clip it — sweeping across a row of icons does not flash, and a pressed pointer / scroll / resize drops it immediately.
 - Status line: branch, upstream, ahead/behind, stash count, busy indicator.
-- Composer status pill: repository/branch capsule in the host input-bar tool row (colored uncommitted / pullable / to-push counters), click to switch repo and branch — kept in sync with the panel both ways; single-repo workspaces switch branches only, multi-repo workspaces switch both. Off-switch in the settings (on by default). Sessions are pre-warmed on switch so the panel opens instantly.
+- Composer status pill: repository/branch capsule in the host input-bar tool row (colored uncommitted / pullable / to-push counters), click to open a searchable switcher — repositories filter by name or path, branches fold on `/` into a folder tree (`fix/xxx` stays legible), typing filters immediately, arrow keys + Enter pick. Kept in sync with the panel both ways; single-repo workspaces switch branches only, multi-repo workspaces switch both. Off-switch in the settings (on by default). Sessions are pre-warmed on switch so the panel opens instantly.
+- Repo/branch switcher: the panel header and the composer pills share one searchable picker. Repositories filter by name, path, clone directory or current branch and show each clone's checked-out branch; branches fold on `/` into a folder tree that opens matching folders while typing, arrow keys + Enter pick, and folders stay collapsible on an empty filter.
 - Branch tree: HEAD / Local / Remote / Tags groups, filter box, ahead/behind badges, worktree marker; local blue / remote violet / tag amber / HEAD green.
 - Worktrees: a rail view listing the primary and every linked worktree (current / primary / locked / prunable badges, branch, short HEAD, path). Create one on a new branch or attach an existing branch (with an optional start point), open it in the panel, copy its path, remove it (a dirty tree asks for a second, forced confirmation), and prune stale records. It coexists with the official change-request panel.
 - Branch context menu: checkout, rebase current onto this, merge into current, compare with current, new branch from here, rename, delete, fetch, push, send to chat (branch + repo).

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-ide-git",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "main": "./src/index.js",
   "description": "IDE 级 Git 操作面板:分支树 + 提交图谱 + 变更/暂存/提交 + 提交详情。装了 dsh-better-sidebar 时挂成它的原生 tab(右侧栏 + 底部工作台);没装时直接挂 DSH 原生右侧栏,单独安装即可用。JetBrains 风格 Git 工具窗口 for DeepSeek Harness.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ide-git",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "description": "DSH plugin: an IDE-grade Git tool window as a native dsh-better-sidebar tab — branch tree, commit graph, changes, commit details, JetBrains-style actions, in the right sidebar and the bottom panel. | DSH 插件:IDE 级 Git 工具窗口,以 dsh-better-sidebar 原生 Tab 挂载——分支树 / 提交图谱 / 变更与提交详情 / JetBrains 风格操作,右侧栏与底部面板双布局自适应。",
   "type": "module",
   "repository": {

package/src/client.js

@@ -9,8 +9,8 @@
  * chrome:
  *
  *   columns  wide and tall enough : repo/branch bar | tree | graph | changes
- *   stack    narrow and tall      : changes over graph, collapsible tree
- *   compact  short or very narrow : one header row + a Changes/History switch
+ *   stack    narrow and tall      : changes over a tabbed history/diff window
+ *   compact  very narrow          : changes on top + the same tabbed window
  *
  * Theming: no hard-coded surfaces. Every surface is a --dsw-alias-* token, so
  * transparent themes and background plugins (dsh-any-background) show through,
@@ -90,6 +90,8 @@ window.__ModuleLoader__.load({
       'repo.nested': '子仓库',
       'repo.none': '当前工作区不是 Git 仓库',
       'repo.pick': '选择要查看的仓库',
+      'repo.filter': '搜索仓库',
+      'picker.empty': '没有匹配项',
       'repo.empty': '这个工作区下没有找到 Git 仓库',
       'repo.switch': '切换仓库',
       'branch.switch': '切换分支',
@@ -462,6 +464,8 @@ window.__ModuleLoader__.load({
       'repo.nested': 'nested',
       'repo.none': 'This workspace is not a Git repository',
       'repo.pick': 'Pick a repository to inspect',
+      'repo.filter': 'Search repositories',
+      'picker.empty': 'No matches',
       'repo.empty': 'No Git repository found in this workspace',
       'repo.switch': 'Switch repository',
       'branch.switch': 'Switch branch',
@@ -842,6 +846,8 @@ window.__ModuleLoader__.load({
         'repo.nested': '巢狀',
         'repo.none': '呢個工作區唔係 Git 存放庫',
         'repo.pick': '揀一個存放庫嚟睇',
+        'repo.filter': '搵存放庫',
+        'picker.empty': '冇相符項目',
         'repo.empty': '呢個工作區搵唔到 Git 存放庫',
         'repo.switch': '切換存放庫',
         'branch.switch': '切換分支',
@@ -1214,6 +1220,8 @@ window.__ModuleLoader__.load({
         'repo.nested': '巢狀',
         'repo.none': '這個工作區不是 Git 版本庫',
         'repo.pick': '選擇要檢視的版本庫',
+        'repo.filter': '搜尋版本庫',
+        'picker.empty': '沒有相符項目',
         'repo.empty': '這個工作區找不到 Git 版本庫',
         'repo.switch': '切換版本庫',
         'branch.switch': '切換分支',
@@ -1586,6 +1594,8 @@ window.__ModuleLoader__.load({
         'repo.nested': '巢狀',
         'repo.none': '呢個工作區唔係 Git 存放庫',
         'repo.pick': '揀一個存放庫嚟睇',
+        'repo.filter': '搵存放庫',
+        'picker.empty': '冇相符項目',
         'repo.empty': '呢個工作區搵唔到 Git 存放庫',
         'repo.switch': '切換存放庫',
         'branch.switch': '切換分支',
@@ -1958,6 +1968,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'ネスト',
         'repo.none': 'このワークスペースは Git リポジトリではありません',
         'repo.pick': '確認するリポジトリを選択',
+        'repo.filter': 'リポジトリを検索',
+        'picker.empty': '一致する項目がありません',
         'repo.empty': 'このワークスペースに Git リポジトリが見つかりません',
         'repo.switch': 'リポジトリを切り替え',
         'branch.switch': 'ブランチを切り替え',
@@ -2330,6 +2342,8 @@ window.__ModuleLoader__.load({
         'repo.nested': '중첩',
         'repo.none': '이 워크스페이스는 Git 저장소가 아닙니다',
         'repo.pick': '확인할 저장소를 선택하세요',
+        'repo.filter': '저장소 검색',
+        'picker.empty': '일치하는 항목이 없습니다',
         'repo.empty': '이 워크스페이스에서 Git 저장소를 찾을 수 없습니다',
         'repo.switch': '저장소 전환',
         'branch.switch': '브랜치 전환',
@@ -2702,6 +2716,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'verschachtelt',
         'repo.none': 'Dieser Arbeitsbereich ist kein Git-Repository',
         'repo.pick': 'Repository zum Ansehen wählen',
+        'repo.filter': 'Repositories durchsuchen',
+        'picker.empty': 'Keine Treffer',
         'repo.empty': 'In diesem Arbeitsbereich wurde kein Git-Repository gefunden',
         'repo.switch': 'Repository wechseln',
         'branch.switch': 'Branch wechseln',
@@ -3074,6 +3090,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'imbriqué',
         'repo.none': 'Cet espace de travail n\'est pas un dépôt Git',
         'repo.pick': 'Choisir un dépôt à inspecter',
+        'repo.filter': 'Rechercher des dépôts',
+        'picker.empty': 'Aucun résultat',
         'repo.empty': 'Aucun dépôt Git trouvé dans cet espace de travail',
         'repo.switch': 'Changer de dépôt',
         'branch.switch': 'Changer de branche',
@@ -3446,6 +3464,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'вложенный',
         'repo.none': 'Эта рабочая область не является репозиторием Git',
         'repo.pick': 'Выберите репозиторий для просмотра',
+        'repo.filter': 'Поиск репозиториев',
+        'picker.empty': 'Нет совпадений',
         'repo.empty': 'В этой рабочей области репозиторий Git не найден',
         'repo.switch': 'Сменить репозиторий',
         'branch.switch': 'Сменить ветку',
@@ -3818,6 +3838,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'aninhado',
         'repo.none': 'Esta área de trabalho não é um repositório Git',
         'repo.pick': 'Escolha um repositório para inspecionar',
+        'repo.filter': 'Pesquisar repositórios',
+        'picker.empty': 'Nenhum resultado',
         'repo.empty': 'Nenhum repositório Git encontrado nesta área de trabalho',
         'repo.switch': 'Trocar de repositório',
         'branch.switch': 'Trocar de branch',
@@ -4190,6 +4212,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'annidato',
         'repo.none': 'Questa area di lavoro non è un repository Git',
         'repo.pick': 'Scegli un repository da esaminare',
+        'repo.filter': 'Cerca repository',
+        'picker.empty': 'Nessuna corrispondenza',
         'repo.empty': 'Nessun repository Git trovato in questa area di lavoro',
         'repo.switch': 'Cambia repository',
         'branch.switch': 'Cambia branch',
@@ -4562,6 +4586,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'genest',
         'repo.none': 'Deze werkruimte is geen Git-repository',
         'repo.pick': 'Kies een repository om te bekijken',
+        'repo.filter': 'Repositories zoeken',
+        'picker.empty': 'Geen resultaten',
         'repo.empty': 'Geen Git-repository gevonden in deze werkruimte',
         'repo.switch': 'Wissel van repository',
         'branch.switch': 'Wissel van branch',
@@ -4934,6 +4960,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'zagnieżdżone',
         'repo.none': 'Ten obszar roboczy nie jest repozytorium Git',
         'repo.pick': 'Wybierz repozytorium do podglądu',
+        'repo.filter': 'Szukaj repozytoriów',
+        'picker.empty': 'Brak dopasowań',
         'repo.empty': 'W tym obszarze roboczym nie znaleziono repozytorium Git',
         'repo.switch': 'Zmień repozytorium',
         'branch.switch': 'Zmień gałąź',
@@ -5306,6 +5334,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'nästlad',
         'repo.none': 'Den här arbetsytan är inte ett Git-arkiv',
         'repo.pick': 'Välj ett arkiv att granska',
+        'repo.filter': 'Sök bland arkiv',
+        'picker.empty': 'Inga träffar',
         'repo.empty': 'Inget Git-arkiv hittades i den här arbetsytan',
         'repo.switch': 'Byt arkiv',
         'branch.switch': 'Byt gren',
@@ -5678,6 +5708,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'iç içe',
         'repo.none': 'Bu çalışma alanı bir Git deposu değil',
         'repo.pick': 'İncelenecek depoyu seçin',
+        'repo.filter': 'Depo ara',
+        'picker.empty': 'Eşleşme yok',
         'repo.empty': 'Bu çalışma alanında Git deposu bulunamadı',
         'repo.switch': 'Depoyu değiştir',
         'branch.switch': 'Dalı değiştir',
@@ -6050,6 +6082,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'bersarang',
         'repo.none': 'Ruang kerja ini bukan repositori Git',
         'repo.pick': 'Pilih repositori untuk diperiksa',
+        'repo.filter': 'Cari repositori',
+        'picker.empty': 'Tidak ada kecocokan',
         'repo.empty': 'Tidak ada repositori Git di ruang kerja ini',
         'repo.switch': 'Ganti repositori',
         'branch.switch': 'Ganti branch',
@@ -6422,6 +6456,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'lồng nhau',
         'repo.none': 'Không gian làm việc này không phải kho Git',
         'repo.pick': 'Chọn một kho để xem',
+        'repo.filter': 'Tìm kho',
+        'picker.empty': 'Không có kết quả phù hợp',
         'repo.empty': 'Không tìm thấy kho Git trong không gian làm việc này',
         'repo.switch': 'Chuyển kho',
         'branch.switch': 'Chuyển nhánh',
@@ -6794,6 +6830,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'متشعّب',
         'repo.none': 'مساحة العمل هذه ليست مستودع Git',
         'repo.pick': 'اختر مستودعًا لعرضه',
+        'repo.filter': 'البحث عن المستودعات',
+        'picker.empty': 'لا توجد نتائج مطابقة',
         'repo.empty': 'لم يُعثر على مستودع Git في مساحة العمل هذه',
         'repo.switch': 'تبديل المستودع',
         'branch.switch': 'تبديل الفرع',
@@ -7166,6 +7204,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'नेस्टेड',
         'repo.none': 'यह कार्यक्षेत्र Git रिपॉज़िटरी नहीं है',
         'repo.pick': 'देखने के लिए रिपॉज़िटरी चुनें',
+        'repo.filter': 'रिपॉज़िटरी खोजें',
+        'picker.empty': 'कोई मेल नहीं',
         'repo.empty': 'इस कार्यक्षेत्र में कोई Git रिपॉज़िटरी नहीं मिली',
         'repo.switch': 'रिपॉज़िटरी बदलें',
         'branch.switch': 'शाखा बदलें',
@@ -7538,6 +7578,8 @@ window.__ModuleLoader__.load({
         'repo.nested': 'ซ้อนกัน',
         'repo.none': 'เวิร์กสเปซนี้ไม่ใช่รีโพซิทอรี Git',
         'repo.pick': 'เลือกรีโพซิทอรีที่จะดู',
+        'repo.filter': 'ค้นหารีโพซิทอรี',
+        'picker.empty': 'ไม่มีรายการที่ตรงกัน',
         'repo.empty': 'ไม่พบรีโพซิทอรี Git ในเวิร์กสเปซนี้',
         'repo.switch': 'สลับรีโพซิทอรี',
         'branch.switch': 'สลับแบรนช์',
@@ -8852,8 +8894,12 @@ window.__ModuleLoader__.load({
        panes measure width (columns). */
     const PANE_CHROME_KEYS = {
       columns: ['tree', 'changes', 'diff'],
-      stack: ['tree', 'changes', 'diff'],
-      compact: ['tree', 'diff'],
+      /* v0.26.1: BOTH stacked chromes put the history list and the diff in one
+         TABBED window (history | diff) under the changes list, so the diff is
+         no longer a pane of its own here — it fills the tab body. Only the
+         three-column chrome still splits the diff out of the middle column. */
+      stack: ['tree', 'changes'],
+      compact: ['tree', 'changes'],
     }
     /* Whether a key measures a height (stacked chromes) or a width (columns).
        This is the chrome's DEFAULT for the tree/changes panes; the diff pane
@@ -8869,9 +8915,8 @@ window.__ModuleLoader__.load({
       'columns:diff': { min: 120, max: 900 },
       'stack:tree': { min: 100, max: 420 },
       'stack:changes': { min: 120, max: 460 },
-      'stack:diff': { min: 120, max: 900 },
       'compact:tree': { min: 100, max: 420 },
-      'compact:diff': { min: 120, max: 900 },
+      'compact:changes': { min: 120, max: 460 },
     }
     /* Today's fixed sizes stay the default — and stay in the stylesheet: a pane
        the user never dragged keeps exactly the look it had before, while a
@@ -8884,6 +8929,7 @@ window.__ModuleLoader__.load({
       'stack:tree': { ratio: 0.36 },
       'stack:changes': { ratio: 0.46 },
       'compact:tree': { ratio: 0.42 },
+      'compact:changes': { ratio: 0.46 },
     }
     const PANE_MAIN_MIN_W = 240
     const PANE_MAIN_MIN_H = 150
@@ -8899,7 +8945,7 @@ window.__ModuleLoader__.load({
        history↔diff separator lives inside the middle pane, so it is not counted
        against the body's own budget. */
     const PANE_GUTTER_PX = 8
-    const PANE_BODY_GUTTERS = { columns: 2, stack: 2, compact: 1 }
+    const PANE_BODY_GUTTERS = { columns: 2, stack: 2, compact: 2 }
     const PANE_BUCKETS = Object.keys(PANE_CHROME_KEYS).reduce(
       (all, chrome) => all.concat([chrome + ':wide', chrome + ':tall']), [])
 
@@ -10469,12 +10515,187 @@ window.__ModuleLoader__.load({
       return E('div', { className: 'dig-menu-wrap', ref: ref, style: { left: position.left + 'px', top: position.top + 'px' } },
         E('div', { className: 'dig-menu', ref: cardRef, 'data-menu-material': 'translucent' },
           E('div', { className: 'dig-menu-scroll' },
-            props.items.map((item, index) => renderItem(item, index, false)))),
+            props.body === undefined
+              ? (Array.isArray(props.items) ? props.items : []).map((item, index) => renderItem(item, index, false))
+              : props.body)),
         sub === null ? null : E('div', { className: 'dig-menu dig-menu-sub', 'data-menu-material': 'translucent', style: sub.flip === true ? { right: '100%', top: sub.top + 'px' } : { left: '100%', top: sub.top + 'px' } },
           E('div', { className: 'dig-menu-scroll' },
             sub.items.map((item, index) => renderItem(item, index, true)))))
     }
 
+    /* Searchable picker body shared by the panel header switchers and the
+       composer pills. It owns no positioning: the panel renders it as a
+       ContextMenu body, the composer inside its own .dig-cs-menu. Repositories
+       are a flat, filtered list; branches keep their slash namespace as a
+       collapsible tree, and a non-empty query opens every folder so a match
+       is never hidden behind a fold. */
+    function SearchPicker(props) {
+      const t = props.t
+      const mode = props.mode === 'branch' ? 'branch' : 'repo'
+      const [needle, setNeedle] = useState('')
+      const [folded, setFolded] = useState({})
+      const [active, setActive] = useState(0)
+      const inputRef = useRef(null)
+      const listRef = useRef(null)
+      useEffect(() => {
+        const input = inputRef.current
+        if (input !== null && typeof input.focus === 'function') input.focus({ preventScroll: true })
+      }, [])
+      const query = needle.trim().toLowerCase()
+      const matches = (value) => query === '' || String(value === undefined || value === null ? '' : value).toLowerCase().indexOf(query) >= 0
+      const rows = []
+      if (mode === 'repo') {
+        const repos = Array.isArray(props.repos) ? props.repos : []
+        for (const repo of repos) {
+          const name = repo.name === undefined || repo.name === null ? baseNameOf(repo.path) : String(repo.name)
+          if (query !== '' && matches(name) === false && matches(repo.path) === false && matches(repo.sub) === false && matches(repo.branch) === false) continue
+          rows.push({ key: 'repo:' + String(repo.path), kind: 'repo', repo: repo, name: name })
+        }
+      } else {
+        const entries = (Array.isArray(props.branches) ? props.branches : []).filter((entry) => matches(entry.name))
+        const root = { folders: new Map(), leaves: [] }
+        for (const entry of entries) {
+          const parts = String(entry.name).split('/')
+          let node = root
+          for (let index = 0; index < parts.length - 1; index += 1) {
+            const key = parts[index]
+            if (node.folders.has(key) === false) node.folders.set(key, { folders: new Map(), leaves: [] })
+            node = node.folders.get(key)
+          }
+          node.leaves.push({ entry: entry, label: parts[parts.length - 1] })
+        }
+        const countLeaves = (node) => node.leaves.length + Array.from(node.folders.values()).reduce((sum, child) => sum + countLeaves(child), 0)
+        const walk = (node, prefix, depth) => {
+          for (const name of Array.from(node.folders.keys()).sort()) {
+            const id = prefix === '' ? name : prefix + '/' + name
+            const open = query !== '' || folded[id] !== true
+            rows.push({ key: 'dir:' + id, kind: 'folder', id: id, name: name, depth: depth, count: countLeaves(node.folders.get(name)), open: open })
+            if (open === true) walk(node.folders.get(name), id, depth + 1)
+          }
+          for (const leaf of node.leaves) {
+            const entry = leaf.entry
+            const worktree = entry.worktree !== null && entry.worktree !== undefined
+            const busy = typeof props.busyName === 'string' && props.busyName !== ''
+            rows.push({
+              key: 'branch:' + String(entry.name), kind: 'branch', entry: entry, label: leaf.label, depth: depth,
+              disabled: worktree === true || busy === true, worktree: worktree,
+            })
+          }
+        }
+        walk(root, '', 0)
+      }
+      const selectable = rows.filter((row) => row.kind !== 'folder' && row.disabled !== true)
+      const activeIndex = selectable.length === 0 ? -1 : Math.min(active, selectable.length - 1)
+      const activeRow = activeIndex < 0 ? null : selectable[activeIndex]
+      const activeKey = activeRow === null ? '' : activeRow.key
+      useEffect(() => {
+        const host = listRef.current
+        if (host === null || activeKey === '') return
+        const found = Array.from(host.querySelectorAll('[data-pick-key]')).find((row) => row.getAttribute('data-pick-key') === activeKey)
+        if (found !== undefined && typeof found.scrollIntoView === 'function') found.scrollIntoView({ block: 'nearest' })
+      }, [activeKey])
+      const pickRow = (row) => {
+        if (row === null || row.disabled === true || typeof props.onPick !== 'function') return
+        if (row.kind === 'repo') props.onPick(row.repo.path, row.repo)
+        else if (row.kind === 'branch') props.onPick(row.entry.name, row.entry)
+      }
+      const onKeyDown = (event) => {
+        if (event.key === 'Escape') {
+          event.preventDefault()
+          event.stopPropagation()
+          if (typeof props.onClose === 'function') props.onClose()
+          return
+        }
+        if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
+          if (selectable.length === 0) return
+          event.preventDefault()
+          event.stopPropagation()
+          setActive((value) => {
+            const current = Math.min(value, selectable.length - 1)
+            return event.key === 'ArrowDown' ? (current + 1) % selectable.length : (current - 1 + selectable.length) % selectable.length
+          })
+          return
+        }
+        if (event.key === 'Enter') {
+          event.preventDefault()
+          event.stopPropagation()
+          pickRow(activeRow)
+        }
+      }
+      const currentRepo = mode === 'repo' && props.current !== undefined && props.current !== null ? String(props.current) : ''
+      const currentBranch = mode === 'branch' && props.current !== undefined && props.current !== null ? String(props.current) : ''
+      const rowClass = (row) => 'dig-pick-row'
+        + (activeKey === row.key ? ' dig-pick-row-active' : '')
+        + ((currentRepo !== '' && row.kind === 'repo' && String(row.repo.path) === currentRepo) ? ' dig-pick-row-current' : '')
+        + ((currentBranch !== '' && row.kind === 'branch' && String(row.entry.name) === currentBranch) ? ' dig-pick-row-current' : '')
+        + (row.disabled === true ? ' dig-pick-row-disabled' : '')
+      const rowsView = rows.map((row) => {
+        if (row.kind === 'folder') {
+          return E('button', {
+            key: row.key, type: 'button',
+            className: 'dig-pick-folder' + (row.open !== true ? ' dig-pick-folder-closed' : ''),
+            style: { paddingLeft: (6 + row.depth * 14) + 'px' },
+            onClick: () => { if (query !== '') return; setFolded((previous) => Object.assign({}, previous, { [row.id]: row.open === true })) },
+          },
+            E('span', { className: 'dig-pick-chevron' + (row.open === true ? ' dig-pick-chevron-open' : '') }, E(Icon, { name: 'chevron', size: 10 })),
+            E(Icon, { name: 'folder', size: 12 }),
+            E('span', { className: 'dig-pick-name' }, row.name),
+            E('span', { className: 'dig-pick-count' }, String(row.count)))
+        }
+        if (row.kind === 'repo') {
+          return E('button', {
+            key: row.key, type: 'button', className: rowClass(row), 'data-pick-key': row.key,
+            title: row.repo.path,
+            onMouseEnter: () => { const index = selectable.indexOf(row); if (index >= 0) setActive(index) },
+            onClick: () => pickRow(row),
+          },
+            E(Icon, { name: 'folder', size: 13 }),
+            E('span', { className: 'dig-pick-main' },
+              E('span', { className: 'dig-pick-name' }, row.name),
+              row.repo.sub !== undefined && row.repo.sub !== null && row.repo.sub !== '' && row.repo.sub !== row.name
+                ? E('span', { className: 'dig-pick-sub' }, row.repo.sub)
+                : null),
+            row.repo.branch === undefined || row.repo.branch === null || row.repo.branch === ''
+              ? null
+              : E('span', { className: 'dig-pick-badge' }, row.repo.branch))
+        }
+        const entry = row.entry
+        const head = entry.head === true
+        const worktreeNote = row.worktree === true
+          ? (props.worktreeNote === undefined ? t('branches.worktree') : props.worktreeNote)
+          : null
+        return E('button', {
+          key: row.key, type: 'button',
+          className: rowClass(row) + (head === true ? ' dig-pick-row-head' : ''),
+          'data-pick-key': row.key,
+          style: { paddingLeft: (6 + row.depth * 14) + 'px' },
+          disabled: row.disabled === true,
+          title: String(entry.name) + (worktreeNote === null ? '' : ' · ' + worktreeNote),
+          onMouseEnter: () => { const index = selectable.indexOf(row); if (index >= 0) setActive(index) },
+          onClick: () => pickRow(row),
+        },
+          E('span', { className: 'dig-pick-icon dig-tone-' + (head === true ? 'warn' : 'accent') }, E(Icon, { name: head === true ? 'star' : 'branch', size: 12 })),
+          E('span', { className: 'dig-pick-name' }, row.label),
+          worktreeNote === null ? null : E('span', { className: 'dig-pick-note' }, worktreeNote),
+          entry.ahead > 0 ? E('span', { className: 'dig-pick-count' }, '↑' + String(entry.ahead)) : null,
+          entry.behind > 0 ? E('span', { className: 'dig-pick-count' }, '↓' + String(entry.behind)) : null)
+      })
+      return E('div', { className: 'dig-pick dig-pick-' + mode },
+        E('div', { className: 'dig-pick-search' },
+          E('input', {
+            ref: inputRef,
+            className: 'dig-input dig-input-compact dig-pick-input',
+            value: needle,
+            spellCheck: false,
+            placeholder: mode === 'repo' ? t('repo.filter') : t('branches.filter'),
+            'aria-label': mode === 'repo' ? t('repo.filter') : t('branches.filter'),
+            onChange: (event) => { setNeedle(event.target.value); setActive(0) },
+            onKeyDown: onKeyDown,
+          })),
+        E('div', { className: 'dig-pick-list', ref: listRef, role: 'listbox' },
+          rowsView.length === 0 ? E('div', { className: 'dig-pick-empty' }, t('picker.empty')) : rowsView))
+    }
+
     /* Lets the user choose which actions the rail shows and in which order. The
        list is drag-sortable and arrow-sortable (the arrows also work with a
        keyboard); visibility is a per-action toggle, not a delete, so a hidden
@@ -12027,10 +12248,12 @@ window.__ModuleLoader__.load({
           return
         }
         anchorRef.current = key
-        /* Plain click only SELECTS (single-replace, the branch tree's model):
-           the diff moved to DOUBLE-click — a stray click mid-multi-select must
-           not yank the pane away (v0.18.3). */
+        /* Plain click SELECTS and shows the diff (v0.25.1, user request): in the
+           narrow right column the list replaces the pane, so a click that only
+           highlighted the row looked like "nothing happened". Modifier clicks
+           above stay pure multi-select; ignored rows have no diff to show. */
         setSelection((previous) => previous.size === 1 && previous.has(key) === true ? previous : new Set([key]))
+        if (group !== 'ignored' && props.onDiff !== undefined) props.onDiff(item, group)
       }, [setSelection, anchorRef, props.onDiff])
       /* Rubber-band selection now comes from the shared useRubberBand hook
          (see its comment): the fixed row heights + the prefix-sum offsets
@@ -13165,11 +13388,37 @@ window.__ModuleLoader__.load({
       const [selectedPath, setSelectedPath] = useState(null)
       const [patch, setPatch] = useState('')
       const [patchLoading, setPatchLoading] = useState(false)
+      /* The compact chrome's lower window is tabbed (history | diff) instead of
+         split, so opening a file does not take the history list away: the diff
+         gets its own tab and the user can switch back (v0.26.0). */
+      const [splitTab, setSplitTab] = useState('history')
+      useEffect(() => {
+        if (splitTab === 'diff' && patch === '' && patchLoading === false) setSplitTab('history')
+      }, [splitTab, patch, patchLoading])
+      /* v0.26.3: the row fires onDiff from its single click now, so a double
+         click used to open the same diff three times — and the responses raced
+         (a slow first request could land after the second and paint the wrong
+         file under the new title). `diffSeq` stamps each request and only the
+         newest one is allowed to write; `diffLast` swallows the burst a double
+         click produces. */
+      const diffSeq = useRef(0)
+      const diffLast = useRef({ key: '', at: 0 })
       /* What the open diff pane shows (v0.13.5): the pane is shared by the
          commit detail (hash + subject) and the working tree (staged or not),
          and the selection menu's payload must say which. Cleared everywhere
          the patch is cleared. */
       const [diffContext, setDiffContext] = useState(null)
+      /* v0.27: closing / switching away must also invalidate the request in
+         flight and reset the double-click guard. Without the stamp bump a
+         late response repainted the closed pane; without the diffLast reset
+         reopening the same file within 400ms was swallowed. */
+      const resetDiff = useCallback(() => {
+        diffSeq.current += 1
+        diffLast.current = { key: '', at: 0 }
+        setPatch('')
+        setPatchLoading(false)
+        setDiffContext(null)
+      }, [])
       /* ---- multi-select (issue #13): the change list's selection lives here
          so the right-click menu, the keyboard and the selection bar act on one
          set; the branch tree and the history keep theirs closer to their rows
@@ -13203,6 +13452,10 @@ window.__ModuleLoader__.load({
       const onChangeSelection = useCallback((update) => { setChangeSelection(update); clearPicksExcept('changes') }, [clearPicksExcept])
       const onCommitPicks = useCallback((update) => { setPickedCommits(update); clearPicksExcept('history') }, [clearPicksExcept])
       const [menu, setMenu] = useState(null)
+      /* The header repo/branch switchers need a search box and a branch tree,
+         which a plain ContextMenu item list cannot express; they share the
+         same anchored surface through its `body` prop. */
+      const [picker, setPicker] = useState(null)
       const [dialog, setDialog] = useState(null)
       const [tick, setTick] = useState(0)
       const [favTick, setFavTick] = useState(0)
@@ -13818,11 +14071,10 @@ window.__ModuleLoader__.load({
         headRef.current = null
         setDetail(null)
         setSelectedHash(null)
-        setPatch('')
-        setDiffContext(null)
+        resetDiff()
         setView('history')
         setPathFilter('')
-      }, [sessionId])
+      }, [sessionId, resetDiff])
 
       /* The composer status pill and this panel are separate trees; when the
          pill (or any other seat) switches the repository or the branch, this
@@ -13849,16 +14101,24 @@ window.__ModuleLoader__.load({
       }, [sessionId, repoRoot, pickRepo, refresh])
 
       const openDiff = useCallback(async (seed) => {
+        const key = JSON.stringify([base, seed])
+        const now = Date.now()
+        if (key === diffLast.current.key && now - diffLast.current.at < 400) return
+        diffLast.current = { key: key, at: now }
+        const run = diffSeq.current + 1
+        diffSeq.current = run
         setPatchLoading(true)
         setPatch('')
         try {
           const data = await request('diff', Object.assign({}, base, seed))
+          if (diffSeq.current !== run) return
           setPatch(data.patch)
         } catch (caught) {
+          if (diffSeq.current !== run) return
           setErrorCode(null)
           setError(caught instanceof Error ? caught.message : String(caught))
         } finally {
-          setPatchLoading(false)
+          if (diffSeq.current === run) setPatchLoading(false)
         }
       }, [base])
 
@@ -13939,6 +14199,11 @@ window.__ModuleLoader__.load({
          file menu, working-diff shortcut): external first, inline fallback. */
       const showDiff = useCallback((seed) => {
         if (previewDiff(seed) === true) return
+        /* The pane header names the file; its close button clears the selection
+           again, so the inline path owns selectedPath here too. */
+        setSelectedPath(seed.path === undefined ? null : seed.path)
+        /* Compact chrome: the diff lives in a tab, so opening a file shows it. */
+        setSplitTab('diff')
         if (seed.hash !== undefined && seed.hash !== null) {
           setDiffContext({ kind: 'commit', hash: seed.hash, subject: seed.subject || '' })
           void openDiff({ hash: seed.hash, path: seed.path })
@@ -13951,8 +14216,7 @@ window.__ModuleLoader__.load({
       const selectCommit = useCallback(async (commit) => {
         setSelectedHash(commit.hash)
         setSelectedPath(null)
-        setPatch('')
-        setDiffContext(null)
+        resetDiff()
         setView('detail')
         setDetail(null)
         try {
@@ -13961,7 +14225,7 @@ window.__ModuleLoader__.load({
           setErrorCode(null)
           setError(caught instanceof Error ? caught.message : String(caught))
         }
-      }, [base])
+      }, [base, resetDiff])
 
       const checkout = useCallback(async (entry) => {
         if (entry.tag === true) { void run('checkout', { branch: entry.name }); return }
@@ -13988,6 +14252,7 @@ window.__ModuleLoader__.load({
       const openMenuAt = useCallback((event, items) => {
         const element = hostRef.current
         const rect = element === null ? null : element.getBoundingClientRect()
+        setPicker(null)
         setMenu({
           x: event.clientX - (rect === null ? 0 : rect.left),
           y: event.clientY - (rect === null ? 0 : rect.top),
@@ -13997,6 +14262,22 @@ window.__ModuleLoader__.load({
         })
       }, [])
 
+      /* Same anchor math as openMenuAt, but the body is a SearchPicker instead
+         of a fixed item list. Keeping it separate means the generic context
+         menus do not grow search state they never use. */
+      const openPickerAt = useCallback((event, kind) => {
+        const element = hostRef.current
+        const rect = element === null ? null : element.getBoundingClientRect()
+        setMenu(null)
+        setPicker({
+          kind: kind,
+          x: event.clientX - (rect === null ? 0 : rect.left),
+          y: event.clientY - (rect === null ? 0 : rect.top),
+          boundsWidth: rect === null ? 0 : Math.round(rect.width),
+          boundsHeight: rect === null ? 0 : Math.round(rect.height),
+        })
+      }, [])
+
       /* ---------- toast plumbing ---------- */
       /* Declared BEFORE the context menus on purpose: the send-to-chat bindings
          and every menu builder close over pushToast, and a hooks dependency
@@ -14712,7 +14993,13 @@ window.__ModuleLoader__.load({
 
       /* ---------- shared pieces ---------- */
 
-      const repoOptions = repoState === null ? [] : repoState.repos
+      /* The scanned row keeps the branch it had when the workspace was
+         listed; after a checkout the branch pill and the tree move on, so the
+         repo label must follow the live HEAD instead of naming the old
+         branch. */
+      const repoOptions = repoState === null ? [] : repoState.repos.map((repo) => (
+        repo.path === repoRoot && branches !== null ? Object.assign({}, repo, { branch: branches.branch }) : repo
+      ))
       /* A linked worktree opened from the worktree view is a repository root
          the workspace scan never listed. Without a header entry the top bar
          kept naming the primary checkout while every branch and change below
@@ -14734,27 +15021,12 @@ window.__ModuleLoader__.load({
          popovers reuse openMenuAt, so they clamp to the panel box and share
          the opaque, frosted menu surface instead of the OS select popup. */
       const openRepoMenu = useCallback((event) => {
-        openMenuAt(event, headerRepos.map((repo) => ({
-          id: 'repo:' + repo.path,
-          icon: 'folder',
-          tone: 'accent',
-          label: repo.name + (repo.branch === null || repo.branch === undefined ? '' : ' · ' + repo.branch),
-          active: repo.path === repoRoot,
-          run: () => { if (repo.path !== repoRoot) pickRepo(repo.path) },
-        })))
-      }, [openMenuAt, headerRepos, repoRoot, pickRepo])
+        openPickerAt(event, 'repo')
+      }, [openPickerAt])
 
       const openBranchSwitchMenu = useCallback((event) => {
-        const local = branches === null ? [] : branches.local
-        openMenuAt(event, local.map((entry) => ({
-          id: 'switch:' + entry.name,
-          icon: entry.head === true ? 'star' : 'branch',
-          tone: entry.head === true ? 'warn' : 'accent',
-          label: entry.name,
-          active: entry.head === true,
-          run: () => { if (entry.head !== true) void checkout(entry) },
-        })))
-      }, [openMenuAt, branches, checkout])
+        openPickerAt(event, 'branch')
+      }, [openPickerAt])
 
       const topBar = E('div', { className: 'dig-topbar' },
         E(RepoSelect, {
@@ -14815,7 +15087,7 @@ window.__ModuleLoader__.load({
       const historyPane = view === 'detail'
         ? E(CommitDetail, {
             t: t, detail: detail, selectedPath: selectedPath,
-            onBack: () => { setView('history'); setSelectedPath(null); setPatch(''); setDiffContext(null) },
+            onBack: () => { setView('history'); setSelectedPath(null); resetDiff() },
             /* Plain click only highlights the file; the DOUBLE-click opens its
                diff (v0.18.3, one click model across every list). */
             onSelectFile: (file) => { setSelectedPath(file.path) },
@@ -14846,16 +15118,20 @@ window.__ModuleLoader__.load({
             request: request,
           })
 
-      const diffPane = patch === '' && patchLoading === false ? null : E('div', { className: 'dig-diff-pane', 'data-pane': 'diff', style: paneStyle('diff'), onContextMenu: onDiffPaneContextMenu },
+      /* The compact chrome renders the diff INSTEAD of the changes list (the
+         narrow right column has no neighbour to show it beside), so it needs a
+         filling variant; every other chrome keeps the 55%-tall split pane. */
+      const diffPaneOf = (fill) => patch === '' && patchLoading === false ? null : E('div', { className: 'dig-diff-pane' + (fill === true ? ' dig-diff-pane-fill' : ''), 'data-pane': 'diff', style: fill === true ? null : paneStyle('diff'), onContextMenu: onDiffPaneContextMenu },
         E('div', { className: 'dig-diff-head' },
           E('span', { className: 'dig-mono dig-diff-path' }, selectedPath === null ? '' : selectedPath),
           E('button', {
             type: 'button',
             className: 'dig-icon-btn',
             title: t('toast.close'),
-            onClick: () => { setPatch(''); setSelectedPath(null); setDiffContext(null) },
+            onClick: () => { resetDiff(); setSelectedPath(null); setSplitTab('history') },
           }, E(Icon, { name: 'close', size: 12 }))),
         E(DiffBody, { patch: patch, loading: patchLoading, t: t }))
+      const diffPane = diffPaneOf(false)
 
       /* ---------- rail (IDE-style left action strip) ---------- */
 
@@ -15231,7 +15507,7 @@ window.__ModuleLoader__.load({
         else if (spec.id === 'tree') { entry.active = treeOpen; entry.run = () => foldTree(!treeOpen) }
         else if (spec.id === 'worktrees') {
           entry.active = view === 'worktrees'
-          entry.run = () => { setPatch(''); setDiffContext(null); setView(view === 'worktrees' ? 'history' : 'worktrees') }
+          entry.run = () => { resetDiff(); setView(view === 'worktrees' ? 'history' : 'worktrees') }
         }
         else if (spec.id === 'float') {
           // Label AND icon follow where the panel actually is: floating panels get
@@ -15377,9 +15653,56 @@ window.__ModuleLoader__.load({
       const worktrees = summary !== null && Array.isArray(summary.worktrees) ? summary.worktrees : []
 
       /* The history↔diff separator only exists while a diff is on screen, and it
-         lives inside the middle pane — the diff is the pane below it. */
+         lives inside the middle pane — the diff is the pane below it. Only the
+         three-column chrome keeps that split (v0.26.1). */
       const diffGutter = diffPane === null ? null : gutter('diff', 'next')
 
+      /* v0.26.1 — the stacked chromes (stack and compact) show the history list
+         and the diff in ONE tabbed window below the changes list: clicking a
+         file flips that window to the diff tab instead of splitting the diff out
+         and squeezing the history. `withCount` only matters on compact, whose
+         changes head (and with it the "changes {n}" badge) is hidden; `withTree`
+         adds the tree toggle that chrome has no other way to reach. */
+      const noDiff = patch === '' && patchLoading === false
+      const fillDiff = diffPaneOf(true)
+      const splitTabs = (withCount, withTree) => E('div', { className: 'dig-split-tabs' },
+        withCount === true ? E('span', { className: 'dig-compact-count' }, fill(t('seg.changes'), { n: dirty })) : null,
+        E('button', {
+          type: 'button',
+          className: 'dig-tab',
+          'data-active': splitTab === 'history' ? 'true' : 'false',
+          'data-action': 'history-tab',
+          onClick: () => setSplitTab('history'),
+        }, t('seg.history')),
+        E('button', {
+          type: 'button',
+          className: 'dig-tab',
+          'data-active': splitTab === 'diff' ? 'true' : 'false',
+          'data-action': 'diff-tab',
+          disabled: noDiff,
+          title: noDiff ? t('diff.empty') : t('diff.codeLabel'),
+          onClick: () => setSplitTab('diff'),
+        }, t('diff.codeLabel')),
+        E('span', { className: 'dig-topbar-spacer' }),
+        withTree === true ? E('button', {
+          type: 'button',
+          className: 'dig-icon-btn' + (treeOpen ? ' dig-icon-btn-active' : ''),
+          'data-action': 'tree',
+          'aria-pressed': treeOpen ? 'true' : 'false',
+          title: t('toolbar.tree'),
+          onClick: () => foldTree(!treeOpen),
+        }, E(Icon, { name: treeOpen ? 'eye' : 'eyeOff' })) : null)
+
+      /* v0.26.3: a tabbed window keeps BOTH panes mounted and only hides the
+         inactive one. Swapping the elements out unmounted the history list (and
+         the commit detail) on every diff switch, which threw away its scroll
+         position and the windowed list's state. `display:none` keeps the
+         scrollTop (verified in Chromium). The hidden diff measures 0 tall and
+         is dropped by measurePanes' `live > 0` filter, so pane geometry stays
+         honest. */
+      const diffActive = splitTab === 'diff' && fillDiff !== null
+      const tabPane = (active, node) => node === null ? null : E('div', { className: 'dig-tab-pane' + (active === true ? '' : ' dig-tab-pane-hidden') }, node)
+
       let body
       if (repoState === null) {
         /* The scan is still running: a neutral loading state, never the
@@ -15403,31 +15726,19 @@ window.__ModuleLoader__.load({
           onRemove: (tree) => setDialog({ kind: 'worktreeRemove', tree: tree, force: false }),
         }))
       } else if (compact) {
+        /* v0.26.0: the changes list sits on TOP and the lower window is a tab
+           pair (history | diff) instead of a split — opening a file no longer
+           takes the history list away, and the changes list never disappears.
+           The diff tab only exists while there is a patch to show. */
         body = E('div', { className: 'dig-body dig-body-compact', ref: bodyRef },
-          E('div', { className: 'dig-compact-bar' },
-            E(Segmented, {
-              value: view === 'detail' ? 'history' : view,
-              onChange: (next) => { setView(next); setPatch(''); setDiffContext(null) },
-              items: [
-                { id: 'changes', label: fill(t('seg.changes'), { n: dirty }) },
-                { id: 'history', label: t('seg.history') },
-              ],
-            }),
-            E('span', { className: 'dig-topbar-spacer' }),
-            // Two-way on purpose: treeOpen is persisted, so a header button that
-            // only rendered while the tree was OPEN left a folded tree with no way
-            // back on this chrome (the rail now carries one too, for the others).
-            E('button', {
-              type: 'button',
-              className: 'dig-icon-btn' + (treeOpen ? ' dig-icon-btn-active' : ''),
-              'data-action': 'tree',
-              'aria-pressed': treeOpen ? 'true' : 'false',
-              title: t('toolbar.tree'),
-              onClick: () => foldTree(!treeOpen),
-            }, E(Icon, { name: treeOpen ? 'eye' : 'eyeOff' }))),
           treeOpen ? E('div', { className: 'dig-compact-tree', 'data-pane': 'tree', style: paneStyle('tree') }, E(BranchTree, { t: t, branches: branches, favorites: favorites, onCheckout: checkout, onBrowse: browseBranch, onBranchMenu: branchMenu, onDeleteEntries: deleteBranchEntries, onCopyValues: copyValues, onPicksChange: onBranchPicks, clearSignal: pickEpochs.tree })) : null,
           treeOpen ? gutter('tree', 'prev') : null,
-          view === 'changes' ? changesPane : E('div', { className: 'dig-pane dig-pane-main' }, historyPane, diffGutter, diffPane))
+          E('div', { className: 'dig-pane dig-pane-changes-stack', 'data-pane': 'changes', style: paneStyle('changes') }, changesPane),
+          gutter('changes', 'prev'),
+          E('div', { className: 'dig-pane dig-pane-main' },
+            splitTabs(true, true),
+            tabPane(diffActive === false, historyPane),
+            fillDiff === null ? null : tabPane(diffActive, fillDiff)))
       } else if (columns) {
         body = E('div', { className: 'dig-body dig-body-columns', ref: bodyRef },
           treeOpen ? E('div', { className: 'dig-pane dig-pane-tree', 'data-pane': 'tree', style: paneStyle('tree') }, E(BranchTree, { t: t, branches: branches, favorites: favorites, onCheckout: checkout, onBrowse: browseBranch, onBranchMenu: branchMenu, onDeleteEntries: deleteBranchEntries, onCopyValues: copyValues, onPicksChange: onBranchPicks, clearSignal: pickEpochs.tree })) : null,
@@ -15441,7 +15752,13 @@ window.__ModuleLoader__.load({
           treeOpen ? gutter('tree', 'prev') : null,
           E('div', { className: 'dig-pane dig-pane-changes-stack', 'data-pane': 'changes', style: paneStyle('changes') }, changesPane),
           gutter('changes', 'prev'),
-          E('div', { className: 'dig-pane dig-pane-main' }, historyPane, diffGutter, diffPane))
+          /* v0.26.1: below the commit box the history list and the diff share
+             one tabbed window — a click on a changed file flips to the diff tab
+             and leaves the list (and its scroll position) alone. */
+          E('div', { className: 'dig-pane dig-pane-main' },
+            splitTabs(false, false),
+            tabPane(diffActive === false, historyPane),
+            fillDiff === null ? null : tabPane(diffActive, fillDiff)))
       }
 
       /* ---------- overlays ---------- */
@@ -15457,6 +15774,37 @@ window.__ModuleLoader__.load({
           onClose: () => setMenu(null),
         }))
       }
+      if (picker !== null) {
+        /* The panel header's repo/branch switchers share the ContextMenu
+           surface (same clamping and outside-click), but their body is the
+           searchable picker instead of an item list. */
+        const branchList = branches === null ? [] : branches.local
+        overlays.push(E(ContextMenu, {
+          key: 'picker',
+          anchor: { x: picker.x, y: picker.y },
+          boundsWidth: picker.boundsWidth,
+          boundsHeight: picker.boundsHeight,
+          items: [],
+          body: E(SearchPicker, {
+            key: picker.kind,
+            mode: picker.kind,
+            t: t,
+            repos: picker.kind === 'repo' ? headerRepos : [],
+            branches: picker.kind === 'branch' ? branchList : [],
+            current: picker.kind === 'repo' ? repoRoot : (branches === null ? '' : branches.branch),
+            onPick: (value, row) => {
+              setPicker(null)
+              if (picker.kind === 'repo') {
+                if (value !== repoRoot) pickRepo(value)
+                return
+              }
+              if (row.head !== true) void checkout(row)
+            },
+            onClose: () => setPicker(null),
+          }),
+          onClose: () => setPicker(null),
+        }))
+      }
       if (railSettings === true) {
         overlays.push(E(RailSettings, {
           key: 'rail-settings',
@@ -15957,7 +16305,21 @@ window.__ModuleLoader__.load({
       '.dig-pane-main{flex:1;min-width:0}',
       '.dig-pane-changes{width:290px;flex:none;border-left:1px solid var(--dsw-alias-border-l2)}',
       '.dig-pane-changes-stack{max-height:46%;flex:none;border-bottom:1px solid var(--dsw-alias-border-l2)}',
-      '.dig-compact-bar{display:flex;align-items:center;gap:6px;padding:4px 6px;flex:none}',
+      /* v0.26.1: both stacked chromes show history and diff in one tabbed
+         window; the strip is the window's tab bar (the compact chrome also
+         hosts the changes count and the tree toggle in it). */
+      '.dig-split-tabs{display:flex;align-items:center;gap:4px;padding:4px 6px;flex:none;border-bottom:1px solid var(--dsw-alias-border-l2)}',
+      /* v0.26.3: the tabbed window's bodies stay mounted; the inactive one is
+         hidden so the history list keeps its scroll position and the detail
+         keeps its expanded state. */
+      '.dig-tab-pane{display:flex;flex-direction:column;flex:1;min-height:0;min-width:0}',
+      '.dig-tab-pane-hidden{display:none}',
+      '.dig-compact-count{color:var(--dsw-alias-label-secondary);font-weight:500;font-size:11px;padding:0 2px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:45%}',
+      '.dig-tab{border:none;background:transparent;color:var(--dsw-alias-label-secondary);font:inherit;font-size:11px;font-weight:500;padding:2px 10px;border-radius:var(--dsw-radius-sm,8px);cursor:pointer;white-space:nowrap;flex:none}',
+      '.dig-tab:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}',
+      '.dig-tab[data-active="true"]{background:var(--dsw-alias-bg-layer-2,var(--dsw-alias-bg-layer-1));color:var(--dsw-alias-label-primary)}',
+      '.dig-tab:disabled{opacity:.45;cursor:default}',
+      '.dig-tab:disabled:hover{background:transparent;color:var(--dsw-alias-label-secondary)}',
       '.dig-compact-tree{max-height:42%;flex:none;border-bottom:1px solid var(--dsw-alias-border-l2)}',
       // A divider: an 8px hit area (a fingertip needs it) painted as a 1px hairline
       // that lights up on hover, focus or while dragging. touch-action:none is what
@@ -15991,6 +16353,29 @@ window.__ModuleLoader__.load({
       '.dig-picker-name{flex:none;font-weight:600}',
       '.dig-picker-kind{color:var(--dsw-alias-label-tertiary);flex:none}',
       '.dig-picker-path{color:var(--dsw-alias-label-tertiary);margin-left:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:50%}',
+      /* v0.27 searchable repo / branch picker (panel header + composer pill).
+         The list scrolls, the search field stays pinned on top. */
+      '.dig-pick{display:flex;flex-direction:column;gap:2px;width:300px;max-width:100%;min-height:0;color:var(--dsw-alias-label-primary)}',
+      '.dig-pick-search{position:sticky;top:0;z-index:1;padding:2px 2px 6px;background:var(--dsw-alias-bg-layer-2,var(--dsw-alias-bg-layer-1))}',
+      '.dig-pick-list{display:flex;flex-direction:column;gap:1px;overflow:auto;min-height:0;max-height:300px;overscroll-behavior:contain}',
+      '.dig-pick-row{display:flex;align-items:center;gap:6px;width:100%;padding:4px 8px;border:none;border-radius:var(--dsw-radius-sm,8px);background:transparent;color:inherit;font:inherit;font-size:13px;text-align:left;cursor:pointer;min-width:0}',
+      '.dig-pick-row:hover:not(:disabled),.dig-pick-folder:hover{background:var(--dsw-alias-interactive-bg-hover)}',
+      '.dig-pick-row-active{background:var(--dsw-alias-interactive-bg-hover)}',
+      '.dig-pick-row-current{color:var(--dsw-alias-brand-primary)}',
+      '.dig-pick-row-disabled{opacity:.45;cursor:default}',
+      '.dig-pick-row-head{font-weight:600}',
+      '.dig-pick-folder{display:flex;align-items:center;gap:5px;width:100%;padding:3px 8px;border:none;border-radius:var(--dsw-radius-sm,8px);background:transparent;color:var(--dsw-alias-label-secondary);font:inherit;font-size:12px;text-align:left;cursor:pointer;min-width:0}',
+      '.dig-pick-chevron{display:inline-flex;flex:none;transition:transform .12s ease;opacity:.6}',
+      '.dig-pick-chevron-open{transform:rotate(90deg)}',
+      '.dig-pick-main{display:flex;flex-direction:column;min-width:0;flex:1}',
+      '.dig-pick-name{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
+      '.dig-pick-sub{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-tertiary);font-size:10px;line-height:12px}',
+      '.dig-pick-icon{display:inline-flex;flex:none}',
+      '.dig-pick-badge{margin-left:auto;flex:none;max-width:90px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0 6px;border-radius:999px;corner-shape:round;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-secondary);font-size:10px;line-height:16px}',
+      '.dig-pick-note{flex:none;color:var(--dsw-alias-label-tertiary);font-size:11px}',
+      '.dig-pick-count{margin-left:auto;flex:none;color:var(--dsw-alias-label-tertiary);font-size:11px;font-variant-numeric:tabular-nums}',
+      '.dig-pick-empty{padding:10px 8px;color:var(--dsw-alias-label-tertiary);font-size:12px}',
+      '.dig-cs-menu.dig-cs-picker{width:300px;min-width:260px;max-width:340px;max-height:360px;padding:4px;overflow:hidden}',
       /* position:relative: the marquee box paints against this wrapper (the
          scroll container is offset by the search field — same rule as
          .dig-history above). */
@@ -16013,6 +16398,11 @@ window.__ModuleLoader__.load({
       '.dig-folder-head:hover{color:var(--dsw-alias-label-primary)}',
       '.dig-folder-name{flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
       '.dig-count{margin-left:auto;opacity:.6;font-weight:400}',
+      /* v0.26.2: the changes head is the one count that belongs to the WORD, not
+         to the right edge — .dig-count pushes itself to the far right (fine for the
+         branch groups), so the changes header opts back in to sitting right after
+         its title (user report: the number floated in the middle of the row). */
+      '.dig-changes-head .dig-count{margin-left:0}',
       '.dig-chevron{display:inline-flex;transform:rotate(-90deg);transition:transform .12s ease}',
       '.dig-chevron-open{transform:rotate(0deg)}',
       '.dig-row{display:flex;align-items:center;gap:5px;padding:2px 8px;cursor:pointer;white-space:nowrap;overflow:hidden}',
@@ -16065,7 +16455,10 @@ window.__ModuleLoader__.load({
          filter bar, and painting from the wrong rect was the v0.19.2 drift. */
       '.dig-history{display:flex;flex-direction:column;min-height:0;flex:1;position:relative}',
       '.dig-history-scroll{flex:1;overflow:auto}',
-      '.dig-commit{display:flex;align-items:center;gap:6px;padding:1px 8px 1px 0;cursor:pointer;height:26px;overflow:hidden}',
+      // The row's left edge follows the bars above it (filter row / compact
+      // switch: 4px 6px padding), so the time column and the graph start on the
+      // same inset as the input box instead of flush against the pane edge.
+      '.dig-commit{display:flex;align-items:center;gap:6px;padding:1px 8px 1px 6px;cursor:pointer;height:26px;overflow:hidden}',
       '.dig-commit:hover{background:var(--dsw-alias-interactive-bg-hover)}',
       /* Same theme-aware gray mix as .dig-row-selected (see it). */
       '.dig-commit-selected{background:color-mix(in srgb,var(--dsw-alias-interactive-bg-active,var(--dsw-alias-interactive-bg-hover)) 58%,var(--dsw-static-neutral-bluish-75,var(--dsw-alias-bg-layer-3)) 42%);color:var(--dsw-alias-label-primary);box-shadow:inset 2px 0 0 var(--dsw-alias-brand-primary)}',
@@ -16176,6 +16569,7 @@ window.__ModuleLoader__.load({
       '.dig-detail-files{display:flex;flex-direction:column}',
       '.dig-mono{font-family:ui-monospace,SFMono-Regular,Menlo,monospace}',
       '.dig-diff-pane{flex:none;max-height:55%;display:flex;flex-direction:column;min-height:0;border-top:1px solid var(--dsw-alias-border-l2)}',
+      '.dig-diff-pane-fill{flex:1;max-height:none;border-top:none}',
       '.dig-diff-head{display:flex;align-items:center;gap:8px;padding:3px 8px;color:var(--dsw-alias-label-tertiary);flex:none;min-width:0}',
       '.dig-diff-path{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex:1;min-width:0}',
       '.dig-diff{flex:1;overflow:auto;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:calc(12px + var(--dsh-code-font-delta, 0px));line-height:1.5;font-weight:500;min-height:0}',
@@ -17180,50 +17574,48 @@ window.__ModuleLoader__.load({
         behind > 0 ? E('span', { className: 'dig-cs-badge dig-cs-behind', title: t('composer.behindHint') }, '↓' + String(behind)) : null,
         ahead > 0 ? E('span', { className: 'dig-cs-badge dig-cs-ahead', title: t('composer.aheadHint') }, '↑' + String(ahead)) : null,
         error !== '' ? E('span', { className: 'dig-cs-error', title: error }, '×') : null,
-        menu === 'repo' ? E('div', { className: 'dig-cs-menu', 'data-cordis-panel': '' },
+        menu === 'repo' ? E('div', { className: 'dig-cs-menu dig-cs-picker', 'data-cordis-panel': '' },
           /* v0.19.2: one row per checkout — the repository's own name first
              (origin URL basename, falling back to the directory name), and the
              single-level directory name as a small sub line only when the two
              differ (two clones of one repository stay tellable apart). The
-             full path lives in the tooltip, not in the row. */
-          data.repos.map((row) => {
-            const dirName = baseNameOf(row.path)
-            const displayName = row.origin !== undefined && row.origin !== '' ? row.origin : dirName
-            return E('button', {
-              key: row.path,
-              type: 'button',
-              className: 'dig-cs-item',
-              'data-current': row.path === repoRoot ? 'true' : 'false',
-              title: row.path,
-              onClick: () => pickRepoRoot(row.path),
-            },
-              E(Icon, { name: 'commit', size: 11 }),
-              E('span', { className: 'dig-cs-item-main' },
-                E('span', { className: 'dig-cs-item-name' }, displayName),
-                dirName !== displayName ? E('span', { className: 'dig-cs-item-sub' }, dirName) : null))
+             full path lives in the tooltip, not in the row. v0.27 adds the
+             search field so seven clones need no scrolling to find one. */
+          E(SearchPicker, {
+            key: 'composer-repo',
+            mode: 'repo',
+            t: t,
+            repos: data.repos.map((row) => {
+              const dirName = baseNameOf(row.path)
+              const displayName = row.origin !== undefined && row.origin !== '' ? row.origin : dirName
+              return {
+                path: row.path,
+                name: displayName,
+                sub: dirName !== displayName ? dirName : undefined,
+              }
+            }),
+            current: repoRoot,
+            onPick: (path) => pickRepoRoot(path),
+            onClose: () => setMenu(null),
           }))
           : null,
         menu === 'branch' ? (branchLoading === true || branchList === null
           ? E('div', { className: 'dig-cs-menu', 'data-cordis-panel': '' }, E('div', { className: 'dig-cs-item dig-cs-static' }, '…'))
-          : E('div', { className: 'dig-cs-menu', 'data-cordis-panel': '' },
-            branchList.local.map((entry) => E('button', {
-              key: entry.name,
-              type: 'button',
-              className: 'dig-cs-item',
-              'data-current': entry.head === true ? 'true' : 'false',
-              disabled: entry.worktree !== null || checkingOut !== '',
-              title: entry.worktree !== null ? t('composer.inWorktree') : (checkingOut !== '' ? t('composer.busy') : entry.name),
-              onClick: () => { void checkoutBranch(entry.name) },
-            },
-              E(Icon, { name: 'branch', size: 11 }),
-              E('span', { className: 'dig-cs-item-name' }, entry.name),
-              entry.worktree !== null ? E('span', { className: 'dig-cs-item-note' }, t('composer.inWorktree')) : null,
-              checkingOut === entry.name ? E('span', { className: 'dig-cs-item-note' }, '…') : null,
-              entry.ahead > 0 || entry.behind > 0
-                ? E('span', { className: 'dig-cs-item-counts' },
-                  entry.ahead > 0 ? E('span', { className: 'dig-cs-ahead' }, '↑' + String(entry.ahead)) : null,
-                  entry.behind > 0 ? E('span', { className: 'dig-cs-behind' }, '↓' + String(entry.behind)) : null)
-                : null))))
+          : E('div', { className: 'dig-cs-menu dig-cs-picker', 'data-cordis-panel': '' },
+            E(SearchPicker, {
+              key: 'composer-branch',
+              mode: 'branch',
+              t: t,
+              branches: branchList.local,
+              current: branchName === null ? '' : branchName,
+              busyName: checkingOut,
+              worktreeNote: t('composer.inWorktree'),
+              onPick: (name, entry) => {
+                if (entry.head === true) { setMenu(null); return }
+                void checkoutBranch(name)
+              },
+              onClose: () => setMenu(null),
+            })))
           : null,
       )
     }