fix: load shared container runtime in Vite renderer

README.ja-JP.md

@@ -9,12 +9,6 @@
   <a href="https://netcatty.app"><strong>netcatty.app</strong></a>
 </p>
 
-<p align="center">
-  <a href="https://trendshift.io/repositories/18391?utm_source=trendshift-badge&amp;utm_medium=badge&amp;utm_campaign=badge-trendshift-18391" target="_blank" rel="noopener noreferrer">
-    <img src="https://trendshift.io/api/badge/trendshift/repositories/18391/daily?language=TypeScript" alt="binaricat/Netcatty | Trendshift" width="250" height="55"/>
-  </a>
-</p>
-
 <p align="center">
   Electron、React、xterm.js で構築された機能豊富な SSH ワークスペース。<br/>
   🔥 内蔵 AI Agent · 分割ターミナル · Vault ビュー · SFTP ワークフロー · カスタムテーマ — すべてが一つに。
@@ -46,7 +40,7 @@
 
 ---
 
-<img width="3358" height="1984" alt="image" src="docs/assets/readme/overview.webp" />
+<img width="3358" height="1984" alt="image" src="https://github.com/user-attachments/assets/e1302660-dece-46be-9857-1678a9b13d00" />
 
 ---
 
@@ -69,13 +63,13 @@
 
 Catty Agent にサーバーの健全性チェックを依頼すると、適切なコマンドを実行し、出力を分析して数秒で明確なサマリーを提示します。
 
-<img width="3302" height="1978" alt="image" src="docs/assets/readme/catty-single-host.webp" />
+<img width="3302" height="1978" alt="image" src="https://github.com/user-attachments/assets/3ec30145-d226-4e26-834b-52ee75b5e205" />
 
 #### 🚀 マルチホスト — Docker Swarm クラスターのセットアップ
 
 1 つの会話で 2 台のサーバーをまたいで Docker Swarm クラスターをオーケストレーションする Catty Agent をご覧ください。初期化、トークン交換、ノード参加まですべてこなします — あなたは望む結果を伝えるだけ。
 
-<img width="3294" height="1974" alt="image" src="docs/assets/readme/catty-multi-host.webp" />
+<img width="3294" height="1974" alt="image" src="https://github.com/user-attachments/assets/ca17e857-6163-4067-a615-cacdfd5be4fc" />
 
 ---
 
@@ -156,34 +150,34 @@ Catty Agent にサーバーの健全性チェックを依頼すると、適切
 
 メインウィンドウは、長時間の SSH 作業を前提に設計されています。セッション、ナビゲーション、主要ツールへ素早くアクセスできます。
 
-<img width="3290" height="1988" alt="image" src="docs/assets/readme/main-window.webp" />
+<img width="3290" height="1988" alt="image" src="https://github.com/user-attachments/assets/ab3afd3e-a819-46fc-9251-40acb592ba69" />
 
-<img width="3324" height="1992" alt="image" src="docs/assets/readme/main-window-terminal.webp" />
+<img width="3324" height="1992" alt="image" src="https://github.com/user-attachments/assets/7c7f6e7f-fb20-4574-8e7f-74397682b873" />
 
 <a name="vault-ビュー"></a>
 ## Vault ビュー
 
 作業に合わせて見え方を切り替え：グリッドで全体像、リストでスキャン、ツリーで整理と階層ナビゲーション。
 
-<img width="3292" height="1984" alt="image" src="docs/assets/readme/vault-grid.webp" />
+<img width="3292" height="1984" alt="image" src="https://github.com/user-attachments/assets/29642143-3fd6-4693-a30c-b7f656053ca3" />
 
-<img width="3322" height="1998" alt="image" src="docs/assets/readme/vault-list.webp" />
+<img width="3322" height="1998" alt="image" src="https://github.com/user-attachments/assets/6041efe2-607e-4314-838c-eba3db4c852c" />
 
 <a name="モニタリングビュー"></a>
 ## モニタリングビュー
 
 CPU、メモリ、ディスク、ネットワーク、レイテンシーを確認でき、対応する環境では GPU の詳細も表示されます。表示する列の選択、列幅や更新設定の調整ができ、監視対象のホストから直接ターミナルを開くこともできます。
 
-<img width="3364" height="1982" alt="image" src="docs/assets/readme/monitoring.webp" />
+<img width="3364" height="1982" alt="image" src="https://github.com/user-attachments/assets/d0f495b5-25c8-494f-bb9c-8c20b0a921b6" />
 
-<img width="3362" height="1980" alt="image" src="docs/assets/readme/monitoring-columns.webp" />
+<img width="3362" height="1980" alt="image" src="https://github.com/user-attachments/assets/245c234e-2b22-43f2-a4fd-8057d229c56f" />
 
 <a name="分割ターミナル"></a>
 ## 分割ターミナル
 
 分割ペインで複数のサーバー/タスクを同時に扱えます（例：デプロイ + ログ + 監視）。
 
-<img width="1560" height="871" alt="split" src="docs/assets/readme/split-terminals.webp" />
+<img width="1560" height="871" alt="split" src="https://github.com/user-attachments/assets/c93a8523-6256-4bb3-8b6e-d599831f2f9f" />
 
 ---
 

README.md

@@ -46,7 +46,7 @@
 
 ---
 
-<img width="3358" height="1984" alt="image" src="docs/assets/readme/overview.webp" />
+<img width="3358" height="1984" alt="image" src="https://github.com/user-attachments/assets/e1302660-dece-46be-9857-1678a9b13d00" />
 
 
 ---
@@ -69,14 +69,14 @@
 
 Ask Catty Agent to check a server's health, and it runs the right commands, analyzes the output, and gives you a clear summary — all in seconds.
 
-<img width="3302" height="1978" alt="image" src="docs/assets/readme/catty-single-host.webp" />
+<img width="3302" height="1978" alt="image" src="https://github.com/user-attachments/assets/3ec30145-d226-4e26-834b-52ee75b5e205" />
 
 
 #### 🚀 Multi-Host — Docker Swarm Cluster Setup
 
 Watch Catty Agent orchestrate a Docker Swarm cluster across two servers in one conversation. It handles the init, token exchange, and node joining — you just tell it what you want.
 
-<img width="3294" height="1974" alt="image" src="docs/assets/readme/catty-multi-host.webp" />
+<img width="3294" height="1974" alt="image" src="https://github.com/user-attachments/assets/ca17e857-6163-4067-a615-cacdfd5be4fc" />
 
 
 ---
@@ -159,10 +159,10 @@ If you regularly work with a fleet of servers, Netcatty is built for speed and f
 
 The main window is designed for long-running SSH workflows: quick access to sessions, navigation, and core tools in one place.
 
-<img width="3290" height="1988" alt="image" src="docs/assets/readme/main-window.webp" />
+<img width="3290" height="1988" alt="image" src="https://github.com/user-attachments/assets/ab3afd3e-a819-46fc-9251-40acb592ba69" />
 
 
-<img width="3324" height="1992" alt="image" src="docs/assets/readme/main-window-terminal.webp" />
+<img width="3324" height="1992" alt="image" src="https://github.com/user-attachments/assets/7c7f6e7f-fb20-4574-8e7f-74397682b873" />
 
 
 
@@ -171,23 +171,21 @@ The main window is designed for long-running SSH workflows: quick access to sess
 
 Organize and navigate your hosts using the view that best fits the moment: grid for overview, list for scanning, tree for structure.
 
-<img width="3292" height="1984" alt="image" src="docs/assets/readme/vault-grid.webp" />
+<img width="3292" height="1984" alt="image" src="https://github.com/user-attachments/assets/29642143-3fd6-4693-a30c-b7f656053ca3" />
 
 
-<img width="3322" height="1998" alt="image" src="docs/assets/readme/vault-list.webp" />
+<img width="3322" height="1998" alt="image" src="https://github.com/user-attachments/assets/6041efe2-607e-4314-838c-eba3db4c852c" />
 
 
 
 
 ## Monitoring View
 
-Inspect CPU, memory, disk, network, and latency readings, with GPU details where available. Choose visible columns, resize them, select refresh intervals down to 1 second, and open a terminal directly from a monitored host.
+Inspect CPU, memory, disk, network, and latency readings, with GPU details where available. Choose visible columns, resize them, adjust refresh controls, and open a terminal directly from a monitored host.
 
-Disk I/O shows aggregate read/write throughput for Linux hardware-backed block devices, without counting partitions or stacked virtual devices twice. Rates use two consecutive samples; `--` means unavailable or warming up, not zero activity. Disk I/O is currently unavailable on macOS; existing macOS monitoring is unchanged. The terminal system overview uses the same shared measurements.
+<img width="3364" height="1982" alt="image" src="https://github.com/user-attachments/assets/d0f495b5-25c8-494f-bb9c-8c20b0a921b6" />
 
-<img width="3364" height="1982" alt="image" src="docs/assets/readme/monitoring.webp" />
-
-<img width="3362" height="1980" alt="image" src="docs/assets/readme/monitoring-columns.webp" />
+<img width="3362" height="1980" alt="image" src="https://github.com/user-attachments/assets/245c234e-2b22-43f2-a4fd-8057d229c56f" />
 
 
 
@@ -197,7 +195,7 @@ Disk I/O shows aggregate read/write throughput for Linux hardware-backed block d
 
 Split panes help you monitor multiple servers/services at the same time (deploy + logs + metrics) without juggling windows.
 
-<img width="1560" height="871" alt="split" src="docs/assets/readme/split-terminals.webp" />
+<img width="1560" height="871" alt="split" src="https://github.com/user-attachments/assets/c93a8523-6256-4bb3-8b6e-d599831f2f9f" />
 
 ---
 

README.zh-CN.md

@@ -9,12 +9,6 @@
   <a href="https://netcatty.app"><strong>netcatty.app</strong></a>
 </p>
 
-<p align="center">
-  <a href="https://trendshift.io/repositories/18391?utm_source=trendshift-badge&amp;utm_medium=badge&amp;utm_campaign=badge-trendshift-18391" target="_blank" rel="noopener noreferrer">
-    <img src="https://trendshift.io/api/badge/trendshift/repositories/18391/daily?language=TypeScript" alt="binaricat/Netcatty | Trendshift" width="250" height="55"/>
-  </a>
-</p>
-
 <p align="center">
   一个基于 Electron、React 和 xterm.js 构建的功能丰富的 SSH 工作空间。<br/>
   🔥 内置 AI Agent · 分屏终端 · Vault 多视图 · SFTP 工作流 · 自定义主题 —— 一应俱全。
@@ -46,7 +40,7 @@
 
 ---
 
-<img width="3358" height="1984" alt="image" src="docs/assets/readme/overview.webp" />
+<img width="3358" height="1984" alt="image" src="https://github.com/user-attachments/assets/e1302660-dece-46be-9857-1678a9b13d00" />
 
 ---
 
@@ -69,13 +63,13 @@
 
 让 Catty Agent 检查服务器健康状态，它会自动运行合适的命令、分析输出并给出清晰总结 —— 几秒内完成。
 
-<img width="3302" height="1978" alt="image" src="docs/assets/readme/catty-single-host.webp" />
+<img width="3302" height="1978" alt="image" src="https://github.com/user-attachments/assets/3ec30145-d226-4e26-834b-52ee75b5e205" />
 
 #### 🚀 多主机 —— Docker Swarm 集群搭建
 
 看 Catty Agent 在一次对话中跨两台服务器编排 Docker Swarm 集群。它负责初始化、令牌交换和节点加入 —— 你只需说出想要的结果。
 
-<img width="3294" height="1974" alt="image" src="docs/assets/readme/catty-multi-host.webp" />
+<img width="3294" height="1974" alt="image" src="https://github.com/user-attachments/assets/ca17e857-6163-4067-a615-cacdfd5be4fc" />
 
 ---
 
@@ -156,34 +150,34 @@
 
 主界面围绕长期 SSH 工作流设计：把会话、导航和常用工具集中到同一处，减少切换成本。
 
-<img width="3290" height="1988" alt="image" src="docs/assets/readme/main-window.webp" />
+<img width="3290" height="1988" alt="image" src="https://github.com/user-attachments/assets/ab3afd3e-a819-46fc-9251-40acb592ba69" />
 
-<img width="3324" height="1992" alt="image" src="docs/assets/readme/main-window-terminal.webp" />
+<img width="3324" height="1992" alt="image" src="https://github.com/user-attachments/assets/7c7f6e7f-fb20-4574-8e7f-74397682b873" />
 
 <a name="vault-视图"></a>
 ## Vault 视图
 
 用更适合当前任务的方式管理与浏览主机：网格看全局，列表做筛选，树形做整理与层级导航。
 
-<img width="3292" height="1984" alt="image" src="docs/assets/readme/vault-grid.webp" />
+<img width="3292" height="1984" alt="image" src="https://github.com/user-attachments/assets/29642143-3fd6-4693-a30c-b7f656053ca3" />
 
-<img width="3322" height="1998" alt="image" src="docs/assets/readme/vault-list.webp" />
+<img width="3322" height="1998" alt="image" src="https://github.com/user-attachments/assets/6041efe2-607e-4314-838c-eba3db4c852c" />
 
 <a name="监控视图"></a>
 ## 监控视图
 
 查看 CPU、内存、磁盘、网络和延迟数据；支持的环境还可显示 GPU 详情。你可以选择显示的列、调整列宽和刷新设置，并直接从受监控的主机打开终端。
 
-<img width="3364" height="1982" alt="image" src="docs/assets/readme/monitoring.webp" />
+<img width="3364" height="1982" alt="image" src="https://github.com/user-attachments/assets/d0f495b5-25c8-494f-bb9c-8c20b0a921b6" />
 
-<img width="3362" height="1980" alt="image" src="docs/assets/readme/monitoring-columns.webp" />
+<img width="3362" height="1980" alt="image" src="https://github.com/user-attachments/assets/245c234e-2b22-43f2-a4fd-8057d229c56f" />
 
 <a name="分屏终端"></a>
 ## 分屏终端
 
 分屏适合同时处理多个任务（例如部署 + 日志 + 排障），不用频繁切换窗口。
 
-<img width="1560" height="871" alt="split" src="docs/assets/readme/split-terminals.webp" />
+<img width="1560" height="871" alt="split" src="https://github.com/user-attachments/assets/c93a8523-6256-4bb3-8b6e-d599831f2f9f" />
 
 ---
 

README.zh-TW.md

@@ -9,12 +9,6 @@
   <a href="https://netcatty.app"><strong>netcatty.app</strong></a>
 </p>
 
-<p align="center">
-  <a href="https://trendshift.io/repositories/18391?utm_source=trendshift-badge&amp;utm_medium=badge&amp;utm_campaign=badge-trendshift-18391" target="_blank" rel="noopener noreferrer">
-    <img src="https://trendshift.io/api/badge/trendshift/repositories/18391/daily?language=TypeScript" alt="binaricat/Netcatty | Trendshift" width="250" height="55"/>
-  </a>
-</p>
-
 <p align="center">
   以 Electron、React 與 xterm.js 打造，介面精緻、功能完整的 SSH 工作區。<br/>
   🔥 內建 AI Agent · 分割終端 · Vault 檢視 · SFTP 工作流 · 自訂主題 —— 全部整合在一起。
@@ -46,7 +40,7 @@
 
 ---
 
-<img width="3358" height="1984" alt="image" src="docs/assets/readme/overview.webp" />
+<img width="3358" height="1984" alt="image" src="https://github.com/user-attachments/assets/e1302660-dece-46be-9857-1678a9b13d00" />
 
 ---
 
@@ -69,13 +63,13 @@
 
 請 Catty Agent 檢查伺服器健康狀況，它會自動執行合適的指令、分析輸出，並在幾秒內給你一份清楚的總結。
 
-<img width="3302" height="1978" alt="image" src="docs/assets/readme/catty-single-host.webp" />
+<img width="3302" height="1978" alt="image" src="https://github.com/user-attachments/assets/3ec30145-d226-4e26-834b-52ee75b5e205" />
 
 #### 🚀 多主機 —— 建立 Docker Swarm 叢集
 
 看 Catty Agent 在一次對話裡，跨兩台伺服器編排出一個 Docker Swarm 叢集。初始化、權杖交換、節點加入都由它處理 —— 你只要說出你想要的結果。
 
-<img width="3294" height="1974" alt="image" src="docs/assets/readme/catty-multi-host.webp" />
+<img width="3294" height="1974" alt="image" src="https://github.com/user-attachments/assets/ca17e857-6163-4067-a615-cacdfd5be4fc" />
 
 ---
 
@@ -156,34 +150,34 @@
 
 主視窗是為了長時間的 SSH 工作流程而設計：工作階段、導覽與常用工具都集中在同一個地方。
 
-<img width="3290" height="1988" alt="image" src="docs/assets/readme/main-window.webp" />
+<img width="3290" height="1988" alt="image" src="https://github.com/user-attachments/assets/ab3afd3e-a819-46fc-9251-40acb592ba69" />
 
-<img width="3324" height="1992" alt="image" src="docs/assets/readme/main-window-terminal.webp" />
+<img width="3324" height="1992" alt="image" src="https://github.com/user-attachments/assets/7c7f6e7f-fb20-4574-8e7f-74397682b873" />
 
 <a name="vault-檢視"></a>
 ## Vault 檢視
 
 用最適合當下情境的方式整理與瀏覽主機：網格看全局、清單快速掃視、樹狀理層級。
 
-<img width="3292" height="1984" alt="image" src="docs/assets/readme/vault-grid.webp" />
+<img width="3292" height="1984" alt="image" src="https://github.com/user-attachments/assets/29642143-3fd6-4693-a30c-b7f656053ca3" />
 
-<img width="3322" height="1998" alt="image" src="docs/assets/readme/vault-list.webp" />
+<img width="3322" height="1998" alt="image" src="https://github.com/user-attachments/assets/6041efe2-607e-4314-838c-eba3db4c852c" />
 
 <a name="監控檢視"></a>
 ## 監控檢視
 
 查看 CPU、記憶體、磁碟、網路與延遲資料；支援的環境還可顯示 GPU 詳情。你可以選擇顯示的欄位、調整欄寬與重新整理設定，並直接從受監控的主機開啟終端機。
 
-<img width="3364" height="1982" alt="image" src="docs/assets/readme/monitoring.webp" />
+<img width="3364" height="1982" alt="image" src="https://github.com/user-attachments/assets/d0f495b5-25c8-494f-bb9c-8c20b0a921b6" />
 
-<img width="3362" height="1980" alt="image" src="docs/assets/readme/monitoring-columns.webp" />
+<img width="3362" height="1980" alt="image" src="https://github.com/user-attachments/assets/245c234e-2b22-43f2-a4fd-8057d229c56f" />
 
 <a name="分割終端"></a>
 ## 分割終端
 
 分割窗格讓你同時盯著多台伺服器或多個服務（部署 + 日誌 + 監控指標），不用一直切視窗。
 
-<img width="1560" height="871" alt="split" src="docs/assets/readme/split-terminals.webp" />
+<img width="1560" height="871" alt="split" src="https://github.com/user-attachments/assets/c93a8523-6256-4bb3-8b6e-d599831f2f9f" />
 
 ---
 

application/AppHandlers.globalHotkeys.test.ts

@@ -1,5 +1,4 @@
 import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
 import test from 'node:test';
 
 import {
@@ -9,11 +8,6 @@ import {
   handleGlobalHotkeyKeyDownImpl,
   markForwardedNativeShortcutEvent,
 } from './app/AppHandlers.ts';
-import {
-  DEFAULT_SETTINGS_CHROME_SNAPSHOT,
-  getSettingsChromeSnapshot,
-  publishSettingsChromeSnapshot,
-} from './state/settingsChromeStore.ts';
 import { matchesKeyBinding } from '../domain/models.ts';
 import { DEFAULT_KEY_BINDINGS } from '../domain/models/keyBindings.ts';
 
@@ -835,201 +829,3 @@ for (const scenario of [
     });
   }
 }
-
-for (const scheme of ['pc', 'mac'] as const) {
-  test(`focused terminal ${scheme} consumes Shift+B for the host list and leaves plain B to broadcast`, () => {
-    const target = new FakeHTMLElement();
-    const shiftedActions: string[] = [];
-    let shiftedPrevented = false;
-    let shiftedStopped = false;
-    handleGlobalHotkeyKeyDownImpl(() => ({
-      HOTKEY_DEBUG: false,
-      closeTabKeyStr: '',
-      executeHotkeyAction: (action: string) => {
-        shiftedActions.push(action);
-        return action === 'toggleHostTree';
-      },
-      hotkeyScheme: scheme,
-      keyBindings: DEFAULT_KEY_BINDINGS,
-      matchesKeyBinding,
-    }), {
-      key: 'b',
-      code: 'KeyB',
-      ctrlKey: scheme === 'pc',
-      metaKey: scheme === 'mac',
-      altKey: false,
-      shiftKey: true,
-      target,
-      composedPath: () => [target],
-      preventDefault: () => { shiftedPrevented = true; },
-      stopPropagation: () => { shiftedStopped = true; },
-    } as unknown as KeyboardEvent);
-
-    assert.deepEqual(shiftedActions, ['toggleHostTree']);
-    assert.equal(shiftedPrevented, true);
-    assert.equal(shiftedStopped, true);
-
-    const plainActions: string[] = [];
-    let plainPrevented = false;
-    handleGlobalHotkeyKeyDownImpl(() => ({
-      HOTKEY_DEBUG: false,
-      closeTabKeyStr: '',
-      executeHotkeyAction: (action: string) => {
-        plainActions.push(action);
-        return undefined;
-      },
-      hotkeyScheme: scheme,
-      keyBindings: DEFAULT_KEY_BINDINGS,
-      matchesKeyBinding,
-    }), {
-      key: 'b',
-      code: 'KeyB',
-      ctrlKey: scheme === 'pc',
-      metaKey: scheme === 'mac',
-      altKey: false,
-      shiftKey: false,
-      target,
-      composedPath: () => [target],
-      preventDefault: () => { plainPrevented = true; },
-      stopPropagation: () => {},
-    } as unknown as KeyboardEvent);
-
-    assert.deepEqual(plainActions, ['broadcast']);
-    assert.equal(plainPrevented, false);
-  });
-}
-
-test('focused terminal leaves the host-list chord alone when the toggle does not run', () => {
-  const target = new FakeHTMLElement();
-  const actions: string[] = [];
-  let prevented = false;
-  let stopped = false;
-  handleGlobalHotkeyKeyDownImpl(() => ({
-    HOTKEY_DEBUG: false,
-    closeTabKeyStr: '',
-    executeHotkeyAction: (action: string) => {
-      actions.push(action);
-      return false;
-    },
-    hotkeyScheme: 'pc',
-    keyBindings: DEFAULT_KEY_BINDINGS,
-    matchesKeyBinding,
-  }), {
-    key: 'b',
-    code: 'KeyB',
-    ctrlKey: true,
-    metaKey: false,
-    altKey: false,
-    shiftKey: true,
-    target,
-    composedPath: () => [target],
-    preventDefault: () => { prevented = true; },
-    stopPropagation: () => { stopped = true; },
-  } as unknown as KeyboardEvent);
-
-  assert.deepEqual(actions, ['toggleHostTree']);
-  assert.equal(prevented, false);
-  assert.equal(stopped, false);
-});
-
-test('host list shortcut reaches a focused Monaco editor and stays out of plain text fields', () => {
-  const monaco = new FakeMonacoHTMLElement();
-  const monacoActions: string[] = [];
-  let monacoPrevented = false;
-  handleGlobalHotkeyKeyDownImpl(() => ({
-    HOTKEY_DEBUG: false,
-    closeTabKeyStr: '',
-    executeHotkeyAction: (action: string) => {
-      monacoActions.push(action);
-      return true;
-    },
-    hotkeyScheme: 'pc',
-    keyBindings: DEFAULT_KEY_BINDINGS,
-    matchesKeyBinding,
-  }), {
-    key: 'b',
-    code: 'KeyB',
-    ctrlKey: true,
-    metaKey: false,
-    altKey: false,
-    shiftKey: true,
-    target: monaco,
-    composedPath: () => [monaco],
-    preventDefault: () => { monacoPrevented = true; },
-    stopPropagation: () => {},
-  } as unknown as KeyboardEvent);
-
-  assert.deepEqual(monacoActions, ['toggleHostTree']);
-  assert.equal(monacoPrevented, true);
-
-  const input = new FakeInputHTMLElement();
-  const inputActions: string[] = [];
-  let inputPrevented = false;
-  handleGlobalHotkeyKeyDownImpl(() => ({
-    HOTKEY_DEBUG: false,
-    closeTabKeyStr: '',
-    executeHotkeyAction: (action: string) => {
-      inputActions.push(action);
-      return true;
-    },
-    hotkeyScheme: 'pc',
-    keyBindings: DEFAULT_KEY_BINDINGS,
-    matchesKeyBinding,
-  }), {
-    key: 'b',
-    code: 'KeyB',
-    ctrlKey: true,
-    metaKey: false,
-    altKey: false,
-    shiftKey: true,
-    target: input,
-    composedPath: () => [input],
-    preventDefault: () => { inputPrevented = true; },
-    stopPropagation: () => {},
-  } as unknown as KeyboardEvent);
-
-  assert.deepEqual(inputActions, []);
-  assert.equal(inputPrevented, false);
-});
-
-test('toggleHostTree uses the host list toggle only while that list can show', () => {
-  const previous = getSettingsChromeSnapshot();
-  const calls: string[] = [];
-  const toggleHostTree = () => { calls.push('toggle'); };
-  const event = {} as KeyboardEvent;
-  const contextFor = (activeTabId: string, orderedTabs: string[] = [activeTabId]) => ({
-    activeTabStore: { getActiveTabId: () => activeTabId },
-    editorTabs: [],
-    orderedTabs,
-    sessions: [{ id: 'session-1' }],
-    settings: {},
-    toEditorTabId: (id: string) => id,
-    toggleHostTree,
-    workspaces: [{ id: 'workspace-1' }],
-  });
-
-  try {
-    publishSettingsChromeSnapshot({ ...DEFAULT_SETTINGS_CHROME_SNAPSHOT, showHostTreeSidebar: true });
-    assert.equal(executeHotkeyActionImpl(() => contextFor('session-1'), 'toggleHostTree', event), true);
-    assert.equal(executeHotkeyActionImpl(() => contextFor('editor:note', []), 'toggleHostTree', event), true);
-    assert.equal(executeHotkeyActionImpl(() => contextFor('workspace-1'), 'toggleHostTree', event), true);
-    assert.deepEqual(calls, ['toggle', 'toggle', 'toggle']);
-
-    calls.length = 0;
-    assert.equal(executeHotkeyActionImpl(() => contextFor('vault', []), 'toggleHostTree', event), false);
-    assert.equal(executeHotkeyActionImpl(() => contextFor('sftp', []), 'toggleHostTree', event), false);
-    assert.equal(executeHotkeyActionImpl(() => contextFor('plugin-view:demo:main', ['plugin-view:demo:main']), 'toggleHostTree', event), false);
-    assert.deepEqual(calls, []);
-
-    publishSettingsChromeSnapshot({ ...DEFAULT_SETTINGS_CHROME_SNAPSHOT, showHostTreeSidebar: false });
-    assert.equal(executeHotkeyActionImpl(() => contextFor('session-1'), 'toggleHostTree', event), false);
-    assert.deepEqual(calls, []);
-  } finally {
-    publishSettingsChromeSnapshot(previous);
-  }
-});
-
-test('host list shortcut calls the same store toggle as the toolbar button', () => {
-  const source = readFileSync(new URL('./app/AppSideEffects.tsx', import.meta.url), 'utf8');
-  assert.match(source, /toggleHostTree:\s*\(\)\s*=>\s*terminalHostTreeStore\.toggle\(\)/);
-});

application/app/AppHandlers.ts

@@ -9,8 +9,6 @@ import { getAvailablePaneMagnificationController } from '../../domain/paneMagnif
 import { sanitizeHostIconFields } from '../../domain/hostIcon';
 import { resolveEffectiveTerminalProtocol } from '../../domain/terminalProtocol';
 import { getTerminalPassthroughActions } from '../state/useGlobalHotkeys';
-import { getSettingsChromeSnapshot } from '../state/settingsChromeStore';
-import { isHostTreeWorkTabSurface } from './workTabSurface';
 import { tabShortcutDigitFromEvent } from '../../domain/models/keyBindings';
 import { isPortForwardingAutoReconnectEnabled } from '../../domain/portForwardingReconnect';
 import { buildNumberShortcutTabTargets } from './tabShortcutTargets';
@@ -278,9 +276,6 @@ export function handleGlobalHotkeyKeyDownImpl(getCtx: AppContextGetter, e: Keybo
     const paneZoomBinding = keyBindings.find((binding) => binding.action === 'togglePaneZoom');
     const paneZoomKeyStr = paneZoomBinding ? (isMac ? paneZoomBinding.mac : paneZoomBinding.pc) : null;
     const isPaneZoomHotkey = paneZoomKeyStr ? matchesKeyBinding(e, paneZoomKeyStr, isMac) : false;
-    const hostTreeBinding = keyBindings.find((binding) => binding.action === 'toggleHostTree');
-    const hostTreeKeyStr = hostTreeBinding ? (isMac ? hostTreeBinding.mac : hostTreeBinding.pc) : null;
-    const isHostTreeHotkey = hostTreeKeyStr ? matchesKeyBinding(e, hostTreeKeyStr, isMac) : false;
 
     if (
       (isFormElement || isMonacoElement)
@@ -288,7 +283,6 @@ export function handleGlobalHotkeyKeyDownImpl(getCtx: AppContextGetter, e: Keybo
       && e.key !== 'Escape'
       && !isQuickSwitchHotkey
       && !isPaneZoomHotkey
-      && !(isMonacoElement && isHostTreeHotkey)
       && !forwardedNativeShortcutEvents.has(e)
     ) {
       return;
@@ -328,10 +322,9 @@ export function handleGlobalHotkeyKeyDownImpl(getCtx: AppContextGetter, e: Keybo
         continue;
       }
 
-      // An unavailable action must leave the chord to the terminal.
-      // Broadcast keeps Ctrl/Cmd+B for tmux; the host list keeps Ctrl/Cmd+Shift+B
-      // when the sidebar cannot show. Dispatch once before consuming it.
-      if (binding.action === 'broadcast' || binding.action === 'toggleHostTree') {
+      // An unavailable broadcast action must leave the chord to the terminal
+      // (notably tmux's Ctrl+B prefix). Dispatch once before consuming it.
+      if (binding.action === 'broadcast') {
         if (executeHotkeyAction(binding.action, e) === true) {
           e.preventDefault();
           e.stopPropagation();
@@ -808,7 +801,7 @@ export async function closeTabsBatchImpl(getCtx: AppContextGetter, targetIds: st
 }
 
 export function executeHotkeyActionImpl(getCtx: AppContextGetter, action: string, e: KeyboardEvent) {
-  const { IS_DEV, MOVE_FOCUS_DEBOUNCE_MS, activeTabStore, addConnectionLogRef, canUseGlobalBroadcast, closePluginViewTab, closeSession, closeTabInFlightRef, closeWorkspace, collectSessionIds, confirmIfBusyLocalTerminal, createLocalTerminalWithCurrentShell, editorTabs, fromEditorTabId, handleOpenSettingsRef, handleRequestCloseEditorTabRef, isEditorTabId, isPluginViewTabId, isQuickSwitcherOpen, lastMoveFocusTimeRef, moveFocusInWorkspace, orderedTabs, resolveCloseIntent, resolveSnippetsShortcutIntent, sessions, setActiveTabId, setAddToWorkspaceDialog, setIsQuickSwitcherOpen, setNavigateToSection, settings, sftpPaneMagnificationRef, splitSessionWithCurrentShell, systemInfoRef, terminalPaneMagnificationRef, toEditorTabId, toggleBroadcast, toggleGlobalBroadcast, toggleHostTree, toggleScriptsSidePanelRef, toggleSidePanelRef, toggleWindowOpacity, workspaces } = getCtx();
+  const { IS_DEV, MOVE_FOCUS_DEBOUNCE_MS, activeTabStore, addConnectionLogRef, canUseGlobalBroadcast, closePluginViewTab, closeSession, closeTabInFlightRef, closeWorkspace, collectSessionIds, confirmIfBusyLocalTerminal, createLocalTerminalWithCurrentShell, editorTabs, fromEditorTabId, handleOpenSettingsRef, handleRequestCloseEditorTabRef, isEditorTabId, isPluginViewTabId, isQuickSwitcherOpen, lastMoveFocusTimeRef, moveFocusInWorkspace, orderedTabs, resolveCloseIntent, resolveSnippetsShortcutIntent, sessions, setActiveTabId, setAddToWorkspaceDialog, setIsQuickSwitcherOpen, setNavigateToSection, settings, sftpPaneMagnificationRef, splitSessionWithCurrentShell, systemInfoRef, terminalPaneMagnificationRef, toEditorTabId, toggleBroadcast, toggleGlobalBroadcast, toggleScriptsSidePanelRef, toggleSidePanelRef, toggleWindowOpacity, workspaces } = getCtx();
 {
     const shortcutTabs = buildNumberShortcutTabTargets({
       showSftpTab: settings.showSftpTab ?? true,
@@ -1004,18 +997,6 @@ export function executeHotkeyActionImpl(getCtx: AppContextGetter, action: string
       case 'toggleSidePanel':
         toggleSidePanelRef.current?.();
         break;
-      case 'toggleHostTree': {
-        const currentId = activeTabStore.getActiveTabId();
-        if (!isHostTreeWorkTabSurface({
-          enabled: getSettingsChromeSnapshot().showHostTreeSidebar,
-          activeTabId: currentId,
-          orderedTabs: orderedTabs ?? [],
-          sessionIds: new Set((sessions ?? []).map((session: TerminalSession) => session.id)),
-          workspaceIds: new Set((workspaces ?? []).map((workspace: { id: string }) => workspace.id)),
-        }) || typeof toggleHostTree !== 'function') return false;
-        toggleHostTree();
-        return true;
-      }
       case 'broadcast': {
         // Workspace tabs keep their local broadcast state; orphan tabs share
         // the global state when at least two visible orphan tabs exist.
@@ -1203,7 +1184,7 @@ export function handleConnectToHostImpl(getCtx: AppContextGetter, host: Host, hi
   }
 }
 
-export async function handleTerminalDataCaptureImpl(getCtx: AppContextGetter, sessionId: string, data: string) {
+export function handleTerminalDataCaptureImpl(getCtx: AppContextGetter, sessionId: string, data: string) {
   const { IS_DEV, connectionLogs, selectConnectionLogForTerminalDataCapture, sessions, updateConnectionLog } = getCtx();
 {
     if (IS_DEV) console.log('[handleTerminalDataCapture] Called', { sessionId, dataLength: data.length });
@@ -1219,10 +1200,7 @@ export async function handleTerminalDataCaptureImpl(getCtx: AppContextGetter, se
     if (IS_DEV) console.log('[handleTerminalDataCapture] Matching log', matchingLog);
 
     if (matchingLog) {
-      // The IndexedDB replay write commits asynchronously. Waiting here keeps
-      // a crash during session teardown from dropping the newest capture any
-      // more often than the old synchronous localStorage write.
-      await updateConnectionLog(matchingLog.id, {
+      updateConnectionLog(matchingLog.id, {
         endTime: Date.now(),
         terminalData: data,
       });

application/app/AppSideEffects.tsx

@@ -70,7 +70,6 @@ import {
 import { getCredentialProtectionAvailability } from '../../infrastructure/services/credentialProtection';
 import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
 import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
-import { terminalHostTreeStore } from '../state/terminalHostTreeStore';
 import {
   markExternalMcpStartupReady,
   readExternalMcpFocusOnHostOpen,
@@ -1127,7 +1126,6 @@ export function AppSideEffects() {
       toggleBroadcast,
       toggleGlobalBroadcast,
       canUseGlobalBroadcast: canUseGlobalBroadcastRef.current,
-      toggleHostTree: () => terminalHostTreeStore.toggle(),
       toggleScriptsSidePanelRef,
       toggleSidePanelRef,
       toggleWindowOpacity,

application/app/AppView.tsx

@@ -272,7 +272,7 @@ function AppViewInner({ domains }: AppViewProps) {
     handleEndSessionDrag, handleFollowAppTerminalThemeChange, handleHostConnectWithProtocolCheck, handleHotkeyAction, handleKeyboardInteractiveCancel, handleKeyboardInteractiveSubmit,
     handleOpenHostFromVaultNote, handleOpenQuickSwitcher, handleOpenSettings, handleOpenVaultHostFromChat, handleOpenVaultNoteFromChat, handleOpenVaultSectionFromChat, handleOpenVaultSnippetFromChat, handleRootContextMenu, handlePassphraseCancel, handlePassphraseSkip, handlePassphraseSubmit, handleFidoPromptSubmit, handleFidoPromptCancel, handleProtocolSelect,
     handleRequestCloseEditorTabRef, handleSessionStatusChange, handleSyncNowManual, handleTerminalDataCapture, handleUpdateHostFromTerminal,
-    hostById, hosts, terminalHosts, updateTerminalHosts, hotkeyScheme, identities, importOrReuseKey, isBroadcastEnabled, isComposeSendToAll, onToggleComposeSendTarget, isGlobalBroadcastEnabled, isGlobalComposeSendToAll, onToggleGlobalBroadcast, onToggleGlobalComposeSendTarget, canUseGlobalBroadcast, isCreateWorkspaceOpen, isMacClient, isQuickSwitcherOpen,
+    hostById, hosts, terminalHosts, updateTerminalHosts, hotkeyScheme, identities, importOrReuseKey, isBroadcastEnabled, isGlobalBroadcastEnabled, onToggleGlobalBroadcast, canUseGlobalBroadcast, isCreateWorkspaceOpen, isMacClient, isQuickSwitcherOpen,
     keyBindings, keyboardInteractiveQueue, keys, logViews, managedSources, navigateToSection, openLogView, openNoteRequest, orderedTabsWithEditors, orphanSessions,
     passphraseQueue, fidoPromptQueue, protocolSelectHost, proxyProfiles, portForwardingRules, quickResults, quickSearch, removeSessionFromWorkspace, reorderWorkTabs, reorderWorkspaceSessions,
     resolveEmptyVaultConflict, resolveSessionAppearance, runSnippet, sessionLogsDir, sessionLogsEnabled, sessionLogsFormat, sessionLogsTimestampsEnabled, sessionRenameTarget, sshDebugLogsEnabled,
@@ -784,12 +784,8 @@ function AppViewInner({ domains }: AppViewProps) {
           onCreateLocalTerminal={handleCreateLocalTerminal}
           isBroadcastEnabled={isBroadcastEnabled}
           onToggleBroadcast={toggleBroadcast}
-          isComposeSendToAll={isComposeSendToAll}
-          onToggleComposeSendTarget={onToggleComposeSendTarget}
           isGlobalBroadcastEnabled={isGlobalBroadcastEnabled}
-          isGlobalComposeSendToAll={isGlobalComposeSendToAll}
           onToggleGlobalBroadcast={onToggleGlobalBroadcast}
-          onToggleGlobalComposeSendTarget={onToggleGlobalComposeSendTarget}
           canUseGlobalBroadcast={canUseGlobalBroadcast}
           updateHosts={updateTerminalHosts}
           updateSnippets={updateSnippets}

application/app/hosts/TerminalHost.tsx

@@ -205,11 +205,7 @@ export function TerminalHost() {
       updateTerminalHosts: handlers.updateTerminalHosts,
       hotkeyScheme: terminalSettings.hotkeyScheme,
       isBroadcastEnabled: sessionActions?.isBroadcastEnabled,
-      isComposeSendToAll: sessionActions?.isComposeSendToAll,
-      onToggleComposeSendTarget: sessionActions?.toggleComposeSendTarget,
       isGlobalBroadcastEnabled: sessionActions?.isGlobalBroadcastEnabled,
-      isGlobalComposeSendToAll: sessionActions?.isGlobalComposeSendToAll,
-      onToggleGlobalComposeSendTarget: sessionActions?.toggleGlobalComposeSendTarget,
       canUseGlobalBroadcast: sessionActions?.canUseGlobalBroadcast,
       keyBindings: terminalSettings.keyBindings,
       openNoteRequest: local.openNoteRequest,

application/app/publishers/SessionPublisher.tsx

@@ -70,12 +70,8 @@ export function SessionPublisher({ persistSessionRestore, children }: SessionPub
     reorderTabs,
     toggleBroadcast,
     isBroadcastEnabled,
-    toggleComposeSendTarget,
-    isComposeSendToAll,
     toggleGlobalBroadcast,
     isGlobalBroadcastEnabled,
-    toggleGlobalComposeSendTarget,
-    isGlobalComposeSendToAll,
     canUseGlobalBroadcast,
     copySession,
     copyWorkspace,
@@ -154,12 +150,8 @@ export function SessionPublisher({ persistSessionRestore, children }: SessionPub
     reorderTabs,
     toggleBroadcast,
     isBroadcastEnabled,
-    toggleComposeSendTarget,
-    isComposeSendToAll,
     toggleGlobalBroadcast,
     isGlobalBroadcastEnabled,
-    toggleGlobalComposeSendTarget,
-    isGlobalComposeSendToAll,
     canUseGlobalBroadcast,
     copySession,
     copyWorkspace,
@@ -189,9 +181,7 @@ export function SessionPublisher({ persistSessionRestore, children }: SessionPub
     getOrderedWorkTabs,
     getSessionRestoreCwd,
     isBroadcastEnabled,
-    isComposeSendToAll,
     isGlobalBroadcastEnabled,
-    isGlobalComposeSendToAll,
     moveFocusInWorkspace,
     openLogView,
     canUseGlobalBroadcast,
@@ -211,9 +201,7 @@ export function SessionPublisher({ persistSessionRestore, children }: SessionPub
     submitSessionRename,
     submitWorkspaceRename,
     toggleBroadcast,
-    toggleComposeSendTarget,
     toggleGlobalBroadcast,
-    toggleGlobalComposeSendTarget,
     toggleWorkspaceViewMode,
     updateSessionCodingCliProvider,
     updateSessionDynamicTitle,

application/app/strictModeIdempotency.test.ts

@@ -165,12 +165,8 @@ test('vault init cancels the superseded StrictMode effect before publishing read
   );
   const initAt = vaultSource.indexOf('let cancelled = false;');
   assert.notEqual(initAt, -1, 'vault init must track cancellation');
-  const initSlice = vaultSource.slice(initAt, initAt + 20000);
-  assert.match(
-    initSlice,
-    /return \(\) => \{\s*\n\s*cancelled = true;\s*\n\s*resolveTerminalDataReady\(\);\s*\n\s*\};/,
-    'StrictMode cleanup cancels init and unblocks the terminal-data ready promise',
-  );
+  const initSlice = vaultSource.slice(initAt, initAt + 12000);
+  assert.match(initSlice, /return \(\) => \{\s*\n\s*cancelled = true;\s*\n\s*\};/);
   assert.match(
     initSlice,
     /if \(!cancelled\) \{\s*\n\s*setIsInitialized\(true\);\s*\n\s*setVaultInitialized\(true\);\s*\n\s*\}/,

application/app/useAppStartupEffects.transferQuit.test.ts

@@ -1,87 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import React from "react";
-import { act, create, type ReactTestRenderer } from "react-test-renderer";
-import { useAppStartupEffects } from "./useAppStartupEffects.ts";
-import { sftpTransferCenterStore } from "../state/sftpTransferCenterStore.ts";
-import { netcattyBridge } from "../../infrastructure/services/netcattyBridge.ts";
-
-for (const accept of [false, true]) {
-  test(`app Quit with an unfinished transfer: ${accept ? "confirm quits" : "declining reports \"transfers\" before resuming only transferring and queued tasks"}`, async (t) => {
-    const previous = Object.getOwnPropertyDescriptor(globalThis, "IS_REACT_ACT_ENVIRONMENT");
-    Object.defineProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT", { configurable: true, value: true });
-    const g = globalThis as unknown as { window?: { confirm?: (m: string) => boolean } };
-    const hadWindow = "window" in g; const previousConfirm = g.window?.confirm;
-    if (!g.window) g.window = {};
-    g.window.confirm = () => accept;
-    let renderer: ReactTestRenderer | undefined;
-    let releaseResume!: () => void;
-    const resumeGate = new Promise<void>((resolve) => { releaseResume = resolve; });
-    t.after(async () => {
-      releaseResume();
-      await act(async () => renderer?.unmount());
-      if (hadWindow && g.window) g.window.confirm = previousConfirm; else delete g.window;
-      if (previous) Object.defineProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT", previous);
-      else Reflect.deleteProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT");
-    });
-    const calls: string[] = [];
-    const reports: Array<[boolean, string | undefined]> = [];
-    let resumeSettled = false;
-    let query!: () => Promise<void>;
-    t.mock.method(sftpTransferCenterStore, "getSnapshot", () => ({
-      tasks: [
-        { id: "running", status: "transferring" },
-        { id: "queued", status: "queued" },
-        { id: "already-paused", status: "paused" },
-        { id: "pausing", status: "pausing" },
-        { id: "interrupted", status: "interrupted" },
-        { id: "child", parentTaskId: "running", status: "transferring" },
-      ],
-    }) as unknown as ReturnType<typeof sftpTransferCenterStore.getSnapshot>);
-    t.mock.method(sftpTransferCenterStore, "pause", async (id: string) => { calls.push(`pause:${id}`); });
-    t.mock.method(sftpTransferCenterStore, "resume", async (id: string) => {
-      calls.push(`resume:${id}`);
-      await resumeGate;
-      resumeSettled = true;
-    });
-    t.mock.method(netcattyBridge, "get", () => ({
-      onCheckDirtyEditors: (callback: typeof query) => { query = callback; return () => {}; },
-      reportDirtyEditorsResult: (dirty: boolean, reason?: string) => {
-        calls.push("report");
-        reports.push([dirty, reason]);
-      },
-    }));
-    function Probe() {
-      useAppStartupEffects({ enabled: false, updateState: {}, sessions: [], hosts: [], keys: [], identities: [], knownHosts: [], proxyProfiles: [], groupConfigs: [], workspaces: [], portForwardingRules: [], t: (key: string) => key });
-      return null;
-    }
-    await act(async () => { renderer = create(React.createElement(Probe)); });
-    const paused = [
-      "pause:running",
-      "pause:queued",
-      "pause:already-paused",
-      "pause:pausing",
-      "pause:interrupted",
-    ];
-    let timer: ReturnType<typeof setTimeout> | undefined;
-    try {
-      await Promise.race([
-        query(),
-        new Promise((_, reject) => {
-          timer = setTimeout(() => reject(new Error("dirty check waited on resume")), 1000);
-        }),
-      ]);
-    } finally {
-      clearTimeout(timer);
-    }
-    assert.equal(resumeSettled, false, "the dirty-check reply must not wait for resume");
-    if (accept) {
-      assert.deepEqual(reports, [[false, undefined]]);
-      assert.deepEqual(calls, [...paused, "report"], "accepted quit leaves every prompted task paused");
-    } else {
-      assert.deepEqual(reports, [[true, "transfers"]], "main must be told the prompt was already answered");
-      assert.deepEqual(calls, [...paused, "report", "resume:running", "resume:queued"],
-        "report precedes resume, and only transferring/queued rows the prompt paused are resumed");
-    }
-  });
-}

application/app/useAppStartupEffects.ts

@@ -356,51 +356,30 @@ export function useAppStartupEffects(ctx: StartupEffectsContext) {
       // on a slow quit and then quitting anyway after the timeout is
       // exactly the same outcome.
       let hasDirty = false;
-      let reason: "editors" | "transfers" | undefined;
-      // Captured before pause. Only transferring/queued rows were active
-      // because of this prompt.
-      let tasksToResume: { id: string }[] = [];
       try {
         // Pending handoffs retain source contents; accepted handoffs clear them.
         hasDirty = editorTabStore.getTabs().some((tab) => tab.content !== tab.baselineContent);
-        if (hasDirty) {
-          reason = "editors";
-          toast.warning(t('sftp.editor.quitBlockedByDirty'), 'SFTP');
-        }
+        if (hasDirty) toast.warning(t('sftp.editor.quitBlockedByDirty'), 'SFTP');
         if (!hasDirty) {
           const unfinishedTasks = sftpTransferCenterStore.getSnapshot().tasks.filter((task) => (
             !task.parentTaskId && !["completed", "failed", "cancelled"].includes(task.status)
           ));
           if (unfinishedTasks.length > 0) {
-            const resumable = unfinishedTasks.filter((task) => (
-              task.status === "transferring" || task.status === "queued"
-            ));
             await Promise.allSettled(unfinishedTasks.map((task) => sftpTransferCenterStore.pause(task.id)));
             hasDirty = !window.confirm(t('sftp.transferCenter.quitConfirm', { count: unfinishedTasks.length }));
-            if (hasDirty) {
-              // The user chose to stay. Main must hear that before any resume:
-              // resume can outlive the 5s dirty-check timeout, and a late reply
-              // lets the app quit anyway. The synchronous dialog is also skipped
-              // because this prompt was already answered.
-              reason = "transfers";
-              tasksToResume = resumable;
-            }
           }
         }
       } catch (err) {
         console.error('[App] dirty-editors check failed:', err);
       }
       try {
-        bridge.reportDirtyEditorsResult?.(hasDirty, reason);
+        bridge.reportDirtyEditorsResult?.(hasDirty);
       } catch (err) {
         // Reporting itself shouldn't throw, but if the IPC bridge is in a
         // bad state we'd rather log than bubble out of the listener and
         // disable the quit guard for the rest of the session.
         console.error('[App] reportDirtyEditorsResult failed:', err);
       }
-      if (tasksToResume.length > 0) {
-        void Promise.allSettled(tasksToResume.map((task) => sftpTransferCenterStore.resume(task.id)));
-      }
     });
     return unsub;
   }, [enabled, t]);

application/i18n/locales/en/ai.ts

@@ -582,7 +582,6 @@ export const enAiMessages: Messages = {
   'ai.chat.modelCatalogSourceCached': 'Cached · last success {time}',
   'ai.chat.modelCatalogSourceCachedNoTime': 'Cached',
   'ai.chat.modelCatalogSourcePresets': 'Built-in default list',
-  'ai.chat.refreshModelList': 'Refresh model list',
   'ai.chat.noMatchingModels': 'No matching models',
   'ai.chat.recent': 'Recent',
   'ai.chat.viewAll': 'View All',

application/i18n/locales/en/core.ts

@@ -964,7 +964,6 @@ Highlight the focused split pane:
   'settings.shortcuts.category.terminal': 'Terminal',
   'settings.shortcuts.category.navigation': 'Navigation',
   'settings.shortcuts.category.app': 'App',
-  'settings.shortcuts.binding.toggle-host-tree': 'Toggle Host List',
   'settings.shortcuts.category.sftp': 'SFTP',
 
   // Context menus / common actions

application/i18n/locales/en/monitor.ts

@@ -1,9 +1,4 @@
 export const enMonitorMessages = {
-  "monitor.diskIo": "Disk I/O",
-  "monitor.diskRead": "Read",
-  "monitor.diskWrite": "Write",
-  "monitor.diskIoHint": "Aggregate Linux hardware-backed block-device I/O, excluding partitions and stacked virtual devices. Unavailable until two valid samples; not supported on macOS.",
-
   "monitor.actions": "Panel actions",
   "monitor.unavailable": "Monitoring is unavailable. Try starting again when the connection is restored.",
   "monitor.username": "Username",

application/i18n/locales/en/terminal.ts

@@ -1,15 +1,6 @@
 import type { Messages } from '../types';
 
 export const enTerminalMessages: Messages = {
-  'terminal.toolbar.openSessionLog': 'Open session log',
-  'terminal.toolbar.sessionLogActions': 'Session log actions',
-  'terminal.toolbar.sessionLog.menu': 'Session log',
-  'terminal.toolbar.sessionLog.open': 'Open',
-  'terminal.toolbar.sessionLog.reveal': 'Show in folder',
-  'terminal.toolbar.sessionLog.chooseApplication': 'Open with…',
-  'terminal.toolbar.sessionLog.systemDefault': 'Open with system default',
-  'terminal.toolbar.openSessionLogFailed': 'Failed to open session log.',
-
   'terminal.menu.saveScreen': 'Save current screen',
   'terminal.saveScreen.failed': 'Failed to save terminal screen.',
   // Multi-line paste confirmation dialog (#3398)
@@ -77,8 +68,6 @@ export const enTerminalMessages: Messages = {
   'terminal.composeBar.send': 'Send',
   'terminal.composeBar.close': 'Close compose bar',
   'terminal.composeBar.broadcasting': 'Broadcasting to all sessions',
-  'terminal.composeBar.sendToAll': 'Send to all sessions',
-  'terminal.composeBar.sendToActive': 'Send to the active session only',
   'terminal.composeBar.broadcastAllowPassword': 'Broadcast without password protection',
   'terminal.composeBar.resize': 'Resize compose bar height',
   'terminal.composeBar.manageSnippets': 'Manage quick snippets',

application/i18n/locales/es/ai.ts

@@ -565,7 +565,6 @@ export const esAiMessages: Messages = {
   'ai.chat.modelCatalogSourceCached': 'En caché · último éxito {time}',
   'ai.chat.modelCatalogSourceCachedNoTime': 'En caché',
   'ai.chat.modelCatalogSourcePresets': 'Lista predeterminada integrada',
-  'ai.chat.refreshModelList': 'Actualizar la lista de modelos',
   'ai.chat.noMatchingModels': 'No hay modelos coincidentes',
   'ai.chat.recent': 'Recientes',
   'ai.chat.viewAll': 'Ver todo',

application/i18n/locales/es/core.ts

@@ -913,7 +913,6 @@ Resalta el panel dividido enfocado:
   'settings.shortcuts.binding.broadcast': 'Alternar modo de transmisión',
   'settings.shortcuts.binding.toggle-opacity': 'Alternar la transparencia de la ventana',
   'settings.shortcuts.binding.toggle-side-panel': 'Alternar panel lateral',
-  'settings.shortcuts.binding.toggle-host-tree': 'Alternar lista de hosts',
   'settings.shortcuts.binding.sftp-copy': 'Copiar archivos',
   'settings.shortcuts.binding.sftp-cut': 'Cortar archivos',
   'settings.shortcuts.binding.sftp-paste': 'Pegar archivos',

application/i18n/locales/es/monitor.ts

@@ -1,9 +1,4 @@
 export const esMonitorMessages = {
-  "monitor.diskIo": "E/S de disco",
-  "monitor.diskRead": "Lectura",
-  "monitor.diskWrite": "Escritura",
-  "monitor.diskIoHint": "E/S agregada de dispositivos de bloques físicos de Linux, sin contar particiones ni capas virtuales. No disponible hasta tener dos muestras válidas; no compatible con macOS.",
-
   "monitor.actions": "Acciones del panel",
   "monitor.unavailable": "La monitorización no está disponible. Iníciala de nuevo cuando se restablezca la conexión.",
   "monitor.username": "Usuario",

application/i18n/locales/es/terminal.ts

@@ -1,15 +1,6 @@
 import type { Messages } from '../types';
 
 export const esTerminalMessages: Messages = {
-  'terminal.toolbar.openSessionLog': 'Abrir registro de sesión',
-  'terminal.toolbar.sessionLogActions': 'Acciones del registro',
-  'terminal.toolbar.sessionLog.menu': 'Registro de sesión',
-  'terminal.toolbar.sessionLog.open': 'Abrir',
-  'terminal.toolbar.sessionLog.reveal': 'Mostrar en carpeta',
-  'terminal.toolbar.sessionLog.chooseApplication': 'Abrir con…',
-  'terminal.toolbar.sessionLog.systemDefault': 'Abrir con la aplicación predeterminada',
-  'terminal.toolbar.openSessionLogFailed': 'No se pudo abrir el registro.',
-
   'terminal.menu.saveScreen': 'Guardar pantalla actual',
   'terminal.saveScreen.failed': 'No se pudo guardar la pantalla del terminal.',
   // Diálogo de confirmación de pegado multilínea (#3398)
@@ -77,8 +68,6 @@ export const esTerminalMessages: Messages = {
   'terminal.composeBar.send': 'Enviar',
   'terminal.composeBar.close': 'Cerrar barra de redacción',
   'terminal.composeBar.broadcasting': 'Difundiendo a todas las sesiones',
-  'terminal.composeBar.sendToAll': 'Enviar a todas las sesiones',
-  'terminal.composeBar.sendToActive': 'Enviar solo a la sesión activa',
   'terminal.composeBar.broadcastAllowPassword': 'Difundir sin protección de contraseña',
   'terminal.composeBar.resize': 'Cambiar la altura de la barra de redacción',
   'terminal.composeBar.manageSnippets': 'Administrar snippets rápidos',

application/i18n/locales/ru/ai.ts

@@ -521,7 +521,6 @@ export const ruAiMessages: Messages = {
   'ai.chat.modelCatalogSourceCached': 'Кэш · обновлён {time}',
   'ai.chat.modelCatalogSourceCachedNoTime': 'Кэш',
   'ai.chat.modelCatalogSourcePresets': 'Встроенный список моделей',
-  'ai.chat.refreshModelList': 'Обновить список моделей',
   'ai.chat.noMatchingModels': 'Нет подходящих моделей',
   'ai.chat.recent': 'Недавние',
   'ai.chat.viewAll': 'Показать всё',

application/i18n/locales/ru/core.ts

@@ -938,7 +938,6 @@ export const ruCoreMessages: Messages = {
   'settings.shortcuts.binding.broadcast': 'Переключить режим трансляции',
   'settings.shortcuts.binding.toggle-opacity': 'Переключить прозрачность окна',
   'settings.shortcuts.binding.toggle-side-panel': 'Переключить боковую панель',
-  'settings.shortcuts.binding.toggle-host-tree': 'Переключить список хостов',
   'settings.shortcuts.binding.sftp-copy': 'Копировать файл',
   'settings.shortcuts.binding.sftp-cut': 'Вырезать файл',
   'settings.shortcuts.binding.sftp-paste': 'Вставить файл',

application/i18n/locales/ru/monitor.ts

@@ -1,9 +1,4 @@
 export const ruMonitorMessages = {
-  "monitor.diskIo": "Дисковый ввод-вывод",
-  "monitor.diskRead": "Чтение",
-  "monitor.diskWrite": "Запись",
-  "monitor.diskIoHint": "Суммарный ввод-вывод физических блочных устройств Linux, без разделов и виртуальных слоёв. Доступен после двух корректных замеров; macOS не поддерживается.",
-
   "monitor.actions": "Действия панели",
   "monitor.unavailable": "Мониторинг недоступен. Запустите его снова после восстановления связи.",
   "monitor.username": "Пользователь",

application/i18n/locales/ru/terminal.ts

@@ -1,15 +1,6 @@
 import type { Messages } from '../types';
 
 export const ruTerminalMessages: Messages = {
-  'terminal.toolbar.openSessionLog': 'Открыть журнал сессии',
-  'terminal.toolbar.sessionLogActions': 'Действия с журналом',
-  'terminal.toolbar.sessionLog.menu': 'Журнал сессии',
-  'terminal.toolbar.sessionLog.open': 'Открыть',
-  'terminal.toolbar.sessionLog.reveal': 'Показать в папке',
-  'terminal.toolbar.sessionLog.chooseApplication': 'Открыть с помощью…',
-  'terminal.toolbar.sessionLog.systemDefault': 'Открыть по умолчанию',
-  'terminal.toolbar.openSessionLogFailed': 'Не удалось открыть журнал.',
-
   'terminal.menu.saveScreen': 'Сохранить текущий экран',
   'terminal.saveScreen.failed': 'Не удалось сохранить экран терминала.',
   // Диалог подтверждения многострочной вставки (#3398)
@@ -98,8 +89,6 @@ export const ruTerminalMessages: Messages = {
   'terminal.composeBar.send': 'Отправить',
   'terminal.composeBar.close': 'Закрыть строку ввода',
   'terminal.composeBar.broadcasting': 'Трансляция во все сессии',
-  'terminal.composeBar.sendToAll': 'Отправить во все сессии',
-  'terminal.composeBar.sendToActive': 'Отправить только в активную сессию',
   'terminal.composeBar.broadcastAllowPassword': 'Транслировать без защиты пароля',
   'terminal.composeBar.resize': 'Изменить высоту строки ввода',
   'terminal.composeBar.manageSnippets': 'Управление быстрыми сниппетами',

application/i18n/locales/terminalSessionLogLocales.test.ts

@@ -1,32 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import en from './en';
-import es from './es';
-import ru from './ru';
-import zhCN from './zh-CN';
-import zhTW from './zh-TW';
-
-const keys = [
-  'terminal.toolbar.openSessionLog',
-  'terminal.toolbar.sessionLogActions',
-  'terminal.toolbar.sessionLog.menu',
-  'terminal.toolbar.sessionLog.open',
-  'terminal.toolbar.sessionLog.reveal',
-  'terminal.toolbar.sessionLog.chooseApplication',
-  'terminal.toolbar.sessionLog.systemDefault',
-  'terminal.toolbar.openSessionLogFailed',
-] as const;
-
-test('saved session log actions are translated in every shipped locale', () => {
-  for (const [locale, messages] of Object.entries({ en, es, ru, 'zh-CN': zhCN, 'zh-TW': zhTW })) {
-    for (const key of keys) assert.ok(messages[key], `${locale} is missing ${key}`);
-    assert.equal(messages['terminal.toolbar.sessionLog.rememberApplication'], undefined);
-  }
-  assert.equal(en['terminal.toolbar.sessionLog.menu'], 'Session log');
-  assert.equal(en['terminal.toolbar.sessionLog.open'], 'Open');
-  assert.equal(en['terminal.toolbar.sessionLog.reveal'], 'Show in folder');
-  assert.equal(en['terminal.toolbar.sessionLog.chooseApplication'], 'Open with…');
-  assert.equal(en['terminal.toolbar.sessionLog.systemDefault'], 'Open with system default');
-  assert.equal(zhCN['terminal.toolbar.sessionLog.menu'], '会话日志');
-  assert.equal(zhTW['terminal.toolbar.sessionLog.menu'], '工作階段日誌');
-});

application/i18n/locales/zh-CN/ai.ts

@@ -582,7 +582,6 @@ export const zhCNAiMessages: Messages = {
   'ai.chat.modelCatalogSourceCached': '缓存 · 上次成功 {time}',
   'ai.chat.modelCatalogSourceCachedNoTime': '缓存',
   'ai.chat.modelCatalogSourcePresets': '内置默认列表',
-  'ai.chat.refreshModelList': '刷新模型列表',
   'ai.chat.noMatchingModels': '没有匹配的模型',
   'ai.chat.recent': '最近',
   'ai.chat.viewAll': '查看全部',

application/i18n/locales/zh-CN/monitor.ts

@@ -1,9 +1,4 @@
 export const zhCNMonitorMessages = {
-  "monitor.diskIo": "磁盘 I/O",
-  "monitor.diskRead": "读取",
-  "monitor.diskWrite": "写入",
-  "monitor.diskIoHint": "Linux 底层块设备的汇总 I/O，不重复统计分区和叠加的虚拟设备。取得两次有效采样前不可用；暂不支持 macOS。",
-
   "monitor.actions": "面板操作",
   "monitor.unavailable": "监控暂不可用，连接恢复后请重新开始。",
   "monitor.username": "用户名",

application/i18n/locales/zh-CN/terminal.ts

@@ -1,15 +1,6 @@
 import type { Messages } from '../types';
 
 export const zhCNTerminalMessages: Messages = {
-  'terminal.toolbar.openSessionLog': '打开会话日志',
-  'terminal.toolbar.sessionLogActions': '会话日志操作',
-  'terminal.toolbar.sessionLog.menu': '会话日志',
-  'terminal.toolbar.sessionLog.open': '打开',
-  'terminal.toolbar.sessionLog.reveal': '在文件夹中显示',
-  'terminal.toolbar.sessionLog.chooseApplication': '打开方式…',
-  'terminal.toolbar.sessionLog.systemDefault': '用系统默认应用打开',
-  'terminal.toolbar.openSessionLogFailed': '无法打开会话日志。',
-
   'terminal.menu.saveScreen': '保存当前屏幕',
   'terminal.saveScreen.failed': '保存终端屏幕失败。',
   // 多行粘贴确认对话框（#3398）
@@ -621,7 +612,6 @@ export const zhCNTerminalMessages: Messages = {
   'settings.shortcuts.binding.broadcast': '切换广播模式',
   'settings.shortcuts.binding.toggle-opacity': '切换窗口透明度',
   'settings.shortcuts.binding.toggle-side-panel': '切换侧边栏',
-  'settings.shortcuts.binding.toggle-host-tree': '切换主机列表',
   'settings.shortcuts.binding.sftp-copy': '复制文件',
   'settings.shortcuts.binding.sftp-cut': '剪切文件',
   'settings.shortcuts.binding.sftp-paste': '粘贴文件',

application/i18n/locales/zh-CN/vault.ts

@@ -524,8 +524,6 @@ export const zhCNVaultMessages: Messages = {
   'terminal.composeBar.send': '发送',
   'terminal.composeBar.close': '关闭撰写栏',
   'terminal.composeBar.broadcasting': '正在广播到所有会话',
-  'terminal.composeBar.sendToAll': '发送到所有会话',
-  'terminal.composeBar.sendToActive': '仅发送到当前会话',
   'terminal.composeBar.broadcastAllowPassword': '广播时不对密码进行保护',
   'terminal.composeBar.resize': '拖拽调整撰写栏高度',
   'terminal.composeBar.manageSnippets': '管理快捷代码片段',

application/i18n/locales/zh-TW/ai.ts

@@ -572,7 +572,6 @@ export const zhTWAiMessages: Messages = {
   'ai.chat.modelCatalogSourceCached': '快取 · 上次成功 {time}',
   'ai.chat.modelCatalogSourceCachedNoTime': '快取',
   'ai.chat.modelCatalogSourcePresets': '內建預設清單',
-  'ai.chat.refreshModelList': '重新整理模型清單',
   'ai.chat.noMatchingModels': '沒有符合的模型',
   'ai.chat.recent': '最近',
   'ai.chat.viewAll': '檢視全部',

application/i18n/locales/zh-TW/monitor.ts

@@ -1,9 +1,4 @@
 export const zhTWMonitorMessages = {
-  "monitor.diskIo": "磁碟 I/O",
-  "monitor.diskRead": "讀取",
-  "monitor.diskWrite": "寫入",
-  "monitor.diskIoHint": "Linux 底層區塊裝置的彙總 I/O，不重複統計分割區與疊加的虛擬裝置。取得兩次有效取樣前無法使用；暫不支援 macOS。",
-
   "monitor.actions": "面板操作",
   "monitor.unavailable": "監控暫時無法使用，連線恢復後請重新開始。",
   "monitor.username": "使用者名稱",

application/i18n/locales/zh-TW/terminal.ts

@@ -1,15 +1,6 @@
 import type { Messages } from '../types';
 
 export const zhTWTerminalMessages: Messages = {
-  'terminal.toolbar.openSessionLog': '開啟工作階段日誌',
-  'terminal.toolbar.sessionLogActions': '工作階段日誌操作',
-  'terminal.toolbar.sessionLog.menu': '工作階段日誌',
-  'terminal.toolbar.sessionLog.open': '開啟',
-  'terminal.toolbar.sessionLog.reveal': '在資料夾中顯示',
-  'terminal.toolbar.sessionLog.chooseApplication': '開啟方式…',
-  'terminal.toolbar.sessionLog.systemDefault': '用系統預設應用程式開啟',
-  'terminal.toolbar.openSessionLogFailed': '無法開啟工作階段日誌。',
-
   'terminal.menu.saveScreen': '儲存目前畫面',
   'terminal.saveScreen.failed': '儲存終端畫面失敗。',
   // 多行貼上確認對話框（#3398）
@@ -621,7 +612,6 @@ export const zhTWTerminalMessages: Messages = {
   'settings.shortcuts.binding.broadcast': '切換廣播模式',
   'settings.shortcuts.binding.toggle-opacity': '切換視窗透明度',
   'settings.shortcuts.binding.toggle-side-panel': '切換側邊欄',
-  'settings.shortcuts.binding.toggle-host-tree': '切換主機列表',
   'settings.shortcuts.binding.sftp-copy': '複製檔案',
   'settings.shortcuts.binding.sftp-cut': '剪下檔案',
   'settings.shortcuts.binding.sftp-paste': '貼上檔案',

application/i18n/locales/zh-TW/vault.ts

@@ -524,8 +524,6 @@ export const zhTWVaultMessages: Messages = {
   'terminal.composeBar.send': '傳送',
   'terminal.composeBar.close': '關閉撰寫欄',
   'terminal.composeBar.broadcasting': '正在廣播到所有工作階段',
-  'terminal.composeBar.sendToAll': '傳送到所有工作階段',
-  'terminal.composeBar.sendToActive': '僅傳送到目前工作階段',
   'terminal.composeBar.broadcastAllowPassword': '廣播時不對密碼進行保護',
   'terminal.composeBar.resize': '拖曳調整撰寫欄高度',
   'terminal.composeBar.manageSnippets': '管理快捷程式碼片段',

application/state/aiStateSnapshots.test.ts

@@ -717,103 +717,3 @@ test('writeSessionsForStorage makes a final attempt with only the newest session
     });
   }
 });
-
-function freezeHistory<T>(value: T): T {
-  if (value && typeof value === 'object') {
-    Object.values(value).forEach(freezeHistory);
-    Object.freeze(value);
-  }
-  return value;
-}
-
-function makePersistenceHistory(count: number, activeMessages = 6): AISession[] {
-  return Array.from({ length: count }, (_, index) => makeSession(
-    `session-${index}`,
-    count - index,
-    Array.from({ length: index === 0 ? activeMessages : 6 }, (_, messageIndex) => ({
-      id: `message-${index}-${messageIndex}`,
-      role: messageIndex % 2 ? 'assistant' : 'user',
-      content: 'ordinary text '.repeat(8),
-      timestamp: messageIndex,
-      ...(messageIndex % 2 ? {
-        toolResults: [{ toolCallId: `tool-${messageIndex}`, content: 'sample output '.repeat(700) }],
-        providerContinuation: {
-          reasoningParts: [{
-            text: 'reasoning',
-            providerOptions: { openai: { reasoningEncryptedContent: 'x'.repeat(256) } },
-          }],
-        },
-      } : {}),
-    })),
-  ));
-}
-
-for (const [count, activeMessages] of [[20, 6], [200, 6], [20, 200]]) {
-  test(`fitting history serializes only retained full sessions (${count} chats, ${activeMessages} active messages)`, async (t) => {
-    const { serializeSessionsForStorage } = await import('./aiStateSnapshots');
-    const sessions = freezeHistory(makePersistenceHistory(count, activeMessages));
-    const expected = sessions.slice(0, 50);
-    const expectedJson = JSON.stringify(expected);
-    const stringify = t.mock.method(JSON, 'stringify');
-
-    const result = serializeSessionsForStorage(sessions);
-
-    assert.equal(stringify.mock.callCount(), expected.length);
-    assert.equal(result.json, expectedJson);
-    assert.deepEqual(result.sessions, expected);
-    assert.equal(result.sessions[0], sessions[0]);
-  });
-}
-
-test('fit-first budget keeps string-length units and exact-fit replay data without mutating input', async () => {
-  const { serializeSessionsForStorage } = await import('./aiStateSnapshots');
-  const sessions = makePersistenceHistory(1);
-  sessions[0].messages[0].content = '\u4e2d\u6587\ud83d\ude00'.repeat(100);
-  freezeHistory(sessions);
-  const fullJson = JSON.stringify(sessions);
-  assert.ok(Buffer.byteLength(fullJson) > fullJson.length);
-  for (const budget of [fullJson.length, fullJson.length + 1]) {
-    assert.equal(serializeSessionsForStorage(sessions, budget).json, fullJson);
-  }
-  const overflow = serializeSessionsForStorage(sessions, fullJson.length - 1);
-  assert.ok(overflow.json.length < fullJson.length);
-  assert.equal(JSON.stringify(sessions), fullJson);
-});
-
-test('fit-first empty history preserves output even below the minimum array budget', async () => {
-  const { serializeSessionsForStorage } = await import('./aiStateSnapshots');
-  for (const budget of [0, 1, 2, 3]) {
-    assert.deepEqual(serializeSessionsForStorage([], budget), { json: '[]', sessions: [] });
-  }
-});
-
-test('synced storage bypasses fit-first pruning and non-quota failures still propagate', async (t) => {
-  const { writeSessionsForStorage } = await import('./aiStateSnapshots');
-  const sessions = freezeHistory(makePersistenceHistory(51, 201));
-  const read = t.mock.method(localStorageAdapter, 'read', () => ({ enabled: true }));
-  const write = t.mock.method(localStorageAdapter, 'write', () => false);
-  const writeString = t.mock.method(localStorageAdapter, 'writeString', () => true);
-  assert.equal(writeSessionsForStorage(sessions), false);
-  assert.equal(write.mock.callCount(), 1);
-  assert.equal(write.mock.calls[0].arguments[1], sessions);
-  assert.equal(writeString.mock.callCount(), 0);
-
-  read.mock.mockImplementation(() => ({ enabled: false }));
-  const error = new Error('non-quota storage failure');
-  writeString.mock.mockImplementation(() => { throw error; });
-  assert.throws(() => writeSessionsForStorage(sessions), candidate => candidate === error);
-  assert.equal(writeString.mock.callCount(), 1);
-});
-
-for (const [budget, expectedCalls] of [[128 * 1024, 160], [0, 161]]) {
-  test(`overflow reuses prepared full JSON at budget ${budget}`, async (t) => {
-    const { serializeSessionsForStorage } = await import('./aiStateSnapshots');
-    const sessions = freezeHistory(makePersistenceHistory(20));
-    const stringify = t.mock.method(JSON, 'stringify');
-    const result = serializeSessionsForStorage(sessions, budget);
-    // Same work as the original ladder: no second full-session serialization
-    // after the fit check, even when a last-resort degraded chat is needed.
-    assert.equal(stringify.mock.callCount(), expectedCalls);
-    assert.equal(result.sessions.length, budget === 0 ? 1 : 4);
-  });
-}

application/state/aiStateSnapshots.ts

@@ -363,30 +363,12 @@ export function serializeSessionsForStorage(
   sessions: AISession[],
   budgetBytes: number = MAX_SESSIONS_JSON_BYTES,
 ): { json: string; sessions: AISession[] } {
-  const prepared = pruneSessionsForStorage(sessions).map(rawSession => {
+  const serialized = pruneSessionsForStorage(sessions).map(rawSession => {
     // These messages are replaced by the durable summary before every later
     // request, so their replay ciphertext can never be used again. Remove it
     // before deciding whether the newest session deserves full protection;
     // otherwise dead metadata can evict other visible conversations.
     const session = stripCompactedEncryptedReasoningFromSession(rawSession);
-    return { session, json: JSON.stringify(session) };
-  });
-
-  // Check whether retained history fits before preparing degradation. Use
-  // the existing JSON string-length budget including array delimiters, and
-  // avoid preparing unused stripped messages and serializing payloads again.
-  const fullLength = 2 + prepared.reduce((total, entry) => total + entry.json.length, 0)
-    + Math.max(0, prepared.length - 1);
-  if (fullLength <= budgetBytes) {
-    return {
-      json: `[${prepared.map(entry => entry.json).join(',')}]`,
-      sessions: prepared.map(entry => entry.session),
-    };
-  }
-
-  // Reuse the full representation when the unchanged degradation ladder is
-  // needed, including on quota retries with a smaller budget.
-  const serialized = prepared.map(({ session, json }) => {
     const degradableMessages = session.messages.flatMap((message, index) => {
       const degradedMessage = stripEncryptedReasoningFromMessage(message);
       if (degradedMessage === message) return [];
@@ -397,6 +379,7 @@ export function serializeSessionsForStorage(
       }];
     });
     const strippedSession = stripEncryptedReasoningFromSession(session);
+    const json = JSON.stringify(session);
     return {
       session,
       json,

application/state/sessionLogActions.test.ts

@@ -1,82 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import { readFileSync } from 'node:fs';
-import { JSDOM } from 'jsdom';
-import { performSessionLogAction } from './sessionLogActions';
-import { STORAGE_KEY_SESSION_LOG_APPLICATION } from '../../infrastructure/config/storageKeys';
-
-test('session log actions resolve and flush the selected session, remember apps and reset to default', async () => {
-  const dom = new JSDOM('', { url: 'http://localhost' });
-  const previousWindow = Object.getOwnPropertyDescriptor(globalThis, 'window');
-  const previousStorage = Object.getOwnPropertyDescriptor(globalThis, 'localStorage');
-  Object.defineProperty(globalThis, 'window', { configurable: true, value: dom.window });
-  Object.defineProperty(globalThis, 'localStorage', { configurable: true, value: dom.window.localStorage });
-  const calls: unknown[][] = [];
-  let picked: { path: string; name: string } | null = { path: '/Applications/My Editor.app', name: 'My Editor' };
-  let available = true;
-  let failOpen = false;
-  const bridge = {
-    prepareSessionLog: async (payload: { sessionId: string }) => {
-      calls.push(['prepare', payload]);
-      return available ? { success: true, filePath: `/logs/${payload.sessionId}.html` }
-        : { success: false, error: 'No saved log for this session' };
-    },
-    revealSessionLog: async (payload: { sessionId: string }) => {
-      calls.push(['reveal', payload]);
-      return { success: true };
-    },
-    selectApplication: async () => { calls.push(['choose']); return picked; },
-    openWithApplication: async (file: string, app: string) => {
-      calls.push(['application', file, app]);
-      if (failOpen) throw new Error('Launch failed');
-      return true;
-    },
-    openWithSystemDefault: async (file: string) => { calls.push(['default', file]); return { success: true }; },
-  };
-  Object.assign(dom.window, { netcatty: bridge });
-  try {
-    await performSessionLogAction('first', 'open');
-    assert.deepEqual(calls.splice(0), [['prepare', { sessionId: 'first' }], ['default', '/logs/first.html']]);
-    await performSessionLogAction('second', 'chooseApplication');
-    assert.deepEqual(calls.splice(0), [
-      ['prepare', { sessionId: 'second' }], ['choose'], ['prepare', { sessionId: 'second' }],
-      ['application', '/logs/second.html', picked!.path],
-    ]);
-    assert.equal(JSON.parse(dom.window.localStorage.getItem(STORAGE_KEY_SESSION_LOG_APPLICATION)!).name, 'My Editor');
-    await performSessionLogAction('first', 'open');
-    assert.deepEqual(calls.splice(0), [['prepare', { sessionId: 'first' }], ['application', '/logs/first.html', picked!.path]]);
-    await performSessionLogAction('first', 'reveal');
-    assert.deepEqual(calls.splice(0), [['reveal', { sessionId: 'first' }]]);
-    await performSessionLogAction('first', 'systemDefault');
-    assert.equal(dom.window.localStorage.getItem(STORAGE_KEY_SESSION_LOG_APPLICATION), null);
-    calls.length = 0;
-    picked = null;
-    await performSessionLogAction('first', 'chooseApplication');
-    assert.deepEqual(calls.splice(0), [['prepare', { sessionId: 'first' }], ['choose']]);
-    available = false;
-    await assert.rejects(performSessionLogAction('missing', 'chooseApplication'), /No saved log/);
-    assert.deepEqual(calls.splice(0), [['prepare', { sessionId: 'missing' }]]);
-    available = true;
-    picked = { path: '/missing-editor', name: 'Missing' };
-    failOpen = true;
-    await assert.rejects(performSessionLogAction('first', 'chooseApplication'), /Launch failed/);
-    assert.equal(dom.window.localStorage.getItem(STORAGE_KEY_SESSION_LOG_APPLICATION), null);
-  } finally {
-    if (previousWindow) Object.defineProperty(globalThis, 'window', previousWindow);
-    else Reflect.deleteProperty(globalThis, 'window');
-    if (previousStorage) Object.defineProperty(globalThis, 'localStorage', previousStorage);
-    else Reflect.deleteProperty(globalThis, 'localStorage');
-    dom.window.close();
-  }
-});
-
-// The integration boundary must translate backend errors, including ordinary
-// Error instances. Raw filesystem/app-launch details belong only in diagnostics.
-test('terminal log action errors use the translated toast instead of raw backend text', () => {
-  const source = readFileSync(new URL('../../components/Terminal.tsx', import.meta.url), 'utf8');
-  const handler = source.slice(source.indexOf('  const handleSessionLogAction ='),
-    source.indexOf('  const handleToggleSessionLog ='));
-  assert.match(handler, /logger\.error\("\[Terminal\] Failed to open or reveal session log:", err\)/);
-  assert.match(handler, /toast\.error\(t\('terminal\.toolbar\.openSessionLogFailed'\)\)/);
-  assert.doesNotMatch(handler, /err\.message/);
-});

application/state/sessionLogActions.ts

@@ -1,48 +0,0 @@
-import { STORAGE_KEY_SESSION_LOG_APPLICATION } from '../../infrastructure/config/storageKeys';
-import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
-import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
-
-export type SessionLogAction = 'open' | 'reveal' | 'chooseApplication' | 'systemDefault';
-type LogApplication = { path: string; name: string };
-
-/** Resolve the session's actual log in its owning process before opening it. */
-export async function performSessionLogAction(sessionId: string, action: SessionLogAction): Promise<void> {
-  const bridge = netcattyBridge.get();
-  if (!bridge?.prepareSessionLog) throw new Error('Session log bridge unavailable');
-  if (action === 'reveal') {
-    const result = await bridge.revealSessionLog?.({ sessionId });
-    if (!result?.success) throw new Error(result?.error || 'Failed to reveal session log');
-    return;
-  }
-
-  // Check availability before presenting an application picker. Resolve again
-  // afterwards so any output received while the picker was open is flushed.
-  let result = await bridge.prepareSessionLog({ sessionId });
-  if (!result.success || !result.filePath) throw new Error(result.error || 'No saved log for this session');
-  let application = localStorageAdapter.read<LogApplication>(STORAGE_KEY_SESSION_LOG_APPLICATION);
-  if (action === 'chooseApplication') {
-    if (!bridge.selectApplication) throw new Error('Application picker unavailable');
-    application = await bridge.selectApplication();
-    if (!application) return;
-    result = await bridge.prepareSessionLog({ sessionId });
-    if (!result.success || !result.filePath) throw new Error(result.error || 'No saved log for this session');
-  } else if (action === 'systemDefault') {
-    application = null;
-  }
-
-  if (application?.path) {
-    if (!bridge.openWithApplication) throw new Error('Application opening unavailable');
-    const opened = await bridge.openWithApplication(result.filePath, application.path);
-    if (!opened) throw new Error('Failed to open session log');
-  } else {
-    const opened = await bridge.openWithSystemDefault?.(result.filePath);
-    if (!opened?.success) throw new Error(opened?.error || 'Failed to open session log');
-  }
-  // Only remember a choice after a successful launch; failed launches leave
-  // the previous preference intact and can be retried or reset from the menu.
-  if (action === 'chooseApplication') {
-    localStorageAdapter.write(STORAGE_KEY_SESSION_LOG_APPLICATION, application);
-  } else if (action === 'systemDefault') {
-    localStorageAdapter.remove(STORAGE_KEY_SESSION_LOG_APPLICATION);
-  }
-}

application/state/sessionSnapshotStore.test.ts

@@ -102,10 +102,6 @@ test('session actions register and unregister', () => {
     reorderTabs: noop,
     toggleBroadcast: noop,
     isBroadcastEnabled: noop,
-    toggleComposeSendTarget: noop,
-    isComposeSendToAll: noop,
-    toggleGlobalComposeSendTarget: noop,
-    isGlobalComposeSendToAll: false,
     copySession: noop,
     copyWorkspace: noop,
     createSessionFromCloneSource: noop,

application/state/sessionSnapshotStore.ts

@@ -68,12 +68,8 @@ export type SessionSnapshotActions = Pick<
   | 'reorderTabs'
   | 'toggleBroadcast'
   | 'isBroadcastEnabled'
-  | 'toggleComposeSendTarget'
-  | 'isComposeSendToAll'
   | 'toggleGlobalBroadcast'
   | 'isGlobalBroadcastEnabled'
-  | 'toggleGlobalComposeSendTarget'
-  | 'isGlobalComposeSendToAll'
   | 'canUseGlobalBroadcast'
   | 'copySession'
   | 'copyWorkspace'

application/state/sftp/retryFromCheckpoint.test.ts

@@ -1,38 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import type { TransferTask } from "../../../domain/models";
-import { canRetryFromCheckpoint } from "./retryFromCheckpoint";
-
-const failed = (over: Partial<TransferTask> = {}): TransferTask => ({
-  id: "t", fileName: "big.bin", sourcePath: "/l/big.bin", targetPath: "/r/big.bin",
-  sourceConnectionId: "local", targetConnectionId: "remote", direction: "upload",
-  status: "failed", totalBytes: 100, transferredBytes: 40, checkpointBytes: 40,
-  speed: 0, startTime: 1, isDirectory: false, error: "SFTP channel closed", ...over,
-});
-
-test("canRetryFromCheckpoint resumes the channel-loss forms the bridge already classifies", () => {
-  for (const error of [
-    "read ECONNABORTED",
-    "socket hang up",
-    "ERR_SFTP_CHANNEL_CLOSED",
-    "SFTP pipelined upload failed: socket hang up",
-    "client-socket",
-  ]) {
-    assert.equal(canRetryFromCheckpoint(failed({ error })), true, error);
-  }
-});
-
-test("canRetryFromCheckpoint only for a top-level file that lost its connection with progress", () => {
-  assert.equal(canRetryFromCheckpoint(failed()), true);
-  assert.equal(canRetryFromCheckpoint(failed({ error: "read ECONNRESET" })), true);
-  assert.equal(canRetryFromCheckpoint(failed({ checkpointBytes: 0 })), false, "nothing to resume");
-  assert.equal(canRetryFromCheckpoint(failed({ error: "Permission denied" })), false, "content errors restart");
-  assert.equal(canRetryFromCheckpoint(failed({ isDirectory: true })), false);
-  assert.equal(canRetryFromCheckpoint(failed({ parentTaskId: "dir" })), false);
-  assert.equal(canRetryFromCheckpoint(failed({ status: "cancelled" })), false);
-  assert.equal(canRetryFromCheckpoint(failed({ retryable: false })), false);
-  assert.equal(canRetryFromCheckpoint(failed({ direction: "download" })), false, "downloads keep the owner retry");
-  assert.equal(canRetryFromCheckpoint(failed({ direction: "remote-to-remote" })), false, "remote copies keep the owner retry");
-  assert.equal(canRetryFromCheckpoint(failed({ direction: "local-copy" })), false);
-  assert.equal(canRetryFromCheckpoint(undefined), false);
-});

application/state/sftp/retryFromCheckpoint.ts

@@ -1,29 +0,0 @@
-import type { TransferTask } from "../../../domain/models";
-
-// Failures that only mean "the SSH/SFTP connection went away". The staged
-// .part is intact up to the checkpoint, so Retry can continue from it instead
-// of restarting at byte 0 (which also strands the old stage on the server,
-// because the new attempt stages under a fresh transfer id).
-// Keep this identical to UPLOAD_PREFIX_SESSION_LOSS in transferBridge.cjs, and
-// cover every code or message isSftpChannelLossError already treats as channel
-// loss (including ECONNABORTED, socket hang up, ERR_SFTP_CHANNEL_CLOSED, and
-// client-socket). A miss here restarts at byte 0 and strands the .part.
-const SESSION_LOSS_ERROR = /SFTP (channel closed|session lost)|ERR_SFTP_CHANNEL_CLOSED|ECONNRESET|ECONNABORTED|EPIPE|Not connected|No response from server|Keepalive timeout|socket hang up|client-socket|connection (lost|closed|reset)/i;
-
-/**
- * True when Retry should resume the same task from its checkpoint.
- * Only local-to-remote uploads (`direction === "upload"`) do this. Downloads
- * and remote copies have no unfingerprinted stage to keep, so they stay on
- * the owner's fresh retry.
- */
-export function canRetryFromCheckpoint(task: TransferTask | undefined): boolean {
-  if (!task) return false;
-  return task.status === "failed"
-    && !task.isDirectory
-    && !task.parentTaskId
-    && task.retryable !== false
-    && !task.conflict
-    && task.direction === "upload"
-    && (task.checkpointBytes ?? 0) > 0
-    && SESSION_LOSS_ERROR.test(task.error ?? "");
-}

application/state/sftp/transferDirectoryOps.discovery.test.tsx

@@ -334,111 +334,6 @@ test("live directory download rejects a Windows backslash traversal entry", asyn
   }
 });
 
-test("a file batch that rejects mid-walk does not emit unhandledRejection", async () => {
-  const previousWindow = (globalThis as { window?: unknown }).window;
-  const previousLocalStorage = (globalThis as { localStorage?: unknown }).localStorage;
-  const previousActEnvironment = (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT;
-  (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
-
-  const root = {
-    ...rootTask(),
-    targetPath: "C:\\Users\\alice\\Downloads\\folder",
-  };
-  let tasks: TransferTask[] = [root];
-  const transfersRef = { current: tasks };
-  const setTransfers = (update: React.SetStateAction<TransferTask[]>) => {
-    tasks = typeof update === "function" ? update(tasks) : update;
-    transfersRef.current = tasks;
-  };
-  let releaseLater!: () => void;
-  const laterGate = new Promise<void>((resolve) => {
-    releaseLater = resolve;
-  });
-  let laterListingStarted!: () => void;
-  const laterListing = new Promise<void>((resolve) => {
-    laterListingStarted = resolve;
-  });
-  (globalThis as { window?: unknown }).window = {
-    netcatty: {
-      mkdirLocal: async () => undefined,
-      statLocal: async () => ({ type: "directory" }),
-    },
-  };
-  (globalThis as { localStorage?: unknown }).localStorage = {
-    getItem: () => null,
-    setItem: () => undefined,
-    removeItem: () => undefined,
-  };
-
-  let operations: ReturnType<typeof useSftpDirectoryTransferOps> | undefined;
-  let renderer: ReactTestRenderer | null = null;
-  const Probe = () => {
-    operations = useSftpDirectoryTransferOps({
-      ownerId: "owner",
-      cancelledTasksRef: { current: new Set() },
-      pausedTasksRef: { current: new Set() },
-      waitUntilTransferResumed: async () => undefined,
-      activeChildIdsRef: { current: new Map() },
-      transfersRef,
-      setTransfers,
-      listLocalFiles: async () => [],
-      listRemoteFiles: async (_sftpId: string, path: string) => {
-        if (path === "/source") return [directoryEntry("bad"), directoryEntry("later")];
-        if (path === "/source/bad") return [fileEntry("..\\outside.txt")];
-        laterListingStarted();
-        await laterGate;
-        return [];
-      },
-    });
-    return null;
-  };
-  const unhandled: unknown[] = [];
-  const onUnhandled = (reason: unknown) => {
-    unhandled.push(reason);
-  };
-  const rejectionText = (reason: unknown) => (
-    reason instanceof Error ? reason.message : String(reason)
-  );
-  process.on("unhandledRejection", onUnhandled);
-
-  let running: Promise<number> | undefined;
-  try {
-    await act(async () => {
-      renderer = create(React.createElement(Probe));
-    });
-    assert.ok(operations);
-    running = operations.transferDirectory(
-      root,
-      "source-sftp",
-      null,
-      false,
-      true,
-      "auto",
-      "auto",
-      root.id,
-    );
-    await laterListing;
-    // The bad directory's batch is already queued. End this turn while the
-    // sibling listing is still blocked so an unhandled rejection can surface.
-    await new Promise((resolve) => setImmediate(resolve));
-    assert.deepEqual(unhandled.map(rejectionText), []);
-    releaseLater();
-    await assert.rejects(running, /unsafe transfer path/i);
-    await new Promise((resolve) => setImmediate(resolve));
-    assert.deepEqual(unhandled.map(rejectionText), []);
-  } finally {
-    releaseLater();
-    await running?.catch(() => {});
-    process.off("unhandledRejection", onUnhandled);
-    await act(async () => {
-      renderer?.unmount();
-    });
-    (globalThis as { window?: unknown }).window = previousWindow;
-    (globalThis as { localStorage?: unknown }).localStorage = previousLocalStorage;
-    (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
-  }
-});
-
 for (const ownerChange of ["same", "changed-active", "changed-completed"] as const) {
 test(`live folder settles superseded ownership without clobbering its replacement: ${ownerChange}`, async () => {
   const { sftpTransferCenterStore } = await import("../sftpTransferCenterStore");

application/state/sftp/transferDirectoryOps.ts

@@ -23,7 +23,6 @@ import {
   DEFAULT_SFTP_DIRECTORY_LISTING_CONCURRENCY,
   resolveSftpDirectoryListingConcurrency,
   resolveSftpSkipUnchangedEnabled,
-  resolveSftpTransferConcurrency,
   runSftpTransferWorkers,
 } from "./transferConcurrency";
 import { getSftpTransferResourceKeys, globalSftpTransferScheduler } from "./globalTransferScheduler";
@@ -79,30 +78,11 @@ function createDirectoryListingGate(concurrency = DEFAULT_SFTP_DIRECTORY_LISTING
   };
 }
 
-/** Observed at queue time so a mid-walk rejection is not unhandled. */
-type QueuedFileBatch =
-  | { ok: true; errors: number }
-  | { ok: false; error: unknown };
-
 type DirectoryDiscoveryProgress = {
   discoveredFiles: number;
   nextEntryIndex: number;
   /** Tree-wide semaphore so nested parallel walks cannot multiply listings. */
   listingGate?: ReturnType<typeof createDirectoryListingGate>;
-  /**
-   * Tree-wide file-transfer gate (transfer concurrency setting). Each directory
-   * hands its files to workers that share this gate, and the walk does not wait
-   * for a directory's files before moving on, so there is no per-directory
-   * barrier: trees of many small directories keep N files in flight.
-   */
-  fileGate?: ReturnType<typeof createDirectoryListingGate>;
-  /**
-   * Per-directory file batches. Each promise is settled when queued; the root
-   * walk inspects the outcomes after discovery.
-   */
-  pendingFileBatches?: Promise<QueuedFileBatch>[];
-  /** First session loss seen by any batch; later batches stop claiming files. */
-  sessionLostError?: Error | null;
 };
 
 function isCancelledLocalOrGlobal(
@@ -547,7 +527,7 @@ export function useSftpDirectoryTransferOps({
   };
 
   /** Returns number of failed child file transfers */
-  const walkDirectory = async (
+  const transferDirectory = async (
     task: TransferTask,
     sourceSftpId: string | null,
     targetSftpId: string | null,
@@ -561,8 +541,7 @@ export function useSftpDirectoryTransferOps({
     followSymlinks = false, // Only true for downloadToLocal — uploads/copies treat symlinks as files
     discoveryProgress?: DirectoryDiscoveryProgress,
     traversalBudget?: SftpDirectoryTraversalBudget,
-    rootProgress?: DirectoryDiscoveryProgress,
-  ): Promise<number> => {
+  ) => {
     // Check if task or root task was cancelled before starting
     if (cancelledTasksRef.current.has(task.id) || cancelledTasksRef.current.has(rootTaskId)) {
       throw new Error("Transfer cancelled");
@@ -573,12 +552,11 @@ export function useSftpDirectoryTransferOps({
     // as soon as each directory is listed; compressed upload is a separate path.
     // UI should treat totalBytes as "discovered so far", not a fixed grand total.
     let totalErrors = 0;
-    const progress: DirectoryDiscoveryProgress = discoveryProgress ?? rootProgress ?? {
+    const progress = discoveryProgress ?? {
       discoveredFiles: 0,
       nextEntryIndex: 0,
       listingGate: createDirectoryListingGate(resolveSftpDirectoryListingConcurrency()),
     };
-    if (!progress.pendingFileBatches) progress.pendingFileBatches = [];
     if (!progress.listingGate) {
       progress.listingGate = createDirectoryListingGate(resolveSftpDirectoryListingConcurrency());
     }
@@ -706,7 +684,7 @@ export function useSftpDirectoryTransferOps({
         };
 
         const isSymlink = dir.type === "symlink";
-        totalErrors += await walkDirectory(
+        totalErrors += await transferDirectory(
           childTask,
           sourceSftpId,
           targetSftpId,
@@ -743,21 +721,11 @@ export function useSftpDirectoryTransferOps({
       let sessionLostError: Error | null = null;
       const directoryEntryBase = progress.nextEntryIndex;
       progress.nextEntryIndex += regularFiles.length;
-      const directoryFiles = regularFiles;
-      if (!progress.fileGate) {
-        // Same setting runSftpTransferWorkers reads, created on first file.
-        progress.fileGate = createDirectoryListingGate(resolveSftpTransferConcurrency(
-          () => localStorageAdapter.readNumber(STORAGE_KEY_SFTP_TRANSFER_CONCURRENCY),
-        ));
-      }
-      const fileGate = progress.fileGate;
 
-      const fileBatch = (async (): Promise<number> => {
       await runSftpTransferWorkers(
-        directoryFiles,
+        regularFiles,
         () => localStorageAdapter.readNumber(STORAGE_KEY_SFTP_TRANSFER_CONCURRENCY),
-        async (file, fileIndex) => fileGate.run(async () => {
-          if (!sessionLostError && progress.sessionLostError) sessionLostError = progress.sessionLostError;
+        async (file, fileIndex) => {
           if (sessionLostError) throw sessionLostError;
           if (cancelledTasksRef.current.has(task.id) || cancelledTasksRef.current.has(rootTaskId)) {
             throw new Error("Transfer cancelled");
@@ -1025,7 +993,6 @@ export function useSftpDirectoryTransferOps({
             );
             if (isSessionError(err) && !sessionLostError) {
               sessionLostError = err instanceof Error ? err : new Error(message);
-              progress.sessionLostError = progress.sessionLostError ?? sessionLostError;
               // Fail remaining queued siblings quickly with a clear cause.
               setTransfers((prev) => prev.map((t) => (
                 t.parentTaskId === rootTaskId
@@ -1048,10 +1015,10 @@ export function useSftpDirectoryTransferOps({
               await waitWhileTransferPaused(rootTaskId);
             }
           }
-        }),
+        },
         {
           beforeClaim: async () => {
-            if (sessionLostError || progress.sessionLostError) return;
+            if (sessionLostError) return;
             await waitWhileTransferPaused(rootTaskId);
           },
         },
@@ -1063,69 +1030,17 @@ export function useSftpDirectoryTransferOps({
         throw err;
       });
 
+      totalErrors += errors.length;
       if (sessionLostError) {
         logger.warn("[SFTP] Directory transfer stopped early: session lost", sessionLostError.message);
       } else if (errors.length > 0) {
         logger.debug?.("[SFTP] Some files in directory transfer failed", errors);
       }
-      return errors.length;
-      })();
-      // Do not wait here: the walk continues into sibling directories while
-      // this directory's files drain through the shared fileGate. Settle the
-      // batch now so a failure during that walk (unsafe filename, unexpected
-      // worker error) is handled. The root drain still surfaces the error.
-      progress.pendingFileBatches.push(fileBatch.then(
-        (errors): QueuedFileBatch => ({ ok: true, errors }),
-        (error: unknown): QueuedFileBatch => ({ ok: false, error }),
-      ));
     }
 
     return totalErrors;
   };
 
-  const transferDirectory = async (
-    ...args: Parameters<typeof walkDirectory>
-  ): Promise<number> => {
-    const [, , , , , , , , , , , discoveryProgress, traversalBudget] = args;
-    if (discoveryProgress) return walkDirectory(...args);
-    // Root of a folder task: own the tree-wide progress so we can drain every
-    // directory's file batch, even when the walk itself throws, before the
-    // caller decides the folder's final state.
-    const rootProgress: DirectoryDiscoveryProgress = {
-      discoveredFiles: 0,
-      nextEntryIndex: 0,
-      listingGate: createDirectoryListingGate(resolveSftpDirectoryListingConcurrency()),
-      pendingFileBatches: [],
-    };
-    let walkErrors = 0;
-    let walkError: unknown = null;
-    try {
-      const [task, sourceSftpId, targetSftpId, sourceIsLocal, targetIsLocal, sourceEncoding,
-        targetEncoding, rootTaskId, sameHost, symlinkDepth, followSymlinks] = args;
-      walkErrors = await walkDirectory(
-        task, sourceSftpId, targetSftpId, sourceIsLocal, targetIsLocal, sourceEncoding,
-        targetEncoding, rootTaskId, sameHost, symlinkDepth, followSymlinks,
-        undefined, traversalBudget, rootProgress,
-      );
-    } catch (error) {
-      walkError = error;
-    }
-    let fileErrors = 0;
-    let batchError: unknown = null;
-    const batches = rootProgress.pendingFileBatches!;
-    for (let index = 0; index < batches.length; index += 1) {
-      const outcome = await batches[index];
-      if (outcome.ok) {
-        fileErrors += outcome.errors;
-      } else {
-        batchError = batchError ?? outcome.error;
-      }
-    }
-    if (walkError) throw walkError;
-    if (batchError) throw batchError;
-    return walkErrors + fileErrors;
-  };
-
 
   return { transferFile, transferDirectory };
 }

application/state/sftp/useSftpTransfers.lifecycleFlush.test.tsx

@@ -1,226 +0,0 @@
-/** @test lifecycle repaints coalesce to one frame and still settle the final status */
-import assert from "node:assert/strict";
-import test from "node:test";
-import React from "react";
-import { act, create, type ReactTestRenderer } from "react-test-renderer";
-
-import type { TransferTask } from "../../../domain/models";
-import { sftpTransferCenterStore } from "../sftpTransferCenterStore";
-import { latchTransferPauseTree, releaseTransferPauseTree } from "./transferPauseLatch";
-import { useSftpTransfers } from "./useSftpTransfers";
-
-type Frame = { id: number; callback: (time: number) => void; cancelled: boolean };
-
-function installFrameQueue() {
-  const previousWindow = (globalThis as { window?: unknown }).window;
-  const previousActFlag = (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT;
-  (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
-  const frames: Frame[] = [];
-  let nextId = 1;
-  const requestAnimationFrame = (callback: (time: number) => void) => {
-    const frame: Frame = { id: nextId++, callback, cancelled: false };
-    frames.push(frame);
-    return frame.id;
-  };
-  const cancelAnimationFrame = (id: number) => {
-    const frame = frames.find((candidate) => candidate.id === id);
-    if (frame) frame.cancelled = true;
-  };
-  (globalThis as { window?: unknown }).window = {
-    netcatty: {},
-    requestAnimationFrame,
-    cancelAnimationFrame,
-  };
-  return {
-    frames,
-    flush: async () => {
-      const pending = frames.splice(0, frames.length).filter((frame) => !frame.cancelled);
-      await act(async () => {
-        for (const frame of pending) frame.callback(0);
-      });
-      return pending.length;
-    },
-    restore: () => {
-      (globalThis as { window?: unknown }).window = previousWindow;
-      (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = previousActFlag;
-    },
-  };
-}
-
-function makeTask(id: string, status: TransferTask["status"], error?: string): TransferTask {
-  return {
-    id,
-    fileName: `${id}.txt`,
-    sourcePath: `/source/${id}.txt`,
-    targetPath: `/target/${id}.txt`,
-    sourceConnectionId: "local",
-    targetConnectionId: "remote",
-    direction: "upload",
-    status,
-    error,
-    totalBytes: 10,
-    transferredBytes: status === "completed" ? 10 : 2,
-    speed: status === "transferring" ? 1 : 0,
-    startTime: 1,
-    isDirectory: false,
-    resumable: true,
-  };
-}
-
-function mount(ownerId: string) {
-  let ops: ReturnType<typeof useSftpTransfers> | undefined;
-  let renderer: ReactTestRenderer | undefined;
-  function Probe() {
-    ops = useSftpTransfers({
-      ownerId,
-      getActivePane: () => null,
-      getPaneByConnectionId: () => null,
-      getTabByConnectionId: () => null,
-      updateTab: () => undefined,
-      refresh: async () => undefined,
-      clearCacheForConnection: () => undefined,
-      handleSessionError: () => undefined,
-      sftpSessionsRef: { current: new Map() },
-      connectionCacheKeyMapRef: { current: new Map() },
-      listLocalFiles: async () => [],
-      listRemoteFiles: async () => [],
-    });
-    return null;
-  }
-  return {
-    get ops() {
-      return ops;
-    },
-    render: async () => {
-      await act(async () => { renderer = create(React.createElement(Probe)); });
-    },
-    unmount: async () => {
-      await act(async () => { renderer?.unmount(); });
-      renderer = undefined;
-    },
-  };
-}
-
-test("lifecycle frames keep the final completion, pause, cancel, and error status", async () => {
-  const ownerId = "lifecycle-flush-final-status";
-  const queue = installFrameQueue();
-  const view = mount(ownerId);
-  const taskId = "lifecycle-row";
-  try {
-    await view.render();
-    const stages: Array<{ status: TransferTask["status"]; error?: string }> = [
-      { status: "transferring" },
-      { status: "paused" },
-      { status: "cancelled" },
-      { status: "failed", error: "connection reset" },
-      { status: "completed" },
-    ];
-    for (const stage of stages) {
-      await act(async () => {
-        sftpTransferCenterStore.publishOwner(ownerId, [makeTask(taskId, stage.status, stage.error)]);
-      });
-      const paintsNow = stage.status !== "transferring";
-      if (paintsNow) {
-        assert.equal(queue.frames.filter((frame) => !frame.cancelled).length, 0);
-      } else {
-        assert.notEqual(view.ops?.transfers.find((row) => row.id === taskId)?.status, stage.status);
-        assert.equal(queue.frames.filter((frame) => !frame.cancelled).length, 1);
-        assert.equal(await queue.flush(), 1);
-      }
-      const painted = view.ops?.transfers.find((row) => row.id === taskId);
-      assert.equal(painted?.status, stage.status);
-      assert.equal(painted?.error, stage.error);
-      assert.equal(
-        sftpTransferCenterStore.getOwnerTasks(ownerId).find((row) => row.id === taskId)?.status,
-        stage.status,
-      );
-    }
-  } finally {
-    sftpTransferCenterStore.dismiss(taskId);
-    await view.unmount();
-    queue.restore();
-  }
-});
-
-test("parent pause paints while a child frame is pending and a stale publish cannot reopen it", async () => {
-  const ownerId = "lifecycle-flush-parent-pause";
-  const queue = installFrameQueue();
-  const view = mount(ownerId);
-  const parentId = "folder-parent";
-  const childId = "folder-child";
-  const parent = (status: TransferTask["status"]): TransferTask => ({
-    ...makeTask(parentId, status),
-    isDirectory: true,
-    progressMode: "files",
-    lifecycleEpoch: 4,
-  });
-  const child = (status: TransferTask["status"]): TransferTask => ({
-    ...makeTask(childId, status),
-    parentTaskId: parentId,
-    lifecycleEpoch: 4,
-  });
-  try {
-    await view.render();
-    sftpTransferCenterStore.publishOwner(ownerId, [parent("transferring"), child("transferring")]);
-    assert.equal(view.ops?.transfers.length, 0, "child lifecycle churn stays on the pending frame");
-    assert.equal(queue.frames.filter((frame) => !frame.cancelled).length, 1);
-
-    // Pause lands while that frame is still queued. Latch afterwards: the
-    // control-epoch guard drops a panel publish that arrives already latched,
-    // and Resume is the equal-epoch republish that happens only after unlatch.
-    await act(async () => {
-      sftpTransferCenterStore.publishOwner(ownerId, [parent("paused"), child("paused")]);
-    });
-    assert.equal(view.ops?.transfers.find((row) => row.id === parentId)?.status, "paused");
-    assert.equal(view.ops?.transfers.find((row) => row.id === childId)?.status, "paused");
-    assert.equal(queue.frames.filter((frame) => !frame.cancelled).length, 0, "pause cancels the pre-pause frame");
-
-    latchTransferPauseTree(parentId, [childId]);
-    await act(async () => {
-      sftpTransferCenterStore.publishOwner(ownerId, [parent("transferring"), child("paused")]);
-    });
-    await queue.flush();
-    assert.equal(sftpTransferCenterStore.getTask(parentId)?.status, "paused");
-    assert.equal(sftpTransferCenterStore.getTask(childId)?.status, "paused");
-    const paintedParent = view.ops?.transfers.find((row) => row.id === parentId);
-    assert.equal(paintedParent?.status, "paused");
-    assert.equal(
-      view.ops?.transfers.filter((row) => (
-        !row.parentTaskId && ["pending", "queued", "transferring", "pausing"].includes(row.status)
-      )).length,
-      0,
-    );
-  } finally {
-    releaseTransferPauseTree(parentId, [childId]);
-    sftpTransferCenterStore.dismiss(parentId);
-    await view.unmount();
-    queue.restore();
-  }
-});
-
-test("unmount cancels the pending lifecycle frame and remount reads the settled store row", async () => {
-  const ownerId = "lifecycle-flush-unmount";
-  const queue = installFrameQueue();
-  const view = mount(ownerId);
-  const taskId = "lifecycle-unmount-row";
-  try {
-    await view.render();
-    sftpTransferCenterStore.publishOwner(ownerId, [makeTask(taskId, "failed", "write failed")]);
-    assert.equal(view.ops?.transfers.length, 0);
-    assert.equal(queue.frames.filter((frame) => !frame.cancelled).length, 1);
-
-    await view.unmount();
-    assert.equal(queue.frames.filter((frame) => !frame.cancelled).length, 0);
-    assert.equal(await queue.flush(), 0);
-
-    await view.render();
-    const painted = view.ops?.transfers.find((row) => row.id === taskId);
-    assert.equal(painted?.status, "failed");
-    assert.equal(painted?.error, "write failed");
-    assert.equal(queue.frames.filter((frame) => !frame.cancelled).length, 0);
-  } finally {
-    sftpTransferCenterStore.dismiss(taskId);
-    await view.unmount();
-    queue.restore();
-  }
-});

application/state/sftp/useSftpTransfers.transferPlan.test.tsx

@@ -440,9 +440,6 @@ test("stat-less remote source keeps the listing size in the overwrite dialog and
         "left",
         "right",
       );
-      // Lifecycle paints coalesce to one frame. The plan lives on the ref
-      // immediately; React state catches up on the queued animation frame.
-      await new Promise((resolve) => setTimeout(resolve, 0));
     });
 
     assert.equal(started.length, 0, "an unresolved conflict must not start the transfer");

application/state/sftp/useSftpTransfers.ts

@@ -34,7 +34,6 @@ import {
   resolveDirectDirectoryDownloadFinalStatus,
 } from "./downloadTransferTask";
 import {
-  isTransferOrRootPauseLatched,
   releaseTransferPauseTree,
   waitUntilTransferPauseReleased,
 } from "./transferPauseLatch";
@@ -159,89 +158,6 @@ export function finishTransferTask(
   return status;
 }
 
-const STICKY_CONTROL_STATUSES = new Set<TransferStatus>([
-  "paused",
-  "pausing",
-  "cancelled",
-  "completed",
-  "failed",
-  "interrupted",
-  "attention",
-]);
-
-const LIVE_QUEUE_STATUSES = new Set<TransferStatus>([
-  "transferring",
-  "pending",
-  "queued",
-]);
-
-/**
- * Pause, resume, and cancel paint on the same turn. Per-file complete/queue
- * churn stays on the animation frame so a folder upload does not commit once
- * per child.
- */
-export function shouldPaintTransferControlNow(
-  previous: readonly TransferTask[],
-  next: readonly TransferTask[],
-): boolean {
-  const prevById = new Map(previous.map((row) => [row.id, row]));
-  return next.some((row) => {
-    const prevRow = prevById.get(row.id);
-    if (prevRow?.status === row.status) return false;
-    if (row.status === "paused" || row.status === "pausing" || row.status === "cancelled") return true;
-    if (prevRow && (prevRow.status === "paused" || prevRow.status === "pausing" || prevRow.status === "cancelled")) {
-      return true;
-    }
-    if (
-      !row.parentTaskId
-      && prevRow
-      && (STICKY_CONTROL_STATUSES.has(row.status) || STICKY_CONTROL_STATUSES.has(prevRow.status))
-    ) {
-      return true;
-    }
-    return false;
-  });
-}
-
-/**
- * Child lifecycle updates clone the ref they saw. If that clone still says the
- * folder is transferring after the store already paused it, publishing the
- * clone reopens the parent. An explicit status edit (resume, retry) is kept.
- */
-export function reconcilePanelRowsWithStore(
-  previous: readonly TransferTask[],
-  next: readonly TransferTask[],
-  storeRows: readonly TransferTask[],
-): TransferTask[] {
-  const prevById = new Map(previous.map((row) => [row.id, row]));
-  const storeById = new Map(storeRows.map((row) => [row.id, row]));
-  let changed = false;
-  const reconciled = next.map((row) => {
-    const storeRow = storeById.get(row.id);
-    const prevRow = prevById.get(row.id);
-    if (!storeRow || !STICKY_CONTROL_STATUSES.has(storeRow.status) || !LIVE_QUEUE_STATUSES.has(row.status)) {
-      return row;
-    }
-    // A full-list write can disagree with the ref only because the ref already
-    // moved to the store's pause. That is a stale snapshot, not Resume.
-    // Resume releases the latch before it republishes transferring.
-    const rootId = row.parentTaskId ?? row.id;
-    const latchedReopen = isTransferOrRootPauseLatched(rootId, row.id);
-    if (prevRow && prevRow.status !== row.status && !latchedReopen) return row;
-    if (row.status === storeRow.status) return row;
-    changed = true;
-    return {
-      ...row,
-      status: storeRow.status,
-      speed: 0,
-      error: storeRow.error,
-      endTime: storeRow.endTime,
-      pauseUnavailableReason: storeRow.pauseUnavailableReason,
-    };
-  });
-  return changed ? reconciled : next as TransferTask[];
-}
-
 /** User-facing path exclusivity notice (toast + logs). */
 function notifyPathConflict(
   existing: Pick<TransferTask, "fileName" | "status">,
@@ -321,85 +237,29 @@ export const useSftpTransfers = ({
   const transfersRef = useRef(transfers);
   const conflictsRef = useRef(conflicts);
   conflictsRef.current = conflicts;
+  // When the retained panel is re-opened, catch up React state from the ref that
+  // kept receiving progress while the surface was hidden.
+  useEffect(() => {
+    if (!surfaceVisible) return;
+    setTransfersState(transfersRef.current);
+  }, [surfaceVisible]);
+
   // Keep owner lifecycle changes in the global transfer store. Byte progress
   // arrives independently through the unified process-wide event stream.
   //
   // Do not pre-assign transfersRef before publishing the same array reference —
   // identity equality skips the store merge (avoids store↔listener loops).
-  // Lifecycle writers (child add/start/complete) fire several times per file.
-  // Repainting the whole SFTP view synchronously on each one saturates the
-  // renderer on folders with many small files, which then throttles the
-  // transfer itself. transfersRef/store stay authoritative; React state
-  // catches up once per frame, except pause/resume/cancel and folder terminal
-  // rows, which paint immediately.
-  //
-  // A frame queued for child churn must not commit a pre-pause ref after the
-  // store has already paused the parent. The flush re-reads the store, and a
-  // synchronous control paint bumps paintEpoch so that queued frame no-ops.
-  const stateFlushHandleRef = useRef<{ cancel: () => void } | null>(null);
-  const paintEpochRef = useRef(0);
-  const cancelScheduledTransferPaint = useCallback(() => {
-    stateFlushHandleRef.current?.cancel();
-    stateFlushHandleRef.current = null;
-  }, []);
-  const paintTransfersNow = useCallback((rows: TransferTask[]) => {
-    cancelScheduledTransferPaint();
-    paintEpochRef.current += 1;
-    transfersRef.current = rows;
-    setTransfersState(rows);
-  }, [cancelScheduledTransferPaint]);
-  const scheduleTransfersStateFlush = useCallback(() => {
-    if (stateFlushHandleRef.current) return;
-    const epochAtSchedule = paintEpochRef.current;
-    const flush = () => {
-      stateFlushHandleRef.current = null;
-      // A pause/resume/cancel/terminal paint landed after this frame was queued.
-      if (paintEpochRef.current !== epochAtSchedule) return;
-      const storeRows = sftpTransferCenterStore.getOwnerTasks(ownerId);
-      const painted = reconcilePanelRowsWithStore(transfersRef.current, transfersRef.current, storeRows);
-      paintEpochRef.current += 1;
-      transfersRef.current = painted;
-      setTransfersState(painted);
-    };
-    if (typeof window !== "undefined" && typeof window.requestAnimationFrame === "function") {
-      const id = window.requestAnimationFrame(flush);
-      stateFlushHandleRef.current = { cancel: () => window.cancelAnimationFrame(id) };
-    } else {
-      const id = setTimeout(flush, 16);
-      stateFlushHandleRef.current = { cancel: () => clearTimeout(id) };
-    }
-  }, [ownerId]);
-  useEffect(() => () => {
-    cancelScheduledTransferPaint();
-  }, [cancelScheduledTransferPaint]);
-  // When the retained panel is re-opened, catch up React state from the ref that
-  // kept receiving progress while the surface was hidden. Cancel any frame that
-  // was queued against the hidden snapshot so it cannot paint over this catch-up.
-  useEffect(() => {
-    if (!surfaceVisible) return;
-    paintTransfersNow(transfersRef.current);
-  }, [paintTransfersNow, surfaceVisible]);
   const setTransfers = useCallback((update: SetStateAction<TransferTask[]>) => {
     const prev = transfersRef.current;
     const next = typeof update === "function"
       ? (update as (value: TransferTask[]) => TransferTask[])(prev)
       : update;
     if (next === prev) return;
-    const reconciled = reconcilePanelRowsWithStore(
-      prev,
-      next,
-      sftpTransferCenterStore.getOwnerTasks(ownerId),
-    );
-    if (reconciled === prev) return;
-    sftpTransferCenterStore.publishOwner(ownerId, reconciled);
+    sftpTransferCenterStore.publishOwner(ownerId, next);
     const canonical = sftpTransferCenterStore.getOwnerTasks(ownerId);
-    if (shouldPaintTransferControlNow(prev, canonical)) {
-      paintTransfersNow(canonical);
-      return;
-    }
     transfersRef.current = canonical;
-    scheduleTransfersStateFlush();
-  }, [ownerId, paintTransfersNow, scheduleTransfersStateFlush]);
+    setTransfersState(canonical);
+  }, [ownerId]);
 
   // Coalesce progress-only patches to one paint per animation frame. Without
   // this, each stream tick maps the full transfer list + publishOwner + store
@@ -431,19 +291,9 @@ export const useSftpTransfers = ({
     const prevPending = pendingProgressByIdRef.current.get(taskId) || {};
     pendingProgressByIdRef.current.set(taskId, { ...prevPending, ...updates });
     // Keep ref hot for cancel/pause checks without waiting for paint.
-    // A byte tick that still says "transferring" must not reopen a latched pause.
-    transfersRef.current = transfersRef.current.map((row) => {
-      if (row.id !== taskId) return row;
-      const merged = { ...row, ...updates };
-      const latched = isTransferOrRootPauseLatched(row.parentTaskId ?? row.id, row.id);
-      if (
-        (latched || row.status === "paused" || row.status === "pausing")
-        && (updates.status === "transferring" || updates.status === "pending" || updates.status === "queued")
-      ) {
-        return { ...merged, status: row.status, speed: 0 };
-      }
-      return merged;
-    });
+    transfersRef.current = transfersRef.current.map((row) => (
+      row.id === taskId ? { ...row, ...updates } : row
+    ));
     scheduleProgressFlush();
   }, [scheduleProgressFlush]);
   useEffect(() => () => {
@@ -1222,9 +1072,8 @@ export const useSftpTransfers = ({
           const next = transfersRef.current.map((candidate) => (
             candidate.id === task.id ? canonicalTask : candidate
           ));
-          // Terminal rows used to setState directly and leave a child frame
-          // queued. That frame later painted the pre-terminal ref.
-          paintTransfersNow(next);
+          transfersRef.current = next;
+          setTransfersState(next);
         },
       );
 
@@ -2275,16 +2124,11 @@ export const useSftpTransfers = ({
   // panel list; byte-only ticks update refs without repainting the whole panel.
   useEffect(() => {
     return sftpTransferCenterStore.subscribe(() => {
-      const previous = transfersRef.current;
       const ownerRows = sftpTransferCenterStore.getSnapshot().tasks.filter((task) => task.ownerId === ownerId);
       transfersRef.current = ownerRows;
-      if (shouldPaintTransferControlNow(previous, ownerRows)) {
-        paintTransfersNow(ownerRows);
-        return;
-      }
-      scheduleTransfersStateFlush();
+      setTransfersState(ownerRows);
     });
-  }, [ownerId, paintTransfersNow, scheduleTransfersStateFlush]);
+  }, [ownerId]);
 
   useEffect(() => sftpTransferCenterStore.subscribeProgress(() => {
     const liveById = new Map(sftpTransferCenterStore.getSnapshot().tasks.map((task) => [task.id, task]));

application/state/sftpTransferCenterStore.test.ts

@@ -97,89 +97,6 @@ test("background-agent retry after restart uses fresh dedicated recovery instead
   assert.equal(store.getTask("background-retry")?.status, "completed");
 });
 
-for (const [label, error, expectResume] of [
-  ["dead channel", "SFTP channel closed", true],
-  ["lost session", "SFTP session lost. Please reconnect.", true],
-  ["aborted socket", "read ECONNABORTED", true],
-  ["hung up socket", "socket hang up", true],
-  ["closed channel code", "ERR_SFTP_CHANNEL_CLOSED", true],
-  ["client socket", "client-socket", true],
-  ["content failure", "Permission denied", false],
-] as const) {
-  test(`panel Retry after ${label} ${expectResume ? "resumes the same task from its checkpoint" : "keeps the restart-from-0 retry"}`, async () => {
-    const controllerRetries: string[] = [];
-    const dedicatedTasks: TransferTask[] = [];
-    const store = createSftpTransferCenterStore();
-    store.registerOwner("panel-a", {
-      pause: async () => {},
-      resume: async () => {},
-      cancel: async () => {},
-      retry: async (id) => { controllerRetries.push(id); },
-      prioritize: async () => {},
-      dismiss: () => {},
-    });
-    store.setDedicatedResumeHandler(async (task) => {
-      dedicatedTasks.push(task);
-      return { success: true };
-    });
-    store.publishOwner("panel-a", [{
-      ...makeTask("dropped", "failed"),
-      totalBytes: 100,
-      checkpointBytes: 37,
-      transferredBytes: 37,
-      error,
-      endTime: Date.now(),
-    }]);
-
-    await store.retry("dropped");
-
-    if (expectResume) {
-      assert.deepEqual(controllerRetries, [], "no fresh-id restart");
-      assert.equal(dedicatedTasks.length, 1);
-      assert.equal(dedicatedTasks[0]?.id, "dropped", "same id keeps the same staged .part");
-      assert.equal(dedicatedTasks[0]?.checkpointBytes, 37);
-      assert.equal(dedicatedTasks[0]?.reconnectRequired, true);
-    } else {
-      assert.deepEqual(controllerRetries, ["dropped"]);
-      assert.equal(dedicatedTasks.length, 0);
-    }
-  });
-}
-
-test("panel Retry after a dropped download or remote copy keeps the owner restart", async () => {
-  for (const direction of ["download", "remote-to-remote"] as const) {
-    const controllerRetries: string[] = [];
-    const dedicatedTasks: TransferTask[] = [];
-    const store = createSftpTransferCenterStore();
-    store.registerOwner("panel-a", {
-      pause: async () => {},
-      resume: async () => {},
-      cancel: async () => {},
-      retry: async (id) => { controllerRetries.push(id); },
-      prioritize: async () => {},
-      dismiss: () => {},
-    });
-    store.setDedicatedResumeHandler(async (task) => {
-      dedicatedTasks.push(task);
-      return { success: true };
-    });
-    store.publishOwner("panel-a", [{
-      ...makeTask("dropped", "failed"),
-      direction,
-      totalBytes: 100,
-      checkpointBytes: 37,
-      transferredBytes: 37,
-      error: "SFTP channel closed",
-      endTime: Date.now(),
-    }]);
-
-    await store.retry("dropped");
-
-    assert.deepEqual(controllerRetries, ["dropped"], direction);
-    assert.equal(dedicatedTasks.length, 0, direction);
-  }
-});
-
 test("resume without an owner uses a live backend transfer session when available", async (t) => {
   const resumeCalls: string[] = [];
   const previousWindow = Object.getOwnPropertyDescriptor(globalThis, "window");

application/state/sftpTransferCenterStore.ts

@@ -42,7 +42,6 @@ import {
 } from "./sftp/globalSftpTransferControl";
 import { restoreSftpTransferHistoryCooperatively } from "./sftp/transferHistoryRestoreMigration";
 import { cancelExternalUploadRuntime } from "./sftp/externalUploadRuntime";
-import { canRetryFromCheckpoint } from "./sftp/retryFromCheckpoint";
 
 type Listener = () => void;
 type TaskSettlementObserver = {
@@ -366,13 +365,9 @@ export function mergeOwnerPublishedTask(
     } else if (
       existingPaused
       && (incoming.status === "transferring" || incoming.status === "pending" || incoming.status === "queued")
-      // A strictly older epoch is a stale snapshot. Equal epochs are how Resume
-      // republishes after the latch drops. While the pause latch is still held,
-      // that republish is a pre-pause panel snapshot and must not reopen the row.
-      && (
-        incomingLifecycleEpoch < existingLifecycleEpoch
-        || isTransferOrRootPauseLatched(existing.parentTaskId ?? existing.id, existing.id)
-      )
+      // Only a strictly older epoch is a stale snapshot. Equal/missing epochs must
+      // allow intentional Resume (publishOwner after unlatch) to re-open the row.
+      && incomingLifecycleEpoch < existingLifecycleEpoch
     ) {
       // Soft-drain / late progress publish must not un-pause without resume epoch.
       merged.status = existing.status;
@@ -2057,24 +2052,6 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
       const controller = ownerId === "background-agent"
         ? undefined
         : controllers.get(ownerId ?? "");
-      // Live panel task whose connection dropped mid-file: the stage is valid
-      // up to the checkpoint. Continue through the reconnect-resume path a
-      // restored task uses (same id, so the same staged .part) instead of a
-      // fresh id from byte 0, which strands the old stage on the server.
-      // Orphaned rows (no live owner) keep the restart-from-0 contract below.
-      if (controller && canRetryFromCheckpoint(task)) {
-        tasks = tasks.map((candidate) => candidate.id === taskId ? {
-          ...candidate,
-          status: "interrupted" as const,
-          error: undefined,
-          reconnectRequired: true,
-          speed: 0,
-          endTime: undefined,
-        } : candidate);
-        emit();
-        await this.resume(taskId);
-        return;
-      }
       if (controller) {
         await controller.retry(taskId);
         return;

application/state/useHostBrowserPanel.test.ts

@@ -125,55 +125,6 @@ test('overlapping nonmodal menus yield with a picture; modal dialogs yield even
   await f.tick(); assert.equal(f.layouts.at(-1)?.occluded, true);
 });
 
-function panel(f: Awaited<ReturnType<typeof fixture>>, x: number, y: number, width: number, height: number) {
-  const node = f.overlay('<div data-section="app-host-editor-layer"><div data-native-view-occluder></div></div>').firstElementChild!;
-  node.getBoundingClientRect = () => new f.env.window.DOMRect(x, y, width, height);
-  return node;
-}
-
-test('an overlay host editor panel narrows the live page beside it, then restores the pane', async (t) => {
-  const f = await fixture(t);
-  panel(f, 900, 0, 400, 900); await f.tick();
-  assert.deepEqual(f.layouts.at(-1)?.bounds, { x: 200, y: 100, width: 500, height: 600 }, 'a panel beside the pane changes nothing');
-  const editor = panel(f, 450, 0, 600, 900); await f.tick();
-  assert.equal(f.layouts.at(-1)?.visible, true);
-  assert.equal(f.layouts.at(-1)?.occluded, false, 'the page stays live instead of becoming a picture');
-  assert.deepEqual(f.layouts.at(-1)?.bounds, { x: 200, y: 100, width: 250, height: 600 });
-  assert.deepEqual(f.panel().snapshot, []);
-  editor.getBoundingClientRect = () => new f.env.window.DOMRect(400, 0, 650, 900);
-  f.resize(); await f.tick();
-  assert.deepEqual(f.layouts.at(-1)?.bounds, { x: 200, y: 100, width: 200, height: 600 }, 'resizing the panel follows it');
-  editor.parentElement!.remove(); await f.tick();
-  assert.deepEqual(f.layouts.at(-1)?.bounds, { x: 200, y: 100, width: 500, height: 600 });
-  assert.equal(f.layouts.at(-1)?.occluded, false);
-});
-
-test('a popper inside the panel leaves the narrowed page live; one over the page keeps aligned pictures', async (t) => {
-  const f = await fixture(t);
-  panel(f, 0, 0, 300, 900); await f.tick();
-  assert.deepEqual(f.layouts.at(-1)?.bounds, { x: 300, y: 100, width: 400, height: 600 });
-  const select = f.overlay(tooltip, 140, 110); await f.tick();
-  assert.equal(f.layouts.at(-1)?.occluded, false, 'a select inside the left panel does not reach the page');
-  select.remove();
-  f.overlay(tooltip, 320, 110); await f.tick();
-  assert.equal(f.layouts.at(-1)?.occluded, true);
-  assert.deepEqual(f.layouts.at(-1)?.bounds, { x: 300, y: 100, width: 400, height: 600 });
-  assert.deepEqual(f.panel().snapshot.map((layer) => layer.bounds), [{ x: 100, y: 0, width: 500, height: 600 }],
-    'pictures are placed where the narrowed page sits inside the pane');
-});
-
-test('a panel over the middle of the pane or leaving too little room falls back to a picture', async (t) => {
-  const f = await fixture(t);
-  const middle = panel(f, 300, 0, 100, 900); await f.tick();
-  assert.equal(f.layouts.at(-1)?.occluded, true);
-  assert.deepEqual(f.layouts.at(-1)?.bounds, { x: 200, y: 100, width: 500, height: 600 });
-  assert.deepEqual(f.panel().snapshot, layers);
-  middle.parentElement!.remove(); await f.tick();
-  assert.equal(f.layouts.at(-1)?.occluded, false);
-  panel(f, 250, 0, 600, 900); await f.tick();
-  assert.equal(f.layouts.at(-1)?.occluded, true, 'a 50px strip is not worth a live page');
-});
-
 test('closing a menu while capture is pending cannot restore stale pictures', async (t) => {
   const f = await fixture(t);
   let complete: (result: Result) => void = () => assert.fail('capture was not started');

application/state/useHostBrowserPanel.ts

@@ -1,17 +1,16 @@
 import { useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { currentBrowserThemeTokens, mountHostBrowser } from '../hostBrowser';
-import { resolveHostBrowserPaneBesidePanels, type HostBrowserPaneRect } from '../../domain/hostBrowser';
 import type { Host, Identity, KnownHost, SSHKey, TerminalSettings } from '../../domain/models';
 import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
 import type { HostBrowserPanelSnapshotLayer } from '../../types/global/netcatty-bridge-sync';
 
-function overlapsBrowser(rect: HostBrowserPaneRect, element: Element): boolean {
+function overlapsBrowser(rect: DOMRect, element: Element): boolean {
   const style = getComputedStyle(element);
   if (style.display === 'none' || style.visibility === 'hidden' || element.closest('[hidden], [inert], [data-state="closed"]')) return false;
   const overlay = element.getBoundingClientRect();
   return overlay.width > 0 && overlay.height > 0
-    && overlay.x < rect.x + rect.width && overlay.right > rect.x
-    && overlay.y < rect.y + rect.height && overlay.bottom > rect.y;
+    && overlay.x < rect.right && overlay.right > rect.x
+    && overlay.y < rect.bottom && overlay.bottom > rect.y;
 }
 
 interface BrowserPanelOptions {
@@ -71,21 +70,12 @@ export function useHostBrowserPanel(options: BrowserPanelOptions) {
       const rect = element?.getBoundingClientRect();
       // Native views sit above renderer portals. Only overlapping poppers need
       // to yield; dialogs are modal even when their content is beside the pane.
-      // Overlay panels stay open while the user works, so the live page moves
-      // beside them when it can and only falls back to a picture otherwise.
       const locked = !!document.querySelector('[data-app-lock-overlay]');
       const modal = !!document.querySelector('[role="dialog"][aria-modal="true"], [role="alertdialog"]');
       const overlays = Array.from(document.querySelectorAll(
-        '[role="dialog"], [role="alertdialog"], [role="menu"][data-state="open"], [data-radix-popper-content-wrapper] > *, '
-        + '[data-native-view-occluder]',
+        '[role="dialog"], [role="alertdialog"], [role="menu"][data-state="open"], [data-radix-popper-content-wrapper] > *',
       ));
-      const isPanel = (overlay: Element) => overlay.matches('[data-native-view-occluder]');
-      const panels = rect ? overlays.filter((overlay) => isPanel(overlay) && overlapsBrowser(rect, overlay)) : [];
-      const live = rect && resolveHostBrowserPaneBesidePanels(rect, panels.map((panel) => panel.getBoundingClientRect()));
-      // Poppers over the part of the pane hidden behind a panel (e.g. a select
-      // inside the host editor) no longer touch the live page.
-      const covered = modal || (!!rect && !live)
-        || (!!live && overlays.some((overlay) => !isPanel(overlay) && overlapsBrowser(live, overlay)));
+      const covered = modal || (!!rect && overlays.some((overlay) => overlapsBrowser(rect, overlay)));
       const targets = new Set<Element>(overlays);
       for (let target: Element | null = element; target; target = target.parentElement) targets.add(target);
       for (const target of observed) {
@@ -100,11 +90,7 @@ export function useHostBrowserPanel(options: BrowserPanelOptions) {
       const visible = isVisible && !!element?.isConnected && !!rect
         && rect.width > 0 && rect.height > 0 && !element?.closest('[inert]') && !locked;
       if (!visible) setSnapshot(null);
-      const pane = live || rect;
-      const bounds = pane ? { x: pane.x, y: pane.y, width: pane.width, height: pane.height } : undefined;
-      // Pictures are relative to the native page, which may sit beside a panel.
-      const offsetX = rect && bounds ? bounds.x - rect.x : 0;
-      const offsetY = rect && bounds ? bounds.y - rect.y : 0;
+      const bounds = rect ? { x: rect.x, y: rect.y, width: rect.width, height: rect.height } : undefined;
       const theme = element && getComputedStyle(element).colorScheme === 'light' ? 'light' : 'dark';
       const themeTokens = currentBrowserThemeTokens(element ?? undefined);
       const layout: Parameters<NonNullable<NetcattyBridge['setHostBrowserPanelLayout']>>[0] = {
@@ -116,9 +102,7 @@ export function useHostBrowserPanel(options: BrowserPanelOptions) {
         const revision = ++layoutRevision;
         void bridge?.setHostBrowserPanelLayout?.(layout).then((result) => {
           if (disposed || layoutRevision !== revision) return;
-          setSnapshot(visible && covered && typeof result === 'object' ? { browserId, layers: result.layers.map((layer) => ({
-            ...layer, bounds: { ...layer.bounds, x: layer.bounds.x + offsetX, y: layer.bounds.y + offsetY },
-          })) } : null);
+          setSnapshot(visible && covered && typeof result === 'object' ? { browserId, layers: result.layers } : null);
         }).catch(() => {});
       }
     };
@@ -135,15 +119,14 @@ export function useHostBrowserPanel(options: BrowserPanelOptions) {
     if (doc) mutationObserver?.observe(doc.documentElement, {
       subtree: true, childList: true, attributes: true,
       attributeFilter: ['style', 'class', 'hidden', 'inert', 'role', 'aria-modal', 'data-state',
-        'data-app-lock-overlay', 'data-radix-popper-content-wrapper', 'data-native-view-occluder',
-        'href', 'media', 'disabled'],
+        'data-app-lock-overlay', 'data-radix-popper-content-wrapper', 'href', 'media', 'disabled'],
     });
     const onMotion = (event: Event) => {
       const target = event.target;
       if (!element || !view || !(target instanceof view.Element)) return;
       if (!target.contains(element) && !target.matches(
         '[role="dialog"], [role="alertdialog"], [role="menu"], [data-app-lock-overlay], '
-        + '[data-radix-popper-content-wrapper], [data-radix-popper-content-wrapper] > *, [data-native-view-occluder]',
+        + '[data-radix-popper-content-wrapper], [data-radix-popper-content-wrapper] > *',
       )) return;
       trackAnimations(target);
       schedule();

application/state/useServerStats.ts

@@ -54,8 +54,6 @@ export interface ServerStats {
   swapTotal: number | null;     // Total swap in MB
   swapUsed: number | null;      // Used swap in MB
   topProcesses: ProcessInfo[];  // Top 10 processes by memory
-  diskReadSpeed?: number | null; // Aggregate Linux hardware-backed block I/O, bytes/sec
-  diskWriteSpeed?: number | null;
   diskPercent: number | null;   // Disk usage percentage for root partition
   diskUsed: number | null;      // Disk used in GB
   diskTotal: number | null;     // Total disk in GB
@@ -242,8 +240,6 @@ function normalizeServerStats(stats: Partial<ServerStats>): ServerStats {
     diskPercent: stats.diskPercent ?? null,
     diskUsed: stats.diskUsed ?? null,
     diskTotal: stats.diskTotal ?? null,
-    diskReadSpeed: stats.diskReadSpeed ?? null,
-    diskWriteSpeed: stats.diskWriteSpeed ?? null,
     disks: stats.disks || [],
     netRxSpeed: stats.netRxSpeed || 0,
     netTxSpeed: stats.netTxSpeed || 0,

application/state/useSessionLogBackend.ts

@@ -50,7 +50,7 @@ export const useSessionLogBackend = () => {
 
   const getManualSessionLogStatus = useCallback(async (payload: ManualStatusPayload) => {
     const bridge = netcattyBridge.get();
-    return bridge?.getManualSessionLogStatus?.(payload) ?? { success: false, isLogging: false, hasSessionLog: false, error: "Session log bridge unavailable" };
+    return bridge?.getManualSessionLogStatus?.(payload) ?? { success: false, isLogging: false, error: "Session log bridge unavailable" };
   }, []);
 
   return {

application/state/useSessionState.composeBroadcast.test.ts

@@ -1,139 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import React from "react";
-import { act, create, type ReactTestRenderer } from "react-test-renderer";
-
-import { useSessionState } from "./useSessionState.ts";
-
-type SessionState = ReturnType<typeof useSessionState>;
-
-test("compose send target follows toolbar broadcast and then flips independently", async () => {
-  const previousWindow = Object.getOwnPropertyDescriptor(globalThis, "window");
-  const eventTarget = new EventTarget() as EventTarget & Record<string, unknown>;
-  Object.assign(eventTarget, { setTimeout, clearTimeout });
-  Object.defineProperty(globalThis, "window", {
-    configurable: true,
-    value: eventTarget,
-  });
-  const actEnvironment = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };
-  const previousActEnvironment = actEnvironment.IS_REACT_ACT_ENVIRONMENT;
-  actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
-
-  let state: SessionState | null = null;
-  let renderer: ReactTestRenderer | null = null;
-  const current = (): SessionState => {
-    assert.ok(state);
-    return state;
-  };
-
-  function Probe() {
-    state = useSessionState({ persistSessionRestore: false });
-    return null;
-  }
-
-  try {
-    await act(async () => {
-      renderer = create(React.createElement(Probe));
-    });
-    await act(async () => { current().createLocalTerminal({ shellName: "01" }); });
-    await act(async () => { current().createLocalTerminal({ shellName: "02" }); });
-    const [first, second] = current().orphanSessions;
-    await act(async () => {
-      current().createWorkspaceFromSessions(first.id, second.id, "right");
-    });
-    const workspaceId = current().workspaces[0]?.id;
-    assert.ok(workspaceId);
-    assert.equal(current().isBroadcastEnabled(workspaceId), false);
-    assert.equal(current().isComposeSendToAll(workspaceId), false);
-
-    await act(async () => { current().toggleBroadcast(workspaceId); });
-    assert.equal(current().isBroadcastEnabled(workspaceId), true);
-    assert.equal(current().isComposeSendToAll(workspaceId), true);
-
-    await act(async () => { current().toggleComposeSendTarget(workspaceId); });
-    assert.equal(current().isBroadcastEnabled(workspaceId), true);
-    assert.equal(current().isComposeSendToAll(workspaceId), false);
-
-    await act(async () => { current().toggleComposeSendTarget(workspaceId); });
-    assert.equal(current().isComposeSendToAll(workspaceId), true);
-    assert.equal(current().isBroadcastEnabled(workspaceId), true);
-
-    await act(async () => { current().toggleBroadcast(workspaceId); });
-    assert.equal(current().isBroadcastEnabled(workspaceId), false);
-    assert.equal(current().isComposeSendToAll(workspaceId), false);
-
-    await act(async () => { current().toggleComposeSendTarget(workspaceId); });
-    assert.equal(current().isBroadcastEnabled(workspaceId), false);
-    assert.equal(current().isComposeSendToAll(workspaceId), true);
-
-    await act(async () => { current().toggleGlobalBroadcast(); });
-    assert.equal(current().isGlobalBroadcastEnabled, false);
-    assert.equal(current().isGlobalComposeSendToAll, false);
-    assert.equal(current().canUseGlobalBroadcast, false);
-  } finally {
-    await act(async () => { renderer?.unmount(); });
-    actEnvironment.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
-    if (previousWindow) Object.defineProperty(globalThis, "window", previousWindow);
-    else Reflect.deleteProperty(globalThis, "window");
-  }
-});
-
-test("global compose send target follows the toolbar switch for orphan sessions", async () => {
-  const previousWindow = Object.getOwnPropertyDescriptor(globalThis, "window");
-  const eventTarget = new EventTarget() as EventTarget & Record<string, unknown>;
-  Object.assign(eventTarget, { setTimeout, clearTimeout });
-  Object.defineProperty(globalThis, "window", {
-    configurable: true,
-    value: eventTarget,
-  });
-  const actEnvironment = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };
-  const previousActEnvironment = actEnvironment.IS_REACT_ACT_ENVIRONMENT;
-  actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
-
-  let state: SessionState | null = null;
-  let renderer: ReactTestRenderer | null = null;
-  const current = (): SessionState => {
-    assert.ok(state);
-    return state;
-  };
-
-  function Probe() {
-    state = useSessionState({ persistSessionRestore: false });
-    return null;
-  }
-
-  try {
-    await act(async () => {
-      renderer = create(React.createElement(Probe));
-    });
-    await act(async () => { current().createLocalTerminal({ shellName: "01" }); });
-    await act(async () => { current().createLocalTerminal({ shellName: "02" }); });
-    assert.equal(current().canUseGlobalBroadcast, true);
-    assert.equal(current().isGlobalComposeSendToAll, false);
-
-    await act(async () => { current().toggleGlobalBroadcast(); });
-    assert.equal(current().isGlobalBroadcastEnabled, true);
-    assert.equal(current().isGlobalComposeSendToAll, true);
-
-    await act(async () => { current().toggleGlobalComposeSendTarget(); });
-    assert.equal(current().isGlobalBroadcastEnabled, true);
-    assert.equal(current().isGlobalComposeSendToAll, false);
-
-    await act(async () => { current().toggleGlobalBroadcast(); });
-    assert.equal(current().isGlobalBroadcastEnabled, false);
-    assert.equal(current().isGlobalComposeSendToAll, false);
-
-    const closedId = current().orphanSessions[1].id;
-    await act(async () => { current().toggleGlobalComposeSendTarget(); });
-    assert.equal(current().isGlobalComposeSendToAll, true);
-    await act(async () => { current().closeSession(closedId); });
-    assert.equal(current().canUseGlobalBroadcast, false);
-    assert.equal(current().isGlobalBroadcastEnabled, false);
-    assert.equal(current().isGlobalComposeSendToAll, false);
-  } finally {
-    await act(async () => { renderer?.unmount(); });
-    actEnvironment.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
-    if (previousWindow) Object.defineProperty(globalThis, "window", previousWindow);
-    else Reflect.deleteProperty(globalThis, "window");
-  }
-});

application/state/useSessionState.ts

@@ -25,10 +25,6 @@ SplitHint,
 updateWorkspaceSplitSizes,
 } from '../../domain/workspace';
 import { clearSessionFontSizeOverride as clearSessionFontSizeOverrideFields } from '../../domain/terminalAppearance';
-import {
-  composeSendTargetAfterToolbarToggle,
-  flipComposeSendTarget,
-} from '../../domain/terminalBroadcast';
 import { buildOrderedWorkTabIds, reorderWorkTabIds } from '../app/workTabSurface';
 import { activeTabStore } from './activeTabStore';
 import {
@@ -239,12 +235,8 @@ export const useSessionState = ({
   const [tabOrder, setTabOrder] = useState<string[]>(initialRestoreState.tabOrder);
   // Broadcast mode: stores workspace IDs that have broadcast enabled
   const [broadcastWorkspaceIds, setBroadcastWorkspaceIds] = useState<Set<string>>(new Set());
-  // Compose-bar send target. Toolbar toggles reset it; the compose bar can
-  // then flip it without changing keystroke fan-out.
-  const [composeSendAllWorkspaceIds, setComposeSendAllWorkspaceIds] = useState<Set<string>>(new Set());
   // Global broadcast mode: enables broadcast for all orphan sessions (not in workspaces)
   const [globalBroadcastEnabled, setGlobalBroadcastEnabled] = useState<boolean>(false);
-  const [globalComposeSendToAll, setGlobalComposeSendToAll] = useState<boolean>(false);
   // Log views: stores open log replay tabs
   const [logViews, setLogViews] = useState<LogView[]>([]);
   const [restorePreviousSessionRevision, setRestorePreviousSessionRevision] = useState(0);
@@ -1145,10 +1137,8 @@ export const useSessionState = ({
   const canUseGlobalBroadcast = orphanSessions.length >= 2;
 
   // Losing the group must disarm broadcast before another tab can join it.
-  // Compose-bar send target follows the toolbar switch back to active-only.
-  if (!canUseGlobalBroadcast && (globalBroadcastEnabled || globalComposeSendToAll)) {
-    if (globalBroadcastEnabled) setGlobalBroadcastEnabled(false);
-    if (globalComposeSendToAll) setGlobalComposeSendToAll(false);
+  if (!canUseGlobalBroadcast && globalBroadcastEnabled) {
+    setGlobalBroadcastEnabled(false);
   }
 
   const openLogView = useCallback((log: ConnectionLog) => {
@@ -1283,61 +1273,31 @@ export const useSessionState = ({
     return newSessionId;
   }, [setActiveTabId]);
 
-  const setWorkspaceComposeSendTarget = useCallback((workspaceId: string, target: 'all' | 'active') => {
-    setComposeSendAllWorkspaceIds((prev) => {
-      const hasAll = prev.has(workspaceId);
-      if ((target === 'all') === hasAll) return prev;
+  // Toggle broadcast mode for a workspace
+  const toggleBroadcast = useCallback((workspaceId: string) => {
+    setBroadcastWorkspaceIds(prev => {
       const next = new Set(prev);
-      if (target === 'all') next.add(workspaceId);
-      else next.delete(workspaceId);
+      if (next.has(workspaceId)) {
+        next.delete(workspaceId);
+      } else {
+        next.add(workspaceId);
+      }
       return next;
     });
   }, []);
 
-  // Toggle broadcast mode for a workspace. Compose-bar send target follows.
-  const toggleBroadcast = useCallback((workspaceId: string) => {
-    const enabling = !broadcastWorkspaceIds.has(workspaceId);
-    setBroadcastWorkspaceIds(prev => {
-      const next = new Set(prev);
-      if (prev.has(workspaceId)) next.delete(workspaceId);
-      else next.add(workspaceId);
-      return next;
-    });
-    setWorkspaceComposeSendTarget(workspaceId, composeSendTargetAfterToolbarToggle(enabling));
-  }, [broadcastWorkspaceIds, setWorkspaceComposeSendTarget]);
-
   // Check if a workspace has broadcast enabled
   const isBroadcastEnabled = useCallback((workspaceId: string) => {
     return broadcastWorkspaceIds.has(workspaceId);
   }, [broadcastWorkspaceIds]);
 
-  const toggleComposeSendTarget = useCallback((workspaceId: string) => {
-    setWorkspaceComposeSendTarget(
-      workspaceId,
-      flipComposeSendTarget(composeSendAllWorkspaceIds.has(workspaceId) ? 'all' : 'active'),
-    );
-  }, [composeSendAllWorkspaceIds, setWorkspaceComposeSendTarget]);
-
-  const isComposeSendToAll = useCallback((workspaceId: string) => {
-    return composeSendAllWorkspaceIds.has(workspaceId);
-  }, [composeSendAllWorkspaceIds]);
-
   // Toggle global broadcast mode for orphan sessions
   const toggleGlobalBroadcast = useCallback(() => {
-    setGlobalBroadcastEnabled(prev => {
-      const next = !prev;
-      setGlobalComposeSendToAll(composeSendTargetAfterToolbarToggle(next) === 'all');
-      return next;
-    });
-  }, []);
-
-  const toggleGlobalComposeSendTarget = useCallback(() => {
-    setGlobalComposeSendToAll((prev) => flipComposeSendTarget(prev ? 'all' : 'active') === 'all');
+    setGlobalBroadcastEnabled(prev => !prev);
   }, []);
 
   // Global broadcast enabled state - direct boolean value
   const isGlobalBroadcastEnabled = globalBroadcastEnabled;
-  const isGlobalComposeSendToAll = globalComposeSendToAll;
 
   const baseWorkTabIds = useMemo(() => [
     ...orphanSessions.map(s => s.id),
@@ -1466,12 +1426,8 @@ export const useSessionState = ({
     // Broadcast mode
     toggleBroadcast,
     isBroadcastEnabled,
-    toggleComposeSendTarget,
-    isComposeSendToAll,
     toggleGlobalBroadcast,
     isGlobalBroadcastEnabled,
-    toggleGlobalComposeSendTarget,
-    isGlobalComposeSendToAll,
     orderedTabs,
     getOrderedWorkTabs,
     reorderTabs,

application/state/useVaultImportHandlers.ts

@@ -33,7 +33,6 @@ import {
   filterVaultImportKeyPassphrasesAgainstExisting,
   mergeVaultImportIssues,
   resolveVaultImportKeyPassphraseConflicts,
-  toVaultImportExistingHostRef,
   type VaultImportFormat,
 } from "../../domain/vaultImport";
 import type { GroupConfig, Host, ManagedSource, SSHKey } from "../../types";
@@ -176,7 +175,6 @@ export function useVaultImportHandlers({
             files,
             encoding: options?.encoding,
             masterPassword: options?.masterPassword,
-            existingHosts: hostsRef.current.map(toVaultImportExistingHostRef),
             signal,
             onProgress: (progress) => {
               if (!signal.aborted) updateProgress(progress);

application/state/useVaultState.connectionLogTerminalData.test.ts

@@ -1,60 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import { readFileSync } from "node:fs";
-
-const source = readFileSync(new URL("./useVaultState.ts", import.meta.url), "utf8");
-const terminalLayerSource = readFileSync(
-  new URL("../../components/TerminalLayer.tsx", import.meta.url),
-  "utf8",
-);
-
-test("connection log replay blobs persist through IndexedDB instead of the legacy localStorage blob", () => {
-  assert.match(source, /await migrateLegacyConnectionLogTerminalData\(/);
-  assert.match(source, /await writeTerminalDataMapDiff\(/);
-  assert.match(source, /STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV/);
-  assert.match(source, /syncConnectionLogTerminalData !== false|syncConnectionLogTerminalData\)/);
-  assert.doesNotMatch(source, /writeTerminalDataMapWithQuotaRetry/);
-  assert.doesNotMatch(
-    source,
-    /localStorageAdapter\.write\(\s*STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA\s*,/,
-  );
-});
-
-test("close-path connection log updates await the indexedDB persist task", () => {
-  assert.match(
-    source,
-    /const updateConnectionLog = useCallback\([\s\S]*?return commitConnectionLogs\(/,
-  );
-  assert.match(source, /rebaseQueuedConnectionLogs\(\s*memory,\s*removedIds,\s*changedIds,/);
-  assert.match(
-    source,
-    /if \(!options\?\.pruneMainBlob\) \{[\s\S]*?rebaseQueuedConnectionLogs\(/,
-  );
-  assert.match(source, /retainNewestUnsavedReplays\(fallbackLogs, keep\)/);
-  assert.match(source, /if \(!map\) return;/);
-  assert.match(
-    source,
-    /if \(key === STORAGE_KEY_CONNECTION_LOGS\) \{\s*\/\/ This window already updated connectionLogsRef before setItem\.[\s\S]*?return;\s*\}/,
-  );
-  assert.match(
-    terminalLayerSource,
-    /const handleTerminalDataCapture = useCallback\(\(sessionId: string, data: string\) => \{\s*return onTerminalDataCapture\?\.\(sessionId, data\);/,
-  );
-});
-
-test("boot re-reads connection logs after indexedDB load and falls back to the main blob", () => {
-  const revAt = source.indexOf("let revSeen = readTerminalDataRev()");
-  const bootAt = source.indexOf("const loaded = await migrateLegacyConnectionLogTerminalData");
-  assert.notEqual(revAt, -1);
-  assert.ok(revAt < bootAt);
-  const bootSlice = source.slice(bootAt, bootAt + 2800);
-  assert.match(bootSlice, /revNow !== revSeen[\s\S]*?await loadConnectionLogTerminalData\(\)/);
-  assert.match(
-    bootSlice,
-    /localStorageAdapter\.read<ConnectionLog\[\]>\(\s*STORAGE_KEY_CONNECTION_LOGS,\s*\)[\s\S]*?pruneTerminalDataMapForStorage\(connectionLogsForBoot/,
-  );
-  assert.match(
-    source,
-    /!sidePersisted && unsavedTerminalDataPending && mainPersisted\) \{\s*\/\/[\s\S]*?localStorageAdapter\.read<ConnectionLog\[\]>\(\s*STORAGE_KEY_CONNECTION_LOGS\s*\)[\s\S]*?mergeTerminalDataIntoLogs\(freshLogs, buildTerminalDataMapFromLogs\(logs\)\)/,
-  );
-});

application/state/useVaultState.ts

@@ -37,7 +37,6 @@ import {
 import {
   STORAGE_KEY_CONNECTION_LOGS,
   STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA,
-  STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV,
   STORAGE_KEY_GROUP_CONFIGS,
   STORAGE_KEY_GROUPS,
   STORAGE_KEY_HOSTS,
@@ -62,23 +61,11 @@ import {
 } from "../../domain/globalHistory";
 import {
   buildTerminalDataMapFromLogs,
-  acknowledgePendingConnectionLogWrites,
-  mergeConnectionLogsWithPendingMutations,
+  mergeConnectionLogsFromStorage,
   mergeTerminalDataIntoLogs,
   mergeTerminalDataMapsForStorage,
-  pruneInMemoryUnsavedTerminalData,
-  rebaseQueuedConnectionLogs,
-  retainNewestUnsavedReplays,
-  pruneTerminalDataMapForStorage,
   type ConnectionLogTerminalDataMap,
-  type PendingConnectionLogWrite,
 } from "../../domain/connectionLogTerminalData";
-import {
-  tryLoadAll as tryLoadConnectionLogTerminalData,
-  migrateLegacyConnectionLogTerminalData,
-  writeTerminalDataMapDiff,
-  type ConnectionLogTerminalDataRev,
-} from "../../infrastructure/persistence/connectionLogTerminalDataStore";
 import { getNextVaultOrder, normalizeVaultOrder } from "../../domain/vaultOrder";
 import {
   deleteSelectedSnippetsFromVault,
@@ -240,13 +227,6 @@ const safeParse = <T,>(value: string | null): T | null => {
   }
 };
 
-/** `null` means the read failed. `{}` is a successful empty store. Retries once. */
-const loadConnectionLogTerminalData = async (): Promise<ConnectionLogTerminalDataMap | null> => {
-  const first = await tryLoadConnectionLogTerminalData();
-  if (first) return first;
-  return tryLoadConnectionLogTerminalData();
-};
-
 /**
  * Strip the bulky `terminalData` replay buffer from transient (unsaved)
  * connection logs before persisting. `terminalData` is the full terminal
@@ -275,6 +255,9 @@ const readLegacyLineTimestampsEnabled = (): boolean => {
   return stored?.showLineTimestamps === true;
 };
 
+const readConnectionLogTerminalDataMap = (): ConnectionLogTerminalDataMap =>
+  localStorageAdapter.read<ConnectionLogTerminalDataMap>(STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA) ?? {};
+
 const readPersistedConnectionLogIds = (): Set<string> => {
   const stored = localStorageAdapter.read<ConnectionLog[]>(STORAGE_KEY_CONNECTION_LOGS) ?? [];
   return new Set(stored.map((log) => log.id));
@@ -293,18 +276,23 @@ const buildPersistedLogIds = (
   return ids;
 };
 
-export type UseVaultStateOptions = {
-  /**
-   * When false, skip loading and cross-window sync of the bulky
-   * connection-log terminal-data side store (~30–50 MB in localStorage).
-   * Pass false from windows that never show connection-log replay
-   * (Settings, tray panel, terminal popup). Default true.
-   */
-  syncConnectionLogTerminalData?: boolean;
+const writeConnectionLogTerminalDataMap = (
+  logs: ConnectionLog[],
+  localMaps: ConnectionLogTerminalDataMap[],
+  usePersistedLogIdsFromDisk: boolean,
+): boolean => {
+  const existing = readConnectionLogTerminalDataMap();
+  const pruned = mergeTerminalDataMapsForStorage(
+    logs,
+    existing,
+    localMaps,
+    buildPersistedLogIds(logs, usePersistedLogIdsFromDisk),
+  );
+  if (JSON.stringify(existing) === JSON.stringify(pruned)) return true;
+  return localStorageAdapter.write(STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA, pruned);
 };
 
-export const useVaultState = (options?: UseVaultStateOptions) => {
-  const syncConnectionLogTerminalData = options?.syncConnectionLogTerminalData !== false;
+export const useVaultState = () => {
   const [isInitialized, setIsInitialized] = useState(false);
   const [hosts, setHosts] = useState<Host[]>([]);
   const [keys, setKeys] = useState<SSHKey[]>([]);
@@ -430,158 +418,67 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
   const identitiesReadSeq = useRef(0);
   const proxyProfilesReadSeq = useRef(0);
   const groupConfigsReadSeq = useRef(0);
-  const connectionLogsRef = useRef<ConnectionLog[]>([]);
-  const connectionLogWriteGenerationRef = useRef(0);
-  const connectionLogPendingRef = useRef(new Map<string, PendingConnectionLogWrite>());
   const connectionLogTerminalDataRef = useRef<ConnectionLogTerminalDataMap>({});
-  const connectionLogTerminalDataPersistedRef = useRef<ConnectionLogTerminalDataMap>({});
-  const connectionLogTerminalDataRevRawRef = useRef<string | null>(null);
-  const connectionLogTerminalDataLoadSeq = useRef(0);
-  const terminalDataQueueRef = useRef<Promise<void>>(Promise.resolve());
-  const terminalDataReadyRef = useRef<Promise<void>>(Promise.resolve());
   const pluginCredentialCatalogVersion = useRef(0);
 
-  const enqueueTerminalDataTask = useCallback(<T,>(task: () => Promise<T>): Promise<T> => {
-    const run = terminalDataQueueRef.current.then(task, task);
-    terminalDataQueueRef.current = run.then(() => undefined, () => undefined);
-    return run;
-  }, []);
-
-  const bumpConnectionLogTerminalDataRev = useCallback((ids: readonly string[]) => {
-    const current = localStorageAdapter.read<ConnectionLogTerminalDataRev>(
-      STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV,
-    );
-    const prev = typeof current?.rev === "number" && Number.isFinite(current.rev) ? current.rev : 0;
-    const payload: ConnectionLogTerminalDataRev = {
-      rev: Math.max(prev + 1, Date.now()),
-      ids: [...ids].sort(),
-      nonce: crypto.randomUUID(),
-    };
-    // Record the exact JSON before setItem so this window ignores its own echo.
-    connectionLogTerminalDataRevRawRef.current = JSON.stringify(payload);
-    const written = localStorageAdapter.write(STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV, payload);
-    if (!written) {
-      connectionLogTerminalDataRevRawRef.current = localStorageAdapter.readString(
-        STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV,
-      );
-    }
-  }, []);
-
-  const absorbRemoteTerminalDataIfNeeded = useCallback(async () => {
-    const raw = localStorageAdapter.readString(STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV);
-    if (raw === connectionLogTerminalDataRevRawRef.current) return;
-    const map = await loadConnectionLogTerminalData();
-    if (!map) return;
-    connectionLogTerminalDataRevRawRef.current = raw;
-    connectionLogTerminalDataPersistedRef.current = map;
-    connectionLogTerminalDataRef.current = {
-      ...map,
-      ...connectionLogTerminalDataRef.current,
-    };
-  }, []);
-
-  const syncConnectionLogTerminalDataMap = useCallback(async (
+  const syncConnectionLogTerminalDataMap = useCallback((
     logs: ConnectionLog[],
     options?: { usePersistedLogIdsFromDisk?: boolean },
   ) => {
-    if (!syncConnectionLogTerminalData) return true;
-    await absorbRemoteTerminalDataIfNeeded();
-    const baseline = connectionLogTerminalDataPersistedRef.current;
+    const usePersistedLogIdsFromDisk = options?.usePersistedLogIdsFromDisk ?? false;
+    const localMaps = [
+      connectionLogTerminalDataRef.current,
+      buildTerminalDataMapFromLogs(logs),
+    ];
+    const existing = readConnectionLogTerminalDataMap();
     const merged = mergeTerminalDataMapsForStorage(
       logs,
-      baseline,
-      [
-        connectionLogTerminalDataRef.current,
-        buildTerminalDataMapFromLogs(logs),
-      ],
-      buildPersistedLogIds(logs, options?.usePersistedLogIdsFromDisk ?? false),
+      existing,
+      localMaps,
+      buildPersistedLogIds(logs, usePersistedLogIdsFromDisk),
     );
-    const written = await writeTerminalDataMapDiff(baseline, merged);
-    // Keep the capped map in memory even when IndexedDB rejects the write, so
-    // the next close retries from the last committed baseline.
-    connectionLogTerminalDataRef.current = merged;
-    if (!written.changed) return true;
-    if (!written.persisted) return false;
-    connectionLogTerminalDataPersistedRef.current = merged;
-    bumpConnectionLogTerminalDataRev(Object.keys(merged));
-    return true;
-  }, [
-    absorbRemoteTerminalDataIfNeeded,
-    bumpConnectionLogTerminalDataRev,
-    syncConnectionLogTerminalData,
-  ]);
+    const persisted = writeConnectionLogTerminalDataMap(
+      logs,
+      localMaps,
+      usePersistedLogIdsFromDisk,
+    );
+    if (persisted) {
+      connectionLogTerminalDataRef.current = merged;
+    } else {
+      connectionLogTerminalDataRef.current = {
+        ...connectionLogTerminalDataRef.current,
+        ...buildTerminalDataMapFromLogs(logs),
+      };
+    }
+    return { map: connectionLogTerminalDataRef.current, persisted };
+  }, []);
 
-  const persistConnectionLogState = useCallback(async (
+  const persistConnectionLogState = useCallback((
     logs: ConnectionLog[],
-    options?: {
-      pruneMainBlob?: boolean;
-      removedIds?: ReadonlySet<string>;
-      changedIds?: ReadonlySet<string>;
-    },
+    options?: { pruneMainBlob?: boolean },
   ) => {
     const unsavedTerminalDataPending = logs.some(
       (log) => !log.saved && log.terminalData !== undefined,
     );
-    let mainReplay: ConnectionLogTerminalDataMap = {};
-    const writeMain = (value: ConnectionLog[]) => {
-      const written = localStorageAdapter.write(STORAGE_KEY_CONNECTION_LOGS, value);
-      if (written) mainReplay = buildTerminalDataMapFromLogs(value);
-      return written;
-    };
 
     let mainPersisted = true;
     if (options?.pruneMainBlob) {
       const prunedMain = pruneConnectionLogsForStorage(logs);
-      mainPersisted = writeMain(prunedMain);
+      mainPersisted = localStorageAdapter.write(STORAGE_KEY_CONNECTION_LOGS, prunedMain);
       if (!mainPersisted && unsavedTerminalDataPending) {
-        mainPersisted = writeMain(logs);
+        mainPersisted = localStorageAdapter.write(STORAGE_KEY_CONNECTION_LOGS, logs);
       }
     }
 
-    let sidePersisted = false;
+    let sidePersisted = true;
     if (mainPersisted || !options?.pruneMainBlob) {
-      sidePersisted = await syncConnectionLogTerminalDataMap(logs, {
+      ({ persisted: sidePersisted } = syncConnectionLogTerminalDataMap(logs, {
         usePersistedLogIdsFromDisk: Boolean(options?.pruneMainBlob && mainPersisted),
-      });
+      }));
     }
 
     if (!options?.pruneMainBlob) {
-      // The side-store await can overlap another window's metadata write.
-      // Rebase this snapshot onto the blob that exists now, immediately before
-      // replacing it. A failed read keeps the snapshot already rebased at enqueue.
-      const freshLogs = localStorageAdapter.read<ConnectionLog[]>(STORAGE_KEY_CONNECTION_LOGS);
-      const toWrite = freshLogs
-        ? rebaseQueuedConnectionLogs(
-          logs,
-          options?.removedIds ?? new Set<string>(),
-          options?.changedIds ?? new Set<string>(),
-          mergeConnectionLogsWithPendingMutations(
-            connectionLogsRef.current,
-            freshLogs,
-            connectionLogTerminalDataPersistedRef.current,
-            connectionLogPendingRef.current,
-          ),
-          freshLogs,
-        )
-        : logs;
-      mainPersisted = writeMain(toWrite);
-    } else if (!sidePersisted && unsavedTerminalDataPending && mainPersisted) {
-      // IndexedDB rejected the replay after the pruned metadata write. Put the
-      // buffers back on the current main blob so a restart still has them,
-      // without replacing logs another window wrote during the await.
-      // If that blob exceeds quota, drop older unsaved replays and retry so
-      // the newest capture still has a durable copy.
-      const freshLogs = localStorageAdapter.read<ConnectionLog[]>(STORAGE_KEY_CONNECTION_LOGS);
-      let fallbackLogs = freshLogs
-        ? mergeTerminalDataIntoLogs(freshLogs, buildTerminalDataMapFromLogs(logs))
-        : logs;
-      sidePersisted = writeMain(fallbackLogs);
-      let keep = fallbackLogs.filter((log) => !log.saved && log.terminalData).length;
-      while (!sidePersisted && keep > 1) {
-        keep = Math.max(1, Math.floor(keep / 2));
-        fallbackLogs = retainNewestUnsavedReplays(fallbackLogs, keep);
-        sidePersisted = writeMain(fallbackLogs);
-      }
+      mainPersisted = localStorageAdapter.write(STORAGE_KEY_CONNECTION_LOGS, logs);
     }
 
     if (!mainPersisted && unsavedTerminalDataPending) {
@@ -593,105 +490,15 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
         "[useVaultState] Failed to persist connection log terminal replay data side store.",
       );
     }
-    return { metadataPersisted: mainPersisted, replayPersisted: sidePersisted, mainReplay };
   }, [syncConnectionLogTerminalDataMap]);
 
-  const commitConnectionLogs = useCallback((
-    recipe: (prev: ConnectionLog[]) => ConnectionLog[],
-    options?: { pruneMainBlob?: boolean },
-  ) => {
-    const prev = connectionLogsRef.current;
-    const next = recipe(prev);
-    const prevById = new Map(prev.map((log) => [log.id, log]));
-    const nextIds = new Set<string>();
-    const generation = ++connectionLogWriteGenerationRef.current;
-    for (const log of next) {
-      nextIds.add(log.id);
-      const before = prevById.get(log.id);
-      if (!before || before !== log) {
-        const previous = connectionLogPendingRef.current.get(log.id);
-        const changes: Partial<ConnectionLog> = { ...previous?.changes };
-        const fieldGenerations = { ...previous?.fieldGenerations };
-        for (const field of Object.keys({ ...before, ...log }) as Array<keyof ConnectionLog>) {
-          if (!before || before[field] !== log[field]) {
-            Object.assign(changes, { [field]: log[field] });
-            fieldGenerations[field] = generation;
-          }
-        }
-        connectionLogPendingRef.current.set(log.id, {
-          generation, log, changes, fieldGenerations, added: previous?.added ?? !before,
-        });
-      }
-    }
-    for (const log of prev) {
-      if (!nextIds.has(log.id)) {
-        connectionLogPendingRef.current.set(log.id, { generation, log: null });
-      }
-    }
-    connectionLogsRef.current = next;
-    setConnectionLogs(next);
-    return enqueueTerminalDataTask(() => withVaultImportLock("connection-logs", async () => {
-      // The shared lock covers the read/rebase as well as both storage writes.
-      // Include uncommitted generations from failed or newer queued captures.
-      await absorbRemoteTerminalDataIfNeeded();
-      const pending = new Map(connectionLogPendingRef.current);
-      const removedIds = new Set<string>();
-      const changedIds = new Set<string>();
-      for (const [id, mutation] of pending) {
-        if (mutation.log === null) removedIds.add(id);
-        else changedIds.add(id);
-      }
-      const storedBefore = localStorageAdapter.read<ConnectionLog[]>(STORAGE_KEY_CONNECTION_LOGS);
-      const memory = mergeConnectionLogsWithPendingMutations(
-        connectionLogsRef.current,
-        storedBefore ?? connectionLogsRef.current,
-        connectionLogTerminalDataPersistedRef.current,
-        pending,
-      );
-      const persisted = await persistConnectionLogState(
-        rebaseQueuedConnectionLogs(
-          memory,
-          removedIds,
-          changedIds,
-          memory,
-          storedBefore,
-        ),
-        { ...options, removedIds, changedIds },
-      );
-      // A replay/quota failure must not retain already-committed add or
-      // metadata ownership: retrying it could undo a peer bookmark/deletion.
-      connectionLogPendingRef.current = acknowledgePendingConnectionLogWrites(
-        connectionLogPendingRef.current, pending, persisted,
-      );
-      if (persisted.metadataPersisted || persisted.replayPersisted) {
-        const stored = localStorageAdapter.read<ConnectionLog[]>(STORAGE_KEY_CONNECTION_LOGS);
-        if (stored) {
-          const merged = mergeConnectionLogsWithPendingMutations(
-            connectionLogsRef.current,
-            stored,
-            connectionLogTerminalDataRef.current,
-            connectionLogPendingRef.current,
-          );
-          connectionLogsRef.current = merged;
-          setConnectionLogs(merged);
-        }
-      }
-      return persisted.metadataPersisted && persisted.replayPersisted;
-    }));
-  }, [absorbRemoteTerminalDataIfNeeded, enqueueTerminalDataTask, persistConnectionLogState]);
-
   const applyConnectionLogsFromStorage = useCallback((
     prev: ConnectionLog[],
     storedLogs: ConnectionLog[],
     terminalDataMap: ConnectionLogTerminalDataMap,
   ) => {
     connectionLogTerminalDataRef.current = terminalDataMap;
-    return mergeConnectionLogsWithPendingMutations(
-      prev,
-      storedLogs,
-      terminalDataMap,
-      connectionLogPendingRef.current,
-    );
+    return mergeConnectionLogsFromStorage(prev, storedLogs, terminalDataMap);
   }, []);
 
   // Encrypt outside the lock, then under the lock prune script bindings against
@@ -1485,56 +1292,63 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
         ...log,
         id: crypto.randomUUID(),
       };
-      void commitConnectionLogs((prev) => {
+      setConnectionLogs((prev) => {
         // Keep only the last 500 non-saved entries plus all saved entries
         const savedLogs = prev.filter((l) => l.saved);
         const unsavedLogs = prev.filter((l) => !l.saved);
         const updated = [newLog, ...unsavedLogs].slice(0, 500);
-        return pruneInMemoryUnsavedTerminalData(
-          [...updated, ...savedLogs].sort(
-            (a, b) => b.startTime - a.startTime
-          ),
+        const final = [...updated, ...savedLogs].sort(
+          (a, b) => b.startTime - a.startTime
         );
-      }, { pruneMainBlob: true });
+        persistConnectionLogState(final, { pruneMainBlob: true });
+        return final;
+      });
       return newLog.id;
     },
-    [commitConnectionLogs],
+    [persistConnectionLogState],
   );
 
   const updateConnectionLog = useCallback(
     (id: string, updates: Partial<ConnectionLog>) => {
-      return commitConnectionLogs((prev) => (
-        pruneInMemoryUnsavedTerminalData(
-          prev.map((log) => (log.id === id ? { ...log, ...updates } : log)),
-        )
-      ), { pruneMainBlob: true });
+      setConnectionLogs((prev) => {
+        const updated = prev.map((log) =>
+          log.id === id ? { ...log, ...updates } : log
+        );
+        persistConnectionLogState(updated, { pruneMainBlob: true });
+        return updated;
+      });
     },
-    [commitConnectionLogs],
+    [persistConnectionLogState],
   );
 
   const toggleConnectionLogSaved = useCallback((id: string) => {
-    void commitConnectionLogs((prev) => (
-      pruneInMemoryUnsavedTerminalData(
-        prev.map((log) =>
-          log.id === id ? { ...log, saved: !log.saved } : log
-        ),
-      )
-    ), { pruneMainBlob: false });
-  }, [commitConnectionLogs]);
+    setConnectionLogs((prev) => {
+      const updated = prev.map((log) =>
+        log.id === id ? { ...log, saved: !log.saved } : log
+      );
+      persistConnectionLogState(updated, { pruneMainBlob: false });
+      return updated;
+    });
+  }, [persistConnectionLogState]);
 
   const deleteConnectionLog = useCallback((id: string) => {
-    void commitConnectionLogs(
-      (prev) => prev.filter((log) => log.id !== id),
-      { pruneMainBlob: true },
-    );
-  }, [commitConnectionLogs]);
+    setConnectionLogs((prev) => {
+      const updated = prev.filter((log) => log.id !== id);
+      const map = { ...connectionLogTerminalDataRef.current };
+      delete map[id];
+      connectionLogTerminalDataRef.current = map;
+      persistConnectionLogState(updated, { pruneMainBlob: true });
+      return updated;
+    });
+  }, [persistConnectionLogState]);
 
   const clearUnsavedConnectionLogs = useCallback(() => {
-    void commitConnectionLogs(
-      (prev) => prev.filter((log) => log.saved),
-      { pruneMainBlob: true },
-    );
-  }, [commitConnectionLogs]);
+    setConnectionLogs((prev) => {
+      const saved = prev.filter((log) => log.saved);
+      persistConnectionLogState(saved, { pruneMainBlob: true });
+      return saved;
+    });
+  }, [persistConnectionLogState]);
 
   // Connection logs for Vault logs section — keep App domain bags off session churn.
   useLayoutEffect(() => {
@@ -1601,11 +1415,6 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
 
   useEffect(() => {
     let cancelled = false;
-    let resolveTerminalDataReady = () => {};
-    const terminalDataReady = new Promise<void>((resolve) => {
-      resolveTerminalDataReady = resolve;
-    });
-    terminalDataReadyRef.current = terminalDataReady;
     const init = async () => {
       try {
         await withVaultImportLock("vault", async () => {
@@ -1815,91 +1624,14 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
           publishShellHistorySnapshot(savedShellHistory);
         }
 
-        // Load connection logs. Replay blobs live in IndexedDB, one row per
-        // log id. Windows that never render replay skip that read
-        // (Settings / tray / popup).
+        // Load connection logs
         const savedConnectionLogs = localStorageAdapter.read<ConnectionLog[]>(
           STORAGE_KEY_CONNECTION_LOGS,
         );
-        let connectionLogsForBoot = savedConnectionLogs;
-        let terminalDataMap: ConnectionLogTerminalDataMap = {};
-        let durableTerminalData = true;
-        if (syncConnectionLogTerminalData) {
-          const readTerminalDataRev = () => localStorageAdapter.readString(
-            STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV,
-          );
-          // A peer can commit replay and bump the rev while this load is in
-          // flight. Capture the rev first and reload when it moves, so stamping
-          // the key later does not mark an unread snapshot as consumed.
-          let revSeen = readTerminalDataRev();
-          const loaded = await migrateLegacyConnectionLogTerminalData({
-            read: () => localStorageAdapter.read<ConnectionLogTerminalDataMap>(
-              STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA,
-            ),
-            remove: () => {
-              localStorageAdapter.remove(STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA);
-            },
-          });
-          if (cancelled) return;
-          terminalDataMap = loaded.map;
-          let revNow = readTerminalDataRev();
-          if (revNow !== revSeen) {
-            const reloaded = await loadConnectionLogTerminalData();
-            if (cancelled) return;
-            if (reloaded) {
-              if (Object.keys(reloaded).length > 0) {
-                terminalDataMap = { ...terminalDataMap, ...reloaded };
-              }
-              revSeen = revNow;
-            }
-          }
-          // Another window can append a log while IndexedDB is opening. Prune
-          // against that newer metadata so this boot does not delete its replay.
-          connectionLogsForBoot = localStorageAdapter.read<ConnectionLog[]>(
-            STORAGE_KEY_CONNECTION_LOGS,
-          ) ?? savedConnectionLogs;
-          const pruned = connectionLogsForBoot
-            ? pruneTerminalDataMapForStorage(connectionLogsForBoot, terminalDataMap)
-            : terminalDataMap;
-          // A legacy map that never reached IndexedDB is not a diff baseline.
-          // Comparing against it would persist only the changed ids and then
-          // drop the rest of the legacy blob on the next boot.
-          const baseline = loaded.durable ? terminalDataMap : {};
-          const written = await writeTerminalDataMapDiff(baseline, pruned);
-          if (cancelled) return;
-          if (written.persisted) {
-            terminalDataMap = pruned;
-            if (!loaded.durable) {
-              localStorageAdapter.remove(STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA);
-            }
-          }
-          durableTerminalData = written.persisted || loaded.durable;
-          if (loaded.migrated || (written.changed && written.persisted)) {
-            bumpConnectionLogTerminalDataRev(Object.keys(terminalDataMap));
-          } else {
-            revNow = readTerminalDataRev();
-            if (revNow !== revSeen) {
-              const reloaded = await loadConnectionLogTerminalData();
-              if (cancelled) return;
-              if (reloaded) {
-                if (Object.keys(reloaded).length > 0) {
-                  terminalDataMap = { ...terminalDataMap, ...reloaded };
-                }
-                revSeen = revNow;
-                connectionLogsForBoot = localStorageAdapter.read<ConnectionLog[]>(
-                  STORAGE_KEY_CONNECTION_LOGS,
-                ) ?? connectionLogsForBoot;
-              }
-            }
-            connectionLogTerminalDataRevRawRef.current = revSeen;
-          }
-        }
+        const terminalDataMap = readConnectionLogTerminalDataMap();
         connectionLogTerminalDataRef.current = terminalDataMap;
-        connectionLogTerminalDataPersistedRef.current = durableTerminalData ? terminalDataMap : {};
-        if (connectionLogsForBoot) {
-          const hydrated = mergeTerminalDataIntoLogs(connectionLogsForBoot, terminalDataMap);
-          connectionLogsRef.current = hydrated;
-          setConnectionLogs(hydrated);
+        if (savedConnectionLogs) {
+          setConnectionLogs(mergeTerminalDataIntoLogs(savedConnectionLogs, terminalDataMap));
         }
 
         // Load managed sources
@@ -1928,7 +1660,6 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
           }
         }
       } finally {
-        resolveTerminalDataReady();
         // StrictMode remount cancels the first init; only the surviving effect
         // may publish "vault ready" or terminals can boot against empty keys.
         if (!cancelled) {
@@ -1941,15 +1672,8 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
     void init();
     return () => {
       cancelled = true;
-      resolveTerminalDataReady();
     };
-  }, [
-    bumpConnectionLogTerminalDataRev,
-    commitEncryptedHostsUnderVaultLock,
-    syncConnectionLogTerminalData,
-    updateHosts,
-    updateSnippets,
-  ]);
+  }, [commitEncryptedHostsUnderVaultLock, updateHosts, updateSnippets]);
 
   useEffect(() => {
     if (!isInitialized) return;
@@ -2150,22 +1874,17 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
       }
 
       if (key === STORAGE_KEY_CONNECTION_LOGS) {
-        // A queued peer event may predate our successful commit. Read the
-        // current blob, then preserve only still-owned local generations.
-        const next = localStorageAdapter.read<ConnectionLog[]>(STORAGE_KEY_CONNECTION_LOGS);
-        if (!next) return;
-        const merged = applyConnectionLogsFromStorage(
-          connectionLogsRef.current,
-          next,
-          connectionLogTerminalDataRef.current,
+        const next = safeParse<ConnectionLog[]>(event.newValue) ?? [];
+        setConnectionLogs((prev) =>
+          applyConnectionLogsFromStorage(prev, next, connectionLogTerminalDataRef.current),
         );
-        connectionLogsRef.current = merged;
-        setConnectionLogs(merged);
         return;
       }
 
-      if (key === STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV) {
-        applyTerminalDataRev(event.newValue);
+      if (key === STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA) {
+        const next = safeParse<ConnectionLogTerminalDataMap>(event.newValue) ?? {};
+        connectionLogTerminalDataRef.current = next;
+        setConnectionLogs((prev) => mergeConnectionLogsFromStorage(prev, prev, next));
         return;
       }
 
@@ -2193,47 +1912,19 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
       }
     };
 
-    const applyTerminalDataRev = (raw: string | null) => {
-      // Settings, tray, and popup mounts never replay logs and must not
-      // pull the side store across windows.
-      if (!syncConnectionLogTerminalData) return;
-      if (raw === connectionLogTerminalDataRevRawRef.current) return;
-      const seq = ++connectionLogTerminalDataLoadSeq.current;
-      void terminalDataReadyRef.current.then(() => enqueueTerminalDataTask(() => withVaultImportLock("connection-logs", async () => {
-        if (seq !== connectionLogTerminalDataLoadSeq.current) return;
-        const map = await loadConnectionLogTerminalData();
-        if (seq !== connectionLogTerminalDataLoadSeq.current) return;
-        if (!map) return;
-        connectionLogTerminalDataRevRawRef.current = localStorageAdapter.readString(
-          STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV,
-        );
-        connectionLogTerminalDataPersistedRef.current = map;
-        connectionLogTerminalDataRef.current = map;
-        const merged = mergeConnectionLogsWithPendingMutations(
-          connectionLogsRef.current,
-          localStorageAdapter.read<ConnectionLog[]>(STORAGE_KEY_CONNECTION_LOGS) ?? connectionLogsRef.current,
-          map,
-          connectionLogPendingRef.current,
-        );
-        connectionLogsRef.current = merged;
-        setConnectionLogs(merged);
-      })));
-    };
-
     const handleLocalStorageAdapterChanged = (event: Event) => {
       const key = (event as CustomEvent<{ key?: string }>).detail?.key;
       if (key === STORAGE_KEY_CONNECTION_LOGS) {
-        // This window already updated connectionLogsRef before setItem. The
-        // adapter notifies on a timer, so this blob can be older than a log
-        // added or finalized while that write was still queued. Applying it
-        // would drop that log from the ref, and the follow-up recipe would
-        // record no changed id. Other windows still arrive through "storage".
+        const next = localStorageAdapter.read<ConnectionLog[]>(STORAGE_KEY_CONNECTION_LOGS) ?? [];
+        setConnectionLogs((prev) =>
+          applyConnectionLogsFromStorage(prev, next, connectionLogTerminalDataRef.current),
+        );
         return;
       }
-      if (key === STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV) {
-        applyTerminalDataRev(localStorageAdapter.readString(
-          STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA_REV,
-        ));
+      if (key === STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA) {
+        const next = readConnectionLogTerminalDataMap();
+        connectionLogTerminalDataRef.current = next;
+        setConnectionLogs((prev) => mergeConnectionLogsFromStorage(prev, prev, next));
       }
     };
 
@@ -2243,7 +1934,7 @@ export const useVaultState = (options?: UseVaultStateOptions) => {
       window.removeEventListener("storage", handleStorage);
       window.removeEventListener(LOCAL_STORAGE_ADAPTER_CHANGED_EVENT, handleLocalStorageAdapterChanged);
     };
-  }, [applyConnectionLogsFromStorage, enqueueTerminalDataTask, syncConnectionLogTerminalData]);
+  }, [applyConnectionLogsFromStorage]);
 
   const updateHostLastConnected = useCallback((hostId: string) => {
     setHosts((prev) => {

components/AIChatPanelContent.tsx

@@ -411,8 +411,6 @@ export const AIChatPanelContent: React.FC<AIChatPanelContentProps> = ({
                   modelCatalogLoading={modelCatalogLoading}
                   modelCatalogSource={modelCatalogSource}
                   modelCatalogFetchedAt={modelCatalogFetchedAt}
-                  modelCatalogWarning={modelCatalogWarning}
-                  onRefreshModelCatalog={handleModelCatalogRetry}
                   allowCustomModelEntry={allowCustomModelEntry}
                   selectedModelId={selectedAgentModel}
                   onModelSelect={handleAgentModelSelect}

components/AIChatSidePanel.tsx

@@ -1090,9 +1090,6 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
           target.agentEnv,
           target.agentCommand,
           target.codexRuntime,
-          // Manual refresh (retry banner / picker button) must bypass the
-          // main-side LKG-first policy and go live.
-          options.force === true,
         );
         if (!result?.ok || !Array.isArray(result.models)) {
           throw new Error(result?.error || 'Failed to load SDK agent models');

components/AIChatSidePanelHelpers.test.tsx

@@ -620,34 +620,6 @@ test('SDK runtime model cache preserves degraded warnings until a successful ret
   assert.equal(cache.read('copilot')?.warning, undefined);
 });
 
-test('SDK runtime model cache re-queries main past the TTL so a clean LKG serve clears a stale banner', async () => {
-  let now = 1_000;
-  const cache = createSdkRuntimeModelCache({ ttlMs: 100, now: () => now });
-
-  // A degraded serve (warning) is cached and replayed within the TTL.
-  await cache.refresh('claude:/opt/bin/claude', async () => ({
-    currentModelId: 'claude-opus-5-5',
-    models: [{ id: 'claude-opus-5-5', name: 'Opus 5.5' }],
-    warning: 'live fetch failed',
-  }));
-  assert.equal(cache.read('claude:/opt/bin/claude')?.warning, 'live fetch failed');
-
-  // Past the TTL the entry is evicted and the next automatic load re-queries
-  // main; with the LKG-first policy that round-trip returns a clean
-  // last-known-good serve, so the stale banner clears.
-  now = 1_150;
-  const cleared = await cache.refresh('claude:/opt/bin/claude', async () => ({
-    currentModelId: 'claude-opus-5-5',
-    models: [{ id: 'claude-opus-5-5', name: 'Opus 5.5' }],
-    source: 'last-known-good',
-    fetchedAt: '2026-10-23T08:00:00.000Z',
-  }));
-  assert.equal(cleared.source, 'last-known-good');
-  assert.equal(cleared.warning, undefined);
-  assert.equal(cache.read('claude:/opt/bin/claude')?.warning, undefined);
-  assert.equal(cache.read('claude:/opt/bin/claude')?.fetchedAt, '2026-10-23T08:00:00.000Z');
-});
-
 // #3584 alignment: OpenCode must render build-time presets while its live
 // catalog load is pending, exactly like every other backend. The old host
 // code suppressed presets for opencode while `runtimeModelLoading` was set,

components/AIChatSidePanelHelpers.ts

@@ -247,10 +247,6 @@ export function createSdkRuntimeModelCache(options: SdkRuntimeModelCacheOptions
       pruneEntries();
       const cached = entries.get(key);
       if (!refreshOptions.force && cached && now() - cached.updatedAt < ttlMs) {
-        // The LKG-first policy lives in main: once a persisted catalog exists
-        // there, a TTL-expired non-force refresh is answered from disk with a
-        // clean last-known-good serve (no live attempt, no warning), so the
-        // next automatic load here clears a stale banner.
         touchEntry(key, cached);
         return Promise.resolve(cloneCatalog(cached));
       }

components/GroupDetailsPanel.saveOrder.test.tsx

@@ -1,98 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import React from "react";
-import { act, create, type ReactTestRenderer } from "react-test-renderer";
-
-import { normalizeVaultOrder, sortByVaultOrder } from "../domain/vaultOrder.ts";
-import type { GroupConfig } from "../types.ts";
-import GroupDetailsPanel from "./GroupDetailsPanel.tsx";
-import { HostNotesEditor } from "./host/HostNotesEditor.tsx";
-import { AsidePanel } from "./ui/aside-panel.tsx";
-import { Input } from "./ui/input.tsx";
-import { TooltipProvider } from "./ui/tooltip.tsx";
-import { installDomEnvironment } from "./test-support/renderReactDom.tsx";
-
-async function saveGroup(config: GroupConfig | undefined, newName?: string) {
-  const environment = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };
-  const previous = environment.IS_REACT_ACT_ENVIRONMENT;
-  const dom = installDomEnvironment();
-  const previousRaf = globalThis.requestAnimationFrame;
-  const previousCancelRaf = globalThis.cancelAnimationFrame;
-  globalThis.requestAnimationFrame = (callback) => setTimeout(() => callback(0), 0) as unknown as number;
-  globalThis.cancelAnimationFrame = (id) => clearTimeout(id);
-  environment.IS_REACT_ACT_ENVIRONMENT = true;
-  let renderer: ReactTestRenderer | undefined;
-  let saved: GroupConfig | undefined;
-  let savedName: string | undefined;
-  try {
-    await act(async () => {
-      renderer = create(
-        <TooltipProvider>
-          <GroupDetailsPanel
-            groupPath={config?.path ?? "new-group"}
-            config={config}
-            availableKeys={[]}
-            identities={[]}
-            allHosts={[]}
-            groups={[]}
-            terminalThemeId="default"
-            terminalFontSize={14}
-            onSave={(value, name) => { saved = value; savedName = name; }}
-            onCancel={() => {}}
-          />
-        </TooltipProvider>,
-      );
-    });
-    await act(async () => {
-      renderer!.root.findByType(HostNotesEditor).props.onChange(" Updated note ");
-      if (newName) {
-        renderer!.root.findAllByType(Input)[0].props.onChange({ target: { value: newName } });
-      }
-    });
-    await act(async () => {
-      renderer!.root.findByType(AsidePanel).props.actions.props.onClick();
-    });
-    assert.ok(saved, "the actual panel save handler must emit a config");
-    return { saved, savedName };
-  } finally {
-    if (renderer) await act(async () => { renderer!.unmount(); });
-    globalThis.requestAnimationFrame = previousRaf;
-    globalThis.cancelAnimationFrame = previousCancelRaf;
-    dom.cleanup();
-    environment.IS_REACT_ACT_ENVIRONMENT = previous;
-  }
-}
-
-test("editing group notes retains its manual position through write normalization", async () => {
-  const original = { path: "Fleet-0999", order: 1000 };
-  const sibling = { path: "Fleet-0998", order: 2000 };
-  const { saved, savedName } = await saveGroup(original);
-  assert.deepEqual(saved, { ...original, notes: "Updated note" });
-  assert.equal(savedName, undefined);
-  // VaultView removes the old config and appends the panel's replacement.
-  const written = normalizeVaultOrder([sibling, saved]);
-  assert.deepEqual(sortByVaultOrder(written).map((config) => config.path), [original.path, sibling.path]);
-  assert.deepEqual(original, { path: "Fleet-0999", order: 1000 });
-});
-
-test("renaming a group in the details panel retains its manual position", async () => {
-  const { saved, savedName } = await saveGroup({ path: "parent/old", order: 2500 }, "renamed");
-  assert.equal(saved.path, "parent/renamed");
-  assert.equal(saved.order, 2500);
-  assert.equal(savedName, "renamed");
-});
-
-test("group saves preserve zero and negative manual order values", async () => {
-  for (const order of [0, -1000]) {
-    const { saved } = await saveGroup({ path: "group", order });
-    assert.equal(saved.order, order);
-  }
-});
-
-test("saving a new or unordered group leaves order assignment to the write path", async () => {
-  for (const config of [undefined, { path: "existing-unordered" }]) {
-    const { saved } = await saveGroup(config);
-    assert.equal(Object.hasOwn(saved, "order"), false);
-    assert.equal(normalizeVaultOrder([saved])[0].order, 1000);
-  }
-});

components/GroupDetailsPanel.tsx

@@ -559,8 +559,6 @@ const GroupDetailsPanel: React.FC<GroupDetailsPanelPropsWithResize> = ({
 
     const result: GroupConfig = {
       path: newPath,
-      // Editing defaults or notes must not change the group's manual position.
-      ...(config?.order !== undefined && { order: config.order }),
       notes: form.notes?.trim() || undefined,
       // Only include SSH fields if SSH section is enabled
       ...(sshEnabled && {

components/HostTreeView.orderUpdates.test.tsx

@@ -1,69 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import { JSDOM } from "jsdom";
-import type { GroupNode } from "../types";
-
-test("HostTreeView React updates invalidate order when configs or sort mode change", async () => {
-  const dom = new JSDOM('<!doctype html><html><body><div id="scroll"><div id="root"></div></div></body></html>', {
-    url: "http://localhost", pretendToBeVisual: true,
-  });
-  const previous = new Map<string, PropertyDescriptor | undefined>();
-  const install = (key: string, value: unknown) => {
-    previous.set(key, Object.getOwnPropertyDescriptor(globalThis, key));
-    Object.defineProperty(globalThis, key, { configurable: true, writable: true, value });
-  };
-  class ResizeObserverStub {
-    observe() {}
-    unobserve() {}
-    disconnect() {}
-  }
-  for (const key of ["window", "document", "navigator", "HTMLElement", "Element", "Node", "MutationObserver", "Event", "CustomEvent", "MouseEvent", "KeyboardEvent", "FocusEvent", "localStorage"] as const) {
-    install(key, key === "window" ? dom.window : dom.window[key]);
-  }
-  install("getComputedStyle", dom.window.getComputedStyle.bind(dom.window));
-  install("requestAnimationFrame", dom.window.requestAnimationFrame.bind(dom.window));
-  install("cancelAnimationFrame", dom.window.cancelAnimationFrame.bind(dom.window));
-  install("ResizeObserver", ResizeObserverStub);
-  install("IS_REACT_ACT_ENVIRONMENT", true);
-  const scroller = dom.window.document.getElementById("scroll")!;
-  Object.defineProperties(scroller, { offsetHeight: { value: 800 }, offsetWidth: { value: 1280 } });
-  const { act, createElement } = await import("react");
-  const { createRoot } = await import("react-dom/client");
-  const { HostTreeView } = await import("./HostTreeView.tsx");
-  const noop = () => undefined;
-  const groupTree: GroupNode[] = ["alpha", "beta"].map((path) => ({ name: path, path, hosts: [], children: {} }));
-  const common = {
-    groupTree, hosts: [], expandedPaths: new Set<string>(), scrollRef: { current: scroller },
-    onConnect: noop, onEditHost: noop, onDuplicateHost: noop, onDeleteHost: noop,
-    onCopyCredentials: noop, onNewGroup: noop, onRenameGroup: noop, onEditGroup: noop,
-    onDeleteGroup: noop, moveHostToGroup: noop, moveGroup: noop,
-  };
-  const root = createRoot(dom.window.document.getElementById("root")!);
-  const paths = () => [...dom.window.document.querySelectorAll("[data-group-path]")].map((node) => node.getAttribute("data-group-path"));
-  try {
-    await act(async () => {
-      root.render(createElement(HostTreeView, { ...common, sortMode: "manual", groupConfigs: [{ path: "beta", order: -1 }] }));
-    });
-    assert.deepEqual(paths(), ["beta", "alpha"]);
-    await act(async () => {
-      root.render(createElement(HostTreeView, { ...common, sortMode: "manual", groupConfigs: [{ path: "alpha", order: -1 }] }));
-    });
-    assert.deepEqual(paths(), ["alpha", "beta"]);
-    const groupConfigs = [{ path: "beta", order: -1 }];
-    await act(async () => {
-      root.render(createElement(HostTreeView, { ...common, sortMode: "az", groupConfigs }));
-    });
-    assert.deepEqual(paths(), ["alpha", "beta"]);
-    await act(async () => {
-      root.render(createElement(HostTreeView, { ...common, sortMode: "manual", groupConfigs }));
-    });
-    assert.deepEqual(paths(), ["beta", "alpha"]);
-  } finally {
-    await act(async () => { root.unmount(); });
-    dom.window.close();
-    for (const [key, descriptor] of previous) {
-      if (descriptor) Object.defineProperty(globalThis, key, descriptor);
-      else delete (globalThis as Record<string, unknown>)[key];
-    }
-  }
-});

components/HostTreeView.test.tsx

@@ -498,75 +498,3 @@ test("HostTreeView IP sorting stays inside each group and leaves manual order in
   assert.deepEqual(keys("ip"), ["group:prod", "group:prod/east", "host:east-two", "host:east-ten", "host:prod-two", "host:prod-ten", "host:root-two", "host:root-ten"]);
   assert.deepEqual(keys("manual"), ["group:prod", "group:prod/east", "host:east-ten", "host:east-two", "host:prod-ten", "host:prod-two", "host:root-ten", "host:root-two"]);
 });
-
-// Deterministic work-count assertions, not a wall-clock benchmark.
-test("HostTreeView scans manual group order only once across expanded leaf groups", () => {
-  const groupTree: GroupNode[] = ["c", "b", "a"].map((path) => ({
-    name: path, path, children: {}, hosts: [],
-  }));
-  const groupConfigs: GroupConfig[] = groupTree.map((node, order) => ({ path: node.path, order }));
-  let configVisits = 0;
-  Object.defineProperty(groupConfigs, "filter", {
-    value: (predicate: (value: GroupConfig, index: number, array: GroupConfig[]) => unknown) =>
-      Array.prototype.filter.call(groupConfigs, (value: GroupConfig, index: number, array: GroupConfig[]) => {
-        configVisits += 1;
-        return predicate(value, index, array);
-      }),
-  });
-  for (const expandedPaths of [new Set<string>(), new Set(["a", "b", "c"])]) {
-    configVisits = 0;
-    const manual = buildVisibleHostTreeItems({ groupTree, groupConfigs, expandedPaths, ungroupedHosts: [], sortMode: "manual" });
-    assert.equal(configVisits, 3);
-    assert.deepEqual(manual.map((item) => item.key), ["group:c", "group:b", "group:a"]);
-    for (const sortMode of ["az", "za", "newest", "oldest", "group", "ip"] as const) {
-      configVisits = 0;
-      const items = buildVisibleHostTreeItems({ groupTree, groupConfigs, expandedPaths, ungroupedHosts: [], sortMode });
-      assert.equal(configVisits, 0, `${sortMode} must not construct a manual order index`);
-      assert.deepEqual(items.map((item) => item.key), sortMode === "za"
-        ? ["group:c", "group:b", "group:a"]
-        : ["group:a", "group:b", "group:c"]);
-    }
-  }
-});
-
-test("HostTreeView shared order index preserves valid duplicates, ties and nested sibling metadata", () => {
-  const leaf = (path: string): GroupNode => ({ name: path.split("/").at(-1)!, path, children: {}, hosts: [] });
-  const parent: GroupNode = {
-    ...leaf("parent"),
-    children: { z: leaf("parent/z"), a: leaf("parent/a"), b: leaf("parent/b") },
-    hosts: [{ ...baseHost, id: "child-host", group: "parent" }],
-  };
-  const groupTree = [leaf("unordered-z"), leaf("tie-b"), parent, leaf("tie-a"), leaf("unordered-a")];
-  const groupConfigs: GroupConfig[] = [
-    { path: "parent", order: 10 }, { path: "parent", order: -1 },
-    { path: "parent", order: Number.NaN }, { path: "parent", order: Infinity },
-    { path: "tie-b", order: 0 }, { path: "tie-a", order: 0 },
-    { path: "unordered-a", order: Number.NaN },
-    { path: "parent/a", order: 0 }, { path: "parent/b", order: 0 },
-    { path: "parent/z", order: -2 },
-  ];
-  const ungroupedHosts = [{ ...baseHost, id: "root-host", group: "" }];
-  const expandedPaths = new Set(["parent", "parent/z", "parent/a", "parent/b"]);
-  const inputBefore = structuredClone({ groupTree, groupConfigs, ungroupedHosts, expandedPaths });
-  const items = buildVisibleHostTreeItems({ groupTree, groupConfigs, ungroupedHosts, expandedPaths, sortMode: "manual" });
-  assert.deepEqual(items.map(({ key, depth, posInSet, setSize }) => ({ key, depth, posInSet, setSize })), [
-    { key: "group:parent", depth: 0, posInSet: 1, setSize: 6 },
-    { key: "group:parent/z", depth: 1, posInSet: 1, setSize: 4 },
-    { key: "group:parent/b", depth: 1, posInSet: 2, setSize: 4 },
-    { key: "group:parent/a", depth: 1, posInSet: 3, setSize: 4 },
-    { key: "host:child-host", depth: 1, posInSet: 4, setSize: 4 },
-    { key: "group:tie-a", depth: 0, posInSet: 2, setSize: 6 },
-    { key: "group:tie-b", depth: 0, posInSet: 3, setSize: 6 },
-    { key: "group:unordered-z", depth: 0, posInSet: 4, setSize: 6 },
-    { key: "group:unordered-a", depth: 0, posInSet: 5, setSize: 6 },
-    { key: "host:root-host", depth: 0, posInSet: 6, setSize: 6 },
-  ]);
-  assert.equal(items[0].kind === "group" && items[0].node, parent);
-  assert.equal(items[4].kind === "host" && items[4].host, parent.hosts[0]);
-  assert.deepEqual({ groupTree, groupConfigs, ungroupedHosts, expandedPaths }, inputBefore);
-  const changed = buildVisibleHostTreeItems({
-    groupTree, groupConfigs: [...groupConfigs, { path: "tie-a", order: -10 }],
-    ungroupedHosts, expandedPaths, sortMode: "manual",
-  });
-  assert.equal(changed[0].key, "group:tie-a");
-});

components/HostTreeView.tsx

@@ -64,25 +64,22 @@ export type VisibleHostTreeItem =
     setSize: number;
   };
 
-const buildHostTreeGroupOrder = (groupConfigs: GroupConfig[]): Map<string, number> => (
-  new Map(
-    groupConfigs
-      .filter((config) => typeof config.order === 'number' && Number.isFinite(config.order))
-      .map((config) => [config.path, config.order as number]),
-  )
-);
-
 const sortHostTreeGroups = (
   nodes: GroupNode[],
   sortMode: HostTreeSortMode,
-  orderByPath?: ReadonlyMap<string, number>,
+  groupConfigs: GroupConfig[],
 ): GroupNode[] => {
   const originalIndex = new Map(nodes.map((node, index) => [node.path, index]));
+  const orderByPath = new Map(
+    groupConfigs
+      .filter((config) => typeof config.order === 'number' && Number.isFinite(config.order))
+      .map((config) => [config.path, config.order as number]),
+  );
   return [...nodes].sort((a, b) => {
     if (sortMode === 'za') return b.name.localeCompare(a.name);
     if (sortMode === 'manual') {
-      const orderA = orderByPath?.get(a.path);
-      const orderB = orderByPath?.get(b.path);
+      const orderA = orderByPath.get(a.path);
+      const orderB = orderByPath.get(b.path);
       if (orderA !== undefined && orderB !== undefined && orderA !== orderB) return orderA - orderB;
       if (orderA !== undefined) return -1;
       if (orderB !== undefined) return 1;
@@ -118,9 +115,8 @@ export function buildVisibleHostTreeItems({
   groupConfigs: GroupConfig[];
 }): VisibleHostTreeItem[] {
   const items: VisibleHostTreeItem[] = [];
-  const orderByPath = sortMode === 'manual' ? buildHostTreeGroupOrder(groupConfigs) : undefined;
   const visitGroups = (nodes: GroupNode[], depth: number) => {
-    const sortedGroups = sortHostTreeGroups(nodes, sortMode, orderByPath);
+    const sortedGroups = sortHostTreeGroups(nodes, sortMode, groupConfigs);
     // Root-level ungrouped hosts are siblings of top-level groups.
     const rootUngrouped = depth === 0 ? sortHostTreeHosts(ungroupedHosts, sortMode) : [];
     const siblingSetSize = sortedGroups.length + rootUngrouped.length;
@@ -137,7 +133,7 @@ export function buildVisibleHostTreeItems({
       const childGroups = sortHostTreeGroups(
         Object.values(node.children ?? {}) as GroupNode[],
         sortMode,
-        orderByPath,
+        groupConfigs,
       );
       const childHosts = sortHostTreeHosts(node.hosts, sortMode);
       const childSetSize = childGroups.length + childHosts.length;
@@ -186,7 +182,7 @@ export function buildVisibleHostTreeItems({
       const childGroups = sortHostTreeGroups(
         Object.values(node.children ?? {}) as GroupNode[],
         sortMode,
-        orderByPath,
+        groupConfigs,
       );
       const childHosts = sortHostTreeHosts(node.hosts, sortMode);
       const childSetSize = childGroups.length + childHosts.length;
@@ -443,7 +439,7 @@ const TreeNode: React.FC<TreeNodeProps> = ({
   const childNodes = useMemo(() => sortHostTreeGroups(
     Object.values(node.children ?? {}) as GroupNode[],
     sortMode,
-    sortMode === 'manual' ? buildHostTreeGroupOrder(groupConfigs) : undefined,
+    groupConfigs,
   ), [groupConfigs, node.children, sortMode]);
   const sortedHosts = useMemo(
     () => sortHostTreeHosts(node.hosts, sortMode),

components/SettingsPage.tsx

@@ -270,7 +270,7 @@ const SettingsSyncTabWithVault: React.FC<{ onSettingsApplied?: () => void }> = (
         groupConfigs,
         importDataFromString,
         clearVaultData,
-    } = useVaultState({ syncConnectionLogTerminalData: false });
+    } = useVaultState();
 
     const { rules: portForwardingRules, importRules: importPortForwardingRules } = usePortForwardingState();
 

components/Terminal.tsx

@@ -73,7 +73,6 @@ import {
 } from "../application/state/terminalAutoReconnect";
 import { useStoredBoolean } from "../application/state/useStoredBoolean";
 import { readOptionalStoredStringValue, useStoredString } from "../application/state/useStoredString";
-import { performSessionLogAction, type SessionLogAction } from "../application/state/sessionLogActions";
 import { useSessionLogBackend } from "../application/state/useSessionLogBackend";
 import { useTerminalLayoutSuppressActive } from "../application/state/terminalLayoutSuppressStore";
 import { useAppearanceChromeStore } from "../application/state/appearanceChromeStore";
@@ -364,8 +363,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   onOpenTheme,
   onOpenSystem,
   isBroadcastEnabled,
-  composeSendToAll,
-  onToggleComposeSendTarget,
   onToggleBroadcast,
   onToggleComposeBar,
   isWorkspaceComposeBarOpen,
@@ -909,7 +906,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   const [isCancelling, setIsCancelling] = useState(false);
   const [showSFTP, setShowSFTP] = useState(false);
   const [isSessionLogging, setIsSessionLogging] = useState(false);
-  const [canOpenSessionLog, setCanOpenSessionLog] = useState(false);
   const [progressValue, setProgressValue] = useState(CONNECTION_PROGRESS_START);
   const [isDisconnectedDialogDismissed, setIsDisconnectedDialogDismissed] = useState(false);
   const [connectionReuseFellBack, setConnectionReuseFellBack] = useState(false);
@@ -1618,7 +1614,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     const capturedData = options?.finalized
       ? data
       : (finalizeTerminalLogData() || data);
-    return captureHandler(capturedSessionId, capturedData);
+    captureHandler(capturedSessionId, capturedData);
   }, [finalizeTerminalLogData]);
 
   const attachHomeWebContentsIdRef = useRef<number | null | undefined>(undefined);
@@ -1796,14 +1792,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
 
     if (!closingSessionId) {
       disposeSessionListeners();
-      // Close preparation already cleared sessionRef after the display handoff.
-      // Unmount teardown calls cleanup again. An attach popup must not
-      // closeSession on that second pass: worker mode emits netcatty:exit to
-      // the home renderer before the boot-epoch check, which drops home input
-      // (sessionRef = null) while a mismatched epoch leaves the PTY alive.
-      if (attachExistingSession) {
-        return;
-      }
       // Still notify main so in-flight SSH passphrase prompts for this UI
       // sessionId are aborted even before a backend session was attached.
       try {
@@ -1973,11 +1961,10 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   }, [sessionId]);
 
   const forceCloseHibernatedSession = useCallback(() => {
-    let pendingCapture: void | Promise<void>;
     if (!terminalDataCapturedRef.current) {
       const hibernatedData = hibernateSnapshotRef.current + hibernatePendingBufferRef.current;
       if (hibernatedData) {
-        pendingCapture = handleTerminalDataCaptureOnce(sessionId, hibernatedData);
+        handleTerminalDataCaptureOnce(sessionId, hibernatedData);
       }
     }
     disposeDataRef.current?.();
@@ -2020,7 +2007,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     }
     sessionRef.current = null;
     clearHibernateRuntimeState();
-    return pendingCapture;
   }, [attachAuthorization, attachExistingSession, clearHibernateRuntimeState, handleTerminalDataCaptureOnce, sessionId, terminalBackend]);
 
   const observeTerminalInputPrompt = useCallback((
@@ -3447,15 +3433,13 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     // A bypassed password fan-out (#3488) forces the sensitive marker even
     // when this target has not itself classified its prompt as sensitive.
     const sensitive = passwordPromptActiveRef.current || options?.sensitive === true;
-    const broadcastThisSend = options?.broadcast !== undefined
-      ? options.broadcast === true
-      : isBroadcastEnabledRef.current;
     if (
       shouldBroadcastDuringSensitivePrompt({
         sensitivePromptActive: sensitive,
         broadcastPasswordBypass: broadcastPasswordBypassRef.current,
       })
-      && broadcastThisSend
+      && options?.broadcast !== false
+      && isBroadcastEnabledRef.current
       && onBroadcastInputRef.current
     ) {
       const broadcastDeliveredSessionIds = onBroadcastInputRef.current(data, sessionId, {
@@ -3465,11 +3449,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
         // peer writes keep skipping input interceptors.
         ...(sensitive ? { sourceSensitive: true } : {}),
         ...(lineDelayMs ? { lineDelayMs } : {}),
-        // Compose-bar send-to-all while the toolbar switch is off. Keystrokes
-        // and snippets leave this unset and stay on the toolbar gate.
-        ...(options?.broadcast === true && !isBroadcastEnabledRef.current
-          ? { composePeerFanOut: true }
-          : {}),
       });
       // #3491: report the sessions that received the fan-out so callers (the
       // solo compose bar) can detect a payload delivered into a sensitive
@@ -4148,15 +4127,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     onClipboardImageUploadResult: handleClipboardImageUploadResult,
   });
 
-  const handleSessionLogAction = useCallback(async (action: SessionLogAction) => {
-    try {
-      await performSessionLogAction(sessionRef.current ?? sessionId, action);
-    } catch (err) {
-      logger.error("[Terminal] Failed to open or reveal session log:", err);
-      toast.error(t('terminal.toolbar.openSessionLogFailed'));
-    }
-  }, [sessionId, t]);
-
   const handleToggleSessionLog = useCallback(async () => {
     const currentSessionId = sessionRef.current ?? sessionId;
     if (!currentSessionId) {
@@ -4206,7 +4176,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
       if (startResult?.success) {
         if (!startResult?.started && startResult?.canceled) return;
         setIsSessionLogging(!!startResult?.started);
-        if (startResult?.started) setCanOpenSessionLog(true);
       } else {
         toast.error(startResult?.error || "Failed to start session log");
       }
@@ -4231,21 +4200,14 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     const currentSessionId = sessionRef.current ?? sessionId;
     if (!currentSessionId) {
       setIsSessionLogging(false);
-      setCanOpenSessionLog(false);
       return;
     }
 
     let cancelled = false;
     void getManualSessionLogStatus({ sessionId: currentSessionId }).then((result) => {
-      if (!cancelled) {
-        setIsSessionLogging(!!result?.isLogging);
-        setCanOpenSessionLog(!!result?.hasSessionLog);
-      }
+      if (!cancelled) setIsSessionLogging(!!result?.isLogging);
     }).catch(() => {
-      if (!cancelled) {
-        setIsSessionLogging(false);
-        setCanOpenSessionLog(false);
-      }
+      if (!cancelled) setIsSessionLogging(false);
     });
 
     return () => {
@@ -4321,8 +4283,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
       isSearchOpen={isSearchOpen}
       onToggleSearch={handleToggleSearch}
       showLogButton
-      onSessionLogAction={handleSessionLogAction}
-      canOpenSessionLog={canOpenSessionLog}
       onToggleSessionLog={handleToggleSessionLog}
       isSessionLogging={isSessionLogging}
       isSessionLogDisabled={status !== "connected" && !isSessionLogging}
@@ -4355,8 +4315,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     handleSendYmodem,
     handleSetTerminalEncoding,
     handleToggleSessionLog,
-    handleSessionLogAction,
-    canOpenSessionLog,
     handleToggleSearch,
     handleToolbarRecordingToggle,
     host,
@@ -4731,7 +4689,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
 
   return (
     <>
-      <TerminalView ctx={{ Activity, ArrowDownToLine, ArrowUpFromLine, Button, Clock3, Copy, Cpu, HardDrive, HoverCard, HoverCardContent, HoverCardTrigger, Maximize2, MemoryStick, Radio, RefreshCcw, Sparkles, SquareArrowOutUpRight, Unplug, TerminalAutocomplete, TerminalComposeBar, TerminalConnectionDialog, TerminalContextMenu, TerminalSearchBar, Tooltip, TooltipContent, TooltipTrigger, ZmodemOverwriteDialog, ZmodemProgressIndicator, auth, autocompleteAcceptTextRef, autocompleteCloseRef, autocompleteHostOs, autocompleteInputRef, autocompleteKeyEventRef, autocompleteRepositionRef, autocompleteSettings, canUpdateHost: !!onUpdateHost, chainProgress, cn, compactToolbar, lineTimestampsAvailable, containerRef, effectiveFontSize, effectiveFontWeight, effectiveTheme, error, executeSnippet, executeSnippetCommand, handleAddSelectionToAI: onAddSelectionToAI ? handleAddSelectionToAI : undefined, handleCancelConnect, handleCloseDisconnectedSession, handleCloseSearch, handleDisconnect: (attachExistingSession || compactToolbar) ? undefined : handleDisconnect, handleDismissDisconnectedDialog, handleDragEnter, handleDragLeave, handleDragOver, handleDrop, handleFindNext, handleFindPrevious, handleHostKeyAddAndContinue, handleHostKeyClose, handleHostKeyContinue, handleOpenHostBrowser, handleOpenSFTP, handleOsc52ReadResponse, handleOsc7SetupConfirm, handleOsc7SetupOpenChange, handleReceiveYmodem, handleRetry, handleSearch, handleSendYmodem, handleTopOverlayMouseDownCapture, hasMouseTracking, host, hotkeyScheme, inWorkspace, isBroadcastEnabled, composeSendToAll, onToggleComposeSendTarget, isCancelling, isComposeBarOpen: effectiveComposeBarOpen, isConnectionAwaitingUserInput, isDraggingOver, isFocusMode, isFocusedPane, isLocalConnection, remoteDragDropUsesZmodem, isPluginTerminalProviderAvailable, isReconnectActive, isSerialConnection, isSearchOpen, isSupportedOs, isSystemSidebarEligible, isVisible, keyBindings, keys, identities, knownCwdRef, needsHostKeyVerification, onAddSelectionToAI, onBroadcastInput, onCloseSession, onDetach, onDetachDragEnd, onDetachDragStart, onDetachPointerDown, onEndSessionDrag, onExpandToFocus, onTogglePaneMagnification, onOpenSystem, onRename, onSplitHorizontal, onSplitVertical, onStartSessionDrag, onToggleBroadcast, onUpdateHost: handleUpdateHostFromTerminal, osc52ReadPromptVisible, osc7SetupOpen, osc7SetupRunning, passwordPromptActiveRef, pendingHostKeyInfo, progressLogs, progressValue, renderControls, resolvedFontFamily, restoreState, scrollToBottomAfterProgrammaticInput, searchMatchCount, searchFocusToken, scriptExecutionOverlay: activeScriptRun ? (
+      <TerminalView ctx={{ Activity, ArrowDownToLine, ArrowUpFromLine, Button, Clock3, Copy, Cpu, HardDrive, HoverCard, HoverCardContent, HoverCardTrigger, Maximize2, MemoryStick, Radio, RefreshCcw, Sparkles, SquareArrowOutUpRight, Unplug, TerminalAutocomplete, TerminalComposeBar, TerminalConnectionDialog, TerminalContextMenu, TerminalSearchBar, Tooltip, TooltipContent, TooltipTrigger, ZmodemOverwriteDialog, ZmodemProgressIndicator, auth, autocompleteAcceptTextRef, autocompleteCloseRef, autocompleteHostOs, autocompleteInputRef, autocompleteKeyEventRef, autocompleteRepositionRef, autocompleteSettings, canUpdateHost: !!onUpdateHost, chainProgress, cn, compactToolbar, lineTimestampsAvailable, containerRef, effectiveFontSize, effectiveFontWeight, effectiveTheme, error, executeSnippet, executeSnippetCommand, handleAddSelectionToAI: onAddSelectionToAI ? handleAddSelectionToAI : undefined, handleCancelConnect, handleCloseDisconnectedSession, handleCloseSearch, handleDisconnect: (attachExistingSession || compactToolbar) ? undefined : handleDisconnect, handleDismissDisconnectedDialog, handleDragEnter, handleDragLeave, handleDragOver, handleDrop, handleFindNext, handleFindPrevious, handleHostKeyAddAndContinue, handleHostKeyClose, handleHostKeyContinue, handleOpenHostBrowser, handleOsc52ReadResponse, handleOsc7SetupConfirm, handleOsc7SetupOpenChange, handleReceiveYmodem, handleRetry, handleSearch, handleSendYmodem, handleTopOverlayMouseDownCapture, hasMouseTracking, host, hotkeyScheme, inWorkspace, isBroadcastEnabled, isCancelling, isComposeBarOpen: effectiveComposeBarOpen, isConnectionAwaitingUserInput, isDraggingOver, isFocusMode, isFocusedPane, isLocalConnection, remoteDragDropUsesZmodem, isPluginTerminalProviderAvailable, isReconnectActive, isSerialConnection, isSearchOpen, isSupportedOs, isSystemSidebarEligible, isVisible, keyBindings, keys, identities, knownCwdRef, needsHostKeyVerification, onAddSelectionToAI, onBroadcastInput, onCloseSession, onDetach, onDetachDragEnd, onDetachDragStart, onDetachPointerDown, onEndSessionDrag, onExpandToFocus, onTogglePaneMagnification, onOpenSystem, onRename, onSplitHorizontal, onSplitVertical, onStartSessionDrag, onToggleBroadcast, onUpdateHost: handleUpdateHostFromTerminal, osc52ReadPromptVisible, osc7SetupOpen, osc7SetupRunning, passwordPromptActiveRef, pendingHostKeyInfo, progressLogs, progressValue, renderControls, resolvedFontFamily, restoreState, scrollToBottomAfterProgrammaticInput, searchMatchCount, searchFocusToken, scriptExecutionOverlay: activeScriptRun ? (
         <ScriptExecutionOverlay
           run={activeScriptRun}
           onPause={() => { void pauseScriptRun(activeScriptRun.runId); }}

components/TerminalLayer.tsx

@@ -260,12 +260,8 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
   onCreateLocalTerminal,
   isBroadcastEnabled,
   onToggleBroadcast,
-  isComposeSendToAll,
-  onToggleComposeSendTarget,
   isGlobalBroadcastEnabled,
-  isGlobalComposeSendToAll,
   onToggleGlobalBroadcast,
-  onToggleGlobalComposeSendTarget,
   canUseGlobalBroadcast,
   updateHosts,
   updateSnippets,
@@ -704,7 +700,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
   }, [onAddKnownHost]);
 
   const handleTerminalDataCapture = useCallback((sessionId: string, data: string) => {
-    return onTerminalDataCapture?.(sessionId, data);
+    onTerminalDataCapture?.(sessionId, data);
   }, [onTerminalDataCapture]);
 
   // Terminal backend for broadcast writes
@@ -1281,7 +1277,6 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
       sourceSessionId,
       globalBroadcastEnabled: isGlobalBroadcastEnabled,
       directTargetSessionIds: options?.kittyKeyboardTargetSessionIds,
-      includeGlobalPeersWithoutToolbar: options?.composePeerFanOut === true,
     }).filter(id => !paced?.targets || paced.targets.some(target => target.sessionId === id));
     if (options?.preparePacedBroadcast && paced) {
       paced.targets = targetSessionIds.filter(id => passwordBypass || !isTerminalSensitiveInputActive(id)).map(id => {
@@ -2468,19 +2463,14 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     let anyRecipientSensitive = false;
     const pendingSends: Promise<boolean>[] = [];
     const payload = text + '\r';
-    // Compose Enter follows the compose-bar target. Toolbar broadcast stays
-    // the keystroke switch and is only the fallback when no compose target
-    // has been published (older callers).
-    const composeSendToAll = isComposeSendToAll
-      ? isComposeSendToAll(activeWorkspace.id) === true
-      : Boolean(isBroadcastEnabled?.(activeWorkspace.id));
+    const broadcastEnabled = isBroadcastEnabled?.(activeWorkspace.id);
     const focusedSessionId = activeWorkspace.focusedSessionId;
     const broadcastPasswordBypass = broadcastPasswordBypassRef.current;
     const focusedSensitive = focusedSessionId
       ? isTerminalSensitiveInputActive(focusedSessionId)
       : false;
 
-    if (composeSendToAll && (broadcastPasswordBypass || !focusedSensitive)) {
+    if (broadcastEnabled && (broadcastPasswordBypass || !focusedSensitive)) {
       const allSessionIds = sessionsRef.current
         .filter((session) => session.workspaceId === activeWorkspace.id)
         .map((session) => session.id);
@@ -2528,9 +2518,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
         const executor = snippetExecutorsRef.current.get(targetId);
         if (executor) {
           const sensitive = isTerminalSensitiveInputActive(targetId);
-          // Explicitly local: an omitted broadcast option falls back to the
-          // toolbar switch, which can still be on while compose is active-only.
-          pendingSends.push(Promise.resolve(executor(text, false, { broadcast: false })).then(
+          pendingSends.push(Promise.resolve(executor(text, false)).then(
             (sent) => sent && !sensitive && !isTerminalSensitiveInputActive(targetId),
           ));
         } else {
@@ -2551,7 +2539,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     // eligibility for it.
     if (focusedSensitive || anyRecipientSensitive) return false;
     return delivered;
-  }, [isBroadcastEnabled, isComposeSendToAll, terminalBackend]);
+  }, [isBroadcastEnabled, terminalBackend]);
 
   const sessionLogConfig = useMemo(
     () => ({
@@ -2676,11 +2664,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     restoreTerminalCwd,
     identities,
     isBroadcastEnabled,
-    isComposeSendToAll,
-    onToggleComposeSendTarget,
     isGlobalBroadcastEnabled,
-    isGlobalComposeSendToAll,
-    onToggleGlobalComposeSendTarget,
     canUseGlobalBroadcast,
     isComposeBarOpen,
     keyBindings,

components/TerminalPopupPage.tsx

@@ -286,7 +286,7 @@ function TerminalPopupPageInner({
     groupConfigs,
     updateKnownHosts,
     deleteSelectedSnippets,
-  } = useVaultState({ syncConnectionLogTerminalData: false });
+  } = useVaultState();
   const [config, setConfig] = useState<TerminalPopupPayload | null>(null);
   const [terminalReady, setTerminalReady] = useState(false);
   const [startupError, setStartupError] = useState<string | null>(null);

components/TopTabs.test.ts

@@ -281,75 +281,6 @@ test("duplicate double-click behavior falls back to copying when unavailable", (
   assert.deepEqual(copiedSessionIds, ["session-1"]);
 });
 
-test("draggable top-tab close buttons cancel the drag gesture on mousedown", () => {
-  const closeButtonLabels = [
-    "tabs.closePluginViewAria",
-    "Close editor tab",
-    "tabs.closeSessionAria",
-    "tabs.closeLogViewAria",
-  ];
-
-  for (const label of closeButtonLabels) {
-    const labelIndex = topTabItemsSource.indexOf(label);
-    assert.notEqual(labelIndex, -1, `missing close label ${label}`);
-    const buttonStart = topTabItemsSource.lastIndexOf("<button", labelIndex);
-    const buttonEnd = topTabItemsSource.indexOf(">", labelIndex);
-    const openingTag = topTabItemsSource.slice(buttonStart, buttonEnd);
-    assert.match(
-      openingTag,
-      /onMouseDown=\{handleTabCloseButtonMouseDown\}/,
-      `${label} close button must guard mousedown`,
-    );
-  }
-
-  assert.equal(
-    topTabItemsSource.match(/onMouseDown=\{handleTabCloseButtonMouseDown\}/g)?.length,
-    4,
-  );
-
-  const workspaceSource = topTabItemsSource.slice(
-    topTabItemsSource.indexOf("export const WorkspaceTopTab"),
-    topTabItemsSource.indexOf("WorkspaceTopTab.displayName"),
-  );
-  assert.equal(workspaceSource.includes("handleTabCloseButtonMouseDown"), false);
-  assert.equal(workspaceSource.includes("<button"), false);
-});
-
-test("draggable top tab roots activate sub-threshold presses and still reorder past the threshold", () => {
-  const tabTypes = ["plugin-view", "editor", "session", "workspace", "logView"];
-
-  for (const tabType of tabTypes) {
-    const marker = `data-tab-type="${tabType}"`;
-    const start = topTabItemsSource.indexOf(marker);
-    assert.notEqual(start, -1, marker);
-    const classNameAt = topTabItemsSource.indexOf("className={cn(", start);
-    assert.notEqual(classNameAt, -1, tabType);
-    const openingHandlers = topTabItemsSource.slice(start, classNameAt);
-    assert.match(openingHandlers, /onMouseDown=\{handleTabDragThresholdMouseDown\}/, tabType);
-    assert.match(openingHandlers, /onMouseUp=\{\(event\) => handleTabDragThresholdRelease\(event,/, tabType);
-    assert.match(
-      openingHandlers,
-      /onDragStart=\{\(event\) => \{\s*handleTabDragThresholdDragStart\(event\);\s*onTabDragStart\(event,/,
-      tabType,
-    );
-    assert.match(
-      openingHandlers,
-      /onDrag=\{\(event\) => \{\s*if \(!handleTabDragThresholdDrag\(event\)\) return;\s*onTabDragStart\(event,/,
-      tabType,
-    );
-    assert.match(
-      openingHandlers,
-      /onDragEnd=\{\(event\) => \{\s*handleTabDragThresholdRelease\(event,[\s\S]*?onTabDragEnd\(\);\s*\}\}/,
-      tabType,
-    );
-    assert.equal(openingHandlers.includes("handleTabCloseButtonMouseDown"), false, tabType);
-    assert.equal(openingHandlers.includes("preventDefault"), false, tabType);
-  }
-
-  assert.equal(topTabItemsSource.match(/onMouseDown=\{handleTabMiddleMouseDown\}/g)?.length ?? 0, 0);
-  assert.equal(topTabItemsSource.match(/handleTabDragThresholdRelease\(/g)?.length, 10);
-});
-
 test("session close button double click stays on the close button", () => {
   let stopPropagationCount = 0;
 

components/TopTabs.tsx

@@ -24,7 +24,6 @@ import { useWindowControls } from '../application/state/useWindowControls';
 import { useSettingsChromeStore } from '../application/state/settingsChromeStore';
 import { useI18n } from '../application/i18n/I18nProvider';
 import { Host, TerminalSession, Workspace } from '../types';
-import { isTabDragReorderStarted } from '../lib/tabInteractions';
 import { cn } from '../lib/utils';
 import { Button } from './ui/button';
 import { ContextMenuItem, ContextMenuSeparator } from './ui/context-menu';
@@ -521,20 +520,14 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
   ]);
 
   const handleTabDragStart = useCallback((e: React.DragEvent, tabId: string) => {
-    // Payload must be written on the original dragstart. A slow reorder calls
-    // this again from `drag`, when DataTransfer is already read-only.
-    try {
-      e.dataTransfer.effectAllowed = 'move';
-      e.dataTransfer.setData('tab-reorder-id', tabId);
-      // Also set session-id for backward compatibility with workspace split functionality
-      // Only orphan sessions can be dragged to create workspaces
-      if (orphanSessionMap.has(tabId)) {
-        e.dataTransfer.setData('session-id', tabId);
-      }
-    } catch (error) {
-      if (!(error instanceof DOMException)) throw error;
+    e.dataTransfer.effectAllowed = 'move';
+    e.dataTransfer.setData('tab-reorder-id', tabId);
+    // Also set session-id for backward compatibility with workspace split functionality
+    // Only orphan sessions can be dragged to create workspaces
+    const isOrphanSession = orphanSessionMap.has(tabId);
+    if (isOrphanSession) {
+      e.dataTransfer.setData('session-id', tabId);
     }
-    if (!isTabDragReorderStarted()) return;
     draggedTabIdRef.current = tabId;
     // Use setTimeout to allow the drag image to be captured before we change styles
     setTimeout(() => {

components/TrayPanel.tsx

@@ -148,7 +148,7 @@ const TrayPanelContent: React.FC = () => {
     onTrayPanelMenuData,
   } = useTrayPanelBackend();
 
-  const { hosts, knownHosts, updateKnownHosts } = useVaultState({ syncConnectionLogTerminalData: false });
+  const { hosts, knownHosts, updateKnownHosts } = useVaultState();
   // TrayPanel runs in its own BrowserWindow, so this hook's session state is
   // independent from (and typically empty compared to) the main App's — it's
   // used here only for its storage-sync side effects, never for closeSession.

components/ai/ChatInput.tsx

@@ -212,10 +212,6 @@ interface ChatInputProps {
   modelCatalogSource?: 'live' | 'last-known-good' | 'presets';
   /** ISO timestamp of the successful fetch backing `modelCatalogSource`. */
   modelCatalogFetchedAt?: string;
-  /** The catalog warning text behind the host's retry banner, when present. */
-  modelCatalogWarning?: string;
-  /** Manual refresh action for the picker's refresh button (force path). */
-  onRefreshModelCatalog?: () => void;
   /**
    * Offer the picker's "use custom model" action. Disable when the current
    * agent locks the model (e.g. managed Codex `model` config overrides the
@@ -290,8 +286,6 @@ const ChatInput: React.FC<ChatInputProps> = ({
   modelCatalogLoading = false,
   modelCatalogSource,
   modelCatalogFetchedAt,
-  modelCatalogWarning,
-  onRefreshModelCatalog,
   allowCustomModelEntry = true,
   selectedModelId,
   onModelSelect,
@@ -1614,8 +1608,6 @@ const ChatInput: React.FC<ChatInputProps> = ({
                     loading={!hasProviderSwitcher ? modelCatalogLoading : undefined}
                     catalogSource={!hasProviderSwitcher ? modelCatalogSource : undefined}
                     catalogFetchedAt={!hasProviderSwitcher ? modelCatalogFetchedAt : undefined}
-                    catalogWarning={!hasProviderSwitcher ? modelCatalogWarning : undefined}
-                    onRefreshCatalog={!hasProviderSwitcher ? onRefreshModelCatalog : undefined}
                     allowCustomEntry={allowCustomModelEntry}
                     prefs={modelPrefs}
                     onSelectProviderModel={(providerId, modelId, contextWindow) => {
@@ -1832,8 +1824,6 @@ function chatInputPropsAreEqual(prev: ChatInputProps, next: ChatInputProps): boo
     && prev.modelCatalogLoading === next.modelCatalogLoading
     && prev.modelCatalogSource === next.modelCatalogSource
     && prev.modelCatalogFetchedAt === next.modelCatalogFetchedAt
-    && prev.modelCatalogWarning === next.modelCatalogWarning
-    && prev.onRefreshModelCatalog === next.onRefreshModelCatalog
     && prev.allowCustomModelEntry === next.allowCustomModelEntry
     && prev.selectedModelId === next.selectedModelId
     && prev.onModelSelect === next.onModelSelect

components/ai/ComposerModelPicker.test.tsx

@@ -156,36 +156,3 @@ test('external agent picker shows the loading row while the live catalog is pend
   // keeps built-in presets visible during loading and passes them through.
   assert.doesNotMatch(html, /gpt-5\.1/);
 });
-
-test('manual refresh button renders for any fetched catalog or warning and stays localized', () => {
-  const base = {
-    modelPresets: [{ id: 'm-1', name: 'M1' }],
-    selectedModelId: 'm-1',
-    prefs: { recent: [], pinned: [] },
-    onSelectModel: () => {},
-    onTogglePinned: () => {},
-  };
-  for (const [locale, refreshLabel] of [
-    ['en', 'Refresh model list'],
-    ['zh-CN', '刷新模型列表'],
-    ['zh-TW', '重新整理模型清單'],
-    ['es', 'Actualizar la lista de modelos'],
-    ['ru', 'Обновить список моделей'],
-  ]) {
-    const html = renderToStaticMarkup(
-      <I18nProvider locale={locale}>
-        <ComposerModelPicker {...base} catalogSource="last-known-good" onRefreshCatalog={() => {}} />
-      </I18nProvider>,
-    );
-    assert.ok(html.includes(`aria-label="${refreshLabel}"`));
-  }
-
-  // A plain preset list without a host refresh action stays buttonless.
-  assert.doesNotMatch(renderToStaticMarkup(<ComposerModelPicker {...base} />), /refreshModelList/);
-
-  // A degraded preset serve (warning, no source) still offers the refresh.
-  const warned = renderToStaticMarkup(
-    <ComposerModelPicker {...base} catalogWarning="live fetch failed" onRefreshCatalog={() => {}} />,
-  );
-  assert.match(warned, /aria-label="ai\.chat\.refreshModelList"/);
-});

components/ai/ComposerModelPicker.tsx

@@ -1,4 +1,4 @@
-import { Check, ChevronLeft, ChevronRight, Loader2, Pin, RotateCw, Search, Star } from 'lucide-react';
+import { Check, ChevronLeft, ChevronRight, Loader2, Pin, Search, Star } from 'lucide-react';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useI18n } from '../../application/i18n/I18nProvider';
 import {
@@ -37,18 +37,6 @@ export interface ComposerModelPickerProps {
   catalogSource?: 'live' | 'last-known-good' | 'presets';
   /** ISO timestamp of the successful fetch backing `catalogSource`. */
   catalogFetchedAt?: string;
-  /**
-   * The catalog warning text behind the host's retry banner, when present.
-   * Together with `catalogSource` it decides whether the manual refresh
-   * button renders: any fetched catalog (live or last-known-good) or a
-   * degraded preset fallback offers a refresh; a plain preset list does not.
-   */
-  catalogWarning?: string | null;
-  /**
-   * Manual refresh action (LKG-first policy: the picker hydrates from disk
-   * and the user refreshes explicitly). Triggers the host's force refresh.
-   */
-  onRefreshCatalog?: () => void;
   prefs: ComposerModelPrefs;
   /**
    * Offer the "use custom model" action. Disable when the host locks the
@@ -119,8 +107,6 @@ export const ComposerModelPicker: React.FC<ComposerModelPickerProps> = ({
   loading = false,
   catalogSource,
   catalogFetchedAt,
-  catalogWarning,
-  onRefreshCatalog,
   prefs,
   allowCustomEntry = true,
   onSelectProviderModel,
@@ -188,18 +174,6 @@ export const ComposerModelPicker: React.FC<ComposerModelPickerProps> = ({
       ? t('ai.chat.modelCatalogSourceCached').replace('{time}', time)
       : t('ai.chat.modelCatalogSourceCachedNoTime');
   }, [loading, catalogSource, catalogFetchedAt, t]);
-  // Manual refresh (LKG-first): offered whenever a fetched catalog (any
-  // source) or the degraded-preset warning is present. Hidden while loading —
-  // the spinner row is the in-flight feedback — and in provider mode, where
-  // neither a catalog chip nor a host refresh action exists.
-  const showRefreshButton = useMemo(() => (
-    !loading
-    && Boolean(onRefreshCatalog)
-    && (catalogSource === 'live'
-      || catalogSource === 'last-known-good'
-      || Boolean(catalogWarning))
-  ), [loading, onRefreshCatalog, catalogSource, catalogWarning]);
-  const refreshLabel = t('ai.chat.refreshModelList');
   // Manual model ids are accepted in both modes: provider-bound catalogs and
   // preset lists from external CLI agents whose catalogs lag new models.
   const showCustom = Boolean(
@@ -410,22 +384,9 @@ export const ComposerModelPicker: React.FC<ComposerModelPickerProps> = ({
         )}
       </div>
 
-      {(catalogChipText || showRefreshButton) && (
-        <div className="flex items-center gap-1 border-t border-border/40 px-2.5 py-1 text-[10px] text-muted-foreground/45">
-          {catalogChipText && (
-            <span className="min-w-0 flex-1 truncate" title={catalogChipText}>{catalogChipText}</span>
-          )}
-          {showRefreshButton && (
-            <button
-              type="button"
-              aria-label={refreshLabel}
-              title={refreshLabel}
-              onClick={onRefreshCatalog}
-              className="shrink-0 rounded p-0.5 text-muted-foreground/55 transition-colors hover:bg-muted/40 hover:text-foreground/75 cursor-pointer"
-            >
-              <RotateCw size={11} />
-            </button>
-          )}
+      {catalogChipText && (
+        <div className="border-t border-border/40 px-2.5 py-1 text-[10px] text-muted-foreground/45" title={catalogChipText}>
+          {catalogChipText}
         </div>
       )}
     </div>

components/aside-panel.test.ts

@@ -1,9 +1,7 @@
 import test from "node:test";
 import assert from "node:assert/strict";
-import React from "react";
-import { renderToStaticMarkup } from "react-dom/server";
 
-import { AsidePanel, invokeAsideActionMenuItemClick } from "./ui/aside-panel.tsx";
+import { invokeAsideActionMenuItemClick } from "./ui/aside-panel.tsx";
 
 test("AsideActionMenuItem closes its menu before running the action", () => {
   const events: string[] = [];
@@ -23,12 +21,3 @@ test("AsideActionMenuItem still closes when no action is provided", () => {
 
   assert.deepEqual(events, ["close"]);
 });
-
-test("overlay aside panels ask native views to yield; inline panels do not", () => {
-  const render = (layout: "overlay" | "inline") => renderToStaticMarkup(
-    React.createElement(AsidePanel, { open: true, onClose: () => {}, layout, children: "content" }),
-  );
-
-  assert.match(render("overlay"), /data-native-view-occluder=""/);
-  assert.doesNotMatch(render("inline"), /data-native-view-occluder/);
-});

components/settings/tabs/ai/types.ts

@@ -158,7 +158,7 @@ export interface NetcattyAiBridge {
   aiCodexCancelLogin?: (sessionId: string) => Promise<{ ok: boolean; found?: boolean; session?: CodexLoginSession; error?: string }>;
   aiCodexLogout?: (options?: { codexPath?: string; agentEnv?: Record<string, string> }) => Promise<{ ok: boolean; state?: CodexIntegrationState; isConnected?: boolean; rawOutput?: string; logoutOutput?: string; error?: string }>;
   aiResolveCli?: (params: { command: string; customPath?: string; refreshShellEnv?: boolean; apiKeyPresent?: boolean }) => Promise<AgentPathInfo>;
-  aiSdkAgentListModels?: (sdkBackend: string, cwd?: string, providerId?: string, chatSessionId?: string, agentEnv?: Record<string, string>, agentCommand?: string, codexRuntime?: 'sdk' | 'app-server', force?: boolean) => Promise<{ ok: boolean; models?: Array<{ id: string; name: string; description?: string; thinkingLevels?: string[]; defaultThinkingLevel?: string }>; currentModelId?: string | null; warning?: string; source?: 'live' | 'last-known-good'; fetchedAt?: string; error?: string }>;
+  aiSdkAgentListModels?: (sdkBackend: string, cwd?: string, providerId?: string, chatSessionId?: string, agentEnv?: Record<string, string>, agentCommand?: string, codexRuntime?: 'sdk' | 'app-server') => Promise<{ ok: boolean; models?: Array<{ id: string; name: string; description?: string; thinkingLevels?: string[]; defaultThinkingLevel?: string }>; currentModelId?: string | null; warning?: string; source?: 'live' | 'last-known-good'; fetchedAt?: string; error?: string }>;
   codexAppServerGetStatus?: (agentCommand?: string, agentEnv?: Record<string, string>) => Promise<{ ok: boolean; available: boolean; error?: string }>;
   aiUserSkillsGetStatus?: () => Promise<UserSkillsStatusResult>;
   aiUserSkillsOpenFolder?: () => Promise<UserSkillsStatusResult>;

components/systemManager/DiskIoSummary.tsx

@@ -1,23 +0,0 @@
-import React from "react";
-import { useI18n } from "../../application/i18n/I18nProvider";
-
-function rate(value: number | null | undefined) {
-  if (value == null || !Number.isFinite(value) || value < 0) return "--";
-  if (value >= 1024 ** 2) return `${(value / 1024 ** 2).toFixed(1)} MiB/s`;
-  if (value >= 1024) return `${(value / 1024).toFixed(1)} KiB/s`;
-  return `${Math.round(value)} B/s`;
-}
-
-/** Same shared-sampler rates in monitor cards, tables, and terminal overview. */
-export function DiskIoSummary({ stats }: {
-  stats?: { diskReadSpeed?: number | null; diskWriteSpeed?: number | null } | null;
-}) {
-  const { t } = useI18n();
-  return (
-    <div data-disk-io className="flex flex-wrap gap-x-3 gap-y-0.5 text-[10px] tabular-nums text-muted-foreground" title={t("monitor.diskIoHint")}>
-      <span>{t("monitor.diskIo")}</span>
-      <span>{t("monitor.diskRead")} {rate(stats?.diskReadSpeed)}</span>
-      <span>{t("monitor.diskWrite")} {rate(stats?.diskWriteSpeed)}</span>
-    </div>
-  );
-}

components/systemManager/SystemOverviewTab.tsx

@@ -12,7 +12,6 @@ import { aggregateMountedDiskUsage } from '../../domain/systemDiskUsage';
 import { cn } from '../../lib/utils';
 import { useServerStats } from '../../application/state/useServerStats';
 import { ResourceBar } from './ResourceBar';
-import { DiskIoSummary } from './DiskIoSummary';
 import {
   SystemPanelEmpty,
   SystemPanelError,
@@ -336,8 +335,6 @@ export const SystemOverviewTab = memo(function SystemOverviewTab({
             />
           </div>
 
-          <div className="mt-3"><DiskIoSummary stats={stats} /></div>
-
           <div className="mt-3 grid grid-cols-2 gap-2">
             <InfoPill label={t('systemManager.overview.load')} value={formatLoad(stats.loadAverage)} />
             <InfoPill label={t('systemManager.overview.uptime')} value={formatDuration(stats.uptimeSeconds, t)} />

components/terminal/TerminalComposeBar.test.tsx

@@ -3,7 +3,6 @@ import test from 'node:test';
 import React from 'react';
 import { JSDOM } from 'jsdom';
 import { act, create, type ReactTestRenderer } from 'react-test-renderer';
-import { I18nProvider } from '../../application/i18n/I18nProvider';
 import { TerminalComposeBar } from './TerminalComposeBar';
 import { TooltipProvider } from '../ui/tooltip';
 import { getComposeBarHistory, pruneComposeBarHistory, recordComposeBarHistory } from '../../application/state/composeBarHistoryStore';
@@ -196,65 +195,3 @@ test('empty compose draft Enter reconnects; a typed draft still sends', async (t
 
   await act(async () => { root.unmount(); });
 });
-
-test('compose send target toggle shows all vs active without looking like broadcast when active', async (t) => {
-  const dom = new JSDOM('<!doctype html><html><body></body></html>', { url: 'http://localhost' });
-  const originals = new Map<string, PropertyDescriptor | undefined>();
-  for (const name of ['window', 'document', 'localStorage']) {
-    originals.set(name, Object.getOwnPropertyDescriptor(globalThis, name));
-    Object.defineProperty(globalThis, name, { configurable: true, value: dom.window[name as keyof Window] });
-  }
-  t.after(() => {
-    dom.window.close();
-    for (const [name, descriptor] of originals) {
-      if (descriptor) Object.defineProperty(globalThis, name, descriptor);
-      else Reflect.deleteProperty(globalThis, name);
-    }
-  });
-  Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
-  const toggles: string[] = [];
-  const render = (composeSendToAll: boolean) => (
-    <I18nProvider locale="en">
-      <TooltipProvider>
-        <TerminalComposeBar
-          sessionId="compose-target"
-          onSend={() => true}
-          onClose={() => {}}
-          isBroadcastEnabled
-          composeSendToAll={composeSendToAll}
-          onToggleComposeSendTarget={() => { toggles.push('toggle'); }}
-        />
-      </TooltipProvider>
-    </I18nProvider>
-  );
-  let root!: ReactTestRenderer;
-  await act(async () => {
-    root = create(render(true), { createNodeMock: (el) => (el.type === 'textarea' ? { focus() {} } : null) });
-  });
-  const button = root.root.findAll(
-    (node) => node.props?.['data-compose-send-target'] === 'all' || node.props?.['data-compose-send-target'] === 'active',
-  )[0];
-  assert.ok(button);
-  assert.equal(button.props['data-compose-send-target'], 'all');
-  assert.equal(button.props['aria-pressed'], true);
-  assert.match(String(button.props['aria-label']), /all sessions/i);
-  const pulsing = root.root.findAll((node) => typeof node.props?.className === 'string' && node.props.className.includes('animate-pulse'));
-  assert.ok(pulsing.length > 0);
-  await act(async () => {
-    button.props.onClick({
-      preventDefault() {},
-      stopPropagation() {},
-      defaultPrevented: false,
-      nativeEvent: { defaultPrevented: false },
-    });
-  });
-  assert.deepEqual(toggles, ['toggle']);
-  await act(async () => { root.update(render(false)); });
-  const active = root.root.findAll((node) => node.props?.['data-compose-send-target'] === 'active')[0];
-  assert.ok(active);
-  assert.equal(active.props['aria-pressed'], false);
-  assert.match(String(active.props['aria-label']), /active session/i);
-  const stillPulsing = root.root.findAll((node) => typeof node.props?.className === 'string' && node.props.className.includes('animate-pulse'));
-  assert.equal(stillPulsing.length, 0);
-  await act(async () => { root.unmount(); });
-});

components/terminal/TerminalComposeBar.tsx

@@ -280,9 +280,6 @@ export interface TerminalComposeBarProps {
   onSnippetClick?: (snippet: Snippet) => void;
   snippets?: Snippet[];
   isBroadcastEnabled?: boolean;
-  /** Compose-bar send target. Undefined follows toolbar broadcast. */
-  composeSendToAll?: boolean;
-  onToggleComposeSendTarget?: () => void;
   themeColors?: {
     background: string;
     foreground: string;
@@ -296,8 +293,6 @@ export const TerminalComposeBar: React.FC<TerminalComposeBarProps> = ({
   onSnippetClick,
   snippets = [],
   isBroadcastEnabled,
-  composeSendToAll,
-  onToggleComposeSendTarget,
   themeColors,
 }) => {
   const { t } = useI18n();
@@ -355,9 +350,8 @@ export const TerminalComposeBar: React.FC<TerminalComposeBarProps> = ({
     };
   }, [broadcastMenuAnchor]);
 
-  const sendToAll = composeSendToAll ?? Boolean(isBroadcastEnabled);
   const handleBroadcastContextMenu = useCallback((event: React.MouseEvent) => {
-    if (!isBroadcastEnabled && !sendToAll) return;
+    if (!isBroadcastEnabled) return;
     event.preventDefault();
     event.stopPropagation();
     setBroadcastMenuAnchor({
@@ -365,7 +359,7 @@ export const TerminalComposeBar: React.FC<TerminalComposeBarProps> = ({
       y: event.clientY,
       inTextarea: event.target instanceof Element && Boolean(event.target.closest('textarea')),
     });
-  }, [isBroadcastEnabled, sendToAll]);
+  }, [isBroadcastEnabled]);
 
   const handleComposeMenuEdit = useCallback(async (action: 'cut' | 'copy' | 'paste' | 'selectAll') => {
     setBroadcastMenuAnchor(null);
@@ -613,33 +607,14 @@ export const TerminalComposeBar: React.FC<TerminalComposeBarProps> = ({
 
       <div className="flex-1 min-h-0 px-3 pt-1.5 pb-2 flex flex-col">
         <div className="flex flex-1 min-h-0 items-start gap-1.5">
-          {(onToggleComposeSendTarget || sendToAll) && (
+          {isBroadcastEnabled && (
             <Tooltip>
               <TooltipTrigger asChild>
-                <button
-                  type="button"
-                  data-compose-send-target={sendToAll ? 'all' : 'active'}
-                  aria-pressed={sendToAll}
-                  aria-label={sendToAll
-                    ? t('terminal.composeBar.sendToAll')
-                    : t('terminal.composeBar.sendToActive')}
-                  className="flex items-center pt-0.5 flex-shrink-0 rounded-sm"
-                  onMouseDown={(event) => event.preventDefault()}
-                  onClick={() => onToggleComposeSendTarget?.()}
-                  onContextMenu={handleBroadcastContextMenu}
-                >
-                  <Radio
-                    size={14}
-                    className={sendToAll ? 'text-amber-400 animate-pulse' : undefined}
-                    style={sendToAll ? undefined : { color: theme.mutedFg }}
-                  />
-                </button>
+                <div className="flex items-center cursor-default pt-0.5 flex-shrink-0">
+                  <Radio size={14} className="text-amber-400 animate-pulse" />
+                </div>
               </TooltipTrigger>
-              <TooltipContent>
-                {sendToAll
-                  ? t('terminal.composeBar.broadcasting')
-                  : t('terminal.composeBar.sendToActive')}
-              </TooltipContent>
+              <TooltipContent>{t('terminal.composeBar.broadcasting')}</TooltipContent>
             </Tooltip>
           )}
 

components/terminal/TerminalContextMenu.sftp.test.tsx

@@ -1,123 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import { JSDOM } from 'jsdom';
-
-test('SFTP menu opens the clicked pane without a selection and is absent without a handler', async () => {
-  const dom = new JSDOM('<!doctype html><html><body><div id="root"></div></body></html>', {
-    pretendToBeVisual: true,
-    url: 'http://localhost',
-  });
-  const window = dom.window;
-  const previousGlobals = new Map<string, PropertyDescriptor | undefined>();
-  const installGlobal = (key: string, value: unknown) => {
-    previousGlobals.set(key, Object.getOwnPropertyDescriptor(globalThis, key));
-    Object.defineProperty(globalThis, key, {
-      configurable: true,
-      writable: true,
-      value,
-    });
-  };
-
-  class ResizeObserverStub {
-    observe() {}
-    unobserve() {}
-    disconnect() {}
-  }
-
-  installGlobal('window', window);
-  installGlobal('document', window.document);
-  installGlobal('navigator', window.navigator);
-  installGlobal('HTMLElement', window.HTMLElement);
-  installGlobal('HTMLInputElement', window.HTMLInputElement);
-  installGlobal('HTMLTextAreaElement', window.HTMLTextAreaElement);
-  installGlobal('Element', window.Element);
-  installGlobal('SVGElement', window.SVGElement);
-  installGlobal('Node', window.Node);
-  installGlobal('NodeFilter', window.NodeFilter);
-  installGlobal('MutationObserver', window.MutationObserver);
-  installGlobal('CustomEvent', window.CustomEvent);
-  installGlobal('DOMRect', window.DOMRect);
-  installGlobal('Event', window.Event);
-  installGlobal('KeyboardEvent', window.KeyboardEvent);
-  installGlobal('MouseEvent', window.MouseEvent);
-  installGlobal('getComputedStyle', window.getComputedStyle.bind(window));
-  installGlobal('requestAnimationFrame', window.requestAnimationFrame.bind(window));
-  installGlobal('cancelAnimationFrame', window.cancelAnimationFrame.bind(window));
-  installGlobal('ResizeObserver', ResizeObserverStub);
-  installGlobal('IS_REACT_ACT_ENVIRONMENT', true);
-
-  const { default: React, act } = await import('react');
-  const { createRoot } = await import('react-dom/client');
-  const { I18nProvider } = await import('../../application/i18n/I18nProvider.tsx');
-  const { TerminalContextMenu } = await import('./TerminalContextMenu.tsx');
-  const rootNode = window.document.getElementById('root');
-  assert.ok(rootNode);
-  const root = createRoot(rootNode);
-  const actions: string[] = [];
-
-  const openMenu = async (hostId: string) => {
-    const surface = window.document.querySelector<HTMLElement>(`[data-testid="${hostId}"]`);
-    assert.ok(surface);
-    await act(async () => {
-      surface.dispatchEvent(new window.MouseEvent('contextmenu', {
-        bubbles: true,
-        button: 2,
-        clientX: 20,
-        clientY: 20,
-      }));
-    });
-  };
-
-  const findMenuItem = (label: string): HTMLElement => {
-    const item = Array.from(window.document.querySelectorAll<HTMLElement>('[role="menuitem"]'))
-      .find((candidate) => candidate.textContent?.includes(label));
-    assert.ok(item, `${label} menu item should be visible`);
-    return item;
-  };
-
-  const renderPanes = async (enabled = true) => {
-    await act(async () => {
-      root.render(
-        <I18nProvider locale="zh-CN">
-          {['host-a', 'host-b'].map((hostId) => (
-            <TerminalContextMenu
-              key={hostId}
-              sessionId={hostId}
-              hostId={hostId}
-              status="connected"
-              hasSelection={false}
-              onOpenSftp={enabled ? () => actions.push(hostId) : undefined}
-            >
-              <div data-testid={hostId}>Terminal</div>
-            </TerminalContextMenu>
-          ))}
-        </I18nProvider>,
-      );
-    });
-  };
-
-  try {
-    await renderPanes();
-    for (const hostId of ['host-b', 'host-a', 'host-b']) {
-      await openMenu(hostId);
-      const item = findMenuItem('打开 SFTP');
-      assert.notEqual(item.getAttribute('aria-disabled'), 'true');
-      assert.equal(findMenuItem('复制').getAttribute('aria-disabled'), 'true');
-      await act(async () => item.click());
-      assert.equal(window.document.querySelector('[role="menu"]'), null);
-    }
-    assert.deepEqual(actions, ['host-b', 'host-a', 'host-b']);
-
-    await renderPanes(false);
-    await openMenu('host-a');
-    assert.equal(window.document.body.textContent?.includes('打开 SFTP'), false);
-  } finally {
-    await act(async () => root.unmount());
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    dom.window.close();
-    for (const [key, descriptor] of previousGlobals) {
-      if (descriptor) Object.defineProperty(globalThis, key, descriptor);
-      else delete (globalThis as Record<string, unknown>)[key];
-    }
-  }
-});

components/terminal/TerminalContextMenu.tsx

@@ -7,7 +7,6 @@ import {
   Copy,
   Download,
   Globe2,
-  FolderInput,
   Pencil,
   RefreshCcw,
   Sparkles,
@@ -68,7 +67,6 @@ export interface TerminalContextMenuProps {
   onReconnect?: () => void;
   onClose?: () => void;
   onOpenBrowser?: () => void;
-  onOpenSftp?: () => void;
   onSelectWord?: () => void;
   onAddSelectionToAI?: () => void;
   onRename?: () => void;
@@ -229,7 +227,6 @@ export const TerminalContextMenu: React.FC<TerminalContextMenuProps> = ({
   onReconnect,
   onClose,
   onOpenBrowser,
-  onOpenSftp,
   onSelectWord,
   onAddSelectionToAI,
   onRename,
@@ -416,14 +413,6 @@ export const TerminalContextMenu: React.FC<TerminalContextMenuProps> = ({
             {t('terminal.menu.selectAll')}
             <ContextMenuShortcut>{selectAllShortcut}</ContextMenuShortcut>
           </ContextMenuItem>
-          {onOpenSftp && (
-            <>
-              <ContextMenuSeparator />
-              <ContextMenuItem onClick={onOpenSftp}>
-                <FolderInput size={14} className="mr-2" /> {t('terminal.toolbar.openSftp')}
-              </ContextMenuItem>
-            </>
-          )}
           {onOpenBrowser && (
             <>
               <ContextMenuSeparator />

components/terminal/TerminalToolbar.test.ts

@@ -6,7 +6,7 @@ import { renderToStaticMarkup } from "react-dom/server";
 
 import { I18nProvider } from "../../application/i18n/I18nProvider.tsx";
 import type { Host } from "../../types.ts";
-import { TERMINAL_TOOLBAR_LAYOUT_DEFAULTS, TerminalToolbar } from "./TerminalToolbar.tsx";
+import { TerminalToolbar } from "./TerminalToolbar.tsx";
 
 const toolbarSource = readFileSync(new URL("./TerminalToolbar.tsx", import.meta.url), "utf8");
 
@@ -213,26 +213,3 @@ for (const host of [serialHost, pluginHost]) {
     assert.equal(renderToolbar(host).includes('aria-label="Open SFTP"'), false);
   });
 }
-
-test('open session log stays in the overflow menu until logging is active', () => {
-  assert.equal(TERMINAL_TOOLBAR_LAYOUT_DEFAULTS.placement.openSessionLog, 'collapse');
-  const hidden = renderToolbar(sshHost, 'disconnected', { onSessionLogAction: () => {} });
-  assert.doesNotMatch(hidden, /aria-label="Open session log"/);
-  assert.doesNotMatch(hidden, /Open session log/);
-
-  for (const status of ['connected', 'disconnected'] as const) {
-    const markup = renderToolbar(sshHost, status, {
-      onSessionLogAction: () => {},
-      canOpenSessionLog: true,
-    });
-    assert.doesNotMatch(markup, /aria-label="Open session log"/);
-    assert.doesNotMatch(markup, /aria-label="Session log actions"/);
-    assert.match(markup, /aria-label="More actions"/);
-  }
-  assert.match(toolbarSource, /case 'openSessionLog':/);
-  assert.match(toolbarSource, /data-session-log-submenu="true"/);
-  assert.match(toolbarSource, /terminal\.toolbar\.sessionLog\.menu/);
-  assert.match(toolbarSource, /terminal\.toolbar\.sessionLog\.\$\{action\}/);
-  assert.equal(toolbarSource.includes('rememberApplication'), false);
-  assert.equal(toolbarSource.includes('Open session log'), false);
-});

components/terminal/TerminalToolbar.tsx

@@ -6,8 +6,6 @@
 import {
   Check,
   ChevronRight,
-  ChevronDown,
-  FileSearch,
   Circle,
   Download,
   FileText,
@@ -27,7 +25,6 @@ import {
 } from 'lucide-react';
 import React, { useMemo, useState } from 'react';
 import { useI18n } from '../../application/i18n/I18nProvider';
-import type { SessionLogAction } from '../../application/state/sessionLogActions';
 import { useToolbarItemLayout } from '../../application/state/useToolbarItemLayout';
 import type { ToolbarItemLayoutDefaults } from '../../domain/toolbarItemLayout';
 import { STORAGE_KEY_TERMINAL_TOOLBAR_LAYOUT } from '../../infrastructure/config/storageKeys';
@@ -54,7 +51,6 @@ export const TERMINAL_TOOLBAR_ITEM_IDS = [
   'compose',
   'search',
   'sessionLog',
-  'openSessionLog',
   'scripts',
   'history',
   'configureOsc7',
@@ -77,7 +73,6 @@ export const TERMINAL_TOOLBAR_LAYOUT_DEFAULTS: ToolbarItemLayoutDefaults = {
     compose: 'show',
     search: 'show',
     sessionLog: 'show',
-    openSessionLog: 'collapse',
     scripts: 'show',
     history: 'collapse',
     configureOsc7: 'collapse',
@@ -119,9 +114,6 @@ export interface TerminalToolbarProps {
   // Manual session log
   showLogButton?: boolean;
   onToggleSessionLog?: () => void;
-  onSessionLogAction?: (action: SessionLogAction) => void;
-  /** Automatic logging is enabled, or this session has started a manual log. */
-  canOpenSessionLog?: boolean;
   isSessionLogging?: boolean;
   isSessionLogDisabled?: boolean;
   // Compose bar
@@ -160,8 +152,6 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
   onToggleSearch,
   showLogButton = false,
   onToggleSessionLog,
-  onSessionLogAction,
-  canOpenSessionLog = false,
   isSessionLogging = false,
   isSessionLogDisabled = false,
   isComposeBarOpen,
@@ -206,13 +196,12 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
   const pendingScriptDeleteCount = (pendingScriptDeleteIds ?? []).filter((id) =>
     snippets.some((snippet) => snippet.id === id),
   ).length;
-  // Overflow popover and its submenus are controlled so that picking an
-  // item closes the whole chain, and so the parent popover can ignore
-  // clicks that land in a submenu portal (otherwise the submenu click
-  // would read as "outside" and dismiss the parent).
+  // Overflow popover + encoding submenu are both controlled so that
+  // picking an encoding closes the whole chain, and so the parent popover
+  // can ignore clicks that land in the submenu portal (otherwise the
+  // submenu click would read as "outside" and dismiss the parent).
   const [overflowOpen, setOverflowOpen] = useState(false);
   const [encodingSubmenuOpen, setEncodingSubmenuOpen] = useState(false);
-  const [sessionLogSubmenuOpen, setSessionLogSubmenuOpen] = useState(false);
   const buttonBase =
     'h-6 w-6 p-0 shadow-none border-none text-[color:var(--terminal-toolbar-fg)] bg-transparent hover:bg-transparent';
 
@@ -259,7 +248,6 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
       ids.push('ymodemSend', 'ymodemReceive');
     }
     if (showLogButton) ids.push('sessionLog');
-    if (onSessionLogAction && canOpenSessionLog) ids.push('openSessionLog');
     if (historySupported) ids.push('history');
     if (onConfigureOsc7 && !hidesSftp) ids.push('configureOsc7');
     if (onStartRecording) ids.push('recording');
@@ -276,8 +264,6 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
     onSetTerminalEncoding,
     onStartRecording,
     showLogButton,
-    onSessionLogAction,
-    canOpenSessionLog,
   ]);
 
   const itemLabels = useMemo(
@@ -292,7 +278,6 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
       sessionLog: isSessionLogging
         ? t('terminal.toolbar.stopSessionLog')
         : t('terminal.toolbar.startSessionLog'),
-      openSessionLog: t('terminal.toolbar.sessionLog.menu'),
       scripts: t('terminal.toolbar.scripts'),
       history: t('terminal.toolbar.history'),
       configureOsc7: t('terminal.toolbar.configureOsc7'),
@@ -313,7 +298,6 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
       compose: <TextCursorInput size={14} />,
       search: <Search size={14} />,
       sessionLog: <FileText size={14} />,
-      openSessionLog: <FileSearch size={14} />,
       scripts: <Zap size={14} />,
       history: <History size={14} />,
       configureOsc7: <FolderSync size={14} />,
@@ -453,52 +437,6 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
     );
   }
 
-  const renderSessionLogSubmenu = () => {
-    if (!onSessionLogAction) return null;
-    return (
-      <Popover open={sessionLogSubmenuOpen} onOpenChange={setSessionLogSubmenuOpen}>
-        <PopoverTrigger asChild>
-          <button
-            type="button"
-            className={menuItemClass}
-            aria-haspopup="menu"
-            aria-expanded={sessionLogSubmenuOpen}
-          >
-            <FileSearch size={12} className="shrink-0" />
-            <span className="flex-1 text-left truncate">{t('terminal.toolbar.sessionLog.menu')}</span>
-            <ChevronRight size={12} className="shrink-0 text-muted-foreground" />
-          </button>
-        </PopoverTrigger>
-        <PopoverContent
-          data-session-log-submenu="true"
-          data-section="terminal-toolbar-menu"
-          className="w-56 p-1"
-          side="right"
-          align="start"
-          sideOffset={6}
-        >
-          {(['open', 'reveal', 'chooseApplication', 'systemDefault'] as const).map((action) => (
-            <button
-              key={action}
-              type="button"
-              className={menuItemClass}
-              onClick={() => {
-                onSessionLogAction(action);
-                setSessionLogSubmenuOpen(false);
-                setOverflowOpen(false);
-              }}
-            >
-              <FileSearch size={12} className="shrink-0" />
-              <span className="flex-1 text-left truncate">
-                {t(`terminal.toolbar.sessionLog.${action}`)}
-              </span>
-            </button>
-          ))}
-        </PopoverContent>
-      </Popover>
-    );
-  };
-
   const renderEncodingSubmenu = () => {
     if (!encodingSwitchSupported || !onSetTerminalEncoding) return null;
     return (
@@ -693,38 +631,6 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
             <TooltipContent side="bottom">{t('terminal.toolbar.searchTerminal')}</TooltipContent>
           </Tooltip>
         );
-      case 'openSessionLog':
-        return (
-          <div key={id} className="flex items-center gap-0.5">
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button type="button" variant="secondary" size="icon" className={buttonBase}
-                  aria-label={t('terminal.toolbar.openSessionLog')}
-                  onClick={() => onSessionLogAction?.('open')}>
-                  <FileSearch size={12} />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="bottom">{t('terminal.toolbar.openSessionLog')}</TooltipContent>
-            </Tooltip>
-            <Popover>
-              <PopoverTrigger asChild>
-                <Button type="button" variant="secondary" size="icon" className={cn(buttonBase, 'w-4')}
-                  aria-label={t('terminal.toolbar.sessionLogActions')}>
-                  <ChevronDown size={10} />
-                </Button>
-              </PopoverTrigger>
-              <PopoverContent align="end" className="w-56 p-1">
-                {(['reveal', 'chooseApplication', 'systemDefault'] as const).map(action => (
-                  <PopoverClose asChild key={action}>
-                    <button type="button" className={menuItemClass} onClick={() => onSessionLogAction?.(action)}>
-                      {t(`terminal.toolbar.sessionLog.${action}`)}
-                    </button>
-                  </PopoverClose>
-                ))}
-              </PopoverContent>
-            </Popover>
-          </div>
-        );
       case 'sessionLog':
         return (
           <Tooltip key={id}>
@@ -997,8 +903,6 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
             </button>
           </PopoverClose>
         );
-      case 'openSessionLog':
-        return <React.Fragment key={id}>{renderSessionLogSubmenu()}</React.Fragment>;
       case 'sessionLog':
         return (
           <PopoverClose asChild key={id}>
@@ -1116,10 +1020,7 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
             open={overflowOpen}
             onOpenChange={(open) => {
               setOverflowOpen(open);
-              if (!open) {
-                setEncodingSubmenuOpen(false);
-                setSessionLogSubmenuOpen(false);
-              }
+              if (!open) setEncodingSubmenuOpen(false);
             }}
           >
             <Tooltip>
@@ -1147,7 +1048,7 @@ export const TerminalToolbar: React.FC<TerminalToolbarProps> = ({
                 // "outside" this popover; without this guard a click
                 // in the submenu would dismiss the parent.
                 const target = e.target as Element | null;
-                if (target?.closest('[data-encoding-submenu="true"], [data-session-log-submenu="true"]')) {
+                if (target?.closest('[data-encoding-submenu="true"]')) {
                   e.preventDefault();
                 }
               }}

components/terminal/TerminalView.test.tsx

@@ -652,16 +652,6 @@ test("terminal boot is cancelable and closes eagerly on cleanup", () => {
   );
   // Owner panes close the pending backend; attach popups only dispose xterm.
   assert.match(neverConnectedBranch, /if \(!attachExistingSession\)/);
-  const emptySessionBranch = readFileSync(new URL("../Terminal.tsx", import.meta.url), "utf8");
-  const emptyStart = emptySessionBranch.indexOf("if (!closingSessionId)");
-  const emptyEnd = emptySessionBranch.indexOf("Observe/attach popups must not kill", emptyStart);
-  const emptyBranch = emptySessionBranch.slice(emptyStart, emptyEnd);
-  const attachGuardAt = emptyBranch.indexOf("if (attachExistingSession)");
-  const emptyCloseAt = emptyBranch.indexOf("terminalBackend.closeSession(");
-  assert.ok(
-    attachGuardAt !== -1 && emptyCloseAt !== -1 && attachGuardAt < emptyCloseAt,
-    "a second attach cleanup after sessionRef is cleared must not closeSession",
-  );
   assert.match(effectsSource, /let ownedRuntime:/);
   assert.match(
     cleanup,
@@ -741,11 +731,3 @@ test("terminal theme updates force xterm renderer to repaint immediately", () =>
   assert.match(schedulerSource, /term\.options\.theme = \{/);
   assert.match(schedulerSource, /forceSyncRenderAfterResize\(term\)/);
 });
-
-test("SFTP context action reuses the pane toolbar handler and its availability", () => {
-  const source = readFileSync(new URL("./TerminalView.tsx", import.meta.url), "utf8");
-  const terminalSource = readFileSync(new URL("../Terminal.tsx", import.meta.url), "utf8");
-  assert.match(source, /onOpenSftp=\{status === "connected" && !isSerialConnection && !host\?\.id\?\.startsWith\("serial-"\) && !isPluginHostProtocol\(host\?\.protocol\) \? ctx\.handleOpenSFTP : undefined\}/);
-  assert.match(terminalSource, /onOpenSFTP=\{handleOpenSFTP\}/);
-  assert.match(terminalSource, /<TerminalView ctx=\{\{[^\n]*handleOpenSFTP,/);
-});

components/terminal/TerminalView.tsx

@@ -390,7 +390,7 @@ function terminalViewCtxEqual(
 }
 
 function TerminalViewInner({ ctx, isPaneMagnified = false }: { ctx: TerminalViewContext; isPaneMagnified?: boolean }) {
-  const { Activity, Button, Clock3, Copy, Maximize2, Radio, RefreshCcw, SquareArrowOutUpRight, TerminalAutocomplete, TerminalComposeBar, TerminalConnectionDialog, TerminalContextMenu, TerminalSearchBar, Tooltip, TooltipContent, TooltipTrigger, Unplug, ZmodemOverwriteDialog, ZmodemProgressIndicator, auth, autocompleteAcceptTextRef, autocompleteCloseRef, autocompleteHostOs, autocompleteInputRef, autocompleteKeyEventRef, autocompleteRepositionRef, autocompleteSettings, canUpdateHost, chainProgress, cn, compactToolbar, lineTimestampsAvailable, containerRef, effectiveFontSize, effectiveFontWeight, effectiveTerminalProtocol, effectiveTheme, error, executeSnippet, executeSnippetCommand, handleAddSelectionToAI, handleCancelConnect, handleCloseDisconnectedSession, handleCloseSearch, handleDisconnect, handleDismissDisconnectedDialog, handleDragEnter, handleDragLeave, handleDragOver, handleDrop, handleFindNext, handleFindPrevious, handleHostKeyAddAndContinue, handleHostKeyClose, handleHostKeyContinue, handleOsc52ReadResponse, handleOsc7SetupConfirm, handleOsc7SetupOpenChange, handleReceiveYmodem, handleRetry, handleSearch, handleSendYmodem, handleTopOverlayMouseDownCapture, hasMouseTracking, host, hotkeyScheme, inWorkspace, isBroadcastEnabled, composeSendToAll, onToggleComposeSendTarget, isCancelling, isComposeBarOpen, isConnectionAwaitingUserInput, isDraggingOver, isFocusMode, isFocusedPane, isLocalConnection, remoteDragDropUsesZmodem, isPluginTerminalProviderAvailable, isReconnectActive, isSerialConnection, isSearchOpen, isSupportedOs, isSystemSidebarEligible, isVisible, keyBindings, keys, identities, knownCwdRef, needsHostKeyVerification, onCloseSession, onDetach, onDetachPointerDown, onExpandToFocus, onTogglePaneMagnification, onOpenSystem, onRename, onSplitHorizontal, onSplitVertical, onToggleBroadcast, onUpdateHost, osc52ReadPromptVisible, osc7SetupOpen, osc7SetupRunning, passwordPromptActiveRef, pendingHostKeyInfo, progressLogs, progressValue, renderControls, resolvedFontFamily, restoreState, scriptExecutionOverlay, searchMatchCount, searchFocusToken, sessionDisplayName, sessionId, workspaceId, sessionRef, setIsComposeBarOpen, setShowLogs, shouldShowConnectionDialog, showDisconnectedTerminalNotice, showConnectionControls, showLogs, showSelectionAIAction, isRestoringSelectionRef, snippets, status, sudoHintRef, sudoHintText, passwordPickerState, onPasswordPickerSelect, passwordPickerTitle, passwordPickerEmptyText, t, termRef, terminalContextActions, terminalCwdTracker, terminalPreviewVars, terminalSettings, terminalReconnectAvailable, reconnectNoticeMessage, timeLeft, toast, zmodem } = ctx;
+  const { Activity, Button, Clock3, Copy, Maximize2, Radio, RefreshCcw, SquareArrowOutUpRight, TerminalAutocomplete, TerminalComposeBar, TerminalConnectionDialog, TerminalContextMenu, TerminalSearchBar, Tooltip, TooltipContent, TooltipTrigger, Unplug, ZmodemOverwriteDialog, ZmodemProgressIndicator, auth, autocompleteAcceptTextRef, autocompleteCloseRef, autocompleteHostOs, autocompleteInputRef, autocompleteKeyEventRef, autocompleteRepositionRef, autocompleteSettings, canUpdateHost, chainProgress, cn, compactToolbar, lineTimestampsAvailable, containerRef, effectiveFontSize, effectiveFontWeight, effectiveTerminalProtocol, effectiveTheme, error, executeSnippet, executeSnippetCommand, handleAddSelectionToAI, handleCancelConnect, handleCloseDisconnectedSession, handleCloseSearch, handleDisconnect, handleDismissDisconnectedDialog, handleDragEnter, handleDragLeave, handleDragOver, handleDrop, handleFindNext, handleFindPrevious, handleHostKeyAddAndContinue, handleHostKeyClose, handleHostKeyContinue, handleOsc52ReadResponse, handleOsc7SetupConfirm, handleOsc7SetupOpenChange, handleReceiveYmodem, handleRetry, handleSearch, handleSendYmodem, handleTopOverlayMouseDownCapture, hasMouseTracking, host, hotkeyScheme, inWorkspace, isBroadcastEnabled, isCancelling, isComposeBarOpen, isConnectionAwaitingUserInput, isDraggingOver, isFocusMode, isFocusedPane, isLocalConnection, remoteDragDropUsesZmodem, isPluginTerminalProviderAvailable, isReconnectActive, isSerialConnection, isSearchOpen, isSupportedOs, isSystemSidebarEligible, isVisible, keyBindings, keys, identities, knownCwdRef, needsHostKeyVerification, onCloseSession, onDetach, onDetachPointerDown, onExpandToFocus, onTogglePaneMagnification, onOpenSystem, onRename, onSplitHorizontal, onSplitVertical, onToggleBroadcast, onUpdateHost, osc52ReadPromptVisible, osc7SetupOpen, osc7SetupRunning, passwordPromptActiveRef, pendingHostKeyInfo, progressLogs, progressValue, renderControls, resolvedFontFamily, restoreState, scriptExecutionOverlay, searchMatchCount, searchFocusToken, sessionDisplayName, sessionId, workspaceId, sessionRef, setIsComposeBarOpen, setShowLogs, shouldShowConnectionDialog, showDisconnectedTerminalNotice, showConnectionControls, showLogs, showSelectionAIAction, isRestoringSelectionRef, snippets, status, sudoHintRef, sudoHintText, passwordPickerState, onPasswordPickerSelect, passwordPickerTitle, passwordPickerEmptyText, t, termRef, terminalContextActions, terminalCwdTracker, terminalPreviewVars, terminalSettings, terminalReconnectAvailable, reconnectNoticeMessage, timeLeft, toast, zmodem } = ctx;
   // Context menu only needs a snapshot at open; avoid selection state lifting into Terminal.
   const [contextMenuHasSelection, setContextMenuHasSelection] = useState(false);
   const isNetworkDevice = host.deviceType === 'network'
@@ -591,7 +591,6 @@ function TerminalViewInner({ ctx, isPaneMagnified = false }: { ctx: TerminalView
       onSaveScreen={terminalContextActions.onSaveScreen}
       onCopy={terminalContextActions.onCopy}
       onOpenBrowser={(!host?.protocol || ['ssh', 'mosh', 'local'].includes(host.protocol)) ? () => { void ctx.handleOpenHostBrowser(); } : undefined}
-      onOpenSftp={status === "connected" && !isSerialConnection && !host?.id?.startsWith("serial-") && !isPluginHostProtocol(host?.protocol) ? ctx.handleOpenSFTP : undefined}
       onPaste={terminalContextActions.onPaste}
       onUploadClipboardImage={status === "connected" ? terminalContextActions.onUploadClipboardImage : undefined}
       onPasteSelection={terminalContextActions.onPasteSelection}
@@ -1329,10 +1328,6 @@ function TerminalViewInner({ ctx, isPaneMagnified = false }: { ctx: TerminalView
                 let anyRecipientSensitive = false;
                 let broadcastRecipientIds: readonly string[] = [];
                 const sent = await executeSnippetCommand(text, false, {
-                  // Explicit target: active-only stays local while toolbar
-                  // broadcast (keystrokes) can remain on, and send-to-all
-                  // still fans out when the toolbar switch is off.
-                  broadcast: composeSendToAll ?? Boolean(isBroadcastEnabled),
                   onBroadcastDelivered: (sessionIds) => {
                     broadcastRecipientIds = sessionIds;
                     if (sessionIds.some((id) => isTerminalSensitiveInputActive(id))) {
@@ -1357,8 +1352,6 @@ function TerminalViewInner({ ctx, isPaneMagnified = false }: { ctx: TerminalView
               termRef.current?.focus();
             }}
             isBroadcastEnabled={isBroadcastEnabled}
-            composeSendToAll={composeSendToAll}
-            onToggleComposeSendTarget={onToggleComposeSendTarget}
             themeColors={effectiveTheme.colors}
           />
         )}

components/terminal/runtime/createTerminalSessionStarters.ts

@@ -1965,14 +1965,7 @@ export const createTerminalSessionStarters = (ctx: TerminalSessionStartersContex
               sessionId: ctx.sessionId,
               dataLength: terminalData.length,
             });
-            const pendingCapture: unknown = ctx.onTerminalDataCapture(ctx.sessionId, terminalData);
-            if (
-              pendingCapture !== undefined
-              && pendingCapture !== null
-              && typeof (pendingCapture as Promise<void>).then === "function"
-            ) {
-              await (pendingCapture as Promise<void>);
-            }
+            ctx.onTerminalDataCapture(ctx.sessionId, terminalData);
           } catch (err) {
             logger.warn("Failed to serialize terminal data:", err);
           }

components/terminal/runtime/createTerminalSessionStarters.types.ts

@@ -245,7 +245,7 @@ export type TerminalSessionStartersContext = {
   onSessionAttached?: (sessionId: string) => void;
   onRestoreCwdIntentConsumed?: (cwd: string) => void;
   onSessionExit?: (sessionId: string, evt: TerminalSessionExitEvent) => void;
-  onTerminalDataCapture?: (sessionId: string, data: string) => void | Promise<void>;
+  onTerminalDataCapture?: (sessionId: string, data: string) => void;
   onTerminalLogData?: (data: string) => void;
   onProgrammaticCommandLogRewrite?: (rewrite: ProgrammaticCommandLogRewrite) => void;
   onTerminalOutput?: (chunk: string, meta?: TerminalSessionDataMeta) => void;

components/terminal/runtime/terminalKeystrokeBroadcastGate.test.ts

@@ -1,41 +0,0 @@
-import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import test from "node:test";
-
-import { shouldBroadcastTerminalUserInput } from "./terminalUserPaste.ts";
-
-test("toolbar broadcast still fans terminal keystrokes out to peers", () => {
-  const term = {};
-  assert.equal(
-    shouldBroadcastTerminalUserInput(term, "ls", {
-      isBroadcastEnabled: true,
-      hasBroadcastInputHandler: true,
-    }),
-    true,
-  );
-  assert.equal(
-    shouldBroadcastTerminalUserInput(term, "ls", {
-      isBroadcastEnabled: false,
-      hasBroadcastInputHandler: true,
-    }),
-    false,
-  );
-});
-
-test("keystroke fan-out stays on the toolbar gate and ignores the compose-bar target", () => {
-  const runtime = readFileSync(new URL("./createXTermRuntime.ts", import.meta.url), "utf8");
-  assert.match(runtime, /isBroadcastEnabled: ctx\.isBroadcastEnabledRef\.current/);
-  assert.match(
-    runtime,
-    /onBroadcastInput\?\.\(broadcastData, ctx\.sessionId, sensitive \? \{ sourceSensitive: true \} : undefined\)/,
-  );
-  assert.doesNotMatch(runtime, /composeSendToAll|composePeerFanOut/);
-
-  const layer = readFileSync(new URL("../../TerminalLayer.tsx", import.meta.url), "utf8");
-  assert.match(layer, /includeGlobalPeersWithoutToolbar: options\?\.composePeerFanOut === true/);
-  const keystrokeCall = layer.slice(
-    layer.indexOf("const handleBroadcastInput"),
-    layer.indexOf("const handleCommandSubmitted"),
-  );
-  assert.doesNotMatch(keystrokeCall, /isComposeSendToAll/);
-});

components/terminal/runtime/terminalOutputHistory.ts

@@ -475,10 +475,6 @@ export const createTerminalOutputHistoryPreview = (options?: {
   // mark / trailing surrogate in the next) while xterm's grapheme provider
   // joins them across writes, so the next span must be able to rejoin it.
   let openGrapheme: string | null = null;
-  // When set, `openGrapheme` still holds the whole non-ASCII piece the last
-  // append wrote; its last grapheme is only segmented out when a following
-  // span actually tries to rejoin it (rare), not on every append.
-  let openGraphemeUnresolved = false;
   let openGraphemeCell = 0;
   let cacheDirty = true;
   let cacheCols = -1;
@@ -555,10 +551,6 @@ export const createTerminalOutputHistoryPreview = (options?: {
       && cursor === current.length
       && cursorCell === openGraphemeCell
     ) {
-      if (openGraphemeUnresolved) {
-        openGrapheme = lastGraphemeUnits(openGrapheme);
-        openGraphemeUnresolved = false;
-      }
       const probeEnd = Math.min(span.length, WRAP_PROBE_UTF16_UNITS);
       const head = openGrapheme + span.slice(0, probeEnd);
       let first = firstGraphemeUnits(head);
@@ -711,9 +703,7 @@ export const createTerminalOutputHistoryPreview = (options?: {
       // clusters and corrupt the transcript, while a boundary-aligned cut
       // keeps every piece's segmentation identical to the span's.
       let pieceEnd = offset + (maxChars - current.length);
-      // A remainder no longer than the cap needs no boundary search: the
-      // segment walk below would consume all of it and cut at its end.
-      if (pieceEnd - offset > pieceCap && span.length - offset > pieceCap) {
+      if (pieceEnd - offset > pieceCap) {
         const window = span.slice(offset, offset + pieceCap + WRAP_PROBE_UTF16_UNITS);
         let cutLength = 0;
         let end = window.length;
@@ -804,8 +794,7 @@ export const createTerminalOutputHistoryPreview = (options?: {
         // continuing it (a split cluster) can be rejoined (see writeSpan).
         // An empty open grapheme would corrupt the join, so track null then.
         openGrapheme = !fitting ? null
-          : pieceAscii ? fitting.slice(-1) : fitting;
-        openGraphemeUnresolved = !!fitting && !pieceAscii;
+          : isAsciiOnly(fitting) ? fitting.slice(-1) : lastGraphemeUnits(fitting);
         openGraphemeCell = cursorCell;
       }
       cursor = appending ? current.length

components/terminal/runtime/terminalSessionAttachment.ts

@@ -1000,14 +1000,7 @@ export const attachSessionToTerminal = (
       try {
         await ctx.prepareKeywordHighlightSerialization?.();
         const terminalData = ctx.serializeAddonRef.current.serialize();
-        const pendingCapture: unknown = ctx.onTerminalDataCapture(ctx.sessionId, terminalData);
-        if (
-          pendingCapture !== undefined
-          && pendingCapture !== null
-          && typeof (pendingCapture as Promise<void>).then === "function"
-        ) {
-          await (pendingCapture as Promise<void>);
-        }
+        ctx.onTerminalDataCapture(ctx.sessionId, terminalData);
       } catch (err) {
         logger.warn("Failed to serialize terminal data:", err);
       }

components/terminal/terminalHelpers.ts

@@ -48,11 +48,6 @@ export interface TerminalBroadcastInputOptions {
    * the dispatcher tags the payload sourceSensitive.
    */
   sensitive?: boolean;
-  /**
-   * Compose-bar send-to-all for orphan sessions while the toolbar broadcast
-   * switch stays off. Keystroke fan-out never sets this.
-   */
-  composePeerFanOut?: boolean;
   /**
    * Observer for the sessions that actually received the payload (#3491):
    * the solo compose bar uses it to detect a fan-out delivered into a peer's
@@ -203,7 +198,7 @@ export interface TerminalProps {
   onTerminalFontSizeChange?: (fontSize: number) => void;
   onStatusChange?: (sessionId: string, status: TerminalSession["status"], sftpHost?: Host) => void;
   onSessionExit?: (sessionId: string, evt: TerminalSessionExitEvent) => void;
-  onTerminalDataCapture?: (sessionId: string, data: string) => void | Promise<void>;
+  onTerminalDataCapture?: (sessionId: string, data: string) => void;
   onOsDetected?: (hostId: string, distro: string) => void;
   onCloseSession?: (sessionId: string) => void;
   onUpdateHost?: (host: Host) => void;
@@ -241,9 +236,6 @@ export interface TerminalProps {
   onOpenTheme?: () => void;
   onOpenSystem?: () => void;
   isBroadcastEnabled?: boolean;
-  /** Compose-bar send target for solo sessions. Workspace compose lives on the layer. */
-  composeSendToAll?: boolean;
-  onToggleComposeSendTarget?: () => void;
   onToggleBroadcast?: () => void;
   onToggleComposeBar?: () => void;
   isWorkspaceComposeBarOpen?: boolean;

components/terminal/terminalMemo.ts

@@ -54,8 +54,6 @@ export const terminalPropsAreEqual = (
   && prev.disableTerminalFontZoom === next.disableTerminalFontZoom
   && prev.keyBindings === next.keyBindings
   && prev.isBroadcastEnabled === next.isBroadcastEnabled
-  && prev.composeSendToAll === next.composeSendToAll
-  && prev.onToggleComposeSendTarget === next.onToggleComposeSendTarget
   && prev.isWorkspaceComposeBarOpen === next.isWorkspaceComposeBarOpen
   && prev.sessionLog === next.sessionLog
   && prev.sshDebugLogEnabled === next.sshDebugLogEnabled

components/terminal/terminalTabVisibilityRecovery.behavior.test.ts

@@ -1,182 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any, react-hooks/exhaustive-deps */
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import React from 'react';
-import { act, create, type ReactTestRenderer } from 'react-test-renderer';
-import { useTerminalEffects } from './useTerminalEffects';
-import { TERMINAL_SESSION_RESTORE_FOCUS_EVENT } from './focusTerminalSession';
-
-// Exercise the real hook's reveal and settling effects. The injected effect
-// hooks omit unrelated backend/auth/font setup; no recovery logic is copied.
-function visibilityEffect(effect: React.EffectCallback) {
-  const body = effect.toString();
-  return body.includes('const becameVisible')
-    || (/hiddenAtRef\.current\s*=\s*Date\.now\(\)/.test(body))
-    || ((/hiddenAtRef\.current\s*=\s*null/.test(body)) && body.includes('const timer'))
-    || (body.includes('const timer1') && body.includes('const timer2'))
-    || body.includes('const handleRestoreFocus')
-    || body.includes('const recoverTerminalOnAppResume');
-}
-
-function harness(t: any, initiallyHasRuntime = true) {
-  (globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
-  let now = 10_000;
-  let nextId = 0;
-  const timers = new Map<number, { at: number; run: () => void }>();
-  const schedule = (run: () => void, delay = 0) => {
-    const id = ++nextId;
-    timers.set(id, { at: now + delay, run });
-    return id;
-  };
-  t.mock.method(Date, 'now', () => now);
-  t.mock.method(globalThis, 'setTimeout', schedule);
-  t.mock.method(globalThis, 'clearTimeout', (id: number) => timers.delete(id));
-  const win = new EventTarget();
-  const doc = Object.assign(new EventTarget(), { visibilityState: 'visible', querySelector: () => null });
-  let fullscreen: ((value: boolean) => void) | undefined;
-  let renderer: ReactTestRenderer;
-  const documentBefore = Object.getOwnPropertyDescriptor(globalThis, 'document');
-  Object.defineProperty(globalThis, 'document', { configurable: true, value: doc });
-  const windowBefore = Object.getOwnPropertyDescriptor(globalThis, 'window');
-  Object.defineProperty(globalThis, 'window', { configurable: true, value: Object.assign(win, { setTimeout: schedule }) });
-  t.after(() => {
-    if (renderer) act(() => renderer.unmount());
-    if (documentBefore) Object.defineProperty(globalThis, 'document', documentBefore);
-    else delete (globalThis as any).document;
-    if (windowBefore) Object.defineProperty(globalThis, 'window', windowBefore);
-    else delete (globalThis as any).window;
-  });
-  const fitTimes: number[] = [];
-  const calls = { ensure: 0, clear: 0, fit: 0, forcedFit: 0, render: 0, focus: 0 };
-  const term = { options: {}, focus() { calls.focus++; }, rows: 24, cols: 80, buffer: { active: { type: 'normal' } }, scrollToBottom() {}, _core: { _renderService: { _renderRows() { calls.render++; } } } };
-  const runtime = { ensureWebglRenderer() { calls.ensure++; }, clearTextureAtlas() { calls.clear++; } };
-  const values: Record<string, any> = {
-    host: { id: 'host', protocol: 'ssh' }, auth: {}, zmodem: {}, effectiveTheme: { id: 'theme', colors: {} },
-    terminalSettings: {}, terminalSettingsRef: { current: {} },
-    terminalBackend: { onWindowFullScreenChanged(callback: (value: boolean) => void) { fullscreen = callback; return () => { fullscreen = undefined; }; } },
-    pluginDecorationRules: [], sessionId: 'session', paneLayoutKey: 'layout',
-    isVisible: false, isVisibleRef: { current: false }, splitResizeActive: false, inWorkspace: false,
-    termRef: { current: initiallyHasRuntime ? term : null }, xtermRuntimeRef: { current: initiallyHasRuntime ? runtime : null },
-    fitAddonRef: { current: {} }, sessionRef: { current: 'pty' },
-    containerRef: { current: { clientWidth: 800, clientHeight: 480 } },
-    lastFittedSizeRef: { current: { width: 800, height: 480 } }, pendingOutputScrollRef: { current: false },
-    safeFit(options: any) {
-      calls.fit++;
-      fitTimes.push(now);
-      if (options?.force) calls.forcedFit++;
-      const container = values.containerRef.current;
-      values.lastFittedSizeRef.current = { width: container.clientWidth, height: container.clientHeight };
-    },
-    forceSyncRenderAfterResize() { calls.render++; }, resizeSession() {},
-    useEffect(effect: React.EffectCallback, deps: React.DependencyList) {
-      React.useEffect(visibilityEffect(effect) ? effect : () => {}, deps);
-    },
-    useLayoutEffect(effect: React.EffectCallback, deps: React.DependencyList) {
-      React.useLayoutEffect(visibilityEffect(effect) ? effect : () => {}, deps);
-    },
-  };
-  const ctx = new Proxy(values, { get(target, key: string) {
-    if (!(key in target)) target[key] = key.endsWith('Ref') ? { current: null } : (() => {});
-    return target[key];
-  } });
-  function Component() { useTerminalEffects(ctx); return null; }
-  act(() => { renderer = create(React.createElement(Component)); });
-  function advance(ms: number) {
-    const end = now + ms;
-    while (true) {
-      const next = [...timers.entries()].filter(([, item]) => item.at <= end).sort((a, b) => a[1].at - b[1].at)[0];
-      if (!next) break;
-      now = next[1].at;
-      timers.delete(next[0]);
-      act(() => next[1].run());
-    }
-    now = end;
-  }
-  return { calls, fitTimes, advance, values,
-    focus() { const event = Object.assign(new Event(TERMINAL_SESSION_RESTORE_FOCUS_EVENT), { detail: { sessionId: 'session' } }); act(() => { win.dispatchEvent(event); }); },
-    resume() { act(() => { doc.dispatchEvent(new Event('visibilitychange')); }); },
-    fullscreen() { act(() => fullscreen?.(true)); },
-    reveal() { values.isVisible = true; values.isVisibleRef.current = true; act(() => renderer.update(React.createElement(Component))); },
-    publishRuntime() { values.termRef.current = term; values.xtermRuntimeRef.current = runtime; },
-  };
-}
-
-for (const hiddenMs of [2000, 4000]) {
-  test(`unchanged reveal after ${hiddenMs}ms does not repeat recovery in settling timers`, t => {
-    const h = harness(t);
-    h.advance(hiddenMs);
-    h.reveal();
-    assert.equal(h.calls.clear, hiddenMs >= 3000 ? 1 : 0);
-    h.advance(600);
-    assert.equal(h.calls.clear, hiddenMs >= 3000 ? 1 : 0);
-    assert.equal(h.calls.fit, 0);
-  });
-}
-
-test('late changed bounds still receive a settling fit', t => {
-  const h = harness(t);
-  h.advance(4000); h.reveal(); h.advance(200);
-  h.values.containerRef.current.clientHeight = 460;
-  h.advance(400);
-  assert.equal(h.calls.fit, 1);
-  assert.equal(h.calls.forcedFit, 0);
-  assert.deepEqual(h.values.lastFittedSizeRef.current, { width: 800, height: 460 });
-});
-
-test('runtime published after reveal still receives delayed recovery', t => {
-  const h = harness(t, false);
-  h.advance(4000); h.reveal();
-  assert.equal(h.calls.clear, 0);
-  h.advance(25); h.publishRuntime(); h.advance(575);
-  assert.equal(h.calls.ensure, 1);
-  assert.equal(h.calls.clear, 1);
-  assert.equal(h.calls.forcedFit, 1);
-});
-
-
-test('focus restoration and its 50ms retry do not refit unchanged bounds', t => {
-  const h = harness(t);
-  h.advance(4000); h.reveal(); h.advance(600);
-  h.focus(); h.advance(50); h.focus(); h.advance(500);
-  assert.equal(h.calls.focus, 2);
-  assert.equal(h.calls.fit, 0);
-  assert.equal(h.calls.clear, 1);
-});
-
-test('focus restoration still recovers changed bounds', t => {
-  const h = harness(t);
-  h.advance(4000); h.reveal(); h.advance(600);
-  h.values.containerRef.current.clientWidth = 780;
-  h.focus(); h.advance(50); h.focus(); h.advance(100);
-  assert.equal(h.calls.focus, 2);
-  assert.equal(h.calls.forcedFit, 2);
-  assert.deepEqual(h.values.lastFittedSizeRef.current, { width: 780, height: 480 });
-});
-
-for (const source of ['resume', 'fullscreen'] as const) {
-  test(`fitted focus retries preserve pending ${source} recovery timers`, t => {
-    const h = harness(t);
-    h.advance(4000); h.reveal(); h.advance(600);
-    h[source](); h.advance(0);
-    assert.equal(h.calls.forcedFit, 1);
-    h.focus(); h.advance(50); h.focus(); h.advance(500);
-    assert.equal(h.calls.focus, 2);
-    assert.equal(h.calls.forcedFit, 3, 'all three explicit recovery passes must survive focus retries');
-    assert.deepEqual(h.fitTimes.map(at => at - h.fitTimes[0]), source === 'resume' ? [0, 100, 300] : [0, 150, 400]);
-  });
-}
-
-for (const source of ['resume', 'fullscreen'] as const) {
-  test(`focus during changed bounds preserves pending ${source} settling passes`, t => {
-    const h = harness(t);
-    h.advance(4000); h.reveal(); h.advance(600);
-    h[source](); h.advance(0);
-    h.advance(50);
-    h.values.containerRef.current.clientWidth = 780;
-    h.focus(); h.advance(500);
-    assert.equal(h.calls.focus, 1);
-    assert.equal(h.calls.forcedFit, 3);
-    assert.deepEqual(h.fitTimes.map(at => at - h.fitTimes[0]), source === 'resume' ? [0, 100, 300] : [0, 150, 400]);
-    assert.equal(h.values.lastFittedSizeRef.current.width, 780);
-  });
-}

components/terminal/terminalTabVisibilityRecovery.test.ts

@@ -115,27 +115,6 @@ test('immediate tab recovery marks webgl recovery to skip the delayed duplicate
   );
   assert.match(
     source,
-    /if \(lastWebglRecoveryLayoutKeyRef\.current === paneLayoutKey\) \{/,
+    /lastWebglRecoveryLayoutKeyRef\.current === paneLayoutKey\s*&& hiddenMs < CSS_ONLY_TAB_REVEAL_MAX_HIDDEN_MS/,
   );
 });
-
-test('reveal does not claim recovery before the terminal runtime exists', () => {
-  const start = source.indexOf('const recoverTerminalAfterBecomeVisible = () => {');
-  const end = source.indexOf('// Refit synchronously', start);
-  const recovery = source.slice(start, end);
-  const runtimeGuard = recovery.indexOf('if (!termRef.current || !xtermRuntimeRef.current) return;');
-  const commit = recovery.indexOf('lastWebglRecoveryLayoutKeyRef.current = paneLayoutKey');
-  assert.ok(runtimeGuard >= 0 && runtimeGuard < commit);
-});
-
-test('settling tab-layout probes do not force a fit when bounds are unchanged', () => {
-  const start = source.indexOf('const refitSettledLayout = () => {');
-  const end = source.indexOf('}, [inWorkspace, isVisible]);', start);
-  const settling = source.slice(start, end);
-  assert.ok(start >= 0 && end > start);
-  assert.match(settling, /if \(!isVisibleRef\.current \|\| currentContainerSizeAlreadyFit\(\)\) return;/);
-  assert.match(settling, /safeFit\(\{ requireVisible: true \}\);/);
-  assert.doesNotMatch(settling, /force: true/);
-  assert.match(settling, /setTimeout\(refitSettledLayout, 100\)/);
-  assert.match(settling, /setTimeout\(refitSettledLayout, 350\)/);
-});

components/terminal/useTerminalEffects.ts

@@ -917,14 +917,8 @@ export function useTerminalEffects(ctx: TerminalEffectsContext) {
       bootAbort.abort();
       isBootActiveRef.current = false;
       if (hibernatedRef?.current) {
-        const pendingClose = forceCloseHibernatedSession?.() as void | Promise<void>;
-        if (pendingClose && typeof pendingClose.then === "function") {
-          void pendingClose.finally(() => {
-            disposeOwnedRuntime();
-          });
-        } else {
-          disposeOwnedRuntime();
-        }
+        forceCloseHibernatedSession?.();
+        disposeOwnedRuntime();
         return;
       }
 
@@ -952,20 +946,13 @@ export function useTerminalEffects(ctx: TerminalEffectsContext) {
         return;
       }
 
-      const persistCloseCapture = async (data: string, source: string, dataLength: number) => {
+      const persistCloseCapture = (data: string, source: string, dataLength: number) => {
         logger.info("[Terminal] Capturing data on unmount", {
           sessionId,
           source,
           dataLength,
         });
-        const pendingCapture: unknown = handleTerminalDataCaptureOnce(sessionId, data, { finalized: true });
-        if (
-          pendingCapture !== undefined
-          && pendingCapture !== null
-          && typeof (pendingCapture as Promise<void>).then === "function"
-        ) {
-          await (pendingCapture as Promise<void>);
-        }
+        handleTerminalDataCaptureOnce(sessionId, data, { finalized: true });
       };
 
       const term = termRef.current;
@@ -1004,7 +991,7 @@ export function useTerminalEffects(ctx: TerminalEffectsContext) {
           ? resolveConnectionLogCapturePayload(finalizeTerminalLogData)
           : null;
         if (connectionLogPayload) {
-          await persistCloseCapture(
+          persistCloseCapture(
             connectionLogPayload.data,
             connectionLogPayload.source,
             connectionLogPayload.data.length,
@@ -1031,7 +1018,7 @@ export function useTerminalEffects(ctx: TerminalEffectsContext) {
               return;
             }
             if (payload) {
-              await persistCloseCapture(payload.data, payload.source, payload.data.length);
+              persistCloseCapture(payload.data, payload.source, payload.data.length);
             }
             ownedRuntime = null;
             scheduleTerminalCloseTeardown(teardown);
@@ -1330,12 +1317,7 @@ export function useTerminalEffects(ctx: TerminalEffectsContext) {
       applyUserCursorBlinkPreference(term, terminalSettingsRef.current);
       if (hasOpenAppDialog()) return;
       term.focus();
-      // Tab focus retries do not imply a lost renderer or a changed layout.
-      // Leave explicit app-resume/fullscreen recovery timers untouched when
-      // these bounds are already fitted, or recovery is still settling.
-      if (!currentContainerSizeAlreadyFit() && layoutRecoveryTimersRef.current.length === 0) {
-        scheduleLayoutRecoveryRefit([0, 100]);
-      }
+      scheduleLayoutRecoveryRefit([0, 100]);
     };
 
     window.addEventListener(TERMINAL_SESSION_RESTORE_FOCUS_EVENT, handleRestoreFocus);
@@ -1405,9 +1387,6 @@ export function useTerminalEffects(ctx: TerminalEffectsContext) {
 
   const recoverTerminalAfterBecomeVisible = () => {
     flushTerminalWritesAfterBecomeVisible();
-    // A hidden pane can become visible before its asynchronous boot completes.
-    // Do not claim recovery until there is a runtime for the delayed pass to use.
-    if (!termRef.current || !xtermRuntimeRef.current) return;
 
     if (
       getHiddenDurationMs() < CSS_ONLY_TAB_REVEAL_MAX_HIDDEN_MS
@@ -1484,17 +1463,20 @@ export function useTerminalEffects(ctx: TerminalEffectsContext) {
   useEffect(() => {
     if (!isVisible) return;
 
+    const hiddenMs = hiddenAtRef.current
+      ? Date.now() - hiddenAtRef.current
+      : Number.POSITIVE_INFINITY;
     hiddenAtRef.current = null;
 
-    // The layout effect already recovers long hides as well as short ones.
-    // Repeating it here discards the freshly populated, potentially shared atlas.
-    if (lastWebglRecoveryLayoutKeyRef.current === paneLayoutKey) {
+    if (
+      lastWebglRecoveryLayoutKeyRef.current === paneLayoutKey
+      && hiddenMs < CSS_ONLY_TAB_REVEAL_MAX_HIDDEN_MS
+    ) {
       flushPendingOutputScroll();
       return;
     }
 
     const timer = setTimeout(() => {
-      if (!isVisibleRef.current || !termRef.current || !xtermRuntimeRef.current) return;
       lastWebglRecoveryLayoutKeyRef.current = paneLayoutKey;
       // A pane that mounted hidden deferred its WebGL renderer; create it now
       // that it's visible (no-op if already active or WebGL is disabled).
@@ -1705,16 +1687,14 @@ export function useTerminalEffects(ctx: TerminalEffectsContext) {
     // Fit twice: once after initial layout (100ms) and again after layout settles
     // (350ms) to handle race conditions during split operations where the container
     // dimensions may not be final on the first pass.
-    const refitSettledLayout = () => {
-      // Keep checking for late split/layout changes, but an unchanged tab does
-      // not need another forced fit (which clears its glyph atlas even when
-      // the row/column count is unchanged).
-      if (!isVisibleRef.current || currentContainerSizeAlreadyFit()) return;
+    const timer1 = setTimeout(() => {
       safeFit({ requireVisible: true });
       finishLayoutRecoveryAfterFit();
-    };
-    const timer1 = setTimeout(refitSettledLayout, 100);
-    const timer2 = setTimeout(refitSettledLayout, 350);
+    }, 100);
+    const timer2 = setTimeout(() => {
+      safeFit({ force: true, requireVisible: true });
+      finishLayoutRecoveryAfterFit();
+    }, 350);
     return () => { clearTimeout(timer1); clearTimeout(timer2); };
   }, [inWorkspace, isVisible]);
 

components/terminalLayer/TerminalLayerSupport.tsx

@@ -696,7 +696,7 @@ export interface TerminalLayerProps {
   onCommandExecuted?: (command: string, hostId: string, hostLabel: string, sessionId: string) => void;
   onDeleteShellHistoryEntry?: (entryId: string) => void;
   onClearCommandHistory?: () => void;
-  onTerminalDataCapture?: (sessionId: string, data: string) => void | Promise<void>;
+  onTerminalDataCapture?: (sessionId: string, data: string) => void;
   onCreateWorkspaceFromSessions: (baseSessionId: string, joiningSessionId: string, hint: Exclude<SplitHint, null>) => void;
   onAddSessionToWorkspace: (workspaceId: string, sessionId: string, hint: Exclude<SplitHint, null>) => void;
   onRequestAddToWorkspace?: (workspaceId: string) => void;
@@ -719,14 +719,10 @@ export interface TerminalLayerProps {
   onCreateLocalTerminal?: () => void;
   // Broadcast mode
   isBroadcastEnabled?: (workspaceId: string) => boolean;
-  isComposeSendToAll?: (workspaceId: string) => boolean;
-  onToggleComposeSendTarget?: (workspaceId: string) => void;
   isGlobalBroadcastEnabled?: boolean;
-  isGlobalComposeSendToAll?: boolean;
   canUseGlobalBroadcast?: boolean;
   onToggleBroadcast?: (workspaceId: string) => void;
   onToggleGlobalBroadcast?: () => void;
-  onToggleGlobalComposeSendTarget?: () => void;
   // SFTP side panel
   updateHosts: (hosts: Host[]) => void;
   updateSnippets?: (snippets: Snippet[]) => void;
@@ -819,7 +815,7 @@ interface TerminalPaneProps {
   onCloseSession: (sessionId: string) => void;
   onStatusChange: (sessionId: string, status: TerminalSession['status'], sftpHost?: Host) => void;
   onSessionExit: (sessionId: string, evt: TerminalSessionExitEvent) => void;
-  onTerminalDataCapture?: (sessionId: string, data: string) => void | Promise<void>;
+  onTerminalDataCapture?: (sessionId: string, data: string) => void;
   onOsDetected: (hostId: string, distro: string) => void;
   onUpdateHost: (host: Host) => void;
   onAddKnownHost?: (knownHost: KnownHost) => void;
@@ -828,12 +824,9 @@ interface TerminalPaneProps {
   onSetWorkspaceFocusedSession?: (workspaceId: string, sessionId: string) => void;
   onSplitSession?: (sessionId: string, direction: SplitDirection) => void;
   isBroadcastEnabled?: (workspaceId: string) => boolean;
-  isComposeSendToAll?: (workspaceId: string) => boolean;
   isGlobalBroadcastEnabled?: boolean;
-  isGlobalComposeSendToAll?: boolean;
   canUseGlobalBroadcast?: boolean;
   onToggleGlobalBroadcast?: () => void;
-  onToggleGlobalComposeSendTarget?: () => void;
   onBroadcastInput: (
     data: string,
     sourceSessionId: string,
@@ -959,12 +952,9 @@ const terminalPanePropsAreEqual = (
   prev.onSetWorkspaceFocusedSession === next.onSetWorkspaceFocusedSession &&
   prev.onSplitSession === next.onSplitSession &&
   prev.isBroadcastEnabled === next.isBroadcastEnabled &&
-  prev.isComposeSendToAll === next.isComposeSendToAll &&
   prev.isGlobalBroadcastEnabled === next.isGlobalBroadcastEnabled &&
-  prev.isGlobalComposeSendToAll === next.isGlobalComposeSendToAll &&
   prev.canUseGlobalBroadcast === next.canUseGlobalBroadcast &&
   prev.onToggleGlobalBroadcast === next.onToggleGlobalBroadcast &&
-  prev.onToggleGlobalComposeSendTarget === next.onToggleGlobalComposeSendTarget &&
   prev.onBroadcastInput === next.onBroadcastInput &&
   prev.onBroadcastInterruptPriorityChange === next.onBroadcastInterruptPriorityChange &&
   prev.onToggleWorkspaceComposeBar === next.onToggleWorkspaceComposeBar &&
@@ -1263,12 +1253,9 @@ const TerminalPane: React.FC<TerminalPaneProps> = memo(({
   onSetWorkspaceFocusedSession,
   onSplitSession,
   isBroadcastEnabled,
-  isComposeSendToAll,
   isGlobalBroadcastEnabled,
-  isGlobalComposeSendToAll,
   canUseGlobalBroadcast,
   onToggleGlobalBroadcast,
-  onToggleGlobalComposeSendTarget,
   onBroadcastInput,
   onBroadcastInterruptPriorityChange,
   onToggleWorkspaceComposeBar,
@@ -1498,12 +1485,6 @@ const TerminalPane: React.FC<TerminalPaneProps> = memo(({
   const broadcastEnabled = activeWorkspaceId
     ? !!isBroadcastEnabled?.(activeWorkspaceId)
     : (isGlobalBroadcastEnabled ?? false);
-  const composeSendToAll = activeWorkspaceId
-    ? !!isComposeSendToAll?.(activeWorkspaceId)
-    : !!isGlobalComposeSendToAll;
-  const toggleComposeSendTarget = !activeWorkspaceId && canUseGlobalBroadcast
-    ? onToggleGlobalComposeSendTarget
-    : undefined;
   const isHostEphemeral = !isSavedVaultHost(hostMap.get(host.id));
   const sessionAppearance = useMemo(
     () => resolveSessionAppearance({ host, isEphemeral: isHostEphemeral }),
@@ -1649,8 +1630,6 @@ const TerminalPane: React.FC<TerminalPaneProps> = memo(({
         onSplitHorizontal={onSplitSession ? splitHorizontalHandler : undefined}
         onSplitVertical={onSplitSession ? splitVerticalHandler : undefined}
         isBroadcastEnabled={broadcastEnabled}
-        composeSendToAll={inActiveWorkspace ? undefined : composeSendToAll}
-        onToggleComposeSendTarget={toggleComposeSendTarget}
         onToggleBroadcast={
           inActiveWorkspace
             ? workspaceBroadcastHandler
@@ -1658,7 +1637,7 @@ const TerminalPane: React.FC<TerminalPaneProps> = memo(({
         }
         onToggleComposeBar={inActiveWorkspace ? onToggleWorkspaceComposeBar : undefined}
         isWorkspaceComposeBarOpen={inActiveWorkspace ? isComposeBarOpen : undefined}
-        onBroadcastInput={onBroadcastInput}
+        onBroadcastInput={broadcastEnabled ? onBroadcastInput : undefined}
         onBroadcastInterruptPriorityChange={onBroadcastInterruptPriorityChange}
         onSnippetExecutorChange={onSnippetExecutorChange}
         onProgrammaticCommandLogRewriteChange={onProgrammaticCommandLogRewriteChange}
@@ -1738,7 +1717,7 @@ interface TerminalPanesHostProps {
   onCloseSession: (sessionId: string) => void;
   onStatusChange: (sessionId: string, status: TerminalSession['status'], sftpHost?: Host) => void;
   onSessionExit: (sessionId: string, evt: TerminalSessionExitEvent) => void;
-  onTerminalDataCapture?: (sessionId: string, data: string) => void | Promise<void>;
+  onTerminalDataCapture?: (sessionId: string, data: string) => void;
   onOsDetected: (hostId: string, distro: string) => void;
   onUpdateHost: (host: Host) => void;
   onAddKnownHost?: (knownHost: KnownHost) => void;
@@ -1747,12 +1726,9 @@ interface TerminalPanesHostProps {
   onSetWorkspaceFocusedSession?: (workspaceId: string, sessionId: string) => void;
   onSplitSession?: (sessionId: string, direction: SplitDirection) => void;
   isBroadcastEnabled?: (workspaceId: string) => boolean;
-  isComposeSendToAll?: (workspaceId: string) => boolean;
   isGlobalBroadcastEnabled?: boolean;
-  isGlobalComposeSendToAll?: boolean;
   canUseGlobalBroadcast?: boolean;
   onToggleGlobalBroadcast?: () => void;
-  onToggleGlobalComposeSendTarget?: () => void;
   onBroadcastInput: (
     data: string,
     sourceSessionId: string,
@@ -1840,12 +1816,9 @@ const terminalPanesHostPropsAreEqual = (
   if (prev.onSetWorkspaceFocusedSession !== next.onSetWorkspaceFocusedSession) return false;
   if (prev.onSplitSession !== next.onSplitSession) return false;
   if (prev.isBroadcastEnabled !== next.isBroadcastEnabled) return false;
-  if (prev.isComposeSendToAll !== next.isComposeSendToAll) return false;
   if (prev.isGlobalBroadcastEnabled !== next.isGlobalBroadcastEnabled) return false;
-  if (prev.isGlobalComposeSendToAll !== next.isGlobalComposeSendToAll) return false;
   if (prev.canUseGlobalBroadcast !== next.canUseGlobalBroadcast) return false;
   if (prev.onToggleGlobalBroadcast !== next.onToggleGlobalBroadcast) return false;
-  if (prev.onToggleGlobalComposeSendTarget !== next.onToggleGlobalComposeSendTarget) return false;
   if (prev.onBroadcastInput !== next.onBroadcastInput) return false;
   if (prev.onBroadcastInterruptPriorityChange !== next.onBroadcastInterruptPriorityChange) return false;
   if (prev.onToggleWorkspaceComposeBar !== next.onToggleWorkspaceComposeBar) return false;