From a4ef04ede39636e3d6c416e38e78d69e20619a2b Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Fri, 12 Jun 2026 07:34:46 +0800
Subject: [PATCH 01/28] feat(settings): add SSH host management

---
 .../test/webui/web-settings.test.mjs          |  132 +++
 crates/agent-gateway/web/src/App.tsx          |   11 +-
 .../web/src/components/icons.tsx              |    4 +
 .../web/src/components/ui/input.tsx           |    2 +-
 .../web/src/components/ui/textarea.tsx        |    2 +-
 crates/agent-gateway/web/src/i18n/config.ts   |  125 +-
 crates/agent-gateway/web/src/index.css        |   51 +
 .../web/src/lib/settings/index.ts             |  257 +++--
 .../web/src/lib/settings/storage.ts           |   10 +
 .../web/src/lib/settings/sync.ts              |  156 ++-
 crates/agent-gateway/web/src/lib/ssh/scan.ts  |  268 +++++
 .../web/src/pages/SettingsPage.tsx            |   20 +-
 .../web/src/pages/settings/SshSection.tsx     | 1019 +++++++++++++++++
 .../web/src/pages/settings/types.ts           |    1 +
 crates/agent-gui/src-tauri/src/commands/fs.rs |  186 +++
 .../src-tauri/src/commands/settings.rs        |  676 +++++++++++
 crates/agent-gui/src-tauri/src/lib.rs         |    3 +
 .../src-tauri/src/services/gateway.rs         |    6 +-
 .../src-tauri/src/services/gateway_bridge.rs  |  159 +--
 crates/agent-gui/src/App.tsx                  |   53 +-
 crates/agent-gui/src/components/icons.tsx     |    4 +
 crates/agent-gui/src/components/ui/input.tsx  |    2 +-
 .../agent-gui/src/components/ui/textarea.tsx  |    2 +-
 crates/agent-gui/src/i18n/config.ts           |  122 ++
 crates/agent-gui/src/index.css                |  118 ++
 crates/agent-gui/src/lib/settings/index.ts    |  138 ++-
 crates/agent-gui/src/lib/settings/storage.ts  |   10 +
 crates/agent-gui/src/lib/settings/sync.ts     |  131 +++
 crates/agent-gui/src/lib/ssh/scan.ts          |  268 +++++
 crates/agent-gui/src/pages/SettingsPage.tsx   |    9 +
 .../src/pages/settings/SshSection.tsx         | 1019 +++++++++++++++++
 crates/agent-gui/src/pages/settings/types.ts  |    1 +
 32 files changed, 4718 insertions(+), 247 deletions(-)
 create mode 100644 crates/agent-gateway/web/src/lib/ssh/scan.ts
 create mode 100644 crates/agent-gateway/web/src/pages/settings/SshSection.tsx
 create mode 100644 crates/agent-gui/src/lib/ssh/scan.ts
 create mode 100644 crates/agent-gui/src/pages/settings/SshSection.tsx

diff --git a/crates/agent-gateway/test/webui/web-settings.test.mjs b/crates/agent-gateway/test/webui/web-settings.test.mjs
index 60708b2e0..7fa3e37cd 100644
--- a/crates/agent-gateway/test/webui/web-settings.test.mjs
+++ b/crates/agent-gateway/test/webui/web-settings.test.mjs
@@ -259,6 +259,138 @@ test("gateway settings sync keeps remote connection local and syncs web terminal
   assert.deepEqual(payload.chatRuntimeControls, synced.chatRuntimeControls);
 });
 
+test("ssh settings sync redacts stored secrets and carries one-shot secret updates", () => {
+  installWindow();
+  const source = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "ssh-prod",
+          name: "Prod",
+          description: "Production jump host",
+          host: "prod.example.com",
+          port: 2222,
+          username: "deploy",
+          authType: "privateKey",
+          password: "ssh-password",
+          privateKey: "-----BEGIN OPENSSH PRIVATE KEY-----",
+          privateKeyPath: "~/.ssh/prod",
+          proxy: {
+            type: "http",
+            url: "http://127.0.0.1",
+            port: 1080,
+            username: "proxy-user",
+            password: "proxy-password",
+          },
+        },
+      ],
+    },
+  });
+
+  const redacted = settingsSync.redactSettingsForWebStorage(source);
+  assert.equal(redacted.ssh.hosts[0].password, "");
+  assert.equal(redacted.ssh.hosts[0].privateKey, "");
+  assert.equal(redacted.ssh.hosts[0].proxy.type, "http");
+  assert.equal(redacted.ssh.hosts[0].proxy.password, "");
+  assert.equal(redacted.ssh.hosts[0].passwordConfigured, true);
+  assert.equal(redacted.ssh.hosts[0].privateKeyConfigured, true);
+  assert.equal(redacted.ssh.hosts[0].proxy.passwordConfigured, true);
+
+  const publicPayload = settingsSync.buildGatewaySettingsSyncPayload(source);
+  assert.equal(publicPayload.ssh.hosts[0].password, "");
+  assert.equal(publicPayload.ssh.hosts[0].privateKey, "");
+  assert.equal(publicPayload.ssh.hosts[0].proxy.type, "http");
+  assert.equal(publicPayload.ssh.hosts[0].proxy.password, "");
+  assert.equal(publicPayload.ssh.hosts[0].passwordConfigured, true);
+  assert.equal(publicPayload.ssh.hosts[0].privateKeyConfigured, true);
+  assert.equal(publicPayload.ssh.hosts[0].proxy.passwordConfigured, true);
+  assert.equal(Object.hasOwn(publicPayload, "sshSecretUpdates"), false);
+
+  const privatePayload = settingsSync.buildGatewaySettingsSyncPayload(source, {
+    includeProviderApiKeyUpdates: true,
+  });
+  assert.equal(privatePayload.ssh.hosts[0].password, "");
+  assert.equal(privatePayload.ssh.hosts[0].privateKey, "");
+  assert.equal(privatePayload.ssh.hosts[0].proxy.type, "http");
+  assert.equal(privatePayload.ssh.hosts[0].proxy.password, "");
+  assert.deepEqual(privatePayload.sshSecretUpdates, {
+    "ssh-prod": {
+      password: "ssh-password",
+      privateKey: "-----BEGIN OPENSSH PRIVATE KEY-----",
+      proxyPassword: "proxy-password",
+    },
+  });
+});
+
+test("ssh settings sync merges one-shot secret updates into existing hosts", () => {
+  installWindow();
+  const current = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "ssh-prod",
+          name: "Prod",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+          password: "old-password",
+          privateKey: "old-key",
+          proxy: {
+            type: "socks5",
+            url: "socks5://127.0.0.1",
+            port: 1080,
+            username: "proxy-user",
+            password: "old-proxy-password",
+          },
+        },
+      ],
+    },
+  });
+
+  const synced = settingsSync.applyGatewaySettingsSyncPayload(current, {
+    ssh: {
+      hosts: [
+        {
+          id: "ssh-prod",
+          name: "Prod",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "privateKey",
+          password: "",
+          passwordConfigured: true,
+          privateKey: "",
+          privateKeyPath: "~/.ssh/prod",
+          privateKeyConfigured: true,
+          proxy: {
+            type: "http",
+            url: "http://127.0.0.1",
+            port: 1080,
+            username: "proxy-user",
+            password: "",
+            passwordConfigured: true,
+          },
+        },
+      ],
+    },
+    sshSecretUpdates: {
+      "ssh-prod": {
+        password: "new-password",
+        privateKey: "new-key",
+        proxyPassword: "new-proxy-password",
+      },
+    },
+  });
+
+  assert.equal(synced.ssh.hosts[0].authType, "privateKey");
+  assert.equal(synced.ssh.hosts[0].password, "new-password");
+  assert.equal(synced.ssh.hosts[0].privateKey, "new-key");
+  assert.equal(synced.ssh.hosts[0].proxy.type, "http");
+  assert.equal(synced.ssh.hosts[0].proxy.password, "new-proxy-password");
+  assert.equal(synced.ssh.hosts[0].passwordConfigured, true);
+  assert.equal(synced.ssh.hosts[0].privateKeyConfigured, true);
+  assert.equal(synced.ssh.hosts[0].proxy.passwordConfigured, true);
+});
+
 test("workspace project selection stays out of synced system workdir", () => {
   installWindow();
   const resolvedSystem = settings.resolveWorkspaceProjects(
diff --git a/crates/agent-gateway/web/src/App.tsx b/crates/agent-gateway/web/src/App.tsx
index 973d607b5..422bb202a 100644
--- a/crates/agent-gateway/web/src/App.tsx
+++ b/crates/agent-gateway/web/src/App.tsx
@@ -598,8 +598,13 @@ function hasSettingsSyncChanged(prev: AppSettings, next: AppSettings) {
   );
 }
 
-function hasProviderApiKeyUpdates(settings: AppSettings) {
-  return settings.customProviders.some((provider) => provider.apiKey.trim().length > 0);
+function hasSensitiveSettingsUpdates(settings: AppSettings) {
+  return (
+    settings.customProviders.some((provider) => provider.apiKey.trim().length > 0) ||
+    settings.ssh.hosts.some(
+      (host) => host.password.trim().length > 0 || host.privateKey.trim().length > 0,
+    )
+  );
 }
 
 function resolveAppWorkspaceProjects(settings: AppSettings): AppSettings {
@@ -2166,7 +2171,7 @@ export default function App() {
         queueSettingsSave(
           rawNext,
           "保存 WebUI 设置失败。",
-          hasSettingsSyncChanged(prev, next) || hasProviderApiKeyUpdates(rawNext),
+          hasSettingsSyncChanged(prev, next) || hasSensitiveSettingsUpdates(rawNext),
         );
         return next;
       });
diff --git a/crates/agent-gateway/web/src/components/icons.tsx b/crates/agent-gateway/web/src/components/icons.tsx
index 59c087d5b..cb151b3d6 100644
--- a/crates/agent-gateway/web/src/components/icons.tsx
+++ b/crates/agent-gateway/web/src/components/icons.tsx
@@ -44,8 +44,10 @@ import HomeSource from "~icons/lucide/house";
 import ImageIconSource from "~icons/lucide/image";
 import ImageOffSource from "~icons/lucide/image-off";
 import KeySource from "~icons/lucide/key";
+import LayoutGridSource from "~icons/lucide/layout-grid";
 import Link2Source from "~icons/lucide/link-2";
 import LightbulbSource from "~icons/lucide/lightbulb";
+import ListSource from "~icons/lucide/list";
 import Loader2Source from "~icons/lucide/loader-circle";
 import LockSource from "~icons/lucide/lock";
 import LogOutSource from "~icons/lucide/log-out";
@@ -176,8 +178,10 @@ export const Home = createIcon(HomeSource);
 export const ImageIcon = createIcon(ImageIconSource);
 export const ImageOff = createIcon(ImageOffSource);
 export const Key = createIcon(KeySource);
+export const LayoutGrid = createIcon(LayoutGridSource);
 export const Link2 = createIcon(Link2Source);
 export const Lightbulb = createIcon(LightbulbSource);
+export const List = createIcon(ListSource);
 export const Loader2 = createIcon(Loader2Source);
 export const Lock = createIcon(LockSource);
 export const LogOut = createIcon(LogOutSource);
diff --git a/crates/agent-gateway/web/src/components/ui/input.tsx b/crates/agent-gateway/web/src/components/ui/input.tsx
index 480494415..028196072 100644
--- a/crates/agent-gateway/web/src/components/ui/input.tsx
+++ b/crates/agent-gateway/web/src/components/ui/input.tsx
@@ -10,7 +10,7 @@ export const Input = React.forwardRef<HTMLInputElement, InputProps>(
       <input
         type={type}
         className={cn(
-          "flex h-9 w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-xs transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+          "flex h-9 w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-xs transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:border-input focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50",
           className,
         )}
         ref={ref}
diff --git a/crates/agent-gateway/web/src/components/ui/textarea.tsx b/crates/agent-gateway/web/src/components/ui/textarea.tsx
index a829b9603..22acbd514 100644
--- a/crates/agent-gateway/web/src/components/ui/textarea.tsx
+++ b/crates/agent-gateway/web/src/components/ui/textarea.tsx
@@ -9,7 +9,7 @@ export const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
     return (
       <textarea
         className={cn(
-          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-xs placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-xs placeholder:text-muted-foreground focus-visible:border-input focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50",
           className,
         )}
         ref={ref}
diff --git a/crates/agent-gateway/web/src/i18n/config.ts b/crates/agent-gateway/web/src/i18n/config.ts
index 4604d9ff0..187cbd04d 100644
--- a/crates/agent-gateway/web/src/i18n/config.ts
+++ b/crates/agent-gateway/web/src/i18n/config.ts
@@ -275,7 +275,8 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.tunnelEmptyHintCreate": "在上方新建第一个临时链接",
     "projectTools.tunnelEmptyHintProject": "切换到「当前项目」即可创建链接",
     "projectTools.tunnelTargetRequired": "请输入本地 HTTP 服务地址。",
-    "projectTools.tunnelInvalidUrl": "请输入有效的 http://localhost 地址，不能包含账号、密码或片段。",
+    "projectTools.tunnelInvalidUrl":
+      "请输入有效的 http://localhost 地址，不能包含账号、密码或片段。",
     "projectTools.tunnelLocalhostOnly": "仅支持 localhost、127.0.0.1 或 [::1]。",
     "projectTools.tunnelRemoteOffline": "Remote Gateway 未连接，连接后才能创建或关闭 tunnel。",
     "projectTools.tunnelWebDisabled": "桌面端 Remote 设置未允许 WebUI 创建或关闭内网穿透。",
@@ -521,6 +522,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.navProviders": "供应商配置",
     "settings.navHooks": "Hooks",
     "settings.navAgents": "全局提示词",
+    "settings.navSsh": "SSH",
     "settings.navCron": "Cron",
     "settings.navRemote": "Remote",
     "settings.navSkills": "Skills",
@@ -836,6 +838,65 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.agentsReady": "可以保存",
     "settings.agentsRequired": "名称和 Prompt 为必填项",
 
+    /* ── Settings SSH ── */
+    "settings.sshTitle": "SSH",
+    "settings.sshDesc": "管理常用 SSH 主机、用户名和登录凭据",
+    "settings.sshAdd": "添加",
+    "settings.sshEdit": "编辑 SSH",
+    "settings.sshImport": "导入",
+    "settings.sshCount": "台主机",
+    "settings.sshViewList": "列表视图",
+    "settings.sshViewGrid": "网格视图",
+    "settings.sshNoHosts": "还没有配置 SSH 主机",
+    "settings.sshNoHostsHint": "添加主机，或从用户目录下的 ~/.ssh/config 与私钥文件中扫描导入。",
+    "settings.sshName": "名称",
+    "settings.sshNamePlaceholder": "例如：生产跳板机",
+    "settings.sshHost": "Host",
+    "settings.sshHostPlaceholder": "例如：10.0.0.12 或 server.example.com",
+    "settings.sshUsername": "用户名",
+    "settings.sshUsernamePlaceholder": "例如：root",
+    "settings.sshPort": "端口",
+    "settings.sshAuthMethod": "登录方式",
+    "settings.sshAuthPassword": "密码登录",
+    "settings.sshAuthPasswordHint": "保存用户名与密码",
+    "settings.sshAuthPrivateKey": "私钥登录",
+    "settings.sshAuthPrivateKeyHint": "导入私钥文件或直接粘贴内容",
+    "settings.sshPassword": "密码",
+    "settings.sshPasswordPlaceholder": "输入 SSH 登录密码",
+    "settings.sshPasswordConfigured": "密码已保存",
+    "settings.sshShowPassword": "显示密码",
+    "settings.sshHidePassword": "隐藏密码",
+    "settings.sshPrivateKey": "私钥",
+    "settings.sshPrivateKeyImport": "导入私钥",
+    "settings.sshPrivateKeyPathPlaceholder": "私钥路径或文件名",
+    "settings.sshPrivateKeyPlaceholder": "粘贴 OpenSSH 私钥内容...",
+    "settings.sshPrivateKeyConfigured": "私钥已保存",
+    "settings.sshAdvancedSettings": "高级设置",
+    "settings.sshAdvancedProxy": "代理",
+    "settings.sshProxyType": "代理类型",
+    "settings.sshProxyTypeSocks5": "SOCKS5",
+    "settings.sshProxyTypeHttp": "HTTP",
+    "settings.sshProxyUrl": "代理链接",
+    "settings.sshProxyUrlPlaceholder": "例如：socks5://127.0.0.1",
+    "settings.sshProxyUrlSocks5Placeholder": "例如：socks5://127.0.0.1",
+    "settings.sshProxyUrlHttpPlaceholder": "例如：http://127.0.0.1",
+    "settings.sshProxyPort": "端口",
+    "settings.sshProxyUsername": "用户名",
+    "settings.sshProxyUsernamePlaceholder": "例如：proxy-user",
+    "settings.sshProxyPassword": "密码",
+    "settings.sshProxyPasswordPlaceholder": "输入代理密码",
+    "settings.sshProxyPasswordConfigured": "代理密码已保存",
+    "settings.sshReady": "可以保存",
+    "settings.sshRequired": "名称和 Host 为必填项",
+    "settings.sshImportDesc": "扫描用户目录下的 ~/.ssh/config 和常见私钥文件",
+    "settings.sshImportScanning": "正在扫描 ~/.ssh ...",
+    "settings.sshImportFailed": "扫描失败",
+    "settings.sshImportFound": "发现 {count} 条 Host 配置，{keys} 个可读取私钥文件。",
+    "settings.sshImportEmpty": "没有发现可导入的 SSH 配置",
+    "settings.sshImportEmptyHint": "请确认 ~/.ssh/config 中存在 Host 配置。",
+    "settings.sshImportDuplicate": "已存在",
+    "settings.sshImportSelected": "已选择 {count} 条配置",
+
     /* ── Settings Cron ── */
     "settings.cronTitle": "定时任务",
     "settings.cronDesc": "配置和管理定时执行的自动化任务",
@@ -1757,6 +1818,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.navProviders": "Providers",
     "settings.navHooks": "Hooks",
     "settings.navAgents": "Prompt",
+    "settings.navSsh": "SSH",
     "settings.navCron": "Cron",
     "settings.navRemote": "Remote",
     "settings.navSkills": "Skills",
@@ -2087,6 +2149,67 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.agentsReady": "Ready to save",
     "settings.agentsRequired": "Name and Prompt are required",
 
+    /* ── Settings SSH ── */
+    "settings.sshTitle": "SSH",
+    "settings.sshDesc": "Manage SSH hosts, usernames, and login credentials",
+    "settings.sshAdd": "Add",
+    "settings.sshEdit": "Edit SSH",
+    "settings.sshImport": "Import",
+    "settings.sshCount": "hosts",
+    "settings.sshViewList": "List view",
+    "settings.sshViewGrid": "Grid view",
+    "settings.sshNoHosts": "No SSH hosts configured yet",
+    "settings.sshNoHostsHint":
+      "Add a host, or scan ~/.ssh/config and private key files under the user directory.",
+    "settings.sshName": "Name",
+    "settings.sshNamePlaceholder": "e.g. Production bastion",
+    "settings.sshHost": "Host",
+    "settings.sshHostPlaceholder": "e.g. 10.0.0.12 or server.example.com",
+    "settings.sshUsername": "Username",
+    "settings.sshUsernamePlaceholder": "e.g. root",
+    "settings.sshPort": "Port",
+    "settings.sshAuthMethod": "Login method",
+    "settings.sshAuthPassword": "Password",
+    "settings.sshAuthPasswordHint": "Store username and password",
+    "settings.sshAuthPrivateKey": "Private key",
+    "settings.sshAuthPrivateKeyHint": "Import a key file or paste the key directly",
+    "settings.sshPassword": "Password",
+    "settings.sshPasswordPlaceholder": "Enter the SSH login password",
+    "settings.sshPasswordConfigured": "Password saved",
+    "settings.sshShowPassword": "Show password",
+    "settings.sshHidePassword": "Hide password",
+    "settings.sshPrivateKey": "Private key",
+    "settings.sshPrivateKeyImport": "Import key",
+    "settings.sshPrivateKeyPathPlaceholder": "Private key path or file name",
+    "settings.sshPrivateKeyPlaceholder": "Paste OpenSSH private key content...",
+    "settings.sshPrivateKeyConfigured": "Private key saved",
+    "settings.sshAdvancedSettings": "Advanced settings",
+    "settings.sshAdvancedProxy": "Proxy",
+    "settings.sshProxyType": "Proxy type",
+    "settings.sshProxyTypeSocks5": "SOCKS5",
+    "settings.sshProxyTypeHttp": "HTTP",
+    "settings.sshProxyUrl": "Proxy URL",
+    "settings.sshProxyUrlPlaceholder": "e.g. socks5://127.0.0.1",
+    "settings.sshProxyUrlSocks5Placeholder": "e.g. socks5://127.0.0.1",
+    "settings.sshProxyUrlHttpPlaceholder": "e.g. http://127.0.0.1",
+    "settings.sshProxyPort": "Port",
+    "settings.sshProxyUsername": "Username",
+    "settings.sshProxyUsernamePlaceholder": "e.g. proxy-user",
+    "settings.sshProxyPassword": "Password",
+    "settings.sshProxyPasswordPlaceholder": "Enter proxy password",
+    "settings.sshProxyPasswordConfigured": "Proxy password saved",
+    "settings.sshReady": "Ready to save",
+    "settings.sshRequired": "Name and Host are required",
+    "settings.sshImportDesc":
+      "Scan ~/.ssh/config and common private key files in the user directory",
+    "settings.sshImportScanning": "Scanning ~/.ssh ...",
+    "settings.sshImportFailed": "Scan failed",
+    "settings.sshImportFound": "Found {count} Host entries and {keys} readable private key files.",
+    "settings.sshImportEmpty": "No importable SSH config found",
+    "settings.sshImportEmptyHint": "Make sure ~/.ssh/config contains Host entries.",
+    "settings.sshImportDuplicate": "Exists",
+    "settings.sshImportSelected": "{count} configs selected",
+
     /* ── Settings Cron ── */
     "settings.cronTitle": "Scheduled Tasks",
     "settings.cronDesc": "Configure and manage automated scheduled tasks",
diff --git a/crates/agent-gateway/web/src/index.css b/crates/agent-gateway/web/src/index.css
index 5fde2ca63..a26518914 100644
--- a/crates/agent-gateway/web/src/index.css
+++ b/crates/agent-gateway/web/src/index.css
@@ -210,6 +210,27 @@
     user-select: text;
   }
 
+  input:not([type="checkbox"]):not([type="radio"]):not([type="range"]):focus,
+  textarea:focus,
+  select:focus,
+  [contenteditable="true"]:focus,
+  [contenteditable="plaintext-only"]:focus,
+  [role="textbox"]:focus {
+    outline: none;
+  }
+
+  input:not([type="checkbox"]):not([type="radio"]):not([type="range"]):focus-visible,
+  textarea:focus-visible,
+  select:focus-visible,
+  [contenteditable="true"]:focus-visible,
+  [contenteditable="plaintext-only"]:focus-visible,
+  [role="textbox"]:focus-visible {
+    --tw-ring-offset-shadow: 0 0 #0000;
+    --tw-ring-shadow: 0 0 #0000;
+    border-color: hsl(var(--input));
+    box-shadow: var(--tw-shadow, 0 0 #0000);
+  }
+
   /* Custom scrollbar */
   ::-webkit-scrollbar {
     width: 6px;
@@ -628,6 +649,31 @@
     z-index: -1;
   }
 
+  .ssh-auth-panel {
+    overflow: hidden;
+    transition:
+      max-height 300ms cubic-bezier(0.16, 1, 0.3, 1),
+      opacity 220ms ease,
+      transform 300ms cubic-bezier(0.16, 1, 0.3, 1);
+    will-change: max-height, opacity, transform;
+  }
+
+  .ssh-collapsible {
+    display: grid;
+    grid-template-rows: 0fr;
+    transition: grid-template-rows 280ms cubic-bezier(0.16, 1, 0.3, 1);
+    will-change: grid-template-rows;
+  }
+
+  .ssh-collapsible[data-open="true"] {
+    grid-template-rows: 1fr;
+  }
+
+  .ssh-collapsible-inner {
+    min-height: 0;
+    overflow: hidden;
+  }
+
   @keyframes settingsSectionIn {
     from {
       opacity: 0;
@@ -656,6 +702,11 @@
       animation: none;
     }
 
+    .ssh-auth-panel,
+    .ssh-collapsible {
+      transition-duration: 1ms;
+    }
+
     .settings-section-shell::before {
       opacity: 0.45;
       filter: none;
diff --git a/crates/agent-gateway/web/src/lib/settings/index.ts b/crates/agent-gateway/web/src/lib/settings/index.ts
index 9ec5e88e3..92789263d 100644
--- a/crates/agent-gateway/web/src/lib/settings/index.ts
+++ b/crates/agent-gateway/web/src/lib/settings/index.ts
@@ -1,10 +1,7 @@
 import { DEFAULT_LOCALE, normalizeLocale, type Locale } from "../../i18n/config";
 import { mergeAlwaysEnabledSkillNames } from "../skills/builtin";
 import { normalizeApiKey, normalizeBaseUrl, normalizeModels } from "./normalize";
-import {
-  CUSTOM_SYSTEM_TOOL_OPTIONS,
-  type SystemToolId,
-} from "../tools/customSystemTools";
+import { CUSTOM_SYSTEM_TOOL_OPTIONS, type SystemToolId } from "../tools/customSystemTools";
 export type { SystemToolId } from "../tools/customSystemTools";
 
 export type ProviderId = "codex" | "claude_code" | "gemini";
@@ -13,13 +10,7 @@ export type ExecutionMode = "text" | "tools" | "agent-dev";
 
 export type CodexRequestFormat = "openai-completions" | "openai-responses";
 
-export type ReasoningLevel =
-  | "off"
-  | "minimal"
-  | "low"
-  | "medium"
-  | "high"
-  | "xhigh";
+export type ReasoningLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh";
 
 export type McpTransport = "stdio" | "http" | "sse";
 
@@ -37,14 +28,7 @@ export type HookLifecycleEventType =
 
 export type ConversationHookType = "command" | "http";
 
-export type HookHttpMethod =
-  | "GET"
-  | "POST"
-  | "PUT"
-  | "PATCH"
-  | "DELETE"
-  | "HEAD"
-  | "OPTIONS";
+export type HookHttpMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "HEAD" | "OPTIONS";
 
 export type HookHttpRequest = {
   id: string;
@@ -246,6 +230,38 @@ export type AgentPromptTemplate = {
   enabled: boolean;
 };
 
+export type SshAuthType = "password" | "privateKey";
+export type SshProxyType = "socks5" | "http";
+
+export type SshProxyConfig = {
+  type: SshProxyType;
+  url: string;
+  port: number;
+  username: string;
+  password: string;
+  passwordConfigured?: boolean;
+};
+
+export type SshHostConfig = {
+  id: string;
+  name: string;
+  description: string;
+  host: string;
+  port: number;
+  username: string;
+  authType: SshAuthType;
+  password: string;
+  passwordConfigured?: boolean;
+  privateKey: string;
+  privateKeyPath: string;
+  privateKeyConfigured?: boolean;
+  proxy: SshProxyConfig;
+};
+
+export type SshSettings = {
+  hosts: SshHostConfig[];
+};
+
 export type CustomProvider = {
   id: string;
   name: string;
@@ -282,6 +298,7 @@ export type AppSettings = {
   customProviders: CustomProvider[];
   mcp: McpSettings;
   agents: AgentPromptTemplate[];
+  ssh: SshSettings;
   hooks: ConversationHook[];
   cron: CronTask[];
   remote: RemoteSettings;
@@ -513,7 +530,10 @@ function normalizeWorkspaceProject(input: unknown): WorkspaceProject | null {
   const name =
     typeof obj.name === "string" && obj.name.trim()
       ? obj.name.trim()
-      : path.split(/[\\/]+/).filter(Boolean).pop() || "Project";
+      : path
+          .split(/[\\/]+/)
+          .filter(Boolean)
+          .pop() || "Project";
   const createdAt =
     typeof obj.createdAt === "number" && Number.isFinite(obj.createdAt) && obj.createdAt > 0
       ? obj.createdAt
@@ -616,7 +636,10 @@ export function resolveWorkspaceProjects(
       ? { lastConversationAt: defaultExisting.lastConversationAt }
       : {}),
     ...(defaultExisting?.isPinned
-      ? { isPinned: true, pinnedAt: defaultExisting.pinnedAt ?? defaultExisting.updatedAt }
+      ? {
+          isPinned: true,
+          pinnedAt: defaultExisting.pinnedAt ?? defaultExisting.updatedAt,
+        }
       : {}),
   };
 
@@ -635,7 +658,13 @@ export function resolveWorkspaceProjects(
     projects.push({
       ...project,
       id,
-      name: project.name.trim() || project.path.split(/[\\/]+/).filter(Boolean).pop() || "Project",
+      name:
+        project.name.trim() ||
+        project.path
+          .split(/[\\/]+/)
+          .filter(Boolean)
+          .pop() ||
+        "Project",
       kind: project.kind,
     });
   }
@@ -777,9 +806,7 @@ export function getChatRuntimeReasoningLevelsForProvider(params: {
   providerId?: ProviderId;
   requestFormat?: CodexRequestFormat;
 }): ReasoningLevel[] {
-  return getChatRuntimeReasoningLevelsForProviderKey(
-    getChatRuntimeReasoningProviderKey(params),
-  );
+  return getChatRuntimeReasoningLevelsForProviderKey(getChatRuntimeReasoningProviderKey(params));
 }
 
 export function normalizeChatRuntimeControlsForProvider(
@@ -864,7 +891,8 @@ function normalizeOptionalText(input: unknown): string {
 function normalizeCronRemainingExecutions(input: unknown): number | undefined {
   if (input == null) return undefined;
   if (typeof input === "string" && input.trim() === "") return undefined;
-  const numeric = typeof input === "number" ? input : typeof input === "string" ? Number(input) : NaN;
+  const numeric =
+    typeof input === "number" ? input : typeof input === "string" ? Number(input) : NaN;
   if (!Number.isFinite(numeric) || !Number.isInteger(numeric) || numeric < 0) {
     return undefined;
   }
@@ -893,9 +921,7 @@ function normalizeCronTaskType(input: unknown): CronTaskType {
 
 function normalizeHookHttpMethod(input: unknown): HookHttpMethod {
   const value = typeof input === "string" ? input.trim().toUpperCase() : "";
-  return HOOK_HTTP_METHODS.includes(value as HookHttpMethod)
-    ? (value as HookHttpMethod)
-    : "POST";
+  return HOOK_HTTP_METHODS.includes(value as HookHttpMethod) ? (value as HookHttpMethod) : "POST";
 }
 
 export function canHookHttpMethodHaveBody(method: HookHttpMethod): boolean {
@@ -905,9 +931,10 @@ export function canHookHttpMethodHaveBody(method: HookHttpMethod): boolean {
 function normalizeHookHttpRequest(input: unknown): HookHttpRequest {
   const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
   const method = normalizeHookHttpMethod(obj.method);
-  const body = canHookHttpMethodHaveBody(method) && Object.prototype.hasOwnProperty.call(obj, "body")
-    ? obj.body
-    : undefined;
+  const body =
+    canHookHttpMethodHaveBody(method) && Object.prototype.hasOwnProperty.call(obj, "body")
+      ? obj.body
+      : undefined;
 
   return {
     id: typeof obj.id === "string" && obj.id.trim() ? obj.id.trim() : crypto.randomUUID(),
@@ -976,8 +1003,7 @@ function normalizeRecordStringString(input: unknown): Record<string, string> | u
   const out: Record<string, string> = {};
   for (const [rawKey, rawValue] of Object.entries(input as Record<string, unknown>)) {
     const key = String(rawKey).trim();
-    const value =
-      typeof rawValue === "string" ? rawValue.trim() : String(rawValue ?? "").trim();
+    const value = typeof rawValue === "string" ? rawValue.trim() : String(rawValue ?? "").trim();
     if (!key || !value) continue;
     out[key] = value;
   }
@@ -1020,9 +1046,7 @@ function normalizeMcpSelection(input: unknown, servers: McpServerConfig[]): stri
 function normalizeTimeoutMs(input: unknown): number {
   const numeric =
     typeof input === "number" ? input : typeof input === "string" ? Number(input) : NaN;
-  const timeoutMs = Number.isFinite(numeric)
-    ? Math.floor(numeric)
-    : DEFAULT_MCP_TIMEOUT_MS;
+  const timeoutMs = Number.isFinite(numeric) ? Math.floor(numeric) : DEFAULT_MCP_TIMEOUT_MS;
   return timeoutMs > 0 ? timeoutMs : DEFAULT_MCP_TIMEOUT_MS;
 }
 
@@ -1202,8 +1226,7 @@ export function normalizeCustomProvider(input: unknown): CustomProvider {
     ),
     requestFormat: codexRouting?.requestFormat,
     reasoning: normalizeReasoningLevel(obj.reasoning),
-    promptCachingEnabled:
-      type === "claude_code" ? obj.promptCachingEnabled !== false : false,
+    promptCachingEnabled: type === "claude_code" ? obj.promptCachingEnabled !== false : false,
     nativeWebSearchEnabled: obj.nativeWebSearchEnabled !== false,
   };
 }
@@ -1221,6 +1244,86 @@ export function normalizeAgentPromptTemplate(input: unknown): AgentPromptTemplat
   };
 }
 
+function normalizeSshAuthType(input: unknown): SshAuthType {
+  return input === "privateKey" ? "privateKey" : "password";
+}
+
+function normalizeSshPort(input: unknown): number {
+  const value = typeof input === "number" || typeof input === "string" ? Number(input) : 22;
+  if (!Number.isFinite(value)) return 22;
+  const port = Math.floor(value);
+  return port >= 1 && port <= 65535 ? port : 22;
+}
+
+function normalizeSshProxyPort(input: unknown): number {
+  const value = typeof input === "number" || typeof input === "string" ? Number(input) : 0;
+  if (!Number.isFinite(value)) return 0;
+  const port = Math.floor(value);
+  return port >= 1 && port <= 65535 ? port : 0;
+}
+
+function normalizeSshProxyType(input: unknown): SshProxyType {
+  return input === "http" ? "http" : "socks5";
+}
+
+export function normalizeSshProxyConfig(input: unknown): SshProxyConfig {
+  const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
+  const password = normalizeOptionalText(obj.password);
+  return {
+    type: normalizeSshProxyType(obj.type),
+    url: normalizeOptionalText(obj.url),
+    port: normalizeSshProxyPort(obj.port),
+    username: typeof obj.username === "string" ? obj.username.trim() : "",
+    password,
+    passwordConfigured: password.length > 0 || obj.passwordConfigured === true,
+  };
+}
+
+export function normalizeSshHostConfig(input: unknown): SshHostConfig {
+  const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
+  const host = typeof obj.host === "string" ? obj.host.trim() : "";
+  const name =
+    typeof obj.name === "string" && obj.name.trim() ? obj.name.trim() : host || "未命名 SSH";
+  const password = normalizeOptionalText(obj.password);
+  const privateKey = normalizeOptionalText(obj.privateKey);
+  const privateKeyPath = normalizeOptionalText(obj.privateKeyPath);
+
+  return {
+    id: typeof obj.id === "string" && obj.id.trim() ? obj.id.trim() : crypto.randomUUID(),
+    name,
+    description: normalizeOptionalText(obj.description),
+    host,
+    port: normalizeSshPort(obj.port),
+    username: typeof obj.username === "string" ? obj.username.trim() : "",
+    authType: normalizeSshAuthType(obj.authType),
+    password,
+    passwordConfigured: password.length > 0 || obj.passwordConfigured === true,
+    privateKey,
+    privateKeyPath,
+    privateKeyConfigured:
+      privateKey.length > 0 || privateKeyPath.length > 0 || obj.privateKeyConfigured === true,
+    proxy: normalizeSshProxyConfig(obj.proxy),
+  };
+}
+
+export function normalizeSshSettings(input: unknown): SshSettings {
+  const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
+  const sourceHosts = Array.isArray(obj.hosts) ? obj.hosts : [];
+  const seenIds = new Set<string>();
+  const hosts = sourceHosts.map((host) => {
+    const normalized = normalizeSshHostConfig(host);
+    if (!seenIds.has(normalized.id)) {
+      seenIds.add(normalized.id);
+      return normalized;
+    }
+    const id = crypto.randomUUID();
+    seenIds.add(id);
+    return { ...normalized, id };
+  });
+
+  return { hosts };
+}
+
 export function normalizeSystemSettings(input: unknown): SystemSettings {
   const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
   return {
@@ -1351,9 +1454,10 @@ function normalizeMemoryOrganizerSchedule(input: unknown): MemoryOrganizerSchedu
     frequency: normalizeMemoryOrganizerFrequency(obj.frequency),
     timeLocal: normalizeMemoryOrganizerTime(obj.timeLocal),
     weekday: normalizeMemoryOrganizerWeekday(obj.weekday),
-    timezone: typeof obj.timezone === "string" && obj.timezone.trim()
-      ? obj.timezone.trim()
-      : defaults.timezone,
+    timezone:
+      typeof obj.timezone === "string" && obj.timezone.trim()
+        ? obj.timezone.trim()
+        : defaults.timezone,
   };
 }
 
@@ -1452,9 +1556,9 @@ export function normalizeMemorySettings(
     Boolean(organizerModel) &&
     organizerSchedule.frequency !== "none";
   const organizerNextRunAt = organizerEnabled
-    ? normalizeOptionalTimestamp(obj.organizerNextRunAt) ??
+    ? (normalizeOptionalTimestamp(obj.organizerNextRunAt) ??
       computeNextMemoryOrganizerRunAt(organizerSchedule) ??
-      undefined
+      undefined)
     : undefined;
   return {
     organizerModel,
@@ -1554,9 +1658,7 @@ export function normalizeProjectToolsGitReviewSettings(
   };
 }
 
-export function normalizeProjectToolsTunnelSettings(
-  input: unknown,
-): ProjectToolsTunnelSettings {
+export function normalizeProjectToolsTunnelSettings(input: unknown): ProjectToolsTunnelSettings {
   const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
   const openProjectPathKeys = Array.from(
     new Set(
@@ -1587,10 +1689,9 @@ export function normalizeProjectToolsPanelTabOrder(input: unknown): string[] {
 }
 
 function isProjectToolsPanelTab(input: unknown): input is ProjectToolsPanelTab {
-  return input === "terminal" ||
-    input === "fileTree" ||
-    input === "gitReview" ||
-    input === "tunnel";
+  return (
+    input === "terminal" || input === "fileTree" || input === "gitReview" || input === "tunnel"
+  );
 }
 
 export function normalizeProjectToolsPanelActiveTab(input: unknown): ProjectToolsPanelTab {
@@ -1634,15 +1735,15 @@ export function normalizeCustomSettings(
   customProviders: CustomProvider[],
 ): CustomSettings {
   const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
-  const chatSidebar = (obj.chatSidebar && typeof obj.chatSidebar === "object"
-    ? obj.chatSidebar
-    : {}) as Record<string, unknown>;
-  const legacyTerminalPanel = (obj.terminalPanel && typeof obj.terminalPanel === "object"
-    ? obj.terminalPanel
-    : {}) as Record<string, unknown>;
-  const projectToolsPanel = (obj.projectToolsPanel && typeof obj.projectToolsPanel === "object"
-    ? obj.projectToolsPanel
-    : {}) as Record<string, unknown>;
+  const chatSidebar = (
+    obj.chatSidebar && typeof obj.chatSidebar === "object" ? obj.chatSidebar : {}
+  ) as Record<string, unknown>;
+  const legacyTerminalPanel = (
+    obj.terminalPanel && typeof obj.terminalPanel === "object" ? obj.terminalPanel : {}
+  ) as Record<string, unknown>;
+  const projectToolsPanel = (
+    obj.projectToolsPanel && typeof obj.projectToolsPanel === "object" ? obj.projectToolsPanel : {}
+  ) as Record<string, unknown>;
   const projectToolsPanelActiveTab = normalizeProjectToolsPanelActiveTab(
     projectToolsPanel.activeTab,
   );
@@ -1705,6 +1806,9 @@ export function getDefaultSettings(): AppSettings {
       selected: [],
     },
     agents: [],
+    ssh: {
+      hosts: [],
+    },
     hooks: [],
     cron: [],
     remote: {
@@ -1749,6 +1853,7 @@ export function normalizeSettings(input?: Partial<AppSettings> | null): AppSetti
     customProviders,
     mcp: normalizeMcpSettings(obj.mcp ?? defaults.mcp),
     agents: normalizeAgentPromptTemplates(obj.agents ?? defaults.agents),
+    ssh: normalizeSshSettings(obj.ssh ?? defaults.ssh),
     hooks: normalizeConversationHooks(obj.hooks ?? defaults.hooks),
     cron: normalizeCronTasks(obj.cron ?? defaults.cron),
     remote: normalizeRemoteSettings(obj.remote ?? defaults.remote),
@@ -1767,10 +1872,7 @@ export function normalizeSettings(input?: Partial<AppSettings> | null): AppSetti
   };
 }
 
-export function updateSystem(
-  prev: AppSettings,
-  patch: Partial<SystemSettings>,
-): AppSettings {
+export function updateSystem(prev: AppSettings, patch: Partial<SystemSettings>): AppSettings {
   return normalizeSettings({
     ...prev,
     system: {
@@ -1790,16 +1892,23 @@ export function updateMcp(prev: AppSettings, patch: Partial<McpSettings>): AppSe
   });
 }
 
-export function updateAgents(
-  prev: AppSettings,
-  agents: AgentPromptTemplate[],
-): AppSettings {
+export function updateAgents(prev: AppSettings, agents: AgentPromptTemplate[]): AppSettings {
   return normalizeSettings({
     ...prev,
     agents,
   });
 }
 
+export function updateSsh(prev: AppSettings, patch: Partial<SshSettings>): AppSettings {
+  return normalizeSettings({
+    ...prev,
+    ssh: {
+      ...prev.ssh,
+      ...patch,
+    },
+  });
+}
+
 export function updateHooks(prev: AppSettings, hooks: ConversationHook[]): AppSettings {
   return normalizeSettings({
     ...prev,
@@ -1814,10 +1923,7 @@ export function updateCronTasks(prev: AppSettings, cron: CronTask[]): AppSetting
   });
 }
 
-export function updateSkills(
-  prev: AppSettings,
-  patch: Partial<SkillsSettings>,
-): AppSettings {
+export function updateSkills(prev: AppSettings, patch: Partial<SkillsSettings>): AppSettings {
   return normalizeSettings({
     ...prev,
     skills: {
@@ -2011,10 +2117,9 @@ export function removeProjectToolsProjectState(
     (pathKey) => pathKey !== normalizedPathKey,
   );
   const removedOpenProjectPathKey = nextOpenProjectPathKeys.length !== openProjectPathKeys.length;
-  const gitReviewOpenProjectPathKeys =
-    prev.customSettings.projectToolsGitReview.openProjectPathKeys
-      .map((pathKey) => workspaceProjectPathKey(pathKey))
-      .filter(Boolean);
+  const gitReviewOpenProjectPathKeys = prev.customSettings.projectToolsGitReview.openProjectPathKeys
+    .map((pathKey) => workspaceProjectPathKey(pathKey))
+    .filter(Boolean);
   const nextGitReviewOpenProjectPathKeys = gitReviewOpenProjectPathKeys.filter(
     (pathKey) => pathKey !== normalizedPathKey,
   );
diff --git a/crates/agent-gateway/web/src/lib/settings/storage.ts b/crates/agent-gateway/web/src/lib/settings/storage.ts
index b87d00929..e25b086f5 100644
--- a/crates/agent-gateway/web/src/lib/settings/storage.ts
+++ b/crates/agent-gateway/web/src/lib/settings/storage.ts
@@ -30,6 +30,7 @@ type PersistedSettingsResponse = {
   system?: unknown | null;
   mcp?: unknown | null;
   agents?: unknown | null;
+  ssh?: unknown | null;
   hooks?: unknown | null;
   cron?: unknown | null;
   remote?: unknown | null;
@@ -215,6 +216,7 @@ export async function loadPersistedSettingsWithDefaults(): Promise<PersistedSett
     customProviders: (persisted?.providers ?? defaults.customProviders) as AppSettings["customProviders"],
     mcp: (persisted?.mcp ?? defaults.mcp) as AppSettings["mcp"],
     agents: (persisted?.agents ?? defaults.agents) as AppSettings["agents"],
+    ssh: (persisted?.ssh ?? defaults.ssh) as AppSettings["ssh"],
     hooks: (persisted?.hooks ?? defaults.hooks) as AppSettings["hooks"],
     cron: (persisted?.cron ?? defaults.cron) as AppSettings["cron"],
     remote: (persisted?.remote ?? defaults.remote) as AppSettings["remote"],
@@ -277,6 +279,14 @@ export async function persistSettings(prev: AppSettings, next: AppSettings): Pro
     );
   }
 
+  if (hasChanged(prev.ssh, next.ssh)) {
+    tasks.push(
+      invoke("settings_save_ssh", {
+        payload: next.ssh,
+      } as any),
+    );
+  }
+
   if (hasChanged(prev.hooks, next.hooks)) {
     tasks.push(
       invoke("settings_save_hooks", {
diff --git a/crates/agent-gateway/web/src/lib/settings/sync.ts b/crates/agent-gateway/web/src/lib/settings/sync.ts
index fda0eeacc..d64d018fc 100644
--- a/crates/agent-gateway/web/src/lib/settings/sync.ts
+++ b/crates/agent-gateway/web/src/lib/settings/sync.ts
@@ -9,10 +9,15 @@ import {
 } from "./index";
 
 export type GatewayProviderApiKeyUpdates = Record<string, string>;
-export type GatewaySettingsSyncProvider = Omit<
-  AppSettings["customProviders"][number],
-  "apiKey"
-> & {
+export type GatewaySshSecretUpdates = Record<
+  string,
+  {
+    password?: string;
+    privateKey?: string;
+    proxyPassword?: string;
+  }
+>;
+export type GatewaySettingsSyncProvider = Omit<AppSettings["customProviders"][number], "apiKey"> & {
   apiKeyConfigured?: boolean;
 };
 export type GatewaySettingsSyncCustomSettings = Omit<
@@ -25,12 +30,10 @@ export type GatewaySettingsSyncPayload = {
   customProviders: GatewaySettingsSyncProvider[];
   mcp: AppSettings["mcp"];
   agents: AppSettings["agents"];
+  ssh: AppSettings["ssh"];
   hooks: AppSettings["hooks"];
   cron: AppSettings["cron"];
-  remote?: Pick<
-    AppSettings["remote"],
-    "enableWebTerminal" | "enableWebGit" | "enableWebTunnels"
-  >;
+  remote?: Pick<AppSettings["remote"], "enableWebTerminal" | "enableWebGit" | "enableWebTunnels">;
   memory: AppSettings["memory"];
   customSettings: GatewaySettingsSyncCustomSettings;
   skills: AppSettings["skills"];
@@ -39,6 +42,7 @@ export type GatewaySettingsSyncPayload = {
   theme: AppSettings["theme"];
   locale: AppSettings["locale"];
   providerApiKeyUpdates?: GatewayProviderApiKeyUpdates;
+  sshSecretUpdates?: GatewaySshSecretUpdates;
 };
 
 function asObject(value: unknown): Record<string, unknown> {
@@ -77,9 +81,31 @@ export function redactSettingsForWebStorage(settings: AppSettings): AppSettings
   return normalizeSettings({
     ...settings,
     customProviders: redactCustomProvidersForWebStorage(settings.customProviders),
+    ssh: redactSshSettingsForWebStorage(settings.ssh),
   });
 }
 
+function redactSshSettingsForWebStorage(ssh: AppSettings["ssh"]): AppSettings["ssh"] {
+  return {
+    hosts: ssh.hosts.map((host) => ({
+      ...host,
+      password: "",
+      passwordConfigured: host.password.trim().length > 0 || host.passwordConfigured === true,
+      privateKey: "",
+      privateKeyConfigured:
+        host.privateKey.trim().length > 0 ||
+        host.privateKeyPath.trim().length > 0 ||
+        host.privateKeyConfigured === true,
+      proxy: {
+        ...host.proxy,
+        password: "",
+        passwordConfigured:
+          host.proxy.password.trim().length > 0 || host.proxy.passwordConfigured === true,
+      },
+    })),
+  };
+}
+
 function collectProviderApiKeyUpdates(
   customProviders: AppSettings["customProviders"],
 ): GatewayProviderApiKeyUpdates | undefined {
@@ -93,6 +119,29 @@ function collectProviderApiKeyUpdates(
   return Object.keys(updates).length > 0 ? updates : undefined;
 }
 
+function collectSshSecretUpdates(ssh: AppSettings["ssh"]): GatewaySshSecretUpdates | undefined {
+  const updates: GatewaySshSecretUpdates = {};
+  for (const host of ssh.hosts) {
+    const id = host.id.trim();
+    if (!id) continue;
+    const password = host.password.trim();
+    const privateKey = host.privateKey.trim();
+    const proxyPassword = host.proxy.password.trim();
+    const update: GatewaySshSecretUpdates[string] = {};
+    if (password) update.password = password;
+    if (privateKey) update.privateKey = privateKey;
+    if (proxyPassword) update.proxyPassword = proxyPassword;
+    if (Object.keys(update).length > 0) {
+      updates[id] = update;
+    }
+  }
+  return Object.keys(updates).length > 0 ? updates : undefined;
+}
+
+function redactSshSettingsForGateway(ssh: AppSettings["ssh"]): AppSettings["ssh"] {
+  return redactSshSettingsForWebStorage(ssh);
+}
+
 function syncableCustomSettings(
   customSettings: AppSettings["customSettings"],
 ): GatewaySettingsSyncCustomSettings {
@@ -173,10 +222,7 @@ function mergeSyncedSystemSettings(
   }
 
   const incomingSystem = incoming as AppSettings["system"];
-  const activeWorkspaceProjectId = resolveSyncedActiveWorkspaceProjectId(
-    current,
-    incomingSystem,
-  );
+  const activeWorkspaceProjectId = resolveSyncedActiveWorkspaceProjectId(current, incomingSystem);
   if (!Array.isArray(incomingSystem.workspaceProjects)) {
     return {
       ...incomingSystem,
@@ -224,6 +270,29 @@ function normalizeProviderApiKeyUpdates(value: unknown): GatewayProviderApiKeyUp
   return updates;
 }
 
+function normalizeSshSecretUpdates(value: unknown): GatewaySshSecretUpdates {
+  const source = asObject(value);
+  const updates: GatewaySshSecretUpdates = {};
+  for (const [id, rawUpdate] of Object.entries(source)) {
+    const normalizedId = id.trim();
+    if (!normalizedId) continue;
+    const updateSource = asObject(rawUpdate);
+    const password = typeof updateSource.password === "string" ? updateSource.password.trim() : "";
+    const privateKey =
+      typeof updateSource.privateKey === "string" ? updateSource.privateKey.trim() : "";
+    const proxyPassword =
+      typeof updateSource.proxyPassword === "string" ? updateSource.proxyPassword.trim() : "";
+    const update: GatewaySshSecretUpdates[string] = {};
+    if (password) update.password = password;
+    if (privateKey) update.privateKey = privateKey;
+    if (proxyPassword) update.proxyPassword = proxyPassword;
+    if (Object.keys(update).length > 0) {
+      updates[normalizedId] = update;
+    }
+  }
+  return updates;
+}
+
 function mergeSyncedCustomProviders(
   current: AppSettings["customProviders"],
   incoming: unknown,
@@ -283,6 +352,50 @@ function mergeSyncedRemoteSettings(
   };
 }
 
+function mergeSyncedSshSettings(
+  current: AppSettings["ssh"],
+  incoming: unknown,
+  secretUpdates: GatewaySshSecretUpdates,
+): AppSettings["ssh"] {
+  const normalized = normalizeSettings({
+    ssh: incoming as AppSettings["ssh"],
+  }).ssh;
+  const currentById = new Map(current.hosts.map((host) => [host.id, host]));
+  return {
+    hosts: normalized.hosts.map((host) => {
+      const currentHost = currentById.get(host.id);
+      const update = secretUpdates[host.id];
+      const password = (update?.password ?? host.password.trim()) || currentHost?.password || "";
+      const privateKey =
+        (update?.privateKey ?? host.privateKey.trim()) || currentHost?.privateKey || "";
+      const proxyPassword =
+        (update?.proxyPassword ?? host.proxy.password.trim()) || currentHost?.proxy.password || "";
+      return {
+        ...host,
+        password,
+        passwordConfigured:
+          password.length > 0 ||
+          host.passwordConfigured === true ||
+          currentHost?.passwordConfigured === true,
+        privateKey,
+        privateKeyConfigured:
+          privateKey.length > 0 ||
+          host.privateKeyPath.trim().length > 0 ||
+          host.privateKeyConfigured === true ||
+          currentHost?.privateKeyConfigured === true,
+        proxy: {
+          ...host.proxy,
+          password: proxyPassword,
+          passwordConfigured:
+            proxyPassword.length > 0 ||
+            host.proxy.passwordConfigured === true ||
+            currentHost?.proxy.passwordConfigured === true,
+        },
+      };
+    }),
+  };
+}
+
 function mergeSyncedProjectToolsFileTreeSettings(
   current: AppSettings["customSettings"]["projectToolsFileTree"],
   incoming: unknown,
@@ -364,6 +477,7 @@ export function buildGatewaySettingsSyncPayload(
     customProviders: redactCustomProvidersForGateway(settings.customProviders),
     mcp: settings.mcp,
     agents: settings.agents,
+    ssh: redactSshSettingsForGateway(settings.ssh),
     hooks: settings.hooks,
     cron: settings.cron,
     remote: {
@@ -385,6 +499,12 @@ export function buildGatewaySettingsSyncPayload(
   if (providerApiKeyUpdates) {
     payload.providerApiKeyUpdates = providerApiKeyUpdates;
   }
+  const sshSecretUpdates = options.includeProviderApiKeyUpdates
+    ? collectSshSecretUpdates(settings.ssh)
+    : undefined;
+  if (sshSecretUpdates) {
+    payload.sshSecretUpdates = sshSecretUpdates;
+  }
   return payload;
 }
 
@@ -394,16 +514,17 @@ export function applyGatewaySettingsSyncPayload(
 ): AppSettings {
   const source = asObject(payload);
   const providerApiKeyUpdates = normalizeProviderApiKeyUpdates(source.providerApiKeyUpdates);
+  const sshSecretUpdates = normalizeSshSecretUpdates(source.sshSecretUpdates);
   const selectedModel =
     source.selectedModel === null
       ? undefined
-      : (source.selectedModel as AppSettings["selectedModel"] | undefined) ??
-        current.selectedModel;
+      : ((source.selectedModel as AppSettings["selectedModel"] | undefined) ??
+        current.selectedModel);
   const memory = Object.prototype.hasOwnProperty.call(source, "memory")
-    ? (source.memory as AppSettings["memory"] | null | undefined) ?? {}
+    ? ((source.memory as AppSettings["memory"] | null | undefined) ?? {})
     : current.memory;
   const customSettings = Object.prototype.hasOwnProperty.call(source, "customSettings")
-    ? (source.customSettings as GatewaySettingsSyncCustomSettings | null | undefined) ?? {}
+    ? ((source.customSettings as GatewaySettingsSyncCustomSettings | null | undefined) ?? {})
     : current.customSettings;
   const incomingCustomSettings = customSettings as GatewaySettingsSyncCustomSettings;
 
@@ -419,6 +540,9 @@ export function applyGatewaySettingsSyncPayload(
     ),
     mcp: (source.mcp as AppSettings["mcp"] | undefined) ?? current.mcp,
     agents: (source.agents as AppSettings["agents"] | undefined) ?? current.agents,
+    ssh: Object.prototype.hasOwnProperty.call(source, "ssh")
+      ? mergeSyncedSshSettings(current.ssh, source.ssh, sshSecretUpdates)
+      : current.ssh,
     hooks: (source.hooks as AppSettings["hooks"] | undefined) ?? current.hooks,
     cron: (source.cron as AppSettings["cron"] | undefined) ?? current.cron,
     memory: memory as AppSettings["memory"],
diff --git a/crates/agent-gateway/web/src/lib/ssh/scan.ts b/crates/agent-gateway/web/src/lib/ssh/scan.ts
new file mode 100644
index 000000000..a5ca32c88
--- /dev/null
+++ b/crates/agent-gateway/web/src/lib/ssh/scan.ts
@@ -0,0 +1,268 @@
+import { invoke } from "@tauri-apps/api/core";
+import type { SshHostConfig } from "../settings";
+
+type FsRoot = {
+  id: string;
+  path: string;
+  kind: "home" | "root" | "drive";
+  label: string;
+};
+
+type FsRootsResponse = {
+  roots: FsRoot[];
+};
+
+type FsListResponse = {
+  entries: Array<{ path: string; kind: "file" | "dir" }>;
+};
+
+type FsReadEditableTextResponse = {
+  content: string;
+};
+
+export type SshImportCandidate = Omit<SshHostConfig, "id"> & {
+  id: string;
+  source: string;
+  duplicate: boolean;
+};
+
+export type SshScanResult = {
+  homePath: string;
+  sshDirPath: string;
+  keyFiles: string[];
+  candidates: SshImportCandidate[];
+};
+
+type ParsedSshHost = {
+  alias: string;
+  host: string;
+  username: string;
+  port: number;
+  identityFile: string;
+};
+
+const SSH_CONFIG_PATH = ".ssh/config";
+const SSH_DIR_PATH = ".ssh";
+const DEFAULT_SSH_PORT = 22;
+
+function normalizePath(path: string) {
+  return path.replace(/\\/g, "/").replace(/\/+$/, "");
+}
+
+function joinPath(base: string, child: string) {
+  const normalizedBase = normalizePath(base);
+  const normalizedChild = child.replace(/^\/+/, "");
+  return normalizedChild ? `${normalizedBase}/${normalizedChild}` : normalizedBase;
+}
+
+function basename(path: string) {
+  const normalized = normalizePath(path);
+  return normalized.slice(normalized.lastIndexOf("/") + 1) || normalized;
+}
+
+function parsePort(value: string | undefined) {
+  const port = Number(value ?? "");
+  if (!Number.isFinite(port)) return DEFAULT_SSH_PORT;
+  const normalized = Math.floor(port);
+  return normalized >= 1 && normalized <= 65535 ? normalized : DEFAULT_SSH_PORT;
+}
+
+function isWildcardHost(alias: string) {
+  return alias.includes("*") || alias.includes("?") || alias.startsWith("!");
+}
+
+function stripInlineComment(line: string) {
+  const index = line.indexOf("#");
+  return index >= 0 ? line.slice(0, index).trim() : line.trim();
+}
+
+function parseSshConfig(content: string): ParsedSshHost[] {
+  const hosts: ParsedSshHost[] = [];
+  let aliases: string[] = [];
+  let options = new Map<string, string>();
+
+  function flush() {
+    const hostAliases = aliases.filter((alias) => alias && !isWildcardHost(alias));
+    for (const alias of hostAliases) {
+      const hostName = options.get("hostname")?.trim() || alias;
+      hosts.push({
+        alias,
+        host: hostName,
+        username: options.get("user")?.trim() || "",
+        port: parsePort(options.get("port")),
+        identityFile: options.get("identityfile")?.trim() || "",
+      });
+    }
+    aliases = [];
+    options = new Map<string, string>();
+  }
+
+  for (const rawLine of content.split(/\r?\n/)) {
+    const line = stripInlineComment(rawLine);
+    if (!line) continue;
+    const [rawKey = "", ...rest] = line.split(/\s+/);
+    const key = rawKey.toLowerCase();
+    const value = rest.join(" ").trim();
+    if (key === "host") {
+      flush();
+      aliases = rest.map((item) => item.trim()).filter(Boolean);
+      continue;
+    }
+    if (aliases.length > 0 && key && value) {
+      options.set(key, value);
+    }
+  }
+  flush();
+
+  return hosts;
+}
+
+function isLikelyPrivateKeyPath(path: string) {
+  const name = basename(path);
+  if (!name || name.endsWith(".pub")) return false;
+  if (
+    ["config", "known_hosts", "known_hosts.old", "authorized_keys", "authorized_keys2"].includes(
+      name,
+    )
+  ) {
+    return false;
+  }
+  return name.startsWith("id_") || !name.includes(".");
+}
+
+function isPrivateKeyContent(content: string) {
+  return /^-----BEGIN [A-Z0-9 ]*PRIVATE KEY-----/m.test(content.trim());
+}
+
+function expandIdentityPath(homePath: string, path: string) {
+  const trimmed = path.trim().replace(/^"|"$/g, "");
+  if (!trimmed) return "";
+  if (trimmed.startsWith("~/")) return joinPath(homePath, trimmed.slice(2));
+  if (trimmed.startsWith("$HOME/")) return joinPath(homePath, trimmed.slice(6));
+  if (trimmed.startsWith("/")) return normalizePath(trimmed);
+  return joinPath(homePath, trimmed);
+}
+
+function toHomeRelativePath(homePath: string, path: string) {
+  const home = `${normalizePath(homePath)}/`;
+  const normalized = normalizePath(path);
+  return normalized.startsWith(home) ? normalized.slice(home.length) : "";
+}
+
+async function readHomeFile(homePath: string, relativePath: string) {
+  const response = await invoke<FsReadEditableTextResponse>("fs_read_editable_text", {
+    workdir: homePath,
+    path: relativePath,
+  });
+  return response.content;
+}
+
+async function readOptionalHomeFile(homePath: string, relativePath: string) {
+  try {
+    return await readHomeFile(homePath, relativePath);
+  } catch {
+    return "";
+  }
+}
+
+async function findHomePath() {
+  const response = await invoke<FsRootsResponse>("fs_roots");
+  const home =
+    response.roots.find((root) => root.kind === "home") ??
+    response.roots.find((root) => root.id === "home");
+  return home?.path?.trim() ?? "";
+}
+
+async function listSshDirectory(homePath: string) {
+  try {
+    const response = await invoke<FsListResponse>("fs_list", {
+      workdir: homePath,
+      path: SSH_DIR_PATH,
+      depth: 1,
+      offset: 0,
+      max_results: 300,
+    });
+    return Array.isArray(response.entries) ? response.entries : [];
+  } catch {
+    return [];
+  }
+}
+
+export function sshHostIdentityKey(host: Pick<SshHostConfig, "host" | "port" | "username">) {
+  return `${host.host.trim().toLowerCase()}|${host.port || DEFAULT_SSH_PORT}|${host.username
+    .trim()
+    .toLowerCase()}`;
+}
+
+export async function scanSshImportCandidates(
+  existingHosts: SshHostConfig[] = [],
+): Promise<SshScanResult> {
+  const homePath = await findHomePath();
+  if (!homePath) {
+    throw new Error("无法定位用户目录。");
+  }
+
+  const entries = await listSshDirectory(homePath);
+  const configContent = await readOptionalHomeFile(homePath, SSH_CONFIG_PATH);
+  const parsedHosts = parseSshConfig(configContent);
+  const keyEntries = entries
+    .filter((entry) => entry.kind === "file" && isLikelyPrivateKeyPath(entry.path))
+    .map((entry) => entry.path);
+
+  const keyContentByPath = new Map<string, string>();
+  for (const keyPath of keyEntries) {
+    const content = await readOptionalHomeFile(homePath, keyPath);
+    if (isPrivateKeyContent(content)) {
+      keyContentByPath.set(normalizePath(keyPath), content.trim());
+      keyContentByPath.set(joinPath(homePath, keyPath), content.trim());
+    }
+  }
+
+  const existingKeys = new Set(existingHosts.map(sshHostIdentityKey));
+  const candidates = parsedHosts.map((host) => {
+    const identityPath = expandIdentityPath(homePath, host.identityFile);
+    const identityRelativePath = identityPath ? toHomeRelativePath(homePath, identityPath) : "";
+    const privateKey =
+      keyContentByPath.get(identityPath) ??
+      (identityRelativePath ? keyContentByPath.get(normalizePath(identityRelativePath)) : "") ??
+      "";
+    const authType = privateKey || identityPath ? "privateKey" : "password";
+    const candidate: SshImportCandidate = {
+      id: `ssh-import-${host.alias}-${host.host}-${host.port}`,
+      name: host.alias,
+      description: "Imported from ~/.ssh/config",
+      host: host.host,
+      port: host.port,
+      username: host.username,
+      authType,
+      password: "",
+      passwordConfigured: false,
+      privateKey,
+      privateKeyPath: identityPath,
+      privateKeyConfigured: privateKey.length > 0 || identityPath.length > 0,
+      proxy: {
+        type: "socks5",
+        url: "",
+        port: 0,
+        username: "",
+        password: "",
+        passwordConfigured: false,
+      },
+      source: SSH_CONFIG_PATH,
+      duplicate: false,
+    };
+    return {
+      ...candidate,
+      duplicate: existingKeys.has(sshHostIdentityKey(candidate)),
+    };
+  });
+
+  return {
+    homePath,
+    sshDirPath: joinPath(homePath, SSH_DIR_PATH),
+    keyFiles: [...keyContentByPath.keys()]
+      .filter((path) => !path.startsWith(normalizePath(homePath)))
+      .sort(),
+    candidates,
+  };
+}
diff --git a/crates/agent-gateway/web/src/pages/SettingsPage.tsx b/crates/agent-gateway/web/src/pages/SettingsPage.tsx
index 7a08b3c83..212849bf1 100644
--- a/crates/agent-gateway/web/src/pages/SettingsPage.tsx
+++ b/crates/agent-gateway/web/src/pages/SettingsPage.tsx
@@ -1,5 +1,15 @@
 import { useEffect, useMemo, useState, type ReactNode } from "react";
-import { ArrowLeft, BookOpen, Brain, Clock3, Cloud, Cpu, Settings2, Zap } from "../components/icons";
+import {
+  ArrowLeft,
+  BookOpen,
+  Brain,
+  Clock3,
+  Cloud,
+  Cpu,
+  Key,
+  Settings2,
+  Zap,
+} from "../components/icons";
 
 import { useLocale } from "../i18n";
 import { AgentsSection } from "./settings/AgentsSection";
@@ -8,6 +18,7 @@ import { HooksSection } from "./settings/HooksSection";
 import { MemoryPanel } from "./settings/MemoryPanel";
 import { ProvidersSection } from "./settings/ProvidersSection";
 import { RemoteSection } from "./settings/RemoteSection";
+import { SshSection } from "./settings/SshSection";
 import { SystemSettingsForm } from "./settings/SystemSettingsForm";
 import type { SectionId, SettingsPageProps } from "./settings/types";
 
@@ -100,6 +111,10 @@ const NAV_ITEMS_STATIC: Array<{ id: SectionId; icon: ReactNode }> = [
     id: "cron",
     icon: <Clock3 className="h-4 w-4" />,
   },
+  {
+    id: "ssh",
+    icon: <Key className="h-4 w-4" />,
+  },
   {
     id: "remote",
     icon: <Cloud className="h-4 w-4" />,
@@ -122,6 +137,7 @@ export function SettingsPage(props: SettingsPageProps) {
     system: t("settings.navSystem"),
     providers: t("settings.navProviders"),
     agents: t("settings.navAgents"),
+    ssh: t("settings.navSsh"),
     memory: t("settings.navMemory"),
     hooks: t("settings.navHooks"),
     cron: t("settings.navCron"),
@@ -162,6 +178,8 @@ export function SettingsPage(props: SettingsPageProps) {
         return <CronSection settings={settings} setSettings={setSettings} />;
       case "agents":
         return <AgentsSection settings={settings} setSettings={setSettings} />;
+      case "ssh":
+        return <SshSection settings={settings} setSettings={setSettings} />;
       case "remote":
         return <RemoteSection settings={settings} setSettings={setSettings} />;
       case "memory":
diff --git a/crates/agent-gateway/web/src/pages/settings/SshSection.tsx b/crates/agent-gateway/web/src/pages/settings/SshSection.tsx
new file mode 100644
index 000000000..2d1d61663
--- /dev/null
+++ b/crates/agent-gateway/web/src/pages/settings/SshSection.tsx
@@ -0,0 +1,1019 @@
+import { type CSSProperties, useEffect, useRef, useState } from "react";
+import { createPortal } from "react-dom";
+import {
+  Check,
+  ChevronDown,
+  Eye,
+  EyeOff,
+  Key,
+  LayoutGrid,
+  List,
+  Lock,
+  Pencil,
+  Plus,
+  Server,
+  Trash2,
+  Upload,
+} from "../../components/icons";
+
+import { Button } from "../../components/ui/button";
+import { Input } from "../../components/ui/input";
+import { Label } from "../../components/ui/label";
+import { Textarea } from "../../components/ui/textarea";
+import { useLocale } from "../../i18n";
+import {
+  type SshAuthType,
+  type SshHostConfig,
+  type SshProxyType,
+  updateSsh,
+} from "../../lib/settings";
+import { useModalMotion } from "../../lib/shared/modalMotion";
+import {
+  type SshImportCandidate,
+  type SshScanResult,
+  scanSshImportCandidates,
+} from "../../lib/ssh/scan";
+import { ConfirmDeletePopover, PromptTag } from "./shared";
+import type { SettingsSectionProps } from "./types";
+
+type SshViewMode = "list" | "grid";
+type SshHostDraft = Omit<SshHostConfig, "id">;
+
+function normalizePortInput(value: string) {
+  const port = Number(value);
+  if (!Number.isFinite(port)) return 22;
+  const normalized = Math.floor(port);
+  return normalized >= 1 && normalized <= 65535 ? normalized : 22;
+}
+
+function normalizeOptionalPortInput(value: string) {
+  const trimmed = value.trim();
+  if (!trimmed) return 0;
+  const port = Number(trimmed);
+  if (!Number.isFinite(port)) return 0;
+  const normalized = Math.floor(port);
+  return normalized >= 1 && normalized <= 65535 ? normalized : 0;
+}
+
+function endpointLabel(host: SshHostConfig) {
+  const userPrefix = host.username.trim() ? `${host.username.trim()}@` : "";
+  return `${userPrefix}${host.host}:${host.port}`;
+}
+
+function authLabel(host: Pick<SshHostConfig, "authType">, t: (key: string) => string) {
+  return host.authType === "privateKey"
+    ? t("settings.sshAuthPrivateKey")
+    : t("settings.sshAuthPassword");
+}
+
+function SshPasswordInput(props: {
+  id: string;
+  value: string;
+  disabled?: boolean;
+  onChange: (value: string) => void;
+}) {
+  const { id, value, disabled = false, onChange } = props;
+  const { t } = useLocale();
+  const [visible, setVisible] = useState(false);
+  const toggleLabel = visible ? t("settings.sshHidePassword") : t("settings.sshShowPassword");
+
+  return (
+    <div className="relative">
+      <Input
+        id={id}
+        type={visible ? "text" : "password"}
+        value={value}
+        disabled={disabled}
+        className="pr-10"
+        onChange={(event) => onChange(event.currentTarget.value)}
+      />
+      <Button
+        type="button"
+        variant="ghost"
+        size="icon"
+        className="absolute right-1 top-1/2 h-8 w-8 -translate-y-1/2 text-muted-foreground hover:text-foreground disabled:pointer-events-none disabled:opacity-50"
+        disabled={disabled}
+        onClick={() => setVisible((current) => !current)}
+        title={toggleLabel}
+        aria-label={toggleLabel}
+      >
+        {visible ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
+      </Button>
+    </div>
+  );
+}
+
+function SshHostModal(props: {
+  initialData?: SshHostConfig;
+  onSave: (data: SshHostDraft) => void;
+  onClose: () => void;
+}) {
+  const { initialData, onSave, onClose } = props;
+  const { t } = useLocale();
+  const fileInputRef = useRef<HTMLInputElement | null>(null);
+  const [name, setName] = useState(initialData?.name ?? "");
+  const [host, setHost] = useState(initialData?.host ?? "");
+  const [port, setPort] = useState(String(initialData?.port ?? 22));
+  const [username, setUsername] = useState(initialData?.username ?? "");
+  const [authType, setAuthType] = useState<SshAuthType>(initialData?.authType ?? "password");
+  const [password, setPassword] = useState(initialData?.password ?? "");
+  const [privateKey, setPrivateKey] = useState(initialData?.privateKey ?? "");
+  const [privateKeyPath, setPrivateKeyPath] = useState(initialData?.privateKeyPath ?? "");
+  const [advancedOpen, setAdvancedOpen] = useState(false);
+  const [proxyType, setProxyType] = useState<SshProxyType>(initialData?.proxy.type ?? "socks5");
+  const [proxyUrl, setProxyUrl] = useState(initialData?.proxy.url ?? "");
+  const [proxyPort, setProxyPort] = useState(
+    initialData?.proxy.port ? String(initialData.proxy.port) : "",
+  );
+  const [proxyUsername, setProxyUsername] = useState(initialData?.proxy.username ?? "");
+  const [proxyPassword, setProxyPassword] = useState(initialData?.proxy.password ?? "");
+  const { isClosing, modalState, requestClose } = useModalMotion(onClose);
+  const isEditing = Boolean(initialData);
+  const isPasswordAuth = authType === "password";
+  const passwordAuthPanelStyle: CSSProperties = {
+    maxHeight: isPasswordAuth ? "7rem" : "0rem",
+    opacity: isPasswordAuth ? 1 : 0,
+    pointerEvents: isPasswordAuth ? "auto" : "none",
+    transform: isPasswordAuth ? "translateY(0)" : "translateY(-4px)",
+  };
+  const privateKeyAuthPanelStyle: CSSProperties = {
+    maxHeight: isPasswordAuth ? "0rem" : "24rem",
+    opacity: isPasswordAuth ? 0 : 1,
+    pointerEvents: isPasswordAuth ? "none" : "auto",
+    transform: isPasswordAuth ? "translateY(4px)" : "translateY(0)",
+  };
+
+  function handleFileSelected(file: File | undefined) {
+    if (!file) return;
+    const reader = new FileReader();
+    reader.onload = () => {
+      const content = typeof reader.result === "string" ? reader.result : "";
+      setPrivateKey(content.trim());
+      setPrivateKeyPath(file.name);
+      setAuthType("privateKey");
+    };
+    reader.readAsText(file);
+  }
+
+  function handleSave() {
+    if (isClosing) return;
+    const trimmedName = name.trim();
+    const trimmedHost = host.trim();
+    if (!trimmedName || !trimmedHost) return;
+    const trimmedPassword = password.trim();
+    const trimmedPrivateKey = privateKey.trim();
+    const trimmedPrivateKeyPath = privateKeyPath.trim();
+    const trimmedProxyPassword = proxyPassword.trim();
+    onSave({
+      name: trimmedName,
+      description: initialData?.description ?? "",
+      host: trimmedHost,
+      port: normalizePortInput(port),
+      username: username.trim(),
+      authType,
+      password: trimmedPassword,
+      passwordConfigured: trimmedPassword.length > 0 || initialData?.passwordConfigured === true,
+      privateKey: trimmedPrivateKey,
+      privateKeyPath: trimmedPrivateKeyPath,
+      privateKeyConfigured:
+        trimmedPrivateKey.length > 0 ||
+        trimmedPrivateKeyPath.length > 0 ||
+        initialData?.privateKeyConfigured === true,
+      proxy: {
+        type: proxyType,
+        url: proxyUrl.trim(),
+        port: normalizeOptionalPortInput(proxyPort),
+        username: proxyUsername.trim(),
+        password: trimmedProxyPassword,
+        passwordConfigured:
+          trimmedProxyPassword.length > 0 || initialData?.proxy.passwordConfigured === true,
+      },
+    });
+    requestClose();
+  }
+
+  return createPortal(
+    <div
+      className="settings-modal-overlay fixed inset-0 z-50 flex items-center justify-center p-4"
+      data-state={modalState}
+    >
+      <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" onClick={requestClose} />
+      <div className="settings-modal-panel relative z-10 flex max-h-[92vh] w-full max-w-3xl flex-col overflow-hidden rounded-2xl border bg-background shadow-2xl">
+        <div className="settings-modal-header flex items-center gap-3 border-b px-6 py-4">
+          <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
+            <Key className="h-5 w-5" />
+          </div>
+          <div className="flex-1">
+            <div className="text-sm font-semibold">
+              {isEditing ? t("settings.sshEdit") : t("settings.sshAdd")}
+            </div>
+            <div className="text-xs text-muted-foreground">{t("settings.sshDesc")}</div>
+          </div>
+        </div>
+
+        <div className="settings-modal-body flex-1 overflow-y-auto px-6 py-5">
+          <div className="grid grid-cols-2 gap-4">
+            <div className="space-y-1.5">
+              <Label htmlFor="ssh-name" className="text-xs font-medium text-muted-foreground">
+                {t("settings.sshName")}
+                <span className="ml-0.5 text-red-500">*</span>
+              </Label>
+              <Input
+                id="ssh-name"
+                value={name}
+                onChange={(event) => setName(event.currentTarget.value)}
+              />
+            </div>
+            <div className="space-y-1.5">
+              <Label htmlFor="ssh-host" className="text-xs font-medium text-muted-foreground">
+                {t("settings.sshHost")}
+                <span className="ml-0.5 text-red-500">*</span>
+              </Label>
+              <Input
+                id="ssh-host"
+                value={host}
+                onChange={(event) => setHost(event.currentTarget.value)}
+              />
+            </div>
+            <div className="space-y-1.5">
+              <Label htmlFor="ssh-username" className="text-xs font-medium text-muted-foreground">
+                {t("settings.sshUsername")}
+              </Label>
+              <Input
+                id="ssh-username"
+                value={username}
+                onChange={(event) => setUsername(event.currentTarget.value)}
+              />
+            </div>
+            <div className="space-y-1.5">
+              <Label htmlFor="ssh-port" className="text-xs font-medium text-muted-foreground">
+                {t("settings.sshPort")}
+              </Label>
+              <Input
+                id="ssh-port"
+                type="number"
+                min={1}
+                max={65535}
+                value={port}
+                onChange={(event) => setPort(event.currentTarget.value)}
+              />
+            </div>
+          </div>
+
+          <div className="mt-4 space-y-2">
+            <div className="text-xs font-medium text-muted-foreground">
+              {t("settings.sshAuthMethod")}
+            </div>
+            <div className="grid grid-cols-2 gap-2">
+              <button
+                type="button"
+                onClick={() => setAuthType("password")}
+                className={`group relative flex items-center gap-3 rounded-xl border px-3 py-3 text-left transition-all duration-200 ease-out hover:-translate-y-0.5 ${
+                  isPasswordAuth
+                    ? "border-emerald-500/40 bg-emerald-500/[0.06] shadow-sm"
+                    : "border-border/60 bg-card hover:border-border hover:bg-muted/20"
+                }`}
+              >
+                <Lock
+                  className={`h-4 w-4 shrink-0 text-emerald-500 transition-transform duration-200 ${
+                    isPasswordAuth ? "scale-110" : "group-hover:scale-105"
+                  }`}
+                />
+                <div className="min-w-0">
+                  <div className="text-sm font-medium">{t("settings.sshAuthPassword")}</div>
+                  <div className="text-xs text-muted-foreground">
+                    {t("settings.sshAuthPasswordHint")}
+                  </div>
+                </div>
+                <Check
+                  aria-hidden="true"
+                  className={`ml-auto h-4 w-4 shrink-0 text-emerald-500 transition-all duration-200 ${
+                    isPasswordAuth ? "scale-100 opacity-100" : "scale-75 opacity-0"
+                  }`}
+                />
+              </button>
+              <button
+                type="button"
+                onClick={() => setAuthType("privateKey")}
+                className={`group relative flex items-center gap-3 rounded-xl border px-3 py-3 text-left transition-all duration-200 ease-out hover:-translate-y-0.5 ${
+                  !isPasswordAuth
+                    ? "border-emerald-500/40 bg-emerald-500/[0.06] shadow-sm"
+                    : "border-border/60 bg-card hover:border-border hover:bg-muted/20"
+                }`}
+              >
+                <Key
+                  className={`h-4 w-4 shrink-0 text-emerald-500 transition-transform duration-200 ${
+                    !isPasswordAuth ? "scale-110" : "group-hover:scale-105"
+                  }`}
+                />
+                <div className="min-w-0">
+                  <div className="text-sm font-medium">{t("settings.sshAuthPrivateKey")}</div>
+                  <div className="text-xs text-muted-foreground">
+                    {t("settings.sshAuthPrivateKeyHint")}
+                  </div>
+                </div>
+                <Check
+                  aria-hidden="true"
+                  className={`ml-auto h-4 w-4 shrink-0 text-emerald-500 transition-all duration-200 ${
+                    !isPasswordAuth ? "scale-100 opacity-100" : "scale-75 opacity-0"
+                  }`}
+                />
+              </button>
+            </div>
+          </div>
+
+          <div className="mt-4">
+            <div
+              aria-hidden={!isPasswordAuth}
+              className="ssh-auth-panel ssh-auth-panel--password"
+              data-state={isPasswordAuth ? "open" : "closed-up"}
+              style={passwordAuthPanelStyle}
+            >
+              <div className="space-y-1.5">
+                <Label htmlFor="ssh-password" className="text-xs font-medium text-muted-foreground">
+                  {t("settings.sshPassword")}
+                </Label>
+                <SshPasswordInput
+                  id="ssh-password"
+                  value={password}
+                  disabled={!isPasswordAuth}
+                  onChange={setPassword}
+                />
+                {initialData?.passwordConfigured && !password.trim() ? (
+                  <div className="text-[11px] text-muted-foreground">
+                    {t("settings.sshPasswordConfigured")}
+                  </div>
+                ) : null}
+              </div>
+            </div>
+
+            <div
+              aria-hidden={isPasswordAuth}
+              className="ssh-auth-panel ssh-auth-panel--private-key"
+              data-state={!isPasswordAuth ? "open" : "closed-down"}
+              style={privateKeyAuthPanelStyle}
+            >
+              <div className="space-y-3">
+                <div className="relative">
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    className="absolute right-2 top-2 z-10 h-7 w-7 rounded-md border border-transparent bg-background/80 p-0 text-muted-foreground shadow-none hover:border-border/70 hover:bg-muted/70 hover:text-foreground"
+                    aria-label={t("settings.sshPrivateKeyImport")}
+                    disabled={isPasswordAuth}
+                    onClick={() => fileInputRef.current?.click()}
+                    title={t("settings.sshPrivateKeyImport")}
+                  >
+                    <Upload className="h-3.5 w-3.5" aria-hidden="true" />
+                  </Button>
+                  <input
+                    ref={fileInputRef}
+                    type="file"
+                    className="hidden"
+                    disabled={isPasswordAuth}
+                    onChange={(event) => handleFileSelected(event.currentTarget.files?.[0])}
+                  />
+                  <Textarea
+                    id="ssh-private-key"
+                    aria-label={t("settings.sshPrivateKey")}
+                    value={privateKey}
+                    disabled={isPasswordAuth}
+                    className="min-h-[180px] resize-y pr-12 font-mono text-xs leading-relaxed"
+                    onChange={(event) => setPrivateKey(event.currentTarget.value)}
+                  />
+                </div>
+                {initialData?.privateKeyConfigured && !privateKey.trim() ? (
+                  <div className="text-[11px] text-muted-foreground">
+                    {t("settings.sshPrivateKeyConfigured")}
+                  </div>
+                ) : null}
+              </div>
+            </div>
+          </div>
+
+          <div className="mt-5 overflow-hidden rounded-xl border border-border/60 bg-muted/10">
+            <button
+              type="button"
+              className="flex w-full items-center justify-between gap-3 px-4 py-3 text-left text-sm font-medium transition-colors hover:bg-muted/30"
+              onClick={() => setAdvancedOpen((open) => !open)}
+            >
+              <span>{t("settings.sshAdvancedSettings")}</span>
+              <ChevronDown
+                className={`h-4 w-4 text-muted-foreground transition-transform duration-200 ${
+                  advancedOpen ? "rotate-180" : ""
+                }`}
+              />
+            </button>
+
+            <div className="ssh-collapsible" data-open={advancedOpen}>
+              <div
+                aria-hidden={!advancedOpen}
+                className={`ssh-collapsible-inner border-border/60 px-4 transition-[border-width,padding] duration-200 ease-out ${
+                  advancedOpen ? "border-t py-4" : "border-t-0 py-0"
+                }`}
+                inert={!advancedOpen}
+              >
+                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+                  <div className="space-y-1.5 sm:col-span-2">
+                    <Label className="text-xs font-medium text-muted-foreground">
+                      {t("settings.sshProxyType")}
+                    </Label>
+                    <div className="grid grid-cols-2 gap-2 rounded-xl border border-border/60 bg-background p-1">
+                      {(["socks5", "http"] as SshProxyType[]).map((type) => (
+                        <button
+                          key={type}
+                          type="button"
+                          className={`rounded-lg px-3 py-2 text-xs font-medium transition-colors ${
+                            proxyType === type
+                              ? "bg-muted text-foreground shadow-sm"
+                              : "text-muted-foreground hover:bg-muted/60 hover:text-foreground"
+                          }`}
+                          onClick={() => setProxyType(type)}
+                        >
+                          {type === "socks5"
+                            ? t("settings.sshProxyTypeSocks5")
+                            : t("settings.sshProxyTypeHttp")}
+                        </button>
+                      ))}
+                    </div>
+                  </div>
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="ssh-proxy-url"
+                      className="text-xs font-medium text-muted-foreground"
+                    >
+                      {t("settings.sshProxyUrl")}
+                    </Label>
+                    <Input
+                      id="ssh-proxy-url"
+                      value={proxyUrl}
+                      placeholder={t(
+                        proxyType === "socks5"
+                          ? "settings.sshProxyUrlSocks5Placeholder"
+                          : "settings.sshProxyUrlHttpPlaceholder",
+                      )}
+                      onChange={(event) => setProxyUrl(event.currentTarget.value)}
+                    />
+                  </div>
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="ssh-proxy-port"
+                      className="text-xs font-medium text-muted-foreground"
+                    >
+                      {t("settings.sshProxyPort")}
+                    </Label>
+                    <Input
+                      id="ssh-proxy-port"
+                      type="number"
+                      min={1}
+                      max={65535}
+                      value={proxyPort}
+                      onChange={(event) => setProxyPort(event.currentTarget.value)}
+                    />
+                  </div>
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="ssh-proxy-username"
+                      className="text-xs font-medium text-muted-foreground"
+                    >
+                      {t("settings.sshProxyUsername")}
+                    </Label>
+                    <Input
+                      id="ssh-proxy-username"
+                      value={proxyUsername}
+                      onChange={(event) => setProxyUsername(event.currentTarget.value)}
+                    />
+                  </div>
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="ssh-proxy-password"
+                      className="text-xs font-medium text-muted-foreground"
+                    >
+                      {t("settings.sshProxyPassword")}
+                    </Label>
+                    <SshPasswordInput
+                      id="ssh-proxy-password"
+                      value={proxyPassword}
+                      onChange={setProxyPassword}
+                    />
+                    {initialData?.proxy.passwordConfigured && !proxyPassword.trim() ? (
+                      <div className="text-[11px] text-muted-foreground">
+                        {t("settings.sshProxyPasswordConfigured")}
+                      </div>
+                    ) : null}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div className="settings-modal-footer flex items-center justify-end border-t px-6 py-4">
+          <div className="flex items-center gap-2">
+            <Button variant="outline" onClick={requestClose}>
+              {t("settings.cancel")}
+            </Button>
+            <Button onClick={handleSave} disabled={!name.trim() || !host.trim() || isClosing}>
+              {t("settings.save")}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </div>,
+    document.body,
+  );
+}
+
+function SshImportModal(props: {
+  existingHosts: SshHostConfig[];
+  onImport: (hosts: SshImportCandidate[]) => void;
+  onClose: () => void;
+}) {
+  const { existingHosts, onImport, onClose } = props;
+  const { t } = useLocale();
+  const [result, setResult] = useState<SshScanResult | null>(null);
+  const [error, setError] = useState("");
+  const [selectedIds, setSelectedIds] = useState<Set<string>>(() => new Set());
+  const { isClosing, modalState, requestClose } = useModalMotion(onClose);
+
+  useEffect(() => {
+    let cancelled = false;
+    setResult(null);
+    setError("");
+    scanSshImportCandidates(existingHosts)
+      .then((scanResult) => {
+        if (cancelled) return;
+        setResult(scanResult);
+        setSelectedIds(
+          new Set(scanResult.candidates.filter((item) => !item.duplicate).map((item) => item.id)),
+        );
+      })
+      .catch((scanError) => {
+        if (cancelled) return;
+        setError(scanError instanceof Error ? scanError.message : String(scanError));
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [existingHosts]);
+
+  const candidates = result?.candidates ?? [];
+  const selected = candidates.filter((candidate) => selectedIds.has(candidate.id));
+
+  function toggle(id: string) {
+    setSelectedIds((current) => {
+      const next = new Set(current);
+      if (next.has(id)) next.delete(id);
+      else next.add(id);
+      return next;
+    });
+  }
+
+  return createPortal(
+    <div
+      className="settings-modal-overlay fixed inset-0 z-50 flex items-center justify-center p-4"
+      data-state={modalState}
+    >
+      <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" onClick={requestClose} />
+      <div className="settings-modal-panel relative z-10 flex max-h-[90vh] w-full max-w-3xl flex-col overflow-hidden rounded-2xl border bg-background shadow-2xl">
+        <div className="settings-modal-header flex items-center gap-3 border-b px-6 py-4">
+          <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
+            <Upload className="h-5 w-5" />
+          </div>
+          <div className="flex-1">
+            <div className="text-sm font-semibold">{t("settings.sshImport")}</div>
+            <div className="text-xs text-muted-foreground">{t("settings.sshImportDesc")}</div>
+          </div>
+        </div>
+
+        <div className="settings-modal-body flex-1 overflow-y-auto px-6 py-5">
+          {!result && !error ? (
+            <div className="flex h-48 items-center justify-center rounded-2xl border border-dashed border-border/60 bg-muted/20 text-sm text-muted-foreground">
+              {t("settings.sshImportScanning")}
+            </div>
+          ) : null}
+
+          {error ? (
+            <div className="rounded-2xl border border-destructive/30 bg-destructive/5 p-4 text-sm text-destructive">
+              {t("settings.sshImportFailed")}: {error}
+            </div>
+          ) : null}
+
+          {result ? (
+            <div className="space-y-4">
+              <div className="rounded-xl border border-border/60 bg-muted/20 px-4 py-3 text-xs text-muted-foreground">
+                <div className="font-medium text-foreground">{result.sshDirPath}</div>
+                <div className="mt-1">
+                  {t("settings.sshImportFound")
+                    .replace("{count}", String(candidates.length))
+                    .replace("{keys}", String(result.keyFiles.length))}
+                </div>
+              </div>
+
+              {candidates.length === 0 ? (
+                <div className="flex flex-col items-center gap-3 rounded-2xl border border-dashed border-border/60 bg-muted/20 py-12 text-center">
+                  <Key className="h-8 w-8 text-muted-foreground/50" />
+                  <div>
+                    <div className="text-sm font-medium">{t("settings.sshImportEmpty")}</div>
+                    <div className="mt-1 text-xs text-muted-foreground">
+                      {t("settings.sshImportEmptyHint")}
+                    </div>
+                  </div>
+                </div>
+              ) : (
+                <div className="space-y-2">
+                  {candidates.map((candidate) => (
+                    <button
+                      key={candidate.id}
+                      type="button"
+                      disabled={candidate.duplicate}
+                      onClick={() => toggle(candidate.id)}
+                      className={`flex w-full items-center gap-3 rounded-xl border px-4 py-3 text-left transition-colors ${
+                        selectedIds.has(candidate.id)
+                          ? "border-emerald-500/40 bg-emerald-500/[0.06]"
+                          : "border-border/60 bg-card hover:border-border"
+                      } ${candidate.duplicate ? "cursor-not-allowed opacity-60" : ""}`}
+                    >
+                      <span
+                        className={`flex h-5 w-5 shrink-0 items-center justify-center rounded border transition-colors duration-150 ${
+                          selectedIds.has(candidate.id)
+                            ? "border-emerald-500 bg-emerald-500 text-white"
+                            : "border-border bg-background"
+                        }`}
+                      >
+                        <Check
+                          className={`h-3.5 w-3.5 transition-transform duration-150 ${
+                            selectedIds.has(candidate.id) ? "scale-100" : "scale-0"
+                          }`}
+                        />
+                      </span>
+                      <div className="min-w-0 flex-1">
+                        <div className="flex items-center gap-2">
+                          <span className="truncate text-sm font-medium">{candidate.name}</span>
+                          <PromptTag label={authLabel(candidate, t)} />
+                          {candidate.duplicate ? (
+                            <PromptTag label={t("settings.sshImportDuplicate")} muted />
+                          ) : null}
+                        </div>
+                        <div className="mt-1 truncate text-xs text-muted-foreground">
+                          {candidate.username ? `${candidate.username}@` : ""}
+                          {candidate.host}:{candidate.port}
+                        </div>
+                      </div>
+                    </button>
+                  ))}
+                </div>
+              )}
+            </div>
+          ) : null}
+        </div>
+
+        <div className="settings-modal-footer flex items-center justify-between border-t px-6 py-4">
+          <div className="text-xs text-muted-foreground">
+            {t("settings.sshImportSelected").replace("{count}", String(selected.length))}
+          </div>
+          <div className="flex items-center gap-2">
+            <Button variant="outline" onClick={requestClose}>
+              {t("settings.cancel")}
+            </Button>
+            <Button
+              disabled={selected.length === 0 || isClosing}
+              onClick={() => {
+                onImport(selected);
+                requestClose();
+              }}
+            >
+              {t("settings.sshImport")}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </div>,
+    document.body,
+  );
+}
+
+function SshHostCard(props: {
+  host: SshHostConfig;
+  viewMode: SshViewMode;
+  onEdit: () => void;
+  onDelete: () => void;
+}) {
+  const { host, viewMode, onEdit, onDelete } = props;
+  const { t } = useLocale();
+  const showKeyPath = host.authType === "privateKey" && host.privateKeyPath.trim().length > 0;
+  const showKeyConfigured = host.authType === "privateKey" && host.privateKeyConfigured;
+  const showProxy =
+    host.proxy.url.trim().length > 0 || host.proxy.port > 0 || host.proxy.passwordConfigured;
+  const hasMeta = showKeyPath || showKeyConfigured || showProxy;
+
+  const actions = (
+    <div className="settings-hover-actions flex items-center gap-0.5 opacity-0 transition-opacity focus-within:opacity-100 group-hover:opacity-100">
+      <Button
+        variant="ghost"
+        size="icon"
+        className="h-7 w-7 text-muted-foreground hover:text-foreground"
+        onClick={onEdit}
+        title={t("settings.edit")}
+      >
+        <Pencil className="h-3.5 w-3.5" />
+      </Button>
+      <ConfirmDeletePopover name={host.name} onConfirm={onDelete}>
+        {(open) => (
+          <Button
+            variant="ghost"
+            size="icon"
+            className="h-7 w-7 text-muted-foreground hover:text-destructive"
+            onClick={open}
+            title={t("settings.delete")}
+          >
+            <Trash2 className="h-3.5 w-3.5" />
+          </Button>
+        )}
+      </ConfirmDeletePopover>
+    </div>
+  );
+
+  const metaTags = (
+    <div className="flex flex-wrap items-center gap-1.5">
+      {showKeyPath ? <PromptTag label={host.privateKeyPath} muted /> : null}
+      {showKeyConfigured ? <PromptTag label={t("settings.sshPrivateKeyConfigured")} muted /> : null}
+      {showProxy ? <PromptTag label={t("settings.sshAdvancedProxy")} muted /> : null}
+    </div>
+  );
+
+  if (viewMode === "grid") {
+    return (
+      <div className="group relative z-0 flex flex-col rounded-xl border border-border/60 bg-card p-4 transition-all duration-200 hover:z-10 hover:border-emerald-500/40 hover:shadow-md hover:shadow-emerald-500/10">
+        <div className="absolute right-3 top-3">{actions}</div>
+        <div className="flex items-start gap-3 pr-12">
+          <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-emerald-500/10 text-emerald-500 transition-transform duration-200 group-hover:scale-105">
+            <Server className="h-[18px] w-[18px]" />
+          </div>
+          <div className="min-w-0 flex-1">
+            <div className="truncate text-sm font-medium text-foreground">{host.name}</div>
+            <div className="mt-1 flex">
+              <PromptTag label={authLabel(host, t)} />
+            </div>
+          </div>
+        </div>
+        <div className="mt-3 truncate font-mono text-xs text-muted-foreground">
+          {endpointLabel(host)}
+        </div>
+        {hasMeta ? <div className="mt-auto pt-3">{metaTags}</div> : null}
+      </div>
+    );
+  }
+
+  return (
+    <div className="group relative z-0 rounded-xl border border-border/60 bg-card transition-all duration-200 hover:z-10 hover:border-emerald-500/40 hover:shadow-md hover:shadow-emerald-500/10">
+      <div className="settings-card-row flex items-center gap-3 px-4 py-3">
+        <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-emerald-500/10 text-emerald-500 transition-transform duration-200 group-hover:scale-105">
+          <Server className="h-4 w-4" />
+        </div>
+        <div className="min-w-0 flex-1">
+          <div className="flex items-center gap-2">
+            <span className="truncate text-sm font-medium text-foreground">{host.name}</span>
+            <PromptTag label={authLabel(host, t)} />
+          </div>
+          <div className="mt-1 truncate font-mono text-xs text-muted-foreground">
+            {endpointLabel(host)}
+          </div>
+        </div>
+        {actions}
+      </div>
+      {hasMeta ? <div className="border-t border-border/40 px-4 py-2.5">{metaTags}</div> : null}
+    </div>
+  );
+}
+
+function SshViewModeToggle(props: { value: SshViewMode; onChange: (value: SshViewMode) => void }) {
+  const { value, onChange } = props;
+  const { t } = useLocale();
+  const groupLabel = `${t("settings.sshViewList")} / ${t("settings.sshViewGrid")}`;
+  const options = [
+    { value: "list" as const, label: t("settings.sshViewList"), icon: List },
+    { value: "grid" as const, label: t("settings.sshViewGrid"), icon: LayoutGrid },
+  ];
+
+  return (
+    <fieldset className="relative isolate grid min-w-0 grid-cols-2 rounded-lg border border-border/60 bg-muted/30 p-0.5 shadow-inner shadow-black/5">
+      <legend className="sr-only">{groupLabel}</legend>
+      <span
+        aria-hidden="true"
+        className={`pointer-events-none absolute bottom-0.5 left-0.5 top-0.5 w-[calc(50%-0.125rem)] rounded-md bg-emerald-500/10 shadow-sm shadow-emerald-500/10 ring-1 ring-emerald-500/30 transition-transform duration-200 ease-out motion-reduce:transition-none ${
+          value === "grid" ? "translate-x-full" : "translate-x-0"
+        }`}
+      />
+      {options.map((option) => {
+        const Icon = option.icon;
+        const active = value === option.value;
+        return (
+          <button
+            key={option.value}
+            type="button"
+            className={`relative z-10 flex h-7 w-7 items-center justify-center rounded-md transition-colors duration-200 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background motion-reduce:transition-none ${
+              active ? "text-emerald-500" : "text-muted-foreground"
+            }`}
+            title={option.label}
+            aria-label={option.label}
+            aria-pressed={active}
+            onClick={() => onChange(option.value)}
+          >
+            <Icon className="h-3.5 w-3.5" />
+          </button>
+        );
+      })}
+    </fieldset>
+  );
+}
+
+export function SshSection(props: SettingsSectionProps) {
+  const { settings, setSettings } = props;
+  const { t } = useLocale();
+  const [viewMode, setViewMode] = useState<SshViewMode>("list");
+  const [modalOpen, setModalOpen] = useState(false);
+  const [importOpen, setImportOpen] = useState(false);
+  const [editingHost, setEditingHost] = useState<SshHostConfig | null>(null);
+  const hosts = settings.ssh.hosts;
+
+  function openAdd() {
+    setEditingHost(null);
+    setModalOpen(true);
+  }
+
+  function openEdit(host: SshHostConfig) {
+    setEditingHost(host);
+    setModalOpen(true);
+  }
+
+  function closeModal() {
+    setModalOpen(false);
+    setEditingHost(null);
+  }
+
+  function handleSave(data: SshHostDraft) {
+    setSettings((prev) => {
+      if (editingHost) {
+        return updateSsh(prev, {
+          hosts: prev.ssh.hosts.map((host) =>
+            host.id === editingHost.id
+              ? {
+                  ...host,
+                  ...data,
+                  password: data.password || host.password,
+                  privateKey: data.privateKey || host.privateKey,
+                  passwordConfigured:
+                    data.password.trim().length > 0 || host.passwordConfigured === true,
+                  privateKeyConfigured:
+                    data.privateKey.trim().length > 0 ||
+                    data.privateKeyPath.trim().length > 0 ||
+                    host.privateKeyConfigured === true,
+                  proxy: {
+                    ...data.proxy,
+                    password: data.proxy.password || host.proxy.password,
+                    passwordConfigured:
+                      data.proxy.password.trim().length > 0 ||
+                      host.proxy.passwordConfigured === true,
+                  },
+                }
+              : host,
+          ),
+        });
+      }
+      return updateSsh(prev, {
+        hosts: [
+          ...prev.ssh.hosts,
+          {
+            id: crypto.randomUUID(),
+            ...data,
+          },
+        ],
+      });
+    });
+  }
+
+  function handleDelete(id: string) {
+    setSettings((prev) =>
+      updateSsh(prev, {
+        hosts: prev.ssh.hosts.filter((host) => host.id !== id),
+      }),
+    );
+  }
+
+  function handleImport(candidates: SshImportCandidate[]) {
+    setSettings((prev) =>
+      updateSsh(prev, {
+        hosts: [
+          ...prev.ssh.hosts,
+          ...candidates.map((candidate) => {
+            const { id: _id, source: _source, duplicate: _duplicate, ...host } = candidate;
+            return {
+              id: crypto.randomUUID(),
+              ...host,
+            };
+          }),
+        ],
+      }),
+    );
+  }
+
+  return (
+    <>
+      <div className="settings-ssh-section space-y-5">
+        <div className="settings-section-heading-row flex items-center justify-between gap-4">
+          <div className="settings-section-title-group flex items-center gap-3">
+            <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-emerald-500/10">
+              <Key className="h-[18px] w-[18px] text-emerald-500" />
+            </div>
+            <div>
+              <h3 className="text-sm font-semibold">{t("settings.sshTitle")}</h3>
+              <p className="text-xs text-muted-foreground">{t("settings.sshDesc")}</p>
+            </div>
+          </div>
+
+          <div className="settings-section-actions flex items-center gap-2">
+            {hosts.length > 0 ? (
+              <div className="flex items-center gap-2 rounded-lg bg-muted/50 px-2.5 py-1.5 text-xs text-muted-foreground">
+                <span className="tabular-nums font-medium text-foreground">{hosts.length}</span>
+                {t("settings.sshCount")}
+              </div>
+            ) : null}
+            <SshViewModeToggle value={viewMode} onChange={setViewMode} />
+            <Button
+              variant="outline"
+              size="sm"
+              className="gap-1.5"
+              onClick={() => setImportOpen(true)}
+            >
+              <Upload className="h-3.5 w-3.5" />
+              {t("settings.sshImport")}
+            </Button>
+            <Button variant="outline" size="sm" className="gap-1.5" onClick={openAdd}>
+              <Plus className="h-3.5 w-3.5" />
+              {t("settings.sshAdd")}
+            </Button>
+          </div>
+        </div>
+
+        {hosts.length === 0 ? (
+          <div className="flex flex-col items-center gap-4 rounded-2xl border border-dashed border-border/60 bg-muted/20 py-14 text-center">
+            <div className="flex h-14 w-14 items-center justify-center rounded-2xl bg-emerald-500/10">
+              <Key className="h-6 w-6 text-emerald-400" />
+            </div>
+            <div className="space-y-1.5">
+              <p className="text-sm font-medium text-foreground">{t("settings.sshNoHosts")}</p>
+              <p className="mx-auto max-w-sm text-xs leading-relaxed text-muted-foreground">
+                {t("settings.sshNoHostsHint")}
+              </p>
+            </div>
+            <div className="flex items-center gap-2">
+              <Button
+                variant="outline"
+                size="sm"
+                className="gap-1.5"
+                onClick={() => setImportOpen(true)}
+              >
+                <Upload className="h-3.5 w-3.5" />
+                {t("settings.sshImport")}
+              </Button>
+              <Button size="sm" className="gap-1.5" onClick={openAdd}>
+                <Plus className="h-3.5 w-3.5" />
+                {t("settings.sshAdd")}
+              </Button>
+            </div>
+          </div>
+        ) : (
+          <div
+            className={viewMode === "grid" ? "grid grid-cols-1 gap-3 sm:grid-cols-2" : "space-y-2"}
+          >
+            {hosts.map((host) => (
+              <SshHostCard
+                key={host.id}
+                host={host}
+                viewMode={viewMode}
+                onEdit={() => openEdit(host)}
+                onDelete={() => handleDelete(host.id)}
+              />
+            ))}
+          </div>
+        )}
+      </div>
+
+      {modalOpen ? (
+        <SshHostModal
+          initialData={editingHost ?? undefined}
+          onSave={handleSave}
+          onClose={closeModal}
+        />
+      ) : null}
+      {importOpen ? (
+        <SshImportModal
+          existingHosts={hosts}
+          onImport={handleImport}
+          onClose={() => setImportOpen(false)}
+        />
+      ) : null}
+    </>
+  );
+}
diff --git a/crates/agent-gateway/web/src/pages/settings/types.ts b/crates/agent-gateway/web/src/pages/settings/types.ts
index 580ea9078..db7380d14 100644
--- a/crates/agent-gateway/web/src/pages/settings/types.ts
+++ b/crates/agent-gateway/web/src/pages/settings/types.ts
@@ -7,6 +7,7 @@ export type SectionId =
   | "system"
   | "providers"
   | "agents"
+  | "ssh"
   | "memory"
   | "hooks"
   | "cron"
diff --git a/crates/agent-gui/src-tauri/src/commands/fs.rs b/crates/agent-gui/src-tauri/src/commands/fs.rs
index ea4ef8e47..d2942c962 100644
--- a/crates/agent-gui/src-tauri/src/commands/fs.rs
+++ b/crates/agent-gui/src-tauri/src/commands/fs.rs
@@ -29,6 +29,8 @@ const MAX_ZIP_XML_ENTRY_BYTES: usize = 4 * 1024 * 1024;
 
 const DEFAULT_LIST_DEPTH: usize = 2;
 const DEFAULT_PAGE_LIMIT: usize = 200;
+const DEFAULT_LIST_DIRS_MAX_RESULTS: usize = 2000;
+const HARD_LIST_DIRS_MAX_RESULTS: usize = 10000;
 
 const DEFAULT_GREP_HEAD_LIMIT: usize = 200;
 const MAX_GREP_LINE_CHARS: usize = 400;
@@ -2472,6 +2474,168 @@ pub struct ListResponse {
     pub entries: Vec<ListEntry>,
 }
 
+#[derive(Debug, Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct FsRoot {
+    pub id: String,
+    pub path: String,
+    pub kind: String,
+    pub label: String,
+}
+
+#[derive(Debug, Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct FsRootsResponse {
+    pub roots: Vec<FsRoot>,
+}
+
+#[derive(Debug, Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct FsDirEntry {
+    pub path: String,
+    pub name: String,
+}
+
+#[derive(Debug, Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct FsListDirsResponse {
+    pub path: String,
+    pub entries: Vec<FsDirEntry>,
+    pub truncated: bool,
+}
+
+pub(crate) fn fs_roots_sync() -> Result<FsRootsResponse, String> {
+    let mut roots: Vec<FsRoot> = Vec::new();
+
+    #[cfg(not(windows))]
+    {
+        roots.push(FsRoot {
+            id: "/".to_string(),
+            path: "/".to_string(),
+            kind: "root".to_string(),
+            label: "/".to_string(),
+        });
+    }
+
+    if let Some(home) = dirs::home_dir() {
+        let home_str = home.to_string_lossy().trim().to_string();
+        if !home_str.is_empty() && home_str != "/" {
+            roots.push(FsRoot {
+                id: home_str.clone(),
+                path: home_str,
+                kind: "home".to_string(),
+                label: "~".to_string(),
+            });
+        }
+    }
+
+    #[cfg(windows)]
+    {
+        #[link(name = "kernel32")]
+        extern "system" {
+            fn GetLogicalDrives() -> u32;
+        }
+
+        let mask = unsafe { GetLogicalDrives() };
+        if mask == 0 {
+            // Keep the picker usable if we at least have home.
+            if !roots.is_empty() {
+                return Ok(FsRootsResponse { roots });
+            }
+            return Err(io::Error::last_os_error().to_string());
+        }
+
+        for i in 0..26u32 {
+            if mask & (1u32 << i) == 0 {
+                continue;
+            }
+            let drive = (b'A' + u8::try_from(i).unwrap_or(0)) as char;
+            let path = format!("{drive}:\\");
+            roots.push(FsRoot {
+                id: path.clone(),
+                path,
+                kind: "drive".to_string(),
+                label: format!("{drive}:"),
+            });
+        }
+    }
+
+    Ok(FsRootsResponse { roots })
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn fs_roots() -> Result<FsRootsResponse, String> {
+    run_blocking("fs_roots", fs_roots_sync).await
+}
+
+pub(crate) fn fs_list_dirs_sync(
+    path: String,
+    max_results: Option<usize>,
+) -> Result<FsListDirsResponse, String> {
+    let dir = path.trim().to_string();
+    if dir.is_empty() {
+        return Err("path is required".to_string());
+    }
+
+    let limit = max_results
+        .unwrap_or(DEFAULT_LIST_DIRS_MAX_RESULTS)
+        .clamp(1, HARD_LIST_DIRS_MAX_RESULTS);
+
+    let entries = fs::read_dir(&dir).map_err(|e| e.to_string())?;
+    let mut dirs: Vec<FsDirEntry> = Vec::new();
+
+    for entry in entries {
+        let entry = entry.map_err(|e| e.to_string())?;
+        let file_type = entry.file_type().map_err(|e| e.to_string())?;
+
+        let mut is_dir = file_type.is_dir();
+        if !is_dir && file_type.is_symlink() {
+            if let Ok(metadata) = entry.metadata() {
+                is_dir = metadata.is_dir();
+            }
+        }
+        if !is_dir {
+            continue;
+        }
+
+        let name = entry.file_name().to_string_lossy().into_owned();
+        let child_path = entry.path().to_string_lossy().into_owned();
+        dirs.push(FsDirEntry {
+            path: display_path(&PathBuf::from(child_path)),
+            name,
+        });
+    }
+
+    dirs.sort_by(|a, b| {
+        let left = a.name.to_lowercase();
+        let right = b.name.to_lowercase();
+        if left == right {
+            a.name.cmp(&b.name)
+        } else {
+            left.cmp(&right)
+        }
+    });
+
+    let truncated = dirs.len() > limit;
+    if truncated {
+        dirs.truncate(limit);
+    }
+
+    Ok(FsListDirsResponse {
+        path: dir,
+        entries: dirs,
+        truncated,
+    })
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn fs_list_dirs(
+    path: String,
+    max_results: Option<usize>,
+) -> Result<FsListDirsResponse, String> {
+    run_blocking("fs_list_dirs", move || fs_list_dirs_sync(path, max_results)).await
+}
+
 fn build_ignore_walker(base: &Path, max_depth: Option<usize>) -> ignore::Walk {
     let mut builder = WalkBuilder::new(base);
     builder
@@ -3728,6 +3892,28 @@ mod tests {
         let _ = fs::remove_dir_all(workdir);
     }
 
+    #[test]
+    fn list_dirs_returns_sorted_directories_and_truncates() {
+        let workdir = unique_test_workdir("list-dirs");
+        fs::create_dir_all(workdir.join("zeta")).expect("create zeta");
+        fs::create_dir_all(workdir.join("Alpha")).expect("create alpha");
+        fs::write(workdir.join("file.txt"), "file").expect("write file");
+
+        let response = fs_list_dirs_sync(workdir.display().to_string(), Some(1))
+            .expect("list dirs should succeed");
+
+        assert_eq!(response.path, workdir.display().to_string());
+        assert!(response.truncated);
+        assert_eq!(response.entries.len(), 1);
+        assert_eq!(response.entries[0].name, "Alpha");
+        assert_eq!(
+            response.entries[0].path,
+            display_path(&workdir.join("Alpha"))
+        );
+
+        let _ = fs::remove_dir_all(workdir);
+    }
+
     #[test]
     fn list_respects_gitignore_and_rejects_outside_paths() {
         let workdir = unique_test_workdir("list-ignore");
diff --git a/crates/agent-gui/src-tauri/src/commands/settings.rs b/crates/agent-gui/src-tauri/src/commands/settings.rs
index 1d541b355..1ea291c2e 100644
--- a/crates/agent-gui/src-tauri/src/commands/settings.rs
+++ b/crates/agent-gui/src-tauri/src/commands/settings.rs
@@ -19,6 +19,7 @@ const PROVIDER_SETTINGS_TABLE: &str = "provider_settings";
 const SYSTEM_SETTINGS_TABLE: &str = "system_settings";
 const MCP_SETTINGS_TABLE: &str = "mcp_settings";
 const AGENT_PROMPT_TEMPLATES_TABLE: &str = "agent_prompt_templates";
+const SSH_SETTINGS_TABLE: &str = "ssh_settings";
 const HOOK_SETTINGS_TABLE: &str = "hook_settings";
 const CRON_SETTINGS_TABLE: &str = "cron_settings";
 const CRON_EXECUTION_LOGS_TABLE: &str = "cron_execution_logs";
@@ -35,6 +36,7 @@ const SYSTEM_MISSING_WORKSPACE_PROJECT_PATHS_KEY: &str = "missingWorkspaceProjec
 const DEFAULT_WORKSPACE_PROJECT_ID: &str = "default-project";
 const DEFAULT_WORKSPACE_PROJECT_NAME: &str = "Default Project";
 pub(crate) const PROVIDER_API_KEY_UPDATES_FIELD: &str = "providerApiKeyUpdates";
+pub(crate) const SSH_SECRET_UPDATES_FIELD: &str = "sshSecretUpdates";
 
 const PROVIDER_SETTINGS_SELECT_SQL: &str = "
     SELECT provider_id, payload_json
@@ -80,6 +82,46 @@ const AGENT_PROMPT_TEMPLATES_INSERT_SQL: &str = "
 ";
 const AGENT_PROMPT_TEMPLATES_DELETE_SQL: &str = "DELETE FROM agent_prompt_templates";
 
+const SSH_SETTINGS_SELECT_SQL: &str = "
+    SELECT
+        host_id,
+        name,
+        description,
+        host,
+        port,
+        username,
+        auth_type,
+        password,
+        password_configured,
+        private_key,
+        private_key_path,
+        private_key_configured,
+        proxy_json
+    FROM ssh_settings
+    ORDER BY sort_index ASC, host_id ASC
+";
+const SSH_SETTINGS_INSERT_SQL: &str = "
+    INSERT INTO ssh_settings (
+        host_id,
+        name,
+        description,
+        host,
+        port,
+        username,
+        auth_type,
+        password,
+        password_configured,
+        private_key,
+        private_key_path,
+        private_key_configured,
+        proxy_json,
+        sort_index,
+        updated_at
+    )
+    VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15)
+";
+const SSH_SETTINGS_DELETE_SQL: &str = "DELETE FROM ssh_settings";
+
 const HOOK_SETTINGS_SELECT_SQL: &str = "
     SELECT hook_id, payload_json
     FROM hook_settings
@@ -114,6 +156,7 @@ pub struct SettingsLoadResponse {
     pub system: Option<Value>,
     pub mcp: Option<Value>,
     pub agents: Option<Value>,
+    pub ssh: Option<Value>,
     pub hooks: Option<Value>,
     pub cron: Option<Value>,
     pub remote: Option<Value>,
@@ -294,6 +337,23 @@ pub(crate) fn initialize_schema(conn: &Connection) -> Result<(), String> {
             sort_index INTEGER NOT NULL,
             updated_at INTEGER NOT NULL
         );
+        CREATE TABLE IF NOT EXISTS ssh_settings (
+            host_id TEXT PRIMARY KEY,
+            name TEXT NOT NULL,
+            description TEXT NOT NULL,
+            host TEXT NOT NULL,
+            port INTEGER NOT NULL,
+            username TEXT NOT NULL,
+            auth_type TEXT NOT NULL,
+            password TEXT NOT NULL,
+            password_configured INTEGER NOT NULL DEFAULT 0,
+            private_key TEXT NOT NULL,
+            private_key_path TEXT NOT NULL,
+            private_key_configured INTEGER NOT NULL DEFAULT 0,
+            proxy_json TEXT NOT NULL,
+            sort_index INTEGER NOT NULL,
+            updated_at INTEGER NOT NULL
+        );
         CREATE TABLE IF NOT EXISTS hook_settings (
             hook_id TEXT PRIMARY KEY,
             payload_json TEXT NOT NULL,
@@ -1302,6 +1362,13 @@ pub(crate) fn load_gateway_settings_sync_snapshot(conn: &Connection) -> Result<V
         "agents".to_string(),
         load_agents(conn)?.unwrap_or(Value::Array(Vec::new())),
     );
+    snapshot.insert(
+        "ssh".to_string(),
+        redact_ssh_settings(load_ssh(conn)?.unwrap_or(Value::Object(Map::from_iter([(
+            "hosts".to_string(),
+            Value::Array(Vec::new()),
+        )]))))?,
+    );
     snapshot.insert(
         "hooks".to_string(),
         load_hooks(conn)?.unwrap_or(Value::Array(Vec::new())),
@@ -1348,18 +1415,86 @@ pub(crate) fn load_gateway_settings_sync_snapshot(conn: &Connection) -> Result<V
 pub(crate) fn redact_gateway_settings_sync_payload(payload: Value) -> Result<Value, String> {
     let mut snapshot = expect_object(payload, "gateway settings sync payload")?;
     snapshot.remove(PROVIDER_API_KEY_UPDATES_FIELD);
+    snapshot.remove(SSH_SECRET_UPDATES_FIELD);
     if let Some(providers) = snapshot.remove("customProviders") {
         snapshot.insert(
             "customProviders".to_string(),
             redact_provider_credentials(providers)?,
         );
     }
+    if let Some(ssh) = snapshot.remove("ssh") {
+        snapshot.insert("ssh".to_string(), redact_ssh_settings(ssh)?);
+    }
     if let Some(remote) = snapshot.remove("remote") {
         snapshot.insert("remote".to_string(), redact_remote_settings(remote)?);
     }
     Ok(Value::Object(snapshot))
 }
 
+fn redact_ssh_settings(ssh: Value) -> Result<Value, String> {
+    let mut ssh = expect_object(ssh, "ssh settings payload")?;
+    let hosts = expect_array(
+        ssh.remove("hosts").unwrap_or(Value::Array(Vec::new())),
+        "ssh settings hosts",
+    )?;
+    let redacted = hosts
+        .into_iter()
+        .map(redact_ssh_host_secret)
+        .collect::<Result<Vec<_>, _>>()?;
+    Ok(Value::Object(Map::from_iter([(
+        "hosts".to_string(),
+        Value::Array(redacted),
+    )])))
+}
+
+fn redact_ssh_host_secret(host: Value) -> Result<Value, String> {
+    let mut payload = expect_object(host, "ssh settings host")?;
+    let password_configured =
+        match payload.remove("password") {
+            Some(Value::String(value)) => !value.trim().is_empty(),
+            Some(Value::Null) | None => false,
+            Some(_) => return Err("ssh settings password must be a string".to_string()),
+        } || matches!(payload.get("passwordConfigured"), Some(Value::Bool(true)));
+    let private_key_configured = match payload.remove("privateKey") {
+        Some(Value::String(value)) => !value.trim().is_empty(),
+        Some(Value::Null) | None => false,
+        Some(_) => return Err("ssh settings privateKey must be a string".to_string()),
+    } || payload
+        .get("privateKeyPath")
+        .and_then(Value::as_str)
+        .is_some_and(|value| !value.trim().is_empty())
+        || matches!(payload.get("privateKeyConfigured"), Some(Value::Bool(true)));
+    payload.insert(
+        "passwordConfigured".to_string(),
+        Value::Bool(password_configured),
+    );
+    payload.insert(
+        "privateKeyConfigured".to_string(),
+        Value::Bool(private_key_configured),
+    );
+    if let Some(proxy) = payload.remove("proxy") {
+        if !matches!(proxy, Value::Null) {
+            payload.insert("proxy".to_string(), redact_ssh_proxy_secret(proxy)?);
+        }
+    }
+    Ok(Value::Object(payload))
+}
+
+fn redact_ssh_proxy_secret(proxy: Value) -> Result<Value, String> {
+    let mut payload = expect_object(proxy, "ssh settings proxy")?;
+    let password_configured =
+        match payload.remove("password") {
+            Some(Value::String(value)) => !value.trim().is_empty(),
+            Some(Value::Null) | None => false,
+            Some(_) => return Err("ssh settings proxy.password must be a string".to_string()),
+        } || matches!(payload.get("passwordConfigured"), Some(Value::Bool(true)));
+    payload.insert(
+        "passwordConfigured".to_string(),
+        Value::Bool(password_configured),
+    );
+    Ok(Value::Object(payload))
+}
+
 fn redact_remote_settings(remote: Value) -> Result<Value, String> {
     let remote = expect_object(remote, "remote settings payload")?;
     let enable_web_terminal = remote
@@ -1453,6 +1588,80 @@ fn load_agents(conn: &Connection) -> Result<Option<Value>, String> {
     }
 }
 
+fn load_ssh(conn: &Connection) -> Result<Option<Value>, String> {
+    let mut stmt = conn
+        .prepare(SSH_SETTINGS_SELECT_SQL)
+        .map_err(|e| format!("准备读取 {SSH_SETTINGS_TABLE} 失败：{e}"))?;
+    let rows = stmt
+        .query_map([], |row| {
+            let proxy_json = row.get::<_, String>(12)?;
+            let proxy = parse_json(&proxy_json, SSH_SETTINGS_TABLE).map_err(|error| {
+                rusqlite::Error::FromSqlConversionFailure(
+                    12,
+                    rusqlite::types::Type::Text,
+                    Box::new(std::io::Error::new(std::io::ErrorKind::InvalidData, error)),
+                )
+            })?;
+            Ok(Value::Object(Map::from_iter([
+                ("id".to_string(), Value::String(row.get::<_, String>(0)?)),
+                ("name".to_string(), Value::String(row.get::<_, String>(1)?)),
+                (
+                    "description".to_string(),
+                    Value::String(row.get::<_, String>(2)?),
+                ),
+                ("host".to_string(), Value::String(row.get::<_, String>(3)?)),
+                (
+                    "port".to_string(),
+                    Value::Number(Number::from(row.get::<_, i64>(4)?)),
+                ),
+                (
+                    "username".to_string(),
+                    Value::String(row.get::<_, String>(5)?),
+                ),
+                (
+                    "authType".to_string(),
+                    Value::String(row.get::<_, String>(6)?),
+                ),
+                (
+                    "password".to_string(),
+                    Value::String(row.get::<_, String>(7)?),
+                ),
+                (
+                    "passwordConfigured".to_string(),
+                    Value::Bool(row.get::<_, i64>(8)? != 0),
+                ),
+                (
+                    "privateKey".to_string(),
+                    Value::String(row.get::<_, String>(9)?),
+                ),
+                (
+                    "privateKeyPath".to_string(),
+                    Value::String(row.get::<_, String>(10)?),
+                ),
+                (
+                    "privateKeyConfigured".to_string(),
+                    Value::Bool(row.get::<_, i64>(11)? != 0),
+                ),
+                ("proxy".to_string(), proxy),
+            ])))
+        })
+        .map_err(|e| format!("读取 {SSH_SETTINGS_TABLE} 失败：{e}"))?;
+
+    let mut hosts = Vec::new();
+    for row in rows {
+        hosts.push(row.map_err(|e| format!("读取 {SSH_SETTINGS_TABLE} 行失败：{e}"))?);
+    }
+
+    if hosts.is_empty() {
+        Ok(None)
+    } else {
+        Ok(Some(Value::Object(Map::from_iter([(
+            "hosts".to_string(),
+            Value::Array(hosts),
+        )]))))
+    }
+}
+
 fn load_hooks(conn: &Connection) -> Result<Option<Value>, String> {
     let mut stmt = conn
         .prepare(HOOK_SETTINGS_SELECT_SQL)
@@ -1647,6 +1856,252 @@ fn save_agents(conn: &mut Connection, payload: Value) -> Result<(), String> {
     Ok(())
 }
 
+fn validate_ssh_auth_type(value: Option<&Value>, label: &str) -> Result<String, String> {
+    let auth_type = value
+        .and_then(Value::as_str)
+        .map(str::trim)
+        .unwrap_or("password");
+    match auth_type {
+        "password" | "privateKey" => Ok(auth_type.to_string()),
+        other => Err(format!("{label}.authType 不支持：{other}")),
+    }
+}
+
+fn validate_ssh_port(value: Option<&Value>, label: &str) -> Result<i64, String> {
+    let port = match value {
+        Some(Value::Number(number)) => number
+            .as_i64()
+            .ok_or_else(|| format!("{label}.port 必须是 1-65535 的整数"))?,
+        Some(Value::String(text)) if text.trim().is_empty() => 22,
+        Some(Value::String(text)) => text
+            .trim()
+            .parse::<i64>()
+            .map_err(|_| format!("{label}.port 必须是 1-65535 的整数"))?,
+        Some(Value::Null) | None => 22,
+        Some(_) => return Err(format!("{label}.port 必须是 1-65535 的整数")),
+    };
+
+    if (1..=65535).contains(&port) {
+        Ok(port)
+    } else {
+        Err(format!("{label}.port 必须是 1-65535 的整数"))
+    }
+}
+
+fn validate_ssh_proxy_port(value: Option<&Value>, label: &str) -> Result<i64, String> {
+    let port = match value {
+        Some(Value::Number(number)) => number
+            .as_i64()
+            .ok_or_else(|| format!("{label}.port 必须是 0 或 1-65535 的整数"))?,
+        Some(Value::String(text)) if text.trim().is_empty() => 0,
+        Some(Value::String(text)) => text
+            .trim()
+            .parse::<i64>()
+            .map_err(|_| format!("{label}.port 必须是 0 或 1-65535 的整数"))?,
+        Some(Value::Null) | None => 0,
+        Some(_) => return Err(format!("{label}.port 必须是 0 或 1-65535 的整数")),
+    };
+
+    if port == 0 || (1..=65535).contains(&port) {
+        Ok(port)
+    } else {
+        Err(format!("{label}.port 必须是 0 或 1-65535 的整数"))
+    }
+}
+
+fn validate_ssh_proxy_type(value: Option<&Value>, label: &str) -> Result<String, String> {
+    let proxy_type = match value {
+        Some(Value::String(text)) if text.trim() == "http" => "http",
+        Some(Value::String(text)) if text.trim().is_empty() || text.trim() == "socks5" => "socks5",
+        Some(Value::Null) | None => "socks5",
+        _ => return Err(format!("{label}.type 必须是 socks5 或 http")),
+    };
+    Ok(proxy_type.to_string())
+}
+
+fn validate_and_normalize_ssh_proxy(
+    proxy: Option<&Value>,
+    label: &str,
+) -> Result<Map<String, Value>, String> {
+    let proxy = match proxy {
+        Some(Value::Object(map)) => map,
+        Some(Value::Null) | None => {
+            let mut payload = Map::new();
+            payload.insert("type".to_string(), Value::String("socks5".to_string()));
+            payload.insert("url".to_string(), Value::String(String::new()));
+            payload.insert("port".to_string(), Value::Number(Number::from(0)));
+            payload.insert("username".to_string(), Value::String(String::new()));
+            payload.insert("password".to_string(), Value::String(String::new()));
+            payload.insert("passwordConfigured".to_string(), Value::Bool(false));
+            return Ok(payload);
+        }
+        Some(_) => return Err(format!("{label}.proxy 必须是对象")),
+    };
+    let proxy_label = format!("{label}.proxy");
+    let proxy_type = validate_ssh_proxy_type(proxy.get("type"), &proxy_label)?;
+    let url = extract_optional_string(proxy, "url");
+    let port = validate_ssh_proxy_port(proxy.get("port"), &proxy_label)?;
+    let username = extract_optional_string(proxy, "username");
+    let password = extract_optional_string(proxy, "password");
+    let password_configured =
+        extract_bool_with_default(proxy, "passwordConfigured", &proxy_label, false)?
+            || !password.is_empty();
+
+    let mut payload = Map::new();
+    payload.insert("type".to_string(), Value::String(proxy_type));
+    payload.insert("url".to_string(), Value::String(url));
+    payload.insert("port".to_string(), Value::Number(Number::from(port)));
+    payload.insert("username".to_string(), Value::String(username));
+    payload.insert("password".to_string(), Value::String(password));
+    payload.insert(
+        "passwordConfigured".to_string(),
+        Value::Bool(password_configured),
+    );
+    Ok(payload)
+}
+
+fn validate_and_normalize_ssh_host(
+    host: Map<String, Value>,
+    label: &str,
+) -> Result<(String, Map<String, Value>), String> {
+    let host_id = extract_non_empty_string(&host, "id", label)?;
+    let name = extract_non_empty_string(&host, "name", label)?;
+    let hostname = extract_non_empty_string(&host, "host", label)?;
+    let auth_type = validate_ssh_auth_type(host.get("authType"), label)?;
+    let port = validate_ssh_port(host.get("port"), label)?;
+    let username = extract_optional_string(&host, "username");
+    let description = extract_optional_string(&host, "description");
+    let password = extract_optional_string(&host, "password");
+    let private_key = extract_optional_string(&host, "privateKey");
+    let private_key_path = extract_optional_string(&host, "privateKeyPath");
+    let password_configured = extract_bool_with_default(&host, "passwordConfigured", label, false)?
+        || !password.is_empty();
+    let private_key_configured =
+        extract_bool_with_default(&host, "privateKeyConfigured", label, false)?
+            || !private_key.is_empty()
+            || !private_key_path.is_empty();
+    let proxy = validate_and_normalize_ssh_proxy(host.get("proxy"), label)?;
+
+    let mut payload = Map::new();
+    payload.insert("name".to_string(), Value::String(name));
+    payload.insert("description".to_string(), Value::String(description));
+    payload.insert("host".to_string(), Value::String(hostname));
+    payload.insert("port".to_string(), Value::Number(Number::from(port)));
+    payload.insert("username".to_string(), Value::String(username));
+    payload.insert("authType".to_string(), Value::String(auth_type));
+    payload.insert("password".to_string(), Value::String(password));
+    payload.insert(
+        "passwordConfigured".to_string(),
+        Value::Bool(password_configured),
+    );
+    payload.insert("privateKey".to_string(), Value::String(private_key));
+    payload.insert(
+        "privateKeyPath".to_string(),
+        Value::String(private_key_path),
+    );
+    payload.insert(
+        "privateKeyConfigured".to_string(),
+        Value::Bool(private_key_configured),
+    );
+    payload.insert("proxy".to_string(), Value::Object(proxy));
+
+    Ok((host_id, payload))
+}
+
+fn ssh_payload_string(payload: &Map<String, Value>, key: &str) -> Result<String, String> {
+    payload
+        .get(key)
+        .and_then(Value::as_str)
+        .map(ToString::to_string)
+        .ok_or_else(|| format!("{SSH_SETTINGS_TABLE}.{key} 必须是字符串"))
+}
+
+fn ssh_payload_i64(payload: &Map<String, Value>, key: &str) -> Result<i64, String> {
+    payload
+        .get(key)
+        .and_then(Value::as_i64)
+        .ok_or_else(|| format!("{SSH_SETTINGS_TABLE}.{key} 必须是整数"))
+}
+
+fn ssh_payload_bool(payload: &Map<String, Value>, key: &str) -> Result<bool, String> {
+    payload
+        .get(key)
+        .and_then(Value::as_bool)
+        .ok_or_else(|| format!("{SSH_SETTINGS_TABLE}.{key} 必须是布尔值"))
+}
+
+fn ssh_payload_proxy_json(payload: &Map<String, Value>) -> Result<String, String> {
+    let proxy = payload
+        .get("proxy")
+        .cloned()
+        .ok_or_else(|| format!("{SSH_SETTINGS_TABLE}.proxy 不能为空"))?;
+    serialize_json(&proxy, SSH_SETTINGS_TABLE)
+}
+
+fn insert_ssh_settings_row(
+    conn: &Connection,
+    host_id: &str,
+    payload: &Map<String, Value>,
+    sort_index: i64,
+    updated_at: i64,
+) -> Result<(), String> {
+    conn.execute(
+        SSH_SETTINGS_INSERT_SQL,
+        params![
+            host_id,
+            ssh_payload_string(payload, "name")?,
+            ssh_payload_string(payload, "description")?,
+            ssh_payload_string(payload, "host")?,
+            ssh_payload_i64(payload, "port")?,
+            ssh_payload_string(payload, "username")?,
+            ssh_payload_string(payload, "authType")?,
+            ssh_payload_string(payload, "password")?,
+            ssh_payload_bool(payload, "passwordConfigured")?,
+            ssh_payload_string(payload, "privateKey")?,
+            ssh_payload_string(payload, "privateKeyPath")?,
+            ssh_payload_bool(payload, "privateKeyConfigured")?,
+            ssh_payload_proxy_json(payload)?,
+            sort_index,
+            updated_at
+        ],
+    )
+    .map_err(|e| format!("写入 {SSH_SETTINGS_TABLE} 失败：{e}"))?;
+    Ok(())
+}
+
+fn save_ssh(conn: &mut Connection, payload: Value) -> Result<(), String> {
+    let ssh = expect_object(payload, "settings_save_ssh payload")?;
+    let hosts = expect_array(
+        ssh.get("hosts")
+            .cloned()
+            .unwrap_or(Value::Array(Vec::new())),
+        "settings_save_ssh payload.hosts",
+    )?;
+    let updated_at = now_ms();
+    let tx = conn
+        .transaction()
+        .map_err(|e| format!("开启 {SSH_SETTINGS_TABLE} 事务失败：{e}"))?;
+    tx.execute(SSH_SETTINGS_DELETE_SQL, [])
+        .map_err(|e| format!("清空 {SSH_SETTINGS_TABLE} 失败：{e}"))?;
+
+    let mut seen = HashSet::new();
+    for (sort_index, host) in hosts.into_iter().enumerate() {
+        let (host_id, payload) = validate_and_normalize_ssh_host(
+            expect_object(host, "settings_save_ssh payload.hosts[]")?,
+            "settings_save_ssh payload.hosts[]",
+        )?;
+        if !seen.insert(host_id.clone()) {
+            return Err(format!("{SSH_SETTINGS_TABLE}.host_id 重复：{host_id}"));
+        }
+
+        insert_ssh_settings_row(&tx, &host_id, &payload, sort_index as i64, updated_at)?;
+    }
+
+    tx.commit()
+        .map_err(|e| format!("提交 {SSH_SETTINGS_TABLE} 事务失败：{e}"))?;
+    Ok(())
+}
+
 fn save_hooks(conn: &mut Connection, payload: Value) -> Result<(), String> {
     let hooks = expect_array(payload, "settings_save_hooks payload")?;
     let updated_at = now_ms();
@@ -1895,6 +2350,7 @@ pub async fn settings_load_all() -> Result<SettingsLoadResponse, String> {
             system: Some(load_system_with_defaults(&conn, &default_workdir)?),
             mcp: load_mcp(&conn)?,
             agents: load_agents(&conn)?,
+            ssh: load_ssh(&conn)?,
             hooks: load_hooks(&conn)?,
             cron: load_cron(&conn)?,
             remote: load_remote(&conn)?,
@@ -1978,6 +2434,16 @@ pub async fn settings_save_agents(payload: Value) -> Result<(), String> {
     .map_err(|e| format!("settings_save_agents join 失败：{e}"))?
 }
 
+#[tauri::command]
+pub async fn settings_save_ssh(payload: Value) -> Result<(), String> {
+    tauri::async_runtime::spawn_blocking(move || {
+        let mut conn = open_db()?;
+        save_ssh(&mut conn, payload)
+    })
+    .await
+    .map_err(|e| format!("settings_save_ssh join 失败：{e}"))?
+}
+
 #[tauri::command]
 pub async fn settings_save_hooks(payload: Value) -> Result<(), String> {
     tauri::async_runtime::spawn_blocking(move || {
@@ -2014,6 +2480,16 @@ mod tests {
         conn
     }
 
+    fn table_columns(conn: &Connection, table: &str) -> Vec<String> {
+        let mut stmt = conn
+            .prepare(&format!("PRAGMA table_info({table})"))
+            .expect("prepare table info");
+        stmt.query_map([], |row| row.get::<_, String>(1))
+            .expect("query table info")
+            .collect::<Result<Vec<_>, _>>()
+            .expect("collect table columns")
+    }
+
     #[test]
     fn initialize_schema_creates_all_tables() {
         let conn = open_memory_db();
@@ -2023,6 +2499,7 @@ mod tests {
             SYSTEM_SETTINGS_TABLE,
             MCP_SETTINGS_TABLE,
             AGENT_PROMPT_TEMPLATES_TABLE,
+            SSH_SETTINGS_TABLE,
             HOOK_SETTINGS_TABLE,
             CRON_SETTINGS_TABLE,
             CRON_EXECUTION_LOGS_TABLE,
@@ -2040,6 +2517,39 @@ mod tests {
         }
     }
 
+    #[test]
+    fn initialize_schema_creates_columnar_ssh_settings_table() {
+        let conn = open_memory_db();
+        let columns = table_columns(&conn, SSH_SETTINGS_TABLE);
+
+        for column in [
+            "host_id",
+            "name",
+            "description",
+            "host",
+            "port",
+            "username",
+            "auth_type",
+            "password",
+            "password_configured",
+            "private_key",
+            "private_key_path",
+            "private_key_configured",
+            "proxy_json",
+            "sort_index",
+            "updated_at",
+        ] {
+            assert!(
+                columns.iter().any(|item| item == column),
+                "{SSH_SETTINGS_TABLE}.{column} should exist"
+            );
+        }
+        assert!(
+            !columns.iter().any(|item| item == "payload_json"),
+            "{SSH_SETTINGS_TABLE}.payload_json should not exist"
+        );
+    }
+
     #[test]
     fn save_memory_persists_default_payload_and_sync_snapshot() {
         let mut conn = open_memory_db();
@@ -2146,6 +2656,172 @@ mod tests {
         assert_eq!(snapshot["customProviders"][1]["apiKeyConfigured"], true);
     }
 
+    #[test]
+    fn save_ssh_persists_hosts_and_redacts_sync_snapshot() {
+        let mut conn = open_memory_db();
+        save_ssh(
+            &mut conn,
+            json!({
+                "hosts": [
+                    {
+                        "id": "prod",
+                        "name": "Production",
+                        "description": "Primary production host",
+                        "host": "prod.example.com",
+                        "port": "2222",
+                        "username": "deploy",
+                        "authType": "privateKey",
+                        "password": "ssh-password",
+                        "privateKey": "-----BEGIN OPENSSH PRIVATE KEY-----\nsecret\n-----END OPENSSH PRIVATE KEY-----",
+                        "privateKeyPath": "~/.ssh/id_ed25519",
+                        "proxy": {
+                            "type": "http",
+                            "url": "http://127.0.0.1",
+                            "port": "1080",
+                            "username": "proxy-user",
+                            "password": "proxy-password"
+                        }
+                    },
+                    {
+                        "id": "staging",
+                        "name": "Staging",
+                        "description": "",
+                        "host": "staging.example.com",
+                        "username": "ubuntu",
+                        "authType": "password",
+                        "passwordConfigured": true
+                    }
+                ]
+            }),
+        )
+        .expect("save ssh settings");
+
+        let row_count = conn
+            .query_row("SELECT COUNT(*) FROM ssh_settings", [], |row| {
+                row.get::<_, i64>(0)
+            })
+            .expect("count ssh rows");
+        let loaded = load_ssh(&conn).expect("load ssh settings");
+
+        assert_eq!(row_count, 2);
+        let stored = conn
+            .query_row(
+                "
+                SELECT name, host, port, auth_type, private_key, proxy_json
+                FROM ssh_settings
+                WHERE host_id = 'prod'
+                ",
+                [],
+                |row| {
+                    Ok((
+                        row.get::<_, String>(0)?,
+                        row.get::<_, String>(1)?,
+                        row.get::<_, i64>(2)?,
+                        row.get::<_, String>(3)?,
+                        row.get::<_, String>(4)?,
+                        row.get::<_, String>(5)?,
+                    ))
+                },
+            )
+            .expect("load stored ssh columns");
+        assert_eq!(stored.0, "Production");
+        assert_eq!(stored.1, "prod.example.com");
+        assert_eq!(stored.2, 2222);
+        assert_eq!(stored.3, "privateKey");
+        assert_eq!(
+            stored.4,
+            "-----BEGIN OPENSSH PRIVATE KEY-----\nsecret\n-----END OPENSSH PRIVATE KEY-----"
+        );
+        assert_eq!(
+            parse_json(&stored.5, SSH_SETTINGS_TABLE).expect("parse proxy json"),
+            json!({
+                "type": "http",
+                "url": "http://127.0.0.1",
+                "port": 1080,
+                "username": "proxy-user",
+                "password": "proxy-password",
+                "passwordConfigured": true
+            })
+        );
+        assert_eq!(
+            loaded,
+            Some(json!({
+                "hosts": [
+                    {
+                        "id": "prod",
+                        "name": "Production",
+                        "description": "Primary production host",
+                        "host": "prod.example.com",
+                        "port": 2222,
+                        "username": "deploy",
+                        "authType": "privateKey",
+                        "password": "ssh-password",
+                        "passwordConfigured": true,
+                        "privateKey": "-----BEGIN OPENSSH PRIVATE KEY-----\nsecret\n-----END OPENSSH PRIVATE KEY-----",
+                        "privateKeyPath": "~/.ssh/id_ed25519",
+                        "privateKeyConfigured": true,
+                        "proxy": {
+                            "type": "http",
+                            "url": "http://127.0.0.1",
+                            "port": 1080,
+                            "username": "proxy-user",
+                            "password": "proxy-password",
+                            "passwordConfigured": true
+                        }
+                    },
+                    {
+                        "id": "staging",
+                        "name": "Staging",
+                        "description": "",
+                        "host": "staging.example.com",
+                        "port": 22,
+                        "username": "ubuntu",
+                        "authType": "password",
+                        "password": "",
+                        "passwordConfigured": true,
+                        "privateKey": "",
+                        "privateKeyPath": "",
+                        "privateKeyConfigured": false,
+                        "proxy": {
+                            "type": "socks5",
+                            "url": "",
+                            "port": 0,
+                            "username": "",
+                            "password": "",
+                            "passwordConfigured": false
+                        }
+                    }
+                ]
+            }))
+        );
+
+        let snapshot =
+            load_gateway_settings_sync_snapshot(&conn).expect("load gateway settings snapshot");
+        assert_eq!(snapshot["ssh"]["hosts"][0]["password"], Value::Null);
+        assert_eq!(snapshot["ssh"]["hosts"][0]["privateKey"], Value::Null);
+        assert_eq!(snapshot["ssh"]["hosts"][0]["passwordConfigured"], true);
+        assert_eq!(snapshot["ssh"]["hosts"][0]["privateKeyConfigured"], true);
+        assert_eq!(
+            snapshot["ssh"]["hosts"][0]["proxy"]["password"],
+            Value::Null
+        );
+        assert_eq!(
+            snapshot["ssh"]["hosts"][0]["proxy"]["passwordConfigured"],
+            true
+        );
+        assert_eq!(snapshot["ssh"]["hosts"][1]["password"], Value::Null);
+        assert_eq!(snapshot["ssh"]["hosts"][1]["privateKey"], Value::Null);
+        assert_eq!(snapshot["ssh"]["hosts"][1]["passwordConfigured"], true);
+        assert_eq!(
+            snapshot["ssh"]["hosts"][1]["proxy"]["password"],
+            Value::Null
+        );
+        assert_eq!(
+            snapshot["ssh"]["hosts"][1]["proxy"]["passwordConfigured"],
+            false
+        );
+    }
+
     #[test]
     fn save_mcp_persists_one_row_per_server_and_restores_selection() {
         let mut conn = open_memory_db();
diff --git a/crates/agent-gui/src-tauri/src/lib.rs b/crates/agent-gui/src-tauri/src/lib.rs
index c6c257229..78a516e3b 100644
--- a/crates/agent-gui/src-tauri/src/lib.rs
+++ b/crates/agent-gui/src-tauri/src/lib.rs
@@ -68,6 +68,8 @@ macro_rules! app_invoke_handler {
             commands::fs::fs_delete,
             commands::fs::fs_create_dir,
             commands::fs::fs_rename,
+            commands::fs::fs_roots,
+            commands::fs::fs_list_dirs,
             commands::fs::fs_list,
             commands::fs::fs_glob,
             commands::fs::fs_grep,
@@ -114,6 +116,7 @@ macro_rules! app_invoke_handler {
             commands::settings::settings_save_system,
             commands::settings::settings_save_mcp,
             commands::settings::settings_save_agents,
+            commands::settings::settings_save_ssh,
             commands::settings::settings_save_hooks,
             commands::settings::settings_save_cron,
             commands::settings::settings_save_remote,
diff --git a/crates/agent-gui/src-tauri/src/services/gateway.rs b/crates/agent-gui/src-tauri/src/services/gateway.rs
index 9e7882bcd..166a92255 100644
--- a/crates/agent-gui/src-tauri/src/services/gateway.rs
+++ b/crates/agent-gui/src-tauri/src/services/gateway.rs
@@ -22,7 +22,7 @@ use crate::commands::chat_history::{self, ChatHistorySummary};
 use crate::commands::settings::{
     load_gateway_settings_sync_snapshot, load_remote_settings, normalize_remote_settings_payload,
     open_db, redact_gateway_settings_sync_payload, RemoteSettingsPayload,
-    PROVIDER_API_KEY_UPDATES_FIELD,
+    PROVIDER_API_KEY_UPDATES_FIELD, SSH_SECRET_UPDATES_FIELD,
 };
 use crate::runtime::terminal::{
     terminal_shell_options, TerminalEventPayload, TerminalSessionRecord, TerminalSessionRegistry,
@@ -3694,6 +3694,7 @@ fn build_local_settings_update_event_payload(payload: Value) -> Result<Value, St
         _ => return Err("gateway settings sync payload must be an object".to_string()),
     };
     let provider_api_key_updates = event.remove(PROVIDER_API_KEY_UPDATES_FIELD);
+    let ssh_secret_updates = event.remove(SSH_SECRET_UPDATES_FIELD);
     event.remove("remote");
     let mut public_event = match redact_gateway_settings_sync_payload(Value::Object(event))? {
         Value::Object(map) => map,
@@ -3702,6 +3703,9 @@ fn build_local_settings_update_event_payload(payload: Value) -> Result<Value, St
     if let Some(updates) = provider_api_key_updates {
         public_event.insert(PROVIDER_API_KEY_UPDATES_FIELD.to_string(), updates);
     }
+    if let Some(updates) = ssh_secret_updates {
+        public_event.insert(SSH_SECRET_UPDATES_FIELD.to_string(), updates);
+    }
     Ok(Value::Object(public_event))
 }
 
diff --git a/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs b/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs
index 3900ec41d..6c7489e6a 100644
--- a/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs
+++ b/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs
@@ -6,8 +6,8 @@ use serde_json::{json, Value};
 use crate::commands::{
     chat_history,
     fs::{
-        fs_create_dir_sync, fs_delete_sync, fs_list_sync, fs_mention_list_sync,
-        fs_read_editable_text_sync, fs_read_workspace_image_sync, fs_rename_sync,
+        fs_create_dir_sync, fs_delete_sync, fs_list_dirs_sync, fs_list_sync, fs_mention_list_sync,
+        fs_read_editable_text_sync, fs_read_workspace_image_sync, fs_rename_sync, fs_roots_sync,
         fs_write_text_sync,
     },
     git::git_gateway_action_sync,
@@ -29,8 +29,6 @@ use crate::services::memory::{
 };
 use crate::services::skills::system_manage_skill_sync;
 
-const DEFAULT_FS_LIST_DIRS_MAX_RESULTS: usize = 2000;
-const HARD_FS_LIST_DIRS_MAX_RESULTS: usize = 10000;
 const DEFAULT_HISTORY_LIST_PAGE: i32 = 1;
 const DEFAULT_HISTORY_LIST_PAGE_SIZE: i32 = 80;
 
@@ -340,142 +338,47 @@ pub async fn handle_file_mention_list(
     })
 }
 
-fn list_fs_roots_sync() -> Result<Vec<proto::FsRoot>, String> {
-    let mut roots: Vec<proto::FsRoot> = Vec::new();
-
-    #[cfg(not(windows))]
-    {
-        roots.push(proto::FsRoot {
-            id: "/".to_string(),
-            path: "/".to_string(),
-            kind: "root".to_string(),
-            label: "/".to_string(),
-        });
-    }
-
-    if let Some(home) = dirs::home_dir() {
-        let home_str = home.to_string_lossy().trim().to_string();
-        if !home_str.is_empty() && home_str != "/" {
-            roots.push(proto::FsRoot {
-                id: home_str.clone(),
-                path: home_str,
-                kind: "home".to_string(),
-                label: "~".to_string(),
-            });
-        }
-    }
-
-    #[cfg(windows)]
-    {
-        #[link(name = "kernel32")]
-        extern "system" {
-            fn GetLogicalDrives() -> u32;
-        }
-
-        let mask = unsafe { GetLogicalDrives() };
-        if mask == 0 {
-            // Keep the picker usable if we at least have home.
-            if !roots.is_empty() {
-                return Ok(roots);
-            }
-            return Err(std::io::Error::last_os_error().to_string());
-        }
-
-        for i in 0..26u32 {
-            if mask & (1u32 << i) == 0 {
-                continue;
-            }
-            let drive = (b'A' + u8::try_from(i).unwrap_or(0)) as char;
-            let path = format!("{drive}:\\");
-            roots.push(proto::FsRoot {
-                id: path.clone(),
-                path,
-                kind: "drive".to_string(),
-                label: format!("{drive}:"),
-            });
-        }
-    }
-
-    Ok(roots)
-}
-
-fn fs_list_dirs_sync(path: String, max_results: u32) -> Result<proto::FsListDirsResponse, String> {
-    let dir = path.trim().to_string();
-    if dir.is_empty() {
-        return Err("path is required".to_string());
-    }
-
-    let mut limit = if max_results == 0 {
-        DEFAULT_FS_LIST_DIRS_MAX_RESULTS
-    } else {
-        usize::try_from(max_results).unwrap_or(HARD_FS_LIST_DIRS_MAX_RESULTS)
-    };
-    if limit > HARD_FS_LIST_DIRS_MAX_RESULTS {
-        limit = HARD_FS_LIST_DIRS_MAX_RESULTS;
-    }
-
-    let entries = std::fs::read_dir(&dir).map_err(|e| e.to_string())?;
-    let mut dirs: Vec<proto::FsDirEntry> = Vec::new();
-
-    for entry in entries {
-        let entry = entry.map_err(|e| e.to_string())?;
-        let file_type = entry.file_type().map_err(|e| e.to_string())?;
-
-        let mut is_dir = file_type.is_dir();
-        if !is_dir && file_type.is_symlink() {
-            if let Ok(metadata) = entry.metadata() {
-                is_dir = metadata.is_dir();
-            }
-        }
-        if !is_dir {
-            continue;
-        }
-
-        let name = entry.file_name().to_string_lossy().into_owned();
-        let child_path = entry.path().to_string_lossy().into_owned();
-        dirs.push(proto::FsDirEntry {
-            path: child_path,
-            name,
-        });
-    }
-
-    dirs.sort_by(|a, b| {
-        let left = a.name.to_lowercase();
-        let right = b.name.to_lowercase();
-        if left == right {
-            a.name.cmp(&b.name)
-        } else {
-            left.cmp(&right)
-        }
-    });
-
-    let truncated = dirs.len() > limit;
-    if truncated {
-        dirs.truncate(limit);
-    }
-
-    Ok(proto::FsListDirsResponse {
-        path: dir,
-        entries: dirs,
-        truncated,
-    })
-}
-
 pub async fn handle_fs_roots() -> Result<proto::FsRootsResponse, String> {
-    tauri::async_runtime::spawn_blocking(list_fs_roots_sync)
+    tauri::async_runtime::spawn_blocking(fs_roots_sync)
         .await
         .map_err(|e| format!("gateway fs roots join failed: {e}"))?
-        .map(|roots| proto::FsRootsResponse { roots })
+        .map(|response| proto::FsRootsResponse {
+            roots: response
+                .roots
+                .into_iter()
+                .map(|root| proto::FsRoot {
+                    id: root.id,
+                    path: root.path,
+                    kind: root.kind,
+                    label: root.label,
+                })
+                .collect(),
+        })
 }
 
 pub async fn handle_fs_list_dirs(
     request: proto::FsListDirsRequest,
 ) -> Result<proto::FsListDirsResponse, String> {
     tauri::async_runtime::spawn_blocking(move || {
-        fs_list_dirs_sync(request.path, request.max_results)
+        let max_results = usize::try_from(request.max_results)
+            .ok()
+            .filter(|value| *value > 0);
+        fs_list_dirs_sync(request.path, max_results)
     })
     .await
     .map_err(|e| format!("gateway fs list dirs join failed: {e}"))?
+    .map(|response| proto::FsListDirsResponse {
+        path: response.path,
+        entries: response
+            .entries
+            .into_iter()
+            .map(|entry| proto::FsDirEntry {
+                path: entry.path,
+                name: entry.name,
+            })
+            .collect(),
+        truncated: response.truncated,
+    })
 }
 
 pub async fn handle_fs_create_project_folder(
diff --git a/crates/agent-gui/src/App.tsx b/crates/agent-gui/src/App.tsx
index be0250017..8d3a94855 100644
--- a/crates/agent-gui/src/App.tsx
+++ b/crates/agent-gui/src/App.tsx
@@ -64,16 +64,44 @@ function hasSettingsSyncChanged(prev: AppSettings, next: AppSettings) {
   );
 }
 
-function hasProviderApiKeyUpdatesPayload(payload: unknown) {
-  const updates =
+function hasSensitiveSettingsUpdates(settings: AppSettings) {
+  return (
+    settings.customProviders.some((provider) => provider.apiKey.trim().length > 0) ||
+    settings.ssh.hosts.some(
+      (host) => host.password.trim().length > 0 || host.privateKey.trim().length > 0,
+    )
+  );
+}
+
+function hasSensitiveSettingsUpdatesPayload(payload: unknown) {
+  const source =
     payload && typeof payload === "object" && !Array.isArray(payload)
-      ? (payload as { providerApiKeyUpdates?: unknown }).providerApiKeyUpdates
-      : undefined;
-  if (!updates || typeof updates !== "object" || Array.isArray(updates)) {
-    return false;
+      ? (payload as { providerApiKeyUpdates?: unknown; sshSecretUpdates?: unknown })
+      : {};
+  const providerUpdates = source.providerApiKeyUpdates;
+  if (
+    providerUpdates &&
+    typeof providerUpdates === "object" &&
+    !Array.isArray(providerUpdates) &&
+    Object.values(providerUpdates).some(
+      (value) => typeof value === "string" && value.trim().length > 0,
+    )
+  ) {
+    return true;
   }
-  return Object.values(updates).some(
-    (value) => typeof value === "string" && value.trim().length > 0,
+  const sshUpdates = source.sshSecretUpdates;
+  return Boolean(
+    sshUpdates &&
+      typeof sshUpdates === "object" &&
+      !Array.isArray(sshUpdates) &&
+      Object.values(sshUpdates).some((value) => {
+        if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+        const update = value as { password?: unknown; privateKey?: unknown };
+        return (
+          (typeof update.password === "string" && update.password.trim().length > 0) ||
+          (typeof update.privateKey === "string" && update.privateKey.trim().length > 0)
+        );
+      }),
   );
 }
 
@@ -190,7 +218,12 @@ export default function App() {
           normalizeSettings(updater(prev)),
           defaultWorkdirRef.current,
         );
-        queueSettingsSave(prev, next, "保存设置失败。", hasSettingsSyncChanged(prev, next));
+        queueSettingsSave(
+          prev,
+          next,
+          "保存设置失败。",
+          hasSettingsSyncChanged(prev, next) || hasSensitiveSettingsUpdates(next),
+        );
         return next;
       });
     },
@@ -270,7 +303,7 @@ export default function App() {
             defaultWorkdirRef.current,
           );
           const publicChanged = hasSettingsSyncChanged(prev, next);
-          if (!publicChanged && !hasProviderApiKeyUpdatesPayload(event.payload)) {
+          if (!publicChanged && !hasSensitiveSettingsUpdatesPayload(event.payload)) {
             return prev;
           }
           queueSettingsSave(prev, next, "同步 WebUI 设置失败。", publicChanged);
diff --git a/crates/agent-gui/src/components/icons.tsx b/crates/agent-gui/src/components/icons.tsx
index 09e1cf9ef..cb1716447 100644
--- a/crates/agent-gui/src/components/icons.tsx
+++ b/crates/agent-gui/src/components/icons.tsx
@@ -42,7 +42,9 @@ import ImageIconSource from "~icons/lucide/image";
 import ImageOffSource from "~icons/lucide/image-off";
 import InfoSource from "~icons/lucide/info";
 import KeySource from "~icons/lucide/key";
+import LayoutGridSource from "~icons/lucide/layout-grid";
 import LightbulbSource from "~icons/lucide/lightbulb";
+import ListSource from "~icons/lucide/list";
 import Link2Source from "~icons/lucide/link-2";
 import Loader2Source from "~icons/lucide/loader-circle";
 import LoaderCircleSource from "~icons/lucide/loader-circle";
@@ -171,8 +173,10 @@ export const ImageIcon = createIcon(ImageIconSource);
 export const ImageOff = createIcon(ImageOffSource);
 export const Info = createIcon(InfoSource);
 export const Key = createIcon(KeySource);
+export const LayoutGrid = createIcon(LayoutGridSource);
 export const Link2 = createIcon(Link2Source);
 export const Lightbulb = createIcon(LightbulbSource);
+export const List = createIcon(ListSource);
 export const Loader2 = createIcon(Loader2Source);
 export const LoaderCircle = createIcon(LoaderCircleSource);
 export const Lock = createIcon(LockSource);
diff --git a/crates/agent-gui/src/components/ui/input.tsx b/crates/agent-gui/src/components/ui/input.tsx
index 480494415..028196072 100644
--- a/crates/agent-gui/src/components/ui/input.tsx
+++ b/crates/agent-gui/src/components/ui/input.tsx
@@ -10,7 +10,7 @@ export const Input = React.forwardRef<HTMLInputElement, InputProps>(
       <input
         type={type}
         className={cn(
-          "flex h-9 w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-xs transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+          "flex h-9 w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-xs transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:border-input focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50",
           className,
         )}
         ref={ref}
diff --git a/crates/agent-gui/src/components/ui/textarea.tsx b/crates/agent-gui/src/components/ui/textarea.tsx
index a829b9603..22acbd514 100644
--- a/crates/agent-gui/src/components/ui/textarea.tsx
+++ b/crates/agent-gui/src/components/ui/textarea.tsx
@@ -9,7 +9,7 @@ export const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
     return (
       <textarea
         className={cn(
-          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-xs placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-xs placeholder:text-muted-foreground focus-visible:border-input focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50",
           className,
         )}
         ref={ref}
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index 9718ce48e..e9b568f06 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -535,6 +535,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.navProviders": "供应商配置",
     "settings.navHooks": "Hooks",
     "settings.navAgents": "全局提示词",
+    "settings.navSsh": "SSH",
     "settings.navCron": "Cron",
     "settings.navRemote": "Remote",
     "settings.navSkills": "Skills",
@@ -880,6 +881,65 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.agentsReady": "可以保存",
     "settings.agentsRequired": "名称和 Prompt 为必填项",
 
+    /* ── Settings SSH ── */
+    "settings.sshTitle": "SSH",
+    "settings.sshDesc": "管理常用 SSH 主机、用户名和登录凭据",
+    "settings.sshAdd": "添加",
+    "settings.sshEdit": "编辑 SSH",
+    "settings.sshImport": "导入",
+    "settings.sshCount": "台主机",
+    "settings.sshViewList": "列表视图",
+    "settings.sshViewGrid": "网格视图",
+    "settings.sshNoHosts": "还没有配置 SSH 主机",
+    "settings.sshNoHostsHint": "添加主机，或从用户目录下的 ~/.ssh/config 与私钥文件中扫描导入。",
+    "settings.sshName": "名称",
+    "settings.sshNamePlaceholder": "例如：生产跳板机",
+    "settings.sshHost": "Host",
+    "settings.sshHostPlaceholder": "例如：10.0.0.12 或 server.example.com",
+    "settings.sshUsername": "用户名",
+    "settings.sshUsernamePlaceholder": "例如：root",
+    "settings.sshPort": "端口",
+    "settings.sshAuthMethod": "登录方式",
+    "settings.sshAuthPassword": "密码登录",
+    "settings.sshAuthPasswordHint": "保存用户名与密码",
+    "settings.sshAuthPrivateKey": "私钥登录",
+    "settings.sshAuthPrivateKeyHint": "导入私钥文件或直接粘贴内容",
+    "settings.sshPassword": "密码",
+    "settings.sshPasswordPlaceholder": "输入 SSH 登录密码",
+    "settings.sshPasswordConfigured": "密码已保存",
+    "settings.sshShowPassword": "显示密码",
+    "settings.sshHidePassword": "隐藏密码",
+    "settings.sshPrivateKey": "私钥",
+    "settings.sshPrivateKeyImport": "导入私钥",
+    "settings.sshPrivateKeyPathPlaceholder": "私钥路径或文件名",
+    "settings.sshPrivateKeyPlaceholder": "粘贴 OpenSSH 私钥内容...",
+    "settings.sshPrivateKeyConfigured": "私钥已保存",
+    "settings.sshAdvancedSettings": "高级设置",
+    "settings.sshAdvancedProxy": "代理",
+    "settings.sshProxyType": "代理类型",
+    "settings.sshProxyTypeSocks5": "SOCKS5",
+    "settings.sshProxyTypeHttp": "HTTP",
+    "settings.sshProxyUrl": "代理链接",
+    "settings.sshProxyUrlPlaceholder": "例如：socks5://127.0.0.1",
+    "settings.sshProxyUrlSocks5Placeholder": "例如：socks5://127.0.0.1",
+    "settings.sshProxyUrlHttpPlaceholder": "例如：http://127.0.0.1",
+    "settings.sshProxyPort": "端口",
+    "settings.sshProxyUsername": "用户名",
+    "settings.sshProxyUsernamePlaceholder": "例如：proxy-user",
+    "settings.sshProxyPassword": "密码",
+    "settings.sshProxyPasswordPlaceholder": "输入代理密码",
+    "settings.sshProxyPasswordConfigured": "代理密码已保存",
+    "settings.sshReady": "可以保存",
+    "settings.sshRequired": "名称和 Host 为必填项",
+    "settings.sshImportDesc": "扫描用户目录下的 ~/.ssh/config 和常见私钥文件",
+    "settings.sshImportScanning": "正在扫描 ~/.ssh ...",
+    "settings.sshImportFailed": "扫描失败",
+    "settings.sshImportFound": "发现 {count} 条 Host 配置，{keys} 个可读取私钥文件。",
+    "settings.sshImportEmpty": "没有发现可导入的 SSH 配置",
+    "settings.sshImportEmptyHint": "请确认 ~/.ssh/config 中存在 Host 配置。",
+    "settings.sshImportDuplicate": "已存在",
+    "settings.sshImportSelected": "已选择 {count} 条配置",
+
     /* ── Settings Cron ── */
     "settings.cronTitle": "定时任务",
     "settings.cronDesc": "配置和管理定时执行的自动化任务",
@@ -1812,6 +1872,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.navProviders": "Providers",
     "settings.navHooks": "Hooks",
     "settings.navAgents": "Prompt",
+    "settings.navSsh": "SSH",
     "settings.navCron": "Cron",
     "settings.navRemote": "Remote",
     "settings.navSkills": "Skills",
@@ -2177,6 +2238,67 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.agentsReady": "Ready to save",
     "settings.agentsRequired": "Name and Prompt are required",
 
+    /* ── Settings SSH ── */
+    "settings.sshTitle": "SSH",
+    "settings.sshDesc": "Manage SSH hosts, usernames, and login credentials",
+    "settings.sshAdd": "Add",
+    "settings.sshEdit": "Edit SSH",
+    "settings.sshImport": "Import",
+    "settings.sshCount": "hosts",
+    "settings.sshViewList": "List view",
+    "settings.sshViewGrid": "Grid view",
+    "settings.sshNoHosts": "No SSH hosts configured yet",
+    "settings.sshNoHostsHint":
+      "Add a host, or scan ~/.ssh/config and private key files under the user directory.",
+    "settings.sshName": "Name",
+    "settings.sshNamePlaceholder": "e.g. Production bastion",
+    "settings.sshHost": "Host",
+    "settings.sshHostPlaceholder": "e.g. 10.0.0.12 or server.example.com",
+    "settings.sshUsername": "Username",
+    "settings.sshUsernamePlaceholder": "e.g. root",
+    "settings.sshPort": "Port",
+    "settings.sshAuthMethod": "Login method",
+    "settings.sshAuthPassword": "Password",
+    "settings.sshAuthPasswordHint": "Store username and password",
+    "settings.sshAuthPrivateKey": "Private key",
+    "settings.sshAuthPrivateKeyHint": "Import a key file or paste the key directly",
+    "settings.sshPassword": "Password",
+    "settings.sshPasswordPlaceholder": "Enter the SSH login password",
+    "settings.sshPasswordConfigured": "Password saved",
+    "settings.sshShowPassword": "Show password",
+    "settings.sshHidePassword": "Hide password",
+    "settings.sshPrivateKey": "Private key",
+    "settings.sshPrivateKeyImport": "Import key",
+    "settings.sshPrivateKeyPathPlaceholder": "Private key path or file name",
+    "settings.sshPrivateKeyPlaceholder": "Paste OpenSSH private key content...",
+    "settings.sshPrivateKeyConfigured": "Private key saved",
+    "settings.sshAdvancedSettings": "Advanced settings",
+    "settings.sshAdvancedProxy": "Proxy",
+    "settings.sshProxyType": "Proxy type",
+    "settings.sshProxyTypeSocks5": "SOCKS5",
+    "settings.sshProxyTypeHttp": "HTTP",
+    "settings.sshProxyUrl": "Proxy URL",
+    "settings.sshProxyUrlPlaceholder": "e.g. socks5://127.0.0.1",
+    "settings.sshProxyUrlSocks5Placeholder": "e.g. socks5://127.0.0.1",
+    "settings.sshProxyUrlHttpPlaceholder": "e.g. http://127.0.0.1",
+    "settings.sshProxyPort": "Port",
+    "settings.sshProxyUsername": "Username",
+    "settings.sshProxyUsernamePlaceholder": "e.g. proxy-user",
+    "settings.sshProxyPassword": "Password",
+    "settings.sshProxyPasswordPlaceholder": "Enter proxy password",
+    "settings.sshProxyPasswordConfigured": "Proxy password saved",
+    "settings.sshReady": "Ready to save",
+    "settings.sshRequired": "Name and Host are required",
+    "settings.sshImportDesc":
+      "Scan ~/.ssh/config and common private key files in the user directory",
+    "settings.sshImportScanning": "Scanning ~/.ssh ...",
+    "settings.sshImportFailed": "Scan failed",
+    "settings.sshImportFound": "Found {count} Host entries and {keys} readable private key files.",
+    "settings.sshImportEmpty": "No importable SSH config found",
+    "settings.sshImportEmptyHint": "Make sure ~/.ssh/config contains Host entries.",
+    "settings.sshImportDuplicate": "Exists",
+    "settings.sshImportSelected": "{count} configs selected",
+
     /* ── Settings Cron ── */
     "settings.cronTitle": "Scheduled Tasks",
     "settings.cronDesc": "Configure and manage automated scheduled tasks",
diff --git a/crates/agent-gui/src/index.css b/crates/agent-gui/src/index.css
index c4cb0d4ea..287ac4f58 100644
--- a/crates/agent-gui/src/index.css
+++ b/crates/agent-gui/src/index.css
@@ -206,6 +206,27 @@
     user-select: text;
   }
 
+  input:not([type="checkbox"]):not([type="radio"]):not([type="range"]):focus,
+  textarea:focus,
+  select:focus,
+  [contenteditable="true"]:focus,
+  [contenteditable="plaintext-only"]:focus,
+  [role="textbox"]:focus {
+    outline: none;
+  }
+
+  input:not([type="checkbox"]):not([type="radio"]):not([type="range"]):focus-visible,
+  textarea:focus-visible,
+  select:focus-visible,
+  [contenteditable="true"]:focus-visible,
+  [contenteditable="plaintext-only"]:focus-visible,
+  [role="textbox"]:focus-visible {
+    --tw-ring-offset-shadow: 0 0 #0000;
+    --tw-ring-shadow: 0 0 #0000;
+    border-color: hsl(var(--input));
+    box-shadow: var(--tw-shadow, 0 0 #0000);
+  }
+
   /* Custom scrollbar */
   ::-webkit-scrollbar {
     width: 6px;
@@ -652,6 +673,65 @@
     z-index: -1;
   }
 
+  .ssh-auth-panel {
+    overflow: hidden;
+    transition:
+      max-height 300ms cubic-bezier(0.16, 1, 0.3, 1),
+      opacity 220ms ease,
+      transform 300ms cubic-bezier(0.16, 1, 0.3, 1);
+    will-change: max-height, opacity, transform;
+  }
+
+  .ssh-collapsible {
+    display: grid;
+    grid-template-rows: 0fr;
+    transition: grid-template-rows 280ms cubic-bezier(0.16, 1, 0.3, 1);
+    will-change: grid-template-rows;
+  }
+
+  .ssh-collapsible[data-open="true"] {
+    grid-template-rows: 1fr;
+  }
+
+  .ssh-collapsible-inner {
+    min-height: 0;
+    overflow: hidden;
+  }
+
+  /* Settings modal open/close motion (mirrors the gateway web styles.css). */
+  .settings-modal-overlay {
+    opacity: 0;
+    transition: opacity 180ms ease;
+    will-change: opacity;
+  }
+
+  .settings-modal-overlay[data-state="open"] {
+    opacity: 1;
+  }
+
+  .settings-modal-overlay[data-state="closed"] {
+    pointer-events: none;
+  }
+
+  .settings-modal-panel {
+    opacity: 0;
+    transform: translateY(12px) scale(0.985);
+    transition:
+      opacity 180ms ease,
+      transform 180ms cubic-bezier(0.22, 1, 0.36, 1);
+    will-change: opacity, transform;
+  }
+
+  .settings-modal-overlay[data-state="open"] .settings-modal-panel {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+
+  .settings-modal-overlay[data-state="closed"] .settings-modal-panel {
+    opacity: 0;
+    transform: translateY(8px) scale(0.985);
+  }
+
   @keyframes settingsSectionIn {
     from {
       opacity: 0;
@@ -680,6 +760,13 @@
       animation: none;
     }
 
+    .ssh-auth-panel,
+    .ssh-collapsible,
+    .settings-modal-overlay,
+    .settings-modal-panel {
+      transition-duration: 1ms;
+    }
+
     .settings-section-shell::before {
       opacity: 0.45;
       filter: none;
@@ -1861,6 +1948,37 @@
   }
 }
 
+/*
+ * SSH settings — responsive helpers. Unlayered so these win over the
+ * Tailwind flex/align/gap/padding utilities on the same elements
+ * (utilities layer > components layer in Tailwind v4 cascade).
+ */
+@media (max-width: 640px) {
+  .settings-section-heading-row {
+    flex-direction: column;
+    align-items: stretch;
+    gap: 12px;
+  }
+
+  .settings-section-title-group {
+    min-width: 0;
+  }
+
+  .settings-section-actions {
+    width: 100%;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+  }
+
+  .settings-hover-actions {
+    opacity: 1 !important;
+  }
+
+  .settings-card-row {
+    padding: 12px;
+  }
+}
+
 /*
  * Code block copy-button overrides — MUST be outside @layer to beat
  * the inline Tailwind utilities emitted by the streamdown library
diff --git a/crates/agent-gui/src/lib/settings/index.ts b/crates/agent-gui/src/lib/settings/index.ts
index fd633cf85..3cba00aec 100644
--- a/crates/agent-gui/src/lib/settings/index.ts
+++ b/crates/agent-gui/src/lib/settings/index.ts
@@ -235,6 +235,38 @@ export type AgentPromptTemplate = {
   enabled: boolean;
 };
 
+export type SshAuthType = "password" | "privateKey";
+export type SshProxyType = "socks5" | "http";
+
+export type SshProxyConfig = {
+  type: SshProxyType;
+  url: string;
+  port: number;
+  username: string;
+  password: string;
+  passwordConfigured?: boolean;
+};
+
+export type SshHostConfig = {
+  id: string;
+  name: string;
+  description: string;
+  host: string;
+  port: number;
+  username: string;
+  authType: SshAuthType;
+  password: string;
+  passwordConfigured?: boolean;
+  privateKey: string;
+  privateKeyPath: string;
+  privateKeyConfigured?: boolean;
+  proxy: SshProxyConfig;
+};
+
+export type SshSettings = {
+  hosts: SshHostConfig[];
+};
+
 export type CustomProvider = {
   id: string;
   name: string;
@@ -271,6 +303,7 @@ export type AppSettings = {
   customProviders: CustomProvider[];
   mcp: McpSettings;
   agents: AgentPromptTemplate[];
+  ssh: SshSettings;
   hooks: ConversationHook[];
   cron: CronTask[];
   remote: RemoteSettings;
@@ -1212,6 +1245,86 @@ export function normalizeAgentPromptTemplate(input: unknown): AgentPromptTemplat
   };
 }
 
+function normalizeSshAuthType(input: unknown): SshAuthType {
+  return input === "privateKey" ? "privateKey" : "password";
+}
+
+function normalizeSshPort(input: unknown): number {
+  const value = typeof input === "number" || typeof input === "string" ? Number(input) : 22;
+  if (!Number.isFinite(value)) return 22;
+  const port = Math.floor(value);
+  return port >= 1 && port <= 65535 ? port : 22;
+}
+
+function normalizeSshProxyPort(input: unknown): number {
+  const value = typeof input === "number" || typeof input === "string" ? Number(input) : 0;
+  if (!Number.isFinite(value)) return 0;
+  const port = Math.floor(value);
+  return port >= 1 && port <= 65535 ? port : 0;
+}
+
+function normalizeSshProxyType(input: unknown): SshProxyType {
+  return input === "http" ? "http" : "socks5";
+}
+
+export function normalizeSshProxyConfig(input: unknown): SshProxyConfig {
+  const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
+  const password = normalizeOptionalText(obj.password);
+  return {
+    type: normalizeSshProxyType(obj.type),
+    url: normalizeOptionalText(obj.url),
+    port: normalizeSshProxyPort(obj.port),
+    username: typeof obj.username === "string" ? obj.username.trim() : "",
+    password,
+    passwordConfigured: password.length > 0 || obj.passwordConfigured === true,
+  };
+}
+
+export function normalizeSshHostConfig(input: unknown): SshHostConfig {
+  const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
+  const host = typeof obj.host === "string" ? obj.host.trim() : "";
+  const name =
+    typeof obj.name === "string" && obj.name.trim() ? obj.name.trim() : host || "未命名 SSH";
+  const password = normalizeOptionalText(obj.password);
+  const privateKey = normalizeOptionalText(obj.privateKey);
+  const privateKeyPath = normalizeOptionalText(obj.privateKeyPath);
+
+  return {
+    id: typeof obj.id === "string" && obj.id.trim() ? obj.id.trim() : crypto.randomUUID(),
+    name,
+    description: normalizeOptionalText(obj.description),
+    host,
+    port: normalizeSshPort(obj.port),
+    username: typeof obj.username === "string" ? obj.username.trim() : "",
+    authType: normalizeSshAuthType(obj.authType),
+    password,
+    passwordConfigured: password.length > 0 || obj.passwordConfigured === true,
+    privateKey,
+    privateKeyPath,
+    privateKeyConfigured:
+      privateKey.length > 0 || privateKeyPath.length > 0 || obj.privateKeyConfigured === true,
+    proxy: normalizeSshProxyConfig(obj.proxy),
+  };
+}
+
+export function normalizeSshSettings(input: unknown): SshSettings {
+  const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
+  const sourceHosts = Array.isArray(obj.hosts) ? obj.hosts : [];
+  const seenIds = new Set<string>();
+  const hosts = sourceHosts.map((host) => {
+    const normalized = normalizeSshHostConfig(host);
+    if (!seenIds.has(normalized.id)) {
+      seenIds.add(normalized.id);
+      return normalized;
+    }
+    const id = crypto.randomUUID();
+    seenIds.add(id);
+    return { ...normalized, id };
+  });
+
+  return { hosts };
+}
+
 export function normalizeSystemSettings(input: unknown): SystemSettings {
   const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
   return {
@@ -1546,9 +1659,7 @@ export function normalizeProjectToolsGitReviewSettings(
   };
 }
 
-export function normalizeProjectToolsTunnelSettings(
-  input: unknown,
-): ProjectToolsTunnelSettings {
+export function normalizeProjectToolsTunnelSettings(input: unknown): ProjectToolsTunnelSettings {
   const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
   const openProjectPathKeys = Array.from(
     new Set(
@@ -1579,10 +1690,9 @@ export function normalizeProjectToolsPanelTabOrder(input: unknown): string[] {
 }
 
 function isProjectToolsPanelTab(input: unknown): input is ProjectToolsPanelTab {
-  return input === "terminal" ||
-    input === "fileTree" ||
-    input === "gitReview" ||
-    input === "tunnel";
+  return (
+    input === "terminal" || input === "fileTree" || input === "gitReview" || input === "tunnel"
+  );
 }
 
 export function normalizeProjectToolsPanelActiveTab(input: unknown): ProjectToolsPanelTab {
@@ -1704,6 +1814,9 @@ export function getDefaultSettings(): AppSettings {
       selected: [],
     },
     agents: [],
+    ssh: {
+      hosts: [],
+    },
     hooks: [],
     cron: [],
     remote: {
@@ -1749,6 +1862,7 @@ export function normalizeSettings(input?: Partial<AppSettings> | null): AppSetti
     customProviders,
     mcp: normalizeMcpSettings(obj.mcp ?? defaults.mcp),
     agents: normalizeAgentPromptTemplates(obj.agents ?? defaults.agents),
+    ssh: normalizeSshSettings(obj.ssh ?? defaults.ssh),
     hooks: normalizeConversationHooks(obj.hooks ?? defaults.hooks),
     cron: normalizeCronTasks(obj.cron ?? defaults.cron),
     remote: normalizeRemoteSettings(obj.remote ?? defaults.remote),
@@ -1795,6 +1909,16 @@ export function updateAgents(prev: AppSettings, agents: AgentPromptTemplate[]):
   });
 }
 
+export function updateSsh(prev: AppSettings, patch: Partial<SshSettings>): AppSettings {
+  return normalizeSettings({
+    ...prev,
+    ssh: {
+      ...prev.ssh,
+      ...patch,
+    },
+  });
+}
+
 export function updateHooks(prev: AppSettings, hooks: ConversationHook[]): AppSettings {
   return normalizeSettings({
     ...prev,
diff --git a/crates/agent-gui/src/lib/settings/storage.ts b/crates/agent-gui/src/lib/settings/storage.ts
index e2f715d19..72c3dea76 100644
--- a/crates/agent-gui/src/lib/settings/storage.ts
+++ b/crates/agent-gui/src/lib/settings/storage.ts
@@ -31,6 +31,7 @@ type PersistedSettingsResponse = {
   system?: unknown | null;
   mcp?: unknown | null;
   agents?: unknown | null;
+  ssh?: unknown | null;
   hooks?: unknown | null;
   cron?: unknown | null;
   remote?: unknown | null;
@@ -229,6 +230,7 @@ export async function loadPersistedSettingsWithDefaults(): Promise<PersistedSett
       defaults.customProviders) as AppSettings["customProviders"],
     mcp: (persisted?.mcp ?? defaults.mcp) as AppSettings["mcp"],
     agents: (persisted?.agents ?? defaults.agents) as AppSettings["agents"],
+    ssh: (persisted?.ssh ?? defaults.ssh) as AppSettings["ssh"],
     hooks: (persisted?.hooks ?? defaults.hooks) as AppSettings["hooks"],
     cron: (persisted?.cron ?? defaults.cron) as AppSettings["cron"],
     remote: (persisted?.remote ?? defaults.remote) as AppSettings["remote"],
@@ -292,6 +294,14 @@ export async function persistSettings(prev: AppSettings, next: AppSettings): Pro
     );
   }
 
+  if (hasChanged(prev.ssh, next.ssh)) {
+    tasks.push(
+      invoke("settings_save_ssh", {
+        payload: next.ssh,
+      } as any),
+    );
+  }
+
   if (hasChanged(prev.hooks, next.hooks)) {
     tasks.push(
       invoke("settings_save_hooks", {
diff --git a/crates/agent-gui/src/lib/settings/sync.ts b/crates/agent-gui/src/lib/settings/sync.ts
index f3b1bfb3e..d80aa225c 100644
--- a/crates/agent-gui/src/lib/settings/sync.ts
+++ b/crates/agent-gui/src/lib/settings/sync.ts
@@ -9,6 +9,14 @@ import {
 } from "./index";
 
 export type GatewayProviderApiKeyUpdates = Record<string, string>;
+export type GatewaySshSecretUpdates = Record<
+  string,
+  {
+    password?: string;
+    privateKey?: string;
+    proxyPassword?: string;
+  }
+>;
 export type GatewaySettingsSyncProvider = Omit<AppSettings["customProviders"][number], "apiKey"> & {
   apiKeyConfigured?: boolean;
 };
@@ -22,6 +30,7 @@ export type GatewaySettingsSyncPayload = {
   customProviders: GatewaySettingsSyncProvider[];
   mcp: AppSettings["mcp"];
   agents: AppSettings["agents"];
+  ssh: AppSettings["ssh"];
   hooks: AppSettings["hooks"];
   cron: AppSettings["cron"];
   remote?: Pick<AppSettings["remote"], "enableWebTerminal" | "enableWebGit" | "enableWebTunnels">;
@@ -33,6 +42,7 @@ export type GatewaySettingsSyncPayload = {
   theme: AppSettings["theme"];
   locale: AppSettings["locale"];
   providerApiKeyUpdates?: GatewayProviderApiKeyUpdates;
+  sshSecretUpdates?: GatewaySshSecretUpdates;
 };
 
 function asObject(value: unknown): Record<string, unknown> {
@@ -71,9 +81,31 @@ export function redactSettingsForWebStorage(settings: AppSettings): AppSettings
   return normalizeSettings({
     ...settings,
     customProviders: redactCustomProvidersForWebStorage(settings.customProviders),
+    ssh: redactSshSettingsForWebStorage(settings.ssh),
   });
 }
 
+function redactSshSettingsForWebStorage(ssh: AppSettings["ssh"]): AppSettings["ssh"] {
+  return {
+    hosts: ssh.hosts.map((host) => ({
+      ...host,
+      password: "",
+      passwordConfigured: host.password.trim().length > 0 || host.passwordConfigured === true,
+      privateKey: "",
+      privateKeyConfigured:
+        host.privateKey.trim().length > 0 ||
+        host.privateKeyPath.trim().length > 0 ||
+        host.privateKeyConfigured === true,
+      proxy: {
+        ...host.proxy,
+        password: "",
+        passwordConfigured:
+          host.proxy.password.trim().length > 0 || host.proxy.passwordConfigured === true,
+      },
+    })),
+  };
+}
+
 function collectProviderApiKeyUpdates(
   customProviders: AppSettings["customProviders"],
 ): GatewayProviderApiKeyUpdates | undefined {
@@ -87,6 +119,29 @@ function collectProviderApiKeyUpdates(
   return Object.keys(updates).length > 0 ? updates : undefined;
 }
 
+function collectSshSecretUpdates(ssh: AppSettings["ssh"]): GatewaySshSecretUpdates | undefined {
+  const updates: GatewaySshSecretUpdates = {};
+  for (const host of ssh.hosts) {
+    const id = host.id.trim();
+    if (!id) continue;
+    const password = host.password.trim();
+    const privateKey = host.privateKey.trim();
+    const proxyPassword = host.proxy.password.trim();
+    const update: GatewaySshSecretUpdates[string] = {};
+    if (password) update.password = password;
+    if (privateKey) update.privateKey = privateKey;
+    if (proxyPassword) update.proxyPassword = proxyPassword;
+    if (Object.keys(update).length > 0) {
+      updates[id] = update;
+    }
+  }
+  return Object.keys(updates).length > 0 ? updates : undefined;
+}
+
+function redactSshSettingsForGateway(ssh: AppSettings["ssh"]): AppSettings["ssh"] {
+  return redactSshSettingsForWebStorage(ssh);
+}
+
 function syncableCustomSettings(
   customSettings: AppSettings["customSettings"],
 ): GatewaySettingsSyncCustomSettings {
@@ -215,6 +270,29 @@ function normalizeProviderApiKeyUpdates(value: unknown): GatewayProviderApiKeyUp
   return updates;
 }
 
+function normalizeSshSecretUpdates(value: unknown): GatewaySshSecretUpdates {
+  const source = asObject(value);
+  const updates: GatewaySshSecretUpdates = {};
+  for (const [id, rawUpdate] of Object.entries(source)) {
+    const normalizedId = id.trim();
+    if (!normalizedId) continue;
+    const updateSource = asObject(rawUpdate);
+    const password = typeof updateSource.password === "string" ? updateSource.password.trim() : "";
+    const privateKey =
+      typeof updateSource.privateKey === "string" ? updateSource.privateKey.trim() : "";
+    const proxyPassword =
+      typeof updateSource.proxyPassword === "string" ? updateSource.proxyPassword.trim() : "";
+    const update: GatewaySshSecretUpdates[string] = {};
+    if (password) update.password = password;
+    if (privateKey) update.privateKey = privateKey;
+    if (proxyPassword) update.proxyPassword = proxyPassword;
+    if (Object.keys(update).length > 0) {
+      updates[normalizedId] = update;
+    }
+  }
+  return updates;
+}
+
 function mergeSyncedCustomProviders(
   current: AppSettings["customProviders"],
   incoming: unknown,
@@ -271,6 +349,48 @@ function mergeSyncedRemoteSettings(
   };
 }
 
+function mergeSyncedSshSettings(
+  current: AppSettings["ssh"],
+  incoming: unknown,
+  secretUpdates: GatewaySshSecretUpdates,
+): AppSettings["ssh"] {
+  const normalized = normalizeSettings({ ssh: incoming as AppSettings["ssh"] }).ssh;
+  const currentById = new Map(current.hosts.map((host) => [host.id, host]));
+  return {
+    hosts: normalized.hosts.map((host) => {
+      const currentHost = currentById.get(host.id);
+      const update = secretUpdates[host.id];
+      const password = (update?.password ?? host.password.trim()) || currentHost?.password || "";
+      const privateKey =
+        (update?.privateKey ?? host.privateKey.trim()) || currentHost?.privateKey || "";
+      const proxyPassword =
+        (update?.proxyPassword ?? host.proxy.password.trim()) || currentHost?.proxy.password || "";
+      return {
+        ...host,
+        password,
+        passwordConfigured:
+          password.length > 0 ||
+          host.passwordConfigured === true ||
+          currentHost?.passwordConfigured === true,
+        privateKey,
+        privateKeyConfigured:
+          privateKey.length > 0 ||
+          host.privateKeyPath.trim().length > 0 ||
+          host.privateKeyConfigured === true ||
+          currentHost?.privateKeyConfigured === true,
+        proxy: {
+          ...host.proxy,
+          password: proxyPassword,
+          passwordConfigured:
+            proxyPassword.length > 0 ||
+            host.proxy.passwordConfigured === true ||
+            currentHost?.proxy.passwordConfigured === true,
+        },
+      };
+    }),
+  };
+}
+
 function mergeSyncedProjectToolsFileTreeSettings(
   current: AppSettings["customSettings"]["projectToolsFileTree"],
   incoming: unknown,
@@ -352,6 +472,7 @@ export function buildGatewaySettingsSyncPayload(
     customProviders: redactCustomProvidersForGateway(settings.customProviders),
     mcp: settings.mcp,
     agents: settings.agents,
+    ssh: redactSshSettingsForGateway(settings.ssh),
     hooks: settings.hooks,
     cron: settings.cron,
     remote: {
@@ -373,6 +494,12 @@ export function buildGatewaySettingsSyncPayload(
   if (providerApiKeyUpdates) {
     payload.providerApiKeyUpdates = providerApiKeyUpdates;
   }
+  const sshSecretUpdates = options.includeProviderApiKeyUpdates
+    ? collectSshSecretUpdates(settings.ssh)
+    : undefined;
+  if (sshSecretUpdates) {
+    payload.sshSecretUpdates = sshSecretUpdates;
+  }
   return payload;
 }
 
@@ -382,6 +509,7 @@ export function applyGatewaySettingsSyncPayload(
 ): AppSettings {
   const source = asObject(payload);
   const providerApiKeyUpdates = normalizeProviderApiKeyUpdates(source.providerApiKeyUpdates);
+  const sshSecretUpdates = normalizeSshSecretUpdates(source.sshSecretUpdates);
   const selectedModel =
     source.selectedModel === null
       ? undefined
@@ -407,6 +535,9 @@ export function applyGatewaySettingsSyncPayload(
     ),
     mcp: (source.mcp as AppSettings["mcp"] | undefined) ?? current.mcp,
     agents: (source.agents as AppSettings["agents"] | undefined) ?? current.agents,
+    ssh: Object.hasOwn(source, "ssh")
+      ? mergeSyncedSshSettings(current.ssh, source.ssh, sshSecretUpdates)
+      : current.ssh,
     hooks: (source.hooks as AppSettings["hooks"] | undefined) ?? current.hooks,
     cron: (source.cron as AppSettings["cron"] | undefined) ?? current.cron,
     memory: memory as AppSettings["memory"],
diff --git a/crates/agent-gui/src/lib/ssh/scan.ts b/crates/agent-gui/src/lib/ssh/scan.ts
new file mode 100644
index 000000000..a5ca32c88
--- /dev/null
+++ b/crates/agent-gui/src/lib/ssh/scan.ts
@@ -0,0 +1,268 @@
+import { invoke } from "@tauri-apps/api/core";
+import type { SshHostConfig } from "../settings";
+
+type FsRoot = {
+  id: string;
+  path: string;
+  kind: "home" | "root" | "drive";
+  label: string;
+};
+
+type FsRootsResponse = {
+  roots: FsRoot[];
+};
+
+type FsListResponse = {
+  entries: Array<{ path: string; kind: "file" | "dir" }>;
+};
+
+type FsReadEditableTextResponse = {
+  content: string;
+};
+
+export type SshImportCandidate = Omit<SshHostConfig, "id"> & {
+  id: string;
+  source: string;
+  duplicate: boolean;
+};
+
+export type SshScanResult = {
+  homePath: string;
+  sshDirPath: string;
+  keyFiles: string[];
+  candidates: SshImportCandidate[];
+};
+
+type ParsedSshHost = {
+  alias: string;
+  host: string;
+  username: string;
+  port: number;
+  identityFile: string;
+};
+
+const SSH_CONFIG_PATH = ".ssh/config";
+const SSH_DIR_PATH = ".ssh";
+const DEFAULT_SSH_PORT = 22;
+
+function normalizePath(path: string) {
+  return path.replace(/\\/g, "/").replace(/\/+$/, "");
+}
+
+function joinPath(base: string, child: string) {
+  const normalizedBase = normalizePath(base);
+  const normalizedChild = child.replace(/^\/+/, "");
+  return normalizedChild ? `${normalizedBase}/${normalizedChild}` : normalizedBase;
+}
+
+function basename(path: string) {
+  const normalized = normalizePath(path);
+  return normalized.slice(normalized.lastIndexOf("/") + 1) || normalized;
+}
+
+function parsePort(value: string | undefined) {
+  const port = Number(value ?? "");
+  if (!Number.isFinite(port)) return DEFAULT_SSH_PORT;
+  const normalized = Math.floor(port);
+  return normalized >= 1 && normalized <= 65535 ? normalized : DEFAULT_SSH_PORT;
+}
+
+function isWildcardHost(alias: string) {
+  return alias.includes("*") || alias.includes("?") || alias.startsWith("!");
+}
+
+function stripInlineComment(line: string) {
+  const index = line.indexOf("#");
+  return index >= 0 ? line.slice(0, index).trim() : line.trim();
+}
+
+function parseSshConfig(content: string): ParsedSshHost[] {
+  const hosts: ParsedSshHost[] = [];
+  let aliases: string[] = [];
+  let options = new Map<string, string>();
+
+  function flush() {
+    const hostAliases = aliases.filter((alias) => alias && !isWildcardHost(alias));
+    for (const alias of hostAliases) {
+      const hostName = options.get("hostname")?.trim() || alias;
+      hosts.push({
+        alias,
+        host: hostName,
+        username: options.get("user")?.trim() || "",
+        port: parsePort(options.get("port")),
+        identityFile: options.get("identityfile")?.trim() || "",
+      });
+    }
+    aliases = [];
+    options = new Map<string, string>();
+  }
+
+  for (const rawLine of content.split(/\r?\n/)) {
+    const line = stripInlineComment(rawLine);
+    if (!line) continue;
+    const [rawKey = "", ...rest] = line.split(/\s+/);
+    const key = rawKey.toLowerCase();
+    const value = rest.join(" ").trim();
+    if (key === "host") {
+      flush();
+      aliases = rest.map((item) => item.trim()).filter(Boolean);
+      continue;
+    }
+    if (aliases.length > 0 && key && value) {
+      options.set(key, value);
+    }
+  }
+  flush();
+
+  return hosts;
+}
+
+function isLikelyPrivateKeyPath(path: string) {
+  const name = basename(path);
+  if (!name || name.endsWith(".pub")) return false;
+  if (
+    ["config", "known_hosts", "known_hosts.old", "authorized_keys", "authorized_keys2"].includes(
+      name,
+    )
+  ) {
+    return false;
+  }
+  return name.startsWith("id_") || !name.includes(".");
+}
+
+function isPrivateKeyContent(content: string) {
+  return /^-----BEGIN [A-Z0-9 ]*PRIVATE KEY-----/m.test(content.trim());
+}
+
+function expandIdentityPath(homePath: string, path: string) {
+  const trimmed = path.trim().replace(/^"|"$/g, "");
+  if (!trimmed) return "";
+  if (trimmed.startsWith("~/")) return joinPath(homePath, trimmed.slice(2));
+  if (trimmed.startsWith("$HOME/")) return joinPath(homePath, trimmed.slice(6));
+  if (trimmed.startsWith("/")) return normalizePath(trimmed);
+  return joinPath(homePath, trimmed);
+}
+
+function toHomeRelativePath(homePath: string, path: string) {
+  const home = `${normalizePath(homePath)}/`;
+  const normalized = normalizePath(path);
+  return normalized.startsWith(home) ? normalized.slice(home.length) : "";
+}
+
+async function readHomeFile(homePath: string, relativePath: string) {
+  const response = await invoke<FsReadEditableTextResponse>("fs_read_editable_text", {
+    workdir: homePath,
+    path: relativePath,
+  });
+  return response.content;
+}
+
+async function readOptionalHomeFile(homePath: string, relativePath: string) {
+  try {
+    return await readHomeFile(homePath, relativePath);
+  } catch {
+    return "";
+  }
+}
+
+async function findHomePath() {
+  const response = await invoke<FsRootsResponse>("fs_roots");
+  const home =
+    response.roots.find((root) => root.kind === "home") ??
+    response.roots.find((root) => root.id === "home");
+  return home?.path?.trim() ?? "";
+}
+
+async function listSshDirectory(homePath: string) {
+  try {
+    const response = await invoke<FsListResponse>("fs_list", {
+      workdir: homePath,
+      path: SSH_DIR_PATH,
+      depth: 1,
+      offset: 0,
+      max_results: 300,
+    });
+    return Array.isArray(response.entries) ? response.entries : [];
+  } catch {
+    return [];
+  }
+}
+
+export function sshHostIdentityKey(host: Pick<SshHostConfig, "host" | "port" | "username">) {
+  return `${host.host.trim().toLowerCase()}|${host.port || DEFAULT_SSH_PORT}|${host.username
+    .trim()
+    .toLowerCase()}`;
+}
+
+export async function scanSshImportCandidates(
+  existingHosts: SshHostConfig[] = [],
+): Promise<SshScanResult> {
+  const homePath = await findHomePath();
+  if (!homePath) {
+    throw new Error("无法定位用户目录。");
+  }
+
+  const entries = await listSshDirectory(homePath);
+  const configContent = await readOptionalHomeFile(homePath, SSH_CONFIG_PATH);
+  const parsedHosts = parseSshConfig(configContent);
+  const keyEntries = entries
+    .filter((entry) => entry.kind === "file" && isLikelyPrivateKeyPath(entry.path))
+    .map((entry) => entry.path);
+
+  const keyContentByPath = new Map<string, string>();
+  for (const keyPath of keyEntries) {
+    const content = await readOptionalHomeFile(homePath, keyPath);
+    if (isPrivateKeyContent(content)) {
+      keyContentByPath.set(normalizePath(keyPath), content.trim());
+      keyContentByPath.set(joinPath(homePath, keyPath), content.trim());
+    }
+  }
+
+  const existingKeys = new Set(existingHosts.map(sshHostIdentityKey));
+  const candidates = parsedHosts.map((host) => {
+    const identityPath = expandIdentityPath(homePath, host.identityFile);
+    const identityRelativePath = identityPath ? toHomeRelativePath(homePath, identityPath) : "";
+    const privateKey =
+      keyContentByPath.get(identityPath) ??
+      (identityRelativePath ? keyContentByPath.get(normalizePath(identityRelativePath)) : "") ??
+      "";
+    const authType = privateKey || identityPath ? "privateKey" : "password";
+    const candidate: SshImportCandidate = {
+      id: `ssh-import-${host.alias}-${host.host}-${host.port}`,
+      name: host.alias,
+      description: "Imported from ~/.ssh/config",
+      host: host.host,
+      port: host.port,
+      username: host.username,
+      authType,
+      password: "",
+      passwordConfigured: false,
+      privateKey,
+      privateKeyPath: identityPath,
+      privateKeyConfigured: privateKey.length > 0 || identityPath.length > 0,
+      proxy: {
+        type: "socks5",
+        url: "",
+        port: 0,
+        username: "",
+        password: "",
+        passwordConfigured: false,
+      },
+      source: SSH_CONFIG_PATH,
+      duplicate: false,
+    };
+    return {
+      ...candidate,
+      duplicate: existingKeys.has(sshHostIdentityKey(candidate)),
+    };
+  });
+
+  return {
+    homePath,
+    sshDirPath: joinPath(homePath, SSH_DIR_PATH),
+    keyFiles: [...keyContentByPath.keys()]
+      .filter((path) => !path.startsWith(normalizePath(homePath)))
+      .sort(),
+    candidates,
+  };
+}
diff --git a/crates/agent-gui/src/pages/SettingsPage.tsx b/crates/agent-gui/src/pages/SettingsPage.tsx
index ed41c7bad..fcadf525e 100644
--- a/crates/agent-gui/src/pages/SettingsPage.tsx
+++ b/crates/agent-gui/src/pages/SettingsPage.tsx
@@ -8,6 +8,7 @@ import {
   Cloud,
   Cpu,
   Info,
+  Key,
   Settings2,
   Zap,
 } from "../components/icons";
@@ -20,6 +21,7 @@ import { HooksSection } from "./settings/HooksSection";
 import { MemoryPanel } from "./settings/MemoryPanel";
 import { ProvidersSection } from "./settings/ProvidersSection";
 import { RemoteSection } from "./settings/RemoteSection";
+import { SshSection } from "./settings/SshSection";
 import { SystemSettingsForm } from "./settings/SystemSettingsForm";
 import type { SectionId, SettingsPageProps } from "./settings/types";
 
@@ -97,6 +99,10 @@ const NAV_ITEMS_STATIC: Array<{ id: SectionId; icon: ReactNode }> = [
     id: "cron",
     icon: <Clock3 className="h-3.5 w-3.5" />,
   },
+  {
+    id: "ssh",
+    icon: <Key className="h-3.5 w-3.5" />,
+  },
   {
     id: "remote",
     icon: <Cloud className="h-3.5 w-3.5" />,
@@ -123,6 +129,7 @@ export function SettingsPage(props: SettingsPageProps) {
     system: t("settings.navSystem"),
     providers: t("settings.navProviders"),
     agents: t("settings.navAgents"),
+    ssh: t("settings.navSsh"),
     memory: t("settings.navMemory"),
     hooks: t("settings.navHooks"),
     cron: t("settings.navCron"),
@@ -164,6 +171,8 @@ export function SettingsPage(props: SettingsPageProps) {
         return <CronSection settings={settings} setSettings={setSettings} />;
       case "agents":
         return <AgentsSection settings={settings} setSettings={setSettings} />;
+      case "ssh":
+        return <SshSection settings={settings} setSettings={setSettings} />;
       case "remote":
         return <RemoteSection settings={settings} setSettings={setSettings} />;
       case "memory":
diff --git a/crates/agent-gui/src/pages/settings/SshSection.tsx b/crates/agent-gui/src/pages/settings/SshSection.tsx
new file mode 100644
index 000000000..2d1d61663
--- /dev/null
+++ b/crates/agent-gui/src/pages/settings/SshSection.tsx
@@ -0,0 +1,1019 @@
+import { type CSSProperties, useEffect, useRef, useState } from "react";
+import { createPortal } from "react-dom";
+import {
+  Check,
+  ChevronDown,
+  Eye,
+  EyeOff,
+  Key,
+  LayoutGrid,
+  List,
+  Lock,
+  Pencil,
+  Plus,
+  Server,
+  Trash2,
+  Upload,
+} from "../../components/icons";
+
+import { Button } from "../../components/ui/button";
+import { Input } from "../../components/ui/input";
+import { Label } from "../../components/ui/label";
+import { Textarea } from "../../components/ui/textarea";
+import { useLocale } from "../../i18n";
+import {
+  type SshAuthType,
+  type SshHostConfig,
+  type SshProxyType,
+  updateSsh,
+} from "../../lib/settings";
+import { useModalMotion } from "../../lib/shared/modalMotion";
+import {
+  type SshImportCandidate,
+  type SshScanResult,
+  scanSshImportCandidates,
+} from "../../lib/ssh/scan";
+import { ConfirmDeletePopover, PromptTag } from "./shared";
+import type { SettingsSectionProps } from "./types";
+
+type SshViewMode = "list" | "grid";
+type SshHostDraft = Omit<SshHostConfig, "id">;
+
+function normalizePortInput(value: string) {
+  const port = Number(value);
+  if (!Number.isFinite(port)) return 22;
+  const normalized = Math.floor(port);
+  return normalized >= 1 && normalized <= 65535 ? normalized : 22;
+}
+
+function normalizeOptionalPortInput(value: string) {
+  const trimmed = value.trim();
+  if (!trimmed) return 0;
+  const port = Number(trimmed);
+  if (!Number.isFinite(port)) return 0;
+  const normalized = Math.floor(port);
+  return normalized >= 1 && normalized <= 65535 ? normalized : 0;
+}
+
+function endpointLabel(host: SshHostConfig) {
+  const userPrefix = host.username.trim() ? `${host.username.trim()}@` : "";
+  return `${userPrefix}${host.host}:${host.port}`;
+}
+
+function authLabel(host: Pick<SshHostConfig, "authType">, t: (key: string) => string) {
+  return host.authType === "privateKey"
+    ? t("settings.sshAuthPrivateKey")
+    : t("settings.sshAuthPassword");
+}
+
+function SshPasswordInput(props: {
+  id: string;
+  value: string;
+  disabled?: boolean;
+  onChange: (value: string) => void;
+}) {
+  const { id, value, disabled = false, onChange } = props;
+  const { t } = useLocale();
+  const [visible, setVisible] = useState(false);
+  const toggleLabel = visible ? t("settings.sshHidePassword") : t("settings.sshShowPassword");
+
+  return (
+    <div className="relative">
+      <Input
+        id={id}
+        type={visible ? "text" : "password"}
+        value={value}
+        disabled={disabled}
+        className="pr-10"
+        onChange={(event) => onChange(event.currentTarget.value)}
+      />
+      <Button
+        type="button"
+        variant="ghost"
+        size="icon"
+        className="absolute right-1 top-1/2 h-8 w-8 -translate-y-1/2 text-muted-foreground hover:text-foreground disabled:pointer-events-none disabled:opacity-50"
+        disabled={disabled}
+        onClick={() => setVisible((current) => !current)}
+        title={toggleLabel}
+        aria-label={toggleLabel}
+      >
+        {visible ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
+      </Button>
+    </div>
+  );
+}
+
+function SshHostModal(props: {
+  initialData?: SshHostConfig;
+  onSave: (data: SshHostDraft) => void;
+  onClose: () => void;
+}) {
+  const { initialData, onSave, onClose } = props;
+  const { t } = useLocale();
+  const fileInputRef = useRef<HTMLInputElement | null>(null);
+  const [name, setName] = useState(initialData?.name ?? "");
+  const [host, setHost] = useState(initialData?.host ?? "");
+  const [port, setPort] = useState(String(initialData?.port ?? 22));
+  const [username, setUsername] = useState(initialData?.username ?? "");
+  const [authType, setAuthType] = useState<SshAuthType>(initialData?.authType ?? "password");
+  const [password, setPassword] = useState(initialData?.password ?? "");
+  const [privateKey, setPrivateKey] = useState(initialData?.privateKey ?? "");
+  const [privateKeyPath, setPrivateKeyPath] = useState(initialData?.privateKeyPath ?? "");
+  const [advancedOpen, setAdvancedOpen] = useState(false);
+  const [proxyType, setProxyType] = useState<SshProxyType>(initialData?.proxy.type ?? "socks5");
+  const [proxyUrl, setProxyUrl] = useState(initialData?.proxy.url ?? "");
+  const [proxyPort, setProxyPort] = useState(
+    initialData?.proxy.port ? String(initialData.proxy.port) : "",
+  );
+  const [proxyUsername, setProxyUsername] = useState(initialData?.proxy.username ?? "");
+  const [proxyPassword, setProxyPassword] = useState(initialData?.proxy.password ?? "");
+  const { isClosing, modalState, requestClose } = useModalMotion(onClose);
+  const isEditing = Boolean(initialData);
+  const isPasswordAuth = authType === "password";
+  const passwordAuthPanelStyle: CSSProperties = {
+    maxHeight: isPasswordAuth ? "7rem" : "0rem",
+    opacity: isPasswordAuth ? 1 : 0,
+    pointerEvents: isPasswordAuth ? "auto" : "none",
+    transform: isPasswordAuth ? "translateY(0)" : "translateY(-4px)",
+  };
+  const privateKeyAuthPanelStyle: CSSProperties = {
+    maxHeight: isPasswordAuth ? "0rem" : "24rem",
+    opacity: isPasswordAuth ? 0 : 1,
+    pointerEvents: isPasswordAuth ? "none" : "auto",
+    transform: isPasswordAuth ? "translateY(4px)" : "translateY(0)",
+  };
+
+  function handleFileSelected(file: File | undefined) {
+    if (!file) return;
+    const reader = new FileReader();
+    reader.onload = () => {
+      const content = typeof reader.result === "string" ? reader.result : "";
+      setPrivateKey(content.trim());
+      setPrivateKeyPath(file.name);
+      setAuthType("privateKey");
+    };
+    reader.readAsText(file);
+  }
+
+  function handleSave() {
+    if (isClosing) return;
+    const trimmedName = name.trim();
+    const trimmedHost = host.trim();
+    if (!trimmedName || !trimmedHost) return;
+    const trimmedPassword = password.trim();
+    const trimmedPrivateKey = privateKey.trim();
+    const trimmedPrivateKeyPath = privateKeyPath.trim();
+    const trimmedProxyPassword = proxyPassword.trim();
+    onSave({
+      name: trimmedName,
+      description: initialData?.description ?? "",
+      host: trimmedHost,
+      port: normalizePortInput(port),
+      username: username.trim(),
+      authType,
+      password: trimmedPassword,
+      passwordConfigured: trimmedPassword.length > 0 || initialData?.passwordConfigured === true,
+      privateKey: trimmedPrivateKey,
+      privateKeyPath: trimmedPrivateKeyPath,
+      privateKeyConfigured:
+        trimmedPrivateKey.length > 0 ||
+        trimmedPrivateKeyPath.length > 0 ||
+        initialData?.privateKeyConfigured === true,
+      proxy: {
+        type: proxyType,
+        url: proxyUrl.trim(),
+        port: normalizeOptionalPortInput(proxyPort),
+        username: proxyUsername.trim(),
+        password: trimmedProxyPassword,
+        passwordConfigured:
+          trimmedProxyPassword.length > 0 || initialData?.proxy.passwordConfigured === true,
+      },
+    });
+    requestClose();
+  }
+
+  return createPortal(
+    <div
+      className="settings-modal-overlay fixed inset-0 z-50 flex items-center justify-center p-4"
+      data-state={modalState}
+    >
+      <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" onClick={requestClose} />
+      <div className="settings-modal-panel relative z-10 flex max-h-[92vh] w-full max-w-3xl flex-col overflow-hidden rounded-2xl border bg-background shadow-2xl">
+        <div className="settings-modal-header flex items-center gap-3 border-b px-6 py-4">
+          <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
+            <Key className="h-5 w-5" />
+          </div>
+          <div className="flex-1">
+            <div className="text-sm font-semibold">
+              {isEditing ? t("settings.sshEdit") : t("settings.sshAdd")}
+            </div>
+            <div className="text-xs text-muted-foreground">{t("settings.sshDesc")}</div>
+          </div>
+        </div>
+
+        <div className="settings-modal-body flex-1 overflow-y-auto px-6 py-5">
+          <div className="grid grid-cols-2 gap-4">
+            <div className="space-y-1.5">
+              <Label htmlFor="ssh-name" className="text-xs font-medium text-muted-foreground">
+                {t("settings.sshName")}
+                <span className="ml-0.5 text-red-500">*</span>
+              </Label>
+              <Input
+                id="ssh-name"
+                value={name}
+                onChange={(event) => setName(event.currentTarget.value)}
+              />
+            </div>
+            <div className="space-y-1.5">
+              <Label htmlFor="ssh-host" className="text-xs font-medium text-muted-foreground">
+                {t("settings.sshHost")}
+                <span className="ml-0.5 text-red-500">*</span>
+              </Label>
+              <Input
+                id="ssh-host"
+                value={host}
+                onChange={(event) => setHost(event.currentTarget.value)}
+              />
+            </div>
+            <div className="space-y-1.5">
+              <Label htmlFor="ssh-username" className="text-xs font-medium text-muted-foreground">
+                {t("settings.sshUsername")}
+              </Label>
+              <Input
+                id="ssh-username"
+                value={username}
+                onChange={(event) => setUsername(event.currentTarget.value)}
+              />
+            </div>
+            <div className="space-y-1.5">
+              <Label htmlFor="ssh-port" className="text-xs font-medium text-muted-foreground">
+                {t("settings.sshPort")}
+              </Label>
+              <Input
+                id="ssh-port"
+                type="number"
+                min={1}
+                max={65535}
+                value={port}
+                onChange={(event) => setPort(event.currentTarget.value)}
+              />
+            </div>
+          </div>
+
+          <div className="mt-4 space-y-2">
+            <div className="text-xs font-medium text-muted-foreground">
+              {t("settings.sshAuthMethod")}
+            </div>
+            <div className="grid grid-cols-2 gap-2">
+              <button
+                type="button"
+                onClick={() => setAuthType("password")}
+                className={`group relative flex items-center gap-3 rounded-xl border px-3 py-3 text-left transition-all duration-200 ease-out hover:-translate-y-0.5 ${
+                  isPasswordAuth
+                    ? "border-emerald-500/40 bg-emerald-500/[0.06] shadow-sm"
+                    : "border-border/60 bg-card hover:border-border hover:bg-muted/20"
+                }`}
+              >
+                <Lock
+                  className={`h-4 w-4 shrink-0 text-emerald-500 transition-transform duration-200 ${
+                    isPasswordAuth ? "scale-110" : "group-hover:scale-105"
+                  }`}
+                />
+                <div className="min-w-0">
+                  <div className="text-sm font-medium">{t("settings.sshAuthPassword")}</div>
+                  <div className="text-xs text-muted-foreground">
+                    {t("settings.sshAuthPasswordHint")}
+                  </div>
+                </div>
+                <Check
+                  aria-hidden="true"
+                  className={`ml-auto h-4 w-4 shrink-0 text-emerald-500 transition-all duration-200 ${
+                    isPasswordAuth ? "scale-100 opacity-100" : "scale-75 opacity-0"
+                  }`}
+                />
+              </button>
+              <button
+                type="button"
+                onClick={() => setAuthType("privateKey")}
+                className={`group relative flex items-center gap-3 rounded-xl border px-3 py-3 text-left transition-all duration-200 ease-out hover:-translate-y-0.5 ${
+                  !isPasswordAuth
+                    ? "border-emerald-500/40 bg-emerald-500/[0.06] shadow-sm"
+                    : "border-border/60 bg-card hover:border-border hover:bg-muted/20"
+                }`}
+              >
+                <Key
+                  className={`h-4 w-4 shrink-0 text-emerald-500 transition-transform duration-200 ${
+                    !isPasswordAuth ? "scale-110" : "group-hover:scale-105"
+                  }`}
+                />
+                <div className="min-w-0">
+                  <div className="text-sm font-medium">{t("settings.sshAuthPrivateKey")}</div>
+                  <div className="text-xs text-muted-foreground">
+                    {t("settings.sshAuthPrivateKeyHint")}
+                  </div>
+                </div>
+                <Check
+                  aria-hidden="true"
+                  className={`ml-auto h-4 w-4 shrink-0 text-emerald-500 transition-all duration-200 ${
+                    !isPasswordAuth ? "scale-100 opacity-100" : "scale-75 opacity-0"
+                  }`}
+                />
+              </button>
+            </div>
+          </div>
+
+          <div className="mt-4">
+            <div
+              aria-hidden={!isPasswordAuth}
+              className="ssh-auth-panel ssh-auth-panel--password"
+              data-state={isPasswordAuth ? "open" : "closed-up"}
+              style={passwordAuthPanelStyle}
+            >
+              <div className="space-y-1.5">
+                <Label htmlFor="ssh-password" className="text-xs font-medium text-muted-foreground">
+                  {t("settings.sshPassword")}
+                </Label>
+                <SshPasswordInput
+                  id="ssh-password"
+                  value={password}
+                  disabled={!isPasswordAuth}
+                  onChange={setPassword}
+                />
+                {initialData?.passwordConfigured && !password.trim() ? (
+                  <div className="text-[11px] text-muted-foreground">
+                    {t("settings.sshPasswordConfigured")}
+                  </div>
+                ) : null}
+              </div>
+            </div>
+
+            <div
+              aria-hidden={isPasswordAuth}
+              className="ssh-auth-panel ssh-auth-panel--private-key"
+              data-state={!isPasswordAuth ? "open" : "closed-down"}
+              style={privateKeyAuthPanelStyle}
+            >
+              <div className="space-y-3">
+                <div className="relative">
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    className="absolute right-2 top-2 z-10 h-7 w-7 rounded-md border border-transparent bg-background/80 p-0 text-muted-foreground shadow-none hover:border-border/70 hover:bg-muted/70 hover:text-foreground"
+                    aria-label={t("settings.sshPrivateKeyImport")}
+                    disabled={isPasswordAuth}
+                    onClick={() => fileInputRef.current?.click()}
+                    title={t("settings.sshPrivateKeyImport")}
+                  >
+                    <Upload className="h-3.5 w-3.5" aria-hidden="true" />
+                  </Button>
+                  <input
+                    ref={fileInputRef}
+                    type="file"
+                    className="hidden"
+                    disabled={isPasswordAuth}
+                    onChange={(event) => handleFileSelected(event.currentTarget.files?.[0])}
+                  />
+                  <Textarea
+                    id="ssh-private-key"
+                    aria-label={t("settings.sshPrivateKey")}
+                    value={privateKey}
+                    disabled={isPasswordAuth}
+                    className="min-h-[180px] resize-y pr-12 font-mono text-xs leading-relaxed"
+                    onChange={(event) => setPrivateKey(event.currentTarget.value)}
+                  />
+                </div>
+                {initialData?.privateKeyConfigured && !privateKey.trim() ? (
+                  <div className="text-[11px] text-muted-foreground">
+                    {t("settings.sshPrivateKeyConfigured")}
+                  </div>
+                ) : null}
+              </div>
+            </div>
+          </div>
+
+          <div className="mt-5 overflow-hidden rounded-xl border border-border/60 bg-muted/10">
+            <button
+              type="button"
+              className="flex w-full items-center justify-between gap-3 px-4 py-3 text-left text-sm font-medium transition-colors hover:bg-muted/30"
+              onClick={() => setAdvancedOpen((open) => !open)}
+            >
+              <span>{t("settings.sshAdvancedSettings")}</span>
+              <ChevronDown
+                className={`h-4 w-4 text-muted-foreground transition-transform duration-200 ${
+                  advancedOpen ? "rotate-180" : ""
+                }`}
+              />
+            </button>
+
+            <div className="ssh-collapsible" data-open={advancedOpen}>
+              <div
+                aria-hidden={!advancedOpen}
+                className={`ssh-collapsible-inner border-border/60 px-4 transition-[border-width,padding] duration-200 ease-out ${
+                  advancedOpen ? "border-t py-4" : "border-t-0 py-0"
+                }`}
+                inert={!advancedOpen}
+              >
+                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+                  <div className="space-y-1.5 sm:col-span-2">
+                    <Label className="text-xs font-medium text-muted-foreground">
+                      {t("settings.sshProxyType")}
+                    </Label>
+                    <div className="grid grid-cols-2 gap-2 rounded-xl border border-border/60 bg-background p-1">
+                      {(["socks5", "http"] as SshProxyType[]).map((type) => (
+                        <button
+                          key={type}
+                          type="button"
+                          className={`rounded-lg px-3 py-2 text-xs font-medium transition-colors ${
+                            proxyType === type
+                              ? "bg-muted text-foreground shadow-sm"
+                              : "text-muted-foreground hover:bg-muted/60 hover:text-foreground"
+                          }`}
+                          onClick={() => setProxyType(type)}
+                        >
+                          {type === "socks5"
+                            ? t("settings.sshProxyTypeSocks5")
+                            : t("settings.sshProxyTypeHttp")}
+                        </button>
+                      ))}
+                    </div>
+                  </div>
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="ssh-proxy-url"
+                      className="text-xs font-medium text-muted-foreground"
+                    >
+                      {t("settings.sshProxyUrl")}
+                    </Label>
+                    <Input
+                      id="ssh-proxy-url"
+                      value={proxyUrl}
+                      placeholder={t(
+                        proxyType === "socks5"
+                          ? "settings.sshProxyUrlSocks5Placeholder"
+                          : "settings.sshProxyUrlHttpPlaceholder",
+                      )}
+                      onChange={(event) => setProxyUrl(event.currentTarget.value)}
+                    />
+                  </div>
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="ssh-proxy-port"
+                      className="text-xs font-medium text-muted-foreground"
+                    >
+                      {t("settings.sshProxyPort")}
+                    </Label>
+                    <Input
+                      id="ssh-proxy-port"
+                      type="number"
+                      min={1}
+                      max={65535}
+                      value={proxyPort}
+                      onChange={(event) => setProxyPort(event.currentTarget.value)}
+                    />
+                  </div>
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="ssh-proxy-username"
+                      className="text-xs font-medium text-muted-foreground"
+                    >
+                      {t("settings.sshProxyUsername")}
+                    </Label>
+                    <Input
+                      id="ssh-proxy-username"
+                      value={proxyUsername}
+                      onChange={(event) => setProxyUsername(event.currentTarget.value)}
+                    />
+                  </div>
+                  <div className="space-y-1.5">
+                    <Label
+                      htmlFor="ssh-proxy-password"
+                      className="text-xs font-medium text-muted-foreground"
+                    >
+                      {t("settings.sshProxyPassword")}
+                    </Label>
+                    <SshPasswordInput
+                      id="ssh-proxy-password"
+                      value={proxyPassword}
+                      onChange={setProxyPassword}
+                    />
+                    {initialData?.proxy.passwordConfigured && !proxyPassword.trim() ? (
+                      <div className="text-[11px] text-muted-foreground">
+                        {t("settings.sshProxyPasswordConfigured")}
+                      </div>
+                    ) : null}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div className="settings-modal-footer flex items-center justify-end border-t px-6 py-4">
+          <div className="flex items-center gap-2">
+            <Button variant="outline" onClick={requestClose}>
+              {t("settings.cancel")}
+            </Button>
+            <Button onClick={handleSave} disabled={!name.trim() || !host.trim() || isClosing}>
+              {t("settings.save")}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </div>,
+    document.body,
+  );
+}
+
+function SshImportModal(props: {
+  existingHosts: SshHostConfig[];
+  onImport: (hosts: SshImportCandidate[]) => void;
+  onClose: () => void;
+}) {
+  const { existingHosts, onImport, onClose } = props;
+  const { t } = useLocale();
+  const [result, setResult] = useState<SshScanResult | null>(null);
+  const [error, setError] = useState("");
+  const [selectedIds, setSelectedIds] = useState<Set<string>>(() => new Set());
+  const { isClosing, modalState, requestClose } = useModalMotion(onClose);
+
+  useEffect(() => {
+    let cancelled = false;
+    setResult(null);
+    setError("");
+    scanSshImportCandidates(existingHosts)
+      .then((scanResult) => {
+        if (cancelled) return;
+        setResult(scanResult);
+        setSelectedIds(
+          new Set(scanResult.candidates.filter((item) => !item.duplicate).map((item) => item.id)),
+        );
+      })
+      .catch((scanError) => {
+        if (cancelled) return;
+        setError(scanError instanceof Error ? scanError.message : String(scanError));
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [existingHosts]);
+
+  const candidates = result?.candidates ?? [];
+  const selected = candidates.filter((candidate) => selectedIds.has(candidate.id));
+
+  function toggle(id: string) {
+    setSelectedIds((current) => {
+      const next = new Set(current);
+      if (next.has(id)) next.delete(id);
+      else next.add(id);
+      return next;
+    });
+  }
+
+  return createPortal(
+    <div
+      className="settings-modal-overlay fixed inset-0 z-50 flex items-center justify-center p-4"
+      data-state={modalState}
+    >
+      <div className="absolute inset-0 bg-black/60 backdrop-blur-sm" onClick={requestClose} />
+      <div className="settings-modal-panel relative z-10 flex max-h-[90vh] w-full max-w-3xl flex-col overflow-hidden rounded-2xl border bg-background shadow-2xl">
+        <div className="settings-modal-header flex items-center gap-3 border-b px-6 py-4">
+          <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
+            <Upload className="h-5 w-5" />
+          </div>
+          <div className="flex-1">
+            <div className="text-sm font-semibold">{t("settings.sshImport")}</div>
+            <div className="text-xs text-muted-foreground">{t("settings.sshImportDesc")}</div>
+          </div>
+        </div>
+
+        <div className="settings-modal-body flex-1 overflow-y-auto px-6 py-5">
+          {!result && !error ? (
+            <div className="flex h-48 items-center justify-center rounded-2xl border border-dashed border-border/60 bg-muted/20 text-sm text-muted-foreground">
+              {t("settings.sshImportScanning")}
+            </div>
+          ) : null}
+
+          {error ? (
+            <div className="rounded-2xl border border-destructive/30 bg-destructive/5 p-4 text-sm text-destructive">
+              {t("settings.sshImportFailed")}: {error}
+            </div>
+          ) : null}
+
+          {result ? (
+            <div className="space-y-4">
+              <div className="rounded-xl border border-border/60 bg-muted/20 px-4 py-3 text-xs text-muted-foreground">
+                <div className="font-medium text-foreground">{result.sshDirPath}</div>
+                <div className="mt-1">
+                  {t("settings.sshImportFound")
+                    .replace("{count}", String(candidates.length))
+                    .replace("{keys}", String(result.keyFiles.length))}
+                </div>
+              </div>
+
+              {candidates.length === 0 ? (
+                <div className="flex flex-col items-center gap-3 rounded-2xl border border-dashed border-border/60 bg-muted/20 py-12 text-center">
+                  <Key className="h-8 w-8 text-muted-foreground/50" />
+                  <div>
+                    <div className="text-sm font-medium">{t("settings.sshImportEmpty")}</div>
+                    <div className="mt-1 text-xs text-muted-foreground">
+                      {t("settings.sshImportEmptyHint")}
+                    </div>
+                  </div>
+                </div>
+              ) : (
+                <div className="space-y-2">
+                  {candidates.map((candidate) => (
+                    <button
+                      key={candidate.id}
+                      type="button"
+                      disabled={candidate.duplicate}
+                      onClick={() => toggle(candidate.id)}
+                      className={`flex w-full items-center gap-3 rounded-xl border px-4 py-3 text-left transition-colors ${
+                        selectedIds.has(candidate.id)
+                          ? "border-emerald-500/40 bg-emerald-500/[0.06]"
+                          : "border-border/60 bg-card hover:border-border"
+                      } ${candidate.duplicate ? "cursor-not-allowed opacity-60" : ""}`}
+                    >
+                      <span
+                        className={`flex h-5 w-5 shrink-0 items-center justify-center rounded border transition-colors duration-150 ${
+                          selectedIds.has(candidate.id)
+                            ? "border-emerald-500 bg-emerald-500 text-white"
+                            : "border-border bg-background"
+                        }`}
+                      >
+                        <Check
+                          className={`h-3.5 w-3.5 transition-transform duration-150 ${
+                            selectedIds.has(candidate.id) ? "scale-100" : "scale-0"
+                          }`}
+                        />
+                      </span>
+                      <div className="min-w-0 flex-1">
+                        <div className="flex items-center gap-2">
+                          <span className="truncate text-sm font-medium">{candidate.name}</span>
+                          <PromptTag label={authLabel(candidate, t)} />
+                          {candidate.duplicate ? (
+                            <PromptTag label={t("settings.sshImportDuplicate")} muted />
+                          ) : null}
+                        </div>
+                        <div className="mt-1 truncate text-xs text-muted-foreground">
+                          {candidate.username ? `${candidate.username}@` : ""}
+                          {candidate.host}:{candidate.port}
+                        </div>
+                      </div>
+                    </button>
+                  ))}
+                </div>
+              )}
+            </div>
+          ) : null}
+        </div>
+
+        <div className="settings-modal-footer flex items-center justify-between border-t px-6 py-4">
+          <div className="text-xs text-muted-foreground">
+            {t("settings.sshImportSelected").replace("{count}", String(selected.length))}
+          </div>
+          <div className="flex items-center gap-2">
+            <Button variant="outline" onClick={requestClose}>
+              {t("settings.cancel")}
+            </Button>
+            <Button
+              disabled={selected.length === 0 || isClosing}
+              onClick={() => {
+                onImport(selected);
+                requestClose();
+              }}
+            >
+              {t("settings.sshImport")}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </div>,
+    document.body,
+  );
+}
+
+function SshHostCard(props: {
+  host: SshHostConfig;
+  viewMode: SshViewMode;
+  onEdit: () => void;
+  onDelete: () => void;
+}) {
+  const { host, viewMode, onEdit, onDelete } = props;
+  const { t } = useLocale();
+  const showKeyPath = host.authType === "privateKey" && host.privateKeyPath.trim().length > 0;
+  const showKeyConfigured = host.authType === "privateKey" && host.privateKeyConfigured;
+  const showProxy =
+    host.proxy.url.trim().length > 0 || host.proxy.port > 0 || host.proxy.passwordConfigured;
+  const hasMeta = showKeyPath || showKeyConfigured || showProxy;
+
+  const actions = (
+    <div className="settings-hover-actions flex items-center gap-0.5 opacity-0 transition-opacity focus-within:opacity-100 group-hover:opacity-100">
+      <Button
+        variant="ghost"
+        size="icon"
+        className="h-7 w-7 text-muted-foreground hover:text-foreground"
+        onClick={onEdit}
+        title={t("settings.edit")}
+      >
+        <Pencil className="h-3.5 w-3.5" />
+      </Button>
+      <ConfirmDeletePopover name={host.name} onConfirm={onDelete}>
+        {(open) => (
+          <Button
+            variant="ghost"
+            size="icon"
+            className="h-7 w-7 text-muted-foreground hover:text-destructive"
+            onClick={open}
+            title={t("settings.delete")}
+          >
+            <Trash2 className="h-3.5 w-3.5" />
+          </Button>
+        )}
+      </ConfirmDeletePopover>
+    </div>
+  );
+
+  const metaTags = (
+    <div className="flex flex-wrap items-center gap-1.5">
+      {showKeyPath ? <PromptTag label={host.privateKeyPath} muted /> : null}
+      {showKeyConfigured ? <PromptTag label={t("settings.sshPrivateKeyConfigured")} muted /> : null}
+      {showProxy ? <PromptTag label={t("settings.sshAdvancedProxy")} muted /> : null}
+    </div>
+  );
+
+  if (viewMode === "grid") {
+    return (
+      <div className="group relative z-0 flex flex-col rounded-xl border border-border/60 bg-card p-4 transition-all duration-200 hover:z-10 hover:border-emerald-500/40 hover:shadow-md hover:shadow-emerald-500/10">
+        <div className="absolute right-3 top-3">{actions}</div>
+        <div className="flex items-start gap-3 pr-12">
+          <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-emerald-500/10 text-emerald-500 transition-transform duration-200 group-hover:scale-105">
+            <Server className="h-[18px] w-[18px]" />
+          </div>
+          <div className="min-w-0 flex-1">
+            <div className="truncate text-sm font-medium text-foreground">{host.name}</div>
+            <div className="mt-1 flex">
+              <PromptTag label={authLabel(host, t)} />
+            </div>
+          </div>
+        </div>
+        <div className="mt-3 truncate font-mono text-xs text-muted-foreground">
+          {endpointLabel(host)}
+        </div>
+        {hasMeta ? <div className="mt-auto pt-3">{metaTags}</div> : null}
+      </div>
+    );
+  }
+
+  return (
+    <div className="group relative z-0 rounded-xl border border-border/60 bg-card transition-all duration-200 hover:z-10 hover:border-emerald-500/40 hover:shadow-md hover:shadow-emerald-500/10">
+      <div className="settings-card-row flex items-center gap-3 px-4 py-3">
+        <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-emerald-500/10 text-emerald-500 transition-transform duration-200 group-hover:scale-105">
+          <Server className="h-4 w-4" />
+        </div>
+        <div className="min-w-0 flex-1">
+          <div className="flex items-center gap-2">
+            <span className="truncate text-sm font-medium text-foreground">{host.name}</span>
+            <PromptTag label={authLabel(host, t)} />
+          </div>
+          <div className="mt-1 truncate font-mono text-xs text-muted-foreground">
+            {endpointLabel(host)}
+          </div>
+        </div>
+        {actions}
+      </div>
+      {hasMeta ? <div className="border-t border-border/40 px-4 py-2.5">{metaTags}</div> : null}
+    </div>
+  );
+}
+
+function SshViewModeToggle(props: { value: SshViewMode; onChange: (value: SshViewMode) => void }) {
+  const { value, onChange } = props;
+  const { t } = useLocale();
+  const groupLabel = `${t("settings.sshViewList")} / ${t("settings.sshViewGrid")}`;
+  const options = [
+    { value: "list" as const, label: t("settings.sshViewList"), icon: List },
+    { value: "grid" as const, label: t("settings.sshViewGrid"), icon: LayoutGrid },
+  ];
+
+  return (
+    <fieldset className="relative isolate grid min-w-0 grid-cols-2 rounded-lg border border-border/60 bg-muted/30 p-0.5 shadow-inner shadow-black/5">
+      <legend className="sr-only">{groupLabel}</legend>
+      <span
+        aria-hidden="true"
+        className={`pointer-events-none absolute bottom-0.5 left-0.5 top-0.5 w-[calc(50%-0.125rem)] rounded-md bg-emerald-500/10 shadow-sm shadow-emerald-500/10 ring-1 ring-emerald-500/30 transition-transform duration-200 ease-out motion-reduce:transition-none ${
+          value === "grid" ? "translate-x-full" : "translate-x-0"
+        }`}
+      />
+      {options.map((option) => {
+        const Icon = option.icon;
+        const active = value === option.value;
+        return (
+          <button
+            key={option.value}
+            type="button"
+            className={`relative z-10 flex h-7 w-7 items-center justify-center rounded-md transition-colors duration-200 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background motion-reduce:transition-none ${
+              active ? "text-emerald-500" : "text-muted-foreground"
+            }`}
+            title={option.label}
+            aria-label={option.label}
+            aria-pressed={active}
+            onClick={() => onChange(option.value)}
+          >
+            <Icon className="h-3.5 w-3.5" />
+          </button>
+        );
+      })}
+    </fieldset>
+  );
+}
+
+export function SshSection(props: SettingsSectionProps) {
+  const { settings, setSettings } = props;
+  const { t } = useLocale();
+  const [viewMode, setViewMode] = useState<SshViewMode>("list");
+  const [modalOpen, setModalOpen] = useState(false);
+  const [importOpen, setImportOpen] = useState(false);
+  const [editingHost, setEditingHost] = useState<SshHostConfig | null>(null);
+  const hosts = settings.ssh.hosts;
+
+  function openAdd() {
+    setEditingHost(null);
+    setModalOpen(true);
+  }
+
+  function openEdit(host: SshHostConfig) {
+    setEditingHost(host);
+    setModalOpen(true);
+  }
+
+  function closeModal() {
+    setModalOpen(false);
+    setEditingHost(null);
+  }
+
+  function handleSave(data: SshHostDraft) {
+    setSettings((prev) => {
+      if (editingHost) {
+        return updateSsh(prev, {
+          hosts: prev.ssh.hosts.map((host) =>
+            host.id === editingHost.id
+              ? {
+                  ...host,
+                  ...data,
+                  password: data.password || host.password,
+                  privateKey: data.privateKey || host.privateKey,
+                  passwordConfigured:
+                    data.password.trim().length > 0 || host.passwordConfigured === true,
+                  privateKeyConfigured:
+                    data.privateKey.trim().length > 0 ||
+                    data.privateKeyPath.trim().length > 0 ||
+                    host.privateKeyConfigured === true,
+                  proxy: {
+                    ...data.proxy,
+                    password: data.proxy.password || host.proxy.password,
+                    passwordConfigured:
+                      data.proxy.password.trim().length > 0 ||
+                      host.proxy.passwordConfigured === true,
+                  },
+                }
+              : host,
+          ),
+        });
+      }
+      return updateSsh(prev, {
+        hosts: [
+          ...prev.ssh.hosts,
+          {
+            id: crypto.randomUUID(),
+            ...data,
+          },
+        ],
+      });
+    });
+  }
+
+  function handleDelete(id: string) {
+    setSettings((prev) =>
+      updateSsh(prev, {
+        hosts: prev.ssh.hosts.filter((host) => host.id !== id),
+      }),
+    );
+  }
+
+  function handleImport(candidates: SshImportCandidate[]) {
+    setSettings((prev) =>
+      updateSsh(prev, {
+        hosts: [
+          ...prev.ssh.hosts,
+          ...candidates.map((candidate) => {
+            const { id: _id, source: _source, duplicate: _duplicate, ...host } = candidate;
+            return {
+              id: crypto.randomUUID(),
+              ...host,
+            };
+          }),
+        ],
+      }),
+    );
+  }
+
+  return (
+    <>
+      <div className="settings-ssh-section space-y-5">
+        <div className="settings-section-heading-row flex items-center justify-between gap-4">
+          <div className="settings-section-title-group flex items-center gap-3">
+            <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-emerald-500/10">
+              <Key className="h-[18px] w-[18px] text-emerald-500" />
+            </div>
+            <div>
+              <h3 className="text-sm font-semibold">{t("settings.sshTitle")}</h3>
+              <p className="text-xs text-muted-foreground">{t("settings.sshDesc")}</p>
+            </div>
+          </div>
+
+          <div className="settings-section-actions flex items-center gap-2">
+            {hosts.length > 0 ? (
+              <div className="flex items-center gap-2 rounded-lg bg-muted/50 px-2.5 py-1.5 text-xs text-muted-foreground">
+                <span className="tabular-nums font-medium text-foreground">{hosts.length}</span>
+                {t("settings.sshCount")}
+              </div>
+            ) : null}
+            <SshViewModeToggle value={viewMode} onChange={setViewMode} />
+            <Button
+              variant="outline"
+              size="sm"
+              className="gap-1.5"
+              onClick={() => setImportOpen(true)}
+            >
+              <Upload className="h-3.5 w-3.5" />
+              {t("settings.sshImport")}
+            </Button>
+            <Button variant="outline" size="sm" className="gap-1.5" onClick={openAdd}>
+              <Plus className="h-3.5 w-3.5" />
+              {t("settings.sshAdd")}
+            </Button>
+          </div>
+        </div>
+
+        {hosts.length === 0 ? (
+          <div className="flex flex-col items-center gap-4 rounded-2xl border border-dashed border-border/60 bg-muted/20 py-14 text-center">
+            <div className="flex h-14 w-14 items-center justify-center rounded-2xl bg-emerald-500/10">
+              <Key className="h-6 w-6 text-emerald-400" />
+            </div>
+            <div className="space-y-1.5">
+              <p className="text-sm font-medium text-foreground">{t("settings.sshNoHosts")}</p>
+              <p className="mx-auto max-w-sm text-xs leading-relaxed text-muted-foreground">
+                {t("settings.sshNoHostsHint")}
+              </p>
+            </div>
+            <div className="flex items-center gap-2">
+              <Button
+                variant="outline"
+                size="sm"
+                className="gap-1.5"
+                onClick={() => setImportOpen(true)}
+              >
+                <Upload className="h-3.5 w-3.5" />
+                {t("settings.sshImport")}
+              </Button>
+              <Button size="sm" className="gap-1.5" onClick={openAdd}>
+                <Plus className="h-3.5 w-3.5" />
+                {t("settings.sshAdd")}
+              </Button>
+            </div>
+          </div>
+        ) : (
+          <div
+            className={viewMode === "grid" ? "grid grid-cols-1 gap-3 sm:grid-cols-2" : "space-y-2"}
+          >
+            {hosts.map((host) => (
+              <SshHostCard
+                key={host.id}
+                host={host}
+                viewMode={viewMode}
+                onEdit={() => openEdit(host)}
+                onDelete={() => handleDelete(host.id)}
+              />
+            ))}
+          </div>
+        )}
+      </div>
+
+      {modalOpen ? (
+        <SshHostModal
+          initialData={editingHost ?? undefined}
+          onSave={handleSave}
+          onClose={closeModal}
+        />
+      ) : null}
+      {importOpen ? (
+        <SshImportModal
+          existingHosts={hosts}
+          onImport={handleImport}
+          onClose={() => setImportOpen(false)}
+        />
+      ) : null}
+    </>
+  );
+}
diff --git a/crates/agent-gui/src/pages/settings/types.ts b/crates/agent-gui/src/pages/settings/types.ts
index 28f9c8341..63dbddbeb 100644
--- a/crates/agent-gui/src/pages/settings/types.ts
+++ b/crates/agent-gui/src/pages/settings/types.ts
@@ -7,6 +7,7 @@ export type SectionId =
   | "system"
   | "providers"
   | "agents"
+  | "ssh"
   | "memory"
   | "hooks"
   | "cron"

From 699b1c6faa73162166ea688bfdc21bd90879f0f9 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Fri, 12 Jun 2026 11:01:31 +0800
Subject: [PATCH 02/28] feat(project-tools): add SSH tunnel host associations

---
 .../test/webui/web-settings.test.mjs          | 104 ++++++
 crates/agent-gateway/web/src/App.tsx          |  20 ++
 .../project-tools/ProjectToolsPanel.tsx       | 164 +++++++++-
 .../project-tools/SshTunnelPanel.tsx          | 302 +++++++++++++++++
 crates/agent-gateway/web/src/i18n/config.ts   |  47 +++
 .../web/src/lib/settings/index.ts             | 304 +++++++++++++++---
 .../web/src/lib/settings/storage.ts           |   3 +
 .../web/src/lib/settings/sync.ts              |  39 +++
 .../agent-gateway/web/src/lib/webSettings.ts  |   2 +
 .../web/src/pages/settings/SshSection.tsx     |  10 +-
 .../project-tools/ProjectToolsPanel.tsx       | 159 ++++++++-
 .../project-tools/SshTunnelPanel.tsx          | 302 +++++++++++++++++
 crates/agent-gui/src/i18n/config.ts           |  47 +++
 crates/agent-gui/src/lib/settings/index.ts    | 304 +++++++++++++++---
 crates/agent-gui/src/lib/settings/storage.ts  |   3 +
 crates/agent-gui/src/lib/settings/sync.ts     |  33 ++
 crates/agent-gui/src/pages/ChatPage.tsx       |  20 ++
 .../src/pages/settings/SshSection.tsx         |  10 +-
 18 files changed, 1788 insertions(+), 85 deletions(-)
 create mode 100644 crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
 create mode 100644 crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx

diff --git a/crates/agent-gateway/test/webui/web-settings.test.mjs b/crates/agent-gateway/test/webui/web-settings.test.mjs
index 7fa3e37cd..5414df1c1 100644
--- a/crates/agent-gateway/test/webui/web-settings.test.mjs
+++ b/crates/agent-gateway/test/webui/web-settings.test.mjs
@@ -202,6 +202,10 @@ test("loadWebSettings forces current gateway URL/token over stale persisted remo
     openProjectPathKeys: ["/stale/project"],
     openVersion: 1,
   };
+  stale.customSettings.projectToolsSshTunnel = {
+    openProjectPathKeys: ["/stale/project"],
+    openVersion: 1,
+  };
   store.set("liveagent.gateway.webui.settings.v1", JSON.stringify(stale));
 
   const loaded = webSettings.loadWebSettings(" new-token ");
@@ -212,6 +216,7 @@ test("loadWebSettings forces current gateway URL/token over stale persisted remo
   assert.deepEqual(loaded.customSettings.projectToolsFileTree.openProjectPathKeys, []);
   assert.deepEqual(loaded.customSettings.projectToolsGitReview.openProjectPathKeys, []);
   assert.deepEqual(loaded.customSettings.projectToolsTunnel.openProjectPathKeys, []);
+  assert.deepEqual(loaded.customSettings.projectToolsSshTunnel.openProjectPathKeys, []);
 });
 
 test("gateway settings sync keeps remote connection local and syncs web terminal setting", () => {
@@ -284,10 +289,20 @@ test("ssh settings sync redacts stored secrets and carries one-shot secret updat
           },
         },
       ],
+      projectHostAssociations: {
+        "/project-a": ["ssh-prod", "missing-host", "ssh-prod"],
+        "   ": ["ssh-prod"],
+      },
     },
   });
+  assert.deepEqual(source.ssh.projectHostAssociations, {
+    "/project-a": ["ssh-prod"],
+  });
 
   const redacted = settingsSync.redactSettingsForWebStorage(source);
+  assert.deepEqual(redacted.ssh.projectHostAssociations, {
+    "/project-a": ["ssh-prod"],
+  });
   assert.equal(redacted.ssh.hosts[0].password, "");
   assert.equal(redacted.ssh.hosts[0].privateKey, "");
   assert.equal(redacted.ssh.hosts[0].proxy.type, "http");
@@ -297,6 +312,9 @@ test("ssh settings sync redacts stored secrets and carries one-shot secret updat
   assert.equal(redacted.ssh.hosts[0].proxy.passwordConfigured, true);
 
   const publicPayload = settingsSync.buildGatewaySettingsSyncPayload(source);
+  assert.deepEqual(publicPayload.ssh.projectHostAssociations, {
+    "/project-a": ["ssh-prod"],
+  });
   assert.equal(publicPayload.ssh.hosts[0].password, "");
   assert.equal(publicPayload.ssh.hosts[0].privateKey, "");
   assert.equal(publicPayload.ssh.hosts[0].proxy.type, "http");
@@ -309,6 +327,9 @@ test("ssh settings sync redacts stored secrets and carries one-shot secret updat
   const privatePayload = settingsSync.buildGatewaySettingsSyncPayload(source, {
     includeProviderApiKeyUpdates: true,
   });
+  assert.deepEqual(privatePayload.ssh.projectHostAssociations, {
+    "/project-a": ["ssh-prod"],
+  });
   assert.equal(privatePayload.ssh.hosts[0].password, "");
   assert.equal(privatePayload.ssh.hosts[0].privateKey, "");
   assert.equal(privatePayload.ssh.hosts[0].proxy.type, "http");
@@ -371,6 +392,9 @@ test("ssh settings sync merges one-shot secret updates into existing hosts", ()
           },
         },
       ],
+      projectHostAssociations: {
+        "/project-a": ["ssh-prod"],
+      },
     },
     sshSecretUpdates: {
       "ssh-prod": {
@@ -389,6 +413,62 @@ test("ssh settings sync merges one-shot secret updates into existing hosts", ()
   assert.equal(synced.ssh.hosts[0].passwordConfigured, true);
   assert.equal(synced.ssh.hosts[0].privateKeyConfigured, true);
   assert.equal(synced.ssh.hosts[0].proxy.passwordConfigured, true);
+  assert.deepEqual(synced.ssh.projectHostAssociations, {
+    "/project-a": ["ssh-prod"],
+  });
+});
+
+test("ssh settings sync preserves project host associations when older payload omits them", () => {
+  installWindow();
+  const current = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "ssh-prod",
+          name: "Prod",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+        },
+      ],
+      projectHostAssociations: {
+        "/project-a": ["ssh-prod"],
+      },
+    },
+  });
+
+  const preserved = settingsSync.applyGatewaySettingsSyncPayload(current, {
+    ssh: {
+      hosts: [
+        {
+          id: "ssh-prod",
+          name: "Prod",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+        },
+      ],
+    },
+  });
+  assert.deepEqual(preserved.ssh.projectHostAssociations, {
+    "/project-a": ["ssh-prod"],
+  });
+
+  const cleared = settingsSync.applyGatewaySettingsSyncPayload(current, {
+    ssh: {
+      hosts: [
+        {
+          id: "ssh-prod",
+          name: "Prod",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+        },
+      ],
+      projectHostAssociations: {},
+    },
+  });
+  assert.deepEqual(cleared.ssh.projectHostAssociations, {});
 });
 
 test("workspace project selection stays out of synced system workdir", () => {
@@ -498,6 +578,10 @@ test("gateway settings sync keeps newer project tool tab open state", () => {
         openProjectPathKeys: ["/web/project"],
         openVersion: 2,
       },
+      projectToolsSshTunnel: {
+        openProjectPathKeys: ["/web/project"],
+        openVersion: 2,
+      },
     },
   });
 
@@ -518,6 +602,10 @@ test("gateway settings sync keeps newer project tool tab open state", () => {
         openProjectPathKeys: [],
         openVersion: 1,
       },
+      projectToolsSshTunnel: {
+        openProjectPathKeys: [],
+        openVersion: 1,
+      },
     },
   });
   assert.deepEqual(staleSynced.customSettings.projectToolsGitReview.openProjectPathKeys, [
@@ -528,6 +616,10 @@ test("gateway settings sync keeps newer project tool tab open state", () => {
     "/web/project",
   ]);
   assert.equal(staleSynced.customSettings.projectToolsTunnel.openVersion, 2);
+  assert.deepEqual(staleSynced.customSettings.projectToolsSshTunnel.openProjectPathKeys, [
+    "/web/project",
+  ]);
+  assert.equal(staleSynced.customSettings.projectToolsSshTunnel.openVersion, 2);
   assert.equal(staleSynced.customSettings.projectToolsPanel.width, 612);
   assert.equal(staleSynced.customSettings.projectToolsPanel.activeTab, "gitReview");
   assert.deepEqual(staleSynced.customSettings.projectToolsPanel.activeTabs, {
@@ -557,6 +649,10 @@ test("gateway settings sync keeps newer project tool tab open state", () => {
         openProjectPathKeys: ["/desktop/project"],
         openVersion: 3,
       },
+      projectToolsSshTunnel: {
+        openProjectPathKeys: ["/desktop/project"],
+        openVersion: 3,
+      },
     },
   });
   assert.deepEqual(newerSynced.customSettings.projectToolsGitReview.openProjectPathKeys, [
@@ -567,6 +663,10 @@ test("gateway settings sync keeps newer project tool tab open state", () => {
     "/desktop/project",
   ]);
   assert.equal(newerSynced.customSettings.projectToolsTunnel.openVersion, 3);
+  assert.deepEqual(newerSynced.customSettings.projectToolsSshTunnel.openProjectPathKeys, [
+    "/desktop/project",
+  ]);
+  assert.equal(newerSynced.customSettings.projectToolsSshTunnel.openVersion, 3);
   assert.equal(newerSynced.customSettings.projectToolsPanel.width, 612);
   assert.equal(newerSynced.customSettings.projectToolsPanel.activeTab, "gitReview");
   assert.deepEqual(newerSynced.customSettings.projectToolsPanel.activeTabs, {
@@ -586,6 +686,10 @@ test("gateway settings sync keeps newer project tool tab open state", () => {
     openProjectPathKeys: ["/desktop/project"],
     openVersion: 3,
   });
+  assert.deepEqual(payload.customSettings.projectToolsSshTunnel, {
+    openProjectPathKeys: ["/desktop/project"],
+    openVersion: 3,
+  });
 });
 
 test("gateway settings sync keeps newer project conversation activity", () => {
diff --git a/crates/agent-gateway/web/src/App.tsx b/crates/agent-gateway/web/src/App.tsx
index 422bb202a..805788ff8 100644
--- a/crates/agent-gateway/web/src/App.tsx
+++ b/crates/agent-gateway/web/src/App.tsx
@@ -67,9 +67,11 @@ import {
   getProjectToolsFileTreeProjectState,
   getProjectToolsPanelActiveTab,
   getProjectToolsPanelTabOrder,
+  getSshProjectHostIds,
   isAgentDevMode,
   isProjectToolsFileTreeOpen,
   isProjectToolsGitReviewOpen,
+  isProjectToolsSshTunnelOpen,
   isProjectToolsTunnelOpen,
   normalizeChatRuntimeControlsForProvider,
   normalizeSettings,
@@ -81,9 +83,11 @@ import {
   updateProjectToolsFileTreeProjectState,
   updateProjectToolsFileTreeOpen,
   updateProjectToolsGitReviewOpen,
+  updateProjectToolsSshTunnelOpen,
   updateProjectToolsTunnelOpen,
   updateProjectToolsPanelActiveTab,
   updateProjectToolsPanelTabOrder,
+  updateSshProjectHostIds,
   type AppSettings,
   type ChatRuntimeControls,
   type CustomProvider,
@@ -5880,6 +5884,11 @@ export default function App() {
     settings.customSettings,
     terminalProjectPathKey,
   );
+  const projectToolsSshTunnelOpen = isProjectToolsSshTunnelOpen(
+    settings.customSettings,
+    terminalProjectPathKey,
+  );
+  const associatedSshHostIds = getSshProjectHostIds(settings.ssh, terminalProjectPathKey);
   const projectToolsDisabledMessage = !settingsSyncReady
     ? "Syncing desktop settings..."
     : !isAgentMode
@@ -7051,6 +7060,9 @@ export default function App() {
               terminalProjectPathKey,
             )}
             tunnelOpen={projectToolsTunnelOpen}
+            sshTunnelOpen={projectToolsSshTunnelOpen}
+            sshHosts={settings.ssh.hosts}
+            associatedSshHostIds={associatedSshHostIds}
             client={terminalClient}
             gitClient={gitClient}
             gitWriteEnabled={settings.remote.enableWebGit}
@@ -7097,6 +7109,14 @@ export default function App() {
             onTunnelOpenChange={(open) =>
               setSettings((prev) => updateProjectToolsTunnelOpen(prev, terminalProjectPathKey, open))
             }
+            onSshTunnelOpenChange={(open) =>
+              setSettings((prev) =>
+                updateProjectToolsSshTunnelOpen(prev, terminalProjectPathKey, open),
+              )
+            }
+            onSshProjectHostIdsChange={(hostIds) =>
+              setSettings((prev) => updateSshProjectHostIds(prev, terminalProjectPathKey, hostIds))
+            }
             onSessionsChange={handleProjectTerminalSessionsChange}
             onInsertFileMention={(path, kind) => {
               composerRef.current?.insertFileMention(path, kind);
diff --git a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
index baf973971..f2cb02ed4 100644
--- a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
@@ -19,6 +19,7 @@ import type {
   ProjectToolsFileTreeProjectState,
   ProjectToolsFileTreeStatePatch,
   ProjectToolsPanelTab,
+  SshHostConfig,
 } from "@/lib/settings";
 import type { GitClient } from "@/lib/git/types";
 import { cn } from "@/lib/shared/utils";
@@ -36,6 +37,7 @@ import {
   GitBranch,
   Globe,
   GripVertical,
+  Key,
   Plus,
   Terminal,
   X,
@@ -57,6 +59,7 @@ import {
 } from "./GitReviewPanel";
 import { LocalTunnelPanel, type LocalTunnelClient } from "./LocalTunnelPanel";
 import { ProjectFileTreePanel } from "./ProjectFileTreePanel";
+import { SshTunnelPanel } from "./SshTunnelPanel";
 
 const MIN_PANEL_WIDTH = 320;
 const DEFAULT_MAX_PANEL_WIDTH = 720;
@@ -67,6 +70,7 @@ const DEFAULT_TERMINAL_ROWS = 24;
 const FILE_TREE_TAB_ID = "__file_tree__";
 const GIT_REVIEW_TAB_ID = "__git_review__";
 const TUNNEL_TAB_ID = "__tunnel__";
+const SSH_TUNNEL_TAB_ID = "__ssh_tunnel__";
 const PROJECT_TOOLS_RESIZE_END_EVENT = "liveagent:project-tools-resize-end";
 
 type ProjectToolsPanelProps = {
@@ -85,6 +89,9 @@ type ProjectToolsPanelProps = {
   fileTreeState: ProjectToolsFileTreeProjectState;
   gitReviewOpen: boolean;
   tunnelOpen?: boolean;
+  sshTunnelOpen?: boolean;
+  sshHosts?: SshHostConfig[];
+  associatedSshHostIds?: string[];
   client: TerminalClient;
   gitClient?: GitClient | null;
   gitWriteEnabled?: boolean;
@@ -100,6 +107,8 @@ type ProjectToolsPanelProps = {
   onFileTreeStateChange: (patch: ProjectToolsFileTreeStatePatch) => void;
   onGitReviewOpenChange: (open: boolean) => void;
   onTunnelOpenChange?: (open: boolean) => void;
+  onSshTunnelOpenChange?: (open: boolean) => void;
+  onSshProjectHostIdsChange?: (hostIds: string[]) => void;
   onSessionsChange?: (sessions: TerminalSession[]) => void;
   onInsertFileMention?: (path: string, kind: "file" | "dir") => void;
   onOpenFile?: (path: string) => void;
@@ -213,6 +222,10 @@ type ProjectToolsTab =
   | {
       id: typeof TUNNEL_TAB_ID;
       kind: "tunnel";
+    }
+  | {
+      id: typeof SSH_TUNNEL_TAB_ID;
+      kind: "sshTunnel";
     };
 
 type TabDragState = {
@@ -741,6 +754,9 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     fileTreeState,
     gitReviewOpen,
     tunnelOpen = false,
+    sshTunnelOpen = false,
+    sshHosts = [],
+    associatedSshHostIds = [],
     client,
     gitClient,
     gitWriteEnabled = false,
@@ -756,6 +772,8 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     onFileTreeStateChange,
     onGitReviewOpenChange,
     onTunnelOpenChange,
+    onSshTunnelOpenChange,
+    onSshProjectHostIdsChange,
     onSessionsChange,
     onInsertFileMention,
     onOpenFile,
@@ -810,12 +828,16 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
   const fileTreeInitialized = Boolean(projectPathKey && fileTreeOpen);
   const gitReviewInitialized = Boolean(projectPathKey && gitReviewOpen);
   const tunnelInitialized = Boolean(tunnelOpen && tunnelClient);
+  const sshTunnelInitialized = Boolean(projectPathKey && sshTunnelOpen);
   const tunnelAvailable = Boolean(tunnelClient);
   const previousFileTreeInitializedRef = useRef(fileTreeInitialized);
   const previousGitReviewInitializedRef = useRef(gitReviewInitialized);
   const previousTunnelInitializedRef = useRef(tunnelInitialized);
+  const previousSshTunnelInitializedRef = useRef(sshTunnelInitialized);
   const currentActiveTab: ProjectToolsPanelTab =
-    activeTab === "tunnel" && tunnelInitialized
+    activeTab === "sshTunnel" && sshTunnelInitialized
+      ? "sshTunnel"
+      : activeTab === "tunnel" && tunnelInitialized
       ? "tunnel"
       : activeTab === "gitReview" && gitReviewInitialized
       ? "gitReview"
@@ -849,8 +871,11 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     if (tunnelInitialized) {
       nextTabs.push({ id: TUNNEL_TAB_ID, kind: "tunnel" });
     }
+    if (sshTunnelInitialized) {
+      nextTabs.push({ id: SSH_TUNNEL_TAB_ID, kind: "sshTunnel" });
+    }
     return nextTabs;
-  }, [fileTreeInitialized, gitReviewInitialized, sessions, tunnelInitialized]);
+  }, [fileTreeInitialized, gitReviewInitialized, sessions, sshTunnelInitialized, tunnelInitialized]);
   const effectiveTabOrder = draftTabOrder ?? tabOrder;
   const orderedProjectTabs = useMemo(
     () => orderProjectToolsTabs(visibleTabs, effectiveTabOrder),
@@ -953,6 +978,18 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     }
   }, [activeTab, onActiveTabChange, tunnelInitialized]);
 
+  useEffect(() => {
+    const previousSshTunnelInitialized = previousSshTunnelInitializedRef.current;
+    previousSshTunnelInitializedRef.current = sshTunnelInitialized;
+    if (sshTunnelInitialized && !previousSshTunnelInitialized) {
+      onActiveTabChange("sshTunnel");
+      return;
+    }
+    if (!sshTunnelInitialized && previousSshTunnelInitialized && activeTab === "sshTunnel") {
+      onActiveTabChange("terminal");
+    }
+  }, [activeTab, onActiveTabChange, sshTunnelInitialized]);
+
   const publishSessions = useCallback(
     (nextSessions: TerminalSession[], options?: { notifyParent?: boolean }) => {
       const sorted = sortSessions(nextSessions);
@@ -1079,6 +1116,7 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     sessions,
     shellOptions.length,
     orderedProjectTabIds,
+    sshTunnelInitialized,
     updateTabsScrollState,
   ]);
 
@@ -1093,7 +1131,9 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
           ? GIT_REVIEW_TAB_ID
           : currentActiveTab === "tunnel"
             ? TUNNEL_TAB_ID
-            : activeSession?.id;
+            : currentActiveTab === "sshTunnel"
+              ? SSH_TUNNEL_TAB_ID
+              : activeSession?.id;
     if (!targetTabId) return;
     const target = Array.from(
       element.querySelectorAll<HTMLElement>("[data-project-tools-tab-id]"),
@@ -1586,7 +1626,9 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     }
   }, []);
 
-  const showDisabledMessage = Boolean(disabledMessage && !tunnelAvailable && !tunnelInitialized);
+  const showDisabledMessage = Boolean(
+    disabledMessage && !tunnelAvailable && !tunnelInitialized && !sshTunnelInitialized,
+  );
   const showProjectToolsChooser =
     !showDisabledMessage &&
     (projectReady || tunnelAvailable) &&
@@ -1661,6 +1703,19 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     }
   }, [activeTab, onActiveTabChange, onTunnelOpenChange]);
 
+  const startSshTunnel = useCallback(() => {
+    if (!projectReady) return;
+    onSshTunnelOpenChange?.(true);
+    onActiveTabChange("sshTunnel");
+  }, [onActiveTabChange, onSshTunnelOpenChange, projectReady]);
+
+  const closeSshTunnelTab = useCallback(() => {
+    onSshTunnelOpenChange?.(false);
+    if (activeTab === "sshTunnel") {
+      onActiveTabChange("terminal");
+    }
+  }, [activeTab, onActiveTabChange, onSshTunnelOpenChange]);
+
   const renderCreateTerminalMenuItem = () => {
     if (shellOptions.length > 1) {
       return (
@@ -1927,6 +1982,63 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                       );
                     }
 
+                    if (tab.kind === "sshTunnel") {
+                      return (
+                        <div
+                          key={tab.id}
+                          data-project-tools-tab-id={tab.id}
+                          className={cn(
+                            "project-tools-panel-tab group relative flex h-8 max-w-[12rem] shrink-0 select-none items-center gap-1 rounded-md border border-transparent px-1.5 text-xs text-muted-foreground transition-[background-color,border-color,color,opacity,transform,box-shadow] hover:bg-muted/80 hover:text-foreground",
+                            currentActiveTab === "sshTunnel" &&
+                              "border-border bg-muted text-foreground shadow-sm",
+                            draggingTabId === tab.id &&
+                              "z-10 scale-[0.98] opacity-80 shadow-md ring-1 ring-ring",
+                          )}
+                          title={t("projectTools.sshTunnelTitle")}
+                        >
+                          <button
+                            type="button"
+                            aria-label={t("projectTools.sshTunnelTitle")}
+                            className="absolute inset-0 z-0 rounded-md bg-transparent p-0 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                            onClick={() => {
+                              if (consumeSuppressedTabClick(tab.id)) return;
+                              onActiveTabChange("sshTunnel");
+                            }}
+                          />
+                          {renderTabDragHandle(tab.id, t("projectTools.sshTunnelTitle"))}
+                          <div
+                            aria-hidden="true"
+                            className="pointer-events-none relative z-10 flex h-full min-w-0 flex-1 items-center gap-1.5 text-left text-inherit"
+                          >
+                            <Key className="h-3.5 w-3.5 shrink-0" />
+                            <span className="min-w-0 truncate">
+                              {t("projectTools.sshTunnelTitle")}
+                            </span>
+                          </div>
+                          <button
+                            type="button"
+                            data-project-tools-tab-action="close"
+                            aria-label={t("projectTools.closeSshTunnelTab")}
+                            title={t("projectTools.closeSshTunnelTab")}
+                            className="relative z-10 ml-0.5 flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground/70 transition-colors hover:bg-background hover:text-foreground focus-visible:bg-background focus-visible:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring md:opacity-0 md:group-hover:opacity-100 md:focus-visible:opacity-100"
+                            onPointerDown={(event) => {
+                              event.stopPropagation();
+                            }}
+                            onMouseDown={(event) => {
+                              event.stopPropagation();
+                            }}
+                            onClick={(event) => {
+                              event.stopPropagation();
+                              consumeSuppressedTabClick(tab.id);
+                              closeSshTunnelTab();
+                            }}
+                          >
+                            <X className="h-3 w-3" />
+                          </button>
+                        </div>
+                      );
+                    }
+
                     const session = tab.session;
                     const isPendingClose = pendingCloseSessionId === session.id;
                     const isClosing = closingSessionId === session.id;
@@ -2067,6 +2179,14 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                     <Globe className="h-3.5 w-3.5" />
                     {t("projectTools.newTunnel")}
                   </DropdownMenuItem>
+                  <DropdownMenuItem
+                    onSelect={startSshTunnel}
+                    disabled={!projectReady}
+                    className="gap-2 text-xs"
+                  >
+                    <Key className="h-3.5 w-3.5" />
+                    {t("projectTools.newSshTunnel")}
+                  </DropdownMenuItem>
                 </DropdownMenuContent>
               </DropdownMenu>
               {onClose ? (
@@ -2205,6 +2325,25 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                       </div>
                     </div>
                   </button>
+                  <button
+                    type="button"
+                    onClick={startSshTunnel}
+                    disabled={!projectReady}
+                    title={disabledMessage}
+                    className="group flex items-center gap-3 rounded-lg border border-border/60 bg-background px-3.5 py-3 text-left text-sm text-foreground transition-all hover:border-border hover:bg-muted/60 hover:shadow-sm disabled:pointer-events-none disabled:opacity-50"
+                  >
+                    <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-muted/80 text-muted-foreground transition-colors group-hover:bg-muted group-hover:text-foreground">
+                      <Key className="h-4.5 w-4.5" />
+                    </div>
+                    <div className="min-w-0 flex-1">
+                      <div className="font-medium leading-tight">
+                        {t("projectTools.newSshTunnel")}
+                      </div>
+                      <div className="mt-0.5 text-xs leading-tight text-muted-foreground">
+                        {t("projectTools.sshTunnelDescription")}
+                      </div>
+                    </div>
+                  </button>
                 </div>
                 {loading ? (
                   <div className="text-center text-xs text-muted-foreground">
@@ -2270,6 +2409,23 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                     />
                   </div>
                 ) : null}
+                {sshTunnelInitialized ? (
+                  <div
+                    className={cn(
+                      "min-h-0 flex-1",
+                      currentActiveTab === "sshTunnel" ? "flex flex-col" : "hidden",
+                    )}
+                  >
+                    <SshTunnelPanel
+                      projectPathKey={projectPathKey}
+                      hosts={sshHosts}
+                      associatedHostIds={associatedSshHostIds}
+                      onAssociatedHostIdsChange={(hostIds) => {
+                        onSshProjectHostIdsChange?.(hostIds);
+                      }}
+                    />
+                  </div>
+                ) : null}
                 {sessions.length > 0 ? (
                   <div
                     className={cn(
diff --git a/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
new file mode 100644
index 000000000..bf8e79b0e
--- /dev/null
+++ b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
@@ -0,0 +1,302 @@
+import { useMemo, useState } from "react";
+import { useLocale } from "@/i18n";
+import type { SshHostConfig } from "@/lib/settings";
+import { cn } from "@/lib/shared/utils";
+import { ArrowLeft, Check, Globe, Key, Server, Settings } from "../icons";
+import { Button } from "../ui/button";
+
+type SshTunnelScope = "project" | "all";
+type SshTunnelView = "list" | "settings";
+
+type SshTunnelPanelProps = {
+  projectPathKey: string;
+  hosts: SshHostConfig[];
+  associatedHostIds: string[];
+  onAssociatedHostIdsChange: (hostIds: string[]) => void;
+};
+
+function endpointLabel(host: SshHostConfig) {
+  const userPrefix = host.username.trim() ? `${host.username.trim()}@` : "";
+  return `${userPrefix}${host.host}:${host.port}`;
+}
+
+function authLabel(host: Pick<SshHostConfig, "authType">, t: (key: string) => string) {
+  return host.authType === "privateKey"
+    ? t("settings.sshAuthPrivateKey")
+    : t("settings.sshAuthPassword");
+}
+
+function hostHasMeta(host: SshHostConfig) {
+  return (
+    (host.authType === "privateKey" &&
+      (host.privateKeyPath.trim().length > 0 || host.privateKeyConfigured === true)) ||
+    host.proxy.url.trim().length > 0 ||
+    host.proxy.port > 0 ||
+    host.proxy.passwordConfigured === true
+  );
+}
+
+function HostMetaTags(props: { host: SshHostConfig }) {
+  const { host } = props;
+  const { t } = useLocale();
+  const tags: string[] = [];
+  if (host.authType === "privateKey" && host.privateKeyPath.trim()) {
+    tags.push(host.privateKeyPath.trim());
+  } else if (host.authType === "privateKey" && host.privateKeyConfigured) {
+    tags.push(t("settings.sshPrivateKeyConfigured"));
+  }
+  if (host.proxy.url.trim().length > 0 || host.proxy.port > 0 || host.proxy.passwordConfigured) {
+    tags.push(t("settings.sshAdvancedProxy"));
+  }
+  if (tags.length === 0) return null;
+  return (
+    <div className="mt-2 flex flex-wrap items-center gap-1.5">
+      {tags.map((tag) => (
+        <span
+          key={tag}
+          className="max-w-full truncate rounded-md bg-muted/70 px-1.5 py-0.5 text-[10.5px] font-medium text-muted-foreground"
+          title={tag}
+        >
+          {tag}
+        </span>
+      ))}
+    </div>
+  );
+}
+
+export function SshTunnelPanel(props: SshTunnelPanelProps) {
+  const { projectPathKey, hosts, associatedHostIds, onAssociatedHostIdsChange } = props;
+  const { t } = useLocale();
+  const [scope, setScope] = useState<SshTunnelScope>("project");
+  const [view, setView] = useState<SshTunnelView>("list");
+  const associatedSet = useMemo(() => new Set(associatedHostIds), [associatedHostIds]);
+  const associatedHosts = useMemo(
+    () => hosts.filter((host) => associatedSet.has(host.id)),
+    [associatedSet, hosts],
+  );
+
+  const toggleHost = (hostId: string) => {
+    const current = associatedHostIds.filter((id) => hosts.some((host) => host.id === id));
+    const next = associatedSet.has(hostId)
+      ? current.filter((id) => id !== hostId)
+      : [...current, hostId];
+    onAssociatedHostIdsChange(next);
+  };
+
+  const settingsActive = view === "settings";
+  const listPageClassName = cn(
+    "absolute inset-0 flex min-h-0 flex-col bg-gradient-to-b from-muted/40 via-muted/15 to-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
+    settingsActive
+      ? "pointer-events-none z-0 -translate-x-4 opacity-0"
+      : "z-10 translate-x-0 opacity-100",
+  );
+  const settingsPageClassName = cn(
+    "absolute inset-0 flex min-h-0 flex-col bg-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
+    settingsActive
+      ? "z-10 translate-x-0 opacity-100"
+      : "pointer-events-none z-0 translate-x-4 opacity-0",
+  );
+
+  const emptyTitle =
+    scope === "project"
+      ? t("projectTools.sshTunnelProjectEmpty")
+      : t("projectTools.sshTunnelAllEmpty");
+  const emptyHint =
+    scope === "project"
+      ? associatedHosts.length > 0
+        ? t("projectTools.sshTunnelProjectEmptyWithHosts")
+        : t("projectTools.sshTunnelProjectEmptyHint")
+      : t("projectTools.sshTunnelAllEmptyHint");
+
+  return (
+    <div className="relative flex min-h-0 flex-1 overflow-hidden bg-background">
+      <div className={settingsPageClassName} aria-hidden={!settingsActive} inert={!settingsActive}>
+        <div className="flex h-12 shrink-0 items-center gap-2 border-b border-border px-3">
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            className="h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground"
+            title={t("projectTools.sshTunnelBack")}
+            onClick={() => setView("list")}
+          >
+            <ArrowLeft className="h-4 w-4" />
+          </Button>
+          <div className="min-w-0 flex-1">
+            <div className="truncate text-sm font-semibold text-foreground">
+              {t("projectTools.sshTunnelAssociateHosts")}
+            </div>
+            <div className="truncate text-xs text-muted-foreground">
+              {t("projectTools.sshTunnelAssociateHostsHint")}
+            </div>
+          </div>
+          <div className="rounded-md bg-muted/60 px-2 py-1 text-xs text-muted-foreground">
+            <span className="tabular-nums text-foreground">{associatedHosts.length}</span>{" "}
+            {t("projectTools.sshTunnelAssociatedCount")}
+          </div>
+        </div>
+
+        {hosts.length === 0 ? (
+          <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
+            <div className="flex h-12 w-12 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
+              <Key className="h-6 w-6" />
+            </div>
+            <div className="max-w-xs space-y-1">
+              <div className="text-sm font-medium text-foreground">
+                {t("projectTools.sshTunnelNoConfiguredHosts")}
+              </div>
+              <div className="text-xs leading-relaxed text-muted-foreground">
+                {t("projectTools.sshTunnelNoConfiguredHostsHint")}
+              </div>
+            </div>
+          </div>
+        ) : (
+          <div className="min-h-0 flex-1 overflow-y-auto px-3 py-3">
+            <div className="space-y-2">
+              {hosts.map((host) => {
+                const selected = associatedSet.has(host.id);
+                return (
+                  <button
+                    key={host.id}
+                    type="button"
+                    className={cn(
+                      "group flex w-full items-start gap-3 rounded-xl border border-border/60 bg-card px-3 py-3 text-left transition-all hover:border-emerald-500/40 hover:bg-muted/40",
+                      selected && "border-emerald-500/50 bg-emerald-500/5",
+                    )}
+                    aria-pressed={selected}
+                    onClick={() => toggleHost(host.id)}
+                  >
+                    <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-emerald-500/10 text-emerald-500">
+                      <Server className="h-4 w-4" />
+                    </div>
+                    <div className="min-w-0 flex-1">
+                      <div className="flex min-w-0 items-center gap-2">
+                        <span className="truncate text-sm font-medium text-foreground">
+                          {host.name}
+                        </span>
+                        <span className="shrink-0 rounded-md bg-muted/70 px-1.5 py-0.5 text-[10.5px] font-medium text-muted-foreground">
+                          {authLabel(host, t)}
+                        </span>
+                      </div>
+                      <div className="mt-1 truncate font-mono text-xs text-muted-foreground">
+                        {endpointLabel(host)}
+                      </div>
+                      {hostHasMeta(host) ? <HostMetaTags host={host} /> : null}
+                    </div>
+                    <span
+                      className={cn(
+                        "mt-1 flex h-5 w-5 shrink-0 items-center justify-center rounded-full border transition-colors",
+                        selected
+                          ? "border-emerald-500 bg-emerald-500 text-white"
+                          : "border-border bg-background text-transparent",
+                      )}
+                      aria-hidden="true"
+                    >
+                      <Check className="h-3 w-3" />
+                    </span>
+                  </button>
+                );
+              })}
+            </div>
+          </div>
+        )}
+      </div>
+
+      <div className={listPageClassName} aria-hidden={settingsActive} inert={settingsActive}>
+        <div className="shrink-0 border-b border-border/60 bg-background/70 px-4 pb-3 pt-3.5 backdrop-blur-xl">
+          <div className="flex items-center gap-2.5">
+            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl border border-border/60 bg-background/80 text-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_2px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
+              <Key className="h-4 w-4" />
+            </div>
+            <div className="min-w-0 flex-1">
+              <div className="truncate text-sm font-semibold tracking-tight text-foreground">
+                {t("projectTools.sshTunnelTitle")}
+              </div>
+              <div className="truncate text-xs text-muted-foreground">
+                {projectPathKey
+                  ? t("projectTools.sshTunnelConfiguredHosts").replace(
+                      "{count}",
+                      String(associatedHosts.length),
+                    )
+                  : t("projectTools.sshTunnelNoProject")}
+              </div>
+            </div>
+            {scope === "project" ? (
+              <button
+                type="button"
+                className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border/60 hover:bg-muted/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                title={t("projectTools.sshTunnelSettings")}
+                aria-label={t("projectTools.sshTunnelSettings")}
+                onClick={() => setView("settings")}
+              >
+                <Settings className="h-4 w-4" />
+              </button>
+            ) : null}
+          </div>
+
+          <div
+            role="group"
+            aria-label={t("projectTools.sshTunnelScopeGroup")}
+            className="relative mt-3 grid grid-cols-2 gap-0.5 rounded-lg bg-muted/70 p-0.5"
+          >
+            <div
+              aria-hidden="true"
+              className={cn(
+                "pointer-events-none absolute inset-y-0 left-0 z-0 w-1/2 transform-gpu rounded-[7px] bg-background shadow-sm transition-transform duration-200 ease-out motion-reduce:transition-none",
+                scope === "all" ? "translate-x-full" : "translate-x-0",
+              )}
+            />
+            {(["project", "all"] as const).map((option) => {
+              const selected = scope === option;
+              const Icon = option === "project" ? Server : Globe;
+              const label =
+                option === "project"
+                  ? t("projectTools.sshTunnelScopeProject")
+                  : t("projectTools.sshTunnelScopeAll");
+              return (
+                <button
+                  key={option}
+                  type="button"
+                  className={cn(
+                    "relative z-10 flex h-7 min-w-0 transform-gpu items-center justify-center gap-1.5 rounded-[7px] px-2 text-xs text-muted-foreground transition-[color,transform] duration-200 ease-out hover:text-foreground active:scale-[0.98] focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring motion-reduce:transition-none motion-reduce:active:scale-100",
+                    selected && "font-medium text-foreground",
+                  )}
+                  title={label}
+                  aria-label={label}
+                  aria-pressed={selected}
+                  onClick={() => setScope(option)}
+                >
+                  <Icon className="h-3.5 w-3.5 shrink-0" />
+                  <span className="truncate">{label}</span>
+                </button>
+              );
+            })}
+          </div>
+        </div>
+
+        <div className="min-h-0 flex-1 overflow-y-auto px-3 py-3">
+          <div className="flex flex-col items-center justify-center gap-1.5 rounded-xl border border-dashed border-border/70 bg-background/40 px-4 py-10 text-center">
+            <div className="mb-1.5 flex h-12 w-12 items-center justify-center rounded-2xl border border-border/50 bg-background/80 text-muted-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_3px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
+              <Key className="h-5 w-5" />
+            </div>
+            <div className="text-xs font-medium text-foreground/80">{emptyTitle}</div>
+            <div className="max-w-[16rem] text-[11px] leading-relaxed text-muted-foreground">
+              {emptyHint}
+            </div>
+            {scope === "project" && associatedHosts.length === 0 ? (
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                className="mt-2 h-7 rounded-lg bg-background/70 px-2.5 text-xs"
+                onClick={() => setView("settings")}
+              >
+                {t("projectTools.sshTunnelAssociateHosts")}
+              </Button>
+            ) : null}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/crates/agent-gateway/web/src/i18n/config.ts b/crates/agent-gateway/web/src/i18n/config.ts
index 187cbd04d..c3aaf0403 100644
--- a/crates/agent-gateway/web/src/i18n/config.ts
+++ b/crates/agent-gateway/web/src/i18n/config.ts
@@ -238,6 +238,26 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.gitReviewDescription": "查看代码变更和提交历史",
     "projectTools.newTunnel": "新建内网穿透",
     "projectTools.tunnelDescription": "通过 Gateway 暴露本机 HTTP 服务",
+    "projectTools.sshTunnelTitle": "SSH 隧道",
+    "projectTools.newSshTunnel": "新建 SSH 隧道",
+    "projectTools.sshTunnelDescription": "查看 SSH 隧道并关联项目主机",
+    "projectTools.sshTunnelSettings": "设置 SSH 隧道",
+    "projectTools.sshTunnelBack": "返回 SSH 隧道",
+    "projectTools.sshTunnelScopeGroup": "切换 SSH 隧道视角",
+    "projectTools.sshTunnelScopeProject": "项目SSH",
+    "projectTools.sshTunnelScopeAll": "全局SSH",
+    "projectTools.sshTunnelConfiguredHosts": "已关联 {count} 台 SSH 主机",
+    "projectTools.sshTunnelNoProject": "选择项目后可关联 SSH 主机",
+    "projectTools.sshTunnelProjectEmpty": "当前项目暂无启动的 SSH 隧道",
+    "projectTools.sshTunnelProjectEmptyHint": "先关联设置中已配置的 SSH 主机，后续即可从这里启动项目隧道。",
+    "projectTools.sshTunnelProjectEmptyWithHosts": "已关联的主机会保留在此项目中，启动功能将在后续接入。",
+    "projectTools.sshTunnelAllEmpty": "暂无启动的 SSH 隧道",
+    "projectTools.sshTunnelAllEmptyHint": "所有项目和全局范围内当前都没有运行中的 SSH 隧道。",
+    "projectTools.sshTunnelAssociateHosts": "关联 SSH 主机",
+    "projectTools.sshTunnelAssociateHostsHint": "从 Settings > SSH 已配置主机中选择当前项目可用的主机",
+    "projectTools.sshTunnelAssociatedCount": "已关联",
+    "projectTools.sshTunnelNoConfiguredHosts": "还没有配置 SSH 主机",
+    "projectTools.sshTunnelNoConfiguredHostsHint": "请先到 Settings > SSH 添加或导入主机，再回到这里关联当前项目。",
     "projectTools.tunnelScopeGroup": "切换内网穿透视角",
     "projectTools.tunnelScopeProject": "当前项目",
     "projectTools.tunnelScopeGlobal": "全局",
@@ -253,6 +273,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.closeFileTree": "关闭文件树",
     "projectTools.closeGitReview": "关闭 Git 审查",
     "projectTools.closeTunnelTab": "关闭内网穿透",
+    "projectTools.closeSshTunnelTab": "关闭 SSH 隧道",
     "projectTools.tunnelTargetUrl": "本地服务地址",
     "projectTools.tunnelTargetPlaceholder": "http://localhost:3000",
     "projectTools.tunnelName": "名称",
@@ -1524,6 +1545,31 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.gitReviewDescription": "Review code changes and commit history",
     "projectTools.newTunnel": "New Tunnel",
     "projectTools.tunnelDescription": "Expose local HTTP services through Gateway",
+    "projectTools.sshTunnelTitle": "SSH Tunnel",
+    "projectTools.newSshTunnel": "New SSH Tunnel",
+    "projectTools.sshTunnelDescription": "Review SSH tunnels and associate project hosts",
+    "projectTools.sshTunnelSettings": "SSH tunnel settings",
+    "projectTools.sshTunnelBack": "Back to SSH tunnel",
+    "projectTools.sshTunnelScopeGroup": "Switch SSH tunnel scope",
+    "projectTools.sshTunnelScopeProject": "Project SSH",
+    "projectTools.sshTunnelScopeAll": "Global SSH",
+    "projectTools.sshTunnelConfiguredHosts": "{count} SSH hosts associated",
+    "projectTools.sshTunnelNoProject": "Select a project to associate SSH hosts",
+    "projectTools.sshTunnelProjectEmpty": "No SSH tunnels running for this project",
+    "projectTools.sshTunnelProjectEmptyHint":
+      "Associate SSH hosts from settings first. Project tunnel startup can be wired in later.",
+    "projectTools.sshTunnelProjectEmptyWithHosts":
+      "Associated hosts are saved for this project. Startup will be wired in later.",
+    "projectTools.sshTunnelAllEmpty": "No SSH tunnels running",
+    "projectTools.sshTunnelAllEmptyHint":
+      "There are no running SSH tunnels across projects or the global scope.",
+    "projectTools.sshTunnelAssociateHosts": "Associate SSH Hosts",
+    "projectTools.sshTunnelAssociateHostsHint":
+      "Choose hosts configured in Settings > SSH for the current project",
+    "projectTools.sshTunnelAssociatedCount": "associated",
+    "projectTools.sshTunnelNoConfiguredHosts": "No SSH hosts configured yet",
+    "projectTools.sshTunnelNoConfiguredHostsHint":
+      "Add or import hosts in Settings > SSH first, then associate them here.",
     "projectTools.tunnelScopeGroup": "Switch tunnel scope",
     "projectTools.tunnelScopeProject": "Current Project",
     "projectTools.tunnelScopeGlobal": "Global",
@@ -1539,6 +1585,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.closeFileTree": "Close File Tree",
     "projectTools.closeGitReview": "Close Git Review",
     "projectTools.closeTunnelTab": "Close Tunnel",
+    "projectTools.closeSshTunnelTab": "Close SSH Tunnel",
     "projectTools.tunnelTargetUrl": "Local service URL",
     "projectTools.tunnelTargetPlaceholder": "http://localhost:3000",
     "projectTools.tunnelName": "Name",
diff --git a/crates/agent-gateway/web/src/lib/settings/index.ts b/crates/agent-gateway/web/src/lib/settings/index.ts
index 92789263d..db0acbe23 100644
--- a/crates/agent-gateway/web/src/lib/settings/index.ts
+++ b/crates/agent-gateway/web/src/lib/settings/index.ts
@@ -126,7 +126,12 @@ export type ChatSidebarSettings = {
   recentCollapsed: boolean;
 };
 
-export type ProjectToolsPanelTab = "terminal" | "fileTree" | "gitReview" | "tunnel";
+export type ProjectToolsPanelTab =
+  | "terminal"
+  | "fileTree"
+  | "gitReview"
+  | "tunnel"
+  | "sshTunnel";
 
 export type ProjectToolsPanelSettings = {
   width: number;
@@ -159,6 +164,11 @@ export type ProjectToolsTunnelSettings = {
   openVersion: number;
 };
 
+export type ProjectToolsSshTunnelSettings = {
+  openProjectPathKeys: string[];
+  openVersion: number;
+};
+
 export type ProjectToolsFileTreeStatePatch = Partial<ProjectToolsFileTreeProjectState> & {
   bumpRevision?: boolean;
   bumpStateVersion?: boolean;
@@ -171,6 +181,7 @@ export type CustomSettings = {
   projectToolsFileTree: ProjectToolsFileTreeSettings;
   projectToolsGitReview: ProjectToolsGitReviewSettings;
   projectToolsTunnel: ProjectToolsTunnelSettings;
+  projectToolsSshTunnel: ProjectToolsSshTunnelSettings;
 };
 
 export type SystemSettings = {
@@ -260,6 +271,7 @@ export type SshHostConfig = {
 
 export type SshSettings = {
   hosts: SshHostConfig[];
+  projectHostAssociations: Record<string, string[]>;
 };
 
 export type CustomProvider = {
@@ -1320,8 +1332,43 @@ export function normalizeSshSettings(input: unknown): SshSettings {
     seenIds.add(id);
     return { ...normalized, id };
   });
+  const hostIds = new Set(hosts.map((host) => host.id));
 
-  return { hosts };
+  return {
+    hosts,
+    projectHostAssociations: normalizeSshProjectHostAssociations(
+      obj.projectHostAssociations,
+      hostIds,
+    ),
+  };
+}
+
+function normalizeSshProjectHostAssociations(
+  input: unknown,
+  hostIds: ReadonlySet<string>,
+): Record<string, string[]> {
+  const rawAssociations = (
+    input && typeof input === "object" && !Array.isArray(input) ? input : {}
+  ) as Record<string, unknown>;
+  const associations: Record<string, string[]> = {};
+  for (const [pathKey, rawHostIds] of Object.entries(rawAssociations)) {
+    const normalizedPathKey = workspaceProjectPathKey(pathKey);
+    if (!normalizedPathKey || !Array.isArray(rawHostIds)) continue;
+    const ids: string[] = [];
+    const seen = new Set<string>();
+    for (const rawHostId of rawHostIds) {
+      if (typeof rawHostId !== "string") continue;
+      const hostId = rawHostId.trim();
+      if (!hostId || !hostIds.has(hostId) || seen.has(hostId)) continue;
+      seen.add(hostId);
+      ids.push(hostId);
+      if (ids.length >= 64) break;
+    }
+    if (ids.length === 0) continue;
+    associations[normalizedPathKey] = ids;
+    if (Object.keys(associations).length >= 100) break;
+  }
+  return associations;
 }
 
 export function normalizeSystemSettings(input: unknown): SystemSettings {
@@ -1673,6 +1720,23 @@ export function normalizeProjectToolsTunnelSettings(input: unknown): ProjectTool
   };
 }
 
+export function normalizeProjectToolsSshTunnelSettings(
+  input: unknown,
+): ProjectToolsSshTunnelSettings {
+  const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
+  const openProjectPathKeys = Array.from(
+    new Set(
+      (Array.isArray(obj.openProjectPathKeys) ? obj.openProjectPathKeys : [])
+        .map((pathKey) => workspaceProjectPathKey(pathKey))
+        .filter(Boolean),
+    ),
+  ).sort();
+  return {
+    openProjectPathKeys,
+    openVersion: normalizeIntegerInRange(obj.openVersion, 0, Number.MAX_SAFE_INTEGER, 0),
+  };
+}
+
 export function normalizeProjectToolsPanelTabOrder(input: unknown): string[] {
   if (!Array.isArray(input)) return [];
   const order: string[] = [];
@@ -1690,7 +1754,11 @@ export function normalizeProjectToolsPanelTabOrder(input: unknown): string[] {
 
 function isProjectToolsPanelTab(input: unknown): input is ProjectToolsPanelTab {
   return (
-    input === "terminal" || input === "fileTree" || input === "gitReview" || input === "tunnel"
+    input === "terminal" ||
+    input === "fileTree" ||
+    input === "gitReview" ||
+    input === "tunnel" ||
+    input === "sshTunnel"
   );
 }
 
@@ -1762,6 +1830,11 @@ export function normalizeCustomSettings(
       ? obj.projectToolsTunnel
       : {}
   ) as unknown;
+  const projectToolsSshTunnel = (
+    obj.projectToolsSshTunnel && typeof obj.projectToolsSshTunnel === "object"
+      ? obj.projectToolsSshTunnel
+      : {}
+  ) as unknown;
   return {
     conversationTitleModel: normalizeSelectedModelForProviders(
       normalizeSelectedModel(obj.conversationTitleModel),
@@ -1785,6 +1858,7 @@ export function normalizeCustomSettings(
     projectToolsFileTree: normalizeProjectToolsFileTreeSettings(projectToolsFileTree),
     projectToolsGitReview: normalizeProjectToolsGitReviewSettings(projectToolsGitReview),
     projectToolsTunnel: normalizeProjectToolsTunnelSettings(projectToolsTunnel),
+    projectToolsSshTunnel: normalizeProjectToolsSshTunnelSettings(projectToolsSshTunnel),
   };
 }
 
@@ -1808,6 +1882,7 @@ export function getDefaultSettings(): AppSettings {
     agents: [],
     ssh: {
       hosts: [],
+      projectHostAssociations: {},
     },
     hooks: [],
     cron: [],
@@ -1909,6 +1984,76 @@ export function updateSsh(prev: AppSettings, patch: Partial<SshSettings>): AppSe
   });
 }
 
+function normalizeSshProjectHostIdList(
+  ssh: SshSettings,
+  hostIds: readonly string[],
+): string[] {
+  const availableHostIds = new Set(ssh.hosts.map((host) => host.id));
+  const seen = new Set<string>();
+  const ids: string[] = [];
+  for (const rawHostId of hostIds) {
+    const hostId = rawHostId.trim();
+    if (!hostId || !availableHostIds.has(hostId) || seen.has(hostId)) continue;
+    seen.add(hostId);
+    ids.push(hostId);
+    if (ids.length >= 64) break;
+  }
+  return ids;
+}
+
+export function getSshProjectHostIds(ssh: SshSettings, projectPathKey: string): string[] {
+  const normalizedPathKey = workspaceProjectPathKey(projectPathKey);
+  if (!normalizedPathKey) return [];
+  return normalizeSshProjectHostIdList(
+    ssh,
+    ssh.projectHostAssociations[normalizedPathKey] ?? [],
+  );
+}
+
+export function updateSshProjectHostIds(
+  prev: AppSettings,
+  projectPathKey: string,
+  hostIds: readonly string[],
+): AppSettings {
+  const normalizedPathKey = workspaceProjectPathKey(projectPathKey);
+  if (!normalizedPathKey) return prev;
+  const nextHostIds = normalizeSshProjectHostIdList(prev.ssh, hostIds);
+  const currentHostIds = getSshProjectHostIds(prev.ssh, normalizedPathKey);
+  if (
+    currentHostIds.length === nextHostIds.length &&
+    currentHostIds.every((hostId, index) => hostId === nextHostIds[index])
+  ) {
+    return prev;
+  }
+  const projectHostAssociations = { ...prev.ssh.projectHostAssociations };
+  if (nextHostIds.length > 0) {
+    projectHostAssociations[normalizedPathKey] = nextHostIds;
+  } else {
+    delete projectHostAssociations[normalizedPathKey];
+  }
+  return updateSsh(prev, { projectHostAssociations });
+}
+
+export function removeSshHostFromProjectAssociations(
+  prev: AppSettings,
+  hostId: string,
+): AppSettings {
+  const normalizedHostId = hostId.trim();
+  if (!normalizedHostId) return prev;
+  let changed = false;
+  const projectHostAssociations: Record<string, string[]> = {};
+  for (const [pathKey, hostIds] of Object.entries(prev.ssh.projectHostAssociations)) {
+    const nextHostIds = hostIds.filter((item) => item !== normalizedHostId);
+    if (nextHostIds.length !== hostIds.length) {
+      changed = true;
+    }
+    if (nextHostIds.length > 0) {
+      projectHostAssociations[pathKey] = nextHostIds;
+    }
+  }
+  return changed ? updateSsh(prev, { projectHostAssociations }) : prev;
+}
+
 export function updateHooks(prev: AppSettings, hooks: ConversationHook[]): AppSettings {
   return normalizeSettings({
     ...prev,
@@ -1975,6 +2120,10 @@ function hasProjectToolsTunnelSessionState(state: ProjectToolsTunnelSettings): b
   return state.openVersion > 0 || state.openProjectPathKeys.length > 0;
 }
 
+function hasProjectToolsSshTunnelSessionState(state: ProjectToolsSshTunnelSettings): boolean {
+  return state.openVersion > 0 || state.openProjectPathKeys.length > 0;
+}
+
 export function preserveProjectToolsSessionState(
   next: AppSettings,
   current: AppSettings,
@@ -1988,6 +2137,9 @@ export function preserveProjectToolsSessionState(
   const currentTunnel = normalizeProjectToolsTunnelSettings(
     current.customSettings.projectToolsTunnel,
   );
+  const currentSshTunnel = normalizeProjectToolsSshTunnelSettings(
+    current.customSettings.projectToolsSshTunnel,
+  );
 
   return normalizeSettings({
     ...next,
@@ -2002,6 +2154,9 @@ export function preserveProjectToolsSessionState(
       projectToolsTunnel: hasProjectToolsTunnelSessionState(currentTunnel)
         ? currentTunnel
         : next.customSettings.projectToolsTunnel,
+      projectToolsSshTunnel: hasProjectToolsSshTunnelSessionState(currentSshTunnel)
+        ? currentSshTunnel
+        : next.customSettings.projectToolsSshTunnel,
     },
   });
 }
@@ -2133,6 +2288,19 @@ export function removeProjectToolsProjectState(
   );
   const removedTunnelOpenProjectPathKey =
     nextTunnelOpenProjectPathKeys.length !== tunnelOpenProjectPathKeys.length;
+  const sshTunnelOpenProjectPathKeys =
+    prev.customSettings.projectToolsSshTunnel.openProjectPathKeys
+      .map((pathKey) => workspaceProjectPathKey(pathKey))
+      .filter(Boolean);
+  const nextSshTunnelOpenProjectPathKeys = sshTunnelOpenProjectPathKeys.filter(
+    (pathKey) => pathKey !== normalizedPathKey,
+  );
+  const removedSshTunnelOpenProjectPathKey =
+    nextSshTunnelOpenProjectPathKeys.length !== sshTunnelOpenProjectPathKeys.length;
+  const hasSshProjectAssociation = Object.hasOwn(
+    prev.ssh.projectHostAssociations,
+    normalizedPathKey,
+  );
   const hasFileTreeProjectState = Object.prototype.hasOwnProperty.call(
     prev.customSettings.projectToolsFileTree.projects,
     normalizedPathKey,
@@ -2145,7 +2313,9 @@ export function removeProjectToolsProjectState(
     !removedOpenProjectPathKey &&
     !removedGitReviewOpenProjectPathKey &&
     !removedTunnelOpenProjectPathKey &&
-    !hasFileTreeProjectState
+    !removedSshTunnelOpenProjectPathKey &&
+    !hasFileTreeProjectState &&
+    !hasSshProjectAssociation
   ) {
     return prev;
   }
@@ -2170,39 +2340,63 @@ export function removeProjectToolsProjectState(
     delete projects[normalizedPathKey];
   }
 
-  return updateCustomSettings(prev, {
-    projectToolsPanel: {
-      ...prev.customSettings.projectToolsPanel,
-      activeTabs,
-      tabOrders,
-    },
-    projectToolsFileTree: {
-      ...prev.customSettings.projectToolsFileTree,
-      openProjectPathKeys: removedOpenProjectPathKey
-        ? nextOpenProjectPathKeys.sort()
-        : prev.customSettings.projectToolsFileTree.openProjectPathKeys,
-      openVersion: removedFileTreeState
-        ? prev.customSettings.projectToolsFileTree.openVersion + 1
-        : prev.customSettings.projectToolsFileTree.openVersion,
-      projects,
-    },
-    projectToolsGitReview: {
-      ...prev.customSettings.projectToolsGitReview,
-      openProjectPathKeys: removedGitReviewOpenProjectPathKey
-        ? nextGitReviewOpenProjectPathKeys.sort()
-        : prev.customSettings.projectToolsGitReview.openProjectPathKeys,
-      openVersion: removedGitReviewOpenProjectPathKey
-        ? prev.customSettings.projectToolsGitReview.openVersion + 1
-        : prev.customSettings.projectToolsGitReview.openVersion,
+  const projectHostAssociations = hasSshProjectAssociation
+    ? { ...prev.ssh.projectHostAssociations }
+    : prev.ssh.projectHostAssociations;
+  if (hasSshProjectAssociation) {
+    delete projectHostAssociations[normalizedPathKey];
+  }
+
+  return normalizeSettings({
+    ...prev,
+    ssh: {
+      ...prev.ssh,
+      projectHostAssociations,
     },
-    projectToolsTunnel: {
-      ...prev.customSettings.projectToolsTunnel,
-      openProjectPathKeys: removedTunnelOpenProjectPathKey
-        ? nextTunnelOpenProjectPathKeys.sort()
-        : prev.customSettings.projectToolsTunnel.openProjectPathKeys,
-      openVersion: removedTunnelOpenProjectPathKey
-        ? prev.customSettings.projectToolsTunnel.openVersion + 1
-        : prev.customSettings.projectToolsTunnel.openVersion,
+    customSettings: {
+      ...prev.customSettings,
+      projectToolsPanel: {
+        ...prev.customSettings.projectToolsPanel,
+        activeTabs,
+        tabOrders,
+      },
+      projectToolsFileTree: {
+        ...prev.customSettings.projectToolsFileTree,
+        openProjectPathKeys: removedOpenProjectPathKey
+          ? nextOpenProjectPathKeys.sort()
+          : prev.customSettings.projectToolsFileTree.openProjectPathKeys,
+        openVersion: removedFileTreeState
+          ? prev.customSettings.projectToolsFileTree.openVersion + 1
+          : prev.customSettings.projectToolsFileTree.openVersion,
+        projects,
+      },
+      projectToolsGitReview: {
+        ...prev.customSettings.projectToolsGitReview,
+        openProjectPathKeys: removedGitReviewOpenProjectPathKey
+          ? nextGitReviewOpenProjectPathKeys.sort()
+          : prev.customSettings.projectToolsGitReview.openProjectPathKeys,
+        openVersion: removedGitReviewOpenProjectPathKey
+          ? prev.customSettings.projectToolsGitReview.openVersion + 1
+          : prev.customSettings.projectToolsGitReview.openVersion,
+      },
+      projectToolsTunnel: {
+        ...prev.customSettings.projectToolsTunnel,
+        openProjectPathKeys: removedTunnelOpenProjectPathKey
+          ? nextTunnelOpenProjectPathKeys.sort()
+          : prev.customSettings.projectToolsTunnel.openProjectPathKeys,
+        openVersion: removedTunnelOpenProjectPathKey
+          ? prev.customSettings.projectToolsTunnel.openVersion + 1
+          : prev.customSettings.projectToolsTunnel.openVersion,
+      },
+      projectToolsSshTunnel: {
+        ...prev.customSettings.projectToolsSshTunnel,
+        openProjectPathKeys: removedSshTunnelOpenProjectPathKey
+          ? nextSshTunnelOpenProjectPathKeys.sort()
+          : prev.customSettings.projectToolsSshTunnel.openProjectPathKeys,
+        openVersion: removedSshTunnelOpenProjectPathKey
+          ? prev.customSettings.projectToolsSshTunnel.openVersion + 1
+          : prev.customSettings.projectToolsSshTunnel.openVersion,
+      },
     },
   });
 }
@@ -2333,6 +2527,44 @@ export function updateProjectToolsTunnelOpen(
   });
 }
 
+export function isProjectToolsSshTunnelOpen(
+  customSettings: CustomSettings,
+  projectPathKey: string,
+): boolean {
+  const normalizedPathKey = workspaceProjectPathKey(projectPathKey);
+  return (
+    normalizedPathKey !== "" &&
+    customSettings.projectToolsSshTunnel.openProjectPathKeys.includes(normalizedPathKey)
+  );
+}
+
+export function updateProjectToolsSshTunnelOpen(
+  prev: AppSettings,
+  projectPathKey: string,
+  open: boolean,
+): AppSettings {
+  const normalizedPathKey = workspaceProjectPathKey(projectPathKey);
+  if (!normalizedPathKey) return prev;
+  const openProjectPathKeys = new Set(
+    prev.customSettings.projectToolsSshTunnel.openProjectPathKeys
+      .map((pathKey) => workspaceProjectPathKey(pathKey))
+      .filter(Boolean),
+  );
+  if (openProjectPathKeys.has(normalizedPathKey) === open) return prev;
+  if (open) {
+    openProjectPathKeys.add(normalizedPathKey);
+  } else {
+    openProjectPathKeys.delete(normalizedPathKey);
+  }
+  return updateCustomSettings(prev, {
+    projectToolsSshTunnel: {
+      ...prev.customSettings.projectToolsSshTunnel,
+      openProjectPathKeys: Array.from(openProjectPathKeys).sort(),
+      openVersion: prev.customSettings.projectToolsSshTunnel.openVersion + 1,
+    },
+  });
+}
+
 function projectToolsFileTreeProjectStateEqual(
   left: ProjectToolsFileTreeProjectState,
   right: ProjectToolsFileTreeProjectState,
diff --git a/crates/agent-gateway/web/src/lib/settings/storage.ts b/crates/agent-gateway/web/src/lib/settings/storage.ts
index e25b086f5..37b3bfafb 100644
--- a/crates/agent-gateway/web/src/lib/settings/storage.ts
+++ b/crates/agent-gateway/web/src/lib/settings/storage.ts
@@ -8,6 +8,7 @@ import {
   normalizeChatRuntimeControls,
   normalizeProjectToolsFileTreeSettings,
   normalizeProjectToolsGitReviewSettings,
+  normalizeProjectToolsSshTunnelSettings,
   normalizeProjectToolsTunnelSettings,
   normalizeProjectToolsPanelActiveTab,
   normalizeProjectToolsPanelActiveTabs,
@@ -61,6 +62,7 @@ function toPersistedLocalCustomSettings(
     projectToolsFileTree: normalizeProjectToolsFileTreeSettings({}),
     projectToolsGitReview: normalizeProjectToolsGitReviewSettings({}),
     projectToolsTunnel: normalizeProjectToolsTunnelSettings({}),
+    projectToolsSshTunnel: normalizeProjectToolsSshTunnelSettings({}),
   };
 }
 
@@ -114,6 +116,7 @@ function readLocalUiSettings(): {
       projectToolsFileTree: normalizeProjectToolsFileTreeSettings({}),
       projectToolsGitReview: normalizeProjectToolsGitReviewSettings({}),
       projectToolsTunnel: normalizeProjectToolsTunnelSettings({}),
+      projectToolsSshTunnel: normalizeProjectToolsSshTunnelSettings({}),
     });
   }
 
diff --git a/crates/agent-gateway/web/src/lib/settings/sync.ts b/crates/agent-gateway/web/src/lib/settings/sync.ts
index d64d018fc..677fa9e52 100644
--- a/crates/agent-gateway/web/src/lib/settings/sync.ts
+++ b/crates/agent-gateway/web/src/lib/settings/sync.ts
@@ -2,6 +2,7 @@ import {
   normalizeChatRuntimeControls,
   normalizeProjectToolsFileTreeSettings,
   normalizeProjectToolsGitReviewSettings,
+  normalizeProjectToolsSshTunnelSettings,
   normalizeProjectToolsTunnelSettings,
   normalizeSettings,
   workspaceProjectPathKey,
@@ -87,6 +88,7 @@ export function redactSettingsForWebStorage(settings: AppSettings): AppSettings
 
 function redactSshSettingsForWebStorage(ssh: AppSettings["ssh"]): AppSettings["ssh"] {
   return {
+    projectHostAssociations: ssh.projectHostAssociations,
     hosts: ssh.hosts.map((host) => ({
       ...host,
       password: "",
@@ -357,11 +359,24 @@ function mergeSyncedSshSettings(
   incoming: unknown,
   secretUpdates: GatewaySshSecretUpdates,
 ): AppSettings["ssh"] {
+  const source = asObject(incoming);
   const normalized = normalizeSettings({
     ssh: incoming as AppSettings["ssh"],
   }).ssh;
   const currentById = new Map(current.hosts.map((host) => [host.id, host]));
+  const projectHostAssociations = Object.prototype.hasOwnProperty.call(
+    source,
+    "projectHostAssociations",
+  )
+    ? normalized.projectHostAssociations
+    : normalizeSettings({
+        ssh: {
+          hosts: normalized.hosts,
+          projectHostAssociations: current.projectHostAssociations,
+        },
+      }).ssh.projectHostAssociations;
   return {
+    projectHostAssociations,
     hosts: normalized.hosts.map((host) => {
       const currentHost = currentById.get(host.id);
       const update = secretUpdates[host.id];
@@ -468,6 +483,21 @@ function mergeSyncedProjectToolsTunnelSettings(
   };
 }
 
+function mergeSyncedProjectToolsSshTunnelSettings(
+  current: AppSettings["customSettings"]["projectToolsSshTunnel"],
+  incoming: unknown,
+): AppSettings["customSettings"]["projectToolsSshTunnel"] {
+  const currentState = normalizeProjectToolsSshTunnelSettings(current);
+  const incomingState = normalizeProjectToolsSshTunnelSettings(incoming);
+  const openFromIncoming = incomingState.openVersion >= currentState.openVersion;
+  return {
+    openProjectPathKeys: openFromIncoming
+      ? incomingState.openProjectPathKeys
+      : currentState.openProjectPathKeys,
+    openVersion: Math.max(currentState.openVersion, incomingState.openVersion),
+  };
+}
+
 export function buildGatewaySettingsSyncPayload(
   settings: AppSettings,
   options: { includeProviderApiKeyUpdates?: boolean } = {},
@@ -575,6 +605,15 @@ export function applyGatewaySettingsSyncPayload(
             incomingCustomSettings.projectToolsTunnel,
           )
         : current.customSettings.projectToolsTunnel,
+      projectToolsSshTunnel: Object.prototype.hasOwnProperty.call(
+        incomingCustomSettings,
+        "projectToolsSshTunnel",
+      )
+        ? mergeSyncedProjectToolsSshTunnelSettings(
+            current.customSettings.projectToolsSshTunnel,
+            incomingCustomSettings.projectToolsSshTunnel,
+          )
+        : current.customSettings.projectToolsSshTunnel,
       chatSidebar: current.customSettings.chatSidebar,
       projectToolsPanel: current.customSettings.projectToolsPanel,
     },
diff --git a/crates/agent-gateway/web/src/lib/webSettings.ts b/crates/agent-gateway/web/src/lib/webSettings.ts
index 57b829f17..cf101df08 100644
--- a/crates/agent-gateway/web/src/lib/webSettings.ts
+++ b/crates/agent-gateway/web/src/lib/webSettings.ts
@@ -2,6 +2,7 @@ import {
   getDefaultSettings,
   normalizeProjectToolsFileTreeSettings,
   normalizeProjectToolsGitReviewSettings,
+  normalizeProjectToolsSshTunnelSettings,
   normalizeProjectToolsTunnelSettings,
   normalizeSettings,
   type AppSettings,
@@ -42,6 +43,7 @@ function stripSessionOnlyProjectToolsState(settings: AppSettings): AppSettings {
       projectToolsFileTree: normalizeProjectToolsFileTreeSettings({}),
       projectToolsGitReview: normalizeProjectToolsGitReviewSettings({}),
       projectToolsTunnel: normalizeProjectToolsTunnelSettings({}),
+      projectToolsSshTunnel: normalizeProjectToolsSshTunnelSettings({}),
     },
   };
 }
diff --git a/crates/agent-gateway/web/src/pages/settings/SshSection.tsx b/crates/agent-gateway/web/src/pages/settings/SshSection.tsx
index 2d1d61663..f699f18e8 100644
--- a/crates/agent-gateway/web/src/pages/settings/SshSection.tsx
+++ b/crates/agent-gateway/web/src/pages/settings/SshSection.tsx
@@ -25,6 +25,7 @@ import {
   type SshAuthType,
   type SshHostConfig,
   type SshProxyType,
+  removeSshHostFromProjectAssociations,
   updateSsh,
 } from "../../lib/settings";
 import { useModalMotion } from "../../lib/shared/modalMotion";
@@ -895,9 +896,12 @@ export function SshSection(props: SettingsSectionProps) {
 
   function handleDelete(id: string) {
     setSettings((prev) =>
-      updateSsh(prev, {
-        hosts: prev.ssh.hosts.filter((host) => host.id !== id),
-      }),
+      removeSshHostFromProjectAssociations(
+        updateSsh(prev, {
+          hosts: prev.ssh.hosts.filter((host) => host.id !== id),
+        }),
+        id,
+      ),
     );
   }
 
diff --git a/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx b/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
index 0e9b8a05e..94cbc47d2 100644
--- a/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
@@ -18,6 +18,7 @@ import type {
   ProjectToolsFileTreeProjectState,
   ProjectToolsFileTreeStatePatch,
   ProjectToolsPanelTab,
+  SshHostConfig,
 } from "../../lib/settings";
 import type { GitClient } from "../../lib/git/types";
 import { cn } from "../../lib/shared/utils";
@@ -35,6 +36,7 @@ import {
   GitBranch,
   Globe,
   GripVertical,
+  Key,
   Plus,
   Terminal,
   X,
@@ -56,6 +58,7 @@ import {
 } from "./GitReviewPanel";
 import { LocalTunnelPanel, type LocalTunnelClient } from "./LocalTunnelPanel";
 import { ProjectFileTreePanel } from "./ProjectFileTreePanel";
+import { SshTunnelPanel } from "./SshTunnelPanel";
 
 const MIN_PANEL_WIDTH = 320;
 const DEFAULT_MAX_PANEL_WIDTH = 720;
@@ -66,6 +69,7 @@ const DEFAULT_TERMINAL_ROWS = 24;
 const FILE_TREE_TAB_ID = "__file_tree__";
 const GIT_REVIEW_TAB_ID = "__git_review__";
 const TUNNEL_TAB_ID = "__tunnel__";
+const SSH_TUNNEL_TAB_ID = "__ssh_tunnel__";
 const PROJECT_TOOLS_RESIZE_END_EVENT = "liveagent:project-tools-resize-end";
 
 type ProjectToolsPanelProps = {
@@ -84,6 +88,9 @@ type ProjectToolsPanelProps = {
   fileTreeState: ProjectToolsFileTreeProjectState;
   gitReviewOpen: boolean;
   tunnelOpen?: boolean;
+  sshTunnelOpen?: boolean;
+  sshHosts?: SshHostConfig[];
+  associatedSshHostIds?: string[];
   client: TerminalClient;
   gitClient?: GitClient | null;
   gitWriteEnabled?: boolean;
@@ -99,6 +106,8 @@ type ProjectToolsPanelProps = {
   onFileTreeStateChange: (patch: ProjectToolsFileTreeStatePatch) => void;
   onGitReviewOpenChange: (open: boolean) => void;
   onTunnelOpenChange?: (open: boolean) => void;
+  onSshTunnelOpenChange?: (open: boolean) => void;
+  onSshProjectHostIdsChange?: (hostIds: string[]) => void;
   onSessionsChange?: (sessions: TerminalSession[]) => void;
   onInsertFileMention?: (path: string, kind: "file" | "dir") => void;
   onOpenFile?: (path: string) => void;
@@ -212,6 +221,10 @@ type ProjectToolsTab =
   | {
       id: typeof TUNNEL_TAB_ID;
       kind: "tunnel";
+    }
+  | {
+      id: typeof SSH_TUNNEL_TAB_ID;
+      kind: "sshTunnel";
     };
 
 type TabDragState = {
@@ -662,6 +675,9 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     fileTreeState,
     gitReviewOpen,
     tunnelOpen = false,
+    sshTunnelOpen = false,
+    sshHosts = [],
+    associatedSshHostIds = [],
     client,
     gitClient,
     gitWriteEnabled = true,
@@ -677,6 +693,8 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     onFileTreeStateChange,
     onGitReviewOpenChange,
     onTunnelOpenChange,
+    onSshTunnelOpenChange,
+    onSshProjectHostIdsChange,
     onSessionsChange,
     onInsertFileMention,
     onOpenFile,
@@ -723,12 +741,16 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
   const fileTreeInitialized = Boolean(projectPathKey && fileTreeOpen);
   const gitReviewInitialized = Boolean(projectPathKey && gitReviewOpen);
   const tunnelInitialized = Boolean(tunnelOpen && tunnelClient);
+  const sshTunnelInitialized = Boolean(projectPathKey && sshTunnelOpen);
   const tunnelAvailable = Boolean(tunnelClient);
   const previousFileTreeInitializedRef = useRef(fileTreeInitialized);
   const previousGitReviewInitializedRef = useRef(gitReviewInitialized);
   const previousTunnelInitializedRef = useRef(tunnelInitialized);
+  const previousSshTunnelInitializedRef = useRef(sshTunnelInitialized);
   const currentActiveTab: ProjectToolsPanelTab =
-    activeTab === "tunnel" && tunnelInitialized
+    activeTab === "sshTunnel" && sshTunnelInitialized
+      ? "sshTunnel"
+      : activeTab === "tunnel" && tunnelInitialized
       ? "tunnel"
       : activeTab === "gitReview" && gitReviewInitialized
         ? "gitReview"
@@ -762,8 +784,11 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     if (tunnelInitialized) {
       nextTabs.push({ id: TUNNEL_TAB_ID, kind: "tunnel" });
     }
+    if (sshTunnelInitialized) {
+      nextTabs.push({ id: SSH_TUNNEL_TAB_ID, kind: "sshTunnel" });
+    }
     return nextTabs;
-  }, [fileTreeInitialized, gitReviewInitialized, sessions, tunnelInitialized]);
+  }, [fileTreeInitialized, gitReviewInitialized, sessions, sshTunnelInitialized, tunnelInitialized]);
   const effectiveTabOrder = draftTabOrder ?? tabOrder;
   const orderedProjectTabs = useMemo(
     () => orderProjectToolsTabs(visibleTabs, effectiveTabOrder),
@@ -811,6 +836,18 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     }
   }, [activeTab, onActiveTabChange, tunnelInitialized]);
 
+  useEffect(() => {
+    const previousSshTunnelInitialized = previousSshTunnelInitializedRef.current;
+    previousSshTunnelInitializedRef.current = sshTunnelInitialized;
+    if (sshTunnelInitialized && !previousSshTunnelInitialized) {
+      onActiveTabChange("sshTunnel");
+      return;
+    }
+    if (!sshTunnelInitialized && previousSshTunnelInitialized && activeTab === "sshTunnel") {
+      onActiveTabChange("terminal");
+    }
+  }, [activeTab, onActiveTabChange, sshTunnelInitialized]);
+
   const publishSessions = useCallback(
     (nextSessions: TerminalSession[], options?: { notifyParent?: boolean }) => {
       const sorted = sortSessions(nextSessions);
@@ -1283,7 +1320,9 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     [clampedWidth, onWidthChange, panelWidth],
   );
 
-  const showDisabledMessage = Boolean(disabledMessage && !tunnelAvailable && !tunnelInitialized);
+  const showDisabledMessage = Boolean(
+    disabledMessage && !tunnelAvailable && !tunnelInitialized && !sshTunnelInitialized,
+  );
   const showProjectToolsChooser =
     !showDisabledMessage &&
     (projectReady || tunnelAvailable) &&
@@ -1358,6 +1397,19 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     }
   }, [activeTab, onActiveTabChange, onTunnelOpenChange]);
 
+  const startSshTunnel = useCallback(() => {
+    if (!projectReady) return;
+    onSshTunnelOpenChange?.(true);
+    onActiveTabChange("sshTunnel");
+  }, [onActiveTabChange, onSshTunnelOpenChange, projectReady]);
+
+  const closeSshTunnelTab = useCallback(() => {
+    onSshTunnelOpenChange?.(false);
+    if (activeTab === "sshTunnel") {
+      onActiveTabChange("terminal");
+    }
+  }, [activeTab, onActiveTabChange, onSshTunnelOpenChange]);
+
   const renderCreateTerminalMenuItem = () => {
     if (shellOptions.length > 1) {
       return (
@@ -1618,6 +1670,63 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                     );
                   }
 
+                  if (tab.kind === "sshTunnel") {
+                    return (
+                      <div
+                        key={tab.id}
+                        data-project-tools-tab-id={tab.id}
+                        className={cn(
+                          "group relative flex h-8 max-w-[12rem] shrink-0 select-none items-center gap-1 rounded-md border border-transparent px-1.5 text-xs text-muted-foreground transition-[background-color,border-color,color,opacity,transform,box-shadow] hover:bg-muted/80 hover:text-foreground",
+                          currentActiveTab === "sshTunnel" &&
+                            "border-border bg-muted text-foreground shadow-sm",
+                          draggingTabId === tab.id &&
+                            "z-10 scale-[0.98] opacity-80 shadow-md ring-1 ring-ring",
+                        )}
+                        title={t("projectTools.sshTunnelTitle")}
+                      >
+                        <button
+                          type="button"
+                          aria-label={t("projectTools.sshTunnelTitle")}
+                          className="absolute inset-0 z-0 rounded-md bg-transparent p-0 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                          onClick={() => {
+                            if (consumeSuppressedTabClick(tab.id)) return;
+                            onActiveTabChange("sshTunnel");
+                          }}
+                        />
+                        {renderTabDragHandle(tab.id, t("projectTools.sshTunnelTitle"))}
+                        <div
+                          aria-hidden="true"
+                          className="pointer-events-none relative z-10 flex h-full min-w-0 flex-1 items-center gap-1.5 text-left text-inherit"
+                        >
+                          <Key className="h-3.5 w-3.5 shrink-0" />
+                          <span className="min-w-0 truncate">
+                            {t("projectTools.sshTunnelTitle")}
+                          </span>
+                        </div>
+                        <button
+                          type="button"
+                          data-project-tools-tab-action="close"
+                          aria-label={t("projectTools.closeSshTunnelTab")}
+                          title={t("projectTools.closeSshTunnelTab")}
+                          className="relative z-10 ml-0.5 flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground/70 transition-colors hover:bg-background hover:text-foreground focus-visible:bg-background focus-visible:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring md:opacity-0 md:group-hover:opacity-100 md:focus-visible:opacity-100"
+                          onPointerDown={(event) => {
+                            event.stopPropagation();
+                          }}
+                          onMouseDown={(event) => {
+                            event.stopPropagation();
+                          }}
+                          onClick={(event) => {
+                            event.stopPropagation();
+                            consumeSuppressedTabClick(tab.id);
+                            closeSshTunnelTab();
+                          }}
+                        >
+                          <X className="h-3 w-3" />
+                        </button>
+                      </div>
+                    );
+                  }
+
                   const session = tab.session;
                   const isPendingClose = pendingCloseSessionId === session.id;
                   const isClosing = closingSessionId === session.id;
@@ -1738,6 +1847,14 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                     <Globe className="h-3.5 w-3.5" />
                     {t("projectTools.newTunnel")}
                   </DropdownMenuItem>
+                  <DropdownMenuItem
+                    onSelect={startSshTunnel}
+                    disabled={!projectReady}
+                    className="gap-2 text-xs"
+                  >
+                    <Key className="h-3.5 w-3.5" />
+                    {t("projectTools.newSshTunnel")}
+                  </DropdownMenuItem>
                 </DropdownMenuContent>
               </DropdownMenu>
               {onClose ? (
@@ -1874,6 +1991,25 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                       </div>
                     </div>
                   </button>
+                  <button
+                    type="button"
+                    onClick={startSshTunnel}
+                    disabled={!projectReady}
+                    title={disabledMessage}
+                    className="group flex items-center gap-3 rounded-lg border border-border/60 bg-background px-3.5 py-3 text-left text-sm text-foreground transition-all hover:border-border hover:bg-muted/60 hover:shadow-sm disabled:pointer-events-none disabled:opacity-50"
+                  >
+                    <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-muted/80 text-muted-foreground transition-colors group-hover:bg-muted group-hover:text-foreground">
+                      <Key className="h-4.5 w-4.5" />
+                    </div>
+                    <div className="min-w-0 flex-1">
+                      <div className="font-medium leading-tight">
+                        {t("projectTools.newSshTunnel")}
+                      </div>
+                      <div className="mt-0.5 text-xs leading-tight text-muted-foreground">
+                        {t("projectTools.sshTunnelDescription")}
+                      </div>
+                    </div>
+                  </button>
                 </div>
                 {loading ? (
                   <div className="text-center text-xs text-muted-foreground">
@@ -1939,6 +2075,23 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                     />
                   </div>
                 ) : null}
+                {sshTunnelInitialized ? (
+                  <div
+                    className={cn(
+                      "min-h-0 flex-1",
+                      currentActiveTab === "sshTunnel" ? "flex flex-col" : "hidden",
+                    )}
+                  >
+                    <SshTunnelPanel
+                      projectPathKey={projectPathKey}
+                      hosts={sshHosts}
+                      associatedHostIds={associatedSshHostIds}
+                      onAssociatedHostIdsChange={(hostIds) => {
+                        onSshProjectHostIdsChange?.(hostIds);
+                      }}
+                    />
+                  </div>
+                ) : null}
                 {sessions.length > 0 ? (
                   <div
                     className={cn(
diff --git a/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
new file mode 100644
index 000000000..6bdf13bdb
--- /dev/null
+++ b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
@@ -0,0 +1,302 @@
+import { useMemo, useState } from "react";
+import { useLocale } from "../../i18n";
+import type { SshHostConfig } from "../../lib/settings";
+import { cn } from "../../lib/shared/utils";
+import { ArrowLeft, Check, Globe, Key, Server, Settings } from "../icons";
+import { Button } from "../ui/button";
+
+type SshTunnelScope = "project" | "all";
+type SshTunnelView = "list" | "settings";
+
+type SshTunnelPanelProps = {
+  projectPathKey: string;
+  hosts: SshHostConfig[];
+  associatedHostIds: string[];
+  onAssociatedHostIdsChange: (hostIds: string[]) => void;
+};
+
+function endpointLabel(host: SshHostConfig) {
+  const userPrefix = host.username.trim() ? `${host.username.trim()}@` : "";
+  return `${userPrefix}${host.host}:${host.port}`;
+}
+
+function authLabel(host: Pick<SshHostConfig, "authType">, t: (key: string) => string) {
+  return host.authType === "privateKey"
+    ? t("settings.sshAuthPrivateKey")
+    : t("settings.sshAuthPassword");
+}
+
+function hostHasMeta(host: SshHostConfig) {
+  return (
+    (host.authType === "privateKey" &&
+      (host.privateKeyPath.trim().length > 0 || host.privateKeyConfigured === true)) ||
+    host.proxy.url.trim().length > 0 ||
+    host.proxy.port > 0 ||
+    host.proxy.passwordConfigured === true
+  );
+}
+
+function HostMetaTags(props: { host: SshHostConfig }) {
+  const { host } = props;
+  const { t } = useLocale();
+  const tags: string[] = [];
+  if (host.authType === "privateKey" && host.privateKeyPath.trim()) {
+    tags.push(host.privateKeyPath.trim());
+  } else if (host.authType === "privateKey" && host.privateKeyConfigured) {
+    tags.push(t("settings.sshPrivateKeyConfigured"));
+  }
+  if (host.proxy.url.trim().length > 0 || host.proxy.port > 0 || host.proxy.passwordConfigured) {
+    tags.push(t("settings.sshAdvancedProxy"));
+  }
+  if (tags.length === 0) return null;
+  return (
+    <div className="mt-2 flex flex-wrap items-center gap-1.5">
+      {tags.map((tag) => (
+        <span
+          key={tag}
+          className="max-w-full truncate rounded-md bg-muted/70 px-1.5 py-0.5 text-[10.5px] font-medium text-muted-foreground"
+          title={tag}
+        >
+          {tag}
+        </span>
+      ))}
+    </div>
+  );
+}
+
+export function SshTunnelPanel(props: SshTunnelPanelProps) {
+  const { projectPathKey, hosts, associatedHostIds, onAssociatedHostIdsChange } = props;
+  const { t } = useLocale();
+  const [scope, setScope] = useState<SshTunnelScope>("project");
+  const [view, setView] = useState<SshTunnelView>("list");
+  const associatedSet = useMemo(() => new Set(associatedHostIds), [associatedHostIds]);
+  const associatedHosts = useMemo(
+    () => hosts.filter((host) => associatedSet.has(host.id)),
+    [associatedSet, hosts],
+  );
+
+  const toggleHost = (hostId: string) => {
+    const current = associatedHostIds.filter((id) => hosts.some((host) => host.id === id));
+    const next = associatedSet.has(hostId)
+      ? current.filter((id) => id !== hostId)
+      : [...current, hostId];
+    onAssociatedHostIdsChange(next);
+  };
+
+  const settingsActive = view === "settings";
+  const listPageClassName = cn(
+    "absolute inset-0 flex min-h-0 flex-col bg-gradient-to-b from-muted/40 via-muted/15 to-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
+    settingsActive
+      ? "pointer-events-none z-0 -translate-x-4 opacity-0"
+      : "z-10 translate-x-0 opacity-100",
+  );
+  const settingsPageClassName = cn(
+    "absolute inset-0 flex min-h-0 flex-col bg-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
+    settingsActive
+      ? "z-10 translate-x-0 opacity-100"
+      : "pointer-events-none z-0 translate-x-4 opacity-0",
+  );
+
+  const emptyTitle =
+    scope === "project"
+      ? t("projectTools.sshTunnelProjectEmpty")
+      : t("projectTools.sshTunnelAllEmpty");
+  const emptyHint =
+    scope === "project"
+      ? associatedHosts.length > 0
+        ? t("projectTools.sshTunnelProjectEmptyWithHosts")
+        : t("projectTools.sshTunnelProjectEmptyHint")
+      : t("projectTools.sshTunnelAllEmptyHint");
+
+  return (
+    <div className="relative flex min-h-0 flex-1 overflow-hidden bg-background">
+      <div className={settingsPageClassName} aria-hidden={!settingsActive} inert={!settingsActive}>
+        <div className="flex h-12 shrink-0 items-center gap-2 border-b border-border px-3">
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            className="h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground"
+            title={t("projectTools.sshTunnelBack")}
+            onClick={() => setView("list")}
+          >
+            <ArrowLeft className="h-4 w-4" />
+          </Button>
+          <div className="min-w-0 flex-1">
+            <div className="truncate text-sm font-semibold text-foreground">
+              {t("projectTools.sshTunnelAssociateHosts")}
+            </div>
+            <div className="truncate text-xs text-muted-foreground">
+              {t("projectTools.sshTunnelAssociateHostsHint")}
+            </div>
+          </div>
+          <div className="rounded-md bg-muted/60 px-2 py-1 text-xs text-muted-foreground">
+            <span className="tabular-nums text-foreground">{associatedHosts.length}</span>{" "}
+            {t("projectTools.sshTunnelAssociatedCount")}
+          </div>
+        </div>
+
+        {hosts.length === 0 ? (
+          <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
+            <div className="flex h-12 w-12 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
+              <Key className="h-6 w-6" />
+            </div>
+            <div className="max-w-xs space-y-1">
+              <div className="text-sm font-medium text-foreground">
+                {t("projectTools.sshTunnelNoConfiguredHosts")}
+              </div>
+              <div className="text-xs leading-relaxed text-muted-foreground">
+                {t("projectTools.sshTunnelNoConfiguredHostsHint")}
+              </div>
+            </div>
+          </div>
+        ) : (
+          <div className="min-h-0 flex-1 overflow-y-auto px-3 py-3">
+            <div className="space-y-2">
+              {hosts.map((host) => {
+                const selected = associatedSet.has(host.id);
+                return (
+                  <button
+                    key={host.id}
+                    type="button"
+                    className={cn(
+                      "group flex w-full items-start gap-3 rounded-xl border border-border/60 bg-card px-3 py-3 text-left transition-all hover:border-emerald-500/40 hover:bg-muted/40",
+                      selected && "border-emerald-500/50 bg-emerald-500/5",
+                    )}
+                    aria-pressed={selected}
+                    onClick={() => toggleHost(host.id)}
+                  >
+                    <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-emerald-500/10 text-emerald-500">
+                      <Server className="h-4 w-4" />
+                    </div>
+                    <div className="min-w-0 flex-1">
+                      <div className="flex min-w-0 items-center gap-2">
+                        <span className="truncate text-sm font-medium text-foreground">
+                          {host.name}
+                        </span>
+                        <span className="shrink-0 rounded-md bg-muted/70 px-1.5 py-0.5 text-[10.5px] font-medium text-muted-foreground">
+                          {authLabel(host, t)}
+                        </span>
+                      </div>
+                      <div className="mt-1 truncate font-mono text-xs text-muted-foreground">
+                        {endpointLabel(host)}
+                      </div>
+                      {hostHasMeta(host) ? <HostMetaTags host={host} /> : null}
+                    </div>
+                    <span
+                      className={cn(
+                        "mt-1 flex h-5 w-5 shrink-0 items-center justify-center rounded-full border transition-colors",
+                        selected
+                          ? "border-emerald-500 bg-emerald-500 text-white"
+                          : "border-border bg-background text-transparent",
+                      )}
+                      aria-hidden="true"
+                    >
+                      <Check className="h-3 w-3" />
+                    </span>
+                  </button>
+                );
+              })}
+            </div>
+          </div>
+        )}
+      </div>
+
+      <div className={listPageClassName} aria-hidden={settingsActive} inert={settingsActive}>
+        <div className="shrink-0 border-b border-border/60 bg-background/70 px-4 pb-3 pt-3.5 backdrop-blur-xl">
+          <div className="flex items-center gap-2.5">
+            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl border border-border/60 bg-background/80 text-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_2px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
+              <Key className="h-4 w-4" />
+            </div>
+            <div className="min-w-0 flex-1">
+              <div className="truncate text-sm font-semibold tracking-tight text-foreground">
+                {t("projectTools.sshTunnelTitle")}
+              </div>
+              <div className="truncate text-xs text-muted-foreground">
+                {projectPathKey
+                  ? t("projectTools.sshTunnelConfiguredHosts").replace(
+                      "{count}",
+                      String(associatedHosts.length),
+                    )
+                  : t("projectTools.sshTunnelNoProject")}
+              </div>
+            </div>
+            {scope === "project" ? (
+              <button
+                type="button"
+                className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border/60 hover:bg-muted/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                title={t("projectTools.sshTunnelSettings")}
+                aria-label={t("projectTools.sshTunnelSettings")}
+                onClick={() => setView("settings")}
+              >
+                <Settings className="h-4 w-4" />
+              </button>
+            ) : null}
+          </div>
+
+          <div
+            role="group"
+            aria-label={t("projectTools.sshTunnelScopeGroup")}
+            className="relative mt-3 grid grid-cols-2 gap-0.5 rounded-lg bg-muted/70 p-0.5"
+          >
+            <div
+              aria-hidden="true"
+              className={cn(
+                "pointer-events-none absolute inset-y-0 left-0 z-0 w-1/2 transform-gpu rounded-[7px] bg-background shadow-sm transition-transform duration-200 ease-out motion-reduce:transition-none",
+                scope === "all" ? "translate-x-full" : "translate-x-0",
+              )}
+            />
+            {(["project", "all"] as const).map((option) => {
+              const selected = scope === option;
+              const Icon = option === "project" ? Server : Globe;
+              const label =
+                option === "project"
+                  ? t("projectTools.sshTunnelScopeProject")
+                  : t("projectTools.sshTunnelScopeAll");
+              return (
+                <button
+                  key={option}
+                  type="button"
+                  className={cn(
+                    "relative z-10 flex h-7 min-w-0 transform-gpu items-center justify-center gap-1.5 rounded-[7px] px-2 text-xs text-muted-foreground transition-[color,transform] duration-200 ease-out hover:text-foreground active:scale-[0.98] focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring motion-reduce:transition-none motion-reduce:active:scale-100",
+                    selected && "font-medium text-foreground",
+                  )}
+                  title={label}
+                  aria-label={label}
+                  aria-pressed={selected}
+                  onClick={() => setScope(option)}
+                >
+                  <Icon className="h-3.5 w-3.5 shrink-0" />
+                  <span className="truncate">{label}</span>
+                </button>
+              );
+            })}
+          </div>
+        </div>
+
+        <div className="min-h-0 flex-1 overflow-y-auto px-3 py-3">
+          <div className="flex flex-col items-center justify-center gap-1.5 rounded-xl border border-dashed border-border/70 bg-background/40 px-4 py-10 text-center">
+            <div className="mb-1.5 flex h-12 w-12 items-center justify-center rounded-2xl border border-border/50 bg-background/80 text-muted-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_3px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
+              <Key className="h-5 w-5" />
+            </div>
+            <div className="text-xs font-medium text-foreground/80">{emptyTitle}</div>
+            <div className="max-w-[16rem] text-[11px] leading-relaxed text-muted-foreground">
+              {emptyHint}
+            </div>
+            {scope === "project" && associatedHosts.length === 0 ? (
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                className="mt-2 h-7 rounded-lg bg-background/70 px-2.5 text-xs"
+                onClick={() => setView("settings")}
+              >
+                {t("projectTools.sshTunnelAssociateHosts")}
+              </Button>
+            ) : null}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index e9b568f06..98cc60cb9 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -250,6 +250,26 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.gitReviewDescription": "查看代码变更和提交历史",
     "projectTools.newTunnel": "新建内网穿透",
     "projectTools.tunnelDescription": "通过 Gateway 暴露本机 HTTP 服务",
+    "projectTools.sshTunnelTitle": "SSH 隧道",
+    "projectTools.newSshTunnel": "新建 SSH 隧道",
+    "projectTools.sshTunnelDescription": "查看 SSH 隧道并关联项目主机",
+    "projectTools.sshTunnelSettings": "设置 SSH 隧道",
+    "projectTools.sshTunnelBack": "返回 SSH 隧道",
+    "projectTools.sshTunnelScopeGroup": "切换 SSH 隧道视角",
+    "projectTools.sshTunnelScopeProject": "项目SSH",
+    "projectTools.sshTunnelScopeAll": "全局SSH",
+    "projectTools.sshTunnelConfiguredHosts": "已关联 {count} 台 SSH 主机",
+    "projectTools.sshTunnelNoProject": "选择项目后可关联 SSH 主机",
+    "projectTools.sshTunnelProjectEmpty": "当前项目暂无启动的 SSH 隧道",
+    "projectTools.sshTunnelProjectEmptyHint": "先关联设置中已配置的 SSH 主机，后续即可从这里启动项目隧道。",
+    "projectTools.sshTunnelProjectEmptyWithHosts": "已关联的主机会保留在此项目中，启动功能将在后续接入。",
+    "projectTools.sshTunnelAllEmpty": "暂无启动的 SSH 隧道",
+    "projectTools.sshTunnelAllEmptyHint": "所有项目和全局范围内当前都没有运行中的 SSH 隧道。",
+    "projectTools.sshTunnelAssociateHosts": "关联 SSH 主机",
+    "projectTools.sshTunnelAssociateHostsHint": "从 Settings > SSH 已配置主机中选择当前项目可用的主机",
+    "projectTools.sshTunnelAssociatedCount": "已关联",
+    "projectTools.sshTunnelNoConfiguredHosts": "还没有配置 SSH 主机",
+    "projectTools.sshTunnelNoConfiguredHostsHint": "请先到 Settings > SSH 添加或导入主机，再回到这里关联当前项目。",
     "projectTools.tunnelScopeGroup": "切换内网穿透视角",
     "projectTools.tunnelScopeProject": "当前项目",
     "projectTools.tunnelScopeGlobal": "全局",
@@ -265,6 +285,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.closeFileTree": "关闭文件树",
     "projectTools.closeGitReview": "关闭 Git 审查",
     "projectTools.closeTunnelTab": "关闭内网穿透",
+    "projectTools.closeSshTunnelTab": "关闭 SSH 隧道",
     "projectTools.tunnelTargetUrl": "本地服务地址",
     "projectTools.tunnelTargetPlaceholder": "http://localhost:3000",
     "projectTools.tunnelName": "名称",
@@ -1577,6 +1598,31 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.gitReviewDescription": "Review code changes and commit history",
     "projectTools.newTunnel": "New Tunnel",
     "projectTools.tunnelDescription": "Expose local HTTP services through Gateway",
+    "projectTools.sshTunnelTitle": "SSH Tunnel",
+    "projectTools.newSshTunnel": "New SSH Tunnel",
+    "projectTools.sshTunnelDescription": "Review SSH tunnels and associate project hosts",
+    "projectTools.sshTunnelSettings": "SSH tunnel settings",
+    "projectTools.sshTunnelBack": "Back to SSH tunnel",
+    "projectTools.sshTunnelScopeGroup": "Switch SSH tunnel scope",
+    "projectTools.sshTunnelScopeProject": "Project SSH",
+    "projectTools.sshTunnelScopeAll": "Global SSH",
+    "projectTools.sshTunnelConfiguredHosts": "{count} SSH hosts associated",
+    "projectTools.sshTunnelNoProject": "Select a project to associate SSH hosts",
+    "projectTools.sshTunnelProjectEmpty": "No SSH tunnels running for this project",
+    "projectTools.sshTunnelProjectEmptyHint":
+      "Associate SSH hosts from settings first. Project tunnel startup can be wired in later.",
+    "projectTools.sshTunnelProjectEmptyWithHosts":
+      "Associated hosts are saved for this project. Startup will be wired in later.",
+    "projectTools.sshTunnelAllEmpty": "No SSH tunnels running",
+    "projectTools.sshTunnelAllEmptyHint":
+      "There are no running SSH tunnels across projects or the global scope.",
+    "projectTools.sshTunnelAssociateHosts": "Associate SSH Hosts",
+    "projectTools.sshTunnelAssociateHostsHint":
+      "Choose hosts configured in Settings > SSH for the current project",
+    "projectTools.sshTunnelAssociatedCount": "associated",
+    "projectTools.sshTunnelNoConfiguredHosts": "No SSH hosts configured yet",
+    "projectTools.sshTunnelNoConfiguredHostsHint":
+      "Add or import hosts in Settings > SSH first, then associate them here.",
     "projectTools.tunnelScopeGroup": "Switch tunnel scope",
     "projectTools.tunnelScopeProject": "Current Project",
     "projectTools.tunnelScopeGlobal": "Global",
@@ -1592,6 +1638,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.closeFileTree": "Close File Tree",
     "projectTools.closeGitReview": "Close Git Review",
     "projectTools.closeTunnelTab": "Close Tunnel",
+    "projectTools.closeSshTunnelTab": "Close SSH Tunnel",
     "projectTools.tunnelTargetUrl": "Local service URL",
     "projectTools.tunnelTargetPlaceholder": "http://localhost:3000",
     "projectTools.tunnelName": "Name",
diff --git a/crates/agent-gui/src/lib/settings/index.ts b/crates/agent-gui/src/lib/settings/index.ts
index 3cba00aec..eb4e495ab 100644
--- a/crates/agent-gui/src/lib/settings/index.ts
+++ b/crates/agent-gui/src/lib/settings/index.ts
@@ -127,7 +127,12 @@ export type ChatSidebarSettings = {
   recentCollapsed: boolean;
 };
 
-export type ProjectToolsPanelTab = "terminal" | "fileTree" | "gitReview" | "tunnel";
+export type ProjectToolsPanelTab =
+  | "terminal"
+  | "fileTree"
+  | "gitReview"
+  | "tunnel"
+  | "sshTunnel";
 
 export type ProjectToolsPanelSettings = {
   width: number;
@@ -160,6 +165,11 @@ export type ProjectToolsTunnelSettings = {
   openVersion: number;
 };
 
+export type ProjectToolsSshTunnelSettings = {
+  openProjectPathKeys: string[];
+  openVersion: number;
+};
+
 export type ProjectToolsFileTreeStatePatch = Partial<ProjectToolsFileTreeProjectState> & {
   bumpRevision?: boolean;
   bumpStateVersion?: boolean;
@@ -172,6 +182,7 @@ export type CustomSettings = {
   projectToolsFileTree: ProjectToolsFileTreeSettings;
   projectToolsGitReview: ProjectToolsGitReviewSettings;
   projectToolsTunnel: ProjectToolsTunnelSettings;
+  projectToolsSshTunnel: ProjectToolsSshTunnelSettings;
 };
 
 export type UpdateSettings = {
@@ -265,6 +276,7 @@ export type SshHostConfig = {
 
 export type SshSettings = {
   hosts: SshHostConfig[];
+  projectHostAssociations: Record<string, string[]>;
 };
 
 export type CustomProvider = {
@@ -1321,8 +1333,43 @@ export function normalizeSshSettings(input: unknown): SshSettings {
     seenIds.add(id);
     return { ...normalized, id };
   });
+  const hostIds = new Set(hosts.map((host) => host.id));
 
-  return { hosts };
+  return {
+    hosts,
+    projectHostAssociations: normalizeSshProjectHostAssociations(
+      obj.projectHostAssociations,
+      hostIds,
+    ),
+  };
+}
+
+function normalizeSshProjectHostAssociations(
+  input: unknown,
+  hostIds: ReadonlySet<string>,
+): Record<string, string[]> {
+  const rawAssociations = (
+    input && typeof input === "object" && !Array.isArray(input) ? input : {}
+  ) as Record<string, unknown>;
+  const associations: Record<string, string[]> = {};
+  for (const [pathKey, rawHostIds] of Object.entries(rawAssociations)) {
+    const normalizedPathKey = workspaceProjectPathKey(pathKey);
+    if (!normalizedPathKey || !Array.isArray(rawHostIds)) continue;
+    const ids: string[] = [];
+    const seen = new Set<string>();
+    for (const rawHostId of rawHostIds) {
+      if (typeof rawHostId !== "string") continue;
+      const hostId = rawHostId.trim();
+      if (!hostId || !hostIds.has(hostId) || seen.has(hostId)) continue;
+      seen.add(hostId);
+      ids.push(hostId);
+      if (ids.length >= 64) break;
+    }
+    if (ids.length === 0) continue;
+    associations[normalizedPathKey] = ids;
+    if (Object.keys(associations).length >= 100) break;
+  }
+  return associations;
 }
 
 export function normalizeSystemSettings(input: unknown): SystemSettings {
@@ -1674,6 +1721,23 @@ export function normalizeProjectToolsTunnelSettings(input: unknown): ProjectTool
   };
 }
 
+export function normalizeProjectToolsSshTunnelSettings(
+  input: unknown,
+): ProjectToolsSshTunnelSettings {
+  const obj = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
+  const openProjectPathKeys = Array.from(
+    new Set(
+      (Array.isArray(obj.openProjectPathKeys) ? obj.openProjectPathKeys : [])
+        .map((pathKey) => workspaceProjectPathKey(pathKey))
+        .filter(Boolean),
+    ),
+  ).sort();
+  return {
+    openProjectPathKeys,
+    openVersion: normalizeIntegerInRange(obj.openVersion, 0, Number.MAX_SAFE_INTEGER, 0),
+  };
+}
+
 export function normalizeProjectToolsPanelTabOrder(input: unknown): string[] {
   if (!Array.isArray(input)) return [];
   const order: string[] = [];
@@ -1691,7 +1755,11 @@ export function normalizeProjectToolsPanelTabOrder(input: unknown): string[] {
 
 function isProjectToolsPanelTab(input: unknown): input is ProjectToolsPanelTab {
   return (
-    input === "terminal" || input === "fileTree" || input === "gitReview" || input === "tunnel"
+    input === "terminal" ||
+    input === "fileTree" ||
+    input === "gitReview" ||
+    input === "tunnel" ||
+    input === "sshTunnel"
   );
 }
 
@@ -1763,6 +1831,11 @@ export function normalizeCustomSettings(
       ? obj.projectToolsTunnel
       : {}
   ) as unknown;
+  const projectToolsSshTunnel = (
+    obj.projectToolsSshTunnel && typeof obj.projectToolsSshTunnel === "object"
+      ? obj.projectToolsSshTunnel
+      : {}
+  ) as unknown;
   return {
     conversationTitleModel: normalizeSelectedModelForProviders(
       normalizeSelectedModel(obj.conversationTitleModel),
@@ -1786,6 +1859,7 @@ export function normalizeCustomSettings(
     projectToolsFileTree: normalizeProjectToolsFileTreeSettings(projectToolsFileTree),
     projectToolsGitReview: normalizeProjectToolsGitReviewSettings(projectToolsGitReview),
     projectToolsTunnel: normalizeProjectToolsTunnelSettings(projectToolsTunnel),
+    projectToolsSshTunnel: normalizeProjectToolsSshTunnelSettings(projectToolsSshTunnel),
   };
 }
 
@@ -1816,6 +1890,7 @@ export function getDefaultSettings(): AppSettings {
     agents: [],
     ssh: {
       hosts: [],
+      projectHostAssociations: {},
     },
     hooks: [],
     cron: [],
@@ -1919,6 +1994,76 @@ export function updateSsh(prev: AppSettings, patch: Partial<SshSettings>): AppSe
   });
 }
 
+function normalizeSshProjectHostIdList(
+  ssh: SshSettings,
+  hostIds: readonly string[],
+): string[] {
+  const availableHostIds = new Set(ssh.hosts.map((host) => host.id));
+  const seen = new Set<string>();
+  const ids: string[] = [];
+  for (const rawHostId of hostIds) {
+    const hostId = rawHostId.trim();
+    if (!hostId || !availableHostIds.has(hostId) || seen.has(hostId)) continue;
+    seen.add(hostId);
+    ids.push(hostId);
+    if (ids.length >= 64) break;
+  }
+  return ids;
+}
+
+export function getSshProjectHostIds(ssh: SshSettings, projectPathKey: string): string[] {
+  const normalizedPathKey = workspaceProjectPathKey(projectPathKey);
+  if (!normalizedPathKey) return [];
+  return normalizeSshProjectHostIdList(
+    ssh,
+    ssh.projectHostAssociations[normalizedPathKey] ?? [],
+  );
+}
+
+export function updateSshProjectHostIds(
+  prev: AppSettings,
+  projectPathKey: string,
+  hostIds: readonly string[],
+): AppSettings {
+  const normalizedPathKey = workspaceProjectPathKey(projectPathKey);
+  if (!normalizedPathKey) return prev;
+  const nextHostIds = normalizeSshProjectHostIdList(prev.ssh, hostIds);
+  const currentHostIds = getSshProjectHostIds(prev.ssh, normalizedPathKey);
+  if (
+    currentHostIds.length === nextHostIds.length &&
+    currentHostIds.every((hostId, index) => hostId === nextHostIds[index])
+  ) {
+    return prev;
+  }
+  const projectHostAssociations = { ...prev.ssh.projectHostAssociations };
+  if (nextHostIds.length > 0) {
+    projectHostAssociations[normalizedPathKey] = nextHostIds;
+  } else {
+    delete projectHostAssociations[normalizedPathKey];
+  }
+  return updateSsh(prev, { projectHostAssociations });
+}
+
+export function removeSshHostFromProjectAssociations(
+  prev: AppSettings,
+  hostId: string,
+): AppSettings {
+  const normalizedHostId = hostId.trim();
+  if (!normalizedHostId) return prev;
+  let changed = false;
+  const projectHostAssociations: Record<string, string[]> = {};
+  for (const [pathKey, hostIds] of Object.entries(prev.ssh.projectHostAssociations)) {
+    const nextHostIds = hostIds.filter((item) => item !== normalizedHostId);
+    if (nextHostIds.length !== hostIds.length) {
+      changed = true;
+    }
+    if (nextHostIds.length > 0) {
+      projectHostAssociations[pathKey] = nextHostIds;
+    }
+  }
+  return changed ? updateSsh(prev, { projectHostAssociations }) : prev;
+}
+
 export function updateHooks(prev: AppSettings, hooks: ConversationHook[]): AppSettings {
   return normalizeSettings({
     ...prev,
@@ -1985,6 +2130,10 @@ function hasProjectToolsTunnelSessionState(state: ProjectToolsTunnelSettings): b
   return state.openVersion > 0 || state.openProjectPathKeys.length > 0;
 }
 
+function hasProjectToolsSshTunnelSessionState(state: ProjectToolsSshTunnelSettings): boolean {
+  return state.openVersion > 0 || state.openProjectPathKeys.length > 0;
+}
+
 export function preserveProjectToolsSessionState(
   next: AppSettings,
   current: AppSettings,
@@ -1998,6 +2147,9 @@ export function preserveProjectToolsSessionState(
   const currentTunnel = normalizeProjectToolsTunnelSettings(
     current.customSettings.projectToolsTunnel,
   );
+  const currentSshTunnel = normalizeProjectToolsSshTunnelSettings(
+    current.customSettings.projectToolsSshTunnel,
+  );
 
   return normalizeSettings({
     ...next,
@@ -2012,6 +2164,9 @@ export function preserveProjectToolsSessionState(
       projectToolsTunnel: hasProjectToolsTunnelSessionState(currentTunnel)
         ? currentTunnel
         : next.customSettings.projectToolsTunnel,
+      projectToolsSshTunnel: hasProjectToolsSshTunnelSessionState(currentSshTunnel)
+        ? currentSshTunnel
+        : next.customSettings.projectToolsSshTunnel,
     },
   });
 }
@@ -2143,6 +2298,19 @@ export function removeProjectToolsProjectState(
   );
   const removedTunnelOpenProjectPathKey =
     nextTunnelOpenProjectPathKeys.length !== tunnelOpenProjectPathKeys.length;
+  const sshTunnelOpenProjectPathKeys =
+    prev.customSettings.projectToolsSshTunnel.openProjectPathKeys
+      .map((pathKey) => workspaceProjectPathKey(pathKey))
+      .filter(Boolean);
+  const nextSshTunnelOpenProjectPathKeys = sshTunnelOpenProjectPathKeys.filter(
+    (pathKey) => pathKey !== normalizedPathKey,
+  );
+  const removedSshTunnelOpenProjectPathKey =
+    nextSshTunnelOpenProjectPathKeys.length !== sshTunnelOpenProjectPathKeys.length;
+  const hasSshProjectAssociation = Object.hasOwn(
+    prev.ssh.projectHostAssociations,
+    normalizedPathKey,
+  );
   const hasFileTreeProjectState = Object.hasOwn(
     prev.customSettings.projectToolsFileTree.projects,
     normalizedPathKey,
@@ -2155,7 +2323,9 @@ export function removeProjectToolsProjectState(
     !removedOpenProjectPathKey &&
     !removedGitReviewOpenProjectPathKey &&
     !removedTunnelOpenProjectPathKey &&
-    !hasFileTreeProjectState
+    !removedSshTunnelOpenProjectPathKey &&
+    !hasFileTreeProjectState &&
+    !hasSshProjectAssociation
   ) {
     return prev;
   }
@@ -2180,39 +2350,63 @@ export function removeProjectToolsProjectState(
     delete projects[normalizedPathKey];
   }
 
-  return updateCustomSettings(prev, {
-    projectToolsPanel: {
-      ...prev.customSettings.projectToolsPanel,
-      activeTabs,
-      tabOrders,
-    },
-    projectToolsFileTree: {
-      ...prev.customSettings.projectToolsFileTree,
-      openProjectPathKeys: removedOpenProjectPathKey
-        ? nextOpenProjectPathKeys.sort()
-        : prev.customSettings.projectToolsFileTree.openProjectPathKeys,
-      openVersion: removedFileTreeState
-        ? prev.customSettings.projectToolsFileTree.openVersion + 1
-        : prev.customSettings.projectToolsFileTree.openVersion,
-      projects,
-    },
-    projectToolsGitReview: {
-      ...prev.customSettings.projectToolsGitReview,
-      openProjectPathKeys: removedGitReviewOpenProjectPathKey
-        ? nextGitReviewOpenProjectPathKeys.sort()
-        : prev.customSettings.projectToolsGitReview.openProjectPathKeys,
-      openVersion: removedGitReviewOpenProjectPathKey
-        ? prev.customSettings.projectToolsGitReview.openVersion + 1
-        : prev.customSettings.projectToolsGitReview.openVersion,
+  const projectHostAssociations = hasSshProjectAssociation
+    ? { ...prev.ssh.projectHostAssociations }
+    : prev.ssh.projectHostAssociations;
+  if (hasSshProjectAssociation) {
+    delete projectHostAssociations[normalizedPathKey];
+  }
+
+  return normalizeSettings({
+    ...prev,
+    ssh: {
+      ...prev.ssh,
+      projectHostAssociations,
     },
-    projectToolsTunnel: {
-      ...prev.customSettings.projectToolsTunnel,
-      openProjectPathKeys: removedTunnelOpenProjectPathKey
-        ? nextTunnelOpenProjectPathKeys.sort()
-        : prev.customSettings.projectToolsTunnel.openProjectPathKeys,
-      openVersion: removedTunnelOpenProjectPathKey
-        ? prev.customSettings.projectToolsTunnel.openVersion + 1
-        : prev.customSettings.projectToolsTunnel.openVersion,
+    customSettings: {
+      ...prev.customSettings,
+      projectToolsPanel: {
+        ...prev.customSettings.projectToolsPanel,
+        activeTabs,
+        tabOrders,
+      },
+      projectToolsFileTree: {
+        ...prev.customSettings.projectToolsFileTree,
+        openProjectPathKeys: removedOpenProjectPathKey
+          ? nextOpenProjectPathKeys.sort()
+          : prev.customSettings.projectToolsFileTree.openProjectPathKeys,
+        openVersion: removedFileTreeState
+          ? prev.customSettings.projectToolsFileTree.openVersion + 1
+          : prev.customSettings.projectToolsFileTree.openVersion,
+        projects,
+      },
+      projectToolsGitReview: {
+        ...prev.customSettings.projectToolsGitReview,
+        openProjectPathKeys: removedGitReviewOpenProjectPathKey
+          ? nextGitReviewOpenProjectPathKeys.sort()
+          : prev.customSettings.projectToolsGitReview.openProjectPathKeys,
+        openVersion: removedGitReviewOpenProjectPathKey
+          ? prev.customSettings.projectToolsGitReview.openVersion + 1
+          : prev.customSettings.projectToolsGitReview.openVersion,
+      },
+      projectToolsTunnel: {
+        ...prev.customSettings.projectToolsTunnel,
+        openProjectPathKeys: removedTunnelOpenProjectPathKey
+          ? nextTunnelOpenProjectPathKeys.sort()
+          : prev.customSettings.projectToolsTunnel.openProjectPathKeys,
+        openVersion: removedTunnelOpenProjectPathKey
+          ? prev.customSettings.projectToolsTunnel.openVersion + 1
+          : prev.customSettings.projectToolsTunnel.openVersion,
+      },
+      projectToolsSshTunnel: {
+        ...prev.customSettings.projectToolsSshTunnel,
+        openProjectPathKeys: removedSshTunnelOpenProjectPathKey
+          ? nextSshTunnelOpenProjectPathKeys.sort()
+          : prev.customSettings.projectToolsSshTunnel.openProjectPathKeys,
+        openVersion: removedSshTunnelOpenProjectPathKey
+          ? prev.customSettings.projectToolsSshTunnel.openVersion + 1
+          : prev.customSettings.projectToolsSshTunnel.openVersion,
+      },
     },
   });
 }
@@ -2343,6 +2537,44 @@ export function updateProjectToolsTunnelOpen(
   });
 }
 
+export function isProjectToolsSshTunnelOpen(
+  customSettings: CustomSettings,
+  projectPathKey: string,
+): boolean {
+  const normalizedPathKey = workspaceProjectPathKey(projectPathKey);
+  return (
+    normalizedPathKey !== "" &&
+    customSettings.projectToolsSshTunnel.openProjectPathKeys.includes(normalizedPathKey)
+  );
+}
+
+export function updateProjectToolsSshTunnelOpen(
+  prev: AppSettings,
+  projectPathKey: string,
+  open: boolean,
+): AppSettings {
+  const normalizedPathKey = workspaceProjectPathKey(projectPathKey);
+  if (!normalizedPathKey) return prev;
+  const openProjectPathKeys = new Set(
+    prev.customSettings.projectToolsSshTunnel.openProjectPathKeys
+      .map((pathKey) => workspaceProjectPathKey(pathKey))
+      .filter(Boolean),
+  );
+  if (openProjectPathKeys.has(normalizedPathKey) === open) return prev;
+  if (open) {
+    openProjectPathKeys.add(normalizedPathKey);
+  } else {
+    openProjectPathKeys.delete(normalizedPathKey);
+  }
+  return updateCustomSettings(prev, {
+    projectToolsSshTunnel: {
+      ...prev.customSettings.projectToolsSshTunnel,
+      openProjectPathKeys: Array.from(openProjectPathKeys).sort(),
+      openVersion: prev.customSettings.projectToolsSshTunnel.openVersion + 1,
+    },
+  });
+}
+
 function projectToolsFileTreeProjectStateEqual(
   left: ProjectToolsFileTreeProjectState,
   right: ProjectToolsFileTreeProjectState,
diff --git a/crates/agent-gui/src/lib/settings/storage.ts b/crates/agent-gui/src/lib/settings/storage.ts
index 72c3dea76..0146ea786 100644
--- a/crates/agent-gui/src/lib/settings/storage.ts
+++ b/crates/agent-gui/src/lib/settings/storage.ts
@@ -8,6 +8,7 @@ import {
   normalizeChatRuntimeControls,
   normalizeProjectToolsFileTreeSettings,
   normalizeProjectToolsGitReviewSettings,
+  normalizeProjectToolsSshTunnelSettings,
   normalizeProjectToolsTunnelSettings,
   normalizeProjectToolsPanelActiveTab,
   normalizeProjectToolsPanelActiveTabs,
@@ -63,6 +64,7 @@ function toPersistedLocalCustomSettings(
     projectToolsFileTree: normalizeProjectToolsFileTreeSettings({}),
     projectToolsGitReview: normalizeProjectToolsGitReviewSettings({}),
     projectToolsTunnel: normalizeProjectToolsTunnelSettings({}),
+    projectToolsSshTunnel: normalizeProjectToolsSshTunnelSettings({}),
   };
 }
 
@@ -117,6 +119,7 @@ function readLocalUiSettings(): {
       projectToolsFileTree: normalizeProjectToolsFileTreeSettings({}),
       projectToolsGitReview: normalizeProjectToolsGitReviewSettings({}),
       projectToolsTunnel: normalizeProjectToolsTunnelSettings({}),
+      projectToolsSshTunnel: normalizeProjectToolsSshTunnelSettings({}),
     });
   }
 
diff --git a/crates/agent-gui/src/lib/settings/sync.ts b/crates/agent-gui/src/lib/settings/sync.ts
index d80aa225c..46ed7faae 100644
--- a/crates/agent-gui/src/lib/settings/sync.ts
+++ b/crates/agent-gui/src/lib/settings/sync.ts
@@ -3,6 +3,7 @@ import {
   normalizeChatRuntimeControls,
   normalizeProjectToolsFileTreeSettings,
   normalizeProjectToolsGitReviewSettings,
+  normalizeProjectToolsSshTunnelSettings,
   normalizeProjectToolsTunnelSettings,
   normalizeSettings,
   workspaceProjectPathKey,
@@ -87,6 +88,7 @@ export function redactSettingsForWebStorage(settings: AppSettings): AppSettings
 
 function redactSshSettingsForWebStorage(ssh: AppSettings["ssh"]): AppSettings["ssh"] {
   return {
+    projectHostAssociations: ssh.projectHostAssociations,
     hosts: ssh.hosts.map((host) => ({
       ...host,
       password: "",
@@ -354,9 +356,19 @@ function mergeSyncedSshSettings(
   incoming: unknown,
   secretUpdates: GatewaySshSecretUpdates,
 ): AppSettings["ssh"] {
+  const source = asObject(incoming);
   const normalized = normalizeSettings({ ssh: incoming as AppSettings["ssh"] }).ssh;
   const currentById = new Map(current.hosts.map((host) => [host.id, host]));
+  const projectHostAssociations = Object.hasOwn(source, "projectHostAssociations")
+    ? normalized.projectHostAssociations
+    : normalizeSettings({
+        ssh: {
+          hosts: normalized.hosts,
+          projectHostAssociations: current.projectHostAssociations,
+        },
+      }).ssh.projectHostAssociations;
   return {
+    projectHostAssociations,
     hosts: normalized.hosts.map((host) => {
       const currentHost = currentById.get(host.id);
       const update = secretUpdates[host.id];
@@ -463,6 +475,21 @@ function mergeSyncedProjectToolsTunnelSettings(
   };
 }
 
+function mergeSyncedProjectToolsSshTunnelSettings(
+  current: AppSettings["customSettings"]["projectToolsSshTunnel"],
+  incoming: unknown,
+): AppSettings["customSettings"]["projectToolsSshTunnel"] {
+  const currentState = normalizeProjectToolsSshTunnelSettings(current);
+  const incomingState = normalizeProjectToolsSshTunnelSettings(incoming);
+  const openFromIncoming = incomingState.openVersion >= currentState.openVersion;
+  return {
+    openProjectPathKeys: openFromIncoming
+      ? incomingState.openProjectPathKeys
+      : currentState.openProjectPathKeys,
+    openVersion: Math.max(currentState.openVersion, incomingState.openVersion),
+  };
+}
+
 export function buildGatewaySettingsSyncPayload(
   settings: AppSettings,
   options: { includeProviderApiKeyUpdates?: boolean } = {},
@@ -561,6 +588,12 @@ export function applyGatewaySettingsSyncPayload(
             incomingCustomSettings.projectToolsTunnel,
           )
         : current.customSettings.projectToolsTunnel,
+      projectToolsSshTunnel: Object.hasOwn(incomingCustomSettings, "projectToolsSshTunnel")
+        ? mergeSyncedProjectToolsSshTunnelSettings(
+            current.customSettings.projectToolsSshTunnel,
+            incomingCustomSettings.projectToolsSshTunnel,
+          )
+        : current.customSettings.projectToolsSshTunnel,
       chatSidebar: current.customSettings.chatSidebar,
       projectToolsPanel: current.customSettings.projectToolsPanel,
     },
diff --git a/crates/agent-gui/src/pages/ChatPage.tsx b/crates/agent-gui/src/pages/ChatPage.tsx
index 48ac3a99d..128f769ea 100644
--- a/crates/agent-gui/src/pages/ChatPage.tsx
+++ b/crates/agent-gui/src/pages/ChatPage.tsx
@@ -115,10 +115,12 @@ import {
   getProjectToolsFileTreeProjectState,
   getProjectToolsPanelActiveTab,
   getProjectToolsPanelTabOrder,
+  getSshProjectHostIds,
   isAgentDevMode,
   isAgentExecutionMode,
   isProjectToolsFileTreeOpen,
   isProjectToolsGitReviewOpen,
+  isProjectToolsSshTunnelOpen,
   isProjectToolsTunnelOpen,
   normalizeChatRuntimeControlsForProvider,
   type SelectedModel,
@@ -132,9 +134,11 @@ import {
   updateProjectToolsFileTreeProjectState,
   updateProjectToolsFileTreeOpen,
   updateProjectToolsGitReviewOpen,
+  updateProjectToolsSshTunnelOpen,
   updateProjectToolsTunnelOpen,
   updateProjectToolsPanelActiveTab,
   updateProjectToolsPanelTabOrder,
+  updateSshProjectHostIds,
   updateChatRuntimeControlsForProvider,
   updateMcp,
   updateMemorySettings,
@@ -1453,6 +1457,11 @@ export function ChatPage(props: ChatPageProps) {
     settings.customSettings,
     terminalProjectPathKey,
   );
+  const projectToolsSshTunnelOpen = isProjectToolsSshTunnelOpen(
+    settings.customSettings,
+    terminalProjectPathKey,
+  );
+  const associatedSshHostIds = getSshProjectHostIds(settings.ssh, terminalProjectPathKey);
   const terminalDisabledMessage = !isAgentMode
     ? "Project tools require Agent project mode."
     : !terminalProjectPath
@@ -4619,6 +4628,9 @@ export function ChatPage(props: ChatPageProps) {
         )}
         gitReviewOpen={isProjectToolsGitReviewOpen(settings.customSettings, terminalProjectPathKey)}
         tunnelOpen={projectToolsTunnelOpen}
+        sshTunnelOpen={projectToolsSshTunnelOpen}
+        sshHosts={settings.ssh.hosts}
+        associatedSshHostIds={associatedSshHostIds}
         client={tauriTerminalClient}
         gitClient={tauriGitClient}
         gitWriteEnabled
@@ -4660,6 +4672,14 @@ export function ChatPage(props: ChatPageProps) {
         onTunnelOpenChange={(open) =>
           setSettings((prev) => updateProjectToolsTunnelOpen(prev, terminalProjectPathKey, open))
         }
+        onSshTunnelOpenChange={(open) =>
+          setSettings((prev) =>
+            updateProjectToolsSshTunnelOpen(prev, terminalProjectPathKey, open),
+          )
+        }
+        onSshProjectHostIdsChange={(hostIds) =>
+          setSettings((prev) => updateSshProjectHostIds(prev, terminalProjectPathKey, hostIds))
+        }
         onSessionsChange={setProjectTerminalSessions}
         onInsertFileMention={(path, kind) => {
           composerRef.current?.insertFileMention(path, kind);
diff --git a/crates/agent-gui/src/pages/settings/SshSection.tsx b/crates/agent-gui/src/pages/settings/SshSection.tsx
index 2d1d61663..f699f18e8 100644
--- a/crates/agent-gui/src/pages/settings/SshSection.tsx
+++ b/crates/agent-gui/src/pages/settings/SshSection.tsx
@@ -25,6 +25,7 @@ import {
   type SshAuthType,
   type SshHostConfig,
   type SshProxyType,
+  removeSshHostFromProjectAssociations,
   updateSsh,
 } from "../../lib/settings";
 import { useModalMotion } from "../../lib/shared/modalMotion";
@@ -895,9 +896,12 @@ export function SshSection(props: SettingsSectionProps) {
 
   function handleDelete(id: string) {
     setSettings((prev) =>
-      updateSsh(prev, {
-        hosts: prev.ssh.hosts.filter((host) => host.id !== id),
-      }),
+      removeSshHostFromProjectAssociations(
+        updateSsh(prev, {
+          hosts: prev.ssh.hosts.filter((host) => host.id !== id),
+        }),
+        id,
+      ),
     );
   }
 

From a6cf4b3ca86bb274e7eda614e60897e92e210ee7 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Fri, 12 Jun 2026 22:01:30 +0800
Subject: [PATCH 03/28] feat(project-tools): add SSH tunnel creation view

---
 .../project-tools/SshTunnelPanel.tsx          | 184 ++++++++++++++++--
 crates/agent-gateway/web/src/i18n/config.ts   |  24 +++
 .../project-tools/SshTunnelPanel.tsx          | 184 ++++++++++++++++--
 crates/agent-gui/src/i18n/config.ts           |  24 +++
 4 files changed, 390 insertions(+), 26 deletions(-)

diff --git a/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
index bf8e79b0e..e24587bd6 100644
--- a/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
@@ -2,11 +2,12 @@ import { useMemo, useState } from "react";
 import { useLocale } from "@/i18n";
 import type { SshHostConfig } from "@/lib/settings";
 import { cn } from "@/lib/shared/utils";
-import { ArrowLeft, Check, Globe, Key, Server, Settings } from "../icons";
+import { ArrowLeft, Check, ChevronDown, Globe, Key, Plus, Server, Settings } from "../icons";
 import { Button } from "../ui/button";
+import { Textarea } from "../ui/textarea";
 
 type SshTunnelScope = "project" | "all";
-type SshTunnelView = "list" | "settings";
+type SshTunnelView = "list" | "settings" | "create";
 
 type SshTunnelPanelProps = {
   projectPathKey: string;
@@ -69,11 +70,17 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
   const { t } = useLocale();
   const [scope, setScope] = useState<SshTunnelScope>("project");
   const [view, setView] = useState<SshTunnelView>("list");
+  const [createHostId, setCreateHostId] = useState("");
+  const [createSftpEnabled, setCreateSftpEnabled] = useState(false);
+  const [createNote, setCreateNote] = useState("");
   const associatedSet = useMemo(() => new Set(associatedHostIds), [associatedHostIds]);
   const associatedHosts = useMemo(
     () => hosts.filter((host) => associatedSet.has(host.id)),
     [associatedSet, hosts],
   );
+  const selectedCreateHostId = associatedSet.has(createHostId)
+    ? createHostId
+    : (associatedHosts[0]?.id ?? "");
 
   const toggleHost = (hostId: string) => {
     const current = associatedHostIds.filter((id) => hosts.some((host) => host.id === id));
@@ -83,12 +90,14 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
     onAssociatedHostIdsChange(next);
   };
 
+  const listActive = view === "list";
   const settingsActive = view === "settings";
+  const createActive = view === "create";
   const listPageClassName = cn(
     "absolute inset-0 flex min-h-0 flex-col bg-gradient-to-b from-muted/40 via-muted/15 to-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
-    settingsActive
-      ? "pointer-events-none z-0 -translate-x-4 opacity-0"
-      : "z-10 translate-x-0 opacity-100",
+    listActive
+      ? "z-10 translate-x-0 opacity-100"
+      : "pointer-events-none z-0 -translate-x-4 opacity-0",
   );
   const settingsPageClassName = cn(
     "absolute inset-0 flex min-h-0 flex-col bg-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
@@ -96,7 +105,12 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
       ? "z-10 translate-x-0 opacity-100"
       : "pointer-events-none z-0 translate-x-4 opacity-0",
   );
-
+  const createPageClassName = cn(
+    "absolute inset-0 flex min-h-0 flex-col bg-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
+    createActive
+      ? "z-10 translate-x-0 opacity-100"
+      : "pointer-events-none z-0 translate-x-4 opacity-0",
+  );
   const emptyTitle =
     scope === "project"
       ? t("projectTools.sshTunnelProjectEmpty")
@@ -202,7 +216,131 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         )}
       </div>
 
-      <div className={listPageClassName} aria-hidden={settingsActive} inert={settingsActive}>
+      <div className={createPageClassName} aria-hidden={!createActive} inert={!createActive}>
+        <div className="flex h-12 shrink-0 items-center gap-2 border-b border-border px-3">
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            className="h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground"
+            title={t("projectTools.sshTunnelBack")}
+            onClick={() => setView("list")}
+          >
+            <ArrowLeft className="h-4 w-4" />
+          </Button>
+          <div className="min-w-0 flex-1">
+            <div className="truncate text-sm font-semibold text-foreground">
+              {t("projectTools.sshTunnelCreateTitle")}
+            </div>
+            <div className="truncate text-xs text-muted-foreground">
+              {t("projectTools.sshTunnelCreateHint")}
+            </div>
+          </div>
+        </div>
+
+        {hosts.length === 0 || associatedHosts.length === 0 ? (
+          <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
+            <div className="flex h-12 w-12 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
+              <Key className="h-6 w-6" />
+            </div>
+            <div className="max-w-xs space-y-1">
+              <div className="text-sm font-medium text-foreground">
+                {hosts.length === 0
+                  ? t("projectTools.sshTunnelNoConfiguredHosts")
+                  : t("projectTools.sshTunnelCreateNoAssociatedHosts")}
+              </div>
+              <div className="text-xs leading-relaxed text-muted-foreground">
+                {hosts.length === 0
+                  ? t("projectTools.sshTunnelNoConfiguredHostsHint")
+                  : t("projectTools.sshTunnelCreateNoAssociatedHostsHint")}
+              </div>
+            </div>
+          </div>
+        ) : (
+          <form
+            className="min-h-0 flex-1 overflow-y-auto px-3 py-3"
+            onSubmit={(event) => event.preventDefault()}
+          >
+            <div className="space-y-3">
+              <label className="block space-y-1.5">
+                <span className="text-xs font-medium text-foreground">
+                  {t("projectTools.sshTunnelHost")}
+                </span>
+                <div className="group relative">
+                  <span
+                    className="pointer-events-none absolute inset-y-0 left-0 flex w-10 items-center justify-center text-emerald-500"
+                    aria-hidden="true"
+                  >
+                    <Server className="h-4 w-4" />
+                  </span>
+                  <select
+                    className="h-10 w-full appearance-none rounded-xl border border-border/70 bg-card/80 pl-10 pr-9 text-sm font-medium text-foreground shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] outline-none transition-colors hover:border-emerald-500/40 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                    value={selectedCreateHostId}
+                    onChange={(event) => setCreateHostId(event.currentTarget.value)}
+                  >
+                    {associatedHosts.map((host) => (
+                      <option key={host.id} value={host.id}>
+                        {host.name} - {endpointLabel(host)}
+                      </option>
+                    ))}
+                  </select>
+                  <ChevronDown
+                    className="pointer-events-none absolute right-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground transition-colors group-focus-within:text-emerald-500"
+                    aria-hidden="true"
+                  />
+                </div>
+              </label>
+
+              <label className="flex min-h-10 items-center gap-3 rounded-xl border border-border/70 bg-card/80 px-3 py-2.5 shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] transition-colors hover:border-emerald-500/40">
+                <input
+                  type="checkbox"
+                  checked={createSftpEnabled}
+                  onChange={(event) => setCreateSftpEnabled(event.currentTarget.checked)}
+                  className="h-4 w-4 shrink-0 rounded border-border text-emerald-500 accent-emerald-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-emerald-500/40"
+                />
+                <span className="min-w-0 flex-1 text-xs font-medium text-foreground">
+                  {t("projectTools.sshTunnelSftpEnabled")}
+                </span>
+              </label>
+
+              <label className="block space-y-1.5">
+                <span className="text-xs font-medium text-foreground">
+                  {t("projectTools.sshTunnelNote")}
+                </span>
+                <Textarea
+                  value={createNote}
+                  onChange={(event) => setCreateNote(event.currentTarget.value)}
+                  className="min-h-20 rounded-lg border-border/70 bg-background/80 text-xs focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                  placeholder={t("projectTools.sshTunnelNotePlaceholder")}
+                />
+              </label>
+            </div>
+
+            <div className="mt-4 flex items-center justify-end gap-2 border-t border-border/60 pt-3">
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                className="h-8 rounded-lg px-3 text-xs"
+                onClick={() => setView("list")}
+              >
+                {t("projectTools.sshTunnelCreateCancel")}
+              </Button>
+              <Button
+                type="submit"
+                size="sm"
+                className="h-8 rounded-lg px-3 text-xs"
+                disabled
+                title={t("projectTools.sshTunnelCreateUnavailable")}
+              >
+                {t("projectTools.sshTunnelCreate")}
+              </Button>
+            </div>
+          </form>
+        )}
+      </div>
+
+      <div className={listPageClassName} aria-hidden={!listActive} inert={!listActive}>
         <div className="shrink-0 border-b border-border/60 bg-background/70 px-4 pb-3 pt-3.5 backdrop-blur-xl">
           <div className="flex items-center gap-2.5">
             <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl border border-border/60 bg-background/80 text-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_2px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
@@ -221,6 +359,15 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                   : t("projectTools.sshTunnelNoProject")}
               </div>
             </div>
+            <button
+              type="button"
+              className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border/60 hover:bg-muted/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+              title={t("projectTools.newSshTunnel")}
+              aria-label={t("projectTools.newSshTunnel")}
+              onClick={() => setView("create")}
+            >
+              <Plus className="h-4 w-4" />
+            </button>
             {scope === "project" ? (
               <button
                 type="button"
@@ -283,17 +430,28 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
             <div className="max-w-[16rem] text-[11px] leading-relaxed text-muted-foreground">
               {emptyHint}
             </div>
-            {scope === "project" && associatedHosts.length === 0 ? (
+            <div className="mt-2 flex flex-wrap items-center justify-center gap-2">
               <Button
                 type="button"
-                variant="outline"
+                variant="default"
                 size="sm"
-                className="mt-2 h-7 rounded-lg bg-background/70 px-2.5 text-xs"
-                onClick={() => setView("settings")}
+                className="h-7 rounded-lg px-2.5 text-xs"
+                onClick={() => setView("create")}
               >
-                {t("projectTools.sshTunnelAssociateHosts")}
+                {t("projectTools.newSshTunnel")}
               </Button>
-            ) : null}
+              {scope === "project" && associatedHosts.length === 0 ? (
+                <Button
+                  type="button"
+                  variant="outline"
+                  size="sm"
+                  className="h-7 rounded-lg bg-background/70 px-2.5 text-xs"
+                  onClick={() => setView("settings")}
+                >
+                  {t("projectTools.sshTunnelAssociateHosts")}
+                </Button>
+              ) : null}
+            </div>
           </div>
         </div>
       </div>
diff --git a/crates/agent-gateway/web/src/i18n/config.ts b/crates/agent-gateway/web/src/i18n/config.ts
index c3aaf0403..5cc986574 100644
--- a/crates/agent-gateway/web/src/i18n/config.ts
+++ b/crates/agent-gateway/web/src/i18n/config.ts
@@ -258,6 +258,17 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelAssociatedCount": "已关联",
     "projectTools.sshTunnelNoConfiguredHosts": "还没有配置 SSH 主机",
     "projectTools.sshTunnelNoConfiguredHostsHint": "请先到 Settings > SSH 添加或导入主机，再回到这里关联当前项目。",
+    "projectTools.sshTunnelCreateTitle": "新建 SSH 隧道",
+    "projectTools.sshTunnelCreateHint": "选择已关联主机、SFTP 和备注；实际启动功能将在后续接入。",
+    "projectTools.sshTunnelCreateNoAssociatedHosts": "当前项目还没有关联 SSH 主机",
+    "projectTools.sshTunnelCreateNoAssociatedHostsHint": "先关联 Settings > SSH 中的主机，再从这里新建 SSH 隧道。",
+    "projectTools.sshTunnelHost": "SSH 主机",
+    "projectTools.sshTunnelSftpEnabled": "开启 SFTP",
+    "projectTools.sshTunnelNote": "备注",
+    "projectTools.sshTunnelNotePlaceholder": "可选：记录用途或访问说明",
+    "projectTools.sshTunnelCreate": "创建隧道",
+    "projectTools.sshTunnelCreateCancel": "取消",
+    "projectTools.sshTunnelCreateUnavailable": "当前仅提供界面，启动功能将在后续接入",
     "projectTools.tunnelScopeGroup": "切换内网穿透视角",
     "projectTools.tunnelScopeProject": "当前项目",
     "projectTools.tunnelScopeGlobal": "全局",
@@ -1570,6 +1581,19 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelNoConfiguredHosts": "No SSH hosts configured yet",
     "projectTools.sshTunnelNoConfiguredHostsHint":
       "Add or import hosts in Settings > SSH first, then associate them here.",
+    "projectTools.sshTunnelCreateTitle": "New SSH Tunnel",
+    "projectTools.sshTunnelCreateHint":
+      "Choose an associated host, SFTP, and note. Startup will be wired in later.",
+    "projectTools.sshTunnelCreateNoAssociatedHosts": "No SSH hosts associated with this project",
+    "projectTools.sshTunnelCreateNoAssociatedHostsHint":
+      "Associate hosts from Settings > SSH before creating an SSH tunnel here.",
+    "projectTools.sshTunnelHost": "SSH host",
+    "projectTools.sshTunnelSftpEnabled": "Enable SFTP",
+    "projectTools.sshTunnelNote": "Note",
+    "projectTools.sshTunnelNotePlaceholder": "Optional: purpose or access notes",
+    "projectTools.sshTunnelCreate": "Create tunnel",
+    "projectTools.sshTunnelCreateCancel": "Cancel",
+    "projectTools.sshTunnelCreateUnavailable": "This is UI-only; startup will be wired in later",
     "projectTools.tunnelScopeGroup": "Switch tunnel scope",
     "projectTools.tunnelScopeProject": "Current Project",
     "projectTools.tunnelScopeGlobal": "Global",
diff --git a/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
index 6bdf13bdb..d0cf553b6 100644
--- a/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
@@ -2,11 +2,12 @@ import { useMemo, useState } from "react";
 import { useLocale } from "../../i18n";
 import type { SshHostConfig } from "../../lib/settings";
 import { cn } from "../../lib/shared/utils";
-import { ArrowLeft, Check, Globe, Key, Server, Settings } from "../icons";
+import { ArrowLeft, Check, ChevronDown, Globe, Key, Plus, Server, Settings } from "../icons";
 import { Button } from "../ui/button";
+import { Textarea } from "../ui/textarea";
 
 type SshTunnelScope = "project" | "all";
-type SshTunnelView = "list" | "settings";
+type SshTunnelView = "list" | "settings" | "create";
 
 type SshTunnelPanelProps = {
   projectPathKey: string;
@@ -69,11 +70,17 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
   const { t } = useLocale();
   const [scope, setScope] = useState<SshTunnelScope>("project");
   const [view, setView] = useState<SshTunnelView>("list");
+  const [createHostId, setCreateHostId] = useState("");
+  const [createSftpEnabled, setCreateSftpEnabled] = useState(false);
+  const [createNote, setCreateNote] = useState("");
   const associatedSet = useMemo(() => new Set(associatedHostIds), [associatedHostIds]);
   const associatedHosts = useMemo(
     () => hosts.filter((host) => associatedSet.has(host.id)),
     [associatedSet, hosts],
   );
+  const selectedCreateHostId = associatedSet.has(createHostId)
+    ? createHostId
+    : (associatedHosts[0]?.id ?? "");
 
   const toggleHost = (hostId: string) => {
     const current = associatedHostIds.filter((id) => hosts.some((host) => host.id === id));
@@ -83,12 +90,14 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
     onAssociatedHostIdsChange(next);
   };
 
+  const listActive = view === "list";
   const settingsActive = view === "settings";
+  const createActive = view === "create";
   const listPageClassName = cn(
     "absolute inset-0 flex min-h-0 flex-col bg-gradient-to-b from-muted/40 via-muted/15 to-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
-    settingsActive
-      ? "pointer-events-none z-0 -translate-x-4 opacity-0"
-      : "z-10 translate-x-0 opacity-100",
+    listActive
+      ? "z-10 translate-x-0 opacity-100"
+      : "pointer-events-none z-0 -translate-x-4 opacity-0",
   );
   const settingsPageClassName = cn(
     "absolute inset-0 flex min-h-0 flex-col bg-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
@@ -96,7 +105,12 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
       ? "z-10 translate-x-0 opacity-100"
       : "pointer-events-none z-0 translate-x-4 opacity-0",
   );
-
+  const createPageClassName = cn(
+    "absolute inset-0 flex min-h-0 flex-col bg-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
+    createActive
+      ? "z-10 translate-x-0 opacity-100"
+      : "pointer-events-none z-0 translate-x-4 opacity-0",
+  );
   const emptyTitle =
     scope === "project"
       ? t("projectTools.sshTunnelProjectEmpty")
@@ -202,7 +216,131 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         )}
       </div>
 
-      <div className={listPageClassName} aria-hidden={settingsActive} inert={settingsActive}>
+      <div className={createPageClassName} aria-hidden={!createActive} inert={!createActive}>
+        <div className="flex h-12 shrink-0 items-center gap-2 border-b border-border px-3">
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            className="h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground"
+            title={t("projectTools.sshTunnelBack")}
+            onClick={() => setView("list")}
+          >
+            <ArrowLeft className="h-4 w-4" />
+          </Button>
+          <div className="min-w-0 flex-1">
+            <div className="truncate text-sm font-semibold text-foreground">
+              {t("projectTools.sshTunnelCreateTitle")}
+            </div>
+            <div className="truncate text-xs text-muted-foreground">
+              {t("projectTools.sshTunnelCreateHint")}
+            </div>
+          </div>
+        </div>
+
+        {hosts.length === 0 || associatedHosts.length === 0 ? (
+          <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
+            <div className="flex h-12 w-12 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
+              <Key className="h-6 w-6" />
+            </div>
+            <div className="max-w-xs space-y-1">
+              <div className="text-sm font-medium text-foreground">
+                {hosts.length === 0
+                  ? t("projectTools.sshTunnelNoConfiguredHosts")
+                  : t("projectTools.sshTunnelCreateNoAssociatedHosts")}
+              </div>
+              <div className="text-xs leading-relaxed text-muted-foreground">
+                {hosts.length === 0
+                  ? t("projectTools.sshTunnelNoConfiguredHostsHint")
+                  : t("projectTools.sshTunnelCreateNoAssociatedHostsHint")}
+              </div>
+            </div>
+          </div>
+        ) : (
+          <form
+            className="min-h-0 flex-1 overflow-y-auto px-3 py-3"
+            onSubmit={(event) => event.preventDefault()}
+          >
+            <div className="space-y-3">
+              <label className="block space-y-1.5">
+                <span className="text-xs font-medium text-foreground">
+                  {t("projectTools.sshTunnelHost")}
+                </span>
+                <div className="group relative">
+                  <span
+                    className="pointer-events-none absolute inset-y-0 left-0 flex w-10 items-center justify-center text-emerald-500"
+                    aria-hidden="true"
+                  >
+                    <Server className="h-4 w-4" />
+                  </span>
+                  <select
+                    className="h-10 w-full appearance-none rounded-xl border border-border/70 bg-card/80 pl-10 pr-9 text-sm font-medium text-foreground shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] outline-none transition-colors hover:border-emerald-500/40 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                    value={selectedCreateHostId}
+                    onChange={(event) => setCreateHostId(event.currentTarget.value)}
+                  >
+                    {associatedHosts.map((host) => (
+                      <option key={host.id} value={host.id}>
+                        {host.name} - {endpointLabel(host)}
+                      </option>
+                    ))}
+                  </select>
+                  <ChevronDown
+                    className="pointer-events-none absolute right-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground transition-colors group-focus-within:text-emerald-500"
+                    aria-hidden="true"
+                  />
+                </div>
+              </label>
+
+              <label className="flex min-h-10 items-center gap-3 rounded-xl border border-border/70 bg-card/80 px-3 py-2.5 shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] transition-colors hover:border-emerald-500/40">
+                <input
+                  type="checkbox"
+                  checked={createSftpEnabled}
+                  onChange={(event) => setCreateSftpEnabled(event.currentTarget.checked)}
+                  className="h-4 w-4 shrink-0 rounded border-border text-emerald-500 accent-emerald-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-emerald-500/40"
+                />
+                <span className="min-w-0 flex-1 text-xs font-medium text-foreground">
+                  {t("projectTools.sshTunnelSftpEnabled")}
+                </span>
+              </label>
+
+              <label className="block space-y-1.5">
+                <span className="text-xs font-medium text-foreground">
+                  {t("projectTools.sshTunnelNote")}
+                </span>
+                <Textarea
+                  value={createNote}
+                  onChange={(event) => setCreateNote(event.currentTarget.value)}
+                  className="min-h-20 rounded-lg border-border/70 bg-background/80 text-xs focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                  placeholder={t("projectTools.sshTunnelNotePlaceholder")}
+                />
+              </label>
+            </div>
+
+            <div className="mt-4 flex items-center justify-end gap-2 border-t border-border/60 pt-3">
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                className="h-8 rounded-lg px-3 text-xs"
+                onClick={() => setView("list")}
+              >
+                {t("projectTools.sshTunnelCreateCancel")}
+              </Button>
+              <Button
+                type="submit"
+                size="sm"
+                className="h-8 rounded-lg px-3 text-xs"
+                disabled
+                title={t("projectTools.sshTunnelCreateUnavailable")}
+              >
+                {t("projectTools.sshTunnelCreate")}
+              </Button>
+            </div>
+          </form>
+        )}
+      </div>
+
+      <div className={listPageClassName} aria-hidden={!listActive} inert={!listActive}>
         <div className="shrink-0 border-b border-border/60 bg-background/70 px-4 pb-3 pt-3.5 backdrop-blur-xl">
           <div className="flex items-center gap-2.5">
             <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl border border-border/60 bg-background/80 text-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_2px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
@@ -221,6 +359,15 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                   : t("projectTools.sshTunnelNoProject")}
               </div>
             </div>
+            <button
+              type="button"
+              className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border/60 hover:bg-muted/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+              title={t("projectTools.newSshTunnel")}
+              aria-label={t("projectTools.newSshTunnel")}
+              onClick={() => setView("create")}
+            >
+              <Plus className="h-4 w-4" />
+            </button>
             {scope === "project" ? (
               <button
                 type="button"
@@ -283,17 +430,28 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
             <div className="max-w-[16rem] text-[11px] leading-relaxed text-muted-foreground">
               {emptyHint}
             </div>
-            {scope === "project" && associatedHosts.length === 0 ? (
+            <div className="mt-2 flex flex-wrap items-center justify-center gap-2">
               <Button
                 type="button"
-                variant="outline"
+                variant="default"
                 size="sm"
-                className="mt-2 h-7 rounded-lg bg-background/70 px-2.5 text-xs"
-                onClick={() => setView("settings")}
+                className="h-7 rounded-lg px-2.5 text-xs"
+                onClick={() => setView("create")}
               >
-                {t("projectTools.sshTunnelAssociateHosts")}
+                {t("projectTools.newSshTunnel")}
               </Button>
-            ) : null}
+              {scope === "project" && associatedHosts.length === 0 ? (
+                <Button
+                  type="button"
+                  variant="outline"
+                  size="sm"
+                  className="h-7 rounded-lg bg-background/70 px-2.5 text-xs"
+                  onClick={() => setView("settings")}
+                >
+                  {t("projectTools.sshTunnelAssociateHosts")}
+                </Button>
+              ) : null}
+            </div>
           </div>
         </div>
       </div>
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index 98cc60cb9..5cce8e6ab 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -270,6 +270,17 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelAssociatedCount": "已关联",
     "projectTools.sshTunnelNoConfiguredHosts": "还没有配置 SSH 主机",
     "projectTools.sshTunnelNoConfiguredHostsHint": "请先到 Settings > SSH 添加或导入主机，再回到这里关联当前项目。",
+    "projectTools.sshTunnelCreateTitle": "新建 SSH 隧道",
+    "projectTools.sshTunnelCreateHint": "选择已关联主机、SFTP 和备注；实际启动功能将在后续接入。",
+    "projectTools.sshTunnelCreateNoAssociatedHosts": "当前项目还没有关联 SSH 主机",
+    "projectTools.sshTunnelCreateNoAssociatedHostsHint": "先关联 Settings > SSH 中的主机，再从这里新建 SSH 隧道。",
+    "projectTools.sshTunnelHost": "SSH 主机",
+    "projectTools.sshTunnelSftpEnabled": "开启 SFTP",
+    "projectTools.sshTunnelNote": "备注",
+    "projectTools.sshTunnelNotePlaceholder": "可选：记录用途或访问说明",
+    "projectTools.sshTunnelCreate": "创建隧道",
+    "projectTools.sshTunnelCreateCancel": "取消",
+    "projectTools.sshTunnelCreateUnavailable": "当前仅提供界面，启动功能将在后续接入",
     "projectTools.tunnelScopeGroup": "切换内网穿透视角",
     "projectTools.tunnelScopeProject": "当前项目",
     "projectTools.tunnelScopeGlobal": "全局",
@@ -1623,6 +1634,19 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelNoConfiguredHosts": "No SSH hosts configured yet",
     "projectTools.sshTunnelNoConfiguredHostsHint":
       "Add or import hosts in Settings > SSH first, then associate them here.",
+    "projectTools.sshTunnelCreateTitle": "New SSH Tunnel",
+    "projectTools.sshTunnelCreateHint":
+      "Choose an associated host, SFTP, and note. Startup will be wired in later.",
+    "projectTools.sshTunnelCreateNoAssociatedHosts": "No SSH hosts associated with this project",
+    "projectTools.sshTunnelCreateNoAssociatedHostsHint":
+      "Associate hosts from Settings > SSH before creating an SSH tunnel here.",
+    "projectTools.sshTunnelHost": "SSH host",
+    "projectTools.sshTunnelSftpEnabled": "Enable SFTP",
+    "projectTools.sshTunnelNote": "Note",
+    "projectTools.sshTunnelNotePlaceholder": "Optional: purpose or access notes",
+    "projectTools.sshTunnelCreate": "Create tunnel",
+    "projectTools.sshTunnelCreateCancel": "Cancel",
+    "projectTools.sshTunnelCreateUnavailable": "This is UI-only; startup will be wired in later",
     "projectTools.tunnelScopeGroup": "Switch tunnel scope",
     "projectTools.tunnelScopeProject": "Current Project",
     "projectTools.tunnelScopeGlobal": "Global",

From 3a827522a5b26bb0d19782afa0f310fa299f663e Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sat, 13 Jun 2026 14:59:28 +0800
Subject: [PATCH 04/28] feat(ssh): add synchronized SSH terminal sessions

---
 Cargo.lock                                    | 1214 +++++++++++++-
 .../internal/proto/v1/gateway.pb.go           | 1411 ++++++++++------
 .../internal/server/websocket.go              |   19 +-
 .../server/websocket_connection_state_test.go |   76 +
 .../internal/server/websocket_payloads.go     |   43 +
 .../internal/server/websocket_routes.go       |    5 +
 .../internal/server/websocket_routes_test.go  |    5 +
 .../server/websocket_settings_handlers.go     |   57 +
 .../server/websocket_terminal_handlers.go     |  146 +-
 .../internal/session/manager_settings_sync.go |   12 +
 .../internal/session/manager_terminal.go      |   38 +-
 .../internal/session/manager_test.go          |  107 +-
 crates/agent-gateway/proto/v1/gateway.proto   |   44 +
 .../test/websocket/terminal_test.go           |  290 +++-
 crates/agent-gateway/web/src/App.tsx          |  126 +-
 .../project-tools/ProjectToolsPanel.tsx       |  533 ++----
 .../project-tools/SshTunnelPanel.tsx          |  737 ++++++++-
 .../project-tools/XTermViewport.tsx           |  445 +++++
 .../WorkspaceSshTerminalOverlay.tsx           |  286 ++++
 crates/agent-gateway/web/src/i18n/config.ts   |  152 +-
 .../web/src/lib/gatewaySocket.ts              |  274 ++-
 .../web/src/lib/gatewaySocket.worker.ts       |   88 +-
 .../web/src/lib/settings/index.ts             |   14 +-
 .../web/src/lib/settings/storage.ts           |    8 +-
 .../web/src/lib/settings/sync.ts              |   31 +-
 crates/agent-gateway/web/src/lib/ssh/scan.ts  |    2 +
 .../src/lib/terminal/gatewayTerminalClient.ts |   12 +
 .../web/src/lib/terminal/sessionStore.ts      |    2 +-
 .../web/src/lib/terminal/types.ts             |   52 +
 .../web/src/pages/settings/RemoteSection.tsx  |   20 +
 .../web/src/pages/settings/SshSection.tsx     |  167 +-
 .../agent-gateway/web/src/shims/tauriCore.ts  |    8 +
 crates/agent-gateway/web/src/styles.css       |    3 +-
 crates/agent-gui/src-tauri/Cargo.toml         |    3 +-
 .../src-tauri/src/commands/settings.rs        |  579 ++++++-
 .../src-tauri/src/commands/terminal.rs        |   50 +-
 crates/agent-gui/src-tauri/src/lib.rs         |    5 +
 .../src-tauri/src/runtime/terminal.rs         | 1464 ++++++++++++++++-
 .../src-tauri/src/services/gateway.rs         |  253 ++-
 .../project-tools/ProjectToolsPanel.tsx       |  459 ++----
 .../project-tools/SshTunnelPanel.tsx          |  736 ++++++++-
 .../project-tools/XTermViewport.tsx           |  445 +++++
 .../WorkspaceSshTerminalOverlay.tsx           |  288 ++++
 crates/agent-gui/src/i18n/config.ts           |  152 +-
 crates/agent-gui/src/lib/settings/index.ts    |   14 +-
 crates/agent-gui/src/lib/settings/storage.ts  |    8 +-
 crates/agent-gui/src/lib/settings/sync.ts     |   31 +-
 crates/agent-gui/src/lib/ssh/scan.ts          |    2 +
 .../src/lib/terminal/sessionStore.ts          |    2 +-
 .../src/lib/terminal/tauriTerminalClient.ts   |  118 +-
 crates/agent-gui/src/lib/terminal/types.ts    |   52 +
 crates/agent-gui/src/pages/ChatPage.tsx       |  101 +-
 .../src/pages/settings/RemoteSection.tsx      |   18 +
 .../src/pages/settings/SshSection.tsx         |  167 +-
 .../test/settings/normalization.test.mjs      |  274 ++-
 55 files changed, 9868 insertions(+), 1780 deletions(-)
 create mode 100644 crates/agent-gateway/web/src/components/project-tools/XTermViewport.tsx
 create mode 100644 crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
 create mode 100644 crates/agent-gui/src/components/project-tools/XTermViewport.tsx
 create mode 100644 crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx

diff --git a/Cargo.lock b/Cargo.lock
index 5361af655..b92b00a90 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,6 +8,16 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "aead"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef60ac202874e574ce7a7158cc8bca7313dd344322482e4fadee288bf4a306b8"
+dependencies = [
+ "crypto-common 0.2.2",
+ "inout 0.2.2",
+]
+
 [[package]]
 name = "aes"
 version = "0.8.4"
@@ -15,8 +25,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
- "cipher",
- "cpufeatures",
+ "cipher 0.4.4",
+ "cpufeatures 0.2.17",
+]
+
+[[package]]
+name = "aes"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fc76eaeac4c9164506c466d4ffdd8ec9d0c5bf57ee97177c4d8eceb3a0e138"
+dependencies = [
+ "cipher 0.5.2",
+ "cpubits",
+ "cpufeatures 0.3.0",
+ "zeroize",
+]
+
+[[package]]
+name = "aes-gcm"
+version = "0.11.0-rc.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da8c919c118108f144adecad74b425b804ad075580d605d9b33c2d6d1c62a2f8"
+dependencies = [
+ "aead",
+ "aes 0.9.1",
+ "cipher 0.5.2",
+ "ctr",
+ "ghash",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -67,6 +104,18 @@ dependencies = [
  "derive_arbitrary",
 ]
 
+[[package]]
+name = "argon2"
+version = "0.6.0-rc.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7af50940b73bf4e16c15c448a2b121c63f2d68e3e54b6a8731673cb4aa0cdff5"
+dependencies = [
+ "base64ct",
+ "blake2",
+ "cpufeatures 0.3.0",
+ "password-hash",
+]
+
 [[package]]
 name = "async-broadcast"
 version = "0.7.2"
@@ -262,6 +311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc"
 dependencies = [
  "aws-lc-sys",
+ "untrusted 0.7.1",
  "zeroize",
 ]
 
@@ -376,6 +426,12 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "base16ct"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd307490d624467aa6f74b0eabb77633d1f758a7b25f12bceb0b22e08d9726f6"
+
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -388,6 +444,23 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64ct"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
+
+[[package]]
+name = "bcrypt-pbkdf"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "144e573728da132683b9488acd528274c790e07fc06ff81ee29f9d8f8b1041e0"
+dependencies = [
+ "blowfish",
+ "pbkdf2",
+ "sha2 0.11.0",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -418,13 +491,32 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "blake2"
+version = "0.11.0-rc.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "061f1a09225e328e1ffbb378d2d49923c0ca5fee19fb5ac1cc9c1e9d52b93690"
+dependencies = [
+ "digest 0.11.3",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.7",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
+dependencies = [
+ "hybrid-array",
+ "zeroize",
 ]
 
 [[package]]
@@ -433,7 +525,16 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.7",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "710f1dd022ef4e93f8a438b4ba958de7f64308434fa6a87104481645cc30068b"
+dependencies = [
+ "hybrid-array",
 ]
 
 [[package]]
@@ -467,6 +568,16 @@ dependencies = [
  "piper",
 ]
 
+[[package]]
+name = "blowfish"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62ce3946557b35e71d1bbe07ec385073ce9eda05043f95de134eb578fcf1a298"
+dependencies = [
+ "byteorder",
+ "cipher 0.5.2",
+]
+
 [[package]]
 name = "brotli"
 version = "8.0.2"
@@ -610,7 +721,16 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
 dependencies = [
- "cipher",
+ "cipher 0.4.4",
+]
+
+[[package]]
+name = "cbc"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce2dc9ee5f88d11e0beb842c88b33c8a5cf0d1329c4b19494af42b07dbfe8896"
+dependencies = [
+ "cipher 0.5.2",
 ]
 
 [[package]]
@@ -670,6 +790,19 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cipher 0.5.2",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.1",
+ "zeroize",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.44"
@@ -700,8 +833,20 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
- "crypto-common",
- "inout",
+ "crypto-common 0.1.7",
+ "inout 0.1.4",
+]
+
+[[package]]
+name = "cipher"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c"
+dependencies = [
+ "block-buffer 0.12.1",
+ "crypto-common 0.2.2",
+ "inout 0.2.2",
+ "zeroize",
 ]
 
 [[package]]
@@ -713,6 +858,12 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "cmov"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -732,6 +883,12 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "const-oid"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -798,6 +955,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cpubits"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b85f9c39137c3a891689859392b1bd49812121d0d61c9caf00d46ed5ce06ae"
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -807,6 +970,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -861,16 +1033,54 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crypto-bigint"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42a0d26b245348befa0c121944541476763dcc46ede886c88f9d12e1697d27c3"
+dependencies = [
+ "cpubits",
+ "ctutils",
+ "getrandom 0.4.2",
+ "hybrid-array",
+ "num-traits",
+ "rand_core 0.10.1",
+ "serdect",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.7",
  "typenum",
 ]
 
+[[package]]
+name = "crypto-common"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
+dependencies = [
+ "getrandom 0.4.2",
+ "hybrid-array",
+ "rand_core 0.10.1",
+]
+
+[[package]]
+name = "crypto-primes"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3633a51a39c69ebbaa4feaa694bd83d241e4093901c84a0963b19d9bb3f0cf8f"
+dependencies = [
+ "crypto-bigint",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "cssparser"
 version = "0.29.6"
@@ -921,6 +1131,52 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "ctr"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baaca1c4b237092596f64d571e9db6ce4109c4ef9742e27590f1709594461f21"
+dependencies = [
+ "cipher 0.5.2",
+]
+
+[[package]]
+name = "ctutils"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
+dependencies = [
+ "cmov",
+ "subtle",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "5.0.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f359e08ca85e7bd759e1fd933ff2bccd81864c60a8fba0e259c7f822b0924bf"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "curve25519-dalek-derive",
+ "digest 0.11.3",
+ "fiat-crypto",
+ "rustc_version",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "darling"
 version = "0.20.11"
@@ -996,6 +1252,28 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 
+[[package]]
+name = "delegate"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "780eb241654bf097afb00fc5f054a09b687dad862e485fdcf8399bb056565370"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "der"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
 [[package]]
 name = "deranged"
 version = "0.5.8"
@@ -1082,14 +1360,35 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "des"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "916a94e407b54f9034d71dd748234cd1e516ced6284009906ae246f177eafe5a"
+dependencies = [
+ "cipher 0.5.2",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer",
- "crypto-common",
+ "block-buffer 0.10.4",
+ "crypto-common 0.1.7",
+]
+
+[[package]]
+name = "digest"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
+dependencies = [
+ "block-buffer 0.12.1",
+ "const-oid",
+ "crypto-common 0.2.2",
+ "ctutils",
 ]
 
 [[package]]
@@ -1225,12 +1524,76 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
+[[package]]
+name = "ecdsa"
+version = "0.17.0-rc.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54fb064faabbee66e1fc8e5c5a9458d4269dc2d8b638fe86a425adb2510d1a96"
+dependencies = [
+ "der",
+ "digest 0.11.3",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
+ "zeroize",
+]
+
+[[package]]
+name = "ed25519"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29fcf32e6c73d1079f83ab4d782de2d81620346a5f38c6237a86a22f8368980a"
+dependencies = [
+ "pkcs8",
+ "signature",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "3.0.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b011170fe4f04665565b4110afef66774fe9ffff278f3eb5b81cc73d26e27d60"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core 0.10.1",
+ "serde",
+ "sha2 0.11.0",
+ "signature",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "either"
 version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
+[[package]]
+name = "elliptic-curve"
+version = "0.14.0-rc.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "102d3643d30dd8b559613c5cced68317199597fffb278cdc88daa2ef7fafc935"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "crypto-common 0.2.2",
+ "digest 0.11.3",
+ "ff",
+ "group",
+ "hkdf",
+ "hybrid-array",
+ "once_cell",
+ "pem-rfc7468",
+ "pkcs8",
+ "rand_core 0.10.1",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "embed-resource"
 version = "3.0.8"
@@ -1266,6 +1629,18 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
 
+[[package]]
+name = "enum_dispatch"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "enumflags2"
 version = "0.7.12"
@@ -1362,6 +1737,22 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "ff"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f686ab92a9fb0eaf188f6c6c87b89490baa6fdb0db4544ba4dc47f7942489f"
+dependencies = [
+ "rand_core 0.10.1",
+ "subtle",
+]
+
+[[package]]
+name = "fiat-crypto"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24"
+
 [[package]]
 name = "field-offset"
 version = "0.3.6"
@@ -1485,6 +1876,21 @@ dependencies = [
  "new_debug_unreachable",
 ]
 
+[[package]]
+name = "futures"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-channel"
 version = "0.3.32"
@@ -1560,6 +1966,7 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
+ "futures-channel",
  "futures-core",
  "futures-io",
  "futures-macro",
@@ -1688,6 +2095,17 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "generic-array"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb130435a959a8d525e6bca66ff6c40981a300ee96d70e3ef56f046556d614a3"
+dependencies = [
+ "generic-array 0.14.7",
+ "rustversion",
+ "typenum",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -1733,10 +2151,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 6.0.0",
+ "rand_core 0.10.1",
  "wasip2",
  "wasip3",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ghash"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eecf2d5dc9b66b732b97707a0210906b1d30523eb773193ab777c0c84b3e8d5"
+dependencies = [
+ "polyval",
 ]
 
 [[package]]
@@ -1848,6 +2278,17 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "group"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fd1a1c7a5206c5b7a3f5a0d7ccd3ff85d0c8f5133d62a02680255b0004af5f4"
+dependencies = [
+ "ff",
+ "rand_core 0.10.1",
+ "subtle",
+]
+
 [[package]]
 name = "gtk"
 version = "0.18.2"
@@ -1976,6 +2417,30 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hex-literal"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1"
+
+[[package]]
+name = "hkdf"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
+dependencies = [
+ "digest 0.11.3",
+]
+
 [[package]]
 name = "html5ever"
 version = "0.29.1"
@@ -2043,6 +2508,18 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "hybrid-array"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214"
+dependencies = [
+ "ctutils",
+ "subtle",
+ "typenum",
+ "zeroize",
+]
+
 [[package]]
 name = "hyper"
 version = "1.9.0"
@@ -2337,8 +2814,30 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
- "block-padding",
- "generic-array",
+ "block-padding 0.3.3",
+ "generic-array 0.14.7",
+]
+
+[[package]]
+name = "inout"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7"
+dependencies = [
+ "block-padding 0.4.2",
+ "hybrid-array",
+]
+
+[[package]]
+name = "internal-russh-num-bigint"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae8e22120c32fb4d19ec55fba35015f57095cd95a2e3b732e44457f5915b2ee8"
+dependencies = [
+ "num-integer",
+ "num-traits",
+ "rand 0.10.1",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -2502,6 +3001,26 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "keccak"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+]
+
+[[package]]
+name = "kem"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01737161ba802849cfd486b5bd209d38ba4943494c249a8126005170c7621edd"
+dependencies = [
+ "crypto-common 0.2.2",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "keyboard-types"
 version = "0.7.0"
@@ -2563,9 +3082,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.184"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libloading"
@@ -2639,10 +3158,11 @@ dependencies = [
  "reqwest",
  "rfd",
  "rusqlite",
+ "russh",
  "rustls",
  "serde",
  "serde_json",
- "sha2",
+ "sha2 0.10.9",
  "tauri",
  "tauri-build",
  "tauri-plugin-mcp-bridge",
@@ -2683,8 +3203,8 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c7c1d3350d071cb86987a6bcb205c7019a0eb70dcad92b454fec722cca8d68b"
 dependencies = [
- "aes",
- "cbc",
+ "aes 0.8.4",
+ "cbc 0.1.2",
  "chrono",
  "encoding_rs",
  "flate2",
@@ -2774,9 +3294,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
  "cfg-if",
- "digest",
+ "digest 0.10.7",
 ]
 
+[[package]]
+name = "md5"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0"
+
 [[package]]
 name = "memchr"
 version = "2.8.0"
@@ -2831,6 +3357,31 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "ml-kem"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e15f3e5b957493873e396a66914e83e616b6afe335cdef7efe5c6e1216aba66"
+dependencies = [
+ "hybrid-array",
+ "kem",
+ "module-lattice",
+ "pkcs8",
+ "rand_core 0.10.1",
+ "sha3",
+]
+
+[[package]]
+name = "module-lattice"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c61b87c9683ab7cb1c6871d261ad5479b6b10ceb52c4352aaca3b5d35a8febe"
+dependencies = [
+ "ctutils",
+ "hybrid-array",
+ "num-traits",
+]
+
 [[package]]
 name = "moxcms"
 version = "0.8.1"
@@ -2916,6 +3467,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nix"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
+dependencies = [
+ "bitflags 2.11.0",
+ "cfg-if",
+ "cfg_aliases 0.2.1",
+ "libc",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -2943,6 +3506,16 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.2.1"
@@ -2960,6 +3533,15 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -3390,6 +3972,67 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
+[[package]]
+name = "p256"
+version = "0.14.0-rc.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41adc63effe99d48837a8cc0e6d7a77e32ae6a07f6000df466178dbc2193093e"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primefield",
+ "primeorder",
+ "sha2 0.11.0",
+]
+
+[[package]]
+name = "p384"
+version = "0.14.0-rc.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd5333afa5ae0347f39e6a0f2c9c155da431583fd71fe5555bd0521b4ccaf02"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "fiat-crypto",
+ "primefield",
+ "primeorder",
+ "sha2 0.11.0",
+]
+
+[[package]]
+name = "p521"
+version = "0.14.0-rc.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3a5297f53dc16d35909060ba3032cff7867e8809f01e273ff325579d5f0ceae"
+dependencies = [
+ "base16ct",
+ "ecdsa",
+ "elliptic-curve",
+ "primefield",
+ "primeorder",
+ "sha2 0.11.0",
+]
+
+[[package]]
+name = "pageant"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f3a5ae18f65a85c67a77d18d42d3606c07948e3c17c1e5f74852b26589e88a5"
+dependencies = [
+ "base16ct",
+ "byteorder",
+ "bytes",
+ "delegate",
+ "futures",
+ "log",
+ "rand 0.10.1",
+ "sha2 0.11.0",
+ "thiserror 2.0.18",
+ "tokio",
+ "windows 0.62.2",
+ "windows-strings 0.5.1",
+]
+
 [[package]]
 name = "pango"
 version = "0.18.3"
@@ -3444,12 +4087,40 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "password-hash"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aab41826031698d6ffcd9cff78ef56ef998e39dc7e5067cdfebe373842d4723b"
+dependencies = [
+ "phc",
+]
+
 [[package]]
 name = "pathdiff"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
+[[package]]
+name = "pbkdf2"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112d82ceb8c5bf524d9af484d4e4970c9fd5a0cc15ba14ad93dccd28873b0629"
+dependencies = [
+ "digest 0.11.3",
+ "hmac",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6305423e0e7738146434843d1694d621cce767262b2a86910beab705e4493d9"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -3466,6 +4137,16 @@ dependencies = [
  "indexmap 2.13.1",
 ]
 
+[[package]]
+name = "phc"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44dc769b75f93afdddd8c7fa12d685292ddeff1e66f7f0f3a234cf1818afe892"
+dependencies = [
+ "base64ct",
+ "ctutils",
+]
+
 [[package]]
 name = "phf"
 version = "0.8.0"
@@ -3708,6 +4389,44 @@ dependencies = [
  "futures-io",
 ]
 
+[[package]]
+name = "pkcs1"
+version = "0.8.0-rc.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "986d2e952779af96ea048f160fd9194e1751b4faea78bcf3ceb456efe008088e"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "pkcs5"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "279a91971a1d8eb1260a30938eae3be9cb67b472dffecb222fbbbe2fd2dc1453"
+dependencies = [
+ "aes 0.9.1",
+ "cbc 0.2.1",
+ "der",
+ "pbkdf2",
+ "rand_core 0.10.1",
+ "scrypt",
+ "sha2 0.11.0",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7"
+dependencies = [
+ "der",
+ "pkcs5",
+ "rand_core 0.10.1",
+ "spki",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
@@ -3773,6 +4492,28 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
+[[package]]
+name = "poly1305"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00baa632505d05512f48a963e16051c54fda9a95cc9acea1a4e3c90991c4a2e"
+dependencies = [
+ "cpufeatures 0.3.0",
+ "universal-hash",
+ "zeroize",
+]
+
+[[package]]
+name = "polyval"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dfc63250416fea14f5749b90725916a6c903f599d51cb635aa7a52bfd03eede"
+dependencies = [
+ "cpubits",
+ "cpufeatures 0.3.0",
+ "universal-hash",
+]
+
 [[package]]
 name = "portable-pty"
 version = "0.9.0"
@@ -3786,7 +4527,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "nix",
+ "nix 0.28.0",
  "serial2",
  "shared_library",
  "shell-words",
@@ -3834,6 +4575,29 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "primefield"
+version = "0.14.0-rc.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d7e42f46a29abc16fb621a3466ee453358ebaae48a9e515f287e0af052ed8f"
+dependencies = [
+ "crypto-bigint",
+ "crypto-common 0.2.2",
+ "ff",
+ "rand_core 0.10.1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "primeorder"
+version = "0.14.0-rc.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d2793f22b9b6fd11ef3ac1d59bf003c2573593e4968702341605c2748fd90bf"
+dependencies = [
+ "elliptic-curve",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -4090,6 +4854,17 @@ dependencies = [
  "rand_core 0.9.5",
 ]
 
+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -4147,6 +4922,12 @@ dependencies = [
  "getrandom 0.3.4",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -4310,6 +5091,16 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "rfc6979"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5236ce872cac07e0fb3969b0cbf468c7d2f37d432f1b627dcb7b8d34563fb0c3"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
 [[package]]
 name = "rfd"
 version = "0.17.2"
@@ -4347,10 +5138,29 @@ dependencies = [
  "cfg-if",
  "getrandom 0.2.17",
  "libc",
- "untrusted",
+ "untrusted 0.9.0",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rsa"
+version = "0.10.0-rc.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b2aa4ba0d89f73d1e332df05be0eeab8840351c36ca5654341dfdb57bb3caf"
+dependencies = [
+ "const-oid",
+ "crypto-bigint",
+ "crypto-primes",
+ "digest 0.11.3",
+ "pkcs1",
+ "pkcs8",
+ "rand_core 0.10.1",
+ "sha2 0.11.0",
+ "signature",
+ "spki",
+ "zeroize",
+]
+
 [[package]]
 name = "rsqlite-vfs"
 version = "0.1.0"
@@ -4376,6 +5186,102 @@ dependencies = [
  "sqlite-wasm-rs",
 ]
 
+[[package]]
+name = "russh"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbf893f64684e58da8a68d56a5e84d1cf0440226274c515770fe267707a7d0b0"
+dependencies = [
+ "aes 0.9.1",
+ "aws-lc-rs",
+ "bitflags 2.11.0",
+ "block-padding 0.4.2",
+ "byteorder",
+ "bytes",
+ "cbc 0.2.1",
+ "cipher 0.5.2",
+ "crypto-bigint",
+ "ctr",
+ "curve25519-dalek",
+ "data-encoding",
+ "delegate",
+ "der",
+ "digest 0.11.3",
+ "ecdsa",
+ "ed25519-dalek",
+ "elliptic-curve",
+ "enum_dispatch",
+ "flate2",
+ "futures",
+ "generic-array 1.4.2",
+ "getrandom 0.4.2",
+ "ghash",
+ "hex-literal",
+ "hmac",
+ "inout 0.2.2",
+ "internal-russh-num-bigint",
+ "keccak",
+ "log",
+ "md5",
+ "ml-kem",
+ "module-lattice",
+ "num-bigint",
+ "p256",
+ "p384",
+ "p521",
+ "pageant",
+ "pbkdf2",
+ "pkcs1",
+ "pkcs5",
+ "pkcs8",
+ "polyval",
+ "rand 0.10.1",
+ "rand_core 0.10.1",
+ "rsa",
+ "russh-cryptovec",
+ "russh-util",
+ "salsa20",
+ "scrypt",
+ "sec1",
+ "sha1 0.11.0",
+ "sha2 0.11.0",
+ "sha3",
+ "signature",
+ "spki",
+ "ssh-encoding",
+ "ssh-key",
+ "subtle",
+ "thiserror 2.0.18",
+ "tokio",
+ "typenum",
+ "universal-hash",
+ "zeroize",
+]
+
+[[package]]
+name = "russh-cryptovec"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "443f6bbcfacb34a1aab2b12b99bf08e0c63abdc5a0db261901365df9d57fff51"
+dependencies = [
+ "log",
+ "nix 0.31.3",
+ "ssh-encoding",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "russh-util"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "668424a5dde0bcb45b55ba7de8476b93831b4aa2fa6947e145f3b053e22c60b6"
+dependencies = [
+ "chrono",
+ "tokio",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "rustc-hash"
 version = "2.1.2"
@@ -4487,7 +5393,7 @@ dependencies = [
  "aws-lc-rs",
  "ring",
  "rustls-pki-types",
- "untrusted",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -4502,6 +5408,16 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
+[[package]]
+name = "salsa20"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f874456e72520ff1375a06c588eaf074b0f01f9e9e1aada45bd9b7954a6e42c"
+dependencies = [
+ "cfg-if",
+ "cipher 0.5.2",
+]
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -4583,6 +5499,32 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "scrypt"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87af57419b594aa23fa95f09f0e06d80d84ba01c26148c43844cad6ff4485f0"
+dependencies = [
+ "cfg-if",
+ "pbkdf2",
+ "salsa20",
+ "sha2 0.11.0",
+]
+
+[[package]]
+name = "sec1"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d56d437c2f19203ce5f7122e507831de96f3d2d4d3be5af44a0b0a09d8a80e4d"
+dependencies = [
+ "base16ct",
+ "ctutils",
+ "der",
+ "hybrid-array",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
 version = "3.7.0"
@@ -4802,6 +5744,16 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "serdect"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66cf8fedced2fcf12406bcb34223dffb92eaf34908ede12fed414c82b7f00b3e"
+dependencies = [
+ "base16ct",
+ "serde",
+]
+
 [[package]]
 name = "serial2"
 version = "0.2.37"
@@ -4861,8 +5813,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
- "cpufeatures",
- "digest",
+ "cpufeatures 0.2.17",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha1"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "digest 0.11.3",
 ]
 
 [[package]]
@@ -4872,8 +5835,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
- "cpufeatures",
- "digest",
+ "cpufeatures 0.2.17",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "digest 0.11.3",
+]
+
+[[package]]
+name = "sha3"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be176f1a57ce4e3d31c1a166222d9768de5954f811601fb7ca06fc8203905ce1"
+dependencies = [
+ "digest 0.11.3",
+ "keccak",
 ]
 
 [[package]]
@@ -4908,6 +5892,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "signature"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5"
+dependencies = [
+ "digest 0.11.3",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
@@ -5006,6 +6000,16 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "spki"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
 [[package]]
 name = "sqlite-wasm-rs"
 version = "0.5.2"
@@ -5018,6 +6022,67 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "ssh-cipher"
+version = "0.3.0-rc.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10db6f219196a8528f9ec904d9d45cdad692d65b0e57e72be4dedd1c5fddce36"
+dependencies = [
+ "aead",
+ "aes 0.9.1",
+ "aes-gcm",
+ "cbc 0.2.1",
+ "chacha20",
+ "cipher 0.5.2",
+ "ctr",
+ "ctutils",
+ "des",
+ "poly1305",
+ "ssh-encoding",
+ "zeroize",
+]
+
+[[package]]
+name = "ssh-encoding"
+version = "0.3.0-rc.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abf34aa716da5d5b4c496936d042ea282ab392092cd68a72ef6a8863ff8c96a"
+dependencies = [
+ "base64ct",
+ "bytes",
+ "crypto-bigint",
+ "ctutils",
+ "digest 0.11.3",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "ssh-key"
+version = "0.7.0-rc.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45735ce3dea95690e4a9e414c4cfde7f79835063c3dcd35881df85a84118e74b"
+dependencies = [
+ "argon2",
+ "bcrypt-pbkdf",
+ "ctutils",
+ "ed25519-dalek",
+ "hex",
+ "hmac",
+ "p256",
+ "p384",
+ "p521",
+ "rand_core 0.10.1",
+ "rsa",
+ "sec1",
+ "sha1 0.11.0",
+ "sha2 0.11.0",
+ "signature",
+ "ssh-cipher",
+ "ssh-encoding",
+ "zeroize",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -5225,7 +6290,7 @@ dependencies = [
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
@@ -5308,7 +6373,7 @@ dependencies = [
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -5350,7 +6415,7 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "sha2",
+ "sha2 0.10.9",
  "syn 2.0.117",
  "tauri-utils",
  "thiserror 2.0.18",
@@ -5416,7 +6481,7 @@ dependencies = [
  "tokio-tungstenite",
  "uuid",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
 ]
 
@@ -5438,7 +6503,7 @@ dependencies = [
  "tauri-plugin",
  "thiserror 2.0.18",
  "url",
- "windows",
+ "windows 0.61.3",
  "zbus",
 ]
 
@@ -5497,7 +6562,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -5522,7 +6587,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
  "wry",
 ]
 
@@ -6085,7 +7150,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.9.2",
- "sha1",
+ "sha1 0.10.6",
  "thiserror 2.0.18",
  "utf-8",
 ]
@@ -6172,6 +7237,22 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "universal-hash"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4987bdc12753382e0bec4a65c50738ffaabc998b9cdd1f952fb5f39b0048a96"
+dependencies = [
+ "crypto-common 0.2.2",
+ "ctutils",
+]
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -6596,7 +7677,7 @@ checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-implement",
  "windows-interface",
@@ -6620,7 +7701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
 dependencies = [
  "thiserror 2.0.18",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
 ]
 
@@ -6682,11 +7763,23 @@ version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
- "windows-collections",
+ "windows-collections 0.2.0",
  "windows-core 0.61.2",
- "windows-future",
+ "windows-future 0.2.1",
  "windows-link 0.1.3",
- "windows-numerics",
+ "windows-numerics 0.2.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections 0.3.2",
+ "windows-core 0.62.2",
+ "windows-future 0.3.2",
+ "windows-numerics 0.3.1",
 ]
 
 [[package]]
@@ -6698,6 +7791,15 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core 0.62.2",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.61.2"
@@ -6732,7 +7834,18 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
  "windows-core 0.61.2",
  "windows-link 0.1.3",
- "windows-threading",
+ "windows-threading 0.1.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+ "windows-threading 0.2.1",
 ]
 
 [[package]]
@@ -6779,6 +7892,16 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.6.1"
@@ -6928,6 +8051,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-version"
 version = "0.1.7"
@@ -7245,7 +8377,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "raw-window-handle",
- "sha2",
+ "sha2 0.10.9",
  "soup3",
  "tao-macros",
  "thiserror 2.0.18",
@@ -7253,7 +8385,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
diff --git a/crates/agent-gateway/internal/proto/v1/gateway.pb.go b/crates/agent-gateway/internal/proto/v1/gateway.pb.go
index 7c159763e..76f474141 100644
--- a/crates/agent-gateway/internal/proto/v1/gateway.pb.go
+++ b/crates/agent-gateway/internal/proto/v1/gateway.pb.go
@@ -158,7 +158,7 @@ func (x ChatEvent_ChatEventType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use ChatEvent_ChatEventType.Descriptor instead.
 func (ChatEvent_ChatEventType) EnumDescriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{28, 0}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{30, 0}
 }
 
 type AuthRequest struct {
@@ -327,6 +327,7 @@ type GatewayEnvelope struct {
 	//	*GatewayEnvelope_TunnelControl
 	//	*GatewayEnvelope_TunnelControlResp
 	//	*GatewayEnvelope_TunnelFrame
+	//	*GatewayEnvelope_SettingsResetSshKnownHost
 	Payload       isGatewayEnvelope_Payload `protobuf_oneof:"payload"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
@@ -743,6 +744,15 @@ func (x *GatewayEnvelope) GetTunnelFrame() *TunnelFrame {
 	return nil
 }
 
+func (x *GatewayEnvelope) GetSettingsResetSshKnownHost() *SettingsResetSshKnownHostRequest {
+	if x != nil {
+		if x, ok := x.Payload.(*GatewayEnvelope_SettingsResetSshKnownHost); ok {
+			return x.SettingsResetSshKnownHost
+		}
+	}
+	return nil
+}
+
 type isGatewayEnvelope_Payload interface {
 	isGatewayEnvelope_Payload()
 }
@@ -907,6 +917,10 @@ type GatewayEnvelope_TunnelFrame struct {
 	TunnelFrame *TunnelFrame `protobuf:"bytes,69,opt,name=tunnel_frame,json=tunnelFrame,proto3,oneof"`
 }
 
+type GatewayEnvelope_SettingsResetSshKnownHost struct {
+	SettingsResetSshKnownHost *SettingsResetSshKnownHostRequest `protobuf:"bytes,72,opt,name=settings_reset_ssh_known_host,json=settingsResetSshKnownHost,proto3,oneof"`
+}
+
 func (*GatewayEnvelope_ChatRequest) isGatewayEnvelope_Payload() {}
 
 func (*GatewayEnvelope_CancelChat) isGatewayEnvelope_Payload() {}
@@ -987,6 +1001,8 @@ func (*GatewayEnvelope_TunnelControlResp) isGatewayEnvelope_Payload() {}
 
 func (*GatewayEnvelope_TunnelFrame) isGatewayEnvelope_Payload() {}
 
+func (*GatewayEnvelope_SettingsResetSshKnownHost) isGatewayEnvelope_Payload() {}
+
 type AgentEnvelope struct {
 	state     protoimpl.MessageState `protogen:"open.v1"`
 	RequestId string                 `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
@@ -1037,6 +1053,7 @@ type AgentEnvelope struct {
 	//	*AgentEnvelope_TunnelFrame
 	//	*AgentEnvelope_ChatControl
 	//	*AgentEnvelope_RuntimeStatus
+	//	*AgentEnvelope_SettingsResetSshKnownHostResp
 	//	*AgentEnvelope_Error
 	Payload       isAgentEnvelope_Payload `protobuf_oneof:"payload"`
 	unknownFields protoimpl.UnknownFields
@@ -1490,6 +1507,15 @@ func (x *AgentEnvelope) GetRuntimeStatus() *RuntimeStatusEvent {
 	return nil
 }
 
+func (x *AgentEnvelope) GetSettingsResetSshKnownHostResp() *SettingsResetSshKnownHostResponse {
+	if x != nil {
+		if x, ok := x.Payload.(*AgentEnvelope_SettingsResetSshKnownHostResp); ok {
+			return x.SettingsResetSshKnownHostResp
+		}
+	}
+	return nil
+}
+
 func (x *AgentEnvelope) GetError() *ErrorResponse {
 	if x != nil {
 		if x, ok := x.Payload.(*AgentEnvelope_Error); ok {
@@ -1679,6 +1705,10 @@ type AgentEnvelope_RuntimeStatus struct {
 	RuntimeStatus *RuntimeStatusEvent `protobuf:"bytes,71,opt,name=runtime_status,json=runtimeStatus,proto3,oneof"`
 }
 
+type AgentEnvelope_SettingsResetSshKnownHostResp struct {
+	SettingsResetSshKnownHostResp *SettingsResetSshKnownHostResponse `protobuf:"bytes,72,opt,name=settings_reset_ssh_known_host_resp,json=settingsResetSshKnownHostResp,proto3,oneof"`
+}
+
 type AgentEnvelope_Error struct {
 	Error *ErrorResponse `protobuf:"bytes,99,opt,name=error,proto3,oneof"`
 }
@@ -1771,6 +1801,8 @@ func (*AgentEnvelope_ChatControl) isAgentEnvelope_Payload() {}
 
 func (*AgentEnvelope_RuntimeStatus) isAgentEnvelope_Payload() {}
 
+func (*AgentEnvelope_SettingsResetSshKnownHostResp) isAgentEnvelope_Payload() {}
+
 func (*AgentEnvelope_Error) isAgentEnvelope_Payload() {}
 
 type ChatSelectedModel struct {
@@ -2837,6 +2869,10 @@ type TerminalRequest struct {
 	Cols           uint32                 `protobuf:"varint,8,opt,name=cols,proto3" json:"cols,omitempty"`
 	Rows           uint32                 `protobuf:"varint,9,opt,name=rows,proto3" json:"rows,omitempty"`
 	MaxBytes       uint32                 `protobuf:"varint,10,opt,name=max_bytes,json=maxBytes,proto3" json:"max_bytes,omitempty"`
+	SshHostId      string                 `protobuf:"bytes,11,opt,name=ssh_host_id,json=sshHostId,proto3" json:"ssh_host_id,omitempty"`
+	PromptId       string                 `protobuf:"bytes,12,opt,name=prompt_id,json=promptId,proto3" json:"prompt_id,omitempty"`
+	PromptAnswer   string                 `protobuf:"bytes,13,opt,name=prompt_answer,json=promptAnswer,proto3" json:"prompt_answer,omitempty"`
+	TrustHostKey   bool                   `protobuf:"varint,14,opt,name=trust_host_key,json=trustHostKey,proto3" json:"trust_host_key,omitempty"`
 	unknownFields  protoimpl.UnknownFields
 	sizeCache      protoimpl.SizeCache
 }
@@ -2941,6 +2977,34 @@ func (x *TerminalRequest) GetMaxBytes() uint32 {
 	return 0
 }
 
+func (x *TerminalRequest) GetSshHostId() string {
+	if x != nil {
+		return x.SshHostId
+	}
+	return ""
+}
+
+func (x *TerminalRequest) GetPromptId() string {
+	if x != nil {
+		return x.PromptId
+	}
+	return ""
+}
+
+func (x *TerminalRequest) GetPromptAnswer() string {
+	if x != nil {
+		return x.PromptAnswer
+	}
+	return ""
+}
+
+func (x *TerminalRequest) GetTrustHostKey() bool {
+	if x != nil {
+		return x.TrustHostKey
+	}
+	return false
+}
+
 type TerminalSession struct {
 	state          protoimpl.MessageState `protogen:"open.v1"`
 	Id             string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -2956,6 +3020,8 @@ type TerminalSession struct {
 	FinishedAt     uint64                 `protobuf:"varint,11,opt,name=finished_at,json=finishedAt,proto3" json:"finished_at,omitempty"`
 	ExitCode       int32                  `protobuf:"varint,12,opt,name=exit_code,json=exitCode,proto3" json:"exit_code,omitempty"`
 	Running        bool                   `protobuf:"varint,13,opt,name=running,proto3" json:"running,omitempty"`
+	Kind           string                 `protobuf:"bytes,14,opt,name=kind,proto3" json:"kind,omitempty"`
+	Ssh            *TerminalSshMetadata   `protobuf:"bytes,15,opt,name=ssh,proto3" json:"ssh,omitempty"`
 	unknownFields  protoimpl.UnknownFields
 	sizeCache      protoimpl.SizeCache
 }
@@ -3081,6 +3147,244 @@ func (x *TerminalSession) GetRunning() bool {
 	return false
 }
 
+func (x *TerminalSession) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *TerminalSession) GetSsh() *TerminalSshMetadata {
+	if x != nil {
+		return x.Ssh
+	}
+	return nil
+}
+
+type TerminalSshMetadata struct {
+	state                protoimpl.MessageState `protogen:"open.v1"`
+	HostId               string                 `protobuf:"bytes,1,opt,name=host_id,json=hostId,proto3" json:"host_id,omitempty"`
+	HostName             string                 `protobuf:"bytes,2,opt,name=host_name,json=hostName,proto3" json:"host_name,omitempty"`
+	Username             string                 `protobuf:"bytes,3,opt,name=username,proto3" json:"username,omitempty"`
+	Host                 string                 `protobuf:"bytes,4,opt,name=host,proto3" json:"host,omitempty"`
+	Port                 uint32                 `protobuf:"varint,5,opt,name=port,proto3" json:"port,omitempty"`
+	AuthType             string                 `protobuf:"bytes,6,opt,name=auth_type,json=authType,proto3" json:"auth_type,omitempty"`
+	Status               string                 `protobuf:"bytes,7,opt,name=status,proto3" json:"status,omitempty"`
+	ReconnectAttempt     uint32                 `protobuf:"varint,8,opt,name=reconnect_attempt,json=reconnectAttempt,proto3" json:"reconnect_attempt,omitempty"`
+	ReconnectMaxAttempts uint32                 `protobuf:"varint,9,opt,name=reconnect_max_attempts,json=reconnectMaxAttempts,proto3" json:"reconnect_max_attempts,omitempty"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
+}
+
+func (x *TerminalSshMetadata) Reset() {
+	*x = TerminalSshMetadata{}
+	mi := &file_proto_v1_gateway_proto_msgTypes[21]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *TerminalSshMetadata) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TerminalSshMetadata) ProtoMessage() {}
+
+func (x *TerminalSshMetadata) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_v1_gateway_proto_msgTypes[21]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TerminalSshMetadata.ProtoReflect.Descriptor instead.
+func (*TerminalSshMetadata) Descriptor() ([]byte, []int) {
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *TerminalSshMetadata) GetHostId() string {
+	if x != nil {
+		return x.HostId
+	}
+	return ""
+}
+
+func (x *TerminalSshMetadata) GetHostName() string {
+	if x != nil {
+		return x.HostName
+	}
+	return ""
+}
+
+func (x *TerminalSshMetadata) GetUsername() string {
+	if x != nil {
+		return x.Username
+	}
+	return ""
+}
+
+func (x *TerminalSshMetadata) GetHost() string {
+	if x != nil {
+		return x.Host
+	}
+	return ""
+}
+
+func (x *TerminalSshMetadata) GetPort() uint32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+func (x *TerminalSshMetadata) GetAuthType() string {
+	if x != nil {
+		return x.AuthType
+	}
+	return ""
+}
+
+func (x *TerminalSshMetadata) GetStatus() string {
+	if x != nil {
+		return x.Status
+	}
+	return ""
+}
+
+func (x *TerminalSshMetadata) GetReconnectAttempt() uint32 {
+	if x != nil {
+		return x.ReconnectAttempt
+	}
+	return 0
+}
+
+func (x *TerminalSshMetadata) GetReconnectMaxAttempts() uint32 {
+	if x != nil {
+		return x.ReconnectMaxAttempts
+	}
+	return 0
+}
+
+type TerminalSshPrompt struct {
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	Id                string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Kind              string                 `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"`
+	HostId            string                 `protobuf:"bytes,3,opt,name=host_id,json=hostId,proto3" json:"host_id,omitempty"`
+	HostName          string                 `protobuf:"bytes,4,opt,name=host_name,json=hostName,proto3" json:"host_name,omitempty"`
+	Host              string                 `protobuf:"bytes,5,opt,name=host,proto3" json:"host,omitempty"`
+	Port              uint32                 `protobuf:"varint,6,opt,name=port,proto3" json:"port,omitempty"`
+	Message           string                 `protobuf:"bytes,7,opt,name=message,proto3" json:"message,omitempty"`
+	FingerprintSha256 string                 `protobuf:"bytes,8,opt,name=fingerprint_sha256,json=fingerprintSha256,proto3" json:"fingerprint_sha256,omitempty"`
+	KeyType           string                 `protobuf:"bytes,9,opt,name=key_type,json=keyType,proto3" json:"key_type,omitempty"`
+	AnswerEcho        bool                   `protobuf:"varint,10,opt,name=answer_echo,json=answerEcho,proto3" json:"answer_echo,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
+}
+
+func (x *TerminalSshPrompt) Reset() {
+	*x = TerminalSshPrompt{}
+	mi := &file_proto_v1_gateway_proto_msgTypes[22]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *TerminalSshPrompt) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TerminalSshPrompt) ProtoMessage() {}
+
+func (x *TerminalSshPrompt) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_v1_gateway_proto_msgTypes[22]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TerminalSshPrompt.ProtoReflect.Descriptor instead.
+func (*TerminalSshPrompt) Descriptor() ([]byte, []int) {
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{22}
+}
+
+func (x *TerminalSshPrompt) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetHostId() string {
+	if x != nil {
+		return x.HostId
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetHostName() string {
+	if x != nil {
+		return x.HostName
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetHost() string {
+	if x != nil {
+		return x.Host
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetPort() uint32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+func (x *TerminalSshPrompt) GetMessage() string {
+	if x != nil {
+		return x.Message
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetFingerprintSha256() string {
+	if x != nil {
+		return x.FingerprintSha256
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetKeyType() string {
+	if x != nil {
+		return x.KeyType
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetAnswerEcho() bool {
+	if x != nil {
+		return x.AnswerEcho
+	}
+	return false
+}
+
 type TerminalShellOption struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -3092,7 +3396,7 @@ type TerminalShellOption struct {
 
 func (x *TerminalShellOption) Reset() {
 	*x = TerminalShellOption{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[21]
+	mi := &file_proto_v1_gateway_proto_msgTypes[23]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3104,7 +3408,7 @@ func (x *TerminalShellOption) String() string {
 func (*TerminalShellOption) ProtoMessage() {}
 
 func (x *TerminalShellOption) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[21]
+	mi := &file_proto_v1_gateway_proto_msgTypes[23]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3117,7 +3421,7 @@ func (x *TerminalShellOption) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TerminalShellOption.ProtoReflect.Descriptor instead.
 func (*TerminalShellOption) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{21}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *TerminalShellOption) GetId() string {
@@ -3152,13 +3456,15 @@ type TerminalResponse struct {
 	DefaultShell      string                 `protobuf:"bytes,7,opt,name=default_shell,json=defaultShell,proto3" json:"default_shell,omitempty"`
 	OutputStartOffset uint64                 `protobuf:"varint,8,opt,name=output_start_offset,json=outputStartOffset,proto3" json:"output_start_offset,omitempty"`
 	OutputEndOffset   uint64                 `protobuf:"varint,9,opt,name=output_end_offset,json=outputEndOffset,proto3" json:"output_end_offset,omitempty"`
+	SshPrompt         *TerminalSshPrompt     `protobuf:"bytes,10,opt,name=ssh_prompt,json=sshPrompt,proto3" json:"ssh_prompt,omitempty"`
+	LatencyMs         uint32                 `protobuf:"varint,11,opt,name=latency_ms,json=latencyMs,proto3" json:"latency_ms,omitempty"`
 	unknownFields     protoimpl.UnknownFields
 	sizeCache         protoimpl.SizeCache
 }
 
 func (x *TerminalResponse) Reset() {
 	*x = TerminalResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[22]
+	mi := &file_proto_v1_gateway_proto_msgTypes[24]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3170,7 +3476,7 @@ func (x *TerminalResponse) String() string {
 func (*TerminalResponse) ProtoMessage() {}
 
 func (x *TerminalResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[22]
+	mi := &file_proto_v1_gateway_proto_msgTypes[24]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3183,7 +3489,7 @@ func (x *TerminalResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TerminalResponse.ProtoReflect.Descriptor instead.
 func (*TerminalResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{22}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *TerminalResponse) GetAction() string {
@@ -3249,6 +3555,20 @@ func (x *TerminalResponse) GetOutputEndOffset() uint64 {
 	return 0
 }
 
+func (x *TerminalResponse) GetSshPrompt() *TerminalSshPrompt {
+	if x != nil {
+		return x.SshPrompt
+	}
+	return nil
+}
+
+func (x *TerminalResponse) GetLatencyMs() uint32 {
+	if x != nil {
+		return x.LatencyMs
+	}
+	return 0
+}
+
 type TerminalEvent struct {
 	state             protoimpl.MessageState `protogen:"open.v1"`
 	Kind              string                 `protobuf:"bytes,1,opt,name=kind,proto3" json:"kind,omitempty"`
@@ -3264,7 +3584,7 @@ type TerminalEvent struct {
 
 func (x *TerminalEvent) Reset() {
 	*x = TerminalEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[23]
+	mi := &file_proto_v1_gateway_proto_msgTypes[25]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3276,7 +3596,7 @@ func (x *TerminalEvent) String() string {
 func (*TerminalEvent) ProtoMessage() {}
 
 func (x *TerminalEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[23]
+	mi := &file_proto_v1_gateway_proto_msgTypes[25]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3289,7 +3609,7 @@ func (x *TerminalEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TerminalEvent.ProtoReflect.Descriptor instead.
 func (*TerminalEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{23}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *TerminalEvent) GetKind() string {
@@ -3352,7 +3672,7 @@ type GitRequest struct {
 
 func (x *GitRequest) Reset() {
 	*x = GitRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[24]
+	mi := &file_proto_v1_gateway_proto_msgTypes[26]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3364,7 +3684,7 @@ func (x *GitRequest) String() string {
 func (*GitRequest) ProtoMessage() {}
 
 func (x *GitRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[24]
+	mi := &file_proto_v1_gateway_proto_msgTypes[26]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3377,7 +3697,7 @@ func (x *GitRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GitRequest.ProtoReflect.Descriptor instead.
 func (*GitRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{24}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *GitRequest) GetAction() string {
@@ -3411,7 +3731,7 @@ type GitResponse struct {
 
 func (x *GitResponse) Reset() {
 	*x = GitResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[25]
+	mi := &file_proto_v1_gateway_proto_msgTypes[27]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3423,7 +3743,7 @@ func (x *GitResponse) String() string {
 func (*GitResponse) ProtoMessage() {}
 
 func (x *GitResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[25]
+	mi := &file_proto_v1_gateway_proto_msgTypes[27]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3436,7 +3756,7 @@ func (x *GitResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GitResponse.ProtoReflect.Descriptor instead.
 func (*GitResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{25}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *GitResponse) GetAction() string {
@@ -3470,7 +3790,7 @@ type ChatRequest struct {
 
 func (x *ChatRequest) Reset() {
 	*x = ChatRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[26]
+	mi := &file_proto_v1_gateway_proto_msgTypes[28]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3482,7 +3802,7 @@ func (x *ChatRequest) String() string {
 func (*ChatRequest) ProtoMessage() {}
 
 func (x *ChatRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[26]
+	mi := &file_proto_v1_gateway_proto_msgTypes[28]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3495,7 +3815,7 @@ func (x *ChatRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatRequest.ProtoReflect.Descriptor instead.
 func (*ChatRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{26}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *ChatRequest) GetConversationId() string {
@@ -3570,7 +3890,7 @@ type CancelChatRequest struct {
 
 func (x *CancelChatRequest) Reset() {
 	*x = CancelChatRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[27]
+	mi := &file_proto_v1_gateway_proto_msgTypes[29]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3582,7 +3902,7 @@ func (x *CancelChatRequest) String() string {
 func (*CancelChatRequest) ProtoMessage() {}
 
 func (x *CancelChatRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[27]
+	mi := &file_proto_v1_gateway_proto_msgTypes[29]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3595,7 +3915,7 @@ func (x *CancelChatRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CancelChatRequest.ProtoReflect.Descriptor instead.
 func (*CancelChatRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{27}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *CancelChatRequest) GetConversationId() string {
@@ -3616,7 +3936,7 @@ type ChatEvent struct {
 
 func (x *ChatEvent) Reset() {
 	*x = ChatEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[28]
+	mi := &file_proto_v1_gateway_proto_msgTypes[30]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3628,7 +3948,7 @@ func (x *ChatEvent) String() string {
 func (*ChatEvent) ProtoMessage() {}
 
 func (x *ChatEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[28]
+	mi := &file_proto_v1_gateway_proto_msgTypes[30]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3641,7 +3961,7 @@ func (x *ChatEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatEvent.ProtoReflect.Descriptor instead.
 func (*ChatEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{28}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *ChatEvent) GetType() ChatEvent_ChatEventType {
@@ -3682,7 +4002,7 @@ type ChatControlEvent struct {
 
 func (x *ChatControlEvent) Reset() {
 	*x = ChatControlEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[29]
+	mi := &file_proto_v1_gateway_proto_msgTypes[31]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3694,7 +4014,7 @@ func (x *ChatControlEvent) String() string {
 func (*ChatControlEvent) ProtoMessage() {}
 
 func (x *ChatControlEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[29]
+	mi := &file_proto_v1_gateway_proto_msgTypes[31]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3707,7 +4027,7 @@ func (x *ChatControlEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatControlEvent.ProtoReflect.Descriptor instead.
 func (*ChatControlEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{29}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *ChatControlEvent) GetRequestId() string {
@@ -3786,7 +4106,7 @@ type RuntimeStatusEvent struct {
 
 func (x *RuntimeStatusEvent) Reset() {
 	*x = RuntimeStatusEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[30]
+	mi := &file_proto_v1_gateway_proto_msgTypes[32]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3798,7 +4118,7 @@ func (x *RuntimeStatusEvent) String() string {
 func (*RuntimeStatusEvent) ProtoMessage() {}
 
 func (x *RuntimeStatusEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[30]
+	mi := &file_proto_v1_gateway_proto_msgTypes[32]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3811,7 +4131,7 @@ func (x *RuntimeStatusEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RuntimeStatusEvent.ProtoReflect.Descriptor instead.
 func (*RuntimeStatusEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{30}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *RuntimeStatusEvent) GetWorkerId() string {
@@ -3860,7 +4180,7 @@ type CronManageRequest struct {
 
 func (x *CronManageRequest) Reset() {
 	*x = CronManageRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[31]
+	mi := &file_proto_v1_gateway_proto_msgTypes[33]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3872,7 +4192,7 @@ func (x *CronManageRequest) String() string {
 func (*CronManageRequest) ProtoMessage() {}
 
 func (x *CronManageRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[31]
+	mi := &file_proto_v1_gateway_proto_msgTypes[33]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3885,7 +4205,7 @@ func (x *CronManageRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CronManageRequest.ProtoReflect.Descriptor instead.
 func (*CronManageRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{31}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *CronManageRequest) GetAction() string {
@@ -3919,7 +4239,7 @@ type CronManageResponse struct {
 
 func (x *CronManageResponse) Reset() {
 	*x = CronManageResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[32]
+	mi := &file_proto_v1_gateway_proto_msgTypes[34]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3931,7 +4251,7 @@ func (x *CronManageResponse) String() string {
 func (*CronManageResponse) ProtoMessage() {}
 
 func (x *CronManageResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[32]
+	mi := &file_proto_v1_gateway_proto_msgTypes[34]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3944,7 +4264,7 @@ func (x *CronManageResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CronManageResponse.ProtoReflect.Descriptor instead.
 func (*CronManageResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{32}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *CronManageResponse) GetAction() string {
@@ -3973,7 +4293,7 @@ type HistoryListRequest struct {
 
 func (x *HistoryListRequest) Reset() {
 	*x = HistoryListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[33]
+	mi := &file_proto_v1_gateway_proto_msgTypes[35]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3985,7 +4305,7 @@ func (x *HistoryListRequest) String() string {
 func (*HistoryListRequest) ProtoMessage() {}
 
 func (x *HistoryListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[33]
+	mi := &file_proto_v1_gateway_proto_msgTypes[35]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3998,7 +4318,7 @@ func (x *HistoryListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryListRequest.ProtoReflect.Descriptor instead.
 func (*HistoryListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{33}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *HistoryListRequest) GetPage() int32 {
@@ -4039,7 +4359,7 @@ type HistoryListResponse struct {
 
 func (x *HistoryListResponse) Reset() {
 	*x = HistoryListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[34]
+	mi := &file_proto_v1_gateway_proto_msgTypes[36]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4051,7 +4371,7 @@ func (x *HistoryListResponse) String() string {
 func (*HistoryListResponse) ProtoMessage() {}
 
 func (x *HistoryListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[34]
+	mi := &file_proto_v1_gateway_proto_msgTypes[36]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4064,7 +4384,7 @@ func (x *HistoryListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryListResponse.ProtoReflect.Descriptor instead.
 func (*HistoryListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{34}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *HistoryListResponse) GetConversations() []*ConversationSummary {
@@ -4101,7 +4421,7 @@ type ConversationSummary struct {
 
 func (x *ConversationSummary) Reset() {
 	*x = ConversationSummary{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[35]
+	mi := &file_proto_v1_gateway_proto_msgTypes[37]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4113,7 +4433,7 @@ func (x *ConversationSummary) String() string {
 func (*ConversationSummary) ProtoMessage() {}
 
 func (x *ConversationSummary) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[35]
+	mi := &file_proto_v1_gateway_proto_msgTypes[37]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4126,7 +4446,7 @@ func (x *ConversationSummary) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConversationSummary.ProtoReflect.Descriptor instead.
 func (*ConversationSummary) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{35}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *ConversationSummary) GetId() string {
@@ -4223,7 +4543,7 @@ type HistoryGetRequest struct {
 
 func (x *HistoryGetRequest) Reset() {
 	*x = HistoryGetRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[36]
+	mi := &file_proto_v1_gateway_proto_msgTypes[38]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4235,7 +4555,7 @@ func (x *HistoryGetRequest) String() string {
 func (*HistoryGetRequest) ProtoMessage() {}
 
 func (x *HistoryGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[36]
+	mi := &file_proto_v1_gateway_proto_msgTypes[38]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4248,7 +4568,7 @@ func (x *HistoryGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryGetRequest.ProtoReflect.Descriptor instead.
 func (*HistoryGetRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{36}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *HistoryGetRequest) GetConversationId() string {
@@ -4279,7 +4599,7 @@ type HistoryGetResponse struct {
 
 func (x *HistoryGetResponse) Reset() {
 	*x = HistoryGetResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[37]
+	mi := &file_proto_v1_gateway_proto_msgTypes[39]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4291,7 +4611,7 @@ func (x *HistoryGetResponse) String() string {
 func (*HistoryGetResponse) ProtoMessage() {}
 
 func (x *HistoryGetResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[37]
+	mi := &file_proto_v1_gateway_proto_msgTypes[39]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4304,7 +4624,7 @@ func (x *HistoryGetResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryGetResponse.ProtoReflect.Descriptor instead.
 func (*HistoryGetResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{37}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *HistoryGetResponse) GetConversationId() string {
@@ -4359,7 +4679,7 @@ type HistoryRenameRequest struct {
 
 func (x *HistoryRenameRequest) Reset() {
 	*x = HistoryRenameRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[38]
+	mi := &file_proto_v1_gateway_proto_msgTypes[40]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4371,7 +4691,7 @@ func (x *HistoryRenameRequest) String() string {
 func (*HistoryRenameRequest) ProtoMessage() {}
 
 func (x *HistoryRenameRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[38]
+	mi := &file_proto_v1_gateway_proto_msgTypes[40]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4384,7 +4704,7 @@ func (x *HistoryRenameRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryRenameRequest.ProtoReflect.Descriptor instead.
 func (*HistoryRenameRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{38}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *HistoryRenameRequest) GetConversationId() string {
@@ -4410,7 +4730,7 @@ type HistoryRenameResponse struct {
 
 func (x *HistoryRenameResponse) Reset() {
 	*x = HistoryRenameResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[39]
+	mi := &file_proto_v1_gateway_proto_msgTypes[41]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4422,7 +4742,7 @@ func (x *HistoryRenameResponse) String() string {
 func (*HistoryRenameResponse) ProtoMessage() {}
 
 func (x *HistoryRenameResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[39]
+	mi := &file_proto_v1_gateway_proto_msgTypes[41]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4435,7 +4755,7 @@ func (x *HistoryRenameResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryRenameResponse.ProtoReflect.Descriptor instead.
 func (*HistoryRenameResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{39}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *HistoryRenameResponse) GetConversation() *ConversationSummary {
@@ -4455,7 +4775,7 @@ type HistoryPinRequest struct {
 
 func (x *HistoryPinRequest) Reset() {
 	*x = HistoryPinRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[40]
+	mi := &file_proto_v1_gateway_proto_msgTypes[42]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4467,7 +4787,7 @@ func (x *HistoryPinRequest) String() string {
 func (*HistoryPinRequest) ProtoMessage() {}
 
 func (x *HistoryPinRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[40]
+	mi := &file_proto_v1_gateway_proto_msgTypes[42]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4480,7 +4800,7 @@ func (x *HistoryPinRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryPinRequest.ProtoReflect.Descriptor instead.
 func (*HistoryPinRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{40}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *HistoryPinRequest) GetConversationId() string {
@@ -4506,7 +4826,7 @@ type HistoryPinResponse struct {
 
 func (x *HistoryPinResponse) Reset() {
 	*x = HistoryPinResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[41]
+	mi := &file_proto_v1_gateway_proto_msgTypes[43]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4518,7 +4838,7 @@ func (x *HistoryPinResponse) String() string {
 func (*HistoryPinResponse) ProtoMessage() {}
 
 func (x *HistoryPinResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[41]
+	mi := &file_proto_v1_gateway_proto_msgTypes[43]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4531,7 +4851,7 @@ func (x *HistoryPinResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryPinResponse.ProtoReflect.Descriptor instead.
 func (*HistoryPinResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{41}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *HistoryPinResponse) GetConversation() *ConversationSummary {
@@ -4555,7 +4875,7 @@ type HistoryShareStatus struct {
 
 func (x *HistoryShareStatus) Reset() {
 	*x = HistoryShareStatus{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[42]
+	mi := &file_proto_v1_gateway_proto_msgTypes[44]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4567,7 +4887,7 @@ func (x *HistoryShareStatus) String() string {
 func (*HistoryShareStatus) ProtoMessage() {}
 
 func (x *HistoryShareStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[42]
+	mi := &file_proto_v1_gateway_proto_msgTypes[44]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4580,7 +4900,7 @@ func (x *HistoryShareStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareStatus.ProtoReflect.Descriptor instead.
 func (*HistoryShareStatus) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{42}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{44}
 }
 
 func (x *HistoryShareStatus) GetConversationId() string {
@@ -4634,7 +4954,7 @@ type HistoryShareGetRequest struct {
 
 func (x *HistoryShareGetRequest) Reset() {
 	*x = HistoryShareGetRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[43]
+	mi := &file_proto_v1_gateway_proto_msgTypes[45]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4646,7 +4966,7 @@ func (x *HistoryShareGetRequest) String() string {
 func (*HistoryShareGetRequest) ProtoMessage() {}
 
 func (x *HistoryShareGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[43]
+	mi := &file_proto_v1_gateway_proto_msgTypes[45]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4659,7 +4979,7 @@ func (x *HistoryShareGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareGetRequest.ProtoReflect.Descriptor instead.
 func (*HistoryShareGetRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{43}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{45}
 }
 
 func (x *HistoryShareGetRequest) GetConversationId() string {
@@ -4678,7 +4998,7 @@ type HistoryShareGetResponse struct {
 
 func (x *HistoryShareGetResponse) Reset() {
 	*x = HistoryShareGetResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[44]
+	mi := &file_proto_v1_gateway_proto_msgTypes[46]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4690,7 +5010,7 @@ func (x *HistoryShareGetResponse) String() string {
 func (*HistoryShareGetResponse) ProtoMessage() {}
 
 func (x *HistoryShareGetResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[44]
+	mi := &file_proto_v1_gateway_proto_msgTypes[46]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4703,7 +5023,7 @@ func (x *HistoryShareGetResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareGetResponse.ProtoReflect.Descriptor instead.
 func (*HistoryShareGetResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{44}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{46}
 }
 
 func (x *HistoryShareGetResponse) GetShare() *HistoryShareStatus {
@@ -4724,7 +5044,7 @@ type HistoryShareSetRequest struct {
 
 func (x *HistoryShareSetRequest) Reset() {
 	*x = HistoryShareSetRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[45]
+	mi := &file_proto_v1_gateway_proto_msgTypes[47]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4736,7 +5056,7 @@ func (x *HistoryShareSetRequest) String() string {
 func (*HistoryShareSetRequest) ProtoMessage() {}
 
 func (x *HistoryShareSetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[45]
+	mi := &file_proto_v1_gateway_proto_msgTypes[47]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4749,7 +5069,7 @@ func (x *HistoryShareSetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareSetRequest.ProtoReflect.Descriptor instead.
 func (*HistoryShareSetRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{45}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *HistoryShareSetRequest) GetConversationId() string {
@@ -4782,7 +5102,7 @@ type HistoryShareSetResponse struct {
 
 func (x *HistoryShareSetResponse) Reset() {
 	*x = HistoryShareSetResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[46]
+	mi := &file_proto_v1_gateway_proto_msgTypes[48]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4794,7 +5114,7 @@ func (x *HistoryShareSetResponse) String() string {
 func (*HistoryShareSetResponse) ProtoMessage() {}
 
 func (x *HistoryShareSetResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[46]
+	mi := &file_proto_v1_gateway_proto_msgTypes[48]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4807,7 +5127,7 @@ func (x *HistoryShareSetResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareSetResponse.ProtoReflect.Descriptor instead.
 func (*HistoryShareSetResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{46}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{48}
 }
 
 func (x *HistoryShareSetResponse) GetShare() *HistoryShareStatus {
@@ -4826,7 +5146,7 @@ type HistoryShareResolveRequest struct {
 
 func (x *HistoryShareResolveRequest) Reset() {
 	*x = HistoryShareResolveRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[47]
+	mi := &file_proto_v1_gateway_proto_msgTypes[49]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4838,7 +5158,7 @@ func (x *HistoryShareResolveRequest) String() string {
 func (*HistoryShareResolveRequest) ProtoMessage() {}
 
 func (x *HistoryShareResolveRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[47]
+	mi := &file_proto_v1_gateway_proto_msgTypes[49]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4851,7 +5171,7 @@ func (x *HistoryShareResolveRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareResolveRequest.ProtoReflect.Descriptor instead.
 func (*HistoryShareResolveRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{47}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{49}
 }
 
 func (x *HistoryShareResolveRequest) GetToken() string {
@@ -4874,7 +5194,7 @@ type HistoryShareResolveResponse struct {
 
 func (x *HistoryShareResolveResponse) Reset() {
 	*x = HistoryShareResolveResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[48]
+	mi := &file_proto_v1_gateway_proto_msgTypes[50]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4886,7 +5206,7 @@ func (x *HistoryShareResolveResponse) String() string {
 func (*HistoryShareResolveResponse) ProtoMessage() {}
 
 func (x *HistoryShareResolveResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[48]
+	mi := &file_proto_v1_gateway_proto_msgTypes[50]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4899,7 +5219,7 @@ func (x *HistoryShareResolveResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareResolveResponse.ProtoReflect.Descriptor instead.
 func (*HistoryShareResolveResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{48}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{50}
 }
 
 func (x *HistoryShareResolveResponse) GetConversationId() string {
@@ -4945,7 +5265,7 @@ type HistoryWorkdirsRequest struct {
 
 func (x *HistoryWorkdirsRequest) Reset() {
 	*x = HistoryWorkdirsRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[49]
+	mi := &file_proto_v1_gateway_proto_msgTypes[51]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4957,7 +5277,7 @@ func (x *HistoryWorkdirsRequest) String() string {
 func (*HistoryWorkdirsRequest) ProtoMessage() {}
 
 func (x *HistoryWorkdirsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[49]
+	mi := &file_proto_v1_gateway_proto_msgTypes[51]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4970,7 +5290,7 @@ func (x *HistoryWorkdirsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryWorkdirsRequest.ProtoReflect.Descriptor instead.
 func (*HistoryWorkdirsRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{49}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{51}
 }
 
 type HistoryWorkdirSummary struct {
@@ -4984,7 +5304,7 @@ type HistoryWorkdirSummary struct {
 
 func (x *HistoryWorkdirSummary) Reset() {
 	*x = HistoryWorkdirSummary{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[50]
+	mi := &file_proto_v1_gateway_proto_msgTypes[52]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4996,7 +5316,7 @@ func (x *HistoryWorkdirSummary) String() string {
 func (*HistoryWorkdirSummary) ProtoMessage() {}
 
 func (x *HistoryWorkdirSummary) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[50]
+	mi := &file_proto_v1_gateway_proto_msgTypes[52]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5009,7 +5329,7 @@ func (x *HistoryWorkdirSummary) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryWorkdirSummary.ProtoReflect.Descriptor instead.
 func (*HistoryWorkdirSummary) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{50}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{52}
 }
 
 func (x *HistoryWorkdirSummary) GetPath() string {
@@ -5042,7 +5362,7 @@ type HistoryWorkdirsResponse struct {
 
 func (x *HistoryWorkdirsResponse) Reset() {
 	*x = HistoryWorkdirsResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[51]
+	mi := &file_proto_v1_gateway_proto_msgTypes[53]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5054,7 +5374,7 @@ func (x *HistoryWorkdirsResponse) String() string {
 func (*HistoryWorkdirsResponse) ProtoMessage() {}
 
 func (x *HistoryWorkdirsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[51]
+	mi := &file_proto_v1_gateway_proto_msgTypes[53]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5067,7 +5387,7 @@ func (x *HistoryWorkdirsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryWorkdirsResponse.ProtoReflect.Descriptor instead.
 func (*HistoryWorkdirsResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{51}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{53}
 }
 
 func (x *HistoryWorkdirsResponse) GetWorkdirs() []*HistoryWorkdirSummary {
@@ -5086,7 +5406,7 @@ type HistoryDeleteRequest struct {
 
 func (x *HistoryDeleteRequest) Reset() {
 	*x = HistoryDeleteRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[52]
+	mi := &file_proto_v1_gateway_proto_msgTypes[54]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5098,7 +5418,7 @@ func (x *HistoryDeleteRequest) String() string {
 func (*HistoryDeleteRequest) ProtoMessage() {}
 
 func (x *HistoryDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[52]
+	mi := &file_proto_v1_gateway_proto_msgTypes[54]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5111,7 +5431,7 @@ func (x *HistoryDeleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryDeleteRequest.ProtoReflect.Descriptor instead.
 func (*HistoryDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{52}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{54}
 }
 
 func (x *HistoryDeleteRequest) GetConversationId() string {
@@ -5129,7 +5449,7 @@ type HistoryDeleteResponse struct {
 
 func (x *HistoryDeleteResponse) Reset() {
 	*x = HistoryDeleteResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[53]
+	mi := &file_proto_v1_gateway_proto_msgTypes[55]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5141,7 +5461,7 @@ func (x *HistoryDeleteResponse) String() string {
 func (*HistoryDeleteResponse) ProtoMessage() {}
 
 func (x *HistoryDeleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[53]
+	mi := &file_proto_v1_gateway_proto_msgTypes[55]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5154,7 +5474,7 @@ func (x *HistoryDeleteResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryDeleteResponse.ProtoReflect.Descriptor instead.
 func (*HistoryDeleteResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{53}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{55}
 }
 
 type HistoryTruncateRequest struct {
@@ -5169,7 +5489,7 @@ type HistoryTruncateRequest struct {
 
 func (x *HistoryTruncateRequest) Reset() {
 	*x = HistoryTruncateRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[54]
+	mi := &file_proto_v1_gateway_proto_msgTypes[56]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5181,7 +5501,7 @@ func (x *HistoryTruncateRequest) String() string {
 func (*HistoryTruncateRequest) ProtoMessage() {}
 
 func (x *HistoryTruncateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[54]
+	mi := &file_proto_v1_gateway_proto_msgTypes[56]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5194,7 +5514,7 @@ func (x *HistoryTruncateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryTruncateRequest.ProtoReflect.Descriptor instead.
 func (*HistoryTruncateRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{54}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{56}
 }
 
 func (x *HistoryTruncateRequest) GetConversationId() string {
@@ -5236,7 +5556,7 @@ type HistoryTruncateResponse struct {
 
 func (x *HistoryTruncateResponse) Reset() {
 	*x = HistoryTruncateResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[55]
+	mi := &file_proto_v1_gateway_proto_msgTypes[57]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5248,7 +5568,7 @@ func (x *HistoryTruncateResponse) String() string {
 func (*HistoryTruncateResponse) ProtoMessage() {}
 
 func (x *HistoryTruncateResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[55]
+	mi := &file_proto_v1_gateway_proto_msgTypes[57]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5261,7 +5581,7 @@ func (x *HistoryTruncateResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryTruncateResponse.ProtoReflect.Descriptor instead.
 func (*HistoryTruncateResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{55}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{57}
 }
 
 func (x *HistoryTruncateResponse) GetConversationId() string {
@@ -5296,7 +5616,7 @@ type HistorySyncEvent struct {
 
 func (x *HistorySyncEvent) Reset() {
 	*x = HistorySyncEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[56]
+	mi := &file_proto_v1_gateway_proto_msgTypes[58]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5308,7 +5628,7 @@ func (x *HistorySyncEvent) String() string {
 func (*HistorySyncEvent) ProtoMessage() {}
 
 func (x *HistorySyncEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[56]
+	mi := &file_proto_v1_gateway_proto_msgTypes[58]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5321,7 +5641,7 @@ func (x *HistorySyncEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistorySyncEvent.ProtoReflect.Descriptor instead.
 func (*HistorySyncEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{56}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{58}
 }
 
 func (x *HistorySyncEvent) GetKind() string {
@@ -5353,7 +5673,7 @@ type ProviderListRequest struct {
 
 func (x *ProviderListRequest) Reset() {
 	*x = ProviderListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[57]
+	mi := &file_proto_v1_gateway_proto_msgTypes[59]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5365,7 +5685,7 @@ func (x *ProviderListRequest) String() string {
 func (*ProviderListRequest) ProtoMessage() {}
 
 func (x *ProviderListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[57]
+	mi := &file_proto_v1_gateway_proto_msgTypes[59]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5378,7 +5698,7 @@ func (x *ProviderListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProviderListRequest.ProtoReflect.Descriptor instead.
 func (*ProviderListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{57}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{59}
 }
 
 type ProviderListResponse struct {
@@ -5390,7 +5710,7 @@ type ProviderListResponse struct {
 
 func (x *ProviderListResponse) Reset() {
 	*x = ProviderListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[58]
+	mi := &file_proto_v1_gateway_proto_msgTypes[60]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5402,7 +5722,7 @@ func (x *ProviderListResponse) String() string {
 func (*ProviderListResponse) ProtoMessage() {}
 
 func (x *ProviderListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[58]
+	mi := &file_proto_v1_gateway_proto_msgTypes[60]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5415,7 +5735,7 @@ func (x *ProviderListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProviderListResponse.ProtoReflect.Descriptor instead.
 func (*ProviderListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{58}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{60}
 }
 
 func (x *ProviderListResponse) GetProvidersJson() string {
@@ -5433,7 +5753,7 @@ type SettingsGetRequest struct {
 
 func (x *SettingsGetRequest) Reset() {
 	*x = SettingsGetRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[59]
+	mi := &file_proto_v1_gateway_proto_msgTypes[61]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5445,7 +5765,7 @@ func (x *SettingsGetRequest) String() string {
 func (*SettingsGetRequest) ProtoMessage() {}
 
 func (x *SettingsGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[59]
+	mi := &file_proto_v1_gateway_proto_msgTypes[61]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5458,7 +5778,7 @@ func (x *SettingsGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsGetRequest.ProtoReflect.Descriptor instead.
 func (*SettingsGetRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{59}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{61}
 }
 
 type SettingsGetResponse struct {
@@ -5470,7 +5790,7 @@ type SettingsGetResponse struct {
 
 func (x *SettingsGetResponse) Reset() {
 	*x = SettingsGetResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[60]
+	mi := &file_proto_v1_gateway_proto_msgTypes[62]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5482,7 +5802,7 @@ func (x *SettingsGetResponse) String() string {
 func (*SettingsGetResponse) ProtoMessage() {}
 
 func (x *SettingsGetResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[60]
+	mi := &file_proto_v1_gateway_proto_msgTypes[62]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5495,7 +5815,7 @@ func (x *SettingsGetResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsGetResponse.ProtoReflect.Descriptor instead.
 func (*SettingsGetResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{60}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{62}
 }
 
 func (x *SettingsGetResponse) GetSettingsJson() string {
@@ -5514,7 +5834,7 @@ type SettingsUpdateRequest struct {
 
 func (x *SettingsUpdateRequest) Reset() {
 	*x = SettingsUpdateRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[61]
+	mi := &file_proto_v1_gateway_proto_msgTypes[63]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5526,7 +5846,7 @@ func (x *SettingsUpdateRequest) String() string {
 func (*SettingsUpdateRequest) ProtoMessage() {}
 
 func (x *SettingsUpdateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[61]
+	mi := &file_proto_v1_gateway_proto_msgTypes[63]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5539,7 +5859,7 @@ func (x *SettingsUpdateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsUpdateRequest.ProtoReflect.Descriptor instead.
 func (*SettingsUpdateRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{61}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{63}
 }
 
 func (x *SettingsUpdateRequest) GetSettingsJson() string {
@@ -5559,7 +5879,7 @@ type SettingsUpdateResponse struct {
 
 func (x *SettingsUpdateResponse) Reset() {
 	*x = SettingsUpdateResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[62]
+	mi := &file_proto_v1_gateway_proto_msgTypes[64]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5571,7 +5891,7 @@ func (x *SettingsUpdateResponse) String() string {
 func (*SettingsUpdateResponse) ProtoMessage() {}
 
 func (x *SettingsUpdateResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[62]
+	mi := &file_proto_v1_gateway_proto_msgTypes[64]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5584,7 +5904,7 @@ func (x *SettingsUpdateResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsUpdateResponse.ProtoReflect.Descriptor instead.
 func (*SettingsUpdateResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{62}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{64}
 }
 
 func (x *SettingsUpdateResponse) GetAccepted() bool {
@@ -5601,6 +5921,102 @@ func (x *SettingsUpdateResponse) GetMessage() string {
 	return ""
 }
 
+type SettingsResetSshKnownHostRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Host          string                 `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
+	Port          uint32                 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *SettingsResetSshKnownHostRequest) Reset() {
+	*x = SettingsResetSshKnownHostRequest{}
+	mi := &file_proto_v1_gateway_proto_msgTypes[65]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *SettingsResetSshKnownHostRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SettingsResetSshKnownHostRequest) ProtoMessage() {}
+
+func (x *SettingsResetSshKnownHostRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_v1_gateway_proto_msgTypes[65]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SettingsResetSshKnownHostRequest.ProtoReflect.Descriptor instead.
+func (*SettingsResetSshKnownHostRequest) Descriptor() ([]byte, []int) {
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{65}
+}
+
+func (x *SettingsResetSshKnownHostRequest) GetHost() string {
+	if x != nil {
+		return x.Host
+	}
+	return ""
+}
+
+func (x *SettingsResetSshKnownHostRequest) GetPort() uint32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+type SettingsResetSshKnownHostResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Deleted       uint32                 `protobuf:"varint,1,opt,name=deleted,proto3" json:"deleted,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *SettingsResetSshKnownHostResponse) Reset() {
+	*x = SettingsResetSshKnownHostResponse{}
+	mi := &file_proto_v1_gateway_proto_msgTypes[66]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *SettingsResetSshKnownHostResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SettingsResetSshKnownHostResponse) ProtoMessage() {}
+
+func (x *SettingsResetSshKnownHostResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_v1_gateway_proto_msgTypes[66]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SettingsResetSshKnownHostResponse.ProtoReflect.Descriptor instead.
+func (*SettingsResetSshKnownHostResponse) Descriptor() ([]byte, []int) {
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{66}
+}
+
+func (x *SettingsResetSshKnownHostResponse) GetDeleted() uint32 {
+	if x != nil {
+		return x.Deleted
+	}
+	return 0
+}
+
 type SettingsSyncEvent struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	SettingsJson  string                 `protobuf:"bytes,1,opt,name=settings_json,json=settingsJson,proto3" json:"settings_json,omitempty"`
@@ -5610,7 +6026,7 @@ type SettingsSyncEvent struct {
 
 func (x *SettingsSyncEvent) Reset() {
 	*x = SettingsSyncEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[63]
+	mi := &file_proto_v1_gateway_proto_msgTypes[67]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5622,7 +6038,7 @@ func (x *SettingsSyncEvent) String() string {
 func (*SettingsSyncEvent) ProtoMessage() {}
 
 func (x *SettingsSyncEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[63]
+	mi := &file_proto_v1_gateway_proto_msgTypes[67]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5635,7 +6051,7 @@ func (x *SettingsSyncEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsSyncEvent.ProtoReflect.Descriptor instead.
 func (*SettingsSyncEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{63}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{67}
 }
 
 func (x *SettingsSyncEvent) GetSettingsJson() string {
@@ -5653,7 +6069,7 @@ type SkillFilesListRequest struct {
 
 func (x *SkillFilesListRequest) Reset() {
 	*x = SkillFilesListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[64]
+	mi := &file_proto_v1_gateway_proto_msgTypes[68]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5665,7 +6081,7 @@ func (x *SkillFilesListRequest) String() string {
 func (*SkillFilesListRequest) ProtoMessage() {}
 
 func (x *SkillFilesListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[64]
+	mi := &file_proto_v1_gateway_proto_msgTypes[68]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5678,7 +6094,7 @@ func (x *SkillFilesListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillFilesListRequest.ProtoReflect.Descriptor instead.
 func (*SkillFilesListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{64}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{68}
 }
 
 type SkillFilesListResponse struct {
@@ -5692,7 +6108,7 @@ type SkillFilesListResponse struct {
 
 func (x *SkillFilesListResponse) Reset() {
 	*x = SkillFilesListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[65]
+	mi := &file_proto_v1_gateway_proto_msgTypes[69]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5704,7 +6120,7 @@ func (x *SkillFilesListResponse) String() string {
 func (*SkillFilesListResponse) ProtoMessage() {}
 
 func (x *SkillFilesListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[65]
+	mi := &file_proto_v1_gateway_proto_msgTypes[69]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5717,7 +6133,7 @@ func (x *SkillFilesListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillFilesListResponse.ProtoReflect.Descriptor instead.
 func (*SkillFilesListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{65}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{69}
 }
 
 func (x *SkillFilesListResponse) GetRootDir() string {
@@ -5750,7 +6166,7 @@ type SkillMetadataReadRequest struct {
 
 func (x *SkillMetadataReadRequest) Reset() {
 	*x = SkillMetadataReadRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[66]
+	mi := &file_proto_v1_gateway_proto_msgTypes[70]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5762,7 +6178,7 @@ func (x *SkillMetadataReadRequest) String() string {
 func (*SkillMetadataReadRequest) ProtoMessage() {}
 
 func (x *SkillMetadataReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[66]
+	mi := &file_proto_v1_gateway_proto_msgTypes[70]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5775,7 +6191,7 @@ func (x *SkillMetadataReadRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillMetadataReadRequest.ProtoReflect.Descriptor instead.
 func (*SkillMetadataReadRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{66}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{70}
 }
 
 func (x *SkillMetadataReadRequest) GetPath() string {
@@ -5795,7 +6211,7 @@ type SkillMetadataReadResponse struct {
 
 func (x *SkillMetadataReadResponse) Reset() {
 	*x = SkillMetadataReadResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[67]
+	mi := &file_proto_v1_gateway_proto_msgTypes[71]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5807,7 +6223,7 @@ func (x *SkillMetadataReadResponse) String() string {
 func (*SkillMetadataReadResponse) ProtoMessage() {}
 
 func (x *SkillMetadataReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[67]
+	mi := &file_proto_v1_gateway_proto_msgTypes[71]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5820,7 +6236,7 @@ func (x *SkillMetadataReadResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillMetadataReadResponse.ProtoReflect.Descriptor instead.
 func (*SkillMetadataReadResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{67}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{71}
 }
 
 func (x *SkillMetadataReadResponse) GetName() string {
@@ -5848,7 +6264,7 @@ type SkillTextReadRequest struct {
 
 func (x *SkillTextReadRequest) Reset() {
 	*x = SkillTextReadRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[68]
+	mi := &file_proto_v1_gateway_proto_msgTypes[72]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5860,7 +6276,7 @@ func (x *SkillTextReadRequest) String() string {
 func (*SkillTextReadRequest) ProtoMessage() {}
 
 func (x *SkillTextReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[68]
+	mi := &file_proto_v1_gateway_proto_msgTypes[72]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5873,7 +6289,7 @@ func (x *SkillTextReadRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillTextReadRequest.ProtoReflect.Descriptor instead.
 func (*SkillTextReadRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{68}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{72}
 }
 
 func (x *SkillTextReadRequest) GetPath() string {
@@ -5907,7 +6323,7 @@ type SkillTextReadResponse struct {
 
 func (x *SkillTextReadResponse) Reset() {
 	*x = SkillTextReadResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[69]
+	mi := &file_proto_v1_gateway_proto_msgTypes[73]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5919,7 +6335,7 @@ func (x *SkillTextReadResponse) String() string {
 func (*SkillTextReadResponse) ProtoMessage() {}
 
 func (x *SkillTextReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[69]
+	mi := &file_proto_v1_gateway_proto_msgTypes[73]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5932,7 +6348,7 @@ func (x *SkillTextReadResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillTextReadResponse.ProtoReflect.Descriptor instead.
 func (*SkillTextReadResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{69}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{73}
 }
 
 func (x *SkillTextReadResponse) GetContent() string {
@@ -5958,7 +6374,7 @@ type SkillManageRequest struct {
 
 func (x *SkillManageRequest) Reset() {
 	*x = SkillManageRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[70]
+	mi := &file_proto_v1_gateway_proto_msgTypes[74]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5970,7 +6386,7 @@ func (x *SkillManageRequest) String() string {
 func (*SkillManageRequest) ProtoMessage() {}
 
 func (x *SkillManageRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[70]
+	mi := &file_proto_v1_gateway_proto_msgTypes[74]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5983,7 +6399,7 @@ func (x *SkillManageRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillManageRequest.ProtoReflect.Descriptor instead.
 func (*SkillManageRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{70}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{74}
 }
 
 func (x *SkillManageRequest) GetPayloadJson() string {
@@ -6002,7 +6418,7 @@ type SkillManageResponse struct {
 
 func (x *SkillManageResponse) Reset() {
 	*x = SkillManageResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[71]
+	mi := &file_proto_v1_gateway_proto_msgTypes[75]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6014,7 +6430,7 @@ func (x *SkillManageResponse) String() string {
 func (*SkillManageResponse) ProtoMessage() {}
 
 func (x *SkillManageResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[71]
+	mi := &file_proto_v1_gateway_proto_msgTypes[75]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6027,7 +6443,7 @@ func (x *SkillManageResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillManageResponse.ProtoReflect.Descriptor instead.
 func (*SkillManageResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{71}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{75}
 }
 
 func (x *SkillManageResponse) GetResultJson() string {
@@ -6048,7 +6464,7 @@ type FileMentionListRequest struct {
 
 func (x *FileMentionListRequest) Reset() {
 	*x = FileMentionListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[72]
+	mi := &file_proto_v1_gateway_proto_msgTypes[76]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6060,7 +6476,7 @@ func (x *FileMentionListRequest) String() string {
 func (*FileMentionListRequest) ProtoMessage() {}
 
 func (x *FileMentionListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[72]
+	mi := &file_proto_v1_gateway_proto_msgTypes[76]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6073,7 +6489,7 @@ func (x *FileMentionListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FileMentionListRequest.ProtoReflect.Descriptor instead.
 func (*FileMentionListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{72}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{76}
 }
 
 func (x *FileMentionListRequest) GetWorkdir() string {
@@ -6107,7 +6523,7 @@ type FileMentionEntry struct {
 
 func (x *FileMentionEntry) Reset() {
 	*x = FileMentionEntry{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[73]
+	mi := &file_proto_v1_gateway_proto_msgTypes[77]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6119,7 +6535,7 @@ func (x *FileMentionEntry) String() string {
 func (*FileMentionEntry) ProtoMessage() {}
 
 func (x *FileMentionEntry) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[73]
+	mi := &file_proto_v1_gateway_proto_msgTypes[77]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6132,7 +6548,7 @@ func (x *FileMentionEntry) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FileMentionEntry.ProtoReflect.Descriptor instead.
 func (*FileMentionEntry) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{73}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{77}
 }
 
 func (x *FileMentionEntry) GetPath() string {
@@ -6159,7 +6575,7 @@ type FileMentionListResponse struct {
 
 func (x *FileMentionListResponse) Reset() {
 	*x = FileMentionListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[74]
+	mi := &file_proto_v1_gateway_proto_msgTypes[78]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6171,7 +6587,7 @@ func (x *FileMentionListResponse) String() string {
 func (*FileMentionListResponse) ProtoMessage() {}
 
 func (x *FileMentionListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[74]
+	mi := &file_proto_v1_gateway_proto_msgTypes[78]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6184,7 +6600,7 @@ func (x *FileMentionListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FileMentionListResponse.ProtoReflect.Descriptor instead.
 func (*FileMentionListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{74}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{78}
 }
 
 func (x *FileMentionListResponse) GetEntries() []*FileMentionEntry {
@@ -6213,7 +6629,7 @@ type FsRoot struct {
 
 func (x *FsRoot) Reset() {
 	*x = FsRoot{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[75]
+	mi := &file_proto_v1_gateway_proto_msgTypes[79]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6225,7 +6641,7 @@ func (x *FsRoot) String() string {
 func (*FsRoot) ProtoMessage() {}
 
 func (x *FsRoot) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[75]
+	mi := &file_proto_v1_gateway_proto_msgTypes[79]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6238,7 +6654,7 @@ func (x *FsRoot) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRoot.ProtoReflect.Descriptor instead.
 func (*FsRoot) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{75}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{79}
 }
 
 func (x *FsRoot) GetId() string {
@@ -6277,7 +6693,7 @@ type FsRootsRequest struct {
 
 func (x *FsRootsRequest) Reset() {
 	*x = FsRootsRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[76]
+	mi := &file_proto_v1_gateway_proto_msgTypes[80]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6289,7 +6705,7 @@ func (x *FsRootsRequest) String() string {
 func (*FsRootsRequest) ProtoMessage() {}
 
 func (x *FsRootsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[76]
+	mi := &file_proto_v1_gateway_proto_msgTypes[80]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6302,7 +6718,7 @@ func (x *FsRootsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRootsRequest.ProtoReflect.Descriptor instead.
 func (*FsRootsRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{76}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{80}
 }
 
 type FsRootsResponse struct {
@@ -6314,7 +6730,7 @@ type FsRootsResponse struct {
 
 func (x *FsRootsResponse) Reset() {
 	*x = FsRootsResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[77]
+	mi := &file_proto_v1_gateway_proto_msgTypes[81]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6326,7 +6742,7 @@ func (x *FsRootsResponse) String() string {
 func (*FsRootsResponse) ProtoMessage() {}
 
 func (x *FsRootsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[77]
+	mi := &file_proto_v1_gateway_proto_msgTypes[81]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6339,7 +6755,7 @@ func (x *FsRootsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRootsResponse.ProtoReflect.Descriptor instead.
 func (*FsRootsResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{77}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{81}
 }
 
 func (x *FsRootsResponse) GetRoots() []*FsRoot {
@@ -6359,7 +6775,7 @@ type FsListDirsRequest struct {
 
 func (x *FsListDirsRequest) Reset() {
 	*x = FsListDirsRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[78]
+	mi := &file_proto_v1_gateway_proto_msgTypes[82]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6371,7 +6787,7 @@ func (x *FsListDirsRequest) String() string {
 func (*FsListDirsRequest) ProtoMessage() {}
 
 func (x *FsListDirsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[78]
+	mi := &file_proto_v1_gateway_proto_msgTypes[82]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6384,7 +6800,7 @@ func (x *FsListDirsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListDirsRequest.ProtoReflect.Descriptor instead.
 func (*FsListDirsRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{78}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{82}
 }
 
 func (x *FsListDirsRequest) GetPath() string {
@@ -6411,7 +6827,7 @@ type FsDirEntry struct {
 
 func (x *FsDirEntry) Reset() {
 	*x = FsDirEntry{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[79]
+	mi := &file_proto_v1_gateway_proto_msgTypes[83]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6423,7 +6839,7 @@ func (x *FsDirEntry) String() string {
 func (*FsDirEntry) ProtoMessage() {}
 
 func (x *FsDirEntry) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[79]
+	mi := &file_proto_v1_gateway_proto_msgTypes[83]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6436,7 +6852,7 @@ func (x *FsDirEntry) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsDirEntry.ProtoReflect.Descriptor instead.
 func (*FsDirEntry) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{79}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{83}
 }
 
 func (x *FsDirEntry) GetPath() string {
@@ -6464,7 +6880,7 @@ type FsListDirsResponse struct {
 
 func (x *FsListDirsResponse) Reset() {
 	*x = FsListDirsResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[80]
+	mi := &file_proto_v1_gateway_proto_msgTypes[84]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6476,7 +6892,7 @@ func (x *FsListDirsResponse) String() string {
 func (*FsListDirsResponse) ProtoMessage() {}
 
 func (x *FsListDirsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[80]
+	mi := &file_proto_v1_gateway_proto_msgTypes[84]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6489,7 +6905,7 @@ func (x *FsListDirsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListDirsResponse.ProtoReflect.Descriptor instead.
 func (*FsListDirsResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{80}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{84}
 }
 
 func (x *FsListDirsResponse) GetPath() string {
@@ -6523,7 +6939,7 @@ type FsCreateProjectFolderRequest struct {
 
 func (x *FsCreateProjectFolderRequest) Reset() {
 	*x = FsCreateProjectFolderRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[81]
+	mi := &file_proto_v1_gateway_proto_msgTypes[85]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6535,7 +6951,7 @@ func (x *FsCreateProjectFolderRequest) String() string {
 func (*FsCreateProjectFolderRequest) ProtoMessage() {}
 
 func (x *FsCreateProjectFolderRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[81]
+	mi := &file_proto_v1_gateway_proto_msgTypes[85]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6548,7 +6964,7 @@ func (x *FsCreateProjectFolderRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsCreateProjectFolderRequest.ProtoReflect.Descriptor instead.
 func (*FsCreateProjectFolderRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{81}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{85}
 }
 
 func (x *FsCreateProjectFolderRequest) GetParent() string {
@@ -6574,7 +6990,7 @@ type FsCreateProjectFolderResponse struct {
 
 func (x *FsCreateProjectFolderResponse) Reset() {
 	*x = FsCreateProjectFolderResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[82]
+	mi := &file_proto_v1_gateway_proto_msgTypes[86]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6586,7 +7002,7 @@ func (x *FsCreateProjectFolderResponse) String() string {
 func (*FsCreateProjectFolderResponse) ProtoMessage() {}
 
 func (x *FsCreateProjectFolderResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[82]
+	mi := &file_proto_v1_gateway_proto_msgTypes[86]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6599,7 +7015,7 @@ func (x *FsCreateProjectFolderResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsCreateProjectFolderResponse.ProtoReflect.Descriptor instead.
 func (*FsCreateProjectFolderResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{82}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{86}
 }
 
 func (x *FsCreateProjectFolderResponse) GetPath() string {
@@ -6622,7 +7038,7 @@ type FsListRequest struct {
 
 func (x *FsListRequest) Reset() {
 	*x = FsListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[83]
+	mi := &file_proto_v1_gateway_proto_msgTypes[87]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6634,7 +7050,7 @@ func (x *FsListRequest) String() string {
 func (*FsListRequest) ProtoMessage() {}
 
 func (x *FsListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[83]
+	mi := &file_proto_v1_gateway_proto_msgTypes[87]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6647,7 +7063,7 @@ func (x *FsListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListRequest.ProtoReflect.Descriptor instead.
 func (*FsListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{83}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{87}
 }
 
 func (x *FsListRequest) GetWorkdir() string {
@@ -6695,7 +7111,7 @@ type FsListEntry struct {
 
 func (x *FsListEntry) Reset() {
 	*x = FsListEntry{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[84]
+	mi := &file_proto_v1_gateway_proto_msgTypes[88]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6707,7 +7123,7 @@ func (x *FsListEntry) String() string {
 func (*FsListEntry) ProtoMessage() {}
 
 func (x *FsListEntry) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[84]
+	mi := &file_proto_v1_gateway_proto_msgTypes[88]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6720,7 +7136,7 @@ func (x *FsListEntry) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListEntry.ProtoReflect.Descriptor instead.
 func (*FsListEntry) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{84}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{88}
 }
 
 func (x *FsListEntry) GetPath() string {
@@ -6753,7 +7169,7 @@ type FsListResponse struct {
 
 func (x *FsListResponse) Reset() {
 	*x = FsListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[85]
+	mi := &file_proto_v1_gateway_proto_msgTypes[89]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6765,7 +7181,7 @@ func (x *FsListResponse) String() string {
 func (*FsListResponse) ProtoMessage() {}
 
 func (x *FsListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[85]
+	mi := &file_proto_v1_gateway_proto_msgTypes[89]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6778,7 +7194,7 @@ func (x *FsListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListResponse.ProtoReflect.Descriptor instead.
 func (*FsListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{85}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{89}
 }
 
 func (x *FsListResponse) GetPath() string {
@@ -6847,7 +7263,7 @@ type FsReadEditableTextRequest struct {
 
 func (x *FsReadEditableTextRequest) Reset() {
 	*x = FsReadEditableTextRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[86]
+	mi := &file_proto_v1_gateway_proto_msgTypes[90]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6859,7 +7275,7 @@ func (x *FsReadEditableTextRequest) String() string {
 func (*FsReadEditableTextRequest) ProtoMessage() {}
 
 func (x *FsReadEditableTextRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[86]
+	mi := &file_proto_v1_gateway_proto_msgTypes[90]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6872,7 +7288,7 @@ func (x *FsReadEditableTextRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsReadEditableTextRequest.ProtoReflect.Descriptor instead.
 func (*FsReadEditableTextRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{86}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{90}
 }
 
 func (x *FsReadEditableTextRequest) GetWorkdir() string {
@@ -6903,7 +7319,7 @@ type FsReadEditableTextResponse struct {
 
 func (x *FsReadEditableTextResponse) Reset() {
 	*x = FsReadEditableTextResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[87]
+	mi := &file_proto_v1_gateway_proto_msgTypes[91]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6915,7 +7331,7 @@ func (x *FsReadEditableTextResponse) String() string {
 func (*FsReadEditableTextResponse) ProtoMessage() {}
 
 func (x *FsReadEditableTextResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[87]
+	mi := &file_proto_v1_gateway_proto_msgTypes[91]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6928,7 +7344,7 @@ func (x *FsReadEditableTextResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsReadEditableTextResponse.ProtoReflect.Descriptor instead.
 func (*FsReadEditableTextResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{87}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{91}
 }
 
 func (x *FsReadEditableTextResponse) GetPath() string {
@@ -6983,7 +7399,7 @@ type FsReadWorkspaceImageRequest struct {
 
 func (x *FsReadWorkspaceImageRequest) Reset() {
 	*x = FsReadWorkspaceImageRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[88]
+	mi := &file_proto_v1_gateway_proto_msgTypes[92]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6995,7 +7411,7 @@ func (x *FsReadWorkspaceImageRequest) String() string {
 func (*FsReadWorkspaceImageRequest) ProtoMessage() {}
 
 func (x *FsReadWorkspaceImageRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[88]
+	mi := &file_proto_v1_gateway_proto_msgTypes[92]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7008,7 +7424,7 @@ func (x *FsReadWorkspaceImageRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsReadWorkspaceImageRequest.ProtoReflect.Descriptor instead.
 func (*FsReadWorkspaceImageRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{88}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{92}
 }
 
 func (x *FsReadWorkspaceImageRequest) GetWorkdir() string {
@@ -7039,7 +7455,7 @@ type FsReadWorkspaceImageResponse struct {
 
 func (x *FsReadWorkspaceImageResponse) Reset() {
 	*x = FsReadWorkspaceImageResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[89]
+	mi := &file_proto_v1_gateway_proto_msgTypes[93]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7051,7 +7467,7 @@ func (x *FsReadWorkspaceImageResponse) String() string {
 func (*FsReadWorkspaceImageResponse) ProtoMessage() {}
 
 func (x *FsReadWorkspaceImageResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[89]
+	mi := &file_proto_v1_gateway_proto_msgTypes[93]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7064,7 +7480,7 @@ func (x *FsReadWorkspaceImageResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsReadWorkspaceImageResponse.ProtoReflect.Descriptor instead.
 func (*FsReadWorkspaceImageResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{89}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{93}
 }
 
 func (x *FsReadWorkspaceImageResponse) GetPath() string {
@@ -7125,7 +7541,7 @@ type FsWriteTextRequest struct {
 
 func (x *FsWriteTextRequest) Reset() {
 	*x = FsWriteTextRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[90]
+	mi := &file_proto_v1_gateway_proto_msgTypes[94]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7137,7 +7553,7 @@ func (x *FsWriteTextRequest) String() string {
 func (*FsWriteTextRequest) ProtoMessage() {}
 
 func (x *FsWriteTextRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[90]
+	mi := &file_proto_v1_gateway_proto_msgTypes[94]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7150,7 +7566,7 @@ func (x *FsWriteTextRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsWriteTextRequest.ProtoReflect.Descriptor instead.
 func (*FsWriteTextRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{90}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{94}
 }
 
 func (x *FsWriteTextRequest) GetWorkdir() string {
@@ -7224,7 +7640,7 @@ type FsWriteTextResponse struct {
 
 func (x *FsWriteTextResponse) Reset() {
 	*x = FsWriteTextResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[91]
+	mi := &file_proto_v1_gateway_proto_msgTypes[95]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7236,7 +7652,7 @@ func (x *FsWriteTextResponse) String() string {
 func (*FsWriteTextResponse) ProtoMessage() {}
 
 func (x *FsWriteTextResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[91]
+	mi := &file_proto_v1_gateway_proto_msgTypes[95]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7249,7 +7665,7 @@ func (x *FsWriteTextResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsWriteTextResponse.ProtoReflect.Descriptor instead.
 func (*FsWriteTextResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{91}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{95}
 }
 
 func (x *FsWriteTextResponse) GetPath() string {
@@ -7311,7 +7727,7 @@ type FsCreateDirRequest struct {
 
 func (x *FsCreateDirRequest) Reset() {
 	*x = FsCreateDirRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[92]
+	mi := &file_proto_v1_gateway_proto_msgTypes[96]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7323,7 +7739,7 @@ func (x *FsCreateDirRequest) String() string {
 func (*FsCreateDirRequest) ProtoMessage() {}
 
 func (x *FsCreateDirRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[92]
+	mi := &file_proto_v1_gateway_proto_msgTypes[96]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7336,7 +7752,7 @@ func (x *FsCreateDirRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsCreateDirRequest.ProtoReflect.Descriptor instead.
 func (*FsCreateDirRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{92}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{96}
 }
 
 func (x *FsCreateDirRequest) GetWorkdir() string {
@@ -7363,7 +7779,7 @@ type FsCreateDirResponse struct {
 
 func (x *FsCreateDirResponse) Reset() {
 	*x = FsCreateDirResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[93]
+	mi := &file_proto_v1_gateway_proto_msgTypes[97]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7375,7 +7791,7 @@ func (x *FsCreateDirResponse) String() string {
 func (*FsCreateDirResponse) ProtoMessage() {}
 
 func (x *FsCreateDirResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[93]
+	mi := &file_proto_v1_gateway_proto_msgTypes[97]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7388,7 +7804,7 @@ func (x *FsCreateDirResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsCreateDirResponse.ProtoReflect.Descriptor instead.
 func (*FsCreateDirResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{93}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{97}
 }
 
 func (x *FsCreateDirResponse) GetPath() string {
@@ -7416,7 +7832,7 @@ type FsRenameRequest struct {
 
 func (x *FsRenameRequest) Reset() {
 	*x = FsRenameRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[94]
+	mi := &file_proto_v1_gateway_proto_msgTypes[98]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7428,7 +7844,7 @@ func (x *FsRenameRequest) String() string {
 func (*FsRenameRequest) ProtoMessage() {}
 
 func (x *FsRenameRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[94]
+	mi := &file_proto_v1_gateway_proto_msgTypes[98]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7441,7 +7857,7 @@ func (x *FsRenameRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRenameRequest.ProtoReflect.Descriptor instead.
 func (*FsRenameRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{94}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{98}
 }
 
 func (x *FsRenameRequest) GetWorkdir() string {
@@ -7476,7 +7892,7 @@ type FsRenameResponse struct {
 
 func (x *FsRenameResponse) Reset() {
 	*x = FsRenameResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[95]
+	mi := &file_proto_v1_gateway_proto_msgTypes[99]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7488,7 +7904,7 @@ func (x *FsRenameResponse) String() string {
 func (*FsRenameResponse) ProtoMessage() {}
 
 func (x *FsRenameResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[95]
+	mi := &file_proto_v1_gateway_proto_msgTypes[99]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7501,7 +7917,7 @@ func (x *FsRenameResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRenameResponse.ProtoReflect.Descriptor instead.
 func (*FsRenameResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{95}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{99}
 }
 
 func (x *FsRenameResponse) GetFromPath() string {
@@ -7535,7 +7951,7 @@ type FsDeleteRequest struct {
 
 func (x *FsDeleteRequest) Reset() {
 	*x = FsDeleteRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[96]
+	mi := &file_proto_v1_gateway_proto_msgTypes[100]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7547,7 +7963,7 @@ func (x *FsDeleteRequest) String() string {
 func (*FsDeleteRequest) ProtoMessage() {}
 
 func (x *FsDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[96]
+	mi := &file_proto_v1_gateway_proto_msgTypes[100]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7560,7 +7976,7 @@ func (x *FsDeleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsDeleteRequest.ProtoReflect.Descriptor instead.
 func (*FsDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{96}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{100}
 }
 
 func (x *FsDeleteRequest) GetWorkdir() string {
@@ -7587,7 +8003,7 @@ type FsDeleteResponse struct {
 
 func (x *FsDeleteResponse) Reset() {
 	*x = FsDeleteResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[97]
+	mi := &file_proto_v1_gateway_proto_msgTypes[101]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7599,7 +8015,7 @@ func (x *FsDeleteResponse) String() string {
 func (*FsDeleteResponse) ProtoMessage() {}
 
 func (x *FsDeleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[97]
+	mi := &file_proto_v1_gateway_proto_msgTypes[101]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7612,7 +8028,7 @@ func (x *FsDeleteResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsDeleteResponse.ProtoReflect.Descriptor instead.
 func (*FsDeleteResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{97}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{101}
 }
 
 func (x *FsDeleteResponse) GetPath() string {
@@ -7638,7 +8054,7 @@ type PingRequest struct {
 
 func (x *PingRequest) Reset() {
 	*x = PingRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[98]
+	mi := &file_proto_v1_gateway_proto_msgTypes[102]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7650,7 +8066,7 @@ func (x *PingRequest) String() string {
 func (*PingRequest) ProtoMessage() {}
 
 func (x *PingRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[98]
+	mi := &file_proto_v1_gateway_proto_msgTypes[102]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7663,7 +8079,7 @@ func (x *PingRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PingRequest.ProtoReflect.Descriptor instead.
 func (*PingRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{98}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{102}
 }
 
 func (x *PingRequest) GetTimestamp() int64 {
@@ -7682,7 +8098,7 @@ type PongResponse struct {
 
 func (x *PongResponse) Reset() {
 	*x = PongResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[99]
+	mi := &file_proto_v1_gateway_proto_msgTypes[103]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7694,7 +8110,7 @@ func (x *PongResponse) String() string {
 func (*PongResponse) ProtoMessage() {}
 
 func (x *PongResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[99]
+	mi := &file_proto_v1_gateway_proto_msgTypes[103]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7707,7 +8123,7 @@ func (x *PongResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PongResponse.ProtoReflect.Descriptor instead.
 func (*PongResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{99}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{103}
 }
 
 func (x *PongResponse) GetTimestamp() int64 {
@@ -7727,7 +8143,7 @@ type ErrorResponse struct {
 
 func (x *ErrorResponse) Reset() {
 	*x = ErrorResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[100]
+	mi := &file_proto_v1_gateway_proto_msgTypes[104]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7739,7 +8155,7 @@ func (x *ErrorResponse) String() string {
 func (*ErrorResponse) ProtoMessage() {}
 
 func (x *ErrorResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[100]
+	mi := &file_proto_v1_gateway_proto_msgTypes[104]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7752,7 +8168,7 @@ func (x *ErrorResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ErrorResponse.ProtoReflect.Descriptor instead.
 func (*ErrorResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{100}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{104}
 }
 
 func (x *ErrorResponse) GetCode() int32 {
@@ -7782,7 +8198,7 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" +
 	"\amessage\x18\x02 \x01(\tR\amessage\x12\x1d\n" +
 	"\n" +
-	"session_id\x18\x03 \x01(\tR\tsessionId\"\x85\x1b\n" +
+	"session_id\x18\x03 \x01(\tR\tsessionId\"\x81\x1c\n" +
 	"\x0fGatewayEnvelope\x12\x1d\n" +
 	"\n" +
 	"request_id\x18\x01 \x01(\tR\trequestId\x12\x1c\n" +
@@ -7833,8 +8249,9 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\x17fs_read_workspace_image\x18? \x01(\v21.liveagent.gateway.v1.FsReadWorkspaceImageRequestH\x00R\x14fsReadWorkspaceImage\x12S\n" +
 	"\x0etunnel_control\x18C \x01(\v2*.liveagent.gateway.v1.TunnelControlRequestH\x00R\rtunnelControl\x12]\n" +
 	"\x13tunnel_control_resp\x18D \x01(\v2+.liveagent.gateway.v1.TunnelControlResponseH\x00R\x11tunnelControlResp\x12F\n" +
-	"\ftunnel_frame\x18E \x01(\v2!.liveagent.gateway.v1.TunnelFrameH\x00R\vtunnelFrameB\t\n" +
-	"\apayload\"\xc0 \n" +
+	"\ftunnel_frame\x18E \x01(\v2!.liveagent.gateway.v1.TunnelFrameH\x00R\vtunnelFrame\x12z\n" +
+	"\x1dsettings_reset_ssh_known_host\x18H \x01(\v26.liveagent.gateway.v1.SettingsResetSshKnownHostRequestH\x00R\x19settingsResetSshKnownHostB\t\n" +
+	"\apayload\"\xc7!\n" +
 	"\rAgentEnvelope\x12\x1d\n" +
 	"\n" +
 	"request_id\x18\x01 \x01(\tR\trequestId\x12\x1c\n" +
@@ -7885,7 +8302,8 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\x13tunnel_control_resp\x18D \x01(\v2+.liveagent.gateway.v1.TunnelControlResponseH\x00R\x11tunnelControlResp\x12F\n" +
 	"\ftunnel_frame\x18E \x01(\v2!.liveagent.gateway.v1.TunnelFrameH\x00R\vtunnelFrame\x12K\n" +
 	"\fchat_control\x18F \x01(\v2&.liveagent.gateway.v1.ChatControlEventH\x00R\vchatControl\x12Q\n" +
-	"\x0eruntime_status\x18G \x01(\v2(.liveagent.gateway.v1.RuntimeStatusEventH\x00R\rruntimeStatus\x12;\n" +
+	"\x0eruntime_status\x18G \x01(\v2(.liveagent.gateway.v1.RuntimeStatusEventH\x00R\rruntimeStatus\x12\x84\x01\n" +
+	"\"settings_reset_ssh_known_host_resp\x18H \x01(\v27.liveagent.gateway.v1.SettingsResetSshKnownHostResponseH\x00R\x1dsettingsResetSshKnownHostResp\x12;\n" +
 	"\x05error\x18c \x01(\v2#.liveagent.gateway.v1.ErrorResponseH\x00R\x05errorB\t\n" +
 	"\apayload\"|\n" +
 	"\x11ChatSelectedModel\x12,\n" +
@@ -7982,7 +8400,7 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\targs_json\x18\x02 \x01(\tR\bargsJson\"7\n" +
 	"\x14MemoryManageResponse\x12\x1f\n" +
 	"\vresult_json\x18\x01 \x01(\tR\n" +
-	"resultJson\"\x89\x02\n" +
+	"resultJson\"\x91\x03\n" +
 	"\x0fTerminalRequest\x12\x16\n" +
 	"\x06action\x18\x01 \x01(\tR\x06action\x12\x1d\n" +
 	"\n" +
@@ -7995,7 +8413,11 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\x04cols\x18\b \x01(\rR\x04cols\x12\x12\n" +
 	"\x04rows\x18\t \x01(\rR\x04rows\x12\x1b\n" +
 	"\tmax_bytes\x18\n" +
-	" \x01(\rR\bmaxBytes\"\xd9\x02\n" +
+	" \x01(\rR\bmaxBytes\x12\x1e\n" +
+	"\vssh_host_id\x18\v \x01(\tR\tsshHostId\x12\x1b\n" +
+	"\tprompt_id\x18\f \x01(\tR\bpromptId\x12#\n" +
+	"\rprompt_answer\x18\r \x01(\tR\fpromptAnswer\x12$\n" +
+	"\x0etrust_host_key\x18\x0e \x01(\bR\ftrustHostKey\"\xaa\x03\n" +
 	"\x0fTerminalSession\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12(\n" +
 	"\x10project_path_key\x18\x02 \x01(\tR\x0eprojectPathKey\x12\x10\n" +
@@ -8013,11 +8435,36 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\vfinished_at\x18\v \x01(\x04R\n" +
 	"finishedAt\x12\x1b\n" +
 	"\texit_code\x18\f \x01(\x05R\bexitCode\x12\x18\n" +
-	"\arunning\x18\r \x01(\bR\arunning\"U\n" +
+	"\arunning\x18\r \x01(\bR\arunning\x12\x12\n" +
+	"\x04kind\x18\x0e \x01(\tR\x04kind\x12;\n" +
+	"\x03ssh\x18\x0f \x01(\v2).liveagent.gateway.v1.TerminalSshMetadataR\x03ssh\"\xa7\x02\n" +
+	"\x13TerminalSshMetadata\x12\x17\n" +
+	"\ahost_id\x18\x01 \x01(\tR\x06hostId\x12\x1b\n" +
+	"\thost_name\x18\x02 \x01(\tR\bhostName\x12\x1a\n" +
+	"\busername\x18\x03 \x01(\tR\busername\x12\x12\n" +
+	"\x04host\x18\x04 \x01(\tR\x04host\x12\x12\n" +
+	"\x04port\x18\x05 \x01(\rR\x04port\x12\x1b\n" +
+	"\tauth_type\x18\x06 \x01(\tR\bauthType\x12\x16\n" +
+	"\x06status\x18\a \x01(\tR\x06status\x12+\n" +
+	"\x11reconnect_attempt\x18\b \x01(\rR\x10reconnectAttempt\x124\n" +
+	"\x16reconnect_max_attempts\x18\t \x01(\rR\x14reconnectMaxAttempts\"\x9a\x02\n" +
+	"\x11TerminalSshPrompt\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
+	"\x04kind\x18\x02 \x01(\tR\x04kind\x12\x17\n" +
+	"\ahost_id\x18\x03 \x01(\tR\x06hostId\x12\x1b\n" +
+	"\thost_name\x18\x04 \x01(\tR\bhostName\x12\x12\n" +
+	"\x04host\x18\x05 \x01(\tR\x04host\x12\x12\n" +
+	"\x04port\x18\x06 \x01(\rR\x04port\x12\x18\n" +
+	"\amessage\x18\a \x01(\tR\amessage\x12-\n" +
+	"\x12fingerprint_sha256\x18\b \x01(\tR\x11fingerprintSha256\x12\x19\n" +
+	"\bkey_type\x18\t \x01(\tR\akeyType\x12\x1f\n" +
+	"\vanswer_echo\x18\n" +
+	" \x01(\bR\n" +
+	"answerEcho\"U\n" +
 	"\x13TerminalShellOption\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x14\n" +
 	"\x05label\x18\x02 \x01(\tR\x05label\x12\x18\n" +
-	"\acommand\x18\x03 \x01(\tR\acommand\"\xb5\x03\n" +
+	"\acommand\x18\x03 \x01(\tR\acommand\"\x9c\x04\n" +
 	"\x10TerminalResponse\x12\x16\n" +
 	"\x06action\x18\x01 \x01(\tR\x06action\x12A\n" +
 	"\bsessions\x18\x02 \x03(\v2%.liveagent.gateway.v1.TerminalSessionR\bsessions\x12?\n" +
@@ -8027,7 +8474,12 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\rshell_options\x18\x06 \x03(\v2).liveagent.gateway.v1.TerminalShellOptionR\fshellOptions\x12#\n" +
 	"\rdefault_shell\x18\a \x01(\tR\fdefaultShell\x12.\n" +
 	"\x13output_start_offset\x18\b \x01(\x04R\x11outputStartOffset\x12*\n" +
-	"\x11output_end_offset\x18\t \x01(\x04R\x0foutputEndOffset\"\x9d\x02\n" +
+	"\x11output_end_offset\x18\t \x01(\x04R\x0foutputEndOffset\x12F\n" +
+	"\n" +
+	"ssh_prompt\x18\n" +
+	" \x01(\v2'.liveagent.gateway.v1.TerminalSshPromptR\tsshPrompt\x12\x1d\n" +
+	"\n" +
+	"latency_ms\x18\v \x01(\rR\tlatencyMs\"\x9d\x02\n" +
 	"\rTerminalEvent\x12\x12\n" +
 	"\x04kind\x18\x01 \x01(\tR\x04kind\x12\x1d\n" +
 	"\n" +
@@ -8206,7 +8658,12 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\rsettings_json\x18\x01 \x01(\tR\fsettingsJson\"N\n" +
 	"\x16SettingsUpdateResponse\x12\x1a\n" +
 	"\baccepted\x18\x01 \x01(\bR\baccepted\x12\x18\n" +
-	"\amessage\x18\x02 \x01(\tR\amessage\"8\n" +
+	"\amessage\x18\x02 \x01(\tR\amessage\"J\n" +
+	" SettingsResetSshKnownHostRequest\x12\x12\n" +
+	"\x04host\x18\x01 \x01(\tR\x04host\x12\x12\n" +
+	"\x04port\x18\x02 \x01(\rR\x04port\"=\n" +
+	"!SettingsResetSshKnownHostResponse\x12\x18\n" +
+	"\adeleted\x18\x01 \x01(\rR\adeleted\"8\n" +
 	"\x11SettingsSyncEvent\x12#\n" +
 	"\rsettings_json\x18\x01 \x01(\tR\fsettingsJson\"\x17\n" +
 	"\x15SkillFilesListRequest\"g\n" +
@@ -8386,235 +8843,243 @@ func file_proto_v1_gateway_proto_rawDescGZIP() []byte {
 }
 
 var file_proto_v1_gateway_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_proto_v1_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 101)
+var file_proto_v1_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 105)
 var file_proto_v1_gateway_proto_goTypes = []any{
-	(TunnelFrameKind)(0),                  // 0: liveagent.gateway.v1.TunnelFrameKind
-	(ChatEvent_ChatEventType)(0),          // 1: liveagent.gateway.v1.ChatEvent.ChatEventType
-	(*AuthRequest)(nil),                   // 2: liveagent.gateway.v1.AuthRequest
-	(*AuthResponse)(nil),                  // 3: liveagent.gateway.v1.AuthResponse
-	(*GatewayEnvelope)(nil),               // 4: liveagent.gateway.v1.GatewayEnvelope
-	(*AgentEnvelope)(nil),                 // 5: liveagent.gateway.v1.AgentEnvelope
-	(*ChatSelectedModel)(nil),             // 6: liveagent.gateway.v1.ChatSelectedModel
-	(*ChatRuntimeControls)(nil),           // 7: liveagent.gateway.v1.ChatRuntimeControls
-	(*ChatUploadedFile)(nil),              // 8: liveagent.gateway.v1.ChatUploadedFile
-	(*UploadReadableFile)(nil),            // 9: liveagent.gateway.v1.UploadReadableFile
-	(*UploadReadableFilesRequest)(nil),    // 10: liveagent.gateway.v1.UploadReadableFilesRequest
-	(*UploadReadableFilesResponse)(nil),   // 11: liveagent.gateway.v1.UploadReadableFilesResponse
-	(*UploadedImagePreviewRequest)(nil),   // 12: liveagent.gateway.v1.UploadedImagePreviewRequest
-	(*UploadedImagePreviewResponse)(nil),  // 13: liveagent.gateway.v1.UploadedImagePreviewResponse
-	(*TunnelControlRequest)(nil),          // 14: liveagent.gateway.v1.TunnelControlRequest
-	(*TunnelControlResponse)(nil),         // 15: liveagent.gateway.v1.TunnelControlResponse
-	(*TunnelSummary)(nil),                 // 16: liveagent.gateway.v1.TunnelSummary
-	(*TunnelHeader)(nil),                  // 17: liveagent.gateway.v1.TunnelHeader
-	(*TunnelFrame)(nil),                   // 18: liveagent.gateway.v1.TunnelFrame
-	(*MemoryManageRequest)(nil),           // 19: liveagent.gateway.v1.MemoryManageRequest
-	(*MemoryManageResponse)(nil),          // 20: liveagent.gateway.v1.MemoryManageResponse
-	(*TerminalRequest)(nil),               // 21: liveagent.gateway.v1.TerminalRequest
-	(*TerminalSession)(nil),               // 22: liveagent.gateway.v1.TerminalSession
-	(*TerminalShellOption)(nil),           // 23: liveagent.gateway.v1.TerminalShellOption
-	(*TerminalResponse)(nil),              // 24: liveagent.gateway.v1.TerminalResponse
-	(*TerminalEvent)(nil),                 // 25: liveagent.gateway.v1.TerminalEvent
-	(*GitRequest)(nil),                    // 26: liveagent.gateway.v1.GitRequest
-	(*GitResponse)(nil),                   // 27: liveagent.gateway.v1.GitResponse
-	(*ChatRequest)(nil),                   // 28: liveagent.gateway.v1.ChatRequest
-	(*CancelChatRequest)(nil),             // 29: liveagent.gateway.v1.CancelChatRequest
-	(*ChatEvent)(nil),                     // 30: liveagent.gateway.v1.ChatEvent
-	(*ChatControlEvent)(nil),              // 31: liveagent.gateway.v1.ChatControlEvent
-	(*RuntimeStatusEvent)(nil),            // 32: liveagent.gateway.v1.RuntimeStatusEvent
-	(*CronManageRequest)(nil),             // 33: liveagent.gateway.v1.CronManageRequest
-	(*CronManageResponse)(nil),            // 34: liveagent.gateway.v1.CronManageResponse
-	(*HistoryListRequest)(nil),            // 35: liveagent.gateway.v1.HistoryListRequest
-	(*HistoryListResponse)(nil),           // 36: liveagent.gateway.v1.HistoryListResponse
-	(*ConversationSummary)(nil),           // 37: liveagent.gateway.v1.ConversationSummary
-	(*HistoryGetRequest)(nil),             // 38: liveagent.gateway.v1.HistoryGetRequest
-	(*HistoryGetResponse)(nil),            // 39: liveagent.gateway.v1.HistoryGetResponse
-	(*HistoryRenameRequest)(nil),          // 40: liveagent.gateway.v1.HistoryRenameRequest
-	(*HistoryRenameResponse)(nil),         // 41: liveagent.gateway.v1.HistoryRenameResponse
-	(*HistoryPinRequest)(nil),             // 42: liveagent.gateway.v1.HistoryPinRequest
-	(*HistoryPinResponse)(nil),            // 43: liveagent.gateway.v1.HistoryPinResponse
-	(*HistoryShareStatus)(nil),            // 44: liveagent.gateway.v1.HistoryShareStatus
-	(*HistoryShareGetRequest)(nil),        // 45: liveagent.gateway.v1.HistoryShareGetRequest
-	(*HistoryShareGetResponse)(nil),       // 46: liveagent.gateway.v1.HistoryShareGetResponse
-	(*HistoryShareSetRequest)(nil),        // 47: liveagent.gateway.v1.HistoryShareSetRequest
-	(*HistoryShareSetResponse)(nil),       // 48: liveagent.gateway.v1.HistoryShareSetResponse
-	(*HistoryShareResolveRequest)(nil),    // 49: liveagent.gateway.v1.HistoryShareResolveRequest
-	(*HistoryShareResolveResponse)(nil),   // 50: liveagent.gateway.v1.HistoryShareResolveResponse
-	(*HistoryWorkdirsRequest)(nil),        // 51: liveagent.gateway.v1.HistoryWorkdirsRequest
-	(*HistoryWorkdirSummary)(nil),         // 52: liveagent.gateway.v1.HistoryWorkdirSummary
-	(*HistoryWorkdirsResponse)(nil),       // 53: liveagent.gateway.v1.HistoryWorkdirsResponse
-	(*HistoryDeleteRequest)(nil),          // 54: liveagent.gateway.v1.HistoryDeleteRequest
-	(*HistoryDeleteResponse)(nil),         // 55: liveagent.gateway.v1.HistoryDeleteResponse
-	(*HistoryTruncateRequest)(nil),        // 56: liveagent.gateway.v1.HistoryTruncateRequest
-	(*HistoryTruncateResponse)(nil),       // 57: liveagent.gateway.v1.HistoryTruncateResponse
-	(*HistorySyncEvent)(nil),              // 58: liveagent.gateway.v1.HistorySyncEvent
-	(*ProviderListRequest)(nil),           // 59: liveagent.gateway.v1.ProviderListRequest
-	(*ProviderListResponse)(nil),          // 60: liveagent.gateway.v1.ProviderListResponse
-	(*SettingsGetRequest)(nil),            // 61: liveagent.gateway.v1.SettingsGetRequest
-	(*SettingsGetResponse)(nil),           // 62: liveagent.gateway.v1.SettingsGetResponse
-	(*SettingsUpdateRequest)(nil),         // 63: liveagent.gateway.v1.SettingsUpdateRequest
-	(*SettingsUpdateResponse)(nil),        // 64: liveagent.gateway.v1.SettingsUpdateResponse
-	(*SettingsSyncEvent)(nil),             // 65: liveagent.gateway.v1.SettingsSyncEvent
-	(*SkillFilesListRequest)(nil),         // 66: liveagent.gateway.v1.SkillFilesListRequest
-	(*SkillFilesListResponse)(nil),        // 67: liveagent.gateway.v1.SkillFilesListResponse
-	(*SkillMetadataReadRequest)(nil),      // 68: liveagent.gateway.v1.SkillMetadataReadRequest
-	(*SkillMetadataReadResponse)(nil),     // 69: liveagent.gateway.v1.SkillMetadataReadResponse
-	(*SkillTextReadRequest)(nil),          // 70: liveagent.gateway.v1.SkillTextReadRequest
-	(*SkillTextReadResponse)(nil),         // 71: liveagent.gateway.v1.SkillTextReadResponse
-	(*SkillManageRequest)(nil),            // 72: liveagent.gateway.v1.SkillManageRequest
-	(*SkillManageResponse)(nil),           // 73: liveagent.gateway.v1.SkillManageResponse
-	(*FileMentionListRequest)(nil),        // 74: liveagent.gateway.v1.FileMentionListRequest
-	(*FileMentionEntry)(nil),              // 75: liveagent.gateway.v1.FileMentionEntry
-	(*FileMentionListResponse)(nil),       // 76: liveagent.gateway.v1.FileMentionListResponse
-	(*FsRoot)(nil),                        // 77: liveagent.gateway.v1.FsRoot
-	(*FsRootsRequest)(nil),                // 78: liveagent.gateway.v1.FsRootsRequest
-	(*FsRootsResponse)(nil),               // 79: liveagent.gateway.v1.FsRootsResponse
-	(*FsListDirsRequest)(nil),             // 80: liveagent.gateway.v1.FsListDirsRequest
-	(*FsDirEntry)(nil),                    // 81: liveagent.gateway.v1.FsDirEntry
-	(*FsListDirsResponse)(nil),            // 82: liveagent.gateway.v1.FsListDirsResponse
-	(*FsCreateProjectFolderRequest)(nil),  // 83: liveagent.gateway.v1.FsCreateProjectFolderRequest
-	(*FsCreateProjectFolderResponse)(nil), // 84: liveagent.gateway.v1.FsCreateProjectFolderResponse
-	(*FsListRequest)(nil),                 // 85: liveagent.gateway.v1.FsListRequest
-	(*FsListEntry)(nil),                   // 86: liveagent.gateway.v1.FsListEntry
-	(*FsListResponse)(nil),                // 87: liveagent.gateway.v1.FsListResponse
-	(*FsReadEditableTextRequest)(nil),     // 88: liveagent.gateway.v1.FsReadEditableTextRequest
-	(*FsReadEditableTextResponse)(nil),    // 89: liveagent.gateway.v1.FsReadEditableTextResponse
-	(*FsReadWorkspaceImageRequest)(nil),   // 90: liveagent.gateway.v1.FsReadWorkspaceImageRequest
-	(*FsReadWorkspaceImageResponse)(nil),  // 91: liveagent.gateway.v1.FsReadWorkspaceImageResponse
-	(*FsWriteTextRequest)(nil),            // 92: liveagent.gateway.v1.FsWriteTextRequest
-	(*FsWriteTextResponse)(nil),           // 93: liveagent.gateway.v1.FsWriteTextResponse
-	(*FsCreateDirRequest)(nil),            // 94: liveagent.gateway.v1.FsCreateDirRequest
-	(*FsCreateDirResponse)(nil),           // 95: liveagent.gateway.v1.FsCreateDirResponse
-	(*FsRenameRequest)(nil),               // 96: liveagent.gateway.v1.FsRenameRequest
-	(*FsRenameResponse)(nil),              // 97: liveagent.gateway.v1.FsRenameResponse
-	(*FsDeleteRequest)(nil),               // 98: liveagent.gateway.v1.FsDeleteRequest
-	(*FsDeleteResponse)(nil),              // 99: liveagent.gateway.v1.FsDeleteResponse
-	(*PingRequest)(nil),                   // 100: liveagent.gateway.v1.PingRequest
-	(*PongResponse)(nil),                  // 101: liveagent.gateway.v1.PongResponse
-	(*ErrorResponse)(nil),                 // 102: liveagent.gateway.v1.ErrorResponse
+	(TunnelFrameKind)(0),                      // 0: liveagent.gateway.v1.TunnelFrameKind
+	(ChatEvent_ChatEventType)(0),              // 1: liveagent.gateway.v1.ChatEvent.ChatEventType
+	(*AuthRequest)(nil),                       // 2: liveagent.gateway.v1.AuthRequest
+	(*AuthResponse)(nil),                      // 3: liveagent.gateway.v1.AuthResponse
+	(*GatewayEnvelope)(nil),                   // 4: liveagent.gateway.v1.GatewayEnvelope
+	(*AgentEnvelope)(nil),                     // 5: liveagent.gateway.v1.AgentEnvelope
+	(*ChatSelectedModel)(nil),                 // 6: liveagent.gateway.v1.ChatSelectedModel
+	(*ChatRuntimeControls)(nil),               // 7: liveagent.gateway.v1.ChatRuntimeControls
+	(*ChatUploadedFile)(nil),                  // 8: liveagent.gateway.v1.ChatUploadedFile
+	(*UploadReadableFile)(nil),                // 9: liveagent.gateway.v1.UploadReadableFile
+	(*UploadReadableFilesRequest)(nil),        // 10: liveagent.gateway.v1.UploadReadableFilesRequest
+	(*UploadReadableFilesResponse)(nil),       // 11: liveagent.gateway.v1.UploadReadableFilesResponse
+	(*UploadedImagePreviewRequest)(nil),       // 12: liveagent.gateway.v1.UploadedImagePreviewRequest
+	(*UploadedImagePreviewResponse)(nil),      // 13: liveagent.gateway.v1.UploadedImagePreviewResponse
+	(*TunnelControlRequest)(nil),              // 14: liveagent.gateway.v1.TunnelControlRequest
+	(*TunnelControlResponse)(nil),             // 15: liveagent.gateway.v1.TunnelControlResponse
+	(*TunnelSummary)(nil),                     // 16: liveagent.gateway.v1.TunnelSummary
+	(*TunnelHeader)(nil),                      // 17: liveagent.gateway.v1.TunnelHeader
+	(*TunnelFrame)(nil),                       // 18: liveagent.gateway.v1.TunnelFrame
+	(*MemoryManageRequest)(nil),               // 19: liveagent.gateway.v1.MemoryManageRequest
+	(*MemoryManageResponse)(nil),              // 20: liveagent.gateway.v1.MemoryManageResponse
+	(*TerminalRequest)(nil),                   // 21: liveagent.gateway.v1.TerminalRequest
+	(*TerminalSession)(nil),                   // 22: liveagent.gateway.v1.TerminalSession
+	(*TerminalSshMetadata)(nil),               // 23: liveagent.gateway.v1.TerminalSshMetadata
+	(*TerminalSshPrompt)(nil),                 // 24: liveagent.gateway.v1.TerminalSshPrompt
+	(*TerminalShellOption)(nil),               // 25: liveagent.gateway.v1.TerminalShellOption
+	(*TerminalResponse)(nil),                  // 26: liveagent.gateway.v1.TerminalResponse
+	(*TerminalEvent)(nil),                     // 27: liveagent.gateway.v1.TerminalEvent
+	(*GitRequest)(nil),                        // 28: liveagent.gateway.v1.GitRequest
+	(*GitResponse)(nil),                       // 29: liveagent.gateway.v1.GitResponse
+	(*ChatRequest)(nil),                       // 30: liveagent.gateway.v1.ChatRequest
+	(*CancelChatRequest)(nil),                 // 31: liveagent.gateway.v1.CancelChatRequest
+	(*ChatEvent)(nil),                         // 32: liveagent.gateway.v1.ChatEvent
+	(*ChatControlEvent)(nil),                  // 33: liveagent.gateway.v1.ChatControlEvent
+	(*RuntimeStatusEvent)(nil),                // 34: liveagent.gateway.v1.RuntimeStatusEvent
+	(*CronManageRequest)(nil),                 // 35: liveagent.gateway.v1.CronManageRequest
+	(*CronManageResponse)(nil),                // 36: liveagent.gateway.v1.CronManageResponse
+	(*HistoryListRequest)(nil),                // 37: liveagent.gateway.v1.HistoryListRequest
+	(*HistoryListResponse)(nil),               // 38: liveagent.gateway.v1.HistoryListResponse
+	(*ConversationSummary)(nil),               // 39: liveagent.gateway.v1.ConversationSummary
+	(*HistoryGetRequest)(nil),                 // 40: liveagent.gateway.v1.HistoryGetRequest
+	(*HistoryGetResponse)(nil),                // 41: liveagent.gateway.v1.HistoryGetResponse
+	(*HistoryRenameRequest)(nil),              // 42: liveagent.gateway.v1.HistoryRenameRequest
+	(*HistoryRenameResponse)(nil),             // 43: liveagent.gateway.v1.HistoryRenameResponse
+	(*HistoryPinRequest)(nil),                 // 44: liveagent.gateway.v1.HistoryPinRequest
+	(*HistoryPinResponse)(nil),                // 45: liveagent.gateway.v1.HistoryPinResponse
+	(*HistoryShareStatus)(nil),                // 46: liveagent.gateway.v1.HistoryShareStatus
+	(*HistoryShareGetRequest)(nil),            // 47: liveagent.gateway.v1.HistoryShareGetRequest
+	(*HistoryShareGetResponse)(nil),           // 48: liveagent.gateway.v1.HistoryShareGetResponse
+	(*HistoryShareSetRequest)(nil),            // 49: liveagent.gateway.v1.HistoryShareSetRequest
+	(*HistoryShareSetResponse)(nil),           // 50: liveagent.gateway.v1.HistoryShareSetResponse
+	(*HistoryShareResolveRequest)(nil),        // 51: liveagent.gateway.v1.HistoryShareResolveRequest
+	(*HistoryShareResolveResponse)(nil),       // 52: liveagent.gateway.v1.HistoryShareResolveResponse
+	(*HistoryWorkdirsRequest)(nil),            // 53: liveagent.gateway.v1.HistoryWorkdirsRequest
+	(*HistoryWorkdirSummary)(nil),             // 54: liveagent.gateway.v1.HistoryWorkdirSummary
+	(*HistoryWorkdirsResponse)(nil),           // 55: liveagent.gateway.v1.HistoryWorkdirsResponse
+	(*HistoryDeleteRequest)(nil),              // 56: liveagent.gateway.v1.HistoryDeleteRequest
+	(*HistoryDeleteResponse)(nil),             // 57: liveagent.gateway.v1.HistoryDeleteResponse
+	(*HistoryTruncateRequest)(nil),            // 58: liveagent.gateway.v1.HistoryTruncateRequest
+	(*HistoryTruncateResponse)(nil),           // 59: liveagent.gateway.v1.HistoryTruncateResponse
+	(*HistorySyncEvent)(nil),                  // 60: liveagent.gateway.v1.HistorySyncEvent
+	(*ProviderListRequest)(nil),               // 61: liveagent.gateway.v1.ProviderListRequest
+	(*ProviderListResponse)(nil),              // 62: liveagent.gateway.v1.ProviderListResponse
+	(*SettingsGetRequest)(nil),                // 63: liveagent.gateway.v1.SettingsGetRequest
+	(*SettingsGetResponse)(nil),               // 64: liveagent.gateway.v1.SettingsGetResponse
+	(*SettingsUpdateRequest)(nil),             // 65: liveagent.gateway.v1.SettingsUpdateRequest
+	(*SettingsUpdateResponse)(nil),            // 66: liveagent.gateway.v1.SettingsUpdateResponse
+	(*SettingsResetSshKnownHostRequest)(nil),  // 67: liveagent.gateway.v1.SettingsResetSshKnownHostRequest
+	(*SettingsResetSshKnownHostResponse)(nil), // 68: liveagent.gateway.v1.SettingsResetSshKnownHostResponse
+	(*SettingsSyncEvent)(nil),                 // 69: liveagent.gateway.v1.SettingsSyncEvent
+	(*SkillFilesListRequest)(nil),             // 70: liveagent.gateway.v1.SkillFilesListRequest
+	(*SkillFilesListResponse)(nil),            // 71: liveagent.gateway.v1.SkillFilesListResponse
+	(*SkillMetadataReadRequest)(nil),          // 72: liveagent.gateway.v1.SkillMetadataReadRequest
+	(*SkillMetadataReadResponse)(nil),         // 73: liveagent.gateway.v1.SkillMetadataReadResponse
+	(*SkillTextReadRequest)(nil),              // 74: liveagent.gateway.v1.SkillTextReadRequest
+	(*SkillTextReadResponse)(nil),             // 75: liveagent.gateway.v1.SkillTextReadResponse
+	(*SkillManageRequest)(nil),                // 76: liveagent.gateway.v1.SkillManageRequest
+	(*SkillManageResponse)(nil),               // 77: liveagent.gateway.v1.SkillManageResponse
+	(*FileMentionListRequest)(nil),            // 78: liveagent.gateway.v1.FileMentionListRequest
+	(*FileMentionEntry)(nil),                  // 79: liveagent.gateway.v1.FileMentionEntry
+	(*FileMentionListResponse)(nil),           // 80: liveagent.gateway.v1.FileMentionListResponse
+	(*FsRoot)(nil),                            // 81: liveagent.gateway.v1.FsRoot
+	(*FsRootsRequest)(nil),                    // 82: liveagent.gateway.v1.FsRootsRequest
+	(*FsRootsResponse)(nil),                   // 83: liveagent.gateway.v1.FsRootsResponse
+	(*FsListDirsRequest)(nil),                 // 84: liveagent.gateway.v1.FsListDirsRequest
+	(*FsDirEntry)(nil),                        // 85: liveagent.gateway.v1.FsDirEntry
+	(*FsListDirsResponse)(nil),                // 86: liveagent.gateway.v1.FsListDirsResponse
+	(*FsCreateProjectFolderRequest)(nil),      // 87: liveagent.gateway.v1.FsCreateProjectFolderRequest
+	(*FsCreateProjectFolderResponse)(nil),     // 88: liveagent.gateway.v1.FsCreateProjectFolderResponse
+	(*FsListRequest)(nil),                     // 89: liveagent.gateway.v1.FsListRequest
+	(*FsListEntry)(nil),                       // 90: liveagent.gateway.v1.FsListEntry
+	(*FsListResponse)(nil),                    // 91: liveagent.gateway.v1.FsListResponse
+	(*FsReadEditableTextRequest)(nil),         // 92: liveagent.gateway.v1.FsReadEditableTextRequest
+	(*FsReadEditableTextResponse)(nil),        // 93: liveagent.gateway.v1.FsReadEditableTextResponse
+	(*FsReadWorkspaceImageRequest)(nil),       // 94: liveagent.gateway.v1.FsReadWorkspaceImageRequest
+	(*FsReadWorkspaceImageResponse)(nil),      // 95: liveagent.gateway.v1.FsReadWorkspaceImageResponse
+	(*FsWriteTextRequest)(nil),                // 96: liveagent.gateway.v1.FsWriteTextRequest
+	(*FsWriteTextResponse)(nil),               // 97: liveagent.gateway.v1.FsWriteTextResponse
+	(*FsCreateDirRequest)(nil),                // 98: liveagent.gateway.v1.FsCreateDirRequest
+	(*FsCreateDirResponse)(nil),               // 99: liveagent.gateway.v1.FsCreateDirResponse
+	(*FsRenameRequest)(nil),                   // 100: liveagent.gateway.v1.FsRenameRequest
+	(*FsRenameResponse)(nil),                  // 101: liveagent.gateway.v1.FsRenameResponse
+	(*FsDeleteRequest)(nil),                   // 102: liveagent.gateway.v1.FsDeleteRequest
+	(*FsDeleteResponse)(nil),                  // 103: liveagent.gateway.v1.FsDeleteResponse
+	(*PingRequest)(nil),                       // 104: liveagent.gateway.v1.PingRequest
+	(*PongResponse)(nil),                      // 105: liveagent.gateway.v1.PongResponse
+	(*ErrorResponse)(nil),                     // 106: liveagent.gateway.v1.ErrorResponse
 }
 var file_proto_v1_gateway_proto_depIdxs = []int32{
-	28,  // 0: liveagent.gateway.v1.GatewayEnvelope.chat_request:type_name -> liveagent.gateway.v1.ChatRequest
-	29,  // 1: liveagent.gateway.v1.GatewayEnvelope.cancel_chat:type_name -> liveagent.gateway.v1.CancelChatRequest
-	33,  // 2: liveagent.gateway.v1.GatewayEnvelope.cron_manage:type_name -> liveagent.gateway.v1.CronManageRequest
-	35,  // 3: liveagent.gateway.v1.GatewayEnvelope.history_list:type_name -> liveagent.gateway.v1.HistoryListRequest
-	38,  // 4: liveagent.gateway.v1.GatewayEnvelope.history_get:type_name -> liveagent.gateway.v1.HistoryGetRequest
-	40,  // 5: liveagent.gateway.v1.GatewayEnvelope.history_rename:type_name -> liveagent.gateway.v1.HistoryRenameRequest
-	54,  // 6: liveagent.gateway.v1.GatewayEnvelope.history_delete:type_name -> liveagent.gateway.v1.HistoryDeleteRequest
-	56,  // 7: liveagent.gateway.v1.GatewayEnvelope.history_truncate:type_name -> liveagent.gateway.v1.HistoryTruncateRequest
-	42,  // 8: liveagent.gateway.v1.GatewayEnvelope.history_pin:type_name -> liveagent.gateway.v1.HistoryPinRequest
-	45,  // 9: liveagent.gateway.v1.GatewayEnvelope.history_share_get:type_name -> liveagent.gateway.v1.HistoryShareGetRequest
-	47,  // 10: liveagent.gateway.v1.GatewayEnvelope.history_share_set:type_name -> liveagent.gateway.v1.HistoryShareSetRequest
-	49,  // 11: liveagent.gateway.v1.GatewayEnvelope.history_share_resolve:type_name -> liveagent.gateway.v1.HistoryShareResolveRequest
-	51,  // 12: liveagent.gateway.v1.GatewayEnvelope.history_workdirs:type_name -> liveagent.gateway.v1.HistoryWorkdirsRequest
-	59,  // 13: liveagent.gateway.v1.GatewayEnvelope.provider_list:type_name -> liveagent.gateway.v1.ProviderListRequest
-	61,  // 14: liveagent.gateway.v1.GatewayEnvelope.settings_get:type_name -> liveagent.gateway.v1.SettingsGetRequest
-	63,  // 15: liveagent.gateway.v1.GatewayEnvelope.settings_update:type_name -> liveagent.gateway.v1.SettingsUpdateRequest
-	66,  // 16: liveagent.gateway.v1.GatewayEnvelope.skill_files_list:type_name -> liveagent.gateway.v1.SkillFilesListRequest
-	68,  // 17: liveagent.gateway.v1.GatewayEnvelope.skill_metadata_read:type_name -> liveagent.gateway.v1.SkillMetadataReadRequest
-	70,  // 18: liveagent.gateway.v1.GatewayEnvelope.skill_text_read:type_name -> liveagent.gateway.v1.SkillTextReadRequest
-	74,  // 19: liveagent.gateway.v1.GatewayEnvelope.file_mention_list:type_name -> liveagent.gateway.v1.FileMentionListRequest
+	30,  // 0: liveagent.gateway.v1.GatewayEnvelope.chat_request:type_name -> liveagent.gateway.v1.ChatRequest
+	31,  // 1: liveagent.gateway.v1.GatewayEnvelope.cancel_chat:type_name -> liveagent.gateway.v1.CancelChatRequest
+	35,  // 2: liveagent.gateway.v1.GatewayEnvelope.cron_manage:type_name -> liveagent.gateway.v1.CronManageRequest
+	37,  // 3: liveagent.gateway.v1.GatewayEnvelope.history_list:type_name -> liveagent.gateway.v1.HistoryListRequest
+	40,  // 4: liveagent.gateway.v1.GatewayEnvelope.history_get:type_name -> liveagent.gateway.v1.HistoryGetRequest
+	42,  // 5: liveagent.gateway.v1.GatewayEnvelope.history_rename:type_name -> liveagent.gateway.v1.HistoryRenameRequest
+	56,  // 6: liveagent.gateway.v1.GatewayEnvelope.history_delete:type_name -> liveagent.gateway.v1.HistoryDeleteRequest
+	58,  // 7: liveagent.gateway.v1.GatewayEnvelope.history_truncate:type_name -> liveagent.gateway.v1.HistoryTruncateRequest
+	44,  // 8: liveagent.gateway.v1.GatewayEnvelope.history_pin:type_name -> liveagent.gateway.v1.HistoryPinRequest
+	47,  // 9: liveagent.gateway.v1.GatewayEnvelope.history_share_get:type_name -> liveagent.gateway.v1.HistoryShareGetRequest
+	49,  // 10: liveagent.gateway.v1.GatewayEnvelope.history_share_set:type_name -> liveagent.gateway.v1.HistoryShareSetRequest
+	51,  // 11: liveagent.gateway.v1.GatewayEnvelope.history_share_resolve:type_name -> liveagent.gateway.v1.HistoryShareResolveRequest
+	53,  // 12: liveagent.gateway.v1.GatewayEnvelope.history_workdirs:type_name -> liveagent.gateway.v1.HistoryWorkdirsRequest
+	61,  // 13: liveagent.gateway.v1.GatewayEnvelope.provider_list:type_name -> liveagent.gateway.v1.ProviderListRequest
+	63,  // 14: liveagent.gateway.v1.GatewayEnvelope.settings_get:type_name -> liveagent.gateway.v1.SettingsGetRequest
+	65,  // 15: liveagent.gateway.v1.GatewayEnvelope.settings_update:type_name -> liveagent.gateway.v1.SettingsUpdateRequest
+	70,  // 16: liveagent.gateway.v1.GatewayEnvelope.skill_files_list:type_name -> liveagent.gateway.v1.SkillFilesListRequest
+	72,  // 17: liveagent.gateway.v1.GatewayEnvelope.skill_metadata_read:type_name -> liveagent.gateway.v1.SkillMetadataReadRequest
+	74,  // 18: liveagent.gateway.v1.GatewayEnvelope.skill_text_read:type_name -> liveagent.gateway.v1.SkillTextReadRequest
+	78,  // 19: liveagent.gateway.v1.GatewayEnvelope.file_mention_list:type_name -> liveagent.gateway.v1.FileMentionListRequest
 	10,  // 20: liveagent.gateway.v1.GatewayEnvelope.upload_readable_files:type_name -> liveagent.gateway.v1.UploadReadableFilesRequest
-	78,  // 21: liveagent.gateway.v1.GatewayEnvelope.fs_roots:type_name -> liveagent.gateway.v1.FsRootsRequest
-	80,  // 22: liveagent.gateway.v1.GatewayEnvelope.fs_list_dirs:type_name -> liveagent.gateway.v1.FsListDirsRequest
-	100, // 23: liveagent.gateway.v1.GatewayEnvelope.ping:type_name -> liveagent.gateway.v1.PingRequest
+	82,  // 21: liveagent.gateway.v1.GatewayEnvelope.fs_roots:type_name -> liveagent.gateway.v1.FsRootsRequest
+	84,  // 22: liveagent.gateway.v1.GatewayEnvelope.fs_list_dirs:type_name -> liveagent.gateway.v1.FsListDirsRequest
+	104, // 23: liveagent.gateway.v1.GatewayEnvelope.ping:type_name -> liveagent.gateway.v1.PingRequest
 	12,  // 24: liveagent.gateway.v1.GatewayEnvelope.uploaded_image_preview:type_name -> liveagent.gateway.v1.UploadedImagePreviewRequest
 	19,  // 25: liveagent.gateway.v1.GatewayEnvelope.memory_manage:type_name -> liveagent.gateway.v1.MemoryManageRequest
-	72,  // 26: liveagent.gateway.v1.GatewayEnvelope.skill_manage:type_name -> liveagent.gateway.v1.SkillManageRequest
-	83,  // 27: liveagent.gateway.v1.GatewayEnvelope.fs_create_project_folder:type_name -> liveagent.gateway.v1.FsCreateProjectFolderRequest
+	76,  // 26: liveagent.gateway.v1.GatewayEnvelope.skill_manage:type_name -> liveagent.gateway.v1.SkillManageRequest
+	87,  // 27: liveagent.gateway.v1.GatewayEnvelope.fs_create_project_folder:type_name -> liveagent.gateway.v1.FsCreateProjectFolderRequest
 	21,  // 28: liveagent.gateway.v1.GatewayEnvelope.terminal_request:type_name -> liveagent.gateway.v1.TerminalRequest
-	85,  // 29: liveagent.gateway.v1.GatewayEnvelope.fs_list:type_name -> liveagent.gateway.v1.FsListRequest
-	92,  // 30: liveagent.gateway.v1.GatewayEnvelope.fs_write_text:type_name -> liveagent.gateway.v1.FsWriteTextRequest
-	94,  // 31: liveagent.gateway.v1.GatewayEnvelope.fs_create_dir:type_name -> liveagent.gateway.v1.FsCreateDirRequest
-	96,  // 32: liveagent.gateway.v1.GatewayEnvelope.fs_rename:type_name -> liveagent.gateway.v1.FsRenameRequest
-	98,  // 33: liveagent.gateway.v1.GatewayEnvelope.fs_delete:type_name -> liveagent.gateway.v1.FsDeleteRequest
-	26,  // 34: liveagent.gateway.v1.GatewayEnvelope.git_request:type_name -> liveagent.gateway.v1.GitRequest
-	88,  // 35: liveagent.gateway.v1.GatewayEnvelope.fs_read_editable_text:type_name -> liveagent.gateway.v1.FsReadEditableTextRequest
-	90,  // 36: liveagent.gateway.v1.GatewayEnvelope.fs_read_workspace_image:type_name -> liveagent.gateway.v1.FsReadWorkspaceImageRequest
+	89,  // 29: liveagent.gateway.v1.GatewayEnvelope.fs_list:type_name -> liveagent.gateway.v1.FsListRequest
+	96,  // 30: liveagent.gateway.v1.GatewayEnvelope.fs_write_text:type_name -> liveagent.gateway.v1.FsWriteTextRequest
+	98,  // 31: liveagent.gateway.v1.GatewayEnvelope.fs_create_dir:type_name -> liveagent.gateway.v1.FsCreateDirRequest
+	100, // 32: liveagent.gateway.v1.GatewayEnvelope.fs_rename:type_name -> liveagent.gateway.v1.FsRenameRequest
+	102, // 33: liveagent.gateway.v1.GatewayEnvelope.fs_delete:type_name -> liveagent.gateway.v1.FsDeleteRequest
+	28,  // 34: liveagent.gateway.v1.GatewayEnvelope.git_request:type_name -> liveagent.gateway.v1.GitRequest
+	92,  // 35: liveagent.gateway.v1.GatewayEnvelope.fs_read_editable_text:type_name -> liveagent.gateway.v1.FsReadEditableTextRequest
+	94,  // 36: liveagent.gateway.v1.GatewayEnvelope.fs_read_workspace_image:type_name -> liveagent.gateway.v1.FsReadWorkspaceImageRequest
 	14,  // 37: liveagent.gateway.v1.GatewayEnvelope.tunnel_control:type_name -> liveagent.gateway.v1.TunnelControlRequest
 	15,  // 38: liveagent.gateway.v1.GatewayEnvelope.tunnel_control_resp:type_name -> liveagent.gateway.v1.TunnelControlResponse
 	18,  // 39: liveagent.gateway.v1.GatewayEnvelope.tunnel_frame:type_name -> liveagent.gateway.v1.TunnelFrame
-	30,  // 40: liveagent.gateway.v1.AgentEnvelope.chat_event:type_name -> liveagent.gateway.v1.ChatEvent
-	34,  // 41: liveagent.gateway.v1.AgentEnvelope.cron_manage_resp:type_name -> liveagent.gateway.v1.CronManageResponse
-	36,  // 42: liveagent.gateway.v1.AgentEnvelope.history_list_resp:type_name -> liveagent.gateway.v1.HistoryListResponse
-	39,  // 43: liveagent.gateway.v1.AgentEnvelope.history_get_resp:type_name -> liveagent.gateway.v1.HistoryGetResponse
-	41,  // 44: liveagent.gateway.v1.AgentEnvelope.history_rename_resp:type_name -> liveagent.gateway.v1.HistoryRenameResponse
-	55,  // 45: liveagent.gateway.v1.AgentEnvelope.history_delete_resp:type_name -> liveagent.gateway.v1.HistoryDeleteResponse
-	58,  // 46: liveagent.gateway.v1.AgentEnvelope.history_sync:type_name -> liveagent.gateway.v1.HistorySyncEvent
-	57,  // 47: liveagent.gateway.v1.AgentEnvelope.history_truncate_resp:type_name -> liveagent.gateway.v1.HistoryTruncateResponse
-	43,  // 48: liveagent.gateway.v1.AgentEnvelope.history_pin_resp:type_name -> liveagent.gateway.v1.HistoryPinResponse
-	46,  // 49: liveagent.gateway.v1.AgentEnvelope.history_share_get_resp:type_name -> liveagent.gateway.v1.HistoryShareGetResponse
-	48,  // 50: liveagent.gateway.v1.AgentEnvelope.history_share_set_resp:type_name -> liveagent.gateway.v1.HistoryShareSetResponse
-	50,  // 51: liveagent.gateway.v1.AgentEnvelope.history_share_resolve_resp:type_name -> liveagent.gateway.v1.HistoryShareResolveResponse
-	53,  // 52: liveagent.gateway.v1.AgentEnvelope.history_workdirs_resp:type_name -> liveagent.gateway.v1.HistoryWorkdirsResponse
-	60,  // 53: liveagent.gateway.v1.AgentEnvelope.provider_list_resp:type_name -> liveagent.gateway.v1.ProviderListResponse
-	62,  // 54: liveagent.gateway.v1.AgentEnvelope.settings_get_resp:type_name -> liveagent.gateway.v1.SettingsGetResponse
-	64,  // 55: liveagent.gateway.v1.AgentEnvelope.settings_update_resp:type_name -> liveagent.gateway.v1.SettingsUpdateResponse
-	65,  // 56: liveagent.gateway.v1.AgentEnvelope.settings_sync:type_name -> liveagent.gateway.v1.SettingsSyncEvent
-	67,  // 57: liveagent.gateway.v1.AgentEnvelope.skill_files_list_resp:type_name -> liveagent.gateway.v1.SkillFilesListResponse
-	69,  // 58: liveagent.gateway.v1.AgentEnvelope.skill_metadata_read_resp:type_name -> liveagent.gateway.v1.SkillMetadataReadResponse
-	71,  // 59: liveagent.gateway.v1.AgentEnvelope.skill_text_read_resp:type_name -> liveagent.gateway.v1.SkillTextReadResponse
-	76,  // 60: liveagent.gateway.v1.AgentEnvelope.file_mention_list_resp:type_name -> liveagent.gateway.v1.FileMentionListResponse
-	11,  // 61: liveagent.gateway.v1.AgentEnvelope.upload_readable_files_resp:type_name -> liveagent.gateway.v1.UploadReadableFilesResponse
-	79,  // 62: liveagent.gateway.v1.AgentEnvelope.fs_roots_resp:type_name -> liveagent.gateway.v1.FsRootsResponse
-	101, // 63: liveagent.gateway.v1.AgentEnvelope.pong:type_name -> liveagent.gateway.v1.PongResponse
-	82,  // 64: liveagent.gateway.v1.AgentEnvelope.fs_list_dirs_resp:type_name -> liveagent.gateway.v1.FsListDirsResponse
-	13,  // 65: liveagent.gateway.v1.AgentEnvelope.uploaded_image_preview_resp:type_name -> liveagent.gateway.v1.UploadedImagePreviewResponse
-	20,  // 66: liveagent.gateway.v1.AgentEnvelope.memory_manage_resp:type_name -> liveagent.gateway.v1.MemoryManageResponse
-	73,  // 67: liveagent.gateway.v1.AgentEnvelope.skill_manage_resp:type_name -> liveagent.gateway.v1.SkillManageResponse
-	84,  // 68: liveagent.gateway.v1.AgentEnvelope.fs_create_project_folder_resp:type_name -> liveagent.gateway.v1.FsCreateProjectFolderResponse
-	24,  // 69: liveagent.gateway.v1.AgentEnvelope.terminal_response:type_name -> liveagent.gateway.v1.TerminalResponse
-	25,  // 70: liveagent.gateway.v1.AgentEnvelope.terminal_event:type_name -> liveagent.gateway.v1.TerminalEvent
-	87,  // 71: liveagent.gateway.v1.AgentEnvelope.fs_list_resp:type_name -> liveagent.gateway.v1.FsListResponse
-	93,  // 72: liveagent.gateway.v1.AgentEnvelope.fs_write_text_resp:type_name -> liveagent.gateway.v1.FsWriteTextResponse
-	95,  // 73: liveagent.gateway.v1.AgentEnvelope.fs_create_dir_resp:type_name -> liveagent.gateway.v1.FsCreateDirResponse
-	97,  // 74: liveagent.gateway.v1.AgentEnvelope.fs_rename_resp:type_name -> liveagent.gateway.v1.FsRenameResponse
-	99,  // 75: liveagent.gateway.v1.AgentEnvelope.fs_delete_resp:type_name -> liveagent.gateway.v1.FsDeleteResponse
-	27,  // 76: liveagent.gateway.v1.AgentEnvelope.git_response:type_name -> liveagent.gateway.v1.GitResponse
-	89,  // 77: liveagent.gateway.v1.AgentEnvelope.fs_read_editable_text_resp:type_name -> liveagent.gateway.v1.FsReadEditableTextResponse
-	91,  // 78: liveagent.gateway.v1.AgentEnvelope.fs_read_workspace_image_resp:type_name -> liveagent.gateway.v1.FsReadWorkspaceImageResponse
-	14,  // 79: liveagent.gateway.v1.AgentEnvelope.tunnel_control:type_name -> liveagent.gateway.v1.TunnelControlRequest
-	15,  // 80: liveagent.gateway.v1.AgentEnvelope.tunnel_control_resp:type_name -> liveagent.gateway.v1.TunnelControlResponse
-	18,  // 81: liveagent.gateway.v1.AgentEnvelope.tunnel_frame:type_name -> liveagent.gateway.v1.TunnelFrame
-	31,  // 82: liveagent.gateway.v1.AgentEnvelope.chat_control:type_name -> liveagent.gateway.v1.ChatControlEvent
-	32,  // 83: liveagent.gateway.v1.AgentEnvelope.runtime_status:type_name -> liveagent.gateway.v1.RuntimeStatusEvent
-	102, // 84: liveagent.gateway.v1.AgentEnvelope.error:type_name -> liveagent.gateway.v1.ErrorResponse
-	9,   // 85: liveagent.gateway.v1.UploadReadableFilesRequest.files:type_name -> liveagent.gateway.v1.UploadReadableFile
-	8,   // 86: liveagent.gateway.v1.UploadReadableFilesResponse.files:type_name -> liveagent.gateway.v1.ChatUploadedFile
-	16,  // 87: liveagent.gateway.v1.TunnelControlResponse.tunnels:type_name -> liveagent.gateway.v1.TunnelSummary
-	16,  // 88: liveagent.gateway.v1.TunnelControlResponse.tunnel:type_name -> liveagent.gateway.v1.TunnelSummary
-	0,   // 89: liveagent.gateway.v1.TunnelFrame.kind:type_name -> liveagent.gateway.v1.TunnelFrameKind
-	17,  // 90: liveagent.gateway.v1.TunnelFrame.headers:type_name -> liveagent.gateway.v1.TunnelHeader
-	22,  // 91: liveagent.gateway.v1.TerminalResponse.sessions:type_name -> liveagent.gateway.v1.TerminalSession
-	22,  // 92: liveagent.gateway.v1.TerminalResponse.session:type_name -> liveagent.gateway.v1.TerminalSession
-	23,  // 93: liveagent.gateway.v1.TerminalResponse.shell_options:type_name -> liveagent.gateway.v1.TerminalShellOption
-	22,  // 94: liveagent.gateway.v1.TerminalEvent.session:type_name -> liveagent.gateway.v1.TerminalSession
-	6,   // 95: liveagent.gateway.v1.ChatRequest.selected_model:type_name -> liveagent.gateway.v1.ChatSelectedModel
-	8,   // 96: liveagent.gateway.v1.ChatRequest.uploaded_files:type_name -> liveagent.gateway.v1.ChatUploadedFile
-	7,   // 97: liveagent.gateway.v1.ChatRequest.runtime_controls:type_name -> liveagent.gateway.v1.ChatRuntimeControls
-	1,   // 98: liveagent.gateway.v1.ChatEvent.type:type_name -> liveagent.gateway.v1.ChatEvent.ChatEventType
-	37,  // 99: liveagent.gateway.v1.HistoryListResponse.conversations:type_name -> liveagent.gateway.v1.ConversationSummary
-	37,  // 100: liveagent.gateway.v1.HistoryGetResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	37,  // 101: liveagent.gateway.v1.HistoryRenameResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	37,  // 102: liveagent.gateway.v1.HistoryPinResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	44,  // 103: liveagent.gateway.v1.HistoryShareGetResponse.share:type_name -> liveagent.gateway.v1.HistoryShareStatus
-	44,  // 104: liveagent.gateway.v1.HistoryShareSetResponse.share:type_name -> liveagent.gateway.v1.HistoryShareStatus
-	37,  // 105: liveagent.gateway.v1.HistoryShareResolveResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	52,  // 106: liveagent.gateway.v1.HistoryWorkdirsResponse.workdirs:type_name -> liveagent.gateway.v1.HistoryWorkdirSummary
-	37,  // 107: liveagent.gateway.v1.HistoryTruncateResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	37,  // 108: liveagent.gateway.v1.HistorySyncEvent.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	75,  // 109: liveagent.gateway.v1.FileMentionListResponse.entries:type_name -> liveagent.gateway.v1.FileMentionEntry
-	77,  // 110: liveagent.gateway.v1.FsRootsResponse.roots:type_name -> liveagent.gateway.v1.FsRoot
-	81,  // 111: liveagent.gateway.v1.FsListDirsResponse.entries:type_name -> liveagent.gateway.v1.FsDirEntry
-	86,  // 112: liveagent.gateway.v1.FsListResponse.entries:type_name -> liveagent.gateway.v1.FsListEntry
-	5,   // 113: liveagent.gateway.v1.AgentGateway.AgentConnect:input_type -> liveagent.gateway.v1.AgentEnvelope
-	2,   // 114: liveagent.gateway.v1.AgentGateway.Authenticate:input_type -> liveagent.gateway.v1.AuthRequest
-	4,   // 115: liveagent.gateway.v1.AgentGateway.AgentConnect:output_type -> liveagent.gateway.v1.GatewayEnvelope
-	3,   // 116: liveagent.gateway.v1.AgentGateway.Authenticate:output_type -> liveagent.gateway.v1.AuthResponse
-	115, // [115:117] is the sub-list for method output_type
-	113, // [113:115] is the sub-list for method input_type
-	113, // [113:113] is the sub-list for extension type_name
-	113, // [113:113] is the sub-list for extension extendee
-	0,   // [0:113] is the sub-list for field type_name
+	67,  // 40: liveagent.gateway.v1.GatewayEnvelope.settings_reset_ssh_known_host:type_name -> liveagent.gateway.v1.SettingsResetSshKnownHostRequest
+	32,  // 41: liveagent.gateway.v1.AgentEnvelope.chat_event:type_name -> liveagent.gateway.v1.ChatEvent
+	36,  // 42: liveagent.gateway.v1.AgentEnvelope.cron_manage_resp:type_name -> liveagent.gateway.v1.CronManageResponse
+	38,  // 43: liveagent.gateway.v1.AgentEnvelope.history_list_resp:type_name -> liveagent.gateway.v1.HistoryListResponse
+	41,  // 44: liveagent.gateway.v1.AgentEnvelope.history_get_resp:type_name -> liveagent.gateway.v1.HistoryGetResponse
+	43,  // 45: liveagent.gateway.v1.AgentEnvelope.history_rename_resp:type_name -> liveagent.gateway.v1.HistoryRenameResponse
+	57,  // 46: liveagent.gateway.v1.AgentEnvelope.history_delete_resp:type_name -> liveagent.gateway.v1.HistoryDeleteResponse
+	60,  // 47: liveagent.gateway.v1.AgentEnvelope.history_sync:type_name -> liveagent.gateway.v1.HistorySyncEvent
+	59,  // 48: liveagent.gateway.v1.AgentEnvelope.history_truncate_resp:type_name -> liveagent.gateway.v1.HistoryTruncateResponse
+	45,  // 49: liveagent.gateway.v1.AgentEnvelope.history_pin_resp:type_name -> liveagent.gateway.v1.HistoryPinResponse
+	48,  // 50: liveagent.gateway.v1.AgentEnvelope.history_share_get_resp:type_name -> liveagent.gateway.v1.HistoryShareGetResponse
+	50,  // 51: liveagent.gateway.v1.AgentEnvelope.history_share_set_resp:type_name -> liveagent.gateway.v1.HistoryShareSetResponse
+	52,  // 52: liveagent.gateway.v1.AgentEnvelope.history_share_resolve_resp:type_name -> liveagent.gateway.v1.HistoryShareResolveResponse
+	55,  // 53: liveagent.gateway.v1.AgentEnvelope.history_workdirs_resp:type_name -> liveagent.gateway.v1.HistoryWorkdirsResponse
+	62,  // 54: liveagent.gateway.v1.AgentEnvelope.provider_list_resp:type_name -> liveagent.gateway.v1.ProviderListResponse
+	64,  // 55: liveagent.gateway.v1.AgentEnvelope.settings_get_resp:type_name -> liveagent.gateway.v1.SettingsGetResponse
+	66,  // 56: liveagent.gateway.v1.AgentEnvelope.settings_update_resp:type_name -> liveagent.gateway.v1.SettingsUpdateResponse
+	69,  // 57: liveagent.gateway.v1.AgentEnvelope.settings_sync:type_name -> liveagent.gateway.v1.SettingsSyncEvent
+	71,  // 58: liveagent.gateway.v1.AgentEnvelope.skill_files_list_resp:type_name -> liveagent.gateway.v1.SkillFilesListResponse
+	73,  // 59: liveagent.gateway.v1.AgentEnvelope.skill_metadata_read_resp:type_name -> liveagent.gateway.v1.SkillMetadataReadResponse
+	75,  // 60: liveagent.gateway.v1.AgentEnvelope.skill_text_read_resp:type_name -> liveagent.gateway.v1.SkillTextReadResponse
+	80,  // 61: liveagent.gateway.v1.AgentEnvelope.file_mention_list_resp:type_name -> liveagent.gateway.v1.FileMentionListResponse
+	11,  // 62: liveagent.gateway.v1.AgentEnvelope.upload_readable_files_resp:type_name -> liveagent.gateway.v1.UploadReadableFilesResponse
+	83,  // 63: liveagent.gateway.v1.AgentEnvelope.fs_roots_resp:type_name -> liveagent.gateway.v1.FsRootsResponse
+	105, // 64: liveagent.gateway.v1.AgentEnvelope.pong:type_name -> liveagent.gateway.v1.PongResponse
+	86,  // 65: liveagent.gateway.v1.AgentEnvelope.fs_list_dirs_resp:type_name -> liveagent.gateway.v1.FsListDirsResponse
+	13,  // 66: liveagent.gateway.v1.AgentEnvelope.uploaded_image_preview_resp:type_name -> liveagent.gateway.v1.UploadedImagePreviewResponse
+	20,  // 67: liveagent.gateway.v1.AgentEnvelope.memory_manage_resp:type_name -> liveagent.gateway.v1.MemoryManageResponse
+	77,  // 68: liveagent.gateway.v1.AgentEnvelope.skill_manage_resp:type_name -> liveagent.gateway.v1.SkillManageResponse
+	88,  // 69: liveagent.gateway.v1.AgentEnvelope.fs_create_project_folder_resp:type_name -> liveagent.gateway.v1.FsCreateProjectFolderResponse
+	26,  // 70: liveagent.gateway.v1.AgentEnvelope.terminal_response:type_name -> liveagent.gateway.v1.TerminalResponse
+	27,  // 71: liveagent.gateway.v1.AgentEnvelope.terminal_event:type_name -> liveagent.gateway.v1.TerminalEvent
+	91,  // 72: liveagent.gateway.v1.AgentEnvelope.fs_list_resp:type_name -> liveagent.gateway.v1.FsListResponse
+	97,  // 73: liveagent.gateway.v1.AgentEnvelope.fs_write_text_resp:type_name -> liveagent.gateway.v1.FsWriteTextResponse
+	99,  // 74: liveagent.gateway.v1.AgentEnvelope.fs_create_dir_resp:type_name -> liveagent.gateway.v1.FsCreateDirResponse
+	101, // 75: liveagent.gateway.v1.AgentEnvelope.fs_rename_resp:type_name -> liveagent.gateway.v1.FsRenameResponse
+	103, // 76: liveagent.gateway.v1.AgentEnvelope.fs_delete_resp:type_name -> liveagent.gateway.v1.FsDeleteResponse
+	29,  // 77: liveagent.gateway.v1.AgentEnvelope.git_response:type_name -> liveagent.gateway.v1.GitResponse
+	93,  // 78: liveagent.gateway.v1.AgentEnvelope.fs_read_editable_text_resp:type_name -> liveagent.gateway.v1.FsReadEditableTextResponse
+	95,  // 79: liveagent.gateway.v1.AgentEnvelope.fs_read_workspace_image_resp:type_name -> liveagent.gateway.v1.FsReadWorkspaceImageResponse
+	14,  // 80: liveagent.gateway.v1.AgentEnvelope.tunnel_control:type_name -> liveagent.gateway.v1.TunnelControlRequest
+	15,  // 81: liveagent.gateway.v1.AgentEnvelope.tunnel_control_resp:type_name -> liveagent.gateway.v1.TunnelControlResponse
+	18,  // 82: liveagent.gateway.v1.AgentEnvelope.tunnel_frame:type_name -> liveagent.gateway.v1.TunnelFrame
+	33,  // 83: liveagent.gateway.v1.AgentEnvelope.chat_control:type_name -> liveagent.gateway.v1.ChatControlEvent
+	34,  // 84: liveagent.gateway.v1.AgentEnvelope.runtime_status:type_name -> liveagent.gateway.v1.RuntimeStatusEvent
+	68,  // 85: liveagent.gateway.v1.AgentEnvelope.settings_reset_ssh_known_host_resp:type_name -> liveagent.gateway.v1.SettingsResetSshKnownHostResponse
+	106, // 86: liveagent.gateway.v1.AgentEnvelope.error:type_name -> liveagent.gateway.v1.ErrorResponse
+	9,   // 87: liveagent.gateway.v1.UploadReadableFilesRequest.files:type_name -> liveagent.gateway.v1.UploadReadableFile
+	8,   // 88: liveagent.gateway.v1.UploadReadableFilesResponse.files:type_name -> liveagent.gateway.v1.ChatUploadedFile
+	16,  // 89: liveagent.gateway.v1.TunnelControlResponse.tunnels:type_name -> liveagent.gateway.v1.TunnelSummary
+	16,  // 90: liveagent.gateway.v1.TunnelControlResponse.tunnel:type_name -> liveagent.gateway.v1.TunnelSummary
+	0,   // 91: liveagent.gateway.v1.TunnelFrame.kind:type_name -> liveagent.gateway.v1.TunnelFrameKind
+	17,  // 92: liveagent.gateway.v1.TunnelFrame.headers:type_name -> liveagent.gateway.v1.TunnelHeader
+	23,  // 93: liveagent.gateway.v1.TerminalSession.ssh:type_name -> liveagent.gateway.v1.TerminalSshMetadata
+	22,  // 94: liveagent.gateway.v1.TerminalResponse.sessions:type_name -> liveagent.gateway.v1.TerminalSession
+	22,  // 95: liveagent.gateway.v1.TerminalResponse.session:type_name -> liveagent.gateway.v1.TerminalSession
+	25,  // 96: liveagent.gateway.v1.TerminalResponse.shell_options:type_name -> liveagent.gateway.v1.TerminalShellOption
+	24,  // 97: liveagent.gateway.v1.TerminalResponse.ssh_prompt:type_name -> liveagent.gateway.v1.TerminalSshPrompt
+	22,  // 98: liveagent.gateway.v1.TerminalEvent.session:type_name -> liveagent.gateway.v1.TerminalSession
+	6,   // 99: liveagent.gateway.v1.ChatRequest.selected_model:type_name -> liveagent.gateway.v1.ChatSelectedModel
+	8,   // 100: liveagent.gateway.v1.ChatRequest.uploaded_files:type_name -> liveagent.gateway.v1.ChatUploadedFile
+	7,   // 101: liveagent.gateway.v1.ChatRequest.runtime_controls:type_name -> liveagent.gateway.v1.ChatRuntimeControls
+	1,   // 102: liveagent.gateway.v1.ChatEvent.type:type_name -> liveagent.gateway.v1.ChatEvent.ChatEventType
+	39,  // 103: liveagent.gateway.v1.HistoryListResponse.conversations:type_name -> liveagent.gateway.v1.ConversationSummary
+	39,  // 104: liveagent.gateway.v1.HistoryGetResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	39,  // 105: liveagent.gateway.v1.HistoryRenameResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	39,  // 106: liveagent.gateway.v1.HistoryPinResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	46,  // 107: liveagent.gateway.v1.HistoryShareGetResponse.share:type_name -> liveagent.gateway.v1.HistoryShareStatus
+	46,  // 108: liveagent.gateway.v1.HistoryShareSetResponse.share:type_name -> liveagent.gateway.v1.HistoryShareStatus
+	39,  // 109: liveagent.gateway.v1.HistoryShareResolveResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	54,  // 110: liveagent.gateway.v1.HistoryWorkdirsResponse.workdirs:type_name -> liveagent.gateway.v1.HistoryWorkdirSummary
+	39,  // 111: liveagent.gateway.v1.HistoryTruncateResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	39,  // 112: liveagent.gateway.v1.HistorySyncEvent.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	79,  // 113: liveagent.gateway.v1.FileMentionListResponse.entries:type_name -> liveagent.gateway.v1.FileMentionEntry
+	81,  // 114: liveagent.gateway.v1.FsRootsResponse.roots:type_name -> liveagent.gateway.v1.FsRoot
+	85,  // 115: liveagent.gateway.v1.FsListDirsResponse.entries:type_name -> liveagent.gateway.v1.FsDirEntry
+	90,  // 116: liveagent.gateway.v1.FsListResponse.entries:type_name -> liveagent.gateway.v1.FsListEntry
+	5,   // 117: liveagent.gateway.v1.AgentGateway.AgentConnect:input_type -> liveagent.gateway.v1.AgentEnvelope
+	2,   // 118: liveagent.gateway.v1.AgentGateway.Authenticate:input_type -> liveagent.gateway.v1.AuthRequest
+	4,   // 119: liveagent.gateway.v1.AgentGateway.AgentConnect:output_type -> liveagent.gateway.v1.GatewayEnvelope
+	3,   // 120: liveagent.gateway.v1.AgentGateway.Authenticate:output_type -> liveagent.gateway.v1.AuthResponse
+	119, // [119:121] is the sub-list for method output_type
+	117, // [117:119] is the sub-list for method input_type
+	117, // [117:117] is the sub-list for extension type_name
+	117, // [117:117] is the sub-list for extension extendee
+	0,   // [0:117] is the sub-list for field type_name
 }
 
 func init() { file_proto_v1_gateway_proto_init() }
@@ -8663,6 +9128,7 @@ func file_proto_v1_gateway_proto_init() {
 		(*GatewayEnvelope_TunnelControl)(nil),
 		(*GatewayEnvelope_TunnelControlResp)(nil),
 		(*GatewayEnvelope_TunnelFrame)(nil),
+		(*GatewayEnvelope_SettingsResetSshKnownHost)(nil),
 	}
 	file_proto_v1_gateway_proto_msgTypes[3].OneofWrappers = []any{
 		(*AgentEnvelope_ChatEvent)(nil),
@@ -8709,16 +9175,17 @@ func file_proto_v1_gateway_proto_init() {
 		(*AgentEnvelope_TunnelFrame)(nil),
 		(*AgentEnvelope_ChatControl)(nil),
 		(*AgentEnvelope_RuntimeStatus)(nil),
+		(*AgentEnvelope_SettingsResetSshKnownHostResp)(nil),
 		(*AgentEnvelope_Error)(nil),
 	}
-	file_proto_v1_gateway_proto_msgTypes[45].OneofWrappers = []any{}
+	file_proto_v1_gateway_proto_msgTypes[47].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_proto_v1_gateway_proto_rawDesc), len(file_proto_v1_gateway_proto_rawDesc)),
 			NumEnums:      2,
-			NumMessages:   101,
+			NumMessages:   105,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/crates/agent-gateway/internal/server/websocket.go b/crates/agent-gateway/internal/server/websocket.go
index 844e291ad..56e18f5f8 100644
--- a/crates/agent-gateway/internal/server/websocket.go
+++ b/crates/agent-gateway/internal/server/websocket.go
@@ -59,6 +59,15 @@ type websocketTerminalRequestPayload struct {
 	Cols           *int   `json:"cols"`
 	Rows           *int   `json:"rows"`
 	MaxBytes       *int   `json:"max_bytes"`
+	SshHostID      string `json:"ssh_host_id"`
+	PromptID       string `json:"prompt_id"`
+	PromptAnswer   string `json:"prompt_answer"`
+	TrustHostKey   bool   `json:"trust_host_key"`
+}
+
+type websocketSshKnownHostResetPayload struct {
+	Host string `json:"host"`
+	Port *int   `json:"port"`
 }
 
 type websocketGitRequestPayload struct {
@@ -337,9 +346,6 @@ func (c *websocketConnection) startTerminalEventForwarder() {
 				if !ok {
 					return
 				}
-				if !c.sm.WebTerminalEnabled() {
-					continue
-				}
 				if !c.shouldForwardTerminalEvent(event) {
 					continue
 				}
@@ -353,10 +359,13 @@ func (c *websocketConnection) startTerminalEventForwarder() {
 }
 
 func (c *websocketConnection) replayTerminalSessionSnapshot() {
-	if !c.sm.WebTerminalEnabled() {
+	if !c.terminalFeaturesEnabled() {
 		return
 	}
 	for _, terminalSession := range c.sm.TerminalSessionSnapshot("") {
+		if !c.terminalSessionAllowed(terminalSession) {
+			continue
+		}
 		if err := c.writeTerminalEvent(websocketTerminalEventPayload(&gatewayv1.TerminalEvent{
 			Kind:           "created",
 			SessionId:      terminalSession.GetId(),
@@ -382,7 +391,7 @@ func (c *websocketConnection) forgetTerminalInterest(sessionID string, projectPa
 }
 
 func (c *websocketConnection) shouldForwardTerminalEvent(event *gatewayv1.TerminalEvent) bool {
-	return c.terminalInterest.shouldForward(event)
+	return c.terminalEventAllowed(event) && c.terminalInterest.shouldForward(event)
 }
 
 func (c *websocketConnection) startWebSocketHeartbeat() {
diff --git a/crates/agent-gateway/internal/server/websocket_connection_state_test.go b/crates/agent-gateway/internal/server/websocket_connection_state_test.go
index 86f8d9741..24c0b99c1 100644
--- a/crates/agent-gateway/internal/server/websocket_connection_state_test.go
+++ b/crates/agent-gateway/internal/server/websocket_connection_state_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	gatewayv1 "github.com/liveagent/agent-gateway/internal/proto/v1"
+	"github.com/liveagent/agent-gateway/internal/session"
 )
 
 func TestWebsocketTerminalInterestTrackerFiltersOutputBySession(t *testing.T) {
@@ -39,6 +40,81 @@ func TestWebsocketTerminalInterestTrackerFiltersOutputBySession(t *testing.T) {
 	}
 }
 
+func TestWebsocketTerminalPermissionsSeparateLocalAndSshSessions(t *testing.T) {
+	t.Parallel()
+
+	manager := session.NewManager()
+	manager.ApplySettingsJSON(`{"remote":{"enableWebTerminal":false,"enableWebSshTerminal":true}}`)
+	conn := &websocketConnection{sm: manager}
+	localSession := &gatewayv1.TerminalSession{
+		Id:   "local-1",
+		Kind: "local",
+	}
+	sshSession := &gatewayv1.TerminalSession{
+		Id:   "ssh-1",
+		Kind: "ssh",
+		Ssh: &gatewayv1.TerminalSshMetadata{
+			Status: "connected",
+		},
+	}
+
+	if conn.terminalSessionAllowed(localSession) {
+		t.Fatal("local terminal session should not be allowed when only web SSH terminal is enabled")
+	}
+	if !conn.terminalSessionAllowed(sshSession) {
+		t.Fatal("SSH terminal session should be allowed when web SSH terminal is enabled")
+	}
+
+	manager.ApplySettingsJSON(`{"remote":{"enableWebTerminal":true,"enableWebSshTerminal":false}}`)
+	if !conn.terminalSessionAllowed(localSession) {
+		t.Fatal("local terminal session should be allowed when web terminal is enabled")
+	}
+	if conn.terminalSessionAllowed(sshSession) {
+		t.Fatal("SSH terminal session should not be allowed when web SSH terminal is disabled")
+	}
+}
+
+func TestWebsocketTerminalEventForwardingAllowsSshOnlyStatusEvents(t *testing.T) {
+	t.Parallel()
+
+	manager := session.NewManager()
+	manager.ApplySettingsJSON(`{"remote":{"enableWebTerminal":false,"enableWebSshTerminal":true}}`)
+	conn := &websocketConnection{
+		sm:               manager,
+		terminalInterest: newWebsocketTerminalInterestTracker(),
+	}
+
+	if !conn.shouldForwardTerminalEvent(&gatewayv1.TerminalEvent{
+		Kind:           "reconnecting",
+		SessionId:      "ssh-1",
+		ProjectPathKey: "project-1",
+		Session: &gatewayv1.TerminalSession{
+			Id:             "ssh-1",
+			ProjectPathKey: "project-1",
+			Kind:           "ssh",
+			Ssh: &gatewayv1.TerminalSshMetadata{
+				Status:           "reconnecting",
+				ReconnectAttempt: 1,
+			},
+		},
+	}) {
+		t.Fatal("SSH metadata event should forward when only web SSH terminal is enabled")
+	}
+
+	if conn.shouldForwardTerminalEvent(&gatewayv1.TerminalEvent{
+		Kind:           "created",
+		SessionId:      "local-1",
+		ProjectPathKey: "project-1",
+		Session: &gatewayv1.TerminalSession{
+			Id:             "local-1",
+			ProjectPathKey: "project-1",
+			Kind:           "local",
+		},
+	}) {
+		t.Fatal("local metadata event should not forward when web terminal is disabled")
+	}
+}
+
 func TestWebsocketChatTrackerKeepsRecentReleasedRequests(t *testing.T) {
 	t.Parallel()
 
diff --git a/crates/agent-gateway/internal/server/websocket_payloads.go b/crates/agent-gateway/internal/server/websocket_payloads.go
index b54b98bb2..1cbae4115 100644
--- a/crates/agent-gateway/internal/server/websocket_payloads.go
+++ b/crates/agent-gateway/internal/server/websocket_payloads.go
@@ -98,12 +98,14 @@ func websocketTerminalSessionPayload(session *gatewayv1.TerminalSession) map[str
 	if session == nil {
 		return nil
 	}
+	kind := terminalSessionKind(session)
 	payload := map[string]any{
 		"id":               strings.TrimSpace(session.GetId()),
 		"project_path_key": strings.TrimSpace(session.GetProjectPathKey()),
 		"cwd":              strings.TrimSpace(session.GetCwd()),
 		"shell":            strings.TrimSpace(session.GetShell()),
 		"title":            strings.TrimSpace(session.GetTitle()),
+		"kind":             kind,
 		"pid":              session.GetPid(),
 		"cols":             session.GetCols(),
 		"rows":             session.GetRows(),
@@ -119,9 +121,33 @@ func websocketTerminalSessionPayload(session *gatewayv1.TerminalSession) map[str
 	if session.GetFinishedAt() == 0 {
 		payload["finished_at"] = nil
 	}
+	if kind == "ssh" {
+		payload["pid"] = nil
+	}
+	if ssh := session.GetSsh(); ssh != nil {
+		payload["ssh"] = map[string]any{
+			"host_id":                strings.TrimSpace(ssh.GetHostId()),
+			"host_name":              strings.TrimSpace(ssh.GetHostName()),
+			"username":               strings.TrimSpace(ssh.GetUsername()),
+			"host":                   strings.TrimSpace(ssh.GetHost()),
+			"port":                   ssh.GetPort(),
+			"auth_type":              strings.TrimSpace(ssh.GetAuthType()),
+			"status":                 strings.TrimSpace(ssh.GetStatus()),
+			"reconnect_attempt":      ssh.GetReconnectAttempt(),
+			"reconnect_max_attempts": ssh.GetReconnectMaxAttempts(),
+		}
+	}
 	return payload
 }
 
+func terminalSessionKind(session *gatewayv1.TerminalSession) string {
+	kind := strings.TrimSpace(session.GetKind())
+	if kind == "ssh" {
+		return "ssh"
+	}
+	return "local"
+}
+
 func websocketTerminalShellOptionPayload(option *gatewayv1.TerminalShellOption) map[string]any {
 	if option == nil {
 		return nil
@@ -158,9 +184,26 @@ func websocketTerminalResponsePayload(resp *gatewayv1.TerminalResponse) map[stri
 		payload["output_start_offset"] = resp.GetOutputStartOffset()
 		payload["output_end_offset"] = resp.GetOutputEndOffset()
 	}
+	if resp.GetLatencyMs() > 0 {
+		payload["latency_ms"] = resp.GetLatencyMs()
+	}
 	if session := websocketTerminalSessionPayload(resp.GetSession()); session != nil {
 		payload["session"] = session
 	}
+	if prompt := resp.GetSshPrompt(); prompt != nil {
+		payload["ssh_prompt"] = map[string]any{
+			"id":                 strings.TrimSpace(prompt.GetId()),
+			"kind":               strings.TrimSpace(prompt.GetKind()),
+			"host_id":            strings.TrimSpace(prompt.GetHostId()),
+			"host_name":          strings.TrimSpace(prompt.GetHostName()),
+			"host":               strings.TrimSpace(prompt.GetHost()),
+			"port":               prompt.GetPort(),
+			"message":            strings.TrimSpace(prompt.GetMessage()),
+			"fingerprint_sha256": strings.TrimSpace(prompt.GetFingerprintSha256()),
+			"key_type":           strings.TrimSpace(prompt.GetKeyType()),
+			"answer_echo":        prompt.GetAnswerEcho(),
+		}
+	}
 	return payload
 }
 
diff --git a/crates/agent-gateway/internal/server/websocket_routes.go b/crates/agent-gateway/internal/server/websocket_routes.go
index 60ad324dd..9ba9677c4 100644
--- a/crates/agent-gateway/internal/server/websocket_routes.go
+++ b/crates/agent-gateway/internal/server/websocket_routes.go
@@ -29,6 +29,7 @@ var websocketRequestHandlers = map[string]websocketRequestHandler{
 	"providers.list":                 (*websocketConnection).handleProviderList,
 	"settings.get":                   (*websocketConnection).handleSettingsGet,
 	"settings.update":                (*websocketConnection).handleSettingsUpdate,
+	"settings.ssh_known_host.reset":  (*websocketConnection).handleSettingsResetSshKnownHost,
 	"skills.list":                    (*websocketConnection).handleSkillFilesList,
 	"mentions.list":                  (*websocketConnection).handleFileMentionList,
 	"skills.read-metadata":           (*websocketConnection).handleSkillMetadataRead,
@@ -44,6 +45,10 @@ var websocketRequestHandlers = map[string]websocketRequestHandler{
 	"terminal.shell_options":         (*websocketConnection).handleTerminalRequest,
 	"terminal.list":                  (*websocketConnection).handleTerminalRequest,
 	"terminal.create":                (*websocketConnection).handleTerminalRequest,
+	"terminal.create_ssh":            (*websocketConnection).handleTerminalRequest,
+	"terminal.answer_ssh_prompt":     (*websocketConnection).handleTerminalRequest,
+	"terminal.cancel_ssh_prompt":     (*websocketConnection).handleTerminalRequest,
+	"terminal.ssh_latency":           (*websocketConnection).handleTerminalRequest,
 	"terminal.attach":                (*websocketConnection).handleTerminalRequest,
 	"terminal.input":                 (*websocketConnection).handleTerminalRequest,
 	"terminal.resize":                (*websocketConnection).handleTerminalRequest,
diff --git a/crates/agent-gateway/internal/server/websocket_routes_test.go b/crates/agent-gateway/internal/server/websocket_routes_test.go
index 3b275b626..66cd4dc62 100644
--- a/crates/agent-gateway/internal/server/websocket_routes_test.go
+++ b/crates/agent-gateway/internal/server/websocket_routes_test.go
@@ -33,6 +33,7 @@ func TestWebsocketRequestHandlersCoverKnownProtocolTypes(t *testing.T) {
 		"providers.list",
 		"settings.get",
 		"settings.update",
+		"settings.ssh_known_host.reset",
 		"skills.list",
 		"mentions.list",
 		"skills.read-metadata",
@@ -48,6 +49,10 @@ func TestWebsocketRequestHandlersCoverKnownProtocolTypes(t *testing.T) {
 		"terminal.shell_options",
 		"terminal.list",
 		"terminal.create",
+		"terminal.create_ssh",
+		"terminal.answer_ssh_prompt",
+		"terminal.cancel_ssh_prompt",
+		"terminal.ssh_latency",
 		"terminal.attach",
 		"terminal.input",
 		"terminal.resize",
diff --git a/crates/agent-gateway/internal/server/websocket_settings_handlers.go b/crates/agent-gateway/internal/server/websocket_settings_handlers.go
index 8276f623a..86eda3da3 100644
--- a/crates/agent-gateway/internal/server/websocket_settings_handlers.go
+++ b/crates/agent-gateway/internal/server/websocket_settings_handlers.go
@@ -79,3 +79,60 @@ func (c *websocketConnection) handleSettingsUpdate(req websocketRequest) {
 		"message":  strings.TrimSpace(settingsResp.GetMessage()),
 	})
 }
+
+func (c *websocketConnection) handleSettingsResetSshKnownHost(req websocketRequest) {
+	if !c.sm.WebSshTerminalEnabled() {
+		_ = c.writeError(req.ID, "web SSH terminal is disabled in desktop Remote settings")
+		return
+	}
+
+	var body websocketSshKnownHostResetPayload
+	if err := decodeWebSocketPayload(req.Payload, &body); err != nil {
+		_ = c.writeError(req.ID, "invalid settings.ssh_known_host.reset payload")
+		return
+	}
+
+	host := strings.TrimSpace(body.Host)
+	if host == "" {
+		_ = c.writeError(req.ID, "SSH host is required")
+		return
+	}
+	if body.Port == nil || *body.Port <= 0 {
+		_ = c.writeError(req.ID, "SSH port is required")
+		return
+	}
+	if *body.Port > 65535 {
+		_ = c.writeError(req.ID, "SSH port must be <= 65535")
+		return
+	}
+	port := uint32(*body.Port)
+
+	response, err := c.awaitAgentResponse(req.ID, &gatewayv1.GatewayEnvelope{
+		RequestId: req.ID,
+		Timestamp: time.Now().Unix(),
+		Payload: &gatewayv1.GatewayEnvelope_SettingsResetSshKnownHost{
+			SettingsResetSshKnownHost: &gatewayv1.SettingsResetSshKnownHostRequest{
+				Host: host,
+				Port: port,
+			},
+		},
+	})
+	if err != nil {
+		_ = c.writeError(req.ID, websocketErrorMessage(err))
+		return
+	}
+	if errResp := response.GetError(); errResp != nil {
+		_ = c.writeError(req.ID, errResp.GetMessage())
+		return
+	}
+
+	settingsResp := response.GetSettingsResetSshKnownHostResp()
+	if settingsResp == nil {
+		_ = c.writeError(req.ID, "unexpected agent response")
+		return
+	}
+
+	_ = c.writeResponse(req.ID, map[string]any{
+		"deleted": settingsResp.GetDeleted(),
+	})
+}
diff --git a/crates/agent-gateway/internal/server/websocket_terminal_handlers.go b/crates/agent-gateway/internal/server/websocket_terminal_handlers.go
index fd32b7e1a..be12adc2f 100644
--- a/crates/agent-gateway/internal/server/websocket_terminal_handlers.go
+++ b/crates/agent-gateway/internal/server/websocket_terminal_handlers.go
@@ -11,18 +11,46 @@ func terminalActionFromRequestType(requestType string) string {
 	return strings.TrimPrefix(strings.TrimSpace(requestType), "terminal.")
 }
 
+func (c *websocketConnection) terminalFeaturesEnabled() bool {
+	return c.sm.WebTerminalEnabled() || c.sm.WebSshTerminalEnabled()
+}
+
+func (c *websocketConnection) terminalSessionAllowed(session *gatewayv1.TerminalSession) bool {
+	if session == nil {
+		return false
+	}
+	if terminalSessionKind(session) == "ssh" {
+		return c.sm.WebSshTerminalEnabled()
+	}
+	return c.sm.WebTerminalEnabled()
+}
+
+func (c *websocketConnection) terminalEventAllowed(event *gatewayv1.TerminalEvent) bool {
+	if event == nil {
+		return false
+	}
+	if session := event.GetSession(); session != nil {
+		return c.terminalSessionAllowed(session)
+	}
+	sessionID := strings.TrimSpace(event.GetSessionId())
+	if sessionID != "" && c.sm.TerminalSessionKind(sessionID) == "ssh" {
+		return c.sm.WebSshTerminalEnabled()
+	}
+	return c.sm.WebTerminalEnabled()
+}
+
 func (c *websocketConnection) handleTerminalRequest(req websocketRequest) {
 	action := terminalActionFromRequestType(req.Type)
-	if !c.sm.WebTerminalEnabled() {
-		_ = c.writeError(req.ID, "web terminal is disabled in desktop Remote settings")
-		return
-	}
 
 	var body websocketTerminalRequestPayload
 	if err := decodeWebSocketPayload(req.Payload, &body); err != nil {
 		_ = c.writeError(req.ID, "invalid "+req.Type+" payload")
 		return
 	}
+	if !c.terminalRequestAllowed(action, body) {
+		_ = c.writeError(req.ID, terminalPermissionError(action))
+		return
+	}
 
 	cols, err := websocketOptionalUint32(body.Cols, "cols")
 	if err != nil {
@@ -59,6 +87,10 @@ func (c *websocketConnection) handleTerminalRequest(req websocketRequest) {
 				Cols:           cols,
 				Rows:           rows,
 				MaxBytes:       maxBytes,
+				SshHostId:      strings.TrimSpace(body.SshHostID),
+				PromptId:       strings.TrimSpace(body.PromptID),
+				PromptAnswer:   body.PromptAnswer,
+				TrustHostKey:   body.TrustHostKey,
 			},
 		},
 	})
@@ -76,10 +108,75 @@ func (c *websocketConnection) handleTerminalRequest(req websocketRequest) {
 		_ = c.writeError(req.ID, "unexpected agent response")
 		return
 	}
+	resp = c.mergeTerminalListWithCachedSnapshot(action, projectPathKey, resp)
 	c.sm.ApplyTerminalResponseSnapshot(action, projectPathKey, resp)
-	c.rememberTerminalInterest(action, body, resp)
+	filteredResp := c.filterTerminalResponseForPermissions(action, resp)
+	c.rememberTerminalInterest(action, body, filteredResp)
+
+	_ = c.writeResponse(req.ID, websocketTerminalResponsePayload(filteredResp))
+}
+
+func (c *websocketConnection) mergeTerminalListWithCachedSnapshot(
+	action string,
+	projectPathKey string,
+	resp *gatewayv1.TerminalResponse,
+) *gatewayv1.TerminalResponse {
+	if resp == nil || strings.TrimSpace(action) != "list" {
+		return resp
+	}
+	cachedSessions := c.sm.TerminalSessionSnapshot(projectPathKey)
+	if len(cachedSessions) == 0 {
+		return resp
+	}
+	seen := make(map[string]struct{}, len(resp.GetSessions()))
+	for _, session := range resp.GetSessions() {
+		id := strings.TrimSpace(session.GetId())
+		if id != "" {
+			seen[id] = struct{}{}
+		}
+	}
+	merged := make([]*gatewayv1.TerminalSession, 0, len(resp.GetSessions())+len(cachedSessions))
+	merged = append(merged, resp.GetSessions()...)
+	changed := false
+	for _, session := range cachedSessions {
+		id := strings.TrimSpace(session.GetId())
+		if id == "" {
+			continue
+		}
+		if _, ok := seen[id]; ok {
+			continue
+		}
+		seen[id] = struct{}{}
+		merged = append(merged, session)
+		changed = true
+	}
+	if !changed {
+		return resp
+	}
+	clone := *resp
+	clone.Sessions = merged
+	return &clone
+}
 
-	_ = c.writeResponse(req.ID, websocketTerminalResponsePayload(resp))
+func (c *websocketConnection) filterTerminalResponseForPermissions(action string, resp *gatewayv1.TerminalResponse) *gatewayv1.TerminalResponse {
+	if resp == nil || action != "list" {
+		return resp
+	}
+	filtered := make([]*gatewayv1.TerminalSession, 0, len(resp.GetSessions()))
+	changed := false
+	for _, session := range resp.GetSessions() {
+		if c.terminalSessionAllowed(session) {
+			filtered = append(filtered, session)
+		} else {
+			changed = true
+		}
+	}
+	if !changed {
+		return resp
+	}
+	clone := *resp
+	clone.Sessions = filtered
+	return &clone
 }
 
 func (c *websocketConnection) rememberTerminalInterest(action string, body websocketTerminalRequestPayload, resp *gatewayv1.TerminalResponse) {
@@ -95,23 +192,50 @@ func (c *websocketConnection) rememberTerminalInterest(action string, body webso
 	}
 
 	switch action {
-	case "list", "create", "close_project":
+	case "list", "create", "create_ssh", "answer_ssh_prompt", "close_project":
 		c.rememberTerminalProject(projectPathKey)
 	case "attach", "snapshot":
 		c.rememberTerminalSession(sessionID, projectPathKey)
 	}
 }
 
-func (c *websocketConnection) handleTerminalDetach(req websocketRequest) {
-	if !c.sm.WebTerminalEnabled() {
-		_ = c.writeError(req.ID, "web terminal is disabled in desktop Remote settings")
-		return
+func (c *websocketConnection) terminalRequestAllowed(action string, body websocketTerminalRequestPayload) bool {
+	switch action {
+	case "create_ssh", "answer_ssh_prompt", "cancel_ssh_prompt", "ssh_latency":
+		return c.sm.WebSshTerminalEnabled()
+	case "list":
+		return c.sm.WebTerminalEnabled() || c.sm.WebSshTerminalEnabled()
+	case "close_project":
+		return c.sm.WebTerminalEnabled() || c.sm.WebSshTerminalEnabled()
+	case "attach", "snapshot", "input", "resize", "rename", "close", "detach":
+		if c.sm.TerminalSessionKind(body.SessionID) == "ssh" {
+			return c.sm.WebSshTerminalEnabled()
+		}
+		return c.sm.WebTerminalEnabled()
+	default:
+		return c.sm.WebTerminalEnabled()
+	}
+}
+
+func terminalPermissionError(action string) string {
+	switch action {
+	case "create_ssh", "answer_ssh_prompt", "cancel_ssh_prompt", "ssh_latency":
+		return "web SSH terminal is disabled in desktop Remote settings"
+	default:
+		return "web terminal is disabled in desktop Remote settings"
 	}
+}
+
+func (c *websocketConnection) handleTerminalDetach(req websocketRequest) {
 	var body websocketTerminalRequestPayload
 	if err := decodeWebSocketPayload(req.Payload, &body); err != nil {
 		_ = c.writeError(req.ID, "invalid terminal.detach payload")
 		return
 	}
+	if !c.terminalRequestAllowed("detach", body) {
+		_ = c.writeError(req.ID, terminalPermissionError("detach"))
+		return
+	}
 	c.forgetTerminalInterest(body.SessionID, body.ProjectPathKey)
 	_ = c.writeResponse(req.ID, map[string]any{"action": "detach"})
 }
diff --git a/crates/agent-gateway/internal/session/manager_settings_sync.go b/crates/agent-gateway/internal/session/manager_settings_sync.go
index 1651d55d5..09d132842 100644
--- a/crates/agent-gateway/internal/session/manager_settings_sync.go
+++ b/crates/agent-gateway/internal/session/manager_settings_sync.go
@@ -41,6 +41,18 @@ func (m *Manager) WebTerminalEnabled() bool {
 	return ok && enabled
 }
 
+func (m *Manager) WebSshTerminalEnabled() bool {
+	m.syncHub.settingsSnapshotMu.RLock()
+	defer m.syncHub.settingsSnapshotMu.RUnlock()
+
+	remote, ok := m.syncHub.settingsSnapshot["remote"].(map[string]any)
+	if !ok {
+		return false
+	}
+	enabled, ok := remote["enableWebSshTerminal"].(bool)
+	return ok && enabled
+}
+
 func (m *Manager) WebGitEnabled() bool {
 	m.syncHub.settingsSnapshotMu.RLock()
 	defer m.syncHub.settingsSnapshotMu.RUnlock()
diff --git a/crates/agent-gateway/internal/session/manager_terminal.go b/crates/agent-gateway/internal/session/manager_terminal.go
index 54416c741..1989cbfba 100644
--- a/crates/agent-gateway/internal/session/manager_terminal.go
+++ b/crates/agent-gateway/internal/session/manager_terminal.go
@@ -48,9 +48,45 @@ func cloneTerminalSession(session *gatewayv1.TerminalSession) *gatewayv1.Termina
 		FinishedAt:     session.GetFinishedAt(),
 		ExitCode:       session.GetExitCode(),
 		Running:        session.GetRunning(),
+		Kind:           session.GetKind(),
+		Ssh:            cloneTerminalSshMetadata(session.GetSsh()),
 	}
 }
 
+func cloneTerminalSshMetadata(ssh *gatewayv1.TerminalSshMetadata) *gatewayv1.TerminalSshMetadata {
+	if ssh == nil {
+		return nil
+	}
+	return &gatewayv1.TerminalSshMetadata{
+		HostId:               ssh.GetHostId(),
+		HostName:             ssh.GetHostName(),
+		Username:             ssh.GetUsername(),
+		Host:                 ssh.GetHost(),
+		Port:                 ssh.GetPort(),
+		AuthType:             ssh.GetAuthType(),
+		Status:               ssh.GetStatus(),
+		ReconnectAttempt:     ssh.GetReconnectAttempt(),
+		ReconnectMaxAttempts: ssh.GetReconnectMaxAttempts(),
+	}
+}
+
+func (m *Manager) TerminalSessionKind(sessionID string) string {
+	sessionID = strings.TrimSpace(sessionID)
+	if sessionID == "" {
+		return ""
+	}
+	m.syncHub.terminalMu.Lock()
+	defer m.syncHub.terminalMu.Unlock()
+	session := m.syncHub.terminalSessions[sessionID]
+	if session == nil {
+		return ""
+	}
+	if strings.TrimSpace(session.GetKind()) == "ssh" {
+		return "ssh"
+	}
+	return "local"
+}
+
 func terminalSessionSortKey(session *gatewayv1.TerminalSession) (string, uint64, string) {
 	if session == nil {
 		return "", 0, ""
@@ -153,7 +189,7 @@ func (m *Manager) ApplyTerminalResponseSnapshot(
 			delete(m.syncHub.terminalSessions, sessionID)
 			m.syncHub.terminalMu.Unlock()
 		}
-	case "create", "attach", "snapshot", "input", "resize", "rename":
+	case "create", "create_ssh", "answer_ssh_prompt", "attach", "snapshot", "input", "resize", "rename":
 		session := resp.GetSession()
 		sessionID := strings.TrimSpace(session.GetId())
 		if sessionID == "" {
diff --git a/crates/agent-gateway/internal/session/manager_test.go b/crates/agent-gateway/internal/session/manager_test.go
index d707d6dd9..352ef2144 100644
--- a/crates/agent-gateway/internal/session/manager_test.go
+++ b/crates/agent-gateway/internal/session/manager_test.go
@@ -1,37 +1,134 @@
 package session
 
-import "testing"
+import (
+	"testing"
+
+	gatewayv1 "github.com/liveagent/agent-gateway/internal/proto/v1"
+)
 
 func TestApplySettingsJSONPreservingRemoteKeepsDesktopTerminalSetting(t *testing.T) {
 	manager := NewManager()
-	manager.ApplySettingsJSON(`{"remote":{"enableWebTerminal":true},"theme":"dark"}`)
+	manager.ApplySettingsJSON(`{"remote":{"enableWebTerminal":true,"enableWebSshTerminal":true},"theme":"dark"}`)
 	if !manager.WebTerminalEnabled() {
 		t.Fatal("expected desktop settings sync to enable web terminal")
 	}
+	if !manager.WebSshTerminalEnabled() {
+		t.Fatal("expected desktop settings sync to enable web SSH terminal")
+	}
 
-	manager.ApplySettingsJSONPreservingRemote(`{"remote":{"enableWebTerminal":false},"theme":"light"}`)
+	manager.ApplySettingsJSONPreservingRemote(`{"remote":{"enableWebTerminal":false,"enableWebSshTerminal":false},"theme":"light"}`)
 	if !manager.WebTerminalEnabled() {
 		t.Fatal("settings.update must not disable the desktop-owned web terminal setting")
 	}
+	if !manager.WebSshTerminalEnabled() {
+		t.Fatal("settings.update must not disable the desktop-owned web SSH terminal setting")
+	}
 }
 
 func TestApplySettingsJSONKeepsRemoteWhenPublicSettingsEventOmitsIt(t *testing.T) {
 	manager := NewManager()
-	manager.ApplySettingsJSON(`{"remote":{"enableWebTerminal":true},"theme":"dark"}`)
+	manager.ApplySettingsJSON(`{"remote":{"enableWebTerminal":true,"enableWebSshTerminal":true},"theme":"dark"}`)
 	if !manager.WebTerminalEnabled() {
 		t.Fatal("expected desktop settings sync to enable web terminal")
 	}
+	if !manager.WebSshTerminalEnabled() {
+		t.Fatal("expected desktop settings sync to enable web SSH terminal")
+	}
 
 	manager.ApplySettingsJSON(`{"theme":"light"}`)
 	if !manager.WebTerminalEnabled() {
 		t.Fatal("public settings events without remote must not clear the desktop web terminal setting")
 	}
+	if !manager.WebSshTerminalEnabled() {
+		t.Fatal("public settings events without remote must not clear the desktop web SSH terminal setting")
+	}
 }
 
 func TestApplySettingsJSONPreservingRemoteDoesNotTrustIncomingRemote(t *testing.T) {
 	manager := NewManager()
-	manager.ApplySettingsJSONPreservingRemote(`{"remote":{"enableWebTerminal":true}}`)
+	manager.ApplySettingsJSONPreservingRemote(`{"remote":{"enableWebTerminal":true,"enableWebSshTerminal":true}}`)
 	if manager.WebTerminalEnabled() {
 		t.Fatal("settings.update must not enable web terminal without a desktop settings snapshot")
 	}
+	if manager.WebSshTerminalEnabled() {
+		t.Fatal("settings.update must not enable web SSH terminal without a desktop settings snapshot")
+	}
+}
+
+func TestTerminalSessionSnapshotPreservesSshMetadataAndSorts(t *testing.T) {
+	manager := NewManager()
+	manager.ReplaceTerminalSessionSnapshot("", []*gatewayv1.TerminalSession{
+		{
+			Id:             "ssh-2",
+			ProjectPathKey: "/workspace/b",
+			Cwd:            "/workspace/b",
+			Shell:          "ssh",
+			Title:          "Production 2",
+			Kind:           "ssh",
+			CreatedAt:      2,
+			UpdatedAt:      2,
+			Running:        true,
+			Ssh: &gatewayv1.TerminalSshMetadata{
+				HostId:   "prod-2",
+				HostName: "Production 2",
+				Username: "deploy",
+				Host:     "prod-2.example.com",
+				Port:     22,
+				AuthType: "privateKey",
+			},
+		},
+		{
+			Id:             "local-1",
+			ProjectPathKey: "/workspace/a",
+			Cwd:            "/workspace/a",
+			Shell:          "zsh",
+			Title:          "Local",
+			Kind:           "local",
+			CreatedAt:      2,
+			UpdatedAt:      2,
+			Running:        true,
+		},
+		{
+			Id:             "ssh-1",
+			ProjectPathKey: "/workspace/a",
+			Cwd:            "/workspace/a",
+			Shell:          "ssh",
+			Title:          "Production",
+			Kind:           "ssh",
+			CreatedAt:      1,
+			UpdatedAt:      1,
+			Running:        true,
+			Ssh: &gatewayv1.TerminalSshMetadata{
+				HostId:   "prod",
+				HostName: "Production",
+				Username: "deploy",
+				Host:     "prod.example.com",
+				Port:     22,
+				AuthType: "password",
+			},
+		},
+	})
+
+	sessions := manager.TerminalSessionSnapshot("")
+	if len(sessions) != 3 {
+		t.Fatalf("terminal sessions = %d, want 3", len(sessions))
+	}
+	if got := []string{sessions[0].GetId(), sessions[1].GetId(), sessions[2].GetId()}; got[0] != "ssh-1" || got[1] != "local-1" || got[2] != "ssh-2" {
+		t.Fatalf("terminal session order = %#v", got)
+	}
+	if manager.TerminalSessionKind("ssh-1") != "ssh" {
+		t.Fatalf("TerminalSessionKind(ssh-1) = %q, want ssh", manager.TerminalSessionKind("ssh-1"))
+	}
+	if sessions[0].GetSsh().GetHostId() != "prod" || sessions[0].GetSsh().GetAuthType() != "password" {
+		t.Fatalf("ssh metadata = %#v", sessions[0].GetSsh())
+	}
+
+	sessions[0].Ssh.HostId = "mutated"
+	fresh := manager.TerminalSessionSnapshot("/workspace/a")
+	if len(fresh) != 2 {
+		t.Fatalf("filtered terminal sessions = %d, want 2", len(fresh))
+	}
+	if fresh[0].GetSsh().GetHostId() != "prod" {
+		t.Fatalf("terminal snapshot should be immutable, got ssh host id %q", fresh[0].GetSsh().GetHostId())
+	}
 }
diff --git a/crates/agent-gateway/proto/v1/gateway.proto b/crates/agent-gateway/proto/v1/gateway.proto
index d15952d75..75d57e78f 100644
--- a/crates/agent-gateway/proto/v1/gateway.proto
+++ b/crates/agent-gateway/proto/v1/gateway.proto
@@ -66,6 +66,7 @@ message GatewayEnvelope {
     TunnelControlRequest tunnel_control = 67;
     TunnelControlResponse tunnel_control_resp = 68;
     TunnelFrame tunnel_frame = 69;
+    SettingsResetSshKnownHostRequest settings_reset_ssh_known_host = 72;
   }
 }
 
@@ -118,6 +119,7 @@ message AgentEnvelope {
     TunnelFrame tunnel_frame = 69;
     ChatControlEvent chat_control = 70;
     RuntimeStatusEvent runtime_status = 71;
+    SettingsResetSshKnownHostResponse settings_reset_ssh_known_host_resp = 72;
     ErrorResponse error = 99;
   }
 }
@@ -257,6 +259,10 @@ message TerminalRequest {
   uint32 cols = 8;
   uint32 rows = 9;
   uint32 max_bytes = 10;
+  string ssh_host_id = 11;
+  string prompt_id = 12;
+  string prompt_answer = 13;
+  bool trust_host_key = 14;
 }
 
 message TerminalSession {
@@ -273,6 +279,33 @@ message TerminalSession {
   uint64 finished_at = 11;
   int32 exit_code = 12;
   bool running = 13;
+  string kind = 14;
+  TerminalSshMetadata ssh = 15;
+}
+
+message TerminalSshMetadata {
+  string host_id = 1;
+  string host_name = 2;
+  string username = 3;
+  string host = 4;
+  uint32 port = 5;
+  string auth_type = 6;
+  string status = 7;
+  uint32 reconnect_attempt = 8;
+  uint32 reconnect_max_attempts = 9;
+}
+
+message TerminalSshPrompt {
+  string id = 1;
+  string kind = 2;
+  string host_id = 3;
+  string host_name = 4;
+  string host = 5;
+  uint32 port = 6;
+  string message = 7;
+  string fingerprint_sha256 = 8;
+  string key_type = 9;
+  bool answer_echo = 10;
 }
 
 message TerminalShellOption {
@@ -291,6 +324,8 @@ message TerminalResponse {
   string default_shell = 7;
   uint64 output_start_offset = 8;
   uint64 output_end_offset = 9;
+  TerminalSshPrompt ssh_prompt = 10;
+  uint32 latency_ms = 11;
 }
 
 message TerminalEvent {
@@ -534,6 +569,15 @@ message SettingsUpdateResponse {
   string message = 2;
 }
 
+message SettingsResetSshKnownHostRequest {
+  string host = 1;
+  uint32 port = 2;
+}
+
+message SettingsResetSshKnownHostResponse {
+  uint32 deleted = 1;
+}
+
 message SettingsSyncEvent {
   string settings_json = 1;
 }
diff --git a/crates/agent-gateway/test/websocket/terminal_test.go b/crates/agent-gateway/test/websocket/terminal_test.go
index a895d15b3..75c800a9b 100644
--- a/crates/agent-gateway/test/websocket/terminal_test.go
+++ b/crates/agent-gateway/test/websocket/terminal_test.go
@@ -42,13 +42,26 @@ func newTerminalWebSocketTest(
 	webTerminalEnabled bool,
 ) (*session.Manager, *session.AgentSession, *websocket.Conn, func()) {
 	t.Helper()
+	return newTerminalWebSocketTestWithPermissions(t, webTerminalEnabled, false)
+}
+
+func newTerminalWebSocketTestWithPermissions(
+	t *testing.T,
+	webTerminalEnabled bool,
+	webSshTerminalEnabled bool,
+) (*session.Manager, *session.AgentSession, *websocket.Conn, func()) {
+	t.Helper()
 
 	sm := session.NewManager()
 	webTerminalSetting := "false"
 	if webTerminalEnabled {
 		webTerminalSetting = "true"
 	}
-	sm.ApplySettingsJSON(`{"remote":{"enableWebTerminal":` + webTerminalSetting + `}}`)
+	webSshTerminalSetting := "false"
+	if webSshTerminalEnabled {
+		webSshTerminalSetting = "true"
+	}
+	sm.ApplySettingsJSON(`{"remote":{"enableWebTerminal":` + webTerminalSetting + `,"enableWebSshTerminal":` + webSshTerminalSetting + `}}`)
 	sm.RecordAuthentication("desktop-agent", "0.9.0", "session-1")
 	agentSession := session.NewAgentSession(sm.LatestAuthSnapshot())
 	sm.SetSession(agentSession)
@@ -62,6 +75,281 @@ func newTerminalWebSocketTest(
 	return sm, agentSession, conn, cleanup
 }
 
+func TestWebSocketSshTerminalPermissionIsIndependentFromLocalTerminal(t *testing.T) {
+	t.Parallel()
+
+	sm, agentSession, conn, cleanup := newTerminalWebSocketTestWithPermissions(t, false, true)
+	defer cleanup()
+
+	sendEnvelope(t, conn, "terminal-create-local-disabled", "terminal.create", map[string]any{
+		"cwd":              "/workspace/project",
+		"project_path_key": "/workspace/project",
+	})
+	localResponse := receiveEnvelope(t, conn)
+	if localResponse.ID != "terminal-create-local-disabled" || localResponse.Type != "error" {
+		t.Fatalf("local terminal disabled response = %#v, want error", localResponse)
+	}
+	if !strings.Contains(localResponse.Error, "web terminal is disabled") {
+		t.Fatalf("local terminal disabled error = %q", localResponse.Error)
+	}
+
+	sendEnvelope(t, conn, "terminal-create-ssh-enabled", "terminal.create_ssh", map[string]any{
+		"cwd":              " /workspace/project ",
+		"project_path_key": " /workspace/project ",
+		"ssh_host_id":      " prod ",
+		"title":            " Prod SSH ",
+		"cols":             120,
+		"rows":             32,
+	})
+	outbound := readOutboundEnvelope(t, agentSession)
+	req := outbound.GetTerminalRequest()
+	if req == nil {
+		t.Fatalf("terminal.create_ssh outbound payload = %T, want TerminalRequest", outbound.GetPayload())
+	}
+	if req.GetAction() != "create_ssh" ||
+		req.GetCwd() != "/workspace/project" ||
+		req.GetProjectPathKey() != "/workspace/project" ||
+		req.GetSshHostId() != "prod" ||
+		req.GetTitle() != "Prod SSH" ||
+		req.GetCols() != 120 ||
+		req.GetRows() != 32 {
+		t.Fatalf("terminal create_ssh request = %#v", req)
+	}
+
+	sm.DispatchFromAgent(&gatewayv1.AgentEnvelope{
+		RequestId: outbound.GetRequestId(),
+		Timestamp: time.Now().Unix(),
+		Payload: &gatewayv1.AgentEnvelope_TerminalResponse{
+			TerminalResponse: &gatewayv1.TerminalResponse{
+				Action: "create_ssh",
+				Session: &gatewayv1.TerminalSession{
+					Id:             "ssh-1",
+					ProjectPathKey: "/workspace/project",
+					Cwd:            "/workspace/project",
+					Shell:          "ssh",
+					Title:          "Prod SSH",
+					Kind:           "ssh",
+					Cols:           120,
+					Rows:           32,
+					CreatedAt:      1,
+					UpdatedAt:      2,
+					Running:        true,
+					Ssh: &gatewayv1.TerminalSshMetadata{
+						HostId:   "prod",
+						HostName: "Production",
+						Username: "deploy",
+						Host:     "prod.example.com",
+						Port:     22,
+						AuthType: "privateKey",
+					},
+				},
+			},
+		},
+	})
+	createResponse := receiveEnvelopeWithID(t, conn, "terminal-create-ssh-enabled")
+	if createResponse.Type != "response" {
+		t.Fatalf("terminal create_ssh response = %#v, want response", createResponse)
+	}
+	var createPayload struct {
+		Session map[string]any `json:"session"`
+	}
+	if err := json.Unmarshal(createResponse.Payload, &createPayload); err != nil {
+		t.Fatalf("decode create_ssh response: %v", err)
+	}
+	if createPayload.Session["kind"] != "ssh" || createPayload.Session["pid"] != nil {
+		t.Fatalf("create_ssh session payload = %#v, want ssh with nil pid", createPayload.Session)
+	}
+	sshPayload, ok := createPayload.Session["ssh"].(map[string]any)
+	if !ok || sshPayload["host_id"] != "prod" || sshPayload["auth_type"] != "privateKey" {
+		t.Fatalf("create_ssh ssh metadata = %#v", createPayload.Session["ssh"])
+	}
+
+	sendEnvelope(t, conn, "terminal-input-ssh-enabled", "terminal.input", map[string]any{
+		"session_id":       " ssh-1 ",
+		"project_path_key": " /workspace/project ",
+		"data":             "pwd\n",
+	})
+	inputOutbound := readOutboundEnvelope(t, agentSession)
+	inputReq := inputOutbound.GetTerminalRequest()
+	if inputReq == nil {
+		t.Fatalf("ssh terminal input outbound payload = %T, want TerminalRequest", inputOutbound.GetPayload())
+	}
+	if inputReq.GetAction() != "input" ||
+		inputReq.GetSessionId() != "ssh-1" ||
+		inputReq.GetData() != "pwd\n" {
+		t.Fatalf("ssh terminal input request = %#v", inputReq)
+	}
+}
+
+func TestWebSocketSshTerminalCreateRejectedWithoutSshPermission(t *testing.T) {
+	t.Parallel()
+
+	_, _, conn, cleanup := newTerminalWebSocketTestWithPermissions(t, true, false)
+	defer cleanup()
+
+	sendEnvelope(t, conn, "terminal-create-ssh-disabled", "terminal.create_ssh", map[string]any{
+		"cwd":              "/workspace/project",
+		"project_path_key": "/workspace/project",
+		"ssh_host_id":      "prod",
+	})
+
+	env := receiveEnvelope(t, conn)
+	if env.ID != "terminal-create-ssh-disabled" || env.Type != "error" {
+		t.Fatalf("ssh terminal disabled response = %#v, want error", env)
+	}
+	if !strings.Contains(env.Error, "web SSH terminal is disabled") {
+		t.Fatalf("ssh terminal disabled error = %q", env.Error)
+	}
+}
+
+func TestWebSocketTerminalListFiltersLocalSessionsWhenOnlySshEnabled(t *testing.T) {
+	t.Parallel()
+
+	sm, agentSession, conn, cleanup := newTerminalWebSocketTestWithPermissions(t, false, true)
+	defer cleanup()
+
+	sendEnvelope(t, conn, "terminal-list-ssh-only", "terminal.list", map[string]any{
+		"project_path_key": "/workspace/project",
+	})
+	outbound := readOutboundEnvelope(t, agentSession)
+	req := outbound.GetTerminalRequest()
+	if req == nil || req.GetAction() != "list" {
+		t.Fatalf("terminal list outbound payload = %#v, want list request", outbound.GetPayload())
+	}
+
+	sm.DispatchFromAgent(&gatewayv1.AgentEnvelope{
+		RequestId: outbound.GetRequestId(),
+		Timestamp: time.Now().Unix(),
+		Payload: &gatewayv1.AgentEnvelope_TerminalResponse{
+			TerminalResponse: &gatewayv1.TerminalResponse{
+				Action: "list",
+				Sessions: []*gatewayv1.TerminalSession{
+					{
+						Id:             "local-1",
+						ProjectPathKey: "/workspace/project",
+						Cwd:            "/workspace/project",
+						Title:          "Local",
+						Kind:           "local",
+						CreatedAt:      1,
+						UpdatedAt:      1,
+						Running:        true,
+					},
+					{
+						Id:             "ssh-1",
+						ProjectPathKey: "/workspace/project",
+						Cwd:            "/workspace/project",
+						Shell:          "ssh",
+						Title:          "Production",
+						Kind:           "ssh",
+						CreatedAt:      2,
+						UpdatedAt:      2,
+						Running:        true,
+						Ssh: &gatewayv1.TerminalSshMetadata{
+							HostId:   "prod",
+							HostName: "Production",
+							Username: "deploy",
+							Host:     "prod.example.com",
+							Port:     22,
+							AuthType: "password",
+						},
+					},
+				},
+			},
+		},
+	})
+	response := receiveEnvelopeWithID(t, conn, "terminal-list-ssh-only")
+	if response.Type != "response" {
+		t.Fatalf("terminal ssh-only list response = %#v, want response", response)
+	}
+	var payload struct {
+		Sessions []map[string]any `json:"sessions"`
+	}
+	if err := json.Unmarshal(response.Payload, &payload); err != nil {
+		t.Fatalf("decode ssh-only list response: %v", err)
+	}
+	if len(payload.Sessions) != 1 ||
+		payload.Sessions[0]["id"] != "ssh-1" ||
+		payload.Sessions[0]["kind"] != "ssh" {
+		t.Fatalf("ssh-only list sessions = %#v, want only ssh-1", payload.Sessions)
+	}
+}
+
+func TestWebSocketTerminalListMergesCachedSshSessions(t *testing.T) {
+	t.Parallel()
+
+	sm, agentSession, conn, cleanup := newTerminalWebSocketTestWithPermissions(t, false, true)
+	defer cleanup()
+
+	sm.DispatchFromAgent(&gatewayv1.AgentEnvelope{
+		RequestId: "event-created-cached-ssh",
+		Timestamp: time.Now().Unix(),
+		Payload: &gatewayv1.AgentEnvelope_TerminalEvent{
+			TerminalEvent: &gatewayv1.TerminalEvent{
+				Kind:           "created",
+				SessionId:      "ssh-1",
+				ProjectPathKey: "/workspace/project",
+				Session: &gatewayv1.TerminalSession{
+					Id:             "ssh-1",
+					ProjectPathKey: "/workspace/project",
+					Cwd:            "/workspace/project",
+					Shell:          "ssh",
+					Title:          "Production",
+					Kind:           "ssh",
+					CreatedAt:      2,
+					UpdatedAt:      2,
+					Running:        true,
+					Ssh: &gatewayv1.TerminalSshMetadata{
+						HostId:   "prod",
+						HostName: "Production",
+						Username: "deploy",
+						Host:     "prod.example.com",
+						Port:     22,
+						AuthType: "password",
+						Status:   "connected",
+					},
+				},
+			},
+		},
+	})
+	createdEvent := receiveEnvelope(t, conn)
+	if createdEvent.Type != "terminal.event" {
+		t.Fatalf("cached ssh created event = %#v, want terminal.event", createdEvent)
+	}
+
+	sendEnvelope(t, conn, "terminal-list-merge-cached-ssh", "terminal.list", map[string]any{})
+	outbound := readOutboundEnvelope(t, agentSession)
+	req := outbound.GetTerminalRequest()
+	if req == nil || req.GetAction() != "list" {
+		t.Fatalf("terminal list outbound payload = %#v, want list request", outbound.GetPayload())
+	}
+
+	sm.DispatchFromAgent(&gatewayv1.AgentEnvelope{
+		RequestId: outbound.GetRequestId(),
+		Timestamp: time.Now().Unix(),
+		Payload: &gatewayv1.AgentEnvelope_TerminalResponse{
+			TerminalResponse: &gatewayv1.TerminalResponse{
+				Action:   "list",
+				Sessions: []*gatewayv1.TerminalSession{},
+			},
+		},
+	})
+	response := receiveEnvelopeWithID(t, conn, "terminal-list-merge-cached-ssh")
+	if response.Type != "response" {
+		t.Fatalf("terminal cached ssh list response = %#v, want response", response)
+	}
+	var payload struct {
+		Sessions []map[string]any `json:"sessions"`
+	}
+	if err := json.Unmarshal(response.Payload, &payload); err != nil {
+		t.Fatalf("decode cached ssh list response: %v", err)
+	}
+	if len(payload.Sessions) != 1 ||
+		payload.Sessions[0]["id"] != "ssh-1" ||
+		payload.Sessions[0]["kind"] != "ssh" {
+		t.Fatalf("cached ssh list sessions = %#v, want ssh-1", payload.Sessions)
+	}
+}
+
 func TestWebSocketTerminalRejectsInteractiveRequestsWhenDisabled(t *testing.T) {
 	t.Parallel()
 
diff --git a/crates/agent-gateway/web/src/App.tsx b/crates/agent-gateway/web/src/App.tsx
index 805788ff8..d1c0c07c6 100644
--- a/crates/agent-gateway/web/src/App.tsx
+++ b/crates/agent-gateway/web/src/App.tsx
@@ -31,6 +31,7 @@ import { Button } from "@/components/ui/button";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { ProjectToolsPanel } from "@/components/project-tools/ProjectToolsPanel";
 import type { WorkspaceCodeEditorOpenRequest } from "@/components/workspace-editor/WorkspaceCodeEditorOverlay";
+import type { WorkspaceSshTerminalOpenRequest } from "@/components/workspace-editor/WorkspaceSshTerminalOverlay";
 import type { WorkspaceImagePreviewOpenRequest } from "@/components/workspace-editor/WorkspaceImagePreviewOverlay";
 import { isWorkspaceImagePath } from "@/components/workspace-editor/workspaceImagePreview";
 import { LocaleContext, t as translate } from "@/i18n";
@@ -236,6 +237,13 @@ const WorkspaceImagePreviewOverlay = lazy(async () => {
   };
 });
 
+const WorkspaceSshTerminalOverlay = lazy(async () => {
+  const module = await import("@/components/workspace-editor/WorkspaceSshTerminalOverlay");
+  return {
+    default: module.WorkspaceSshTerminalOverlay,
+  };
+});
+
 const MAX_UPLOAD_FILES = 9;
 
 function dragEventHasFiles(event: DragEvent<HTMLElement>) {
@@ -919,6 +927,11 @@ export default function App() {
   const [workspaceImagePreviewOpenRequest, setWorkspaceImagePreviewOpenRequest] =
     useState<WorkspaceImagePreviewOpenRequest | null>(null);
   const workspaceImagePreviewRequestIdRef = useRef(0);
+  const [workspaceSshTerminalMounted, setWorkspaceSshTerminalMounted] = useState(false);
+  const [workspaceSshTerminalOpen, setWorkspaceSshTerminalOpen] = useState(false);
+  const [workspaceSshTerminalOpenRequest, setWorkspaceSshTerminalOpenRequest] =
+    useState<WorkspaceSshTerminalOpenRequest | null>(null);
+  const workspaceSshTerminalRequestIdRef = useRef(0);
   const [terminalSessions, setTerminalSessions] = useState<TerminalSession[]>([]);
   const { confirm: requestConfirmDialog, dialog: confirmDialog } = useConfirmDialog();
   const terminalSessionsVersionRef = useRef(0);
@@ -4755,7 +4768,11 @@ export default function App() {
               current.filter((session) => !terminalSessionBelongsToProject(session, pathKey)),
             );
           };
-          if (terminalClient && settings.remote.enableWebTerminal && pathKey) {
+          if (
+            terminalClient &&
+            (settings.remote.enableWebTerminal || settings.remote.enableWebSshTerminal) &&
+            pathKey
+          ) {
             terminalSessionsToClose = await terminalClient.list(pathKey);
             const runningTerminalCount = terminalSessionsToClose.filter(
               (session) => session.running,
@@ -4884,6 +4901,7 @@ export default function App() {
       refreshHistoryWorkdirs,
       removeWorkspaceProjectFromSettings,
       requestConfirmDialog,
+      settings.remote.enableWebSshTerminal,
       settings.remote.enableWebTerminal,
       settings.locale,
       settings.system,
@@ -5901,6 +5919,8 @@ export default function App() {
     (!settings.remote.enableWebTerminal
       ? "Enable WebUI Terminal in desktop Remote settings."
       : undefined);
+  const webTerminalSessionsEnabled =
+    settings.remote.enableWebTerminal || settings.remote.enableWebSshTerminal;
   const gitDisabledMessage = !settings.remote.enableWebGit
     ? "WebUI Git is disabled in desktop Remote settings."
     : undefined;
@@ -5913,6 +5933,22 @@ export default function App() {
       : status?.online !== true
         ? translate("projectTools.tunnelRemoteOffline", settings.locale)
         : undefined;
+  const hideWorkspaceSshTerminalOverlay = useCallback(() => {
+    setWorkspaceSshTerminalOpen(false);
+  }, []);
+  const openWorkspaceSshTerminalRequest = useCallback(
+    (request: WorkspaceSshTerminalOpenRequest) => {
+      setWorkspaceImagePreviewOpen(false);
+      setWorkspaceEditorOpen(false);
+      setWorkspaceSshTerminalMounted(true);
+      setWorkspaceSshTerminalOpen(true);
+      setWorkspaceSshTerminalOpenRequest(request);
+    },
+    [],
+  );
+  const requestWorkspaceEditorClose = useCallback(() => {
+    setWorkspaceEditorCloseRequestId((current) => current + 1);
+  }, []);
   const handleOpenWorkspaceFile = useCallback(
     (path: string) => {
       if (!terminalProjectPath || !terminalProjectPathKey) return;
@@ -5928,6 +5964,7 @@ export default function App() {
         });
         return;
       }
+      hideWorkspaceSshTerminalOverlay();
       setWorkspaceImagePreviewOpen(false);
       workspaceEditorRequestIdRef.current += 1;
       setWorkspaceEditorCleanupPending(false);
@@ -5940,12 +5977,20 @@ export default function App() {
         path,
       });
     },
-    [terminalProjectPath, terminalProjectPathKey],
+    [hideWorkspaceSshTerminalOverlay, terminalProjectPath, terminalProjectPathKey],
+  );
+  const handleOpenSshTerminal = useCallback(
+    (session: TerminalSession) => {
+      if (session.kind !== "ssh") return;
+      workspaceSshTerminalRequestIdRef.current += 1;
+      const openRequest = {
+        id: workspaceSshTerminalRequestIdRef.current,
+        sessionId: session.id,
+      };
+      openWorkspaceSshTerminalRequest(openRequest);
+    },
+    [openWorkspaceSshTerminalRequest],
   );
-
-  const requestWorkspaceEditorClose = useCallback(() => {
-    setWorkspaceEditorCloseRequestId((current) => current + 1);
-  }, []);
   const requestWorkspaceImagePreviewClose = useCallback(() => {
     setWorkspaceImagePreviewOpen(false);
   }, []);
@@ -5988,11 +6033,9 @@ export default function App() {
   const handleProjectTerminalSessionsChange = useCallback(
     (sessions: TerminalSession[]) => {
       terminalSessionsVersionRef.current += 1;
-      setTerminalSessions((current) =>
-        replaceTerminalSessionsForProject(current, terminalProjectPathKey, sessions),
-      );
+      setTerminalSessions(sortTerminalSessions(sessions));
     },
-    [terminalProjectPathKey],
+    [],
   );
 
   useEffect(() => {
@@ -6004,7 +6047,7 @@ export default function App() {
     if (!settingsSyncReady) {
       return;
     }
-    if (!isAgentMode || !settings.remote.enableWebTerminal || status?.online === false) {
+    if (!isAgentMode || !webTerminalSessionsEnabled || status?.online === false) {
       terminalSessionsVersionRef.current += 1;
       setTerminalSessions([]);
       return;
@@ -6036,11 +6079,11 @@ export default function App() {
     };
   }, [
     isAgentMode,
-    settings.remote.enableWebTerminal,
     settingsSyncReady,
     status?.online,
     status?.session_id,
     terminalClient,
+    webTerminalSessionsEnabled,
   ]);
 
   useEffect(() => {
@@ -6052,6 +6095,44 @@ export default function App() {
     });
   }, [terminalClient]);
 
+  useEffect(() => {
+    if (!terminalClient) return;
+    if (!settingsSyncReady) return;
+    if (!isAgentMode || !webTerminalSessionsEnabled || status?.online !== true) return;
+    if (!projectToolsSshTunnelOpen || !terminalProjectPathKey) return;
+
+    let cancelled = false;
+    let refreshSeq = 0;
+    const refreshProjectTerminalSessions = () => {
+      const seq = ++refreshSeq;
+      void terminalClient
+        .list(terminalProjectPathKey)
+        .then((sessions) => {
+          if (cancelled || seq !== refreshSeq) return;
+          terminalSessionsVersionRef.current += 1;
+          setTerminalSessions((current) =>
+            replaceTerminalSessionsForProject(current, terminalProjectPathKey, sessions),
+          );
+        })
+        .catch(() => undefined);
+    };
+
+    refreshProjectTerminalSessions();
+    const timer = window.setInterval(refreshProjectTerminalSessions, 5_000);
+    return () => {
+      cancelled = true;
+      window.clearInterval(timer);
+    };
+  }, [
+    isAgentMode,
+    projectToolsSshTunnelOpen,
+    settingsSyncReady,
+    status?.online,
+    terminalClient,
+    terminalProjectPathKey,
+    webTerminalSessionsEnabled,
+  ]);
+
   useEffect(() => {
     if (activeView !== "chat") {
       return;
@@ -7032,6 +7113,24 @@ export default function App() {
               />
             </Suspense>
           ) : null}
+          {workspaceSshTerminalMounted && terminalClient ? (
+            <Suspense
+              fallback={
+                <div className="workspace-ssh-terminal-overlay absolute inset-0 z-40 flex items-center justify-center border-r border-border bg-background text-sm text-muted-foreground shadow-2xl">
+                  {translate("workspaceSshTerminal.loading", settings.locale)}
+                </div>
+              }
+            >
+              <WorkspaceSshTerminalOverlay
+                openRequest={workspaceSshTerminalOpenRequest}
+                sessions={terminalSessions}
+                client={terminalClient}
+                theme={settings.theme}
+                isOpen={workspaceSshTerminalOpen}
+                onHide={() => setWorkspaceSshTerminalOpen(false)}
+              />
+            </Suspense>
+          ) : null}
         </div>
 
         {terminalClient ? (
@@ -7040,7 +7139,7 @@ export default function App() {
             collapseImmediately={activeView !== "chat"}
             projectPathKey={terminalProjectPathKey}
             cwd={terminalProjectPath}
-            sessions={projectTerminalSessions}
+            sessions={terminalSessions}
             width={settings.customSettings.projectToolsPanel.width}
             theme={settings.theme}
             disabledMessage={projectToolsDisabledMessage}
@@ -7117,6 +7216,7 @@ export default function App() {
             onSshProjectHostIdsChange={(hostIds) =>
               setSettings((prev) => updateSshProjectHostIds(prev, terminalProjectPathKey, hostIds))
             }
+            onOpenSshSession={handleOpenSshTerminal}
             onSessionsChange={handleProjectTerminalSessionsChange}
             onInsertFileMention={(path, kind) => {
               composerRef.current?.insertFileMention(path, kind);
diff --git a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
index f2cb02ed4..2ed43dc0e 100644
--- a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
@@ -1,7 +1,3 @@
-import "@xterm/xterm/css/xterm.css";
-
-import { FitAddon } from "@xterm/addon-fit";
-import { Terminal as XTerm } from "@xterm/xterm";
 import {
   type CSSProperties,
   type KeyboardEvent as ReactKeyboardEvent,
@@ -21,11 +17,11 @@ import type {
   ProjectToolsPanelTab,
   SshHostConfig,
 } from "@/lib/settings";
+import { workspaceProjectPathKey } from "@/lib/settings";
 import type { GitClient } from "@/lib/git/types";
 import { cn } from "@/lib/shared/utils";
 import type {
   TerminalClient,
-  TerminalEvent,
   TerminalSession,
   TerminalShellOption,
   TerminalSnapshot,
@@ -60,6 +56,7 @@ import {
 import { LocalTunnelPanel, type LocalTunnelClient } from "./LocalTunnelPanel";
 import { ProjectFileTreePanel } from "./ProjectFileTreePanel";
 import { SshTunnelPanel } from "./SshTunnelPanel";
+import { XTermViewport } from "./XTermViewport";
 
 const MIN_PANEL_WIDTH = 320;
 const DEFAULT_MAX_PANEL_WIDTH = 720;
@@ -109,6 +106,7 @@ type ProjectToolsPanelProps = {
   onTunnelOpenChange?: (open: boolean) => void;
   onSshTunnelOpenChange?: (open: boolean) => void;
   onSshProjectHostIdsChange?: (hostIds: string[]) => void;
+  onOpenSshSession?: (session: TerminalSession) => void;
   onSessionsChange?: (sessions: TerminalSession[]) => void;
   onInsertFileMention?: (path: string, kind: "file" | "dir") => void;
   onOpenFile?: (path: string) => void;
@@ -171,6 +169,17 @@ function areSessionsEqual(left: TerminalSession[], right: TerminalSession[]) {
       session.cwd === other.cwd &&
       session.shell === other.shell &&
       session.title === other.title &&
+      session.kind === other.kind &&
+      (session.ssh?.hostId ?? "") === (other.ssh?.hostId ?? "") &&
+      (session.ssh?.hostName ?? "") === (other.ssh?.hostName ?? "") &&
+      (session.ssh?.username ?? "") === (other.ssh?.username ?? "") &&
+      (session.ssh?.host ?? "") === (other.ssh?.host ?? "") &&
+      (session.ssh?.port ?? 0) === (other.ssh?.port ?? 0) &&
+      (session.ssh?.authType ?? "") === (other.ssh?.authType ?? "") &&
+      (session.ssh?.status ?? "") === (other.ssh?.status ?? "") &&
+      (session.ssh?.reconnectAttempt ?? 0) === (other.ssh?.reconnectAttempt ?? 0) &&
+      (session.ssh?.reconnectMaxAttempts ?? 0) ===
+        (other.ssh?.reconnectMaxAttempts ?? 0) &&
       session.pid === other.pid &&
       session.cols === other.cols &&
       session.rows === other.rows &&
@@ -189,6 +198,13 @@ function formatTerminalSessionTitle(title: string, terminalLabel: string) {
   return match[1] ? `${terminalLabel} ${match[1]}` : terminalLabel;
 }
 
+function terminalSessionBelongsToProject(session: TerminalSession, projectPathKey: string) {
+  const wantedProjectKey = workspaceProjectPathKey(projectPathKey);
+  if (!wantedProjectKey) return false;
+  const sessionProjectKey = workspaceProjectPathKey(session.projectPathKey || session.cwd);
+  return sessionProjectKey === wantedProjectKey;
+}
+
 function dirname(path: string) {
   const normalized = path.replace(/\\/g, "/").replace(/\/+$/, "");
   const index = normalized.lastIndexOf("/");
@@ -335,404 +351,6 @@ function reorderTabIdsByKeyboard(tabIds: readonly string[], tabId: string, key:
   return nextTabIds;
 }
 
-function terminalTheme(theme: "light" | "dark") {
-  if (theme === "dark") {
-    return {
-      background: "#0b0f14",
-      foreground: "#d6deeb",
-      cursor: "#f8fafc",
-      selectionBackground: "#334155",
-      black: "#0f172a",
-      red: "#ef4444",
-      green: "#22c55e",
-      yellow: "#eab308",
-      blue: "#38bdf8",
-      magenta: "#c084fc",
-      cyan: "#2dd4bf",
-      white: "#e5e7eb",
-    };
-  }
-  return {
-    background: "#ffffff",
-    foreground: "#172033",
-    cursor: "#111827",
-    selectionBackground: "#dbeafe",
-    black: "#111827",
-    red: "#dc2626",
-    green: "#16a34a",
-    yellow: "#ca8a04",
-    blue: "#2563eb",
-    magenta: "#9333ea",
-    cyan: "#0891b2",
-    white: "#f8fafc",
-  };
-}
-
-function terminalContainerHasSize(container: HTMLElement) {
-  const rect = container.getBoundingClientRect();
-  return rect.width > 0 && rect.height > 0;
-}
-
-function XTermViewport({
-  client,
-  session,
-  theme,
-  isActive,
-  initialSnapshot,
-  onError,
-  onInitialSnapshotConsumed,
-}: {
-  client: TerminalClient;
-  session: TerminalSession;
-  theme: "light" | "dark";
-  isActive: boolean;
-  initialSnapshot?: TerminalSnapshot;
-  onError: (message: string | null) => void;
-  onInitialSnapshotConsumed?: (sessionId: string) => void;
-}) {
-  const containerRef = useRef<HTMLDivElement>(null);
-  const resizeTimerRef = useRef<number | null>(null);
-  const clientRef = useRef(client);
-  const sessionRef = useRef(session);
-  const themeRef = useRef(theme);
-  const onErrorRef = useRef(onError);
-  const initialSnapshotRef = useRef(initialSnapshot);
-  const onInitialSnapshotConsumedRef = useRef(onInitialSnapshotConsumed);
-  clientRef.current = client;
-  sessionRef.current = session;
-  themeRef.current = theme;
-  onErrorRef.current = onError;
-  onInitialSnapshotConsumedRef.current = onInitialSnapshotConsumed;
-
-  const termRef = useRef<XTerm | null>(null);
-  const fitAndResizeRef = useRef<(() => void) | null>(null);
-
-  useEffect(() => {
-    if (!termRef.current) return;
-    termRef.current.options.theme = terminalTheme(theme);
-  }, [theme]);
-
-  useEffect(() => {
-    if (!isActive) {
-      termRef.current?.blur();
-      return;
-    }
-    termRef.current?.focus();
-    window.setTimeout(() => {
-      fitAndResizeRef.current?.();
-    }, 0);
-  }, [isActive]);
-
-  useEffect(() => {
-    const container = containerRef.current;
-    if (!container) return;
-
-    let disposed = false;
-    let snapshotLoaded = false;
-    let loadingSnapshot = false;
-    let lastOutputOffset = 0;
-    const bufferedEvents: TerminalEvent[] = [];
-    const term = new XTerm({
-      cursorBlink: true,
-      disableStdin: !sessionRef.current.running,
-      fontFamily:
-        '"SF Mono", SFMono-Regular, Menlo, Monaco, "Cascadia Code", Consolas, "Liberation Mono", monospace',
-      fontSize: 12,
-      fontWeight: "normal",
-      fontWeightBold: "bold",
-      lineHeight: 1.1,
-      letterSpacing: 0,
-      scrollback: 5000,
-      theme: terminalTheme(themeRef.current),
-    });
-    termRef.current = term;
-    const fit = new FitAddon();
-    term.loadAddon(fit);
-    term.open(container);
-    let touchScrollActive = false;
-    let touchScrollCancelled = false;
-    let lastTouchX = 0;
-    let lastTouchY = 0;
-    let touchScrollRemainder = 0;
-
-    const fitAndResize = () => {
-      if (disposed) return;
-      if (!terminalContainerHasSize(container)) return;
-      try {
-        fit.fit();
-        const s = sessionRef.current;
-        void clientRef.current
-          .resize(s.id, term.cols, term.rows, s.projectPathKey)
-          .catch(() => undefined);
-      } catch {
-        // xterm fit can throw while the panel is hidden or measuring at zero size.
-      }
-    };
-    fitAndResizeRef.current = fitAndResize;
-
-    const resizeObserver = new ResizeObserver(() => {
-      if (resizeTimerRef.current !== null) {
-        window.clearTimeout(resizeTimerRef.current);
-      }
-      resizeTimerRef.current = window.setTimeout(fitAndResize, 40);
-    });
-    resizeObserver.observe(container);
-    window.setTimeout(fitAndResize, 0);
-
-    const dataDisposable = term.onData((data) => {
-      const s = sessionRef.current;
-      if (!s.running) return;
-      void clientRef.current.input(s.id, data, s.projectPathKey).catch((error) => {
-        onErrorRef.current(error instanceof Error ? error.message : String(error));
-      });
-    });
-
-    const getTouchScrollRowHeight = () =>
-      Math.max(8, Math.floor(container.clientHeight / Math.max(1, term.rows)));
-
-    const handleTouchStart = (event: TouchEvent) => {
-      if (event.touches.length !== 1) {
-        touchScrollCancelled = true;
-        touchScrollActive = false;
-        touchScrollRemainder = 0;
-        return;
-      }
-      const touch = event.touches[0];
-      if (!touch) return;
-      touchScrollCancelled = false;
-      touchScrollActive = false;
-      touchScrollRemainder = 0;
-      lastTouchX = touch.clientX;
-      lastTouchY = touch.clientY;
-    };
-
-    const handleTouchMove = (event: TouchEvent) => {
-      if (touchScrollCancelled || event.touches.length !== 1) return;
-      const touch = event.touches[0];
-      if (!touch) return;
-
-      const deltaX = touch.clientX - lastTouchX;
-      const deltaY = touch.clientY - lastTouchY;
-      const absX = Math.abs(deltaX);
-      const absY = Math.abs(deltaY);
-      if (!touchScrollActive) {
-        if (absX > absY && absX > 8) {
-          touchScrollCancelled = true;
-          return;
-        }
-        if (absY < 8) return;
-        touchScrollActive = true;
-      }
-
-      lastTouchX = touch.clientX;
-      lastTouchY = touch.clientY;
-      touchScrollRemainder += -deltaY;
-      const rowHeight = getTouchScrollRowHeight();
-      const rows = Math.trunc(touchScrollRemainder / rowHeight);
-      if (rows !== 0) {
-        term.scrollLines(rows);
-        touchScrollRemainder -= rows * rowHeight;
-      }
-      event.preventDefault();
-    };
-
-    const handleTouchEnd = () => {
-      touchScrollActive = false;
-      touchScrollCancelled = false;
-      touchScrollRemainder = 0;
-    };
-
-    container.addEventListener("touchstart", handleTouchStart, { passive: true });
-    container.addEventListener("touchmove", handleTouchMove, { passive: false });
-    container.addEventListener("touchend", handleTouchEnd);
-    container.addEventListener("touchcancel", handleTouchEnd);
-
-    const applySnapshot = (snapshot: TerminalSnapshot) => {
-      if (snapshot.output) {
-        term.write(snapshot.output);
-      }
-      lastOutputOffset = terminalSnapshotEndOffset(snapshot);
-      snapshotLoaded = true;
-      loadingSnapshot = false;
-      term.options.disableStdin = !snapshot.session.running;
-      replayBufferedEvents();
-      window.setTimeout(fitAndResize, 0);
-    };
-
-    const replayBufferedEvents = () => {
-      const events = bufferedEvents.splice(0);
-      for (const event of events) {
-        writeTerminalEvent(
-          term,
-          event,
-          (nextOffset) => {
-            lastOutputOffset = nextOffset;
-          },
-          lastOutputOffset,
-        );
-      }
-    };
-
-    const loadSnapshot = () => {
-      if (disposed || loadingSnapshot) return;
-      const initial = initialSnapshotRef.current;
-      if (initial?.session.id === sessionRef.current.id) {
-        initialSnapshotRef.current = undefined;
-        onInitialSnapshotConsumedRef.current?.(initial.session.id);
-        applySnapshot(initial);
-        return;
-      }
-      loadingSnapshot = true;
-      const s = sessionRef.current;
-      void clientRef.current
-        .snapshot(s.id, undefined, s.projectPathKey)
-        .then((snapshot) => {
-          if (disposed) return;
-          applySnapshot(snapshot);
-        })
-        .catch((error) => {
-          loadingSnapshot = false;
-          if (!disposed) {
-            onErrorRef.current(error instanceof Error ? error.message : String(error));
-            snapshotLoaded = true;
-            replayBufferedEvents();
-          }
-        });
-    };
-
-    const unsubscribe = clientRef.current.subscribe((event) => {
-      if (disposed || event.sessionId !== session.id) return;
-      if (event.kind === "output" && event.data) {
-        if (snapshotLoaded && !loadingSnapshot) {
-          writeTerminalEvent(
-            term,
-            event,
-            (nextOffset) => {
-              lastOutputOffset = nextOffset;
-            },
-            lastOutputOffset,
-          );
-        } else {
-          bufferedEvents.push(event);
-        }
-      }
-      if (event.kind === "exit" || event.kind === "closed") {
-        term.options.disableStdin = true;
-      }
-    });
-
-    loadSnapshot();
-
-    return () => {
-      disposed = true;
-      termRef.current = null;
-      fitAndResizeRef.current = null;
-      unsubscribe();
-      dataDisposable.dispose();
-      resizeObserver.disconnect();
-      if (resizeTimerRef.current !== null) {
-        window.clearTimeout(resizeTimerRef.current);
-        resizeTimerRef.current = null;
-      }
-      container.removeEventListener("touchstart", handleTouchStart);
-      container.removeEventListener("touchmove", handleTouchMove);
-      container.removeEventListener("touchend", handleTouchEnd);
-      container.removeEventListener("touchcancel", handleTouchEnd);
-      const s = sessionRef.current;
-      void clientRef.current.detach(s.id, s.projectPathKey).catch(() => undefined);
-      term.dispose();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [session.id, session.projectPathKey]);
-
-  return (
-    <div
-      ref={containerRef}
-      className="project-terminal-viewport h-full min-h-0 w-full overflow-hidden px-2 py-2"
-    />
-  );
-}
-
-function terminalSnapshotEndOffset(snapshot: TerminalSnapshot) {
-  if (
-    typeof snapshot.outputEndOffset === "number" &&
-    Number.isFinite(snapshot.outputEndOffset) &&
-    snapshot.outputEndOffset >= 0
-  ) {
-    return snapshot.outputEndOffset;
-  }
-  const startOffset =
-    typeof snapshot.outputStartOffset === "number" &&
-    Number.isFinite(snapshot.outputStartOffset) &&
-    snapshot.outputStartOffset >= 0
-      ? snapshot.outputStartOffset
-      : 0;
-  return startOffset + utf8ByteLength(snapshot.output);
-}
-
-function writeTerminalEvent(
-  term: XTerm,
-  event: TerminalEvent,
-  setLastOutputOffset: (offset: number) => void,
-  lastOutputOffset: number,
-): "written" | "skipped" {
-  const data = event.data ?? "";
-  if (!data) return "skipped";
-  const startOffset = event.outputStartOffset;
-  const endOffset = event.outputEndOffset;
-  if (
-    typeof startOffset === "number" &&
-    Number.isFinite(startOffset) &&
-    typeof endOffset === "number" &&
-    Number.isFinite(endOffset) &&
-    endOffset >= startOffset
-  ) {
-    if (endOffset <= lastOutputOffset) return "skipped";
-    const alreadyWritten = Math.max(0, lastOutputOffset - startOffset);
-    term.write(alreadyWritten > 0 ? sliceUtf8Bytes(data, alreadyWritten) : data);
-    setLastOutputOffset(endOffset);
-    return "written";
-  }
-  term.write(data);
-  setLastOutputOffset(lastOutputOffset + utf8ByteLength(data));
-  return "written";
-}
-
-function sliceUtf8Bytes(value: string, byteOffset: number) {
-  if (byteOffset <= 0) return value;
-  let consumed = 0;
-  let index = 0;
-  for (const segment of value) {
-    const next = consumed + utf8ByteLengthOfCodePoint(segment);
-    if (next <= byteOffset) {
-      consumed = next;
-      index += segment.length;
-      continue;
-    }
-    if (consumed < byteOffset) {
-      index += segment.length;
-    }
-    return value.slice(index);
-  }
-  return "";
-}
-
-function utf8ByteLength(value: string) {
-  let length = 0;
-  for (const segment of value) {
-    length += utf8ByteLengthOfCodePoint(segment);
-  }
-  return length;
-}
-
-function utf8ByteLengthOfCodePoint(value: string) {
-  const codePoint = value.codePointAt(0) ?? 0;
-  if (codePoint <= 0x7f) return 1;
-  if (codePoint <= 0x7ff) return 2;
-  if (codePoint <= 0xffff) return 3;
-  return 4;
-}
-
 function clampScrollLeft(value: number, max: number) {
   return Math.min(max, Math.max(0, value));
 }
@@ -774,6 +392,7 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     onTunnelOpenChange,
     onSshTunnelOpenChange,
     onSshProjectHostIdsChange,
+    onOpenSshSession,
     onSessionsChange,
     onInsertFileMention,
     onOpenFile,
@@ -825,6 +444,18 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
   const effectiveWidthCollapsed = !isOpen && collapseImmediately ? true : widthCollapsed;
   const effectiveShouldRenderContent = !isOpen && collapseImmediately ? false : shouldRenderContent;
   const isControlled = externalSessions !== undefined;
+  const localSessions = useMemo(
+    () =>
+      sessions.filter(
+        (session) =>
+          session.kind !== "ssh" && terminalSessionBelongsToProject(session, projectPathKey),
+      ),
+    [projectPathKey, sessions],
+  );
+  const sshSessions = useMemo(
+    () => sessions.filter((session) => session.kind === "ssh"),
+    [sessions],
+  );
   const fileTreeInitialized = Boolean(projectPathKey && fileTreeOpen);
   const gitReviewInitialized = Boolean(projectPathKey && gitReviewOpen);
   const tunnelInitialized = Boolean(tunnelOpen && tunnelClient);
@@ -846,17 +477,18 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
         : "terminal";
 
   const activeSession = useMemo(
-    () => sessions.find((session) => session.id === activeSessionId) ?? sessions[0] ?? null,
-    [activeSessionId, sessions],
+    () =>
+      localSessions.find((session) => session.id === activeSessionId) ?? localSessions[0] ?? null,
+    [activeSessionId, localSessions],
   );
   const pendingCloseSession = useMemo(
-    () => sessions.find((session) => session.id === pendingCloseSessionId) ?? null,
-    [pendingCloseSessionId, sessions],
+    () => localSessions.find((session) => session.id === pendingCloseSessionId) ?? null,
+    [localSessions, pendingCloseSessionId],
   );
   const [draftTabOrder, setDraftTabOrder] = useState<string[] | null>(null);
   const [draggingTabId, setDraggingTabId] = useState("");
   const visibleTabs = useMemo<ProjectToolsTab[]>(() => {
-    const terminalTabs: ProjectToolsTab[] = sessions.map((session) => ({
+    const terminalTabs: ProjectToolsTab[] = localSessions.map((session) => ({
       id: session.id,
       kind: "terminal",
       session,
@@ -875,7 +507,13 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
       nextTabs.push({ id: SSH_TUNNEL_TAB_ID, kind: "sshTunnel" });
     }
     return nextTabs;
-  }, [fileTreeInitialized, gitReviewInitialized, sessions, sshTunnelInitialized, tunnelInitialized]);
+  }, [
+    fileTreeInitialized,
+    gitReviewInitialized,
+    localSessions,
+    sshTunnelInitialized,
+    tunnelInitialized,
+  ]);
   const effectiveTabOrder = draftTabOrder ?? tabOrder;
   const orderedProjectTabs = useMemo(
     () => orderProjectToolsTabs(visibleTabs, effectiveTabOrder),
@@ -1023,13 +661,13 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     setLoading(true);
     setError(null);
     void client
-      .list(projectPathKey)
+      .list()
       .then((nextSessions) => {
         publishSessions(nextSessions, { notifyParent: !isControlled });
       })
       .catch((err) => setError(err instanceof Error ? err.message : String(err)))
       .finally(() => setLoading(false));
-  }, [client, isControlled, projectPathKey, publishSessions, terminalReady]);
+  }, [client, isControlled, publishSessions, terminalReady]);
 
   useEffect(() => {
     if (!isOpen || isControlled) return;
@@ -1199,7 +837,6 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
   useEffect(() => {
     if (!terminalReady || isControlled) return;
     return client.subscribe((event) => {
-      if (event.projectPathKey !== projectPathKey) return;
       if (event.kind === "output") return;
       setSessions((current) => {
         let next = current;
@@ -1249,10 +886,38 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
 
   useEffect(() => {
     if (!pendingCloseSessionId) return;
-    if (!sessions.some((session) => session.id === pendingCloseSessionId)) {
+    if (!localSessions.some((session) => session.id === pendingCloseSessionId)) {
       setPendingCloseSessionId("");
     }
-  }, [pendingCloseSessionId, sessions]);
+  }, [localSessions, pendingCloseSessionId]);
+
+  const rememberTerminalSnapshot = useCallback(
+    (snapshot: TerminalSnapshot) => {
+      initialTerminalSnapshotsRef.current.set(snapshot.session.id, snapshot);
+      setSessions((current) => {
+        const next = sortSessions([
+          ...current.filter((session) => session.id !== snapshot.session.id),
+          snapshot.session,
+        ]);
+        onSessionsChange?.(next);
+        return next;
+      });
+    },
+    [onSessionsChange],
+  );
+
+  const forgetTerminalSession = useCallback(
+    (sessionId: string) => {
+      initialTerminalSnapshotsRef.current.delete(sessionId);
+      setPendingCloseSessionId((current) => (current === sessionId ? "" : current));
+      setSessions((current) => {
+        const next = sortSessions(current.filter((item) => item.id !== sessionId));
+        onSessionsChange?.(next);
+        return next;
+      });
+    },
+    [onSessionsChange],
+  );
 
   const createTerminal = useCallback(
     (shell?: string) => {
@@ -1268,22 +933,22 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
           rows: DEFAULT_TERMINAL_ROWS,
         })
         .then((snapshot) => {
-          initialTerminalSnapshotsRef.current.set(snapshot.session.id, snapshot);
-          setSessions((current) => {
-            const next = sortSessions([
-              ...current.filter((session) => session.id !== snapshot.session.id),
-              snapshot.session,
-            ]);
-            onSessionsChange?.(next);
-            return next;
-          });
+          rememberTerminalSnapshot(snapshot);
           setActiveSessionId(snapshot.session.id);
           onActiveTabChange("terminal");
         })
         .catch((err) => setError(err instanceof Error ? err.message : String(err)))
         .finally(() => setCreating(false));
     },
-    [client, creating, cwd, onActiveTabChange, onSessionsChange, projectPathKey, terminalReady],
+    [
+      client,
+      creating,
+      cwd,
+      onActiveTabChange,
+      projectPathKey,
+      rememberTerminalSnapshot,
+      terminalReady,
+    ],
   );
 
   const handleCreate = useCallback(() => {
@@ -1298,18 +963,12 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
       void client
         .close(session.id, session.projectPathKey)
         .then(() => {
-          initialTerminalSnapshotsRef.current.delete(session.id);
-          setPendingCloseSessionId((current) => (current === session.id ? "" : current));
-          setSessions((current) => {
-            const next = sortSessions(current.filter((item) => item.id !== session.id));
-            onSessionsChange?.(next);
-            return next;
-          });
+          forgetTerminalSession(session.id);
         })
         .catch((err) => setError(err instanceof Error ? err.message : String(err)))
         .finally(() => setClosingSessionId((current) => (current === session.id ? "" : current)));
     },
-    [client, closingSessionId, onSessionsChange],
+    [client, closingSessionId, forgetTerminalSession],
   );
 
   const handleInitialTerminalSnapshotConsumed = useCallback((sessionId: string) => {
@@ -2417,16 +2076,22 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                     )}
                   >
                     <SshTunnelPanel
+                      cwd={cwd}
                       projectPathKey={projectPathKey}
                       hosts={sshHosts}
                       associatedHostIds={associatedSshHostIds}
+                      client={client}
+                      sessions={sshSessions}
+                      onSessionSnapshot={rememberTerminalSnapshot}
+                      onSessionClosed={forgetTerminalSession}
+                      onOpenSession={(session) => onOpenSshSession?.(session)}
                       onAssociatedHostIdsChange={(hostIds) => {
                         onSshProjectHostIdsChange?.(hostIds);
                       }}
                     />
                   </div>
                 ) : null}
-                {sessions.length > 0 ? (
+                {localSessions.length > 0 ? (
                   <div
                     className={cn(
                       "min-h-0 flex-1 flex-col",
@@ -2439,7 +2104,7 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                       </div>
                     ) : null}
                     <div className="relative min-h-0 flex-1">
-                      {sessions.map((session) => {
+                      {localSessions.map((session) => {
                         const isActiveTerminal =
                           currentActiveTab === "terminal" && activeSession?.id === session.id;
                         return (
diff --git a/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
index e24587bd6..5abf7d3df 100644
--- a/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
@@ -1,18 +1,55 @@
-import { useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useLocale } from "@/i18n";
 import type { SshHostConfig } from "@/lib/settings";
+import { workspaceProjectPathKey } from "@/lib/settings";
 import { cn } from "@/lib/shared/utils";
-import { ArrowLeft, Check, ChevronDown, Globe, Key, Plus, Server, Settings } from "../icons";
+import type {
+  TerminalClient,
+  TerminalSession,
+  TerminalSnapshot,
+  TerminalSshPrompt,
+} from "@/lib/terminal/types";
+import {
+  AlertTriangle,
+  ArrowLeft,
+  Check,
+  ChevronDown,
+  Clock3,
+  Globe,
+  Key,
+  Loader2,
+  Plus,
+  RefreshCw,
+  Server,
+  Settings,
+  Shield,
+  Terminal,
+  Wifi,
+  WifiOff,
+  X,
+} from "../icons";
 import { Button } from "../ui/button";
-import { Textarea } from "../ui/textarea";
+import { useConfirmDialog } from "../ui/confirm-dialog";
 
 type SshTunnelScope = "project" | "all";
 type SshTunnelView = "list" | "settings" | "create";
 
+type SshLatencyState = {
+  latencyMs?: number;
+  loading: boolean;
+  failed: boolean;
+};
+
 type SshTunnelPanelProps = {
+  cwd: string;
   projectPathKey: string;
   hosts: SshHostConfig[];
   associatedHostIds: string[];
+  client: TerminalClient;
+  sessions: TerminalSession[];
+  onSessionSnapshot: (snapshot: TerminalSnapshot) => void;
+  onSessionClosed: (sessionId: string) => void;
+  onOpenSession: (session: TerminalSession) => void;
   onAssociatedHostIdsChange: (hostIds: string[]) => void;
 };
 
@@ -27,16 +64,77 @@ function authLabel(host: Pick<SshHostConfig, "authType">, t: (key: string) => st
     : t("settings.sshAuthPassword");
 }
 
-function hostHasMeta(host: SshHostConfig) {
+function hostHasProxy(host: SshHostConfig) {
   return (
-    (host.authType === "privateKey" &&
-      (host.privateKeyPath.trim().length > 0 || host.privateKeyConfigured === true)) ||
     host.proxy.url.trim().length > 0 ||
     host.proxy.port > 0 ||
+    host.proxy.username.trim().length > 0 ||
     host.proxy.passwordConfigured === true
   );
 }
 
+function hostSecretReady(host: SshHostConfig) {
+  if (host.authType === "privateKey") {
+    return (
+      host.privateKey.trim().length > 0 ||
+      host.privateKeyPath.trim().length > 0 ||
+      host.privateKeyConfigured === true
+    );
+  }
+  return host.password.trim().length > 0 || host.passwordConfigured === true;
+}
+
+function hostStatusMessage(host: SshHostConfig, t: (key: string) => string) {
+  if (hostHasProxy(host)) return t("projectTools.sshTunnelProxyUnsupported");
+  if (!hostSecretReady(host)) return t("projectTools.sshTunnelMissingSecret");
+  return "";
+}
+
+function sessionBelongsToProject(session: TerminalSession, projectPathKey: string) {
+  const wantedProjectKey = workspaceProjectPathKey(projectPathKey);
+  if (!wantedProjectKey) return false;
+  const sessionProjectKey = workspaceProjectPathKey(session.projectPathKey || session.cwd);
+  return sessionProjectKey === wantedProjectKey;
+}
+
+function sessionTitle(session: TerminalSession, fallback: string) {
+  return session.title || session.ssh?.hostName || fallback;
+}
+
+function sessionEndpointLabel(session: TerminalSession) {
+  const ssh = session.ssh;
+  if (!ssh) return session.cwd || session.projectPathKey;
+  const userPrefix = ssh.username.trim() ? `${ssh.username.trim()}@` : "";
+  return `${userPrefix}${ssh.host}:${ssh.port}`;
+}
+
+function sessionProjectLabel(session: TerminalSession) {
+  return session.projectPathKey || session.cwd || "";
+}
+
+function sshSessionStatus(session: TerminalSession) {
+  const status = session.ssh?.status ?? (session.running ? "connected" : "disconnected");
+  if (status === "connected" && !session.running) return "disconnected";
+  return status;
+}
+
+function sshSessionConnected(session: TerminalSession) {
+  return sshSessionStatus(session) === "connected" && session.running;
+}
+
+function sshStatusLabel(session: TerminalSession, t: (key: string) => string) {
+  const status = sshSessionStatus(session);
+  if (status === "reconnecting") {
+    const attempt = Math.max(1, Number(session.ssh?.reconnectAttempt ?? 1));
+    const max = Math.max(attempt, Number(session.ssh?.reconnectMaxAttempts ?? 3));
+    return t("projectTools.sshTunnelReconnecting")
+      .replace("{attempt}", String(attempt))
+      .replace("{max}", String(max));
+  }
+  if (status === "disconnected") return t("projectTools.sshTunnelDisconnected");
+  return t("projectTools.sshTunnelConnected");
+}
+
 function HostMetaTags(props: { host: SshHostConfig }) {
   const { host } = props;
   const { t } = useLocale();
@@ -46,7 +144,10 @@ function HostMetaTags(props: { host: SshHostConfig }) {
   } else if (host.authType === "privateKey" && host.privateKeyConfigured) {
     tags.push(t("settings.sshPrivateKeyConfigured"));
   }
-  if (host.proxy.url.trim().length > 0 || host.proxy.port > 0 || host.proxy.passwordConfigured) {
+  if (host.privateKeyPassphraseConfigured) {
+    tags.push(t("settings.sshPrivateKeyPassphraseConfigured"));
+  }
+  if (hostHasProxy(host)) {
     tags.push(t("settings.sshAdvancedProxy"));
   }
   if (tags.length === 0) return null;
@@ -66,21 +167,127 @@ function HostMetaTags(props: { host: SshHostConfig }) {
 }
 
 export function SshTunnelPanel(props: SshTunnelPanelProps) {
-  const { projectPathKey, hosts, associatedHostIds, onAssociatedHostIdsChange } = props;
+  const {
+    cwd,
+    projectPathKey,
+    hosts,
+    associatedHostIds,
+    client,
+    sessions,
+    onSessionSnapshot,
+    onSessionClosed,
+    onOpenSession,
+    onAssociatedHostIdsChange,
+  } = props;
   const { t } = useLocale();
+  const { confirm: requestCloseSessionConfirm, dialog: closeSessionConfirmDialog } =
+    useConfirmDialog();
   const [scope, setScope] = useState<SshTunnelScope>("project");
   const [view, setView] = useState<SshTunnelView>("list");
   const [createHostId, setCreateHostId] = useState("");
-  const [createSftpEnabled, setCreateSftpEnabled] = useState(false);
-  const [createNote, setCreateNote] = useState("");
+  const [createTitle, setCreateTitle] = useState("");
+  const [creating, setCreating] = useState(false);
+  const [closingSessionId, setClosingSessionId] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const [prompt, setPrompt] = useState<TerminalSshPrompt | null>(null);
+  const [promptAnswer, setPromptAnswer] = useState("");
+  const [answeringPrompt, setAnsweringPrompt] = useState(false);
+  const [latencyBySessionId, setLatencyBySessionId] = useState<Record<string, SshLatencyState>>(
+    {},
+  );
+  const latencyRequestsRef = useRef<Set<string>>(new Set());
   const associatedSet = useMemo(() => new Set(associatedHostIds), [associatedHostIds]);
   const associatedHosts = useMemo(
     () => hosts.filter((host) => associatedSet.has(host.id)),
     [associatedSet, hosts],
   );
-  const selectedCreateHostId = associatedSet.has(createHostId)
+  const sshSessions = useMemo(
+    () => sessions.filter((session) => session.kind === "ssh" && session.ssh),
+    [sessions],
+  );
+  const projectSshSessions = useMemo(
+    () => sshSessions.filter((session) => sessionBelongsToProject(session, projectPathKey)),
+    [projectPathKey, sshSessions],
+  );
+  const visibleSessions = scope === "project" ? projectSshSessions : sshSessions;
+  const canCreateInScope = scope === "project";
+  const createHosts = canCreateInScope ? associatedHosts : [];
+  const selectedCreateHostId = createHosts.some((host) => host.id === createHostId)
     ? createHostId
-    : (associatedHosts[0]?.id ?? "");
+    : (createHosts[0]?.id ?? "");
+  const selectedCreateHost = createHosts.find((host) => host.id === selectedCreateHostId) ?? null;
+  const selectedHostMessage = selectedCreateHost ? hostStatusMessage(selectedCreateHost, t) : "";
+  const canCreate = Boolean(
+    canCreateInScope && selectedCreateHost && !selectedHostMessage && !creating,
+  );
+
+  useEffect(() => {
+    if (canCreateInScope || view !== "create") return;
+    setView("list");
+  }, [canCreateInScope, view]);
+
+  const refreshSessionLatency = useCallback(
+    (session: TerminalSession) => {
+      if (!sshSessionConnected(session) || session.kind !== "ssh") return;
+      if (latencyRequestsRef.current.has(session.id)) return;
+      latencyRequestsRef.current.add(session.id);
+      setLatencyBySessionId((current) => ({
+        ...current,
+        [session.id]: {
+          latencyMs: current[session.id]?.latencyMs,
+          loading: true,
+          failed: false,
+        },
+      }));
+      void client
+        .sshLatency(session.id, session.projectPathKey)
+        .then((latency) => {
+          setLatencyBySessionId((current) => ({
+            ...current,
+            [session.id]: {
+              latencyMs: latency.latencyMs,
+              loading: false,
+              failed: false,
+            },
+          }));
+        })
+        .catch(() => {
+          setLatencyBySessionId((current) => ({
+            ...current,
+            [session.id]: {
+              loading: false,
+              failed: true,
+            },
+          }));
+        })
+        .finally(() => {
+          latencyRequestsRef.current.delete(session.id);
+        });
+    },
+    [client],
+  );
+
+  useEffect(() => {
+    const visibleIds = new Set(visibleSessions.map((session) => session.id));
+    setLatencyBySessionId((current) => {
+      const next = Object.fromEntries(
+        Object.entries(current).filter(([sessionId]) => visibleIds.has(sessionId)),
+      );
+      return Object.keys(next).length === Object.keys(current).length ? current : next;
+    });
+  }, [visibleSessions]);
+
+  useEffect(() => {
+    const connectedSshSessions = visibleSessions.filter(
+      (session) => sshSessionConnected(session) && session.kind === "ssh",
+    );
+    if (connectedSshSessions.length === 0) return;
+    connectedSshSessions.forEach(refreshSessionLatency);
+    const timer = window.setInterval(() => {
+      connectedSshSessions.forEach(refreshSessionLatency);
+    }, 10_000);
+    return () => window.clearInterval(timer);
+  }, [refreshSessionLatency, visibleSessions]);
 
   const toggleHost = (hostId: string) => {
     const current = associatedHostIds.filter((id) => hosts.some((host) => host.id === id));
@@ -90,11 +297,109 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
     onAssociatedHostIdsChange(next);
   };
 
+  const handleCreate = useCallback(() => {
+    if (!selectedCreateHost || !canCreate) return;
+    setCreating(true);
+    setError(null);
+    void client
+      .createSsh({
+        cwd,
+        projectPathKey,
+        hostId: selectedCreateHost.id,
+        title: createTitle.trim() || undefined,
+      })
+      .then((result) => {
+        if (result.prompt) {
+          setPrompt(result.prompt);
+          setPromptAnswer("");
+          setView("list");
+          return;
+        }
+        if (result.snapshot) {
+          onSessionSnapshot(result.snapshot);
+          setCreateTitle("");
+          setView("list");
+        }
+      })
+      .catch((err) => setError(err instanceof Error ? err.message : String(err)))
+      .finally(() => setCreating(false));
+  }, [
+    canCreate,
+    client,
+    createTitle,
+    cwd,
+    onSessionSnapshot,
+    projectPathKey,
+    selectedCreateHost,
+  ]);
+
+  const handleSubmitPrompt = useCallback(() => {
+    if (!prompt || answeringPrompt) return;
+    const hostKeyPrompt = prompt.kind === "hostKey";
+    if (!hostKeyPrompt && !promptAnswer.trim()) return;
+    setAnsweringPrompt(true);
+    setError(null);
+    void client
+      .answerSshPrompt({
+        promptId: prompt.id,
+        answer: hostKeyPrompt ? undefined : promptAnswer,
+        trustHostKey: hostKeyPrompt,
+      })
+      .then((result) => {
+        if (result.prompt) {
+          setPrompt(result.prompt);
+          setPromptAnswer("");
+          return;
+        }
+        setPrompt(null);
+        setPromptAnswer("");
+        if (result.snapshot) {
+          onSessionSnapshot(result.snapshot);
+          setView("list");
+        }
+      })
+      .catch((err) => setError(err instanceof Error ? err.message : String(err)))
+      .finally(() => setAnsweringPrompt(false));
+  }, [answeringPrompt, client, onSessionSnapshot, prompt, promptAnswer]);
+
+  const handleCancelPrompt = useCallback(() => {
+    const promptId = prompt?.id;
+    setPrompt(null);
+    setPromptAnswer("");
+    if (!promptId) return;
+    void client.cancelSshPrompt(promptId).catch(() => undefined);
+  }, [client, prompt]);
+
+  const handleCloseSession = useCallback(
+    async (session: TerminalSession) => {
+      if (closingSessionId === session.id) return;
+      const title = sessionTitle(session, t("projectTools.sshTunnelTitle"));
+      const confirmed = await requestCloseSessionConfirm({
+        title: t("projectTools.confirmCloseSshSession"),
+        subtitle: t("projectTools.closeSshSessionConfirm").replace("{title}", title),
+        detail: sessionEndpointLabel(session),
+        confirmLabel: t("projectTools.closeSshSessionContinue"),
+        cancelLabel: t("projectTools.closeSshSessionCancel"),
+        closeLabel: t("projectTools.closeSshSessionClose"),
+        tone: "destructive",
+      });
+      if (!confirmed) return;
+      setClosingSessionId(session.id);
+      setError(null);
+      void client
+        .close(session.id, session.projectPathKey)
+        .then(() => onSessionClosed(session.id))
+        .catch((err) => setError(err instanceof Error ? err.message : String(err)))
+        .finally(() => setClosingSessionId((current) => (current === session.id ? "" : current)));
+    },
+    [client, closingSessionId, onSessionClosed, requestCloseSessionConfirm, t],
+  );
+
   const listActive = view === "list";
   const settingsActive = view === "settings";
   const createActive = view === "create";
   const listPageClassName = cn(
-    "absolute inset-0 flex min-h-0 flex-col bg-gradient-to-b from-muted/40 via-muted/15 to-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
+    "absolute inset-0 flex min-h-0 flex-col bg-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
     listActive
       ? "z-10 translate-x-0 opacity-100"
       : "pointer-events-none z-0 -translate-x-4 opacity-0",
@@ -117,10 +422,36 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
       : t("projectTools.sshTunnelAllEmpty");
   const emptyHint =
     scope === "project"
-      ? associatedHosts.length > 0
-        ? t("projectTools.sshTunnelProjectEmptyWithHosts")
-        : t("projectTools.sshTunnelProjectEmptyHint")
+      ? t("projectTools.sshTunnelProjectEmptyHint")
       : t("projectTools.sshTunnelAllEmptyHint");
+  const hasCreateHosts = createHosts.length > 0;
+  const visibleSessionCount = visibleSessions.length;
+  const connectedSessionCount = visibleSessions.filter(sshSessionConnected).length;
+  const statusText =
+    visibleSessionCount > 0
+      ? t("projectTools.sshTunnelConnectionCount")
+          .replace("{count}", String(visibleSessionCount))
+          .replace("{connected}", String(connectedSessionCount))
+      : scope === "all"
+        ? t("projectTools.sshTunnelAllEmpty")
+        : projectPathKey
+          ? t("projectTools.sshTunnelProjectEmpty")
+          : t("projectTools.sshTunnelNoProject");
+  const hostKeyPrompt = prompt?.kind === "hostKey";
+  const promptSubmitDisabled =
+    answeringPrompt || Boolean(prompt && !hostKeyPrompt && !promptAnswer.trim());
+  const latencyText = (session: TerminalSession) => {
+    const state = latencyBySessionId[session.id];
+    if (state?.failed) return t("projectTools.sshTunnelLatencyUnknown");
+    if (state?.latencyMs) {
+      return t("projectTools.sshTunnelLatencyValue").replace(
+        "{ms}",
+        String(state.latencyMs),
+      );
+    }
+    if (state?.loading) return t("projectTools.sshTunnelLatencyChecking");
+    return t("projectTools.sshTunnelLatencyUnknown");
+  };
 
   return (
     <div className="relative flex min-h-0 flex-1 overflow-hidden bg-background">
@@ -174,7 +505,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                     key={host.id}
                     type="button"
                     className={cn(
-                      "group flex w-full items-start gap-3 rounded-xl border border-border/60 bg-card px-3 py-3 text-left transition-all hover:border-emerald-500/40 hover:bg-muted/40",
+                      "group flex w-full items-start gap-3 rounded-lg border border-border/60 bg-card px-3 py-3 text-left transition-all hover:border-emerald-500/40 hover:bg-muted/40",
                       selected && "border-emerald-500/50 bg-emerald-500/5",
                     )}
                     aria-pressed={selected}
@@ -195,7 +526,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                       <div className="mt-1 truncate font-mono text-xs text-muted-foreground">
                         {endpointLabel(host)}
                       </div>
-                      {hostHasMeta(host) ? <HostMetaTags host={host} /> : null}
+                      <HostMetaTags host={host} />
                     </div>
                     <span
                       className={cn(
@@ -238,7 +569,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
           </div>
         </div>
 
-        {hosts.length === 0 || associatedHosts.length === 0 ? (
+        {createHosts.length === 0 ? (
           <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
             <div className="flex h-12 w-12 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
               <Key className="h-6 w-6" />
@@ -259,7 +590,10 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         ) : (
           <form
             className="min-h-0 flex-1 overflow-y-auto px-3 py-3"
-            onSubmit={(event) => event.preventDefault()}
+            onSubmit={(event) => {
+              event.preventDefault();
+              handleCreate();
+            }}
           >
             <div className="space-y-3">
               <label className="block space-y-1.5">
@@ -274,11 +608,11 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                     <Server className="h-4 w-4" />
                   </span>
                   <select
-                    className="h-10 w-full appearance-none rounded-xl border border-border/70 bg-card/80 pl-10 pr-9 text-sm font-medium text-foreground shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] outline-none transition-colors hover:border-emerald-500/40 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                    className="h-10 w-full appearance-none rounded-lg border border-border/70 bg-card/80 pl-10 pr-9 text-sm font-medium text-foreground shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] outline-none transition-colors hover:border-emerald-500/40 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
                     value={selectedCreateHostId}
                     onChange={(event) => setCreateHostId(event.currentTarget.value)}
                   >
-                    {associatedHosts.map((host) => (
+                    {createHosts.map((host) => (
                       <option key={host.id} value={host.id}>
                         {host.name} - {endpointLabel(host)}
                       </option>
@@ -291,29 +625,48 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                 </div>
               </label>
 
-              <label className="flex min-h-10 items-center gap-3 rounded-xl border border-border/70 bg-card/80 px-3 py-2.5 shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] transition-colors hover:border-emerald-500/40">
-                <input
-                  type="checkbox"
-                  checked={createSftpEnabled}
-                  onChange={(event) => setCreateSftpEnabled(event.currentTarget.checked)}
-                  className="h-4 w-4 shrink-0 rounded border-border text-emerald-500 accent-emerald-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-emerald-500/40"
-                />
-                <span className="min-w-0 flex-1 text-xs font-medium text-foreground">
-                  {t("projectTools.sshTunnelSftpEnabled")}
-                </span>
-              </label>
-
               <label className="block space-y-1.5">
                 <span className="text-xs font-medium text-foreground">
-                  {t("projectTools.sshTunnelNote")}
+                  {t("projectTools.sshTunnelTabTitle")}
                 </span>
-                <Textarea
-                  value={createNote}
-                  onChange={(event) => setCreateNote(event.currentTarget.value)}
-                  className="min-h-20 rounded-lg border-border/70 bg-background/80 text-xs focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
-                  placeholder={t("projectTools.sshTunnelNotePlaceholder")}
+                <input
+                  value={createTitle}
+                  onChange={(event) => setCreateTitle(event.currentTarget.value)}
+                  className="h-10 w-full rounded-lg border border-border/70 bg-background/80 px-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground/70 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                  placeholder={selectedCreateHost?.name || t("projectTools.sshTunnelTabTitlePlaceholder")}
                 />
               </label>
+
+              {selectedCreateHost ? (
+                <div className="rounded-lg border border-border/60 bg-muted/30 px-3 py-2.5">
+                  <div className="flex min-w-0 items-center gap-2">
+                    <Server className="h-4 w-4 shrink-0 text-emerald-500" />
+                    <div className="min-w-0 flex-1">
+                      <div className="truncate text-xs font-medium text-foreground">
+                        {selectedCreateHost.name}
+                      </div>
+                      <div className="truncate font-mono text-[11px] text-muted-foreground">
+                        {endpointLabel(selectedCreateHost)}
+                      </div>
+                    </div>
+                    <span className="shrink-0 rounded-md bg-background/70 px-1.5 py-0.5 text-[10.5px] text-muted-foreground">
+                      {authLabel(selectedCreateHost, t)}
+                    </span>
+                  </div>
+                  {selectedHostMessage ? (
+                    <div className="mt-2 flex gap-2 rounded-md bg-destructive/10 px-2 py-1.5 text-[11px] leading-relaxed text-destructive">
+                      <AlertTriangle className="mt-0.5 h-3.5 w-3.5 shrink-0" />
+                      <span>{selectedHostMessage}</span>
+                    </div>
+                  ) : null}
+                </div>
+              ) : null}
+
+              {error ? (
+                <div className="rounded-lg border border-destructive/20 bg-destructive/10 px-3 py-2 text-xs text-destructive">
+                  {error}
+                </div>
+              ) : null}
             </div>
 
             <div className="mt-4 flex items-center justify-end gap-2 border-t border-border/60 pt-3">
@@ -326,14 +679,11 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
               >
                 {t("projectTools.sshTunnelCreateCancel")}
               </Button>
-              <Button
-                type="submit"
-                size="sm"
-                className="h-8 rounded-lg px-3 text-xs"
-                disabled
-                title={t("projectTools.sshTunnelCreateUnavailable")}
-              >
-                {t("projectTools.sshTunnelCreate")}
+              <Button type="submit" size="sm" className="h-8 rounded-lg px-3 text-xs" disabled={!canCreate}>
+                {creating ? <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" /> : null}
+                {creating
+                  ? t("projectTools.sshTunnelConnecting")
+                  : t("projectTools.sshTunnelConnect")}
               </Button>
             </div>
           </form>
@@ -341,9 +691,9 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
       </div>
 
       <div className={listPageClassName} aria-hidden={!listActive} inert={!listActive}>
-        <div className="shrink-0 border-b border-border/60 bg-background/70 px-4 pb-3 pt-3.5 backdrop-blur-xl">
+        <div className="shrink-0 border-b border-border/60 bg-background/80 px-4 pb-3 pt-3.5 backdrop-blur-xl">
           <div className="flex items-center gap-2.5">
-            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl border border-border/60 bg-background/80 text-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_2px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
+            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border border-border/60 bg-background/80 text-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_2px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
               <Key className="h-4 w-4" />
             </div>
             <div className="min-w-0 flex-1">
@@ -351,23 +701,20 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                 {t("projectTools.sshTunnelTitle")}
               </div>
               <div className="truncate text-xs text-muted-foreground">
-                {projectPathKey
-                  ? t("projectTools.sshTunnelConfiguredHosts").replace(
-                      "{count}",
-                      String(associatedHosts.length),
-                    )
-                  : t("projectTools.sshTunnelNoProject")}
+                {statusText}
               </div>
             </div>
-            <button
-              type="button"
-              className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border/60 hover:bg-muted/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-              title={t("projectTools.newSshTunnel")}
-              aria-label={t("projectTools.newSshTunnel")}
-              onClick={() => setView("create")}
-            >
-              <Plus className="h-4 w-4" />
-            </button>
+            {canCreateInScope ? (
+              <button
+                type="button"
+                className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border/60 hover:bg-muted/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                title={t("projectTools.newSshTunnel")}
+                aria-label={t("projectTools.newSshTunnel")}
+                onClick={() => setView("create")}
+              >
+                <Plus className="h-4 w-4" />
+              </button>
+            ) : null}
             {scope === "project" ? (
               <button
                 type="button"
@@ -422,39 +769,251 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         </div>
 
         <div className="min-h-0 flex-1 overflow-y-auto px-3 py-3">
-          <div className="flex flex-col items-center justify-center gap-1.5 rounded-xl border border-dashed border-border/70 bg-background/40 px-4 py-10 text-center">
-            <div className="mb-1.5 flex h-12 w-12 items-center justify-center rounded-2xl border border-border/50 bg-background/80 text-muted-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_3px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
-              <Key className="h-5 w-5" />
+          {error ? (
+            <div className="mb-3 rounded-lg border border-destructive/20 bg-destructive/10 px-3 py-2 text-xs text-destructive">
+              {error}
+            </div>
+          ) : null}
+
+          {visibleSessionCount === 0 ? (
+            <div className="flex min-h-full items-center justify-center">
+              <div className="flex flex-col items-center justify-center gap-1.5 rounded-lg border border-dashed border-border/70 bg-background/40 px-4 py-8 text-center">
+                <div className="mb-1.5 flex h-12 w-12 items-center justify-center rounded-xl border border-border/50 bg-background/80 text-muted-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_3px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
+                  <Key className="h-5 w-5" />
+                </div>
+                <div className="text-xs font-medium text-foreground/80">{emptyTitle}</div>
+                <div className="max-w-[16rem] text-[11px] leading-relaxed text-muted-foreground">
+                  {emptyHint}
+                </div>
+                <div className="mt-2 flex flex-wrap items-center justify-center gap-2">
+                  {canCreateInScope ? (
+                    <Button
+                      type="button"
+                      variant="default"
+                      size="sm"
+                      className="h-7 rounded-lg px-2.5 text-xs"
+                      onClick={() => setView("create")}
+                      disabled={!hasCreateHosts}
+                    >
+                      {t("projectTools.newSshTunnel")}
+                    </Button>
+                  ) : null}
+                  {scope === "project" && associatedHosts.length === 0 ? (
+                    <Button
+                      type="button"
+                      variant="outline"
+                      size="sm"
+                      className="h-7 rounded-lg bg-background/70 px-2.5 text-xs"
+                      onClick={() => setView("settings")}
+                    >
+                      {t("projectTools.sshTunnelAssociateHosts")}
+                    </Button>
+                  ) : null}
+                </div>
+              </div>
+            </div>
+          ) : (
+            <div className="space-y-2">
+              {visibleSessions.map((session) => {
+                const title = sessionTitle(session, t("projectTools.sshTunnelTitle"));
+                const endpoint = sessionEndpointLabel(session);
+                const projectLabel = sessionProjectLabel(session);
+                const closing = closingSessionId === session.id;
+                const sshStatus = sshSessionStatus(session);
+                const connected = sshSessionConnected(session);
+                return (
+                  <article
+                    key={session.id}
+                    className="rounded-lg border border-border/60 bg-card px-3 py-3 shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)]"
+                  >
+                    <div className="flex items-start gap-3">
+                      <div
+                        className={cn(
+                          "flex h-9 w-9 shrink-0 items-center justify-center rounded-lg",
+                          sshStatus === "disconnected"
+                            ? "bg-destructive/10 text-destructive"
+                            : sshStatus === "reconnecting"
+                              ? "bg-amber-500/10 text-amber-600 dark:text-amber-400"
+                              : "bg-emerald-500/10 text-emerald-500",
+                        )}
+                      >
+                        <Server className="h-4 w-4" />
+                      </div>
+                      <div className="min-w-0 flex-1">
+                        <div className="flex min-w-0 items-center gap-2">
+                          <span className="truncate text-sm font-medium text-foreground">
+                            {title}
+                          </span>
+                          <span
+                            className={cn(
+                              "inline-flex shrink-0 items-center gap-1 rounded-md px-1.5 py-0.5 text-[10.5px] font-medium",
+                              sshStatus === "disconnected"
+                                ? "bg-destructive/10 text-destructive"
+                                : sshStatus === "reconnecting"
+                                  ? "bg-amber-500/10 text-amber-600 dark:text-amber-400"
+                                  : "bg-emerald-500/10 text-emerald-600 dark:text-emerald-400",
+                            )}
+                          >
+                            {sshStatus === "disconnected" ? (
+                              <WifiOff className="h-3 w-3" />
+                            ) : sshStatus === "reconnecting" ? (
+                              <RefreshCw className="h-3 w-3 animate-spin" />
+                            ) : (
+                              <Wifi className="h-3 w-3" />
+                            )}
+                            {sshStatusLabel(session, t)}
+                          </span>
+                        </div>
+                        <div className="mt-1 truncate font-mono text-[11px] text-muted-foreground">
+                          {endpoint}
+                        </div>
+                        {scope === "all" && projectLabel ? (
+                          <div className="mt-1 truncate text-[11px] text-muted-foreground">
+                            {projectLabel}
+                          </div>
+                        ) : null}
+                      </div>
+                    </div>
+
+                    <div className="mt-3 flex items-end justify-between gap-3">
+                      <div className="flex min-w-0 flex-wrap items-center gap-1.5">
+                        <span className="inline-flex items-center gap-1 rounded-md bg-muted/60 px-1.5 py-0.5 text-[10.5px] text-muted-foreground">
+                          {latencyBySessionId[session.id]?.loading &&
+                          !latencyBySessionId[session.id]?.latencyMs ? (
+                            <Loader2 className="h-3 w-3 animate-spin" />
+                          ) : (
+                            <Clock3 className="h-3 w-3" />
+                          )}
+                          {latencyText(session)}
+                        </span>
+                      </div>
+                      <div className="flex shrink-0 items-center gap-1.5">
+                        <button
+                          type="button"
+                          className="flex h-8 w-8 items-center justify-center rounded-lg border border-border/60 bg-background/70 text-muted-foreground transition-colors hover:border-emerald-500/40 hover:bg-emerald-500/10 hover:text-emerald-600 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 dark:hover:text-emerald-400"
+                          title={t("projectTools.sshTunnelOpenBash")}
+                          aria-label={t("projectTools.sshTunnelOpenBash")}
+                          disabled={!connected}
+                          onClick={() => onOpenSession(session)}
+                        >
+                          <Terminal className="h-4 w-4" />
+                        </button>
+                        <button
+                          type="button"
+                          className="flex h-8 w-8 items-center justify-center rounded-lg border border-border/60 bg-background/70 text-muted-foreground transition-colors hover:border-destructive/30 hover:bg-destructive/10 hover:text-destructive focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50"
+                          title={t("projectTools.sshTunnelCloseSession")}
+                          aria-label={t("projectTools.sshTunnelCloseSession")}
+                          disabled={closing}
+                          onClick={() => handleCloseSession(session)}
+                        >
+                          {closing ? (
+                            <Loader2 className="h-4 w-4 animate-spin" />
+                          ) : (
+                            <X className="h-4 w-4" />
+                          )}
+                        </button>
+                      </div>
+                    </div>
+                  </article>
+                );
+              })}
+            </div>
+          )}
+        </div>
+      </div>
+
+      {prompt ? (
+        <div className="absolute inset-0 z-30 flex items-center justify-center bg-background/70 px-4 backdrop-blur-sm">
+          <form
+            className="w-full max-w-md rounded-lg border border-border bg-card p-4 shadow-xl"
+            onSubmit={(event) => {
+              event.preventDefault();
+              handleSubmitPrompt();
+            }}
+          >
+            <div className="flex items-start gap-3">
+              <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-amber-500/10 text-amber-600 dark:text-amber-400">
+                <Shield className="h-4.5 w-4.5" />
+              </div>
+              <div className="min-w-0 flex-1">
+                <div className="text-sm font-semibold text-foreground">
+                  {hostKeyPrompt
+                    ? t("projectTools.sshTunnelPromptTitle")
+                    : t("projectTools.sshTunnelAuthPromptTitle")}
+                </div>
+                <div className="mt-1 text-xs leading-relaxed text-muted-foreground">
+                  {prompt.message}
+                </div>
+              </div>
             </div>
-            <div className="text-xs font-medium text-foreground/80">{emptyTitle}</div>
-            <div className="max-w-[16rem] text-[11px] leading-relaxed text-muted-foreground">
-              {emptyHint}
+            <div className="mt-3 space-y-2 rounded-lg bg-muted/40 px-3 py-2 text-xs">
+              <div className="flex gap-2">
+                <span className="shrink-0 text-muted-foreground">
+                  {t("projectTools.sshTunnelHost")}
+                </span>
+                <span className="min-w-0 flex-1 truncate font-mono text-foreground">
+                  {prompt.host}:{prompt.port}
+                </span>
+              </div>
+              {prompt.keyType ? (
+                <div className="flex gap-2">
+                  <span className="shrink-0 text-muted-foreground">
+                    {t("projectTools.sshTunnelKeyType")}
+                  </span>
+                  <span className="min-w-0 flex-1 truncate font-mono text-foreground">
+                    {prompt.keyType}
+                  </span>
+                </div>
+              ) : null}
+              {prompt.fingerprintSha256 ? (
+                <div className="flex gap-2">
+                  <span className="shrink-0 text-muted-foreground">
+                    {t("projectTools.sshTunnelFingerprint")}
+                  </span>
+                  <span className="min-w-0 flex-1 break-all font-mono text-foreground">
+                    {prompt.fingerprintSha256}
+                  </span>
+                </div>
+              ) : null}
             </div>
-            <div className="mt-2 flex flex-wrap items-center justify-center gap-2">
+            {!hostKeyPrompt ? (
+              <input
+                value={promptAnswer}
+                onChange={(event) => setPromptAnswer(event.currentTarget.value)}
+                className="mt-3 h-10 w-full rounded-lg border border-border/70 bg-background/80 px-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground/70 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                type={prompt.answerEcho ? "text" : "password"}
+                autoFocus
+              />
+            ) : null}
+            <div className="mt-4 flex justify-end gap-2">
               <Button
                 type="button"
-                variant="default"
+                variant="ghost"
                 size="sm"
-                className="h-7 rounded-lg px-2.5 text-xs"
-                onClick={() => setView("create")}
+                className="h-8 rounded-lg px-3 text-xs"
+                onClick={handleCancelPrompt}
+                disabled={answeringPrompt}
               >
-                {t("projectTools.newSshTunnel")}
+                {hostKeyPrompt
+                  ? t("projectTools.sshTunnelRejectHost")
+                  : t("projectTools.sshTunnelPromptCancel")}
+              </Button>
+              <Button
+                type="submit"
+                size="sm"
+                className="h-8 rounded-lg px-3 text-xs"
+                disabled={promptSubmitDisabled}
+              >
+                {answeringPrompt ? <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" /> : null}
+                {hostKeyPrompt
+                  ? t("projectTools.sshTunnelTrustHost")
+                  : t("projectTools.sshTunnelPromptSubmit")}
               </Button>
-              {scope === "project" && associatedHosts.length === 0 ? (
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  className="h-7 rounded-lg bg-background/70 px-2.5 text-xs"
-                  onClick={() => setView("settings")}
-                >
-                  {t("projectTools.sshTunnelAssociateHosts")}
-                </Button>
-              ) : null}
             </div>
-          </div>
+          </form>
         </div>
-      </div>
+      ) : null}
+      {closeSessionConfirmDialog}
     </div>
   );
 }
diff --git a/crates/agent-gateway/web/src/components/project-tools/XTermViewport.tsx b/crates/agent-gateway/web/src/components/project-tools/XTermViewport.tsx
new file mode 100644
index 000000000..5cf59dd62
--- /dev/null
+++ b/crates/agent-gateway/web/src/components/project-tools/XTermViewport.tsx
@@ -0,0 +1,445 @@
+import "@xterm/xterm/css/xterm.css";
+
+import { FitAddon } from "@xterm/addon-fit";
+import { Terminal as XTerm } from "@xterm/xterm";
+import { useEffect, useRef } from "react";
+import { cn } from "@/lib/shared/utils";
+import type {
+  TerminalClient,
+  TerminalEvent,
+  TerminalSession,
+  TerminalSnapshot,
+} from "@/lib/terminal/types";
+
+type XTermViewportProps = {
+  client: TerminalClient;
+  session: TerminalSession;
+  theme: "light" | "dark";
+  isActive: boolean;
+  initialSnapshot?: TerminalSnapshot;
+  className?: string;
+  onError: (message: string | null) => void;
+  onInitialSnapshotConsumed?: (sessionId: string) => void;
+};
+
+function terminalTheme(theme: "light" | "dark") {
+  if (theme === "dark") {
+    return {
+      background: "#0b0f14",
+      foreground: "#d6deeb",
+      cursor: "#f8fafc",
+      selectionBackground: "#334155",
+      black: "#0f172a",
+      red: "#ef4444",
+      green: "#22c55e",
+      yellow: "#eab308",
+      blue: "#38bdf8",
+      magenta: "#c084fc",
+      cyan: "#2dd4bf",
+      white: "#e5e7eb",
+    };
+  }
+  return {
+    background: "#ffffff",
+    foreground: "#172033",
+    cursor: "#111827",
+    selectionBackground: "#dbeafe",
+    black: "#111827",
+    red: "#dc2626",
+    green: "#16a34a",
+    yellow: "#ca8a04",
+    blue: "#2563eb",
+    magenta: "#9333ea",
+    cyan: "#0891b2",
+    white: "#f8fafc",
+  };
+}
+
+function terminalContainerHasSize(container: HTMLElement) {
+  const rect = container.getBoundingClientRect();
+  return rect.width > 0 && rect.height > 0;
+}
+
+export function XTermViewport({
+  client,
+  session,
+  theme,
+  isActive,
+  initialSnapshot,
+  className,
+  onError,
+  onInitialSnapshotConsumed,
+}: XTermViewportProps) {
+  const containerRef = useRef<HTMLDivElement>(null);
+  const resizeTimerRef = useRef<number | null>(null);
+  const clientRef = useRef(client);
+  const sessionRef = useRef(session);
+  const themeRef = useRef(theme);
+  const onErrorRef = useRef(onError);
+  const initialSnapshotRef = useRef(initialSnapshot);
+  const onInitialSnapshotConsumedRef = useRef(onInitialSnapshotConsumed);
+  clientRef.current = client;
+  sessionRef.current = session;
+  themeRef.current = theme;
+  onErrorRef.current = onError;
+  onInitialSnapshotConsumedRef.current = onInitialSnapshotConsumed;
+
+  const termRef = useRef<XTerm | null>(null);
+  const fitAndResizeRef = useRef<(() => void) | null>(null);
+
+  useEffect(() => {
+    if (!termRef.current) return;
+    termRef.current.options.theme = terminalTheme(theme);
+  }, [theme]);
+
+  useEffect(() => {
+    if (!isActive) {
+      termRef.current?.blur();
+      return;
+    }
+    termRef.current?.focus();
+    window.setTimeout(() => {
+      fitAndResizeRef.current?.();
+    }, 0);
+  }, [isActive]);
+
+  useEffect(() => {
+    const container = containerRef.current;
+    if (!container) return;
+
+    let disposed = false;
+    let snapshotLoaded = false;
+    let loadingSnapshot = false;
+    let lastOutputOffset = 0;
+    const bufferedEvents: TerminalEvent[] = [];
+    const term = new XTerm({
+      cursorBlink: true,
+      disableStdin: !sessionRef.current.running,
+      fontFamily:
+        '"SF Mono", SFMono-Regular, Menlo, Monaco, "Cascadia Code", Consolas, "Liberation Mono", monospace',
+      fontSize: 12,
+      fontWeight: "normal",
+      fontWeightBold: "bold",
+      lineHeight: 1.1,
+      letterSpacing: 0,
+      scrollback: 5000,
+      theme: terminalTheme(themeRef.current),
+    });
+    termRef.current = term;
+    const fit = new FitAddon();
+    term.loadAddon(fit);
+    term.open(container);
+    let touchScrollActive = false;
+    let touchScrollCancelled = false;
+    let lastTouchX = 0;
+    let lastTouchY = 0;
+    let touchScrollRemainder = 0;
+
+    const focusTerminal = () => {
+      if (disposed || !sessionRef.current.running) return;
+      term.focus();
+    };
+
+    const handlePointerDown = (event: PointerEvent) => {
+      if (event.pointerType === "touch") return;
+      focusTerminal();
+    };
+
+    const fitAndResize = () => {
+      if (disposed) return;
+      if (!terminalContainerHasSize(container)) return;
+      try {
+        fit.fit();
+        const s = sessionRef.current;
+        void clientRef.current
+          .resize(s.id, term.cols, term.rows, s.projectPathKey)
+          .catch(() => undefined);
+      } catch {
+        // xterm fit can throw while the panel is hidden or measuring at zero size.
+      }
+    };
+    fitAndResizeRef.current = fitAndResize;
+
+    const resizeObserver = new ResizeObserver(() => {
+      if (resizeTimerRef.current !== null) {
+        window.clearTimeout(resizeTimerRef.current);
+      }
+      resizeTimerRef.current = window.setTimeout(fitAndResize, 40);
+    });
+    resizeObserver.observe(container);
+    window.setTimeout(fitAndResize, 0);
+
+    const dataDisposable = term.onData((data) => {
+      const s = sessionRef.current;
+      if (!s.running) return;
+      void clientRef.current.input(s.id, data, s.projectPathKey).catch((error) => {
+        onErrorRef.current(error instanceof Error ? error.message : String(error));
+      });
+    });
+
+    const getTouchScrollRowHeight = () =>
+      Math.max(8, Math.floor(container.clientHeight / Math.max(1, term.rows)));
+
+    const handleTouchStart = (event: TouchEvent) => {
+      if (event.touches.length !== 1) {
+        touchScrollCancelled = true;
+        touchScrollActive = false;
+        touchScrollRemainder = 0;
+        return;
+      }
+      const touch = event.touches[0];
+      if (!touch) return;
+      touchScrollCancelled = false;
+      touchScrollActive = false;
+      touchScrollRemainder = 0;
+      lastTouchX = touch.clientX;
+      lastTouchY = touch.clientY;
+    };
+
+    const handleTouchMove = (event: TouchEvent) => {
+      if (touchScrollCancelled || event.touches.length !== 1) return;
+      const touch = event.touches[0];
+      if (!touch) return;
+
+      const deltaX = touch.clientX - lastTouchX;
+      const deltaY = touch.clientY - lastTouchY;
+      const absX = Math.abs(deltaX);
+      const absY = Math.abs(deltaY);
+      if (!touchScrollActive) {
+        if (absX > absY && absX > 8) {
+          touchScrollCancelled = true;
+          return;
+        }
+        if (absY < 8) return;
+        touchScrollActive = true;
+      }
+
+      lastTouchX = touch.clientX;
+      lastTouchY = touch.clientY;
+      touchScrollRemainder += -deltaY;
+      const rowHeight = getTouchScrollRowHeight();
+      const rows = Math.trunc(touchScrollRemainder / rowHeight);
+      if (rows !== 0) {
+        term.scrollLines(rows);
+        touchScrollRemainder -= rows * rowHeight;
+      }
+      event.preventDefault();
+    };
+
+    const resetTouchScroll = () => {
+      touchScrollActive = false;
+      touchScrollCancelled = false;
+      touchScrollRemainder = 0;
+    };
+
+    const handleTouchEnd = () => {
+      const shouldFocus = !touchScrollActive && !touchScrollCancelled;
+      resetTouchScroll();
+      if (shouldFocus) {
+        focusTerminal();
+      }
+    };
+
+    const handleTouchCancel = () => {
+      resetTouchScroll();
+    };
+
+    container.addEventListener("pointerdown", handlePointerDown);
+    container.addEventListener("touchstart", handleTouchStart, { passive: true });
+    container.addEventListener("touchmove", handleTouchMove, { passive: false });
+    container.addEventListener("touchend", handleTouchEnd);
+    container.addEventListener("touchcancel", handleTouchCancel);
+
+    const applySnapshot = (snapshot: TerminalSnapshot) => {
+      if (snapshot.output) {
+        term.write(snapshot.output);
+      }
+      lastOutputOffset = terminalSnapshotEndOffset(snapshot);
+      snapshotLoaded = true;
+      loadingSnapshot = false;
+      term.options.disableStdin = !snapshot.session.running;
+      replayBufferedEvents();
+      window.setTimeout(fitAndResize, 0);
+    };
+
+    const replayBufferedEvents = () => {
+      const events = bufferedEvents.splice(0);
+      for (const event of events) {
+        writeTerminalEvent(
+          term,
+          event,
+          (nextOffset) => {
+            lastOutputOffset = nextOffset;
+          },
+          lastOutputOffset,
+        );
+      }
+    };
+
+    const loadSnapshot = () => {
+      if (disposed || loadingSnapshot) return;
+      const initial = initialSnapshotRef.current;
+      if (initial?.session.id === sessionRef.current.id) {
+        initialSnapshotRef.current = undefined;
+        onInitialSnapshotConsumedRef.current?.(initial.session.id);
+        applySnapshot(initial);
+        return;
+      }
+      loadingSnapshot = true;
+      const s = sessionRef.current;
+      void clientRef.current
+        .snapshot(s.id, undefined, s.projectPathKey)
+        .then((snapshot) => {
+          if (disposed) return;
+          applySnapshot(snapshot);
+        })
+        .catch((error) => {
+          loadingSnapshot = false;
+          if (!disposed) {
+            onErrorRef.current(error instanceof Error ? error.message : String(error));
+            snapshotLoaded = true;
+            replayBufferedEvents();
+          }
+        });
+    };
+
+    const unsubscribe = clientRef.current.subscribe((event) => {
+      if (disposed || event.sessionId !== session.id) return;
+      if (event.kind === "output" && event.data) {
+        if (snapshotLoaded && !loadingSnapshot) {
+          writeTerminalEvent(
+            term,
+            event,
+            (nextOffset) => {
+              lastOutputOffset = nextOffset;
+            },
+            lastOutputOffset,
+          );
+        } else {
+          bufferedEvents.push(event);
+        }
+      }
+      if (event.kind === "exit" || event.kind === "closed" || event.kind === "reconnecting") {
+        term.options.disableStdin = true;
+      }
+      if (event.kind === "reconnected") {
+        term.options.disableStdin = false;
+        window.setTimeout(fitAndResize, 0);
+      }
+    });
+
+    loadSnapshot();
+
+    return () => {
+      disposed = true;
+      termRef.current = null;
+      fitAndResizeRef.current = null;
+      unsubscribe();
+      dataDisposable.dispose();
+      resizeObserver.disconnect();
+      if (resizeTimerRef.current !== null) {
+        window.clearTimeout(resizeTimerRef.current);
+        resizeTimerRef.current = null;
+      }
+      container.removeEventListener("pointerdown", handlePointerDown);
+      container.removeEventListener("touchstart", handleTouchStart);
+      container.removeEventListener("touchmove", handleTouchMove);
+      container.removeEventListener("touchend", handleTouchEnd);
+      container.removeEventListener("touchcancel", handleTouchCancel);
+      const s = sessionRef.current;
+      void clientRef.current.detach(s.id, s.projectPathKey).catch(() => undefined);
+      term.dispose();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [session.id, session.projectPathKey]);
+
+  return (
+    <div
+      ref={containerRef}
+      className={cn(
+        "project-terminal-viewport h-full min-h-0 w-full overflow-hidden px-2 py-2",
+        className,
+      )}
+    />
+  );
+}
+
+function terminalSnapshotEndOffset(snapshot: TerminalSnapshot) {
+  if (
+    typeof snapshot.outputEndOffset === "number" &&
+    Number.isFinite(snapshot.outputEndOffset) &&
+    snapshot.outputEndOffset >= 0
+  ) {
+    return snapshot.outputEndOffset;
+  }
+  const startOffset =
+    typeof snapshot.outputStartOffset === "number" &&
+    Number.isFinite(snapshot.outputStartOffset) &&
+    snapshot.outputStartOffset >= 0
+      ? snapshot.outputStartOffset
+      : 0;
+  return startOffset + utf8ByteLength(snapshot.output);
+}
+
+function writeTerminalEvent(
+  term: XTerm,
+  event: TerminalEvent,
+  setLastOutputOffset: (offset: number) => void,
+  lastOutputOffset: number,
+): "written" | "skipped" {
+  const data = event.data ?? "";
+  if (!data) return "skipped";
+  const startOffset = event.outputStartOffset;
+  const endOffset = event.outputEndOffset;
+  if (
+    typeof startOffset === "number" &&
+    Number.isFinite(startOffset) &&
+    typeof endOffset === "number" &&
+    Number.isFinite(endOffset) &&
+    endOffset >= startOffset
+  ) {
+    if (endOffset <= lastOutputOffset) return "skipped";
+    const alreadyWritten = Math.max(0, lastOutputOffset - startOffset);
+    term.write(alreadyWritten > 0 ? sliceUtf8Bytes(data, alreadyWritten) : data);
+    setLastOutputOffset(endOffset);
+    return "written";
+  }
+  term.write(data);
+  setLastOutputOffset(lastOutputOffset + utf8ByteLength(data));
+  return "written";
+}
+
+function sliceUtf8Bytes(value: string, byteOffset: number) {
+  if (byteOffset <= 0) return value;
+  let consumed = 0;
+  let index = 0;
+  for (const segment of value) {
+    const next = consumed + utf8ByteLengthOfCodePoint(segment);
+    if (next <= byteOffset) {
+      consumed = next;
+      index += segment.length;
+      continue;
+    }
+    if (consumed < byteOffset) {
+      index += segment.length;
+    }
+    return value.slice(index);
+  }
+  return "";
+}
+
+function utf8ByteLength(value: string) {
+  let length = 0;
+  for (const segment of value) {
+    length += utf8ByteLengthOfCodePoint(segment);
+  }
+  return length;
+}
+
+function utf8ByteLengthOfCodePoint(value: string) {
+  const codePoint = value.codePointAt(0) ?? 0;
+  if (codePoint <= 0x7f) return 1;
+  if (codePoint <= 0x7ff) return 2;
+  if (codePoint <= 0xffff) return 3;
+  return 4;
+}
diff --git a/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
new file mode 100644
index 000000000..c9b67ecd4
--- /dev/null
+++ b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
@@ -0,0 +1,286 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useLocale } from "@/i18n";
+import { cn } from "@/lib/shared/utils";
+import type { TerminalClient, TerminalSession } from "@/lib/terminal/types";
+import { AlertTriangle, RefreshCw, Terminal, Wifi, WifiOff, X } from "../icons";
+import { XTermViewport } from "../project-tools/XTermViewport";
+
+export type WorkspaceSshTerminalOpenRequest = {
+  id: number;
+  sessionId: string;
+};
+
+type WorkspaceSshTerminalOverlayProps = {
+  openRequest: WorkspaceSshTerminalOpenRequest | null;
+  sessions: TerminalSession[];
+  client: TerminalClient;
+  theme: "light" | "dark";
+  isOpen: boolean;
+  onHide: () => void;
+};
+
+const SSH_TERMINAL_OVERLAY_ANIMATION_MS = 180;
+
+function sshSessionStatus(session: TerminalSession) {
+  const status = session.ssh?.status ?? (session.running ? "connected" : "disconnected");
+  if (status === "connected" && !session.running) return "disconnected";
+  return status;
+}
+
+function sshStatusLabel(session: TerminalSession, t: (key: string) => string) {
+  const status = sshSessionStatus(session);
+  if (status === "reconnecting") {
+    const attempt = Math.max(1, Number(session.ssh?.reconnectAttempt ?? 1));
+    const max = Math.max(attempt, Number(session.ssh?.reconnectMaxAttempts ?? 3));
+    return t("workspaceSshTerminal.reconnecting")
+      .replace("{attempt}", String(attempt))
+      .replace("{max}", String(max));
+  }
+  if (status === "disconnected") return t("workspaceSshTerminal.disconnected");
+  return t("workspaceSshTerminal.connected");
+}
+
+function sessionTitle(session: TerminalSession, fallback: string) {
+  return session.title || session.ssh?.hostName || fallback;
+}
+
+function sessionEndpointLabel(session: TerminalSession) {
+  const ssh = session.ssh;
+  if (!ssh) return session.cwd || session.projectPathKey;
+  const userPrefix = ssh.username.trim() ? `${ssh.username.trim()}@` : "";
+  return `${userPrefix}${ssh.host}:${ssh.port}`;
+}
+
+function statusDotClassName(session: TerminalSession) {
+  const status = sshSessionStatus(session);
+  if (status === "connected") return "bg-emerald-500";
+  if (status === "reconnecting") return "bg-amber-500";
+  return "bg-destructive";
+}
+
+function statusIcon(session: TerminalSession) {
+  const status = sshSessionStatus(session);
+  if (status === "connected") return <Wifi className="h-3.5 w-3.5 text-emerald-600" />;
+  if (status === "reconnecting") {
+    return <RefreshCw className="h-3.5 w-3.5 animate-spin text-amber-600" />;
+  }
+  return <WifiOff className="h-3.5 w-3.5 text-destructive" />;
+}
+
+export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayProps) {
+  const { openRequest, sessions, client, theme, isOpen, onHide } = props;
+  const { t } = useLocale();
+  const [isVisible, setIsVisible] = useState(isOpen);
+  const [openSessionIds, setOpenSessionIds] = useState<string[]>([]);
+  const [activeSessionId, setActiveSessionId] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const openRequestIdRef = useRef<number | null>(null);
+  const hideTimerRef = useRef<number | null>(null);
+
+  const sshSessions = useMemo(
+    () => sessions.filter((session) => session.kind === "ssh" && session.ssh),
+    [sessions],
+  );
+  const sessionsById = useMemo(
+    () => new Map(sshSessions.map((session) => [session.id, session])),
+    [sshSessions],
+  );
+  const openSessions = useMemo(
+    () =>
+      openSessionIds
+        .map((sessionId) => sessionsById.get(sessionId))
+        .filter((session): session is TerminalSession => Boolean(session)),
+    [openSessionIds, sessionsById],
+  );
+  const activeSession =
+    openSessions.find((session) => session.id === activeSessionId) ?? openSessions[0] ?? null;
+
+  const cancelPendingHide = useCallback(() => {
+    if (hideTimerRef.current === null) return;
+    window.clearTimeout(hideTimerRef.current);
+    hideTimerRef.current = null;
+  }, []);
+
+  const hideOverlay = useCallback(() => {
+    cancelPendingHide();
+    setIsVisible(false);
+    hideTimerRef.current = window.setTimeout(() => {
+      hideTimerRef.current = null;
+      onHide();
+    }, SSH_TERMINAL_OVERLAY_ANIMATION_MS);
+  }, [cancelPendingHide, onHide]);
+
+  const closeTab = useCallback((sessionId: string) => {
+    setOpenSessionIds((current) => {
+      const index = current.indexOf(sessionId);
+      if (index < 0) return current;
+      const next = current.filter((id) => id !== sessionId);
+      setActiveSessionId((currentActive) => {
+        if (currentActive !== sessionId) return currentActive;
+        return next[Math.min(index, next.length - 1)] ?? "";
+      });
+      return next;
+    });
+  }, []);
+
+  useEffect(() => {
+    if (!openRequest || openRequestIdRef.current === openRequest.id) return;
+    const session = sessionsById.get(openRequest.sessionId);
+    if (!session) return;
+    openRequestIdRef.current = openRequest.id;
+    cancelPendingHide();
+    setIsVisible(true);
+    setError(null);
+    setOpenSessionIds((current) =>
+      current.includes(session.id) ? current : [...current, session.id],
+    );
+    setActiveSessionId(session.id);
+  }, [cancelPendingHide, openRequest, sessionsById]);
+
+  useEffect(() => {
+    if (isOpen) {
+      cancelPendingHide();
+      setIsVisible(true);
+      return;
+    }
+    setIsVisible(false);
+  }, [cancelPendingHide, isOpen]);
+
+  useEffect(() => {
+    const liveIds = new Set(sshSessions.map((session) => session.id));
+    setOpenSessionIds((current) => {
+      const next = current.filter((sessionId) => liveIds.has(sessionId));
+      return next.length === current.length ? current : next;
+    });
+  }, [sshSessions]);
+
+  useEffect(() => {
+    if (activeSessionId && openSessions.some((session) => session.id === activeSessionId)) return;
+    setActiveSessionId(openSessions[0]?.id ?? "");
+  }, [activeSessionId, openSessions]);
+
+  useEffect(
+    () => () => {
+      cancelPendingHide();
+    },
+    [cancelPendingHide],
+  );
+
+  return (
+    <div
+      className={cn(
+        "workspace-ssh-terminal-overlay absolute inset-0 z-40 flex min-h-0 min-w-0 transform-gpu flex-col overflow-hidden border-r border-border bg-background transition-[opacity,transform,box-shadow] duration-200 ease-out motion-reduce:transition-none",
+        isVisible
+          ? "pointer-events-auto translate-x-0 opacity-100 shadow-2xl"
+          : "pointer-events-none -translate-x-2 opacity-0 shadow-lg",
+      )}
+    >
+      <div className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3">
+        <Terminal className="h-4 w-4 shrink-0 text-primary" />
+        <div className="min-w-0 flex-1">
+          <div className="truncate text-sm font-semibold leading-tight">
+            {t("workspaceSshTerminal.title")}
+          </div>
+          <div className="truncate font-mono text-[11px] text-muted-foreground">
+            {activeSession
+              ? sessionEndpointLabel(activeSession)
+              : t("workspaceSshTerminal.empty")}
+          </div>
+        </div>
+        {activeSession ? (
+          <div className="hidden shrink-0 items-center gap-1.5 rounded-md bg-background/70 px-2 py-1 text-[11px] text-muted-foreground sm:flex">
+            {statusIcon(activeSession)}
+            <span>{sshStatusLabel(activeSession, t)}</span>
+          </div>
+        ) : null}
+        <button
+          type="button"
+          className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border hover:bg-background hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+          title={t("workspaceSshTerminal.close")}
+          aria-label={t("workspaceSshTerminal.close")}
+          onClick={hideOverlay}
+        >
+          <X className="h-4 w-4" />
+        </button>
+      </div>
+
+      <div className="flex h-10 shrink-0 items-end gap-1 overflow-x-auto border-b border-border bg-background px-2 pt-1">
+        {openSessions.map((session) => (
+          <button
+            key={session.id}
+            type="button"
+            className={cn(
+              "group flex h-8 max-w-[14rem] shrink-0 items-center gap-1.5 rounded-t-md border border-b-0 px-2 text-xs transition-colors",
+              session.id === activeSessionId
+                ? "border-border bg-muted text-foreground"
+                : "border-transparent text-muted-foreground hover:bg-muted/60 hover:text-foreground",
+            )}
+            title={sessionEndpointLabel(session)}
+            onClick={() => setActiveSessionId(session.id)}
+          >
+            <span className={cn("h-1.5 w-1.5 shrink-0 rounded-full", statusDotClassName(session))} />
+            <Terminal className="h-3.5 w-3.5 shrink-0" />
+            <span className="min-w-0 truncate">
+              {sessionTitle(session, t("workspaceSshTerminal.title"))}
+            </span>
+            <span
+              role="button"
+              tabIndex={0}
+              className="ml-0.5 flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground/75 hover:bg-background hover:text-foreground"
+              title={t("workspaceSshTerminal.closeTab")}
+              onClick={(event) => {
+                event.stopPropagation();
+                closeTab(session.id);
+              }}
+              onKeyDown={(event) => {
+                if (event.key !== "Enter" && event.key !== " ") return;
+                event.preventDefault();
+                event.stopPropagation();
+                closeTab(session.id);
+              }}
+            >
+              <X className="h-3 w-3" />
+            </span>
+          </button>
+        ))}
+      </div>
+
+      {error ? (
+        <div className="flex shrink-0 items-center gap-2 border-b border-amber-500/20 bg-amber-500/10 px-3 py-2 text-xs text-amber-700 dark:text-amber-300">
+          <AlertTriangle className="h-4 w-4 shrink-0" />
+          <div className="min-w-0 flex-1 truncate">{error}</div>
+        </div>
+      ) : null}
+
+      <div className="relative min-h-0 flex-1 bg-background">
+        {openSessions.length > 0 ? (
+          openSessions.map((session) => {
+            const isActiveTerminal = isVisible && isOpen && activeSessionId === session.id;
+            return (
+              <div
+                key={session.id}
+                aria-hidden={!isActiveTerminal}
+                className={cn("absolute inset-0 min-h-0", isActiveTerminal ? "block" : "hidden")}
+              >
+                <XTermViewport
+                  client={client}
+                  session={session}
+                  theme={theme}
+                  isActive={isActiveTerminal}
+                  onError={setError}
+                />
+              </div>
+            );
+          })
+        ) : (
+          <div className="flex h-full flex-col items-center justify-center gap-3 p-6 text-center text-sm text-muted-foreground">
+            <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-muted/70">
+              <Terminal className="h-5 w-5" />
+            </div>
+            <div>{t("workspaceSshTerminal.empty")}</div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/crates/agent-gateway/web/src/i18n/config.ts b/crates/agent-gateway/web/src/i18n/config.ts
index 5cc986574..0564ef432 100644
--- a/crates/agent-gateway/web/src/i18n/config.ts
+++ b/crates/agent-gateway/web/src/i18n/config.ts
@@ -239,29 +239,29 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.newTunnel": "新建内网穿透",
     "projectTools.tunnelDescription": "通过 Gateway 暴露本机 HTTP 服务",
     "projectTools.sshTunnelTitle": "SSH 隧道",
-    "projectTools.newSshTunnel": "新建 SSH 隧道",
-    "projectTools.sshTunnelDescription": "查看 SSH 隧道并关联项目主机",
-    "projectTools.sshTunnelSettings": "设置 SSH 隧道",
-    "projectTools.sshTunnelBack": "返回 SSH 隧道",
+    "projectTools.newSshTunnel": "新建 SSH 连接",
+    "projectTools.sshTunnelDescription": "启动交互式 SSH 终端并关联项目主机",
+    "projectTools.sshTunnelSettings": "设置 SSH 主机",
+    "projectTools.sshTunnelBack": "返回 SSH",
     "projectTools.sshTunnelScopeGroup": "切换 SSH 隧道视角",
     "projectTools.sshTunnelScopeProject": "项目SSH",
     "projectTools.sshTunnelScopeAll": "全局SSH",
     "projectTools.sshTunnelConfiguredHosts": "已关联 {count} 台 SSH 主机",
     "projectTools.sshTunnelNoProject": "选择项目后可关联 SSH 主机",
-    "projectTools.sshTunnelProjectEmpty": "当前项目暂无启动的 SSH 隧道",
-    "projectTools.sshTunnelProjectEmptyHint": "先关联设置中已配置的 SSH 主机，后续即可从这里启动项目隧道。",
-    "projectTools.sshTunnelProjectEmptyWithHosts": "已关联的主机会保留在此项目中，启动功能将在后续接入。",
-    "projectTools.sshTunnelAllEmpty": "暂无启动的 SSH 隧道",
-    "projectTools.sshTunnelAllEmptyHint": "所有项目和全局范围内当前都没有运行中的 SSH 隧道。",
+    "projectTools.sshTunnelProjectEmpty": "当前项目暂无 SSH 连接",
+    "projectTools.sshTunnelProjectEmptyHint": "先关联设置中已配置的 SSH 主机，然后在这里启动交互式终端。",
+    "projectTools.sshTunnelProjectEmptyWithHosts": "选择已关联主机即可启动 SSH 终端。",
+    "projectTools.sshTunnelAllEmpty": "暂无 SSH 连接",
+    "projectTools.sshTunnelAllEmptyHint": "当前没有运行中的 SSH 终端。",
     "projectTools.sshTunnelAssociateHosts": "关联 SSH 主机",
     "projectTools.sshTunnelAssociateHostsHint": "从 Settings > SSH 已配置主机中选择当前项目可用的主机",
     "projectTools.sshTunnelAssociatedCount": "已关联",
     "projectTools.sshTunnelNoConfiguredHosts": "还没有配置 SSH 主机",
     "projectTools.sshTunnelNoConfiguredHostsHint": "请先到 Settings > SSH 添加或导入主机，再回到这里关联当前项目。",
-    "projectTools.sshTunnelCreateTitle": "新建 SSH 隧道",
-    "projectTools.sshTunnelCreateHint": "选择已关联主机、SFTP 和备注；实际启动功能将在后续接入。",
+    "projectTools.sshTunnelCreateTitle": "新建 SSH 连接",
+    "projectTools.sshTunnelCreateHint": "选择主机并打开交互式 SSH 终端。",
     "projectTools.sshTunnelCreateNoAssociatedHosts": "当前项目还没有关联 SSH 主机",
-    "projectTools.sshTunnelCreateNoAssociatedHostsHint": "先关联 Settings > SSH 中的主机，再从这里新建 SSH 隧道。",
+    "projectTools.sshTunnelCreateNoAssociatedHostsHint": "先关联 Settings > SSH 中的主机，再从这里新建 SSH 连接。",
     "projectTools.sshTunnelHost": "SSH 主机",
     "projectTools.sshTunnelSftpEnabled": "开启 SFTP",
     "projectTools.sshTunnelNote": "备注",
@@ -269,6 +269,35 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelCreate": "创建隧道",
     "projectTools.sshTunnelCreateCancel": "取消",
     "projectTools.sshTunnelCreateUnavailable": "当前仅提供界面，启动功能将在后续接入",
+    "projectTools.sshTunnelConnect": "连接",
+    "projectTools.sshTunnelConnecting": "连接中",
+    "projectTools.sshTunnelTabTitle": "标签标题",
+    "projectTools.sshTunnelTabTitlePlaceholder": "默认使用主机名称",
+    "projectTools.sshTunnelProxyUnsupported": "该主机配置了 proxy，V1 SSH 终端暂不支持代理连接。",
+    "projectTools.sshTunnelMissingSecret": "该主机缺少已保存的认证凭据。",
+    "projectTools.sshTunnelRunningCount": "{count} 个 SSH 连接运行中",
+    "projectTools.sshTunnelConnectionCount": "{count} 个 SSH 连接，{connected} 个已连接",
+    "projectTools.sshTunnelCloseSession": "关闭 SSH 连接",
+    "projectTools.confirmCloseSshSession": "确认断开 SSH",
+    "projectTools.closeSshSessionConfirm": "断开 SSH 连接「{title}」？",
+    "projectTools.closeSshSessionContinue": "断开连接",
+    "projectTools.closeSshSessionCancel": "取消",
+    "projectTools.closeSshSessionClose": "关闭断开确认",
+    "projectTools.sshTunnelConnected": "已连接",
+    "projectTools.sshTunnelReconnecting": "重连中 {attempt}/{max}",
+    "projectTools.sshTunnelDisconnected": "已断连",
+    "projectTools.sshTunnelLatencyUnknown": "延迟 --",
+    "projectTools.sshTunnelLatencyChecking": "检测延迟",
+    "projectTools.sshTunnelLatencyValue": "延迟 {ms}ms",
+    "projectTools.sshTunnelOpenBash": "进入 Bash 交互",
+    "projectTools.sshTunnelPromptTitle": "确认 SSH 主机密钥",
+    "projectTools.sshTunnelAuthPromptTitle": "SSH 认证",
+    "projectTools.sshTunnelTrustHost": "信任并连接",
+    "projectTools.sshTunnelRejectHost": "取消",
+    "projectTools.sshTunnelPromptCancel": "取消",
+    "projectTools.sshTunnelPromptSubmit": "继续连接",
+    "projectTools.sshTunnelFingerprint": "指纹",
+    "projectTools.sshTunnelKeyType": "密钥类型",
     "projectTools.tunnelScopeGroup": "切换内网穿透视角",
     "projectTools.tunnelScopeProject": "当前项目",
     "projectTools.tunnelScopeGlobal": "全局",
@@ -507,6 +536,14 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.fileTree.copiedPath": "已复制路径",
     "projectTools.fileTree.insertReference": "插入引用",
     "workspaceEditor.loading": "正在加载编辑器...",
+    "workspaceSshTerminal.loading": "正在加载 SSH 终端...",
+    "workspaceSshTerminal.title": "SSH 终端",
+    "workspaceSshTerminal.empty": "未打开 SSH 连接",
+    "workspaceSshTerminal.close": "关闭 SSH 终端",
+    "workspaceSshTerminal.closeTab": "关闭 SSH 标签",
+    "workspaceSshTerminal.connected": "已连接",
+    "workspaceSshTerminal.reconnecting": "重连中 {attempt}/{max}",
+    "workspaceSshTerminal.disconnected": "已断连",
     "workspaceEditor.title": "代码编辑器",
     "workspaceEditor.empty": "未打开文件",
     "workspaceEditor.emptyHint": "从右侧文件树双击可编辑文件",
@@ -903,6 +940,16 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.sshPrivateKeyPathPlaceholder": "私钥路径或文件名",
     "settings.sshPrivateKeyPlaceholder": "粘贴 OpenSSH 私钥内容...",
     "settings.sshPrivateKeyConfigured": "私钥已保存",
+    "settings.sshPrivateKeyPassphrase": "私钥口令",
+    "settings.sshPrivateKeyPassphraseConfigured": "私钥口令已保存",
+    "settings.sshKnownHostReset": "重置信任记录",
+    "settings.sshKnownHostResetTitle": "重置 SSH 信任记录",
+    "settings.sshKnownHostResetDesc":
+      "清除此主机端口已保存的 host key，下次连接会重新要求确认指纹。",
+    "settings.sshKnownHostResetConfirm": "重置",
+    "settings.sshKnownHostResetSuccess": "已清除信任记录，下次连接会重新确认 host key。",
+    "settings.sshKnownHostResetEmpty": "没有找到可清除的信任记录。",
+    "settings.sshKnownHostResetFailed": "重置信任记录失败：{error}",
     "settings.sshAdvancedSettings": "高级设置",
     "settings.sshAdvancedProxy": "代理",
     "settings.sshProxyType": "代理类型",
@@ -1052,6 +1099,9 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.remoteWebTerminal": "允许 WebUI Terminal",
     "settings.remoteWebTerminalHint":
       "由桌面端 Remote 设置控制。开启后，已登录 WebUI 可启动并控制本机项目终端。",
+    "settings.remoteWebSshTerminal": "允许 WebUI SSH Terminal",
+    "settings.remoteWebSshTerminalHint":
+      "由桌面端 Remote 设置控制。开启后，已登录 WebUI 可使用本机保存的 SSH 配置创建和控制远程交互式终端。",
     "settings.remoteWebGit": "允许 WebUI Git",
     "settings.remoteWebGitHint":
       "由桌面端 Remote 设置控制。开启后，已登录 WebUI 可对本机项目执行分支、暂存、提交和同步操作。",
@@ -1557,23 +1607,22 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.newTunnel": "New Tunnel",
     "projectTools.tunnelDescription": "Expose local HTTP services through Gateway",
     "projectTools.sshTunnelTitle": "SSH Tunnel",
-    "projectTools.newSshTunnel": "New SSH Tunnel",
-    "projectTools.sshTunnelDescription": "Review SSH tunnels and associate project hosts",
-    "projectTools.sshTunnelSettings": "SSH tunnel settings",
-    "projectTools.sshTunnelBack": "Back to SSH tunnel",
+    "projectTools.newSshTunnel": "New SSH Connection",
+    "projectTools.sshTunnelDescription": "Start interactive SSH terminals and associate project hosts",
+    "projectTools.sshTunnelSettings": "SSH host settings",
+    "projectTools.sshTunnelBack": "Back to SSH",
     "projectTools.sshTunnelScopeGroup": "Switch SSH tunnel scope",
     "projectTools.sshTunnelScopeProject": "Project SSH",
     "projectTools.sshTunnelScopeAll": "Global SSH",
     "projectTools.sshTunnelConfiguredHosts": "{count} SSH hosts associated",
     "projectTools.sshTunnelNoProject": "Select a project to associate SSH hosts",
-    "projectTools.sshTunnelProjectEmpty": "No SSH tunnels running for this project",
+    "projectTools.sshTunnelProjectEmpty": "No SSH connections for this project",
     "projectTools.sshTunnelProjectEmptyHint":
-      "Associate SSH hosts from settings first. Project tunnel startup can be wired in later.",
+      "Associate SSH hosts from settings first, then start an interactive terminal here.",
     "projectTools.sshTunnelProjectEmptyWithHosts":
-      "Associated hosts are saved for this project. Startup will be wired in later.",
-    "projectTools.sshTunnelAllEmpty": "No SSH tunnels running",
-    "projectTools.sshTunnelAllEmptyHint":
-      "There are no running SSH tunnels across projects or the global scope.",
+      "Select an associated host to start an SSH terminal.",
+    "projectTools.sshTunnelAllEmpty": "No SSH connections running",
+    "projectTools.sshTunnelAllEmptyHint": "There are no running SSH terminals.",
     "projectTools.sshTunnelAssociateHosts": "Associate SSH Hosts",
     "projectTools.sshTunnelAssociateHostsHint":
       "Choose hosts configured in Settings > SSH for the current project",
@@ -1581,12 +1630,11 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelNoConfiguredHosts": "No SSH hosts configured yet",
     "projectTools.sshTunnelNoConfiguredHostsHint":
       "Add or import hosts in Settings > SSH first, then associate them here.",
-    "projectTools.sshTunnelCreateTitle": "New SSH Tunnel",
-    "projectTools.sshTunnelCreateHint":
-      "Choose an associated host, SFTP, and note. Startup will be wired in later.",
+    "projectTools.sshTunnelCreateTitle": "New SSH Connection",
+    "projectTools.sshTunnelCreateHint": "Choose a host and open an interactive SSH terminal.",
     "projectTools.sshTunnelCreateNoAssociatedHosts": "No SSH hosts associated with this project",
     "projectTools.sshTunnelCreateNoAssociatedHostsHint":
-      "Associate hosts from Settings > SSH before creating an SSH tunnel here.",
+      "Associate hosts from Settings > SSH before creating an SSH connection here.",
     "projectTools.sshTunnelHost": "SSH host",
     "projectTools.sshTunnelSftpEnabled": "Enable SFTP",
     "projectTools.sshTunnelNote": "Note",
@@ -1594,6 +1642,36 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelCreate": "Create tunnel",
     "projectTools.sshTunnelCreateCancel": "Cancel",
     "projectTools.sshTunnelCreateUnavailable": "This is UI-only; startup will be wired in later",
+    "projectTools.sshTunnelConnect": "Connect",
+    "projectTools.sshTunnelConnecting": "Connecting",
+    "projectTools.sshTunnelTabTitle": "Tab title",
+    "projectTools.sshTunnelTabTitlePlaceholder": "Defaults to the host name",
+    "projectTools.sshTunnelProxyUnsupported":
+      "This host has a proxy configured. V1 SSH terminal does not support proxy connections.",
+    "projectTools.sshTunnelMissingSecret": "This host is missing saved authentication material.",
+    "projectTools.sshTunnelRunningCount": "{count} SSH connections running",
+    "projectTools.sshTunnelConnectionCount": "{count} SSH connections, {connected} connected",
+    "projectTools.sshTunnelCloseSession": "Close SSH connection",
+    "projectTools.confirmCloseSshSession": "Confirm SSH disconnect",
+    "projectTools.closeSshSessionConfirm": 'Disconnect SSH connection "{title}"?',
+    "projectTools.closeSshSessionContinue": "Disconnect",
+    "projectTools.closeSshSessionCancel": "Cancel",
+    "projectTools.closeSshSessionClose": "Close disconnect confirmation",
+    "projectTools.sshTunnelConnected": "Connected",
+    "projectTools.sshTunnelReconnecting": "Reconnecting {attempt}/{max}",
+    "projectTools.sshTunnelDisconnected": "Disconnected",
+    "projectTools.sshTunnelLatencyUnknown": "Latency --",
+    "projectTools.sshTunnelLatencyChecking": "Checking latency",
+    "projectTools.sshTunnelLatencyValue": "Latency {ms}ms",
+    "projectTools.sshTunnelOpenBash": "Open Bash",
+    "projectTools.sshTunnelPromptTitle": "Confirm SSH host key",
+    "projectTools.sshTunnelAuthPromptTitle": "SSH authentication",
+    "projectTools.sshTunnelTrustHost": "Trust and connect",
+    "projectTools.sshTunnelRejectHost": "Cancel",
+    "projectTools.sshTunnelPromptCancel": "Cancel",
+    "projectTools.sshTunnelPromptSubmit": "Continue",
+    "projectTools.sshTunnelFingerprint": "Fingerprint",
+    "projectTools.sshTunnelKeyType": "Key type",
     "projectTools.tunnelScopeGroup": "Switch tunnel scope",
     "projectTools.tunnelScopeProject": "Current Project",
     "projectTools.tunnelScopeGlobal": "Global",
@@ -1841,6 +1919,14 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.fileTree.copiedPath": "Copied Path",
     "projectTools.fileTree.insertReference": "Insert Reference",
     "workspaceEditor.loading": "Loading editor...",
+    "workspaceSshTerminal.loading": "Loading SSH terminal...",
+    "workspaceSshTerminal.title": "SSH Terminal",
+    "workspaceSshTerminal.empty": "No SSH connection open",
+    "workspaceSshTerminal.close": "Close SSH terminal",
+    "workspaceSshTerminal.closeTab": "Close SSH tab",
+    "workspaceSshTerminal.connected": "Connected",
+    "workspaceSshTerminal.reconnecting": "Reconnecting {attempt}/{max}",
+    "workspaceSshTerminal.disconnected": "Disconnected",
     "workspaceEditor.title": "Code Editor",
     "workspaceEditor.empty": "No file open",
     "workspaceEditor.emptyHint": "Double-click an editable file in the file tree",
@@ -2254,6 +2340,17 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.sshPrivateKeyPathPlaceholder": "Private key path or file name",
     "settings.sshPrivateKeyPlaceholder": "Paste OpenSSH private key content...",
     "settings.sshPrivateKeyConfigured": "Private key saved",
+    "settings.sshPrivateKeyPassphrase": "Private key passphrase",
+    "settings.sshPrivateKeyPassphraseConfigured": "Private key passphrase saved",
+    "settings.sshKnownHostReset": "Reset trust record",
+    "settings.sshKnownHostResetTitle": "Reset SSH trust record",
+    "settings.sshKnownHostResetDesc":
+      "Clear the saved host key for this host and port. The next connection will ask you to confirm the fingerprint again.",
+    "settings.sshKnownHostResetConfirm": "Reset",
+    "settings.sshKnownHostResetSuccess":
+      "Trust record cleared. The next connection will confirm the host key again.",
+    "settings.sshKnownHostResetEmpty": "No trust record was found for this host.",
+    "settings.sshKnownHostResetFailed": "Failed to reset trust record: {error}",
     "settings.sshAdvancedSettings": "Advanced settings",
     "settings.sshAdvancedProxy": "Proxy",
     "settings.sshProxyType": "Proxy type",
@@ -2410,6 +2507,9 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.remoteWebTerminal": "Allow WebUI Terminal",
     "settings.remoteWebTerminalHint":
       "Controlled by the desktop Remote settings. When enabled, authenticated WebUI clients can start and control local project terminals.",
+    "settings.remoteWebSshTerminal": "Allow WebUI SSH Terminal",
+    "settings.remoteWebSshTerminalHint":
+      "Controlled by the desktop Remote settings. When enabled, authenticated WebUI clients can create and control remote interactive terminals using SSH profiles saved on the desktop.",
     "settings.remoteWebGit": "Allow WebUI Git",
     "settings.remoteWebGitHint":
       "Controlled by the desktop Remote settings. When enabled, authenticated WebUI clients can run branch, stage, commit, and sync operations on local projects.",
diff --git a/crates/agent-gateway/web/src/lib/gatewaySocket.ts b/crates/agent-gateway/web/src/lib/gatewaySocket.ts
index e09449d6f..b8dee1b0a 100644
--- a/crates/agent-gateway/web/src/lib/gatewaySocket.ts
+++ b/crates/agent-gateway/web/src/lib/gatewaySocket.ts
@@ -7,6 +7,10 @@ import type {
   TerminalSession,
   TerminalShellOptions,
   TerminalSnapshot,
+  TerminalSshCreateResult,
+  TerminalSshLatency,
+  TerminalSshMetadata,
+  TerminalSshPrompt,
 } from "@/lib/terminal/types";
 
 import type {
@@ -76,6 +80,10 @@ type SkillListResponse = {
   truncated: boolean;
 };
 
+export type SshKnownHostResetResult = {
+  deleted: number;
+};
+
 type MentionListResponse = {
   entries: Array<{ path: string; kind: "file" | "dir" }>;
   truncated: boolean;
@@ -248,6 +256,24 @@ type RawTerminalSession = {
   exitCode?: number | null;
   exit_code?: number | null;
   running?: boolean;
+  kind?: string;
+  ssh?: RawTerminalSshMetadata | null;
+};
+
+type RawTerminalSshMetadata = Partial<TerminalSshMetadata> & {
+  host_id?: string;
+  host_name?: string;
+  auth_type?: string;
+  reconnect_attempt?: number;
+  reconnect_max_attempts?: number;
+};
+
+type RawTerminalSshPrompt = Partial<TerminalSshPrompt> & {
+  host_id?: string;
+  host_name?: string;
+  fingerprint_sha256?: string;
+  key_type?: string;
+  answer_echo?: boolean;
 };
 
 type RawTerminalResponse = {
@@ -265,6 +291,10 @@ type RawTerminalResponse = {
   shell_options?: Array<{ id?: string; label?: string; command?: string }>;
   defaultShell?: string;
   default_shell?: string;
+  sshPrompt?: RawTerminalSshPrompt | null;
+  ssh_prompt?: RawTerminalSshPrompt | null;
+  latencyMs?: number;
+  latency_ms?: number;
 };
 
 type RawTerminalEvent = {
@@ -479,13 +509,16 @@ function normalizePositiveInteger(value: number, fallback: number) {
 }
 
 function normalizeTerminalSession(input: RawTerminalSession): TerminalSession {
+  const kind = input.kind === "ssh" ? "ssh" : "local";
   return {
     id: input.id ?? "",
     projectPathKey: input.projectPathKey ?? input.project_path_key ?? "",
     cwd: input.cwd ?? "",
     shell: input.shell ?? "",
     title: input.title ?? "Terminal",
-    pid: input.pid ?? null,
+    kind,
+    ssh: input.ssh ? normalizeTerminalSshMetadata(input.ssh) : null,
+    pid: kind === "ssh" ? null : (input.pid ?? null),
     cols: Number(input.cols ?? 80),
     rows: Number(input.rows ?? 24),
     createdAt: Number(input.createdAt ?? input.created_at ?? 0),
@@ -496,6 +529,40 @@ function normalizeTerminalSession(input: RawTerminalSession): TerminalSession {
   };
 }
 
+function normalizeTerminalSshMetadata(input: RawTerminalSshMetadata): TerminalSshMetadata {
+  return {
+    hostId: input.hostId ?? input.host_id ?? "",
+    hostName: input.hostName ?? input.host_name ?? "",
+    username: input.username ?? "",
+    host: input.host ?? "",
+    port: Number(input.port ?? 22),
+    authType: input.authType ?? input.auth_type ?? "",
+    status: input.status ?? "connected",
+    reconnectAttempt: Number(input.reconnectAttempt ?? input.reconnect_attempt ?? 0),
+    reconnectMaxAttempts: Number(input.reconnectMaxAttempts ?? input.reconnect_max_attempts ?? 3),
+  };
+}
+
+function normalizeTerminalSshPrompt(
+  input: RawTerminalSshPrompt | null | undefined,
+): TerminalSshPrompt | undefined {
+  if (!input) return undefined;
+  const id = input.id?.trim() ?? "";
+  if (!id) return undefined;
+  return {
+    id,
+    kind: input.kind ?? "hostKey",
+    hostId: input.hostId ?? input.host_id ?? "",
+    hostName: input.hostName ?? input.host_name ?? "",
+    host: input.host ?? "",
+    port: Number(input.port ?? 22),
+    message: input.message ?? "",
+    fingerprintSha256: input.fingerprintSha256 ?? input.fingerprint_sha256 ?? undefined,
+    keyType: input.keyType ?? input.key_type ?? undefined,
+    answerEcho: input.answerEcho ?? input.answer_echo ?? false,
+  };
+}
+
 function normalizeTerminalSnapshot(input: RawTerminalResponse): TerminalSnapshot {
   if (!input.session) {
     throw new Error("Terminal response did not include a session");
@@ -513,6 +580,24 @@ function normalizeTerminalSnapshot(input: RawTerminalResponse): TerminalSnapshot
   };
 }
 
+function normalizeTerminalSshCreateResult(input: RawTerminalResponse): TerminalSshCreateResult {
+  return {
+    snapshot: input.session ? normalizeTerminalSnapshot(input) : undefined,
+    prompt: normalizeTerminalSshPrompt(input.sshPrompt ?? input.ssh_prompt),
+  };
+}
+
+function normalizeTerminalSshLatency(input: RawTerminalResponse): TerminalSshLatency {
+  const latencyMs = Number(input.latencyMs ?? input.latency_ms ?? 0);
+  if (!Number.isFinite(latencyMs) || latencyMs <= 0) {
+    throw new Error("SSH latency response did not include latency");
+  }
+  return {
+    sessionId: input.session?.id ?? "",
+    latencyMs: Math.round(latencyMs),
+  };
+}
+
 function normalizeTerminalShellOptions(input: RawTerminalResponse): TerminalShellOptions {
   const options = (input.options ?? input.shellOptions ?? input.shell_options ?? [])
     .map((option) => ({
@@ -545,6 +630,45 @@ function normalizeTerminalEvent(input: RawTerminalEvent): TerminalEvent | null {
   };
 }
 
+function applyTerminalSnapshotEvent(
+  snapshot: Map<string, TerminalSession>,
+  event: TerminalEvent,
+) {
+  if (event.kind === "output") return;
+
+  const sessionId = (event.sessionId || event.session?.id || "").trim();
+  if (event.kind === "closed") {
+    if (sessionId) {
+      snapshot.delete(sessionId);
+    }
+    return;
+  }
+
+  const session = event.session;
+  if (session?.id) {
+    snapshot.set(session.id, session);
+  }
+}
+
+function replayTerminalSnapshot(
+  snapshot: Map<string, TerminalSession>,
+  listener: TerminalListener,
+) {
+  const sessions = [...snapshot.values()].sort((a, b) => {
+    const leftProject = (a.projectPathKey || a.cwd || "").trim();
+    const rightProject = (b.projectPathKey || b.cwd || "").trim();
+    return leftProject.localeCompare(rightProject) || a.createdAt - b.createdAt;
+  });
+  for (const session of sessions) {
+    listener({
+      kind: "created",
+      sessionId: session.id,
+      projectPathKey: session.projectPathKey,
+      session,
+    });
+  }
+}
+
 function normalizeTunnelStatus(input: unknown): TunnelSummary["status"] {
   return input === "expired" || input === "offline" ? input : "active";
 }
@@ -642,6 +766,7 @@ export class GatewayWebSocketClient {
   private conversationListeners = new Set<ConversationListener>();
   private settingsListeners = new Set<SettingsListener>();
   private terminalListeners = new Set<TerminalListener>();
+  private terminalSessionSnapshot = new Map<string, TerminalSession>();
   private statusPollTimer: number | null = null;
   private lastStatus: AgentStatus | null = null;
   private lastStatusError: string | null = null;
@@ -739,6 +864,7 @@ export class GatewayWebSocketClient {
 
   subscribeTerminal(listener: TerminalListener): () => void {
     this.terminalListeners.add(listener);
+    replayTerminalSnapshot(this.terminalSessionSnapshot, listener);
     return () => {
       this.terminalListeners.delete(listener);
     };
@@ -1001,6 +1127,59 @@ export class GatewayWebSocketClient {
     );
   }
 
+  async createSshTerminal(params: {
+    cwd: string;
+    projectPathKey: string;
+    hostId: string;
+    title?: string;
+    cols?: number;
+    rows?: number;
+  }): Promise<TerminalSshCreateResult> {
+    return normalizeTerminalSshCreateResult(
+      await this.request<RawTerminalResponse>("terminal.create_ssh", {
+        cwd: params.cwd,
+        project_path_key: params.projectPathKey,
+        ssh_host_id: params.hostId,
+        title: params.title,
+        cols: params.cols,
+        rows: params.rows,
+      }),
+    );
+  }
+
+  async answerSshTerminalPrompt(params: {
+    promptId: string;
+    answer?: string;
+    trustHostKey?: boolean;
+  }): Promise<TerminalSshCreateResult> {
+    return normalizeTerminalSshCreateResult(
+      await this.request<RawTerminalResponse>("terminal.answer_ssh_prompt", {
+        prompt_id: params.promptId,
+        prompt_answer: params.answer,
+        trust_host_key: params.trustHostKey,
+      }),
+    );
+  }
+
+  async cancelSshTerminalPrompt(promptId: string): Promise<void> {
+    await this.request("terminal.cancel_ssh_prompt", {
+      prompt_id: promptId,
+    });
+  }
+
+  async sshTerminalLatency(
+    sessionId: string,
+    projectPathKey?: string,
+  ): Promise<TerminalSshLatency> {
+    const latency = normalizeTerminalSshLatency(
+      await this.request<RawTerminalResponse>("terminal.ssh_latency", {
+        session_id: sessionId,
+        project_path_key: projectPathKey,
+      }),
+    );
+    return { ...latency, sessionId };
+  }
+
   async snapshotTerminal(
     sessionId: string,
     maxBytes?: number,
@@ -1233,6 +1412,13 @@ export class GatewayWebSocketClient {
     await this.request("settings.update", payload);
   }
 
+  async resetSshKnownHost(params: { host: string; port: number }): Promise<SshKnownHostResetResult> {
+    return this.request<SshKnownHostResetResult>("settings.ssh_known_host.reset", {
+      host: params.host,
+      port: params.port,
+    });
+  }
+
   async listSkillFiles(): Promise<SkillListResponse> {
     return this.requestWithRecovery<SkillListResponse>("skills.list", {});
   }
@@ -1566,6 +1752,9 @@ export class GatewayWebSocketClient {
   private emitStatus(status: AgentStatus | null, error: string | null) {
     this.lastStatus = status;
     this.lastStatusError = error;
+    if (status?.online === false) {
+      this.terminalSessionSnapshot.clear();
+    }
     for (const listener of this.statusListeners) {
       listener(status, error);
     }
@@ -1590,6 +1779,7 @@ export class GatewayWebSocketClient {
   }
 
   private emitTerminal(event: TerminalEvent) {
+    applyTerminalSnapshotEvent(this.terminalSessionSnapshot, event);
     for (const listener of this.terminalListeners) {
       listener(event);
     }
@@ -2152,6 +2342,21 @@ export type GatewayWebSocketClientLike = {
     cols?: number;
     rows?: number;
   }): Promise<TerminalSnapshot>;
+  createSshTerminal(params: {
+    cwd: string;
+    projectPathKey: string;
+    hostId: string;
+    title?: string;
+    cols?: number;
+    rows?: number;
+  }): Promise<TerminalSshCreateResult>;
+  answerSshTerminalPrompt(params: {
+    promptId: string;
+    answer?: string;
+    trustHostKey?: boolean;
+  }): Promise<TerminalSshCreateResult>;
+  cancelSshTerminalPrompt(promptId: string): Promise<void>;
+  sshTerminalLatency(sessionId: string, projectPathKey?: string): Promise<TerminalSshLatency>;
   snapshotTerminal(
     sessionId: string,
     maxBytes?: number,
@@ -2197,6 +2402,7 @@ export type GatewayWebSocketClientLike = {
   listProviders(): Promise<GatewayProviderSummary[]>;
   getSettings(): Promise<GatewaySettingsSyncPayload>;
   updateSettings(payload: GatewaySettingsSyncPayload): Promise<void>;
+  resetSshKnownHost(params: { host: string; port: number }): Promise<SshKnownHostResetResult>;
   listSkillFiles(): Promise<SkillListResponse>;
   manageSkill<T = unknown>(payload: SkillManagePayload): Promise<T>;
   listMentionFiles(
@@ -2376,6 +2582,7 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
   private conversationListeners = new Set<ConversationListener>();
   private settingsListeners = new Set<SettingsListener>();
   private terminalListeners = new Set<TerminalListener>();
+  private terminalSessionSnapshot = new Map<string, TerminalSession>();
   private lastStatus: AgentStatus | null = null;
   private lastStatusError: string | null = null;
   private readonly workerWakeup = (event?: Event) => {
@@ -2468,6 +2675,7 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
 
   subscribeTerminal(listener: TerminalListener): () => void {
     this.terminalListeners.add(listener);
+    replayTerminalSnapshot(this.terminalSessionSnapshot, listener);
     return () => {
       this.terminalListeners.delete(listener);
     };
@@ -2674,6 +2882,59 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
     );
   }
 
+  async createSshTerminal(params: {
+    cwd: string;
+    projectPathKey: string;
+    hostId: string;
+    title?: string;
+    cols?: number;
+    rows?: number;
+  }): Promise<TerminalSshCreateResult> {
+    return normalizeTerminalSshCreateResult(
+      await this.request<RawTerminalResponse>("terminal.create_ssh", {
+        cwd: params.cwd,
+        project_path_key: params.projectPathKey,
+        ssh_host_id: params.hostId,
+        title: params.title,
+        cols: params.cols,
+        rows: params.rows,
+      }),
+    );
+  }
+
+  async answerSshTerminalPrompt(params: {
+    promptId: string;
+    answer?: string;
+    trustHostKey?: boolean;
+  }): Promise<TerminalSshCreateResult> {
+    return normalizeTerminalSshCreateResult(
+      await this.request<RawTerminalResponse>("terminal.answer_ssh_prompt", {
+        prompt_id: params.promptId,
+        prompt_answer: params.answer,
+        trust_host_key: params.trustHostKey,
+      }),
+    );
+  }
+
+  async cancelSshTerminalPrompt(promptId: string): Promise<void> {
+    await this.request("terminal.cancel_ssh_prompt", {
+      prompt_id: promptId,
+    });
+  }
+
+  async sshTerminalLatency(
+    sessionId: string,
+    projectPathKey?: string,
+  ): Promise<TerminalSshLatency> {
+    const latency = normalizeTerminalSshLatency(
+      await this.request<RawTerminalResponse>("terminal.ssh_latency", {
+        session_id: sessionId,
+        project_path_key: projectPathKey,
+      }),
+    );
+    return { ...latency, sessionId };
+  }
+
   async snapshotTerminal(
     sessionId: string,
     maxBytes?: number,
@@ -2904,6 +3165,13 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
     await this.request("settings.update", payload);
   }
 
+  async resetSshKnownHost(params: { host: string; port: number }): Promise<SshKnownHostResetResult> {
+    return this.request<SshKnownHostResetResult>("settings.ssh_known_host.reset", {
+      host: params.host,
+      port: params.port,
+    });
+  }
+
   async listSkillFiles(): Promise<SkillListResponse> {
     return this.request<SkillListResponse>("skills.list", {});
   }
@@ -3341,6 +3609,9 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
   private emitStatus(status: AgentStatus | null, error: string | null) {
     this.lastStatus = status;
     this.lastStatusError = error;
+    if (status?.online === false) {
+      this.terminalSessionSnapshot.clear();
+    }
     for (const listener of this.statusListeners) {
       listener(status, error);
     }
@@ -3365,6 +3636,7 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
   }
 
   private emitTerminal(event: TerminalEvent) {
+    applyTerminalSnapshotEvent(this.terminalSessionSnapshot, event);
     for (const listener of this.terminalListeners) {
       listener(event);
     }
diff --git a/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts b/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts
index d219eed1d..e67b93d5b 100644
--- a/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts
+++ b/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts
@@ -80,6 +80,7 @@ type ManagedClient = {
   statusError: string | null;
   idleTimer: ReturnType<typeof setTimeout> | null;
   terminalDetachTimers: Map<string, ReturnType<typeof setTimeout>>;
+  terminalSessions: Map<string, TerminalSession>;
 };
 
 type PortState = {
@@ -148,6 +149,49 @@ function shouldPostTerminalEventToPort(state: PortState, event: TerminalEvent) {
   );
 }
 
+function applyTerminalSessionEvent(
+  sessions: Map<string, TerminalSession>,
+  event: TerminalEvent,
+) {
+  if (event.kind === "output") return;
+  const sessionId = (event.sessionId || event.session?.id || "").trim();
+  if (event.kind === "closed") {
+    if (sessionId) {
+      sessions.delete(sessionId);
+    }
+    return;
+  }
+  const session = event.session;
+  if (session?.id) {
+    sessions.set(session.id, session);
+  }
+}
+
+function replayTerminalSessionsToPort(port: MessagePort, state: PortState) {
+  const sessions = [...state.client.terminalSessions.values()].sort((a, b) => {
+    const leftProject = (a.projectPathKey || a.cwd || "").trim();
+    const rightProject = (b.projectPathKey || b.cwd || "").trim();
+    return leftProject.localeCompare(rightProject) || a.createdAt - b.createdAt;
+  });
+  for (const session of sessions) {
+    const event: TerminalEvent = {
+      kind: "created",
+      sessionId: session.id,
+      projectPathKey: session.projectPathKey,
+      session,
+    };
+    if (!shouldPostTerminalEventToPort(state, event)) {
+      continue;
+    }
+    postToPort(port, {
+      type: "event",
+      event_type: "terminal",
+      payload: event,
+      connection_id: state.connectionID,
+    });
+  }
+}
+
 function terminalDetachKey(sessionID: string, projectPathKey: string) {
   if (sessionID) {
     return `session:${sessionID}`;
@@ -275,11 +319,15 @@ function getManagedClient(token: string) {
     statusError: null,
     idleTimer: null,
     terminalDetachTimers: new Map(),
+    terminalSessions: new Map(),
   };
 
   managed.client.subscribeStatus((status, error) => {
     managed.status = status;
     managed.statusError = error;
+    if (status?.online === false) {
+      managed.terminalSessions.clear();
+    }
     broadcast(managed, {
       type: "event",
       event_type: "status",
@@ -308,6 +356,7 @@ function getManagedClient(token: string) {
     });
   });
   managed.client.subscribeTerminal((event) => {
+    applyTerminalSessionEvent(managed.terminalSessions, event);
     broadcastTerminal(managed, event);
   });
 
@@ -322,14 +371,15 @@ function connectPort(
   const client = getManagedClient(message.token);
   clearManagedClientCleanup(client);
   client.ports.add(port);
-  portStates.set(port, {
+  const state: PortState = {
     connectionID: message.connection_id,
     client,
     streams: new Map(),
     terminalAllProjects: false,
     terminalProjectKeys: new Set(),
     terminalSessionIds: new Set(),
-  });
+  };
+  portStates.set(port, state);
   postToPort(port, {
     type: "ready",
     connection_id: message.connection_id,
@@ -338,6 +388,7 @@ function connectPort(
       error: client.statusError,
     },
   });
+  replayTerminalSessionsToPort(port, state);
 }
 
 function disconnectPort(port: MessagePort) {
@@ -467,6 +518,16 @@ async function resolveRequest(client: GatewayWebSocketClient, method: string, pa
     case "settings.update":
       await client.updateSettings(payload as GatewaySettingsSyncPayload);
       return undefined;
+    case "settings.ssh_known_host.reset": {
+      const body = (payload && typeof payload === "object" ? payload : {}) as Record<
+        string,
+        unknown
+      >;
+      return client.resetSshKnownHost({
+        host: String(body.host ?? ""),
+        port: typeof body.port === "number" ? body.port : Number(body.port ?? 0),
+      });
+    }
     case "skills.list":
       return client.listSkillFiles();
     case "skills.manage":
@@ -536,6 +597,29 @@ async function resolveRequest(client: GatewayWebSocketClient, method: string, pa
         cols: typeof body.cols === "number" ? body.cols : undefined,
         rows: typeof body.rows === "number" ? body.rows : undefined,
       });
+    case "terminal.create_ssh":
+      return client.createSshTerminal({
+        cwd: String(body.cwd ?? ""),
+        projectPathKey: String(body.project_path_key ?? ""),
+        hostId: String(body.ssh_host_id ?? ""),
+        title: typeof body.title === "string" ? body.title : undefined,
+        cols: typeof body.cols === "number" ? body.cols : undefined,
+        rows: typeof body.rows === "number" ? body.rows : undefined,
+      });
+    case "terminal.answer_ssh_prompt":
+      return client.answerSshTerminalPrompt({
+        promptId: String(body.prompt_id ?? ""),
+        answer: typeof body.prompt_answer === "string" ? body.prompt_answer : undefined,
+        trustHostKey: body.trust_host_key === true,
+      });
+    case "terminal.cancel_ssh_prompt":
+      await client.cancelSshTerminalPrompt(String(body.prompt_id ?? ""));
+      return { action: "cancel_ssh_prompt" };
+    case "terminal.ssh_latency":
+      return client.sshTerminalLatency(
+        String(body.session_id ?? ""),
+        String(body.project_path_key ?? ""),
+      );
     case "terminal.attach":
       return client.snapshotTerminal(
         String(body.session_id ?? ""),
diff --git a/crates/agent-gateway/web/src/lib/settings/index.ts b/crates/agent-gateway/web/src/lib/settings/index.ts
index db0acbe23..6f6f5a0be 100644
--- a/crates/agent-gateway/web/src/lib/settings/index.ts
+++ b/crates/agent-gateway/web/src/lib/settings/index.ts
@@ -266,6 +266,8 @@ export type SshHostConfig = {
   privateKey: string;
   privateKeyPath: string;
   privateKeyConfigured?: boolean;
+  privateKeyPassphrase: string;
+  privateKeyPassphraseConfigured?: boolean;
   proxy: SshProxyConfig;
 };
 
@@ -301,6 +303,7 @@ export type RemoteSettings = {
   autoReconnect: boolean;
   heartbeatInterval: number;
   enableWebTerminal: boolean;
+  enableWebSshTerminal: boolean;
   enableWebGit: boolean;
   enableWebTunnels: boolean;
 };
@@ -1098,6 +1101,7 @@ export function normalizeRemoteSettings(input: unknown): RemoteSettings {
     autoReconnect: obj.autoReconnect !== false,
     heartbeatInterval: normalizePositiveInteger(obj.heartbeatInterval, 30),
     enableWebTerminal: obj.enableWebTerminal === true,
+    enableWebSshTerminal: obj.enableWebSshTerminal === true,
     enableWebGit: obj.enableWebGit === true,
     enableWebTunnels: obj.enableWebTunnels === true,
   };
@@ -1299,6 +1303,7 @@ export function normalizeSshHostConfig(input: unknown): SshHostConfig {
   const password = normalizeOptionalText(obj.password);
   const privateKey = normalizeOptionalText(obj.privateKey);
   const privateKeyPath = normalizeOptionalText(obj.privateKeyPath);
+  const privateKeyPassphrase = normalizeOptionalText(obj.privateKeyPassphrase);
 
   return {
     id: typeof obj.id === "string" && obj.id.trim() ? obj.id.trim() : crypto.randomUUID(),
@@ -1314,6 +1319,9 @@ export function normalizeSshHostConfig(input: unknown): SshHostConfig {
     privateKeyPath,
     privateKeyConfigured:
       privateKey.length > 0 || privateKeyPath.length > 0 || obj.privateKeyConfigured === true,
+    privateKeyPassphrase,
+    privateKeyPassphraseConfigured:
+      privateKeyPassphrase.length > 0 || obj.privateKeyPassphraseConfigured === true,
     proxy: normalizeSshProxyConfig(obj.proxy),
   };
 }
@@ -1806,9 +1814,6 @@ export function normalizeCustomSettings(
   const chatSidebar = (
     obj.chatSidebar && typeof obj.chatSidebar === "object" ? obj.chatSidebar : {}
   ) as Record<string, unknown>;
-  const legacyTerminalPanel = (
-    obj.terminalPanel && typeof obj.terminalPanel === "object" ? obj.terminalPanel : {}
-  ) as Record<string, unknown>;
   const projectToolsPanel = (
     obj.projectToolsPanel && typeof obj.projectToolsPanel === "object" ? obj.projectToolsPanel : {}
   ) as Record<string, unknown>;
@@ -1846,7 +1851,7 @@ export function normalizeCustomSettings(
     },
     projectToolsPanel: {
       width: normalizeIntegerInRange(
-        obj.terminalPanelWidth ?? projectToolsPanel.width ?? legacyTerminalPanel.width,
+        projectToolsPanel.width,
         320,
         1280,
         420,
@@ -1896,6 +1901,7 @@ export function getDefaultSettings(): AppSettings {
       autoReconnect: true,
       heartbeatInterval: 30,
       enableWebTerminal: false,
+      enableWebSshTerminal: false,
       enableWebGit: false,
       enableWebTunnels: false,
     },
diff --git a/crates/agent-gateway/web/src/lib/settings/storage.ts b/crates/agent-gateway/web/src/lib/settings/storage.ts
index 37b3bfafb..eb373aa21 100644
--- a/crates/agent-gateway/web/src/lib/settings/storage.ts
+++ b/crates/agent-gateway/web/src/lib/settings/storage.ts
@@ -81,9 +81,6 @@ function readLocalUiSettings(): {
     const chatSidebar = (
       obj.chatSidebar && typeof obj.chatSidebar === "object" ? obj.chatSidebar : {}
     ) as Record<string, unknown>;
-    const legacyTerminalPanel = (
-      obj.terminalPanel && typeof obj.terminalPanel === "object" ? obj.terminalPanel : {}
-    ) as Record<string, unknown>;
     const projectToolsPanel = (
       obj.projectToolsPanel && typeof obj.projectToolsPanel === "object"
         ? obj.projectToolsPanel
@@ -92,10 +89,7 @@ function readLocalUiSettings(): {
     const projectToolsPanelWidth =
       typeof projectToolsPanel.width === "number" || typeof projectToolsPanel.width === "string"
         ? Number(projectToolsPanel.width)
-        : typeof legacyTerminalPanel.width === "number" ||
-            typeof legacyTerminalPanel.width === "string"
-          ? Number(legacyTerminalPanel.width)
-          : 420;
+        : 420;
     const projectToolsPanelActiveTab = normalizeProjectToolsPanelActiveTab(
       projectToolsPanel.activeTab,
     );
diff --git a/crates/agent-gateway/web/src/lib/settings/sync.ts b/crates/agent-gateway/web/src/lib/settings/sync.ts
index 677fa9e52..207268aba 100644
--- a/crates/agent-gateway/web/src/lib/settings/sync.ts
+++ b/crates/agent-gateway/web/src/lib/settings/sync.ts
@@ -15,6 +15,7 @@ export type GatewaySshSecretUpdates = Record<
   {
     password?: string;
     privateKey?: string;
+    privateKeyPassphrase?: string;
     proxyPassword?: string;
   }
 >;
@@ -34,7 +35,10 @@ export type GatewaySettingsSyncPayload = {
   ssh: AppSettings["ssh"];
   hooks: AppSettings["hooks"];
   cron: AppSettings["cron"];
-  remote?: Pick<AppSettings["remote"], "enableWebTerminal" | "enableWebGit" | "enableWebTunnels">;
+  remote?: Pick<
+    AppSettings["remote"],
+    "enableWebTerminal" | "enableWebSshTerminal" | "enableWebGit" | "enableWebTunnels"
+  >;
   memory: AppSettings["memory"];
   customSettings: GatewaySettingsSyncCustomSettings;
   skills: AppSettings["skills"];
@@ -98,6 +102,10 @@ function redactSshSettingsForWebStorage(ssh: AppSettings["ssh"]): AppSettings["s
         host.privateKey.trim().length > 0 ||
         host.privateKeyPath.trim().length > 0 ||
         host.privateKeyConfigured === true,
+      privateKeyPassphrase: "",
+      privateKeyPassphraseConfigured:
+        host.privateKeyPassphrase.trim().length > 0 ||
+        host.privateKeyPassphraseConfigured === true,
       proxy: {
         ...host.proxy,
         password: "",
@@ -128,10 +136,12 @@ function collectSshSecretUpdates(ssh: AppSettings["ssh"]): GatewaySshSecretUpdat
     if (!id) continue;
     const password = host.password.trim();
     const privateKey = host.privateKey.trim();
+    const privateKeyPassphrase = host.privateKeyPassphrase.trim();
     const proxyPassword = host.proxy.password.trim();
     const update: GatewaySshSecretUpdates[string] = {};
     if (password) update.password = password;
     if (privateKey) update.privateKey = privateKey;
+    if (privateKeyPassphrase) update.privateKeyPassphrase = privateKeyPassphrase;
     if (proxyPassword) update.proxyPassword = proxyPassword;
     if (Object.keys(update).length > 0) {
       updates[id] = update;
@@ -282,11 +292,16 @@ function normalizeSshSecretUpdates(value: unknown): GatewaySshSecretUpdates {
     const password = typeof updateSource.password === "string" ? updateSource.password.trim() : "";
     const privateKey =
       typeof updateSource.privateKey === "string" ? updateSource.privateKey.trim() : "";
+    const privateKeyPassphrase =
+      typeof updateSource.privateKeyPassphrase === "string"
+        ? updateSource.privateKeyPassphrase.trim()
+        : "";
     const proxyPassword =
       typeof updateSource.proxyPassword === "string" ? updateSource.proxyPassword.trim() : "";
     const update: GatewaySshSecretUpdates[string] = {};
     if (password) update.password = password;
     if (privateKey) update.privateKey = privateKey;
+    if (privateKeyPassphrase) update.privateKeyPassphrase = privateKeyPassphrase;
     if (proxyPassword) update.proxyPassword = proxyPassword;
     if (Object.keys(update).length > 0) {
       updates[normalizedId] = update;
@@ -335,6 +350,7 @@ function mergeSyncedRemoteSettings(
   const source = asObject(incoming);
   if (
     !Object.prototype.hasOwnProperty.call(source, "enableWebTerminal") &&
+    !Object.prototype.hasOwnProperty.call(source, "enableWebSshTerminal") &&
     !Object.prototype.hasOwnProperty.call(source, "enableWebGit") &&
     !Object.prototype.hasOwnProperty.call(source, "enableWebTunnels")
   ) {
@@ -345,6 +361,9 @@ function mergeSyncedRemoteSettings(
     enableWebTerminal: Object.prototype.hasOwnProperty.call(source, "enableWebTerminal")
       ? source.enableWebTerminal === true
       : current.enableWebTerminal,
+    enableWebSshTerminal: Object.prototype.hasOwnProperty.call(source, "enableWebSshTerminal")
+      ? source.enableWebSshTerminal === true
+      : current.enableWebSshTerminal,
     enableWebGit: Object.prototype.hasOwnProperty.call(source, "enableWebGit")
       ? source.enableWebGit === true
       : current.enableWebGit,
@@ -383,6 +402,10 @@ function mergeSyncedSshSettings(
       const password = (update?.password ?? host.password.trim()) || currentHost?.password || "";
       const privateKey =
         (update?.privateKey ?? host.privateKey.trim()) || currentHost?.privateKey || "";
+      const privateKeyPassphrase =
+        (update?.privateKeyPassphrase ?? host.privateKeyPassphrase.trim()) ||
+        currentHost?.privateKeyPassphrase ||
+        "";
       const proxyPassword =
         (update?.proxyPassword ?? host.proxy.password.trim()) || currentHost?.proxy.password || "";
       return {
@@ -398,6 +421,11 @@ function mergeSyncedSshSettings(
           host.privateKeyPath.trim().length > 0 ||
           host.privateKeyConfigured === true ||
           currentHost?.privateKeyConfigured === true,
+        privateKeyPassphrase,
+        privateKeyPassphraseConfigured:
+          privateKeyPassphrase.length > 0 ||
+          host.privateKeyPassphraseConfigured === true ||
+          currentHost?.privateKeyPassphraseConfigured === true,
         proxy: {
           ...host.proxy,
           password: proxyPassword,
@@ -512,6 +540,7 @@ export function buildGatewaySettingsSyncPayload(
     cron: settings.cron,
     remote: {
       enableWebTerminal: settings.remote.enableWebTerminal,
+      enableWebSshTerminal: settings.remote.enableWebSshTerminal,
       enableWebGit: settings.remote.enableWebGit,
       enableWebTunnels: settings.remote.enableWebTunnels,
     },
diff --git a/crates/agent-gateway/web/src/lib/ssh/scan.ts b/crates/agent-gateway/web/src/lib/ssh/scan.ts
index a5ca32c88..5b4d348c4 100644
--- a/crates/agent-gateway/web/src/lib/ssh/scan.ts
+++ b/crates/agent-gateway/web/src/lib/ssh/scan.ts
@@ -240,6 +240,8 @@ export async function scanSshImportCandidates(
       privateKey,
       privateKeyPath: identityPath,
       privateKeyConfigured: privateKey.length > 0 || identityPath.length > 0,
+      privateKeyPassphrase: "",
+      privateKeyPassphraseConfigured: false,
       proxy: {
         type: "socks5",
         url: "",
diff --git a/crates/agent-gateway/web/src/lib/terminal/gatewayTerminalClient.ts b/crates/agent-gateway/web/src/lib/terminal/gatewayTerminalClient.ts
index 4af30535a..cce521911 100644
--- a/crates/agent-gateway/web/src/lib/terminal/gatewayTerminalClient.ts
+++ b/crates/agent-gateway/web/src/lib/terminal/gatewayTerminalClient.ts
@@ -12,6 +12,18 @@ export function createGatewayTerminalClient(api: GatewayWebSocketClientLike): Te
     create(params) {
       return api.createTerminal(params);
     },
+    createSsh(params) {
+      return api.createSshTerminal(params);
+    },
+    answerSshPrompt(params) {
+      return api.answerSshTerminalPrompt(params);
+    },
+    async cancelSshPrompt(promptId) {
+      await api.cancelSshTerminalPrompt(promptId);
+    },
+    sshLatency(sessionId, projectPathKey) {
+      return api.sshTerminalLatency(sessionId, projectPathKey);
+    },
     snapshot(sessionId, maxBytes, projectPathKey) {
       return api.snapshotTerminal(sessionId, maxBytes, projectPathKey);
     },
diff --git a/crates/agent-gateway/web/src/lib/terminal/sessionStore.ts b/crates/agent-gateway/web/src/lib/terminal/sessionStore.ts
index 7ba0cff70..8106e5eb0 100644
--- a/crates/agent-gateway/web/src/lib/terminal/sessionStore.ts
+++ b/crates/agent-gateway/web/src/lib/terminal/sessionStore.ts
@@ -54,7 +54,7 @@ export function applyTerminalEventToSessions(
     return sortTerminalSessions(next);
   }
 
-  if (event.kind === "created") {
+  if (event.kind !== "output") {
     return sortTerminalSessions([...current, session]);
   }
 
diff --git a/crates/agent-gateway/web/src/lib/terminal/types.ts b/crates/agent-gateway/web/src/lib/terminal/types.ts
index 15ed13f63..952af2abd 100644
--- a/crates/agent-gateway/web/src/lib/terminal/types.ts
+++ b/crates/agent-gateway/web/src/lib/terminal/types.ts
@@ -4,6 +4,8 @@ export type TerminalSession = {
   cwd: string;
   shell: string;
   title: string;
+  kind: "local" | "ssh";
+  ssh?: TerminalSshMetadata | null;
   pid?: number | null;
   cols: number;
   rows: number;
@@ -14,6 +16,31 @@ export type TerminalSession = {
   running: boolean;
 };
 
+export type TerminalSshMetadata = {
+  hostId: string;
+  hostName: string;
+  username: string;
+  host: string;
+  port: number;
+  authType: string;
+  status: "connected" | "reconnecting" | "disconnected" | string;
+  reconnectAttempt: number;
+  reconnectMaxAttempts: number;
+};
+
+export type TerminalSshPrompt = {
+  id: string;
+  kind: "hostKey" | "auth" | string;
+  hostId: string;
+  hostName: string;
+  host: string;
+  port: number;
+  message: string;
+  fingerprintSha256?: string;
+  keyType?: string;
+  answerEcho?: boolean;
+};
+
 export type TerminalSnapshot = {
   session: TerminalSession;
   output: string;
@@ -22,6 +49,16 @@ export type TerminalSnapshot = {
   outputEndOffset?: number;
 };
 
+export type TerminalSshCreateResult = {
+  snapshot?: TerminalSnapshot;
+  prompt?: TerminalSshPrompt;
+};
+
+export type TerminalSshLatency = {
+  sessionId: string;
+  latencyMs: number;
+};
+
 export type TerminalShellOption = {
   id: string;
   label: string;
@@ -54,6 +91,21 @@ export type TerminalClient = {
     cols?: number;
     rows?: number;
   }): Promise<TerminalSnapshot>;
+  createSsh(params: {
+    cwd: string;
+    projectPathKey: string;
+    hostId: string;
+    title?: string;
+    cols?: number;
+    rows?: number;
+  }): Promise<TerminalSshCreateResult>;
+  answerSshPrompt(params: {
+    promptId: string;
+    answer?: string;
+    trustHostKey?: boolean;
+  }): Promise<TerminalSshCreateResult>;
+  cancelSshPrompt(promptId: string): Promise<void>;
+  sshLatency(sessionId: string, projectPathKey?: string): Promise<TerminalSshLatency>;
   snapshot(
     sessionId: string,
     maxBytes?: number,
diff --git a/crates/agent-gateway/web/src/pages/settings/RemoteSection.tsx b/crates/agent-gateway/web/src/pages/settings/RemoteSection.tsx
index a6db14325..e8debf717 100644
--- a/crates/agent-gateway/web/src/pages/settings/RemoteSection.tsx
+++ b/crates/agent-gateway/web/src/pages/settings/RemoteSection.tsx
@@ -452,6 +452,26 @@ export function RemoteSection(props: SettingsSectionProps) {
           </span>
         </div>
 
+        <div className="settings-card-row flex items-center justify-between gap-4 rounded-lg bg-muted/30 px-4 py-3">
+          <div className="min-w-0 flex-1">
+            <div className="text-sm font-medium">{t("settings.remoteWebSshTerminal")}</div>
+            <p className="mt-0.5 text-xs text-muted-foreground">
+              {t("settings.remoteWebSshTerminalHint")}
+            </p>
+          </div>
+          <span
+            className={`shrink-0 rounded-full px-2.5 py-1 text-xs font-medium ${
+              settings.remote.enableWebSshTerminal
+                ? "bg-emerald-500/10 text-emerald-600 dark:text-emerald-400"
+                : "bg-muted text-muted-foreground"
+            }`}
+          >
+            {settings.remote.enableWebSshTerminal
+              ? t("settings.cronViewStatusEnabled")
+              : t("settings.cronViewStatusDisabled")}
+          </span>
+        </div>
+
         <div className="settings-card-row flex items-center justify-between gap-4 rounded-lg bg-muted/30 px-4 py-3">
           <div className="min-w-0 flex-1">
             <div className="text-sm font-medium">{t("settings.remoteWebGit")}</div>
diff --git a/crates/agent-gateway/web/src/pages/settings/SshSection.tsx b/crates/agent-gateway/web/src/pages/settings/SshSection.tsx
index f699f18e8..29fe315c3 100644
--- a/crates/agent-gateway/web/src/pages/settings/SshSection.tsx
+++ b/crates/agent-gateway/web/src/pages/settings/SshSection.tsx
@@ -1,3 +1,4 @@
+import { invoke } from "@tauri-apps/api/core";
 import { type CSSProperties, useEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import {
@@ -12,6 +13,7 @@ import {
   Pencil,
   Plus,
   Server,
+  Shield,
   Trash2,
   Upload,
 } from "../../components/icons";
@@ -34,11 +36,20 @@ import {
   type SshScanResult,
   scanSshImportCandidates,
 } from "../../lib/ssh/scan";
-import { ConfirmDeletePopover, PromptTag } from "./shared";
+import { ConfirmActionPopover, ConfirmDeletePopover, PromptTag } from "./shared";
 import type { SettingsSectionProps } from "./types";
 
 type SshViewMode = "list" | "grid";
 type SshHostDraft = Omit<SshHostConfig, "id">;
+type SshKnownHostResetStatus = {
+  hostId: string;
+  kind: "success" | "info" | "error";
+  message: string;
+};
+
+type SshKnownHostResetResponse = {
+  deleted: number;
+};
 
 function normalizePortInput(value: string) {
   const port = Number(value);
@@ -120,6 +131,9 @@ function SshHostModal(props: {
   const [password, setPassword] = useState(initialData?.password ?? "");
   const [privateKey, setPrivateKey] = useState(initialData?.privateKey ?? "");
   const [privateKeyPath, setPrivateKeyPath] = useState(initialData?.privateKeyPath ?? "");
+  const [privateKeyPassphrase, setPrivateKeyPassphrase] = useState(
+    initialData?.privateKeyPassphrase ?? "",
+  );
   const [advancedOpen, setAdvancedOpen] = useState(false);
   const [proxyType, setProxyType] = useState<SshProxyType>(initialData?.proxy.type ?? "socks5");
   const [proxyUrl, setProxyUrl] = useState(initialData?.proxy.url ?? "");
@@ -138,7 +152,7 @@ function SshHostModal(props: {
     transform: isPasswordAuth ? "translateY(0)" : "translateY(-4px)",
   };
   const privateKeyAuthPanelStyle: CSSProperties = {
-    maxHeight: isPasswordAuth ? "0rem" : "24rem",
+    maxHeight: isPasswordAuth ? "0rem" : "29rem",
     opacity: isPasswordAuth ? 0 : 1,
     pointerEvents: isPasswordAuth ? "none" : "auto",
     transform: isPasswordAuth ? "translateY(4px)" : "translateY(0)",
@@ -164,6 +178,7 @@ function SshHostModal(props: {
     const trimmedPassword = password.trim();
     const trimmedPrivateKey = privateKey.trim();
     const trimmedPrivateKeyPath = privateKeyPath.trim();
+    const trimmedPrivateKeyPassphrase = privateKeyPassphrase.trim();
     const trimmedProxyPassword = proxyPassword.trim();
     onSave({
       name: trimmedName,
@@ -180,6 +195,10 @@ function SshHostModal(props: {
         trimmedPrivateKey.length > 0 ||
         trimmedPrivateKeyPath.length > 0 ||
         initialData?.privateKeyConfigured === true,
+      privateKeyPassphrase: trimmedPrivateKeyPassphrase,
+      privateKeyPassphraseConfigured:
+        trimmedPrivateKeyPassphrase.length > 0 ||
+        initialData?.privateKeyPassphraseConfigured === true,
       proxy: {
         type: proxyType,
         url: proxyUrl.trim(),
@@ -388,6 +407,26 @@ function SshHostModal(props: {
                     {t("settings.sshPrivateKeyConfigured")}
                   </div>
                 ) : null}
+                <div className="space-y-1.5">
+                  <Label
+                    htmlFor="ssh-private-key-passphrase"
+                    className="text-xs font-medium text-muted-foreground"
+                  >
+                    {t("settings.sshPrivateKeyPassphrase")}
+                  </Label>
+                  <SshPasswordInput
+                    id="ssh-private-key-passphrase"
+                    value={privateKeyPassphrase}
+                    disabled={isPasswordAuth}
+                    onChange={setPrivateKeyPassphrase}
+                  />
+                  {initialData?.privateKeyPassphraseConfigured &&
+                  !privateKeyPassphrase.trim() ? (
+                    <div className="text-[11px] text-muted-foreground">
+                      {t("settings.sshPrivateKeyPassphraseConfigured")}
+                    </div>
+                  ) : null}
+                </div>
               </div>
             </div>
           </div>
@@ -697,19 +736,44 @@ function SshImportModal(props: {
 function SshHostCard(props: {
   host: SshHostConfig;
   viewMode: SshViewMode;
+  resetStatus?: SshKnownHostResetStatus;
+  resettingKnownHost: boolean;
   onEdit: () => void;
   onDelete: () => void;
+  onResetKnownHost: () => void;
 }) {
-  const { host, viewMode, onEdit, onDelete } = props;
+  const { host, viewMode, resetStatus, resettingKnownHost, onEdit, onDelete, onResetKnownHost } =
+    props;
   const { t } = useLocale();
   const showKeyPath = host.authType === "privateKey" && host.privateKeyPath.trim().length > 0;
   const showKeyConfigured = host.authType === "privateKey" && host.privateKeyConfigured;
   const showProxy =
     host.proxy.url.trim().length > 0 || host.proxy.port > 0 || host.proxy.passwordConfigured;
   const hasMeta = showKeyPath || showKeyConfigured || showProxy;
+  const hasFooter = hasMeta || resetStatus;
 
   const actions = (
     <div className="settings-hover-actions flex items-center gap-0.5 opacity-0 transition-opacity focus-within:opacity-100 group-hover:opacity-100">
+      <ConfirmActionPopover
+        title={t("settings.sshKnownHostResetTitle")}
+        description={t("settings.sshKnownHostResetDesc")}
+        confirmLabel={t("settings.sshKnownHostResetConfirm")}
+        onConfirm={onResetKnownHost}
+      >
+        {(open) => (
+          <Button
+            variant="ghost"
+            size="icon"
+            className="h-7 w-7 text-muted-foreground hover:text-foreground"
+            onClick={open}
+            title={t("settings.sshKnownHostReset")}
+            aria-label={t("settings.sshKnownHostReset")}
+            disabled={resettingKnownHost}
+          >
+            <Shield className="h-3.5 w-3.5" />
+          </Button>
+        )}
+      </ConfirmActionPopover>
       <Button
         variant="ghost"
         size="icon"
@@ -743,6 +807,16 @@ function SshHostCard(props: {
     </div>
   );
 
+  const resetStatusNode = resetStatus ? (
+    <div
+      className={`text-xs leading-relaxed ${
+        resetStatus.kind === "error" ? "text-destructive" : "text-muted-foreground"
+      }`}
+    >
+      {resetStatus.message}
+    </div>
+  ) : null;
+
   if (viewMode === "grid") {
     return (
       <div className="group relative z-0 flex flex-col rounded-xl border border-border/60 bg-card p-4 transition-all duration-200 hover:z-10 hover:border-emerald-500/40 hover:shadow-md hover:shadow-emerald-500/10">
@@ -761,7 +835,12 @@ function SshHostCard(props: {
         <div className="mt-3 truncate font-mono text-xs text-muted-foreground">
           {endpointLabel(host)}
         </div>
-        {hasMeta ? <div className="mt-auto pt-3">{metaTags}</div> : null}
+        {hasFooter ? (
+          <div className="mt-auto space-y-2 pt-3">
+            {hasMeta ? metaTags : null}
+            {resetStatusNode}
+          </div>
+        ) : null}
       </div>
     );
   }
@@ -783,7 +862,12 @@ function SshHostCard(props: {
         </div>
         {actions}
       </div>
-      {hasMeta ? <div className="border-t border-border/40 px-4 py-2.5">{metaTags}</div> : null}
+      {hasFooter ? (
+        <div className="space-y-2 border-t border-border/40 px-4 py-2.5">
+          {hasMeta ? metaTags : null}
+          {resetStatusNode}
+        </div>
+      ) : null}
     </div>
   );
 }
@@ -836,8 +920,31 @@ export function SshSection(props: SettingsSectionProps) {
   const [modalOpen, setModalOpen] = useState(false);
   const [importOpen, setImportOpen] = useState(false);
   const [editingHost, setEditingHost] = useState<SshHostConfig | null>(null);
+  const [knownHostResettingId, setKnownHostResettingId] = useState<string | null>(null);
+  const [knownHostResetStatus, setKnownHostResetStatus] =
+    useState<SshKnownHostResetStatus | null>(null);
+  const knownHostResetTimerRef = useRef<number | null>(null);
   const hosts = settings.ssh.hosts;
 
+  useEffect(() => {
+    return () => {
+      if (knownHostResetTimerRef.current !== null) {
+        window.clearTimeout(knownHostResetTimerRef.current);
+      }
+    };
+  }, []);
+
+  function showKnownHostResetStatus(status: SshKnownHostResetStatus) {
+    if (knownHostResetTimerRef.current !== null) {
+      window.clearTimeout(knownHostResetTimerRef.current);
+    }
+    setKnownHostResetStatus(status);
+    knownHostResetTimerRef.current = window.setTimeout(() => {
+      setKnownHostResetStatus((current) => (current?.hostId === status.hostId ? null : current));
+      knownHostResetTimerRef.current = null;
+    }, 5000);
+  }
+
   function openAdd() {
     setEditingHost(null);
     setModalOpen(true);
@@ -864,12 +971,17 @@ export function SshSection(props: SettingsSectionProps) {
                   ...data,
                   password: data.password || host.password,
                   privateKey: data.privateKey || host.privateKey,
+                  privateKeyPassphrase:
+                    data.privateKeyPassphrase || host.privateKeyPassphrase,
                   passwordConfigured:
                     data.password.trim().length > 0 || host.passwordConfigured === true,
                   privateKeyConfigured:
                     data.privateKey.trim().length > 0 ||
                     data.privateKeyPath.trim().length > 0 ||
                     host.privateKeyConfigured === true,
+                  privateKeyPassphraseConfigured:
+                    data.privateKeyPassphrase.trim().length > 0 ||
+                    host.privateKeyPassphraseConfigured === true,
                   proxy: {
                     ...data.proxy,
                     password: data.proxy.password || host.proxy.password,
@@ -905,6 +1017,46 @@ export function SshSection(props: SettingsSectionProps) {
     );
   }
 
+  async function handleResetKnownHost(host: SshHostConfig) {
+    const targetHost = host.host.trim();
+    if (!targetHost || host.port <= 0) {
+      showKnownHostResetStatus({
+        hostId: host.id,
+        kind: "error",
+        message: t("settings.sshKnownHostResetFailed").replace(
+          "{error}",
+          t("settings.sshRequired"),
+        ),
+      });
+      return;
+    }
+
+    setKnownHostResettingId(host.id);
+    try {
+      const response = await invoke<SshKnownHostResetResponse>("settings_reset_ssh_known_host", {
+        host: targetHost,
+        port: host.port,
+      });
+      showKnownHostResetStatus({
+        hostId: host.id,
+        kind: response.deleted > 0 ? "success" : "info",
+        message:
+          response.deleted > 0
+            ? t("settings.sshKnownHostResetSuccess")
+            : t("settings.sshKnownHostResetEmpty"),
+      });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      showKnownHostResetStatus({
+        hostId: host.id,
+        kind: "error",
+        message: t("settings.sshKnownHostResetFailed").replace("{error}", message),
+      });
+    } finally {
+      setKnownHostResettingId((current) => (current === host.id ? null : current));
+    }
+  }
+
   function handleImport(candidates: SshImportCandidate[]) {
     setSettings((prev) =>
       updateSsh(prev, {
@@ -996,8 +1148,13 @@ export function SshSection(props: SettingsSectionProps) {
                 key={host.id}
                 host={host}
                 viewMode={viewMode}
+                resetStatus={
+                  knownHostResetStatus?.hostId === host.id ? knownHostResetStatus : undefined
+                }
+                resettingKnownHost={knownHostResettingId === host.id}
                 onEdit={() => openEdit(host)}
                 onDelete={() => handleDelete(host.id)}
+                onResetKnownHost={() => void handleResetKnownHost(host)}
               />
             ))}
           </div>
diff --git a/crates/agent-gateway/web/src/shims/tauriCore.ts b/crates/agent-gateway/web/src/shims/tauriCore.ts
index 10cc43dfb..edf16c790 100644
--- a/crates/agent-gateway/web/src/shims/tauriCore.ts
+++ b/crates/agent-gateway/web/src/shims/tauriCore.ts
@@ -292,6 +292,14 @@ export async function invoke<T>(command: string, args?: Record<string, unknown>)
       return (await listGatewayCronLogs(args)) as T;
     case "cron_clear_logs":
       return (await clearGatewayCronLogs(args)) as T;
+    case "settings_reset_ssh_known_host": {
+      const host = String(args?.host ?? "").trim();
+      const port = typeof args?.port === "number" ? args.port : Number(args?.port ?? 0);
+      return (await getGatewayWebSocketClient(loadToken().trim()).resetSshKnownHost({
+        host,
+        port,
+      })) as T;
+    }
     case "system_http_get_test":
       return {
         url: `${window.location.origin}/api/status`,
diff --git a/crates/agent-gateway/web/src/styles.css b/crates/agent-gateway/web/src/styles.css
index c4f6054de..12599fc4e 100644
--- a/crates/agent-gateway/web/src/styles.css
+++ b/crates/agent-gateway/web/src/styles.css
@@ -1840,7 +1840,8 @@ html[data-liveagent-webui="gateway"] .external-link-modal-overlay[data-state="cl
   }
 
   html[data-liveagent-webui="gateway"] .workspace-code-editor-overlay,
-  html[data-liveagent-webui="gateway"] .workspace-image-preview-overlay {
+  html[data-liveagent-webui="gateway"] .workspace-image-preview-overlay,
+  html[data-liveagent-webui="gateway"] .workspace-ssh-terminal-overlay {
     z-index: 60;
   }
 
diff --git a/crates/agent-gui/src-tauri/Cargo.toml b/crates/agent-gui/src-tauri/Cargo.toml
index 69cc31349..9da7754cb 100644
--- a/crates/agent-gui/src-tauri/Cargo.toml
+++ b/crates/agent-gui/src-tauri/Cargo.toml
@@ -27,7 +27,7 @@ serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 reqwest = { version = "0.13.2", features = ["blocking", "json", "stream"] }
 axum = "0.8.8"
-tokio = { version = "1.51.0", features = ["macros", "net", "sync", "time"] }
+tokio = { version = "1.51.0", features = ["macros", "net", "sync", "time", "io-util"] }
 tokio-stream = "0.1.17"
 tokio-tungstenite = "0.28.0"
 futures-util = "0.3.31"
@@ -55,6 +55,7 @@ tauri-plugin-updater = "2.10.1"
 quick-xml = "0.38.4"
 portable-pty = "0.9.0"
 wait-timeout = "0.2.1"
+russh = "0.61"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSButton", "NSControl", "NSView", "NSWindow"] }
diff --git a/crates/agent-gui/src-tauri/src/commands/settings.rs b/crates/agent-gui/src-tauri/src/commands/settings.rs
index 1ea291c2e..6e2beef0c 100644
--- a/crates/agent-gui/src-tauri/src/commands/settings.rs
+++ b/crates/agent-gui/src-tauri/src/commands/settings.rs
@@ -20,6 +20,8 @@ const SYSTEM_SETTINGS_TABLE: &str = "system_settings";
 const MCP_SETTINGS_TABLE: &str = "mcp_settings";
 const AGENT_PROMPT_TEMPLATES_TABLE: &str = "agent_prompt_templates";
 const SSH_SETTINGS_TABLE: &str = "ssh_settings";
+const SSH_PROJECT_HOST_ASSOCIATIONS_TABLE: &str = "ssh_project_host_associations";
+const SSH_KNOWN_HOSTS_TABLE: &str = "ssh_known_hosts";
 const HOOK_SETTINGS_TABLE: &str = "hook_settings";
 const CRON_SETTINGS_TABLE: &str = "cron_settings";
 const CRON_EXECUTION_LOGS_TABLE: &str = "cron_execution_logs";
@@ -96,6 +98,8 @@ const SSH_SETTINGS_SELECT_SQL: &str = "
         private_key,
         private_key_path,
         private_key_configured,
+        private_key_passphrase,
+        private_key_passphrase_configured,
         proxy_json
     FROM ssh_settings
     ORDER BY sort_index ASC, host_id ASC
@@ -114,13 +118,29 @@ const SSH_SETTINGS_INSERT_SQL: &str = "
         private_key,
         private_key_path,
         private_key_configured,
+        private_key_passphrase,
+        private_key_passphrase_configured,
         proxy_json,
         sort_index,
         updated_at
     )
-    VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15)
+    VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17)
 ";
 const SSH_SETTINGS_DELETE_SQL: &str = "DELETE FROM ssh_settings";
+const SSH_PROJECT_HOST_ASSOCIATIONS_SELECT_SQL: &str = "
+    SELECT project_path_key, host_ids_json
+    FROM ssh_project_host_associations
+    ORDER BY project_path_key ASC
+";
+const SSH_PROJECT_HOST_ASSOCIATIONS_INSERT_SQL: &str = "
+    INSERT INTO ssh_project_host_associations (project_path_key, host_ids_json, updated_at)
+    VALUES (?1, ?2, ?3)
+";
+const SSH_PROJECT_HOST_ASSOCIATIONS_DELETE_SQL: &str = "DELETE FROM ssh_project_host_associations";
+const SSH_KNOWN_HOSTS_DELETE_SQL: &str = "
+    DELETE FROM ssh_known_hosts
+    WHERE host = ?1 AND port = ?2
+";
 
 const HOOK_SETTINGS_SELECT_SQL: &str = "
     SELECT hook_id, payload_json
@@ -186,6 +206,8 @@ pub struct RemoteSettingsPayload {
     #[serde(default)]
     pub enable_web_terminal: bool,
     #[serde(default)]
+    pub enable_web_ssh_terminal: bool,
+    #[serde(default)]
     pub enable_web_git: bool,
     #[serde(default)]
     pub enable_web_tunnels: bool,
@@ -215,6 +237,7 @@ impl Default for RemoteSettingsPayload {
             auto_reconnect: default_remote_auto_reconnect(),
             heartbeat_interval: default_remote_heartbeat_interval(),
             enable_web_terminal: false,
+            enable_web_ssh_terminal: false,
             enable_web_git: false,
             enable_web_tunnels: false,
         }
@@ -238,6 +261,7 @@ pub(crate) fn normalize_remote_settings_payload(
         auto_reconnect: payload.auto_reconnect,
         heartbeat_interval: payload.heartbeat_interval.max(1),
         enable_web_terminal: payload.enable_web_terminal,
+        enable_web_ssh_terminal: payload.enable_web_ssh_terminal,
         enable_web_git: payload.enable_web_git,
         enable_web_tunnels: payload.enable_web_tunnels,
     }
@@ -283,6 +307,45 @@ pub(crate) fn parse_remote_settings_payload(value: Value) -> Result<RemoteSettin
     Ok(normalize_remote_settings_payload(parsed))
 }
 
+#[derive(Debug, Clone)]
+pub(crate) struct RuntimeSshProxyConfig {
+    pub url: String,
+    pub port: i64,
+    pub username: String,
+    pub password_configured: bool,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct RuntimeSshHostConfig {
+    pub id: String,
+    pub name: String,
+    pub host: String,
+    pub port: u16,
+    pub username: String,
+    pub auth_type: String,
+    pub password: String,
+    pub private_key: String,
+    pub private_key_path: String,
+    pub private_key_passphrase: String,
+    pub proxy: RuntimeSshProxyConfig,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) enum RuntimeSshKnownHostStatus {
+    Known,
+    Unknown,
+    Changed { stored_fingerprint: String },
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct RuntimeSshKnownHostKey {
+    pub host: String,
+    pub port: u16,
+    pub key_type: String,
+    pub key_base64: String,
+    pub fingerprint_sha256: String,
+}
+
 fn now_ms() -> i64 {
     let duration = SystemTime::now()
         .duration_since(UNIX_EPOCH)
@@ -350,10 +413,27 @@ pub(crate) fn initialize_schema(conn: &Connection) -> Result<(), String> {
             private_key TEXT NOT NULL,
             private_key_path TEXT NOT NULL,
             private_key_configured INTEGER NOT NULL DEFAULT 0,
+            private_key_passphrase TEXT NOT NULL DEFAULT '',
+            private_key_passphrase_configured INTEGER NOT NULL DEFAULT 0,
             proxy_json TEXT NOT NULL,
             sort_index INTEGER NOT NULL,
             updated_at INTEGER NOT NULL
         );
+        CREATE TABLE IF NOT EXISTS ssh_project_host_associations (
+            project_path_key TEXT PRIMARY KEY,
+            host_ids_json TEXT NOT NULL,
+            updated_at INTEGER NOT NULL
+        );
+        CREATE TABLE IF NOT EXISTS ssh_known_hosts (
+            host TEXT NOT NULL,
+            port INTEGER NOT NULL,
+            key_type TEXT NOT NULL,
+            key_base64 TEXT NOT NULL,
+            fingerprint_sha256 TEXT NOT NULL,
+            trusted_at INTEGER NOT NULL,
+            updated_at INTEGER NOT NULL,
+            PRIMARY KEY (host, port)
+        );
         CREATE TABLE IF NOT EXISTS hook_settings (
             hook_id TEXT PRIMARY KEY,
             payload_json TEXT NOT NULL,
@@ -1386,6 +1466,7 @@ pub(crate) fn load_gateway_settings_sync_snapshot(conn: &Connection) -> Result<V
         "remote".to_string(),
         json!({
             "enableWebTerminal": remote.enable_web_terminal,
+            "enableWebSshTerminal": remote.enable_web_ssh_terminal,
             "enableWebGit": remote.enable_web_git,
             "enableWebTunnels": remote.enable_web_tunnels,
         }),
@@ -1437,14 +1518,23 @@ fn redact_ssh_settings(ssh: Value) -> Result<Value, String> {
         ssh.remove("hosts").unwrap_or(Value::Array(Vec::new())),
         "ssh settings hosts",
     )?;
+    let project_host_associations = ssh
+        .remove("projectHostAssociations")
+        .unwrap_or(Value::Object(Map::new()));
     let redacted = hosts
         .into_iter()
         .map(redact_ssh_host_secret)
         .collect::<Result<Vec<_>, _>>()?;
-    Ok(Value::Object(Map::from_iter([(
-        "hosts".to_string(),
-        Value::Array(redacted),
-    )])))
+    Ok(Value::Object(Map::from_iter([
+        ("hosts".to_string(), Value::Array(redacted)),
+        (
+            "projectHostAssociations".to_string(),
+            Value::Object(normalize_ssh_project_host_associations_value(
+                project_host_associations,
+                None,
+            )?),
+        ),
+    ])))
 }
 
 fn redact_ssh_host_secret(host: Value) -> Result<Value, String> {
@@ -1464,6 +1554,14 @@ fn redact_ssh_host_secret(host: Value) -> Result<Value, String> {
         .and_then(Value::as_str)
         .is_some_and(|value| !value.trim().is_empty())
         || matches!(payload.get("privateKeyConfigured"), Some(Value::Bool(true)));
+    let private_key_passphrase_configured = match payload.remove("privateKeyPassphrase") {
+        Some(Value::String(value)) => !value.trim().is_empty(),
+        Some(Value::Null) | None => false,
+        Some(_) => return Err("ssh settings privateKeyPassphrase must be a string".to_string()),
+    } || matches!(
+        payload.get("privateKeyPassphraseConfigured"),
+        Some(Value::Bool(true))
+    );
     payload.insert(
         "passwordConfigured".to_string(),
         Value::Bool(password_configured),
@@ -1472,6 +1570,10 @@ fn redact_ssh_host_secret(host: Value) -> Result<Value, String> {
         "privateKeyConfigured".to_string(),
         Value::Bool(private_key_configured),
     );
+    payload.insert(
+        "privateKeyPassphraseConfigured".to_string(),
+        Value::Bool(private_key_passphrase_configured),
+    );
     if let Some(proxy) = payload.remove("proxy") {
         if !matches!(proxy, Value::Null) {
             payload.insert("proxy".to_string(), redact_ssh_proxy_secret(proxy)?);
@@ -1499,21 +1601,23 @@ fn redact_remote_settings(remote: Value) -> Result<Value, String> {
     let remote = expect_object(remote, "remote settings payload")?;
     let enable_web_terminal = remote
         .get("enableWebTerminal")
-        .or_else(|| remote.get("enable_web_terminal"))
         .and_then(Value::as_bool)
         .unwrap_or(false);
     let enable_web_git = remote
         .get("enableWebGit")
-        .or_else(|| remote.get("enable_web_git"))
+        .and_then(Value::as_bool)
+        .unwrap_or(false);
+    let enable_web_ssh_terminal = remote
+        .get("enableWebSshTerminal")
         .and_then(Value::as_bool)
         .unwrap_or(false);
     let enable_web_tunnels = remote
         .get("enableWebTunnels")
-        .or_else(|| remote.get("enable_web_tunnels"))
         .and_then(Value::as_bool)
         .unwrap_or(false);
     Ok(json!({
         "enableWebTerminal": enable_web_terminal,
+        "enableWebSshTerminal": enable_web_ssh_terminal,
         "enableWebGit": enable_web_git,
         "enableWebTunnels": enable_web_tunnels,
     }))
@@ -1594,10 +1698,10 @@ fn load_ssh(conn: &Connection) -> Result<Option<Value>, String> {
         .map_err(|e| format!("准备读取 {SSH_SETTINGS_TABLE} 失败：{e}"))?;
     let rows = stmt
         .query_map([], |row| {
-            let proxy_json = row.get::<_, String>(12)?;
+            let proxy_json = row.get::<_, String>(14)?;
             let proxy = parse_json(&proxy_json, SSH_SETTINGS_TABLE).map_err(|error| {
                 rusqlite::Error::FromSqlConversionFailure(
-                    12,
+                    14,
                     rusqlite::types::Type::Text,
                     Box::new(std::io::Error::new(std::io::ErrorKind::InvalidData, error)),
                 )
@@ -1642,6 +1746,14 @@ fn load_ssh(conn: &Connection) -> Result<Option<Value>, String> {
                     "privateKeyConfigured".to_string(),
                     Value::Bool(row.get::<_, i64>(11)? != 0),
                 ),
+                (
+                    "privateKeyPassphrase".to_string(),
+                    Value::String(row.get::<_, String>(12)?),
+                ),
+                (
+                    "privateKeyPassphraseConfigured".to_string(),
+                    Value::Bool(row.get::<_, i64>(13)? != 0),
+                ),
                 ("proxy".to_string(), proxy),
             ])))
         })
@@ -1652,14 +1764,249 @@ fn load_ssh(conn: &Connection) -> Result<Option<Value>, String> {
         hosts.push(row.map_err(|e| format!("读取 {SSH_SETTINGS_TABLE} 行失败：{e}"))?);
     }
 
-    if hosts.is_empty() {
-        Ok(None)
+    let project_host_associations = load_ssh_project_host_associations(conn, &hosts)?;
+    if hosts.is_empty() && project_host_associations.is_empty() {
+        return Ok(None);
+    }
+    Ok(Some(Value::Object(Map::from_iter([
+        ("hosts".to_string(), Value::Array(hosts)),
+        (
+            "projectHostAssociations".to_string(),
+            Value::Object(project_host_associations),
+        ),
+    ]))))
+}
+
+fn load_ssh_project_host_associations(
+    conn: &Connection,
+    hosts: &[Value],
+) -> Result<Map<String, Value>, String> {
+    let host_ids = hosts
+        .iter()
+        .filter_map(|host| host.get("id").and_then(Value::as_str).map(str::to_string))
+        .collect::<HashSet<_>>();
+    let mut stmt = conn
+        .prepare(SSH_PROJECT_HOST_ASSOCIATIONS_SELECT_SQL)
+        .map_err(|e| format!("准备读取 {SSH_PROJECT_HOST_ASSOCIATIONS_TABLE} 失败：{e}"))?;
+    let rows = stmt
+        .query_map([], |row| {
+            Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?))
+        })
+        .map_err(|e| format!("读取 {SSH_PROJECT_HOST_ASSOCIATIONS_TABLE} 失败：{e}"))?;
+    let mut associations = Map::new();
+    for row in rows {
+        let (project_path_key, host_ids_json) =
+            row.map_err(|e| format!("读取 {SSH_PROJECT_HOST_ASSOCIATIONS_TABLE} 行失败：{e}"))?;
+        let normalized_project_path_key = project_path_key.trim();
+        if normalized_project_path_key.is_empty() {
+            continue;
+        }
+        let parsed = parse_json(&host_ids_json, SSH_PROJECT_HOST_ASSOCIATIONS_TABLE)?;
+        let ids = expect_array(parsed, SSH_PROJECT_HOST_ASSOCIATIONS_TABLE)?
+            .into_iter()
+            .filter_map(|item| item.as_str().map(str::trim).map(str::to_string))
+            .filter(|id| !id.is_empty() && host_ids.contains(id))
+            .collect::<Vec<_>>();
+        if ids.is_empty() {
+            continue;
+        }
+        associations.insert(
+            normalized_project_path_key.to_string(),
+            Value::Array(ids.into_iter().map(Value::String).collect()),
+        );
+    }
+    Ok(associations)
+}
+
+pub(crate) fn load_runtime_ssh_host(host_id: &str) -> Result<Option<RuntimeSshHostConfig>, String> {
+    let host_id = host_id.trim();
+    if host_id.is_empty() {
+        return Ok(None);
+    }
+    let conn = open_db()?;
+    conn.query_row(
+        "
+        SELECT
+            host_id,
+            name,
+            host,
+            port,
+            username,
+            auth_type,
+            password,
+            private_key,
+            private_key_path,
+            private_key_passphrase,
+            proxy_json
+        FROM ssh_settings
+        WHERE host_id = ?1
+        ",
+        params![host_id],
+        |row| {
+            let proxy_json = row.get::<_, String>(10)?;
+            Ok((
+                row.get::<_, String>(0)?,
+                row.get::<_, String>(1)?,
+                row.get::<_, String>(2)?,
+                row.get::<_, i64>(3)?,
+                row.get::<_, String>(4)?,
+                row.get::<_, String>(5)?,
+                row.get::<_, String>(6)?,
+                row.get::<_, String>(7)?,
+                row.get::<_, String>(8)?,
+                row.get::<_, String>(9)?,
+                proxy_json,
+            ))
+        },
+    )
+    .optional()
+    .map_err(|e| format!("读取 {SSH_SETTINGS_TABLE} runtime host 失败：{e}"))?
+    .map(
+        |(
+            id,
+            name,
+            host,
+            port,
+            username,
+            auth_type,
+            password,
+            private_key,
+            private_key_path,
+            private_key_passphrase,
+            proxy_json,
+        )| {
+            let proxy_value = parse_json(&proxy_json, SSH_SETTINGS_TABLE)?;
+            let proxy = expect_object(proxy_value, "ssh runtime proxy")?;
+            let port = u16::try_from(port)
+                .ok()
+                .filter(|port| *port >= 1)
+                .ok_or_else(|| format!("{SSH_SETTINGS_TABLE}.port 无效：{port}"))?;
+            Ok(RuntimeSshHostConfig {
+                id,
+                name,
+                host,
+                port,
+                username,
+                auth_type,
+                password,
+                private_key,
+                private_key_path,
+                private_key_passphrase,
+                proxy: RuntimeSshProxyConfig {
+                    url: extract_optional_string(&proxy, "url"),
+                    port: proxy.get("port").and_then(Value::as_i64).unwrap_or(0),
+                    username: extract_optional_string(&proxy, "username"),
+                    password_configured: proxy
+                        .get("passwordConfigured")
+                        .and_then(Value::as_bool)
+                        .unwrap_or(false),
+                },
+            })
+        },
+    )
+    .transpose()
+}
+
+pub(crate) fn check_runtime_ssh_known_host(
+    key: &RuntimeSshKnownHostKey,
+) -> Result<RuntimeSshKnownHostStatus, String> {
+    let conn = open_db()?;
+    check_runtime_ssh_known_host_with_conn(&conn, key)
+}
+
+fn check_runtime_ssh_known_host_with_conn(
+    conn: &Connection,
+    key: &RuntimeSshKnownHostKey,
+) -> Result<RuntimeSshKnownHostStatus, String> {
+    let stored = conn
+        .query_row(
+            "
+            SELECT key_base64, fingerprint_sha256
+            FROM ssh_known_hosts
+            WHERE host = ?1 AND port = ?2
+            ",
+            params![key.host.trim(), i64::from(key.port)],
+            |row| Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?)),
+        )
+        .optional()
+        .map_err(|e| format!("读取 {SSH_KNOWN_HOSTS_TABLE} 失败：{e}"))?;
+    let Some((stored_key_base64, stored_fingerprint)) = stored else {
+        return Ok(RuntimeSshKnownHostStatus::Unknown);
+    };
+    if stored_key_base64 == key.key_base64 || stored_fingerprint == key.fingerprint_sha256 {
+        Ok(RuntimeSshKnownHostStatus::Known)
     } else {
-        Ok(Some(Value::Object(Map::from_iter([(
-            "hosts".to_string(),
-            Value::Array(hosts),
-        )]))))
+        Ok(RuntimeSshKnownHostStatus::Changed { stored_fingerprint })
+    }
+}
+
+pub(crate) fn trust_runtime_ssh_known_host(key: &RuntimeSshKnownHostKey) -> Result<(), String> {
+    let conn = open_db()?;
+    trust_runtime_ssh_known_host_with_conn(&conn, key)
+}
+
+fn trust_runtime_ssh_known_host_with_conn(
+    conn: &Connection,
+    key: &RuntimeSshKnownHostKey,
+) -> Result<(), String> {
+    let now = now_ms();
+    conn.execute(
+        "
+        INSERT INTO ssh_known_hosts (
+            host,
+            port,
+            key_type,
+            key_base64,
+            fingerprint_sha256,
+            trusted_at,
+            updated_at
+        )
+        VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)
+        ON CONFLICT(host, port) DO UPDATE SET
+            key_type = excluded.key_type,
+            key_base64 = excluded.key_base64,
+            fingerprint_sha256 = excluded.fingerprint_sha256,
+            updated_at = excluded.updated_at
+        ",
+        params![
+            key.host.trim(),
+            i64::from(key.port),
+            key.key_type.trim(),
+            key.key_base64.trim(),
+            key.fingerprint_sha256.trim(),
+            now,
+            now
+        ],
+    )
+    .map_err(|e| format!("写入 {SSH_KNOWN_HOSTS_TABLE} 失败：{e}"))?;
+    Ok(())
+}
+
+pub(crate) fn reset_runtime_ssh_known_host(host: &str, port: u16) -> Result<usize, String> {
+    let conn = open_db()?;
+    reset_runtime_ssh_known_host_with_conn(&conn, host, port)
+}
+
+fn reset_runtime_ssh_known_host_with_conn(
+    conn: &Connection,
+    host: &str,
+    port: u16,
+) -> Result<usize, String> {
+    let host = host.trim();
+    if host.is_empty() {
+        return Err("SSH host is required".to_string());
+    }
+    if port == 0 {
+        return Err("SSH port is required".to_string());
     }
+    conn.execute(SSH_KNOWN_HOSTS_DELETE_SQL, params![host, i64::from(port)])
+        .map_err(|e| format!("重置 {SSH_KNOWN_HOSTS_TABLE} 失败：{e}"))
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SshKnownHostResetResponse {
+    pub deleted: usize,
 }
 
 fn load_hooks(conn: &Connection) -> Result<Option<Value>, String> {
@@ -1974,12 +2321,16 @@ fn validate_and_normalize_ssh_host(
     let password = extract_optional_string(&host, "password");
     let private_key = extract_optional_string(&host, "privateKey");
     let private_key_path = extract_optional_string(&host, "privateKeyPath");
+    let private_key_passphrase = extract_optional_string(&host, "privateKeyPassphrase");
     let password_configured = extract_bool_with_default(&host, "passwordConfigured", label, false)?
         || !password.is_empty();
     let private_key_configured =
         extract_bool_with_default(&host, "privateKeyConfigured", label, false)?
             || !private_key.is_empty()
             || !private_key_path.is_empty();
+    let private_key_passphrase_configured =
+        extract_bool_with_default(&host, "privateKeyPassphraseConfigured", label, false)?
+            || !private_key_passphrase.is_empty();
     let proxy = validate_and_normalize_ssh_proxy(host.get("proxy"), label)?;
 
     let mut payload = Map::new();
@@ -2003,6 +2354,14 @@ fn validate_and_normalize_ssh_host(
         "privateKeyConfigured".to_string(),
         Value::Bool(private_key_configured),
     );
+    payload.insert(
+        "privateKeyPassphrase".to_string(),
+        Value::String(private_key_passphrase),
+    );
+    payload.insert(
+        "privateKeyPassphraseConfigured".to_string(),
+        Value::Bool(private_key_passphrase_configured),
+    );
     payload.insert("proxy".to_string(), Value::Object(proxy));
 
     Ok((host_id, payload))
@@ -2060,6 +2419,8 @@ fn insert_ssh_settings_row(
             ssh_payload_string(payload, "privateKey")?,
             ssh_payload_string(payload, "privateKeyPath")?,
             ssh_payload_bool(payload, "privateKeyConfigured")?,
+            ssh_payload_string(payload, "privateKeyPassphrase")?,
+            ssh_payload_bool(payload, "privateKeyPassphraseConfigured")?,
             ssh_payload_proxy_json(payload)?,
             sort_index,
             updated_at
@@ -2070,19 +2431,22 @@ fn insert_ssh_settings_row(
 }
 
 fn save_ssh(conn: &mut Connection, payload: Value) -> Result<(), String> {
-    let ssh = expect_object(payload, "settings_save_ssh payload")?;
+    let mut ssh = expect_object(payload, "settings_save_ssh payload")?;
     let hosts = expect_array(
-        ssh.get("hosts")
-            .cloned()
-            .unwrap_or(Value::Array(Vec::new())),
+        ssh.remove("hosts").unwrap_or(Value::Array(Vec::new())),
         "settings_save_ssh payload.hosts",
     )?;
+    let raw_project_host_associations = ssh
+        .remove("projectHostAssociations")
+        .unwrap_or(Value::Object(Map::new()));
     let updated_at = now_ms();
     let tx = conn
         .transaction()
         .map_err(|e| format!("开启 {SSH_SETTINGS_TABLE} 事务失败：{e}"))?;
     tx.execute(SSH_SETTINGS_DELETE_SQL, [])
         .map_err(|e| format!("清空 {SSH_SETTINGS_TABLE} 失败：{e}"))?;
+    tx.execute(SSH_PROJECT_HOST_ASSOCIATIONS_DELETE_SQL, [])
+        .map_err(|e| format!("清空 {SSH_PROJECT_HOST_ASSOCIATIONS_TABLE} 失败：{e}"))?;
 
     let mut seen = HashSet::new();
     for (sort_index, host) in hosts.into_iter().enumerate() {
@@ -2097,11 +2461,64 @@ fn save_ssh(conn: &mut Connection, payload: Value) -> Result<(), String> {
         insert_ssh_settings_row(&tx, &host_id, &payload, sort_index as i64, updated_at)?;
     }
 
+    let project_host_associations =
+        normalize_ssh_project_host_associations_value(raw_project_host_associations, Some(&seen))?;
+    for (project_path_key, host_ids) in project_host_associations {
+        tx.execute(
+            SSH_PROJECT_HOST_ASSOCIATIONS_INSERT_SQL,
+            params![
+                project_path_key,
+                serialize_json(&host_ids, SSH_PROJECT_HOST_ASSOCIATIONS_TABLE)?,
+                updated_at
+            ],
+        )
+        .map_err(|e| format!("写入 {SSH_PROJECT_HOST_ASSOCIATIONS_TABLE} 失败：{e}"))?;
+    }
+
     tx.commit()
         .map_err(|e| format!("提交 {SSH_SETTINGS_TABLE} 事务失败：{e}"))?;
     Ok(())
 }
 
+fn normalize_ssh_project_host_associations_value(
+    value: Value,
+    available_host_ids: Option<&HashSet<String>>,
+) -> Result<Map<String, Value>, String> {
+    let raw = match value {
+        Value::Object(map) => map,
+        Value::Null => Map::new(),
+        _ => return Err("ssh.projectHostAssociations 必须是对象".to_string()),
+    };
+    let mut normalized = Map::new();
+    for (project_path_key, host_ids) in raw {
+        let project_path_key = project_path_key.trim().to_string();
+        if project_path_key.is_empty() {
+            continue;
+        }
+        let items = expect_array(host_ids, "ssh.projectHostAssociations[]")?;
+        let mut seen = HashSet::new();
+        let mut ids = Vec::new();
+        for item in items {
+            let Some(host_id) = item.as_str().map(str::trim).filter(|id| !id.is_empty()) else {
+                continue;
+            };
+            if available_host_ids.is_some_and(|available| !available.contains(host_id)) {
+                continue;
+            }
+            if seen.insert(host_id.to_string()) {
+                ids.push(Value::String(host_id.to_string()));
+            }
+            if ids.len() >= 64 {
+                break;
+            }
+        }
+        if !ids.is_empty() {
+            normalized.insert(project_path_key, Value::Array(ids));
+        }
+    }
+    Ok(normalized)
+}
+
 fn save_hooks(conn: &mut Connection, payload: Value) -> Result<(), String> {
     let hooks = expect_array(payload, "settings_save_hooks payload")?;
     let updated_at = now_ms();
@@ -2444,6 +2861,19 @@ pub async fn settings_save_ssh(payload: Value) -> Result<(), String> {
     .map_err(|e| format!("settings_save_ssh join 失败：{e}"))?
 }
 
+#[tauri::command]
+pub async fn settings_reset_ssh_known_host(
+    host: String,
+    port: u16,
+) -> Result<SshKnownHostResetResponse, String> {
+    tauri::async_runtime::spawn_blocking(move || {
+        let deleted = reset_runtime_ssh_known_host(&host, port)?;
+        Ok(SshKnownHostResetResponse { deleted })
+    })
+    .await
+    .map_err(|e| format!("settings_reset_ssh_known_host join 失败：{e}"))?
+}
+
 #[tauri::command]
 pub async fn settings_save_hooks(payload: Value) -> Result<(), String> {
     tauri::async_runtime::spawn_blocking(move || {
@@ -2505,6 +2935,8 @@ mod tests {
             CRON_EXECUTION_LOGS_TABLE,
             REMOTE_SETTINGS_TABLE,
             MEMORY_SETTINGS_TABLE,
+            SSH_PROJECT_HOST_ASSOCIATIONS_TABLE,
+            SSH_KNOWN_HOSTS_TABLE,
         ] {
             let exists = conn
                 .query_row(
@@ -2535,6 +2967,8 @@ mod tests {
             "private_key",
             "private_key_path",
             "private_key_configured",
+            "private_key_passphrase",
+            "private_key_passphrase_configured",
             "proxy_json",
             "sort_index",
             "updated_at",
@@ -2587,6 +3021,7 @@ mod tests {
             auto_reconnect: true,
             heartbeat_interval: 30,
             enable_web_terminal: false,
+            enable_web_ssh_terminal: false,
             enable_web_git: false,
             enable_web_tunnels: false,
         });
@@ -2674,6 +3109,7 @@ mod tests {
                         "password": "ssh-password",
                         "privateKey": "-----BEGIN OPENSSH PRIVATE KEY-----\nsecret\n-----END OPENSSH PRIVATE KEY-----",
                         "privateKeyPath": "~/.ssh/id_ed25519",
+                        "privateKeyPassphrase": "key-passphrase",
                         "proxy": {
                             "type": "http",
                             "url": "http://127.0.0.1",
@@ -2691,7 +3127,12 @@ mod tests {
                         "authType": "password",
                         "passwordConfigured": true
                     }
-                ]
+                ],
+                "projectHostAssociations": {
+                    " /repo/project ": ["prod", "missing", "prod", "staging"],
+                    "empty": ["missing"],
+                    "  ": ["prod"]
+                }
             }),
         )
         .expect("save ssh settings");
@@ -2707,7 +3148,7 @@ mod tests {
         let stored = conn
             .query_row(
                 "
-                SELECT name, host, port, auth_type, private_key, proxy_json
+                SELECT name, host, port, auth_type, private_key, private_key_passphrase, proxy_json
                 FROM ssh_settings
                 WHERE host_id = 'prod'
                 ",
@@ -2720,6 +3161,7 @@ mod tests {
                         row.get::<_, String>(3)?,
                         row.get::<_, String>(4)?,
                         row.get::<_, String>(5)?,
+                        row.get::<_, String>(6)?,
                     ))
                 },
             )
@@ -2732,8 +3174,9 @@ mod tests {
             stored.4,
             "-----BEGIN OPENSSH PRIVATE KEY-----\nsecret\n-----END OPENSSH PRIVATE KEY-----"
         );
+        assert_eq!(stored.5, "key-passphrase");
         assert_eq!(
-            parse_json(&stored.5, SSH_SETTINGS_TABLE).expect("parse proxy json"),
+            parse_json(&stored.6, SSH_SETTINGS_TABLE).expect("parse proxy json"),
             json!({
                 "type": "http",
                 "url": "http://127.0.0.1",
@@ -2760,6 +3203,8 @@ mod tests {
                         "privateKey": "-----BEGIN OPENSSH PRIVATE KEY-----\nsecret\n-----END OPENSSH PRIVATE KEY-----",
                         "privateKeyPath": "~/.ssh/id_ed25519",
                         "privateKeyConfigured": true,
+                        "privateKeyPassphrase": "key-passphrase",
+                        "privateKeyPassphraseConfigured": true,
                         "proxy": {
                             "type": "http",
                             "url": "http://127.0.0.1",
@@ -2782,6 +3227,8 @@ mod tests {
                         "privateKey": "",
                         "privateKeyPath": "",
                         "privateKeyConfigured": false,
+                        "privateKeyPassphrase": "",
+                        "privateKeyPassphraseConfigured": false,
                         "proxy": {
                             "type": "socks5",
                             "url": "",
@@ -2791,7 +3238,10 @@ mod tests {
                             "passwordConfigured": false
                         }
                     }
-                ]
+                ],
+                "projectHostAssociations": {
+                    "/repo/project": ["prod", "staging"]
+                }
             }))
         );
 
@@ -2799,8 +3249,16 @@ mod tests {
             load_gateway_settings_sync_snapshot(&conn).expect("load gateway settings snapshot");
         assert_eq!(snapshot["ssh"]["hosts"][0]["password"], Value::Null);
         assert_eq!(snapshot["ssh"]["hosts"][0]["privateKey"], Value::Null);
+        assert_eq!(
+            snapshot["ssh"]["hosts"][0]["privateKeyPassphrase"],
+            Value::Null
+        );
         assert_eq!(snapshot["ssh"]["hosts"][0]["passwordConfigured"], true);
         assert_eq!(snapshot["ssh"]["hosts"][0]["privateKeyConfigured"], true);
+        assert_eq!(
+            snapshot["ssh"]["hosts"][0]["privateKeyPassphraseConfigured"],
+            true
+        );
         assert_eq!(
             snapshot["ssh"]["hosts"][0]["proxy"]["password"],
             Value::Null
@@ -2811,7 +3269,15 @@ mod tests {
         );
         assert_eq!(snapshot["ssh"]["hosts"][1]["password"], Value::Null);
         assert_eq!(snapshot["ssh"]["hosts"][1]["privateKey"], Value::Null);
+        assert_eq!(
+            snapshot["ssh"]["hosts"][1]["privateKeyPassphrase"],
+            Value::Null
+        );
         assert_eq!(snapshot["ssh"]["hosts"][1]["passwordConfigured"], true);
+        assert_eq!(
+            snapshot["ssh"]["hosts"][1]["privateKeyPassphraseConfigured"],
+            false
+        );
         assert_eq!(
             snapshot["ssh"]["hosts"][1]["proxy"]["password"],
             Value::Null
@@ -2820,6 +3286,63 @@ mod tests {
             snapshot["ssh"]["hosts"][1]["proxy"]["passwordConfigured"],
             false
         );
+        assert_eq!(
+            snapshot["ssh"]["projectHostAssociations"],
+            json!({
+                "/repo/project": ["prod", "staging"]
+            })
+        );
+    }
+
+    #[test]
+    fn ssh_known_hosts_tracks_unknown_known_and_changed_keys() {
+        let conn = open_memory_db();
+        let key = RuntimeSshKnownHostKey {
+            host: "example.com".to_string(),
+            port: 22,
+            key_type: "ssh-ed25519".to_string(),
+            key_base64: "known-key".to_string(),
+            fingerprint_sha256: "SHA256:known".to_string(),
+        };
+
+        assert_eq!(
+            check_runtime_ssh_known_host_with_conn(&conn, &key).expect("check unknown host key"),
+            RuntimeSshKnownHostStatus::Unknown
+        );
+
+        trust_runtime_ssh_known_host_with_conn(&conn, &key).expect("trust host key");
+        assert_eq!(
+            check_runtime_ssh_known_host_with_conn(&conn, &key).expect("check trusted host key"),
+            RuntimeSshKnownHostStatus::Known
+        );
+
+        let changed = RuntimeSshKnownHostKey {
+            key_base64: "changed-key".to_string(),
+            fingerprint_sha256: "SHA256:changed".to_string(),
+            ..key.clone()
+        };
+        assert_eq!(
+            check_runtime_ssh_known_host_with_conn(&conn, &changed)
+                .expect("check changed host key"),
+            RuntimeSshKnownHostStatus::Changed {
+                stored_fingerprint: "SHA256:known".to_string()
+            }
+        );
+
+        assert_eq!(
+            reset_runtime_ssh_known_host_with_conn(&conn, "example.com", 22)
+                .expect("reset host key"),
+            1
+        );
+        assert_eq!(
+            check_runtime_ssh_known_host_with_conn(&conn, &key).expect("check reset host key"),
+            RuntimeSshKnownHostStatus::Unknown
+        );
+        assert_eq!(
+            reset_runtime_ssh_known_host_with_conn(&conn, "example.com", 22)
+                .expect("reset missing host key"),
+            0
+        );
     }
 
     #[test]
@@ -3204,7 +3727,7 @@ mod tests {
     }
 
     #[test]
-    fn save_hooks_rejects_legacy_commands() {
+    fn save_hooks_rejects_unsupported_commands_field() {
         let mut conn = open_memory_db();
         let error = save_hooks(
             &mut conn,
@@ -3220,7 +3743,7 @@ mod tests {
                 }
             ]),
         )
-        .expect_err("reject legacy hook commands");
+        .expect_err("reject unsupported hook commands field");
 
         assert!(error.contains("commands"));
         let count = conn
@@ -3406,7 +3929,7 @@ mod tests {
     }
 
     #[test]
-    fn save_cron_rejects_legacy_bash_commands() {
+    fn save_cron_rejects_unsupported_bash_commands_field() {
         let mut conn = open_memory_db();
         let error = save_cron(
             &mut conn,
@@ -3422,7 +3945,7 @@ mod tests {
                 }
             ]),
         )
-        .expect_err("reject legacy bash commands");
+        .expect_err("reject unsupported bash commands field");
 
         assert!(error.contains("commands"));
         let count = conn
diff --git a/crates/agent-gui/src-tauri/src/commands/terminal.rs b/crates/agent-gui/src-tauri/src/commands/terminal.rs
index 58787997d..c7b758b50 100644
--- a/crates/agent-gui/src-tauri/src/commands/terminal.rs
+++ b/crates/agent-gui/src-tauri/src/commands/terminal.rs
@@ -5,7 +5,8 @@ use tauri::State;
 use crate::runtime::terminal::{
     terminal_shell_options as runtime_terminal_shell_options, TerminalListResponse,
     TerminalReadTailResponse, TerminalSessionRecord, TerminalSessionRegistry,
-    TerminalShellOptionsResponse, TerminalSnapshotResponse,
+    TerminalShellOptionsResponse, TerminalSnapshotResponse, TerminalSshCreateResponse,
+    TerminalSshLatencyResponse,
 };
 
 #[tauri::command(rename_all = "snake_case")]
@@ -34,6 +35,53 @@ pub fn terminal_create(
     registry.create(cwd, project_path_key, shell, title, cols, rows)
 }
 
+#[tauri::command(rename_all = "snake_case")]
+pub async fn terminal_create_ssh(
+    registry: State<'_, Arc<TerminalSessionRegistry>>,
+    cwd: String,
+    project_path_key: Option<String>,
+    ssh_host_id: String,
+    title: Option<String>,
+    cols: Option<u16>,
+    rows: Option<u16>,
+) -> Result<TerminalSshCreateResponse, String> {
+    registry
+        .inner()
+        .clone()
+        .create_ssh(cwd, project_path_key, ssh_host_id, title, cols, rows)
+        .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn terminal_answer_ssh_prompt(
+    registry: State<'_, Arc<TerminalSessionRegistry>>,
+    prompt_id: String,
+    prompt_answer: Option<String>,
+    trust_host_key: Option<bool>,
+) -> Result<TerminalSshCreateResponse, String> {
+    registry
+        .inner()
+        .clone()
+        .answer_ssh_prompt(prompt_id, prompt_answer, trust_host_key.unwrap_or(false))
+        .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub fn terminal_cancel_ssh_prompt(
+    registry: State<'_, Arc<TerminalSessionRegistry>>,
+    prompt_id: String,
+) -> Result<(), String> {
+    registry.cancel_ssh_prompt(prompt_id)
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn terminal_ssh_latency(
+    registry: State<'_, Arc<TerminalSessionRegistry>>,
+    session_id: String,
+) -> Result<TerminalSshLatencyResponse, String> {
+    registry.ssh_latency(session_id).await
+}
+
 #[tauri::command(rename_all = "snake_case")]
 pub fn terminal_snapshot(
     registry: State<'_, Arc<TerminalSessionRegistry>>,
diff --git a/crates/agent-gui/src-tauri/src/lib.rs b/crates/agent-gui/src-tauri/src/lib.rs
index 78a516e3b..cf44c8e4e 100644
--- a/crates/agent-gui/src-tauri/src/lib.rs
+++ b/crates/agent-gui/src-tauri/src/lib.rs
@@ -117,6 +117,7 @@ macro_rules! app_invoke_handler {
             commands::settings::settings_save_mcp,
             commands::settings::settings_save_agents,
             commands::settings::settings_save_ssh,
+            commands::settings::settings_reset_ssh_known_host,
             commands::settings::settings_save_hooks,
             commands::settings::settings_save_cron,
             commands::settings::settings_save_remote,
@@ -145,6 +146,10 @@ macro_rules! app_invoke_handler {
             commands::terminal::terminal_shell_options,
             commands::terminal::terminal_list,
             commands::terminal::terminal_create,
+            commands::terminal::terminal_create_ssh,
+            commands::terminal::terminal_answer_ssh_prompt,
+            commands::terminal::terminal_cancel_ssh_prompt,
+            commands::terminal::terminal_ssh_latency,
             commands::terminal::terminal_snapshot,
             commands::terminal::terminal_input,
             commands::terminal::terminal_resize,
diff --git a/crates/agent-gui/src-tauri/src/runtime/terminal.rs b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
index af52a796d..70161abbc 100644
--- a/crates/agent-gui/src-tauri/src/runtime/terminal.rs
+++ b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
@@ -1,16 +1,28 @@
+use base64::Engine;
 use portable_pty::{native_pty_system, Child, CommandBuilder, MasterPty, PtySize};
+use russh::client;
+use russh::keys::ssh_key::HashAlg;
+use russh::keys::{PrivateKeyWithHashAlg, PublicKey, PublicKeyBase64};
+use russh::ChannelMsg;
+use russh::MethodKind;
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, VecDeque};
 use std::fs;
 use std::io::{Read, Write};
 use std::path::{Path, PathBuf};
 use std::str;
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::{mpsc, Arc, Mutex};
 use std::thread;
-use std::time::{SystemTime, UNIX_EPOCH};
+use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 use tauri::{AppHandle, Emitter};
+use tokio::io::AsyncWriteExt;
+use tokio::time::timeout;
 
+use crate::commands::settings::{
+    check_runtime_ssh_known_host, load_runtime_ssh_host, trust_runtime_ssh_known_host,
+    RuntimeSshHostConfig, RuntimeSshKnownHostKey, RuntimeSshKnownHostStatus,
+};
 use crate::runtime::platform::expand_tilde_path;
 #[cfg(windows)]
 use crate::runtime::process::configure_child_process_group;
@@ -19,6 +31,16 @@ const DEFAULT_ROWS: u16 = 24;
 const DEFAULT_COLS: u16 = 80;
 const MAX_RING_CHUNKS: usize = 4096;
 const MAX_TAIL_BYTES: usize = 256 * 1024;
+const SSH_PROMPT_TIMEOUT: Duration = Duration::from_secs(120);
+const SSH_RECONNECT_MAX_ATTEMPTS: u8 = 3;
+const SSH_RECONNECT_DELAYS: [Duration; 3] = [
+    Duration::from_secs(2),
+    Duration::from_secs(5),
+    Duration::from_secs(10),
+];
+const SSH_STATUS_CONNECTED: &str = "connected";
+const SSH_STATUS_RECONNECTING: &str = "reconnecting";
+const SSH_STATUS_DISCONNECTED: &str = "disconnected";
 pub const TERMINAL_EVENT_NAME: &str = "terminal:event";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -29,6 +51,9 @@ pub struct TerminalSessionRecord {
     pub cwd: String,
     pub shell: String,
     pub title: String,
+    pub kind: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ssh: Option<TerminalSshMetadata>,
     pub pid: Option<u32>,
     pub cols: u16,
     pub rows: u16,
@@ -39,6 +64,35 @@ pub struct TerminalSessionRecord {
     pub running: bool,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TerminalSshMetadata {
+    pub host_id: String,
+    pub host_name: String,
+    pub username: String,
+    pub host: String,
+    pub port: u16,
+    pub auth_type: String,
+    pub status: String,
+    pub reconnect_attempt: u8,
+    pub reconnect_max_attempts: u8,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TerminalSshPrompt {
+    pub id: String,
+    pub kind: String,
+    pub host_id: String,
+    pub host_name: String,
+    pub host: String,
+    pub port: u16,
+    pub message: String,
+    pub fingerprint_sha256: String,
+    pub key_type: String,
+    pub answer_echo: bool,
+}
+
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TerminalListResponse {
@@ -55,6 +109,26 @@ pub struct TerminalSnapshotResponse {
     pub output_end_offset: u64,
 }
 
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TerminalSshCreateResponse {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session: Option<TerminalSessionRecord>,
+    pub output: String,
+    pub truncated: bool,
+    pub output_start_offset: u64,
+    pub output_end_offset: u64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ssh_prompt: Option<TerminalSshPrompt>,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TerminalSshLatencyResponse {
+    pub session_id: String,
+    pub latency_ms: u32,
+}
+
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TerminalShellOption {
@@ -97,13 +171,158 @@ struct TerminalSize {
 }
 
 struct TerminalSessionEntry {
-    master: Mutex<Box<dyn MasterPty + Send>>,
-    writer: Mutex<Box<dyn Write + Send>>,
-    child: Mutex<Box<dyn Child + Send + Sync>>,
+    backend: TerminalSessionBackend,
     record: Mutex<TerminalSessionRecord>,
     output: Mutex<TerminalOutputBuffer>,
 }
 
+enum TerminalSessionBackend {
+    Local {
+        master: Mutex<Box<dyn MasterPty + Send>>,
+        writer: Mutex<Box<dyn Write + Send>>,
+        child: Mutex<Box<dyn Child + Send + Sync>>,
+    },
+    Ssh {
+        runtime: Arc<SshSessionRuntime>,
+    },
+}
+
+struct SshSessionRuntime {
+    handle: tokio::sync::Mutex<Option<client::Handle<LiveAgentSshClient>>>,
+    input_tx: Mutex<Option<tokio::sync::mpsc::Sender<SshSessionInput>>>,
+    shutdown_tx: Mutex<Option<tokio::sync::mpsc::Sender<()>>>,
+    connection_id: AtomicUsize,
+    closing: AtomicBool,
+    reconnect_runner_active: AtomicBool,
+}
+
+impl SshSessionRuntime {
+    fn new() -> Self {
+        Self {
+            handle: tokio::sync::Mutex::new(None),
+            input_tx: Mutex::new(None),
+            shutdown_tx: Mutex::new(None),
+            connection_id: AtomicUsize::new(0),
+            closing: AtomicBool::new(false),
+            reconnect_runner_active: AtomicBool::new(false),
+        }
+    }
+
+    async fn install_connection(
+        &self,
+        handle: client::Handle<LiveAgentSshClient>,
+        input_tx: tokio::sync::mpsc::Sender<SshSessionInput>,
+        shutdown_tx: tokio::sync::mpsc::Sender<()>,
+    ) -> usize {
+        let connection_id = self.connection_id.fetch_add(1, Ordering::SeqCst) + 1;
+        *self.handle.lock().await = Some(handle);
+        if let Ok(mut slot) = self.input_tx.lock() {
+            *slot = Some(input_tx);
+        }
+        if let Ok(mut slot) = self.shutdown_tx.lock() {
+            *slot = Some(shutdown_tx);
+        }
+        connection_id
+    }
+
+    async fn clear_connection_if_current(&self, connection_id: usize) {
+        if self.connection_id.load(Ordering::SeqCst) != connection_id {
+            return;
+        }
+        *self.handle.lock().await = None;
+        if let Ok(mut slot) = self.input_tx.lock() {
+            *slot = None;
+        }
+        if let Ok(mut slot) = self.shutdown_tx.lock() {
+            *slot = None;
+        }
+    }
+
+    fn input_sender(&self) -> Option<tokio::sync::mpsc::Sender<SshSessionInput>> {
+        self.input_tx.lock().ok().and_then(|slot| slot.clone())
+    }
+
+    fn shutdown_sender(&self) -> Option<tokio::sync::mpsc::Sender<()>> {
+        self.shutdown_tx.lock().ok().and_then(|slot| slot.clone())
+    }
+
+    fn close(&self) -> Option<tokio::sync::mpsc::Sender<()>> {
+        self.closing.store(true, Ordering::SeqCst);
+        self.shutdown_sender()
+    }
+
+    fn is_closing(&self) -> bool {
+        self.closing.load(Ordering::SeqCst)
+    }
+
+    fn current_connection_id(&self) -> usize {
+        self.connection_id.load(Ordering::SeqCst)
+    }
+
+    fn begin_reconnect_runner(&self) -> bool {
+        !self.reconnect_runner_active.swap(true, Ordering::SeqCst)
+    }
+
+    fn finish_reconnect_runner(&self) {
+        self.reconnect_runner_active.store(false, Ordering::SeqCst);
+    }
+}
+
+enum SshSessionInput {
+    Data(Vec<u8>),
+    Resize(u32, u32),
+}
+
+#[derive(Debug, Clone)]
+struct PendingSshConnectRequest {
+    cwd: String,
+    project_path_key: String,
+    ssh_host_id: String,
+    title: Option<String>,
+    cols: Option<u16>,
+    rows: Option<u16>,
+}
+
+enum PendingSshPrompt {
+    HostKey {
+        request: PendingSshConnectRequest,
+        host_key: RuntimeSshKnownHostKey,
+    },
+    KeyboardInteractive {
+        request: PendingSshConnectRequest,
+        host_config: RuntimeSshHostConfig,
+        title: String,
+        size: TerminalSize,
+        handle: client::Handle<LiveAgentSshClient>,
+    },
+}
+
+#[derive(Debug, Clone)]
+struct KeyboardInteractivePromptData {
+    name: String,
+    instructions: String,
+    prompt: String,
+    echo: bool,
+}
+
+enum SshAuthOutcome {
+    Authenticated,
+    KeyboardInteractivePrompt(KeyboardInteractivePromptData),
+}
+
+#[derive(Debug, PartialEq, Eq)]
+enum PasswordKbiPromptAction {
+    RespondEmpty,
+    SendPassword,
+    PromptUser,
+}
+
+#[derive(Debug, Clone)]
+struct CapturedHostKey {
+    key: RuntimeSshKnownHostKey,
+    status: RuntimeSshKnownHostStatus,
+}
+
 #[derive(Debug, Clone)]
 struct TerminalOutputChunk {
     start_offset: u64,
@@ -140,6 +359,7 @@ struct TerminalOutputTail {
 #[derive(Default)]
 pub struct TerminalSessionRegistry {
     sessions: Mutex<HashMap<String, Arc<TerminalSessionEntry>>>,
+    pending_ssh_prompts: Mutex<HashMap<String, PendingSshPrompt>>,
     app_handle: Mutex<Option<AppHandle>>,
     subscribers: Arc<Mutex<HashMap<usize, mpsc::Sender<TerminalEvent>>>>,
     next_subscriber_id: AtomicUsize,
@@ -268,6 +488,8 @@ impl TerminalSessionRegistry {
             cwd: cwd.display().to_string(),
             shell: shell_spec.label,
             title,
+            kind: "local".to_string(),
+            ssh: None,
             pid,
             cols: size.cols,
             rows: size.rows,
@@ -279,9 +501,11 @@ impl TerminalSessionRegistry {
         };
 
         let entry = Arc::new(TerminalSessionEntry {
-            master: Mutex::new(pair.master),
-            writer: Mutex::new(writer),
-            child: Mutex::new(child),
+            backend: TerminalSessionBackend::Local {
+                master: Mutex::new(pair.master),
+                writer: Mutex::new(writer),
+                child: Mutex::new(child),
+            },
             record: Mutex::new(record),
             output: Mutex::new(TerminalOutputBuffer::default()),
         });
@@ -318,6 +542,589 @@ impl TerminalSessionRegistry {
         self.snapshot(id, Some(MAX_TAIL_BYTES))
     }
 
+    pub async fn create_ssh(
+        self: &Arc<Self>,
+        cwd: String,
+        project_path_key: Option<String>,
+        ssh_host_id: String,
+        title: Option<String>,
+        cols: Option<u16>,
+        rows: Option<u16>,
+    ) -> Result<TerminalSshCreateResponse, String> {
+        let cwd = canonicalize_workdir(&cwd)?;
+        let project_key = project_path_key
+            .map(|value| workspace_project_path_key(&value))
+            .filter(|value| !value.is_empty())
+            .unwrap_or_else(|| workspace_project_path_key(&cwd.display().to_string()));
+        if project_key.is_empty() {
+            return Err("project_path_key is required".to_string());
+        }
+        let request = PendingSshConnectRequest {
+            cwd: cwd.display().to_string(),
+            project_path_key: project_key,
+            ssh_host_id,
+            title,
+            cols,
+            rows,
+        };
+        self.create_ssh_from_request(request).await
+    }
+
+    pub async fn answer_ssh_prompt(
+        self: &Arc<Self>,
+        prompt_id: String,
+        answer: Option<String>,
+        trust_host_key: bool,
+    ) -> Result<TerminalSshCreateResponse, String> {
+        let prompt_id = prompt_id.trim().to_string();
+        if prompt_id.is_empty() {
+            return Err("prompt_id is required".to_string());
+        }
+        let pending = self
+            .pending_ssh_prompts
+            .lock()
+            .map_err(|_| "ssh prompt registry poisoned".to_string())?
+            .remove(&prompt_id)
+            .ok_or_else(|| format!("ssh prompt not found: {prompt_id}"))?;
+        match pending {
+            PendingSshPrompt::HostKey { request, host_key } => {
+                if !trust_host_key {
+                    return Err("SSH host key trust was cancelled".to_string());
+                }
+                trust_runtime_ssh_known_host(&host_key)?;
+                self.create_ssh_from_request(request).await
+            }
+            PendingSshPrompt::KeyboardInteractive {
+                request,
+                host_config,
+                title,
+                size,
+                mut handle,
+            } => {
+                let response = handle
+                    .authenticate_keyboard_interactive_respond(vec![answer.unwrap_or_default()])
+                    .await
+                    .map_err(|error| {
+                        format!("SSH keyboard-interactive response failed: {error}")
+                    })?;
+                self.continue_ssh_keyboard_interactive(
+                    request,
+                    host_config,
+                    title,
+                    size,
+                    handle,
+                    response,
+                    None,
+                )
+                .await
+            }
+        }
+    }
+
+    pub fn cancel_ssh_prompt(&self, prompt_id: String) -> Result<(), String> {
+        let prompt_id = prompt_id.trim().to_string();
+        if prompt_id.is_empty() {
+            return Err("prompt_id is required".to_string());
+        }
+        let pending = self
+            .pending_ssh_prompts
+            .lock()
+            .map_err(|_| "ssh prompt registry poisoned".to_string())?
+            .remove(&prompt_id);
+        if let Some(PendingSshPrompt::KeyboardInteractive { handle, .. }) = pending {
+            tokio::spawn(async move {
+                let _ = handle
+                    .disconnect(
+                        russh::Disconnect::ByApplication,
+                        "Authentication cancelled",
+                        "en",
+                    )
+                    .await;
+            });
+        }
+        Ok(())
+    }
+
+    async fn create_ssh_from_request(
+        self: &Arc<Self>,
+        request: PendingSshConnectRequest,
+    ) -> Result<TerminalSshCreateResponse, String> {
+        let host_config = load_runtime_ssh_host(&request.ssh_host_id)?
+            .ok_or_else(|| format!("SSH host not found: {}", request.ssh_host_id.trim()))?;
+        if ssh_proxy_configured(&host_config) {
+            return Err("SSH proxy is configured for this host, but V1 SSH terminal does not support proxy connections yet.".to_string());
+        }
+        if host_config.host.trim().is_empty() {
+            return Err("SSH host is required".to_string());
+        }
+        if host_config.username.trim().is_empty() {
+            return Err("SSH username is required".to_string());
+        }
+
+        let size = TerminalSize {
+            cols: request.cols.unwrap_or(DEFAULT_COLS).clamp(20, 400),
+            rows: request.rows.unwrap_or(DEFAULT_ROWS).clamp(6, 200),
+        };
+        let title = request
+            .title
+            .as_ref()
+            .map(|value| value.trim().to_string())
+            .filter(|value| !value.is_empty())
+            .unwrap_or_else(|| self.next_ssh_title(&request.project_path_key, &host_config.name));
+
+        let auth = resolve_ssh_auth_material(&host_config)?;
+        let captured_host_key = Arc::new(tokio::sync::Mutex::new(None::<CapturedHostKey>));
+        let ssh_client = LiveAgentSshClient {
+            host: host_config.host.clone(),
+            port: host_config.port,
+            captured_host_key: Arc::clone(&captured_host_key),
+        };
+        let config = Arc::new(client::Config {
+            ..Default::default()
+        });
+        let mut handle = match client::connect(
+            config,
+            (host_config.host.as_str(), host_config.port),
+            ssh_client,
+        )
+        .await
+        {
+            Ok(handle) => handle,
+            Err(error) => {
+                if let Some(captured) = captured_host_key.lock().await.clone() {
+                    return self.ssh_host_key_response(request, &host_config, captured);
+                }
+                return Err(format!("SSH connection failed: {error}"));
+            }
+        };
+
+        match authenticate_ssh_handle(&mut handle, &host_config, auth).await? {
+            SshAuthOutcome::Authenticated => {
+                self.finish_create_ssh_session(request, host_config, title, size, handle)
+                    .await
+            }
+            SshAuthOutcome::KeyboardInteractivePrompt(prompt_data) => self
+                .ssh_keyboard_interactive_response(
+                    request,
+                    host_config,
+                    title,
+                    size,
+                    handle,
+                    prompt_data,
+                ),
+        }
+    }
+
+    async fn finish_create_ssh_session(
+        self: &Arc<Self>,
+        request: PendingSshConnectRequest,
+        host_config: RuntimeSshHostConfig,
+        title: String,
+        size: TerminalSize,
+        handle: client::Handle<LiveAgentSshClient>,
+    ) -> Result<TerminalSshCreateResponse, String> {
+        let channel = open_ssh_shell_channel(&handle, size).await?;
+
+        let id = uuid::Uuid::new_v4().to_string();
+        let now = now_ms();
+        let ssh = TerminalSshMetadata {
+            host_id: host_config.id.clone(),
+            host_name: host_config.name.clone(),
+            username: host_config.username.clone(),
+            host: host_config.host.clone(),
+            port: host_config.port,
+            auth_type: host_config.auth_type.clone(),
+            status: SSH_STATUS_CONNECTED.to_string(),
+            reconnect_attempt: 0,
+            reconnect_max_attempts: SSH_RECONNECT_MAX_ATTEMPTS,
+        };
+        let record = TerminalSessionRecord {
+            id: id.clone(),
+            project_path_key: request.project_path_key.clone(),
+            cwd: request.cwd.clone(),
+            shell: "ssh".to_string(),
+            title,
+            kind: "ssh".to_string(),
+            ssh: Some(ssh),
+            pid: None,
+            cols: size.cols,
+            rows: size.rows,
+            created_at: now,
+            updated_at: now,
+            finished_at: None,
+            exit_code: None,
+            running: true,
+        };
+
+        let runtime = Arc::new(SshSessionRuntime::new());
+        let (input_tx, input_rx) = tokio::sync::mpsc::channel::<SshSessionInput>(256);
+        let (shutdown_tx, shutdown_rx) = tokio::sync::mpsc::channel::<()>(1);
+        let connection_id = runtime
+            .install_connection(handle, input_tx, shutdown_tx)
+            .await;
+        let entry = Arc::new(TerminalSessionEntry {
+            backend: TerminalSessionBackend::Ssh {
+                runtime: Arc::clone(&runtime),
+            },
+            record: Mutex::new(record),
+            output: Mutex::new(TerminalOutputBuffer::default()),
+        });
+        self.sessions
+            .lock()
+            .expect("terminal session registry poisoned")
+            .insert(id.clone(), Arc::clone(&entry));
+        self.broadcast("created", &entry, None, None, None);
+
+        let registry = Arc::clone(self);
+        tauri::async_runtime::spawn(run_ssh_session_io(
+            registry,
+            id.clone(),
+            Arc::clone(&runtime),
+            connection_id,
+            channel,
+            input_rx,
+            shutdown_rx,
+        ));
+
+        self.snapshot(id, Some(MAX_TAIL_BYTES))
+            .map(terminal_ssh_create_response_from_snapshot)
+    }
+
+    async fn reconnect_ssh_session(
+        self: &Arc<Self>,
+        entry: Arc<TerminalSessionEntry>,
+        attempt: u8,
+    ) -> Result<(), String> {
+        let record = entry
+            .record
+            .lock()
+            .map_err(|_| "terminal session lock poisoned".to_string())?
+            .clone();
+        let ssh = record
+            .ssh
+            .clone()
+            .ok_or_else(|| "SSH session metadata is missing".to_string())?;
+        let TerminalSessionBackend::Ssh { runtime } = &entry.backend else {
+            return Err("terminal session is not an SSH connection".to_string());
+        };
+        if runtime.is_closing() {
+            return Err("SSH session is closing".to_string());
+        }
+        let host_config = load_runtime_ssh_host(&ssh.host_id)?
+            .ok_or_else(|| format!("SSH host not found: {}", ssh.host_id.trim()))?;
+        if ssh_proxy_configured(&host_config) {
+            return Err("SSH proxy is configured for this host, but V1 SSH terminal does not support proxy connections yet.".to_string());
+        }
+
+        let auth = resolve_ssh_auth_material(&host_config)?;
+        let captured_host_key = Arc::new(tokio::sync::Mutex::new(None::<CapturedHostKey>));
+        let ssh_client = LiveAgentSshClient {
+            host: host_config.host.clone(),
+            port: host_config.port,
+            captured_host_key: Arc::clone(&captured_host_key),
+        };
+        let config = Arc::new(client::Config {
+            ..Default::default()
+        });
+        let mut handle = match client::connect(
+            config,
+            (host_config.host.as_str(), host_config.port),
+            ssh_client,
+        )
+        .await
+        {
+            Ok(handle) => handle,
+            Err(error) => {
+                if captured_host_key.lock().await.is_some() {
+                    return Err(
+                        "SSH host key requires confirmation before reconnecting".to_string()
+                    );
+                }
+                return Err(format!("SSH connection failed: {error}"));
+            }
+        };
+
+        match authenticate_ssh_handle(&mut handle, &host_config, auth).await? {
+            SshAuthOutcome::Authenticated => {}
+            SshAuthOutcome::KeyboardInteractivePrompt(_) => {
+                let _ = handle
+                    .disconnect(
+                        russh::Disconnect::ByApplication,
+                        "Keyboard-interactive reconnect requires user input",
+                        "en",
+                    )
+                    .await;
+                return Err(
+                    "SSH reconnect requires keyboard-interactive input from the user".to_string(),
+                );
+            }
+        }
+
+        let size = TerminalSize {
+            cols: record.cols,
+            rows: record.rows,
+        };
+        let channel = open_ssh_shell_channel(&handle, size).await?;
+        let (input_tx, input_rx) = tokio::sync::mpsc::channel::<SshSessionInput>(256);
+        let (shutdown_tx, shutdown_rx) = tokio::sync::mpsc::channel::<()>(1);
+        let connection_id = runtime
+            .install_connection(handle, input_tx, shutdown_tx)
+            .await;
+        {
+            let mut record = entry
+                .record
+                .lock()
+                .map_err(|_| "terminal session lock poisoned".to_string())?;
+            record.running = true;
+            record.finished_at = None;
+            record.exit_code = None;
+            record.updated_at = now_ms();
+            if let Some(ssh) = record.ssh.as_mut() {
+                ssh.status = SSH_STATUS_CONNECTED.to_string();
+                ssh.reconnect_attempt = 0;
+                ssh.reconnect_max_attempts = SSH_RECONNECT_MAX_ATTEMPTS;
+            }
+        }
+        self.append_output(
+            &record.id,
+            format!("\r\n[SSH] Reconnected after attempt {attempt}.\r\n"),
+        );
+        self.broadcast("reconnected", &entry, None, None, None);
+
+        let registry = Arc::clone(self);
+        tauri::async_runtime::spawn(run_ssh_session_io(
+            registry,
+            record.id,
+            Arc::clone(runtime),
+            connection_id,
+            channel,
+            input_rx,
+            shutdown_rx,
+        ));
+        Ok(())
+    }
+
+    async fn handle_ssh_unexpected_disconnect(
+        self: Arc<Self>,
+        session_id: String,
+        runtime: Arc<SshSessionRuntime>,
+        connection_id: usize,
+    ) {
+        if !runtime.begin_reconnect_runner() {
+            return;
+        }
+        if runtime.current_connection_id() != connection_id {
+            runtime.finish_reconnect_runner();
+            return;
+        }
+        runtime.clear_connection_if_current(connection_id).await;
+        if runtime.is_closing() {
+            runtime.finish_reconnect_runner();
+            return;
+        }
+        let Ok(entry) = self.entry(&session_id) else {
+            runtime.finish_reconnect_runner();
+            return;
+        };
+        for attempt in 1..=SSH_RECONNECT_MAX_ATTEMPTS {
+            if runtime.is_closing() {
+                runtime.finish_reconnect_runner();
+                return;
+            }
+            self.mark_ssh_reconnecting(&entry, attempt);
+            self.append_output(
+                &session_id,
+                format!(
+                    "\r\n[SSH] Connection lost. Reconnecting ({attempt}/{SSH_RECONNECT_MAX_ATTEMPTS})...\r\n"
+                ),
+            );
+            let delay = SSH_RECONNECT_DELAYS
+                .get(usize::from(attempt.saturating_sub(1)))
+                .copied()
+                .unwrap_or_else(|| Duration::from_secs(10));
+            tokio::time::sleep(delay).await;
+            if runtime.is_closing() {
+                runtime.finish_reconnect_runner();
+                return;
+            }
+            match self
+                .reconnect_ssh_session(Arc::clone(&entry), attempt)
+                .await
+            {
+                Ok(()) => {
+                    runtime.finish_reconnect_runner();
+                    return;
+                }
+                Err(error) => {
+                    self.append_output(
+                        &session_id,
+                        format!(
+                            "[SSH] Reconnect attempt {attempt}/{SSH_RECONNECT_MAX_ATTEMPTS} failed: {error}\r\n"
+                        ),
+                    );
+                }
+            }
+        }
+        self.mark_ssh_disconnected(&entry);
+        self.append_output(
+            &session_id,
+            format!("[SSH] Reconnect failed after {SSH_RECONNECT_MAX_ATTEMPTS} attempts.\r\n"),
+        );
+        runtime.finish_reconnect_runner();
+    }
+
+    async fn continue_ssh_keyboard_interactive(
+        self: &Arc<Self>,
+        request: PendingSshConnectRequest,
+        host_config: RuntimeSshHostConfig,
+        title: String,
+        size: TerminalSize,
+        mut handle: client::Handle<LiveAgentSshClient>,
+        response: client::KeyboardInteractiveAuthResponse,
+        auto_password: Option<String>,
+    ) -> Result<TerminalSshCreateResponse, String> {
+        match continue_keyboard_interactive_auth(&mut handle, response, auto_password).await? {
+            SshAuthOutcome::Authenticated => {
+                self.finish_create_ssh_session(request, host_config, title, size, handle)
+                    .await
+            }
+            SshAuthOutcome::KeyboardInteractivePrompt(prompt_data) => self
+                .ssh_keyboard_interactive_response(
+                    request,
+                    host_config,
+                    title,
+                    size,
+                    handle,
+                    prompt_data,
+                ),
+        }
+    }
+
+    fn ssh_keyboard_interactive_response(
+        self: &Arc<Self>,
+        request: PendingSshConnectRequest,
+        host_config: RuntimeSshHostConfig,
+        title: String,
+        size: TerminalSize,
+        handle: client::Handle<LiveAgentSshClient>,
+        prompt_data: KeyboardInteractivePromptData,
+    ) -> Result<TerminalSshCreateResponse, String> {
+        let prompt_id = uuid::Uuid::new_v4().to_string();
+        let message = ssh_keyboard_interactive_message(&prompt_data);
+        let prompt = TerminalSshPrompt {
+            id: prompt_id.clone(),
+            kind: "keyboardInteractive".to_string(),
+            host_id: host_config.id.clone(),
+            host_name: host_config.name.clone(),
+            host: host_config.host.clone(),
+            port: host_config.port,
+            message,
+            fingerprint_sha256: String::new(),
+            key_type: String::new(),
+            answer_echo: prompt_data.echo,
+        };
+        self.pending_ssh_prompts
+            .lock()
+            .map_err(|_| "ssh prompt registry poisoned".to_string())?
+            .insert(
+                prompt_id.clone(),
+                PendingSshPrompt::KeyboardInteractive {
+                    request,
+                    host_config,
+                    title,
+                    size,
+                    handle,
+                },
+            );
+        self.schedule_ssh_prompt_timeout(prompt_id);
+        Ok(TerminalSshCreateResponse {
+            session: None,
+            output: String::new(),
+            truncated: false,
+            output_start_offset: 0,
+            output_end_offset: 0,
+            ssh_prompt: Some(prompt),
+        })
+    }
+
+    fn ssh_host_key_response(
+        self: &Arc<Self>,
+        request: PendingSshConnectRequest,
+        host_config: &RuntimeSshHostConfig,
+        captured: CapturedHostKey,
+    ) -> Result<TerminalSshCreateResponse, String> {
+        match captured.status {
+            RuntimeSshKnownHostStatus::Known => {
+                Err("SSH host key check failed unexpectedly".to_string())
+            }
+            RuntimeSshKnownHostStatus::Changed { stored_fingerprint } => Err(format!(
+                "SSH host key changed for {}:{}. Stored fingerprint: {}. Received fingerprint: {}.",
+                host_config.host,
+                host_config.port,
+                stored_fingerprint,
+                captured.key.fingerprint_sha256
+            )),
+            RuntimeSshKnownHostStatus::Unknown => {
+                let prompt_id = uuid::Uuid::new_v4().to_string();
+                let prompt = TerminalSshPrompt {
+                    id: prompt_id.clone(),
+                    kind: "hostKey".to_string(),
+                    host_id: host_config.id.clone(),
+                    host_name: host_config.name.clone(),
+                    host: host_config.host.clone(),
+                    port: host_config.port,
+                    message: format!(
+                        "Trust SSH host key for {}:{}?",
+                        host_config.host, host_config.port
+                    ),
+                    fingerprint_sha256: captured.key.fingerprint_sha256.clone(),
+                    key_type: captured.key.key_type.clone(),
+                    answer_echo: false,
+                };
+                self.pending_ssh_prompts
+                    .lock()
+                    .map_err(|_| "ssh prompt registry poisoned".to_string())?
+                    .insert(
+                        prompt_id.clone(),
+                        PendingSshPrompt::HostKey {
+                            request,
+                            host_key: captured.key,
+                        },
+                    );
+                self.schedule_ssh_prompt_timeout(prompt_id);
+                Ok(TerminalSshCreateResponse {
+                    session: None,
+                    output: String::new(),
+                    truncated: false,
+                    output_start_offset: 0,
+                    output_end_offset: 0,
+                    ssh_prompt: Some(prompt),
+                })
+            }
+        }
+    }
+
+    fn schedule_ssh_prompt_timeout(self: &Arc<Self>, prompt_id: String) {
+        let registry = Arc::clone(self);
+        tokio::spawn(async move {
+            tokio::time::sleep(SSH_PROMPT_TIMEOUT).await;
+            let pending = registry
+                .pending_ssh_prompts
+                .lock()
+                .ok()
+                .and_then(|mut prompts| prompts.remove(&prompt_id));
+            if let Some(PendingSshPrompt::KeyboardInteractive { handle, .. }) = pending {
+                let _ = handle
+                    .disconnect(
+                        russh::Disconnect::ByApplication,
+                        "Authentication prompt timed out",
+                        "en",
+                    )
+                    .await;
+            }
+        });
+    }
+
     pub fn snapshot(
         &self,
         session_id: String,
@@ -343,6 +1150,62 @@ impl TerminalSessionRegistry {
         self.record(session_id)
     }
 
+    pub async fn ssh_latency(
+        self: &Arc<Self>,
+        session_id: String,
+    ) -> Result<TerminalSshLatencyResponse, String> {
+        let entry = self.entry(&session_id)?;
+        let record = entry
+            .record
+            .lock()
+            .map_err(|_| "terminal session lock poisoned".to_string())?
+            .clone();
+        if record.kind.trim() != "ssh" {
+            return Err("terminal session is not an SSH connection".to_string());
+        }
+        if !record.running {
+            return Err("SSH connection is not running".to_string());
+        }
+        let TerminalSessionBackend::Ssh { runtime } = &entry.backend else {
+            return Err("terminal session is not an SSH connection".to_string());
+        };
+        let start = Instant::now();
+        let ping = timeout(Duration::from_secs(3), async {
+            let handle = runtime.handle.lock().await;
+            let Some(handle) = handle.as_ref() else {
+                return Err(russh::Error::Disconnect);
+            };
+            handle.send_ping().await
+        })
+        .await;
+        match ping {
+            Ok(Ok(())) => {}
+            Ok(Err(error)) => {
+                spawn_ssh_reconnect_runner(
+                    Arc::clone(self),
+                    record.id.clone(),
+                    Arc::clone(runtime),
+                    runtime.current_connection_id(),
+                );
+                return Err(format!("SSH latency check failed: {error}"));
+            }
+            Err(_) => {
+                spawn_ssh_reconnect_runner(
+                    Arc::clone(self),
+                    record.id.clone(),
+                    Arc::clone(runtime),
+                    runtime.current_connection_id(),
+                );
+                return Err("SSH latency check timed out".to_string());
+            }
+        }
+        let elapsed = start.elapsed().as_millis().clamp(1, u128::from(u32::MAX)) as u32;
+        Ok(TerminalSshLatencyResponse {
+            session_id: record.id,
+            latency_ms: elapsed,
+        })
+    }
+
     pub fn input(&self, session_id: String, data: String) -> Result<TerminalSessionRecord, String> {
         if data.is_empty() {
             return self.record(session_id);
@@ -356,12 +1219,22 @@ impl TerminalSessionRegistry {
         if !running {
             return Err("terminal session is not running".to_string());
         }
-        entry
-            .writer
-            .lock()
-            .map_err(|_| "terminal writer lock poisoned".to_string())?
-            .write_all(data.as_bytes())
-            .map_err(|err| format!("failed to write terminal input: {err}"))?;
+        match &entry.backend {
+            TerminalSessionBackend::Local { writer, .. } => {
+                writer
+                    .lock()
+                    .map_err(|_| "terminal writer lock poisoned".to_string())?
+                    .write_all(data.as_bytes())
+                    .map_err(|err| format!("failed to write terminal input: {err}"))?;
+            }
+            TerminalSessionBackend::Ssh { runtime } => {
+                runtime
+                    .input_sender()
+                    .ok_or_else(|| "SSH connection is not connected".to_string())?
+                    .try_send(SshSessionInput::Data(data.into_bytes()))
+                    .map_err(|err| format!("failed to write ssh terminal input: {err}"))?;
+            }
+        }
         self.touch(&entry);
         self.record(session_id)
     }
@@ -375,17 +1248,27 @@ impl TerminalSessionRegistry {
         let entry = self.entry(&session_id)?;
         let cols = cols.clamp(20, 400);
         let rows = rows.clamp(6, 200);
-        entry
-            .master
-            .lock()
-            .map_err(|_| "terminal master lock poisoned".to_string())?
-            .resize(PtySize {
-                rows,
-                cols,
-                pixel_width: 0,
-                pixel_height: 0,
-            })
-            .map_err(|err| format!("failed to resize terminal: {err}"))?;
+        match &entry.backend {
+            TerminalSessionBackend::Local { master, .. } => {
+                master
+                    .lock()
+                    .map_err(|_| "terminal master lock poisoned".to_string())?
+                    .resize(PtySize {
+                        rows,
+                        cols,
+                        pixel_width: 0,
+                        pixel_height: 0,
+                    })
+                    .map_err(|err| format!("failed to resize terminal: {err}"))?;
+            }
+            TerminalSessionBackend::Ssh { runtime } => {
+                if let Some(input_tx) = runtime.input_sender() {
+                    input_tx
+                        .try_send(SshSessionInput::Resize(u32::from(cols), u32::from(rows)))
+                        .map_err(|err| format!("failed to resize ssh terminal: {err}"))?;
+                }
+            }
+        }
         {
             let mut record = entry
                 .record
@@ -554,6 +1437,32 @@ impl TerminalSessionRegistry {
         format!("Terminal {}", count + 1)
     }
 
+    fn next_ssh_title(&self, project_path_key: &str, host_name: &str) -> String {
+        let base = host_name.trim();
+        let base = if base.is_empty() { "SSH" } else { base };
+        let count = self
+            .sessions
+            .lock()
+            .ok()
+            .map(|sessions| {
+                sessions
+                    .values()
+                    .filter_map(|entry| entry.record.lock().ok())
+                    .filter(|record| {
+                        record.project_path_key == project_path_key
+                            && record.kind == "ssh"
+                            && record.title.starts_with(base)
+                    })
+                    .count()
+            })
+            .unwrap_or(0);
+        if count == 0 {
+            base.to_string()
+        } else {
+            format!("{base} {}", count + 1)
+        }
+    }
+
     fn entry(&self, session_id: &str) -> Result<Arc<TerminalSessionEntry>, String> {
         let id = session_id.trim();
         if id.is_empty() {
@@ -608,9 +1517,11 @@ impl TerminalSessionRegistry {
             return;
         };
         let mut exit_code = None;
-        if let Ok(mut child) = entry.child.lock() {
-            if let Ok(status) = child.try_wait() {
-                exit_code = status.map(|status| status.exit_code() as i32);
+        if let TerminalSessionBackend::Local { child, .. } = &entry.backend {
+            if let Ok(mut child) = child.lock() {
+                if let Ok(status) = child.try_wait() {
+                    exit_code = status.map(|status| status.exit_code() as i32);
+                }
             }
         }
         {
@@ -628,6 +1539,44 @@ impl TerminalSessionRegistry {
         self.broadcast("exit", &entry, None, None, None);
     }
 
+    fn mark_ssh_reconnecting(&self, entry: &Arc<TerminalSessionEntry>, attempt: u8) {
+        {
+            let mut record = match entry.record.lock() {
+                Ok(record) => record,
+                Err(_) => return,
+            };
+            record.running = false;
+            record.finished_at = None;
+            record.exit_code = None;
+            record.updated_at = now_ms();
+            if let Some(ssh) = record.ssh.as_mut() {
+                ssh.status = SSH_STATUS_RECONNECTING.to_string();
+                ssh.reconnect_attempt = attempt;
+                ssh.reconnect_max_attempts = SSH_RECONNECT_MAX_ATTEMPTS;
+            }
+        }
+        self.broadcast("reconnecting", entry, None, None, None);
+    }
+
+    fn mark_ssh_disconnected(&self, entry: &Arc<TerminalSessionEntry>) {
+        {
+            let mut record = match entry.record.lock() {
+                Ok(record) => record,
+                Err(_) => return,
+            };
+            record.running = false;
+            record.finished_at = Some(now_ms());
+            record.exit_code = None;
+            record.updated_at = now_ms();
+            if let Some(ssh) = record.ssh.as_mut() {
+                ssh.status = SSH_STATUS_DISCONNECTED.to_string();
+                ssh.reconnect_attempt = SSH_RECONNECT_MAX_ATTEMPTS;
+                ssh.reconnect_max_attempts = SSH_RECONNECT_MAX_ATTEMPTS;
+            }
+        }
+        self.broadcast("exit", entry, None, None, None);
+    }
+
     fn broadcast(
         &self,
         kind: &str,
@@ -667,6 +1616,382 @@ impl TerminalSessionRegistry {
     }
 }
 
+struct LiveAgentSshClient {
+    host: String,
+    port: u16,
+    captured_host_key: Arc<tokio::sync::Mutex<Option<CapturedHostKey>>>,
+}
+
+impl client::Handler for LiveAgentSshClient {
+    type Error = russh::Error;
+
+    async fn check_server_key(
+        &mut self,
+        server_public_key: &PublicKey,
+    ) -> Result<bool, Self::Error> {
+        let key_base64 =
+            base64::engine::general_purpose::STANDARD.encode(server_public_key.public_key_bytes());
+        let key = RuntimeSshKnownHostKey {
+            host: self.host.clone(),
+            port: self.port,
+            key_type: server_public_key.algorithm().as_str().to_string(),
+            key_base64,
+            fingerprint_sha256: server_public_key.fingerprint(HashAlg::Sha256).to_string(),
+        };
+        match check_runtime_ssh_known_host(&key) {
+            Ok(RuntimeSshKnownHostStatus::Known) => Ok(true),
+            Ok(status) => {
+                *self.captured_host_key.lock().await = Some(CapturedHostKey { key, status });
+                Ok(false)
+            }
+            Err(error) => {
+                *self.captured_host_key.lock().await = Some(CapturedHostKey {
+                    key,
+                    status: RuntimeSshKnownHostStatus::Changed {
+                        stored_fingerprint: error,
+                    },
+                });
+                Ok(false)
+            }
+        }
+    }
+}
+
+enum ResolvedSshAuth {
+    Password(String),
+    PrivateKey {
+        key: String,
+        passphrase: Option<String>,
+    },
+}
+
+fn ssh_proxy_configured(host: &RuntimeSshHostConfig) -> bool {
+    !host.proxy.url.trim().is_empty()
+        || host.proxy.port > 0
+        || !host.proxy.username.trim().is_empty()
+        || host.proxy.password_configured
+}
+
+fn resolve_ssh_auth_material(host: &RuntimeSshHostConfig) -> Result<ResolvedSshAuth, String> {
+    if host.auth_type == "privateKey" {
+        let key = if !host.private_key.trim().is_empty() {
+            host.private_key.trim().to_string()
+        } else {
+            let path = host.private_key_path.trim();
+            if path.is_empty() {
+                return Err("SSH private key is not configured".to_string());
+            }
+            let expanded = expand_tilde_path(path);
+            fs::read_to_string(&expanded)
+                .map_err(|error| {
+                    format!(
+                        "failed to read SSH private key {}: {error}",
+                        expanded.display()
+                    )
+                })?
+                .trim()
+                .to_string()
+        };
+        if key.is_empty() {
+            return Err("SSH private key is empty".to_string());
+        }
+        let passphrase = host.private_key_passphrase.trim().to_string();
+        Ok(ResolvedSshAuth::PrivateKey {
+            key,
+            passphrase: (!passphrase.is_empty()).then_some(passphrase),
+        })
+    } else {
+        let password = host.password.trim().to_string();
+        if password.is_empty() {
+            return Err("SSH password is not configured".to_string());
+        }
+        Ok(ResolvedSshAuth::Password(password))
+    }
+}
+
+async fn authenticate_ssh_handle(
+    handle: &mut client::Handle<LiveAgentSshClient>,
+    host: &RuntimeSshHostConfig,
+    auth: ResolvedSshAuth,
+) -> Result<SshAuthOutcome, String> {
+    match auth {
+        ResolvedSshAuth::Password(password) => {
+            let result = handle
+                .authenticate_password(host.username.as_str(), password.clone())
+                .await
+                .map_err(|error| format!("SSH password authentication failed: {error}"))?;
+            if result.success() {
+                return Ok(SshAuthOutcome::Authenticated);
+            }
+            if auth_result_can_continue_with_kbi(&result) {
+                let response = handle
+                    .authenticate_keyboard_interactive_start(host.username.as_str(), None::<String>)
+                    .await
+                    .map_err(|error| {
+                        format!("SSH keyboard-interactive authentication failed: {error}")
+                    })?;
+                return continue_keyboard_interactive_auth(handle, response, Some(password)).await;
+            }
+            Err("SSH authentication failed".to_string())
+        }
+        ResolvedSshAuth::PrivateKey { key, passphrase } => {
+            let key_pair = russh::keys::decode_secret_key(&key, passphrase.as_deref())
+                .map_err(|error| format!("Invalid SSH private key: {error}"))?;
+            let key = PrivateKeyWithHashAlg::new(Arc::new(key_pair), Some(HashAlg::Sha256));
+            let result = handle
+                .authenticate_publickey(host.username.as_str(), key)
+                .await
+                .map_err(|error| format!("SSH private key authentication failed: {error}"))?;
+            if result.success() {
+                return Ok(SshAuthOutcome::Authenticated);
+            }
+            if auth_result_can_continue_with_kbi(&result) {
+                let response = handle
+                    .authenticate_keyboard_interactive_start(host.username.as_str(), None::<String>)
+                    .await
+                    .map_err(|error| {
+                        format!("SSH keyboard-interactive authentication failed: {error}")
+                    })?;
+                return continue_keyboard_interactive_auth(handle, response, None).await;
+            }
+            Err("SSH authentication failed".to_string())
+        }
+    }
+}
+
+fn auth_result_can_continue_with_kbi(result: &client::AuthResult) -> bool {
+    matches!(
+        result,
+        client::AuthResult::Failure {
+            remaining_methods,
+            ..
+        } if remaining_methods.contains(&MethodKind::KeyboardInteractive)
+    )
+}
+
+fn prompt_looks_like_password(prompt: &str) -> bool {
+    let normalized = prompt.trim().to_ascii_lowercase();
+    normalized.contains("password") || prompt.contains("密码")
+}
+
+fn classify_password_kbi_prompts(
+    prompts: &[client::Prompt],
+    password_prompt_consumed: bool,
+) -> PasswordKbiPromptAction {
+    if prompts.is_empty() {
+        PasswordKbiPromptAction::RespondEmpty
+    } else if !password_prompt_consumed
+        && prompts.len() == 1
+        && !prompts[0].echo
+        && prompt_looks_like_password(&prompts[0].prompt)
+    {
+        PasswordKbiPromptAction::SendPassword
+    } else {
+        PasswordKbiPromptAction::PromptUser
+    }
+}
+
+async fn continue_keyboard_interactive_auth(
+    handle: &mut client::Handle<LiveAgentSshClient>,
+    mut response: client::KeyboardInteractiveAuthResponse,
+    auto_password: Option<String>,
+) -> Result<SshAuthOutcome, String> {
+    let mut password_prompt_consumed = false;
+    for _ in 0..5 {
+        match response {
+            client::KeyboardInteractiveAuthResponse::Success => {
+                return Ok(SshAuthOutcome::Authenticated);
+            }
+            client::KeyboardInteractiveAuthResponse::Failure { .. } => {
+                return Err("SSH keyboard-interactive authentication failed".to_string());
+            }
+            client::KeyboardInteractiveAuthResponse::InfoRequest {
+                name,
+                instructions,
+                prompts,
+            } => match classify_password_kbi_prompts(&prompts, password_prompt_consumed) {
+                PasswordKbiPromptAction::RespondEmpty => {
+                    response = handle
+                        .authenticate_keyboard_interactive_respond(Vec::new())
+                        .await
+                        .map_err(|error| {
+                            format!("SSH keyboard-interactive response failed: {error}")
+                        })?;
+                }
+                PasswordKbiPromptAction::SendPassword if auto_password.is_some() => {
+                    password_prompt_consumed = true;
+                    response = handle
+                        .authenticate_keyboard_interactive_respond(vec![auto_password
+                            .clone()
+                            .unwrap_or_default()])
+                        .await
+                        .map_err(|error| {
+                            format!("SSH keyboard-interactive response failed: {error}")
+                        })?;
+                }
+                PasswordKbiPromptAction::SendPassword | PasswordKbiPromptAction::PromptUser => {
+                    if prompts.len() != 1 {
+                        return Err(
+                            "SSH keyboard-interactive requested multiple prompts, which is not supported in V1."
+                                .to_string(),
+                        );
+                    }
+                    let prompt = prompts
+                        .into_iter()
+                        .next()
+                        .ok_or_else(|| "SSH keyboard-interactive prompt is empty".to_string())?;
+                    return Ok(SshAuthOutcome::KeyboardInteractivePrompt(
+                        KeyboardInteractivePromptData {
+                            name,
+                            instructions,
+                            prompt: prompt.prompt,
+                            echo: prompt.echo,
+                        },
+                    ));
+                }
+            },
+        }
+    }
+    Err("SSH keyboard-interactive exceeded maximum prompt rounds".to_string())
+}
+
+fn ssh_keyboard_interactive_message(prompt_data: &KeyboardInteractivePromptData) -> String {
+    let mut parts = Vec::new();
+    if !prompt_data.name.trim().is_empty() {
+        parts.push(prompt_data.name.trim().to_string());
+    }
+    if !prompt_data.instructions.trim().is_empty() {
+        parts.push(prompt_data.instructions.trim().to_string());
+    }
+    if !prompt_data.prompt.trim().is_empty() {
+        parts.push(prompt_data.prompt.trim().to_string());
+    }
+    if parts.is_empty() {
+        "SSH keyboard-interactive authentication requires input.".to_string()
+    } else {
+        parts.join("\n")
+    }
+}
+
+async fn open_ssh_shell_channel(
+    handle: &client::Handle<LiveAgentSshClient>,
+    size: TerminalSize,
+) -> Result<russh::Channel<client::Msg>, String> {
+    let channel = handle
+        .channel_open_session()
+        .await
+        .map_err(|error| format!("SSH channel open failed: {error}"))?;
+    channel
+        .request_pty(
+            false,
+            "xterm-256color",
+            u32::from(size.cols),
+            u32::from(size.rows),
+            0,
+            0,
+            &[],
+        )
+        .await
+        .map_err(|error| format!("SSH PTY request failed: {error}"))?;
+    channel
+        .request_shell(false)
+        .await
+        .map_err(|error| format!("SSH shell request failed: {error}"))?;
+    Ok(channel)
+}
+
+async fn run_ssh_session_io(
+    registry: Arc<TerminalSessionRegistry>,
+    session_id: String,
+    runtime: Arc<SshSessionRuntime>,
+    connection_id: usize,
+    channel: russh::Channel<client::Msg>,
+    mut input_rx: tokio::sync::mpsc::Receiver<SshSessionInput>,
+    mut shutdown_rx: tokio::sync::mpsc::Receiver<()>,
+) {
+    let (mut read_half, write_half) = channel.split();
+    let mut writer = write_half.make_writer();
+    let mut decoder = TerminalUtf8Decoder::default();
+    loop {
+        tokio::select! {
+            _ = shutdown_rx.recv() => {
+                let handle = runtime.handle.lock().await;
+                if let Some(handle) = handle.as_ref() {
+                    let _ = handle.disconnect(russh::Disconnect::ByApplication, "User disconnected", "en").await;
+                }
+                break;
+            }
+            input = input_rx.recv() => {
+                match input {
+                    Some(SshSessionInput::Data(data)) => {
+                        if writer.write_all(&data).await.is_err() {
+                            break;
+                        }
+                    }
+                    Some(SshSessionInput::Resize(cols, rows)) => {
+                        let _ = write_half.window_change(cols, rows, 0, 0).await;
+                    }
+                    None => break,
+                }
+            }
+            message = read_half.wait() => {
+                match message {
+                    Some(ChannelMsg::Data { data }) | Some(ChannelMsg::ExtendedData { data, .. }) => {
+                        let text = decoder.push(data.as_ref());
+                        if !text.is_empty() {
+                            registry.append_output(&session_id, text);
+                        }
+                    }
+                    Some(ChannelMsg::Eof) | Some(ChannelMsg::Close) | None => {
+                        break;
+                    }
+                    _ => {}
+                }
+            }
+        }
+    }
+
+    let text = decoder.finish();
+    if !text.is_empty() {
+        registry.append_output(&session_id, text);
+    }
+    spawn_ssh_reconnect_runner(registry, session_id, runtime, connection_id);
+}
+
+fn spawn_ssh_reconnect_runner(
+    registry: Arc<TerminalSessionRegistry>,
+    session_id: String,
+    runtime: Arc<SshSessionRuntime>,
+    connection_id: usize,
+) {
+    thread::spawn(move || {
+        let Ok(rt) = tokio::runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+        else {
+            return;
+        };
+        rt.block_on(async move {
+            registry
+                .handle_ssh_unexpected_disconnect(session_id, runtime, connection_id)
+                .await;
+        });
+    });
+}
+
+fn terminal_ssh_create_response_from_snapshot(
+    snapshot: TerminalSnapshotResponse,
+) -> TerminalSshCreateResponse {
+    TerminalSshCreateResponse {
+        session: Some(snapshot.session),
+        output: snapshot.output,
+        truncated: snapshot.truncated,
+        output_start_offset: snapshot.output_start_offset,
+        output_end_offset: snapshot.output_end_offset,
+        ssh_prompt: None,
+    }
+}
+
 pub struct TerminalSubscriberGuard {
     id: usize,
     subscribers: Arc<Mutex<HashMap<usize, mpsc::Sender<TerminalEvent>>>>,
@@ -757,10 +2082,19 @@ fn read_output_chunks_tail(output: &TerminalOutputBuffer, max_bytes: usize) -> T
 }
 
 fn terminate_terminal_entry(entry: &Arc<TerminalSessionEntry>) {
-    let pid = entry.record.lock().ok().and_then(|record| record.pid);
-    terminate_process_tree_best_effort(pid);
-    if let Ok(mut child) = entry.child.lock() {
-        let _ = child.kill();
+    match &entry.backend {
+        TerminalSessionBackend::Local { child, .. } => {
+            let pid = entry.record.lock().ok().and_then(|record| record.pid);
+            terminate_process_tree_best_effort(pid);
+            if let Ok(mut child) = child.lock() {
+                let _ = child.kill();
+            }
+        }
+        TerminalSessionBackend::Ssh { runtime } => {
+            if let Some(shutdown_tx) = runtime.close() {
+                let _ = shutdown_tx.try_send(());
+            }
+        }
     }
 }
 
@@ -1133,6 +2467,72 @@ mod tests {
         assert_eq!(decoder.finish(), "");
     }
 
+    #[test]
+    fn ssh_auth_result_detects_keyboard_interactive_continuation() {
+        let mut methods = russh::MethodSet::empty();
+        methods.push(MethodKind::KeyboardInteractive);
+        assert!(auth_result_can_continue_with_kbi(
+            &client::AuthResult::Failure {
+                remaining_methods: methods,
+                partial_success: false,
+            }
+        ));
+
+        let mut password_only = russh::MethodSet::empty();
+        password_only.push(MethodKind::Password);
+        assert!(!auth_result_can_continue_with_kbi(
+            &client::AuthResult::Failure {
+                remaining_methods: password_only,
+                partial_success: false,
+            },
+        ));
+        assert!(!auth_result_can_continue_with_kbi(
+            &client::AuthResult::Success
+        ));
+    }
+
+    #[test]
+    fn ssh_password_kbi_prompt_classification_uses_saved_password_once() {
+        let prompts = vec![client::Prompt {
+            prompt: "Password:".to_string(),
+            echo: false,
+        }];
+        assert_eq!(
+            classify_password_kbi_prompts(&prompts, false),
+            PasswordKbiPromptAction::SendPassword
+        );
+        assert_eq!(
+            classify_password_kbi_prompts(&prompts, true),
+            PasswordKbiPromptAction::PromptUser
+        );
+        assert_eq!(
+            classify_password_kbi_prompts(&[], false),
+            PasswordKbiPromptAction::RespondEmpty
+        );
+        assert_eq!(
+            classify_password_kbi_prompts(
+                &[client::Prompt {
+                    prompt: "OTP:".to_string(),
+                    echo: false,
+                }],
+                false,
+            ),
+            PasswordKbiPromptAction::PromptUser
+        );
+    }
+
+    #[test]
+    fn ssh_keyboard_interactive_message_combines_server_fields() {
+        let message = ssh_keyboard_interactive_message(&KeyboardInteractivePromptData {
+            name: "Verification".to_string(),
+            instructions: "Enter code".to_string(),
+            prompt: "OTP:".to_string(),
+            echo: false,
+        });
+
+        assert_eq!(message, "Verification\nEnter code\nOTP:");
+    }
+
     #[test]
     fn terminal_shell_env_scrubs_npm_prefix() {
         let mut command = CommandBuilder::new("/bin/sh");
diff --git a/crates/agent-gui/src-tauri/src/services/gateway.rs b/crates/agent-gui/src-tauri/src/services/gateway.rs
index 166a92255..d5079cadb 100644
--- a/crates/agent-gui/src-tauri/src/services/gateway.rs
+++ b/crates/agent-gui/src-tauri/src/services/gateway.rs
@@ -21,12 +21,12 @@ use uuid::Uuid;
 use crate::commands::chat_history::{self, ChatHistorySummary};
 use crate::commands::settings::{
     load_gateway_settings_sync_snapshot, load_remote_settings, normalize_remote_settings_payload,
-    open_db, redact_gateway_settings_sync_payload, RemoteSettingsPayload,
-    PROVIDER_API_KEY_UPDATES_FIELD, SSH_SECRET_UPDATES_FIELD,
+    open_db, redact_gateway_settings_sync_payload, reset_runtime_ssh_known_host,
+    RemoteSettingsPayload, PROVIDER_API_KEY_UPDATES_FIELD, SSH_SECRET_UPDATES_FIELD,
 };
 use crate::runtime::terminal::{
     terminal_shell_options, TerminalEventPayload, TerminalSessionRecord, TerminalSessionRegistry,
-    TerminalShellOption, TerminalSnapshotResponse,
+    TerminalShellOption, TerminalSnapshotResponse, TerminalSshCreateResponse,
 };
 use crate::services::cron::CronManager;
 use crate::services::gateway_bridge;
@@ -1224,6 +1224,37 @@ impl GatewayController {
                     Err(error) => self.send_error_response(request_id, 400, error).await,
                 }
             }
+            Some(proto::gateway_envelope::Payload::SettingsResetSshKnownHost(request)) => {
+                let host = request.host.trim().to_string();
+                let port = match u16::try_from(request.port) {
+                    Ok(port) if port > 0 => port,
+                    _ => {
+                        return self
+                            .send_error_response(
+                                request_id,
+                                400,
+                                "SSH port must be between 1 and 65535".to_string(),
+                            )
+                            .await;
+                    }
+                };
+                match reset_runtime_ssh_known_host(&host, port) {
+                    Ok(deleted) => {
+                        let deleted = u32::try_from(deleted).unwrap_or(u32::MAX);
+                        self.send_agent_envelope(proto::AgentEnvelope {
+                            request_id,
+                            timestamp: now_unix_seconds(),
+                            payload: Some(
+                                proto::agent_envelope::Payload::SettingsResetSshKnownHostResp(
+                                    proto::SettingsResetSshKnownHostResponse { deleted },
+                                ),
+                            ),
+                        })
+                        .await
+                    }
+                    Err(error) => self.send_error_response(request_id, 400, error).await,
+                }
+            }
             Some(proto::gateway_envelope::Payload::FsRoots(_request)) => {
                 match gateway_bridge::handle_fs_roots().await {
                     Ok(response) => {
@@ -1488,7 +1519,7 @@ impl GatewayController {
                 }
             }
             Some(proto::gateway_envelope::Payload::TerminalRequest(request)) => {
-                match self.handle_terminal_request(request) {
+                match self.handle_terminal_request(request).await {
                     Ok(response) => {
                         self.send_agent_envelope(proto::AgentEnvelope {
                             request_id,
@@ -1506,11 +1537,12 @@ impl GatewayController {
         }
     }
 
-    fn handle_terminal_request(
+    async fn handle_terminal_request(
         &self,
         request: proto::TerminalRequest,
     ) -> Result<proto::TerminalResponse, String> {
         let action = request.action.trim().to_ascii_lowercase();
+        self.ensure_terminal_request_allowed(&action, &request)?;
         match action.as_str() {
             "shell_options" => {
                 let options = terminal_shell_options();
@@ -1528,16 +1560,26 @@ impl GatewayController {
                     default_shell: options.default_shell,
                     output_start_offset: 0,
                     output_end_offset: 0,
+                    ssh_prompt: None,
+                    latency_ms: 0,
                 })
             }
             "list" => {
                 let project_path_key = request.project_path_key.trim().to_string();
                 let project_filter = (!project_path_key.is_empty()).then_some(project_path_key);
+                let config = self.config_tx.borrow().clone();
                 let sessions = self
                     .terminal_registry
                     .list(project_filter)
                     .sessions
                     .into_iter()
+                    .filter(|session| {
+                        if session.kind.trim() == "ssh" {
+                            config.enable_web_ssh_terminal
+                        } else {
+                            config.enable_web_terminal
+                        }
+                    })
                     .map(terminal_session_to_proto)
                     .collect();
                 Ok(proto::TerminalResponse {
@@ -1550,6 +1592,8 @@ impl GatewayController {
                     default_shell: String::new(),
                     output_start_offset: 0,
                     output_end_offset: 0,
+                    ssh_prompt: None,
+                    latency_ms: 0,
                 })
             }
             "create" => {
@@ -1565,6 +1609,75 @@ impl GatewayController {
                 )?;
                 Ok(terminal_snapshot_response_to_proto(action, snapshot))
             }
+            "create_ssh" => {
+                let project_path_key =
+                    required_terminal_project_path_key(&request.project_path_key)?;
+                let response = self
+                    .terminal_registry
+                    .clone()
+                    .create_ssh(
+                        request.cwd,
+                        Some(project_path_key),
+                        request.ssh_host_id,
+                        optional_proto_text(request.title),
+                        optional_proto_u16(request.cols),
+                        optional_proto_u16(request.rows),
+                    )
+                    .await?;
+                Ok(terminal_ssh_create_response_to_proto(action, response))
+            }
+            "answer_ssh_prompt" => {
+                let response = self
+                    .terminal_registry
+                    .clone()
+                    .answer_ssh_prompt(
+                        request.prompt_id,
+                        optional_proto_text(request.prompt_answer),
+                        request.trust_host_key,
+                    )
+                    .await?;
+                Ok(terminal_ssh_create_response_to_proto(action, response))
+            }
+            "ssh_latency" => {
+                self.ensure_terminal_session_in_project(
+                    &request.session_id,
+                    &request.project_path_key,
+                )?;
+                let latency = self
+                    .terminal_registry
+                    .ssh_latency(request.session_id)
+                    .await?;
+                Ok(proto::TerminalResponse {
+                    action,
+                    sessions: Vec::new(),
+                    session: None,
+                    output: String::new(),
+                    truncated: false,
+                    shell_options: Vec::new(),
+                    default_shell: String::new(),
+                    output_start_offset: 0,
+                    output_end_offset: 0,
+                    ssh_prompt: None,
+                    latency_ms: latency.latency_ms,
+                })
+            }
+            "cancel_ssh_prompt" => {
+                self.terminal_registry
+                    .cancel_ssh_prompt(request.prompt_id)?;
+                Ok(proto::TerminalResponse {
+                    action,
+                    sessions: Vec::new(),
+                    session: None,
+                    output: String::new(),
+                    truncated: false,
+                    shell_options: Vec::new(),
+                    default_shell: String::new(),
+                    output_start_offset: 0,
+                    output_end_offset: 0,
+                    ssh_prompt: None,
+                    latency_ms: 0,
+                })
+            }
             "attach" | "snapshot" => {
                 self.ensure_terminal_session_in_project(
                     &request.session_id,
@@ -1618,8 +1731,22 @@ impl GatewayController {
             "close_project" => {
                 let project_path_key =
                     required_terminal_project_path_key(&request.project_path_key)?;
-                let response = self.terminal_registry.close_project(project_path_key)?;
-                Ok(terminal_list_response_to_proto(action, response.sessions))
+                let config = self.config_tx.borrow().clone();
+                let sessions = self
+                    .terminal_registry
+                    .list(Some(project_path_key))
+                    .sessions
+                    .into_iter()
+                    .filter(|session| {
+                        if session.kind.trim() == "ssh" {
+                            config.enable_web_ssh_terminal
+                        } else {
+                            config.enable_web_terminal
+                        }
+                    })
+                    .filter_map(|session| self.terminal_registry.close(session.id).ok())
+                    .collect();
+                Ok(terminal_list_response_to_proto(action, sessions))
             }
             "detach" => Ok(proto::TerminalResponse {
                 action,
@@ -1631,6 +1758,8 @@ impl GatewayController {
                 default_shell: String::new(),
                 output_start_offset: 0,
                 output_end_offset: 0,
+                ssh_prompt: None,
+                latency_ms: 0,
             }),
             "" => Err("terminal action is required".to_string()),
             other => Err(format!("unsupported terminal action: {other}")),
@@ -1652,6 +1781,62 @@ impl GatewayController {
         Ok(())
     }
 
+    fn ensure_terminal_request_allowed(
+        &self,
+        action: &str,
+        request: &proto::TerminalRequest,
+    ) -> Result<(), String> {
+        let config = self.config_tx.borrow().clone();
+        match action {
+            "create_ssh" | "answer_ssh_prompt" | "cancel_ssh_prompt" => {
+                if config.enable_web_ssh_terminal {
+                    Ok(())
+                } else {
+                    Err("web SSH terminal is disabled in desktop Remote settings".to_string())
+                }
+            }
+            "list" => {
+                if config.enable_web_terminal || config.enable_web_ssh_terminal {
+                    Ok(())
+                } else {
+                    Err("web terminal is disabled in desktop Remote settings".to_string())
+                }
+            }
+            "attach" | "snapshot" | "input" | "resize" | "rename" | "close" | "detach"
+            | "ssh_latency" => {
+                let session = self
+                    .terminal_registry
+                    .session_record(request.session_id.trim().to_string())?;
+                let allowed = if session.kind.trim() == "ssh" {
+                    config.enable_web_ssh_terminal
+                } else {
+                    config.enable_web_terminal
+                };
+                if allowed {
+                    Ok(())
+                } else if session.kind.trim() == "ssh" {
+                    Err("web SSH terminal is disabled in desktop Remote settings".to_string())
+                } else {
+                    Err("web terminal is disabled in desktop Remote settings".to_string())
+                }
+            }
+            "close_project" => {
+                if config.enable_web_terminal || config.enable_web_ssh_terminal {
+                    Ok(())
+                } else {
+                    Err("web terminal is disabled in desktop Remote settings".to_string())
+                }
+            }
+            _ => {
+                if config.enable_web_terminal {
+                    Ok(())
+                } else {
+                    Err("web terminal is disabled in desktop Remote settings".to_string())
+                }
+            }
+        }
+    }
+
     async fn send_agent_envelope(&self, envelope: proto::AgentEnvelope) -> Result<(), String> {
         let sender = self.current_outbound_sender()?;
         send_agent_envelope_to(sender, envelope).await
@@ -3546,6 +3731,22 @@ fn terminal_session_to_proto(session: TerminalSessionRecord) -> proto::TerminalS
             .unwrap_or_default(),
         exit_code: session.exit_code.unwrap_or_default(),
         running: session.running,
+        kind: if session.kind.trim() == "ssh" {
+            "ssh".to_string()
+        } else {
+            "local".to_string()
+        },
+        ssh: session.ssh.map(|ssh| proto::TerminalSshMetadata {
+            host_id: ssh.host_id,
+            host_name: ssh.host_name,
+            username: ssh.username,
+            host: ssh.host,
+            port: u32::from(ssh.port),
+            auth_type: ssh.auth_type,
+            status: ssh.status,
+            reconnect_attempt: u32::from(ssh.reconnect_attempt),
+            reconnect_max_attempts: u32::from(ssh.reconnect_max_attempts),
+        }),
     }
 }
 
@@ -3574,6 +3775,8 @@ fn terminal_list_response_to_proto(
         default_shell: String::new(),
         output_start_offset: 0,
         output_end_offset: 0,
+        ssh_prompt: None,
+        latency_ms: 0,
     }
 }
 
@@ -3591,6 +3794,8 @@ fn terminal_record_response_to_proto(
         default_shell: String::new(),
         output_start_offset: 0,
         output_end_offset: 0,
+        ssh_prompt: None,
+        latency_ms: 0,
     }
 }
 
@@ -3608,6 +3813,38 @@ fn terminal_snapshot_response_to_proto(
         default_shell: String::new(),
         output_start_offset: snapshot.output_start_offset,
         output_end_offset: snapshot.output_end_offset,
+        ssh_prompt: None,
+        latency_ms: 0,
+    }
+}
+
+fn terminal_ssh_create_response_to_proto(
+    action: String,
+    response: TerminalSshCreateResponse,
+) -> proto::TerminalResponse {
+    proto::TerminalResponse {
+        action,
+        sessions: Vec::new(),
+        session: response.session.map(terminal_session_to_proto),
+        output: response.output,
+        truncated: response.truncated,
+        shell_options: Vec::new(),
+        default_shell: String::new(),
+        output_start_offset: response.output_start_offset,
+        output_end_offset: response.output_end_offset,
+        ssh_prompt: response.ssh_prompt.map(|prompt| proto::TerminalSshPrompt {
+            id: prompt.id,
+            kind: prompt.kind,
+            host_id: prompt.host_id,
+            host_name: prompt.host_name,
+            host: prompt.host,
+            port: u32::from(prompt.port),
+            message: prompt.message,
+            fingerprint_sha256: prompt.fingerprint_sha256,
+            key_type: prompt.key_type,
+            answer_echo: prompt.answer_echo,
+        }),
+        latency_ms: 0,
     }
 }
 
@@ -4055,6 +4292,7 @@ mod tests {
             auto_reconnect: true,
             heartbeat_interval: 30,
             enable_web_terminal: false,
+            enable_web_ssh_terminal: false,
             enable_web_git: false,
             enable_web_tunnels: false,
         };
@@ -4104,6 +4342,7 @@ mod tests {
             auto_reconnect: true,
             heartbeat_interval: 30,
             enable_web_terminal: false,
+            enable_web_ssh_terminal: false,
             enable_web_git: false,
             enable_web_tunnels: false,
         };
diff --git a/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx b/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
index 94cbc47d2..32cb46bd3 100644
--- a/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
@@ -1,7 +1,3 @@
-import "@xterm/xterm/css/xterm.css";
-
-import { FitAddon } from "@xterm/addon-fit";
-import { Terminal as XTerm } from "@xterm/xterm";
 import {
   type CSSProperties,
   type KeyboardEvent as ReactKeyboardEvent,
@@ -20,11 +16,11 @@ import type {
   ProjectToolsPanelTab,
   SshHostConfig,
 } from "../../lib/settings";
+import { workspaceProjectPathKey } from "../../lib/settings";
 import type { GitClient } from "../../lib/git/types";
 import { cn } from "../../lib/shared/utils";
 import type {
   TerminalClient,
-  TerminalEvent,
   TerminalSession,
   TerminalShellOption,
   TerminalSnapshot,
@@ -59,6 +55,7 @@ import {
 import { LocalTunnelPanel, type LocalTunnelClient } from "./LocalTunnelPanel";
 import { ProjectFileTreePanel } from "./ProjectFileTreePanel";
 import { SshTunnelPanel } from "./SshTunnelPanel";
+import { XTermViewport } from "./XTermViewport";
 
 const MIN_PANEL_WIDTH = 320;
 const DEFAULT_MAX_PANEL_WIDTH = 720;
@@ -108,6 +105,7 @@ type ProjectToolsPanelProps = {
   onTunnelOpenChange?: (open: boolean) => void;
   onSshTunnelOpenChange?: (open: boolean) => void;
   onSshProjectHostIdsChange?: (hostIds: string[]) => void;
+  onOpenSshSession?: (session: TerminalSession) => void;
   onSessionsChange?: (sessions: TerminalSession[]) => void;
   onInsertFileMention?: (path: string, kind: "file" | "dir") => void;
   onOpenFile?: (path: string) => void;
@@ -170,6 +168,17 @@ function areSessionsEqual(left: TerminalSession[], right: TerminalSession[]) {
       session.cwd === other.cwd &&
       session.shell === other.shell &&
       session.title === other.title &&
+      session.kind === other.kind &&
+      (session.ssh?.hostId ?? "") === (other.ssh?.hostId ?? "") &&
+      (session.ssh?.hostName ?? "") === (other.ssh?.hostName ?? "") &&
+      (session.ssh?.username ?? "") === (other.ssh?.username ?? "") &&
+      (session.ssh?.host ?? "") === (other.ssh?.host ?? "") &&
+      (session.ssh?.port ?? 0) === (other.ssh?.port ?? 0) &&
+      (session.ssh?.authType ?? "") === (other.ssh?.authType ?? "") &&
+      (session.ssh?.status ?? "") === (other.ssh?.status ?? "") &&
+      (session.ssh?.reconnectAttempt ?? 0) === (other.ssh?.reconnectAttempt ?? 0) &&
+      (session.ssh?.reconnectMaxAttempts ?? 0) ===
+        (other.ssh?.reconnectMaxAttempts ?? 0) &&
       session.pid === other.pid &&
       session.cols === other.cols &&
       session.rows === other.rows &&
@@ -188,6 +197,13 @@ function formatTerminalSessionTitle(title: string, terminalLabel: string) {
   return match[1] ? `${terminalLabel} ${match[1]}` : terminalLabel;
 }
 
+function terminalSessionBelongsToProject(session: TerminalSession, projectPathKey: string) {
+  const wantedProjectKey = workspaceProjectPathKey(projectPathKey);
+  if (!wantedProjectKey) return false;
+  const sessionProjectKey = workspaceProjectPathKey(session.projectPathKey || session.cwd);
+  return sessionProjectKey === wantedProjectKey;
+}
+
 function dirname(path: string) {
   const normalized = path.replace(/\\/g, "/").replace(/\/+$/, "");
   const index = normalized.lastIndexOf("/");
@@ -334,330 +350,6 @@ function reorderTabIdsByKeyboard(tabIds: readonly string[], tabId: string, key:
   return nextTabIds;
 }
 
-function terminalTheme(theme: "light" | "dark") {
-  if (theme === "dark") {
-    return {
-      background: "#0b0f14",
-      foreground: "#d6deeb",
-      cursor: "#f8fafc",
-      selectionBackground: "#334155",
-      black: "#0f172a",
-      red: "#ef4444",
-      green: "#22c55e",
-      yellow: "#eab308",
-      blue: "#38bdf8",
-      magenta: "#c084fc",
-      cyan: "#2dd4bf",
-      white: "#e5e7eb",
-    };
-  }
-  return {
-    background: "#ffffff",
-    foreground: "#172033",
-    cursor: "#111827",
-    selectionBackground: "#dbeafe",
-    black: "#111827",
-    red: "#dc2626",
-    green: "#16a34a",
-    yellow: "#ca8a04",
-    blue: "#2563eb",
-    magenta: "#9333ea",
-    cyan: "#0891b2",
-    white: "#f8fafc",
-  };
-}
-
-function terminalContainerHasSize(container: HTMLElement) {
-  const rect = container.getBoundingClientRect();
-  return rect.width > 0 && rect.height > 0;
-}
-
-function XTermViewport({
-  client,
-  session,
-  theme,
-  isActive,
-  initialSnapshot,
-  onError,
-  onInitialSnapshotConsumed,
-}: {
-  client: TerminalClient;
-  session: TerminalSession;
-  theme: "light" | "dark";
-  isActive: boolean;
-  initialSnapshot?: TerminalSnapshot;
-  onError: (message: string | null) => void;
-  onInitialSnapshotConsumed?: (sessionId: string) => void;
-}) {
-  const containerRef = useRef<HTMLDivElement>(null);
-  const resizeTimerRef = useRef<number | null>(null);
-  const clientRef = useRef(client);
-  const sessionRef = useRef(session);
-  const themeRef = useRef(theme);
-  const onErrorRef = useRef(onError);
-  const initialSnapshotRef = useRef(initialSnapshot);
-  const onInitialSnapshotConsumedRef = useRef(onInitialSnapshotConsumed);
-  clientRef.current = client;
-  sessionRef.current = session;
-  themeRef.current = theme;
-  onErrorRef.current = onError;
-  onInitialSnapshotConsumedRef.current = onInitialSnapshotConsumed;
-
-  const termRef = useRef<XTerm | null>(null);
-  const fitAndResizeRef = useRef<(() => void) | null>(null);
-
-  useEffect(() => {
-    if (!termRef.current) return;
-    termRef.current.options.theme = terminalTheme(theme);
-  }, [theme]);
-
-  useEffect(() => {
-    if (!isActive) {
-      termRef.current?.blur();
-      return;
-    }
-    termRef.current?.focus();
-    window.setTimeout(() => {
-      fitAndResizeRef.current?.();
-    }, 0);
-  }, [isActive]);
-
-  useEffect(() => {
-    const container = containerRef.current;
-    if (!container) return;
-
-    let disposed = false;
-    let snapshotLoaded = false;
-    let loadingSnapshot = false;
-    let lastOutputOffset = 0;
-    const bufferedEvents: TerminalEvent[] = [];
-    const term = new XTerm({
-      cursorBlink: true,
-      disableStdin: !sessionRef.current.running,
-      fontFamily:
-        '"SF Mono", SFMono-Regular, Menlo, Monaco, "Cascadia Code", Consolas, "Liberation Mono", monospace',
-      fontSize: 12,
-      fontWeight: "normal",
-      fontWeightBold: "bold",
-      lineHeight: 1.1,
-      letterSpacing: 0,
-      scrollback: 5000,
-      theme: terminalTheme(themeRef.current),
-    });
-    termRef.current = term;
-    const fit = new FitAddon();
-    term.loadAddon(fit);
-    term.open(container);
-
-    const fitAndResize = () => {
-      if (disposed) return;
-      if (!terminalContainerHasSize(container)) return;
-      try {
-        fit.fit();
-        const s = sessionRef.current;
-        void clientRef.current
-          .resize(s.id, term.cols, term.rows, s.projectPathKey)
-          .catch(() => undefined);
-      } catch {
-        // xterm fit can throw while the panel is hidden or measuring at zero size.
-      }
-    };
-    fitAndResizeRef.current = fitAndResize;
-
-    const resizeObserver = new ResizeObserver(() => {
-      if (resizeTimerRef.current !== null) {
-        window.clearTimeout(resizeTimerRef.current);
-      }
-      resizeTimerRef.current = window.setTimeout(fitAndResize, 40);
-    });
-    resizeObserver.observe(container);
-    window.setTimeout(fitAndResize, 0);
-
-    const dataDisposable = term.onData((data) => {
-      const s = sessionRef.current;
-      if (!s.running) return;
-      void clientRef.current.input(s.id, data, s.projectPathKey).catch((error) => {
-        onErrorRef.current(error instanceof Error ? error.message : String(error));
-      });
-    });
-
-    const applySnapshot = (snapshot: TerminalSnapshot) => {
-      if (snapshot.output) {
-        term.write(snapshot.output);
-      }
-      lastOutputOffset = terminalSnapshotEndOffset(snapshot);
-      snapshotLoaded = true;
-      loadingSnapshot = false;
-      term.options.disableStdin = !snapshot.session.running;
-      replayBufferedEvents();
-      window.setTimeout(fitAndResize, 0);
-    };
-
-    const replayBufferedEvents = () => {
-      const events = bufferedEvents.splice(0);
-      for (const event of events) {
-        writeTerminalEvent(
-          term,
-          event,
-          (nextOffset) => {
-            lastOutputOffset = nextOffset;
-          },
-          lastOutputOffset,
-        );
-      }
-    };
-
-    const loadSnapshot = () => {
-      if (disposed || loadingSnapshot) return;
-      const initial = initialSnapshotRef.current;
-      if (initial?.session.id === sessionRef.current.id) {
-        initialSnapshotRef.current = undefined;
-        onInitialSnapshotConsumedRef.current?.(initial.session.id);
-        applySnapshot(initial);
-        return;
-      }
-      loadingSnapshot = true;
-      const s = sessionRef.current;
-      void clientRef.current
-        .snapshot(s.id, undefined, s.projectPathKey)
-        .then((snapshot) => {
-          if (disposed) return;
-          applySnapshot(snapshot);
-        })
-        .catch((error) => {
-          loadingSnapshot = false;
-          if (!disposed) {
-            onErrorRef.current(error instanceof Error ? error.message : String(error));
-            snapshotLoaded = true;
-            replayBufferedEvents();
-          }
-        });
-    };
-
-    const unsubscribe = clientRef.current.subscribe((event) => {
-      if (disposed || event.sessionId !== session.id) return;
-      if (event.kind === "output" && event.data) {
-        if (snapshotLoaded && !loadingSnapshot) {
-          writeTerminalEvent(
-            term,
-            event,
-            (nextOffset) => {
-              lastOutputOffset = nextOffset;
-            },
-            lastOutputOffset,
-          );
-        } else {
-          bufferedEvents.push(event);
-        }
-      }
-      if (event.kind === "exit" || event.kind === "closed") {
-        term.options.disableStdin = true;
-      }
-    });
-
-    loadSnapshot();
-
-    return () => {
-      disposed = true;
-      termRef.current = null;
-      fitAndResizeRef.current = null;
-      unsubscribe();
-      dataDisposable.dispose();
-      resizeObserver.disconnect();
-      if (resizeTimerRef.current !== null) {
-        window.clearTimeout(resizeTimerRef.current);
-        resizeTimerRef.current = null;
-      }
-      const s = sessionRef.current;
-      void clientRef.current.detach(s.id, s.projectPathKey).catch(() => undefined);
-      term.dispose();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [session.id, session.projectPathKey]);
-
-  return <div ref={containerRef} className="h-full min-h-0 w-full overflow-hidden px-2 py-2" />;
-}
-
-function terminalSnapshotEndOffset(snapshot: TerminalSnapshot) {
-  if (
-    typeof snapshot.outputEndOffset === "number" &&
-    Number.isFinite(snapshot.outputEndOffset) &&
-    snapshot.outputEndOffset >= 0
-  ) {
-    return snapshot.outputEndOffset;
-  }
-  const startOffset =
-    typeof snapshot.outputStartOffset === "number" &&
-    Number.isFinite(snapshot.outputStartOffset) &&
-    snapshot.outputStartOffset >= 0
-      ? snapshot.outputStartOffset
-      : 0;
-  return startOffset + utf8ByteLength(snapshot.output);
-}
-
-function writeTerminalEvent(
-  term: XTerm,
-  event: TerminalEvent,
-  setLastOutputOffset: (offset: number) => void,
-  lastOutputOffset: number,
-): "written" | "skipped" {
-  const data = event.data ?? "";
-  if (!data) return "skipped";
-  const startOffset = event.outputStartOffset;
-  const endOffset = event.outputEndOffset;
-  if (
-    typeof startOffset === "number" &&
-    Number.isFinite(startOffset) &&
-    typeof endOffset === "number" &&
-    Number.isFinite(endOffset) &&
-    endOffset >= startOffset
-  ) {
-    if (endOffset <= lastOutputOffset) return "skipped";
-    const alreadyWritten = Math.max(0, lastOutputOffset - startOffset);
-    term.write(alreadyWritten > 0 ? sliceUtf8Bytes(data, alreadyWritten) : data);
-    setLastOutputOffset(endOffset);
-    return "written";
-  }
-  term.write(data);
-  setLastOutputOffset(lastOutputOffset + utf8ByteLength(data));
-  return "written";
-}
-
-function sliceUtf8Bytes(value: string, byteOffset: number) {
-  if (byteOffset <= 0) return value;
-  let consumed = 0;
-  let index = 0;
-  for (const segment of value) {
-    const next = consumed + utf8ByteLengthOfCodePoint(segment);
-    if (next <= byteOffset) {
-      consumed = next;
-      index += segment.length;
-      continue;
-    }
-    if (consumed < byteOffset) {
-      index += segment.length;
-    }
-    return value.slice(index);
-  }
-  return "";
-}
-
-function utf8ByteLength(value: string) {
-  let length = 0;
-  for (const segment of value) {
-    length += utf8ByteLengthOfCodePoint(segment);
-  }
-  return length;
-}
-
-function utf8ByteLengthOfCodePoint(value: string) {
-  const codePoint = value.codePointAt(0) ?? 0;
-  if (codePoint <= 0x7f) return 1;
-  if (codePoint <= 0x7ff) return 2;
-  if (codePoint <= 0xffff) return 3;
-  return 4;
-}
-
 export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
   const {
     isOpen,
@@ -695,6 +387,7 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     onTunnelOpenChange,
     onSshTunnelOpenChange,
     onSshProjectHostIdsChange,
+    onOpenSshSession,
     onSessionsChange,
     onInsertFileMention,
     onOpenFile,
@@ -738,6 +431,18 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
   const effectiveWidthCollapsed = !isOpen && collapseImmediately ? true : widthCollapsed;
   const effectiveShouldRenderContent = !isOpen && collapseImmediately ? false : shouldRenderContent;
   const isControlled = externalSessions !== undefined;
+  const localSessions = useMemo(
+    () =>
+      sessions.filter(
+        (session) =>
+          session.kind !== "ssh" && terminalSessionBelongsToProject(session, projectPathKey),
+      ),
+    [projectPathKey, sessions],
+  );
+  const sshSessions = useMemo(
+    () => sessions.filter((session) => session.kind === "ssh"),
+    [sessions],
+  );
   const fileTreeInitialized = Boolean(projectPathKey && fileTreeOpen);
   const gitReviewInitialized = Boolean(projectPathKey && gitReviewOpen);
   const tunnelInitialized = Boolean(tunnelOpen && tunnelClient);
@@ -759,17 +464,18 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
           : "terminal";
 
   const activeSession = useMemo(
-    () => sessions.find((session) => session.id === activeSessionId) ?? sessions[0] ?? null,
-    [activeSessionId, sessions],
+    () =>
+      localSessions.find((session) => session.id === activeSessionId) ?? localSessions[0] ?? null,
+    [activeSessionId, localSessions],
   );
   const pendingCloseSession = useMemo(
-    () => sessions.find((session) => session.id === pendingCloseSessionId) ?? null,
-    [pendingCloseSessionId, sessions],
+    () => localSessions.find((session) => session.id === pendingCloseSessionId) ?? null,
+    [localSessions, pendingCloseSessionId],
   );
   const [draftTabOrder, setDraftTabOrder] = useState<string[] | null>(null);
   const [draggingTabId, setDraggingTabId] = useState("");
   const visibleTabs = useMemo<ProjectToolsTab[]>(() => {
-    const terminalTabs: ProjectToolsTab[] = sessions.map((session) => ({
+    const terminalTabs: ProjectToolsTab[] = localSessions.map((session) => ({
       id: session.id,
       kind: "terminal",
       session,
@@ -788,7 +494,13 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
       nextTabs.push({ id: SSH_TUNNEL_TAB_ID, kind: "sshTunnel" });
     }
     return nextTabs;
-  }, [fileTreeInitialized, gitReviewInitialized, sessions, sshTunnelInitialized, tunnelInitialized]);
+  }, [
+    fileTreeInitialized,
+    gitReviewInitialized,
+    localSessions,
+    sshTunnelInitialized,
+    tunnelInitialized,
+  ]);
   const effectiveTabOrder = draftTabOrder ?? tabOrder;
   const orderedProjectTabs = useMemo(
     () => orderProjectToolsTabs(visibleTabs, effectiveTabOrder),
@@ -881,13 +593,13 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     setLoading(true);
     setError(null);
     void client
-      .list(projectPathKey)
+      .list()
       .then((nextSessions) => {
         publishSessions(nextSessions, { notifyParent: !isControlled });
       })
       .catch((err) => setError(err instanceof Error ? err.message : String(err)))
       .finally(() => setLoading(false));
-  }, [client, isControlled, projectPathKey, publishSessions, terminalReady]);
+  }, [client, isControlled, publishSessions, terminalReady]);
 
   useEffect(() => {
     if (!isOpen || isControlled) return;
@@ -993,7 +705,6 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
   useEffect(() => {
     if (!terminalReady || isControlled) return;
     return client.subscribe((event) => {
-      if (event.projectPathKey !== projectPathKey) return;
       if (event.kind === "output") return;
       setSessions((current) => {
         let next = current;
@@ -1043,10 +754,38 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
 
   useEffect(() => {
     if (!pendingCloseSessionId) return;
-    if (!sessions.some((session) => session.id === pendingCloseSessionId)) {
+    if (!localSessions.some((session) => session.id === pendingCloseSessionId)) {
       setPendingCloseSessionId("");
     }
-  }, [pendingCloseSessionId, sessions]);
+  }, [localSessions, pendingCloseSessionId]);
+
+  const rememberTerminalSnapshot = useCallback(
+    (snapshot: TerminalSnapshot) => {
+      initialTerminalSnapshotsRef.current.set(snapshot.session.id, snapshot);
+      setSessions((current) => {
+        const next = sortSessions([
+          ...current.filter((session) => session.id !== snapshot.session.id),
+          snapshot.session,
+        ]);
+        onSessionsChange?.(next);
+        return next;
+      });
+    },
+    [onSessionsChange],
+  );
+
+  const forgetTerminalSession = useCallback(
+    (sessionId: string) => {
+      initialTerminalSnapshotsRef.current.delete(sessionId);
+      setPendingCloseSessionId((current) => (current === sessionId ? "" : current));
+      setSessions((current) => {
+        const next = sortSessions(current.filter((item) => item.id !== sessionId));
+        onSessionsChange?.(next);
+        return next;
+      });
+    },
+    [onSessionsChange],
+  );
 
   const createTerminal = useCallback(
     (shell?: string) => {
@@ -1062,22 +801,22 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
           rows: DEFAULT_TERMINAL_ROWS,
         })
         .then((snapshot) => {
-          initialTerminalSnapshotsRef.current.set(snapshot.session.id, snapshot);
-          setSessions((current) => {
-            const next = sortSessions([
-              ...current.filter((session) => session.id !== snapshot.session.id),
-              snapshot.session,
-            ]);
-            onSessionsChange?.(next);
-            return next;
-          });
+          rememberTerminalSnapshot(snapshot);
           setActiveSessionId(snapshot.session.id);
           onActiveTabChange("terminal");
         })
         .catch((err) => setError(err instanceof Error ? err.message : String(err)))
         .finally(() => setCreating(false));
     },
-    [client, creating, cwd, onActiveTabChange, onSessionsChange, projectPathKey, terminalReady],
+    [
+      client,
+      creating,
+      cwd,
+      onActiveTabChange,
+      projectPathKey,
+      rememberTerminalSnapshot,
+      terminalReady,
+    ],
   );
 
   const handleCreate = useCallback(() => {
@@ -1092,18 +831,12 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
       void client
         .close(session.id, session.projectPathKey)
         .then(() => {
-          initialTerminalSnapshotsRef.current.delete(session.id);
-          setPendingCloseSessionId((current) => (current === session.id ? "" : current));
-          setSessions((current) => {
-            const next = sortSessions(current.filter((item) => item.id !== session.id));
-            onSessionsChange?.(next);
-            return next;
-          });
+          forgetTerminalSession(session.id);
         })
         .catch((err) => setError(err instanceof Error ? err.message : String(err)))
         .finally(() => setClosingSessionId((current) => (current === session.id ? "" : current)));
     },
-    [client, closingSessionId, onSessionsChange],
+    [client, closingSessionId, forgetTerminalSession],
   );
 
   const handleInitialTerminalSnapshotConsumed = useCallback((sessionId: string) => {
@@ -2083,16 +1816,22 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                     )}
                   >
                     <SshTunnelPanel
+                      cwd={cwd}
                       projectPathKey={projectPathKey}
                       hosts={sshHosts}
                       associatedHostIds={associatedSshHostIds}
+                      client={client}
+                      sessions={sshSessions}
+                      onSessionSnapshot={rememberTerminalSnapshot}
+                      onSessionClosed={forgetTerminalSession}
+                      onOpenSession={(session) => onOpenSshSession?.(session)}
                       onAssociatedHostIdsChange={(hostIds) => {
                         onSshProjectHostIdsChange?.(hostIds);
                       }}
                     />
                   </div>
                 ) : null}
-                {sessions.length > 0 ? (
+                {localSessions.length > 0 ? (
                   <div
                     className={cn(
                       "min-h-0 flex-1 flex-col",
@@ -2105,7 +1844,7 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                       </div>
                     ) : null}
                     <div className="relative min-h-0 flex-1">
-                      {sessions.map((session) => {
+                      {localSessions.map((session) => {
                         const isActiveTerminal =
                           currentActiveTab === "terminal" && activeSession?.id === session.id;
                         return (
diff --git a/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
index d0cf553b6..9bde0cd72 100644
--- a/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
@@ -1,18 +1,55 @@
-import { useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useLocale } from "../../i18n";
 import type { SshHostConfig } from "../../lib/settings";
+import { workspaceProjectPathKey } from "../../lib/settings";
 import { cn } from "../../lib/shared/utils";
-import { ArrowLeft, Check, ChevronDown, Globe, Key, Plus, Server, Settings } from "../icons";
+import type {
+  TerminalClient,
+  TerminalSession,
+  TerminalSnapshot,
+  TerminalSshPrompt,
+} from "../../lib/terminal/types";
+import {
+  AlertTriangle,
+  ArrowLeft,
+  Check,
+  ChevronDown,
+  Clock3,
+  Globe,
+  Key,
+  Loader2,
+  Plus,
+  RefreshCw,
+  Server,
+  Settings,
+  Shield,
+  Terminal,
+  Wifi,
+  WifiOff,
+  X,
+} from "../icons";
 import { Button } from "../ui/button";
-import { Textarea } from "../ui/textarea";
+import { useConfirmDialog } from "../ui/confirm-dialog";
 
 type SshTunnelScope = "project" | "all";
 type SshTunnelView = "list" | "settings" | "create";
 
+type SshLatencyState = {
+  latencyMs?: number;
+  loading: boolean;
+  failed: boolean;
+};
+
 type SshTunnelPanelProps = {
+  cwd: string;
   projectPathKey: string;
   hosts: SshHostConfig[];
   associatedHostIds: string[];
+  client: TerminalClient;
+  sessions: TerminalSession[];
+  onSessionSnapshot: (snapshot: TerminalSnapshot) => void;
+  onSessionClosed: (sessionId: string) => void;
+  onOpenSession: (session: TerminalSession) => void;
   onAssociatedHostIdsChange: (hostIds: string[]) => void;
 };
 
@@ -27,16 +64,77 @@ function authLabel(host: Pick<SshHostConfig, "authType">, t: (key: string) => st
     : t("settings.sshAuthPassword");
 }
 
-function hostHasMeta(host: SshHostConfig) {
+function hostHasProxy(host: SshHostConfig) {
   return (
-    (host.authType === "privateKey" &&
-      (host.privateKeyPath.trim().length > 0 || host.privateKeyConfigured === true)) ||
     host.proxy.url.trim().length > 0 ||
     host.proxy.port > 0 ||
+    host.proxy.username.trim().length > 0 ||
     host.proxy.passwordConfigured === true
   );
 }
 
+function hostSecretReady(host: SshHostConfig) {
+  if (host.authType === "privateKey") {
+    return (
+      host.privateKey.trim().length > 0 ||
+      host.privateKeyPath.trim().length > 0 ||
+      host.privateKeyConfigured === true
+    );
+  }
+  return host.password.trim().length > 0 || host.passwordConfigured === true;
+}
+
+function hostStatusMessage(host: SshHostConfig, t: (key: string) => string) {
+  if (hostHasProxy(host)) return t("projectTools.sshTunnelProxyUnsupported");
+  if (!hostSecretReady(host)) return t("projectTools.sshTunnelMissingSecret");
+  return "";
+}
+
+function sessionBelongsToProject(session: TerminalSession, projectPathKey: string) {
+  const wantedProjectKey = workspaceProjectPathKey(projectPathKey);
+  if (!wantedProjectKey) return false;
+  const sessionProjectKey = workspaceProjectPathKey(session.projectPathKey || session.cwd);
+  return sessionProjectKey === wantedProjectKey;
+}
+
+function sessionTitle(session: TerminalSession, fallback: string) {
+  return session.title || session.ssh?.hostName || fallback;
+}
+
+function sessionEndpointLabel(session: TerminalSession) {
+  const ssh = session.ssh;
+  if (!ssh) return session.cwd || session.projectPathKey;
+  const userPrefix = ssh.username.trim() ? `${ssh.username.trim()}@` : "";
+  return `${userPrefix}${ssh.host}:${ssh.port}`;
+}
+
+function sessionProjectLabel(session: TerminalSession) {
+  return session.projectPathKey || session.cwd || "";
+}
+
+function sshSessionStatus(session: TerminalSession) {
+  const status = session.ssh?.status ?? (session.running ? "connected" : "disconnected");
+  if (status === "connected" && !session.running) return "disconnected";
+  return status;
+}
+
+function sshSessionConnected(session: TerminalSession) {
+  return sshSessionStatus(session) === "connected" && session.running;
+}
+
+function sshStatusLabel(session: TerminalSession, t: (key: string) => string) {
+  const status = sshSessionStatus(session);
+  if (status === "reconnecting") {
+    const attempt = Math.max(1, Number(session.ssh?.reconnectAttempt ?? 1));
+    const max = Math.max(attempt, Number(session.ssh?.reconnectMaxAttempts ?? 3));
+    return t("projectTools.sshTunnelReconnecting")
+      .replace("{attempt}", String(attempt))
+      .replace("{max}", String(max));
+  }
+  if (status === "disconnected") return t("projectTools.sshTunnelDisconnected");
+  return t("projectTools.sshTunnelConnected");
+}
+
 function HostMetaTags(props: { host: SshHostConfig }) {
   const { host } = props;
   const { t } = useLocale();
@@ -46,7 +144,10 @@ function HostMetaTags(props: { host: SshHostConfig }) {
   } else if (host.authType === "privateKey" && host.privateKeyConfigured) {
     tags.push(t("settings.sshPrivateKeyConfigured"));
   }
-  if (host.proxy.url.trim().length > 0 || host.proxy.port > 0 || host.proxy.passwordConfigured) {
+  if (host.privateKeyPassphraseConfigured) {
+    tags.push(t("settings.sshPrivateKeyPassphraseConfigured"));
+  }
+  if (hostHasProxy(host)) {
     tags.push(t("settings.sshAdvancedProxy"));
   }
   if (tags.length === 0) return null;
@@ -66,21 +167,126 @@ function HostMetaTags(props: { host: SshHostConfig }) {
 }
 
 export function SshTunnelPanel(props: SshTunnelPanelProps) {
-  const { projectPathKey, hosts, associatedHostIds, onAssociatedHostIdsChange } = props;
+  const {
+    cwd,
+    projectPathKey,
+    hosts,
+    associatedHostIds,
+    client,
+    sessions,
+    onSessionSnapshot,
+    onSessionClosed,
+    onOpenSession,
+    onAssociatedHostIdsChange,
+  } = props;
   const { t } = useLocale();
+  const { confirm: requestCloseSessionConfirm, dialog: closeSessionConfirmDialog } =
+    useConfirmDialog();
   const [scope, setScope] = useState<SshTunnelScope>("project");
   const [view, setView] = useState<SshTunnelView>("list");
   const [createHostId, setCreateHostId] = useState("");
-  const [createSftpEnabled, setCreateSftpEnabled] = useState(false);
-  const [createNote, setCreateNote] = useState("");
+  const [createTitle, setCreateTitle] = useState("");
+  const [creating, setCreating] = useState(false);
+  const [closingSessionId, setClosingSessionId] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const [prompt, setPrompt] = useState<TerminalSshPrompt | null>(null);
+  const [promptAnswer, setPromptAnswer] = useState("");
+  const [answeringPrompt, setAnsweringPrompt] = useState(false);
+  const [latencyBySessionId, setLatencyBySessionId] = useState<Record<string, SshLatencyState>>(
+    {},
+  );
+  const latencyRequestsRef = useRef<Set<string>>(new Set());
   const associatedSet = useMemo(() => new Set(associatedHostIds), [associatedHostIds]);
   const associatedHosts = useMemo(
     () => hosts.filter((host) => associatedSet.has(host.id)),
     [associatedSet, hosts],
   );
-  const selectedCreateHostId = associatedSet.has(createHostId)
+  const sshSessions = useMemo(
+    () => sessions.filter((session) => session.kind === "ssh" && session.ssh),
+    [sessions],
+  );
+  const projectSshSessions = useMemo(
+    () => sshSessions.filter((session) => sessionBelongsToProject(session, projectPathKey)),
+    [projectPathKey, sshSessions],
+  );
+  const visibleSessions = scope === "project" ? projectSshSessions : sshSessions;
+  const canCreateInScope = scope === "project";
+  const createHosts = canCreateInScope ? associatedHosts : [];
+  const selectedCreateHostId = createHosts.some((host) => host.id === createHostId)
     ? createHostId
-    : (associatedHosts[0]?.id ?? "");
+    : (createHosts[0]?.id ?? "");
+  const selectedCreateHost = createHosts.find((host) => host.id === selectedCreateHostId) ?? null;
+  const selectedHostMessage = selectedCreateHost ? hostStatusMessage(selectedCreateHost, t) : "";
+  const canCreate = Boolean(
+    canCreateInScope && selectedCreateHost && !selectedHostMessage && !creating,
+  );
+  useEffect(() => {
+    if (canCreateInScope || view !== "create") return;
+    setView("list");
+  }, [canCreateInScope, view]);
+
+  const refreshSessionLatency = useCallback(
+    (session: TerminalSession) => {
+      if (!sshSessionConnected(session) || session.kind !== "ssh") return;
+      if (latencyRequestsRef.current.has(session.id)) return;
+      latencyRequestsRef.current.add(session.id);
+      setLatencyBySessionId((current) => ({
+        ...current,
+        [session.id]: {
+          latencyMs: current[session.id]?.latencyMs,
+          loading: true,
+          failed: false,
+        },
+      }));
+      void client
+        .sshLatency(session.id, session.projectPathKey)
+        .then((latency) => {
+          setLatencyBySessionId((current) => ({
+            ...current,
+            [session.id]: {
+              latencyMs: latency.latencyMs,
+              loading: false,
+              failed: false,
+            },
+          }));
+        })
+        .catch(() => {
+          setLatencyBySessionId((current) => ({
+            ...current,
+            [session.id]: {
+              loading: false,
+              failed: true,
+            },
+          }));
+        })
+        .finally(() => {
+          latencyRequestsRef.current.delete(session.id);
+        });
+    },
+    [client],
+  );
+
+  useEffect(() => {
+    const visibleIds = new Set(visibleSessions.map((session) => session.id));
+    setLatencyBySessionId((current) => {
+      const next = Object.fromEntries(
+        Object.entries(current).filter(([sessionId]) => visibleIds.has(sessionId)),
+      );
+      return Object.keys(next).length === Object.keys(current).length ? current : next;
+    });
+  }, [visibleSessions]);
+
+  useEffect(() => {
+    const connectedSshSessions = visibleSessions.filter(
+      (session) => sshSessionConnected(session) && session.kind === "ssh",
+    );
+    if (connectedSshSessions.length === 0) return;
+    connectedSshSessions.forEach(refreshSessionLatency);
+    const timer = window.setInterval(() => {
+      connectedSshSessions.forEach(refreshSessionLatency);
+    }, 10_000);
+    return () => window.clearInterval(timer);
+  }, [refreshSessionLatency, visibleSessions]);
 
   const toggleHost = (hostId: string) => {
     const current = associatedHostIds.filter((id) => hosts.some((host) => host.id === id));
@@ -90,11 +296,109 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
     onAssociatedHostIdsChange(next);
   };
 
+  const handleCreate = useCallback(() => {
+    if (!selectedCreateHost || !canCreate) return;
+    setCreating(true);
+    setError(null);
+    void client
+      .createSsh({
+        cwd,
+        projectPathKey,
+        hostId: selectedCreateHost.id,
+        title: createTitle.trim() || undefined,
+      })
+      .then((result) => {
+        if (result.prompt) {
+          setPrompt(result.prompt);
+          setPromptAnswer("");
+          setView("list");
+          return;
+        }
+        if (result.snapshot) {
+          onSessionSnapshot(result.snapshot);
+          setCreateTitle("");
+          setView("list");
+        }
+      })
+      .catch((err) => setError(err instanceof Error ? err.message : String(err)))
+      .finally(() => setCreating(false));
+  }, [
+    canCreate,
+    client,
+    createTitle,
+    cwd,
+    onSessionSnapshot,
+    projectPathKey,
+    selectedCreateHost,
+  ]);
+
+  const handleSubmitPrompt = useCallback(() => {
+    if (!prompt || answeringPrompt) return;
+    const hostKeyPrompt = prompt.kind === "hostKey";
+    if (!hostKeyPrompt && !promptAnswer.trim()) return;
+    setAnsweringPrompt(true);
+    setError(null);
+    void client
+      .answerSshPrompt({
+        promptId: prompt.id,
+        answer: hostKeyPrompt ? undefined : promptAnswer,
+        trustHostKey: hostKeyPrompt,
+      })
+      .then((result) => {
+        if (result.prompt) {
+          setPrompt(result.prompt);
+          setPromptAnswer("");
+          return;
+        }
+        setPrompt(null);
+        setPromptAnswer("");
+        if (result.snapshot) {
+          onSessionSnapshot(result.snapshot);
+          setView("list");
+        }
+      })
+      .catch((err) => setError(err instanceof Error ? err.message : String(err)))
+      .finally(() => setAnsweringPrompt(false));
+  }, [answeringPrompt, client, onSessionSnapshot, prompt, promptAnswer]);
+
+  const handleCancelPrompt = useCallback(() => {
+    const promptId = prompt?.id;
+    setPrompt(null);
+    setPromptAnswer("");
+    if (!promptId) return;
+    void client.cancelSshPrompt(promptId).catch(() => undefined);
+  }, [client, prompt]);
+
+  const handleCloseSession = useCallback(
+    async (session: TerminalSession) => {
+      if (closingSessionId === session.id) return;
+      const title = sessionTitle(session, t("projectTools.sshTunnelTitle"));
+      const confirmed = await requestCloseSessionConfirm({
+        title: t("projectTools.confirmCloseSshSession"),
+        subtitle: t("projectTools.closeSshSessionConfirm").replace("{title}", title),
+        detail: sessionEndpointLabel(session),
+        confirmLabel: t("projectTools.closeSshSessionContinue"),
+        cancelLabel: t("projectTools.closeSshSessionCancel"),
+        closeLabel: t("projectTools.closeSshSessionClose"),
+        tone: "destructive",
+      });
+      if (!confirmed) return;
+      setClosingSessionId(session.id);
+      setError(null);
+      void client
+        .close(session.id, session.projectPathKey)
+        .then(() => onSessionClosed(session.id))
+        .catch((err) => setError(err instanceof Error ? err.message : String(err)))
+        .finally(() => setClosingSessionId((current) => (current === session.id ? "" : current)));
+    },
+    [client, closingSessionId, onSessionClosed, requestCloseSessionConfirm, t],
+  );
+
   const listActive = view === "list";
   const settingsActive = view === "settings";
   const createActive = view === "create";
   const listPageClassName = cn(
-    "absolute inset-0 flex min-h-0 flex-col bg-gradient-to-b from-muted/40 via-muted/15 to-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
+    "absolute inset-0 flex min-h-0 flex-col bg-background transition-[opacity,transform] duration-200 ease-out motion-reduce:transform-none motion-reduce:transition-none",
     listActive
       ? "z-10 translate-x-0 opacity-100"
       : "pointer-events-none z-0 -translate-x-4 opacity-0",
@@ -117,10 +421,36 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
       : t("projectTools.sshTunnelAllEmpty");
   const emptyHint =
     scope === "project"
-      ? associatedHosts.length > 0
-        ? t("projectTools.sshTunnelProjectEmptyWithHosts")
-        : t("projectTools.sshTunnelProjectEmptyHint")
+      ? t("projectTools.sshTunnelProjectEmptyHint")
       : t("projectTools.sshTunnelAllEmptyHint");
+  const hasCreateHosts = createHosts.length > 0;
+  const visibleSessionCount = visibleSessions.length;
+  const connectedSessionCount = visibleSessions.filter(sshSessionConnected).length;
+  const statusText =
+    visibleSessionCount > 0
+      ? t("projectTools.sshTunnelConnectionCount")
+          .replace("{count}", String(visibleSessionCount))
+          .replace("{connected}", String(connectedSessionCount))
+      : scope === "all"
+        ? t("projectTools.sshTunnelAllEmpty")
+        : projectPathKey
+          ? t("projectTools.sshTunnelProjectEmpty")
+          : t("projectTools.sshTunnelNoProject");
+  const hostKeyPrompt = prompt?.kind === "hostKey";
+  const promptSubmitDisabled =
+    answeringPrompt || Boolean(prompt && !hostKeyPrompt && !promptAnswer.trim());
+  const latencyText = (session: TerminalSession) => {
+    const state = latencyBySessionId[session.id];
+    if (state?.failed) return t("projectTools.sshTunnelLatencyUnknown");
+    if (state?.latencyMs) {
+      return t("projectTools.sshTunnelLatencyValue").replace(
+        "{ms}",
+        String(state.latencyMs),
+      );
+    }
+    if (state?.loading) return t("projectTools.sshTunnelLatencyChecking");
+    return t("projectTools.sshTunnelLatencyUnknown");
+  };
 
   return (
     <div className="relative flex min-h-0 flex-1 overflow-hidden bg-background">
@@ -174,7 +504,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                     key={host.id}
                     type="button"
                     className={cn(
-                      "group flex w-full items-start gap-3 rounded-xl border border-border/60 bg-card px-3 py-3 text-left transition-all hover:border-emerald-500/40 hover:bg-muted/40",
+                      "group flex w-full items-start gap-3 rounded-lg border border-border/60 bg-card px-3 py-3 text-left transition-all hover:border-emerald-500/40 hover:bg-muted/40",
                       selected && "border-emerald-500/50 bg-emerald-500/5",
                     )}
                     aria-pressed={selected}
@@ -195,7 +525,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                       <div className="mt-1 truncate font-mono text-xs text-muted-foreground">
                         {endpointLabel(host)}
                       </div>
-                      {hostHasMeta(host) ? <HostMetaTags host={host} /> : null}
+                      <HostMetaTags host={host} />
                     </div>
                     <span
                       className={cn(
@@ -238,7 +568,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
           </div>
         </div>
 
-        {hosts.length === 0 || associatedHosts.length === 0 ? (
+        {createHosts.length === 0 ? (
           <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
             <div className="flex h-12 w-12 items-center justify-center rounded-xl bg-emerald-500/10 text-emerald-500">
               <Key className="h-6 w-6" />
@@ -259,7 +589,10 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         ) : (
           <form
             className="min-h-0 flex-1 overflow-y-auto px-3 py-3"
-            onSubmit={(event) => event.preventDefault()}
+            onSubmit={(event) => {
+              event.preventDefault();
+              handleCreate();
+            }}
           >
             <div className="space-y-3">
               <label className="block space-y-1.5">
@@ -274,11 +607,11 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                     <Server className="h-4 w-4" />
                   </span>
                   <select
-                    className="h-10 w-full appearance-none rounded-xl border border-border/70 bg-card/80 pl-10 pr-9 text-sm font-medium text-foreground shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] outline-none transition-colors hover:border-emerald-500/40 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                    className="h-10 w-full appearance-none rounded-lg border border-border/70 bg-card/80 pl-10 pr-9 text-sm font-medium text-foreground shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] outline-none transition-colors hover:border-emerald-500/40 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
                     value={selectedCreateHostId}
                     onChange={(event) => setCreateHostId(event.currentTarget.value)}
                   >
-                    {associatedHosts.map((host) => (
+                    {createHosts.map((host) => (
                       <option key={host.id} value={host.id}>
                         {host.name} - {endpointLabel(host)}
                       </option>
@@ -291,29 +624,48 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                 </div>
               </label>
 
-              <label className="flex min-h-10 items-center gap-3 rounded-xl border border-border/70 bg-card/80 px-3 py-2.5 shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)] transition-colors hover:border-emerald-500/40">
-                <input
-                  type="checkbox"
-                  checked={createSftpEnabled}
-                  onChange={(event) => setCreateSftpEnabled(event.currentTarget.checked)}
-                  className="h-4 w-4 shrink-0 rounded border-border text-emerald-500 accent-emerald-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-emerald-500/40"
-                />
-                <span className="min-w-0 flex-1 text-xs font-medium text-foreground">
-                  {t("projectTools.sshTunnelSftpEnabled")}
-                </span>
-              </label>
-
               <label className="block space-y-1.5">
                 <span className="text-xs font-medium text-foreground">
-                  {t("projectTools.sshTunnelNote")}
+                  {t("projectTools.sshTunnelTabTitle")}
                 </span>
-                <Textarea
-                  value={createNote}
-                  onChange={(event) => setCreateNote(event.currentTarget.value)}
-                  className="min-h-20 rounded-lg border-border/70 bg-background/80 text-xs focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
-                  placeholder={t("projectTools.sshTunnelNotePlaceholder")}
+                <input
+                  value={createTitle}
+                  onChange={(event) => setCreateTitle(event.currentTarget.value)}
+                  className="h-10 w-full rounded-lg border border-border/70 bg-background/80 px-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground/70 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                  placeholder={selectedCreateHost?.name || t("projectTools.sshTunnelTabTitlePlaceholder")}
                 />
               </label>
+
+              {selectedCreateHost ? (
+                <div className="rounded-lg border border-border/60 bg-muted/30 px-3 py-2.5">
+                  <div className="flex min-w-0 items-center gap-2">
+                    <Server className="h-4 w-4 shrink-0 text-emerald-500" />
+                    <div className="min-w-0 flex-1">
+                      <div className="truncate text-xs font-medium text-foreground">
+                        {selectedCreateHost.name}
+                      </div>
+                      <div className="truncate font-mono text-[11px] text-muted-foreground">
+                        {endpointLabel(selectedCreateHost)}
+                      </div>
+                    </div>
+                    <span className="shrink-0 rounded-md bg-background/70 px-1.5 py-0.5 text-[10.5px] text-muted-foreground">
+                      {authLabel(selectedCreateHost, t)}
+                    </span>
+                  </div>
+                  {selectedHostMessage ? (
+                    <div className="mt-2 flex gap-2 rounded-md bg-destructive/10 px-2 py-1.5 text-[11px] leading-relaxed text-destructive">
+                      <AlertTriangle className="mt-0.5 h-3.5 w-3.5 shrink-0" />
+                      <span>{selectedHostMessage}</span>
+                    </div>
+                  ) : null}
+                </div>
+              ) : null}
+
+              {error ? (
+                <div className="rounded-lg border border-destructive/20 bg-destructive/10 px-3 py-2 text-xs text-destructive">
+                  {error}
+                </div>
+              ) : null}
             </div>
 
             <div className="mt-4 flex items-center justify-end gap-2 border-t border-border/60 pt-3">
@@ -326,14 +678,11 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
               >
                 {t("projectTools.sshTunnelCreateCancel")}
               </Button>
-              <Button
-                type="submit"
-                size="sm"
-                className="h-8 rounded-lg px-3 text-xs"
-                disabled
-                title={t("projectTools.sshTunnelCreateUnavailable")}
-              >
-                {t("projectTools.sshTunnelCreate")}
+              <Button type="submit" size="sm" className="h-8 rounded-lg px-3 text-xs" disabled={!canCreate}>
+                {creating ? <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" /> : null}
+                {creating
+                  ? t("projectTools.sshTunnelConnecting")
+                  : t("projectTools.sshTunnelConnect")}
               </Button>
             </div>
           </form>
@@ -341,9 +690,9 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
       </div>
 
       <div className={listPageClassName} aria-hidden={!listActive} inert={!listActive}>
-        <div className="shrink-0 border-b border-border/60 bg-background/70 px-4 pb-3 pt-3.5 backdrop-blur-xl">
+        <div className="shrink-0 border-b border-border/60 bg-background/80 px-4 pb-3 pt-3.5 backdrop-blur-xl">
           <div className="flex items-center gap-2.5">
-            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl border border-border/60 bg-background/80 text-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_2px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
+            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border border-border/60 bg-background/80 text-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_2px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
               <Key className="h-4 w-4" />
             </div>
             <div className="min-w-0 flex-1">
@@ -351,23 +700,20 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                 {t("projectTools.sshTunnelTitle")}
               </div>
               <div className="truncate text-xs text-muted-foreground">
-                {projectPathKey
-                  ? t("projectTools.sshTunnelConfiguredHosts").replace(
-                      "{count}",
-                      String(associatedHosts.length),
-                    )
-                  : t("projectTools.sshTunnelNoProject")}
+                {statusText}
               </div>
             </div>
-            <button
-              type="button"
-              className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border/60 hover:bg-muted/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
-              title={t("projectTools.newSshTunnel")}
-              aria-label={t("projectTools.newSshTunnel")}
-              onClick={() => setView("create")}
-            >
-              <Plus className="h-4 w-4" />
-            </button>
+            {canCreateInScope ? (
+              <button
+                type="button"
+                className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border/60 hover:bg-muted/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+                title={t("projectTools.newSshTunnel")}
+                aria-label={t("projectTools.newSshTunnel")}
+                onClick={() => setView("create")}
+              >
+                <Plus className="h-4 w-4" />
+              </button>
+            ) : null}
             {scope === "project" ? (
               <button
                 type="button"
@@ -422,39 +768,251 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         </div>
 
         <div className="min-h-0 flex-1 overflow-y-auto px-3 py-3">
-          <div className="flex flex-col items-center justify-center gap-1.5 rounded-xl border border-dashed border-border/70 bg-background/40 px-4 py-10 text-center">
-            <div className="mb-1.5 flex h-12 w-12 items-center justify-center rounded-2xl border border-border/50 bg-background/80 text-muted-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_3px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
-              <Key className="h-5 w-5" />
+          {error ? (
+            <div className="mb-3 rounded-lg border border-destructive/20 bg-destructive/10 px-3 py-2 text-xs text-destructive">
+              {error}
+            </div>
+          ) : null}
+
+          {visibleSessionCount === 0 ? (
+            <div className="flex min-h-full items-center justify-center">
+              <div className="flex flex-col items-center justify-center gap-1.5 rounded-lg border border-dashed border-border/70 bg-background/40 px-4 py-8 text-center">
+                <div className="mb-1.5 flex h-12 w-12 items-center justify-center rounded-xl border border-border/50 bg-background/80 text-muted-foreground/70 shadow-[inset_0_1px_0_hsl(0_0%_100%_/_0.6),0_1px_3px_hsl(0_0%_0%_/_0.05)] dark:shadow-none">
+                  <Key className="h-5 w-5" />
+                </div>
+                <div className="text-xs font-medium text-foreground/80">{emptyTitle}</div>
+                <div className="max-w-[16rem] text-[11px] leading-relaxed text-muted-foreground">
+                  {emptyHint}
+                </div>
+                <div className="mt-2 flex flex-wrap items-center justify-center gap-2">
+                  {canCreateInScope ? (
+                    <Button
+                      type="button"
+                      variant="default"
+                      size="sm"
+                      className="h-7 rounded-lg px-2.5 text-xs"
+                      onClick={() => setView("create")}
+                      disabled={!hasCreateHosts}
+                    >
+                      {t("projectTools.newSshTunnel")}
+                    </Button>
+                  ) : null}
+                  {scope === "project" && associatedHosts.length === 0 ? (
+                    <Button
+                      type="button"
+                      variant="outline"
+                      size="sm"
+                      className="h-7 rounded-lg bg-background/70 px-2.5 text-xs"
+                      onClick={() => setView("settings")}
+                    >
+                      {t("projectTools.sshTunnelAssociateHosts")}
+                    </Button>
+                  ) : null}
+                </div>
+              </div>
+            </div>
+          ) : (
+            <div className="space-y-2">
+              {visibleSessions.map((session) => {
+                const title = sessionTitle(session, t("projectTools.sshTunnelTitle"));
+                const endpoint = sessionEndpointLabel(session);
+                const projectLabel = sessionProjectLabel(session);
+                const closing = closingSessionId === session.id;
+                const sshStatus = sshSessionStatus(session);
+                const connected = sshSessionConnected(session);
+                return (
+                  <article
+                    key={session.id}
+                    className="rounded-lg border border-border/60 bg-card px-3 py-3 shadow-[0_1px_2px_hsl(0_0%_0%_/_0.04)]"
+                  >
+                    <div className="flex items-start gap-3">
+                      <div
+                        className={cn(
+                          "flex h-9 w-9 shrink-0 items-center justify-center rounded-lg",
+                          sshStatus === "disconnected"
+                            ? "bg-destructive/10 text-destructive"
+                            : sshStatus === "reconnecting"
+                              ? "bg-amber-500/10 text-amber-600 dark:text-amber-400"
+                              : "bg-emerald-500/10 text-emerald-500",
+                        )}
+                      >
+                        <Server className="h-4 w-4" />
+                      </div>
+                      <div className="min-w-0 flex-1">
+                        <div className="flex min-w-0 items-center gap-2">
+                          <span className="truncate text-sm font-medium text-foreground">
+                            {title}
+                          </span>
+                          <span
+                            className={cn(
+                              "inline-flex shrink-0 items-center gap-1 rounded-md px-1.5 py-0.5 text-[10.5px] font-medium",
+                              sshStatus === "disconnected"
+                                ? "bg-destructive/10 text-destructive"
+                                : sshStatus === "reconnecting"
+                                  ? "bg-amber-500/10 text-amber-600 dark:text-amber-400"
+                                  : "bg-emerald-500/10 text-emerald-600 dark:text-emerald-400",
+                            )}
+                          >
+                            {sshStatus === "disconnected" ? (
+                              <WifiOff className="h-3 w-3" />
+                            ) : sshStatus === "reconnecting" ? (
+                              <RefreshCw className="h-3 w-3 animate-spin" />
+                            ) : (
+                              <Wifi className="h-3 w-3" />
+                            )}
+                            {sshStatusLabel(session, t)}
+                          </span>
+                        </div>
+                        <div className="mt-1 truncate font-mono text-[11px] text-muted-foreground">
+                          {endpoint}
+                        </div>
+                        {scope === "all" && projectLabel ? (
+                          <div className="mt-1 truncate text-[11px] text-muted-foreground">
+                            {projectLabel}
+                          </div>
+                        ) : null}
+                      </div>
+                    </div>
+
+                    <div className="mt-3 flex items-end justify-between gap-3">
+                      <div className="flex min-w-0 flex-wrap items-center gap-1.5">
+                        <span className="inline-flex items-center gap-1 rounded-md bg-muted/60 px-1.5 py-0.5 text-[10.5px] text-muted-foreground">
+                          {latencyBySessionId[session.id]?.loading &&
+                          !latencyBySessionId[session.id]?.latencyMs ? (
+                            <Loader2 className="h-3 w-3 animate-spin" />
+                          ) : (
+                            <Clock3 className="h-3 w-3" />
+                          )}
+                          {latencyText(session)}
+                        </span>
+                      </div>
+                      <div className="flex shrink-0 items-center gap-1.5">
+                        <button
+                          type="button"
+                          className="flex h-8 w-8 items-center justify-center rounded-lg border border-border/60 bg-background/70 text-muted-foreground transition-colors hover:border-emerald-500/40 hover:bg-emerald-500/10 hover:text-emerald-600 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 dark:hover:text-emerald-400"
+                          title={t("projectTools.sshTunnelOpenBash")}
+                          aria-label={t("projectTools.sshTunnelOpenBash")}
+                          disabled={!connected}
+                          onClick={() => onOpenSession(session)}
+                        >
+                          <Terminal className="h-4 w-4" />
+                        </button>
+                        <button
+                          type="button"
+                          className="flex h-8 w-8 items-center justify-center rounded-lg border border-border/60 bg-background/70 text-muted-foreground transition-colors hover:border-destructive/30 hover:bg-destructive/10 hover:text-destructive focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50"
+                          title={t("projectTools.sshTunnelCloseSession")}
+                          aria-label={t("projectTools.sshTunnelCloseSession")}
+                          disabled={closing}
+                          onClick={() => handleCloseSession(session)}
+                        >
+                          {closing ? (
+                            <Loader2 className="h-4 w-4 animate-spin" />
+                          ) : (
+                            <X className="h-4 w-4" />
+                          )}
+                        </button>
+                      </div>
+                    </div>
+                  </article>
+                );
+              })}
+            </div>
+          )}
+        </div>
+      </div>
+
+      {prompt ? (
+        <div className="absolute inset-0 z-30 flex items-center justify-center bg-background/70 px-4 backdrop-blur-sm">
+          <form
+            className="w-full max-w-md rounded-lg border border-border bg-card p-4 shadow-xl"
+            onSubmit={(event) => {
+              event.preventDefault();
+              handleSubmitPrompt();
+            }}
+          >
+            <div className="flex items-start gap-3">
+              <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-amber-500/10 text-amber-600 dark:text-amber-400">
+                <Shield className="h-4.5 w-4.5" />
+              </div>
+              <div className="min-w-0 flex-1">
+                <div className="text-sm font-semibold text-foreground">
+                  {hostKeyPrompt
+                    ? t("projectTools.sshTunnelPromptTitle")
+                    : t("projectTools.sshTunnelAuthPromptTitle")}
+                </div>
+                <div className="mt-1 text-xs leading-relaxed text-muted-foreground">
+                  {prompt.message}
+                </div>
+              </div>
             </div>
-            <div className="text-xs font-medium text-foreground/80">{emptyTitle}</div>
-            <div className="max-w-[16rem] text-[11px] leading-relaxed text-muted-foreground">
-              {emptyHint}
+            <div className="mt-3 space-y-2 rounded-lg bg-muted/40 px-3 py-2 text-xs">
+              <div className="flex gap-2">
+                <span className="shrink-0 text-muted-foreground">
+                  {t("projectTools.sshTunnelHost")}
+                </span>
+                <span className="min-w-0 flex-1 truncate font-mono text-foreground">
+                  {prompt.host}:{prompt.port}
+                </span>
+              </div>
+              {prompt.keyType ? (
+                <div className="flex gap-2">
+                  <span className="shrink-0 text-muted-foreground">
+                    {t("projectTools.sshTunnelKeyType")}
+                  </span>
+                  <span className="min-w-0 flex-1 truncate font-mono text-foreground">
+                    {prompt.keyType}
+                  </span>
+                </div>
+              ) : null}
+              {prompt.fingerprintSha256 ? (
+                <div className="flex gap-2">
+                  <span className="shrink-0 text-muted-foreground">
+                    {t("projectTools.sshTunnelFingerprint")}
+                  </span>
+                  <span className="min-w-0 flex-1 break-all font-mono text-foreground">
+                    {prompt.fingerprintSha256}
+                  </span>
+                </div>
+              ) : null}
             </div>
-            <div className="mt-2 flex flex-wrap items-center justify-center gap-2">
+            {!hostKeyPrompt ? (
+              <input
+                value={promptAnswer}
+                onChange={(event) => setPromptAnswer(event.currentTarget.value)}
+                className="mt-3 h-10 w-full rounded-lg border border-border/70 bg-background/80 px-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground/70 focus-visible:border-emerald-500/50 focus-visible:ring-1 focus-visible:ring-emerald-500/20"
+                type={prompt.answerEcho ? "text" : "password"}
+                autoFocus
+              />
+            ) : null}
+            <div className="mt-4 flex justify-end gap-2">
               <Button
                 type="button"
-                variant="default"
+                variant="ghost"
                 size="sm"
-                className="h-7 rounded-lg px-2.5 text-xs"
-                onClick={() => setView("create")}
+                className="h-8 rounded-lg px-3 text-xs"
+                onClick={handleCancelPrompt}
+                disabled={answeringPrompt}
               >
-                {t("projectTools.newSshTunnel")}
+                {hostKeyPrompt
+                  ? t("projectTools.sshTunnelRejectHost")
+                  : t("projectTools.sshTunnelPromptCancel")}
+              </Button>
+              <Button
+                type="submit"
+                size="sm"
+                className="h-8 rounded-lg px-3 text-xs"
+                disabled={promptSubmitDisabled}
+              >
+                {answeringPrompt ? <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" /> : null}
+                {hostKeyPrompt
+                  ? t("projectTools.sshTunnelTrustHost")
+                  : t("projectTools.sshTunnelPromptSubmit")}
               </Button>
-              {scope === "project" && associatedHosts.length === 0 ? (
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  className="h-7 rounded-lg bg-background/70 px-2.5 text-xs"
-                  onClick={() => setView("settings")}
-                >
-                  {t("projectTools.sshTunnelAssociateHosts")}
-                </Button>
-              ) : null}
             </div>
-          </div>
+          </form>
         </div>
-      </div>
+      ) : null}
+      {closeSessionConfirmDialog}
     </div>
   );
 }
diff --git a/crates/agent-gui/src/components/project-tools/XTermViewport.tsx b/crates/agent-gui/src/components/project-tools/XTermViewport.tsx
new file mode 100644
index 000000000..c116c5c01
--- /dev/null
+++ b/crates/agent-gui/src/components/project-tools/XTermViewport.tsx
@@ -0,0 +1,445 @@
+import "@xterm/xterm/css/xterm.css";
+
+import { FitAddon } from "@xterm/addon-fit";
+import { Terminal as XTerm } from "@xterm/xterm";
+import { useEffect, useRef } from "react";
+import { cn } from "../../lib/shared/utils";
+import type {
+  TerminalClient,
+  TerminalEvent,
+  TerminalSession,
+  TerminalSnapshot,
+} from "../../lib/terminal/types";
+
+type XTermViewportProps = {
+  client: TerminalClient;
+  session: TerminalSession;
+  theme: "light" | "dark";
+  isActive: boolean;
+  initialSnapshot?: TerminalSnapshot;
+  className?: string;
+  onError: (message: string | null) => void;
+  onInitialSnapshotConsumed?: (sessionId: string) => void;
+};
+
+function terminalTheme(theme: "light" | "dark") {
+  if (theme === "dark") {
+    return {
+      background: "#0b0f14",
+      foreground: "#d6deeb",
+      cursor: "#f8fafc",
+      selectionBackground: "#334155",
+      black: "#0f172a",
+      red: "#ef4444",
+      green: "#22c55e",
+      yellow: "#eab308",
+      blue: "#38bdf8",
+      magenta: "#c084fc",
+      cyan: "#2dd4bf",
+      white: "#e5e7eb",
+    };
+  }
+  return {
+    background: "#ffffff",
+    foreground: "#172033",
+    cursor: "#111827",
+    selectionBackground: "#dbeafe",
+    black: "#111827",
+    red: "#dc2626",
+    green: "#16a34a",
+    yellow: "#ca8a04",
+    blue: "#2563eb",
+    magenta: "#9333ea",
+    cyan: "#0891b2",
+    white: "#f8fafc",
+  };
+}
+
+function terminalContainerHasSize(container: HTMLElement) {
+  const rect = container.getBoundingClientRect();
+  return rect.width > 0 && rect.height > 0;
+}
+
+export function XTermViewport({
+  client,
+  session,
+  theme,
+  isActive,
+  initialSnapshot,
+  className,
+  onError,
+  onInitialSnapshotConsumed,
+}: XTermViewportProps) {
+  const containerRef = useRef<HTMLDivElement>(null);
+  const resizeTimerRef = useRef<number | null>(null);
+  const clientRef = useRef(client);
+  const sessionRef = useRef(session);
+  const themeRef = useRef(theme);
+  const onErrorRef = useRef(onError);
+  const initialSnapshotRef = useRef(initialSnapshot);
+  const onInitialSnapshotConsumedRef = useRef(onInitialSnapshotConsumed);
+  clientRef.current = client;
+  sessionRef.current = session;
+  themeRef.current = theme;
+  onErrorRef.current = onError;
+  onInitialSnapshotConsumedRef.current = onInitialSnapshotConsumed;
+
+  const termRef = useRef<XTerm | null>(null);
+  const fitAndResizeRef = useRef<(() => void) | null>(null);
+
+  useEffect(() => {
+    if (!termRef.current) return;
+    termRef.current.options.theme = terminalTheme(theme);
+  }, [theme]);
+
+  useEffect(() => {
+    if (!isActive) {
+      termRef.current?.blur();
+      return;
+    }
+    termRef.current?.focus();
+    window.setTimeout(() => {
+      fitAndResizeRef.current?.();
+    }, 0);
+  }, [isActive]);
+
+  useEffect(() => {
+    const container = containerRef.current;
+    if (!container) return;
+
+    let disposed = false;
+    let snapshotLoaded = false;
+    let loadingSnapshot = false;
+    let lastOutputOffset = 0;
+    const bufferedEvents: TerminalEvent[] = [];
+    const term = new XTerm({
+      cursorBlink: true,
+      disableStdin: !sessionRef.current.running,
+      fontFamily:
+        '"SF Mono", SFMono-Regular, Menlo, Monaco, "Cascadia Code", Consolas, "Liberation Mono", monospace',
+      fontSize: 12,
+      fontWeight: "normal",
+      fontWeightBold: "bold",
+      lineHeight: 1.1,
+      letterSpacing: 0,
+      scrollback: 5000,
+      theme: terminalTheme(themeRef.current),
+    });
+    termRef.current = term;
+    const fit = new FitAddon();
+    term.loadAddon(fit);
+    term.open(container);
+    let touchScrollActive = false;
+    let touchScrollCancelled = false;
+    let lastTouchX = 0;
+    let lastTouchY = 0;
+    let touchScrollRemainder = 0;
+
+    const focusTerminal = () => {
+      if (disposed || !sessionRef.current.running) return;
+      term.focus();
+    };
+
+    const handlePointerDown = (event: PointerEvent) => {
+      if (event.pointerType === "touch") return;
+      focusTerminal();
+    };
+
+    const fitAndResize = () => {
+      if (disposed) return;
+      if (!terminalContainerHasSize(container)) return;
+      try {
+        fit.fit();
+        const s = sessionRef.current;
+        void clientRef.current
+          .resize(s.id, term.cols, term.rows, s.projectPathKey)
+          .catch(() => undefined);
+      } catch {
+        // xterm fit can throw while the panel is hidden or measuring at zero size.
+      }
+    };
+    fitAndResizeRef.current = fitAndResize;
+
+    const resizeObserver = new ResizeObserver(() => {
+      if (resizeTimerRef.current !== null) {
+        window.clearTimeout(resizeTimerRef.current);
+      }
+      resizeTimerRef.current = window.setTimeout(fitAndResize, 40);
+    });
+    resizeObserver.observe(container);
+    window.setTimeout(fitAndResize, 0);
+
+    const dataDisposable = term.onData((data) => {
+      const s = sessionRef.current;
+      if (!s.running) return;
+      void clientRef.current.input(s.id, data, s.projectPathKey).catch((error) => {
+        onErrorRef.current(error instanceof Error ? error.message : String(error));
+      });
+    });
+
+    const getTouchScrollRowHeight = () =>
+      Math.max(8, Math.floor(container.clientHeight / Math.max(1, term.rows)));
+
+    const handleTouchStart = (event: TouchEvent) => {
+      if (event.touches.length !== 1) {
+        touchScrollCancelled = true;
+        touchScrollActive = false;
+        touchScrollRemainder = 0;
+        return;
+      }
+      const touch = event.touches[0];
+      if (!touch) return;
+      touchScrollCancelled = false;
+      touchScrollActive = false;
+      touchScrollRemainder = 0;
+      lastTouchX = touch.clientX;
+      lastTouchY = touch.clientY;
+    };
+
+    const handleTouchMove = (event: TouchEvent) => {
+      if (touchScrollCancelled || event.touches.length !== 1) return;
+      const touch = event.touches[0];
+      if (!touch) return;
+
+      const deltaX = touch.clientX - lastTouchX;
+      const deltaY = touch.clientY - lastTouchY;
+      const absX = Math.abs(deltaX);
+      const absY = Math.abs(deltaY);
+      if (!touchScrollActive) {
+        if (absX > absY && absX > 8) {
+          touchScrollCancelled = true;
+          return;
+        }
+        if (absY < 8) return;
+        touchScrollActive = true;
+      }
+
+      lastTouchX = touch.clientX;
+      lastTouchY = touch.clientY;
+      touchScrollRemainder += -deltaY;
+      const rowHeight = getTouchScrollRowHeight();
+      const rows = Math.trunc(touchScrollRemainder / rowHeight);
+      if (rows !== 0) {
+        term.scrollLines(rows);
+        touchScrollRemainder -= rows * rowHeight;
+      }
+      event.preventDefault();
+    };
+
+    const resetTouchScroll = () => {
+      touchScrollActive = false;
+      touchScrollCancelled = false;
+      touchScrollRemainder = 0;
+    };
+
+    const handleTouchEnd = () => {
+      const shouldFocus = !touchScrollActive && !touchScrollCancelled;
+      resetTouchScroll();
+      if (shouldFocus) {
+        focusTerminal();
+      }
+    };
+
+    const handleTouchCancel = () => {
+      resetTouchScroll();
+    };
+
+    container.addEventListener("pointerdown", handlePointerDown);
+    container.addEventListener("touchstart", handleTouchStart, { passive: true });
+    container.addEventListener("touchmove", handleTouchMove, { passive: false });
+    container.addEventListener("touchend", handleTouchEnd);
+    container.addEventListener("touchcancel", handleTouchCancel);
+
+    const applySnapshot = (snapshot: TerminalSnapshot) => {
+      if (snapshot.output) {
+        term.write(snapshot.output);
+      }
+      lastOutputOffset = terminalSnapshotEndOffset(snapshot);
+      snapshotLoaded = true;
+      loadingSnapshot = false;
+      term.options.disableStdin = !snapshot.session.running;
+      replayBufferedEvents();
+      window.setTimeout(fitAndResize, 0);
+    };
+
+    const replayBufferedEvents = () => {
+      const events = bufferedEvents.splice(0);
+      for (const event of events) {
+        writeTerminalEvent(
+          term,
+          event,
+          (nextOffset) => {
+            lastOutputOffset = nextOffset;
+          },
+          lastOutputOffset,
+        );
+      }
+    };
+
+    const loadSnapshot = () => {
+      if (disposed || loadingSnapshot) return;
+      const initial = initialSnapshotRef.current;
+      if (initial?.session.id === sessionRef.current.id) {
+        initialSnapshotRef.current = undefined;
+        onInitialSnapshotConsumedRef.current?.(initial.session.id);
+        applySnapshot(initial);
+        return;
+      }
+      loadingSnapshot = true;
+      const s = sessionRef.current;
+      void clientRef.current
+        .snapshot(s.id, undefined, s.projectPathKey)
+        .then((snapshot) => {
+          if (disposed) return;
+          applySnapshot(snapshot);
+        })
+        .catch((error) => {
+          loadingSnapshot = false;
+          if (!disposed) {
+            onErrorRef.current(error instanceof Error ? error.message : String(error));
+            snapshotLoaded = true;
+            replayBufferedEvents();
+          }
+        });
+    };
+
+    const unsubscribe = clientRef.current.subscribe((event) => {
+      if (disposed || event.sessionId !== session.id) return;
+      if (event.kind === "output" && event.data) {
+        if (snapshotLoaded && !loadingSnapshot) {
+          writeTerminalEvent(
+            term,
+            event,
+            (nextOffset) => {
+              lastOutputOffset = nextOffset;
+            },
+            lastOutputOffset,
+          );
+        } else {
+          bufferedEvents.push(event);
+        }
+      }
+      if (event.kind === "exit" || event.kind === "closed" || event.kind === "reconnecting") {
+        term.options.disableStdin = true;
+      }
+      if (event.kind === "reconnected") {
+        term.options.disableStdin = false;
+        window.setTimeout(fitAndResize, 0);
+      }
+    });
+
+    loadSnapshot();
+
+    return () => {
+      disposed = true;
+      termRef.current = null;
+      fitAndResizeRef.current = null;
+      unsubscribe();
+      dataDisposable.dispose();
+      resizeObserver.disconnect();
+      if (resizeTimerRef.current !== null) {
+        window.clearTimeout(resizeTimerRef.current);
+        resizeTimerRef.current = null;
+      }
+      container.removeEventListener("pointerdown", handlePointerDown);
+      container.removeEventListener("touchstart", handleTouchStart);
+      container.removeEventListener("touchmove", handleTouchMove);
+      container.removeEventListener("touchend", handleTouchEnd);
+      container.removeEventListener("touchcancel", handleTouchCancel);
+      const s = sessionRef.current;
+      void clientRef.current.detach(s.id, s.projectPathKey).catch(() => undefined);
+      term.dispose();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [session.id, session.projectPathKey]);
+
+  return (
+    <div
+      ref={containerRef}
+      className={cn(
+        "project-terminal-viewport h-full min-h-0 w-full overflow-hidden px-2 py-2",
+        className,
+      )}
+    />
+  );
+}
+
+function terminalSnapshotEndOffset(snapshot: TerminalSnapshot) {
+  if (
+    typeof snapshot.outputEndOffset === "number" &&
+    Number.isFinite(snapshot.outputEndOffset) &&
+    snapshot.outputEndOffset >= 0
+  ) {
+    return snapshot.outputEndOffset;
+  }
+  const startOffset =
+    typeof snapshot.outputStartOffset === "number" &&
+    Number.isFinite(snapshot.outputStartOffset) &&
+    snapshot.outputStartOffset >= 0
+      ? snapshot.outputStartOffset
+      : 0;
+  return startOffset + utf8ByteLength(snapshot.output);
+}
+
+function writeTerminalEvent(
+  term: XTerm,
+  event: TerminalEvent,
+  setLastOutputOffset: (offset: number) => void,
+  lastOutputOffset: number,
+): "written" | "skipped" {
+  const data = event.data ?? "";
+  if (!data) return "skipped";
+  const startOffset = event.outputStartOffset;
+  const endOffset = event.outputEndOffset;
+  if (
+    typeof startOffset === "number" &&
+    Number.isFinite(startOffset) &&
+    typeof endOffset === "number" &&
+    Number.isFinite(endOffset) &&
+    endOffset >= startOffset
+  ) {
+    if (endOffset <= lastOutputOffset) return "skipped";
+    const alreadyWritten = Math.max(0, lastOutputOffset - startOffset);
+    term.write(alreadyWritten > 0 ? sliceUtf8Bytes(data, alreadyWritten) : data);
+    setLastOutputOffset(endOffset);
+    return "written";
+  }
+  term.write(data);
+  setLastOutputOffset(lastOutputOffset + utf8ByteLength(data));
+  return "written";
+}
+
+function sliceUtf8Bytes(value: string, byteOffset: number) {
+  if (byteOffset <= 0) return value;
+  let consumed = 0;
+  let index = 0;
+  for (const segment of value) {
+    const next = consumed + utf8ByteLengthOfCodePoint(segment);
+    if (next <= byteOffset) {
+      consumed = next;
+      index += segment.length;
+      continue;
+    }
+    if (consumed < byteOffset) {
+      index += segment.length;
+    }
+    return value.slice(index);
+  }
+  return "";
+}
+
+function utf8ByteLength(value: string) {
+  let length = 0;
+  for (const segment of value) {
+    length += utf8ByteLengthOfCodePoint(segment);
+  }
+  return length;
+}
+
+function utf8ByteLengthOfCodePoint(value: string) {
+  const codePoint = value.codePointAt(0) ?? 0;
+  if (codePoint <= 0x7f) return 1;
+  if (codePoint <= 0x7ff) return 2;
+  if (codePoint <= 0xffff) return 3;
+  return 4;
+}
diff --git a/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx b/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
new file mode 100644
index 000000000..ac08b6042
--- /dev/null
+++ b/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
@@ -0,0 +1,288 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useLocale } from "../../i18n";
+import { cn } from "../../lib/shared/utils";
+import type { TerminalClient, TerminalSession } from "../../lib/terminal/types";
+import { AlertTriangle, RefreshCw, Terminal, Wifi, WifiOff, X } from "../icons";
+import { MacOsTitleBarSpacer } from "../MacOsTitleBarSpacer";
+import { XTermViewport } from "../project-tools/XTermViewport";
+
+export type WorkspaceSshTerminalOpenRequest = {
+  id: number;
+  sessionId: string;
+};
+
+type WorkspaceSshTerminalOverlayProps = {
+  openRequest: WorkspaceSshTerminalOpenRequest | null;
+  sessions: TerminalSession[];
+  client: TerminalClient;
+  theme: "light" | "dark";
+  isOpen: boolean;
+  onHide: () => void;
+};
+
+const SSH_TERMINAL_OVERLAY_ANIMATION_MS = 180;
+
+function sshSessionStatus(session: TerminalSession) {
+  const status = session.ssh?.status ?? (session.running ? "connected" : "disconnected");
+  if (status === "connected" && !session.running) return "disconnected";
+  return status;
+}
+
+function sshStatusLabel(session: TerminalSession, t: (key: string) => string) {
+  const status = sshSessionStatus(session);
+  if (status === "reconnecting") {
+    const attempt = Math.max(1, Number(session.ssh?.reconnectAttempt ?? 1));
+    const max = Math.max(attempt, Number(session.ssh?.reconnectMaxAttempts ?? 3));
+    return t("workspaceSshTerminal.reconnecting")
+      .replace("{attempt}", String(attempt))
+      .replace("{max}", String(max));
+  }
+  if (status === "disconnected") return t("workspaceSshTerminal.disconnected");
+  return t("workspaceSshTerminal.connected");
+}
+
+function sessionTitle(session: TerminalSession, fallback: string) {
+  return session.title || session.ssh?.hostName || fallback;
+}
+
+function sessionEndpointLabel(session: TerminalSession) {
+  const ssh = session.ssh;
+  if (!ssh) return session.cwd || session.projectPathKey;
+  const userPrefix = ssh.username.trim() ? `${ssh.username.trim()}@` : "";
+  return `${userPrefix}${ssh.host}:${ssh.port}`;
+}
+
+function statusDotClassName(session: TerminalSession) {
+  const status = sshSessionStatus(session);
+  if (status === "connected") return "bg-emerald-500";
+  if (status === "reconnecting") return "bg-amber-500";
+  return "bg-destructive";
+}
+
+function statusIcon(session: TerminalSession) {
+  const status = sshSessionStatus(session);
+  if (status === "connected") return <Wifi className="h-3.5 w-3.5 text-emerald-600" />;
+  if (status === "reconnecting") {
+    return <RefreshCw className="h-3.5 w-3.5 animate-spin text-amber-600" />;
+  }
+  return <WifiOff className="h-3.5 w-3.5 text-destructive" />;
+}
+
+export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayProps) {
+  const { openRequest, sessions, client, theme, isOpen, onHide } = props;
+  const { t } = useLocale();
+  const [isVisible, setIsVisible] = useState(isOpen);
+  const [openSessionIds, setOpenSessionIds] = useState<string[]>([]);
+  const [activeSessionId, setActiveSessionId] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const openRequestIdRef = useRef<number | null>(null);
+  const hideTimerRef = useRef<number | null>(null);
+
+  const sshSessions = useMemo(
+    () => sessions.filter((session) => session.kind === "ssh" && session.ssh),
+    [sessions],
+  );
+  const sessionsById = useMemo(
+    () => new Map(sshSessions.map((session) => [session.id, session])),
+    [sshSessions],
+  );
+  const openSessions = useMemo(
+    () =>
+      openSessionIds
+        .map((sessionId) => sessionsById.get(sessionId))
+        .filter((session): session is TerminalSession => Boolean(session)),
+    [openSessionIds, sessionsById],
+  );
+  const activeSession =
+    openSessions.find((session) => session.id === activeSessionId) ?? openSessions[0] ?? null;
+
+  const cancelPendingHide = useCallback(() => {
+    if (hideTimerRef.current === null) return;
+    window.clearTimeout(hideTimerRef.current);
+    hideTimerRef.current = null;
+  }, []);
+
+  const hideOverlay = useCallback(() => {
+    cancelPendingHide();
+    setIsVisible(false);
+    hideTimerRef.current = window.setTimeout(() => {
+      hideTimerRef.current = null;
+      onHide();
+    }, SSH_TERMINAL_OVERLAY_ANIMATION_MS);
+  }, [cancelPendingHide, onHide]);
+
+  const closeTab = useCallback((sessionId: string) => {
+    setOpenSessionIds((current) => {
+      const index = current.indexOf(sessionId);
+      if (index < 0) return current;
+      const next = current.filter((id) => id !== sessionId);
+      setActiveSessionId((currentActive) => {
+        if (currentActive !== sessionId) return currentActive;
+        return next[Math.min(index, next.length - 1)] ?? "";
+      });
+      return next;
+    });
+  }, []);
+
+  useEffect(() => {
+    if (!openRequest || openRequestIdRef.current === openRequest.id) return;
+    const session = sessionsById.get(openRequest.sessionId);
+    if (!session) return;
+    openRequestIdRef.current = openRequest.id;
+    cancelPendingHide();
+    setIsVisible(true);
+    setError(null);
+    setOpenSessionIds((current) =>
+      current.includes(session.id) ? current : [...current, session.id],
+    );
+    setActiveSessionId(session.id);
+  }, [cancelPendingHide, openRequest, sessionsById]);
+
+  useEffect(() => {
+    if (isOpen) {
+      cancelPendingHide();
+      setIsVisible(true);
+      return;
+    }
+    setIsVisible(false);
+  }, [cancelPendingHide, isOpen]);
+
+  useEffect(() => {
+    const liveIds = new Set(sshSessions.map((session) => session.id));
+    setOpenSessionIds((current) => {
+      const next = current.filter((sessionId) => liveIds.has(sessionId));
+      return next.length === current.length ? current : next;
+    });
+  }, [sshSessions]);
+
+  useEffect(() => {
+    if (activeSessionId && openSessions.some((session) => session.id === activeSessionId)) return;
+    setActiveSessionId(openSessions[0]?.id ?? "");
+  }, [activeSessionId, openSessions]);
+
+  useEffect(
+    () => () => {
+      cancelPendingHide();
+    },
+    [cancelPendingHide],
+  );
+
+  return (
+    <div
+      className={cn(
+        "absolute inset-0 z-50 flex min-h-0 min-w-0 transform-gpu flex-col overflow-hidden border-r border-border bg-background transition-[opacity,transform,box-shadow] duration-200 ease-out motion-reduce:transition-none",
+        isVisible
+          ? "pointer-events-auto translate-x-0 opacity-100 shadow-2xl"
+          : "pointer-events-none -translate-x-2 opacity-0 shadow-lg",
+      )}
+    >
+      <MacOsTitleBarSpacer className="bg-muted/45" />
+      <div className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3">
+        <Terminal className="h-4 w-4 shrink-0 text-primary" />
+        <div className="min-w-0 flex-1">
+          <div className="truncate text-sm font-semibold leading-tight">
+            {t("workspaceSshTerminal.title")}
+          </div>
+          <div className="truncate font-mono text-[11px] text-muted-foreground">
+            {activeSession
+              ? sessionEndpointLabel(activeSession)
+              : t("workspaceSshTerminal.empty")}
+          </div>
+        </div>
+        {activeSession ? (
+          <div className="hidden shrink-0 items-center gap-1.5 rounded-md bg-background/70 px-2 py-1 text-[11px] text-muted-foreground sm:flex">
+            {statusIcon(activeSession)}
+            <span>{sshStatusLabel(activeSession, t)}</span>
+          </div>
+        ) : null}
+        <button
+          type="button"
+          className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border hover:bg-background hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+          title={t("workspaceSshTerminal.close")}
+          aria-label={t("workspaceSshTerminal.close")}
+          onClick={hideOverlay}
+        >
+          <X className="h-4 w-4" />
+        </button>
+      </div>
+
+      <div className="flex h-10 shrink-0 items-end gap-1 overflow-x-auto border-b border-border bg-background px-2 pt-1">
+        {openSessions.map((session) => (
+          <button
+            key={session.id}
+            type="button"
+            className={cn(
+              "group flex h-8 max-w-[14rem] shrink-0 items-center gap-1.5 rounded-t-md border border-b-0 px-2 text-xs transition-colors",
+              session.id === activeSessionId
+                ? "border-border bg-muted text-foreground"
+                : "border-transparent text-muted-foreground hover:bg-muted/60 hover:text-foreground",
+            )}
+            title={sessionEndpointLabel(session)}
+            onClick={() => setActiveSessionId(session.id)}
+          >
+            <span className={cn("h-1.5 w-1.5 shrink-0 rounded-full", statusDotClassName(session))} />
+            <Terminal className="h-3.5 w-3.5 shrink-0" />
+            <span className="min-w-0 truncate">
+              {sessionTitle(session, t("workspaceSshTerminal.title"))}
+            </span>
+            <span
+              role="button"
+              tabIndex={0}
+              className="ml-0.5 flex h-5 w-5 shrink-0 items-center justify-center rounded text-muted-foreground/75 hover:bg-background hover:text-foreground"
+              title={t("workspaceSshTerminal.closeTab")}
+              onClick={(event) => {
+                event.stopPropagation();
+                closeTab(session.id);
+              }}
+              onKeyDown={(event) => {
+                if (event.key !== "Enter" && event.key !== " ") return;
+                event.preventDefault();
+                event.stopPropagation();
+                closeTab(session.id);
+              }}
+            >
+              <X className="h-3 w-3" />
+            </span>
+          </button>
+        ))}
+      </div>
+
+      {error ? (
+        <div className="flex shrink-0 items-center gap-2 border-b border-amber-500/20 bg-amber-500/10 px-3 py-2 text-xs text-amber-700 dark:text-amber-300">
+          <AlertTriangle className="h-4 w-4 shrink-0" />
+          <div className="min-w-0 flex-1 truncate">{error}</div>
+        </div>
+      ) : null}
+
+      <div className="relative min-h-0 flex-1 bg-background">
+        {openSessions.length > 0 ? (
+          openSessions.map((session) => {
+            const isActiveTerminal = isVisible && isOpen && activeSessionId === session.id;
+            return (
+              <div
+                key={session.id}
+                aria-hidden={!isActiveTerminal}
+                className={cn("absolute inset-0 min-h-0", isActiveTerminal ? "block" : "hidden")}
+              >
+                <XTermViewport
+                  client={client}
+                  session={session}
+                  theme={theme}
+                  isActive={isActiveTerminal}
+                  onError={setError}
+                />
+              </div>
+            );
+          })
+        ) : (
+          <div className="flex h-full flex-col items-center justify-center gap-3 p-6 text-center text-sm text-muted-foreground">
+            <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-muted/70">
+              <Terminal className="h-5 w-5" />
+            </div>
+            <div>{t("workspaceSshTerminal.empty")}</div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index 5cce8e6ab..f22c89388 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -251,29 +251,29 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.newTunnel": "新建内网穿透",
     "projectTools.tunnelDescription": "通过 Gateway 暴露本机 HTTP 服务",
     "projectTools.sshTunnelTitle": "SSH 隧道",
-    "projectTools.newSshTunnel": "新建 SSH 隧道",
-    "projectTools.sshTunnelDescription": "查看 SSH 隧道并关联项目主机",
-    "projectTools.sshTunnelSettings": "设置 SSH 隧道",
-    "projectTools.sshTunnelBack": "返回 SSH 隧道",
+    "projectTools.newSshTunnel": "新建 SSH 连接",
+    "projectTools.sshTunnelDescription": "启动交互式 SSH 终端并关联项目主机",
+    "projectTools.sshTunnelSettings": "设置 SSH 主机",
+    "projectTools.sshTunnelBack": "返回 SSH",
     "projectTools.sshTunnelScopeGroup": "切换 SSH 隧道视角",
     "projectTools.sshTunnelScopeProject": "项目SSH",
     "projectTools.sshTunnelScopeAll": "全局SSH",
     "projectTools.sshTunnelConfiguredHosts": "已关联 {count} 台 SSH 主机",
     "projectTools.sshTunnelNoProject": "选择项目后可关联 SSH 主机",
-    "projectTools.sshTunnelProjectEmpty": "当前项目暂无启动的 SSH 隧道",
-    "projectTools.sshTunnelProjectEmptyHint": "先关联设置中已配置的 SSH 主机，后续即可从这里启动项目隧道。",
-    "projectTools.sshTunnelProjectEmptyWithHosts": "已关联的主机会保留在此项目中，启动功能将在后续接入。",
-    "projectTools.sshTunnelAllEmpty": "暂无启动的 SSH 隧道",
-    "projectTools.sshTunnelAllEmptyHint": "所有项目和全局范围内当前都没有运行中的 SSH 隧道。",
+    "projectTools.sshTunnelProjectEmpty": "当前项目暂无 SSH 连接",
+    "projectTools.sshTunnelProjectEmptyHint": "先关联设置中已配置的 SSH 主机，然后在这里启动交互式终端。",
+    "projectTools.sshTunnelProjectEmptyWithHosts": "选择已关联主机即可启动 SSH 终端。",
+    "projectTools.sshTunnelAllEmpty": "暂无 SSH 连接",
+    "projectTools.sshTunnelAllEmptyHint": "当前没有运行中的 SSH 终端。",
     "projectTools.sshTunnelAssociateHosts": "关联 SSH 主机",
     "projectTools.sshTunnelAssociateHostsHint": "从 Settings > SSH 已配置主机中选择当前项目可用的主机",
     "projectTools.sshTunnelAssociatedCount": "已关联",
     "projectTools.sshTunnelNoConfiguredHosts": "还没有配置 SSH 主机",
     "projectTools.sshTunnelNoConfiguredHostsHint": "请先到 Settings > SSH 添加或导入主机，再回到这里关联当前项目。",
-    "projectTools.sshTunnelCreateTitle": "新建 SSH 隧道",
-    "projectTools.sshTunnelCreateHint": "选择已关联主机、SFTP 和备注；实际启动功能将在后续接入。",
+    "projectTools.sshTunnelCreateTitle": "新建 SSH 连接",
+    "projectTools.sshTunnelCreateHint": "选择主机并打开交互式 SSH 终端。",
     "projectTools.sshTunnelCreateNoAssociatedHosts": "当前项目还没有关联 SSH 主机",
-    "projectTools.sshTunnelCreateNoAssociatedHostsHint": "先关联 Settings > SSH 中的主机，再从这里新建 SSH 隧道。",
+    "projectTools.sshTunnelCreateNoAssociatedHostsHint": "先关联 Settings > SSH 中的主机，再从这里新建 SSH 连接。",
     "projectTools.sshTunnelHost": "SSH 主机",
     "projectTools.sshTunnelSftpEnabled": "开启 SFTP",
     "projectTools.sshTunnelNote": "备注",
@@ -281,6 +281,35 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelCreate": "创建隧道",
     "projectTools.sshTunnelCreateCancel": "取消",
     "projectTools.sshTunnelCreateUnavailable": "当前仅提供界面，启动功能将在后续接入",
+    "projectTools.sshTunnelConnect": "连接",
+    "projectTools.sshTunnelConnecting": "连接中",
+    "projectTools.sshTunnelTabTitle": "标签标题",
+    "projectTools.sshTunnelTabTitlePlaceholder": "默认使用主机名称",
+    "projectTools.sshTunnelProxyUnsupported": "该主机配置了 proxy，V1 SSH 终端暂不支持代理连接。",
+    "projectTools.sshTunnelMissingSecret": "该主机缺少已保存的认证凭据。",
+    "projectTools.sshTunnelRunningCount": "{count} 个 SSH 连接运行中",
+    "projectTools.sshTunnelConnectionCount": "{count} 个 SSH 连接，{connected} 个已连接",
+    "projectTools.sshTunnelCloseSession": "关闭 SSH 连接",
+    "projectTools.confirmCloseSshSession": "确认断开 SSH",
+    "projectTools.closeSshSessionConfirm": "断开 SSH 连接「{title}」？",
+    "projectTools.closeSshSessionContinue": "断开连接",
+    "projectTools.closeSshSessionCancel": "取消",
+    "projectTools.closeSshSessionClose": "关闭断开确认",
+    "projectTools.sshTunnelConnected": "已连接",
+    "projectTools.sshTunnelReconnecting": "重连中 {attempt}/{max}",
+    "projectTools.sshTunnelDisconnected": "已断连",
+    "projectTools.sshTunnelLatencyUnknown": "延迟 --",
+    "projectTools.sshTunnelLatencyChecking": "检测延迟",
+    "projectTools.sshTunnelLatencyValue": "延迟 {ms}ms",
+    "projectTools.sshTunnelOpenBash": "进入 Bash 交互",
+    "projectTools.sshTunnelPromptTitle": "确认 SSH 主机密钥",
+    "projectTools.sshTunnelAuthPromptTitle": "SSH 认证",
+    "projectTools.sshTunnelTrustHost": "信任并连接",
+    "projectTools.sshTunnelRejectHost": "取消",
+    "projectTools.sshTunnelPromptCancel": "取消",
+    "projectTools.sshTunnelPromptSubmit": "继续连接",
+    "projectTools.sshTunnelFingerprint": "指纹",
+    "projectTools.sshTunnelKeyType": "密钥类型",
     "projectTools.tunnelScopeGroup": "切换内网穿透视角",
     "projectTools.tunnelScopeProject": "当前项目",
     "projectTools.tunnelScopeGlobal": "全局",
@@ -520,6 +549,14 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.fileTree.copiedPath": "已复制路径",
     "projectTools.fileTree.insertReference": "插入引用",
     "workspaceEditor.loading": "正在加载编辑器...",
+    "workspaceSshTerminal.loading": "正在加载 SSH 终端...",
+    "workspaceSshTerminal.title": "SSH 终端",
+    "workspaceSshTerminal.empty": "未打开 SSH 连接",
+    "workspaceSshTerminal.close": "关闭 SSH 终端",
+    "workspaceSshTerminal.closeTab": "关闭 SSH 标签",
+    "workspaceSshTerminal.connected": "已连接",
+    "workspaceSshTerminal.reconnecting": "重连中 {attempt}/{max}",
+    "workspaceSshTerminal.disconnected": "已断连",
     "workspaceEditor.title": "代码编辑器",
     "workspaceEditor.empty": "未打开文件",
     "workspaceEditor.emptyHint": "从右侧文件树双击可编辑文件",
@@ -946,6 +983,16 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.sshPrivateKeyPathPlaceholder": "私钥路径或文件名",
     "settings.sshPrivateKeyPlaceholder": "粘贴 OpenSSH 私钥内容...",
     "settings.sshPrivateKeyConfigured": "私钥已保存",
+    "settings.sshPrivateKeyPassphrase": "私钥口令",
+    "settings.sshPrivateKeyPassphraseConfigured": "私钥口令已保存",
+    "settings.sshKnownHostReset": "重置信任记录",
+    "settings.sshKnownHostResetTitle": "重置 SSH 信任记录",
+    "settings.sshKnownHostResetDesc":
+      "清除此主机端口已保存的 host key，下次连接会重新要求确认指纹。",
+    "settings.sshKnownHostResetConfirm": "重置",
+    "settings.sshKnownHostResetSuccess": "已清除信任记录，下次连接会重新确认 host key。",
+    "settings.sshKnownHostResetEmpty": "没有找到可清除的信任记录。",
+    "settings.sshKnownHostResetFailed": "重置信任记录失败：{error}",
     "settings.sshAdvancedSettings": "高级设置",
     "settings.sshAdvancedProxy": "代理",
     "settings.sshProxyType": "代理类型",
@@ -1094,6 +1141,9 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.remoteAutoReconnectHint": "连接断开后自动尝试重新连接 Gateway",
     "settings.remoteWebTerminal": "允许 WebUI Terminal",
     "settings.remoteWebTerminalHint": "开启后，已登录 WebUI 可启动并控制本机项目终端。",
+    "settings.remoteWebSshTerminal": "允许 WebUI SSH Terminal",
+    "settings.remoteWebSshTerminalHint":
+      "开启后，已登录 WebUI 可使用本机保存的 SSH 配置创建和控制远程交互式终端。",
     "settings.remoteWebGit": "允许 WebUI Git",
     "settings.remoteWebGitHint":
       "开启后，已登录 WebUI 可对本机项目执行分支、暂存、提交和同步操作。",
@@ -1610,23 +1660,22 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.newTunnel": "New Tunnel",
     "projectTools.tunnelDescription": "Expose local HTTP services through Gateway",
     "projectTools.sshTunnelTitle": "SSH Tunnel",
-    "projectTools.newSshTunnel": "New SSH Tunnel",
-    "projectTools.sshTunnelDescription": "Review SSH tunnels and associate project hosts",
-    "projectTools.sshTunnelSettings": "SSH tunnel settings",
-    "projectTools.sshTunnelBack": "Back to SSH tunnel",
+    "projectTools.newSshTunnel": "New SSH Connection",
+    "projectTools.sshTunnelDescription": "Start interactive SSH terminals and associate project hosts",
+    "projectTools.sshTunnelSettings": "SSH host settings",
+    "projectTools.sshTunnelBack": "Back to SSH",
     "projectTools.sshTunnelScopeGroup": "Switch SSH tunnel scope",
     "projectTools.sshTunnelScopeProject": "Project SSH",
     "projectTools.sshTunnelScopeAll": "Global SSH",
     "projectTools.sshTunnelConfiguredHosts": "{count} SSH hosts associated",
     "projectTools.sshTunnelNoProject": "Select a project to associate SSH hosts",
-    "projectTools.sshTunnelProjectEmpty": "No SSH tunnels running for this project",
+    "projectTools.sshTunnelProjectEmpty": "No SSH connections for this project",
     "projectTools.sshTunnelProjectEmptyHint":
-      "Associate SSH hosts from settings first. Project tunnel startup can be wired in later.",
+      "Associate SSH hosts from settings first, then start an interactive terminal here.",
     "projectTools.sshTunnelProjectEmptyWithHosts":
-      "Associated hosts are saved for this project. Startup will be wired in later.",
-    "projectTools.sshTunnelAllEmpty": "No SSH tunnels running",
-    "projectTools.sshTunnelAllEmptyHint":
-      "There are no running SSH tunnels across projects or the global scope.",
+      "Select an associated host to start an SSH terminal.",
+    "projectTools.sshTunnelAllEmpty": "No SSH connections running",
+    "projectTools.sshTunnelAllEmptyHint": "There are no running SSH terminals.",
     "projectTools.sshTunnelAssociateHosts": "Associate SSH Hosts",
     "projectTools.sshTunnelAssociateHostsHint":
       "Choose hosts configured in Settings > SSH for the current project",
@@ -1634,12 +1683,11 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelNoConfiguredHosts": "No SSH hosts configured yet",
     "projectTools.sshTunnelNoConfiguredHostsHint":
       "Add or import hosts in Settings > SSH first, then associate them here.",
-    "projectTools.sshTunnelCreateTitle": "New SSH Tunnel",
-    "projectTools.sshTunnelCreateHint":
-      "Choose an associated host, SFTP, and note. Startup will be wired in later.",
+    "projectTools.sshTunnelCreateTitle": "New SSH Connection",
+    "projectTools.sshTunnelCreateHint": "Choose a host and open an interactive SSH terminal.",
     "projectTools.sshTunnelCreateNoAssociatedHosts": "No SSH hosts associated with this project",
     "projectTools.sshTunnelCreateNoAssociatedHostsHint":
-      "Associate hosts from Settings > SSH before creating an SSH tunnel here.",
+      "Associate hosts from Settings > SSH before creating an SSH connection here.",
     "projectTools.sshTunnelHost": "SSH host",
     "projectTools.sshTunnelSftpEnabled": "Enable SFTP",
     "projectTools.sshTunnelNote": "Note",
@@ -1647,6 +1695,36 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelCreate": "Create tunnel",
     "projectTools.sshTunnelCreateCancel": "Cancel",
     "projectTools.sshTunnelCreateUnavailable": "This is UI-only; startup will be wired in later",
+    "projectTools.sshTunnelConnect": "Connect",
+    "projectTools.sshTunnelConnecting": "Connecting",
+    "projectTools.sshTunnelTabTitle": "Tab title",
+    "projectTools.sshTunnelTabTitlePlaceholder": "Defaults to the host name",
+    "projectTools.sshTunnelProxyUnsupported":
+      "This host has a proxy configured. V1 SSH terminal does not support proxy connections.",
+    "projectTools.sshTunnelMissingSecret": "This host is missing saved authentication material.",
+    "projectTools.sshTunnelRunningCount": "{count} SSH connections running",
+    "projectTools.sshTunnelConnectionCount": "{count} SSH connections, {connected} connected",
+    "projectTools.sshTunnelCloseSession": "Close SSH connection",
+    "projectTools.confirmCloseSshSession": "Confirm SSH disconnect",
+    "projectTools.closeSshSessionConfirm": 'Disconnect SSH connection "{title}"?',
+    "projectTools.closeSshSessionContinue": "Disconnect",
+    "projectTools.closeSshSessionCancel": "Cancel",
+    "projectTools.closeSshSessionClose": "Close disconnect confirmation",
+    "projectTools.sshTunnelConnected": "Connected",
+    "projectTools.sshTunnelReconnecting": "Reconnecting {attempt}/{max}",
+    "projectTools.sshTunnelDisconnected": "Disconnected",
+    "projectTools.sshTunnelLatencyUnknown": "Latency --",
+    "projectTools.sshTunnelLatencyChecking": "Checking latency",
+    "projectTools.sshTunnelLatencyValue": "Latency {ms}ms",
+    "projectTools.sshTunnelOpenBash": "Open Bash",
+    "projectTools.sshTunnelPromptTitle": "Confirm SSH host key",
+    "projectTools.sshTunnelAuthPromptTitle": "SSH authentication",
+    "projectTools.sshTunnelTrustHost": "Trust and connect",
+    "projectTools.sshTunnelRejectHost": "Cancel",
+    "projectTools.sshTunnelPromptCancel": "Cancel",
+    "projectTools.sshTunnelPromptSubmit": "Continue",
+    "projectTools.sshTunnelFingerprint": "Fingerprint",
+    "projectTools.sshTunnelKeyType": "Key type",
     "projectTools.tunnelScopeGroup": "Switch tunnel scope",
     "projectTools.tunnelScopeProject": "Current Project",
     "projectTools.tunnelScopeGlobal": "Global",
@@ -1895,6 +1973,14 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.fileTree.copiedPath": "Copied Path",
     "projectTools.fileTree.insertReference": "Insert Reference",
     "workspaceEditor.loading": "Loading editor...",
+    "workspaceSshTerminal.loading": "Loading SSH terminal...",
+    "workspaceSshTerminal.title": "SSH Terminal",
+    "workspaceSshTerminal.empty": "No SSH connection open",
+    "workspaceSshTerminal.close": "Close SSH terminal",
+    "workspaceSshTerminal.closeTab": "Close SSH tab",
+    "workspaceSshTerminal.connected": "Connected",
+    "workspaceSshTerminal.reconnecting": "Reconnecting {attempt}/{max}",
+    "workspaceSshTerminal.disconnected": "Disconnected",
     "workspaceEditor.title": "Code Editor",
     "workspaceEditor.empty": "No file open",
     "workspaceEditor.emptyHint": "Double-click an editable file in the file tree",
@@ -2343,6 +2429,17 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.sshPrivateKeyPathPlaceholder": "Private key path or file name",
     "settings.sshPrivateKeyPlaceholder": "Paste OpenSSH private key content...",
     "settings.sshPrivateKeyConfigured": "Private key saved",
+    "settings.sshPrivateKeyPassphrase": "Private key passphrase",
+    "settings.sshPrivateKeyPassphraseConfigured": "Private key passphrase saved",
+    "settings.sshKnownHostReset": "Reset trust record",
+    "settings.sshKnownHostResetTitle": "Reset SSH trust record",
+    "settings.sshKnownHostResetDesc":
+      "Clear the saved host key for this host and port. The next connection will ask you to confirm the fingerprint again.",
+    "settings.sshKnownHostResetConfirm": "Reset",
+    "settings.sshKnownHostResetSuccess":
+      "Trust record cleared. The next connection will confirm the host key again.",
+    "settings.sshKnownHostResetEmpty": "No trust record was found for this host.",
+    "settings.sshKnownHostResetFailed": "Failed to reset trust record: {error}",
     "settings.sshAdvancedSettings": "Advanced settings",
     "settings.sshAdvancedProxy": "Proxy",
     "settings.sshProxyType": "Proxy type",
@@ -2499,6 +2596,9 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.remoteWebTerminal": "Allow WebUI Terminal",
     "settings.remoteWebTerminalHint":
       "Allow authenticated WebUI clients to start and control local project terminals.",
+    "settings.remoteWebSshTerminal": "Allow WebUI SSH Terminal",
+    "settings.remoteWebSshTerminalHint":
+      "Allow authenticated WebUI clients to create and control remote interactive terminals using SSH profiles saved on this desktop.",
     "settings.remoteWebGit": "Allow WebUI Git",
     "settings.remoteWebGitHint":
       "Allow authenticated WebUI clients to run branch, stage, commit, and sync operations on local projects.",
diff --git a/crates/agent-gui/src/lib/settings/index.ts b/crates/agent-gui/src/lib/settings/index.ts
index eb4e495ab..4b82032bc 100644
--- a/crates/agent-gui/src/lib/settings/index.ts
+++ b/crates/agent-gui/src/lib/settings/index.ts
@@ -271,6 +271,8 @@ export type SshHostConfig = {
   privateKey: string;
   privateKeyPath: string;
   privateKeyConfigured?: boolean;
+  privateKeyPassphrase: string;
+  privateKeyPassphraseConfigured?: boolean;
   proxy: SshProxyConfig;
 };
 
@@ -306,6 +308,7 @@ export type RemoteSettings = {
   autoReconnect: boolean;
   heartbeatInterval: number;
   enableWebTerminal: boolean;
+  enableWebSshTerminal: boolean;
   enableWebGit: boolean;
   enableWebTunnels: boolean;
 };
@@ -1099,6 +1102,7 @@ export function normalizeRemoteSettings(input: unknown): RemoteSettings {
     autoReconnect: obj.autoReconnect !== false,
     heartbeatInterval: normalizePositiveInteger(obj.heartbeatInterval, 30),
     enableWebTerminal: obj.enableWebTerminal === true,
+    enableWebSshTerminal: obj.enableWebSshTerminal === true,
     enableWebGit: obj.enableWebGit === true,
     enableWebTunnels: obj.enableWebTunnels === true,
   };
@@ -1300,6 +1304,7 @@ export function normalizeSshHostConfig(input: unknown): SshHostConfig {
   const password = normalizeOptionalText(obj.password);
   const privateKey = normalizeOptionalText(obj.privateKey);
   const privateKeyPath = normalizeOptionalText(obj.privateKeyPath);
+  const privateKeyPassphrase = normalizeOptionalText(obj.privateKeyPassphrase);
 
   return {
     id: typeof obj.id === "string" && obj.id.trim() ? obj.id.trim() : crypto.randomUUID(),
@@ -1315,6 +1320,9 @@ export function normalizeSshHostConfig(input: unknown): SshHostConfig {
     privateKeyPath,
     privateKeyConfigured:
       privateKey.length > 0 || privateKeyPath.length > 0 || obj.privateKeyConfigured === true,
+    privateKeyPassphrase,
+    privateKeyPassphraseConfigured:
+      privateKeyPassphrase.length > 0 || obj.privateKeyPassphraseConfigured === true,
     proxy: normalizeSshProxyConfig(obj.proxy),
   };
 }
@@ -1807,9 +1815,6 @@ export function normalizeCustomSettings(
   const chatSidebar = (
     obj.chatSidebar && typeof obj.chatSidebar === "object" ? obj.chatSidebar : {}
   ) as Record<string, unknown>;
-  const legacyTerminalPanel = (
-    obj.terminalPanel && typeof obj.terminalPanel === "object" ? obj.terminalPanel : {}
-  ) as Record<string, unknown>;
   const projectToolsPanel = (
     obj.projectToolsPanel && typeof obj.projectToolsPanel === "object" ? obj.projectToolsPanel : {}
   ) as Record<string, unknown>;
@@ -1847,7 +1852,7 @@ export function normalizeCustomSettings(
     },
     projectToolsPanel: {
       width: normalizeIntegerInRange(
-        obj.terminalPanelWidth ?? projectToolsPanel.width ?? legacyTerminalPanel.width,
+        projectToolsPanel.width,
         320,
         1280,
         420,
@@ -1904,6 +1909,7 @@ export function getDefaultSettings(): AppSettings {
       autoReconnect: true,
       heartbeatInterval: 30,
       enableWebTerminal: false,
+      enableWebSshTerminal: false,
       enableWebGit: false,
       enableWebTunnels: false,
     },
diff --git a/crates/agent-gui/src/lib/settings/storage.ts b/crates/agent-gui/src/lib/settings/storage.ts
index 0146ea786..085861606 100644
--- a/crates/agent-gui/src/lib/settings/storage.ts
+++ b/crates/agent-gui/src/lib/settings/storage.ts
@@ -84,9 +84,6 @@ function readLocalUiSettings(): {
     const chatSidebar = (
       obj.chatSidebar && typeof obj.chatSidebar === "object" ? obj.chatSidebar : {}
     ) as Record<string, unknown>;
-    const legacyTerminalPanel = (
-      obj.terminalPanel && typeof obj.terminalPanel === "object" ? obj.terminalPanel : {}
-    ) as Record<string, unknown>;
     const projectToolsPanel = (
       obj.projectToolsPanel && typeof obj.projectToolsPanel === "object"
         ? obj.projectToolsPanel
@@ -95,10 +92,7 @@ function readLocalUiSettings(): {
     const projectToolsPanelWidth =
       typeof projectToolsPanel.width === "number" || typeof projectToolsPanel.width === "string"
         ? Number(projectToolsPanel.width)
-        : typeof legacyTerminalPanel.width === "number" ||
-            typeof legacyTerminalPanel.width === "string"
-          ? Number(legacyTerminalPanel.width)
-          : 420;
+        : 420;
     const projectToolsPanelActiveTab = normalizeProjectToolsPanelActiveTab(
       projectToolsPanel.activeTab,
     );
diff --git a/crates/agent-gui/src/lib/settings/sync.ts b/crates/agent-gui/src/lib/settings/sync.ts
index 46ed7faae..26f54a42d 100644
--- a/crates/agent-gui/src/lib/settings/sync.ts
+++ b/crates/agent-gui/src/lib/settings/sync.ts
@@ -15,6 +15,7 @@ export type GatewaySshSecretUpdates = Record<
   {
     password?: string;
     privateKey?: string;
+    privateKeyPassphrase?: string;
     proxyPassword?: string;
   }
 >;
@@ -34,7 +35,10 @@ export type GatewaySettingsSyncPayload = {
   ssh: AppSettings["ssh"];
   hooks: AppSettings["hooks"];
   cron: AppSettings["cron"];
-  remote?: Pick<AppSettings["remote"], "enableWebTerminal" | "enableWebGit" | "enableWebTunnels">;
+  remote?: Pick<
+    AppSettings["remote"],
+    "enableWebTerminal" | "enableWebSshTerminal" | "enableWebGit" | "enableWebTunnels"
+  >;
   memory: AppSettings["memory"];
   customSettings: GatewaySettingsSyncCustomSettings;
   skills: AppSettings["skills"];
@@ -98,6 +102,10 @@ function redactSshSettingsForWebStorage(ssh: AppSettings["ssh"]): AppSettings["s
         host.privateKey.trim().length > 0 ||
         host.privateKeyPath.trim().length > 0 ||
         host.privateKeyConfigured === true,
+      privateKeyPassphrase: "",
+      privateKeyPassphraseConfigured:
+        host.privateKeyPassphrase.trim().length > 0 ||
+        host.privateKeyPassphraseConfigured === true,
       proxy: {
         ...host.proxy,
         password: "",
@@ -128,10 +136,12 @@ function collectSshSecretUpdates(ssh: AppSettings["ssh"]): GatewaySshSecretUpdat
     if (!id) continue;
     const password = host.password.trim();
     const privateKey = host.privateKey.trim();
+    const privateKeyPassphrase = host.privateKeyPassphrase.trim();
     const proxyPassword = host.proxy.password.trim();
     const update: GatewaySshSecretUpdates[string] = {};
     if (password) update.password = password;
     if (privateKey) update.privateKey = privateKey;
+    if (privateKeyPassphrase) update.privateKeyPassphrase = privateKeyPassphrase;
     if (proxyPassword) update.proxyPassword = proxyPassword;
     if (Object.keys(update).length > 0) {
       updates[id] = update;
@@ -282,11 +292,16 @@ function normalizeSshSecretUpdates(value: unknown): GatewaySshSecretUpdates {
     const password = typeof updateSource.password === "string" ? updateSource.password.trim() : "";
     const privateKey =
       typeof updateSource.privateKey === "string" ? updateSource.privateKey.trim() : "";
+    const privateKeyPassphrase =
+      typeof updateSource.privateKeyPassphrase === "string"
+        ? updateSource.privateKeyPassphrase.trim()
+        : "";
     const proxyPassword =
       typeof updateSource.proxyPassword === "string" ? updateSource.proxyPassword.trim() : "";
     const update: GatewaySshSecretUpdates[string] = {};
     if (password) update.password = password;
     if (privateKey) update.privateKey = privateKey;
+    if (privateKeyPassphrase) update.privateKeyPassphrase = privateKeyPassphrase;
     if (proxyPassword) update.proxyPassword = proxyPassword;
     if (Object.keys(update).length > 0) {
       updates[normalizedId] = update;
@@ -332,6 +347,7 @@ function mergeSyncedRemoteSettings(
   const source = asObject(incoming);
   if (
     !Object.hasOwn(source, "enableWebTerminal") &&
+    !Object.hasOwn(source, "enableWebSshTerminal") &&
     !Object.hasOwn(source, "enableWebGit") &&
     !Object.hasOwn(source, "enableWebTunnels")
   ) {
@@ -342,6 +358,9 @@ function mergeSyncedRemoteSettings(
     enableWebTerminal: Object.hasOwn(source, "enableWebTerminal")
       ? source.enableWebTerminal === true
       : current.enableWebTerminal,
+    enableWebSshTerminal: Object.hasOwn(source, "enableWebSshTerminal")
+      ? source.enableWebSshTerminal === true
+      : current.enableWebSshTerminal,
     enableWebGit: Object.hasOwn(source, "enableWebGit")
       ? source.enableWebGit === true
       : current.enableWebGit,
@@ -375,6 +394,10 @@ function mergeSyncedSshSettings(
       const password = (update?.password ?? host.password.trim()) || currentHost?.password || "";
       const privateKey =
         (update?.privateKey ?? host.privateKey.trim()) || currentHost?.privateKey || "";
+      const privateKeyPassphrase =
+        (update?.privateKeyPassphrase ?? host.privateKeyPassphrase.trim()) ||
+        currentHost?.privateKeyPassphrase ||
+        "";
       const proxyPassword =
         (update?.proxyPassword ?? host.proxy.password.trim()) || currentHost?.proxy.password || "";
       return {
@@ -390,6 +413,11 @@ function mergeSyncedSshSettings(
           host.privateKeyPath.trim().length > 0 ||
           host.privateKeyConfigured === true ||
           currentHost?.privateKeyConfigured === true,
+        privateKeyPassphrase,
+        privateKeyPassphraseConfigured:
+          privateKeyPassphrase.length > 0 ||
+          host.privateKeyPassphraseConfigured === true ||
+          currentHost?.privateKeyPassphraseConfigured === true,
         proxy: {
           ...host.proxy,
           password: proxyPassword,
@@ -504,6 +532,7 @@ export function buildGatewaySettingsSyncPayload(
     cron: settings.cron,
     remote: {
       enableWebTerminal: settings.remote.enableWebTerminal,
+      enableWebSshTerminal: settings.remote.enableWebSshTerminal,
       enableWebGit: settings.remote.enableWebGit,
       enableWebTunnels: settings.remote.enableWebTunnels,
     },
diff --git a/crates/agent-gui/src/lib/ssh/scan.ts b/crates/agent-gui/src/lib/ssh/scan.ts
index a5ca32c88..5b4d348c4 100644
--- a/crates/agent-gui/src/lib/ssh/scan.ts
+++ b/crates/agent-gui/src/lib/ssh/scan.ts
@@ -240,6 +240,8 @@ export async function scanSshImportCandidates(
       privateKey,
       privateKeyPath: identityPath,
       privateKeyConfigured: privateKey.length > 0 || identityPath.length > 0,
+      privateKeyPassphrase: "",
+      privateKeyPassphraseConfigured: false,
       proxy: {
         type: "socks5",
         url: "",
diff --git a/crates/agent-gui/src/lib/terminal/sessionStore.ts b/crates/agent-gui/src/lib/terminal/sessionStore.ts
index aba7dbf25..009eb1d1a 100644
--- a/crates/agent-gui/src/lib/terminal/sessionStore.ts
+++ b/crates/agent-gui/src/lib/terminal/sessionStore.ts
@@ -54,7 +54,7 @@ export function applyTerminalEventToSessions(
     return sortTerminalSessions(next);
   }
 
-  if (event.kind === "created") {
+  if (event.kind !== "output") {
     return sortTerminalSessions([...current, session]);
   }
 
diff --git a/crates/agent-gui/src/lib/terminal/tauriTerminalClient.ts b/crates/agent-gui/src/lib/terminal/tauriTerminalClient.ts
index 40601fae8..220a0b23a 100644
--- a/crates/agent-gui/src/lib/terminal/tauriTerminalClient.ts
+++ b/crates/agent-gui/src/lib/terminal/tauriTerminalClient.ts
@@ -7,6 +7,10 @@ import type {
   TerminalShellOption,
   TerminalShellOptions,
   TerminalSnapshot,
+  TerminalSshCreateResult,
+  TerminalSshLatency,
+  TerminalSshMetadata,
+  TerminalSshPrompt,
 } from "./types";
 
 type TerminalEventListener = (event: TerminalEvent) => void;
@@ -32,6 +36,24 @@ type RawTerminalSession = Partial<TerminalSession> & {
   updated_at?: number;
   finished_at?: number | null;
   exit_code?: number | null;
+  kind?: string;
+  ssh?: RawTerminalSshMetadata | null;
+};
+
+type RawTerminalSshMetadata = Partial<TerminalSshMetadata> & {
+  host_id?: string;
+  host_name?: string;
+  auth_type?: string;
+  reconnect_attempt?: number;
+  reconnect_max_attempts?: number;
+};
+
+type RawTerminalSshPrompt = Partial<TerminalSshPrompt> & {
+  host_id?: string;
+  host_name?: string;
+  fingerprint_sha256?: string;
+  key_type?: string;
+  answer_echo?: boolean;
 };
 
 type RawTerminalSnapshot = {
@@ -42,6 +64,13 @@ type RawTerminalSnapshot = {
   output_start_offset?: number;
   outputEndOffset?: number;
   output_end_offset?: number;
+  sshPrompt?: RawTerminalSshPrompt | null;
+  ssh_prompt?: RawTerminalSshPrompt | null;
+};
+
+type RawTerminalSshLatency = Partial<TerminalSshLatency> & {
+  session_id?: string;
+  latency_ms?: number;
 };
 
 type RawTerminalListResponse = {
@@ -72,13 +101,16 @@ type RawTerminalEvent = {
 
 function normalizeSession(input: RawTerminalSession): TerminalSession {
   const projectPathKey = input.projectPathKey ?? input.project_path_key ?? "";
+  const kind = input.kind === "ssh" ? "ssh" : "local";
   return {
     id: input.id ?? "",
     projectPathKey,
     cwd: input.cwd ?? "",
     shell: input.shell ?? "",
     title: input.title ?? "Terminal",
-    pid: input.pid ?? null,
+    kind,
+    ssh: input.ssh ? normalizeSshMetadata(input.ssh) : null,
+    pid: kind === "ssh" ? null : (input.pid ?? null),
     cols: Number(input.cols ?? 80),
     rows: Number(input.rows ?? 24),
     createdAt: Number(input.createdAt ?? input.created_at ?? 0),
@@ -89,6 +121,38 @@ function normalizeSession(input: RawTerminalSession): TerminalSession {
   };
 }
 
+function normalizeSshMetadata(input: RawTerminalSshMetadata): TerminalSshMetadata {
+  return {
+    hostId: input.hostId ?? input.host_id ?? "",
+    hostName: input.hostName ?? input.host_name ?? "",
+    username: input.username ?? "",
+    host: input.host ?? "",
+    port: Number(input.port ?? 22),
+    authType: input.authType ?? input.auth_type ?? "",
+    status: input.status ?? "connected",
+    reconnectAttempt: Number(input.reconnectAttempt ?? input.reconnect_attempt ?? 0),
+    reconnectMaxAttempts: Number(input.reconnectMaxAttempts ?? input.reconnect_max_attempts ?? 3),
+  };
+}
+
+function normalizeSshPrompt(input: RawTerminalSshPrompt | null | undefined): TerminalSshPrompt | undefined {
+  if (!input) return undefined;
+  const id = input.id?.trim() ?? "";
+  if (!id) return undefined;
+  return {
+    id,
+    kind: input.kind ?? "hostKey",
+    hostId: input.hostId ?? input.host_id ?? "",
+    hostName: input.hostName ?? input.host_name ?? "",
+    host: input.host ?? "",
+    port: Number(input.port ?? 22),
+    message: input.message ?? "",
+    fingerprintSha256: input.fingerprintSha256 ?? input.fingerprint_sha256 ?? undefined,
+    keyType: input.keyType ?? input.key_type ?? undefined,
+    answerEcho: input.answerEcho ?? input.answer_echo ?? false,
+  };
+}
+
 function normalizeSnapshot(input: RawTerminalSnapshot): TerminalSnapshot {
   if (!input.session) {
     throw new Error("Terminal response did not include a session");
@@ -106,6 +170,25 @@ function normalizeSnapshot(input: RawTerminalSnapshot): TerminalSnapshot {
   };
 }
 
+function normalizeSshCreateResult(input: RawTerminalSnapshot): TerminalSshCreateResult {
+  const prompt = normalizeSshPrompt(input.sshPrompt ?? input.ssh_prompt);
+  return {
+    snapshot: input.session ? normalizeSnapshot(input) : undefined,
+    prompt,
+  };
+}
+
+function normalizeSshLatency(input: RawTerminalSshLatency): TerminalSshLatency {
+  const latencyMs = Number(input.latencyMs ?? input.latency_ms ?? 0);
+  if (!Number.isFinite(latencyMs) || latencyMs <= 0) {
+    throw new Error("SSH latency response did not include latency");
+  }
+  return {
+    sessionId: input.sessionId ?? input.session_id ?? "",
+    latencyMs: Math.round(latencyMs),
+  };
+}
+
 function normalizeShellOptions(input: RawTerminalShellOptionsResponse): TerminalShellOptions {
   const options = (input.options ?? [])
     .map((option) => ({
@@ -168,6 +251,39 @@ export const tauriTerminalClient: TerminalClient = {
       }),
     );
   },
+  async createSsh(params) {
+    return normalizeSshCreateResult(
+      await invoke<RawTerminalSnapshot>("terminal_create_ssh", {
+        cwd: params.cwd,
+        project_path_key: params.projectPathKey,
+        ssh_host_id: params.hostId,
+        title: params.title,
+        cols: params.cols,
+        rows: params.rows,
+      }),
+    );
+  },
+  async answerSshPrompt(params) {
+    return normalizeSshCreateResult(
+      await invoke<RawTerminalSnapshot>("terminal_answer_ssh_prompt", {
+        prompt_id: params.promptId,
+        prompt_answer: params.answer,
+        trust_host_key: params.trustHostKey,
+      }),
+    );
+  },
+  async cancelSshPrompt(promptId) {
+    await invoke("terminal_cancel_ssh_prompt", {
+      prompt_id: promptId,
+    });
+  },
+  async sshLatency(sessionId, _projectPathKey) {
+    return normalizeSshLatency(
+      await invoke<RawTerminalSshLatency>("terminal_ssh_latency", {
+        session_id: sessionId,
+      }),
+    );
+  },
   async snapshot(sessionId, maxBytes, _projectPathKey) {
     return normalizeSnapshot(
       await invoke<RawTerminalSnapshot>("terminal_snapshot", {
diff --git a/crates/agent-gui/src/lib/terminal/types.ts b/crates/agent-gui/src/lib/terminal/types.ts
index 60a9b7ce1..9ff629e33 100644
--- a/crates/agent-gui/src/lib/terminal/types.ts
+++ b/crates/agent-gui/src/lib/terminal/types.ts
@@ -4,6 +4,8 @@ export type TerminalSession = {
   cwd: string;
   shell: string;
   title: string;
+  kind: "local" | "ssh";
+  ssh?: TerminalSshMetadata | null;
   pid?: number | null;
   cols: number;
   rows: number;
@@ -14,6 +16,31 @@ export type TerminalSession = {
   running: boolean;
 };
 
+export type TerminalSshMetadata = {
+  hostId: string;
+  hostName: string;
+  username: string;
+  host: string;
+  port: number;
+  authType: string;
+  status: "connected" | "reconnecting" | "disconnected" | string;
+  reconnectAttempt: number;
+  reconnectMaxAttempts: number;
+};
+
+export type TerminalSshPrompt = {
+  id: string;
+  kind: "hostKey" | "auth" | string;
+  hostId: string;
+  hostName: string;
+  host: string;
+  port: number;
+  message: string;
+  fingerprintSha256?: string;
+  keyType?: string;
+  answerEcho?: boolean;
+};
+
 export type TerminalSnapshot = {
   session: TerminalSession;
   output: string;
@@ -22,6 +49,16 @@ export type TerminalSnapshot = {
   outputEndOffset?: number;
 };
 
+export type TerminalSshCreateResult = {
+  snapshot?: TerminalSnapshot;
+  prompt?: TerminalSshPrompt;
+};
+
+export type TerminalSshLatency = {
+  sessionId: string;
+  latencyMs: number;
+};
+
 export type TerminalShellOption = {
   id: string;
   label: string;
@@ -54,6 +91,21 @@ export type TerminalClient = {
     cols?: number;
     rows?: number;
   }): Promise<TerminalSnapshot>;
+  createSsh(params: {
+    cwd: string;
+    projectPathKey: string;
+    hostId: string;
+    title?: string;
+    cols?: number;
+    rows?: number;
+  }): Promise<TerminalSshCreateResult>;
+  answerSshPrompt(params: {
+    promptId: string;
+    answer?: string;
+    trustHostKey?: boolean;
+  }): Promise<TerminalSshCreateResult>;
+  cancelSshPrompt(promptId: string): Promise<void>;
+  sshLatency(sessionId: string, projectPathKey?: string): Promise<TerminalSshLatency>;
   snapshot(
     sessionId: string,
     maxBytes?: number,
diff --git a/crates/agent-gui/src/pages/ChatPage.tsx b/crates/agent-gui/src/pages/ChatPage.tsx
index 128f769ea..557804fbd 100644
--- a/crates/agent-gui/src/pages/ChatPage.tsx
+++ b/crates/agent-gui/src/pages/ChatPage.tsx
@@ -34,6 +34,7 @@ import type {
   TunnelUpdateInput,
 } from "../components/project-tools/LocalTunnelPanel";
 import type { WorkspaceCodeEditorOpenRequest } from "../components/workspace-editor/WorkspaceCodeEditorOverlay";
+import type { WorkspaceSshTerminalOpenRequest } from "../components/workspace-editor/WorkspaceSshTerminalOverlay";
 import type { WorkspaceImagePreviewOpenRequest } from "../components/workspace-editor/WorkspaceImagePreviewOverlay";
 import { isWorkspaceImagePath } from "../components/workspace-editor/workspaceImagePreview";
 import { Button } from "../components/ui/button";
@@ -224,6 +225,13 @@ const WorkspaceImagePreviewOverlay = lazy(async () => {
   };
 });
 
+const WorkspaceSshTerminalOverlay = lazy(async () => {
+  const module = await import("../components/workspace-editor/WorkspaceSshTerminalOverlay");
+  return {
+    default: module.WorkspaceSshTerminalOverlay,
+  };
+});
+
 type ChatPageProps = {
   settings: AppSettings;
   setSettings: (updater: (prev: AppSettings) => AppSettings) => void;
@@ -667,7 +675,12 @@ export function ChatPage(props: ChatPageProps) {
   const [workspaceImagePreviewOpenRequest, setWorkspaceImagePreviewOpenRequest] =
     useState<WorkspaceImagePreviewOpenRequest | null>(null);
   const workspaceImagePreviewRequestIdRef = useRef(0);
-  const [projectTerminalSessions, setProjectTerminalSessions] = useState<TerminalSession[]>([]);
+  const [workspaceSshTerminalMounted, setWorkspaceSshTerminalMounted] = useState(false);
+  const [workspaceSshTerminalOpen, setWorkspaceSshTerminalOpen] = useState(false);
+  const [workspaceSshTerminalOpenRequest, setWorkspaceSshTerminalOpenRequest] =
+    useState<WorkspaceSshTerminalOpenRequest | null>(null);
+  const workspaceSshTerminalRequestIdRef = useRef(0);
+  const [terminalSessions, setTerminalSessions] = useState<TerminalSession[]>([]);
   const [remoteRuntimeStatus, setRemoteRuntimeStatus] = useState<GatewayRuntimeStatus>(() =>
     buildFallbackGatewayStatus(settings.remote),
   );
@@ -1449,6 +1462,15 @@ export function ChatPage(props: ChatPageProps) {
   const terminalProjectPathKey = terminalProjectPath
     ? workspaceProjectPathKey(terminalProjectPath)
     : "";
+  const projectTerminalSessions = useMemo(
+    () =>
+      terminalProjectPathKey
+        ? terminalSessions.filter((session) =>
+            terminalSessionBelongsToProject(session, terminalProjectPathKey),
+          )
+        : [],
+    [terminalProjectPathKey, terminalSessions],
+  );
   const projectToolsFileTreeOpen = isProjectToolsFileTreeOpen(
     settings.customSettings,
     terminalProjectPathKey,
@@ -1473,6 +1495,22 @@ export function ChatPage(props: ChatPageProps) {
     : !remoteRuntimeStatus.online
       ? t("projectTools.tunnelRemoteOffline")
       : undefined;
+  const hideWorkspaceSshTerminalOverlay = useCallback(() => {
+    setWorkspaceSshTerminalOpen(false);
+  }, []);
+  const openWorkspaceSshTerminalRequest = useCallback(
+    (request: WorkspaceSshTerminalOpenRequest) => {
+      setWorkspaceImagePreviewOpen(false);
+      setWorkspaceEditorOpen(false);
+      setWorkspaceSshTerminalMounted(true);
+      setWorkspaceSshTerminalOpen(true);
+      setWorkspaceSshTerminalOpenRequest(request);
+    },
+    [],
+  );
+  const requestWorkspaceEditorClose = useCallback(() => {
+    setWorkspaceEditorCloseRequestId((current) => current + 1);
+  }, []);
   const handleOpenWorkspaceFile = useCallback(
     (path: string) => {
       if (!terminalProjectPath || !terminalProjectPathKey) return;
@@ -1488,6 +1526,7 @@ export function ChatPage(props: ChatPageProps) {
         });
         return;
       }
+      hideWorkspaceSshTerminalOverlay();
       setWorkspaceImagePreviewOpen(false);
       workspaceEditorRequestIdRef.current += 1;
       setWorkspaceEditorCleanupPending(false);
@@ -1500,11 +1539,20 @@ export function ChatPage(props: ChatPageProps) {
         path,
       });
     },
-    [terminalProjectPath, terminalProjectPathKey],
+    [hideWorkspaceSshTerminalOverlay, terminalProjectPath, terminalProjectPathKey],
+  );
+  const handleOpenSshTerminal = useCallback(
+    (session: TerminalSession) => {
+      if (session.kind !== "ssh") return;
+      workspaceSshTerminalRequestIdRef.current += 1;
+      const openRequest = {
+        id: workspaceSshTerminalRequestIdRef.current,
+        sessionId: session.id,
+      };
+      openWorkspaceSshTerminalRequest(openRequest);
+    },
+    [openWorkspaceSshTerminalRequest],
   );
-  const requestWorkspaceEditorClose = useCallback(() => {
-    setWorkspaceEditorCloseRequestId((current) => current + 1);
-  }, []);
   const requestWorkspaceImagePreviewClose = useCallback(() => {
     setWorkspaceImagePreviewOpen(false);
   }, []);
@@ -1537,20 +1585,20 @@ export function ChatPage(props: ChatPageProps) {
   ]);
   useEffect(() => {
     if (!terminalProjectPathKey) {
-      setProjectTerminalSessions([]);
+      setTerminalSessions([]);
       return;
     }
     let cancelled = false;
     void tauriTerminalClient
-      .list(terminalProjectPathKey)
+      .list()
       .then((sessions) => {
         if (!cancelled) {
-          setProjectTerminalSessions(sortTerminalSessions(sessions));
+          setTerminalSessions(sortTerminalSessions(sessions));
         }
       })
       .catch(() => {
         if (!cancelled) {
-          setProjectTerminalSessions([]);
+          setTerminalSessions([]);
         }
       });
     return () => {
@@ -1560,9 +1608,8 @@ export function ChatPage(props: ChatPageProps) {
   useEffect(() => {
     if (!terminalProjectPathKey) return;
     return tauriTerminalClient.subscribe((event) => {
-      if (!terminalSessionBelongsToProject(event.session, terminalProjectPathKey)) return;
       if (event.kind === "output") return;
-      setProjectTerminalSessions((current) => applyTerminalEventToSessions(current, event));
+      setTerminalSessions((current) => applyTerminalEventToSessions(current, event));
     });
   }, [terminalProjectPathKey]);
   useEffect(() => {
@@ -2117,13 +2164,15 @@ export function ChatPage(props: ChatPageProps) {
           }
           if (terminalSessions.length > 0) {
             await tauriTerminalClient.closeProject(pathKey);
-            setProjectTerminalSessions((current) =>
+            setTerminalSessions((current) =>
               current.filter((session) => !terminalSessionBelongsToProject(session, pathKey)),
             );
           }
           if (pathKey && terminalProjectPathKey === pathKey) {
             setProjectToolsPanelOpen(false);
-            setProjectTerminalSessions([]);
+            setTerminalSessions((current) =>
+              current.filter((session) => !terminalSessionBelongsToProject(session, pathKey)),
+            );
           }
 
           const visibleConversationId = currentConversationIdRef.current;
@@ -4606,13 +4655,34 @@ export function ChatPage(props: ChatPageProps) {
             />
           </Suspense>
         ) : null}
+        {workspaceSshTerminalMounted ? (
+          <Suspense
+            fallback={
+              <div className="absolute inset-0 z-50 flex min-h-0 flex-col border-r border-border bg-background text-sm text-muted-foreground shadow-2xl">
+                <MacOsTitleBarSpacer className="bg-muted/45" />
+                <div className="flex min-h-0 flex-1 items-center justify-center">
+                  {t("workspaceSshTerminal.loading")}
+                </div>
+              </div>
+            }
+          >
+            <WorkspaceSshTerminalOverlay
+              openRequest={workspaceSshTerminalOpenRequest}
+              sessions={terminalSessions}
+              client={tauriTerminalClient}
+              theme={settings.theme}
+              isOpen={workspaceSshTerminalOpen}
+              onHide={() => setWorkspaceSshTerminalOpen(false)}
+            />
+          </Suspense>
+        ) : null}
       </div>
       <ProjectToolsPanel
         isOpen={activeView === "chat" && projectToolsPanelOpen}
         collapseImmediately={activeView !== "chat"}
         projectPathKey={terminalProjectPathKey}
         cwd={terminalProjectPath}
-        sessions={projectTerminalSessions}
+        sessions={terminalSessions}
         width={settings.customSettings.projectToolsPanel.width}
         theme={settings.theme}
         disabledMessage={terminalDisabledMessage}
@@ -4680,7 +4750,8 @@ export function ChatPage(props: ChatPageProps) {
         onSshProjectHostIdsChange={(hostIds) =>
           setSettings((prev) => updateSshProjectHostIds(prev, terminalProjectPathKey, hostIds))
         }
-        onSessionsChange={setProjectTerminalSessions}
+        onOpenSshSession={handleOpenSshTerminal}
+        onSessionsChange={(sessions) => setTerminalSessions(sortTerminalSessions(sessions))}
         onInsertFileMention={(path, kind) => {
           composerRef.current?.insertFileMention(path, kind);
           composerRef.current?.focus();
diff --git a/crates/agent-gui/src/pages/settings/RemoteSection.tsx b/crates/agent-gui/src/pages/settings/RemoteSection.tsx
index 54a2e710f..e82e27709 100644
--- a/crates/agent-gui/src/pages/settings/RemoteSection.tsx
+++ b/crates/agent-gui/src/pages/settings/RemoteSection.tsx
@@ -501,6 +501,24 @@ export function RemoteSection(props: SettingsSectionProps) {
             />
           </div>
 
+          <div className="flex items-center justify-between gap-4 rounded-lg bg-muted/30 px-4 py-3">
+            <div className="min-w-0 flex-1">
+              <div className="text-sm font-medium">{t("settings.remoteWebSshTerminal")}</div>
+              <p className="mt-0.5 text-xs text-muted-foreground">
+                {t("settings.remoteWebSshTerminalHint")}
+              </p>
+            </div>
+            <AgentActivationSwitch
+              checked={settings.remote.enableWebSshTerminal}
+              title={t("settings.remoteWebSshTerminal")}
+              onToggle={() =>
+                updateRemoteSettings(setSettings, {
+                  enableWebSshTerminal: !settings.remote.enableWebSshTerminal,
+                })
+              }
+            />
+          </div>
+
           <div className="flex items-center justify-between gap-4 rounded-lg bg-muted/30 px-4 py-3">
             <div className="min-w-0 flex-1">
               <div className="text-sm font-medium">{t("settings.remoteWebGit")}</div>
diff --git a/crates/agent-gui/src/pages/settings/SshSection.tsx b/crates/agent-gui/src/pages/settings/SshSection.tsx
index f699f18e8..29fe315c3 100644
--- a/crates/agent-gui/src/pages/settings/SshSection.tsx
+++ b/crates/agent-gui/src/pages/settings/SshSection.tsx
@@ -1,3 +1,4 @@
+import { invoke } from "@tauri-apps/api/core";
 import { type CSSProperties, useEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import {
@@ -12,6 +13,7 @@ import {
   Pencil,
   Plus,
   Server,
+  Shield,
   Trash2,
   Upload,
 } from "../../components/icons";
@@ -34,11 +36,20 @@ import {
   type SshScanResult,
   scanSshImportCandidates,
 } from "../../lib/ssh/scan";
-import { ConfirmDeletePopover, PromptTag } from "./shared";
+import { ConfirmActionPopover, ConfirmDeletePopover, PromptTag } from "./shared";
 import type { SettingsSectionProps } from "./types";
 
 type SshViewMode = "list" | "grid";
 type SshHostDraft = Omit<SshHostConfig, "id">;
+type SshKnownHostResetStatus = {
+  hostId: string;
+  kind: "success" | "info" | "error";
+  message: string;
+};
+
+type SshKnownHostResetResponse = {
+  deleted: number;
+};
 
 function normalizePortInput(value: string) {
   const port = Number(value);
@@ -120,6 +131,9 @@ function SshHostModal(props: {
   const [password, setPassword] = useState(initialData?.password ?? "");
   const [privateKey, setPrivateKey] = useState(initialData?.privateKey ?? "");
   const [privateKeyPath, setPrivateKeyPath] = useState(initialData?.privateKeyPath ?? "");
+  const [privateKeyPassphrase, setPrivateKeyPassphrase] = useState(
+    initialData?.privateKeyPassphrase ?? "",
+  );
   const [advancedOpen, setAdvancedOpen] = useState(false);
   const [proxyType, setProxyType] = useState<SshProxyType>(initialData?.proxy.type ?? "socks5");
   const [proxyUrl, setProxyUrl] = useState(initialData?.proxy.url ?? "");
@@ -138,7 +152,7 @@ function SshHostModal(props: {
     transform: isPasswordAuth ? "translateY(0)" : "translateY(-4px)",
   };
   const privateKeyAuthPanelStyle: CSSProperties = {
-    maxHeight: isPasswordAuth ? "0rem" : "24rem",
+    maxHeight: isPasswordAuth ? "0rem" : "29rem",
     opacity: isPasswordAuth ? 0 : 1,
     pointerEvents: isPasswordAuth ? "none" : "auto",
     transform: isPasswordAuth ? "translateY(4px)" : "translateY(0)",
@@ -164,6 +178,7 @@ function SshHostModal(props: {
     const trimmedPassword = password.trim();
     const trimmedPrivateKey = privateKey.trim();
     const trimmedPrivateKeyPath = privateKeyPath.trim();
+    const trimmedPrivateKeyPassphrase = privateKeyPassphrase.trim();
     const trimmedProxyPassword = proxyPassword.trim();
     onSave({
       name: trimmedName,
@@ -180,6 +195,10 @@ function SshHostModal(props: {
         trimmedPrivateKey.length > 0 ||
         trimmedPrivateKeyPath.length > 0 ||
         initialData?.privateKeyConfigured === true,
+      privateKeyPassphrase: trimmedPrivateKeyPassphrase,
+      privateKeyPassphraseConfigured:
+        trimmedPrivateKeyPassphrase.length > 0 ||
+        initialData?.privateKeyPassphraseConfigured === true,
       proxy: {
         type: proxyType,
         url: proxyUrl.trim(),
@@ -388,6 +407,26 @@ function SshHostModal(props: {
                     {t("settings.sshPrivateKeyConfigured")}
                   </div>
                 ) : null}
+                <div className="space-y-1.5">
+                  <Label
+                    htmlFor="ssh-private-key-passphrase"
+                    className="text-xs font-medium text-muted-foreground"
+                  >
+                    {t("settings.sshPrivateKeyPassphrase")}
+                  </Label>
+                  <SshPasswordInput
+                    id="ssh-private-key-passphrase"
+                    value={privateKeyPassphrase}
+                    disabled={isPasswordAuth}
+                    onChange={setPrivateKeyPassphrase}
+                  />
+                  {initialData?.privateKeyPassphraseConfigured &&
+                  !privateKeyPassphrase.trim() ? (
+                    <div className="text-[11px] text-muted-foreground">
+                      {t("settings.sshPrivateKeyPassphraseConfigured")}
+                    </div>
+                  ) : null}
+                </div>
               </div>
             </div>
           </div>
@@ -697,19 +736,44 @@ function SshImportModal(props: {
 function SshHostCard(props: {
   host: SshHostConfig;
   viewMode: SshViewMode;
+  resetStatus?: SshKnownHostResetStatus;
+  resettingKnownHost: boolean;
   onEdit: () => void;
   onDelete: () => void;
+  onResetKnownHost: () => void;
 }) {
-  const { host, viewMode, onEdit, onDelete } = props;
+  const { host, viewMode, resetStatus, resettingKnownHost, onEdit, onDelete, onResetKnownHost } =
+    props;
   const { t } = useLocale();
   const showKeyPath = host.authType === "privateKey" && host.privateKeyPath.trim().length > 0;
   const showKeyConfigured = host.authType === "privateKey" && host.privateKeyConfigured;
   const showProxy =
     host.proxy.url.trim().length > 0 || host.proxy.port > 0 || host.proxy.passwordConfigured;
   const hasMeta = showKeyPath || showKeyConfigured || showProxy;
+  const hasFooter = hasMeta || resetStatus;
 
   const actions = (
     <div className="settings-hover-actions flex items-center gap-0.5 opacity-0 transition-opacity focus-within:opacity-100 group-hover:opacity-100">
+      <ConfirmActionPopover
+        title={t("settings.sshKnownHostResetTitle")}
+        description={t("settings.sshKnownHostResetDesc")}
+        confirmLabel={t("settings.sshKnownHostResetConfirm")}
+        onConfirm={onResetKnownHost}
+      >
+        {(open) => (
+          <Button
+            variant="ghost"
+            size="icon"
+            className="h-7 w-7 text-muted-foreground hover:text-foreground"
+            onClick={open}
+            title={t("settings.sshKnownHostReset")}
+            aria-label={t("settings.sshKnownHostReset")}
+            disabled={resettingKnownHost}
+          >
+            <Shield className="h-3.5 w-3.5" />
+          </Button>
+        )}
+      </ConfirmActionPopover>
       <Button
         variant="ghost"
         size="icon"
@@ -743,6 +807,16 @@ function SshHostCard(props: {
     </div>
   );
 
+  const resetStatusNode = resetStatus ? (
+    <div
+      className={`text-xs leading-relaxed ${
+        resetStatus.kind === "error" ? "text-destructive" : "text-muted-foreground"
+      }`}
+    >
+      {resetStatus.message}
+    </div>
+  ) : null;
+
   if (viewMode === "grid") {
     return (
       <div className="group relative z-0 flex flex-col rounded-xl border border-border/60 bg-card p-4 transition-all duration-200 hover:z-10 hover:border-emerald-500/40 hover:shadow-md hover:shadow-emerald-500/10">
@@ -761,7 +835,12 @@ function SshHostCard(props: {
         <div className="mt-3 truncate font-mono text-xs text-muted-foreground">
           {endpointLabel(host)}
         </div>
-        {hasMeta ? <div className="mt-auto pt-3">{metaTags}</div> : null}
+        {hasFooter ? (
+          <div className="mt-auto space-y-2 pt-3">
+            {hasMeta ? metaTags : null}
+            {resetStatusNode}
+          </div>
+        ) : null}
       </div>
     );
   }
@@ -783,7 +862,12 @@ function SshHostCard(props: {
         </div>
         {actions}
       </div>
-      {hasMeta ? <div className="border-t border-border/40 px-4 py-2.5">{metaTags}</div> : null}
+      {hasFooter ? (
+        <div className="space-y-2 border-t border-border/40 px-4 py-2.5">
+          {hasMeta ? metaTags : null}
+          {resetStatusNode}
+        </div>
+      ) : null}
     </div>
   );
 }
@@ -836,8 +920,31 @@ export function SshSection(props: SettingsSectionProps) {
   const [modalOpen, setModalOpen] = useState(false);
   const [importOpen, setImportOpen] = useState(false);
   const [editingHost, setEditingHost] = useState<SshHostConfig | null>(null);
+  const [knownHostResettingId, setKnownHostResettingId] = useState<string | null>(null);
+  const [knownHostResetStatus, setKnownHostResetStatus] =
+    useState<SshKnownHostResetStatus | null>(null);
+  const knownHostResetTimerRef = useRef<number | null>(null);
   const hosts = settings.ssh.hosts;
 
+  useEffect(() => {
+    return () => {
+      if (knownHostResetTimerRef.current !== null) {
+        window.clearTimeout(knownHostResetTimerRef.current);
+      }
+    };
+  }, []);
+
+  function showKnownHostResetStatus(status: SshKnownHostResetStatus) {
+    if (knownHostResetTimerRef.current !== null) {
+      window.clearTimeout(knownHostResetTimerRef.current);
+    }
+    setKnownHostResetStatus(status);
+    knownHostResetTimerRef.current = window.setTimeout(() => {
+      setKnownHostResetStatus((current) => (current?.hostId === status.hostId ? null : current));
+      knownHostResetTimerRef.current = null;
+    }, 5000);
+  }
+
   function openAdd() {
     setEditingHost(null);
     setModalOpen(true);
@@ -864,12 +971,17 @@ export function SshSection(props: SettingsSectionProps) {
                   ...data,
                   password: data.password || host.password,
                   privateKey: data.privateKey || host.privateKey,
+                  privateKeyPassphrase:
+                    data.privateKeyPassphrase || host.privateKeyPassphrase,
                   passwordConfigured:
                     data.password.trim().length > 0 || host.passwordConfigured === true,
                   privateKeyConfigured:
                     data.privateKey.trim().length > 0 ||
                     data.privateKeyPath.trim().length > 0 ||
                     host.privateKeyConfigured === true,
+                  privateKeyPassphraseConfigured:
+                    data.privateKeyPassphrase.trim().length > 0 ||
+                    host.privateKeyPassphraseConfigured === true,
                   proxy: {
                     ...data.proxy,
                     password: data.proxy.password || host.proxy.password,
@@ -905,6 +1017,46 @@ export function SshSection(props: SettingsSectionProps) {
     );
   }
 
+  async function handleResetKnownHost(host: SshHostConfig) {
+    const targetHost = host.host.trim();
+    if (!targetHost || host.port <= 0) {
+      showKnownHostResetStatus({
+        hostId: host.id,
+        kind: "error",
+        message: t("settings.sshKnownHostResetFailed").replace(
+          "{error}",
+          t("settings.sshRequired"),
+        ),
+      });
+      return;
+    }
+
+    setKnownHostResettingId(host.id);
+    try {
+      const response = await invoke<SshKnownHostResetResponse>("settings_reset_ssh_known_host", {
+        host: targetHost,
+        port: host.port,
+      });
+      showKnownHostResetStatus({
+        hostId: host.id,
+        kind: response.deleted > 0 ? "success" : "info",
+        message:
+          response.deleted > 0
+            ? t("settings.sshKnownHostResetSuccess")
+            : t("settings.sshKnownHostResetEmpty"),
+      });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      showKnownHostResetStatus({
+        hostId: host.id,
+        kind: "error",
+        message: t("settings.sshKnownHostResetFailed").replace("{error}", message),
+      });
+    } finally {
+      setKnownHostResettingId((current) => (current === host.id ? null : current));
+    }
+  }
+
   function handleImport(candidates: SshImportCandidate[]) {
     setSettings((prev) =>
       updateSsh(prev, {
@@ -996,8 +1148,13 @@ export function SshSection(props: SettingsSectionProps) {
                 key={host.id}
                 host={host}
                 viewMode={viewMode}
+                resetStatus={
+                  knownHostResetStatus?.hostId === host.id ? knownHostResetStatus : undefined
+                }
+                resettingKnownHost={knownHostResettingId === host.id}
                 onEdit={() => openEdit(host)}
                 onDelete={() => handleDelete(host.id)}
+                onResetKnownHost={() => void handleResetKnownHost(host)}
               />
             ))}
           </div>
diff --git a/crates/agent-gui/test/settings/normalization.test.mjs b/crates/agent-gui/test/settings/normalization.test.mjs
index fda707545..86b94de13 100644
--- a/crates/agent-gui/test/settings/normalization.test.mjs
+++ b/crates/agent-gui/test/settings/normalization.test.mjs
@@ -540,6 +540,73 @@ test("gateway settings sync payload redacts provider api keys", () => {
   });
 });
 
+test("gateway settings sync redacts ssh secrets and preserves configured state", () => {
+  const appSettings = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "prod",
+          name: "Production",
+          host: "prod.example.com",
+          port: 2222,
+          username: "deploy",
+          authType: "privateKey",
+          password: "ssh-password",
+          privateKey: "-----BEGIN OPENSSH PRIVATE KEY-----\nsecret\n-----END OPENSSH PRIVATE KEY-----",
+          privateKeyPath: "~/.ssh/id_ed25519",
+          privateKeyPassphrase: "key-passphrase",
+          proxy: {
+            type: "http",
+            url: "http://127.0.0.1",
+            port: 1080,
+            username: "proxy-user",
+            password: "proxy-password",
+          },
+        },
+      ],
+      projectHostAssociations: {
+        "/workspace/project": ["prod", "missing", "prod"],
+      },
+    },
+    remote: {
+      enableWebTerminal: true,
+      enableWebSshTerminal: true,
+    },
+  });
+
+  const payload = sync.buildGatewaySettingsSyncPayload(appSettings);
+  assert.equal(payload.ssh.hosts[0].password, "");
+  assert.equal(payload.ssh.hosts[0].privateKey, "");
+  assert.equal(payload.ssh.hosts[0].privateKeyPassphrase, "");
+  assert.equal(payload.ssh.hosts[0].proxy.password, "");
+  assert.equal(payload.ssh.hosts[0].passwordConfigured, true);
+  assert.equal(payload.ssh.hosts[0].privateKeyConfigured, true);
+  assert.equal(payload.ssh.hosts[0].privateKeyPassphraseConfigured, true);
+  assert.equal(payload.ssh.hosts[0].proxy.passwordConfigured, true);
+  assert.deepEqual(payload.ssh.projectHostAssociations, {
+    "/workspace/project": ["prod"],
+  });
+  assert.equal(payload.sshSecretUpdates, undefined);
+  assert.deepEqual(payload.remote, {
+    enableWebTerminal: true,
+    enableWebSshTerminal: true,
+    enableWebGit: false,
+    enableWebTunnels: false,
+  });
+
+  const updatePayload = sync.buildGatewaySettingsSyncPayload(appSettings, {
+    includeProviderApiKeyUpdates: true,
+  });
+  assert.deepEqual(updatePayload.sshSecretUpdates, {
+    prod: {
+      password: "ssh-password",
+      privateKey: "-----BEGIN OPENSSH PRIVATE KEY-----\nsecret\n-----END OPENSSH PRIVATE KEY-----",
+      privateKeyPassphrase: "key-passphrase",
+      proxyPassword: "proxy-password",
+    },
+  });
+});
+
 test("workspace project selection does not rewrite global system workdir or sync active project", () => {
   const resolvedSystem = settings.resolveWorkspaceProjects(
     {
@@ -631,18 +698,7 @@ test("gateway settings sync preserves active workspace project by path when ids
   assert.equal(synced.system.activeWorkspaceProjectId, "desktop-project-a");
 });
 
-test("normalizes project tools panel from current and legacy terminal panel settings", () => {
-  const normalized = settings.normalizeSettings({
-    customSettings: {
-      terminalPanel: {
-        width: 612,
-      },
-    },
-  });
-
-  assert.equal(normalized.customSettings.projectToolsPanel.width, 612);
-  assert.equal(normalized.customSettings.projectToolsPanel.activeTab, "fileTree");
-
+test("normalizes project tools panel from current settings", () => {
   const currentShape = settings.normalizeSettings({
     customSettings: {
       projectToolsPanel: {
@@ -1081,65 +1137,6 @@ test("gateway settings sync keeps project tools panel local and syncs project to
     "/web/project",
   ]);
   assert.equal(synced.customSettings.projectToolsTunnel.openVersion, 2);
-
-  const legacyPanelSynced = sync.applyGatewaySettingsSyncPayload(current, {
-    ...payload,
-    customSettings: {
-      ...payload.customSettings,
-      projectToolsPanel: {
-        width: 360,
-        activeTab: "fileTree",
-        activeTabs: {
-          "/web/project": "fileTree",
-        },
-        tabOrders: {
-          "/web/project": ["web-terminal", "__file_tree__"],
-        },
-      },
-    },
-  });
-  assert.equal(legacyPanelSynced.customSettings.projectToolsPanel.width, 612);
-  assert.equal(legacyPanelSynced.customSettings.projectToolsPanel.activeTab, "terminal");
-  assert.deepEqual(legacyPanelSynced.customSettings.projectToolsPanel.activeTabs, {
-    "/desktop/project": "terminal",
-  });
-  assert.deepEqual(legacyPanelSynced.customSettings.projectToolsPanel.tabOrders, {
-    "/desktop/project": ["desktop-terminal", "__file_tree__"],
-  });
-  assert.deepEqual(legacyPanelSynced.customSettings.projectToolsFileTree.openProjectPathKeys, [
-    "/web/project",
-  ]);
-
-  const {
-    projectToolsFileTree: _projectToolsFileTree,
-    projectToolsGitReview: _projectToolsGitReview,
-    projectToolsTunnel: _projectToolsTunnel,
-    projectToolsPanel: _projectToolsPanel,
-    ...legacyCustomSettings
-  } = payload.customSettings;
-  const legacySynced = sync.applyGatewaySettingsSyncPayload(current, {
-    ...payload,
-    customSettings: legacyCustomSettings,
-  });
-  assert.deepEqual(legacySynced.customSettings.projectToolsFileTree.openProjectPathKeys, [
-    "/desktop/project",
-  ]);
-  assert.equal(legacySynced.customSettings.projectToolsPanel.activeTab, "terminal");
-  assert.deepEqual(legacySynced.customSettings.projectToolsFileTree.projects["/desktop/project"], {
-    query: "desktop",
-    selectedPath: "desktop.ts",
-    expandedPaths: ["", "src"],
-    revision: 1,
-    stateVersion: 0,
-  });
-  assert.deepEqual(legacySynced.customSettings.projectToolsGitReview.openProjectPathKeys, [
-    "/desktop/project",
-  ]);
-  assert.equal(legacySynced.customSettings.projectToolsGitReview.openVersion, 1);
-  assert.deepEqual(legacySynced.customSettings.projectToolsTunnel.openProjectPathKeys, [
-    "/desktop/project",
-  ]);
-  assert.equal(legacySynced.customSettings.projectToolsTunnel.openVersion, 1);
 });
 
 test("gateway settings sync ignores stale project file tree UI snapshots", () => {
@@ -1498,6 +1495,95 @@ test("gateway settings sync applies redacted providers without clearing local ap
   assert.equal(updated.customProviders[0].apiKey, "new-key");
 });
 
+test("gateway settings sync applies redacted ssh hosts without clearing local secrets", () => {
+  const current = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "prod",
+          name: "Production",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "privateKey",
+          password: "old-password",
+          privateKey: "old-key",
+          privateKeyPassphrase: "old-passphrase",
+          proxy: {
+            password: "old-proxy-password",
+          },
+        },
+      ],
+      projectHostAssociations: {
+        "/workspace/project": ["prod"],
+      },
+    },
+  });
+
+  const redacted = sync.applyGatewaySettingsSyncPayload(current, {
+    ssh: {
+      hosts: [
+        {
+          id: "prod",
+          name: "Renamed Production",
+          host: "prod.internal",
+          username: "ubuntu",
+          authType: "privateKey",
+          passwordConfigured: true,
+          privateKeyConfigured: true,
+          privateKeyPassphraseConfigured: true,
+          proxy: {
+            passwordConfigured: true,
+          },
+        },
+      ],
+      projectHostAssociations: {
+        "/workspace/other": ["prod"],
+      },
+    },
+  });
+  assert.equal(redacted.ssh.hosts[0].name, "Renamed Production");
+  assert.equal(redacted.ssh.hosts[0].password, "old-password");
+  assert.equal(redacted.ssh.hosts[0].privateKey, "old-key");
+  assert.equal(redacted.ssh.hosts[0].privateKeyPassphrase, "old-passphrase");
+  assert.equal(redacted.ssh.hosts[0].proxy.password, "old-proxy-password");
+  assert.equal(redacted.ssh.hosts[0].privateKeyPassphraseConfigured, true);
+  assert.deepEqual(redacted.ssh.projectHostAssociations, {
+    "/workspace/other": ["prod"],
+  });
+
+  const updated = sync.applyGatewaySettingsSyncPayload(current, {
+    ssh: {
+      hosts: [
+        {
+          id: "prod",
+          name: "Production",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "privateKey",
+          passwordConfigured: true,
+          privateKeyConfigured: true,
+          privateKeyPassphraseConfigured: true,
+          proxy: {
+            passwordConfigured: true,
+          },
+        },
+      ],
+    },
+    sshSecretUpdates: {
+      prod: {
+        password: "new-password",
+        privateKey: "new-key",
+        privateKeyPassphrase: "new-passphrase",
+        proxyPassword: "new-proxy-password",
+      },
+    },
+  });
+  assert.equal(updated.ssh.hosts[0].password, "new-password");
+  assert.equal(updated.ssh.hosts[0].privateKey, "new-key");
+  assert.equal(updated.ssh.hosts[0].privateKeyPassphrase, "new-passphrase");
+  assert.equal(updated.ssh.hosts[0].proxy.password, "new-proxy-password");
+});
+
 test("web storage redaction clears api keys but keeps configured state", () => {
   const appSettings = settings.normalizeSettings({
     customProviders: [
@@ -1518,6 +1604,38 @@ test("web storage redaction clears api keys but keeps configured state", () => {
   assert.equal(redacted.customProviders[0].apiKeyConfigured, true);
 });
 
+test("web storage redaction clears ssh secrets but keeps configured state", () => {
+  const appSettings = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "prod",
+          name: "Production",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "privateKey",
+          password: "ssh-password",
+          privateKey: "ssh-key",
+          privateKeyPassphrase: "ssh-passphrase",
+          proxy: {
+            password: "proxy-password",
+          },
+        },
+      ],
+    },
+  });
+
+  const redacted = sync.redactSettingsForWebStorage(appSettings);
+  assert.equal(redacted.ssh.hosts[0].password, "");
+  assert.equal(redacted.ssh.hosts[0].privateKey, "");
+  assert.equal(redacted.ssh.hosts[0].privateKeyPassphrase, "");
+  assert.equal(redacted.ssh.hosts[0].proxy.password, "");
+  assert.equal(redacted.ssh.hosts[0].passwordConfigured, true);
+  assert.equal(redacted.ssh.hosts[0].privateKeyConfigured, true);
+  assert.equal(redacted.ssh.hosts[0].privateKeyPassphraseConfigured, true);
+  assert.equal(redacted.ssh.hosts[0].proxy.passwordConfigured, true);
+});
+
 test("only one agent prompt template remains enabled after normalization", () => {
   const agents = settings.normalizeAgentPromptTemplates([
     { id: "a", name: "A", prompt: "Prompt A", enabled: true },
@@ -1603,17 +1721,7 @@ test("hook and cron normalization keep request bodies only for methods that supp
   assert.equal(invalidCronTask.remainingExecutions, undefined);
 });
 
-test("command hook normalization uses script only and drops legacy commands", () => {
-  const legacy = settings.normalizeConversationHook({
-    id: "hook-legacy",
-    type: "command",
-    event: "agent_start",
-    name: "Legacy",
-    commands: [["echo", "legacy"]],
-  });
-  assert.equal(legacy.script, "");
-  assert.equal(legacy.commands, undefined);
-
+test("command hook normalization uses script only", () => {
   const scriptHook = settings.normalizeConversationHook({
     id: "hook-script",
     type: "command",
@@ -1648,6 +1756,7 @@ test("mcp and remote settings normalize transport, selection, ports, and tokens"
     token: " secret ",
     autoReconnect: false,
     heartbeatInterval: "15.8",
+    enableWebSshTerminal: true,
   });
 
   assert.equal(remote.gatewayUrl, "http://127.0.0.1:8787");
@@ -1656,6 +1765,7 @@ test("mcp and remote settings normalize transport, selection, ports, and tokens"
   assert.equal(remote.token, "secret");
   assert.equal(remote.autoReconnect, false);
   assert.equal(remote.heartbeatInterval, 15);
+  assert.equal(remote.enableWebSshTerminal, true);
 
   const remoteWithOversizedPort = settings.normalizeRemoteSettings({
     grpcPort: "70000",

From 71da85b773fd024969d2c6dfce37365d12bbcc8a Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sat, 13 Jun 2026 17:43:26 +0800
Subject: [PATCH 05/28] feat(project-tools): refine SSH terminal experience

---
 .../test/webui/gateway-socket-client.test.mjs |  82 +++++++++++
 .../test/webui/web-settings.test.mjs          | 127 ++++++++++++++++++
 crates/agent-gateway/web/src/App.tsx          |  31 ++---
 .../project-tools/SshTunnelPanel.tsx          |  74 ++++++++--
 .../project-tools/XTermViewport.tsx           |  63 +++++++--
 crates/agent-gateway/web/src/i18n/config.ts   |   4 +-
 .../web/src/lib/gatewaySocket.ts              |  17 ++-
 .../web/src/lib/gatewaySocket.worker.ts       |   7 +-
 .../web/src/lib/settings/sync.ts              |  46 +++++++
 crates/agent-gateway/web/src/styles.css       |  97 +++++++++++--
 .../project-tools/SshTunnelPanel.tsx          |  74 ++++++++--
 .../project-tools/XTermViewport.tsx           |  63 +++++++--
 crates/agent-gui/src/i18n/config.ts           |   4 +-
 crates/agent-gui/src/index.css                |  54 ++++++++
 crates/agent-gui/src/lib/settings/sync.ts     |  46 +++++++
 .../test/settings/normalization.test.mjs      | 123 +++++++++++++++++
 16 files changed, 828 insertions(+), 84 deletions(-)

diff --git a/crates/agent-gateway/test/webui/gateway-socket-client.test.mjs b/crates/agent-gateway/test/webui/gateway-socket-client.test.mjs
index 7905c433e..94f891844 100644
--- a/crates/agent-gateway/test/webui/gateway-socket-client.test.mjs
+++ b/crates/agent-gateway/test/webui/gateway-socket-client.test.mjs
@@ -331,6 +331,88 @@ test("SharedWorker gateway client accepts terminal list sessions from worker pay
   resetGatewayWebSocketClient();
 });
 
+test("SharedWorker gateway client keeps SSH create snapshots from worker payload", async () => {
+  installBrowser();
+  FakeSharedWorker.instances = [];
+  globalThis.SharedWorker = FakeSharedWorker;
+  const loader = createWebModuleLoader();
+  const { getGatewayWebSocketClient, resetGatewayWebSocketClient } = loader.loadModule("src/lib/gatewaySocket.ts");
+  resetGatewayWebSocketClient();
+
+  const client = getGatewayWebSocketClient(" token ");
+  const port = FakeSharedWorker.instances[0].port;
+  const connect = port.messages.find((message) => message.type === "connect");
+  port.emit({
+    type: "ready",
+    connection_id: connect.connection_id,
+    payload: { status: { online: true }, error: null },
+  });
+
+  const createPromise = client.createSshTerminal({
+    cwd: "/workspace/project",
+    projectPathKey: "project-key",
+    hostId: "host-1",
+  });
+  await waitFor(
+    () => port.messages.some((message) => message.type === "request" && message.method === "terminal.create_ssh"),
+    "terminal.create_ssh worker request",
+  );
+  const request = port.messages.find((message) => message.type === "request" && message.method === "terminal.create_ssh");
+  assert.ok(request);
+  assert.deepEqual(request.payload, {
+    cwd: "/workspace/project",
+    project_path_key: "project-key",
+    ssh_host_id: "host-1",
+    title: undefined,
+    cols: undefined,
+    rows: undefined,
+  });
+  port.emit({
+    type: "response",
+    connection_id: connect.connection_id,
+    request_id: request.request_id,
+    payload: {
+      snapshot: {
+        session: {
+          id: "ssh-1",
+          projectPathKey: "project-key",
+          cwd: "/workspace/project",
+          shell: "ssh",
+          title: "Claw-SG",
+          kind: "ssh",
+          ssh: {
+            hostId: "host-1",
+            hostName: "Claw-SG",
+            username: "root",
+            host: "8.219.204.112",
+            port: 22,
+            authType: "privateKey",
+            status: "connected",
+            reconnectAttempt: 0,
+            reconnectMaxAttempts: 3,
+          },
+          pid: null,
+          cols: 80,
+          rows: 24,
+          createdAt: 10,
+          updatedAt: 10,
+          running: true,
+        },
+        output: "root@s878169:~# ",
+        truncated: false,
+        outputStartOffset: 0,
+        outputEndOffset: 18,
+      },
+    },
+  });
+
+  const result = await createPromise;
+  assert.equal(result.snapshot?.session.id, "ssh-1");
+  assert.equal(result.snapshot?.session.ssh?.hostId, "host-1");
+  assert.equal(result.snapshot?.output, "root@s878169:~# ");
+  resetGatewayWebSocketClient();
+});
+
 test("SharedWorker gateway client forwards chat runtime controls to the worker", async () => {
   installBrowser();
   FakeSharedWorker.instances = [];
diff --git a/crates/agent-gateway/test/webui/web-settings.test.mjs b/crates/agent-gateway/test/webui/web-settings.test.mjs
index 5414df1c1..85c8f3fd8 100644
--- a/crates/agent-gateway/test/webui/web-settings.test.mjs
+++ b/crates/agent-gateway/test/webui/web-settings.test.mjs
@@ -258,6 +258,7 @@ test("gateway settings sync keeps remote connection local and syncs web terminal
   const payload = settingsSync.buildGatewaySettingsSyncPayload(synced);
   assert.deepEqual(payload.remote, {
     enableWebTerminal: synced.remote.enableWebTerminal,
+    enableWebSshTerminal: synced.remote.enableWebSshTerminal,
     enableWebGit: synced.remote.enableWebGit,
     enableWebTunnels: synced.remote.enableWebTunnels,
   });
@@ -471,6 +472,132 @@ test("ssh settings sync preserves project host associations when older payload o
   assert.deepEqual(cleared.ssh.projectHostAssociations, {});
 });
 
+test("settings update payload omits unchanged empty ssh hosts for non-ssh updates", () => {
+  installWindow();
+  const desktop = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "ssh-prod",
+          name: "Prod",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+        },
+      ],
+      projectHostAssociations: {
+        "/project-a": ["ssh-prod"],
+      },
+    },
+  });
+  const staleWeb = settings.normalizeSettings({
+    customSettings: {
+      projectToolsSshTunnel: {
+        openProjectPathKeys: [],
+        openVersion: 0,
+      },
+    },
+    ssh: {
+      hosts: [],
+      projectHostAssociations: {},
+    },
+  });
+  const nextWeb = settings.updateProjectToolsSshTunnelOpen(staleWeb, "/project-a", true);
+
+  const update = settingsSync.buildGatewaySettingsSyncUpdatePayload(staleWeb, nextWeb, {
+    includeProviderApiKeyUpdates: true,
+  });
+
+  assert.equal(Object.hasOwn(update, "ssh"), false);
+  assert.equal(Object.hasOwn(update, "customSettings"), true);
+
+  const merged = settingsSync.applyGatewaySettingsSyncPayload(desktop, update);
+  assert.deepEqual(
+    merged.ssh.hosts.map((host) => host.id),
+    ["ssh-prod"],
+  );
+  assert.deepEqual(merged.ssh.projectHostAssociations, {
+    "/project-a": ["ssh-prod"],
+  });
+  assert.equal(settings.isProjectToolsSshTunnelOpen(merged.customSettings, "/project-a"), true);
+});
+
+test("settings update payload includes ssh when hosts are explicitly deleted", () => {
+  installWindow();
+  const current = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "ssh-prod",
+          name: "Prod",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+        },
+      ],
+      projectHostAssociations: {
+        "/project-a": ["ssh-prod"],
+      },
+    },
+  });
+  const deleted = settings.updateSsh(current, {
+    hosts: [],
+    projectHostAssociations: {},
+  });
+
+  const update = settingsSync.buildGatewaySettingsSyncUpdatePayload(current, deleted, {
+    includeProviderApiKeyUpdates: true,
+  });
+
+  assert.equal(Object.hasOwn(update, "ssh"), true);
+  assert.deepEqual(update.ssh.hosts, []);
+  assert.deepEqual(update.ssh.projectHostAssociations, {});
+});
+
+test("settings update payload includes ssh for secret-only ssh updates", () => {
+  installWindow();
+  const current = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "ssh-prod",
+          name: "Prod",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+          password: "old-password",
+        },
+      ],
+    },
+  });
+  const next = settings.normalizeSettings({
+    ...current,
+    ssh: {
+      ...current.ssh,
+      hosts: [
+        {
+          ...current.ssh.hosts[0],
+          password: "new-password",
+        },
+      ],
+    },
+  });
+
+  const update = settingsSync.buildGatewaySettingsSyncUpdatePayload(current, next, {
+    includeProviderApiKeyUpdates: true,
+  });
+
+  assert.equal(Object.hasOwn(update, "ssh"), true);
+  assert.deepEqual(update.sshSecretUpdates, {
+    "ssh-prod": {
+      password: "new-password",
+    },
+  });
+
+  const merged = settingsSync.applyGatewaySettingsSyncPayload(current, update);
+  assert.equal(merged.ssh.hosts[0].password, "new-password");
+});
+
 test("workspace project selection stays out of synced system workdir", () => {
   installWindow();
   const resolvedSystem = settings.resolveWorkspaceProjects(
diff --git a/crates/agent-gateway/web/src/App.tsx b/crates/agent-gateway/web/src/App.tsx
index d1c0c07c6..b5ca1c632 100644
--- a/crates/agent-gateway/web/src/App.tsx
+++ b/crates/agent-gateway/web/src/App.tsx
@@ -99,6 +99,7 @@ import {
 import {
   applyGatewaySettingsSyncPayload,
   buildGatewaySettingsSyncPayload,
+  buildGatewaySettingsSyncUpdatePayload,
   redactSettingsForWebStorage,
   type GatewaySettingsSyncPayload,
 } from "@/lib/settings/sync";
@@ -610,15 +611,6 @@ function hasSettingsSyncChanged(prev: AppSettings, next: AppSettings) {
   );
 }
 
-function hasSensitiveSettingsUpdates(settings: AppSettings) {
-  return (
-    settings.customProviders.some((provider) => provider.apiKey.trim().length > 0) ||
-    settings.ssh.hosts.some(
-      (host) => host.password.trim().length > 0 || host.privateKey.trim().length > 0,
-    )
-  );
-}
-
 function resolveAppWorkspaceProjects(settings: AppSettings): AppSettings {
   return {
     ...settings,
@@ -2129,10 +2121,16 @@ export default function App() {
   }, [token]);
 
   const queueSettingsSave = useCallback(
-    (next: AppSettings, fallback: string, syncGateway: boolean) => {
+    (prev: AppSettings, next: AppSettings, fallback: string, syncGateway: boolean) => {
       const saveSequence = ++settingsSaveSequenceRef.current;
       setSettingsSaveState({ status: "saving" });
       const redactedNext = redactSettingsForWebStorage(next);
+      const gatewayUpdate =
+        syncGateway && api
+          ? buildGatewaySettingsSyncUpdatePayload(prev, next, {
+              includeProviderApiKeyUpdates: true,
+            })
+          : null;
 
       settingsSaveChainRef.current = settingsSaveChainRef.current
         .catch(() => undefined)
@@ -2140,12 +2138,8 @@ export default function App() {
           persistWebSettings(redactedNext);
         })
         .then(async () => {
-          if (syncGateway && api) {
-            await api.updateSettings(
-              buildGatewaySettingsSyncPayload(next, {
-                includeProviderApiKeyUpdates: true,
-              }),
-            );
+          if (gatewayUpdate && Object.keys(gatewayUpdate).length > 0) {
+            await api?.updateSettings(gatewayUpdate);
           }
         })
         .then(() => {
@@ -2173,7 +2167,7 @@ export default function App() {
         if (!hasSettingsSyncChanged(prev, next)) {
           return prev;
         }
-        queueSettingsSave(next, "同步桌面端设置失败。", false);
+        queueSettingsSave(prev, next, "同步桌面端设置失败。", false);
         return next;
       });
     },
@@ -2186,9 +2180,10 @@ export default function App() {
         const rawNext = resolveAppWorkspaceProjects(normalizeSettings(updater(prev)));
         const next = redactSettingsForWebStorage(rawNext);
         queueSettingsSave(
+          prev,
           rawNext,
           "保存 WebUI 设置失败。",
-          hasSettingsSyncChanged(prev, next) || hasSensitiveSettingsUpdates(rawNext),
+          true,
         );
         return next;
       });
diff --git a/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
index 5abf7d3df..0f47f8a1d 100644
--- a/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
@@ -40,6 +40,11 @@ type SshLatencyState = {
   failed: boolean;
 };
 
+type PendingSshCreate = {
+  hostId: string;
+  existingSessionIds: Set<string>;
+};
+
 type SshTunnelPanelProps = {
   cwd: string;
   projectPathKey: string;
@@ -186,6 +191,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
   const [view, setView] = useState<SshTunnelView>("list");
   const [createHostId, setCreateHostId] = useState("");
   const [createTitle, setCreateTitle] = useState("");
+  const [createSftpEnabled, setCreateSftpEnabled] = useState(false);
   const [creating, setCreating] = useState(false);
   const [closingSessionId, setClosingSessionId] = useState("");
   const [error, setError] = useState<string | null>(null);
@@ -196,6 +202,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
     {},
   );
   const latencyRequestsRef = useRef<Set<string>>(new Set());
+  const pendingCreateRef = useRef<PendingSshCreate | null>(null);
   const associatedSet = useMemo(() => new Set(associatedHostIds), [associatedHostIds]);
   const associatedHosts = useMemo(
     () => hosts.filter((host) => associatedSet.has(host.id)),
@@ -289,6 +296,39 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
     return () => window.clearInterval(timer);
   }, [refreshSessionLatency, visibleSessions]);
 
+  const finishCreateFlow = useCallback(() => {
+    if (!pendingCreateRef.current) return;
+    pendingCreateRef.current = null;
+    setPrompt(null);
+    setPromptAnswer("");
+    setCreateTitle("");
+    setCreateSftpEnabled(false);
+    setCreating(false);
+    setError(null);
+    setView("list");
+  }, []);
+
+  const finishCreatedSnapshot = useCallback(
+    (snapshot: TerminalSnapshot) => {
+      onSessionSnapshot(snapshot);
+      finishCreateFlow();
+    },
+    [finishCreateFlow, onSessionSnapshot],
+  );
+
+  useEffect(() => {
+    const pending = pendingCreateRef.current;
+    if (!pending) return;
+    const createdSession = sshSessions.find(
+      (session) =>
+        session.ssh?.hostId === pending.hostId &&
+        !pending.existingSessionIds.has(session.id) &&
+        sessionBelongsToProject(session, projectPathKey),
+    );
+    if (!createdSession) return;
+    finishCreateFlow();
+  }, [finishCreateFlow, projectPathKey, sshSessions]);
+
   const toggleHost = (hostId: string) => {
     const current = associatedHostIds.filter((id) => hosts.some((host) => host.id === id));
     const next = associatedSet.has(hostId)
@@ -299,6 +339,10 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
 
   const handleCreate = useCallback(() => {
     if (!selectedCreateHost || !canCreate) return;
+    pendingCreateRef.current = {
+      hostId: selectedCreateHost.id,
+      existingSessionIds: new Set(sshSessions.map((session) => session.id)),
+    };
     setCreating(true);
     setError(null);
     void client
@@ -316,21 +360,23 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
           return;
         }
         if (result.snapshot) {
-          onSessionSnapshot(result.snapshot);
-          setCreateTitle("");
-          setView("list");
+          finishCreatedSnapshot(result.snapshot);
         }
       })
-      .catch((err) => setError(err instanceof Error ? err.message : String(err)))
+      .catch((err) => {
+        pendingCreateRef.current = null;
+        setError(err instanceof Error ? err.message : String(err));
+      })
       .finally(() => setCreating(false));
   }, [
     canCreate,
     client,
     createTitle,
     cwd,
-    onSessionSnapshot,
+    finishCreatedSnapshot,
     projectPathKey,
     selectedCreateHost,
+    sshSessions,
   ]);
 
   const handleSubmitPrompt = useCallback(() => {
@@ -354,16 +400,16 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         setPrompt(null);
         setPromptAnswer("");
         if (result.snapshot) {
-          onSessionSnapshot(result.snapshot);
-          setView("list");
+          finishCreatedSnapshot(result.snapshot);
         }
       })
       .catch((err) => setError(err instanceof Error ? err.message : String(err)))
       .finally(() => setAnsweringPrompt(false));
-  }, [answeringPrompt, client, onSessionSnapshot, prompt, promptAnswer]);
+  }, [answeringPrompt, client, finishCreatedSnapshot, prompt, promptAnswer]);
 
   const handleCancelPrompt = useCallback(() => {
     const promptId = prompt?.id;
+    pendingCreateRef.current = null;
     setPrompt(null);
     setPromptAnswer("");
     if (!promptId) return;
@@ -637,6 +683,18 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                 />
               </label>
 
+              <label className="flex cursor-pointer items-center gap-3 rounded-lg border border-border/70 bg-background/80 px-3 py-2.5 text-sm text-foreground transition-colors hover:border-emerald-500/40">
+                <input
+                  type="checkbox"
+                  checked={createSftpEnabled}
+                  onChange={(event) => setCreateSftpEnabled(event.currentTarget.checked)}
+                  className="h-4 w-4 rounded border-border text-emerald-500 accent-emerald-500 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/20"
+                />
+                <span className="min-w-0 flex-1 text-xs font-medium">
+                  {t("projectTools.sshTunnelSftpEnabled")}
+                </span>
+              </label>
+
               {selectedCreateHost ? (
                 <div className="rounded-lg border border-border/60 bg-muted/30 px-3 py-2.5">
                   <div className="flex min-w-0 items-center gap-2">
diff --git a/crates/agent-gateway/web/src/components/project-tools/XTermViewport.tsx b/crates/agent-gateway/web/src/components/project-tools/XTermViewport.tsx
index 5cf59dd62..c19aee1fe 100644
--- a/crates/agent-gateway/web/src/components/project-tools/XTermViewport.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/XTermViewport.tsx
@@ -2,7 +2,7 @@ import "@xterm/xterm/css/xterm.css";
 
 import { FitAddon } from "@xterm/addon-fit";
 import { Terminal as XTerm } from "@xterm/xterm";
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, type CSSProperties } from "react";
 import { cn } from "@/lib/shared/utils";
 import type {
   TerminalClient,
@@ -28,30 +28,58 @@ function terminalTheme(theme: "light" | "dark") {
       background: "#0b0f14",
       foreground: "#d6deeb",
       cursor: "#f8fafc",
-      selectionBackground: "#334155",
-      black: "#0f172a",
+      cursorAccent: "#0b0f14",
+      selectionBackground: "#2c3e57",
+      selectionInactiveBackground: "#22304a",
+      scrollbarSliderBackground: "rgba(148, 163, 184, 0.18)",
+      scrollbarSliderHoverBackground: "rgba(148, 163, 184, 0.3)",
+      scrollbarSliderActiveBackground: "rgba(148, 163, 184, 0.42)",
+      overviewRulerBorder: "transparent",
+      black: "#1b2733",
       red: "#ef4444",
       green: "#22c55e",
       yellow: "#eab308",
       blue: "#38bdf8",
       magenta: "#c084fc",
       cyan: "#2dd4bf",
-      white: "#e5e7eb",
+      white: "#cbd5e1",
+      brightBlack: "#64748b",
+      brightRed: "#f87171",
+      brightGreen: "#4ade80",
+      brightYellow: "#fde047",
+      brightBlue: "#7dd3fc",
+      brightMagenta: "#d8b4fe",
+      brightCyan: "#5eead4",
+      brightWhite: "#f8fafc",
     };
   }
   return {
-    background: "#ffffff",
-    foreground: "#172033",
+    background: "#fcfcfd",
+    foreground: "#1f2933",
     cursor: "#111827",
-    selectionBackground: "#dbeafe",
-    black: "#111827",
+    cursorAccent: "#fcfcfd",
+    selectionBackground: "#bfdbfe",
+    selectionInactiveBackground: "#dbeafe",
+    scrollbarSliderBackground: "rgba(100, 116, 139, 0.16)",
+    scrollbarSliderHoverBackground: "rgba(100, 116, 139, 0.26)",
+    scrollbarSliderActiveBackground: "rgba(100, 116, 139, 0.36)",
+    overviewRulerBorder: "transparent",
+    black: "#1f2933",
     red: "#dc2626",
     green: "#16a34a",
-    yellow: "#ca8a04",
+    yellow: "#b45309",
     blue: "#2563eb",
     magenta: "#9333ea",
     cyan: "#0891b2",
-    white: "#f8fafc",
+    white: "#e2e8f0",
+    brightBlack: "#64748b",
+    brightRed: "#ef4444",
+    brightGreen: "#22c55e",
+    brightYellow: "#d97706",
+    brightBlue: "#3b82f6",
+    brightMagenta: "#a855f7",
+    brightCyan: "#06b6d4",
+    brightWhite: "#f8fafc",
   };
 }
 
@@ -86,6 +114,9 @@ export function XTermViewport({
 
   const termRef = useRef<XTerm | null>(null);
   const fitAndResizeRef = useRef<(() => void) | null>(null);
+  const viewportStyle = {
+    "--project-terminal-background": terminalTheme(theme).background,
+  } as CSSProperties;
 
   useEffect(() => {
     if (!termRef.current) return;
@@ -114,15 +145,20 @@ export function XTermViewport({
     const bufferedEvents: TerminalEvent[] = [];
     const term = new XTerm({
       cursorBlink: true,
+      cursorStyle: "block",
+      cursorInactiveStyle: "outline",
       disableStdin: !sessionRef.current.running,
       fontFamily:
         '"SF Mono", SFMono-Regular, Menlo, Monaco, "Cascadia Code", Consolas, "Liberation Mono", monospace',
-      fontSize: 12,
+      fontSize: 13,
       fontWeight: "normal",
       fontWeightBold: "bold",
-      lineHeight: 1.1,
+      lineHeight: 1.3,
       letterSpacing: 0,
       scrollback: 5000,
+      overviewRuler: {
+        width: 8,
+      },
       theme: terminalTheme(themeRef.current),
     });
     termRef.current = term;
@@ -356,8 +392,9 @@ export function XTermViewport({
   return (
     <div
       ref={containerRef}
+      style={viewportStyle}
       className={cn(
-        "project-terminal-viewport h-full min-h-0 w-full overflow-hidden px-2 py-2",
+        "project-terminal-viewport h-full min-h-0 w-full overflow-hidden",
         className,
       )}
     />
diff --git a/crates/agent-gateway/web/src/i18n/config.ts b/crates/agent-gateway/web/src/i18n/config.ts
index 0564ef432..daeb02575 100644
--- a/crates/agent-gateway/web/src/i18n/config.ts
+++ b/crates/agent-gateway/web/src/i18n/config.ts
@@ -263,7 +263,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelCreateNoAssociatedHosts": "当前项目还没有关联 SSH 主机",
     "projectTools.sshTunnelCreateNoAssociatedHostsHint": "先关联 Settings > SSH 中的主机，再从这里新建 SSH 连接。",
     "projectTools.sshTunnelHost": "SSH 主机",
-    "projectTools.sshTunnelSftpEnabled": "开启 SFTP",
+    "projectTools.sshTunnelSftpEnabled": "SFTP功能",
     "projectTools.sshTunnelNote": "备注",
     "projectTools.sshTunnelNotePlaceholder": "可选：记录用途或访问说明",
     "projectTools.sshTunnelCreate": "创建隧道",
@@ -1636,7 +1636,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelCreateNoAssociatedHostsHint":
       "Associate hosts from Settings > SSH before creating an SSH connection here.",
     "projectTools.sshTunnelHost": "SSH host",
-    "projectTools.sshTunnelSftpEnabled": "Enable SFTP",
+    "projectTools.sshTunnelSftpEnabled": "SFTP feature",
     "projectTools.sshTunnelNote": "Note",
     "projectTools.sshTunnelNotePlaceholder": "Optional: purpose or access notes",
     "projectTools.sshTunnelCreate": "Create tunnel",
diff --git a/crates/agent-gateway/web/src/lib/gatewaySocket.ts b/crates/agent-gateway/web/src/lib/gatewaySocket.ts
index b8dee1b0a..4387fea1e 100644
--- a/crates/agent-gateway/web/src/lib/gatewaySocket.ts
+++ b/crates/agent-gateway/web/src/lib/gatewaySocket.ts
@@ -1,4 +1,7 @@
-import type { GatewaySettingsSyncPayload } from "@/lib/settings/sync";
+import type {
+  GatewaySettingsSyncPayload,
+  GatewaySettingsSyncUpdatePayload,
+} from "@/lib/settings/sync";
 import type { HistoryMessageRef } from "@/lib/chat/conversationState";
 import type { PendingUploadedFile } from "@/lib/chat/uploadedFiles";
 
@@ -280,6 +283,8 @@ type RawTerminalResponse = {
   action?: string;
   sessions?: RawTerminalSession[];
   session?: RawTerminalSession;
+  snapshot?: TerminalSnapshot;
+  prompt?: TerminalSshPrompt;
   output?: string;
   truncated?: boolean;
   outputStartOffset?: number;
@@ -582,8 +587,8 @@ function normalizeTerminalSnapshot(input: RawTerminalResponse): TerminalSnapshot
 
 function normalizeTerminalSshCreateResult(input: RawTerminalResponse): TerminalSshCreateResult {
   return {
-    snapshot: input.session ? normalizeTerminalSnapshot(input) : undefined,
-    prompt: normalizeTerminalSshPrompt(input.sshPrompt ?? input.ssh_prompt),
+    snapshot: input.snapshot ?? (input.session ? normalizeTerminalSnapshot(input) : undefined),
+    prompt: input.prompt ?? normalizeTerminalSshPrompt(input.sshPrompt ?? input.ssh_prompt),
   };
 }
 
@@ -1408,7 +1413,7 @@ export class GatewayWebSocketClient {
     return this.requestWithRecovery<GatewaySettingsSyncPayload>("settings.get", {});
   }
 
-  async updateSettings(payload: GatewaySettingsSyncPayload): Promise<void> {
+  async updateSettings(payload: GatewaySettingsSyncUpdatePayload): Promise<void> {
     await this.request("settings.update", payload);
   }
 
@@ -2401,7 +2406,7 @@ export type GatewayWebSocketClientLike = {
   deleteHistory(conversationId: string): Promise<void>;
   listProviders(): Promise<GatewayProviderSummary[]>;
   getSettings(): Promise<GatewaySettingsSyncPayload>;
-  updateSettings(payload: GatewaySettingsSyncPayload): Promise<void>;
+  updateSettings(payload: GatewaySettingsSyncUpdatePayload): Promise<void>;
   resetSshKnownHost(params: { host: string; port: number }): Promise<SshKnownHostResetResult>;
   listSkillFiles(): Promise<SkillListResponse>;
   manageSkill<T = unknown>(payload: SkillManagePayload): Promise<T>;
@@ -3161,7 +3166,7 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
     return this.request<GatewaySettingsSyncPayload>("settings.get", {});
   }
 
-  async updateSettings(payload: GatewaySettingsSyncPayload): Promise<void> {
+  async updateSettings(payload: GatewaySettingsSyncUpdatePayload): Promise<void> {
     await this.request("settings.update", payload);
   }
 
diff --git a/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts b/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts
index e67b93d5b..04d961be9 100644
--- a/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts
+++ b/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts
@@ -1,4 +1,7 @@
-import type { GatewaySettingsSyncPayload } from "@/lib/settings/sync";
+import type {
+  GatewaySettingsSyncPayload,
+  GatewaySettingsSyncUpdatePayload,
+} from "@/lib/settings/sync";
 import type { HistoryMessageRef } from "@/lib/chat/conversationState";
 import type { PendingUploadedFile } from "@/lib/chat/uploadedFiles";
 import type { TerminalEvent, TerminalSession, TerminalSnapshot } from "@/lib/terminal/types";
@@ -516,7 +519,7 @@ async function resolveRequest(client: GatewayWebSocketClient, method: string, pa
     case "settings.get":
       return client.getSettings();
     case "settings.update":
-      await client.updateSettings(payload as GatewaySettingsSyncPayload);
+      await client.updateSettings(payload as GatewaySettingsSyncUpdatePayload);
       return undefined;
     case "settings.ssh_known_host.reset": {
       const body = (payload && typeof payload === "object" ? payload : {}) as Record<
diff --git a/crates/agent-gateway/web/src/lib/settings/sync.ts b/crates/agent-gateway/web/src/lib/settings/sync.ts
index 207268aba..3011b8932 100644
--- a/crates/agent-gateway/web/src/lib/settings/sync.ts
+++ b/crates/agent-gateway/web/src/lib/settings/sync.ts
@@ -49,6 +49,25 @@ export type GatewaySettingsSyncPayload = {
   providerApiKeyUpdates?: GatewayProviderApiKeyUpdates;
   sshSecretUpdates?: GatewaySshSecretUpdates;
 };
+export type GatewaySettingsSyncUpdatePayload = Partial<GatewaySettingsSyncPayload>;
+
+const GATEWAY_SETTINGS_SYNC_FIELDS = [
+  "system",
+  "customProviders",
+  "mcp",
+  "agents",
+  "ssh",
+  "hooks",
+  "cron",
+  "remote",
+  "memory",
+  "customSettings",
+  "skills",
+  "chatRuntimeControls",
+  "selectedModel",
+  "theme",
+  "locale",
+] as const satisfies readonly (keyof GatewaySettingsSyncPayload)[];
 
 function asObject(value: unknown): Record<string, unknown> {
   return value && typeof value === "object" && !Array.isArray(value)
@@ -567,6 +586,33 @@ export function buildGatewaySettingsSyncPayload(
   return payload;
 }
 
+export function buildGatewaySettingsSyncUpdatePayload(
+  prev: AppSettings,
+  next: AppSettings,
+  options: { includeProviderApiKeyUpdates?: boolean } = {},
+): GatewaySettingsSyncUpdatePayload {
+  const previousPayload = buildGatewaySettingsSyncPayload(prev);
+  const nextPayload = buildGatewaySettingsSyncPayload(next, options);
+  const update: GatewaySettingsSyncUpdatePayload = {};
+
+  for (const field of GATEWAY_SETTINGS_SYNC_FIELDS) {
+    if (JSON.stringify(previousPayload[field]) !== JSON.stringify(nextPayload[field])) {
+      (update as Record<string, unknown>)[field] = nextPayload[field];
+    }
+  }
+
+  if (nextPayload.providerApiKeyUpdates) {
+    update.customProviders ??= nextPayload.customProviders;
+    update.providerApiKeyUpdates = nextPayload.providerApiKeyUpdates;
+  }
+  if (nextPayload.sshSecretUpdates) {
+    update.ssh ??= nextPayload.ssh;
+    update.sshSecretUpdates = nextPayload.sshSecretUpdates;
+  }
+
+  return update;
+}
+
 export function applyGatewaySettingsSyncPayload(
   current: AppSettings,
   payload: unknown,
diff --git a/crates/agent-gateway/web/src/styles.css b/crates/agent-gateway/web/src/styles.css
index 12599fc4e..70e03a639 100644
--- a/crates/agent-gateway/web/src/styles.css
+++ b/crates/agent-gateway/web/src/styles.css
@@ -1687,6 +1687,91 @@ html[data-liveagent-webui="gateway"] .external-link-modal-overlay[data-state="cl
   }
 }
 
+html[data-liveagent-webui="gateway"] .project-terminal-viewport {
+  --project-terminal-padding-x: 0.75rem;
+  --project-terminal-padding-y: 0.625rem;
+  --project-terminal-scrollbar-size: 8px;
+  --project-terminal-background: hsl(var(--background));
+  background: var(--project-terminal-background);
+}
+
+html[data-liveagent-webui="gateway"]
+  .workspace-ssh-terminal-overlay
+  .project-terminal-viewport {
+  --project-terminal-padding-x: 1rem;
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport,
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm,
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-screen,
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-scrollable-element {
+  overscroll-behavior: contain;
+  touch-action: none;
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm {
+  background: var(--project-terminal-background);
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  padding:
+    var(--project-terminal-padding-y)
+    var(--project-terminal-padding-x)
+    var(--project-terminal-padding-y)
+    var(--project-terminal-padding-x);
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport,
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-screen,
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-scrollable-element {
+  background: var(--project-terminal-background) !important;
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-scrollable-element {
+  -webkit-overflow-scrolling: touch;
+}
+
+html[data-liveagent-webui="gateway"]
+  .project-terminal-viewport
+  .xterm-scrollable-element
+  > .scrollbar.vertical
+  > .slider {
+  border-radius: 999px;
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport {
+  scrollbar-width: thin;
+  scrollbar-color: transparent transparent;
+  transition: scrollbar-color 0.2s ease;
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport:hover .xterm-viewport {
+  scrollbar-color: hsl(var(--muted-foreground) / 0.32) transparent;
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport::-webkit-scrollbar {
+  width: var(--project-terminal-scrollbar-size);
+  height: var(--project-terminal-scrollbar-size);
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport::-webkit-scrollbar-thumb {
+  border-radius: 999px;
+  background: transparent;
+  transition: background 0.2s ease;
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport:hover .xterm-viewport::-webkit-scrollbar-thumb {
+  background: hsl(var(--muted-foreground) / 0.28);
+}
+
+html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport::-webkit-scrollbar-thumb:hover {
+  background: hsl(var(--muted-foreground) / 0.45);
+}
+
 /* ─── Responsive ─────────────────────────────────────────────────── */
 
 @media (max-width: 1080px) {
@@ -1849,18 +1934,6 @@ html[data-liveagent-webui="gateway"] .external-link-modal-overlay[data-state="cl
     min-width: 0;
   }
 
-  html[data-liveagent-webui="gateway"] .project-terminal-viewport,
-  html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm,
-  html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-screen,
-  html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-scrollable-element {
-    overscroll-behavior: contain;
-    touch-action: none;
-  }
-
-  html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-scrollable-element {
-    -webkit-overflow-scrolling: touch;
-  }
-
   html[data-liveagent-webui="gateway"] .project-tools-panel-handle {
     display: block;
     width: 36px;
diff --git a/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
index 9bde0cd72..891fa62f2 100644
--- a/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
@@ -40,6 +40,11 @@ type SshLatencyState = {
   failed: boolean;
 };
 
+type PendingSshCreate = {
+  hostId: string;
+  existingSessionIds: Set<string>;
+};
+
 type SshTunnelPanelProps = {
   cwd: string;
   projectPathKey: string;
@@ -186,6 +191,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
   const [view, setView] = useState<SshTunnelView>("list");
   const [createHostId, setCreateHostId] = useState("");
   const [createTitle, setCreateTitle] = useState("");
+  const [createSftpEnabled, setCreateSftpEnabled] = useState(false);
   const [creating, setCreating] = useState(false);
   const [closingSessionId, setClosingSessionId] = useState("");
   const [error, setError] = useState<string | null>(null);
@@ -196,6 +202,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
     {},
   );
   const latencyRequestsRef = useRef<Set<string>>(new Set());
+  const pendingCreateRef = useRef<PendingSshCreate | null>(null);
   const associatedSet = useMemo(() => new Set(associatedHostIds), [associatedHostIds]);
   const associatedHosts = useMemo(
     () => hosts.filter((host) => associatedSet.has(host.id)),
@@ -288,6 +295,39 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
     return () => window.clearInterval(timer);
   }, [refreshSessionLatency, visibleSessions]);
 
+  const finishCreateFlow = useCallback(() => {
+    if (!pendingCreateRef.current) return;
+    pendingCreateRef.current = null;
+    setPrompt(null);
+    setPromptAnswer("");
+    setCreateTitle("");
+    setCreateSftpEnabled(false);
+    setCreating(false);
+    setError(null);
+    setView("list");
+  }, []);
+
+  const finishCreatedSnapshot = useCallback(
+    (snapshot: TerminalSnapshot) => {
+      onSessionSnapshot(snapshot);
+      finishCreateFlow();
+    },
+    [finishCreateFlow, onSessionSnapshot],
+  );
+
+  useEffect(() => {
+    const pending = pendingCreateRef.current;
+    if (!pending) return;
+    const createdSession = sshSessions.find(
+      (session) =>
+        session.ssh?.hostId === pending.hostId &&
+        !pending.existingSessionIds.has(session.id) &&
+        sessionBelongsToProject(session, projectPathKey),
+    );
+    if (!createdSession) return;
+    finishCreateFlow();
+  }, [finishCreateFlow, projectPathKey, sshSessions]);
+
   const toggleHost = (hostId: string) => {
     const current = associatedHostIds.filter((id) => hosts.some((host) => host.id === id));
     const next = associatedSet.has(hostId)
@@ -298,6 +338,10 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
 
   const handleCreate = useCallback(() => {
     if (!selectedCreateHost || !canCreate) return;
+    pendingCreateRef.current = {
+      hostId: selectedCreateHost.id,
+      existingSessionIds: new Set(sshSessions.map((session) => session.id)),
+    };
     setCreating(true);
     setError(null);
     void client
@@ -315,21 +359,23 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
           return;
         }
         if (result.snapshot) {
-          onSessionSnapshot(result.snapshot);
-          setCreateTitle("");
-          setView("list");
+          finishCreatedSnapshot(result.snapshot);
         }
       })
-      .catch((err) => setError(err instanceof Error ? err.message : String(err)))
+      .catch((err) => {
+        pendingCreateRef.current = null;
+        setError(err instanceof Error ? err.message : String(err));
+      })
       .finally(() => setCreating(false));
   }, [
     canCreate,
     client,
     createTitle,
     cwd,
-    onSessionSnapshot,
+    finishCreatedSnapshot,
     projectPathKey,
     selectedCreateHost,
+    sshSessions,
   ]);
 
   const handleSubmitPrompt = useCallback(() => {
@@ -353,16 +399,16 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         setPrompt(null);
         setPromptAnswer("");
         if (result.snapshot) {
-          onSessionSnapshot(result.snapshot);
-          setView("list");
+          finishCreatedSnapshot(result.snapshot);
         }
       })
       .catch((err) => setError(err instanceof Error ? err.message : String(err)))
       .finally(() => setAnsweringPrompt(false));
-  }, [answeringPrompt, client, onSessionSnapshot, prompt, promptAnswer]);
+  }, [answeringPrompt, client, finishCreatedSnapshot, prompt, promptAnswer]);
 
   const handleCancelPrompt = useCallback(() => {
     const promptId = prompt?.id;
+    pendingCreateRef.current = null;
     setPrompt(null);
     setPromptAnswer("");
     if (!promptId) return;
@@ -636,6 +682,18 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                 />
               </label>
 
+              <label className="flex cursor-pointer items-center gap-3 rounded-lg border border-border/70 bg-background/80 px-3 py-2.5 text-sm text-foreground transition-colors hover:border-emerald-500/40">
+                <input
+                  type="checkbox"
+                  checked={createSftpEnabled}
+                  onChange={(event) => setCreateSftpEnabled(event.currentTarget.checked)}
+                  className="h-4 w-4 rounded border-border text-emerald-500 accent-emerald-500 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/20"
+                />
+                <span className="min-w-0 flex-1 text-xs font-medium">
+                  {t("projectTools.sshTunnelSftpEnabled")}
+                </span>
+              </label>
+
               {selectedCreateHost ? (
                 <div className="rounded-lg border border-border/60 bg-muted/30 px-3 py-2.5">
                   <div className="flex min-w-0 items-center gap-2">
diff --git a/crates/agent-gui/src/components/project-tools/XTermViewport.tsx b/crates/agent-gui/src/components/project-tools/XTermViewport.tsx
index c116c5c01..f9606fe42 100644
--- a/crates/agent-gui/src/components/project-tools/XTermViewport.tsx
+++ b/crates/agent-gui/src/components/project-tools/XTermViewport.tsx
@@ -2,7 +2,7 @@ import "@xterm/xterm/css/xterm.css";
 
 import { FitAddon } from "@xterm/addon-fit";
 import { Terminal as XTerm } from "@xterm/xterm";
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, type CSSProperties } from "react";
 import { cn } from "../../lib/shared/utils";
 import type {
   TerminalClient,
@@ -28,30 +28,58 @@ function terminalTheme(theme: "light" | "dark") {
       background: "#0b0f14",
       foreground: "#d6deeb",
       cursor: "#f8fafc",
-      selectionBackground: "#334155",
-      black: "#0f172a",
+      cursorAccent: "#0b0f14",
+      selectionBackground: "#2c3e57",
+      selectionInactiveBackground: "#22304a",
+      scrollbarSliderBackground: "rgba(148, 163, 184, 0.18)",
+      scrollbarSliderHoverBackground: "rgba(148, 163, 184, 0.3)",
+      scrollbarSliderActiveBackground: "rgba(148, 163, 184, 0.42)",
+      overviewRulerBorder: "transparent",
+      black: "#1b2733",
       red: "#ef4444",
       green: "#22c55e",
       yellow: "#eab308",
       blue: "#38bdf8",
       magenta: "#c084fc",
       cyan: "#2dd4bf",
-      white: "#e5e7eb",
+      white: "#cbd5e1",
+      brightBlack: "#64748b",
+      brightRed: "#f87171",
+      brightGreen: "#4ade80",
+      brightYellow: "#fde047",
+      brightBlue: "#7dd3fc",
+      brightMagenta: "#d8b4fe",
+      brightCyan: "#5eead4",
+      brightWhite: "#f8fafc",
     };
   }
   return {
-    background: "#ffffff",
-    foreground: "#172033",
+    background: "#fcfcfd",
+    foreground: "#1f2933",
     cursor: "#111827",
-    selectionBackground: "#dbeafe",
-    black: "#111827",
+    cursorAccent: "#fcfcfd",
+    selectionBackground: "#bfdbfe",
+    selectionInactiveBackground: "#dbeafe",
+    scrollbarSliderBackground: "rgba(100, 116, 139, 0.16)",
+    scrollbarSliderHoverBackground: "rgba(100, 116, 139, 0.26)",
+    scrollbarSliderActiveBackground: "rgba(100, 116, 139, 0.36)",
+    overviewRulerBorder: "transparent",
+    black: "#1f2933",
     red: "#dc2626",
     green: "#16a34a",
-    yellow: "#ca8a04",
+    yellow: "#b45309",
     blue: "#2563eb",
     magenta: "#9333ea",
     cyan: "#0891b2",
-    white: "#f8fafc",
+    white: "#e2e8f0",
+    brightBlack: "#64748b",
+    brightRed: "#ef4444",
+    brightGreen: "#22c55e",
+    brightYellow: "#d97706",
+    brightBlue: "#3b82f6",
+    brightMagenta: "#a855f7",
+    brightCyan: "#06b6d4",
+    brightWhite: "#f8fafc",
   };
 }
 
@@ -86,6 +114,9 @@ export function XTermViewport({
 
   const termRef = useRef<XTerm | null>(null);
   const fitAndResizeRef = useRef<(() => void) | null>(null);
+  const viewportStyle = {
+    "--project-terminal-background": terminalTheme(theme).background,
+  } as CSSProperties;
 
   useEffect(() => {
     if (!termRef.current) return;
@@ -114,15 +145,20 @@ export function XTermViewport({
     const bufferedEvents: TerminalEvent[] = [];
     const term = new XTerm({
       cursorBlink: true,
+      cursorStyle: "block",
+      cursorInactiveStyle: "outline",
       disableStdin: !sessionRef.current.running,
       fontFamily:
         '"SF Mono", SFMono-Regular, Menlo, Monaco, "Cascadia Code", Consolas, "Liberation Mono", monospace',
-      fontSize: 12,
+      fontSize: 13,
       fontWeight: "normal",
       fontWeightBold: "bold",
-      lineHeight: 1.1,
+      lineHeight: 1.3,
       letterSpacing: 0,
       scrollback: 5000,
+      overviewRuler: {
+        width: 8,
+      },
       theme: terminalTheme(themeRef.current),
     });
     termRef.current = term;
@@ -356,8 +392,9 @@ export function XTermViewport({
   return (
     <div
       ref={containerRef}
+      style={viewportStyle}
       className={cn(
-        "project-terminal-viewport h-full min-h-0 w-full overflow-hidden px-2 py-2",
+        "project-terminal-viewport h-full min-h-0 w-full overflow-hidden",
         className,
       )}
     />
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index f22c89388..187de4641 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -275,7 +275,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelCreateNoAssociatedHosts": "当前项目还没有关联 SSH 主机",
     "projectTools.sshTunnelCreateNoAssociatedHostsHint": "先关联 Settings > SSH 中的主机，再从这里新建 SSH 连接。",
     "projectTools.sshTunnelHost": "SSH 主机",
-    "projectTools.sshTunnelSftpEnabled": "开启 SFTP",
+    "projectTools.sshTunnelSftpEnabled": "SFTP功能",
     "projectTools.sshTunnelNote": "备注",
     "projectTools.sshTunnelNotePlaceholder": "可选：记录用途或访问说明",
     "projectTools.sshTunnelCreate": "创建隧道",
@@ -1689,7 +1689,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelCreateNoAssociatedHostsHint":
       "Associate hosts from Settings > SSH before creating an SSH connection here.",
     "projectTools.sshTunnelHost": "SSH host",
-    "projectTools.sshTunnelSftpEnabled": "Enable SFTP",
+    "projectTools.sshTunnelSftpEnabled": "SFTP feature",
     "projectTools.sshTunnelNote": "Note",
     "projectTools.sshTunnelNotePlaceholder": "Optional: purpose or access notes",
     "projectTools.sshTunnelCreate": "Create tunnel",
diff --git a/crates/agent-gui/src/index.css b/crates/agent-gui/src/index.css
index 287ac4f58..8be83b86a 100644
--- a/crates/agent-gui/src/index.css
+++ b/crates/agent-gui/src/index.css
@@ -299,6 +299,60 @@
     background: hsl(var(--muted-foreground) / 0.38);
   }
 
+  /* SSH/Bash terminal viewport - keep padding on .xterm so fit() measures rows correctly. */
+  .project-terminal-viewport {
+    --project-terminal-padding-x: 0.75rem;
+    --project-terminal-padding-y: 0.625rem;
+    --project-terminal-scrollbar-size: 8px;
+    --project-terminal-background: hsl(var(--background));
+    background: var(--project-terminal-background);
+  }
+  .project-terminal-viewport .xterm {
+    background: var(--project-terminal-background);
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    padding:
+      var(--project-terminal-padding-y)
+      var(--project-terminal-padding-x)
+      var(--project-terminal-padding-y)
+      var(--project-terminal-padding-x);
+  }
+  .project-terminal-viewport .xterm-viewport,
+  .project-terminal-viewport .xterm-screen,
+  .project-terminal-viewport .xterm-scrollable-element {
+    background: var(--project-terminal-background) !important;
+  }
+  .project-terminal-viewport .xterm-scrollable-element > .scrollbar.vertical > .slider {
+    border-radius: 999px;
+  }
+  .project-terminal-viewport .xterm-viewport {
+    scrollbar-width: thin;
+    scrollbar-color: transparent transparent;
+    transition: scrollbar-color 0.2s ease;
+  }
+  .project-terminal-viewport:hover .xterm-viewport {
+    scrollbar-color: hsl(var(--muted-foreground) / 0.32) transparent;
+  }
+  .project-terminal-viewport .xterm-viewport::-webkit-scrollbar {
+    width: var(--project-terminal-scrollbar-size);
+    height: var(--project-terminal-scrollbar-size);
+  }
+  .project-terminal-viewport .xterm-viewport::-webkit-scrollbar-track {
+    background: transparent;
+  }
+  .project-terminal-viewport .xterm-viewport::-webkit-scrollbar-thumb {
+    border-radius: 999px;
+    background: transparent;
+    transition: background 0.2s ease;
+  }
+  .project-terminal-viewport:hover .xterm-viewport::-webkit-scrollbar-thumb {
+    background: hsl(var(--muted-foreground) / 0.28);
+  }
+  .project-terminal-viewport .xterm-viewport::-webkit-scrollbar-thumb:hover {
+    background: hsl(var(--muted-foreground) / 0.45);
+  }
+
   .git-review-transient-scrollbar {
     scrollbar-width: none;
     -ms-overflow-style: none;
diff --git a/crates/agent-gui/src/lib/settings/sync.ts b/crates/agent-gui/src/lib/settings/sync.ts
index 26f54a42d..a00f22391 100644
--- a/crates/agent-gui/src/lib/settings/sync.ts
+++ b/crates/agent-gui/src/lib/settings/sync.ts
@@ -49,6 +49,25 @@ export type GatewaySettingsSyncPayload = {
   providerApiKeyUpdates?: GatewayProviderApiKeyUpdates;
   sshSecretUpdates?: GatewaySshSecretUpdates;
 };
+export type GatewaySettingsSyncUpdatePayload = Partial<GatewaySettingsSyncPayload>;
+
+const GATEWAY_SETTINGS_SYNC_FIELDS = [
+  "system",
+  "customProviders",
+  "mcp",
+  "agents",
+  "ssh",
+  "hooks",
+  "cron",
+  "remote",
+  "memory",
+  "customSettings",
+  "skills",
+  "chatRuntimeControls",
+  "selectedModel",
+  "theme",
+  "locale",
+] as const satisfies readonly (keyof GatewaySettingsSyncPayload)[];
 
 function asObject(value: unknown): Record<string, unknown> {
   return value && typeof value === "object" && !Array.isArray(value)
@@ -559,6 +578,33 @@ export function buildGatewaySettingsSyncPayload(
   return payload;
 }
 
+export function buildGatewaySettingsSyncUpdatePayload(
+  prev: AppSettings,
+  next: AppSettings,
+  options: { includeProviderApiKeyUpdates?: boolean } = {},
+): GatewaySettingsSyncUpdatePayload {
+  const previousPayload = buildGatewaySettingsSyncPayload(prev);
+  const nextPayload = buildGatewaySettingsSyncPayload(next, options);
+  const update: GatewaySettingsSyncUpdatePayload = {};
+
+  for (const field of GATEWAY_SETTINGS_SYNC_FIELDS) {
+    if (JSON.stringify(previousPayload[field]) !== JSON.stringify(nextPayload[field])) {
+      (update as Record<string, unknown>)[field] = nextPayload[field];
+    }
+  }
+
+  if (nextPayload.providerApiKeyUpdates) {
+    update.customProviders ??= nextPayload.customProviders;
+    update.providerApiKeyUpdates = nextPayload.providerApiKeyUpdates;
+  }
+  if (nextPayload.sshSecretUpdates) {
+    update.ssh ??= nextPayload.ssh;
+    update.sshSecretUpdates = nextPayload.sshSecretUpdates;
+  }
+
+  return update;
+}
+
 export function applyGatewaySettingsSyncPayload(
   current: AppSettings,
   payload: unknown,
diff --git a/crates/agent-gui/test/settings/normalization.test.mjs b/crates/agent-gui/test/settings/normalization.test.mjs
index 86b94de13..b7e370fed 100644
--- a/crates/agent-gui/test/settings/normalization.test.mjs
+++ b/crates/agent-gui/test/settings/normalization.test.mjs
@@ -1584,6 +1584,129 @@ test("gateway settings sync applies redacted ssh hosts without clearing local se
   assert.equal(updated.ssh.hosts[0].proxy.password, "new-proxy-password");
 });
 
+test("gateway settings update payload omits unchanged empty ssh hosts for non-ssh updates", () => {
+  const desktop = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "prod",
+          name: "Production",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+        },
+      ],
+      projectHostAssociations: {
+        "/workspace/project": ["prod"],
+      },
+    },
+  });
+  const staleWeb = settings.normalizeSettings({
+    customSettings: {
+      projectToolsSshTunnel: {
+        openProjectPathKeys: [],
+        openVersion: 0,
+      },
+    },
+    ssh: {
+      hosts: [],
+      projectHostAssociations: {},
+    },
+  });
+  const nextWeb = settings.updateProjectToolsSshTunnelOpen(staleWeb, "/workspace/project", true);
+
+  const update = sync.buildGatewaySettingsSyncUpdatePayload(staleWeb, nextWeb, {
+    includeProviderApiKeyUpdates: true,
+  });
+
+  assert.equal(Object.hasOwn(update, "ssh"), false);
+  assert.equal(Object.hasOwn(update, "customSettings"), true);
+
+  const merged = sync.applyGatewaySettingsSyncPayload(desktop, update);
+  assert.deepEqual(
+    merged.ssh.hosts.map((host) => host.id),
+    ["prod"],
+  );
+  assert.deepEqual(merged.ssh.projectHostAssociations, {
+    "/workspace/project": ["prod"],
+  });
+  assert.equal(settings.isProjectToolsSshTunnelOpen(merged.customSettings, "/workspace/project"), true);
+});
+
+test("gateway settings update payload includes ssh when hosts are explicitly deleted", () => {
+  const current = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "prod",
+          name: "Production",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+        },
+      ],
+      projectHostAssociations: {
+        "/workspace/project": ["prod"],
+      },
+    },
+  });
+  const deleted = settings.updateSsh(current, {
+    hosts: [],
+    projectHostAssociations: {},
+  });
+
+  const update = sync.buildGatewaySettingsSyncUpdatePayload(current, deleted, {
+    includeProviderApiKeyUpdates: true,
+  });
+
+  assert.equal(Object.hasOwn(update, "ssh"), true);
+  assert.deepEqual(update.ssh.hosts, []);
+  assert.deepEqual(update.ssh.projectHostAssociations, {});
+});
+
+test("gateway settings update payload includes ssh for secret-only ssh updates", () => {
+  const current = settings.normalizeSettings({
+    ssh: {
+      hosts: [
+        {
+          id: "prod",
+          name: "Production",
+          host: "prod.example.com",
+          username: "deploy",
+          authType: "password",
+          password: "old-password",
+        },
+      ],
+    },
+  });
+  const next = settings.normalizeSettings({
+    ...current,
+    ssh: {
+      ...current.ssh,
+      hosts: [
+        {
+          ...current.ssh.hosts[0],
+          password: "new-password",
+        },
+      ],
+    },
+  });
+
+  const update = sync.buildGatewaySettingsSyncUpdatePayload(current, next, {
+    includeProviderApiKeyUpdates: true,
+  });
+
+  assert.equal(Object.hasOwn(update, "ssh"), true);
+  assert.deepEqual(update.sshSecretUpdates, {
+    prod: {
+      password: "new-password",
+    },
+  });
+
+  const merged = sync.applyGatewaySettingsSyncPayload(current, update);
+  assert.equal(merged.ssh.hosts[0].password, "new-password");
+});
+
 test("web storage redaction clears api keys but keeps configured state", () => {
   const appSettings = settings.normalizeSettings({
     customProviders: [

From be5d8e74bd207c4c15233fa6f98bdd7ba2d4cf21 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 17:11:17 +0800
Subject: [PATCH 06/28] feat(ssh): add SFTP file manager for tunnel sessions

---
 Cargo.lock                                    |  179 +-
 .../internal/proto/v1/gateway.pb.go           | 1818 +++++++++-----
 .../internal/server/websocket.go              |   70 +
 .../server/websocket_connection_state_test.go |   22 +
 .../internal/server/websocket_payloads.go     |    2 +
 .../internal/server/websocket_routes.go       |    7 +
 .../internal/server/websocket_routes_test.go  |    7 +
 .../server/websocket_sftp_handlers.go         |  179 ++
 .../server/websocket_sftp_handlers_test.go    |   75 +
 .../server/websocket_terminal_handlers.go     |    1 +
 .../internal/session/manager_chat_runs.go     |    5 +
 .../internal/session/manager_sftp.go          |   49 +
 .../internal/session/manager_state.go         |    5 +
 .../internal/session/manager_terminal.go      |    1 +
 crates/agent-gateway/proto/v1/gateway.proto   |   57 +
 crates/agent-gateway/web/src/App.tsx          |    8 +-
 .../web/src/components/icons.tsx              |  154 ++
 .../project-tools/ProjectToolsPanel.tsx       |    4 +-
 .../project-tools/SshTunnelPanel.tsx          |   19 +-
 .../workspace-editor/WorkspaceSftpPanel.tsx   | 2105 +++++++++++++++++
 .../WorkspaceSshTerminalOverlay.tsx           |  128 +-
 crates/agent-gateway/web/src/i18n/config.ts   |   92 +
 .../web/src/lib/gatewaySocket.ts              |  470 +++-
 .../web/src/lib/gatewaySocket.worker.ts       |   75 +
 .../web/src/lib/sftp/gatewaySftpClient.ts     |   31 +
 .../agent-gateway/web/src/lib/sftp/types.ts   |  103 +
 .../web/src/lib/terminal/types.ts             |    2 +
 .../agent-gateway/web/src/shims/tauriCore.ts  |  102 +-
 crates/agent-gui/src-tauri/Cargo.toml         |    1 +
 .../agent-gui/src-tauri/src/commands/mod.rs   |    1 +
 .../agent-gui/src-tauri/src/commands/sftp.rs  |  131 +
 .../src-tauri/src/commands/terminal.rs        |   24 +-
 crates/agent-gui/src-tauri/src/lib.rs         |   14 +
 crates/agent-gui/src-tauri/src/runtime/mod.rs |    1 +
 .../agent-gui/src-tauri/src/runtime/sftp.rs   | 1763 ++++++++++++++
 .../src-tauri/src/runtime/terminal.rs         |  112 +-
 .../src-tauri/src/services/gateway.rs         |  293 ++-
 crates/agent-gui/src/components/icons.tsx     |  154 ++
 .../project-tools/ProjectToolsPanel.tsx       |    4 +-
 .../project-tools/SshTunnelPanel.tsx          |   19 +-
 .../workspace-editor/WorkspaceSftpPanel.tsx   | 2105 +++++++++++++++++
 .../WorkspaceSshTerminalOverlay.tsx           |  128 +-
 crates/agent-gui/src/i18n/config.ts           |   92 +
 .../agent-gui/src/lib/sftp/tauriSftpClient.ts |  215 ++
 crates/agent-gui/src/lib/sftp/types.ts        |  103 +
 .../src/lib/terminal/tauriTerminalClient.ts   |    3 +
 crates/agent-gui/src/lib/terminal/types.ts    |    2 +
 crates/agent-gui/src/pages/ChatPage.tsx       |    5 +-
 48 files changed, 10165 insertions(+), 775 deletions(-)
 create mode 100644 crates/agent-gateway/internal/server/websocket_sftp_handlers.go
 create mode 100644 crates/agent-gateway/internal/server/websocket_sftp_handlers_test.go
 create mode 100644 crates/agent-gateway/internal/session/manager_sftp.go
 create mode 100644 crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSftpPanel.tsx
 create mode 100644 crates/agent-gateway/web/src/lib/sftp/gatewaySftpClient.ts
 create mode 100644 crates/agent-gateway/web/src/lib/sftp/types.ts
 create mode 100644 crates/agent-gui/src-tauri/src/commands/sftp.rs
 create mode 100644 crates/agent-gui/src-tauri/src/runtime/sftp.rs
 create mode 100644 crates/agent-gui/src/components/workspace-editor/WorkspaceSftpPanel.tsx
 create mode 100644 crates/agent-gui/src/lib/sftp/tauriSftpClient.ts
 create mode 100644 crates/agent-gui/src/lib/sftp/types.ts

diff --git a/Cargo.lock b/Cargo.lock
index b92b00a90..14db4cabd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -484,9 +484,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 dependencies = [
  "serde_core",
 ]
@@ -654,7 +654,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -937,7 +937,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "core-foundation 0.10.1",
  "core-graphics-types",
  "foreign-types",
@@ -950,7 +950,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -1246,6 +1246,20 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "dashmap"
+version = "6.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.10.0"
@@ -1418,7 +1432,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.4",
@@ -2207,7 +2221,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -2267,6 +2281,18 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "gloo-timers"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "482ce8a491a501da4cd806bd190275363d674f2845005c6ddbd5d3e1dd54495d"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "gobject-sys"
 version = "0.18.0"
@@ -2366,6 +2392,12 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
 [[package]]
 name = "hashbrown"
 version = "0.15.5"
@@ -2969,13 +3001,12 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.94"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
+checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
 dependencies = [
  "cfg-if",
  "futures-util",
- "once_cell",
  "wasm-bindgen",
 ]
 
@@ -3027,7 +3058,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "serde",
  "unicode-segmentation",
 ]
@@ -3159,6 +3190,7 @@ dependencies = [
  "rfd",
  "rusqlite",
  "russh",
+ "russh-sftp",
  "rustls",
  "serde",
  "serde_json",
@@ -3425,7 +3457,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "jni-sys 0.3.1",
  "log",
  "ndk-sys",
@@ -3461,7 +3493,7 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "cfg-if",
  "cfg_aliases 0.1.1",
  "libc",
@@ -3473,7 +3505,7 @@ version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
@@ -3605,7 +3637,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -3621,7 +3653,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-core-foundation",
@@ -3634,7 +3666,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -3658,7 +3690,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -3670,7 +3702,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "dispatch2",
  "objc2 0.6.4",
 ]
@@ -3681,7 +3713,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "dispatch2",
  "objc2 0.6.4",
  "objc2-core-foundation",
@@ -3733,7 +3765,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -3745,7 +3777,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.4",
@@ -3758,7 +3790,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "objc2 0.6.4",
  "objc2-core-foundation",
 ]
@@ -3781,7 +3813,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -3793,7 +3825,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f112d1746737b0da274ef79a23aac283376f335f4095a083a267a082f21db0c0"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "objc2 0.6.4",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
@@ -3805,7 +3837,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -3818,7 +3850,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -3840,7 +3872,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit",
@@ -3861,7 +3893,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -3884,7 +3916,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -3897,7 +3929,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68bc69301064cebefc6c4c90ce9cba69225239e4b8ff99d445a2b5563797da65"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-app-kit 0.2.2",
@@ -3910,7 +3942,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-app-kit 0.3.2",
@@ -4465,7 +4497,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -4984,7 +5016,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
 ]
 
 [[package]]
@@ -5177,7 +5209,7 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0d2b0146dd9661bf67bb107c0bb2a55064d556eeb3fc314151b957f313bcd4e"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
@@ -5194,7 +5226,7 @@ checksum = "bbf893f64684e58da8a68d56a5e84d1cf0440226274c515770fe267707a7d0b0"
 dependencies = [
  "aes 0.9.1",
  "aws-lc-rs",
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block-padding 0.4.2",
  "byteorder",
  "bytes",
@@ -5270,6 +5302,26 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "russh-sftp"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed8949eca4163c18a8f59ff96d32cf61e9c13b9735e21ef32b3907f4aafa1a9"
+dependencies = [
+ "bitflags 2.13.0",
+ "bytes",
+ "chrono",
+ "dashmap",
+ "gloo-timers",
+ "log",
+ "serde",
+ "serde_bytes",
+ "thiserror 2.0.18",
+ "tokio",
+ "tokio-util",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "russh-util"
 version = "0.52.0"
@@ -5303,7 +5355,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -5531,7 +5583,7 @@ version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
@@ -5572,7 +5624,7 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "cssparser 0.36.0",
  "derive_more 2.1.1",
  "log",
@@ -5617,6 +5669,16 @@ dependencies = [
  "typeid",
 ]
 
+[[package]]
+name = "serde_bytes"
+version = "0.11.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "serde_core"
 version = "1.0.228"
@@ -6230,7 +6292,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -6264,7 +6326,7 @@ version = "0.34.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9103edf55f2da3c82aea4c7fab7c4241032bfeea0e71fa557d98e00e7ce7cc20"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "block2 0.6.2",
  "core-foundation 0.10.1",
  "core-graphics",
@@ -6856,6 +6918,7 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
+ "futures-util",
  "pin-project-lite",
  "tokio",
 ]
@@ -7054,7 +7117,7 @@ version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "bytes",
  "futures-util",
  "http",
@@ -7406,9 +7469,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.117"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
+checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -7419,9 +7482,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.67"
+version = "0.4.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
+checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7429,9 +7492,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.117"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
+checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7439,9 +7502,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.117"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
+checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -7452,9 +7515,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.117"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
+checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
 dependencies = [
  "unicode-ident",
 ]
@@ -7500,7 +7563,7 @@ version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "hashbrown 0.15.5",
  "indexmap 2.13.1",
  "semver",
@@ -7526,7 +7589,7 @@ version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "rustix",
  "wayland-backend",
  "wayland-scanner",
@@ -7538,7 +7601,7 @@ version = "0.32.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -7568,9 +7631,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.94"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
+checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8311,7 +8374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.11.0",
+ "bitflags 2.13.0",
  "indexmap 2.13.1",
  "log",
  "serde",
diff --git a/crates/agent-gateway/internal/proto/v1/gateway.pb.go b/crates/agent-gateway/internal/proto/v1/gateway.pb.go
index 76f474141..4d01dd494 100644
--- a/crates/agent-gateway/internal/proto/v1/gateway.pb.go
+++ b/crates/agent-gateway/internal/proto/v1/gateway.pb.go
@@ -158,7 +158,7 @@ func (x ChatEvent_ChatEventType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use ChatEvent_ChatEventType.Descriptor instead.
 func (ChatEvent_ChatEventType) EnumDescriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{30, 0}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{35, 0}
 }
 
 type AuthRequest struct {
@@ -324,6 +324,7 @@ type GatewayEnvelope struct {
 	//	*GatewayEnvelope_GitRequest
 	//	*GatewayEnvelope_FsReadEditableText
 	//	*GatewayEnvelope_FsReadWorkspaceImage
+	//	*GatewayEnvelope_SftpRequest
 	//	*GatewayEnvelope_TunnelControl
 	//	*GatewayEnvelope_TunnelControlResp
 	//	*GatewayEnvelope_TunnelFrame
@@ -717,6 +718,15 @@ func (x *GatewayEnvelope) GetFsReadWorkspaceImage() *FsReadWorkspaceImageRequest
 	return nil
 }
 
+func (x *GatewayEnvelope) GetSftpRequest() *SftpRequest {
+	if x != nil {
+		if x, ok := x.Payload.(*GatewayEnvelope_SftpRequest); ok {
+			return x.SftpRequest
+		}
+	}
+	return nil
+}
+
 func (x *GatewayEnvelope) GetTunnelControl() *TunnelControlRequest {
 	if x != nil {
 		if x, ok := x.Payload.(*GatewayEnvelope_TunnelControl); ok {
@@ -905,6 +915,10 @@ type GatewayEnvelope_FsReadWorkspaceImage struct {
 	FsReadWorkspaceImage *FsReadWorkspaceImageRequest `protobuf:"bytes,63,opt,name=fs_read_workspace_image,json=fsReadWorkspaceImage,proto3,oneof"`
 }
 
+type GatewayEnvelope_SftpRequest struct {
+	SftpRequest *SftpRequest `protobuf:"bytes,64,opt,name=sftp_request,json=sftpRequest,proto3,oneof"`
+}
+
 type GatewayEnvelope_TunnelControl struct {
 	TunnelControl *TunnelControlRequest `protobuf:"bytes,67,opt,name=tunnel_control,json=tunnelControl,proto3,oneof"`
 }
@@ -995,6 +1009,8 @@ func (*GatewayEnvelope_FsReadEditableText) isGatewayEnvelope_Payload() {}
 
 func (*GatewayEnvelope_FsReadWorkspaceImage) isGatewayEnvelope_Payload() {}
 
+func (*GatewayEnvelope_SftpRequest) isGatewayEnvelope_Payload() {}
+
 func (*GatewayEnvelope_TunnelControl) isGatewayEnvelope_Payload() {}
 
 func (*GatewayEnvelope_TunnelControlResp) isGatewayEnvelope_Payload() {}
@@ -1048,6 +1064,8 @@ type AgentEnvelope struct {
 	//	*AgentEnvelope_GitResponse
 	//	*AgentEnvelope_FsReadEditableTextResp
 	//	*AgentEnvelope_FsReadWorkspaceImageResp
+	//	*AgentEnvelope_SftpResponse
+	//	*AgentEnvelope_SftpEvent
 	//	*AgentEnvelope_TunnelControl
 	//	*AgentEnvelope_TunnelControlResp
 	//	*AgentEnvelope_TunnelFrame
@@ -1462,6 +1480,24 @@ func (x *AgentEnvelope) GetFsReadWorkspaceImageResp() *FsReadWorkspaceImageRespo
 	return nil
 }
 
+func (x *AgentEnvelope) GetSftpResponse() *SftpResponse {
+	if x != nil {
+		if x, ok := x.Payload.(*AgentEnvelope_SftpResponse); ok {
+			return x.SftpResponse
+		}
+	}
+	return nil
+}
+
+func (x *AgentEnvelope) GetSftpEvent() *SftpEvent {
+	if x != nil {
+		if x, ok := x.Payload.(*AgentEnvelope_SftpEvent); ok {
+			return x.SftpEvent
+		}
+	}
+	return nil
+}
+
 func (x *AgentEnvelope) GetTunnelControl() *TunnelControlRequest {
 	if x != nil {
 		if x, ok := x.Payload.(*AgentEnvelope_TunnelControl); ok {
@@ -1685,6 +1721,14 @@ type AgentEnvelope_FsReadWorkspaceImageResp struct {
 	FsReadWorkspaceImageResp *FsReadWorkspaceImageResponse `protobuf:"bytes,66,opt,name=fs_read_workspace_image_resp,json=fsReadWorkspaceImageResp,proto3,oneof"`
 }
 
+type AgentEnvelope_SftpResponse struct {
+	SftpResponse *SftpResponse `protobuf:"bytes,73,opt,name=sftp_response,json=sftpResponse,proto3,oneof"`
+}
+
+type AgentEnvelope_SftpEvent struct {
+	SftpEvent *SftpEvent `protobuf:"bytes,74,opt,name=sftp_event,json=sftpEvent,proto3,oneof"`
+}
+
 type AgentEnvelope_TunnelControl struct {
 	TunnelControl *TunnelControlRequest `protobuf:"bytes,67,opt,name=tunnel_control,json=tunnelControl,proto3,oneof"`
 }
@@ -1791,6 +1835,10 @@ func (*AgentEnvelope_FsReadEditableTextResp) isAgentEnvelope_Payload() {}
 
 func (*AgentEnvelope_FsReadWorkspaceImageResp) isAgentEnvelope_Payload() {}
 
+func (*AgentEnvelope_SftpResponse) isAgentEnvelope_Payload() {}
+
+func (*AgentEnvelope_SftpEvent) isAgentEnvelope_Payload() {}
+
 func (*AgentEnvelope_TunnelControl) isAgentEnvelope_Payload() {}
 
 func (*AgentEnvelope_TunnelControlResp) isAgentEnvelope_Payload() {}
@@ -2873,6 +2921,7 @@ type TerminalRequest struct {
 	PromptId       string                 `protobuf:"bytes,12,opt,name=prompt_id,json=promptId,proto3" json:"prompt_id,omitempty"`
 	PromptAnswer   string                 `protobuf:"bytes,13,opt,name=prompt_answer,json=promptAnswer,proto3" json:"prompt_answer,omitempty"`
 	TrustHostKey   bool                   `protobuf:"varint,14,opt,name=trust_host_key,json=trustHostKey,proto3" json:"trust_host_key,omitempty"`
+	SftpEnabled    bool                   `protobuf:"varint,15,opt,name=sftp_enabled,json=sftpEnabled,proto3" json:"sftp_enabled,omitempty"`
 	unknownFields  protoimpl.UnknownFields
 	sizeCache      protoimpl.SizeCache
 }
@@ -3005,6 +3054,13 @@ func (x *TerminalRequest) GetTrustHostKey() bool {
 	return false
 }
 
+func (x *TerminalRequest) GetSftpEnabled() bool {
+	if x != nil {
+		return x.SftpEnabled
+	}
+	return false
+}
+
 type TerminalSession struct {
 	state          protoimpl.MessageState `protogen:"open.v1"`
 	Id             string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -3172,6 +3228,7 @@ type TerminalSshMetadata struct {
 	Status               string                 `protobuf:"bytes,7,opt,name=status,proto3" json:"status,omitempty"`
 	ReconnectAttempt     uint32                 `protobuf:"varint,8,opt,name=reconnect_attempt,json=reconnectAttempt,proto3" json:"reconnect_attempt,omitempty"`
 	ReconnectMaxAttempts uint32                 `protobuf:"varint,9,opt,name=reconnect_max_attempts,json=reconnectMaxAttempts,proto3" json:"reconnect_max_attempts,omitempty"`
+	SftpEnabled          bool                   `protobuf:"varint,10,opt,name=sftp_enabled,json=sftpEnabled,proto3" json:"sftp_enabled,omitempty"`
 	unknownFields        protoimpl.UnknownFields
 	sizeCache            protoimpl.SizeCache
 }
@@ -3269,36 +3326,45 @@ func (x *TerminalSshMetadata) GetReconnectMaxAttempts() uint32 {
 	return 0
 }
 
-type TerminalSshPrompt struct {
-	state             protoimpl.MessageState `protogen:"open.v1"`
-	Id                string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Kind              string                 `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"`
-	HostId            string                 `protobuf:"bytes,3,opt,name=host_id,json=hostId,proto3" json:"host_id,omitempty"`
-	HostName          string                 `protobuf:"bytes,4,opt,name=host_name,json=hostName,proto3" json:"host_name,omitempty"`
-	Host              string                 `protobuf:"bytes,5,opt,name=host,proto3" json:"host,omitempty"`
-	Port              uint32                 `protobuf:"varint,6,opt,name=port,proto3" json:"port,omitempty"`
-	Message           string                 `protobuf:"bytes,7,opt,name=message,proto3" json:"message,omitempty"`
-	FingerprintSha256 string                 `protobuf:"bytes,8,opt,name=fingerprint_sha256,json=fingerprintSha256,proto3" json:"fingerprint_sha256,omitempty"`
-	KeyType           string                 `protobuf:"bytes,9,opt,name=key_type,json=keyType,proto3" json:"key_type,omitempty"`
-	AnswerEcho        bool                   `protobuf:"varint,10,opt,name=answer_echo,json=answerEcho,proto3" json:"answer_echo,omitempty"`
-	unknownFields     protoimpl.UnknownFields
-	sizeCache         protoimpl.SizeCache
+func (x *TerminalSshMetadata) GetSftpEnabled() bool {
+	if x != nil {
+		return x.SftpEnabled
+	}
+	return false
 }
 
-func (x *TerminalSshPrompt) Reset() {
-	*x = TerminalSshPrompt{}
+type SftpRequest struct {
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	Action         string                 `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"`
+	SessionId      string                 `protobuf:"bytes,2,opt,name=session_id,json=sessionId,proto3" json:"session_id,omitempty"`
+	ProjectPathKey string                 `protobuf:"bytes,3,opt,name=project_path_key,json=projectPathKey,proto3" json:"project_path_key,omitempty"`
+	Workdir        string                 `protobuf:"bytes,4,opt,name=workdir,proto3" json:"workdir,omitempty"`
+	LocalPath      string                 `protobuf:"bytes,5,opt,name=local_path,json=localPath,proto3" json:"local_path,omitempty"`
+	RemotePath     string                 `protobuf:"bytes,6,opt,name=remote_path,json=remotePath,proto3" json:"remote_path,omitempty"`
+	FromPath       string                 `protobuf:"bytes,7,opt,name=from_path,json=fromPath,proto3" json:"from_path,omitempty"`
+	ToPath         string                 `protobuf:"bytes,8,opt,name=to_path,json=toPath,proto3" json:"to_path,omitempty"`
+	Direction      string                 `protobuf:"bytes,9,opt,name=direction,proto3" json:"direction,omitempty"`
+	TargetPath     string                 `protobuf:"bytes,10,opt,name=target_path,json=targetPath,proto3" json:"target_path,omitempty"`
+	Recursive      bool                   `protobuf:"varint,11,opt,name=recursive,proto3" json:"recursive,omitempty"`
+	Overwrite      bool                   `protobuf:"varint,12,opt,name=overwrite,proto3" json:"overwrite,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
+}
+
+func (x *SftpRequest) Reset() {
+	*x = SftpRequest{}
 	mi := &file_proto_v1_gateway_proto_msgTypes[22]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 
-func (x *TerminalSshPrompt) String() string {
+func (x *SftpRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TerminalSshPrompt) ProtoMessage() {}
+func (*SftpRequest) ProtoMessage() {}
 
-func (x *TerminalSshPrompt) ProtoReflect() protoreflect.Message {
+func (x *SftpRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_proto_v1_gateway_proto_msgTypes[22]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -3310,104 +3376,120 @@ func (x *TerminalSshPrompt) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TerminalSshPrompt.ProtoReflect.Descriptor instead.
-func (*TerminalSshPrompt) Descriptor() ([]byte, []int) {
+// Deprecated: Use SftpRequest.ProtoReflect.Descriptor instead.
+func (*SftpRequest) Descriptor() ([]byte, []int) {
 	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{22}
 }
 
-func (x *TerminalSshPrompt) GetId() string {
+func (x *SftpRequest) GetAction() string {
 	if x != nil {
-		return x.Id
+		return x.Action
 	}
 	return ""
 }
 
-func (x *TerminalSshPrompt) GetKind() string {
+func (x *SftpRequest) GetSessionId() string {
 	if x != nil {
-		return x.Kind
+		return x.SessionId
 	}
 	return ""
 }
 
-func (x *TerminalSshPrompt) GetHostId() string {
+func (x *SftpRequest) GetProjectPathKey() string {
 	if x != nil {
-		return x.HostId
+		return x.ProjectPathKey
 	}
 	return ""
 }
 
-func (x *TerminalSshPrompt) GetHostName() string {
+func (x *SftpRequest) GetWorkdir() string {
 	if x != nil {
-		return x.HostName
+		return x.Workdir
 	}
 	return ""
 }
 
-func (x *TerminalSshPrompt) GetHost() string {
+func (x *SftpRequest) GetLocalPath() string {
 	if x != nil {
-		return x.Host
+		return x.LocalPath
 	}
 	return ""
 }
 
-func (x *TerminalSshPrompt) GetPort() uint32 {
+func (x *SftpRequest) GetRemotePath() string {
 	if x != nil {
-		return x.Port
+		return x.RemotePath
 	}
-	return 0
+	return ""
 }
 
-func (x *TerminalSshPrompt) GetMessage() string {
+func (x *SftpRequest) GetFromPath() string {
 	if x != nil {
-		return x.Message
+		return x.FromPath
 	}
 	return ""
 }
 
-func (x *TerminalSshPrompt) GetFingerprintSha256() string {
+func (x *SftpRequest) GetToPath() string {
 	if x != nil {
-		return x.FingerprintSha256
+		return x.ToPath
 	}
 	return ""
 }
 
-func (x *TerminalSshPrompt) GetKeyType() string {
+func (x *SftpRequest) GetDirection() string {
 	if x != nil {
-		return x.KeyType
+		return x.Direction
 	}
 	return ""
 }
 
-func (x *TerminalSshPrompt) GetAnswerEcho() bool {
+func (x *SftpRequest) GetTargetPath() string {
 	if x != nil {
-		return x.AnswerEcho
+		return x.TargetPath
+	}
+	return ""
+}
+
+func (x *SftpRequest) GetRecursive() bool {
+	if x != nil {
+		return x.Recursive
 	}
 	return false
 }
 
-type TerminalShellOption struct {
+func (x *SftpRequest) GetOverwrite() bool {
+	if x != nil {
+		return x.Overwrite
+	}
+	return false
+}
+
+type SftpEntry struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Label         string                 `protobuf:"bytes,2,opt,name=label,proto3" json:"label,omitempty"`
-	Command       string                 `protobuf:"bytes,3,opt,name=command,proto3" json:"command,omitempty"`
+	Path          string                 `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
+	Name          string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Kind          string                 `protobuf:"bytes,3,opt,name=kind,proto3" json:"kind,omitempty"`
+	SizeBytes     uint64                 `protobuf:"varint,4,opt,name=size_bytes,json=sizeBytes,proto3" json:"size_bytes,omitempty"`
+	Mtime         uint64                 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
-func (x *TerminalShellOption) Reset() {
-	*x = TerminalShellOption{}
+func (x *SftpEntry) Reset() {
+	*x = SftpEntry{}
 	mi := &file_proto_v1_gateway_proto_msgTypes[23]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 
-func (x *TerminalShellOption) String() string {
+func (x *SftpEntry) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TerminalShellOption) ProtoMessage() {}
+func (*SftpEntry) ProtoMessage() {}
 
-func (x *TerminalShellOption) ProtoReflect() protoreflect.Message {
+func (x *SftpEntry) ProtoReflect() protoreflect.Message {
 	mi := &file_proto_v1_gateway_proto_msgTypes[23]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -3419,63 +3501,78 @@ func (x *TerminalShellOption) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TerminalShellOption.ProtoReflect.Descriptor instead.
-func (*TerminalShellOption) Descriptor() ([]byte, []int) {
+// Deprecated: Use SftpEntry.ProtoReflect.Descriptor instead.
+func (*SftpEntry) Descriptor() ([]byte, []int) {
 	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{23}
 }
 
-func (x *TerminalShellOption) GetId() string {
+func (x *SftpEntry) GetPath() string {
 	if x != nil {
-		return x.Id
+		return x.Path
 	}
 	return ""
 }
 
-func (x *TerminalShellOption) GetLabel() string {
+func (x *SftpEntry) GetName() string {
 	if x != nil {
-		return x.Label
+		return x.Name
 	}
 	return ""
 }
 
-func (x *TerminalShellOption) GetCommand() string {
+func (x *SftpEntry) GetKind() string {
 	if x != nil {
-		return x.Command
+		return x.Kind
 	}
 	return ""
 }
 
-type TerminalResponse struct {
-	state             protoimpl.MessageState `protogen:"open.v1"`
-	Action            string                 `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"`
-	Sessions          []*TerminalSession     `protobuf:"bytes,2,rep,name=sessions,proto3" json:"sessions,omitempty"`
-	Session           *TerminalSession       `protobuf:"bytes,3,opt,name=session,proto3" json:"session,omitempty"`
-	Output            string                 `protobuf:"bytes,4,opt,name=output,proto3" json:"output,omitempty"`
-	Truncated         bool                   `protobuf:"varint,5,opt,name=truncated,proto3" json:"truncated,omitempty"`
-	ShellOptions      []*TerminalShellOption `protobuf:"bytes,6,rep,name=shell_options,json=shellOptions,proto3" json:"shell_options,omitempty"`
-	DefaultShell      string                 `protobuf:"bytes,7,opt,name=default_shell,json=defaultShell,proto3" json:"default_shell,omitempty"`
-	OutputStartOffset uint64                 `protobuf:"varint,8,opt,name=output_start_offset,json=outputStartOffset,proto3" json:"output_start_offset,omitempty"`
-	OutputEndOffset   uint64                 `protobuf:"varint,9,opt,name=output_end_offset,json=outputEndOffset,proto3" json:"output_end_offset,omitempty"`
-	SshPrompt         *TerminalSshPrompt     `protobuf:"bytes,10,opt,name=ssh_prompt,json=sshPrompt,proto3" json:"ssh_prompt,omitempty"`
-	LatencyMs         uint32                 `protobuf:"varint,11,opt,name=latency_ms,json=latencyMs,proto3" json:"latency_ms,omitempty"`
-	unknownFields     protoimpl.UnknownFields
-	sizeCache         protoimpl.SizeCache
+func (x *SftpEntry) GetSizeBytes() uint64 {
+	if x != nil {
+		return x.SizeBytes
+	}
+	return 0
 }
 
-func (x *TerminalResponse) Reset() {
-	*x = TerminalResponse{}
+func (x *SftpEntry) GetMtime() uint64 {
+	if x != nil {
+		return x.Mtime
+	}
+	return 0
+}
+
+type SftpTransfer struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	SessionId     string                 `protobuf:"bytes,2,opt,name=session_id,json=sessionId,proto3" json:"session_id,omitempty"`
+	Direction     string                 `protobuf:"bytes,3,opt,name=direction,proto3" json:"direction,omitempty"`
+	Status        string                 `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"`
+	SourcePath    string                 `protobuf:"bytes,5,opt,name=source_path,json=sourcePath,proto3" json:"source_path,omitempty"`
+	TargetPath    string                 `protobuf:"bytes,6,opt,name=target_path,json=targetPath,proto3" json:"target_path,omitempty"`
+	CurrentPath   string                 `protobuf:"bytes,7,opt,name=current_path,json=currentPath,proto3" json:"current_path,omitempty"`
+	BytesDone     uint64                 `protobuf:"varint,8,opt,name=bytes_done,json=bytesDone,proto3" json:"bytes_done,omitempty"`
+	BytesTotal    uint64                 `protobuf:"varint,9,opt,name=bytes_total,json=bytesTotal,proto3" json:"bytes_total,omitempty"`
+	FilesDone     uint32                 `protobuf:"varint,10,opt,name=files_done,json=filesDone,proto3" json:"files_done,omitempty"`
+	FilesTotal    uint32                 `protobuf:"varint,11,opt,name=files_total,json=filesTotal,proto3" json:"files_total,omitempty"`
+	Error         string                 `protobuf:"bytes,12,opt,name=error,proto3" json:"error,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *SftpTransfer) Reset() {
+	*x = SftpTransfer{}
 	mi := &file_proto_v1_gateway_proto_msgTypes[24]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 
-func (x *TerminalResponse) String() string {
+func (x *SftpTransfer) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TerminalResponse) ProtoMessage() {}
+func (*SftpTransfer) ProtoMessage() {}
 
-func (x *TerminalResponse) ProtoReflect() protoreflect.Message {
+func (x *SftpTransfer) ProtoReflect() protoreflect.Message {
 	mi := &file_proto_v1_gateway_proto_msgTypes[24]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -3487,115 +3584,121 @@ func (x *TerminalResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TerminalResponse.ProtoReflect.Descriptor instead.
-func (*TerminalResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use SftpTransfer.ProtoReflect.Descriptor instead.
+func (*SftpTransfer) Descriptor() ([]byte, []int) {
 	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *TerminalResponse) GetAction() string {
+func (x *SftpTransfer) GetId() string {
 	if x != nil {
-		return x.Action
+		return x.Id
 	}
 	return ""
 }
 
-func (x *TerminalResponse) GetSessions() []*TerminalSession {
+func (x *SftpTransfer) GetSessionId() string {
 	if x != nil {
-		return x.Sessions
+		return x.SessionId
 	}
-	return nil
+	return ""
 }
 
-func (x *TerminalResponse) GetSession() *TerminalSession {
+func (x *SftpTransfer) GetDirection() string {
 	if x != nil {
-		return x.Session
+		return x.Direction
 	}
-	return nil
+	return ""
 }
 
-func (x *TerminalResponse) GetOutput() string {
+func (x *SftpTransfer) GetStatus() string {
 	if x != nil {
-		return x.Output
+		return x.Status
 	}
 	return ""
 }
 
-func (x *TerminalResponse) GetTruncated() bool {
+func (x *SftpTransfer) GetSourcePath() string {
 	if x != nil {
-		return x.Truncated
+		return x.SourcePath
 	}
-	return false
+	return ""
 }
 
-func (x *TerminalResponse) GetShellOptions() []*TerminalShellOption {
+func (x *SftpTransfer) GetTargetPath() string {
 	if x != nil {
-		return x.ShellOptions
+		return x.TargetPath
 	}
-	return nil
+	return ""
 }
 
-func (x *TerminalResponse) GetDefaultShell() string {
+func (x *SftpTransfer) GetCurrentPath() string {
 	if x != nil {
-		return x.DefaultShell
+		return x.CurrentPath
 	}
 	return ""
 }
 
-func (x *TerminalResponse) GetOutputStartOffset() uint64 {
+func (x *SftpTransfer) GetBytesDone() uint64 {
 	if x != nil {
-		return x.OutputStartOffset
+		return x.BytesDone
 	}
 	return 0
 }
 
-func (x *TerminalResponse) GetOutputEndOffset() uint64 {
+func (x *SftpTransfer) GetBytesTotal() uint64 {
 	if x != nil {
-		return x.OutputEndOffset
+		return x.BytesTotal
 	}
 	return 0
 }
 
-func (x *TerminalResponse) GetSshPrompt() *TerminalSshPrompt {
+func (x *SftpTransfer) GetFilesDone() uint32 {
 	if x != nil {
-		return x.SshPrompt
+		return x.FilesDone
 	}
-	return nil
+	return 0
 }
 
-func (x *TerminalResponse) GetLatencyMs() uint32 {
+func (x *SftpTransfer) GetFilesTotal() uint32 {
 	if x != nil {
-		return x.LatencyMs
+		return x.FilesTotal
 	}
 	return 0
 }
 
-type TerminalEvent struct {
-	state             protoimpl.MessageState `protogen:"open.v1"`
-	Kind              string                 `protobuf:"bytes,1,opt,name=kind,proto3" json:"kind,omitempty"`
-	SessionId         string                 `protobuf:"bytes,2,opt,name=session_id,json=sessionId,proto3" json:"session_id,omitempty"`
-	ProjectPathKey    string                 `protobuf:"bytes,3,opt,name=project_path_key,json=projectPathKey,proto3" json:"project_path_key,omitempty"`
-	Session           *TerminalSession       `protobuf:"bytes,4,opt,name=session,proto3" json:"session,omitempty"`
-	Data              string                 `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`
-	OutputStartOffset uint64                 `protobuf:"varint,6,opt,name=output_start_offset,json=outputStartOffset,proto3" json:"output_start_offset,omitempty"`
-	OutputEndOffset   uint64                 `protobuf:"varint,7,opt,name=output_end_offset,json=outputEndOffset,proto3" json:"output_end_offset,omitempty"`
-	unknownFields     protoimpl.UnknownFields
-	sizeCache         protoimpl.SizeCache
+func (x *SftpTransfer) GetError() string {
+	if x != nil {
+		return x.Error
+	}
+	return ""
 }
 
-func (x *TerminalEvent) Reset() {
-	*x = TerminalEvent{}
+type SftpResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Action        string                 `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"`
+	Path          string                 `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
+	Entries       []*SftpEntry           `protobuf:"bytes,3,rep,name=entries,proto3" json:"entries,omitempty"`
+	Entry         *SftpEntry             `protobuf:"bytes,4,opt,name=entry,proto3" json:"entry,omitempty"`
+	Exists        bool                   `protobuf:"varint,5,opt,name=exists,proto3" json:"exists,omitempty"`
+	Transfer      *SftpTransfer          `protobuf:"bytes,6,opt,name=transfer,proto3" json:"transfer,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *SftpResponse) Reset() {
+	*x = SftpResponse{}
 	mi := &file_proto_v1_gateway_proto_msgTypes[25]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 
-func (x *TerminalEvent) String() string {
+func (x *SftpResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*TerminalEvent) ProtoMessage() {}
+func (*SftpResponse) ProtoMessage() {}
 
-func (x *TerminalEvent) ProtoReflect() protoreflect.Message {
+func (x *SftpResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_proto_v1_gateway_proto_msgTypes[25]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -3607,58 +3710,495 @@ func (x *TerminalEvent) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use TerminalEvent.ProtoReflect.Descriptor instead.
-func (*TerminalEvent) Descriptor() ([]byte, []int) {
+// Deprecated: Use SftpResponse.ProtoReflect.Descriptor instead.
+func (*SftpResponse) Descriptor() ([]byte, []int) {
 	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{25}
 }
 
-func (x *TerminalEvent) GetKind() string {
+func (x *SftpResponse) GetAction() string {
 	if x != nil {
-		return x.Kind
+		return x.Action
 	}
 	return ""
 }
 
-func (x *TerminalEvent) GetSessionId() string {
+func (x *SftpResponse) GetPath() string {
 	if x != nil {
-		return x.SessionId
+		return x.Path
 	}
 	return ""
 }
 
-func (x *TerminalEvent) GetProjectPathKey() string {
+func (x *SftpResponse) GetEntries() []*SftpEntry {
 	if x != nil {
-		return x.ProjectPathKey
+		return x.Entries
 	}
-	return ""
+	return nil
 }
 
-func (x *TerminalEvent) GetSession() *TerminalSession {
+func (x *SftpResponse) GetEntry() *SftpEntry {
 	if x != nil {
-		return x.Session
+		return x.Entry
 	}
 	return nil
 }
 
-func (x *TerminalEvent) GetData() string {
+func (x *SftpResponse) GetExists() bool {
 	if x != nil {
-		return x.Data
+		return x.Exists
 	}
-	return ""
+	return false
 }
 
-func (x *TerminalEvent) GetOutputStartOffset() uint64 {
+func (x *SftpResponse) GetTransfer() *SftpTransfer {
 	if x != nil {
-		return x.OutputStartOffset
+		return x.Transfer
 	}
-	return 0
+	return nil
 }
 
-func (x *TerminalEvent) GetOutputEndOffset() uint64 {
-	if x != nil {
-		return x.OutputEndOffset
-	}
-	return 0
+type SftpEvent struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Kind          string                 `protobuf:"bytes,1,opt,name=kind,proto3" json:"kind,omitempty"`
+	Transfer      *SftpTransfer          `protobuf:"bytes,2,opt,name=transfer,proto3" json:"transfer,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *SftpEvent) Reset() {
+	*x = SftpEvent{}
+	mi := &file_proto_v1_gateway_proto_msgTypes[26]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *SftpEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SftpEvent) ProtoMessage() {}
+
+func (x *SftpEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_v1_gateway_proto_msgTypes[26]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SftpEvent.ProtoReflect.Descriptor instead.
+func (*SftpEvent) Descriptor() ([]byte, []int) {
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{26}
+}
+
+func (x *SftpEvent) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *SftpEvent) GetTransfer() *SftpTransfer {
+	if x != nil {
+		return x.Transfer
+	}
+	return nil
+}
+
+type TerminalSshPrompt struct {
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	Id                string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Kind              string                 `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"`
+	HostId            string                 `protobuf:"bytes,3,opt,name=host_id,json=hostId,proto3" json:"host_id,omitempty"`
+	HostName          string                 `protobuf:"bytes,4,opt,name=host_name,json=hostName,proto3" json:"host_name,omitempty"`
+	Host              string                 `protobuf:"bytes,5,opt,name=host,proto3" json:"host,omitempty"`
+	Port              uint32                 `protobuf:"varint,6,opt,name=port,proto3" json:"port,omitempty"`
+	Message           string                 `protobuf:"bytes,7,opt,name=message,proto3" json:"message,omitempty"`
+	FingerprintSha256 string                 `protobuf:"bytes,8,opt,name=fingerprint_sha256,json=fingerprintSha256,proto3" json:"fingerprint_sha256,omitempty"`
+	KeyType           string                 `protobuf:"bytes,9,opt,name=key_type,json=keyType,proto3" json:"key_type,omitempty"`
+	AnswerEcho        bool                   `protobuf:"varint,10,opt,name=answer_echo,json=answerEcho,proto3" json:"answer_echo,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
+}
+
+func (x *TerminalSshPrompt) Reset() {
+	*x = TerminalSshPrompt{}
+	mi := &file_proto_v1_gateway_proto_msgTypes[27]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *TerminalSshPrompt) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TerminalSshPrompt) ProtoMessage() {}
+
+func (x *TerminalSshPrompt) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_v1_gateway_proto_msgTypes[27]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TerminalSshPrompt.ProtoReflect.Descriptor instead.
+func (*TerminalSshPrompt) Descriptor() ([]byte, []int) {
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{27}
+}
+
+func (x *TerminalSshPrompt) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetHostId() string {
+	if x != nil {
+		return x.HostId
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetHostName() string {
+	if x != nil {
+		return x.HostName
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetHost() string {
+	if x != nil {
+		return x.Host
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetPort() uint32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+func (x *TerminalSshPrompt) GetMessage() string {
+	if x != nil {
+		return x.Message
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetFingerprintSha256() string {
+	if x != nil {
+		return x.FingerprintSha256
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetKeyType() string {
+	if x != nil {
+		return x.KeyType
+	}
+	return ""
+}
+
+func (x *TerminalSshPrompt) GetAnswerEcho() bool {
+	if x != nil {
+		return x.AnswerEcho
+	}
+	return false
+}
+
+type TerminalShellOption struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Label         string                 `protobuf:"bytes,2,opt,name=label,proto3" json:"label,omitempty"`
+	Command       string                 `protobuf:"bytes,3,opt,name=command,proto3" json:"command,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *TerminalShellOption) Reset() {
+	*x = TerminalShellOption{}
+	mi := &file_proto_v1_gateway_proto_msgTypes[28]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *TerminalShellOption) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TerminalShellOption) ProtoMessage() {}
+
+func (x *TerminalShellOption) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_v1_gateway_proto_msgTypes[28]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TerminalShellOption.ProtoReflect.Descriptor instead.
+func (*TerminalShellOption) Descriptor() ([]byte, []int) {
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{28}
+}
+
+func (x *TerminalShellOption) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *TerminalShellOption) GetLabel() string {
+	if x != nil {
+		return x.Label
+	}
+	return ""
+}
+
+func (x *TerminalShellOption) GetCommand() string {
+	if x != nil {
+		return x.Command
+	}
+	return ""
+}
+
+type TerminalResponse struct {
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	Action            string                 `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"`
+	Sessions          []*TerminalSession     `protobuf:"bytes,2,rep,name=sessions,proto3" json:"sessions,omitempty"`
+	Session           *TerminalSession       `protobuf:"bytes,3,opt,name=session,proto3" json:"session,omitempty"`
+	Output            string                 `protobuf:"bytes,4,opt,name=output,proto3" json:"output,omitempty"`
+	Truncated         bool                   `protobuf:"varint,5,opt,name=truncated,proto3" json:"truncated,omitempty"`
+	ShellOptions      []*TerminalShellOption `protobuf:"bytes,6,rep,name=shell_options,json=shellOptions,proto3" json:"shell_options,omitempty"`
+	DefaultShell      string                 `protobuf:"bytes,7,opt,name=default_shell,json=defaultShell,proto3" json:"default_shell,omitempty"`
+	OutputStartOffset uint64                 `protobuf:"varint,8,opt,name=output_start_offset,json=outputStartOffset,proto3" json:"output_start_offset,omitempty"`
+	OutputEndOffset   uint64                 `protobuf:"varint,9,opt,name=output_end_offset,json=outputEndOffset,proto3" json:"output_end_offset,omitempty"`
+	SshPrompt         *TerminalSshPrompt     `protobuf:"bytes,10,opt,name=ssh_prompt,json=sshPrompt,proto3" json:"ssh_prompt,omitempty"`
+	LatencyMs         uint32                 `protobuf:"varint,11,opt,name=latency_ms,json=latencyMs,proto3" json:"latency_ms,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
+}
+
+func (x *TerminalResponse) Reset() {
+	*x = TerminalResponse{}
+	mi := &file_proto_v1_gateway_proto_msgTypes[29]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *TerminalResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TerminalResponse) ProtoMessage() {}
+
+func (x *TerminalResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_v1_gateway_proto_msgTypes[29]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TerminalResponse.ProtoReflect.Descriptor instead.
+func (*TerminalResponse) Descriptor() ([]byte, []int) {
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{29}
+}
+
+func (x *TerminalResponse) GetAction() string {
+	if x != nil {
+		return x.Action
+	}
+	return ""
+}
+
+func (x *TerminalResponse) GetSessions() []*TerminalSession {
+	if x != nil {
+		return x.Sessions
+	}
+	return nil
+}
+
+func (x *TerminalResponse) GetSession() *TerminalSession {
+	if x != nil {
+		return x.Session
+	}
+	return nil
+}
+
+func (x *TerminalResponse) GetOutput() string {
+	if x != nil {
+		return x.Output
+	}
+	return ""
+}
+
+func (x *TerminalResponse) GetTruncated() bool {
+	if x != nil {
+		return x.Truncated
+	}
+	return false
+}
+
+func (x *TerminalResponse) GetShellOptions() []*TerminalShellOption {
+	if x != nil {
+		return x.ShellOptions
+	}
+	return nil
+}
+
+func (x *TerminalResponse) GetDefaultShell() string {
+	if x != nil {
+		return x.DefaultShell
+	}
+	return ""
+}
+
+func (x *TerminalResponse) GetOutputStartOffset() uint64 {
+	if x != nil {
+		return x.OutputStartOffset
+	}
+	return 0
+}
+
+func (x *TerminalResponse) GetOutputEndOffset() uint64 {
+	if x != nil {
+		return x.OutputEndOffset
+	}
+	return 0
+}
+
+func (x *TerminalResponse) GetSshPrompt() *TerminalSshPrompt {
+	if x != nil {
+		return x.SshPrompt
+	}
+	return nil
+}
+
+func (x *TerminalResponse) GetLatencyMs() uint32 {
+	if x != nil {
+		return x.LatencyMs
+	}
+	return 0
+}
+
+type TerminalEvent struct {
+	state             protoimpl.MessageState `protogen:"open.v1"`
+	Kind              string                 `protobuf:"bytes,1,opt,name=kind,proto3" json:"kind,omitempty"`
+	SessionId         string                 `protobuf:"bytes,2,opt,name=session_id,json=sessionId,proto3" json:"session_id,omitempty"`
+	ProjectPathKey    string                 `protobuf:"bytes,3,opt,name=project_path_key,json=projectPathKey,proto3" json:"project_path_key,omitempty"`
+	Session           *TerminalSession       `protobuf:"bytes,4,opt,name=session,proto3" json:"session,omitempty"`
+	Data              string                 `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`
+	OutputStartOffset uint64                 `protobuf:"varint,6,opt,name=output_start_offset,json=outputStartOffset,proto3" json:"output_start_offset,omitempty"`
+	OutputEndOffset   uint64                 `protobuf:"varint,7,opt,name=output_end_offset,json=outputEndOffset,proto3" json:"output_end_offset,omitempty"`
+	unknownFields     protoimpl.UnknownFields
+	sizeCache         protoimpl.SizeCache
+}
+
+func (x *TerminalEvent) Reset() {
+	*x = TerminalEvent{}
+	mi := &file_proto_v1_gateway_proto_msgTypes[30]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *TerminalEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TerminalEvent) ProtoMessage() {}
+
+func (x *TerminalEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_v1_gateway_proto_msgTypes[30]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TerminalEvent.ProtoReflect.Descriptor instead.
+func (*TerminalEvent) Descriptor() ([]byte, []int) {
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{30}
+}
+
+func (x *TerminalEvent) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *TerminalEvent) GetSessionId() string {
+	if x != nil {
+		return x.SessionId
+	}
+	return ""
+}
+
+func (x *TerminalEvent) GetProjectPathKey() string {
+	if x != nil {
+		return x.ProjectPathKey
+	}
+	return ""
+}
+
+func (x *TerminalEvent) GetSession() *TerminalSession {
+	if x != nil {
+		return x.Session
+	}
+	return nil
+}
+
+func (x *TerminalEvent) GetData() string {
+	if x != nil {
+		return x.Data
+	}
+	return ""
+}
+
+func (x *TerminalEvent) GetOutputStartOffset() uint64 {
+	if x != nil {
+		return x.OutputStartOffset
+	}
+	return 0
+}
+
+func (x *TerminalEvent) GetOutputEndOffset() uint64 {
+	if x != nil {
+		return x.OutputEndOffset
+	}
+	return 0
 }
 
 type GitRequest struct {
@@ -3672,7 +4212,7 @@ type GitRequest struct {
 
 func (x *GitRequest) Reset() {
 	*x = GitRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[26]
+	mi := &file_proto_v1_gateway_proto_msgTypes[31]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3684,7 +4224,7 @@ func (x *GitRequest) String() string {
 func (*GitRequest) ProtoMessage() {}
 
 func (x *GitRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[26]
+	mi := &file_proto_v1_gateway_proto_msgTypes[31]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3697,7 +4237,7 @@ func (x *GitRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GitRequest.ProtoReflect.Descriptor instead.
 func (*GitRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{26}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *GitRequest) GetAction() string {
@@ -3731,7 +4271,7 @@ type GitResponse struct {
 
 func (x *GitResponse) Reset() {
 	*x = GitResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[27]
+	mi := &file_proto_v1_gateway_proto_msgTypes[32]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3743,7 +4283,7 @@ func (x *GitResponse) String() string {
 func (*GitResponse) ProtoMessage() {}
 
 func (x *GitResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[27]
+	mi := &file_proto_v1_gateway_proto_msgTypes[32]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3756,7 +4296,7 @@ func (x *GitResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GitResponse.ProtoReflect.Descriptor instead.
 func (*GitResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{27}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *GitResponse) GetAction() string {
@@ -3790,7 +4330,7 @@ type ChatRequest struct {
 
 func (x *ChatRequest) Reset() {
 	*x = ChatRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[28]
+	mi := &file_proto_v1_gateway_proto_msgTypes[33]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3802,7 +4342,7 @@ func (x *ChatRequest) String() string {
 func (*ChatRequest) ProtoMessage() {}
 
 func (x *ChatRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[28]
+	mi := &file_proto_v1_gateway_proto_msgTypes[33]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3815,7 +4355,7 @@ func (x *ChatRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatRequest.ProtoReflect.Descriptor instead.
 func (*ChatRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{28}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *ChatRequest) GetConversationId() string {
@@ -3890,7 +4430,7 @@ type CancelChatRequest struct {
 
 func (x *CancelChatRequest) Reset() {
 	*x = CancelChatRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[29]
+	mi := &file_proto_v1_gateway_proto_msgTypes[34]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3902,7 +4442,7 @@ func (x *CancelChatRequest) String() string {
 func (*CancelChatRequest) ProtoMessage() {}
 
 func (x *CancelChatRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[29]
+	mi := &file_proto_v1_gateway_proto_msgTypes[34]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3915,7 +4455,7 @@ func (x *CancelChatRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CancelChatRequest.ProtoReflect.Descriptor instead.
 func (*CancelChatRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{29}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *CancelChatRequest) GetConversationId() string {
@@ -3936,7 +4476,7 @@ type ChatEvent struct {
 
 func (x *ChatEvent) Reset() {
 	*x = ChatEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[30]
+	mi := &file_proto_v1_gateway_proto_msgTypes[35]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3948,7 +4488,7 @@ func (x *ChatEvent) String() string {
 func (*ChatEvent) ProtoMessage() {}
 
 func (x *ChatEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[30]
+	mi := &file_proto_v1_gateway_proto_msgTypes[35]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3961,7 +4501,7 @@ func (x *ChatEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatEvent.ProtoReflect.Descriptor instead.
 func (*ChatEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{30}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *ChatEvent) GetType() ChatEvent_ChatEventType {
@@ -4002,7 +4542,7 @@ type ChatControlEvent struct {
 
 func (x *ChatControlEvent) Reset() {
 	*x = ChatControlEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[31]
+	mi := &file_proto_v1_gateway_proto_msgTypes[36]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4014,7 +4554,7 @@ func (x *ChatControlEvent) String() string {
 func (*ChatControlEvent) ProtoMessage() {}
 
 func (x *ChatControlEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[31]
+	mi := &file_proto_v1_gateway_proto_msgTypes[36]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4027,7 +4567,7 @@ func (x *ChatControlEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatControlEvent.ProtoReflect.Descriptor instead.
 func (*ChatControlEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{31}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *ChatControlEvent) GetRequestId() string {
@@ -4106,7 +4646,7 @@ type RuntimeStatusEvent struct {
 
 func (x *RuntimeStatusEvent) Reset() {
 	*x = RuntimeStatusEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[32]
+	mi := &file_proto_v1_gateway_proto_msgTypes[37]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4118,7 +4658,7 @@ func (x *RuntimeStatusEvent) String() string {
 func (*RuntimeStatusEvent) ProtoMessage() {}
 
 func (x *RuntimeStatusEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[32]
+	mi := &file_proto_v1_gateway_proto_msgTypes[37]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4131,7 +4671,7 @@ func (x *RuntimeStatusEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RuntimeStatusEvent.ProtoReflect.Descriptor instead.
 func (*RuntimeStatusEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{32}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *RuntimeStatusEvent) GetWorkerId() string {
@@ -4180,7 +4720,7 @@ type CronManageRequest struct {
 
 func (x *CronManageRequest) Reset() {
 	*x = CronManageRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[33]
+	mi := &file_proto_v1_gateway_proto_msgTypes[38]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4192,7 +4732,7 @@ func (x *CronManageRequest) String() string {
 func (*CronManageRequest) ProtoMessage() {}
 
 func (x *CronManageRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[33]
+	mi := &file_proto_v1_gateway_proto_msgTypes[38]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4205,7 +4745,7 @@ func (x *CronManageRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CronManageRequest.ProtoReflect.Descriptor instead.
 func (*CronManageRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{33}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *CronManageRequest) GetAction() string {
@@ -4239,7 +4779,7 @@ type CronManageResponse struct {
 
 func (x *CronManageResponse) Reset() {
 	*x = CronManageResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[34]
+	mi := &file_proto_v1_gateway_proto_msgTypes[39]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4251,7 +4791,7 @@ func (x *CronManageResponse) String() string {
 func (*CronManageResponse) ProtoMessage() {}
 
 func (x *CronManageResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[34]
+	mi := &file_proto_v1_gateway_proto_msgTypes[39]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4264,7 +4804,7 @@ func (x *CronManageResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CronManageResponse.ProtoReflect.Descriptor instead.
 func (*CronManageResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{34}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *CronManageResponse) GetAction() string {
@@ -4293,7 +4833,7 @@ type HistoryListRequest struct {
 
 func (x *HistoryListRequest) Reset() {
 	*x = HistoryListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[35]
+	mi := &file_proto_v1_gateway_proto_msgTypes[40]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4305,7 +4845,7 @@ func (x *HistoryListRequest) String() string {
 func (*HistoryListRequest) ProtoMessage() {}
 
 func (x *HistoryListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[35]
+	mi := &file_proto_v1_gateway_proto_msgTypes[40]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4318,7 +4858,7 @@ func (x *HistoryListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryListRequest.ProtoReflect.Descriptor instead.
 func (*HistoryListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{35}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *HistoryListRequest) GetPage() int32 {
@@ -4359,7 +4899,7 @@ type HistoryListResponse struct {
 
 func (x *HistoryListResponse) Reset() {
 	*x = HistoryListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[36]
+	mi := &file_proto_v1_gateway_proto_msgTypes[41]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4371,7 +4911,7 @@ func (x *HistoryListResponse) String() string {
 func (*HistoryListResponse) ProtoMessage() {}
 
 func (x *HistoryListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[36]
+	mi := &file_proto_v1_gateway_proto_msgTypes[41]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4384,7 +4924,7 @@ func (x *HistoryListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryListResponse.ProtoReflect.Descriptor instead.
 func (*HistoryListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{36}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *HistoryListResponse) GetConversations() []*ConversationSummary {
@@ -4421,7 +4961,7 @@ type ConversationSummary struct {
 
 func (x *ConversationSummary) Reset() {
 	*x = ConversationSummary{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[37]
+	mi := &file_proto_v1_gateway_proto_msgTypes[42]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4433,7 +4973,7 @@ func (x *ConversationSummary) String() string {
 func (*ConversationSummary) ProtoMessage() {}
 
 func (x *ConversationSummary) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[37]
+	mi := &file_proto_v1_gateway_proto_msgTypes[42]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4446,7 +4986,7 @@ func (x *ConversationSummary) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConversationSummary.ProtoReflect.Descriptor instead.
 func (*ConversationSummary) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{37}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *ConversationSummary) GetId() string {
@@ -4543,7 +5083,7 @@ type HistoryGetRequest struct {
 
 func (x *HistoryGetRequest) Reset() {
 	*x = HistoryGetRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[38]
+	mi := &file_proto_v1_gateway_proto_msgTypes[43]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4555,7 +5095,7 @@ func (x *HistoryGetRequest) String() string {
 func (*HistoryGetRequest) ProtoMessage() {}
 
 func (x *HistoryGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[38]
+	mi := &file_proto_v1_gateway_proto_msgTypes[43]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4568,7 +5108,7 @@ func (x *HistoryGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryGetRequest.ProtoReflect.Descriptor instead.
 func (*HistoryGetRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{38}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *HistoryGetRequest) GetConversationId() string {
@@ -4599,7 +5139,7 @@ type HistoryGetResponse struct {
 
 func (x *HistoryGetResponse) Reset() {
 	*x = HistoryGetResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[39]
+	mi := &file_proto_v1_gateway_proto_msgTypes[44]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4611,7 +5151,7 @@ func (x *HistoryGetResponse) String() string {
 func (*HistoryGetResponse) ProtoMessage() {}
 
 func (x *HistoryGetResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[39]
+	mi := &file_proto_v1_gateway_proto_msgTypes[44]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4624,7 +5164,7 @@ func (x *HistoryGetResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryGetResponse.ProtoReflect.Descriptor instead.
 func (*HistoryGetResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{39}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{44}
 }
 
 func (x *HistoryGetResponse) GetConversationId() string {
@@ -4679,7 +5219,7 @@ type HistoryRenameRequest struct {
 
 func (x *HistoryRenameRequest) Reset() {
 	*x = HistoryRenameRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[40]
+	mi := &file_proto_v1_gateway_proto_msgTypes[45]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4691,7 +5231,7 @@ func (x *HistoryRenameRequest) String() string {
 func (*HistoryRenameRequest) ProtoMessage() {}
 
 func (x *HistoryRenameRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[40]
+	mi := &file_proto_v1_gateway_proto_msgTypes[45]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4704,7 +5244,7 @@ func (x *HistoryRenameRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryRenameRequest.ProtoReflect.Descriptor instead.
 func (*HistoryRenameRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{40}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{45}
 }
 
 func (x *HistoryRenameRequest) GetConversationId() string {
@@ -4730,7 +5270,7 @@ type HistoryRenameResponse struct {
 
 func (x *HistoryRenameResponse) Reset() {
 	*x = HistoryRenameResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[41]
+	mi := &file_proto_v1_gateway_proto_msgTypes[46]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4742,7 +5282,7 @@ func (x *HistoryRenameResponse) String() string {
 func (*HistoryRenameResponse) ProtoMessage() {}
 
 func (x *HistoryRenameResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[41]
+	mi := &file_proto_v1_gateway_proto_msgTypes[46]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4755,7 +5295,7 @@ func (x *HistoryRenameResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryRenameResponse.ProtoReflect.Descriptor instead.
 func (*HistoryRenameResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{41}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{46}
 }
 
 func (x *HistoryRenameResponse) GetConversation() *ConversationSummary {
@@ -4775,7 +5315,7 @@ type HistoryPinRequest struct {
 
 func (x *HistoryPinRequest) Reset() {
 	*x = HistoryPinRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[42]
+	mi := &file_proto_v1_gateway_proto_msgTypes[47]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4787,7 +5327,7 @@ func (x *HistoryPinRequest) String() string {
 func (*HistoryPinRequest) ProtoMessage() {}
 
 func (x *HistoryPinRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[42]
+	mi := &file_proto_v1_gateway_proto_msgTypes[47]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4800,7 +5340,7 @@ func (x *HistoryPinRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryPinRequest.ProtoReflect.Descriptor instead.
 func (*HistoryPinRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{42}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *HistoryPinRequest) GetConversationId() string {
@@ -4826,7 +5366,7 @@ type HistoryPinResponse struct {
 
 func (x *HistoryPinResponse) Reset() {
 	*x = HistoryPinResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[43]
+	mi := &file_proto_v1_gateway_proto_msgTypes[48]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4838,7 +5378,7 @@ func (x *HistoryPinResponse) String() string {
 func (*HistoryPinResponse) ProtoMessage() {}
 
 func (x *HistoryPinResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[43]
+	mi := &file_proto_v1_gateway_proto_msgTypes[48]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4851,7 +5391,7 @@ func (x *HistoryPinResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryPinResponse.ProtoReflect.Descriptor instead.
 func (*HistoryPinResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{43}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{48}
 }
 
 func (x *HistoryPinResponse) GetConversation() *ConversationSummary {
@@ -4875,7 +5415,7 @@ type HistoryShareStatus struct {
 
 func (x *HistoryShareStatus) Reset() {
 	*x = HistoryShareStatus{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[44]
+	mi := &file_proto_v1_gateway_proto_msgTypes[49]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4887,7 +5427,7 @@ func (x *HistoryShareStatus) String() string {
 func (*HistoryShareStatus) ProtoMessage() {}
 
 func (x *HistoryShareStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[44]
+	mi := &file_proto_v1_gateway_proto_msgTypes[49]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4900,7 +5440,7 @@ func (x *HistoryShareStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareStatus.ProtoReflect.Descriptor instead.
 func (*HistoryShareStatus) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{44}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{49}
 }
 
 func (x *HistoryShareStatus) GetConversationId() string {
@@ -4954,7 +5494,7 @@ type HistoryShareGetRequest struct {
 
 func (x *HistoryShareGetRequest) Reset() {
 	*x = HistoryShareGetRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[45]
+	mi := &file_proto_v1_gateway_proto_msgTypes[50]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4966,7 +5506,7 @@ func (x *HistoryShareGetRequest) String() string {
 func (*HistoryShareGetRequest) ProtoMessage() {}
 
 func (x *HistoryShareGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[45]
+	mi := &file_proto_v1_gateway_proto_msgTypes[50]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4979,7 +5519,7 @@ func (x *HistoryShareGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareGetRequest.ProtoReflect.Descriptor instead.
 func (*HistoryShareGetRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{45}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{50}
 }
 
 func (x *HistoryShareGetRequest) GetConversationId() string {
@@ -4998,7 +5538,7 @@ type HistoryShareGetResponse struct {
 
 func (x *HistoryShareGetResponse) Reset() {
 	*x = HistoryShareGetResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[46]
+	mi := &file_proto_v1_gateway_proto_msgTypes[51]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5010,7 +5550,7 @@ func (x *HistoryShareGetResponse) String() string {
 func (*HistoryShareGetResponse) ProtoMessage() {}
 
 func (x *HistoryShareGetResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[46]
+	mi := &file_proto_v1_gateway_proto_msgTypes[51]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5023,7 +5563,7 @@ func (x *HistoryShareGetResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareGetResponse.ProtoReflect.Descriptor instead.
 func (*HistoryShareGetResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{46}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{51}
 }
 
 func (x *HistoryShareGetResponse) GetShare() *HistoryShareStatus {
@@ -5044,7 +5584,7 @@ type HistoryShareSetRequest struct {
 
 func (x *HistoryShareSetRequest) Reset() {
 	*x = HistoryShareSetRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[47]
+	mi := &file_proto_v1_gateway_proto_msgTypes[52]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5056,7 +5596,7 @@ func (x *HistoryShareSetRequest) String() string {
 func (*HistoryShareSetRequest) ProtoMessage() {}
 
 func (x *HistoryShareSetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[47]
+	mi := &file_proto_v1_gateway_proto_msgTypes[52]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5069,7 +5609,7 @@ func (x *HistoryShareSetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareSetRequest.ProtoReflect.Descriptor instead.
 func (*HistoryShareSetRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{47}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{52}
 }
 
 func (x *HistoryShareSetRequest) GetConversationId() string {
@@ -5102,7 +5642,7 @@ type HistoryShareSetResponse struct {
 
 func (x *HistoryShareSetResponse) Reset() {
 	*x = HistoryShareSetResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[48]
+	mi := &file_proto_v1_gateway_proto_msgTypes[53]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5114,7 +5654,7 @@ func (x *HistoryShareSetResponse) String() string {
 func (*HistoryShareSetResponse) ProtoMessage() {}
 
 func (x *HistoryShareSetResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[48]
+	mi := &file_proto_v1_gateway_proto_msgTypes[53]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5127,7 +5667,7 @@ func (x *HistoryShareSetResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareSetResponse.ProtoReflect.Descriptor instead.
 func (*HistoryShareSetResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{48}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{53}
 }
 
 func (x *HistoryShareSetResponse) GetShare() *HistoryShareStatus {
@@ -5146,7 +5686,7 @@ type HistoryShareResolveRequest struct {
 
 func (x *HistoryShareResolveRequest) Reset() {
 	*x = HistoryShareResolveRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[49]
+	mi := &file_proto_v1_gateway_proto_msgTypes[54]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5158,7 +5698,7 @@ func (x *HistoryShareResolveRequest) String() string {
 func (*HistoryShareResolveRequest) ProtoMessage() {}
 
 func (x *HistoryShareResolveRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[49]
+	mi := &file_proto_v1_gateway_proto_msgTypes[54]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5171,7 +5711,7 @@ func (x *HistoryShareResolveRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareResolveRequest.ProtoReflect.Descriptor instead.
 func (*HistoryShareResolveRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{49}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{54}
 }
 
 func (x *HistoryShareResolveRequest) GetToken() string {
@@ -5194,7 +5734,7 @@ type HistoryShareResolveResponse struct {
 
 func (x *HistoryShareResolveResponse) Reset() {
 	*x = HistoryShareResolveResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[50]
+	mi := &file_proto_v1_gateway_proto_msgTypes[55]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5206,7 +5746,7 @@ func (x *HistoryShareResolveResponse) String() string {
 func (*HistoryShareResolveResponse) ProtoMessage() {}
 
 func (x *HistoryShareResolveResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[50]
+	mi := &file_proto_v1_gateway_proto_msgTypes[55]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5219,7 +5759,7 @@ func (x *HistoryShareResolveResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryShareResolveResponse.ProtoReflect.Descriptor instead.
 func (*HistoryShareResolveResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{50}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{55}
 }
 
 func (x *HistoryShareResolveResponse) GetConversationId() string {
@@ -5265,7 +5805,7 @@ type HistoryWorkdirsRequest struct {
 
 func (x *HistoryWorkdirsRequest) Reset() {
 	*x = HistoryWorkdirsRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[51]
+	mi := &file_proto_v1_gateway_proto_msgTypes[56]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5277,7 +5817,7 @@ func (x *HistoryWorkdirsRequest) String() string {
 func (*HistoryWorkdirsRequest) ProtoMessage() {}
 
 func (x *HistoryWorkdirsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[51]
+	mi := &file_proto_v1_gateway_proto_msgTypes[56]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5290,7 +5830,7 @@ func (x *HistoryWorkdirsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryWorkdirsRequest.ProtoReflect.Descriptor instead.
 func (*HistoryWorkdirsRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{51}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{56}
 }
 
 type HistoryWorkdirSummary struct {
@@ -5304,7 +5844,7 @@ type HistoryWorkdirSummary struct {
 
 func (x *HistoryWorkdirSummary) Reset() {
 	*x = HistoryWorkdirSummary{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[52]
+	mi := &file_proto_v1_gateway_proto_msgTypes[57]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5316,7 +5856,7 @@ func (x *HistoryWorkdirSummary) String() string {
 func (*HistoryWorkdirSummary) ProtoMessage() {}
 
 func (x *HistoryWorkdirSummary) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[52]
+	mi := &file_proto_v1_gateway_proto_msgTypes[57]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5329,7 +5869,7 @@ func (x *HistoryWorkdirSummary) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryWorkdirSummary.ProtoReflect.Descriptor instead.
 func (*HistoryWorkdirSummary) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{52}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{57}
 }
 
 func (x *HistoryWorkdirSummary) GetPath() string {
@@ -5362,7 +5902,7 @@ type HistoryWorkdirsResponse struct {
 
 func (x *HistoryWorkdirsResponse) Reset() {
 	*x = HistoryWorkdirsResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[53]
+	mi := &file_proto_v1_gateway_proto_msgTypes[58]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5374,7 +5914,7 @@ func (x *HistoryWorkdirsResponse) String() string {
 func (*HistoryWorkdirsResponse) ProtoMessage() {}
 
 func (x *HistoryWorkdirsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[53]
+	mi := &file_proto_v1_gateway_proto_msgTypes[58]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5387,7 +5927,7 @@ func (x *HistoryWorkdirsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryWorkdirsResponse.ProtoReflect.Descriptor instead.
 func (*HistoryWorkdirsResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{53}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{58}
 }
 
 func (x *HistoryWorkdirsResponse) GetWorkdirs() []*HistoryWorkdirSummary {
@@ -5406,7 +5946,7 @@ type HistoryDeleteRequest struct {
 
 func (x *HistoryDeleteRequest) Reset() {
 	*x = HistoryDeleteRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[54]
+	mi := &file_proto_v1_gateway_proto_msgTypes[59]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5418,7 +5958,7 @@ func (x *HistoryDeleteRequest) String() string {
 func (*HistoryDeleteRequest) ProtoMessage() {}
 
 func (x *HistoryDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[54]
+	mi := &file_proto_v1_gateway_proto_msgTypes[59]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5431,7 +5971,7 @@ func (x *HistoryDeleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryDeleteRequest.ProtoReflect.Descriptor instead.
 func (*HistoryDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{54}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{59}
 }
 
 func (x *HistoryDeleteRequest) GetConversationId() string {
@@ -5449,7 +5989,7 @@ type HistoryDeleteResponse struct {
 
 func (x *HistoryDeleteResponse) Reset() {
 	*x = HistoryDeleteResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[55]
+	mi := &file_proto_v1_gateway_proto_msgTypes[60]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5461,7 +6001,7 @@ func (x *HistoryDeleteResponse) String() string {
 func (*HistoryDeleteResponse) ProtoMessage() {}
 
 func (x *HistoryDeleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[55]
+	mi := &file_proto_v1_gateway_proto_msgTypes[60]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5474,7 +6014,7 @@ func (x *HistoryDeleteResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryDeleteResponse.ProtoReflect.Descriptor instead.
 func (*HistoryDeleteResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{55}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{60}
 }
 
 type HistoryTruncateRequest struct {
@@ -5489,7 +6029,7 @@ type HistoryTruncateRequest struct {
 
 func (x *HistoryTruncateRequest) Reset() {
 	*x = HistoryTruncateRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[56]
+	mi := &file_proto_v1_gateway_proto_msgTypes[61]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5501,7 +6041,7 @@ func (x *HistoryTruncateRequest) String() string {
 func (*HistoryTruncateRequest) ProtoMessage() {}
 
 func (x *HistoryTruncateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[56]
+	mi := &file_proto_v1_gateway_proto_msgTypes[61]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5514,7 +6054,7 @@ func (x *HistoryTruncateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryTruncateRequest.ProtoReflect.Descriptor instead.
 func (*HistoryTruncateRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{56}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{61}
 }
 
 func (x *HistoryTruncateRequest) GetConversationId() string {
@@ -5556,7 +6096,7 @@ type HistoryTruncateResponse struct {
 
 func (x *HistoryTruncateResponse) Reset() {
 	*x = HistoryTruncateResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[57]
+	mi := &file_proto_v1_gateway_proto_msgTypes[62]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5568,7 +6108,7 @@ func (x *HistoryTruncateResponse) String() string {
 func (*HistoryTruncateResponse) ProtoMessage() {}
 
 func (x *HistoryTruncateResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[57]
+	mi := &file_proto_v1_gateway_proto_msgTypes[62]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5581,7 +6121,7 @@ func (x *HistoryTruncateResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistoryTruncateResponse.ProtoReflect.Descriptor instead.
 func (*HistoryTruncateResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{57}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{62}
 }
 
 func (x *HistoryTruncateResponse) GetConversationId() string {
@@ -5616,7 +6156,7 @@ type HistorySyncEvent struct {
 
 func (x *HistorySyncEvent) Reset() {
 	*x = HistorySyncEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[58]
+	mi := &file_proto_v1_gateway_proto_msgTypes[63]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5628,7 +6168,7 @@ func (x *HistorySyncEvent) String() string {
 func (*HistorySyncEvent) ProtoMessage() {}
 
 func (x *HistorySyncEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[58]
+	mi := &file_proto_v1_gateway_proto_msgTypes[63]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5641,7 +6181,7 @@ func (x *HistorySyncEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistorySyncEvent.ProtoReflect.Descriptor instead.
 func (*HistorySyncEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{58}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{63}
 }
 
 func (x *HistorySyncEvent) GetKind() string {
@@ -5673,7 +6213,7 @@ type ProviderListRequest struct {
 
 func (x *ProviderListRequest) Reset() {
 	*x = ProviderListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[59]
+	mi := &file_proto_v1_gateway_proto_msgTypes[64]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5685,7 +6225,7 @@ func (x *ProviderListRequest) String() string {
 func (*ProviderListRequest) ProtoMessage() {}
 
 func (x *ProviderListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[59]
+	mi := &file_proto_v1_gateway_proto_msgTypes[64]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5698,7 +6238,7 @@ func (x *ProviderListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProviderListRequest.ProtoReflect.Descriptor instead.
 func (*ProviderListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{59}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{64}
 }
 
 type ProviderListResponse struct {
@@ -5710,7 +6250,7 @@ type ProviderListResponse struct {
 
 func (x *ProviderListResponse) Reset() {
 	*x = ProviderListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[60]
+	mi := &file_proto_v1_gateway_proto_msgTypes[65]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5722,7 +6262,7 @@ func (x *ProviderListResponse) String() string {
 func (*ProviderListResponse) ProtoMessage() {}
 
 func (x *ProviderListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[60]
+	mi := &file_proto_v1_gateway_proto_msgTypes[65]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5735,7 +6275,7 @@ func (x *ProviderListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProviderListResponse.ProtoReflect.Descriptor instead.
 func (*ProviderListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{60}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{65}
 }
 
 func (x *ProviderListResponse) GetProvidersJson() string {
@@ -5753,7 +6293,7 @@ type SettingsGetRequest struct {
 
 func (x *SettingsGetRequest) Reset() {
 	*x = SettingsGetRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[61]
+	mi := &file_proto_v1_gateway_proto_msgTypes[66]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5765,7 +6305,7 @@ func (x *SettingsGetRequest) String() string {
 func (*SettingsGetRequest) ProtoMessage() {}
 
 func (x *SettingsGetRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[61]
+	mi := &file_proto_v1_gateway_proto_msgTypes[66]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5778,7 +6318,7 @@ func (x *SettingsGetRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsGetRequest.ProtoReflect.Descriptor instead.
 func (*SettingsGetRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{61}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{66}
 }
 
 type SettingsGetResponse struct {
@@ -5790,7 +6330,7 @@ type SettingsGetResponse struct {
 
 func (x *SettingsGetResponse) Reset() {
 	*x = SettingsGetResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[62]
+	mi := &file_proto_v1_gateway_proto_msgTypes[67]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5802,7 +6342,7 @@ func (x *SettingsGetResponse) String() string {
 func (*SettingsGetResponse) ProtoMessage() {}
 
 func (x *SettingsGetResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[62]
+	mi := &file_proto_v1_gateway_proto_msgTypes[67]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5815,7 +6355,7 @@ func (x *SettingsGetResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsGetResponse.ProtoReflect.Descriptor instead.
 func (*SettingsGetResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{62}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{67}
 }
 
 func (x *SettingsGetResponse) GetSettingsJson() string {
@@ -5834,7 +6374,7 @@ type SettingsUpdateRequest struct {
 
 func (x *SettingsUpdateRequest) Reset() {
 	*x = SettingsUpdateRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[63]
+	mi := &file_proto_v1_gateway_proto_msgTypes[68]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5846,7 +6386,7 @@ func (x *SettingsUpdateRequest) String() string {
 func (*SettingsUpdateRequest) ProtoMessage() {}
 
 func (x *SettingsUpdateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[63]
+	mi := &file_proto_v1_gateway_proto_msgTypes[68]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5859,7 +6399,7 @@ func (x *SettingsUpdateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsUpdateRequest.ProtoReflect.Descriptor instead.
 func (*SettingsUpdateRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{63}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{68}
 }
 
 func (x *SettingsUpdateRequest) GetSettingsJson() string {
@@ -5879,7 +6419,7 @@ type SettingsUpdateResponse struct {
 
 func (x *SettingsUpdateResponse) Reset() {
 	*x = SettingsUpdateResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[64]
+	mi := &file_proto_v1_gateway_proto_msgTypes[69]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5891,7 +6431,7 @@ func (x *SettingsUpdateResponse) String() string {
 func (*SettingsUpdateResponse) ProtoMessage() {}
 
 func (x *SettingsUpdateResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[64]
+	mi := &file_proto_v1_gateway_proto_msgTypes[69]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5904,7 +6444,7 @@ func (x *SettingsUpdateResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsUpdateResponse.ProtoReflect.Descriptor instead.
 func (*SettingsUpdateResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{64}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{69}
 }
 
 func (x *SettingsUpdateResponse) GetAccepted() bool {
@@ -5931,7 +6471,7 @@ type SettingsResetSshKnownHostRequest struct {
 
 func (x *SettingsResetSshKnownHostRequest) Reset() {
 	*x = SettingsResetSshKnownHostRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[65]
+	mi := &file_proto_v1_gateway_proto_msgTypes[70]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5943,7 +6483,7 @@ func (x *SettingsResetSshKnownHostRequest) String() string {
 func (*SettingsResetSshKnownHostRequest) ProtoMessage() {}
 
 func (x *SettingsResetSshKnownHostRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[65]
+	mi := &file_proto_v1_gateway_proto_msgTypes[70]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5956,7 +6496,7 @@ func (x *SettingsResetSshKnownHostRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsResetSshKnownHostRequest.ProtoReflect.Descriptor instead.
 func (*SettingsResetSshKnownHostRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{65}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{70}
 }
 
 func (x *SettingsResetSshKnownHostRequest) GetHost() string {
@@ -5982,7 +6522,7 @@ type SettingsResetSshKnownHostResponse struct {
 
 func (x *SettingsResetSshKnownHostResponse) Reset() {
 	*x = SettingsResetSshKnownHostResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[66]
+	mi := &file_proto_v1_gateway_proto_msgTypes[71]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -5994,7 +6534,7 @@ func (x *SettingsResetSshKnownHostResponse) String() string {
 func (*SettingsResetSshKnownHostResponse) ProtoMessage() {}
 
 func (x *SettingsResetSshKnownHostResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[66]
+	mi := &file_proto_v1_gateway_proto_msgTypes[71]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6007,7 +6547,7 @@ func (x *SettingsResetSshKnownHostResponse) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use SettingsResetSshKnownHostResponse.ProtoReflect.Descriptor instead.
 func (*SettingsResetSshKnownHostResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{66}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{71}
 }
 
 func (x *SettingsResetSshKnownHostResponse) GetDeleted() uint32 {
@@ -6026,7 +6566,7 @@ type SettingsSyncEvent struct {
 
 func (x *SettingsSyncEvent) Reset() {
 	*x = SettingsSyncEvent{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[67]
+	mi := &file_proto_v1_gateway_proto_msgTypes[72]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6038,7 +6578,7 @@ func (x *SettingsSyncEvent) String() string {
 func (*SettingsSyncEvent) ProtoMessage() {}
 
 func (x *SettingsSyncEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[67]
+	mi := &file_proto_v1_gateway_proto_msgTypes[72]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6051,7 +6591,7 @@ func (x *SettingsSyncEvent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SettingsSyncEvent.ProtoReflect.Descriptor instead.
 func (*SettingsSyncEvent) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{67}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{72}
 }
 
 func (x *SettingsSyncEvent) GetSettingsJson() string {
@@ -6069,7 +6609,7 @@ type SkillFilesListRequest struct {
 
 func (x *SkillFilesListRequest) Reset() {
 	*x = SkillFilesListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[68]
+	mi := &file_proto_v1_gateway_proto_msgTypes[73]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6081,7 +6621,7 @@ func (x *SkillFilesListRequest) String() string {
 func (*SkillFilesListRequest) ProtoMessage() {}
 
 func (x *SkillFilesListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[68]
+	mi := &file_proto_v1_gateway_proto_msgTypes[73]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6094,7 +6634,7 @@ func (x *SkillFilesListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillFilesListRequest.ProtoReflect.Descriptor instead.
 func (*SkillFilesListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{68}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{73}
 }
 
 type SkillFilesListResponse struct {
@@ -6108,7 +6648,7 @@ type SkillFilesListResponse struct {
 
 func (x *SkillFilesListResponse) Reset() {
 	*x = SkillFilesListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[69]
+	mi := &file_proto_v1_gateway_proto_msgTypes[74]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6120,7 +6660,7 @@ func (x *SkillFilesListResponse) String() string {
 func (*SkillFilesListResponse) ProtoMessage() {}
 
 func (x *SkillFilesListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[69]
+	mi := &file_proto_v1_gateway_proto_msgTypes[74]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6133,7 +6673,7 @@ func (x *SkillFilesListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillFilesListResponse.ProtoReflect.Descriptor instead.
 func (*SkillFilesListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{69}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{74}
 }
 
 func (x *SkillFilesListResponse) GetRootDir() string {
@@ -6166,7 +6706,7 @@ type SkillMetadataReadRequest struct {
 
 func (x *SkillMetadataReadRequest) Reset() {
 	*x = SkillMetadataReadRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[70]
+	mi := &file_proto_v1_gateway_proto_msgTypes[75]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6178,7 +6718,7 @@ func (x *SkillMetadataReadRequest) String() string {
 func (*SkillMetadataReadRequest) ProtoMessage() {}
 
 func (x *SkillMetadataReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[70]
+	mi := &file_proto_v1_gateway_proto_msgTypes[75]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6191,7 +6731,7 @@ func (x *SkillMetadataReadRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillMetadataReadRequest.ProtoReflect.Descriptor instead.
 func (*SkillMetadataReadRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{70}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{75}
 }
 
 func (x *SkillMetadataReadRequest) GetPath() string {
@@ -6211,7 +6751,7 @@ type SkillMetadataReadResponse struct {
 
 func (x *SkillMetadataReadResponse) Reset() {
 	*x = SkillMetadataReadResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[71]
+	mi := &file_proto_v1_gateway_proto_msgTypes[76]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6223,7 +6763,7 @@ func (x *SkillMetadataReadResponse) String() string {
 func (*SkillMetadataReadResponse) ProtoMessage() {}
 
 func (x *SkillMetadataReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[71]
+	mi := &file_proto_v1_gateway_proto_msgTypes[76]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6236,7 +6776,7 @@ func (x *SkillMetadataReadResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillMetadataReadResponse.ProtoReflect.Descriptor instead.
 func (*SkillMetadataReadResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{71}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{76}
 }
 
 func (x *SkillMetadataReadResponse) GetName() string {
@@ -6264,7 +6804,7 @@ type SkillTextReadRequest struct {
 
 func (x *SkillTextReadRequest) Reset() {
 	*x = SkillTextReadRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[72]
+	mi := &file_proto_v1_gateway_proto_msgTypes[77]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6276,7 +6816,7 @@ func (x *SkillTextReadRequest) String() string {
 func (*SkillTextReadRequest) ProtoMessage() {}
 
 func (x *SkillTextReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[72]
+	mi := &file_proto_v1_gateway_proto_msgTypes[77]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6289,7 +6829,7 @@ func (x *SkillTextReadRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillTextReadRequest.ProtoReflect.Descriptor instead.
 func (*SkillTextReadRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{72}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{77}
 }
 
 func (x *SkillTextReadRequest) GetPath() string {
@@ -6323,7 +6863,7 @@ type SkillTextReadResponse struct {
 
 func (x *SkillTextReadResponse) Reset() {
 	*x = SkillTextReadResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[73]
+	mi := &file_proto_v1_gateway_proto_msgTypes[78]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6335,7 +6875,7 @@ func (x *SkillTextReadResponse) String() string {
 func (*SkillTextReadResponse) ProtoMessage() {}
 
 func (x *SkillTextReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[73]
+	mi := &file_proto_v1_gateway_proto_msgTypes[78]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6348,7 +6888,7 @@ func (x *SkillTextReadResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillTextReadResponse.ProtoReflect.Descriptor instead.
 func (*SkillTextReadResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{73}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{78}
 }
 
 func (x *SkillTextReadResponse) GetContent() string {
@@ -6374,7 +6914,7 @@ type SkillManageRequest struct {
 
 func (x *SkillManageRequest) Reset() {
 	*x = SkillManageRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[74]
+	mi := &file_proto_v1_gateway_proto_msgTypes[79]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6386,7 +6926,7 @@ func (x *SkillManageRequest) String() string {
 func (*SkillManageRequest) ProtoMessage() {}
 
 func (x *SkillManageRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[74]
+	mi := &file_proto_v1_gateway_proto_msgTypes[79]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6399,7 +6939,7 @@ func (x *SkillManageRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillManageRequest.ProtoReflect.Descriptor instead.
 func (*SkillManageRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{74}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{79}
 }
 
 func (x *SkillManageRequest) GetPayloadJson() string {
@@ -6418,7 +6958,7 @@ type SkillManageResponse struct {
 
 func (x *SkillManageResponse) Reset() {
 	*x = SkillManageResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[75]
+	mi := &file_proto_v1_gateway_proto_msgTypes[80]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6430,7 +6970,7 @@ func (x *SkillManageResponse) String() string {
 func (*SkillManageResponse) ProtoMessage() {}
 
 func (x *SkillManageResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[75]
+	mi := &file_proto_v1_gateway_proto_msgTypes[80]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6443,7 +6983,7 @@ func (x *SkillManageResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillManageResponse.ProtoReflect.Descriptor instead.
 func (*SkillManageResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{75}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{80}
 }
 
 func (x *SkillManageResponse) GetResultJson() string {
@@ -6464,7 +7004,7 @@ type FileMentionListRequest struct {
 
 func (x *FileMentionListRequest) Reset() {
 	*x = FileMentionListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[76]
+	mi := &file_proto_v1_gateway_proto_msgTypes[81]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6476,7 +7016,7 @@ func (x *FileMentionListRequest) String() string {
 func (*FileMentionListRequest) ProtoMessage() {}
 
 func (x *FileMentionListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[76]
+	mi := &file_proto_v1_gateway_proto_msgTypes[81]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6489,7 +7029,7 @@ func (x *FileMentionListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FileMentionListRequest.ProtoReflect.Descriptor instead.
 func (*FileMentionListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{76}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{81}
 }
 
 func (x *FileMentionListRequest) GetWorkdir() string {
@@ -6523,7 +7063,7 @@ type FileMentionEntry struct {
 
 func (x *FileMentionEntry) Reset() {
 	*x = FileMentionEntry{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[77]
+	mi := &file_proto_v1_gateway_proto_msgTypes[82]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6535,7 +7075,7 @@ func (x *FileMentionEntry) String() string {
 func (*FileMentionEntry) ProtoMessage() {}
 
 func (x *FileMentionEntry) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[77]
+	mi := &file_proto_v1_gateway_proto_msgTypes[82]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6548,7 +7088,7 @@ func (x *FileMentionEntry) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FileMentionEntry.ProtoReflect.Descriptor instead.
 func (*FileMentionEntry) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{77}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{82}
 }
 
 func (x *FileMentionEntry) GetPath() string {
@@ -6575,7 +7115,7 @@ type FileMentionListResponse struct {
 
 func (x *FileMentionListResponse) Reset() {
 	*x = FileMentionListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[78]
+	mi := &file_proto_v1_gateway_proto_msgTypes[83]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6587,7 +7127,7 @@ func (x *FileMentionListResponse) String() string {
 func (*FileMentionListResponse) ProtoMessage() {}
 
 func (x *FileMentionListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[78]
+	mi := &file_proto_v1_gateway_proto_msgTypes[83]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6600,7 +7140,7 @@ func (x *FileMentionListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FileMentionListResponse.ProtoReflect.Descriptor instead.
 func (*FileMentionListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{78}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{83}
 }
 
 func (x *FileMentionListResponse) GetEntries() []*FileMentionEntry {
@@ -6629,7 +7169,7 @@ type FsRoot struct {
 
 func (x *FsRoot) Reset() {
 	*x = FsRoot{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[79]
+	mi := &file_proto_v1_gateway_proto_msgTypes[84]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6641,7 +7181,7 @@ func (x *FsRoot) String() string {
 func (*FsRoot) ProtoMessage() {}
 
 func (x *FsRoot) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[79]
+	mi := &file_proto_v1_gateway_proto_msgTypes[84]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6654,7 +7194,7 @@ func (x *FsRoot) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRoot.ProtoReflect.Descriptor instead.
 func (*FsRoot) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{79}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{84}
 }
 
 func (x *FsRoot) GetId() string {
@@ -6693,7 +7233,7 @@ type FsRootsRequest struct {
 
 func (x *FsRootsRequest) Reset() {
 	*x = FsRootsRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[80]
+	mi := &file_proto_v1_gateway_proto_msgTypes[85]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6705,7 +7245,7 @@ func (x *FsRootsRequest) String() string {
 func (*FsRootsRequest) ProtoMessage() {}
 
 func (x *FsRootsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[80]
+	mi := &file_proto_v1_gateway_proto_msgTypes[85]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6718,7 +7258,7 @@ func (x *FsRootsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRootsRequest.ProtoReflect.Descriptor instead.
 func (*FsRootsRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{80}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{85}
 }
 
 type FsRootsResponse struct {
@@ -6730,7 +7270,7 @@ type FsRootsResponse struct {
 
 func (x *FsRootsResponse) Reset() {
 	*x = FsRootsResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[81]
+	mi := &file_proto_v1_gateway_proto_msgTypes[86]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6742,7 +7282,7 @@ func (x *FsRootsResponse) String() string {
 func (*FsRootsResponse) ProtoMessage() {}
 
 func (x *FsRootsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[81]
+	mi := &file_proto_v1_gateway_proto_msgTypes[86]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6755,7 +7295,7 @@ func (x *FsRootsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRootsResponse.ProtoReflect.Descriptor instead.
 func (*FsRootsResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{81}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{86}
 }
 
 func (x *FsRootsResponse) GetRoots() []*FsRoot {
@@ -6775,7 +7315,7 @@ type FsListDirsRequest struct {
 
 func (x *FsListDirsRequest) Reset() {
 	*x = FsListDirsRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[82]
+	mi := &file_proto_v1_gateway_proto_msgTypes[87]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6787,7 +7327,7 @@ func (x *FsListDirsRequest) String() string {
 func (*FsListDirsRequest) ProtoMessage() {}
 
 func (x *FsListDirsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[82]
+	mi := &file_proto_v1_gateway_proto_msgTypes[87]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6800,7 +7340,7 @@ func (x *FsListDirsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListDirsRequest.ProtoReflect.Descriptor instead.
 func (*FsListDirsRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{82}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{87}
 }
 
 func (x *FsListDirsRequest) GetPath() string {
@@ -6827,7 +7367,7 @@ type FsDirEntry struct {
 
 func (x *FsDirEntry) Reset() {
 	*x = FsDirEntry{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[83]
+	mi := &file_proto_v1_gateway_proto_msgTypes[88]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6839,7 +7379,7 @@ func (x *FsDirEntry) String() string {
 func (*FsDirEntry) ProtoMessage() {}
 
 func (x *FsDirEntry) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[83]
+	mi := &file_proto_v1_gateway_proto_msgTypes[88]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6852,7 +7392,7 @@ func (x *FsDirEntry) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsDirEntry.ProtoReflect.Descriptor instead.
 func (*FsDirEntry) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{83}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{88}
 }
 
 func (x *FsDirEntry) GetPath() string {
@@ -6880,7 +7420,7 @@ type FsListDirsResponse struct {
 
 func (x *FsListDirsResponse) Reset() {
 	*x = FsListDirsResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[84]
+	mi := &file_proto_v1_gateway_proto_msgTypes[89]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6892,7 +7432,7 @@ func (x *FsListDirsResponse) String() string {
 func (*FsListDirsResponse) ProtoMessage() {}
 
 func (x *FsListDirsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[84]
+	mi := &file_proto_v1_gateway_proto_msgTypes[89]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6905,7 +7445,7 @@ func (x *FsListDirsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListDirsResponse.ProtoReflect.Descriptor instead.
 func (*FsListDirsResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{84}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{89}
 }
 
 func (x *FsListDirsResponse) GetPath() string {
@@ -6939,7 +7479,7 @@ type FsCreateProjectFolderRequest struct {
 
 func (x *FsCreateProjectFolderRequest) Reset() {
 	*x = FsCreateProjectFolderRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[85]
+	mi := &file_proto_v1_gateway_proto_msgTypes[90]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -6951,7 +7491,7 @@ func (x *FsCreateProjectFolderRequest) String() string {
 func (*FsCreateProjectFolderRequest) ProtoMessage() {}
 
 func (x *FsCreateProjectFolderRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[85]
+	mi := &file_proto_v1_gateway_proto_msgTypes[90]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6964,7 +7504,7 @@ func (x *FsCreateProjectFolderRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsCreateProjectFolderRequest.ProtoReflect.Descriptor instead.
 func (*FsCreateProjectFolderRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{85}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{90}
 }
 
 func (x *FsCreateProjectFolderRequest) GetParent() string {
@@ -6990,7 +7530,7 @@ type FsCreateProjectFolderResponse struct {
 
 func (x *FsCreateProjectFolderResponse) Reset() {
 	*x = FsCreateProjectFolderResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[86]
+	mi := &file_proto_v1_gateway_proto_msgTypes[91]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7002,7 +7542,7 @@ func (x *FsCreateProjectFolderResponse) String() string {
 func (*FsCreateProjectFolderResponse) ProtoMessage() {}
 
 func (x *FsCreateProjectFolderResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[86]
+	mi := &file_proto_v1_gateway_proto_msgTypes[91]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7015,7 +7555,7 @@ func (x *FsCreateProjectFolderResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsCreateProjectFolderResponse.ProtoReflect.Descriptor instead.
 func (*FsCreateProjectFolderResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{86}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{91}
 }
 
 func (x *FsCreateProjectFolderResponse) GetPath() string {
@@ -7038,7 +7578,7 @@ type FsListRequest struct {
 
 func (x *FsListRequest) Reset() {
 	*x = FsListRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[87]
+	mi := &file_proto_v1_gateway_proto_msgTypes[92]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7050,7 +7590,7 @@ func (x *FsListRequest) String() string {
 func (*FsListRequest) ProtoMessage() {}
 
 func (x *FsListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[87]
+	mi := &file_proto_v1_gateway_proto_msgTypes[92]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7063,7 +7603,7 @@ func (x *FsListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListRequest.ProtoReflect.Descriptor instead.
 func (*FsListRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{87}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{92}
 }
 
 func (x *FsListRequest) GetWorkdir() string {
@@ -7111,7 +7651,7 @@ type FsListEntry struct {
 
 func (x *FsListEntry) Reset() {
 	*x = FsListEntry{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[88]
+	mi := &file_proto_v1_gateway_proto_msgTypes[93]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7123,7 +7663,7 @@ func (x *FsListEntry) String() string {
 func (*FsListEntry) ProtoMessage() {}
 
 func (x *FsListEntry) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[88]
+	mi := &file_proto_v1_gateway_proto_msgTypes[93]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7136,7 +7676,7 @@ func (x *FsListEntry) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListEntry.ProtoReflect.Descriptor instead.
 func (*FsListEntry) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{88}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{93}
 }
 
 func (x *FsListEntry) GetPath() string {
@@ -7169,7 +7709,7 @@ type FsListResponse struct {
 
 func (x *FsListResponse) Reset() {
 	*x = FsListResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[89]
+	mi := &file_proto_v1_gateway_proto_msgTypes[94]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7181,7 +7721,7 @@ func (x *FsListResponse) String() string {
 func (*FsListResponse) ProtoMessage() {}
 
 func (x *FsListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[89]
+	mi := &file_proto_v1_gateway_proto_msgTypes[94]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7194,7 +7734,7 @@ func (x *FsListResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsListResponse.ProtoReflect.Descriptor instead.
 func (*FsListResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{89}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{94}
 }
 
 func (x *FsListResponse) GetPath() string {
@@ -7263,7 +7803,7 @@ type FsReadEditableTextRequest struct {
 
 func (x *FsReadEditableTextRequest) Reset() {
 	*x = FsReadEditableTextRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[90]
+	mi := &file_proto_v1_gateway_proto_msgTypes[95]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7275,7 +7815,7 @@ func (x *FsReadEditableTextRequest) String() string {
 func (*FsReadEditableTextRequest) ProtoMessage() {}
 
 func (x *FsReadEditableTextRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[90]
+	mi := &file_proto_v1_gateway_proto_msgTypes[95]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7288,7 +7828,7 @@ func (x *FsReadEditableTextRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsReadEditableTextRequest.ProtoReflect.Descriptor instead.
 func (*FsReadEditableTextRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{90}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{95}
 }
 
 func (x *FsReadEditableTextRequest) GetWorkdir() string {
@@ -7319,7 +7859,7 @@ type FsReadEditableTextResponse struct {
 
 func (x *FsReadEditableTextResponse) Reset() {
 	*x = FsReadEditableTextResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[91]
+	mi := &file_proto_v1_gateway_proto_msgTypes[96]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7331,7 +7871,7 @@ func (x *FsReadEditableTextResponse) String() string {
 func (*FsReadEditableTextResponse) ProtoMessage() {}
 
 func (x *FsReadEditableTextResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[91]
+	mi := &file_proto_v1_gateway_proto_msgTypes[96]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7344,7 +7884,7 @@ func (x *FsReadEditableTextResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsReadEditableTextResponse.ProtoReflect.Descriptor instead.
 func (*FsReadEditableTextResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{91}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{96}
 }
 
 func (x *FsReadEditableTextResponse) GetPath() string {
@@ -7399,7 +7939,7 @@ type FsReadWorkspaceImageRequest struct {
 
 func (x *FsReadWorkspaceImageRequest) Reset() {
 	*x = FsReadWorkspaceImageRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[92]
+	mi := &file_proto_v1_gateway_proto_msgTypes[97]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7411,7 +7951,7 @@ func (x *FsReadWorkspaceImageRequest) String() string {
 func (*FsReadWorkspaceImageRequest) ProtoMessage() {}
 
 func (x *FsReadWorkspaceImageRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[92]
+	mi := &file_proto_v1_gateway_proto_msgTypes[97]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7424,7 +7964,7 @@ func (x *FsReadWorkspaceImageRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsReadWorkspaceImageRequest.ProtoReflect.Descriptor instead.
 func (*FsReadWorkspaceImageRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{92}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{97}
 }
 
 func (x *FsReadWorkspaceImageRequest) GetWorkdir() string {
@@ -7455,7 +7995,7 @@ type FsReadWorkspaceImageResponse struct {
 
 func (x *FsReadWorkspaceImageResponse) Reset() {
 	*x = FsReadWorkspaceImageResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[93]
+	mi := &file_proto_v1_gateway_proto_msgTypes[98]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7467,7 +8007,7 @@ func (x *FsReadWorkspaceImageResponse) String() string {
 func (*FsReadWorkspaceImageResponse) ProtoMessage() {}
 
 func (x *FsReadWorkspaceImageResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[93]
+	mi := &file_proto_v1_gateway_proto_msgTypes[98]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7480,7 +8020,7 @@ func (x *FsReadWorkspaceImageResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsReadWorkspaceImageResponse.ProtoReflect.Descriptor instead.
 func (*FsReadWorkspaceImageResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{93}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{98}
 }
 
 func (x *FsReadWorkspaceImageResponse) GetPath() string {
@@ -7541,7 +8081,7 @@ type FsWriteTextRequest struct {
 
 func (x *FsWriteTextRequest) Reset() {
 	*x = FsWriteTextRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[94]
+	mi := &file_proto_v1_gateway_proto_msgTypes[99]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7553,7 +8093,7 @@ func (x *FsWriteTextRequest) String() string {
 func (*FsWriteTextRequest) ProtoMessage() {}
 
 func (x *FsWriteTextRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[94]
+	mi := &file_proto_v1_gateway_proto_msgTypes[99]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7566,7 +8106,7 @@ func (x *FsWriteTextRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsWriteTextRequest.ProtoReflect.Descriptor instead.
 func (*FsWriteTextRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{94}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{99}
 }
 
 func (x *FsWriteTextRequest) GetWorkdir() string {
@@ -7640,7 +8180,7 @@ type FsWriteTextResponse struct {
 
 func (x *FsWriteTextResponse) Reset() {
 	*x = FsWriteTextResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[95]
+	mi := &file_proto_v1_gateway_proto_msgTypes[100]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7652,7 +8192,7 @@ func (x *FsWriteTextResponse) String() string {
 func (*FsWriteTextResponse) ProtoMessage() {}
 
 func (x *FsWriteTextResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[95]
+	mi := &file_proto_v1_gateway_proto_msgTypes[100]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7665,7 +8205,7 @@ func (x *FsWriteTextResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsWriteTextResponse.ProtoReflect.Descriptor instead.
 func (*FsWriteTextResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{95}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{100}
 }
 
 func (x *FsWriteTextResponse) GetPath() string {
@@ -7727,7 +8267,7 @@ type FsCreateDirRequest struct {
 
 func (x *FsCreateDirRequest) Reset() {
 	*x = FsCreateDirRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[96]
+	mi := &file_proto_v1_gateway_proto_msgTypes[101]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7739,7 +8279,7 @@ func (x *FsCreateDirRequest) String() string {
 func (*FsCreateDirRequest) ProtoMessage() {}
 
 func (x *FsCreateDirRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[96]
+	mi := &file_proto_v1_gateway_proto_msgTypes[101]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7752,7 +8292,7 @@ func (x *FsCreateDirRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsCreateDirRequest.ProtoReflect.Descriptor instead.
 func (*FsCreateDirRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{96}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{101}
 }
 
 func (x *FsCreateDirRequest) GetWorkdir() string {
@@ -7779,7 +8319,7 @@ type FsCreateDirResponse struct {
 
 func (x *FsCreateDirResponse) Reset() {
 	*x = FsCreateDirResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[97]
+	mi := &file_proto_v1_gateway_proto_msgTypes[102]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7791,7 +8331,7 @@ func (x *FsCreateDirResponse) String() string {
 func (*FsCreateDirResponse) ProtoMessage() {}
 
 func (x *FsCreateDirResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[97]
+	mi := &file_proto_v1_gateway_proto_msgTypes[102]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7804,7 +8344,7 @@ func (x *FsCreateDirResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsCreateDirResponse.ProtoReflect.Descriptor instead.
 func (*FsCreateDirResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{97}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{102}
 }
 
 func (x *FsCreateDirResponse) GetPath() string {
@@ -7832,7 +8372,7 @@ type FsRenameRequest struct {
 
 func (x *FsRenameRequest) Reset() {
 	*x = FsRenameRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[98]
+	mi := &file_proto_v1_gateway_proto_msgTypes[103]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7844,7 +8384,7 @@ func (x *FsRenameRequest) String() string {
 func (*FsRenameRequest) ProtoMessage() {}
 
 func (x *FsRenameRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[98]
+	mi := &file_proto_v1_gateway_proto_msgTypes[103]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7857,7 +8397,7 @@ func (x *FsRenameRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRenameRequest.ProtoReflect.Descriptor instead.
 func (*FsRenameRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{98}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{103}
 }
 
 func (x *FsRenameRequest) GetWorkdir() string {
@@ -7892,7 +8432,7 @@ type FsRenameResponse struct {
 
 func (x *FsRenameResponse) Reset() {
 	*x = FsRenameResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[99]
+	mi := &file_proto_v1_gateway_proto_msgTypes[104]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7904,7 +8444,7 @@ func (x *FsRenameResponse) String() string {
 func (*FsRenameResponse) ProtoMessage() {}
 
 func (x *FsRenameResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[99]
+	mi := &file_proto_v1_gateway_proto_msgTypes[104]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7917,7 +8457,7 @@ func (x *FsRenameResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsRenameResponse.ProtoReflect.Descriptor instead.
 func (*FsRenameResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{99}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{104}
 }
 
 func (x *FsRenameResponse) GetFromPath() string {
@@ -7951,7 +8491,7 @@ type FsDeleteRequest struct {
 
 func (x *FsDeleteRequest) Reset() {
 	*x = FsDeleteRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[100]
+	mi := &file_proto_v1_gateway_proto_msgTypes[105]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -7963,7 +8503,7 @@ func (x *FsDeleteRequest) String() string {
 func (*FsDeleteRequest) ProtoMessage() {}
 
 func (x *FsDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[100]
+	mi := &file_proto_v1_gateway_proto_msgTypes[105]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7976,7 +8516,7 @@ func (x *FsDeleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsDeleteRequest.ProtoReflect.Descriptor instead.
 func (*FsDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{100}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{105}
 }
 
 func (x *FsDeleteRequest) GetWorkdir() string {
@@ -8003,7 +8543,7 @@ type FsDeleteResponse struct {
 
 func (x *FsDeleteResponse) Reset() {
 	*x = FsDeleteResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[101]
+	mi := &file_proto_v1_gateway_proto_msgTypes[106]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -8015,7 +8555,7 @@ func (x *FsDeleteResponse) String() string {
 func (*FsDeleteResponse) ProtoMessage() {}
 
 func (x *FsDeleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[101]
+	mi := &file_proto_v1_gateway_proto_msgTypes[106]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8028,7 +8568,7 @@ func (x *FsDeleteResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FsDeleteResponse.ProtoReflect.Descriptor instead.
 func (*FsDeleteResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{101}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{106}
 }
 
 func (x *FsDeleteResponse) GetPath() string {
@@ -8054,7 +8594,7 @@ type PingRequest struct {
 
 func (x *PingRequest) Reset() {
 	*x = PingRequest{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[102]
+	mi := &file_proto_v1_gateway_proto_msgTypes[107]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -8066,7 +8606,7 @@ func (x *PingRequest) String() string {
 func (*PingRequest) ProtoMessage() {}
 
 func (x *PingRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[102]
+	mi := &file_proto_v1_gateway_proto_msgTypes[107]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8079,7 +8619,7 @@ func (x *PingRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PingRequest.ProtoReflect.Descriptor instead.
 func (*PingRequest) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{102}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{107}
 }
 
 func (x *PingRequest) GetTimestamp() int64 {
@@ -8098,7 +8638,7 @@ type PongResponse struct {
 
 func (x *PongResponse) Reset() {
 	*x = PongResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[103]
+	mi := &file_proto_v1_gateway_proto_msgTypes[108]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -8110,7 +8650,7 @@ func (x *PongResponse) String() string {
 func (*PongResponse) ProtoMessage() {}
 
 func (x *PongResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[103]
+	mi := &file_proto_v1_gateway_proto_msgTypes[108]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8123,7 +8663,7 @@ func (x *PongResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PongResponse.ProtoReflect.Descriptor instead.
 func (*PongResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{103}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{108}
 }
 
 func (x *PongResponse) GetTimestamp() int64 {
@@ -8143,7 +8683,7 @@ type ErrorResponse struct {
 
 func (x *ErrorResponse) Reset() {
 	*x = ErrorResponse{}
-	mi := &file_proto_v1_gateway_proto_msgTypes[104]
+	mi := &file_proto_v1_gateway_proto_msgTypes[109]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -8155,7 +8695,7 @@ func (x *ErrorResponse) String() string {
 func (*ErrorResponse) ProtoMessage() {}
 
 func (x *ErrorResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_v1_gateway_proto_msgTypes[104]
+	mi := &file_proto_v1_gateway_proto_msgTypes[109]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8168,7 +8708,7 @@ func (x *ErrorResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ErrorResponse.ProtoReflect.Descriptor instead.
 func (*ErrorResponse) Descriptor() ([]byte, []int) {
-	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{104}
+	return file_proto_v1_gateway_proto_rawDescGZIP(), []int{109}
 }
 
 func (x *ErrorResponse) GetCode() int32 {
@@ -8198,7 +8738,7 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\asuccess\x18\x01 \x01(\bR\asuccess\x12\x18\n" +
 	"\amessage\x18\x02 \x01(\tR\amessage\x12\x1d\n" +
 	"\n" +
-	"session_id\x18\x03 \x01(\tR\tsessionId\"\x81\x1c\n" +
+	"session_id\x18\x03 \x01(\tR\tsessionId\"\xc9\x1c\n" +
 	"\x0fGatewayEnvelope\x12\x1d\n" +
 	"\n" +
 	"request_id\x18\x01 \x01(\tR\trequestId\x12\x1c\n" +
@@ -8246,12 +8786,13 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\vgit_request\x18= \x01(\v2 .liveagent.gateway.v1.GitRequestH\x00R\n" +
 	"gitRequest\x12d\n" +
 	"\x15fs_read_editable_text\x18> \x01(\v2/.liveagent.gateway.v1.FsReadEditableTextRequestH\x00R\x12fsReadEditableText\x12j\n" +
-	"\x17fs_read_workspace_image\x18? \x01(\v21.liveagent.gateway.v1.FsReadWorkspaceImageRequestH\x00R\x14fsReadWorkspaceImage\x12S\n" +
+	"\x17fs_read_workspace_image\x18? \x01(\v21.liveagent.gateway.v1.FsReadWorkspaceImageRequestH\x00R\x14fsReadWorkspaceImage\x12F\n" +
+	"\fsftp_request\x18@ \x01(\v2!.liveagent.gateway.v1.SftpRequestH\x00R\vsftpRequest\x12S\n" +
 	"\x0etunnel_control\x18C \x01(\v2*.liveagent.gateway.v1.TunnelControlRequestH\x00R\rtunnelControl\x12]\n" +
 	"\x13tunnel_control_resp\x18D \x01(\v2+.liveagent.gateway.v1.TunnelControlResponseH\x00R\x11tunnelControlResp\x12F\n" +
 	"\ftunnel_frame\x18E \x01(\v2!.liveagent.gateway.v1.TunnelFrameH\x00R\vtunnelFrame\x12z\n" +
 	"\x1dsettings_reset_ssh_known_host\x18H \x01(\v26.liveagent.gateway.v1.SettingsResetSshKnownHostRequestH\x00R\x19settingsResetSshKnownHostB\t\n" +
-	"\apayload\"\xc7!\n" +
+	"\apayload\"\xd4\"\n" +
 	"\rAgentEnvelope\x12\x1d\n" +
 	"\n" +
 	"request_id\x18\x01 \x01(\tR\trequestId\x12\x1c\n" +
@@ -8297,7 +8838,10 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\x0efs_delete_resp\x18? \x01(\v2&.liveagent.gateway.v1.FsDeleteResponseH\x00R\ffsDeleteResp\x12F\n" +
 	"\fgit_response\x18@ \x01(\v2!.liveagent.gateway.v1.GitResponseH\x00R\vgitResponse\x12n\n" +
 	"\x1afs_read_editable_text_resp\x18A \x01(\v20.liveagent.gateway.v1.FsReadEditableTextResponseH\x00R\x16fsReadEditableTextResp\x12t\n" +
-	"\x1cfs_read_workspace_image_resp\x18B \x01(\v22.liveagent.gateway.v1.FsReadWorkspaceImageResponseH\x00R\x18fsReadWorkspaceImageResp\x12S\n" +
+	"\x1cfs_read_workspace_image_resp\x18B \x01(\v22.liveagent.gateway.v1.FsReadWorkspaceImageResponseH\x00R\x18fsReadWorkspaceImageResp\x12I\n" +
+	"\rsftp_response\x18I \x01(\v2\".liveagent.gateway.v1.SftpResponseH\x00R\fsftpResponse\x12@\n" +
+	"\n" +
+	"sftp_event\x18J \x01(\v2\x1f.liveagent.gateway.v1.SftpEventH\x00R\tsftpEvent\x12S\n" +
 	"\x0etunnel_control\x18C \x01(\v2*.liveagent.gateway.v1.TunnelControlRequestH\x00R\rtunnelControl\x12]\n" +
 	"\x13tunnel_control_resp\x18D \x01(\v2+.liveagent.gateway.v1.TunnelControlResponseH\x00R\x11tunnelControlResp\x12F\n" +
 	"\ftunnel_frame\x18E \x01(\v2!.liveagent.gateway.v1.TunnelFrameH\x00R\vtunnelFrame\x12K\n" +
@@ -8400,7 +8944,7 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\targs_json\x18\x02 \x01(\tR\bargsJson\"7\n" +
 	"\x14MemoryManageResponse\x12\x1f\n" +
 	"\vresult_json\x18\x01 \x01(\tR\n" +
-	"resultJson\"\x91\x03\n" +
+	"resultJson\"\xb4\x03\n" +
 	"\x0fTerminalRequest\x12\x16\n" +
 	"\x06action\x18\x01 \x01(\tR\x06action\x12\x1d\n" +
 	"\n" +
@@ -8417,7 +8961,8 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\vssh_host_id\x18\v \x01(\tR\tsshHostId\x12\x1b\n" +
 	"\tprompt_id\x18\f \x01(\tR\bpromptId\x12#\n" +
 	"\rprompt_answer\x18\r \x01(\tR\fpromptAnswer\x12$\n" +
-	"\x0etrust_host_key\x18\x0e \x01(\bR\ftrustHostKey\"\xaa\x03\n" +
+	"\x0etrust_host_key\x18\x0e \x01(\bR\ftrustHostKey\x12!\n" +
+	"\fsftp_enabled\x18\x0f \x01(\bR\vsftpEnabled\"\xaa\x03\n" +
 	"\x0fTerminalSession\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12(\n" +
 	"\x10project_path_key\x18\x02 \x01(\tR\x0eprojectPathKey\x12\x10\n" +
@@ -8437,7 +8982,7 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\texit_code\x18\f \x01(\x05R\bexitCode\x12\x18\n" +
 	"\arunning\x18\r \x01(\bR\arunning\x12\x12\n" +
 	"\x04kind\x18\x0e \x01(\tR\x04kind\x12;\n" +
-	"\x03ssh\x18\x0f \x01(\v2).liveagent.gateway.v1.TerminalSshMetadataR\x03ssh\"\xa7\x02\n" +
+	"\x03ssh\x18\x0f \x01(\v2).liveagent.gateway.v1.TerminalSshMetadataR\x03ssh\"\xca\x02\n" +
 	"\x13TerminalSshMetadata\x12\x17\n" +
 	"\ahost_id\x18\x01 \x01(\tR\x06hostId\x12\x1b\n" +
 	"\thost_name\x18\x02 \x01(\tR\bhostName\x12\x1a\n" +
@@ -8447,7 +8992,65 @@ const file_proto_v1_gateway_proto_rawDesc = "" +
 	"\tauth_type\x18\x06 \x01(\tR\bauthType\x12\x16\n" +
 	"\x06status\x18\a \x01(\tR\x06status\x12+\n" +
 	"\x11reconnect_attempt\x18\b \x01(\rR\x10reconnectAttempt\x124\n" +
-	"\x16reconnect_max_attempts\x18\t \x01(\rR\x14reconnectMaxAttempts\"\x9a\x02\n" +
+	"\x16reconnect_max_attempts\x18\t \x01(\rR\x14reconnectMaxAttempts\x12!\n" +
+	"\fsftp_enabled\x18\n" +
+	" \x01(\bR\vsftpEnabled\"\xf9\x02\n" +
+	"\vSftpRequest\x12\x16\n" +
+	"\x06action\x18\x01 \x01(\tR\x06action\x12\x1d\n" +
+	"\n" +
+	"session_id\x18\x02 \x01(\tR\tsessionId\x12(\n" +
+	"\x10project_path_key\x18\x03 \x01(\tR\x0eprojectPathKey\x12\x18\n" +
+	"\aworkdir\x18\x04 \x01(\tR\aworkdir\x12\x1d\n" +
+	"\n" +
+	"local_path\x18\x05 \x01(\tR\tlocalPath\x12\x1f\n" +
+	"\vremote_path\x18\x06 \x01(\tR\n" +
+	"remotePath\x12\x1b\n" +
+	"\tfrom_path\x18\a \x01(\tR\bfromPath\x12\x17\n" +
+	"\ato_path\x18\b \x01(\tR\x06toPath\x12\x1c\n" +
+	"\tdirection\x18\t \x01(\tR\tdirection\x12\x1f\n" +
+	"\vtarget_path\x18\n" +
+	" \x01(\tR\n" +
+	"targetPath\x12\x1c\n" +
+	"\trecursive\x18\v \x01(\bR\trecursive\x12\x1c\n" +
+	"\toverwrite\x18\f \x01(\bR\toverwrite\"|\n" +
+	"\tSftpEntry\x12\x12\n" +
+	"\x04path\x18\x01 \x01(\tR\x04path\x12\x12\n" +
+	"\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n" +
+	"\x04kind\x18\x03 \x01(\tR\x04kind\x12\x1d\n" +
+	"\n" +
+	"size_bytes\x18\x04 \x01(\x04R\tsizeBytes\x12\x14\n" +
+	"\x05mtime\x18\x05 \x01(\x04R\x05mtime\"\xee\x02\n" +
+	"\fSftpTransfer\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12\x1d\n" +
+	"\n" +
+	"session_id\x18\x02 \x01(\tR\tsessionId\x12\x1c\n" +
+	"\tdirection\x18\x03 \x01(\tR\tdirection\x12\x16\n" +
+	"\x06status\x18\x04 \x01(\tR\x06status\x12\x1f\n" +
+	"\vsource_path\x18\x05 \x01(\tR\n" +
+	"sourcePath\x12\x1f\n" +
+	"\vtarget_path\x18\x06 \x01(\tR\n" +
+	"targetPath\x12!\n" +
+	"\fcurrent_path\x18\a \x01(\tR\vcurrentPath\x12\x1d\n" +
+	"\n" +
+	"bytes_done\x18\b \x01(\x04R\tbytesDone\x12\x1f\n" +
+	"\vbytes_total\x18\t \x01(\x04R\n" +
+	"bytesTotal\x12\x1d\n" +
+	"\n" +
+	"files_done\x18\n" +
+	" \x01(\rR\tfilesDone\x12\x1f\n" +
+	"\vfiles_total\x18\v \x01(\rR\n" +
+	"filesTotal\x12\x14\n" +
+	"\x05error\x18\f \x01(\tR\x05error\"\x84\x02\n" +
+	"\fSftpResponse\x12\x16\n" +
+	"\x06action\x18\x01 \x01(\tR\x06action\x12\x12\n" +
+	"\x04path\x18\x02 \x01(\tR\x04path\x129\n" +
+	"\aentries\x18\x03 \x03(\v2\x1f.liveagent.gateway.v1.SftpEntryR\aentries\x125\n" +
+	"\x05entry\x18\x04 \x01(\v2\x1f.liveagent.gateway.v1.SftpEntryR\x05entry\x12\x16\n" +
+	"\x06exists\x18\x05 \x01(\bR\x06exists\x12>\n" +
+	"\btransfer\x18\x06 \x01(\v2\".liveagent.gateway.v1.SftpTransferR\btransfer\"_\n" +
+	"\tSftpEvent\x12\x12\n" +
+	"\x04kind\x18\x01 \x01(\tR\x04kind\x12>\n" +
+	"\btransfer\x18\x02 \x01(\v2\".liveagent.gateway.v1.SftpTransferR\btransfer\"\x9a\x02\n" +
 	"\x11TerminalSshPrompt\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
 	"\x04kind\x18\x02 \x01(\tR\x04kind\x12\x17\n" +
@@ -8843,7 +9446,7 @@ func file_proto_v1_gateway_proto_rawDescGZIP() []byte {
 }
 
 var file_proto_v1_gateway_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_proto_v1_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 105)
+var file_proto_v1_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 110)
 var file_proto_v1_gateway_proto_goTypes = []any{
 	(TunnelFrameKind)(0),                      // 0: liveagent.gateway.v1.TunnelFrameKind
 	(ChatEvent_ChatEventType)(0),              // 1: liveagent.gateway.v1.ChatEvent.ChatEventType
@@ -8869,217 +9472,229 @@ var file_proto_v1_gateway_proto_goTypes = []any{
 	(*TerminalRequest)(nil),                   // 21: liveagent.gateway.v1.TerminalRequest
 	(*TerminalSession)(nil),                   // 22: liveagent.gateway.v1.TerminalSession
 	(*TerminalSshMetadata)(nil),               // 23: liveagent.gateway.v1.TerminalSshMetadata
-	(*TerminalSshPrompt)(nil),                 // 24: liveagent.gateway.v1.TerminalSshPrompt
-	(*TerminalShellOption)(nil),               // 25: liveagent.gateway.v1.TerminalShellOption
-	(*TerminalResponse)(nil),                  // 26: liveagent.gateway.v1.TerminalResponse
-	(*TerminalEvent)(nil),                     // 27: liveagent.gateway.v1.TerminalEvent
-	(*GitRequest)(nil),                        // 28: liveagent.gateway.v1.GitRequest
-	(*GitResponse)(nil),                       // 29: liveagent.gateway.v1.GitResponse
-	(*ChatRequest)(nil),                       // 30: liveagent.gateway.v1.ChatRequest
-	(*CancelChatRequest)(nil),                 // 31: liveagent.gateway.v1.CancelChatRequest
-	(*ChatEvent)(nil),                         // 32: liveagent.gateway.v1.ChatEvent
-	(*ChatControlEvent)(nil),                  // 33: liveagent.gateway.v1.ChatControlEvent
-	(*RuntimeStatusEvent)(nil),                // 34: liveagent.gateway.v1.RuntimeStatusEvent
-	(*CronManageRequest)(nil),                 // 35: liveagent.gateway.v1.CronManageRequest
-	(*CronManageResponse)(nil),                // 36: liveagent.gateway.v1.CronManageResponse
-	(*HistoryListRequest)(nil),                // 37: liveagent.gateway.v1.HistoryListRequest
-	(*HistoryListResponse)(nil),               // 38: liveagent.gateway.v1.HistoryListResponse
-	(*ConversationSummary)(nil),               // 39: liveagent.gateway.v1.ConversationSummary
-	(*HistoryGetRequest)(nil),                 // 40: liveagent.gateway.v1.HistoryGetRequest
-	(*HistoryGetResponse)(nil),                // 41: liveagent.gateway.v1.HistoryGetResponse
-	(*HistoryRenameRequest)(nil),              // 42: liveagent.gateway.v1.HistoryRenameRequest
-	(*HistoryRenameResponse)(nil),             // 43: liveagent.gateway.v1.HistoryRenameResponse
-	(*HistoryPinRequest)(nil),                 // 44: liveagent.gateway.v1.HistoryPinRequest
-	(*HistoryPinResponse)(nil),                // 45: liveagent.gateway.v1.HistoryPinResponse
-	(*HistoryShareStatus)(nil),                // 46: liveagent.gateway.v1.HistoryShareStatus
-	(*HistoryShareGetRequest)(nil),            // 47: liveagent.gateway.v1.HistoryShareGetRequest
-	(*HistoryShareGetResponse)(nil),           // 48: liveagent.gateway.v1.HistoryShareGetResponse
-	(*HistoryShareSetRequest)(nil),            // 49: liveagent.gateway.v1.HistoryShareSetRequest
-	(*HistoryShareSetResponse)(nil),           // 50: liveagent.gateway.v1.HistoryShareSetResponse
-	(*HistoryShareResolveRequest)(nil),        // 51: liveagent.gateway.v1.HistoryShareResolveRequest
-	(*HistoryShareResolveResponse)(nil),       // 52: liveagent.gateway.v1.HistoryShareResolveResponse
-	(*HistoryWorkdirsRequest)(nil),            // 53: liveagent.gateway.v1.HistoryWorkdirsRequest
-	(*HistoryWorkdirSummary)(nil),             // 54: liveagent.gateway.v1.HistoryWorkdirSummary
-	(*HistoryWorkdirsResponse)(nil),           // 55: liveagent.gateway.v1.HistoryWorkdirsResponse
-	(*HistoryDeleteRequest)(nil),              // 56: liveagent.gateway.v1.HistoryDeleteRequest
-	(*HistoryDeleteResponse)(nil),             // 57: liveagent.gateway.v1.HistoryDeleteResponse
-	(*HistoryTruncateRequest)(nil),            // 58: liveagent.gateway.v1.HistoryTruncateRequest
-	(*HistoryTruncateResponse)(nil),           // 59: liveagent.gateway.v1.HistoryTruncateResponse
-	(*HistorySyncEvent)(nil),                  // 60: liveagent.gateway.v1.HistorySyncEvent
-	(*ProviderListRequest)(nil),               // 61: liveagent.gateway.v1.ProviderListRequest
-	(*ProviderListResponse)(nil),              // 62: liveagent.gateway.v1.ProviderListResponse
-	(*SettingsGetRequest)(nil),                // 63: liveagent.gateway.v1.SettingsGetRequest
-	(*SettingsGetResponse)(nil),               // 64: liveagent.gateway.v1.SettingsGetResponse
-	(*SettingsUpdateRequest)(nil),             // 65: liveagent.gateway.v1.SettingsUpdateRequest
-	(*SettingsUpdateResponse)(nil),            // 66: liveagent.gateway.v1.SettingsUpdateResponse
-	(*SettingsResetSshKnownHostRequest)(nil),  // 67: liveagent.gateway.v1.SettingsResetSshKnownHostRequest
-	(*SettingsResetSshKnownHostResponse)(nil), // 68: liveagent.gateway.v1.SettingsResetSshKnownHostResponse
-	(*SettingsSyncEvent)(nil),                 // 69: liveagent.gateway.v1.SettingsSyncEvent
-	(*SkillFilesListRequest)(nil),             // 70: liveagent.gateway.v1.SkillFilesListRequest
-	(*SkillFilesListResponse)(nil),            // 71: liveagent.gateway.v1.SkillFilesListResponse
-	(*SkillMetadataReadRequest)(nil),          // 72: liveagent.gateway.v1.SkillMetadataReadRequest
-	(*SkillMetadataReadResponse)(nil),         // 73: liveagent.gateway.v1.SkillMetadataReadResponse
-	(*SkillTextReadRequest)(nil),              // 74: liveagent.gateway.v1.SkillTextReadRequest
-	(*SkillTextReadResponse)(nil),             // 75: liveagent.gateway.v1.SkillTextReadResponse
-	(*SkillManageRequest)(nil),                // 76: liveagent.gateway.v1.SkillManageRequest
-	(*SkillManageResponse)(nil),               // 77: liveagent.gateway.v1.SkillManageResponse
-	(*FileMentionListRequest)(nil),            // 78: liveagent.gateway.v1.FileMentionListRequest
-	(*FileMentionEntry)(nil),                  // 79: liveagent.gateway.v1.FileMentionEntry
-	(*FileMentionListResponse)(nil),           // 80: liveagent.gateway.v1.FileMentionListResponse
-	(*FsRoot)(nil),                            // 81: liveagent.gateway.v1.FsRoot
-	(*FsRootsRequest)(nil),                    // 82: liveagent.gateway.v1.FsRootsRequest
-	(*FsRootsResponse)(nil),                   // 83: liveagent.gateway.v1.FsRootsResponse
-	(*FsListDirsRequest)(nil),                 // 84: liveagent.gateway.v1.FsListDirsRequest
-	(*FsDirEntry)(nil),                        // 85: liveagent.gateway.v1.FsDirEntry
-	(*FsListDirsResponse)(nil),                // 86: liveagent.gateway.v1.FsListDirsResponse
-	(*FsCreateProjectFolderRequest)(nil),      // 87: liveagent.gateway.v1.FsCreateProjectFolderRequest
-	(*FsCreateProjectFolderResponse)(nil),     // 88: liveagent.gateway.v1.FsCreateProjectFolderResponse
-	(*FsListRequest)(nil),                     // 89: liveagent.gateway.v1.FsListRequest
-	(*FsListEntry)(nil),                       // 90: liveagent.gateway.v1.FsListEntry
-	(*FsListResponse)(nil),                    // 91: liveagent.gateway.v1.FsListResponse
-	(*FsReadEditableTextRequest)(nil),         // 92: liveagent.gateway.v1.FsReadEditableTextRequest
-	(*FsReadEditableTextResponse)(nil),        // 93: liveagent.gateway.v1.FsReadEditableTextResponse
-	(*FsReadWorkspaceImageRequest)(nil),       // 94: liveagent.gateway.v1.FsReadWorkspaceImageRequest
-	(*FsReadWorkspaceImageResponse)(nil),      // 95: liveagent.gateway.v1.FsReadWorkspaceImageResponse
-	(*FsWriteTextRequest)(nil),                // 96: liveagent.gateway.v1.FsWriteTextRequest
-	(*FsWriteTextResponse)(nil),               // 97: liveagent.gateway.v1.FsWriteTextResponse
-	(*FsCreateDirRequest)(nil),                // 98: liveagent.gateway.v1.FsCreateDirRequest
-	(*FsCreateDirResponse)(nil),               // 99: liveagent.gateway.v1.FsCreateDirResponse
-	(*FsRenameRequest)(nil),                   // 100: liveagent.gateway.v1.FsRenameRequest
-	(*FsRenameResponse)(nil),                  // 101: liveagent.gateway.v1.FsRenameResponse
-	(*FsDeleteRequest)(nil),                   // 102: liveagent.gateway.v1.FsDeleteRequest
-	(*FsDeleteResponse)(nil),                  // 103: liveagent.gateway.v1.FsDeleteResponse
-	(*PingRequest)(nil),                       // 104: liveagent.gateway.v1.PingRequest
-	(*PongResponse)(nil),                      // 105: liveagent.gateway.v1.PongResponse
-	(*ErrorResponse)(nil),                     // 106: liveagent.gateway.v1.ErrorResponse
+	(*SftpRequest)(nil),                       // 24: liveagent.gateway.v1.SftpRequest
+	(*SftpEntry)(nil),                         // 25: liveagent.gateway.v1.SftpEntry
+	(*SftpTransfer)(nil),                      // 26: liveagent.gateway.v1.SftpTransfer
+	(*SftpResponse)(nil),                      // 27: liveagent.gateway.v1.SftpResponse
+	(*SftpEvent)(nil),                         // 28: liveagent.gateway.v1.SftpEvent
+	(*TerminalSshPrompt)(nil),                 // 29: liveagent.gateway.v1.TerminalSshPrompt
+	(*TerminalShellOption)(nil),               // 30: liveagent.gateway.v1.TerminalShellOption
+	(*TerminalResponse)(nil),                  // 31: liveagent.gateway.v1.TerminalResponse
+	(*TerminalEvent)(nil),                     // 32: liveagent.gateway.v1.TerminalEvent
+	(*GitRequest)(nil),                        // 33: liveagent.gateway.v1.GitRequest
+	(*GitResponse)(nil),                       // 34: liveagent.gateway.v1.GitResponse
+	(*ChatRequest)(nil),                       // 35: liveagent.gateway.v1.ChatRequest
+	(*CancelChatRequest)(nil),                 // 36: liveagent.gateway.v1.CancelChatRequest
+	(*ChatEvent)(nil),                         // 37: liveagent.gateway.v1.ChatEvent
+	(*ChatControlEvent)(nil),                  // 38: liveagent.gateway.v1.ChatControlEvent
+	(*RuntimeStatusEvent)(nil),                // 39: liveagent.gateway.v1.RuntimeStatusEvent
+	(*CronManageRequest)(nil),                 // 40: liveagent.gateway.v1.CronManageRequest
+	(*CronManageResponse)(nil),                // 41: liveagent.gateway.v1.CronManageResponse
+	(*HistoryListRequest)(nil),                // 42: liveagent.gateway.v1.HistoryListRequest
+	(*HistoryListResponse)(nil),               // 43: liveagent.gateway.v1.HistoryListResponse
+	(*ConversationSummary)(nil),               // 44: liveagent.gateway.v1.ConversationSummary
+	(*HistoryGetRequest)(nil),                 // 45: liveagent.gateway.v1.HistoryGetRequest
+	(*HistoryGetResponse)(nil),                // 46: liveagent.gateway.v1.HistoryGetResponse
+	(*HistoryRenameRequest)(nil),              // 47: liveagent.gateway.v1.HistoryRenameRequest
+	(*HistoryRenameResponse)(nil),             // 48: liveagent.gateway.v1.HistoryRenameResponse
+	(*HistoryPinRequest)(nil),                 // 49: liveagent.gateway.v1.HistoryPinRequest
+	(*HistoryPinResponse)(nil),                // 50: liveagent.gateway.v1.HistoryPinResponse
+	(*HistoryShareStatus)(nil),                // 51: liveagent.gateway.v1.HistoryShareStatus
+	(*HistoryShareGetRequest)(nil),            // 52: liveagent.gateway.v1.HistoryShareGetRequest
+	(*HistoryShareGetResponse)(nil),           // 53: liveagent.gateway.v1.HistoryShareGetResponse
+	(*HistoryShareSetRequest)(nil),            // 54: liveagent.gateway.v1.HistoryShareSetRequest
+	(*HistoryShareSetResponse)(nil),           // 55: liveagent.gateway.v1.HistoryShareSetResponse
+	(*HistoryShareResolveRequest)(nil),        // 56: liveagent.gateway.v1.HistoryShareResolveRequest
+	(*HistoryShareResolveResponse)(nil),       // 57: liveagent.gateway.v1.HistoryShareResolveResponse
+	(*HistoryWorkdirsRequest)(nil),            // 58: liveagent.gateway.v1.HistoryWorkdirsRequest
+	(*HistoryWorkdirSummary)(nil),             // 59: liveagent.gateway.v1.HistoryWorkdirSummary
+	(*HistoryWorkdirsResponse)(nil),           // 60: liveagent.gateway.v1.HistoryWorkdirsResponse
+	(*HistoryDeleteRequest)(nil),              // 61: liveagent.gateway.v1.HistoryDeleteRequest
+	(*HistoryDeleteResponse)(nil),             // 62: liveagent.gateway.v1.HistoryDeleteResponse
+	(*HistoryTruncateRequest)(nil),            // 63: liveagent.gateway.v1.HistoryTruncateRequest
+	(*HistoryTruncateResponse)(nil),           // 64: liveagent.gateway.v1.HistoryTruncateResponse
+	(*HistorySyncEvent)(nil),                  // 65: liveagent.gateway.v1.HistorySyncEvent
+	(*ProviderListRequest)(nil),               // 66: liveagent.gateway.v1.ProviderListRequest
+	(*ProviderListResponse)(nil),              // 67: liveagent.gateway.v1.ProviderListResponse
+	(*SettingsGetRequest)(nil),                // 68: liveagent.gateway.v1.SettingsGetRequest
+	(*SettingsGetResponse)(nil),               // 69: liveagent.gateway.v1.SettingsGetResponse
+	(*SettingsUpdateRequest)(nil),             // 70: liveagent.gateway.v1.SettingsUpdateRequest
+	(*SettingsUpdateResponse)(nil),            // 71: liveagent.gateway.v1.SettingsUpdateResponse
+	(*SettingsResetSshKnownHostRequest)(nil),  // 72: liveagent.gateway.v1.SettingsResetSshKnownHostRequest
+	(*SettingsResetSshKnownHostResponse)(nil), // 73: liveagent.gateway.v1.SettingsResetSshKnownHostResponse
+	(*SettingsSyncEvent)(nil),                 // 74: liveagent.gateway.v1.SettingsSyncEvent
+	(*SkillFilesListRequest)(nil),             // 75: liveagent.gateway.v1.SkillFilesListRequest
+	(*SkillFilesListResponse)(nil),            // 76: liveagent.gateway.v1.SkillFilesListResponse
+	(*SkillMetadataReadRequest)(nil),          // 77: liveagent.gateway.v1.SkillMetadataReadRequest
+	(*SkillMetadataReadResponse)(nil),         // 78: liveagent.gateway.v1.SkillMetadataReadResponse
+	(*SkillTextReadRequest)(nil),              // 79: liveagent.gateway.v1.SkillTextReadRequest
+	(*SkillTextReadResponse)(nil),             // 80: liveagent.gateway.v1.SkillTextReadResponse
+	(*SkillManageRequest)(nil),                // 81: liveagent.gateway.v1.SkillManageRequest
+	(*SkillManageResponse)(nil),               // 82: liveagent.gateway.v1.SkillManageResponse
+	(*FileMentionListRequest)(nil),            // 83: liveagent.gateway.v1.FileMentionListRequest
+	(*FileMentionEntry)(nil),                  // 84: liveagent.gateway.v1.FileMentionEntry
+	(*FileMentionListResponse)(nil),           // 85: liveagent.gateway.v1.FileMentionListResponse
+	(*FsRoot)(nil),                            // 86: liveagent.gateway.v1.FsRoot
+	(*FsRootsRequest)(nil),                    // 87: liveagent.gateway.v1.FsRootsRequest
+	(*FsRootsResponse)(nil),                   // 88: liveagent.gateway.v1.FsRootsResponse
+	(*FsListDirsRequest)(nil),                 // 89: liveagent.gateway.v1.FsListDirsRequest
+	(*FsDirEntry)(nil),                        // 90: liveagent.gateway.v1.FsDirEntry
+	(*FsListDirsResponse)(nil),                // 91: liveagent.gateway.v1.FsListDirsResponse
+	(*FsCreateProjectFolderRequest)(nil),      // 92: liveagent.gateway.v1.FsCreateProjectFolderRequest
+	(*FsCreateProjectFolderResponse)(nil),     // 93: liveagent.gateway.v1.FsCreateProjectFolderResponse
+	(*FsListRequest)(nil),                     // 94: liveagent.gateway.v1.FsListRequest
+	(*FsListEntry)(nil),                       // 95: liveagent.gateway.v1.FsListEntry
+	(*FsListResponse)(nil),                    // 96: liveagent.gateway.v1.FsListResponse
+	(*FsReadEditableTextRequest)(nil),         // 97: liveagent.gateway.v1.FsReadEditableTextRequest
+	(*FsReadEditableTextResponse)(nil),        // 98: liveagent.gateway.v1.FsReadEditableTextResponse
+	(*FsReadWorkspaceImageRequest)(nil),       // 99: liveagent.gateway.v1.FsReadWorkspaceImageRequest
+	(*FsReadWorkspaceImageResponse)(nil),      // 100: liveagent.gateway.v1.FsReadWorkspaceImageResponse
+	(*FsWriteTextRequest)(nil),                // 101: liveagent.gateway.v1.FsWriteTextRequest
+	(*FsWriteTextResponse)(nil),               // 102: liveagent.gateway.v1.FsWriteTextResponse
+	(*FsCreateDirRequest)(nil),                // 103: liveagent.gateway.v1.FsCreateDirRequest
+	(*FsCreateDirResponse)(nil),               // 104: liveagent.gateway.v1.FsCreateDirResponse
+	(*FsRenameRequest)(nil),                   // 105: liveagent.gateway.v1.FsRenameRequest
+	(*FsRenameResponse)(nil),                  // 106: liveagent.gateway.v1.FsRenameResponse
+	(*FsDeleteRequest)(nil),                   // 107: liveagent.gateway.v1.FsDeleteRequest
+	(*FsDeleteResponse)(nil),                  // 108: liveagent.gateway.v1.FsDeleteResponse
+	(*PingRequest)(nil),                       // 109: liveagent.gateway.v1.PingRequest
+	(*PongResponse)(nil),                      // 110: liveagent.gateway.v1.PongResponse
+	(*ErrorResponse)(nil),                     // 111: liveagent.gateway.v1.ErrorResponse
 }
 var file_proto_v1_gateway_proto_depIdxs = []int32{
-	30,  // 0: liveagent.gateway.v1.GatewayEnvelope.chat_request:type_name -> liveagent.gateway.v1.ChatRequest
-	31,  // 1: liveagent.gateway.v1.GatewayEnvelope.cancel_chat:type_name -> liveagent.gateway.v1.CancelChatRequest
-	35,  // 2: liveagent.gateway.v1.GatewayEnvelope.cron_manage:type_name -> liveagent.gateway.v1.CronManageRequest
-	37,  // 3: liveagent.gateway.v1.GatewayEnvelope.history_list:type_name -> liveagent.gateway.v1.HistoryListRequest
-	40,  // 4: liveagent.gateway.v1.GatewayEnvelope.history_get:type_name -> liveagent.gateway.v1.HistoryGetRequest
-	42,  // 5: liveagent.gateway.v1.GatewayEnvelope.history_rename:type_name -> liveagent.gateway.v1.HistoryRenameRequest
-	56,  // 6: liveagent.gateway.v1.GatewayEnvelope.history_delete:type_name -> liveagent.gateway.v1.HistoryDeleteRequest
-	58,  // 7: liveagent.gateway.v1.GatewayEnvelope.history_truncate:type_name -> liveagent.gateway.v1.HistoryTruncateRequest
-	44,  // 8: liveagent.gateway.v1.GatewayEnvelope.history_pin:type_name -> liveagent.gateway.v1.HistoryPinRequest
-	47,  // 9: liveagent.gateway.v1.GatewayEnvelope.history_share_get:type_name -> liveagent.gateway.v1.HistoryShareGetRequest
-	49,  // 10: liveagent.gateway.v1.GatewayEnvelope.history_share_set:type_name -> liveagent.gateway.v1.HistoryShareSetRequest
-	51,  // 11: liveagent.gateway.v1.GatewayEnvelope.history_share_resolve:type_name -> liveagent.gateway.v1.HistoryShareResolveRequest
-	53,  // 12: liveagent.gateway.v1.GatewayEnvelope.history_workdirs:type_name -> liveagent.gateway.v1.HistoryWorkdirsRequest
-	61,  // 13: liveagent.gateway.v1.GatewayEnvelope.provider_list:type_name -> liveagent.gateway.v1.ProviderListRequest
-	63,  // 14: liveagent.gateway.v1.GatewayEnvelope.settings_get:type_name -> liveagent.gateway.v1.SettingsGetRequest
-	65,  // 15: liveagent.gateway.v1.GatewayEnvelope.settings_update:type_name -> liveagent.gateway.v1.SettingsUpdateRequest
-	70,  // 16: liveagent.gateway.v1.GatewayEnvelope.skill_files_list:type_name -> liveagent.gateway.v1.SkillFilesListRequest
-	72,  // 17: liveagent.gateway.v1.GatewayEnvelope.skill_metadata_read:type_name -> liveagent.gateway.v1.SkillMetadataReadRequest
-	74,  // 18: liveagent.gateway.v1.GatewayEnvelope.skill_text_read:type_name -> liveagent.gateway.v1.SkillTextReadRequest
-	78,  // 19: liveagent.gateway.v1.GatewayEnvelope.file_mention_list:type_name -> liveagent.gateway.v1.FileMentionListRequest
+	35,  // 0: liveagent.gateway.v1.GatewayEnvelope.chat_request:type_name -> liveagent.gateway.v1.ChatRequest
+	36,  // 1: liveagent.gateway.v1.GatewayEnvelope.cancel_chat:type_name -> liveagent.gateway.v1.CancelChatRequest
+	40,  // 2: liveagent.gateway.v1.GatewayEnvelope.cron_manage:type_name -> liveagent.gateway.v1.CronManageRequest
+	42,  // 3: liveagent.gateway.v1.GatewayEnvelope.history_list:type_name -> liveagent.gateway.v1.HistoryListRequest
+	45,  // 4: liveagent.gateway.v1.GatewayEnvelope.history_get:type_name -> liveagent.gateway.v1.HistoryGetRequest
+	47,  // 5: liveagent.gateway.v1.GatewayEnvelope.history_rename:type_name -> liveagent.gateway.v1.HistoryRenameRequest
+	61,  // 6: liveagent.gateway.v1.GatewayEnvelope.history_delete:type_name -> liveagent.gateway.v1.HistoryDeleteRequest
+	63,  // 7: liveagent.gateway.v1.GatewayEnvelope.history_truncate:type_name -> liveagent.gateway.v1.HistoryTruncateRequest
+	49,  // 8: liveagent.gateway.v1.GatewayEnvelope.history_pin:type_name -> liveagent.gateway.v1.HistoryPinRequest
+	52,  // 9: liveagent.gateway.v1.GatewayEnvelope.history_share_get:type_name -> liveagent.gateway.v1.HistoryShareGetRequest
+	54,  // 10: liveagent.gateway.v1.GatewayEnvelope.history_share_set:type_name -> liveagent.gateway.v1.HistoryShareSetRequest
+	56,  // 11: liveagent.gateway.v1.GatewayEnvelope.history_share_resolve:type_name -> liveagent.gateway.v1.HistoryShareResolveRequest
+	58,  // 12: liveagent.gateway.v1.GatewayEnvelope.history_workdirs:type_name -> liveagent.gateway.v1.HistoryWorkdirsRequest
+	66,  // 13: liveagent.gateway.v1.GatewayEnvelope.provider_list:type_name -> liveagent.gateway.v1.ProviderListRequest
+	68,  // 14: liveagent.gateway.v1.GatewayEnvelope.settings_get:type_name -> liveagent.gateway.v1.SettingsGetRequest
+	70,  // 15: liveagent.gateway.v1.GatewayEnvelope.settings_update:type_name -> liveagent.gateway.v1.SettingsUpdateRequest
+	75,  // 16: liveagent.gateway.v1.GatewayEnvelope.skill_files_list:type_name -> liveagent.gateway.v1.SkillFilesListRequest
+	77,  // 17: liveagent.gateway.v1.GatewayEnvelope.skill_metadata_read:type_name -> liveagent.gateway.v1.SkillMetadataReadRequest
+	79,  // 18: liveagent.gateway.v1.GatewayEnvelope.skill_text_read:type_name -> liveagent.gateway.v1.SkillTextReadRequest
+	83,  // 19: liveagent.gateway.v1.GatewayEnvelope.file_mention_list:type_name -> liveagent.gateway.v1.FileMentionListRequest
 	10,  // 20: liveagent.gateway.v1.GatewayEnvelope.upload_readable_files:type_name -> liveagent.gateway.v1.UploadReadableFilesRequest
-	82,  // 21: liveagent.gateway.v1.GatewayEnvelope.fs_roots:type_name -> liveagent.gateway.v1.FsRootsRequest
-	84,  // 22: liveagent.gateway.v1.GatewayEnvelope.fs_list_dirs:type_name -> liveagent.gateway.v1.FsListDirsRequest
-	104, // 23: liveagent.gateway.v1.GatewayEnvelope.ping:type_name -> liveagent.gateway.v1.PingRequest
+	87,  // 21: liveagent.gateway.v1.GatewayEnvelope.fs_roots:type_name -> liveagent.gateway.v1.FsRootsRequest
+	89,  // 22: liveagent.gateway.v1.GatewayEnvelope.fs_list_dirs:type_name -> liveagent.gateway.v1.FsListDirsRequest
+	109, // 23: liveagent.gateway.v1.GatewayEnvelope.ping:type_name -> liveagent.gateway.v1.PingRequest
 	12,  // 24: liveagent.gateway.v1.GatewayEnvelope.uploaded_image_preview:type_name -> liveagent.gateway.v1.UploadedImagePreviewRequest
 	19,  // 25: liveagent.gateway.v1.GatewayEnvelope.memory_manage:type_name -> liveagent.gateway.v1.MemoryManageRequest
-	76,  // 26: liveagent.gateway.v1.GatewayEnvelope.skill_manage:type_name -> liveagent.gateway.v1.SkillManageRequest
-	87,  // 27: liveagent.gateway.v1.GatewayEnvelope.fs_create_project_folder:type_name -> liveagent.gateway.v1.FsCreateProjectFolderRequest
+	81,  // 26: liveagent.gateway.v1.GatewayEnvelope.skill_manage:type_name -> liveagent.gateway.v1.SkillManageRequest
+	92,  // 27: liveagent.gateway.v1.GatewayEnvelope.fs_create_project_folder:type_name -> liveagent.gateway.v1.FsCreateProjectFolderRequest
 	21,  // 28: liveagent.gateway.v1.GatewayEnvelope.terminal_request:type_name -> liveagent.gateway.v1.TerminalRequest
-	89,  // 29: liveagent.gateway.v1.GatewayEnvelope.fs_list:type_name -> liveagent.gateway.v1.FsListRequest
-	96,  // 30: liveagent.gateway.v1.GatewayEnvelope.fs_write_text:type_name -> liveagent.gateway.v1.FsWriteTextRequest
-	98,  // 31: liveagent.gateway.v1.GatewayEnvelope.fs_create_dir:type_name -> liveagent.gateway.v1.FsCreateDirRequest
-	100, // 32: liveagent.gateway.v1.GatewayEnvelope.fs_rename:type_name -> liveagent.gateway.v1.FsRenameRequest
-	102, // 33: liveagent.gateway.v1.GatewayEnvelope.fs_delete:type_name -> liveagent.gateway.v1.FsDeleteRequest
-	28,  // 34: liveagent.gateway.v1.GatewayEnvelope.git_request:type_name -> liveagent.gateway.v1.GitRequest
-	92,  // 35: liveagent.gateway.v1.GatewayEnvelope.fs_read_editable_text:type_name -> liveagent.gateway.v1.FsReadEditableTextRequest
-	94,  // 36: liveagent.gateway.v1.GatewayEnvelope.fs_read_workspace_image:type_name -> liveagent.gateway.v1.FsReadWorkspaceImageRequest
-	14,  // 37: liveagent.gateway.v1.GatewayEnvelope.tunnel_control:type_name -> liveagent.gateway.v1.TunnelControlRequest
-	15,  // 38: liveagent.gateway.v1.GatewayEnvelope.tunnel_control_resp:type_name -> liveagent.gateway.v1.TunnelControlResponse
-	18,  // 39: liveagent.gateway.v1.GatewayEnvelope.tunnel_frame:type_name -> liveagent.gateway.v1.TunnelFrame
-	67,  // 40: liveagent.gateway.v1.GatewayEnvelope.settings_reset_ssh_known_host:type_name -> liveagent.gateway.v1.SettingsResetSshKnownHostRequest
-	32,  // 41: liveagent.gateway.v1.AgentEnvelope.chat_event:type_name -> liveagent.gateway.v1.ChatEvent
-	36,  // 42: liveagent.gateway.v1.AgentEnvelope.cron_manage_resp:type_name -> liveagent.gateway.v1.CronManageResponse
-	38,  // 43: liveagent.gateway.v1.AgentEnvelope.history_list_resp:type_name -> liveagent.gateway.v1.HistoryListResponse
-	41,  // 44: liveagent.gateway.v1.AgentEnvelope.history_get_resp:type_name -> liveagent.gateway.v1.HistoryGetResponse
-	43,  // 45: liveagent.gateway.v1.AgentEnvelope.history_rename_resp:type_name -> liveagent.gateway.v1.HistoryRenameResponse
-	57,  // 46: liveagent.gateway.v1.AgentEnvelope.history_delete_resp:type_name -> liveagent.gateway.v1.HistoryDeleteResponse
-	60,  // 47: liveagent.gateway.v1.AgentEnvelope.history_sync:type_name -> liveagent.gateway.v1.HistorySyncEvent
-	59,  // 48: liveagent.gateway.v1.AgentEnvelope.history_truncate_resp:type_name -> liveagent.gateway.v1.HistoryTruncateResponse
-	45,  // 49: liveagent.gateway.v1.AgentEnvelope.history_pin_resp:type_name -> liveagent.gateway.v1.HistoryPinResponse
-	48,  // 50: liveagent.gateway.v1.AgentEnvelope.history_share_get_resp:type_name -> liveagent.gateway.v1.HistoryShareGetResponse
-	50,  // 51: liveagent.gateway.v1.AgentEnvelope.history_share_set_resp:type_name -> liveagent.gateway.v1.HistoryShareSetResponse
-	52,  // 52: liveagent.gateway.v1.AgentEnvelope.history_share_resolve_resp:type_name -> liveagent.gateway.v1.HistoryShareResolveResponse
-	55,  // 53: liveagent.gateway.v1.AgentEnvelope.history_workdirs_resp:type_name -> liveagent.gateway.v1.HistoryWorkdirsResponse
-	62,  // 54: liveagent.gateway.v1.AgentEnvelope.provider_list_resp:type_name -> liveagent.gateway.v1.ProviderListResponse
-	64,  // 55: liveagent.gateway.v1.AgentEnvelope.settings_get_resp:type_name -> liveagent.gateway.v1.SettingsGetResponse
-	66,  // 56: liveagent.gateway.v1.AgentEnvelope.settings_update_resp:type_name -> liveagent.gateway.v1.SettingsUpdateResponse
-	69,  // 57: liveagent.gateway.v1.AgentEnvelope.settings_sync:type_name -> liveagent.gateway.v1.SettingsSyncEvent
-	71,  // 58: liveagent.gateway.v1.AgentEnvelope.skill_files_list_resp:type_name -> liveagent.gateway.v1.SkillFilesListResponse
-	73,  // 59: liveagent.gateway.v1.AgentEnvelope.skill_metadata_read_resp:type_name -> liveagent.gateway.v1.SkillMetadataReadResponse
-	75,  // 60: liveagent.gateway.v1.AgentEnvelope.skill_text_read_resp:type_name -> liveagent.gateway.v1.SkillTextReadResponse
-	80,  // 61: liveagent.gateway.v1.AgentEnvelope.file_mention_list_resp:type_name -> liveagent.gateway.v1.FileMentionListResponse
-	11,  // 62: liveagent.gateway.v1.AgentEnvelope.upload_readable_files_resp:type_name -> liveagent.gateway.v1.UploadReadableFilesResponse
-	83,  // 63: liveagent.gateway.v1.AgentEnvelope.fs_roots_resp:type_name -> liveagent.gateway.v1.FsRootsResponse
-	105, // 64: liveagent.gateway.v1.AgentEnvelope.pong:type_name -> liveagent.gateway.v1.PongResponse
-	86,  // 65: liveagent.gateway.v1.AgentEnvelope.fs_list_dirs_resp:type_name -> liveagent.gateway.v1.FsListDirsResponse
-	13,  // 66: liveagent.gateway.v1.AgentEnvelope.uploaded_image_preview_resp:type_name -> liveagent.gateway.v1.UploadedImagePreviewResponse
-	20,  // 67: liveagent.gateway.v1.AgentEnvelope.memory_manage_resp:type_name -> liveagent.gateway.v1.MemoryManageResponse
-	77,  // 68: liveagent.gateway.v1.AgentEnvelope.skill_manage_resp:type_name -> liveagent.gateway.v1.SkillManageResponse
-	88,  // 69: liveagent.gateway.v1.AgentEnvelope.fs_create_project_folder_resp:type_name -> liveagent.gateway.v1.FsCreateProjectFolderResponse
-	26,  // 70: liveagent.gateway.v1.AgentEnvelope.terminal_response:type_name -> liveagent.gateway.v1.TerminalResponse
-	27,  // 71: liveagent.gateway.v1.AgentEnvelope.terminal_event:type_name -> liveagent.gateway.v1.TerminalEvent
-	91,  // 72: liveagent.gateway.v1.AgentEnvelope.fs_list_resp:type_name -> liveagent.gateway.v1.FsListResponse
-	97,  // 73: liveagent.gateway.v1.AgentEnvelope.fs_write_text_resp:type_name -> liveagent.gateway.v1.FsWriteTextResponse
-	99,  // 74: liveagent.gateway.v1.AgentEnvelope.fs_create_dir_resp:type_name -> liveagent.gateway.v1.FsCreateDirResponse
-	101, // 75: liveagent.gateway.v1.AgentEnvelope.fs_rename_resp:type_name -> liveagent.gateway.v1.FsRenameResponse
-	103, // 76: liveagent.gateway.v1.AgentEnvelope.fs_delete_resp:type_name -> liveagent.gateway.v1.FsDeleteResponse
-	29,  // 77: liveagent.gateway.v1.AgentEnvelope.git_response:type_name -> liveagent.gateway.v1.GitResponse
-	93,  // 78: liveagent.gateway.v1.AgentEnvelope.fs_read_editable_text_resp:type_name -> liveagent.gateway.v1.FsReadEditableTextResponse
-	95,  // 79: liveagent.gateway.v1.AgentEnvelope.fs_read_workspace_image_resp:type_name -> liveagent.gateway.v1.FsReadWorkspaceImageResponse
-	14,  // 80: liveagent.gateway.v1.AgentEnvelope.tunnel_control:type_name -> liveagent.gateway.v1.TunnelControlRequest
-	15,  // 81: liveagent.gateway.v1.AgentEnvelope.tunnel_control_resp:type_name -> liveagent.gateway.v1.TunnelControlResponse
-	18,  // 82: liveagent.gateway.v1.AgentEnvelope.tunnel_frame:type_name -> liveagent.gateway.v1.TunnelFrame
-	33,  // 83: liveagent.gateway.v1.AgentEnvelope.chat_control:type_name -> liveagent.gateway.v1.ChatControlEvent
-	34,  // 84: liveagent.gateway.v1.AgentEnvelope.runtime_status:type_name -> liveagent.gateway.v1.RuntimeStatusEvent
-	68,  // 85: liveagent.gateway.v1.AgentEnvelope.settings_reset_ssh_known_host_resp:type_name -> liveagent.gateway.v1.SettingsResetSshKnownHostResponse
-	106, // 86: liveagent.gateway.v1.AgentEnvelope.error:type_name -> liveagent.gateway.v1.ErrorResponse
-	9,   // 87: liveagent.gateway.v1.UploadReadableFilesRequest.files:type_name -> liveagent.gateway.v1.UploadReadableFile
-	8,   // 88: liveagent.gateway.v1.UploadReadableFilesResponse.files:type_name -> liveagent.gateway.v1.ChatUploadedFile
-	16,  // 89: liveagent.gateway.v1.TunnelControlResponse.tunnels:type_name -> liveagent.gateway.v1.TunnelSummary
-	16,  // 90: liveagent.gateway.v1.TunnelControlResponse.tunnel:type_name -> liveagent.gateway.v1.TunnelSummary
-	0,   // 91: liveagent.gateway.v1.TunnelFrame.kind:type_name -> liveagent.gateway.v1.TunnelFrameKind
-	17,  // 92: liveagent.gateway.v1.TunnelFrame.headers:type_name -> liveagent.gateway.v1.TunnelHeader
-	23,  // 93: liveagent.gateway.v1.TerminalSession.ssh:type_name -> liveagent.gateway.v1.TerminalSshMetadata
-	22,  // 94: liveagent.gateway.v1.TerminalResponse.sessions:type_name -> liveagent.gateway.v1.TerminalSession
-	22,  // 95: liveagent.gateway.v1.TerminalResponse.session:type_name -> liveagent.gateway.v1.TerminalSession
-	25,  // 96: liveagent.gateway.v1.TerminalResponse.shell_options:type_name -> liveagent.gateway.v1.TerminalShellOption
-	24,  // 97: liveagent.gateway.v1.TerminalResponse.ssh_prompt:type_name -> liveagent.gateway.v1.TerminalSshPrompt
-	22,  // 98: liveagent.gateway.v1.TerminalEvent.session:type_name -> liveagent.gateway.v1.TerminalSession
-	6,   // 99: liveagent.gateway.v1.ChatRequest.selected_model:type_name -> liveagent.gateway.v1.ChatSelectedModel
-	8,   // 100: liveagent.gateway.v1.ChatRequest.uploaded_files:type_name -> liveagent.gateway.v1.ChatUploadedFile
-	7,   // 101: liveagent.gateway.v1.ChatRequest.runtime_controls:type_name -> liveagent.gateway.v1.ChatRuntimeControls
-	1,   // 102: liveagent.gateway.v1.ChatEvent.type:type_name -> liveagent.gateway.v1.ChatEvent.ChatEventType
-	39,  // 103: liveagent.gateway.v1.HistoryListResponse.conversations:type_name -> liveagent.gateway.v1.ConversationSummary
-	39,  // 104: liveagent.gateway.v1.HistoryGetResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	39,  // 105: liveagent.gateway.v1.HistoryRenameResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	39,  // 106: liveagent.gateway.v1.HistoryPinResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	46,  // 107: liveagent.gateway.v1.HistoryShareGetResponse.share:type_name -> liveagent.gateway.v1.HistoryShareStatus
-	46,  // 108: liveagent.gateway.v1.HistoryShareSetResponse.share:type_name -> liveagent.gateway.v1.HistoryShareStatus
-	39,  // 109: liveagent.gateway.v1.HistoryShareResolveResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	54,  // 110: liveagent.gateway.v1.HistoryWorkdirsResponse.workdirs:type_name -> liveagent.gateway.v1.HistoryWorkdirSummary
-	39,  // 111: liveagent.gateway.v1.HistoryTruncateResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	39,  // 112: liveagent.gateway.v1.HistorySyncEvent.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
-	79,  // 113: liveagent.gateway.v1.FileMentionListResponse.entries:type_name -> liveagent.gateway.v1.FileMentionEntry
-	81,  // 114: liveagent.gateway.v1.FsRootsResponse.roots:type_name -> liveagent.gateway.v1.FsRoot
-	85,  // 115: liveagent.gateway.v1.FsListDirsResponse.entries:type_name -> liveagent.gateway.v1.FsDirEntry
-	90,  // 116: liveagent.gateway.v1.FsListResponse.entries:type_name -> liveagent.gateway.v1.FsListEntry
-	5,   // 117: liveagent.gateway.v1.AgentGateway.AgentConnect:input_type -> liveagent.gateway.v1.AgentEnvelope
-	2,   // 118: liveagent.gateway.v1.AgentGateway.Authenticate:input_type -> liveagent.gateway.v1.AuthRequest
-	4,   // 119: liveagent.gateway.v1.AgentGateway.AgentConnect:output_type -> liveagent.gateway.v1.GatewayEnvelope
-	3,   // 120: liveagent.gateway.v1.AgentGateway.Authenticate:output_type -> liveagent.gateway.v1.AuthResponse
-	119, // [119:121] is the sub-list for method output_type
-	117, // [117:119] is the sub-list for method input_type
-	117, // [117:117] is the sub-list for extension type_name
-	117, // [117:117] is the sub-list for extension extendee
-	0,   // [0:117] is the sub-list for field type_name
+	94,  // 29: liveagent.gateway.v1.GatewayEnvelope.fs_list:type_name -> liveagent.gateway.v1.FsListRequest
+	101, // 30: liveagent.gateway.v1.GatewayEnvelope.fs_write_text:type_name -> liveagent.gateway.v1.FsWriteTextRequest
+	103, // 31: liveagent.gateway.v1.GatewayEnvelope.fs_create_dir:type_name -> liveagent.gateway.v1.FsCreateDirRequest
+	105, // 32: liveagent.gateway.v1.GatewayEnvelope.fs_rename:type_name -> liveagent.gateway.v1.FsRenameRequest
+	107, // 33: liveagent.gateway.v1.GatewayEnvelope.fs_delete:type_name -> liveagent.gateway.v1.FsDeleteRequest
+	33,  // 34: liveagent.gateway.v1.GatewayEnvelope.git_request:type_name -> liveagent.gateway.v1.GitRequest
+	97,  // 35: liveagent.gateway.v1.GatewayEnvelope.fs_read_editable_text:type_name -> liveagent.gateway.v1.FsReadEditableTextRequest
+	99,  // 36: liveagent.gateway.v1.GatewayEnvelope.fs_read_workspace_image:type_name -> liveagent.gateway.v1.FsReadWorkspaceImageRequest
+	24,  // 37: liveagent.gateway.v1.GatewayEnvelope.sftp_request:type_name -> liveagent.gateway.v1.SftpRequest
+	14,  // 38: liveagent.gateway.v1.GatewayEnvelope.tunnel_control:type_name -> liveagent.gateway.v1.TunnelControlRequest
+	15,  // 39: liveagent.gateway.v1.GatewayEnvelope.tunnel_control_resp:type_name -> liveagent.gateway.v1.TunnelControlResponse
+	18,  // 40: liveagent.gateway.v1.GatewayEnvelope.tunnel_frame:type_name -> liveagent.gateway.v1.TunnelFrame
+	72,  // 41: liveagent.gateway.v1.GatewayEnvelope.settings_reset_ssh_known_host:type_name -> liveagent.gateway.v1.SettingsResetSshKnownHostRequest
+	37,  // 42: liveagent.gateway.v1.AgentEnvelope.chat_event:type_name -> liveagent.gateway.v1.ChatEvent
+	41,  // 43: liveagent.gateway.v1.AgentEnvelope.cron_manage_resp:type_name -> liveagent.gateway.v1.CronManageResponse
+	43,  // 44: liveagent.gateway.v1.AgentEnvelope.history_list_resp:type_name -> liveagent.gateway.v1.HistoryListResponse
+	46,  // 45: liveagent.gateway.v1.AgentEnvelope.history_get_resp:type_name -> liveagent.gateway.v1.HistoryGetResponse
+	48,  // 46: liveagent.gateway.v1.AgentEnvelope.history_rename_resp:type_name -> liveagent.gateway.v1.HistoryRenameResponse
+	62,  // 47: liveagent.gateway.v1.AgentEnvelope.history_delete_resp:type_name -> liveagent.gateway.v1.HistoryDeleteResponse
+	65,  // 48: liveagent.gateway.v1.AgentEnvelope.history_sync:type_name -> liveagent.gateway.v1.HistorySyncEvent
+	64,  // 49: liveagent.gateway.v1.AgentEnvelope.history_truncate_resp:type_name -> liveagent.gateway.v1.HistoryTruncateResponse
+	50,  // 50: liveagent.gateway.v1.AgentEnvelope.history_pin_resp:type_name -> liveagent.gateway.v1.HistoryPinResponse
+	53,  // 51: liveagent.gateway.v1.AgentEnvelope.history_share_get_resp:type_name -> liveagent.gateway.v1.HistoryShareGetResponse
+	55,  // 52: liveagent.gateway.v1.AgentEnvelope.history_share_set_resp:type_name -> liveagent.gateway.v1.HistoryShareSetResponse
+	57,  // 53: liveagent.gateway.v1.AgentEnvelope.history_share_resolve_resp:type_name -> liveagent.gateway.v1.HistoryShareResolveResponse
+	60,  // 54: liveagent.gateway.v1.AgentEnvelope.history_workdirs_resp:type_name -> liveagent.gateway.v1.HistoryWorkdirsResponse
+	67,  // 55: liveagent.gateway.v1.AgentEnvelope.provider_list_resp:type_name -> liveagent.gateway.v1.ProviderListResponse
+	69,  // 56: liveagent.gateway.v1.AgentEnvelope.settings_get_resp:type_name -> liveagent.gateway.v1.SettingsGetResponse
+	71,  // 57: liveagent.gateway.v1.AgentEnvelope.settings_update_resp:type_name -> liveagent.gateway.v1.SettingsUpdateResponse
+	74,  // 58: liveagent.gateway.v1.AgentEnvelope.settings_sync:type_name -> liveagent.gateway.v1.SettingsSyncEvent
+	76,  // 59: liveagent.gateway.v1.AgentEnvelope.skill_files_list_resp:type_name -> liveagent.gateway.v1.SkillFilesListResponse
+	78,  // 60: liveagent.gateway.v1.AgentEnvelope.skill_metadata_read_resp:type_name -> liveagent.gateway.v1.SkillMetadataReadResponse
+	80,  // 61: liveagent.gateway.v1.AgentEnvelope.skill_text_read_resp:type_name -> liveagent.gateway.v1.SkillTextReadResponse
+	85,  // 62: liveagent.gateway.v1.AgentEnvelope.file_mention_list_resp:type_name -> liveagent.gateway.v1.FileMentionListResponse
+	11,  // 63: liveagent.gateway.v1.AgentEnvelope.upload_readable_files_resp:type_name -> liveagent.gateway.v1.UploadReadableFilesResponse
+	88,  // 64: liveagent.gateway.v1.AgentEnvelope.fs_roots_resp:type_name -> liveagent.gateway.v1.FsRootsResponse
+	110, // 65: liveagent.gateway.v1.AgentEnvelope.pong:type_name -> liveagent.gateway.v1.PongResponse
+	91,  // 66: liveagent.gateway.v1.AgentEnvelope.fs_list_dirs_resp:type_name -> liveagent.gateway.v1.FsListDirsResponse
+	13,  // 67: liveagent.gateway.v1.AgentEnvelope.uploaded_image_preview_resp:type_name -> liveagent.gateway.v1.UploadedImagePreviewResponse
+	20,  // 68: liveagent.gateway.v1.AgentEnvelope.memory_manage_resp:type_name -> liveagent.gateway.v1.MemoryManageResponse
+	82,  // 69: liveagent.gateway.v1.AgentEnvelope.skill_manage_resp:type_name -> liveagent.gateway.v1.SkillManageResponse
+	93,  // 70: liveagent.gateway.v1.AgentEnvelope.fs_create_project_folder_resp:type_name -> liveagent.gateway.v1.FsCreateProjectFolderResponse
+	31,  // 71: liveagent.gateway.v1.AgentEnvelope.terminal_response:type_name -> liveagent.gateway.v1.TerminalResponse
+	32,  // 72: liveagent.gateway.v1.AgentEnvelope.terminal_event:type_name -> liveagent.gateway.v1.TerminalEvent
+	96,  // 73: liveagent.gateway.v1.AgentEnvelope.fs_list_resp:type_name -> liveagent.gateway.v1.FsListResponse
+	102, // 74: liveagent.gateway.v1.AgentEnvelope.fs_write_text_resp:type_name -> liveagent.gateway.v1.FsWriteTextResponse
+	104, // 75: liveagent.gateway.v1.AgentEnvelope.fs_create_dir_resp:type_name -> liveagent.gateway.v1.FsCreateDirResponse
+	106, // 76: liveagent.gateway.v1.AgentEnvelope.fs_rename_resp:type_name -> liveagent.gateway.v1.FsRenameResponse
+	108, // 77: liveagent.gateway.v1.AgentEnvelope.fs_delete_resp:type_name -> liveagent.gateway.v1.FsDeleteResponse
+	34,  // 78: liveagent.gateway.v1.AgentEnvelope.git_response:type_name -> liveagent.gateway.v1.GitResponse
+	98,  // 79: liveagent.gateway.v1.AgentEnvelope.fs_read_editable_text_resp:type_name -> liveagent.gateway.v1.FsReadEditableTextResponse
+	100, // 80: liveagent.gateway.v1.AgentEnvelope.fs_read_workspace_image_resp:type_name -> liveagent.gateway.v1.FsReadWorkspaceImageResponse
+	27,  // 81: liveagent.gateway.v1.AgentEnvelope.sftp_response:type_name -> liveagent.gateway.v1.SftpResponse
+	28,  // 82: liveagent.gateway.v1.AgentEnvelope.sftp_event:type_name -> liveagent.gateway.v1.SftpEvent
+	14,  // 83: liveagent.gateway.v1.AgentEnvelope.tunnel_control:type_name -> liveagent.gateway.v1.TunnelControlRequest
+	15,  // 84: liveagent.gateway.v1.AgentEnvelope.tunnel_control_resp:type_name -> liveagent.gateway.v1.TunnelControlResponse
+	18,  // 85: liveagent.gateway.v1.AgentEnvelope.tunnel_frame:type_name -> liveagent.gateway.v1.TunnelFrame
+	38,  // 86: liveagent.gateway.v1.AgentEnvelope.chat_control:type_name -> liveagent.gateway.v1.ChatControlEvent
+	39,  // 87: liveagent.gateway.v1.AgentEnvelope.runtime_status:type_name -> liveagent.gateway.v1.RuntimeStatusEvent
+	73,  // 88: liveagent.gateway.v1.AgentEnvelope.settings_reset_ssh_known_host_resp:type_name -> liveagent.gateway.v1.SettingsResetSshKnownHostResponse
+	111, // 89: liveagent.gateway.v1.AgentEnvelope.error:type_name -> liveagent.gateway.v1.ErrorResponse
+	9,   // 90: liveagent.gateway.v1.UploadReadableFilesRequest.files:type_name -> liveagent.gateway.v1.UploadReadableFile
+	8,   // 91: liveagent.gateway.v1.UploadReadableFilesResponse.files:type_name -> liveagent.gateway.v1.ChatUploadedFile
+	16,  // 92: liveagent.gateway.v1.TunnelControlResponse.tunnels:type_name -> liveagent.gateway.v1.TunnelSummary
+	16,  // 93: liveagent.gateway.v1.TunnelControlResponse.tunnel:type_name -> liveagent.gateway.v1.TunnelSummary
+	0,   // 94: liveagent.gateway.v1.TunnelFrame.kind:type_name -> liveagent.gateway.v1.TunnelFrameKind
+	17,  // 95: liveagent.gateway.v1.TunnelFrame.headers:type_name -> liveagent.gateway.v1.TunnelHeader
+	23,  // 96: liveagent.gateway.v1.TerminalSession.ssh:type_name -> liveagent.gateway.v1.TerminalSshMetadata
+	25,  // 97: liveagent.gateway.v1.SftpResponse.entries:type_name -> liveagent.gateway.v1.SftpEntry
+	25,  // 98: liveagent.gateway.v1.SftpResponse.entry:type_name -> liveagent.gateway.v1.SftpEntry
+	26,  // 99: liveagent.gateway.v1.SftpResponse.transfer:type_name -> liveagent.gateway.v1.SftpTransfer
+	26,  // 100: liveagent.gateway.v1.SftpEvent.transfer:type_name -> liveagent.gateway.v1.SftpTransfer
+	22,  // 101: liveagent.gateway.v1.TerminalResponse.sessions:type_name -> liveagent.gateway.v1.TerminalSession
+	22,  // 102: liveagent.gateway.v1.TerminalResponse.session:type_name -> liveagent.gateway.v1.TerminalSession
+	30,  // 103: liveagent.gateway.v1.TerminalResponse.shell_options:type_name -> liveagent.gateway.v1.TerminalShellOption
+	29,  // 104: liveagent.gateway.v1.TerminalResponse.ssh_prompt:type_name -> liveagent.gateway.v1.TerminalSshPrompt
+	22,  // 105: liveagent.gateway.v1.TerminalEvent.session:type_name -> liveagent.gateway.v1.TerminalSession
+	6,   // 106: liveagent.gateway.v1.ChatRequest.selected_model:type_name -> liveagent.gateway.v1.ChatSelectedModel
+	8,   // 107: liveagent.gateway.v1.ChatRequest.uploaded_files:type_name -> liveagent.gateway.v1.ChatUploadedFile
+	7,   // 108: liveagent.gateway.v1.ChatRequest.runtime_controls:type_name -> liveagent.gateway.v1.ChatRuntimeControls
+	1,   // 109: liveagent.gateway.v1.ChatEvent.type:type_name -> liveagent.gateway.v1.ChatEvent.ChatEventType
+	44,  // 110: liveagent.gateway.v1.HistoryListResponse.conversations:type_name -> liveagent.gateway.v1.ConversationSummary
+	44,  // 111: liveagent.gateway.v1.HistoryGetResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	44,  // 112: liveagent.gateway.v1.HistoryRenameResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	44,  // 113: liveagent.gateway.v1.HistoryPinResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	51,  // 114: liveagent.gateway.v1.HistoryShareGetResponse.share:type_name -> liveagent.gateway.v1.HistoryShareStatus
+	51,  // 115: liveagent.gateway.v1.HistoryShareSetResponse.share:type_name -> liveagent.gateway.v1.HistoryShareStatus
+	44,  // 116: liveagent.gateway.v1.HistoryShareResolveResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	59,  // 117: liveagent.gateway.v1.HistoryWorkdirsResponse.workdirs:type_name -> liveagent.gateway.v1.HistoryWorkdirSummary
+	44,  // 118: liveagent.gateway.v1.HistoryTruncateResponse.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	44,  // 119: liveagent.gateway.v1.HistorySyncEvent.conversation:type_name -> liveagent.gateway.v1.ConversationSummary
+	84,  // 120: liveagent.gateway.v1.FileMentionListResponse.entries:type_name -> liveagent.gateway.v1.FileMentionEntry
+	86,  // 121: liveagent.gateway.v1.FsRootsResponse.roots:type_name -> liveagent.gateway.v1.FsRoot
+	90,  // 122: liveagent.gateway.v1.FsListDirsResponse.entries:type_name -> liveagent.gateway.v1.FsDirEntry
+	95,  // 123: liveagent.gateway.v1.FsListResponse.entries:type_name -> liveagent.gateway.v1.FsListEntry
+	5,   // 124: liveagent.gateway.v1.AgentGateway.AgentConnect:input_type -> liveagent.gateway.v1.AgentEnvelope
+	2,   // 125: liveagent.gateway.v1.AgentGateway.Authenticate:input_type -> liveagent.gateway.v1.AuthRequest
+	4,   // 126: liveagent.gateway.v1.AgentGateway.AgentConnect:output_type -> liveagent.gateway.v1.GatewayEnvelope
+	3,   // 127: liveagent.gateway.v1.AgentGateway.Authenticate:output_type -> liveagent.gateway.v1.AuthResponse
+	126, // [126:128] is the sub-list for method output_type
+	124, // [124:126] is the sub-list for method input_type
+	124, // [124:124] is the sub-list for extension type_name
+	124, // [124:124] is the sub-list for extension extendee
+	0,   // [0:124] is the sub-list for field type_name
 }
 
 func init() { file_proto_v1_gateway_proto_init() }
@@ -9125,6 +9740,7 @@ func file_proto_v1_gateway_proto_init() {
 		(*GatewayEnvelope_GitRequest)(nil),
 		(*GatewayEnvelope_FsReadEditableText)(nil),
 		(*GatewayEnvelope_FsReadWorkspaceImage)(nil),
+		(*GatewayEnvelope_SftpRequest)(nil),
 		(*GatewayEnvelope_TunnelControl)(nil),
 		(*GatewayEnvelope_TunnelControlResp)(nil),
 		(*GatewayEnvelope_TunnelFrame)(nil),
@@ -9170,6 +9786,8 @@ func file_proto_v1_gateway_proto_init() {
 		(*AgentEnvelope_GitResponse)(nil),
 		(*AgentEnvelope_FsReadEditableTextResp)(nil),
 		(*AgentEnvelope_FsReadWorkspaceImageResp)(nil),
+		(*AgentEnvelope_SftpResponse)(nil),
+		(*AgentEnvelope_SftpEvent)(nil),
 		(*AgentEnvelope_TunnelControl)(nil),
 		(*AgentEnvelope_TunnelControlResp)(nil),
 		(*AgentEnvelope_TunnelFrame)(nil),
@@ -9178,14 +9796,14 @@ func file_proto_v1_gateway_proto_init() {
 		(*AgentEnvelope_SettingsResetSshKnownHostResp)(nil),
 		(*AgentEnvelope_Error)(nil),
 	}
-	file_proto_v1_gateway_proto_msgTypes[47].OneofWrappers = []any{}
+	file_proto_v1_gateway_proto_msgTypes[52].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_proto_v1_gateway_proto_rawDesc), len(file_proto_v1_gateway_proto_rawDesc)),
 			NumEnums:      2,
-			NumMessages:   105,
+			NumMessages:   110,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/crates/agent-gateway/internal/server/websocket.go b/crates/agent-gateway/internal/server/websocket.go
index 56e18f5f8..b0033f37c 100644
--- a/crates/agent-gateway/internal/server/websocket.go
+++ b/crates/agent-gateway/internal/server/websocket.go
@@ -63,6 +63,7 @@ type websocketTerminalRequestPayload struct {
 	PromptID       string `json:"prompt_id"`
 	PromptAnswer   string `json:"prompt_answer"`
 	TrustHostKey   bool   `json:"trust_host_key"`
+	SftpEnabled    bool   `json:"sftp_enabled"`
 }
 
 type websocketSshKnownHostResetPayload struct {
@@ -70,6 +71,31 @@ type websocketSshKnownHostResetPayload struct {
 	Port *int   `json:"port"`
 }
 
+type websocketSftpRequestPayload struct {
+	SessionID           string `json:"session_id"`
+	SessionIDCamel      string `json:"sessionId"`
+	ProjectPathKey      string `json:"project_path_key"`
+	ProjectPathKeyCamel string `json:"projectPathKey"`
+	Workdir             string `json:"workdir"`
+	Side                string `json:"side"`
+	LocalPath           string `json:"local_path"`
+	LocalPathCamel      string `json:"localPath"`
+	RemotePath          string `json:"remote_path"`
+	RemotePathCamel     string `json:"remotePath"`
+	FromPath            string `json:"from_path"`
+	FromPathCamel       string `json:"fromPath"`
+	SourcePathCamel     string `json:"sourcePath"`
+	ToPath              string `json:"to_path"`
+	ToPathCamel         string `json:"toPath"`
+	Direction           string `json:"direction"`
+	TargetPath          string `json:"target_path"`
+	TargetPathCamel     string `json:"targetPath"`
+	TransferID          string `json:"transfer_id"`
+	TransferIDCamel     string `json:"transferId"`
+	Recursive           bool   `json:"recursive"`
+	Overwrite           bool   `json:"overwrite"`
+}
+
 type websocketGitRequestPayload struct {
 	Workdir string          `json:"workdir"`
 	Args    json.RawMessage `json:"args,omitempty"`
@@ -98,6 +124,8 @@ type websocketConnection struct {
 	settingsEventsCleanup func()
 	terminalEvents        <-chan *gatewayv1.TerminalEvent
 	terminalEventsCleanup func()
+	sftpEvents            <-chan *gatewayv1.SftpEvent
+	sftpEventsCleanup     func()
 	chatEvents            <-chan *session.ChatBroadcastEvent
 	chatEventsCleanup     func()
 	heartbeatOnce         sync.Once
@@ -186,6 +214,10 @@ func (c *websocketConnection) close() {
 			c.terminalEventsCleanup()
 			c.terminalEventsCleanup = nil
 		}
+		if c.sftpEventsCleanup != nil {
+			c.sftpEventsCleanup()
+			c.sftpEventsCleanup = nil
+		}
 		if c.chatEventsCleanup != nil {
 			c.chatEventsCleanup()
 			c.chatEventsCleanup = nil
@@ -221,6 +253,7 @@ func (c *websocketConnection) handleAuth(req websocketRequest) {
 	c.startHistorySyncForwarder()
 	c.startSettingsSyncForwarder()
 	c.startTerminalEventForwarder()
+	c.startSftpEventForwarder()
 	c.startChatEventForwarder()
 	c.startWebSocketHeartbeat()
 	if err := c.writeResponse(req.ID, map[string]any{"ok": true}); err != nil {
@@ -358,6 +391,36 @@ func (c *websocketConnection) startTerminalEventForwarder() {
 	}()
 }
 
+func (c *websocketConnection) startSftpEventForwarder() {
+	if c.sftpEvents != nil || c.sftpEventsCleanup != nil {
+		return
+	}
+
+	sftpEvents, cleanup := c.sm.SubscribeSftpEvents()
+	c.sftpEvents = sftpEvents
+	c.sftpEventsCleanup = cleanup
+
+	go func() {
+		for {
+			select {
+			case <-c.done:
+				return
+			case event, ok := <-sftpEvents:
+				if !ok {
+					return
+				}
+				if !c.sm.WebSshTerminalEnabled() {
+					continue
+				}
+				if err := c.writeSftpEvent(websocketSftpEventPayload(event)); err != nil {
+					c.close()
+					return
+				}
+			}
+		}
+	}()
+}
+
 func (c *websocketConnection) replayTerminalSessionSnapshot() {
 	if !c.terminalFeaturesEnabled() {
 		return
@@ -545,6 +608,13 @@ func (c *websocketConnection) writeTerminalEvent(payload any) error {
 	})
 }
 
+func (c *websocketConnection) writeSftpEvent(payload any) error {
+	return c.writeEnvelope(websocketEnvelope{
+		Type:    "sftp.event",
+		Payload: payload,
+	})
+}
+
 func (c *websocketConnection) writeEnvelope(envelope websocketEnvelope) error {
 	return c.writer.write(envelope)
 }
diff --git a/crates/agent-gateway/internal/server/websocket_connection_state_test.go b/crates/agent-gateway/internal/server/websocket_connection_state_test.go
index 24c0b99c1..9ba139d81 100644
--- a/crates/agent-gateway/internal/server/websocket_connection_state_test.go
+++ b/crates/agent-gateway/internal/server/websocket_connection_state_test.go
@@ -74,6 +74,28 @@ func TestWebsocketTerminalPermissionsSeparateLocalAndSshSessions(t *testing.T) {
 	}
 }
 
+func TestWebsocketTerminalSessionPayloadIncludesSftpEnabled(t *testing.T) {
+	t.Parallel()
+
+	payload := websocketTerminalSessionPayload(&gatewayv1.TerminalSession{
+		Id:   "ssh-1",
+		Kind: "ssh",
+		Ssh: &gatewayv1.TerminalSshMetadata{
+			SftpEnabled: true,
+		},
+	})
+	ssh, ok := payload["ssh"].(map[string]any)
+	if !ok {
+		t.Fatalf("ssh payload missing: %#v", payload["ssh"])
+	}
+	if got := ssh["sftp_enabled"]; got != true {
+		t.Fatalf("sftp_enabled = %#v, want true", got)
+	}
+	if got := ssh["sftpEnabled"]; got != true {
+		t.Fatalf("sftpEnabled = %#v, want true", got)
+	}
+}
+
 func TestWebsocketTerminalEventForwardingAllowsSshOnlyStatusEvents(t *testing.T) {
 	t.Parallel()
 
diff --git a/crates/agent-gateway/internal/server/websocket_payloads.go b/crates/agent-gateway/internal/server/websocket_payloads.go
index 1cbae4115..3b1f232c9 100644
--- a/crates/agent-gateway/internal/server/websocket_payloads.go
+++ b/crates/agent-gateway/internal/server/websocket_payloads.go
@@ -135,6 +135,8 @@ func websocketTerminalSessionPayload(session *gatewayv1.TerminalSession) map[str
 			"status":                 strings.TrimSpace(ssh.GetStatus()),
 			"reconnect_attempt":      ssh.GetReconnectAttempt(),
 			"reconnect_max_attempts": ssh.GetReconnectMaxAttempts(),
+			"sftp_enabled":           ssh.GetSftpEnabled(),
+			"sftpEnabled":            ssh.GetSftpEnabled(),
 		}
 	}
 	return payload
diff --git a/crates/agent-gateway/internal/server/websocket_routes.go b/crates/agent-gateway/internal/server/websocket_routes.go
index 9ba9677c4..878d7c50d 100644
--- a/crates/agent-gateway/internal/server/websocket_routes.go
+++ b/crates/agent-gateway/internal/server/websocket_routes.go
@@ -56,6 +56,13 @@ var websocketRequestHandlers = map[string]websocketRequestHandler{
 	"terminal.close":                 (*websocketConnection).handleTerminalRequest,
 	"terminal.close_project":         (*websocketConnection).handleTerminalRequest,
 	"terminal.detach":                (*websocketConnection).handleTerminalDetach,
+	"sftp.list":                      (*websocketConnection).handleSftpRequest,
+	"sftp.stat":                      (*websocketConnection).handleSftpRequest,
+	"sftp.mkdir":                     (*websocketConnection).handleSftpRequest,
+	"sftp.rename":                    (*websocketConnection).handleSftpRequest,
+	"sftp.delete":                    (*websocketConnection).handleSftpRequest,
+	"sftp.transfer":                  (*websocketConnection).handleSftpRequest,
+	"sftp.cancel":                    (*websocketConnection).handleSftpRequest,
 	"tunnel.list":                    (*websocketConnection).handleTunnelList,
 	"tunnel.create":                  (*websocketConnection).handleTunnelCreate,
 	"tunnel.update":                  (*websocketConnection).handleTunnelUpdate,
diff --git a/crates/agent-gateway/internal/server/websocket_routes_test.go b/crates/agent-gateway/internal/server/websocket_routes_test.go
index 66cd4dc62..d918328af 100644
--- a/crates/agent-gateway/internal/server/websocket_routes_test.go
+++ b/crates/agent-gateway/internal/server/websocket_routes_test.go
@@ -60,6 +60,13 @@ func TestWebsocketRequestHandlersCoverKnownProtocolTypes(t *testing.T) {
 		"terminal.close",
 		"terminal.close_project",
 		"terminal.detach",
+		"sftp.list",
+		"sftp.stat",
+		"sftp.mkdir",
+		"sftp.rename",
+		"sftp.delete",
+		"sftp.transfer",
+		"sftp.cancel",
 		"tunnel.list",
 		"tunnel.create",
 		"tunnel.update",
diff --git a/crates/agent-gateway/internal/server/websocket_sftp_handlers.go b/crates/agent-gateway/internal/server/websocket_sftp_handlers.go
new file mode 100644
index 000000000..4849b8556
--- /dev/null
+++ b/crates/agent-gateway/internal/server/websocket_sftp_handlers.go
@@ -0,0 +1,179 @@
+package server
+
+import (
+	"strings"
+	"time"
+
+	gatewayv1 "github.com/liveagent/agent-gateway/internal/proto/v1"
+)
+
+func (c *websocketConnection) handleSftpRequest(req websocketRequest) {
+	action := sftpActionFromRequestType(req.Type)
+
+	var body websocketSftpRequestPayload
+	if err := decodeWebSocketPayload(req.Payload, &body); err != nil {
+		_ = c.writeError(req.ID, "invalid "+req.Type+" payload")
+		return
+	}
+	if !c.sm.WebSshTerminalEnabled() {
+		_ = c.writeError(req.ID, "web SSH SFTP is disabled in desktop Remote settings")
+		return
+	}
+
+	side := strings.TrimSpace(body.Side)
+	if side == "" {
+		side = strings.TrimSpace(body.Direction)
+	}
+	direction := strings.TrimSpace(body.Direction)
+	if direction == "" {
+		direction = side
+	}
+	sessionID := firstNonEmptyTrimmed(body.SessionID, body.SessionIDCamel)
+	projectPathKey := firstNonEmptyTrimmed(body.ProjectPathKey, body.ProjectPathKeyCamel)
+	localPath := firstNonEmptyRaw(body.LocalPath, body.LocalPathCamel)
+	remotePath := firstNonEmptyRaw(body.RemotePath, body.RemotePathCamel)
+	fromPath := firstNonEmptyRaw(
+		body.FromPath,
+		body.FromPathCamel,
+		body.SourcePathCamel,
+		body.TransferID,
+		body.TransferIDCamel,
+	)
+	toPath := firstNonEmptyRaw(body.ToPath, body.ToPathCamel)
+	targetPath := firstNonEmptyRaw(body.TargetPath, body.TargetPathCamel)
+
+	response, err := c.awaitAgentResponse(req.ID, &gatewayv1.GatewayEnvelope{
+		RequestId: req.ID,
+		Timestamp: time.Now().Unix(),
+		Payload: &gatewayv1.GatewayEnvelope_SftpRequest{
+			SftpRequest: &gatewayv1.SftpRequest{
+				Action:         action,
+				SessionId:      sessionID,
+				ProjectPathKey: projectPathKey,
+				Workdir:        strings.TrimSpace(body.Workdir),
+				LocalPath:      localPath,
+				RemotePath:     remotePath,
+				FromPath:       fromPath,
+				ToPath:         toPath,
+				Direction:      direction,
+				TargetPath:     targetPath,
+				Recursive:      body.Recursive,
+				Overwrite:      body.Overwrite,
+			},
+		},
+	})
+	if err != nil {
+		_ = c.writeError(req.ID, websocketErrorMessage(err))
+		return
+	}
+	if errResp := response.GetError(); errResp != nil {
+		_ = c.writeError(req.ID, errResp.GetMessage())
+		return
+	}
+
+	resp := response.GetSftpResponse()
+	if resp == nil {
+		_ = c.writeError(req.ID, "unexpected agent response")
+		return
+	}
+	_ = c.writeResponse(req.ID, websocketSftpResponsePayload(resp))
+}
+
+func sftpActionFromRequestType(requestType string) string {
+	const prefix = "sftp."
+	if strings.HasPrefix(requestType, prefix) {
+		return strings.TrimSpace(strings.TrimPrefix(requestType, prefix))
+	}
+	return strings.TrimSpace(requestType)
+}
+
+func firstNonEmptyTrimmed(values ...string) string {
+	for _, value := range values {
+		if trimmed := strings.TrimSpace(value); trimmed != "" {
+			return trimmed
+		}
+	}
+	return ""
+}
+
+func firstNonEmptyRaw(values ...string) string {
+	for _, value := range values {
+		if value != "" {
+			return value
+		}
+	}
+	return ""
+}
+
+func websocketSftpResponsePayload(resp *gatewayv1.SftpResponse) map[string]any {
+	payload := map[string]any{
+		"action":  strings.TrimSpace(resp.GetAction()),
+		"path":    resp.GetPath(),
+		"exists":  resp.GetExists(),
+		"entries": websocketSftpEntriesPayload(resp.GetEntries()),
+	}
+	if entry := resp.GetEntry(); entry != nil {
+		payload["entry"] = websocketSftpEntryPayload(entry)
+	}
+	if transfer := resp.GetTransfer(); transfer != nil {
+		payload["transfer"] = websocketSftpTransferPayload(transfer)
+	}
+	return payload
+}
+
+func websocketSftpEventPayload(event *gatewayv1.SftpEvent) map[string]any {
+	payload := map[string]any{
+		"kind": strings.TrimSpace(event.GetKind()),
+	}
+	if transfer := event.GetTransfer(); transfer != nil {
+		payload["transfer"] = websocketSftpTransferPayload(transfer)
+	}
+	return payload
+}
+
+func websocketSftpEntriesPayload(entries []*gatewayv1.SftpEntry) []map[string]any {
+	payload := make([]map[string]any, 0, len(entries))
+	for _, entry := range entries {
+		if entry == nil {
+			continue
+		}
+		payload = append(payload, websocketSftpEntryPayload(entry))
+	}
+	return payload
+}
+
+func websocketSftpEntryPayload(entry *gatewayv1.SftpEntry) map[string]any {
+	return map[string]any{
+		"path":       entry.GetPath(),
+		"name":       entry.GetName(),
+		"kind":       strings.TrimSpace(entry.GetKind()),
+		"sizeBytes":  entry.GetSizeBytes(),
+		"size_bytes": entry.GetSizeBytes(),
+		"mtime":      entry.GetMtime(),
+	}
+}
+
+func websocketSftpTransferPayload(transfer *gatewayv1.SftpTransfer) map[string]any {
+	return map[string]any{
+		"id":           strings.TrimSpace(transfer.GetId()),
+		"sessionId":    strings.TrimSpace(transfer.GetSessionId()),
+		"session_id":   strings.TrimSpace(transfer.GetSessionId()),
+		"direction":    strings.TrimSpace(transfer.GetDirection()),
+		"status":       strings.TrimSpace(transfer.GetStatus()),
+		"sourcePath":   transfer.GetSourcePath(),
+		"source_path":  transfer.GetSourcePath(),
+		"targetPath":   transfer.GetTargetPath(),
+		"target_path":  transfer.GetTargetPath(),
+		"currentPath":  transfer.GetCurrentPath(),
+		"current_path": transfer.GetCurrentPath(),
+		"bytesDone":    transfer.GetBytesDone(),
+		"bytes_done":   transfer.GetBytesDone(),
+		"bytesTotal":   transfer.GetBytesTotal(),
+		"bytes_total":  transfer.GetBytesTotal(),
+		"filesDone":    transfer.GetFilesDone(),
+		"files_done":   transfer.GetFilesDone(),
+		"filesTotal":   transfer.GetFilesTotal(),
+		"files_total":  transfer.GetFilesTotal(),
+		"error":        strings.TrimSpace(transfer.GetError()),
+	}
+}
diff --git a/crates/agent-gateway/internal/server/websocket_sftp_handlers_test.go b/crates/agent-gateway/internal/server/websocket_sftp_handlers_test.go
new file mode 100644
index 000000000..502955182
--- /dev/null
+++ b/crates/agent-gateway/internal/server/websocket_sftp_handlers_test.go
@@ -0,0 +1,75 @@
+package server
+
+import (
+	"testing"
+
+	gatewayv1 "github.com/liveagent/agent-gateway/internal/proto/v1"
+)
+
+func TestFirstNonEmptyRawPreservesSftpPathWhitespace(t *testing.T) {
+	t.Parallel()
+
+	if got := firstNonEmptyRaw("", "  spaced path  "); got != "  spaced path  " {
+		t.Fatalf("firstNonEmptyRaw preserved path = %q", got)
+	}
+	if got := firstNonEmptyRaw("   ", "fallback"); got != "   " {
+		t.Fatalf("firstNonEmptyRaw all-space path = %q", got)
+	}
+}
+
+func TestWebsocketSftpPayloadPreservesPathWhitespace(t *testing.T) {
+	t.Parallel()
+
+	payload := websocketSftpResponsePayload(&gatewayv1.SftpResponse{
+		Action: " list ",
+		Path:   "  remote dir  ",
+		Entries: []*gatewayv1.SftpEntry{
+			{
+				Path: "  remote dir/file  ",
+				Name: "  file  ",
+				Kind: " file ",
+			},
+		},
+		Transfer: &gatewayv1.SftpTransfer{
+			Id:          " transfer-1 ",
+			SessionId:   " session-1 ",
+			Direction:   " upload ",
+			Status:      " running ",
+			SourcePath:  "  local file  ",
+			TargetPath:  "  remote dir  ",
+			CurrentPath: "  remote dir/file  ",
+		},
+	})
+
+	if got := payload["action"]; got != "list" {
+		t.Fatalf("action = %#v", got)
+	}
+	if got := payload["path"]; got != "  remote dir  " {
+		t.Fatalf("path = %#v", got)
+	}
+
+	entries := payload["entries"].([]map[string]any)
+	if got := entries[0]["path"]; got != "  remote dir/file  " {
+		t.Fatalf("entry path = %#v", got)
+	}
+	if got := entries[0]["name"]; got != "  file  " {
+		t.Fatalf("entry name = %#v", got)
+	}
+	if got := entries[0]["kind"]; got != "file" {
+		t.Fatalf("entry kind = %#v", got)
+	}
+
+	transfer := payload["transfer"].(map[string]any)
+	if got := transfer["id"]; got != "transfer-1" {
+		t.Fatalf("transfer id = %#v", got)
+	}
+	if got := transfer["sourcePath"]; got != "  local file  " {
+		t.Fatalf("sourcePath = %#v", got)
+	}
+	if got := transfer["targetPath"]; got != "  remote dir  " {
+		t.Fatalf("targetPath = %#v", got)
+	}
+	if got := transfer["currentPath"]; got != "  remote dir/file  " {
+		t.Fatalf("currentPath = %#v", got)
+	}
+}
diff --git a/crates/agent-gateway/internal/server/websocket_terminal_handlers.go b/crates/agent-gateway/internal/server/websocket_terminal_handlers.go
index be12adc2f..3951abb09 100644
--- a/crates/agent-gateway/internal/server/websocket_terminal_handlers.go
+++ b/crates/agent-gateway/internal/server/websocket_terminal_handlers.go
@@ -91,6 +91,7 @@ func (c *websocketConnection) handleTerminalRequest(req websocketRequest) {
 				PromptId:       strings.TrimSpace(body.PromptID),
 				PromptAnswer:   body.PromptAnswer,
 				TrustHostKey:   body.TrustHostKey,
+				SftpEnabled:    body.SftpEnabled,
 			},
 		},
 	})
diff --git a/crates/agent-gateway/internal/session/manager_chat_runs.go b/crates/agent-gateway/internal/session/manager_chat_runs.go
index 1cf07a609..145ec2cf3 100644
--- a/crates/agent-gateway/internal/session/manager_chat_runs.go
+++ b/crates/agent-gateway/internal/session/manager_chat_runs.go
@@ -815,6 +815,11 @@ func (m *Manager) dispatchFromAgent(expected *AgentSession, env *gatewayv1.Agent
 		return
 	}
 
+	if sftpEvent := env.GetSftpEvent(); sftpEvent != nil {
+		m.broadcastSftpEvent(sftpEvent)
+		return
+	}
+
 	if tunnelFrame := env.GetTunnelFrame(); tunnelFrame != nil {
 		m.dispatchTunnelFrame(tunnelFrame)
 		return
diff --git a/crates/agent-gateway/internal/session/manager_sftp.go b/crates/agent-gateway/internal/session/manager_sftp.go
new file mode 100644
index 000000000..8fad643b8
--- /dev/null
+++ b/crates/agent-gateway/internal/session/manager_sftp.go
@@ -0,0 +1,49 @@
+package session
+
+import (
+	"time"
+
+	gatewayv1 "github.com/liveagent/agent-gateway/internal/proto/v1"
+)
+
+func (m *Manager) SubscribeSftpEvents() (<-chan *gatewayv1.SftpEvent, func()) {
+	ch := make(chan *gatewayv1.SftpEvent, 4096)
+
+	m.syncHub.sftpMu.Lock()
+	subID := m.syncHub.nextSftpSubID
+	m.syncHub.nextSftpSubID += 1
+	m.syncHub.sftpSubscribers[subID] = ch
+	m.syncHub.sftpMu.Unlock()
+
+	cleanup := func() {
+		m.syncHub.sftpMu.Lock()
+		if _, ok := m.syncHub.sftpSubscribers[subID]; ok {
+			// Do not close the channel here: broadcastSftpEvent sends after
+			// copying subscribers, so closing can race with an in-flight send.
+			delete(m.syncHub.sftpSubscribers, subID)
+		}
+		m.syncHub.sftpMu.Unlock()
+	}
+
+	return ch, cleanup
+}
+
+func (m *Manager) broadcastSftpEvent(event *gatewayv1.SftpEvent) {
+	if event == nil {
+		return
+	}
+
+	m.syncHub.sftpMu.Lock()
+	subscribers := make([]chan *gatewayv1.SftpEvent, 0, len(m.syncHub.sftpSubscribers))
+	for _, ch := range m.syncHub.sftpSubscribers {
+		subscribers = append(subscribers, ch)
+	}
+	m.syncHub.sftpMu.Unlock()
+
+	for _, ch := range subscribers {
+		select {
+		case ch <- event:
+		case <-time.After(50 * time.Millisecond):
+		}
+	}
+}
diff --git a/crates/agent-gateway/internal/session/manager_state.go b/crates/agent-gateway/internal/session/manager_state.go
index 55c780bbe..e90d89a2d 100644
--- a/crates/agent-gateway/internal/session/manager_state.go
+++ b/crates/agent-gateway/internal/session/manager_state.go
@@ -40,6 +40,10 @@ type syncHub struct {
 	nextTerminalSubID   int
 	terminalSubscribers map[int]chan *gatewayv1.TerminalEvent
 	terminalSessions    map[string]*gatewayv1.TerminalSession
+
+	sftpMu          sync.Mutex
+	nextSftpSubID   int
+	sftpSubscribers map[int]chan *gatewayv1.SftpEvent
 }
 
 func newSyncHub() *syncHub {
@@ -48,6 +52,7 @@ func newSyncHub() *syncHub {
 		settingsSubscribers: make(map[int]chan *gatewayv1.SettingsSyncEvent),
 		terminalSubscribers: make(map[int]chan *gatewayv1.TerminalEvent),
 		terminalSessions:    make(map[string]*gatewayv1.TerminalSession),
+		sftpSubscribers:     make(map[int]chan *gatewayv1.SftpEvent),
 	}
 }
 
diff --git a/crates/agent-gateway/internal/session/manager_terminal.go b/crates/agent-gateway/internal/session/manager_terminal.go
index 1989cbfba..971a60d05 100644
--- a/crates/agent-gateway/internal/session/manager_terminal.go
+++ b/crates/agent-gateway/internal/session/manager_terminal.go
@@ -67,6 +67,7 @@ func cloneTerminalSshMetadata(ssh *gatewayv1.TerminalSshMetadata) *gatewayv1.Ter
 		Status:               ssh.GetStatus(),
 		ReconnectAttempt:     ssh.GetReconnectAttempt(),
 		ReconnectMaxAttempts: ssh.GetReconnectMaxAttempts(),
+		SftpEnabled:          ssh.GetSftpEnabled(),
 	}
 }
 
diff --git a/crates/agent-gateway/proto/v1/gateway.proto b/crates/agent-gateway/proto/v1/gateway.proto
index 75d57e78f..82944bca0 100644
--- a/crates/agent-gateway/proto/v1/gateway.proto
+++ b/crates/agent-gateway/proto/v1/gateway.proto
@@ -63,6 +63,7 @@ message GatewayEnvelope {
     GitRequest git_request = 61;
     FsReadEditableTextRequest fs_read_editable_text = 62;
     FsReadWorkspaceImageRequest fs_read_workspace_image = 63;
+    SftpRequest sftp_request = 64;
     TunnelControlRequest tunnel_control = 67;
     TunnelControlResponse tunnel_control_resp = 68;
     TunnelFrame tunnel_frame = 69;
@@ -114,6 +115,8 @@ message AgentEnvelope {
     GitResponse git_response = 64;
     FsReadEditableTextResponse fs_read_editable_text_resp = 65;
     FsReadWorkspaceImageResponse fs_read_workspace_image_resp = 66;
+    SftpResponse sftp_response = 73;
+    SftpEvent sftp_event = 74;
     TunnelControlRequest tunnel_control = 67;
     TunnelControlResponse tunnel_control_resp = 68;
     TunnelFrame tunnel_frame = 69;
@@ -263,6 +266,7 @@ message TerminalRequest {
   string prompt_id = 12;
   string prompt_answer = 13;
   bool trust_host_key = 14;
+  bool sftp_enabled = 15;
 }
 
 message TerminalSession {
@@ -293,6 +297,59 @@ message TerminalSshMetadata {
   string status = 7;
   uint32 reconnect_attempt = 8;
   uint32 reconnect_max_attempts = 9;
+  bool sftp_enabled = 10;
+}
+
+message SftpRequest {
+  string action = 1;
+  string session_id = 2;
+  string project_path_key = 3;
+  string workdir = 4;
+  string local_path = 5;
+  string remote_path = 6;
+  string from_path = 7;
+  string to_path = 8;
+  string direction = 9;
+  string target_path = 10;
+  bool recursive = 11;
+  bool overwrite = 12;
+}
+
+message SftpEntry {
+  string path = 1;
+  string name = 2;
+  string kind = 3;
+  uint64 size_bytes = 4;
+  uint64 mtime = 5;
+}
+
+message SftpTransfer {
+  string id = 1;
+  string session_id = 2;
+  string direction = 3;
+  string status = 4;
+  string source_path = 5;
+  string target_path = 6;
+  string current_path = 7;
+  uint64 bytes_done = 8;
+  uint64 bytes_total = 9;
+  uint32 files_done = 10;
+  uint32 files_total = 11;
+  string error = 12;
+}
+
+message SftpResponse {
+  string action = 1;
+  string path = 2;
+  repeated SftpEntry entries = 3;
+  SftpEntry entry = 4;
+  bool exists = 5;
+  SftpTransfer transfer = 6;
+}
+
+message SftpEvent {
+  string kind = 1;
+  SftpTransfer transfer = 2;
 }
 
 message TerminalSshPrompt {
diff --git a/crates/agent-gateway/web/src/App.tsx b/crates/agent-gateway/web/src/App.tsx
index b5ca1c632..a215f7abe 100644
--- a/crates/agent-gateway/web/src/App.tsx
+++ b/crates/agent-gateway/web/src/App.tsx
@@ -107,6 +107,7 @@ import { toModelValue } from "@/lib/providers/llm";
 
 import { getGatewayWebSocketClient, resetGatewayWebSocketClient } from "./lib/gatewaySocket";
 import { createGatewayGitClient } from "./lib/git/gatewayGitClient";
+import { createGatewaySftpClient } from "./lib/sftp/gatewaySftpClient";
 import { createGatewayTerminalClient } from "./lib/terminal/gatewayTerminalClient";
 import {
   applyTerminalEventToSessions,
@@ -791,6 +792,7 @@ export default function App() {
   const [authError, setAuthError] = useState<string | null>(null);
   const api = useMemo(() => (token ? getGatewayWebSocketClient(token) : null), [token]);
   const terminalClient = useMemo(() => (api ? createGatewayTerminalClient(api) : null), [api]);
+  const sftpClient = useMemo(() => (api ? createGatewaySftpClient(api) : null), [api]);
   const gitClient = useMemo(() => (api ? createGatewayGitClient(api) : null), [api]);
   const [status, setStatus] = useState<AgentStatus | null>(null);
   const [statusError, setStatusError] = useState<string | null>(null);
@@ -5975,12 +5977,13 @@ export default function App() {
     [hideWorkspaceSshTerminalOverlay, terminalProjectPath, terminalProjectPathKey],
   );
   const handleOpenSshTerminal = useCallback(
-    (session: TerminalSession) => {
+    (session: TerminalSession, kind: WorkspaceSshTerminalOpenRequest["kind"] = "bash") => {
       if (session.kind !== "ssh") return;
       workspaceSshTerminalRequestIdRef.current += 1;
       const openRequest = {
         id: workspaceSshTerminalRequestIdRef.current,
         sessionId: session.id,
+        kind,
       };
       openWorkspaceSshTerminalRequest(openRequest);
     },
@@ -7108,7 +7111,7 @@ export default function App() {
               />
             </Suspense>
           ) : null}
-          {workspaceSshTerminalMounted && terminalClient ? (
+          {workspaceSshTerminalMounted && terminalClient && sftpClient ? (
             <Suspense
               fallback={
                 <div className="workspace-ssh-terminal-overlay absolute inset-0 z-40 flex items-center justify-center border-r border-border bg-background text-sm text-muted-foreground shadow-2xl">
@@ -7120,6 +7123,7 @@ export default function App() {
                 openRequest={workspaceSshTerminalOpenRequest}
                 sessions={terminalSessions}
                 client={terminalClient}
+                sftpClient={sftpClient}
                 theme={settings.theme}
                 isOpen={workspaceSshTerminalOpen}
                 onHide={() => setWorkspaceSshTerminalOpen(false)}
diff --git a/crates/agent-gateway/web/src/components/icons.tsx b/crates/agent-gateway/web/src/components/icons.tsx
index cb151b3d6..8cd7ea03c 100644
--- a/crates/agent-gateway/web/src/components/icons.tsx
+++ b/crates/agent-gateway/web/src/components/icons.tsx
@@ -3,7 +3,84 @@ import type { ComponentType, SVGProps } from "react";
 import AlertCircleSource from "~icons/lucide/circle-alert";
 import AlertTriangleSource from "~icons/lucide/triangle-alert";
 import ClaudeSource from "~icons/logos/claude-icon";
+import DefaultFileSource from "~icons/vscode-icons/default-file";
+import FileTypeApacheSource from "~icons/vscode-icons/file-type-apache";
+import FileTypeAudioSource from "~icons/vscode-icons/file-type-audio";
+import FileTypeBinarySource from "~icons/vscode-icons/file-type-binary";
+import FileTypeBunSource from "~icons/vscode-icons/file-type-bun";
+import FileTypeCSource from "~icons/vscode-icons/file-type-c";
+import FileTypeCargoSource from "~icons/vscode-icons/file-type-cargo";
+import FileTypeCertSource from "~icons/vscode-icons/file-type-cert";
+import FileTypeCmakeSource from "~icons/vscode-icons/file-type-cmake";
+import FileTypeConfigSource from "~icons/vscode-icons/file-type-config";
+import FileTypeCppSource from "~icons/vscode-icons/file-type-cpp";
+import FileTypeCsharpSource from "~icons/vscode-icons/file-type-csharp";
+import FileTypeCssSource from "~icons/vscode-icons/file-type-css";
+import FileTypeDartSource from "~icons/vscode-icons/file-type-dartlang";
+import FileTypeDbSource from "~icons/vscode-icons/file-type-db";
+import FileTypeDockerSource from "~icons/vscode-icons/file-type-docker";
+import FileTypeDotenvSource from "~icons/vscode-icons/file-type-dotenv";
+import FileTypeEslintSource from "~icons/vscode-icons/file-type-eslint";
+import FileTypeExcelSource from "~icons/vscode-icons/file-type-excel";
+import FileTypeFontSource from "~icons/vscode-icons/file-type-font";
 import FileTypeGeminiSource from "~icons/vscode-icons/file-type-gemini";
+import FileTypeGitSource from "~icons/vscode-icons/file-type-git";
+import FileTypeGoSource from "~icons/vscode-icons/file-type-go";
+import FileTypeGoWorkSource from "~icons/vscode-icons/file-type-go-work";
+import FileTypeGradleSource from "~icons/vscode-icons/file-type-gradle";
+import FileTypeGraphqlSource from "~icons/vscode-icons/file-type-graphql";
+import FileTypeHtmlSource from "~icons/vscode-icons/file-type-html";
+import FileTypeImageSource from "~icons/vscode-icons/file-type-image";
+import FileTypeIniSource from "~icons/vscode-icons/file-type-ini";
+import FileTypeJavaSource from "~icons/vscode-icons/file-type-java";
+import FileTypeJsSource from "~icons/vscode-icons/file-type-js";
+import FileTypeJsConfigSource from "~icons/vscode-icons/file-type-jsconfig";
+import FileTypeJsonSource from "~icons/vscode-icons/file-type-json";
+import FileTypeKeySource from "~icons/vscode-icons/file-type-key";
+import FileTypeKotlinSource from "~icons/vscode-icons/file-type-kotlin";
+import FileTypeLicenseSource from "~icons/vscode-icons/file-type-license";
+import FileTypeLogSource from "~icons/vscode-icons/file-type-log";
+import FileTypeMarkdownSource from "~icons/vscode-icons/file-type-markdown";
+import FileTypeMavenSource from "~icons/vscode-icons/file-type-maven";
+import FileTypeNginxSource from "~icons/vscode-icons/file-type-nginx";
+import FileTypeNodeSource from "~icons/vscode-icons/file-type-node";
+import FileTypeNpmSource from "~icons/vscode-icons/file-type-npm";
+import FileTypePackageSource from "~icons/vscode-icons/file-type-package";
+import FileTypePdfSource from "~icons/vscode-icons/file-type-pdf2";
+import FileTypePhpSource from "~icons/vscode-icons/file-type-php";
+import FileTypePnpmSource from "~icons/vscode-icons/file-type-pnpm";
+import FileTypePowerpointSource from "~icons/vscode-icons/file-type-powerpoint";
+import FileTypePowershellSource from "~icons/vscode-icons/file-type-powershell";
+import FileTypePrettierSource from "~icons/vscode-icons/file-type-prettier";
+import FileTypePrismaSource from "~icons/vscode-icons/file-type-prisma";
+import FileTypePythonSource from "~icons/vscode-icons/file-type-python";
+import FileTypeReactJsSource from "~icons/vscode-icons/file-type-reactjs";
+import FileTypeReactTsSource from "~icons/vscode-icons/file-type-reactts";
+import FileTypeRubySource from "~icons/vscode-icons/file-type-ruby";
+import FileTypeRustSource from "~icons/vscode-icons/file-type-rust";
+import FileTypeScssSource from "~icons/vscode-icons/file-type-scss";
+import FileTypeShellSource from "~icons/vscode-icons/file-type-shell";
+import FileTypeSqlSource from "~icons/vscode-icons/file-type-sql";
+import FileTypeSqliteSource from "~icons/vscode-icons/file-type-sqlite";
+import FileTypeSvelteSource from "~icons/vscode-icons/file-type-svelte";
+import FileTypeSwiftSource from "~icons/vscode-icons/file-type-swift";
+import FileTypeSystemdSource from "~icons/vscode-icons/file-type-systemd";
+import FileTypeTerraformSource from "~icons/vscode-icons/file-type-terraform";
+import FileTypeTextSource from "~icons/vscode-icons/file-type-text";
+import FileTypeTomlSource from "~icons/vscode-icons/file-type-toml";
+import FileTypeTsConfigSource from "~icons/vscode-icons/file-type-tsconfig";
+import FileTypeTsSource from "~icons/vscode-icons/file-type-typescript";
+import FileTypeTsDefSource from "~icons/vscode-icons/file-type-typescriptdef";
+import FileTypeVideoSource from "~icons/vscode-icons/file-type-video";
+import FileTypeViteSource from "~icons/vscode-icons/file-type-vite";
+import FileTypeVitestSource from "~icons/vscode-icons/file-type-vitest";
+import FileTypeVueSource from "~icons/vscode-icons/file-type-vue";
+import FileTypeWebpackSource from "~icons/vscode-icons/file-type-webpack";
+import FileTypeWordSource from "~icons/vscode-icons/file-type-word";
+import FileTypeXmlSource from "~icons/vscode-icons/file-type-xml";
+import FileTypeYamlSource from "~icons/vscode-icons/file-type-yaml";
+import FileTypeYarnSource from "~icons/vscode-icons/file-type-yarn";
+import FileTypeZipSource from "~icons/vscode-icons/file-type-zip";
 import ArrowLeftSource from "~icons/lucide/arrow-left";
 import ArrowRightSource from "~icons/lucide/arrow-right";
 import BanSource from "~icons/lucide/ban";
@@ -138,6 +215,83 @@ export const AlertCircle = createIcon(AlertCircleSource);
 export const AlertTriangle = createIcon(AlertTriangleSource);
 export const ClaudeIcon = createIcon(ClaudeSource);
 export const FileTypeGeminiIcon = createIcon(FileTypeGeminiSource);
+export const DefaultFile = createIcon(DefaultFileSource);
+export const FileTypeApache = createIcon(FileTypeApacheSource);
+export const FileTypeAudio = createIcon(FileTypeAudioSource);
+export const FileTypeBinary = createIcon(FileTypeBinarySource);
+export const FileTypeBun = createIcon(FileTypeBunSource);
+export const FileTypeC = createIcon(FileTypeCSource);
+export const FileTypeCargo = createIcon(FileTypeCargoSource);
+export const FileTypeCert = createIcon(FileTypeCertSource);
+export const FileTypeCmake = createIcon(FileTypeCmakeSource);
+export const FileTypeConfig = createIcon(FileTypeConfigSource);
+export const FileTypeCpp = createIcon(FileTypeCppSource);
+export const FileTypeCsharp = createIcon(FileTypeCsharpSource);
+export const FileTypeCss = createIcon(FileTypeCssSource);
+export const FileTypeDart = createIcon(FileTypeDartSource);
+export const FileTypeDb = createIcon(FileTypeDbSource);
+export const FileTypeDocker = createIcon(FileTypeDockerSource);
+export const FileTypeDotenv = createIcon(FileTypeDotenvSource);
+export const FileTypeEslint = createIcon(FileTypeEslintSource);
+export const FileTypeExcel = createIcon(FileTypeExcelSource);
+export const FileTypeFont = createIcon(FileTypeFontSource);
+export const FileTypeGit = createIcon(FileTypeGitSource);
+export const FileTypeGo = createIcon(FileTypeGoSource);
+export const FileTypeGoWork = createIcon(FileTypeGoWorkSource);
+export const FileTypeGradle = createIcon(FileTypeGradleSource);
+export const FileTypeGraphql = createIcon(FileTypeGraphqlSource);
+export const FileTypeHtml = createIcon(FileTypeHtmlSource);
+export const FileTypeImage = createIcon(FileTypeImageSource);
+export const FileTypeIni = createIcon(FileTypeIniSource);
+export const FileTypeJava = createIcon(FileTypeJavaSource);
+export const FileTypeJs = createIcon(FileTypeJsSource);
+export const FileTypeJsConfig = createIcon(FileTypeJsConfigSource);
+export const FileTypeJson = createIcon(FileTypeJsonSource);
+export const FileTypeKey = createIcon(FileTypeKeySource);
+export const FileTypeKotlin = createIcon(FileTypeKotlinSource);
+export const FileTypeLicense = createIcon(FileTypeLicenseSource);
+export const FileTypeLog = createIcon(FileTypeLogSource);
+export const FileTypeMarkdown = createIcon(FileTypeMarkdownSource);
+export const FileTypeMaven = createIcon(FileTypeMavenSource);
+export const FileTypeNginx = createIcon(FileTypeNginxSource);
+export const FileTypeNode = createIcon(FileTypeNodeSource);
+export const FileTypeNpm = createIcon(FileTypeNpmSource);
+export const FileTypePackage = createIcon(FileTypePackageSource);
+export const FileTypePdf = createIcon(FileTypePdfSource);
+export const FileTypePhp = createIcon(FileTypePhpSource);
+export const FileTypePnpm = createIcon(FileTypePnpmSource);
+export const FileTypePowerpoint = createIcon(FileTypePowerpointSource);
+export const FileTypePowershell = createIcon(FileTypePowershellSource);
+export const FileTypePrettier = createIcon(FileTypePrettierSource);
+export const FileTypePrisma = createIcon(FileTypePrismaSource);
+export const FileTypePython = createIcon(FileTypePythonSource);
+export const FileTypeReactJs = createIcon(FileTypeReactJsSource);
+export const FileTypeReactTs = createIcon(FileTypeReactTsSource);
+export const FileTypeRuby = createIcon(FileTypeRubySource);
+export const FileTypeRust = createIcon(FileTypeRustSource);
+export const FileTypeScss = createIcon(FileTypeScssSource);
+export const FileTypeShell = createIcon(FileTypeShellSource);
+export const FileTypeSql = createIcon(FileTypeSqlSource);
+export const FileTypeSqlite = createIcon(FileTypeSqliteSource);
+export const FileTypeSvelte = createIcon(FileTypeSvelteSource);
+export const FileTypeSwift = createIcon(FileTypeSwiftSource);
+export const FileTypeSystemd = createIcon(FileTypeSystemdSource);
+export const FileTypeTerraform = createIcon(FileTypeTerraformSource);
+export const FileTypeText = createIcon(FileTypeTextSource);
+export const FileTypeToml = createIcon(FileTypeTomlSource);
+export const FileTypeTs = createIcon(FileTypeTsSource);
+export const FileTypeTsConfig = createIcon(FileTypeTsConfigSource);
+export const FileTypeTsDef = createIcon(FileTypeTsDefSource);
+export const FileTypeVideo = createIcon(FileTypeVideoSource);
+export const FileTypeVite = createIcon(FileTypeViteSource);
+export const FileTypeVitest = createIcon(FileTypeVitestSource);
+export const FileTypeVue = createIcon(FileTypeVueSource);
+export const FileTypeWebpack = createIcon(FileTypeWebpackSource);
+export const FileTypeWord = createIcon(FileTypeWordSource);
+export const FileTypeXml = createIcon(FileTypeXmlSource);
+export const FileTypeYaml = createIcon(FileTypeYamlSource);
+export const FileTypeYarn = createIcon(FileTypeYarnSource);
+export const FileTypeZip = createIcon(FileTypeZipSource);
 export const ArrowLeft = createIcon(ArrowLeftSource);
 export const ArrowRight = createIcon(ArrowRightSource);
 export const Ban = createIcon(BanSource);
diff --git a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
index 2ed43dc0e..0b237925d 100644
--- a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
@@ -106,7 +106,7 @@ type ProjectToolsPanelProps = {
   onTunnelOpenChange?: (open: boolean) => void;
   onSshTunnelOpenChange?: (open: boolean) => void;
   onSshProjectHostIdsChange?: (hostIds: string[]) => void;
-  onOpenSshSession?: (session: TerminalSession) => void;
+  onOpenSshSession?: (session: TerminalSession, kind?: "bash" | "sftp") => void;
   onSessionsChange?: (sessions: TerminalSession[]) => void;
   onInsertFileMention?: (path: string, kind: "file" | "dir") => void;
   onOpenFile?: (path: string) => void;
@@ -2084,7 +2084,7 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                       sessions={sshSessions}
                       onSessionSnapshot={rememberTerminalSnapshot}
                       onSessionClosed={forgetTerminalSession}
-                      onOpenSession={(session) => onOpenSshSession?.(session)}
+                      onOpenSession={(session, kind) => onOpenSshSession?.(session, kind)}
                       onAssociatedHostIdsChange={(hostIds) => {
                         onSshProjectHostIdsChange?.(hostIds);
                       }}
diff --git a/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
index 0f47f8a1d..eb33899c5 100644
--- a/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/SshTunnelPanel.tsx
@@ -15,6 +15,7 @@ import {
   Check,
   ChevronDown,
   Clock3,
+  FolderTree,
   Globe,
   Key,
   Loader2,
@@ -54,7 +55,7 @@ type SshTunnelPanelProps = {
   sessions: TerminalSession[];
   onSessionSnapshot: (snapshot: TerminalSnapshot) => void;
   onSessionClosed: (sessionId: string) => void;
-  onOpenSession: (session: TerminalSession) => void;
+  onOpenSession: (session: TerminalSession, kind?: "bash" | "sftp") => void;
   onAssociatedHostIdsChange: (hostIds: string[]) => void;
 };
 
@@ -351,6 +352,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         projectPathKey,
         hostId: selectedCreateHost.id,
         title: createTitle.trim() || undefined,
+        sftpEnabled: createSftpEnabled,
       })
       .then((result) => {
         if (result.prompt) {
@@ -371,6 +373,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
   }, [
     canCreate,
     client,
+    createSftpEnabled,
     createTitle,
     cwd,
     finishCreatedSnapshot,
@@ -952,10 +955,22 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                           title={t("projectTools.sshTunnelOpenBash")}
                           aria-label={t("projectTools.sshTunnelOpenBash")}
                           disabled={!connected}
-                          onClick={() => onOpenSession(session)}
+                          onClick={() => onOpenSession(session, "bash")}
                         >
                           <Terminal className="h-4 w-4" />
                         </button>
+                        {session.ssh?.sftpEnabled ? (
+                          <button
+                            type="button"
+                            className="flex h-8 w-8 items-center justify-center rounded-lg border border-border/60 bg-background/70 text-muted-foreground transition-colors hover:border-sky-500/40 hover:bg-sky-500/10 hover:text-sky-600 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 dark:hover:text-sky-400"
+                            title={t("projectTools.sshTunnelOpenSftp")}
+                            aria-label={t("projectTools.sshTunnelOpenSftp")}
+                            disabled={!connected}
+                            onClick={() => onOpenSession(session, "sftp")}
+                          >
+                            <FolderTree className="h-4 w-4" />
+                          </button>
+                        ) : null}
                         <button
                           type="button"
                           className="flex h-8 w-8 items-center justify-center rounded-lg border border-border/60 bg-background/70 text-muted-foreground transition-colors hover:border-destructive/30 hover:bg-destructive/10 hover:text-destructive focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50"
diff --git a/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSftpPanel.tsx b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSftpPanel.tsx
new file mode 100644
index 000000000..d3395f05a
--- /dev/null
+++ b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSftpPanel.tsx
@@ -0,0 +1,2105 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { createPortal } from "react-dom";
+import { useLocale } from "@/i18n";
+import { cn } from "@/lib/shared/utils";
+import type {
+  SftpClient,
+  SftpEntry,
+  SftpSide,
+  SftpTransfer,
+} from "@/lib/sftp/types";
+import type { TerminalSession } from "@/lib/terminal/types";
+import {
+  AlertTriangle,
+  CheckCircle2,
+  Copy,
+  DefaultFile,
+  Download,
+  FileTypeApache,
+  FileTypeAudio,
+  FileTypeBinary,
+  FileTypeBun,
+  FileTypeC,
+  FileTypeCargo,
+  FileTypeCert,
+  FileTypeCmake,
+  FileTypeConfig,
+  FileTypeCpp,
+  FileTypeCsharp,
+  FileTypeCss,
+  FileTypeDart,
+  FileTypeDb,
+  FileTypeDocker,
+  FileTypeDotenv,
+  FileTypeEslint,
+  FileTypeExcel,
+  FileTypeFont,
+  FileTypeGit,
+  FileTypeGo,
+  FileTypeGoWork,
+  FileTypeGradle,
+  FileTypeGraphql,
+  FileTypeHtml,
+  FileTypeImage,
+  FileTypeIni,
+  FileTypeJava,
+  FileTypeJs,
+  FileTypeJsConfig,
+  FileTypeJson,
+  FileTypeKey,
+  FileTypeKotlin,
+  FileTypeLicense,
+  FileTypeLog,
+  FileTypeMarkdown,
+  FileTypeMaven,
+  FileTypeNginx,
+  FileTypeNode,
+  FileTypeNpm,
+  FileTypePackage,
+  FileTypePdf,
+  FileTypePhp,
+  FileTypePnpm,
+  FileTypePowerpoint,
+  FileTypePowershell,
+  FileTypePrettier,
+  FileTypePrisma,
+  FileTypePython,
+  FileTypeReactJs,
+  FileTypeReactTs,
+  FileTypeRuby,
+  FileTypeRust,
+  FileTypeScss,
+  FileTypeShell,
+  FileTypeSql,
+  FileTypeSqlite,
+  FileTypeSvelte,
+  FileTypeSwift,
+  FileTypeSystemd,
+  FileTypeTerraform,
+  FileTypeText,
+  FileTypeToml,
+  FileTypeTs,
+  FileTypeTsConfig,
+  FileTypeTsDef,
+  FileTypeVideo,
+  FileTypeVite,
+  FileTypeVitest,
+  FileTypeVue,
+  FileTypeWebpack,
+  FileTypeWord,
+  FileTypeXml,
+  FileTypeYaml,
+  FileTypeYarn,
+  FileTypeZip,
+  Folder,
+  FolderOpen,
+  Loader2,
+  Pencil,
+  Plus,
+  RefreshCw,
+  Trash2,
+  type IconComponent,
+  Upload,
+} from "../icons";
+import { useConfirmDialog } from "../ui/confirm-dialog";
+
+type WorkspaceSftpPanelProps = {
+  session: TerminalSession;
+  client: SftpClient;
+  isActive: boolean;
+  onError?: (error: string | null) => void;
+};
+
+type PaneState = {
+  path: string;
+  entries: SftpEntry[];
+  loading: boolean;
+  error: string | null;
+  selectedPaths: string[];
+};
+
+type ContextMenuState = {
+  x: number;
+  y: number;
+  side: SftpSide;
+  path: string;
+  kind: string;
+  isEntry: boolean;
+  items: DragPayloadItem[];
+};
+
+type DragPayloadItem = {
+  path: string;
+  kind: string;
+};
+
+type DragPayload = DragPayloadItem & {
+  side: SftpSide;
+  items?: DragPayloadItem[];
+};
+
+type DragPreviewState = {
+  source: DragPayload;
+  x: number;
+  y: number;
+};
+
+type PointerDragState = {
+  pointerId: number;
+  source: DragPayload;
+  startX: number;
+  startY: number;
+  active: boolean;
+};
+
+type CreateFolderDialogState = {
+  side: SftpSide;
+  basePath: string;
+};
+
+type RenameEntryDialogState = {
+  side: SftpSide;
+  path: string;
+  currentName: string;
+};
+
+const SFTP_DRAG_MIME = "application/x-liveagent-sftp";
+const SFTP_DRAG_TEXT_PREFIX = "liveagent-sftp:";
+const INITIAL_LOCAL_PATH = "";
+const INITIAL_REMOTE_PATH = ".";
+const TERMINAL_TRANSFER_STATUSES = new Set(["completed", "failed", "cancelled"]);
+const POINTER_DRAG_THRESHOLD_PX = 6;
+const FILE_ICON_CLASS = "h-4 w-4 shrink-0";
+const FOLDER_ICON_CLASS = "h-4 w-4 shrink-0 text-amber-500";
+
+const EXACT_FILE_ICONS: Record<string, IconComponent> = {
+  ".bash_profile": FileTypeShell,
+  ".bashrc": FileTypeShell,
+  ".dockerignore": FileTypeDocker,
+  ".editorconfig": FileTypeConfig,
+  ".eslintignore": FileTypeEslint,
+  ".eslintrc": FileTypeEslint,
+  ".gitattributes": FileTypeGit,
+  ".gitconfig": FileTypeGit,
+  ".gitignore": FileTypeGit,
+  ".gitkeep": FileTypeGit,
+  ".htaccess": FileTypeApache,
+  ".npmrc": FileTypeNpm,
+  ".profile": FileTypeShell,
+  ".prettierignore": FileTypePrettier,
+  ".prettierrc": FileTypePrettier,
+  ".vimrc": FileTypeConfig,
+  ".yarnrc": FileTypeYarn,
+  ".zprofile": FileTypeShell,
+  ".zshrc": FileTypeShell,
+  "authorized_keys": FileTypeKey,
+  "bun.lock": FileTypeBun,
+  "bun.lockb": FileTypeBun,
+  "cargo.lock": FileTypeCargo,
+  "cargo.toml": FileTypeCargo,
+  "cmakelists.txt": FileTypeCmake,
+  "composer.json": FileTypePhp,
+  "composer.lock": FileTypePhp,
+  "containerfile": FileTypeDocker,
+  "copying": FileTypeLicense,
+  "copying.md": FileTypeLicense,
+  "copying.txt": FileTypeLicense,
+  "dockerfile": FileTypeDocker,
+  "d.ts": FileTypeTsDef,
+  "go.mod": FileTypeGo,
+  "go.sum": FileTypeGo,
+  "go.work": FileTypeGoWork,
+  "go.work.sum": FileTypeGoWork,
+  "gradle.properties": FileTypeGradle,
+  "gnumakefile": FileTypeConfig,
+  "httpd.conf": FileTypeApache,
+  "id_dsa": FileTypeKey,
+  "id_ecdsa": FileTypeKey,
+  "id_ed25519": FileTypeKey,
+  "id_rsa": FileTypeKey,
+  "jenkinsfile": FileTypeConfig,
+  "jsconfig.json": FileTypeJsConfig,
+  "known_hosts": FileTypeKey,
+  "license": FileTypeLicense,
+  "license.md": FileTypeLicense,
+  "license.txt": FileTypeLicense,
+  "makefile": FileTypeConfig,
+  "nginx.conf": FileTypeNginx,
+  "package-lock.json": FileTypeNpm,
+  "package.json": FileTypePackage,
+  "pnpm-lock.yaml": FileTypePnpm,
+  "pnpm-workspace.yaml": FileTypePnpm,
+  "pom.xml": FileTypeMaven,
+  "procfile": FileTypeConfig,
+  "requirements.txt": FileTypePython,
+  "resolv.conf": FileTypeConfig,
+  "robots.txt": FileTypeText,
+  "settings.gradle": FileTypeGradle,
+  "settings.gradle.kts": FileTypeGradle,
+  "ssh_config": FileTypeKey,
+  "sshd_config": FileTypeKey,
+  "sudoers": FileTypeConfig,
+  "tsconfig.json": FileTypeTsConfig,
+  "yarn.lock": FileTypeYarn,
+};
+
+const EXTENSION_FILE_ICONS: Record<string, IconComponent> = {
+  "7z": FileTypeZip,
+  a: FileTypeBinary,
+  aac: FileTypeAudio,
+  apk: FileTypeZip,
+  avi: FileTypeVideo,
+  avif: FileTypeImage,
+  bash: FileTypeShell,
+  bin: FileTypeBinary,
+  bmp: FileTypeImage,
+  bz2: FileTypeZip,
+  c: FileTypeC,
+  cc: FileTypeCpp,
+  cer: FileTypeCert,
+  cert: FileTypeCert,
+  cfg: FileTypeConfig,
+  cjs: FileTypeJs,
+  class: FileTypeBinary,
+  cmake: FileTypeCmake,
+  conf: FileTypeConfig,
+  config: FileTypeConfig,
+  cpp: FileTypeCpp,
+  crt: FileTypeCert,
+  cs: FileTypeCsharp,
+  csr: FileTypeCert,
+  css: FileTypeCss,
+  csv: FileTypeExcel,
+  cts: FileTypeTs,
+  cxx: FileTypeCpp,
+  dart: FileTypeDart,
+  db: FileTypeDb,
+  deb: FileTypeZip,
+  dll: FileTypeBinary,
+  dmg: FileTypeZip,
+  doc: FileTypeWord,
+  docx: FileTypeWord,
+  dylib: FileTypeBinary,
+  env: FileTypeDotenv,
+  eot: FileTypeFont,
+  exe: FileTypeBinary,
+  fish: FileTypeShell,
+  flac: FileTypeAudio,
+  gif: FileTypeImage,
+  go: FileTypeGo,
+  gql: FileTypeGraphql,
+  gradle: FileTypeGradle,
+  graphql: FileTypeGraphql,
+  gz: FileTypeZip,
+  h: FileTypeC,
+  hpp: FileTypeCpp,
+  htm: FileTypeHtml,
+  html: FileTypeHtml,
+  icns: FileTypeImage,
+  ico: FileTypeImage,
+  ini: FileTypeIni,
+  ipa: FileTypeZip,
+  ipynb: FileTypePython,
+  iso: FileTypeZip,
+  jar: FileTypeZip,
+  java: FileTypeJava,
+  jpeg: FileTypeImage,
+  jpg: FileTypeImage,
+  js: FileTypeJs,
+  json: FileTypeJson,
+  json5: FileTypeJson,
+  jsonc: FileTypeJson,
+  jsx: FileTypeReactJs,
+  key: FileTypeKey,
+  ksh: FileTypeShell,
+  kt: FileTypeKotlin,
+  kts: FileTypeKotlin,
+  less: FileTypeCss,
+  lib: FileTypeBinary,
+  lock: FileTypeConfig,
+  log: FileTypeLog,
+  m4a: FileTypeAudio,
+  markdown: FileTypeMarkdown,
+  md: FileTypeMarkdown,
+  mdx: FileTypeMarkdown,
+  mjs: FileTypeJs,
+  mkv: FileTypeVideo,
+  mov: FileTypeVideo,
+  mp3: FileTypeAudio,
+  mp4: FileTypeVideo,
+  mpeg: FileTypeVideo,
+  mpg: FileTypeVideo,
+  mts: FileTypeTs,
+  node: FileTypeNode,
+  o: FileTypeBinary,
+  ogg: FileTypeAudio,
+  opus: FileTypeAudio,
+  otf: FileTypeFont,
+  out: FileTypeLog,
+  p12: FileTypeCert,
+  pdf: FileTypePdf,
+  pem: FileTypeCert,
+  pfx: FileTypeCert,
+  php: FileTypePhp,
+  plist: FileTypeConfig,
+  png: FileTypeImage,
+  ppt: FileTypePowerpoint,
+  pptx: FileTypePowerpoint,
+  prisma: FileTypePrisma,
+  properties: FileTypeConfig,
+  ps1: FileTypePowershell,
+  psd1: FileTypePowershell,
+  psm1: FileTypePowershell,
+  pub: FileTypeKey,
+  py: FileTypePython,
+  pyc: FileTypeBinary,
+  pyw: FileTypePython,
+  rar: FileTypeZip,
+  rb: FileTypeRuby,
+  rpm: FileTypeZip,
+  rs: FileTypeRust,
+  rtf: FileTypeText,
+  sass: FileTypeScss,
+  scss: FileTypeScss,
+  service: FileTypeSystemd,
+  sh: FileTypeShell,
+  so: FileTypeBinary,
+  socket: FileTypeSystemd,
+  sql: FileTypeSql,
+  sqlite: FileTypeSqlite,
+  sqlite3: FileTypeSqlite,
+  svelte: FileTypeSvelte,
+  svg: FileTypeImage,
+  swift: FileTypeSwift,
+  tar: FileTypeZip,
+  target: FileTypeSystemd,
+  tf: FileTypeTerraform,
+  tfvars: FileTypeTerraform,
+  tgz: FileTypeZip,
+  timer: FileTypeSystemd,
+  toml: FileTypeToml,
+  ts: FileTypeTs,
+  tsx: FileTypeReactTs,
+  tsv: FileTypeExcel,
+  ttf: FileTypeFont,
+  txt: FileTypeText,
+  vue: FileTypeVue,
+  war: FileTypeZip,
+  wasm: FileTypeBinary,
+  wav: FileTypeAudio,
+  webm: FileTypeVideo,
+  webp: FileTypeImage,
+  woff: FileTypeFont,
+  woff2: FileTypeFont,
+  xls: FileTypeExcel,
+  xlsx: FileTypeExcel,
+  xml: FileTypeXml,
+  xz: FileTypeZip,
+  yaml: FileTypeYaml,
+  yml: FileTypeYaml,
+  zip: FileTypeZip,
+  zsh: FileTypeShell,
+};
+
+const PREFIX_FILE_ICONS: Array<[string, IconComponent]> = [
+  [".env", FileTypeDotenv],
+  [".eslintrc", FileTypeEslint],
+  [".git", FileTypeGit],
+  [".npmrc", FileTypeNpm],
+  [".prettierrc", FileTypePrettier],
+  [".yarnrc", FileTypeYarn],
+  ["compose.", FileTypeDocker],
+  ["docker-compose.", FileTypeDocker],
+  ["eslint.config.", FileTypeEslint],
+  ["prettier.config.", FileTypePrettier],
+  ["vite.config.", FileTypeVite],
+  ["vitest.config.", FileTypeVitest],
+  ["webpack.config.", FileTypeWebpack],
+];
+
+function initialPane(path: string): PaneState {
+  return {
+    path,
+    entries: [],
+    loading: false,
+    error: null,
+    selectedPaths: [],
+  };
+}
+
+function parentPath(path: string, side: SftpSide) {
+  const normalized = normalizePath(path, side);
+  if (!normalized || normalized === "." || normalized === "/") return side === "remote" ? "." : "";
+  const parts = normalized.split("/").filter(Boolean);
+  parts.pop();
+  if (side === "remote" && normalized.startsWith("/")) {
+    return parts.length ? `/${parts.join("/")}` : "/";
+  }
+  return parts.join("/") || (side === "remote" ? "." : "");
+}
+
+function basename(path: string) {
+  const normalized = path.replace(/\\/g, "/").replace(/\/+$/, "");
+  return normalized.split("/").filter(Boolean).pop() ?? normalized;
+}
+
+function normalizePath(path: string, side: SftpSide) {
+  const normalized = path.trim().replace(/\\/g, "/");
+  if (side === "remote") {
+    if (!normalized || normalized === ".") return ".";
+    return normalized.replace(/\/+/g, "/");
+  }
+  return normalized.replace(/^\/+/, "").replace(/\/+/g, "/");
+}
+
+function isAbsoluteLocalPath(path: string) {
+  const value = path.trim();
+  return (
+    value.startsWith("/") ||
+    /^[a-zA-Z]:[\\/]/.test(value) ||
+    /^\\\\/.test(value) ||
+    /^\/\/[^/\\]+[\\/][^/\\]+/.test(value)
+  );
+}
+
+function localPathSeparator(root: string) {
+  return root.includes("\\") && !root.includes("/") ? "\\" : "/";
+}
+
+function localAbsolutePathForCopy(workdir: string, path: string) {
+  const rawPath = path.trim();
+  if (isAbsoluteLocalPath(rawPath)) return rawPath;
+
+  const base = workdir.trim();
+  const relativePath = normalizePath(rawPath, "local");
+  if (!relativePath || relativePath === ".") return base;
+
+  const separator = localPathSeparator(base);
+  const normalizedRelativePath = relativePath.replace(/\//g, separator);
+  const trimmedBase = base.replace(/[\\/]+$/, "");
+  if (!trimmedBase) return `${separator}${normalizedRelativePath}`;
+
+  return `${trimmedBase}${separator}${normalizedRelativePath}`;
+}
+
+function remoteAbsolutePathForCopy(path: string) {
+  const normalized = normalizePath(path, "remote");
+  if (!normalized || normalized === ".") return "/";
+  if (normalized.startsWith("/")) return normalized;
+  return `/${normalized.replace(/^\/+/, "")}`;
+}
+
+function absolutePathForCopy(side: SftpSide, path: string, workdir: string) {
+  return side === "local" ? localAbsolutePathForCopy(workdir, path) : remoteAbsolutePathForCopy(path);
+}
+
+function joinPath(parent: string, child: string, side: SftpSide) {
+  const name = child.trim().replace(/\\/g, "/").replace(/^\/+|\/+$/g, "");
+  if (!name) return normalizePath(parent, side);
+  const base = normalizePath(parent, side);
+  if (side === "remote") {
+    if (base === "/") return `/${name}`;
+    if (!base || base === ".") return name;
+  }
+  if (!base) return name;
+  return `${base.replace(/\/+$/, "")}/${name}`;
+}
+
+function pathCrumbs(path: string, side: SftpSide, projectLabel: string) {
+  const normalized = normalizePath(path, side);
+  const root = side === "remote" ? (normalized.startsWith("/") ? "/" : ".") : "";
+  const parts = normalized === "." || normalized === "/" ? [] : normalized.split("/").filter(Boolean);
+  const crumbs = [{ label: side === "remote" ? root : projectLabel, path: root }];
+  let current = root;
+  for (const part of parts) {
+    current = joinPath(current, part, side);
+    crumbs.push({ label: part, path: current });
+  }
+  return crumbs;
+}
+
+function formatBytes(value: number) {
+  if (!Number.isFinite(value) || value <= 0) return "0 B";
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  let size = value;
+  let unit = 0;
+  while (size >= 1024 && unit < units.length - 1) {
+    size /= 1024;
+    unit += 1;
+  }
+  return `${size >= 10 || unit === 0 ? Math.round(size) : size.toFixed(1)} ${units[unit]}`;
+}
+
+function entryTypeLabel(entry: SftpEntry, t: (key: string) => string) {
+  if (entry.kind === "directory") return t("workspaceSftp.entry.folder");
+  const extension = basename(entry.name).split(".").pop();
+  if (extension && extension !== entry.name) return extension;
+  if (entry.kind === "file" || !entry.kind) return t("workspaceSftp.entry.file");
+  return entry.kind;
+}
+
+function iconForEntryName(name: string) {
+  const fileName = basename(name);
+  const normalized = fileName.toLowerCase();
+  const exactIcon = EXACT_FILE_ICONS[normalized];
+  if (exactIcon) return exactIcon;
+  for (const [prefix, Icon] of PREFIX_FILE_ICONS) {
+    if (normalized.startsWith(prefix)) return Icon;
+  }
+  const parts = normalized.split(".");
+  if (parts.length > 1) {
+    const compoundExtension = parts.slice(-2).join(".");
+    const compoundIcon = EXACT_FILE_ICONS[compoundExtension];
+    if (compoundIcon) return compoundIcon;
+    const extensionIcon = EXTENSION_FILE_ICONS[parts[parts.length - 1] ?? ""];
+    if (extensionIcon) return extensionIcon;
+  }
+  return DefaultFile;
+}
+
+function entryIcon(entry: SftpEntry, className?: string) {
+  if (entry.kind === "directory") return <Folder className={className ?? FOLDER_ICON_CLASS} />;
+  const Icon = iconForEntryName(entry.name || entry.path);
+  return <Icon className={className ?? FILE_ICON_CLASS} />;
+}
+
+function transferProgress(transfer: SftpTransfer | null) {
+  if (!transfer) return 0;
+  if (transfer.status === "completed") return 100;
+  if (transfer.bytesTotal > 0) {
+    return Math.min(100, Math.max(0, Math.round((transfer.bytesDone / transfer.bytesTotal) * 100)));
+  }
+  if (transfer.filesTotal > 0) {
+    return Math.min(100, Math.max(0, Math.round((transfer.filesDone / transfer.filesTotal) * 100)));
+  }
+  return transfer.status === "running" ? 8 : 0;
+}
+
+function transferTone(transfer: SftpTransfer | null) {
+  if (!transfer) return "bg-muted-foreground";
+  if (transfer.status === "completed") return "bg-emerald-500";
+  if (transfer.status === "failed") return "bg-destructive";
+  if (transfer.status === "cancelled") return "bg-muted-foreground";
+  return "bg-sky-500";
+}
+
+function isSftpSide(value: unknown): value is SftpSide {
+  return value === "local" || value === "remote";
+}
+
+function isDragPayloadItem(value: unknown): value is DragPayloadItem {
+  if (!value || typeof value !== "object") return false;
+  const item = value as Partial<DragPayloadItem>;
+  return typeof item.path === "string" && typeof item.kind === "string";
+}
+
+function isDragPayload(value: unknown): value is DragPayload {
+  if (!value || typeof value !== "object") return false;
+  const payload = value as Partial<DragPayload>;
+  return (
+    isSftpSide(payload.side) &&
+    typeof payload.path === "string" &&
+    typeof payload.kind === "string" &&
+    (payload.items === undefined || (Array.isArray(payload.items) && payload.items.every(isDragPayloadItem)))
+  );
+}
+
+function dragItems(payload: DragPayload): DragPayloadItem[] {
+  return payload.items?.length ? payload.items : [{ path: payload.path, kind: payload.kind }];
+}
+
+function encodeDragPayload(payload: DragPayload) {
+  return JSON.stringify(payload);
+}
+
+function writeDragPayload(dataTransfer: DataTransfer, payload: DragPayload) {
+  const encoded = encodeDragPayload(payload);
+  dataTransfer.setData(SFTP_DRAG_MIME, encoded);
+  dataTransfer.setData("text/plain", `${SFTP_DRAG_TEXT_PREFIX}${encoded}`);
+  dataTransfer.effectAllowed = "copy";
+}
+
+function readDragPayload(dataTransfer: DataTransfer): DragPayload | null {
+  const custom = dataTransfer.getData(SFTP_DRAG_MIME);
+  const text = dataTransfer.getData("text/plain");
+  const raw = custom || (text.startsWith(SFTP_DRAG_TEXT_PREFIX) ? text.slice(SFTP_DRAG_TEXT_PREFIX.length) : "");
+  if (!raw) return null;
+  try {
+    const payload = JSON.parse(raw) as unknown;
+    return isDragPayload(payload) ? payload : null;
+  } catch {
+    return null;
+  }
+}
+
+function isLeavingCurrentTarget(event: React.DragEvent) {
+  const related = event.relatedTarget;
+  return !related || !(related instanceof Node) || !event.currentTarget.contains(related);
+}
+
+export function WorkspaceSftpPanel(props: WorkspaceSftpPanelProps) {
+  const { session, client, isActive, onError } = props;
+  const { t } = useLocale();
+  const { confirm, dialog } = useConfirmDialog();
+  const panelRef = useRef<HTMLDivElement | null>(null);
+  const transferChainRef = useRef<Promise<void>>(Promise.resolve());
+  const transferWaitersRef = useRef(new Map<string, (transfer: SftpTransfer | null) => void>());
+  const terminalTransfersRef = useRef(new Map<string, SftpTransfer>());
+  const pendingTransferStartsRef = useRef(0);
+  const activeTransferIdsRef = useRef(new Set<string>());
+  const nativeDragPayloadRef = useRef<DragPayload | null>(null);
+  const pointerDragRef = useRef<PointerDragState | null>(null);
+  const suppressNextClickRef = useRef(false);
+  const suppressNextContextMenuRef = useRef(false);
+  const copyToastTimerRef = useRef<number | null>(null);
+  const panePathRef = useRef({ local: INITIAL_LOCAL_PATH, remote: INITIAL_REMOTE_PATH });
+  const [localPane, setLocalPane] = useState<PaneState>(() => initialPane(INITIAL_LOCAL_PATH));
+  const [remotePane, setRemotePane] = useState<PaneState>(() => initialPane(INITIAL_REMOTE_PATH));
+  const [contextMenu, setContextMenu] = useState<ContextMenuState | null>(null);
+  const [dropTarget, setDropTarget] = useState<{ side: SftpSide; path: string } | null>(null);
+  const [activeDragSource, setActiveDragSource] = useState<DragPayload | null>(null);
+  const [dragPreview, setDragPreview] = useState<DragPreviewState | null>(null);
+  const [transfer, setTransfer] = useState<SftpTransfer | null>(null);
+  const [queueCount, setQueueCount] = useState(0);
+  const [busyMessage, setBusyMessage] = useState("");
+  const [createFolderDialog, setCreateFolderDialog] = useState<CreateFolderDialogState | null>(null);
+  const [createFolderName, setCreateFolderName] = useState("");
+  const [creatingFolder, setCreatingFolder] = useState(false);
+  const [renameEntryDialog, setRenameEntryDialog] = useState<RenameEntryDialogState | null>(null);
+  const [renameEntryName, setRenameEntryName] = useState("");
+  const [renamingEntry, setRenamingEntry] = useState(false);
+  const [copyPathDialog, setCopyPathDialog] = useState<string | null>(null);
+  const [copyToastVisible, setCopyToastVisible] = useState(false);
+
+  const workdir = session.cwd;
+  const projectPathKey = session.projectPathKey || session.cwd;
+  const connected = session.running && (session.ssh?.status ?? "connected") === "connected";
+
+  const syncQueueCount = useCallback(() => {
+    setQueueCount(pendingTransferStartsRef.current + activeTransferIdsRef.current.size);
+  }, []);
+
+  useEffect(() => {
+    panePathRef.current = {
+      local: localPane.path,
+      remote: remotePane.path,
+    };
+  }, [localPane.path, remotePane.path]);
+
+  const findEntry = useCallback(
+    (source: DragPayload | null) => {
+      if (!source) return null;
+      const entries = source.side === "local" ? localPane.entries : remotePane.entries;
+      return entries.find((entry) => entry.path === source.path) ?? null;
+    },
+    [localPane.entries, remotePane.entries],
+  );
+
+  const loadPane = useCallback(
+    async (side: SftpSide, path: string) => {
+      const normalizedPath = normalizePath(path, side);
+      const setPane = side === "local" ? setLocalPane : setRemotePane;
+      setPane((current) => ({ ...current, path: normalizedPath, loading: true, error: null }));
+      try {
+        const response = await client.list({
+          sessionId: session.id,
+          projectPathKey,
+          workdir,
+          side,
+          path: normalizedPath,
+        });
+        setPane((current) => ({
+          ...current,
+          path: response.path,
+          entries: response.entries,
+          loading: false,
+          error: null,
+          selectedPaths: current.selectedPaths.filter((path) =>
+            response.entries.some((entry) => entry.path === path),
+          ),
+        }));
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        setPane((current) => ({ ...current, loading: false, error: message }));
+        onError?.(message);
+      }
+    },
+    [client, onError, projectPathKey, session.id, workdir],
+  );
+
+  useEffect(() => {
+    if (!isActive) return;
+    void loadPane("local", localPane.path || INITIAL_LOCAL_PATH);
+    void loadPane("remote", remotePane.path || INITIAL_REMOTE_PATH);
+    // Initial active load only; explicit path changes call loadPane directly.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isActive, session.id]);
+
+  useEffect(() => {
+    return () => {
+      for (const resolve of transferWaitersRef.current.values()) {
+        resolve(null);
+      }
+      transferWaitersRef.current.clear();
+      terminalTransfersRef.current.clear();
+      pendingTransferStartsRef.current = 0;
+      activeTransferIdsRef.current.clear();
+      if (copyToastTimerRef.current !== null) {
+        window.clearTimeout(copyToastTimerRef.current);
+      }
+    };
+  }, []);
+
+  useEffect(() => {
+    if (!contextMenu) return;
+    const close = () => setContextMenu(null);
+    window.addEventListener("click", close);
+    window.addEventListener("blur", close);
+    window.addEventListener("resize", close);
+    return () => {
+      window.removeEventListener("click", close);
+      window.removeEventListener("blur", close);
+      window.removeEventListener("resize", close);
+    };
+  }, [contextMenu]);
+
+  useEffect(() => {
+    return client.subscribeTransfers((event) => {
+      if (event.transfer.sessionId !== session.id) return;
+      setTransfer(event.transfer);
+      if (TERMINAL_TRANSFER_STATUSES.has(event.transfer.status)) {
+        terminalTransfersRef.current.set(event.transfer.id, event.transfer);
+        const resolve = transferWaitersRef.current.get(event.transfer.id);
+        if (resolve) {
+          transferWaitersRef.current.delete(event.transfer.id);
+          terminalTransfersRef.current.delete(event.transfer.id);
+          resolve(event.transfer);
+        }
+        if (event.transfer.id) {
+          activeTransferIdsRef.current.delete(event.transfer.id);
+          syncQueueCount();
+        }
+      }
+      if (event.transfer.status === "completed") {
+        const targetSide: SftpSide = event.transfer.direction === "upload" ? "remote" : "local";
+        void loadPane(targetSide, panePathRef.current[targetSide]);
+      }
+    });
+  }, [client, loadPane, session.id, syncQueueCount]);
+
+  const waitForTransferDone = useCallback((transferId: string) => {
+    const terminalTransfer = terminalTransfersRef.current.get(transferId);
+    if (terminalTransfer) {
+      terminalTransfersRef.current.delete(transferId);
+      return Promise.resolve(terminalTransfer);
+    }
+    return new Promise<SftpTransfer | null>((resolve) => {
+      transferWaitersRef.current.set(transferId, resolve);
+    });
+  }, []);
+
+  const paneForSide = (side: SftpSide) => (side === "local" ? localPane : remotePane);
+  const selectedItemsForSide = useCallback(
+    (side: SftpSide) => {
+      const pane = side === "local" ? localPane : remotePane;
+      const selected = new Set(pane.selectedPaths);
+      return pane.entries.filter((entry) => selected.has(entry.path));
+    },
+    [localPane, remotePane],
+  );
+
+  const getActionItems = useCallback(
+    (side: SftpSide, path: string, kind: string, isEntry = true): DragPayloadItem[] => {
+      if (!isEntry) return [{ path, kind }];
+      const selected = selectedItemsForSide(side);
+      if (selected.some((entry) => entry.path === path)) {
+        return selected.map((entry) => ({ path: entry.path, kind: entry.kind }));
+      }
+      return [{ path, kind }];
+    },
+    [selectedItemsForSide],
+  );
+
+  const selectEntry = (side: SftpSide, path: string, additive: boolean) => {
+    const setPane = side === "local" ? setLocalPane : setRemotePane;
+    setPane((current) => {
+      if (!additive) {
+        return { ...current, selectedPaths: [path] };
+      }
+      const selected = new Set(current.selectedPaths);
+      if (selected.has(path)) {
+        selected.delete(path);
+      } else {
+        selected.add(path);
+      }
+      return { ...current, selectedPaths: [...selected] };
+    });
+  };
+
+  const clearSelection = useCallback((side: SftpSide) => {
+    const setPane = side === "local" ? setLocalPane : setRemotePane;
+    setPane((current) => (current.selectedPaths.length ? { ...current, selectedPaths: [] } : current));
+  }, []);
+
+  const createDragPayload = useCallback(
+    (side: SftpSide, entry: SftpEntry): DragPayload => {
+      const items = getActionItems(side, entry.path, entry.kind, true);
+      return {
+        side,
+        path: entry.path,
+        kind: entry.kind,
+        items,
+      };
+    },
+    [getActionItems],
+  );
+
+  const refreshPane = useCallback(
+    (side: SftpSide) => {
+      const pane = side === "local" ? localPane : remotePane;
+      void loadPane(side, pane.path);
+    },
+    [loadPane, localPane, remotePane],
+  );
+
+  const openCreateFolderDialog = useCallback((side: SftpSide, basePath: string) => {
+    setCreateFolderDialog({ side, basePath });
+    setCreateFolderName("");
+  }, []);
+
+  const closeCreateFolderDialog = useCallback(() => {
+    if (creatingFolder) return;
+    setCreateFolderDialog(null);
+    setCreateFolderName("");
+  }, [creatingFolder]);
+
+  const submitCreateFolder = useCallback(
+    async () => {
+      if (!createFolderDialog) return;
+      const name = createFolderName.trim();
+      if (!name || creatingFolder) return;
+      setBusyMessage(t("workspaceSftp.creatingFolder"));
+      setCreatingFolder(true);
+      try {
+        await client.mkdir({
+          sessionId: session.id,
+          projectPathKey,
+          workdir,
+          side: createFolderDialog.side,
+          path: joinPath(createFolderDialog.basePath, name, createFolderDialog.side),
+        });
+        await loadPane(createFolderDialog.side, paneForSide(createFolderDialog.side).path);
+        setCreateFolderDialog(null);
+        setCreateFolderName("");
+      } catch (error) {
+        onError?.(error instanceof Error ? error.message : String(error));
+      } finally {
+        setCreatingFolder(false);
+        setBusyMessage("");
+      }
+    },
+    [
+      client,
+      createFolderDialog,
+      createFolderName,
+      creatingFolder,
+      loadPane,
+      onError,
+      projectPathKey,
+      session.id,
+      t,
+      workdir,
+      localPane,
+      remotePane,
+    ],
+  );
+
+  const openRenameEntryDialog = useCallback((side: SftpSide, path: string) => {
+    const currentName = basename(path);
+    if (!currentName) return;
+    setRenameEntryDialog({ side, path, currentName });
+    setRenameEntryName(currentName);
+  }, []);
+
+  const closeRenameEntryDialog = useCallback(() => {
+    if (renamingEntry) return;
+    setRenameEntryDialog(null);
+    setRenameEntryName("");
+  }, [renamingEntry]);
+
+  const submitRenameEntry = useCallback(
+    async () => {
+      if (!renameEntryDialog) return;
+      const nextName = renameEntryName.trim();
+      if (!nextName || nextName === renameEntryDialog.currentName || renamingEntry) return;
+      const toPath = joinPath(
+        parentPath(renameEntryDialog.path, renameEntryDialog.side),
+        nextName,
+        renameEntryDialog.side,
+      );
+      setBusyMessage(t("workspaceSftp.renaming"));
+      setRenamingEntry(true);
+      try {
+        await client.rename({
+          sessionId: session.id,
+          projectPathKey,
+          workdir,
+          side: renameEntryDialog.side,
+          fromPath: renameEntryDialog.path,
+          toPath,
+        });
+        await loadPane(renameEntryDialog.side, paneForSide(renameEntryDialog.side).path);
+        setRenameEntryDialog(null);
+        setRenameEntryName("");
+      } catch (error) {
+        onError?.(error instanceof Error ? error.message : String(error));
+      } finally {
+        setRenamingEntry(false);
+        setBusyMessage("");
+      }
+    },
+    [
+      client,
+      loadPane,
+      onError,
+      projectPathKey,
+      renameEntryDialog,
+      renameEntryName,
+      renamingEntry,
+      session.id,
+      t,
+      workdir,
+      localPane,
+      remotePane,
+    ],
+  );
+
+  const deleteEntries = useCallback(
+    async (side: SftpSide, items: DragPayloadItem[]) => {
+      const targets = items.filter((item) => item.path !== "" && item.path !== ".");
+      if (!targets.length) return;
+      const hasDirectory = targets.some((item) => item.kind === "directory");
+      const confirmed = await confirm({
+        title: hasDirectory ? t("workspaceSftp.confirmDeleteDirectory") : t("workspaceSftp.confirmDeleteFile"),
+        subtitle: hasDirectory
+          ? t("workspaceSftp.confirmDeleteDirectorySubtitle")
+          : t("workspaceSftp.confirmDeleteFileSubtitle"),
+        detail: targets.length === 1 ? targets[0].path : targets.map((target) => target.path).join(", "),
+        confirmLabel: t("workspaceSftp.deleteConfirm"),
+        cancelLabel: t("workspaceSftp.cancel"),
+        closeLabel: t("workspaceSftp.cancel"),
+        tone: "destructive",
+      });
+      if (!confirmed) return;
+      setBusyMessage(t("workspaceSftp.deleting"));
+      try {
+        for (const item of targets) {
+          await client.delete({
+            sessionId: session.id,
+            projectPathKey,
+            workdir,
+            side,
+            path: item.path,
+            recursive: item.kind === "directory",
+          });
+        }
+        await loadPane(side, paneForSide(side).path);
+      } catch (error) {
+        onError?.(error instanceof Error ? error.message : String(error));
+      } finally {
+        setBusyMessage("");
+      }
+    },
+    [client, confirm, loadPane, onError, projectPathKey, session.id, t, workdir, localPane, remotePane],
+  );
+
+  const showCopyToast = useCallback(() => {
+    if (copyToastTimerRef.current !== null) {
+      window.clearTimeout(copyToastTimerRef.current);
+    }
+    setCopyToastVisible(true);
+    copyToastTimerRef.current = window.setTimeout(() => {
+      setCopyToastVisible(false);
+      copyToastTimerRef.current = null;
+    }, 1600);
+  }, []);
+
+  const copyPath = useCallback(
+    async (path: string) => {
+      try {
+        await navigator.clipboard.writeText(path);
+        showCopyToast();
+      } catch {
+        setCopyPathDialog(path);
+      }
+    },
+    [showCopyToast],
+  );
+
+  const copyPaths = useCallback(
+    async (side: SftpSide, items: DragPayloadItem[]) => {
+      const text = items.map((item) => absolutePathForCopy(side, item.path, workdir)).join("\n");
+      if (!text) return;
+      await copyPath(text);
+    },
+    [copyPath, workdir],
+  );
+
+  const transferSingleItem = useCallback(
+    async (source: DragPayload, targetSide: SftpSide, targetPath: string) => {
+      const direction = source.side === "local" && targetSide === "remote" ? "upload" : "download";
+      if (source.side === targetSide) return;
+      const queuedTransfer: SftpTransfer = {
+        id: "",
+        sessionId: session.id,
+        direction,
+        status: "queued",
+        sourcePath: source.path,
+        targetPath,
+        currentPath: source.path,
+        bytesDone: 0,
+        bytesTotal: 0,
+        filesDone: 0,
+        filesTotal: 0,
+        error: null,
+      };
+      pendingTransferStartsRef.current += 1;
+      syncQueueCount();
+      setTransfer(queuedTransfer);
+
+      const runTransfer = async () => {
+        try {
+          const targetEntryPath = joinPath(targetPath, basename(source.path), targetSide);
+          const targetStat = await client.stat({
+            sessionId: session.id,
+            projectPathKey,
+            workdir,
+            side: targetSide,
+            path: targetEntryPath,
+          }).catch(() => ({ exists: false }));
+          let overwrite = false;
+          if (targetStat.exists) {
+            const confirmed = await confirm({
+              title: t("workspaceSftp.confirmOverwrite"),
+              subtitle: t("workspaceSftp.confirmOverwriteSubtitle"),
+              detail: targetEntryPath,
+              confirmLabel: t("workspaceSftp.overwrite"),
+              cancelLabel: t("workspaceSftp.cancel"),
+              closeLabel: t("workspaceSftp.cancel"),
+              tone: "warning",
+            });
+            if (!confirmed) {
+              pendingTransferStartsRef.current = Math.max(0, pendingTransferStartsRef.current - 1);
+              syncQueueCount();
+              setTransfer((current) => (current?.id ? current : null));
+              return;
+            }
+            overwrite = true;
+          }
+          setTransfer({ ...queuedTransfer, status: "running" });
+          const response = await client.transfer({
+            sessionId: session.id,
+            projectPathKey,
+            workdir,
+            direction,
+            sourcePath: source.path,
+            targetPath,
+            recursive: source.kind === "directory",
+            overwrite,
+          });
+          pendingTransferStartsRef.current = Math.max(0, pendingTransferStartsRef.current - 1);
+          if (response.transfer.id && !TERMINAL_TRANSFER_STATUSES.has(response.transfer.status)) {
+            activeTransferIdsRef.current.add(response.transfer.id);
+          }
+          syncQueueCount();
+          setTransfer(response.transfer);
+          if (!TERMINAL_TRANSFER_STATUSES.has(response.transfer.status)) {
+            const terminalTransfer = await waitForTransferDone(response.transfer.id);
+            if (terminalTransfer) {
+              activeTransferIdsRef.current.delete(response.transfer.id);
+              syncQueueCount();
+              setTransfer(terminalTransfer);
+            }
+          } else {
+            activeTransferIdsRef.current.delete(response.transfer.id);
+            syncQueueCount();
+          }
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          setTransfer({ ...queuedTransfer, status: "failed", error: message });
+          onError?.(message);
+          pendingTransferStartsRef.current = Math.max(0, pendingTransferStartsRef.current - 1);
+          syncQueueCount();
+        }
+      };
+
+      const nextTransfer = transferChainRef.current.then(runTransfer, runTransfer);
+      transferChainRef.current = nextTransfer.catch(() => undefined);
+      await nextTransfer;
+    },
+    [client, confirm, onError, projectPathKey, session.id, syncQueueCount, t, waitForTransferDone, workdir],
+  );
+
+  const transferItem = useCallback(
+    async (source: DragPayload, targetSide: SftpSide, targetPath: string) => {
+      if (source.side === targetSide) return;
+      const items = dragItems(source);
+      for (const item of items) {
+        await transferSingleItem({ side: source.side, path: item.path, kind: item.kind }, targetSide, targetPath);
+      }
+    },
+    [transferSingleItem],
+  );
+
+  const readDropTargetFromPoint = useCallback((clientX: number, clientY: number) => {
+    const panel = panelRef.current;
+    const element = document.elementFromPoint(clientX, clientY);
+    if (!panel || !element || !panel.contains(element)) return null;
+    const target = element.closest<HTMLElement>("[data-sftp-drop-side]");
+    if (!target || !panel.contains(target)) return null;
+    const side = target.dataset.sftpDropSide;
+    if (!isSftpSide(side)) return null;
+    return {
+      side,
+      path: target.dataset.sftpDropPath ?? "",
+    };
+  }, []);
+
+  useEffect(() => {
+    const handlePointerMove = (event: PointerEvent) => {
+      const drag = pointerDragRef.current;
+      if (!drag || drag.pointerId !== event.pointerId) return;
+      const distance = Math.hypot(event.clientX - drag.startX, event.clientY - drag.startY);
+      if (!drag.active && distance < POINTER_DRAG_THRESHOLD_PX) return;
+      if (!drag.active) {
+        drag.active = true;
+        setActiveDragSource(drag.source);
+      }
+      setDragPreview({ source: drag.source, x: event.clientX, y: event.clientY });
+      const target = readDropTargetFromPoint(event.clientX, event.clientY);
+      setDropTarget(target && target.side !== drag.source.side ? target : null);
+      event.preventDefault();
+    };
+
+    const finishPointerDrag = (event: PointerEvent | MouseEvent) => {
+      const drag = pointerDragRef.current;
+      if (!drag) return;
+      if ("pointerId" in event && drag.pointerId !== event.pointerId) return;
+      pointerDragRef.current = null;
+      const target = readDropTargetFromPoint(event.clientX, event.clientY);
+      setDropTarget(null);
+      setActiveDragSource(null);
+      setDragPreview(null);
+      if (drag.active) {
+        suppressNextClickRef.current = true;
+        window.setTimeout(() => {
+          suppressNextClickRef.current = false;
+        }, 0);
+        event.preventDefault();
+        event.stopPropagation();
+      }
+      if (drag.active && target && target.side !== drag.source.side) {
+        void transferItem(drag.source, target.side, target.path);
+      }
+    };
+    const cancelPointerDrag = () => {
+      pointerDragRef.current = null;
+      setDropTarget(null);
+      setActiveDragSource(null);
+      setDragPreview(null);
+    };
+
+    window.addEventListener("pointermove", handlePointerMove, { passive: false });
+    window.addEventListener("pointerup", finishPointerDrag, { passive: false });
+    window.addEventListener("pointercancel", finishPointerDrag, { passive: false });
+    window.addEventListener("blur", cancelPointerDrag);
+    return () => {
+      window.removeEventListener("pointermove", handlePointerMove);
+      window.removeEventListener("pointerup", finishPointerDrag);
+      window.removeEventListener("pointercancel", finishPointerDrag);
+      window.removeEventListener("blur", cancelPointerDrag);
+    };
+  }, [readDropTargetFromPoint, transferItem]);
+
+  const beginPointerDrag = useCallback((event: React.PointerEvent, source: DragPayload) => {
+    if (event.button !== 0 || !event.isPrimary) return;
+    pointerDragRef.current = {
+      pointerId: event.pointerId,
+      source,
+      startX: event.clientX,
+      startY: event.clientY,
+      active: false,
+    };
+  }, []);
+
+  const handleDragOver = useCallback((event: React.DragEvent, side: SftpSide, path: string) => {
+    event.preventDefault();
+    event.stopPropagation();
+    const payload = readDragPayload(event.dataTransfer) ?? nativeDragPayloadRef.current;
+    if (!payload || payload.side === side) {
+      event.dataTransfer.dropEffect = "none";
+      setDropTarget(null);
+      setDragPreview(null);
+      return;
+    }
+    event.dataTransfer.dropEffect = "copy";
+    setActiveDragSource(payload);
+    setDragPreview({ source: payload, x: event.clientX, y: event.clientY });
+    setDropTarget({ side, path });
+  }, []);
+
+  const handleDrop = useCallback(
+    (event: React.DragEvent, side: SftpSide, path: string) => {
+      event.preventDefault();
+      event.stopPropagation();
+      setDropTarget(null);
+      setActiveDragSource(null);
+      setDragPreview(null);
+      const payload = readDragPayload(event.dataTransfer) ?? nativeDragPayloadRef.current;
+      nativeDragPayloadRef.current = null;
+      if (!payload || payload.side === side) return;
+      void transferItem(payload, side, path);
+    },
+    [transferItem],
+  );
+
+  const handleDragLeave = useCallback((event: React.DragEvent) => {
+    if (isLeavingCurrentTarget(event)) {
+      setDropTarget(null);
+      if (!pointerDragRef.current) {
+        setDragPreview(null);
+      }
+    }
+  }, []);
+
+  const openContextMenu = useCallback(
+    (event: React.MouseEvent, side: SftpSide, path: string, kind: string, isEntry = false) => {
+      event.preventDefault();
+      event.stopPropagation();
+      const items = getActionItems(side, path, kind, isEntry);
+      if (isEntry && !selectedItemsForSide(side).some((entry) => entry.path === path)) {
+        selectEntry(side, path, false);
+      }
+      const rect = panelRef.current?.getBoundingClientRect();
+      const menuWidth = 220;
+      const menuHeight = 250;
+      const maxX = Math.max(8, (rect?.width ?? window.innerWidth) - menuWidth - 8);
+      const maxY = Math.max(8, (rect?.height ?? window.innerHeight) - menuHeight - 8);
+      setContextMenu({
+        x: Math.min(Math.max(8, event.clientX - (rect?.left ?? 0)), maxX),
+        y: Math.min(Math.max(8, event.clientY - (rect?.top ?? 0)), maxY),
+        side,
+        path,
+        kind,
+        isEntry,
+        items,
+      });
+    },
+    [getActionItems, selectedItemsForSide],
+  );
+
+  const panes = useMemo(
+    () => [
+      { side: "local" as const, label: t("workspaceSftp.local"), root: workdir, pane: localPane },
+      {
+        side: "remote" as const,
+        label: t("workspaceSftp.remote"),
+        root: session.ssh ? `${session.ssh.username}@${session.ssh.host}` : session.title,
+        pane: remotePane,
+      },
+    ],
+    [localPane, remotePane, session.ssh, session.title, t, workdir],
+  );
+
+  if (!connected) {
+    return (
+      <div className="flex h-full flex-col items-center justify-center gap-3 p-6 text-center text-sm text-muted-foreground">
+        <AlertTriangle className="h-8 w-8 text-amber-500" />
+        <div className="font-medium text-foreground">{t("workspaceSftp.disconnected")}</div>
+        <div className="max-w-md text-xs">{t("workspaceSftp.disconnectedHint")}</div>
+      </div>
+    );
+  }
+
+  return (
+    <div ref={panelRef} className="relative flex h-full min-h-0 flex-col bg-background">
+      <div className="flex min-h-0 flex-1 overflow-x-auto overflow-y-hidden">
+        <div className="grid h-full min-h-0 min-w-[860px] flex-1 grid-cols-2 divide-x divide-border">
+          {panes.map(({ side, label, root, pane }) => {
+            const dropMode =
+              activeDragSource?.side === "local" && side === "remote"
+                ? "upload"
+                : activeDragSource?.side === "remote" && side === "local"
+                  ? "download"
+                  : null;
+            const dropActive = dropMode !== null && dropTarget?.side === side;
+            const DropIcon = dropMode === "download" ? Download : Upload;
+            const dropPath = dropActive ? dropTarget?.path || pane.path : pane.path;
+
+            return (
+            <div
+              key={side}
+              data-sftp-drop-side={side}
+              data-sftp-drop-path={pane.path}
+              className={cn(
+                "relative flex min-h-0 min-w-0 flex-col overflow-hidden transition-colors",
+                dropMode && "bg-muted/20",
+                dropActive && "bg-emerald-500/5",
+              )}
+              onDragOver={(event) => handleDragOver(event, side, pane.path)}
+              onDragLeave={handleDragLeave}
+              onDrop={(event) => handleDrop(event, side, pane.path)}
+              onContextMenu={(event) => openContextMenu(event, side, pane.path, "directory", false)}
+            >
+              <div className="flex h-12 shrink-0 items-center gap-2 border-b border-border bg-muted/30 px-3">
+                <div className="flex h-8 w-8 items-center justify-center rounded-lg bg-background text-muted-foreground">
+                  {side === "local" ? <FolderOpen className="h-4 w-4" /> : <Folder className="h-4 w-4" />}
+                </div>
+                <div className="min-w-0 flex-1">
+                  <div className="truncate text-sm font-semibold text-foreground">{label}</div>
+                  <div className="truncate font-mono text-[11px] text-muted-foreground">{root}</div>
+                </div>
+                {pane.selectedPaths.length ? (
+                  <button
+                    type="button"
+                    className="inline-flex h-7 max-w-[112px] shrink-0 items-center rounded-full border border-emerald-500/20 bg-emerald-500/10 px-2 text-[11px] font-medium text-emerald-700 transition-colors hover:bg-emerald-500/15 dark:text-emerald-300"
+                    title={t("workspaceSftp.clearSelection")}
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      clearSelection(side);
+                    }}
+                  >
+                    <span className="truncate">
+                      {t("workspaceSftp.selectedCount").replace("{count}", String(pane.selectedPaths.length))}
+                    </span>
+                  </button>
+                ) : null}
+                <button
+                  type="button"
+                  className="flex h-8 w-8 items-center justify-center rounded-lg text-muted-foreground hover:bg-background hover:text-foreground"
+                  title={t("workspaceSftp.refresh")}
+                  onClick={() => refreshPane(side)}
+                >
+                  <RefreshCw className={cn("h-4 w-4", pane.loading && "animate-spin")} />
+                </button>
+              </div>
+
+              <div className="flex h-9 shrink-0 items-center gap-1 overflow-x-auto border-b border-border px-3 text-xs">
+                {pathCrumbs(pane.path, side, t("workspaceSftp.projectRoot")).map((crumb, index) => (
+                  <button
+                    key={`${crumb.path}-${index}`}
+                    type="button"
+                    className="shrink-0 rounded px-1.5 py-1 text-muted-foreground hover:bg-muted hover:text-foreground"
+                    onClick={() => void loadPane(side, crumb.path)}
+                  >
+                    {crumb.label || t("workspaceSftp.projectRoot")}
+                  </button>
+                ))}
+              </div>
+
+              {pane.error ? (
+                <div className="m-3 flex items-start gap-2 rounded-lg border border-destructive/20 bg-destructive/10 px-3 py-2 text-xs text-destructive">
+                  <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
+                  <span className="min-w-0 break-words">{pane.error}</span>
+                </div>
+              ) : null}
+
+              <div
+                className="relative min-h-0 flex-1 overscroll-contain overflow-auto p-2"
+                onClick={(event) => {
+                  const target = event.target;
+                  if (target instanceof HTMLElement && target.closest("[data-sftp-entry]")) return;
+                  clearSelection(side);
+                }}
+              >
+                {dropMode ? (
+                  <div
+                    className={cn(
+                      "pointer-events-none absolute inset-2 z-20 flex items-center justify-center rounded-lg bg-background/80 text-center opacity-75 shadow-inner backdrop-blur-[1px] transition-all",
+                      dropActive && "bg-emerald-500/10 opacity-100",
+                    )}
+                  >
+                    <span className={cn("absolute left-0 top-0 h-14 w-14 rounded-tl-lg border-l-2 border-t-2", dropActive ? "border-emerald-600" : "border-foreground/65")} />
+                    <span className={cn("absolute right-0 top-0 h-14 w-14 rounded-tr-lg border-r-2 border-t-2", dropActive ? "border-emerald-600" : "border-foreground/65")} />
+                    <span className={cn("absolute bottom-0 left-0 h-14 w-14 rounded-bl-lg border-b-2 border-l-2", dropActive ? "border-emerald-600" : "border-foreground/65")} />
+                    <span className={cn("absolute bottom-0 right-0 h-14 w-14 rounded-br-lg border-b-2 border-r-2", dropActive ? "border-emerald-600" : "border-foreground/65")} />
+                    <div className="flex max-w-[75%] flex-col items-center gap-3">
+                      <div className={cn("flex h-14 w-14 items-center justify-center rounded-xl border-2 bg-background/90 shadow-sm", dropActive ? "border-emerald-600 text-emerald-700 dark:text-emerald-300" : "border-foreground/70 text-foreground")}>
+                        <DropIcon className="h-7 w-7" />
+                      </div>
+                      <div>
+                        <div className="text-sm font-semibold text-foreground">{t("workspaceSftp.dropHere")}</div>
+                        <div className="mt-1 text-xs text-muted-foreground">
+                          {t(dropMode === "upload" ? "workspaceSftp.drop.upload" : "workspaceSftp.drop.download")}
+                        </div>
+                        {dropPath ? (
+                          <div className="mx-auto mt-2 max-w-full truncate rounded bg-background/70 px-2 py-1 font-mono text-[11px] text-muted-foreground">
+                            {normalizePath(dropPath, side)}
+                          </div>
+                        ) : null}
+                      </div>
+                    </div>
+                  </div>
+                ) : null}
+                {pane.loading && pane.entries.length === 0 ? (
+                  <div className="flex h-full items-center justify-center gap-2 text-xs text-muted-foreground">
+                    <Loader2 className="h-4 w-4 animate-spin" />
+                    {t("workspaceSftp.loading")}
+                  </div>
+                ) : pane.entries.length === 0 ? (
+                  <div className="flex h-full items-center justify-center text-xs text-muted-foreground">
+                    {t("workspaceSftp.empty")}
+                  </div>
+                ) : (
+                  <div className="space-y-1">
+                    {pane.entries.map((entry) => {
+                      const isSelected = pane.selectedPaths.includes(entry.path);
+                      return (
+                      <button
+                        key={entry.path}
+                        type="button"
+                        draggable={false}
+                        data-sftp-entry="true"
+                        data-sftp-drop-side={entry.kind === "directory" ? side : undefined}
+                        data-sftp-drop-path={entry.kind === "directory" ? entry.path : undefined}
+                        aria-selected={isSelected}
+                        className={cn(
+                          "grid w-full touch-none cursor-default grid-cols-[minmax(0,1fr)_5.5rem] items-center gap-3 rounded-md px-2 py-1.5 text-left text-xs hover:bg-muted",
+                          isSelected && "bg-emerald-500/10 text-foreground ring-1 ring-emerald-500/20",
+                          activeDragSource?.side === side &&
+                            dragItems(activeDragSource).some((item) => item.path === entry.path) &&
+                            "bg-muted text-muted-foreground opacity-70 ring-1 ring-border",
+                          dropTarget?.side === side &&
+                            dropTarget.path === entry.path &&
+                            entry.kind === "directory" &&
+                            "bg-emerald-500/10 text-foreground",
+                        )}
+                        onClick={(event) => {
+                          if (suppressNextClickRef.current) {
+                            suppressNextClickRef.current = false;
+                            event.preventDefault();
+                            event.stopPropagation();
+                            return;
+                          }
+                          selectEntry(side, entry.path, event.ctrlKey || event.metaKey);
+                        }}
+                        onDoubleClick={() => {
+                          if (entry.kind === "directory") void loadPane(side, entry.path);
+                        }}
+                        onDragOver={(event) => {
+                          if (entry.kind === "directory") {
+                            handleDragOver(event, side, entry.path);
+                          }
+                        }}
+                        onDragLeave={(event) => {
+                          if (entry.kind === "directory") {
+                            handleDragLeave(event);
+                          }
+                        }}
+                        onDrop={(event) => {
+                          if (entry.kind === "directory") {
+                            handleDrop(event, side, entry.path);
+                          }
+                        }}
+                        onDragStart={(event) => {
+                          const payload = createDragPayload(side, entry);
+                          nativeDragPayloadRef.current = payload;
+                          setActiveDragSource(payload);
+                          writeDragPayload(event.dataTransfer, payload);
+                        }}
+                        onPointerDown={(event) => {
+                          if (event.button === 0 && event.isPrimary && (event.ctrlKey || event.metaKey)) {
+                            event.preventDefault();
+                            event.stopPropagation();
+                            selectEntry(side, entry.path, true);
+                            suppressNextClickRef.current = true;
+                            suppressNextContextMenuRef.current = event.ctrlKey;
+                            window.setTimeout(() => {
+                              suppressNextContextMenuRef.current = false;
+                            }, 250);
+                            return;
+                          }
+                          try {
+                            event.currentTarget.setPointerCapture(event.pointerId);
+                          } catch {
+                            // Some WebViews reject capture during synthetic pointer streams.
+                          }
+                          beginPointerDrag(event, createDragPayload(side, entry));
+                        }}
+                        onDragEnd={() => {
+                          nativeDragPayloadRef.current = null;
+                          setDropTarget(null);
+                          setActiveDragSource(null);
+                          setDragPreview(null);
+                        }}
+                        onContextMenu={(event) => {
+                          if (suppressNextContextMenuRef.current) {
+                            event.preventDefault();
+                            event.stopPropagation();
+                            suppressNextContextMenuRef.current = false;
+                            return;
+                          }
+                          openContextMenu(event, side, entry.path, entry.kind, true);
+                        }}
+                      >
+                        <span className="flex min-w-0 items-center gap-2">
+                          {entryIcon(entry)}
+                          <span className="truncate">{entry.name}</span>
+                        </span>
+                        <span className="text-right font-mono text-[11px] text-muted-foreground">
+                          {entry.kind === "directory" ? "--" : formatBytes(entry.sizeBytes)}
+                        </span>
+                      </button>
+                    );
+                    })}
+                  </div>
+                )}
+              </div>
+            </div>
+          );
+          })}
+        </div>
+      </div>
+
+      <div className="flex h-10 shrink-0 items-center gap-2 border-t border-border bg-muted/30 px-3 text-xs text-muted-foreground">
+        {busyMessage ? <Loader2 className="h-3.5 w-3.5 animate-spin" /> : null}
+        <span className="min-w-0 flex-1 truncate">
+          {busyMessage || (transfer ? "" : t("workspaceSftp.transfer.idle"))}
+        </span>
+        {transfer ? (
+          <TransferToast
+            transfer={transfer}
+            queueCount={queueCount}
+            cancelLabel={t("workspaceSftp.cancel")}
+            filesLabel={t("workspaceSftp.transfer.files")}
+            statusLabel={t(`workspaceSftp.transfer.${transfer.status}`)}
+            onCancel={
+              transfer.id && transfer.status === "running"
+                ? () => void client.cancelTransfer({ sessionId: session.id, transferId: transfer.id })
+                : undefined
+            }
+          />
+        ) : null}
+      </div>
+
+      {contextMenu ? (
+        <div
+          className="editor-context-menu absolute z-[80] w-[220px] select-none overflow-hidden rounded-xl border border-border/60 bg-popover/90 p-1 text-xs text-popover-foreground shadow-2xl ring-1 ring-black/[0.03] backdrop-blur-xl dark:ring-white/[0.06]"
+          role="menu"
+          style={{ left: contextMenu.x, top: contextMenu.y }}
+          onContextMenu={(event) => event.preventDefault()}
+        >
+          {contextMenu.items.length > 1 ? (
+            <div className="mb-1 flex items-center justify-between rounded-lg bg-emerald-500/10 px-2 py-1 text-[11px] font-medium text-emerald-700 dark:text-emerald-300">
+              <span>{t("workspaceSftp.selectedCount").replace("{count}", String(contextMenu.items.length))}</span>
+              <button
+                type="button"
+                className="rounded px-1 text-emerald-700/80 hover:bg-emerald-500/10 hover:text-emerald-800 dark:text-emerald-300/80 dark:hover:text-emerald-200"
+                onClick={(event) => {
+                  event.stopPropagation();
+                  clearSelection(contextMenu.side);
+                  setContextMenu(null);
+                }}
+              >
+                {t("workspaceSftp.clearSelection")}
+              </button>
+            </div>
+          ) : null}
+          <MenuItem icon={<RefreshCw className="h-3.5 w-3.5" />} label={t("workspaceSftp.refresh")} onClick={() => { setContextMenu(null); refreshPane(contextMenu.side); }} />
+          <MenuItem icon={<Plus className="h-3.5 w-3.5" />} label={t("workspaceSftp.newFolder")} onClick={() => { setContextMenu(null); openCreateFolderDialog(contextMenu.side, contextMenu.kind === "directory" ? contextMenu.path : parentPath(contextMenu.path, contextMenu.side)); }} />
+          <MenuItem icon={<Pencil className="h-3.5 w-3.5" />} label={t("workspaceSftp.rename")} disabled={!contextMenu.isEntry || contextMenu.items.length !== 1 || contextMenu.path === "" || contextMenu.path === "."} onClick={() => { setContextMenu(null); openRenameEntryDialog(contextMenu.side, contextMenu.path); }} />
+          <MenuItem icon={<Trash2 className="h-3.5 w-3.5" />} label={t("workspaceSftp.delete")} disabled={!contextMenu.isEntry || contextMenu.items.length === 0} destructive onClick={() => { setContextMenu(null); void deleteEntries(contextMenu.side, contextMenu.items); }} />
+          <div className="my-1 h-px bg-border/70" />
+          {contextMenu.side === "local" ? (
+            <MenuItem icon={<Upload className="h-3.5 w-3.5" />} label={t("workspaceSftp.uploadToRemote")} disabled={!contextMenu.isEntry || contextMenu.items.length === 0} onClick={() => { setContextMenu(null); void transferItem({ side: "local", path: contextMenu.path, kind: contextMenu.kind, items: contextMenu.items }, "remote", remotePane.path); }} />
+          ) : (
+            <MenuItem icon={<Download className="h-3.5 w-3.5" />} label={t("workspaceSftp.downloadToLocal")} disabled={!contextMenu.isEntry || contextMenu.items.length === 0} onClick={() => { setContextMenu(null); void transferItem({ side: "remote", path: contextMenu.path, kind: contextMenu.kind, items: contextMenu.items }, "local", localPane.path); }} />
+          )}
+          <MenuItem icon={<Copy className="h-3.5 w-3.5" />} label={t("workspaceSftp.copyPath")} onClick={() => { setContextMenu(null); void copyPaths(contextMenu.side, contextMenu.items.length ? contextMenu.items : [{ path: contextMenu.path, kind: contextMenu.kind }]); }} />
+        </div>
+      ) : null}
+      {dragPreview ? (
+        <DragPreview
+          entry={findEntry(dragPreview.source)}
+          fallback={dragPreview.source}
+          x={dragPreview.x}
+          y={dragPreview.y}
+          typeLabel={(entry) => entryTypeLabel(entry, t)}
+        />
+      ) : null}
+      {createFolderDialog ? (
+        <CreateFolderDialog
+          title={t("workspaceSftp.newFolder")}
+          prompt={t("workspaceSftp.newFolderPrompt")}
+          confirmLabel={t("workspaceSftp.newFolder")}
+          cancelLabel={t("workspaceSftp.cancel")}
+          path={normalizePath(createFolderDialog.basePath, createFolderDialog.side)}
+          value={createFolderName}
+          submitting={creatingFolder}
+          onChange={setCreateFolderName}
+          onCancel={closeCreateFolderDialog}
+          onSubmit={() => void submitCreateFolder()}
+        />
+      ) : null}
+      {renameEntryDialog ? (
+        <RenameEntryDialog
+          title={t("workspaceSftp.rename")}
+          prompt={t("workspaceSftp.renamePrompt")}
+          confirmLabel={t("workspaceSftp.rename")}
+          cancelLabel={t("workspaceSftp.cancel")}
+          path={normalizePath(renameEntryDialog.path, renameEntryDialog.side)}
+          originalName={renameEntryDialog.currentName}
+          value={renameEntryName}
+          submitting={renamingEntry}
+          onChange={setRenameEntryName}
+          onCancel={closeRenameEntryDialog}
+          onSubmit={() => void submitRenameEntry()}
+        />
+      ) : null}
+      {copyPathDialog ? (
+        <CopyPathDialog
+          title={t("workspaceSftp.copyPath")}
+          prompt={t("workspaceSftp.copyPathFallback")}
+          closeLabel={t("workspaceSftp.cancel")}
+          text={copyPathDialog}
+          onClose={() => setCopyPathDialog(null)}
+        />
+      ) : null}
+      {copyToastVisible ? <CopyPathToast message={t("workspaceSftp.copyPathCopied")} /> : null}
+      {dialog}
+    </div>
+  );
+}
+
+function CreateFolderDialog(props: {
+  title: string;
+  prompt: string;
+  confirmLabel: string;
+  cancelLabel: string;
+  path: string;
+  value: string;
+  submitting: boolean;
+  onChange: (value: string) => void;
+  onCancel: () => void;
+  onSubmit: () => void;
+}) {
+  const {
+    title,
+    prompt,
+    confirmLabel,
+    cancelLabel,
+    path,
+    value,
+    submitting,
+    onChange,
+    onCancel,
+    onSubmit,
+  } = props;
+  const canSubmit = value.trim().length > 0 && !submitting;
+
+  useEffect(() => {
+    function handleKeyDown(event: KeyboardEvent) {
+      if (event.key === "Escape") {
+        onCancel();
+      }
+    }
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [onCancel]);
+
+  return createPortal(
+    <div
+      className="fixed inset-0 z-[120] flex items-center justify-center p-4"
+      role="dialog"
+      aria-modal="true"
+      aria-label={title}
+    >
+      <button
+        type="button"
+        tabIndex={-1}
+        className="absolute inset-0 cursor-default bg-black/55 backdrop-blur-sm"
+        onClick={onCancel}
+        aria-hidden="true"
+      />
+      <form
+        className="relative z-10 w-full max-w-md overflow-hidden rounded-2xl border border-border/70 bg-background shadow-2xl"
+        onSubmit={(event) => {
+          event.preventDefault();
+          if (canSubmit) {
+            onSubmit();
+          }
+        }}
+      >
+        <div className="border-b border-border/60 px-5 py-4">
+          <div className="text-base font-semibold text-foreground">{title}</div>
+          {path ? (
+            <div className="mt-1 truncate font-mono text-[11px] text-muted-foreground">{path}</div>
+          ) : null}
+        </div>
+        <div className="space-y-2 px-5 py-5">
+          <label className="block text-xs font-medium text-muted-foreground" htmlFor="workspace-sftp-new-folder-name">
+            {prompt}
+          </label>
+          <input
+            id="workspace-sftp-new-folder-name"
+            value={value}
+            autoFocus
+            disabled={submitting}
+            className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground/70 focus:border-ring focus:ring-2 focus:ring-ring/20 disabled:cursor-not-allowed disabled:opacity-60"
+            onChange={(event) => onChange(event.currentTarget.value)}
+          />
+        </div>
+        <div className="flex flex-col-reverse gap-2 border-t border-border/60 bg-muted/20 px-5 py-4 sm:flex-row sm:justify-end">
+          <button
+            type="button"
+            className="inline-flex h-9 items-center justify-center rounded-lg border border-input bg-background px-3 text-sm font-medium text-foreground transition-colors hover:bg-muted disabled:pointer-events-none disabled:opacity-50 sm:w-auto"
+            disabled={submitting}
+            onClick={onCancel}
+          >
+            {cancelLabel}
+          </button>
+          <button
+            type="submit"
+            className="inline-flex h-9 items-center justify-center rounded-lg bg-primary px-3 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-50 sm:w-auto"
+            disabled={!canSubmit}
+          >
+            {submitting ? <Loader2 className="mr-2 h-3.5 w-3.5 animate-spin" /> : null}
+            {confirmLabel}
+          </button>
+        </div>
+      </form>
+    </div>,
+    document.body,
+  );
+}
+
+function CopyPathDialog(props: {
+  title: string;
+  prompt: string;
+  closeLabel: string;
+  text: string;
+  onClose: () => void;
+}) {
+  const { title, prompt, closeLabel, text, onClose } = props;
+
+  useEffect(() => {
+    function handleKeyDown(event: KeyboardEvent) {
+      if (event.key === "Escape") {
+        onClose();
+      }
+    }
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [onClose]);
+
+  return createPortal(
+    <div
+      className="fixed inset-0 z-[120] flex items-center justify-center p-4"
+      role="dialog"
+      aria-modal="true"
+      aria-label={title}
+    >
+      <button
+        type="button"
+        tabIndex={-1}
+        className="absolute inset-0 cursor-default bg-black/55 backdrop-blur-sm"
+        onClick={onClose}
+        aria-hidden="true"
+      />
+      <div className="relative z-10 w-full max-w-md overflow-hidden rounded-2xl border border-border/70 bg-background shadow-2xl">
+        <div className="border-b border-border/60 px-5 py-4">
+          <div className="text-base font-semibold text-foreground">{title}</div>
+          <div className="mt-1 text-xs text-muted-foreground">{prompt}</div>
+        </div>
+        <div className="px-5 py-5">
+          <textarea
+            value={text}
+            readOnly
+            autoFocus
+            className="min-h-28 w-full resize-none rounded-lg border border-input bg-background px-3 py-2 font-mono text-xs text-foreground outline-none transition-colors focus:border-ring focus:ring-2 focus:ring-ring/20"
+            onFocus={(event) => event.currentTarget.select()}
+          />
+        </div>
+        <div className="flex justify-end border-t border-border/60 bg-muted/20 px-5 py-4">
+          <button
+            type="button"
+            className="inline-flex h-9 items-center justify-center rounded-lg border border-input bg-background px-3 text-sm font-medium text-foreground transition-colors hover:bg-muted"
+            onClick={onClose}
+          >
+            {closeLabel}
+          </button>
+        </div>
+      </div>
+    </div>,
+    document.body,
+  );
+}
+
+function CopyPathToast(props: { message: string }) {
+  return (
+    <div className="pointer-events-none absolute bottom-14 right-4 z-[90]">
+      <div className="notify-toast-enter flex min-w-56 items-center gap-2 rounded-lg border border-emerald-500/25 bg-background/95 px-3 py-2 text-sm font-medium text-foreground shadow-2xl backdrop-blur-xl">
+        <CheckCircle2 className="h-4 w-4 shrink-0 text-emerald-600 dark:text-emerald-300" />
+        <span>{props.message}</span>
+      </div>
+    </div>
+  );
+}
+
+function RenameEntryDialog(props: {
+  title: string;
+  prompt: string;
+  confirmLabel: string;
+  cancelLabel: string;
+  path: string;
+  originalName: string;
+  value: string;
+  submitting: boolean;
+  onChange: (value: string) => void;
+  onCancel: () => void;
+  onSubmit: () => void;
+}) {
+  const {
+    title,
+    prompt,
+    confirmLabel,
+    cancelLabel,
+    path,
+    originalName,
+    value,
+    submitting,
+    onChange,
+    onCancel,
+    onSubmit,
+  } = props;
+  const trimmedValue = value.trim();
+  const canSubmit = trimmedValue.length > 0 && trimmedValue !== originalName && !submitting;
+
+  useEffect(() => {
+    function handleKeyDown(event: KeyboardEvent) {
+      if (event.key === "Escape") {
+        onCancel();
+      }
+    }
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [onCancel]);
+
+  return createPortal(
+    <div
+      className="fixed inset-0 z-[120] flex items-center justify-center p-4"
+      role="dialog"
+      aria-modal="true"
+      aria-label={title}
+    >
+      <button
+        type="button"
+        tabIndex={-1}
+        className="absolute inset-0 cursor-default bg-black/55 backdrop-blur-sm"
+        onClick={onCancel}
+        aria-hidden="true"
+      />
+      <form
+        className="relative z-10 w-full max-w-md overflow-hidden rounded-2xl border border-border/70 bg-background shadow-2xl"
+        onSubmit={(event) => {
+          event.preventDefault();
+          if (canSubmit) {
+            onSubmit();
+          }
+        }}
+      >
+        <div className="border-b border-border/60 px-5 py-4">
+          <div className="text-base font-semibold text-foreground">{title}</div>
+          {path ? (
+            <div className="mt-1 truncate font-mono text-[11px] text-muted-foreground">{path}</div>
+          ) : null}
+        </div>
+        <div className="space-y-2 px-5 py-5">
+          <label className="block text-xs font-medium text-muted-foreground" htmlFor="workspace-sftp-rename-entry-name">
+            {prompt}
+          </label>
+          <input
+            id="workspace-sftp-rename-entry-name"
+            value={value}
+            autoFocus
+            disabled={submitting}
+            className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground/70 focus:border-ring focus:ring-2 focus:ring-ring/20 disabled:cursor-not-allowed disabled:opacity-60"
+            onChange={(event) => onChange(event.currentTarget.value)}
+          />
+        </div>
+        <div className="flex flex-col-reverse gap-2 border-t border-border/60 bg-muted/20 px-5 py-4 sm:flex-row sm:justify-end">
+          <button
+            type="button"
+            className="inline-flex h-9 items-center justify-center rounded-lg border border-input bg-background px-3 text-sm font-medium text-foreground transition-colors hover:bg-muted disabled:pointer-events-none disabled:opacity-50 sm:w-auto"
+            disabled={submitting}
+            onClick={onCancel}
+          >
+            {cancelLabel}
+          </button>
+          <button
+            type="submit"
+            className="inline-flex h-9 items-center justify-center rounded-lg bg-primary px-3 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-50 sm:w-auto"
+            disabled={!canSubmit}
+          >
+            {submitting ? <Loader2 className="mr-2 h-3.5 w-3.5 animate-spin" /> : null}
+            {confirmLabel}
+          </button>
+        </div>
+      </form>
+    </div>,
+    document.body,
+  );
+}
+
+function TransferToast(props: {
+  transfer: SftpTransfer;
+  queueCount: number;
+  cancelLabel: string;
+  filesLabel: string;
+  statusLabel: string;
+  onCancel?: () => void;
+}) {
+  const { transfer, queueCount, cancelLabel, filesLabel, statusLabel, onCancel } = props;
+  const progress = transferProgress(transfer);
+  const TransferIcon = transfer.direction === "download" ? Download : Upload;
+  const currentPath = transfer.currentPath || transfer.sourcePath || transfer.targetPath;
+  const isRunning = transfer.status === "running" || transfer.status === "queued";
+  const isCompleted = transfer.status === "completed";
+  const isFailed = transfer.status === "failed";
+  const StatusIcon = isRunning ? Loader2 : isCompleted ? CheckCircle2 : TransferIcon;
+  const iconClass = isFailed
+    ? "text-destructive"
+    : isCompleted
+      ? "text-emerald-600 dark:text-emerald-300"
+      : "text-sky-600 dark:text-sky-300";
+
+  return (
+    <div className="pointer-events-auto relative ml-auto flex h-full w-[340px] max-w-[50%] shrink-0 items-center gap-2 pl-3 text-foreground before:absolute before:bottom-2 before:left-0 before:top-2 before:w-px before:bg-border/60">
+      <div className="flex h-4 w-4 shrink-0 items-center justify-center">
+        <StatusIcon className={cn("h-3.5 w-3.5", iconClass, isRunning && "animate-spin")} />
+      </div>
+      <div className="min-w-0 flex-1">
+        <div className="flex items-center gap-1.5">
+          <span className="shrink-0 text-[11px] font-medium leading-none text-foreground">{statusLabel}</span>
+          <span className="min-w-0 flex-1 truncate font-mono text-[11px] leading-none text-muted-foreground/90">
+            {currentPath}
+          </span>
+          <span className="shrink-0 font-mono text-[10px] leading-none text-muted-foreground">{progress}%</span>
+        </div>
+        {transfer.error ? (
+          <div className="mt-1.5 truncate text-[11px] leading-none text-destructive">{transfer.error}</div>
+        ) : (
+          <div className="mt-1.5 flex items-center gap-1.5">
+            <div className="h-1 min-w-16 flex-1 overflow-hidden rounded-full bg-border/60">
+              <div
+                className={cn("h-full rounded-full transition-all duration-300", transferTone(transfer))}
+                style={{ width: `${progress}%` }}
+              />
+            </div>
+            <span className="shrink-0 text-[10px] leading-none text-muted-foreground">
+              {transfer.filesDone}/{transfer.filesTotal || queueCount || 1} {filesLabel}
+            </span>
+            <span className="shrink-0 font-mono text-[10px] leading-none text-muted-foreground">
+              {formatBytes(transfer.bytesDone)} / {formatBytes(transfer.bytesTotal)}
+            </span>
+          </div>
+        )}
+      </div>
+      {onCancel ? (
+        <button
+          type="button"
+          className="shrink-0 rounded px-1.5 py-0.5 text-[11px] text-destructive hover:bg-destructive/10"
+          onClick={onCancel}
+        >
+          {cancelLabel}
+        </button>
+      ) : null}
+    </div>
+  );
+}
+
+function DragPreview(props: {
+  entry: SftpEntry | null;
+  fallback: DragPayload;
+  x: number;
+  y: number;
+  typeLabel: (entry: SftpEntry) => string;
+}) {
+  const { entry, fallback, x, y, typeLabel } = props;
+  const previewEntry: SftpEntry = entry ?? {
+    path: fallback.path,
+    name: basename(fallback.path) || fallback.path,
+    kind: fallback.kind,
+    sizeBytes: 0,
+    mtime: 0,
+  };
+  const count = dragItems(fallback).length;
+
+  return (
+    <div
+      className="pointer-events-none fixed z-[120] flex w-[260px] max-w-[calc(100vw-32px)] items-center gap-2 rounded-md bg-sky-500/90 px-2.5 py-2 text-xs text-white shadow-xl ring-1 ring-sky-200/50 backdrop-blur-sm"
+      style={{
+        left: x + 18,
+        top: y + 14,
+        transform: "translateY(-50%)",
+      }}
+    >
+      <span className="flex h-7 w-7 shrink-0 items-center justify-center rounded bg-white/15 text-white">
+        {entryIcon(previewEntry, "h-4 w-4 text-white")}
+      </span>
+      <span className="min-w-0 flex-1">
+        <span className="block truncate font-medium leading-4">
+          {previewEntry.name}
+          {count > 1 ? ` +${count - 1}` : ""}
+        </span>
+        <span className="block truncate text-[10px] leading-3 text-white/75">
+          {typeLabel(previewEntry)}
+          {previewEntry.kind === "directory" ? "" : ` · ${formatBytes(previewEntry.sizeBytes)}`}
+        </span>
+      </span>
+      {count > 1 ? (
+        <span className="shrink-0 rounded bg-white/15 px-1.5 py-0.5 font-mono text-[10px] text-white/90">
+          {count}
+        </span>
+      ) : previewEntry.kind === "directory" ? null : (
+        <span className="shrink-0 rounded bg-white/15 px-1.5 py-0.5 font-mono text-[10px] text-white/90">
+          {formatBytes(previewEntry.sizeBytes)}
+        </span>
+      )}
+    </div>
+  );
+}
+
+function MenuItem(props: {
+  icon: React.ReactNode;
+  label: string;
+  destructive?: boolean;
+  disabled?: boolean;
+  onClick: () => void;
+}) {
+  const { icon, label, destructive = false, disabled = false, onClick } = props;
+  return (
+    <button
+      type="button"
+      role="menuitem"
+      disabled={disabled}
+      className={cn(
+        "flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-left transition-colors",
+        destructive
+          ? "text-destructive hover:bg-destructive/10"
+          : "text-popover-foreground hover:bg-accent hover:text-accent-foreground",
+        disabled && "pointer-events-none opacity-45",
+      )}
+      onClick={(event) => {
+        event.stopPropagation();
+        onClick();
+      }}
+    >
+      {icon}
+      <span className="min-w-0 flex-1 truncate">{label}</span>
+    </button>
+  );
+}
diff --git a/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
index c9b67ecd4..702a9dd96 100644
--- a/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
+++ b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
@@ -1,19 +1,31 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useLocale } from "@/i18n";
 import { cn } from "@/lib/shared/utils";
+import type { SftpClient } from "@/lib/sftp/types";
 import type { TerminalClient, TerminalSession } from "@/lib/terminal/types";
-import { AlertTriangle, RefreshCw, Terminal, Wifi, WifiOff, X } from "../icons";
+import { AlertTriangle, FolderTree, RefreshCw, Terminal, Wifi, WifiOff, X } from "../icons";
 import { XTermViewport } from "../project-tools/XTermViewport";
+import { WorkspaceSftpPanel } from "./WorkspaceSftpPanel";
 
 export type WorkspaceSshTerminalOpenRequest = {
   id: number;
   sessionId: string;
+  kind?: WorkspaceSshTerminalTabKind;
+};
+
+type WorkspaceSshTerminalTabKind = "bash" | "sftp";
+
+type WorkspaceSshTerminalTab = {
+  id: string;
+  sessionId: string;
+  kind: WorkspaceSshTerminalTabKind;
 };
 
 type WorkspaceSshTerminalOverlayProps = {
   openRequest: WorkspaceSshTerminalOpenRequest | null;
   sessions: TerminalSession[];
   client: TerminalClient;
+  sftpClient: SftpClient;
   theme: "light" | "dark";
   isOpen: boolean;
   onHide: () => void;
@@ -67,12 +79,16 @@ function statusIcon(session: TerminalSession) {
   return <WifiOff className="h-3.5 w-3.5 text-destructive" />;
 }
 
+function tabIdFor(sessionId: string, kind: WorkspaceSshTerminalTabKind) {
+  return `${kind}:${sessionId}`;
+}
+
 export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayProps) {
-  const { openRequest, sessions, client, theme, isOpen, onHide } = props;
+  const { openRequest, sessions, client, sftpClient, theme, isOpen, onHide } = props;
   const { t } = useLocale();
   const [isVisible, setIsVisible] = useState(isOpen);
-  const [openSessionIds, setOpenSessionIds] = useState<string[]>([]);
-  const [activeSessionId, setActiveSessionId] = useState("");
+  const [openTabs, setOpenTabs] = useState<WorkspaceSshTerminalTab[]>([]);
+  const [activeTabId, setActiveTabId] = useState("");
   const [error, setError] = useState<string | null>(null);
   const openRequestIdRef = useRef<number | null>(null);
   const hideTimerRef = useRef<number | null>(null);
@@ -85,15 +101,18 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
     () => new Map(sshSessions.map((session) => [session.id, session])),
     [sshSessions],
   );
-  const openSessions = useMemo(
+  const openTabRecords = useMemo(
     () =>
-      openSessionIds
-        .map((sessionId) => sessionsById.get(sessionId))
-        .filter((session): session is TerminalSession => Boolean(session)),
-    [openSessionIds, sessionsById],
+      openTabs
+        .map((tab) => ({ tab, session: sessionsById.get(tab.sessionId) }))
+        .filter((record): record is { tab: WorkspaceSshTerminalTab; session: TerminalSession } =>
+          Boolean(record.session),
+        ),
+    [openTabs, sessionsById],
   );
-  const activeSession =
-    openSessions.find((session) => session.id === activeSessionId) ?? openSessions[0] ?? null;
+  const activeRecord =
+    openTabRecords.find((record) => record.tab.id === activeTabId) ?? openTabRecords[0] ?? null;
+  const activeSession = activeRecord?.session ?? null;
 
   const cancelPendingHide = useCallback(() => {
     if (hideTimerRef.current === null) return;
@@ -110,14 +129,14 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
     }, SSH_TERMINAL_OVERLAY_ANIMATION_MS);
   }, [cancelPendingHide, onHide]);
 
-  const closeTab = useCallback((sessionId: string) => {
-    setOpenSessionIds((current) => {
-      const index = current.indexOf(sessionId);
+  const closeTab = useCallback((tabId: string) => {
+    setOpenTabs((current) => {
+      const index = current.findIndex((tab) => tab.id === tabId);
       if (index < 0) return current;
-      const next = current.filter((id) => id !== sessionId);
-      setActiveSessionId((currentActive) => {
-        if (currentActive !== sessionId) return currentActive;
-        return next[Math.min(index, next.length - 1)] ?? "";
+      const next = current.filter((tab) => tab.id !== tabId);
+      setActiveTabId((currentActive) => {
+        if (currentActive !== tabId) return currentActive;
+        return next[Math.min(index, next.length - 1)]?.id ?? "";
       });
       return next;
     });
@@ -127,14 +146,18 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
     if (!openRequest || openRequestIdRef.current === openRequest.id) return;
     const session = sessionsById.get(openRequest.sessionId);
     if (!session) return;
+    const kind = openRequest.kind ?? "bash";
+    const tabId = tabIdFor(session.id, kind);
     openRequestIdRef.current = openRequest.id;
     cancelPendingHide();
     setIsVisible(true);
     setError(null);
-    setOpenSessionIds((current) =>
-      current.includes(session.id) ? current : [...current, session.id],
+    setOpenTabs((current) =>
+      current.some((tab) => tab.id === tabId)
+        ? current
+        : [...current, { id: tabId, sessionId: session.id, kind }],
     );
-    setActiveSessionId(session.id);
+    setActiveTabId(tabId);
   }, [cancelPendingHide, openRequest, sessionsById]);
 
   useEffect(() => {
@@ -148,16 +171,16 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
 
   useEffect(() => {
     const liveIds = new Set(sshSessions.map((session) => session.id));
-    setOpenSessionIds((current) => {
-      const next = current.filter((sessionId) => liveIds.has(sessionId));
+    setOpenTabs((current) => {
+      const next = current.filter((tab) => liveIds.has(tab.sessionId));
       return next.length === current.length ? current : next;
     });
   }, [sshSessions]);
 
   useEffect(() => {
-    if (activeSessionId && openSessions.some((session) => session.id === activeSessionId)) return;
-    setActiveSessionId(openSessions[0]?.id ?? "");
-  }, [activeSessionId, openSessions]);
+    if (activeTabId && openTabRecords.some((record) => record.tab.id === activeTabId)) return;
+    setActiveTabId(openTabRecords[0]?.tab.id ?? "");
+  }, [activeTabId, openTabRecords]);
 
   useEffect(
     () => () => {
@@ -205,23 +228,29 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
       </div>
 
       <div className="flex h-10 shrink-0 items-end gap-1 overflow-x-auto border-b border-border bg-background px-2 pt-1">
-        {openSessions.map((session) => (
+        {openTabRecords.map(({ tab, session }) => (
           <button
-            key={session.id}
+            key={tab.id}
             type="button"
             className={cn(
               "group flex h-8 max-w-[14rem] shrink-0 items-center gap-1.5 rounded-t-md border border-b-0 px-2 text-xs transition-colors",
-              session.id === activeSessionId
+              tab.id === activeTabId
                 ? "border-border bg-muted text-foreground"
                 : "border-transparent text-muted-foreground hover:bg-muted/60 hover:text-foreground",
             )}
             title={sessionEndpointLabel(session)}
-            onClick={() => setActiveSessionId(session.id)}
+            onClick={() => setActiveTabId(tab.id)}
           >
             <span className={cn("h-1.5 w-1.5 shrink-0 rounded-full", statusDotClassName(session))} />
-            <Terminal className="h-3.5 w-3.5 shrink-0" />
+            {tab.kind === "sftp" ? (
+              <FolderTree className="h-3.5 w-3.5 shrink-0" />
+            ) : (
+              <Terminal className="h-3.5 w-3.5 shrink-0" />
+            )}
             <span className="min-w-0 truncate">
-              {sessionTitle(session, t("workspaceSshTerminal.title"))}
+              {tab.kind === "sftp"
+                ? `${t("workspaceSshTerminal.sftpTab")} · ${sessionTitle(session, t("workspaceSshTerminal.title"))}`
+                : sessionTitle(session, t("workspaceSshTerminal.title"))}
             </span>
             <span
               role="button"
@@ -230,13 +259,13 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
               title={t("workspaceSshTerminal.closeTab")}
               onClick={(event) => {
                 event.stopPropagation();
-                closeTab(session.id);
+                closeTab(tab.id);
               }}
               onKeyDown={(event) => {
                 if (event.key !== "Enter" && event.key !== " ") return;
                 event.preventDefault();
                 event.stopPropagation();
-                closeTab(session.id);
+                closeTab(tab.id);
               }}
             >
               <X className="h-3 w-3" />
@@ -253,22 +282,31 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
       ) : null}
 
       <div className="relative min-h-0 flex-1 bg-background">
-        {openSessions.length > 0 ? (
-          openSessions.map((session) => {
-            const isActiveTerminal = isVisible && isOpen && activeSessionId === session.id;
+        {openTabRecords.length > 0 ? (
+          openTabRecords.map(({ tab, session }) => {
+            const isActiveTerminal = isVisible && isOpen && activeTabId === tab.id;
             return (
               <div
-                key={session.id}
+                key={tab.id}
                 aria-hidden={!isActiveTerminal}
                 className={cn("absolute inset-0 min-h-0", isActiveTerminal ? "block" : "hidden")}
               >
-                <XTermViewport
-                  client={client}
-                  session={session}
-                  theme={theme}
-                  isActive={isActiveTerminal}
-                  onError={setError}
-                />
+                {tab.kind === "sftp" ? (
+                  <WorkspaceSftpPanel
+                    client={sftpClient}
+                    session={session}
+                    isActive={isActiveTerminal}
+                    onError={setError}
+                  />
+                ) : (
+                  <XTermViewport
+                    client={client}
+                    session={session}
+                    theme={theme}
+                    isActive={isActiveTerminal}
+                    onError={setError}
+                  />
+                )}
               </div>
             );
           })
diff --git a/crates/agent-gateway/web/src/i18n/config.ts b/crates/agent-gateway/web/src/i18n/config.ts
index daeb02575..9329afaad 100644
--- a/crates/agent-gateway/web/src/i18n/config.ts
+++ b/crates/agent-gateway/web/src/i18n/config.ts
@@ -290,6 +290,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelLatencyChecking": "检测延迟",
     "projectTools.sshTunnelLatencyValue": "延迟 {ms}ms",
     "projectTools.sshTunnelOpenBash": "进入 Bash 交互",
+    "projectTools.sshTunnelOpenSftp": "打开 SFTP 文件管理",
     "projectTools.sshTunnelPromptTitle": "确认 SSH 主机密钥",
     "projectTools.sshTunnelAuthPromptTitle": "SSH 认证",
     "projectTools.sshTunnelTrustHost": "信任并连接",
@@ -541,6 +542,51 @@ export const translations: Record<Locale, Record<string, string>> = {
     "workspaceSshTerminal.empty": "未打开 SSH 连接",
     "workspaceSshTerminal.close": "关闭 SSH 终端",
     "workspaceSshTerminal.closeTab": "关闭 SSH 标签",
+    "workspaceSshTerminal.sftpTab": "SFTP",
+    "workspaceSftp.local": "本地项目",
+    "workspaceSftp.remote": "远端设备",
+    "workspaceSftp.projectRoot": "项目",
+    "workspaceSftp.entry.folder": "文件夹",
+    "workspaceSftp.entry.file": "文件",
+    "workspaceSftp.loading": "正在加载目录...",
+    "workspaceSftp.empty": "目录为空",
+    "workspaceSftp.refresh": "刷新",
+    "workspaceSftp.newFolder": "新建文件夹",
+    "workspaceSftp.newFolderPrompt": "请输入文件夹名称",
+    "workspaceSftp.creatingFolder": "正在创建文件夹",
+    "workspaceSftp.rename": "重命名",
+    "workspaceSftp.renamePrompt": "请输入新名称",
+    "workspaceSftp.renaming": "正在重命名",
+    "workspaceSftp.delete": "删除",
+    "workspaceSftp.deleting": "正在删除",
+    "workspaceSftp.copyPath": "复制路径",
+    "workspaceSftp.copyPathCopied": "已复制绝对路径",
+    "workspaceSftp.copyPathFallback": "复制此路径",
+    "workspaceSftp.selectedCount": "已选择 {count} 项",
+    "workspaceSftp.clearSelection": "清除",
+    "workspaceSftp.uploadToRemote": "上传远端",
+    "workspaceSftp.downloadToLocal": "下载至本地",
+    "workspaceSftp.dropHere": "释放到这里",
+    "workspaceSftp.drop.upload": "上传到远端",
+    "workspaceSftp.drop.download": "下载到本地",
+    "workspaceSftp.confirmOverwrite": "确认覆盖目标",
+    "workspaceSftp.confirmOverwriteSubtitle": "目标路径已存在，继续会覆盖现有内容。",
+    "workspaceSftp.overwrite": "覆盖",
+    "workspaceSftp.confirmDeleteFile": "确认删除文件",
+    "workspaceSftp.confirmDeleteFileSubtitle": "此文件会被删除，操作无法撤销。",
+    "workspaceSftp.confirmDeleteDirectory": "确认递归删除目录",
+    "workspaceSftp.confirmDeleteDirectorySubtitle": "此目录及其所有内容会被递归删除，操作无法撤销。",
+    "workspaceSftp.deleteConfirm": "删除",
+    "workspaceSftp.cancel": "取消",
+    "workspaceSftp.disconnected": "SSH 连接未连接",
+    "workspaceSftp.disconnectedHint": "SFTP 需要当前 SSH 会话保持连接。请重新连接后再试。",
+    "workspaceSftp.transfer.idle": "无传输任务",
+    "workspaceSftp.transfer.queued": "排队中",
+    "workspaceSftp.transfer.running": "传输中",
+    "workspaceSftp.transfer.completed": "已完成",
+    "workspaceSftp.transfer.failed": "传输失败",
+    "workspaceSftp.transfer.cancelled": "已取消",
+    "workspaceSftp.transfer.files": "文件",
     "workspaceSshTerminal.connected": "已连接",
     "workspaceSshTerminal.reconnecting": "重连中 {attempt}/{max}",
     "workspaceSshTerminal.disconnected": "已断连",
@@ -1664,6 +1710,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelLatencyChecking": "Checking latency",
     "projectTools.sshTunnelLatencyValue": "Latency {ms}ms",
     "projectTools.sshTunnelOpenBash": "Open Bash",
+    "projectTools.sshTunnelOpenSftp": "Open SFTP file manager",
     "projectTools.sshTunnelPromptTitle": "Confirm SSH host key",
     "projectTools.sshTunnelAuthPromptTitle": "SSH authentication",
     "projectTools.sshTunnelTrustHost": "Trust and connect",
@@ -1924,6 +1971,51 @@ export const translations: Record<Locale, Record<string, string>> = {
     "workspaceSshTerminal.empty": "No SSH connection open",
     "workspaceSshTerminal.close": "Close SSH terminal",
     "workspaceSshTerminal.closeTab": "Close SSH tab",
+    "workspaceSshTerminal.sftpTab": "SFTP",
+    "workspaceSftp.local": "Local Project",
+    "workspaceSftp.remote": "Remote Device",
+    "workspaceSftp.projectRoot": "Project",
+    "workspaceSftp.entry.folder": "Folder",
+    "workspaceSftp.entry.file": "File",
+    "workspaceSftp.loading": "Loading directory...",
+    "workspaceSftp.empty": "Directory is empty",
+    "workspaceSftp.refresh": "Refresh",
+    "workspaceSftp.newFolder": "New Folder",
+    "workspaceSftp.newFolderPrompt": "Folder name",
+    "workspaceSftp.creatingFolder": "Creating folder",
+    "workspaceSftp.rename": "Rename",
+    "workspaceSftp.renamePrompt": "New name",
+    "workspaceSftp.renaming": "Renaming",
+    "workspaceSftp.delete": "Delete",
+    "workspaceSftp.deleting": "Deleting",
+    "workspaceSftp.copyPath": "Copy Path",
+    "workspaceSftp.copyPathCopied": "Copied Absolute Path",
+    "workspaceSftp.copyPathFallback": "Copy this path",
+    "workspaceSftp.selectedCount": "{count} selected",
+    "workspaceSftp.clearSelection": "Clear",
+    "workspaceSftp.uploadToRemote": "Upload to remote folder",
+    "workspaceSftp.downloadToLocal": "Download to local folder",
+    "workspaceSftp.dropHere": "Drop files here",
+    "workspaceSftp.drop.upload": "Upload to remote",
+    "workspaceSftp.drop.download": "Download to local",
+    "workspaceSftp.confirmOverwrite": "Confirm overwrite",
+    "workspaceSftp.confirmOverwriteSubtitle": "The target path already exists. Continuing will overwrite existing content.",
+    "workspaceSftp.overwrite": "Overwrite",
+    "workspaceSftp.confirmDeleteFile": "Confirm file deletion",
+    "workspaceSftp.confirmDeleteFileSubtitle": "This file will be deleted. This cannot be undone.",
+    "workspaceSftp.confirmDeleteDirectory": "Confirm recursive directory deletion",
+    "workspaceSftp.confirmDeleteDirectorySubtitle": "This directory and all of its contents will be deleted recursively. This cannot be undone.",
+    "workspaceSftp.deleteConfirm": "Delete",
+    "workspaceSftp.cancel": "Cancel",
+    "workspaceSftp.disconnected": "SSH connection is not connected",
+    "workspaceSftp.disconnectedHint": "SFTP requires the SSH session to stay connected. Reconnect and try again.",
+    "workspaceSftp.transfer.idle": "No transfer",
+    "workspaceSftp.transfer.queued": "Queued",
+    "workspaceSftp.transfer.running": "Transferring",
+    "workspaceSftp.transfer.completed": "Completed",
+    "workspaceSftp.transfer.failed": "Failed",
+    "workspaceSftp.transfer.cancelled": "Cancelled",
+    "workspaceSftp.transfer.files": "files",
     "workspaceSshTerminal.connected": "Connected",
     "workspaceSshTerminal.reconnecting": "Reconnecting {attempt}/{max}",
     "workspaceSshTerminal.disconnected": "Disconnected",
diff --git a/crates/agent-gateway/web/src/lib/gatewaySocket.ts b/crates/agent-gateway/web/src/lib/gatewaySocket.ts
index 4387fea1e..1709946bb 100644
--- a/crates/agent-gateway/web/src/lib/gatewaySocket.ts
+++ b/crates/agent-gateway/web/src/lib/gatewaySocket.ts
@@ -15,6 +15,15 @@ import type {
   TerminalSshMetadata,
   TerminalSshPrompt,
 } from "@/lib/terminal/types";
+import type {
+  SftpActionResponse,
+  SftpEntry,
+  SftpListResponse,
+  SftpStatResponse,
+  SftpTransfer,
+  SftpTransferEvent,
+  SftpTransferResponse,
+} from "@/lib/sftp/types";
 
 import type {
   AgentStatus,
@@ -48,6 +57,7 @@ type HistoryListener = (event: GatewayHistoryEvent) => void;
 type ConversationListener = (event: ChatEvent) => void;
 type SettingsListener = (event: GatewaySettingsSyncPayload) => void;
 type TerminalListener = (event: TerminalEvent) => void;
+type SftpTransferListener = (event: SftpTransferEvent) => void;
 
 type PendingRequest = {
   resolve: (value: any) => void;
@@ -269,6 +279,7 @@ type RawTerminalSshMetadata = Partial<TerminalSshMetadata> & {
   auth_type?: string;
   reconnect_attempt?: number;
   reconnect_max_attempts?: number;
+  sftp_enabled?: boolean;
 };
 
 type RawTerminalSshPrompt = Partial<TerminalSshPrompt> & {
@@ -316,6 +327,32 @@ type RawTerminalEvent = {
   output_end_offset?: number;
 };
 
+type RawSftpEntry = Partial<SftpEntry> & {
+  size_bytes?: number;
+};
+
+type RawSftpTransfer = Partial<SftpTransfer> & {
+  session_id?: string;
+  source_path?: string;
+  target_path?: string;
+  current_path?: string;
+  bytes_done?: number;
+  bytes_total?: number;
+  files_done?: number;
+  files_total?: number;
+};
+
+type RawSftpResponse = Partial<SftpListResponse & SftpStatResponse & SftpActionResponse> & {
+  entries?: RawSftpEntry[];
+  entry?: RawSftpEntry | null;
+  transfer?: RawSftpTransfer | null;
+};
+
+type RawSftpEvent = {
+  kind?: string;
+  transfer?: RawSftpTransfer | null;
+};
+
 class AsyncEventQueue<T> implements AsyncIterable<T>, AsyncIterator<T> {
   private values: T[] = [];
   private waiters: Array<{
@@ -545,6 +582,7 @@ function normalizeTerminalSshMetadata(input: RawTerminalSshMetadata): TerminalSs
     status: input.status ?? "connected",
     reconnectAttempt: Number(input.reconnectAttempt ?? input.reconnect_attempt ?? 0),
     reconnectMaxAttempts: Number(input.reconnectMaxAttempts ?? input.reconnect_max_attempts ?? 3),
+    sftpEnabled: input.sftpEnabled ?? input.sftp_enabled ?? false,
   };
 }
 
@@ -568,6 +606,80 @@ function normalizeTerminalSshPrompt(
   };
 }
 
+function normalizeSftpEntry(entry: RawSftpEntry): SftpEntry {
+  return {
+    path: entry.path ?? "",
+    name: entry.name ?? "",
+    kind: entry.kind ?? "file",
+    sizeBytes: Number(entry.sizeBytes ?? entry.size_bytes ?? 0),
+    mtime: Number(entry.mtime ?? 0),
+  };
+}
+
+function normalizeSftpTransfer(transfer: RawSftpTransfer): SftpTransfer {
+  return {
+    id: transfer.id ?? "",
+    sessionId: transfer.sessionId ?? transfer.session_id ?? "",
+    direction: transfer.direction ?? "",
+    status: transfer.status ?? "",
+    sourcePath: transfer.sourcePath ?? transfer.source_path ?? "",
+    targetPath: transfer.targetPath ?? transfer.target_path ?? "",
+    currentPath: transfer.currentPath ?? transfer.current_path ?? "",
+    bytesDone: Number(transfer.bytesDone ?? transfer.bytes_done ?? 0),
+    bytesTotal: Number(transfer.bytesTotal ?? transfer.bytes_total ?? 0),
+    filesDone: Number(transfer.filesDone ?? transfer.files_done ?? 0),
+    filesTotal: Number(transfer.filesTotal ?? transfer.files_total ?? 0),
+    error: transfer.error ?? null,
+  };
+}
+
+function normalizeSftpListResponse(response: RawSftpResponse): SftpListResponse {
+  return {
+    path: response.path ?? "",
+    entries: (response.entries ?? []).map(normalizeSftpEntry),
+  };
+}
+
+function normalizeSftpStatResponse(response: RawSftpResponse): SftpStatResponse {
+  return {
+    exists: response.exists === true,
+    entry: response.entry ? normalizeSftpEntry(response.entry) : null,
+  };
+}
+
+function normalizeSftpActionResponse(response: RawSftpResponse): SftpActionResponse {
+  return {
+    action: response.action ?? "",
+    path: response.path ?? "",
+    entry: response.entry ? normalizeSftpEntry(response.entry) : null,
+    transfer: response.transfer ? normalizeSftpTransfer(response.transfer) : null,
+  };
+}
+
+function normalizeSftpTransferResponse(response: RawSftpResponse): SftpTransferResponse {
+  if (!response.transfer) {
+    throw new Error("SFTP transfer response did not include a transfer");
+  }
+  return { transfer: normalizeSftpTransfer(response.transfer) };
+}
+
+function normalizeSftpTransferEvent(event: RawSftpEvent): SftpTransferEvent | null {
+  if (!event.transfer) return null;
+  return {
+    kind: event.kind ?? "",
+    transfer: normalizeSftpTransfer(event.transfer),
+  };
+}
+
+function sftpPathPayload(side: "local" | "remote", path = "") {
+  return {
+    side,
+    direction: side,
+    local_path: side === "local" ? String(path) : "",
+    remote_path: side === "remote" ? String(path) : "",
+  };
+}
+
 function normalizeTerminalSnapshot(input: RawTerminalResponse): TerminalSnapshot {
   if (!input.session) {
     throw new Error("Terminal response did not include a session");
@@ -771,6 +883,7 @@ export class GatewayWebSocketClient {
   private conversationListeners = new Set<ConversationListener>();
   private settingsListeners = new Set<SettingsListener>();
   private terminalListeners = new Set<TerminalListener>();
+  private sftpTransferListeners = new Set<SftpTransferListener>();
   private terminalSessionSnapshot = new Map<string, TerminalSession>();
   private statusPollTimer: number | null = null;
   private lastStatus: AgentStatus | null = null;
@@ -875,6 +988,13 @@ export class GatewayWebSocketClient {
     };
   }
 
+  subscribeSftpTransfers(listener: SftpTransferListener): () => void {
+    this.sftpTransferListeners.add(listener);
+    return () => {
+      this.sftpTransferListeners.delete(listener);
+    };
+  }
+
   async *chat(
     message: string,
     conversationId?: string,
@@ -1097,6 +1217,128 @@ export class GatewayWebSocketClient {
     return this.request<T>(requestType, { workdir, args });
   }
 
+  async sftpList(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path?: string;
+  }): Promise<SftpListResponse> {
+    return normalizeSftpListResponse(
+      await this.request<RawSftpResponse>("sftp.list", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        ...sftpPathPayload(params.side, params.path ?? ""),
+      }),
+    );
+  }
+
+  async sftpStat(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path?: string;
+  }): Promise<SftpStatResponse> {
+    return normalizeSftpStatResponse(
+      await this.request<RawSftpResponse>("sftp.stat", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        ...sftpPathPayload(params.side, params.path ?? ""),
+      }),
+    );
+  }
+
+  async sftpMkdir(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path: string;
+  }): Promise<SftpActionResponse> {
+    return normalizeSftpActionResponse(
+      await this.request<RawSftpResponse>("sftp.mkdir", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        ...sftpPathPayload(params.side, params.path),
+      }),
+    );
+  }
+
+  async sftpRename(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    fromPath: string;
+    toPath: string;
+  }): Promise<SftpActionResponse> {
+    return normalizeSftpActionResponse(
+      await this.request<RawSftpResponse>("sftp.rename", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        direction: params.side,
+        from_path: params.fromPath,
+        to_path: params.toPath,
+      }),
+    );
+  }
+
+  async sftpDelete(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path: string;
+    recursive?: boolean;
+  }): Promise<SftpActionResponse> {
+    return normalizeSftpActionResponse(
+      await this.request<RawSftpResponse>("sftp.delete", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        ...sftpPathPayload(params.side, params.path),
+        recursive: params.recursive ?? false,
+      }),
+    );
+  }
+
+  async sftpTransfer(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    direction: "upload" | "download";
+    sourcePath: string;
+    targetPath: string;
+    recursive?: boolean;
+    overwrite?: boolean;
+  }): Promise<SftpTransferResponse> {
+    return normalizeSftpTransferResponse(
+      await this.request<RawSftpResponse>("sftp.transfer", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        direction: params.direction,
+        from_path: params.sourcePath,
+        target_path: params.targetPath,
+        recursive: params.recursive ?? false,
+        overwrite: params.overwrite ?? false,
+      }),
+    );
+  }
+
+  async sftpCancelTransfer(params: { sessionId: string; transferId: string }): Promise<void> {
+    await this.request("sftp.cancel", {
+      session_id: params.sessionId,
+      from_path: params.transferId,
+    });
+  }
+
   async terminalShellOptions(): Promise<TerminalShellOptions> {
     return normalizeTerminalShellOptions(
       await this.requestWithRecovery<RawTerminalResponse>("terminal.shell_options", {}),
@@ -1139,6 +1381,7 @@ export class GatewayWebSocketClient {
     title?: string;
     cols?: number;
     rows?: number;
+    sftpEnabled?: boolean;
   }): Promise<TerminalSshCreateResult> {
     return normalizeTerminalSshCreateResult(
       await this.request<RawTerminalResponse>("terminal.create_ssh", {
@@ -1148,6 +1391,7 @@ export class GatewayWebSocketClient {
         title: params.title,
         cols: params.cols,
         rows: params.rows,
+        sftp_enabled: params.sftpEnabled ?? false,
       }),
     );
   }
@@ -1665,7 +1909,8 @@ export class GatewayWebSocketClient {
         this.historyListeners.size > 0 ||
         this.conversationListeners.size > 0 ||
         this.settingsListeners.size > 0 ||
-        this.terminalListeners.size > 0)
+        this.terminalListeners.size > 0 ||
+        this.sftpTransferListeners.size > 0)
     );
   }
 
@@ -1790,6 +2035,12 @@ export class GatewayWebSocketClient {
     }
   }
 
+  private emitSftpTransfer(event: SftpTransferEvent) {
+    for (const listener of this.sftpTransferListeners) {
+      listener(event);
+    }
+  }
+
   private async requestWithRecovery<T>(type: string, payload: unknown): Promise<T> {
     try {
       return await this.request<T>(type, payload);
@@ -2130,6 +2381,14 @@ export class GatewayWebSocketClient {
       return;
     }
 
+    if (envelope.type === "sftp.event") {
+      const event = normalizeSftpTransferEvent(envelope.payload as RawSftpEvent);
+      if (event) {
+        this.emitSftpTransfer(event);
+      }
+      return;
+    }
+
     if ((envelope.type === "chat.event" || envelope.type === "chat.control") && requestId) {
       const stream = this.chatStreams.get(requestId);
       if (!stream) {
@@ -2318,6 +2577,7 @@ export type GatewayWebSocketClientLike = {
   subscribeConversation(listener: ConversationListener): () => void;
   subscribeSettings(listener: SettingsListener): () => void;
   subscribeTerminal(listener: TerminalListener): () => void;
+  subscribeSftpTransfers(listener: SftpTransferListener): () => void;
   chat(
     message: string,
     conversationId?: string,
@@ -2337,6 +2597,54 @@ export type GatewayWebSocketClientLike = {
     workdir: string,
     args?: Record<string, unknown>,
   ): Promise<T>;
+  sftpList(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path?: string;
+  }): Promise<SftpListResponse>;
+  sftpStat(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path?: string;
+  }): Promise<SftpStatResponse>;
+  sftpMkdir(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path: string;
+  }): Promise<SftpActionResponse>;
+  sftpRename(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    fromPath: string;
+    toPath: string;
+  }): Promise<SftpActionResponse>;
+  sftpDelete(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path: string;
+    recursive?: boolean;
+  }): Promise<SftpActionResponse>;
+  sftpTransfer(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    direction: "upload" | "download";
+    sourcePath: string;
+    targetPath: string;
+    recursive?: boolean;
+    overwrite?: boolean;
+  }): Promise<SftpTransferResponse>;
+  sftpCancelTransfer(params: { sessionId: string; transferId: string }): Promise<void>;
   terminalShellOptions(): Promise<TerminalShellOptions>;
   listTerminals(projectPathKey?: string): Promise<TerminalSession[]>;
   createTerminal(params: {
@@ -2354,6 +2662,7 @@ export type GatewayWebSocketClientLike = {
     title?: string;
     cols?: number;
     rows?: number;
+    sftpEnabled?: boolean;
   }): Promise<TerminalSshCreateResult>;
   answerSshTerminalPrompt(params: {
     promptId: string;
@@ -2468,7 +2777,7 @@ type SharedWorkerClientResponseMessage = {
 type SharedWorkerClientEventMessage = {
   type: "event";
   connection_id: string;
-  event_type: "status" | "history" | "conversation" | "settings" | "terminal";
+  event_type: "status" | "history" | "conversation" | "settings" | "terminal" | "sftp";
   payload: unknown;
 };
 
@@ -2587,6 +2896,7 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
   private conversationListeners = new Set<ConversationListener>();
   private settingsListeners = new Set<SettingsListener>();
   private terminalListeners = new Set<TerminalListener>();
+  private sftpTransferListeners = new Set<SftpTransferListener>();
   private terminalSessionSnapshot = new Map<string, TerminalSession>();
   private lastStatus: AgentStatus | null = null;
   private lastStatusError: string | null = null;
@@ -2686,6 +2996,13 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
     };
   }
 
+  subscribeSftpTransfers(listener: SftpTransferListener): () => void {
+    this.sftpTransferListeners.add(listener);
+    return () => {
+      this.sftpTransferListeners.delete(listener);
+    };
+  }
+
   async *chat(
     message: string,
     conversationId?: string,
@@ -2852,6 +3169,140 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
     return this.request<T>(`git.${action}`, { workdir, args });
   }
 
+  async sftpList(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path?: string;
+  }): Promise<SftpListResponse> {
+    return normalizeSftpListResponse(
+      await this.request<RawSftpResponse>("sftp.list", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        direction: params.side,
+        local_path: params.side === "local" ? (params.path ?? "") : "",
+        remote_path: params.side === "remote" ? (params.path ?? "") : "",
+      }),
+    );
+  }
+
+  async sftpStat(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path?: string;
+  }): Promise<SftpStatResponse> {
+    return normalizeSftpStatResponse(
+      await this.request<RawSftpResponse>("sftp.stat", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        direction: params.side,
+        local_path: params.side === "local" ? (params.path ?? "") : "",
+        remote_path: params.side === "remote" ? (params.path ?? "") : "",
+      }),
+    );
+  }
+
+  async sftpMkdir(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path: string;
+  }): Promise<SftpActionResponse> {
+    return normalizeSftpActionResponse(
+      await this.request<RawSftpResponse>("sftp.mkdir", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        direction: params.side,
+        local_path: params.side === "local" ? params.path : "",
+        remote_path: params.side === "remote" ? params.path : "",
+      }),
+    );
+  }
+
+  async sftpRename(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    fromPath: string;
+    toPath: string;
+  }): Promise<SftpActionResponse> {
+    return normalizeSftpActionResponse(
+      await this.request<RawSftpResponse>("sftp.rename", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        direction: params.side,
+        from_path: params.fromPath,
+        to_path: params.toPath,
+      }),
+    );
+  }
+
+  async sftpDelete(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: "local" | "remote";
+    path: string;
+    recursive?: boolean;
+  }): Promise<SftpActionResponse> {
+    return normalizeSftpActionResponse(
+      await this.request<RawSftpResponse>("sftp.delete", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        direction: params.side,
+        local_path: params.side === "local" ? params.path : "",
+        remote_path: params.side === "remote" ? params.path : "",
+        recursive: params.recursive ?? false,
+      }),
+    );
+  }
+
+  async sftpTransfer(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    direction: "upload" | "download";
+    sourcePath: string;
+    targetPath: string;
+    recursive?: boolean;
+    overwrite?: boolean;
+  }): Promise<SftpTransferResponse> {
+    return normalizeSftpTransferResponse(
+      await this.request<RawSftpResponse>("sftp.transfer", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        direction: params.direction,
+        from_path: params.sourcePath,
+        target_path: params.targetPath,
+        recursive: params.recursive ?? false,
+        overwrite: params.overwrite ?? false,
+      }),
+    );
+  }
+
+  async sftpCancelTransfer(params: { sessionId: string; transferId: string }): Promise<void> {
+    await this.request("sftp.cancel", {
+      session_id: params.sessionId,
+      from_path: params.transferId,
+    });
+  }
+
   async terminalShellOptions(): Promise<TerminalShellOptions> {
     return normalizeTerminalShellOptions(
       await this.request<RawTerminalResponse>("terminal.shell_options", {}),
@@ -2894,6 +3345,7 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
     title?: string;
     cols?: number;
     rows?: number;
+    sftpEnabled?: boolean;
   }): Promise<TerminalSshCreateResult> {
     return normalizeTerminalSshCreateResult(
       await this.request<RawTerminalResponse>("terminal.create_ssh", {
@@ -2903,6 +3355,7 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
         title: params.title,
         cols: params.cols,
         rows: params.rows,
+        sftp_enabled: params.sftpEnabled ?? false,
       }),
     );
   }
@@ -3560,6 +4013,13 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
         }
         return;
       }
+      case "sftp": {
+        const event = normalizeSftpTransferEvent(message.payload as RawSftpEvent);
+        if (event) {
+          this.emitSftpTransfer(event);
+        }
+        return;
+      }
     }
   }
 
@@ -3647,6 +4107,12 @@ class SharedWorkerGatewayWebSocketClient implements GatewayWebSocketClientLike {
     }
   }
 
+  private emitSftpTransfer(event: SftpTransferEvent) {
+    for (const listener of this.sftpTransferListeners) {
+      listener(event);
+    }
+  }
+
   private handleDisconnect(error: Error) {
     this.clearReadyTimeout();
     if (!this.connectSettled) {
diff --git a/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts b/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts
index 04d961be9..49b204dcc 100644
--- a/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts
+++ b/crates/agent-gateway/web/src/lib/gatewaySocket.worker.ts
@@ -362,6 +362,13 @@ function getManagedClient(token: string) {
     applyTerminalSessionEvent(managed.terminalSessions, event);
     broadcastTerminal(managed, event);
   });
+  managed.client.subscribeSftpTransfers((event) => {
+    broadcast(managed, {
+      type: "event",
+      event_type: "sftp",
+      payload: event,
+    });
+  });
 
   clients.set(normalizedToken, managed);
   return managed;
@@ -608,6 +615,7 @@ async function resolveRequest(client: GatewayWebSocketClient, method: string, pa
         title: typeof body.title === "string" ? body.title : undefined,
         cols: typeof body.cols === "number" ? body.cols : undefined,
         rows: typeof body.rows === "number" ? body.rows : undefined,
+        sftpEnabled: body.sftp_enabled === true,
       });
     case "terminal.answer_ssh_prompt":
       return client.answerSshTerminalPrompt({
@@ -669,6 +677,73 @@ async function resolveRequest(client: GatewayWebSocketClient, method: string, pa
         String(body.project_path_key ?? ""),
       );
       return undefined;
+    case "sftp.list":
+      return client.sftpList({
+        sessionId: String(body.session_id ?? ""),
+        projectPathKey: String(body.project_path_key ?? ""),
+        workdir: String(body.workdir ?? ""),
+        side: body.side === "local" ? "local" : "remote",
+        path: String(
+          body.side === "local" ? (body.local_path ?? "") : (body.remote_path ?? ""),
+        ),
+      });
+    case "sftp.stat":
+      return client.sftpStat({
+        sessionId: String(body.session_id ?? ""),
+        projectPathKey: String(body.project_path_key ?? ""),
+        workdir: String(body.workdir ?? ""),
+        side: body.side === "local" ? "local" : "remote",
+        path: String(
+          body.side === "local" ? (body.local_path ?? "") : (body.remote_path ?? ""),
+        ),
+      });
+    case "sftp.mkdir":
+      return client.sftpMkdir({
+        sessionId: String(body.session_id ?? ""),
+        projectPathKey: String(body.project_path_key ?? ""),
+        workdir: String(body.workdir ?? ""),
+        side: body.side === "local" ? "local" : "remote",
+        path: String(
+          body.side === "local" ? (body.local_path ?? "") : (body.remote_path ?? ""),
+        ),
+      });
+    case "sftp.rename":
+      return client.sftpRename({
+        sessionId: String(body.session_id ?? ""),
+        projectPathKey: String(body.project_path_key ?? ""),
+        workdir: String(body.workdir ?? ""),
+        side: body.side === "local" ? "local" : "remote",
+        fromPath: String(body.from_path ?? ""),
+        toPath: String(body.to_path ?? ""),
+      });
+    case "sftp.delete":
+      return client.sftpDelete({
+        sessionId: String(body.session_id ?? ""),
+        projectPathKey: String(body.project_path_key ?? ""),
+        workdir: String(body.workdir ?? ""),
+        side: body.side === "local" ? "local" : "remote",
+        path: String(
+          body.side === "local" ? (body.local_path ?? "") : (body.remote_path ?? ""),
+        ),
+        recursive: body.recursive === true,
+      });
+    case "sftp.transfer":
+      return client.sftpTransfer({
+        sessionId: String(body.session_id ?? ""),
+        projectPathKey: String(body.project_path_key ?? ""),
+        workdir: String(body.workdir ?? ""),
+        direction: body.direction === "download" ? "download" : "upload",
+        sourcePath: String(body.from_path ?? ""),
+        targetPath: String(body.target_path ?? ""),
+        recursive: body.recursive === true,
+        overwrite: body.overwrite === true,
+      });
+    case "sftp.cancel":
+      await client.sftpCancelTransfer({
+        sessionId: String(body.session_id ?? ""),
+        transferId: String(body.from_path ?? ""),
+      });
+      return undefined;
     case "tunnel.list":
       return {
         tunnels: await client.listTunnels(),
diff --git a/crates/agent-gateway/web/src/lib/sftp/gatewaySftpClient.ts b/crates/agent-gateway/web/src/lib/sftp/gatewaySftpClient.ts
new file mode 100644
index 000000000..64f020c33
--- /dev/null
+++ b/crates/agent-gateway/web/src/lib/sftp/gatewaySftpClient.ts
@@ -0,0 +1,31 @@
+import type { GatewayWebSocketClientLike } from "@/lib/gatewaySocket";
+import type { SftpClient } from "./types";
+
+export function createGatewaySftpClient(api: GatewayWebSocketClientLike): SftpClient {
+  return {
+    list(params) {
+      return api.sftpList(params);
+    },
+    stat(params) {
+      return api.sftpStat(params);
+    },
+    mkdir(params) {
+      return api.sftpMkdir(params);
+    },
+    rename(params) {
+      return api.sftpRename(params);
+    },
+    delete(params) {
+      return api.sftpDelete(params);
+    },
+    transfer(params) {
+      return api.sftpTransfer(params);
+    },
+    cancelTransfer(params) {
+      return api.sftpCancelTransfer(params);
+    },
+    subscribeTransfers(listener) {
+      return api.subscribeSftpTransfers(listener);
+    },
+  };
+}
diff --git a/crates/agent-gateway/web/src/lib/sftp/types.ts b/crates/agent-gateway/web/src/lib/sftp/types.ts
new file mode 100644
index 000000000..1fe3d5901
--- /dev/null
+++ b/crates/agent-gateway/web/src/lib/sftp/types.ts
@@ -0,0 +1,103 @@
+export type SftpSide = "local" | "remote";
+export type SftpTransferDirection = "upload" | "download";
+
+export type SftpEntry = {
+  path: string;
+  name: string;
+  kind: "file" | "directory" | "symlink" | string;
+  sizeBytes: number;
+  mtime: number;
+};
+
+export type SftpListResponse = {
+  path: string;
+  entries: SftpEntry[];
+};
+
+export type SftpStatResponse = {
+  exists: boolean;
+  entry?: SftpEntry | null;
+};
+
+export type SftpTransfer = {
+  id: string;
+  sessionId: string;
+  direction: SftpTransferDirection | string;
+  status: "queued" | "running" | "completed" | "failed" | "cancelled" | string;
+  sourcePath: string;
+  targetPath: string;
+  currentPath: string;
+  bytesDone: number;
+  bytesTotal: number;
+  filesDone: number;
+  filesTotal: number;
+  error?: string | null;
+};
+
+export type SftpTransferResponse = {
+  transfer: SftpTransfer;
+};
+
+export type SftpTransferEvent = {
+  kind: string;
+  transfer: SftpTransfer;
+};
+
+export type SftpActionResponse = {
+  action?: string;
+  path?: string;
+  entry?: SftpEntry | null;
+  transfer?: SftpTransfer | null;
+};
+
+export type SftpClient = {
+  list(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    path?: string;
+  }): Promise<SftpListResponse>;
+  stat(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    path?: string;
+  }): Promise<SftpStatResponse>;
+  mkdir(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    path: string;
+  }): Promise<SftpActionResponse>;
+  rename(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    fromPath: string;
+    toPath: string;
+  }): Promise<SftpActionResponse>;
+  delete(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    path: string;
+    recursive?: boolean;
+  }): Promise<SftpActionResponse>;
+  transfer(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    direction: SftpTransferDirection;
+    sourcePath: string;
+    targetPath: string;
+    recursive?: boolean;
+    overwrite?: boolean;
+  }): Promise<SftpTransferResponse>;
+  cancelTransfer(params: { sessionId: string; transferId: string }): Promise<void>;
+  subscribeTransfers(listener: (event: SftpTransferEvent) => void): () => void;
+};
diff --git a/crates/agent-gateway/web/src/lib/terminal/types.ts b/crates/agent-gateway/web/src/lib/terminal/types.ts
index 952af2abd..5c13a3336 100644
--- a/crates/agent-gateway/web/src/lib/terminal/types.ts
+++ b/crates/agent-gateway/web/src/lib/terminal/types.ts
@@ -26,6 +26,7 @@ export type TerminalSshMetadata = {
   status: "connected" | "reconnecting" | "disconnected" | string;
   reconnectAttempt: number;
   reconnectMaxAttempts: number;
+  sftpEnabled: boolean;
 };
 
 export type TerminalSshPrompt = {
@@ -98,6 +99,7 @@ export type TerminalClient = {
     title?: string;
     cols?: number;
     rows?: number;
+    sftpEnabled?: boolean;
   }): Promise<TerminalSshCreateResult>;
   answerSshPrompt(params: {
     promptId: string;
diff --git a/crates/agent-gateway/web/src/shims/tauriCore.ts b/crates/agent-gateway/web/src/shims/tauriCore.ts
index edf16c790..4e4152018 100644
--- a/crates/agent-gateway/web/src/shims/tauriCore.ts
+++ b/crates/agent-gateway/web/src/shims/tauriCore.ts
@@ -131,17 +131,101 @@ async function invokeGatewayMemory<T>(command: string, args?: Record<string, unk
   });
 }
 
-function pickWorkdirInBrowser(): string | null {
-  if (typeof window === "undefined" || typeof window.prompt !== "function") {
+async function pickWorkdirInBrowser(): Promise<string | null> {
+  if (typeof window === "undefined" || typeof document === "undefined" || !document.body) {
     return null;
   }
 
-  const message = [
-    "浏览器无法直接打开远程目录选择器。",
-    "请输入桌面端 Agent 可访问的绝对工作目录路径：",
-  ].join("\n");
-  const picked = window.prompt(message, "");
-  return typeof picked === "string" && picked.trim() ? picked.trim() : null;
+  return new Promise((resolve) => {
+    const overlay = document.createElement("div");
+    overlay.className = "fixed inset-0 z-[120] flex items-center justify-center bg-black/55 p-4 backdrop-blur-sm";
+    overlay.setAttribute("role", "dialog");
+    overlay.setAttribute("aria-modal", "true");
+    overlay.setAttribute("aria-label", "选择工作目录");
+
+    const panel = document.createElement("form");
+    panel.className = "relative z-10 w-full max-w-md overflow-hidden rounded-2xl border border-border/70 bg-background shadow-2xl";
+
+    const header = document.createElement("div");
+    header.className = "border-b border-border/60 px-5 py-4";
+
+    const title = document.createElement("div");
+    title.className = "text-base font-semibold text-foreground";
+    title.textContent = "选择工作目录";
+
+    const description = document.createElement("div");
+    description.className = "mt-1 text-xs text-muted-foreground";
+    description.textContent = "浏览器无法直接打开远程目录选择器。请输入桌面端 Agent 可访问的绝对工作目录路径。";
+
+    const body = document.createElement("div");
+    body.className = "space-y-2 px-5 py-5";
+
+    const label = document.createElement("label");
+    label.className = "block text-xs font-medium text-muted-foreground";
+    label.htmlFor = "gateway-browser-workdir-path";
+    label.textContent = "工作目录路径";
+
+    const input = document.createElement("input");
+    input.id = "gateway-browser-workdir-path";
+    input.className = "h-10 w-full rounded-lg border border-input bg-background px-3 font-mono text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground/70 focus:border-ring focus:ring-2 focus:ring-ring/20";
+    input.placeholder = "/Users/name/project";
+    input.type = "text";
+
+    const footer = document.createElement("div");
+    footer.className = "flex flex-col-reverse gap-2 border-t border-border/60 bg-muted/20 px-5 py-4 sm:flex-row sm:justify-end";
+
+    const cancelButton = document.createElement("button");
+    cancelButton.type = "button";
+    cancelButton.className = "inline-flex h-9 items-center justify-center rounded-lg border border-input bg-background px-3 text-sm font-medium text-foreground transition-colors hover:bg-muted sm:w-auto";
+    cancelButton.textContent = "取消";
+
+    const confirmButton = document.createElement("button");
+    confirmButton.type = "submit";
+    confirmButton.className = "inline-flex h-9 items-center justify-center rounded-lg bg-primary px-3 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-50 sm:w-auto";
+    confirmButton.disabled = true;
+    confirmButton.textContent = "确认";
+    let closed = false;
+
+    const cleanup = (value: string | null) => {
+      if (closed) return;
+      closed = true;
+      window.removeEventListener("keydown", handleKeyDown);
+      overlay.remove();
+      resolve(value);
+    };
+
+    function handleKeyDown(event: KeyboardEvent) {
+      if (event.key === "Escape") {
+        cleanup(null);
+      }
+    }
+
+    input.addEventListener("input", () => {
+      confirmButton.disabled = input.value.trim().length === 0;
+    });
+    cancelButton.addEventListener("click", () => cleanup(null));
+    overlay.addEventListener("click", (event) => {
+      if (event.target === overlay) {
+        cleanup(null);
+      }
+    });
+    panel.addEventListener("submit", (event) => {
+      event.preventDefault();
+      const value = input.value.trim();
+      if (value) {
+        cleanup(value);
+      }
+    });
+    window.addEventListener("keydown", handleKeyDown);
+
+    header.append(title, description);
+    body.append(label, input);
+    footer.append(cancelButton, confirmButton);
+    panel.append(header, body, footer);
+    overlay.append(panel);
+    document.body.append(overlay);
+    window.requestAnimationFrame(() => input.focus());
+  });
 }
 
 export async function invoke<T>(command: string, args?: Record<string, unknown>): Promise<T> {
@@ -151,7 +235,7 @@ export async function invoke<T>(command: string, args?: Record<string, unknown>)
 
   switch (command) {
     case "system_pick_folder":
-      return pickWorkdirInBrowser() as T;
+      return (await pickWorkdirInBrowser()) as T;
     case "chat_history_list": {
       const response = await getGatewayWebSocketClient(loadToken().trim()).listHistory(
         typeof args?.page === "number" ? args.page : 1,
diff --git a/crates/agent-gui/src-tauri/Cargo.toml b/crates/agent-gui/src-tauri/Cargo.toml
index 9da7754cb..72f9e364e 100644
--- a/crates/agent-gui/src-tauri/Cargo.toml
+++ b/crates/agent-gui/src-tauri/Cargo.toml
@@ -56,6 +56,7 @@ quick-xml = "0.38.4"
 portable-pty = "0.9.0"
 wait-timeout = "0.2.1"
 russh = "0.61"
+russh-sftp = "2.3.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSButton", "NSControl", "NSView", "NSWindow"] }
diff --git a/crates/agent-gui/src-tauri/src/commands/mod.rs b/crates/agent-gui/src-tauri/src/commands/mod.rs
index 36135ed49..198c0bf76 100644
--- a/crates/agent-gui/src-tauri/src/commands/mod.rs
+++ b/crates/agent-gui/src-tauri/src/commands/mod.rs
@@ -11,6 +11,7 @@ pub mod mcp;
 pub mod memory;
 pub mod process;
 pub mod settings;
+pub mod sftp;
 pub mod shell;
 pub mod subagent_history;
 pub mod system;
diff --git a/crates/agent-gui/src-tauri/src/commands/sftp.rs b/crates/agent-gui/src-tauri/src/commands/sftp.rs
new file mode 100644
index 000000000..9127be29b
--- /dev/null
+++ b/crates/agent-gui/src-tauri/src/commands/sftp.rs
@@ -0,0 +1,131 @@
+use std::sync::Arc;
+
+use tauri::State;
+
+use crate::runtime::sftp::{
+    SftpActionResponse, SftpListResponse, SftpSessionRegistry, SftpStatResponse,
+    SftpTransferResponse,
+};
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn sftp_list(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    project_path_key: Option<String>,
+    workdir: String,
+    side: String,
+    path: Option<String>,
+) -> Result<SftpListResponse, String> {
+    registry
+        .list(session_id, project_path_key, workdir, side, path)
+        .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn sftp_stat(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    project_path_key: Option<String>,
+    workdir: String,
+    side: String,
+    path: Option<String>,
+) -> Result<SftpStatResponse, String> {
+    registry
+        .stat(session_id, project_path_key, workdir, side, path)
+        .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn sftp_mkdir(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    project_path_key: Option<String>,
+    workdir: String,
+    side: String,
+    path: String,
+) -> Result<SftpActionResponse, String> {
+    registry
+        .mkdir(session_id, project_path_key, workdir, side, path)
+        .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn sftp_rename(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    project_path_key: Option<String>,
+    workdir: String,
+    side: String,
+    from_path: String,
+    to_path: String,
+) -> Result<SftpActionResponse, String> {
+    registry
+        .rename(
+            session_id,
+            project_path_key,
+            workdir,
+            side,
+            from_path,
+            to_path,
+        )
+        .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn sftp_delete(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    project_path_key: Option<String>,
+    workdir: String,
+    side: String,
+    path: String,
+    recursive: Option<bool>,
+) -> Result<SftpActionResponse, String> {
+    registry
+        .delete(
+            session_id,
+            project_path_key,
+            workdir,
+            side,
+            path,
+            recursive.unwrap_or(false),
+        )
+        .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn sftp_transfer(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    project_path_key: Option<String>,
+    workdir: String,
+    direction: String,
+    source_path: String,
+    target_path: String,
+    recursive: Option<bool>,
+    overwrite: Option<bool>,
+) -> Result<SftpTransferResponse, String> {
+    registry
+        .inner()
+        .clone()
+        .transfer(
+            session_id,
+            project_path_key,
+            workdir,
+            direction,
+            source_path,
+            target_path,
+            recursive.unwrap_or(false),
+            overwrite.unwrap_or(false),
+        )
+        .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub fn sftp_cancel_transfer(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    transfer_id: String,
+) -> Result<(), String> {
+    registry.cancel_transfer(session_id, transfer_id)
+}
diff --git a/crates/agent-gui/src-tauri/src/commands/terminal.rs b/crates/agent-gui/src-tauri/src/commands/terminal.rs
index c7b758b50..ccce622f0 100644
--- a/crates/agent-gui/src-tauri/src/commands/terminal.rs
+++ b/crates/agent-gui/src-tauri/src/commands/terminal.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use tauri::State;
 
+use crate::runtime::sftp::SftpSessionRegistry;
 use crate::runtime::terminal::{
     terminal_shell_options as runtime_terminal_shell_options, TerminalListResponse,
     TerminalReadTailResponse, TerminalSessionRecord, TerminalSessionRegistry,
@@ -44,11 +45,20 @@ pub async fn terminal_create_ssh(
     title: Option<String>,
     cols: Option<u16>,
     rows: Option<u16>,
+    sftp_enabled: Option<bool>,
 ) -> Result<TerminalSshCreateResponse, String> {
     registry
         .inner()
         .clone()
-        .create_ssh(cwd, project_path_key, ssh_host_id, title, cols, rows)
+        .create_ssh(
+            cwd,
+            project_path_key,
+            ssh_host_id,
+            title,
+            cols,
+            rows,
+            sftp_enabled.unwrap_or(false),
+        )
         .await
 }
 
@@ -122,17 +132,25 @@ pub fn terminal_rename(
 #[tauri::command(rename_all = "snake_case")]
 pub fn terminal_close(
     registry: State<'_, Arc<TerminalSessionRegistry>>,
+    sftp_registry: State<'_, Arc<SftpSessionRegistry>>,
     session_id: String,
 ) -> Result<TerminalSessionRecord, String> {
-    registry.close(session_id)
+    let response = registry.close(session_id)?;
+    sftp_registry.close_session(&response.id);
+    Ok(response)
 }
 
 #[tauri::command(rename_all = "snake_case")]
 pub fn terminal_close_project(
     registry: State<'_, Arc<TerminalSessionRegistry>>,
+    sftp_registry: State<'_, Arc<SftpSessionRegistry>>,
     project_path_key: String,
 ) -> Result<TerminalListResponse, String> {
-    registry.close_project(project_path_key)
+    let response = registry.close_project(project_path_key)?;
+    for session in &response.sessions {
+        sftp_registry.close_session(&session.id);
+    }
+    Ok(response)
 }
 
 #[tauri::command(rename_all = "snake_case")]
diff --git a/crates/agent-gui/src-tauri/src/lib.rs b/crates/agent-gui/src-tauri/src/lib.rs
index cf44c8e4e..5235bb749 100644
--- a/crates/agent-gui/src-tauri/src/lib.rs
+++ b/crates/agent-gui/src-tauri/src/lib.rs
@@ -157,6 +157,13 @@ macro_rules! app_invoke_handler {
             commands::terminal::terminal_close,
             commands::terminal::terminal_close_project,
             commands::terminal::terminal_read_tail,
+            commands::sftp::sftp_list,
+            commands::sftp::sftp_stat,
+            commands::sftp::sftp_mkdir,
+            commands::sftp::sftp_rename,
+            commands::sftp::sftp_delete,
+            commands::sftp::sftp_transfer,
+            commands::sftp::sftp_cancel_transfer,
             commands::git::git_status,
             commands::git::git_branches,
             commands::git::git_init,
@@ -359,6 +366,9 @@ pub fn run() {
     );
     let power_activity = Arc::new(services::power_activity::PowerActivityManager::default());
     let terminal_registry = Arc::new(runtime::terminal::TerminalSessionRegistry::default());
+    let sftp_registry = Arc::new(runtime::sftp::SftpSessionRegistry::new(Arc::clone(
+        &terminal_registry,
+    )));
     let allow_exit = Arc::new(AtomicBool::new(false));
 
     let app = tauri::Builder::default()
@@ -373,11 +383,13 @@ pub fn run() {
             runtime::managed_process::ManagedProcessRegistry::default(),
         ))
         .manage(Arc::clone(&terminal_registry))
+        .manage(Arc::clone(&sftp_registry))
         .manage(Arc::clone(&allow_exit))
         .manage(Arc::clone(&cron_manager))
         .setup({
             let allow_exit = Arc::clone(&allow_exit);
             let terminal_registry = Arc::clone(&terminal_registry);
+            let sftp_registry = Arc::clone(&sftp_registry);
             move |app| {
                 commands::history_db::initialize_history_db()?;
                 configure_system_tray(
@@ -393,6 +405,7 @@ pub fn run() {
                 }
                 cron_manager.attach_app_handle(app.handle().clone())?;
                 terminal_registry.attach_app_handle(app.handle().clone());
+                sftp_registry.attach_app_handle(app.handle().clone());
                 Arc::clone(&cron_manager).start();
                 cron_manager.request_reload();
                 let gateway_controller = Arc::new(services::gateway::GatewayController::new(
@@ -400,6 +413,7 @@ pub fn run() {
                     Arc::clone(&cron_manager),
                     Arc::clone(&memory_store),
                     Arc::clone(&terminal_registry),
+                    Arc::clone(&sftp_registry),
                 ));
                 cron_manager
                     .attach_settings_sync_controller(Arc::downgrade(&gateway_controller))?;
diff --git a/crates/agent-gui/src-tauri/src/runtime/mod.rs b/crates/agent-gui/src-tauri/src/runtime/mod.rs
index 4e92a748f..2e32fbf38 100644
--- a/crates/agent-gui/src-tauri/src/runtime/mod.rs
+++ b/crates/agent-gui/src-tauri/src/runtime/mod.rs
@@ -1,6 +1,7 @@
 pub mod managed_process;
 pub mod platform;
 pub mod process;
+pub mod sftp;
 pub mod shell_runner;
 pub mod task_runner;
 pub mod terminal;
diff --git a/crates/agent-gui/src-tauri/src/runtime/sftp.rs b/crates/agent-gui/src-tauri/src/runtime/sftp.rs
new file mode 100644
index 000000000..b81c5fc2b
--- /dev/null
+++ b/crates/agent-gui/src-tauri/src/runtime/sftp.rs
@@ -0,0 +1,1763 @@
+use serde::Serialize;
+use std::collections::HashMap;
+use std::fs;
+use std::io;
+use std::path::{Component, Path, PathBuf};
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::sync::{mpsc, Arc, Mutex};
+use std::time::{SystemTime, UNIX_EPOCH};
+use tauri::{AppHandle, Emitter};
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use uuid::Uuid;
+
+use crate::runtime::platform::expand_tilde_path;
+use crate::runtime::terminal::{
+    open_sftp_connection_for_host, TerminalSessionRegistry, TerminalSftpConnection,
+    TerminalSshSessionInfo,
+};
+
+const TRANSFER_BUFFER_BYTES: usize = 64 * 1024;
+pub const SFTP_EVENT_NAME: &str = "sftp:event";
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SftpEntry {
+    pub path: String,
+    pub name: String,
+    pub kind: String,
+    pub size_bytes: u64,
+    pub mtime: u64,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SftpListResponse {
+    pub path: String,
+    pub entries: Vec<SftpEntry>,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SftpStatResponse {
+    pub exists: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entry: Option<SftpEntry>,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SftpTransferState {
+    pub id: String,
+    pub session_id: String,
+    pub direction: String,
+    pub status: String,
+    pub source_path: String,
+    pub target_path: String,
+    pub current_path: String,
+    pub bytes_done: u64,
+    pub bytes_total: u64,
+    pub files_done: u32,
+    pub files_total: u32,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SftpTransferResponse {
+    pub transfer: SftpTransferState,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SftpEventPayload {
+    pub kind: String,
+    pub transfer: SftpTransferState,
+}
+
+#[derive(Debug, Clone)]
+pub struct SftpEvent {
+    pub payload: SftpEventPayload,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SftpActionResponse {
+    pub action: String,
+    pub path: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entry: Option<SftpEntry>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transfer: Option<SftpTransferState>,
+}
+
+pub struct SftpSessionRegistry {
+    terminal_registry: Arc<TerminalSessionRegistry>,
+    sessions: Mutex<HashMap<String, Arc<tokio::sync::Mutex<TerminalSftpConnection>>>>,
+    transfers: Mutex<HashMap<String, Arc<SftpTransferTask>>>,
+    app_handle: Mutex<Option<AppHandle>>,
+    subscribers: Arc<Mutex<HashMap<usize, mpsc::Sender<SftpEvent>>>>,
+    next_subscriber_id: AtomicUsize,
+}
+
+struct SftpTransferTask {
+    cancelled: AtomicBool,
+}
+
+#[derive(Clone)]
+struct LocalDirPlan {
+    rel: String,
+}
+
+#[derive(Clone)]
+struct LocalFilePlan {
+    abs: PathBuf,
+    rel: String,
+    size: u64,
+}
+
+#[derive(Clone)]
+struct RemoteDirPlan {
+    rel: String,
+}
+
+#[derive(Clone)]
+struct RemoteFilePlan {
+    path: String,
+    rel: String,
+    size: u64,
+}
+
+impl SftpSessionRegistry {
+    pub fn new(terminal_registry: Arc<TerminalSessionRegistry>) -> Self {
+        Self {
+            terminal_registry,
+            sessions: Mutex::new(HashMap::new()),
+            transfers: Mutex::new(HashMap::new()),
+            app_handle: Mutex::new(None),
+            subscribers: Arc::new(Mutex::new(HashMap::new())),
+            next_subscriber_id: AtomicUsize::new(0),
+        }
+    }
+
+    pub fn attach_app_handle(&self, app_handle: AppHandle) {
+        if let Ok(mut slot) = self.app_handle.lock() {
+            *slot = Some(app_handle);
+        }
+    }
+
+    pub fn subscribe(&self) -> (mpsc::Receiver<SftpEvent>, SftpSubscriberGuard) {
+        let (tx, rx) = mpsc::channel();
+        let id = self.next_subscriber_id.fetch_add(1, Ordering::SeqCst);
+        if let Ok(mut subscribers) = self.subscribers.lock() {
+            subscribers.insert(id, tx);
+        }
+        (
+            rx,
+            SftpSubscriberGuard {
+                id,
+                subscribers: Arc::clone(&self.subscribers),
+            },
+        )
+    }
+
+    pub fn close_session(&self, session_id: &str) {
+        let session_id = session_id.trim();
+        if session_id.is_empty() {
+            return;
+        }
+        if let Ok(mut sessions) = self.sessions.lock() {
+            sessions.remove(session_id);
+        }
+        if let Ok(mut transfers) = self.transfers.lock() {
+            let prefix = format!("{session_id}:");
+            for task in transfers
+                .iter()
+                .filter_map(|(id, task)| id.starts_with(&prefix).then_some(Arc::clone(task)))
+            {
+                task.cancelled.store(true, Ordering::SeqCst);
+            }
+            transfers.retain(|id, _| !id.starts_with(&prefix));
+        }
+    }
+
+    pub async fn list(
+        &self,
+        session_id: String,
+        project_path_key: Option<String>,
+        workdir: String,
+        side: String,
+        path: Option<String>,
+    ) -> Result<SftpListResponse, String> {
+        match normalize_side(&side)?.as_str() {
+            "local" => {
+                let workdir =
+                    self.workdir_for_session(&session_id, project_path_key.as_deref(), &workdir)?;
+                self.list_local(workdir, path)
+            }
+            "remote" => {
+                self.ensure_session_allowed(&session_id, project_path_key.as_deref())?;
+                self.list_remote(session_id, path).await
+            }
+            _ => Err("side must be local or remote".to_string()),
+        }
+    }
+
+    pub async fn stat(
+        &self,
+        session_id: String,
+        project_path_key: Option<String>,
+        workdir: String,
+        side: String,
+        path: Option<String>,
+    ) -> Result<SftpStatResponse, String> {
+        match normalize_side(&side)?.as_str() {
+            "local" => {
+                let workdir =
+                    self.workdir_for_session(&session_id, project_path_key.as_deref(), &workdir)?;
+                self.stat_local(workdir, path)
+            }
+            "remote" => {
+                self.ensure_session_allowed(&session_id, project_path_key.as_deref())?;
+                self.stat_remote(session_id, path).await
+            }
+            _ => Err("side must be local or remote".to_string()),
+        }
+    }
+
+    pub async fn mkdir(
+        &self,
+        session_id: String,
+        project_path_key: Option<String>,
+        workdir: String,
+        side: String,
+        path: String,
+    ) -> Result<SftpActionResponse, String> {
+        match normalize_side(&side)?.as_str() {
+            "local" => {
+                let workdir =
+                    self.workdir_for_session(&session_id, project_path_key.as_deref(), &workdir)?;
+                let target = resolve_local_target(&workdir, &path)?;
+                fs::create_dir_all(&target)
+                    .map_err(|error| format!("failed to create folder: {error}"))?;
+                let entry = local_entry_from_abs(&workdir, &target)?;
+                Ok(SftpActionResponse {
+                    action: "mkdir".to_string(),
+                    path: entry.path.clone(),
+                    entry: Some(entry),
+                    transfer: None,
+                })
+            }
+            "remote" => {
+                self.ensure_session_allowed(&session_id, project_path_key.as_deref())?;
+                let remote_path = normalize_remote_path(&path);
+                let connection = self.connection_for_session(&session_id).await?;
+                let guard = connection.lock().await;
+                guard
+                    .session
+                    .create_dir(remote_path.clone())
+                    .await
+                    .map_err(|error| format!("remote mkdir failed: {error}"))?;
+                let entry = remote_entry_from_metadata(&guard.session, &remote_path).await?;
+                Ok(SftpActionResponse {
+                    action: "mkdir".to_string(),
+                    path: remote_path,
+                    entry: Some(entry),
+                    transfer: None,
+                })
+            }
+            _ => Err("side must be local or remote".to_string()),
+        }
+    }
+
+    pub async fn rename(
+        &self,
+        session_id: String,
+        project_path_key: Option<String>,
+        workdir: String,
+        side: String,
+        from_path: String,
+        to_path: String,
+    ) -> Result<SftpActionResponse, String> {
+        match normalize_side(&side)?.as_str() {
+            "local" => {
+                let workdir =
+                    self.workdir_for_session(&session_id, project_path_key.as_deref(), &workdir)?;
+                let from = resolve_existing_local_entry(&workdir, &from_path)?;
+                let to = resolve_local_target(&workdir, &to_path)?;
+                if let Some(parent) = to.parent() {
+                    fs::create_dir_all(parent)
+                        .map_err(|error| format!("failed to create parent folder: {error}"))?;
+                    ensure_path_inside(&workdir, parent)?;
+                }
+                fs::rename(&from, &to).map_err(|error| format!("local rename failed: {error}"))?;
+                let entry = local_entry_from_abs(&workdir, &to)?;
+                Ok(SftpActionResponse {
+                    action: "rename".to_string(),
+                    path: entry.path.clone(),
+                    entry: Some(entry),
+                    transfer: None,
+                })
+            }
+            "remote" => {
+                self.ensure_session_allowed(&session_id, project_path_key.as_deref())?;
+                let from = normalize_remote_path(&from_path);
+                let to = normalize_remote_path(&to_path);
+                let connection = self.connection_for_session(&session_id).await?;
+                let guard = connection.lock().await;
+                guard
+                    .session
+                    .rename(from, to.clone())
+                    .await
+                    .map_err(|error| format!("remote rename failed: {error}"))?;
+                let entry = remote_entry_from_metadata(&guard.session, &to).await?;
+                Ok(SftpActionResponse {
+                    action: "rename".to_string(),
+                    path: to,
+                    entry: Some(entry),
+                    transfer: None,
+                })
+            }
+            _ => Err("side must be local or remote".to_string()),
+        }
+    }
+
+    pub async fn delete(
+        &self,
+        session_id: String,
+        project_path_key: Option<String>,
+        workdir: String,
+        side: String,
+        path: String,
+        recursive: bool,
+    ) -> Result<SftpActionResponse, String> {
+        match normalize_side(&side)?.as_str() {
+            "local" => {
+                let workdir =
+                    self.workdir_for_session(&session_id, project_path_key.as_deref(), &workdir)?;
+                let target = resolve_existing_local_entry(&workdir, &path)?;
+                let md = fs::symlink_metadata(&target)
+                    .map_err(|error| format!("local stat failed: {error}"))?;
+                if md.file_type().is_symlink() {
+                    fs::remove_file(&target)
+                        .map_err(|error| format!("local delete failed: {error}"))?;
+                } else if md.is_dir() {
+                    if !recursive {
+                        return Err("recursive is required to delete a directory".to_string());
+                    }
+                    fs::remove_dir_all(&target)
+                        .map_err(|error| format!("local recursive delete failed: {error}"))?;
+                } else {
+                    fs::remove_file(&target)
+                        .map_err(|error| format!("local delete failed: {error}"))?;
+                }
+                Ok(SftpActionResponse {
+                    action: "delete".to_string(),
+                    path: normalize_local_path(&path),
+                    entry: None,
+                    transfer: None,
+                })
+            }
+            "remote" => {
+                self.ensure_session_allowed(&session_id, project_path_key.as_deref())?;
+                let remote_path = normalize_remote_path(&path);
+                let connection = self.connection_for_session(&session_id).await?;
+                let guard = connection.lock().await;
+                delete_remote_path(&guard.session, &remote_path, recursive).await?;
+                Ok(SftpActionResponse {
+                    action: "delete".to_string(),
+                    path: remote_path,
+                    entry: None,
+                    transfer: None,
+                })
+            }
+            _ => Err("side must be local or remote".to_string()),
+        }
+    }
+
+    pub async fn transfer(
+        self: &Arc<Self>,
+        session_id: String,
+        project_path_key: Option<String>,
+        workdir: String,
+        direction: String,
+        source_path: String,
+        target_path: String,
+        recursive: bool,
+        overwrite: bool,
+    ) -> Result<SftpTransferResponse, String> {
+        let workdir =
+            self.workdir_for_session(&session_id, project_path_key.as_deref(), &workdir)?;
+        let direction = normalize_transfer_direction(&direction)?;
+        let transfer_id = Uuid::new_v4().to_string();
+        let task_key = format!("{}:{}", session_id.trim(), transfer_id);
+        let task = Arc::new(SftpTransferTask {
+            cancelled: AtomicBool::new(false),
+        });
+        self.transfers
+            .lock()
+            .map_err(|_| "SFTP transfer registry poisoned".to_string())?
+            .insert(task_key.clone(), Arc::clone(&task));
+
+        let initial = SftpTransferState {
+            id: transfer_id.clone(),
+            session_id: session_id.clone(),
+            direction: direction.clone(),
+            status: "queued".to_string(),
+            source_path: normalize_transfer_source_path(&direction, &source_path),
+            target_path: normalize_transfer_target_path(&direction, &target_path),
+            current_path: normalize_transfer_source_path(&direction, &source_path),
+            bytes_done: 0,
+            bytes_total: 0,
+            files_done: 0,
+            files_total: 0,
+            error: None,
+        };
+        self.broadcast("queued", initial.clone());
+
+        let failed_template = initial.clone();
+        let registry = Arc::clone(self);
+        tauri::async_runtime::spawn(async move {
+            let result = if direction == "upload" {
+                registry
+                    .upload(
+                        &session_id,
+                        &transfer_id,
+                        workdir.as_path(),
+                        &source_path,
+                        &target_path,
+                        recursive,
+                        overwrite,
+                        &task,
+                    )
+                    .await
+            } else {
+                registry
+                    .download(
+                        &session_id,
+                        &transfer_id,
+                        workdir.as_path(),
+                        &source_path,
+                        &target_path,
+                        recursive,
+                        overwrite,
+                        &task,
+                    )
+                    .await
+            };
+            if let Ok(mut transfers) = registry.transfers.lock() {
+                transfers.remove(&task_key);
+            }
+            match result {
+                Ok(transfer) => registry.broadcast(&transfer.status.clone(), transfer),
+                Err(error) => {
+                    let mut failed = failed_template;
+                    failed.status = if error.to_ascii_lowercase().contains("cancel") {
+                        "cancelled".to_string()
+                    } else {
+                        "failed".to_string()
+                    };
+                    failed.error = Some(error);
+                    registry.broadcast(&failed.status.clone(), failed);
+                }
+            }
+        });
+
+        Ok(SftpTransferResponse { transfer: initial })
+    }
+
+    pub fn cancel_transfer(&self, session_id: String, transfer_id: String) -> Result<(), String> {
+        let key = format!("{}:{}", session_id.trim(), transfer_id.trim());
+        let task = self
+            .transfers
+            .lock()
+            .map_err(|_| "SFTP transfer registry poisoned".to_string())?
+            .get(&key)
+            .cloned()
+            .ok_or_else(|| "SFTP transfer not found".to_string())?;
+        task.cancelled.store(true, Ordering::SeqCst);
+        Ok(())
+    }
+
+    fn ensure_session_allowed(
+        &self,
+        session_id: &str,
+        project_path_key: Option<&str>,
+    ) -> Result<TerminalSshSessionInfo, String> {
+        let info = self.terminal_registry.ssh_session_info(session_id)?;
+        if let Some(project_path_key) = project_path_key {
+            let wanted = workspace_project_path_key(project_path_key);
+            if !wanted.is_empty() && info.project_path_key != wanted {
+                return Err("SSH session does not belong to this project".to_string());
+            }
+        }
+        if !info.sftp_enabled {
+            return Err("SFTP is not enabled for this SSH session".to_string());
+        }
+        if !info.running {
+            return Err("SSH session is not connected".to_string());
+        }
+        Ok(info)
+    }
+
+    fn workdir_for_session(
+        &self,
+        session_id: &str,
+        project_path_key: Option<&str>,
+        requested_workdir: &str,
+    ) -> Result<PathBuf, String> {
+        let info = self.ensure_session_allowed(session_id, project_path_key)?;
+        let session_workdir = canonicalize_workdir(&info.cwd)?;
+        let requested = canonicalize_workdir(requested_workdir)?;
+        if requested != session_workdir {
+            return Err("SFTP local root must match the SSH session project".to_string());
+        }
+        Ok(session_workdir)
+    }
+
+    fn broadcast(&self, kind: &str, transfer: SftpTransferState) {
+        let payload = SftpEventPayload {
+            kind: kind.to_string(),
+            transfer,
+        };
+
+        if let Ok(app_handle) = self.app_handle.lock() {
+            if let Some(app_handle) = app_handle.as_ref() {
+                let _ = app_handle.emit(SFTP_EVENT_NAME, &payload);
+            }
+        }
+
+        let subscribers = self
+            .subscribers
+            .lock()
+            .map(|subscribers| subscribers.values().cloned().collect::<Vec<_>>())
+            .unwrap_or_default();
+        let event = SftpEvent { payload };
+        for subscriber in subscribers {
+            let _ = subscriber.send(event.clone());
+        }
+    }
+
+    async fn connection_for_session(
+        &self,
+        session_id: &str,
+    ) -> Result<Arc<tokio::sync::Mutex<TerminalSftpConnection>>, String> {
+        let session_id = session_id.trim().to_string();
+        if session_id.is_empty() {
+            return Err("session_id is required".to_string());
+        }
+        if let Some(existing) = self
+            .sessions
+            .lock()
+            .map_err(|_| "SFTP session registry poisoned".to_string())?
+            .get(&session_id)
+            .cloned()
+        {
+            return Ok(existing);
+        }
+
+        let info = self.terminal_registry.ssh_session_info(&session_id)?;
+        if !info.sftp_enabled {
+            return Err("SFTP is not enabled for this SSH session".to_string());
+        }
+        if !info.running {
+            return Err("SSH session is not connected".to_string());
+        }
+        let connection = Arc::new(tokio::sync::Mutex::new(
+            open_sftp_connection_for_host(&info.host_id).await?,
+        ));
+        self.sessions
+            .lock()
+            .map_err(|_| "SFTP session registry poisoned".to_string())?
+            .insert(session_id, Arc::clone(&connection));
+        Ok(connection)
+    }
+
+    fn invalidate_session_connection(&self, session_id: &str) {
+        if let Ok(mut sessions) = self.sessions.lock() {
+            sessions.remove(session_id.trim());
+        }
+    }
+
+    fn list_local(
+        &self,
+        workdir: PathBuf,
+        path: Option<String>,
+    ) -> Result<SftpListResponse, String> {
+        let rel = path.unwrap_or_default();
+        let target = resolve_existing_local_target(&workdir, &rel)?;
+        let md = fs::metadata(&target).map_err(|error| format!("local stat failed: {error}"))?;
+        if !md.is_dir() {
+            return Err("local path is not a directory".to_string());
+        }
+        let mut entries = fs::read_dir(&target)
+            .map_err(|error| format!("local list failed: {error}"))?
+            .filter_map(|entry| entry.ok())
+            .filter_map(|entry| local_entry_from_abs(&workdir, &entry.path()).ok())
+            .filter(|entry| entry.name != "." && entry.name != "..")
+            .collect::<Vec<_>>();
+        sort_entries(&mut entries);
+        Ok(SftpListResponse {
+            path: rel_to_workdir_str(&workdir, &target),
+            entries,
+        })
+    }
+
+    fn stat_local(
+        &self,
+        workdir: PathBuf,
+        path: Option<String>,
+    ) -> Result<SftpStatResponse, String> {
+        let rel = path.unwrap_or_default();
+        let local_rel = sanitize_local_rel_path(&rel)?;
+        let target = workdir.join(local_rel);
+        match fs::symlink_metadata(&target) {
+            Ok(_) => ensure_entry_path_inside(&workdir, &target)?,
+            Err(error) if error.kind() == io::ErrorKind::NotFound => {
+                ensure_path_inside(&workdir, &target)?;
+                return Ok(SftpStatResponse {
+                    exists: false,
+                    entry: None,
+                });
+            }
+            Err(error) => return Err(format!("local stat failed: {error}")),
+        }
+        Ok(SftpStatResponse {
+            exists: true,
+            entry: Some(local_entry_from_abs(&workdir, &target)?),
+        })
+    }
+
+    async fn list_remote(
+        &self,
+        session_id: String,
+        path: Option<String>,
+    ) -> Result<SftpListResponse, String> {
+        let remote_path = normalize_remote_path(path.as_deref().unwrap_or(""));
+        match self
+            .list_remote_once(&session_id, remote_path.clone())
+            .await
+        {
+            Ok(response) => Ok(response),
+            Err(error) if is_session_closed_error(&error) => {
+                self.invalidate_session_connection(&session_id);
+                self.list_remote_once(&session_id, remote_path).await
+            }
+            Err(error) => Err(error),
+        }
+    }
+
+    async fn list_remote_once(
+        &self,
+        session_id: &str,
+        remote_path: String,
+    ) -> Result<SftpListResponse, String> {
+        let connection = self.connection_for_session(&session_id).await?;
+        let guard = connection.lock().await;
+        let list_path = guard
+            .session
+            .canonicalize(remote_path.clone())
+            .await
+            .map(|path| normalize_remote_path(&path))
+            .unwrap_or_else(|_| remote_path.clone());
+        let mut entries = Vec::new();
+        for entry in guard
+            .session
+            .read_dir(list_path.clone())
+            .await
+            .map_err(|error| format!("remote list failed: {error}"))?
+        {
+            let name = entry.file_name();
+            if name == "." || name == ".." {
+                continue;
+            }
+            let path = join_remote_path(&list_path, &name);
+            let metadata = entry.metadata();
+            entries.push(SftpEntry {
+                path,
+                name,
+                kind: remote_kind(&metadata),
+                size_bytes: metadata.size.unwrap_or(0),
+                mtime: u64::from(metadata.mtime.unwrap_or(0)) * 1000,
+            });
+        }
+        sort_entries(&mut entries);
+        Ok(SftpListResponse {
+            path: list_path,
+            entries,
+        })
+    }
+
+    async fn stat_remote(
+        &self,
+        session_id: String,
+        path: Option<String>,
+    ) -> Result<SftpStatResponse, String> {
+        let remote_path = normalize_remote_path(path.as_deref().unwrap_or(""));
+        match self
+            .stat_remote_once(&session_id, remote_path.clone())
+            .await
+        {
+            Ok(response) => Ok(response),
+            Err(error) if is_session_closed_error(&error) => {
+                self.invalidate_session_connection(&session_id);
+                self.stat_remote_once(&session_id, remote_path).await
+            }
+            Err(error) => Err(error),
+        }
+    }
+
+    async fn stat_remote_once(
+        &self,
+        session_id: &str,
+        remote_path: String,
+    ) -> Result<SftpStatResponse, String> {
+        let connection = self.connection_for_session(&session_id).await?;
+        let guard = connection.lock().await;
+        match remote_entry_from_metadata(&guard.session, &remote_path).await {
+            Ok(entry) => Ok(SftpStatResponse {
+                exists: true,
+                entry: Some(entry),
+            }),
+            Err(error) if is_not_found_error(&error) => Ok(SftpStatResponse {
+                exists: false,
+                entry: None,
+            }),
+            Err(error) => Err(error),
+        }
+    }
+
+    async fn upload(
+        &self,
+        session_id: &str,
+        transfer_id: &str,
+        workdir: &Path,
+        source_path: &str,
+        target_path: &str,
+        recursive: bool,
+        overwrite: bool,
+        task: &SftpTransferTask,
+    ) -> Result<SftpTransferState, String> {
+        let source = resolve_existing_local_entry(&workdir, source_path)?;
+        let source_md =
+            fs::symlink_metadata(&source).map_err(|error| format!("local stat failed: {error}"))?;
+        if source_md.file_type().is_symlink() {
+            return Err("SFTP upload does not support local symlinks".to_string());
+        }
+        if source_md.is_dir() && !recursive {
+            return Err("recursive is required to upload a directory".to_string());
+        }
+        let root_name = source
+            .file_name()
+            .map(|value| value.to_string_lossy().to_string())
+            .filter(|value| !value.is_empty())
+            .unwrap_or_else(|| "upload".to_string());
+        let dirs = if source_md.is_dir() {
+            collect_local_dirs(&workdir, &source)?
+        } else {
+            Vec::new()
+        };
+        let files = collect_local_files(&workdir, &source)?;
+        let bytes_total = files.iter().map(|file| file.size).sum::<u64>();
+        let files_total = files.len().min(u32::MAX as usize) as u32;
+        let remote_base = join_remote_path(&normalize_remote_path(target_path), &root_name);
+        let connection = self.connection_for_session(session_id).await?;
+        let guard = connection.lock().await;
+        if source_md.is_dir() {
+            create_remote_dirs_for_local_root(&guard.session, &remote_base).await?;
+            for dir in &dirs {
+                check_cancelled(task)?;
+                ensure_remote_dir_all(&guard.session, &join_remote_path(&remote_base, &dir.rel))
+                    .await?;
+            }
+        }
+
+        let mut state = SftpTransferState {
+            id: transfer_id.to_string(),
+            session_id: session_id.to_string(),
+            direction: "upload".to_string(),
+            status: "running".to_string(),
+            source_path: normalize_local_path(source_path),
+            target_path: remote_base.clone(),
+            current_path: String::new(),
+            bytes_done: 0,
+            bytes_total,
+            files_done: 0,
+            files_total,
+            error: None,
+        };
+        self.broadcast("running", state.clone());
+
+        for file in files {
+            check_cancelled(task)?;
+            let remote_file_path = if source_md.is_dir() {
+                join_remote_path(&remote_base, &file.rel)
+            } else {
+                remote_base.clone()
+            };
+            state.current_path = remote_file_path.clone();
+            if !overwrite
+                && guard
+                    .session
+                    .try_exists(remote_file_path.clone())
+                    .await
+                    .unwrap_or(false)
+            {
+                return Err(format!("target already exists: {remote_file_path}"));
+            }
+            if let Some(parent) = remote_parent_path(&remote_file_path) {
+                ensure_remote_dir_all(&guard.session, &parent).await?;
+            }
+            upload_file(
+                &guard.session,
+                &file.abs,
+                &remote_file_path,
+                &mut state,
+                task,
+                self,
+            )
+            .await?;
+            state.files_done = state.files_done.saturating_add(1);
+            self.broadcast("progress", state.clone());
+        }
+        state.status = if task.cancelled.load(Ordering::SeqCst) {
+            "cancelled".to_string()
+        } else {
+            "completed".to_string()
+        };
+        Ok(state)
+    }
+
+    async fn download(
+        &self,
+        session_id: &str,
+        transfer_id: &str,
+        workdir: &Path,
+        source_path: &str,
+        target_path: &str,
+        recursive: bool,
+        overwrite: bool,
+        task: &SftpTransferTask,
+    ) -> Result<SftpTransferState, String> {
+        let local_target = resolve_local_target(&workdir, target_path)?;
+        let remote_source = normalize_remote_path(source_path);
+        let connection = self.connection_for_session(session_id).await?;
+        let guard = connection.lock().await;
+        let source_meta = guard
+            .session
+            .metadata(remote_source.clone())
+            .await
+            .map_err(|error| format!("remote stat failed: {error}"))?;
+        if source_meta.is_dir() && !recursive {
+            return Err("recursive is required to download a directory".to_string());
+        }
+        let dirs = if source_meta.is_dir() {
+            collect_remote_dirs(&guard.session, &remote_source).await?
+        } else {
+            Vec::new()
+        };
+        let files = collect_remote_files(&guard.session, &remote_source).await?;
+        let bytes_total = files.iter().map(|file| file.size).sum::<u64>();
+        let files_total = files.len().min(u32::MAX as usize) as u32;
+        let source_name = remote_basename(&remote_source).unwrap_or_else(|| "download".to_string());
+        let target_base = local_target.join(source_name);
+        ensure_path_inside(&workdir, &target_base)?;
+        if source_meta.is_dir() {
+            fs::create_dir_all(&target_base)
+                .map_err(|error| format!("failed to create local folder: {error}"))?;
+            ensure_path_inside(&workdir, &target_base)?;
+            for dir in &dirs {
+                check_cancelled(task)?;
+                let local_dir_path = target_base.join(Path::new(&dir.rel));
+                ensure_path_inside(&workdir, &local_dir_path)?;
+                fs::create_dir_all(&local_dir_path)
+                    .map_err(|error| format!("failed to create local folder: {error}"))?;
+            }
+        }
+
+        let mut state = SftpTransferState {
+            id: transfer_id.to_string(),
+            session_id: session_id.to_string(),
+            direction: "download".to_string(),
+            status: "running".to_string(),
+            source_path: remote_source.clone(),
+            target_path: rel_to_workdir_str(&workdir, &target_base),
+            current_path: String::new(),
+            bytes_done: 0,
+            bytes_total,
+            files_done: 0,
+            files_total,
+            error: None,
+        };
+        self.broadcast("running", state.clone());
+
+        for file in files {
+            check_cancelled(task)?;
+            let local_file_path = if source_meta.is_dir() {
+                target_base.join(Path::new(&file.rel))
+            } else {
+                target_base.clone()
+            };
+            ensure_path_inside(&workdir, &local_file_path)?;
+            state.current_path = rel_to_workdir_str(&workdir, &local_file_path);
+            if fs::symlink_metadata(&local_file_path)
+                .map(|metadata| metadata.file_type().is_symlink())
+                .unwrap_or(false)
+            {
+                return Err(format!("target is a local symlink: {}", state.current_path));
+            }
+            if local_file_path.exists() && !overwrite {
+                return Err(format!("target already exists: {}", state.current_path));
+            }
+            if let Some(parent) = local_file_path.parent() {
+                fs::create_dir_all(parent)
+                    .map_err(|error| format!("failed to create local folder: {error}"))?;
+                ensure_path_inside(&workdir, parent)?;
+            }
+            download_file(
+                &guard.session,
+                &file.path,
+                &local_file_path,
+                &mut state,
+                task,
+                self,
+            )
+            .await?;
+            state.files_done = state.files_done.saturating_add(1);
+            self.broadcast("progress", state.clone());
+        }
+        state.status = if task.cancelled.load(Ordering::SeqCst) {
+            "cancelled".to_string()
+        } else {
+            "completed".to_string()
+        };
+        Ok(state)
+    }
+}
+
+pub struct SftpSubscriberGuard {
+    id: usize,
+    subscribers: Arc<Mutex<HashMap<usize, mpsc::Sender<SftpEvent>>>>,
+}
+
+impl Drop for SftpSubscriberGuard {
+    fn drop(&mut self) {
+        if let Ok(mut subscribers) = self.subscribers.lock() {
+            subscribers.remove(&self.id);
+        }
+    }
+}
+
+fn normalize_side(side: &str) -> Result<String, String> {
+    let side = side.trim().to_ascii_lowercase();
+    match side.as_str() {
+        "local" | "remote" => Ok(side),
+        _ => Err("side must be local or remote".to_string()),
+    }
+}
+
+fn normalize_transfer_direction(direction: &str) -> Result<String, String> {
+    let direction = direction.trim().to_ascii_lowercase();
+    match direction.as_str() {
+        "upload" | "download" => Ok(direction),
+        _ => Err("direction must be upload or download".to_string()),
+    }
+}
+
+fn normalize_transfer_source_path(direction: &str, path: &str) -> String {
+    if direction == "upload" {
+        normalize_local_path(path)
+    } else {
+        normalize_remote_path(path)
+    }
+}
+
+fn normalize_transfer_target_path(direction: &str, path: &str) -> String {
+    if direction == "upload" {
+        normalize_remote_path(path)
+    } else {
+        normalize_local_path(path)
+    }
+}
+
+fn canonicalize_workdir(workdir: &str) -> Result<PathBuf, String> {
+    let raw = workdir.trim();
+    if raw.is_empty() {
+        return Err("workdir is required".to_string());
+    }
+    let p = expand_tilde_path(raw);
+    if !p.is_absolute() {
+        return Err("workdir must be an absolute directory".to_string());
+    }
+    let md = fs::metadata(&p).map_err(|_| "workdir must be an existing directory".to_string())?;
+    if !md.is_dir() {
+        return Err("workdir must be an existing directory".to_string());
+    }
+    fs::canonicalize(&p).map_err(|error| format!("failed to canonicalize workdir: {error}"))
+}
+
+fn normalize_local_path(path: &str) -> String {
+    path.trim().replace('\\', "/").trim_matches('/').to_string()
+}
+
+fn sanitize_local_rel_path(path: &str) -> Result<PathBuf, String> {
+    let raw = path.trim().replace('\\', "/");
+    if raw.starts_with('/') {
+        return Err("local path must stay inside the project".to_string());
+    }
+    let normalized = normalize_local_path(&raw);
+    if normalized.is_empty() {
+        return Ok(PathBuf::new());
+    }
+    let mut out = PathBuf::new();
+    for component in Path::new(&normalized).components() {
+        match component {
+            Component::Prefix(_) | Component::RootDir | Component::ParentDir => {
+                return Err("local path must stay inside the project".to_string());
+            }
+            Component::CurDir => {}
+            Component::Normal(segment) => out.push(segment),
+        }
+    }
+    Ok(out)
+}
+
+fn resolve_local_target(workdir: &Path, path: &str) -> Result<PathBuf, String> {
+    let rel = sanitize_local_rel_path(path)?;
+    let target = workdir.join(rel);
+    ensure_path_inside(workdir, &target)?;
+    Ok(target)
+}
+
+fn resolve_existing_local_target(workdir: &Path, path: &str) -> Result<PathBuf, String> {
+    let target = resolve_local_target(workdir, path)?;
+    if !target.exists() {
+        return Err("local path does not exist".to_string());
+    }
+    let canonical =
+        fs::canonicalize(&target).map_err(|error| format!("local stat failed: {error}"))?;
+    ensure_path_inside(workdir, &canonical)?;
+    Ok(canonical)
+}
+
+fn resolve_existing_local_entry(workdir: &Path, path: &str) -> Result<PathBuf, String> {
+    let rel = sanitize_local_rel_path(path)?;
+    let target = workdir.join(rel);
+    fs::symlink_metadata(&target).map_err(|_| "local path does not exist".to_string())?;
+    ensure_entry_path_inside(workdir, &target)?;
+    Ok(target)
+}
+
+fn ensure_entry_path_inside(workdir: &Path, target: &Path) -> Result<(), String> {
+    if target == workdir {
+        return Ok(());
+    }
+    let parent = target
+        .parent()
+        .ok_or_else(|| "target path is outside the project".to_string())?;
+    ensure_path_inside(workdir, parent)
+}
+
+fn ensure_path_inside(workdir: &Path, target: &Path) -> Result<(), String> {
+    if target.exists() {
+        let canonical = fs::canonicalize(target)
+            .map_err(|error| format!("failed to canonicalize target path: {error}"))?;
+        if !canonical.starts_with(workdir) {
+            return Err("target path is outside the project".to_string());
+        }
+        return Ok(());
+    }
+    let mut probe = target;
+    while !probe.exists() {
+        probe = probe
+            .parent()
+            .ok_or_else(|| "target path is outside the project".to_string())?;
+    }
+    let canonical = fs::canonicalize(probe)
+        .map_err(|error| format!("failed to canonicalize target parent: {error}"))?;
+    if !canonical.starts_with(workdir) {
+        return Err("target path is outside the project".to_string());
+    }
+    Ok(())
+}
+
+fn rel_to_workdir_str(workdir: &Path, abs: &Path) -> String {
+    abs.strip_prefix(workdir)
+        .unwrap_or(abs)
+        .to_string_lossy()
+        .replace('\\', "/")
+}
+
+fn workspace_project_path_key(value: &str) -> String {
+    value.trim().replace('\\', "/")
+}
+
+fn local_entry_from_abs(workdir: &Path, abs: &Path) -> Result<SftpEntry, String> {
+    ensure_entry_path_inside(workdir, abs)?;
+    let md = fs::symlink_metadata(abs).map_err(|error| format!("local stat failed: {error}"))?;
+    let name = abs
+        .file_name()
+        .map(|value| value.to_string_lossy().to_string())
+        .unwrap_or_else(|| {
+            workdir
+                .file_name()
+                .map(|v| v.to_string_lossy().to_string())
+                .unwrap_or_default()
+        });
+    let kind = if md.file_type().is_symlink() {
+        "symlink"
+    } else if md.is_dir() {
+        "directory"
+    } else {
+        "file"
+    }
+    .to_string();
+    Ok(SftpEntry {
+        path: rel_to_workdir_str(workdir, abs),
+        name,
+        kind,
+        size_bytes: if md.is_file() { md.len() } else { 0 },
+        mtime: system_time_ms(md.modified().ok()),
+    })
+}
+
+fn system_time_ms(value: Option<SystemTime>) -> u64 {
+    value
+        .and_then(|time| time.duration_since(UNIX_EPOCH).ok())
+        .map(|duration| duration.as_millis().min(u128::from(u64::MAX)) as u64)
+        .unwrap_or(0)
+}
+
+fn sort_entries(entries: &mut [SftpEntry]) {
+    entries.sort_by(|a, b| {
+        let left_dir = a.kind == "directory";
+        let right_dir = b.kind == "directory";
+        right_dir
+            .cmp(&left_dir)
+            .then(
+                a.name
+                    .to_ascii_lowercase()
+                    .cmp(&b.name.to_ascii_lowercase()),
+            )
+            .then(a.name.cmp(&b.name))
+    });
+}
+
+fn remote_kind(metadata: &russh_sftp::client::fs::Metadata) -> String {
+    if metadata.is_dir() {
+        "directory".to_string()
+    } else if metadata.is_symlink() {
+        "symlink".to_string()
+    } else {
+        "file".to_string()
+    }
+}
+
+async fn remote_entry_from_metadata(
+    session: &russh_sftp::client::SftpSession,
+    path: &str,
+) -> Result<SftpEntry, String> {
+    let path = normalize_remote_path(path);
+    let metadata = session
+        .metadata(path.clone())
+        .await
+        .map_err(|error| format!("remote stat failed: {error}"))?;
+    Ok(SftpEntry {
+        name: remote_basename(&path).unwrap_or_else(|| path.clone()),
+        path,
+        kind: remote_kind(&metadata),
+        size_bytes: metadata.size.unwrap_or(0),
+        mtime: u64::from(metadata.mtime.unwrap_or(0)) * 1000,
+    })
+}
+
+fn normalize_remote_path(path: &str) -> String {
+    let raw = path.trim().replace('\\', "/");
+    if raw.is_empty() || raw == "." {
+        return ".".to_string();
+    }
+    let absolute = raw.starts_with('/');
+    let mut parts = Vec::new();
+    for part in raw.split('/') {
+        let part = part.trim();
+        if part.is_empty() || part == "." {
+            continue;
+        }
+        if part == ".." {
+            continue;
+        }
+        parts.push(part);
+    }
+    if absolute {
+        if parts.is_empty() {
+            "/".to_string()
+        } else {
+            format!("/{}", parts.join("/"))
+        }
+    } else if parts.is_empty() {
+        ".".to_string()
+    } else {
+        parts.join("/")
+    }
+}
+
+fn join_remote_path(parent: &str, child: &str) -> String {
+    let child = child.trim().trim_matches('/');
+    if child.is_empty() {
+        return normalize_remote_path(parent);
+    }
+    let parent = normalize_remote_path(parent);
+    if parent == "/" {
+        format!("/{child}")
+    } else if parent == "." {
+        child.to_string()
+    } else {
+        format!("{}/{}", parent.trim_end_matches('/'), child)
+    }
+}
+
+fn remote_parent_path(path: &str) -> Option<String> {
+    let path = normalize_remote_path(path);
+    if path == "." || path == "/" {
+        return None;
+    }
+    match path.rsplit_once('/') {
+        Some(("", _)) => Some("/".to_string()),
+        Some((parent, _)) if !parent.is_empty() => Some(parent.to_string()),
+        _ => Some(".".to_string()),
+    }
+}
+
+fn remote_basename(path: &str) -> Option<String> {
+    let path = normalize_remote_path(path);
+    if path == "." || path == "/" {
+        return None;
+    }
+    path.rsplit('/').next().map(|value| value.to_string())
+}
+
+fn collect_local_dirs(workdir: &Path, source: &Path) -> Result<Vec<LocalDirPlan>, String> {
+    let md = fs::symlink_metadata(source).map_err(|error| format!("local stat failed: {error}"))?;
+    if md.file_type().is_symlink() {
+        return Err("SFTP upload does not support local symlinks".to_string());
+    }
+    if !md.is_dir() {
+        return Ok(Vec::new());
+    }
+    let mut out = Vec::new();
+    collect_local_dirs_inner(workdir, source, source, &mut out)?;
+    Ok(out)
+}
+
+fn collect_local_dirs_inner(
+    workdir: &Path,
+    root: &Path,
+    current: &Path,
+    out: &mut Vec<LocalDirPlan>,
+) -> Result<(), String> {
+    ensure_path_inside(workdir, current)?;
+    for entry in fs::read_dir(current).map_err(|error| format!("local list failed: {error}"))? {
+        let entry = entry.map_err(|error| format!("local list failed: {error}"))?;
+        let path = entry.path();
+        let md =
+            fs::symlink_metadata(&path).map_err(|error| format!("local stat failed: {error}"))?;
+        if md.file_type().is_symlink() {
+            return Err(format!(
+                "SFTP upload does not support local symlink: {}",
+                rel_to_workdir_str(workdir, &path)
+            ));
+        }
+        if md.is_dir() {
+            out.push(LocalDirPlan {
+                rel: path
+                    .strip_prefix(root)
+                    .unwrap_or(&path)
+                    .to_string_lossy()
+                    .replace('\\', "/"),
+            });
+            collect_local_dirs_inner(workdir, root, &path, out)?;
+        }
+    }
+    Ok(())
+}
+
+fn collect_local_files(workdir: &Path, source: &Path) -> Result<Vec<LocalFilePlan>, String> {
+    let md = fs::symlink_metadata(source).map_err(|error| format!("local stat failed: {error}"))?;
+    if md.file_type().is_symlink() {
+        return Err("SFTP upload does not support local symlinks".to_string());
+    }
+    if md.is_file() {
+        return Ok(vec![LocalFilePlan {
+            abs: source.to_path_buf(),
+            rel: source
+                .file_name()
+                .map(|value| value.to_string_lossy().to_string())
+                .unwrap_or_else(|| "file".to_string()),
+            size: md.len(),
+        }]);
+    }
+    if !md.is_dir() {
+        return Err("local source is neither file nor directory".to_string());
+    }
+    let mut out = Vec::new();
+    collect_local_files_inner(workdir, source, source, &mut out)?;
+    Ok(out)
+}
+
+fn collect_local_files_inner(
+    workdir: &Path,
+    root: &Path,
+    current: &Path,
+    out: &mut Vec<LocalFilePlan>,
+) -> Result<(), String> {
+    ensure_path_inside(workdir, current)?;
+    for entry in fs::read_dir(current).map_err(|error| format!("local list failed: {error}"))? {
+        let entry = entry.map_err(|error| format!("local list failed: {error}"))?;
+        let path = entry.path();
+        let md =
+            fs::symlink_metadata(&path).map_err(|error| format!("local stat failed: {error}"))?;
+        if md.file_type().is_symlink() {
+            return Err(format!(
+                "SFTP upload does not support local symlink: {}",
+                rel_to_workdir_str(workdir, &path)
+            ));
+        }
+        if md.is_dir() {
+            collect_local_files_inner(workdir, root, &path, out)?;
+        } else if md.is_file() {
+            out.push(LocalFilePlan {
+                rel: path
+                    .strip_prefix(root)
+                    .unwrap_or(&path)
+                    .to_string_lossy()
+                    .replace('\\', "/"),
+                abs: path,
+                size: md.len(),
+            });
+        }
+    }
+    Ok(())
+}
+
+async fn collect_remote_dirs(
+    session: &russh_sftp::client::SftpSession,
+    source: &str,
+) -> Result<Vec<RemoteDirPlan>, String> {
+    let metadata = session
+        .metadata(source.to_string())
+        .await
+        .map_err(|error| format!("remote stat failed: {error}"))?;
+    if !metadata.is_dir() {
+        return Ok(Vec::new());
+    }
+    let mut out = Vec::new();
+    collect_remote_dirs_inner(session, source, source, &mut out).await?;
+    Ok(out)
+}
+
+async fn collect_remote_dirs_inner(
+    session: &russh_sftp::client::SftpSession,
+    root: &str,
+    current: &str,
+    out: &mut Vec<RemoteDirPlan>,
+) -> Result<(), String> {
+    let mut stack = vec![current.to_string()];
+    while let Some(dir) = stack.pop() {
+        for entry in session
+            .read_dir(dir.clone())
+            .await
+            .map_err(|error| format!("remote list failed: {error}"))?
+        {
+            let name = entry.file_name();
+            if name == "." || name == ".." {
+                continue;
+            }
+            let path = join_remote_path(&dir, &name);
+            let metadata = entry.metadata();
+            if metadata.is_dir() {
+                out.push(RemoteDirPlan {
+                    rel: remote_relative_path(root, &path),
+                });
+                stack.push(path);
+            }
+        }
+    }
+    Ok(())
+}
+
+async fn collect_remote_files(
+    session: &russh_sftp::client::SftpSession,
+    source: &str,
+) -> Result<Vec<RemoteFilePlan>, String> {
+    let metadata = session
+        .metadata(source.to_string())
+        .await
+        .map_err(|error| format!("remote stat failed: {error}"))?;
+    if !metadata.is_dir() {
+        return Ok(vec![RemoteFilePlan {
+            path: source.to_string(),
+            rel: remote_basename(source).unwrap_or_else(|| "file".to_string()),
+            size: metadata.size.unwrap_or(0),
+        }]);
+    }
+    let mut out = Vec::new();
+    collect_remote_files_inner(session, source, source, &mut out).await?;
+    Ok(out)
+}
+
+async fn collect_remote_files_inner(
+    session: &russh_sftp::client::SftpSession,
+    root: &str,
+    current: &str,
+    out: &mut Vec<RemoteFilePlan>,
+) -> Result<(), String> {
+    let mut stack = vec![current.to_string()];
+    while let Some(dir) = stack.pop() {
+        for entry in session
+            .read_dir(dir.clone())
+            .await
+            .map_err(|error| format!("remote list failed: {error}"))?
+        {
+            let name = entry.file_name();
+            if name == "." || name == ".." {
+                continue;
+            }
+            let path = join_remote_path(&dir, &name);
+            let metadata = entry.metadata();
+            if metadata.is_dir() {
+                stack.push(path);
+            } else {
+                out.push(RemoteFilePlan {
+                    rel: remote_relative_path(root, &path),
+                    path,
+                    size: metadata.size.unwrap_or(0),
+                });
+            }
+        }
+    }
+    Ok(())
+}
+
+fn remote_relative_path(root: &str, path: &str) -> String {
+    let root = normalize_remote_path(root);
+    let path = normalize_remote_path(path);
+    if let Some(rest) = path.strip_prefix(root.trim_end_matches('/')) {
+        rest.trim_start_matches('/').to_string()
+    } else {
+        remote_basename(&path).unwrap_or(path)
+    }
+}
+
+async fn ensure_remote_dir_all(
+    session: &russh_sftp::client::SftpSession,
+    path: &str,
+) -> Result<(), String> {
+    let path = normalize_remote_path(path);
+    if path == "." || path == "/" {
+        return Ok(());
+    }
+    let absolute = path.starts_with('/');
+    let mut current = if absolute {
+        "/".to_string()
+    } else {
+        ".".to_string()
+    };
+    for part in path
+        .trim_matches('/')
+        .split('/')
+        .filter(|part| !part.is_empty())
+    {
+        current = join_remote_path(&current, part);
+        match session.create_dir(current.clone()).await {
+            Ok(_) => {}
+            Err(_) if session.try_exists(current.clone()).await.unwrap_or(false) => {}
+            Err(error) => return Err(format!("remote mkdir failed: {error}")),
+        }
+    }
+    Ok(())
+}
+
+async fn create_remote_dirs_for_local_root(
+    session: &russh_sftp::client::SftpSession,
+    path: &str,
+) -> Result<(), String> {
+    ensure_remote_dir_all(session, path).await
+}
+
+async fn upload_file(
+    session: &russh_sftp::client::SftpSession,
+    local_path: &Path,
+    remote_path: &str,
+    state: &mut SftpTransferState,
+    task: &SftpTransferTask,
+    registry: &SftpSessionRegistry,
+) -> Result<(), String> {
+    let mut local = tokio::fs::File::open(local_path)
+        .await
+        .map_err(|error| format!("failed to open local file: {error}"))?;
+    let mut remote = session
+        .create(remote_path.to_string())
+        .await
+        .map_err(|error| format!("failed to create remote file: {error}"))?;
+    let mut buffer = vec![0u8; TRANSFER_BUFFER_BYTES];
+    loop {
+        check_cancelled(task)?;
+        let read = local
+            .read(&mut buffer)
+            .await
+            .map_err(|error| format!("failed to read local file: {error}"))?;
+        if read == 0 {
+            break;
+        }
+        remote
+            .write_all(&buffer[..read])
+            .await
+            .map_err(|error| format!("failed to write remote file: {error}"))?;
+        state.bytes_done = state.bytes_done.saturating_add(read as u64);
+        registry.broadcast("progress", state.clone());
+    }
+    remote
+        .shutdown()
+        .await
+        .map_err(|error| format!("failed to close remote file: {error}"))?;
+    Ok(())
+}
+
+async fn download_file(
+    session: &russh_sftp::client::SftpSession,
+    remote_path: &str,
+    local_path: &Path,
+    state: &mut SftpTransferState,
+    task: &SftpTransferTask,
+    registry: &SftpSessionRegistry,
+) -> Result<(), String> {
+    let mut remote = session
+        .open(remote_path.to_string())
+        .await
+        .map_err(|error| format!("failed to open remote file: {error}"))?;
+    let mut local = tokio::fs::File::create(local_path)
+        .await
+        .map_err(|error| format!("failed to create local file: {error}"))?;
+    let mut buffer = vec![0u8; TRANSFER_BUFFER_BYTES];
+    loop {
+        check_cancelled(task)?;
+        let read = remote
+            .read(&mut buffer)
+            .await
+            .map_err(|error| format!("failed to read remote file: {error}"))?;
+        if read == 0 {
+            break;
+        }
+        local
+            .write_all(&buffer[..read])
+            .await
+            .map_err(|error| format!("failed to write local file: {error}"))?;
+        state.bytes_done = state.bytes_done.saturating_add(read as u64);
+        registry.broadcast("progress", state.clone());
+    }
+    local
+        .shutdown()
+        .await
+        .map_err(|error| format!("failed to close local file: {error}"))?;
+    Ok(())
+}
+
+async fn delete_remote_path(
+    session: &russh_sftp::client::SftpSession,
+    path: &str,
+    recursive: bool,
+) -> Result<(), String> {
+    let metadata = session
+        .metadata(path.to_string())
+        .await
+        .map_err(|error| format!("remote stat failed: {error}"))?;
+    if metadata.is_dir() {
+        if !recursive {
+            return Err("recursive is required to delete a remote directory".to_string());
+        }
+        let mut dirs = vec![path.to_string()];
+        let mut files = Vec::new();
+        let mut idx = 0;
+        while idx < dirs.len() {
+            let dir = dirs[idx].clone();
+            idx += 1;
+            for entry in session
+                .read_dir(dir.clone())
+                .await
+                .map_err(|error| format!("remote list failed: {error}"))?
+            {
+                let name = entry.file_name();
+                if name == "." || name == ".." {
+                    continue;
+                }
+                let child = join_remote_path(&dir, &name);
+                if entry.metadata().is_dir() {
+                    dirs.push(child);
+                } else {
+                    files.push(child);
+                }
+            }
+        }
+        for file in files {
+            session
+                .remove_file(file)
+                .await
+                .map_err(|error| format!("remote delete failed: {error}"))?;
+        }
+        for dir in dirs.into_iter().rev() {
+            session
+                .remove_dir(dir)
+                .await
+                .map_err(|error| format!("remote rmdir failed: {error}"))?;
+        }
+    } else {
+        session
+            .remove_file(path.to_string())
+            .await
+            .map_err(|error| format!("remote delete failed: {error}"))?;
+    }
+    Ok(())
+}
+
+fn check_cancelled(task: &SftpTransferTask) -> Result<(), String> {
+    if task.cancelled.load(Ordering::SeqCst) {
+        Err("SFTP transfer was cancelled".to_string())
+    } else {
+        Ok(())
+    }
+}
+
+fn is_not_found_error(error: &str) -> bool {
+    let normalized = error.to_ascii_lowercase();
+    normalized.contains("no such") || normalized.contains("not found")
+}
+
+fn is_session_closed_error(error: &str) -> bool {
+    let normalized = error.to_ascii_lowercase();
+    normalized.contains("session closed")
+        || normalized.contains("channel closed")
+        || normalized.contains("connection closed")
+        || normalized.contains("broken pipe")
+        || normalized.contains("connection reset")
+        || normalized.contains("eof")
+}
+
+impl From<io::Error> for SftpActionResponse {
+    fn from(error: io::Error) -> Self {
+        Self {
+            action: "error".to_string(),
+            path: String::new(),
+            entry: None,
+            transfer: Some(SftpTransferState {
+                id: String::new(),
+                session_id: String::new(),
+                direction: String::new(),
+                status: "failed".to_string(),
+                source_path: String::new(),
+                target_path: String::new(),
+                current_path: String::new(),
+                bytes_done: 0,
+                bytes_total: 0,
+                files_done: 0,
+                files_total: 0,
+                error: Some(error.to_string()),
+            }),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn normalize_remote_path_keeps_posix_shape() {
+        assert_eq!(normalize_remote_path(""), ".");
+        assert_eq!(normalize_remote_path("."), ".");
+        assert_eq!(normalize_remote_path("/"), "/");
+        assert_eq!(normalize_remote_path("/var//log/"), "/var/log");
+        assert_eq!(normalize_remote_path("home/agent/../tmp"), "home/agent/tmp");
+    }
+
+    #[test]
+    fn join_remote_path_treats_target_as_directory() {
+        assert_eq!(join_remote_path(".", "file.txt"), "file.txt");
+        assert_eq!(join_remote_path("/", "file.txt"), "/file.txt");
+        assert_eq!(join_remote_path("/tmp/.ssh", "config"), "/tmp/.ssh/config");
+        assert_eq!(
+            join_remote_path("folder.with.dots", "file.txt"),
+            "folder.with.dots/file.txt"
+        );
+    }
+
+    #[test]
+    fn session_closed_errors_are_reconnectable() {
+        assert!(is_session_closed_error(
+            "remote list failed: session closed"
+        ));
+        assert!(is_session_closed_error(
+            "remote stat failed: channel closed"
+        ));
+        assert!(is_session_closed_error("remote list failed: broken pipe"));
+        assert!(is_session_closed_error(
+            "remote list failed: connection reset by peer"
+        ));
+        assert!(!is_session_closed_error(
+            "remote list failed: permission denied"
+        ));
+        assert!(!is_session_closed_error("remote list failed: no such file"));
+    }
+
+    #[test]
+    fn sanitize_local_rel_path_rejects_escape_components() {
+        assert!(sanitize_local_rel_path("src/main.rs").is_ok());
+        assert!(sanitize_local_rel_path("../outside").is_err());
+        assert!(sanitize_local_rel_path("/absolute").is_err());
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn local_leaf_symlink_is_entry_not_followed_target() {
+        use std::os::unix::fs::symlink;
+
+        let workdir = tempfile::tempdir().expect("workdir");
+        let outside = tempfile::tempdir().expect("outside");
+        let workdir_path = fs::canonicalize(workdir.path()).expect("canonical workdir");
+        let outside_file = outside.path().join("secret.txt");
+        fs::write(&outside_file, "secret").expect("write outside file");
+        let link_path = workdir.path().join("linked-secret");
+        let canonical_link_path = workdir_path.join("linked-secret");
+        symlink(&outside_file, &link_path).expect("create symlink");
+
+        let entry_path = resolve_existing_local_entry(&workdir_path, "linked-secret")
+            .expect("resolve symlink entry");
+        assert_eq!(entry_path, canonical_link_path);
+        assert!(resolve_existing_local_target(&workdir_path, "linked-secret").is_err());
+
+        let entry = local_entry_from_abs(&workdir_path, &canonical_link_path).expect("local entry");
+        assert_eq!(entry.kind, "symlink");
+        assert_eq!(entry.path, "linked-secret");
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn collect_local_files_rejects_nested_symlink() {
+        use std::os::unix::fs::symlink;
+
+        let workdir = tempfile::tempdir().expect("workdir");
+        let outside = tempfile::tempdir().expect("outside");
+        let workdir_path = fs::canonicalize(workdir.path()).expect("canonical workdir");
+        let source_dir = workdir.path().join("src");
+        fs::create_dir(&source_dir).expect("create source dir");
+        let outside_file = outside.path().join("secret.txt");
+        fs::write(&outside_file, "secret").expect("write outside file");
+        symlink(&outside_file, source_dir.join("linked-secret")).expect("create symlink");
+        let canonical_source_dir = workdir_path.join("src");
+
+        let error = match collect_local_files(&workdir_path, &canonical_source_dir) {
+            Ok(_) => panic!("expected local symlink rejection"),
+            Err(error) => error,
+        };
+        assert!(error.contains("local symlink"));
+    }
+}
diff --git a/crates/agent-gui/src-tauri/src/runtime/terminal.rs b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
index 70161abbc..c853d90fc 100644
--- a/crates/agent-gui/src-tauri/src/runtime/terminal.rs
+++ b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
@@ -76,6 +76,7 @@ pub struct TerminalSshMetadata {
     pub status: String,
     pub reconnect_attempt: u8,
     pub reconnect_max_attempts: u8,
+    pub sftp_enabled: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -129,6 +130,15 @@ pub struct TerminalSshLatencyResponse {
     pub latency_ms: u32,
 }
 
+#[derive(Debug, Clone)]
+pub struct TerminalSshSessionInfo {
+    pub project_path_key: String,
+    pub cwd: String,
+    pub running: bool,
+    pub host_id: String,
+    pub sftp_enabled: bool,
+}
+
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TerminalShellOption {
@@ -281,6 +291,7 @@ struct PendingSshConnectRequest {
     title: Option<String>,
     cols: Option<u16>,
     rows: Option<u16>,
+    sftp_enabled: bool,
 }
 
 enum PendingSshPrompt {
@@ -550,6 +561,7 @@ impl TerminalSessionRegistry {
         title: Option<String>,
         cols: Option<u16>,
         rows: Option<u16>,
+        sftp_enabled: bool,
     ) -> Result<TerminalSshCreateResponse, String> {
         let cwd = canonicalize_workdir(&cwd)?;
         let project_key = project_path_key
@@ -566,6 +578,7 @@ impl TerminalSessionRegistry {
             title,
             cols,
             rows,
+            sftp_enabled,
         };
         self.create_ssh_from_request(request).await
     }
@@ -737,6 +750,7 @@ impl TerminalSessionRegistry {
             status: SSH_STATUS_CONNECTED.to_string(),
             reconnect_attempt: 0,
             reconnect_max_attempts: SSH_RECONNECT_MAX_ATTEMPTS,
+            sftp_enabled: request.sftp_enabled,
         };
         let record = TerminalSessionRecord {
             id: id.clone(),
@@ -1150,6 +1164,23 @@ impl TerminalSessionRegistry {
         self.record(session_id)
     }
 
+    pub fn ssh_session_info(&self, session_id: &str) -> Result<TerminalSshSessionInfo, String> {
+        let record = self.record(session_id.to_string())?;
+        if record.kind.trim() != "ssh" {
+            return Err("terminal session is not an SSH connection".to_string());
+        }
+        let ssh = record
+            .ssh
+            .ok_or_else(|| "SSH session metadata is missing".to_string())?;
+        Ok(TerminalSshSessionInfo {
+            project_path_key: record.project_path_key,
+            cwd: record.cwd,
+            running: record.running,
+            host_id: ssh.host_id,
+            sftp_enabled: ssh.sftp_enabled,
+        })
+    }
+
     pub async fn ssh_latency(
         self: &Arc<Self>,
         session_id: String,
@@ -1616,7 +1647,12 @@ impl TerminalSessionRegistry {
     }
 }
 
-struct LiveAgentSshClient {
+pub(crate) struct TerminalSftpConnection {
+    pub(crate) _handle: client::Handle<LiveAgentSshClient>,
+    pub(crate) session: russh_sftp::client::SftpSession,
+}
+
+pub(crate) struct LiveAgentSshClient {
     host: String,
     port: u16,
     captured_host_key: Arc<tokio::sync::Mutex<Option<CapturedHostKey>>>,
@@ -1900,6 +1936,80 @@ async fn open_ssh_shell_channel(
     Ok(channel)
 }
 
+pub(crate) async fn open_sftp_connection_for_host(
+    ssh_host_id: &str,
+) -> Result<TerminalSftpConnection, String> {
+    let host_config = load_runtime_ssh_host(ssh_host_id)?
+        .ok_or_else(|| format!("SSH host not found: {}", ssh_host_id.trim()))?;
+    if ssh_proxy_configured(&host_config) {
+        return Err("SSH proxy is configured for this host, but V1 SFTP does not support proxy connections yet.".to_string());
+    }
+    if host_config.host.trim().is_empty() {
+        return Err("SSH host is required".to_string());
+    }
+    if host_config.username.trim().is_empty() {
+        return Err("SSH username is required".to_string());
+    }
+
+    let auth = resolve_ssh_auth_material(&host_config)?;
+    let captured_host_key = Arc::new(tokio::sync::Mutex::new(None::<CapturedHostKey>));
+    let ssh_client = LiveAgentSshClient {
+        host: host_config.host.clone(),
+        port: host_config.port,
+        captured_host_key: Arc::clone(&captured_host_key),
+    };
+    let config = Arc::new(client::Config {
+        ..Default::default()
+    });
+    let mut handle = match client::connect(
+        config,
+        (host_config.host.as_str(), host_config.port),
+        ssh_client,
+    )
+    .await
+    {
+        Ok(handle) => handle,
+        Err(error) => {
+            if captured_host_key.lock().await.is_some() {
+                return Err("SSH host key requires confirmation before opening SFTP".to_string());
+            }
+            return Err(format!("SSH connection failed: {error}"));
+        }
+    };
+
+    match authenticate_ssh_handle(&mut handle, &host_config, auth).await? {
+        SshAuthOutcome::Authenticated => {}
+        SshAuthOutcome::KeyboardInteractivePrompt(_) => {
+            let _ = handle
+                .disconnect(
+                    russh::Disconnect::ByApplication,
+                    "Keyboard-interactive SFTP authentication requires Bash prompt first",
+                    "en",
+                )
+                .await;
+            return Err(
+                "SSH keyboard-interactive authentication requires opening Bash first".to_string(),
+            );
+        }
+    }
+
+    let channel = handle
+        .channel_open_session()
+        .await
+        .map_err(|error| format!("SFTP channel open failed: {error}"))?;
+    channel
+        .request_subsystem(true, "sftp")
+        .await
+        .map_err(|error| format!("SFTP subsystem request failed: {error}"))?;
+    let session = russh_sftp::client::SftpSession::new(channel.into_stream())
+        .await
+        .map_err(|error| format!("SFTP session failed: {error}"))?;
+    Ok(TerminalSftpConnection {
+        _handle: handle,
+        session,
+    })
+}
+
 async fn run_ssh_session_io(
     registry: Arc<TerminalSessionRegistry>,
     session_id: String,
diff --git a/crates/agent-gui/src-tauri/src/services/gateway.rs b/crates/agent-gui/src-tauri/src/services/gateway.rs
index d5079cadb..45c91afc4 100644
--- a/crates/agent-gui/src-tauri/src/services/gateway.rs
+++ b/crates/agent-gui/src-tauri/src/services/gateway.rs
@@ -24,6 +24,10 @@ use crate::commands::settings::{
     open_db, redact_gateway_settings_sync_payload, reset_runtime_ssh_known_host,
     RemoteSettingsPayload, PROVIDER_API_KEY_UPDATES_FIELD, SSH_SECRET_UPDATES_FIELD,
 };
+use crate::runtime::sftp::{
+    SftpActionResponse, SftpEntry, SftpEventPayload, SftpListResponse, SftpSessionRegistry,
+    SftpStatResponse, SftpTransferResponse, SftpTransferState,
+};
 use crate::runtime::terminal::{
     terminal_shell_options, TerminalEventPayload, TerminalSessionRecord, TerminalSessionRegistry,
     TerminalShellOption, TerminalSnapshotResponse, TerminalSshCreateResponse,
@@ -242,6 +246,7 @@ pub struct GatewayController {
     cron_manager: Arc<CronManager>,
     memory_store: Arc<MemoryStore>,
     terminal_registry: Arc<TerminalSessionRegistry>,
+    sftp_registry: Arc<SftpSessionRegistry>,
     config_tx: watch::Sender<RemoteSettingsPayload>,
     runner_task: Mutex<Option<tauri::async_runtime::JoinHandle<()>>>,
     status: Mutex<GatewayStatusSnapshot>,
@@ -254,6 +259,7 @@ pub struct GatewayController {
     tunnel_ws_streams: Mutex<HashMap<String, mpsc::Sender<proto::TunnelFrame>>>,
     pending_tunnel_controls: Mutex<HashMap<String, oneshot::Sender<proto::TunnelControlResponse>>>,
     terminal_forwarder_once: Once,
+    sftp_forwarder_once: Once,
     remote_chat_inbox_sweeper_once: Once,
 }
 
@@ -263,6 +269,7 @@ impl GatewayController {
         cron_manager: Arc<CronManager>,
         memory_store: Arc<MemoryStore>,
         terminal_registry: Arc<TerminalSessionRegistry>,
+        sftp_registry: Arc<SftpSessionRegistry>,
     ) -> Self {
         let initial_config = RemoteSettingsPayload::default();
         let (config_tx, _) = watch::channel(initial_config);
@@ -271,6 +278,7 @@ impl GatewayController {
             cron_manager,
             memory_store,
             terminal_registry,
+            sftp_registry,
             config_tx,
             runner_task: Mutex::new(None),
             status: Mutex::new(GatewayStatusSnapshot {
@@ -293,12 +301,14 @@ impl GatewayController {
             tunnel_ws_streams: Mutex::new(HashMap::new()),
             pending_tunnel_controls: Mutex::new(HashMap::new()),
             terminal_forwarder_once: Once::new(),
+            sftp_forwarder_once: Once::new(),
             remote_chat_inbox_sweeper_once: Once::new(),
         }
     }
 
     pub fn start(self: &Arc<Self>) -> Result<(), String> {
         self.start_terminal_forwarder();
+        self.start_sftp_forwarder();
         self.start_remote_chat_inbox_sweeper();
         self.ensure_runner()
     }
@@ -322,6 +332,25 @@ impl GatewayController {
         });
     }
 
+    fn start_sftp_forwarder(self: &Arc<Self>) {
+        let controller = Arc::clone(self);
+        self.sftp_forwarder_once.call_once(move || {
+            let (receiver, guard) = controller.sftp_registry.subscribe();
+            thread::spawn(move || {
+                let _guard = guard;
+                while let Ok(event) = receiver.recv() {
+                    let envelope = build_sftp_event_envelope(event.payload);
+                    let Ok(sender) = controller.current_outbound_sender() else {
+                        continue;
+                    };
+                    if let Err(error) = sender.blocking_send(envelope) {
+                        eprintln!("send gateway SFTP event failed: {error}");
+                    }
+                }
+            });
+        });
+    }
+
     fn start_remote_chat_inbox_sweeper(self: &Arc<Self>) {
         let controller = Arc::clone(self);
         self.remote_chat_inbox_sweeper_once.call_once(move || {
@@ -1533,10 +1562,160 @@ impl GatewayController {
                     Err(error) => self.send_error_response(request_id, 500, error).await,
                 }
             }
+            Some(proto::gateway_envelope::Payload::SftpRequest(request)) => {
+                match self.handle_sftp_request(request).await {
+                    Ok(response) => {
+                        self.send_agent_envelope(proto::AgentEnvelope {
+                            request_id,
+                            timestamp: now_unix_seconds(),
+                            payload: Some(proto::agent_envelope::Payload::SftpResponse(response)),
+                        })
+                        .await
+                    }
+                    Err(error) => self.send_error_response(request_id, 500, error).await,
+                }
+            }
             None => Ok(()),
         }
     }
 
+    async fn handle_sftp_request(
+        &self,
+        request: proto::SftpRequest,
+    ) -> Result<proto::SftpResponse, String> {
+        if !self.config_tx.borrow().enable_web_ssh_terminal {
+            return Err("web SSH SFTP is disabled in desktop Remote settings".to_string());
+        }
+        let action = request.action.trim().to_ascii_lowercase();
+        match action.as_str() {
+            "list" => {
+                let side = if request.direction.trim().is_empty() {
+                    "remote".to_string()
+                } else {
+                    request.direction
+                };
+                let path = sftp_side_path(&side, &request.local_path, &request.remote_path);
+                let response = self
+                    .sftp_registry
+                    .list(
+                        request.session_id,
+                        Some(request.project_path_key),
+                        request.workdir,
+                        side,
+                        Some(path),
+                    )
+                    .await?;
+                Ok(sftp_list_response_to_proto(action, response))
+            }
+            "stat" | "probe" => {
+                let side = if request.direction.trim().is_empty() {
+                    "remote".to_string()
+                } else {
+                    request.direction
+                };
+                let path = sftp_side_path(&side, &request.local_path, &request.remote_path);
+                let response = self
+                    .sftp_registry
+                    .stat(
+                        request.session_id,
+                        Some(request.project_path_key),
+                        request.workdir,
+                        side,
+                        Some(path),
+                    )
+                    .await?;
+                Ok(sftp_stat_response_to_proto(action, response))
+            }
+            "mkdir" => {
+                let side = if request.direction.trim().is_empty() {
+                    "remote".to_string()
+                } else {
+                    request.direction
+                };
+                let path = sftp_side_path(&side, &request.local_path, &request.remote_path);
+                let response = self
+                    .sftp_registry
+                    .mkdir(
+                        request.session_id,
+                        Some(request.project_path_key),
+                        request.workdir,
+                        side,
+                        path,
+                    )
+                    .await?;
+                Ok(sftp_action_response_to_proto(action, response))
+            }
+            "rename" => {
+                let side = if request.direction.trim().is_empty() {
+                    "remote".to_string()
+                } else {
+                    request.direction
+                };
+                let response = self
+                    .sftp_registry
+                    .rename(
+                        request.session_id,
+                        Some(request.project_path_key),
+                        request.workdir,
+                        side,
+                        request.from_path,
+                        request.to_path,
+                    )
+                    .await?;
+                Ok(sftp_action_response_to_proto(action, response))
+            }
+            "delete" => {
+                let side = if request.direction.trim().is_empty() {
+                    "remote".to_string()
+                } else {
+                    request.direction
+                };
+                let path = sftp_side_path(&side, &request.local_path, &request.remote_path);
+                let response = self
+                    .sftp_registry
+                    .delete(
+                        request.session_id,
+                        Some(request.project_path_key),
+                        request.workdir,
+                        side,
+                        path,
+                        request.recursive,
+                    )
+                    .await?;
+                Ok(sftp_action_response_to_proto(action, response))
+            }
+            "transfer" => {
+                let response = self
+                    .sftp_registry
+                    .transfer(
+                        request.session_id,
+                        Some(request.project_path_key),
+                        request.workdir,
+                        request.direction,
+                        request.from_path,
+                        request.target_path,
+                        request.recursive,
+                        request.overwrite,
+                    )
+                    .await?;
+                Ok(sftp_transfer_response_to_proto(action, response))
+            }
+            "cancel" => {
+                self.sftp_registry
+                    .cancel_transfer(request.session_id, request.from_path)?;
+                Ok(proto::SftpResponse {
+                    action,
+                    path: String::new(),
+                    entries: Vec::new(),
+                    entry: None,
+                    exists: false,
+                    transfer: None,
+                })
+            }
+            _ => Err(format!("unsupported sftp action: {action}")),
+        }
+    }
+
     async fn handle_terminal_request(
         &self,
         request: proto::TerminalRequest,
@@ -1622,6 +1801,7 @@ impl GatewayController {
                         optional_proto_text(request.title),
                         optional_proto_u16(request.cols),
                         optional_proto_u16(request.rows),
+                        request.sftp_enabled,
                     )
                     .await?;
                 Ok(terminal_ssh_create_response_to_proto(action, response))
@@ -1726,13 +1906,14 @@ impl GatewayController {
                     &request.project_path_key,
                 )?;
                 let session = self.terminal_registry.close(request.session_id)?;
+                self.sftp_registry.close_session(&session.id);
                 Ok(terminal_record_response_to_proto(action, session))
             }
             "close_project" => {
                 let project_path_key =
                     required_terminal_project_path_key(&request.project_path_key)?;
                 let config = self.config_tx.borrow().clone();
-                let sessions = self
+                let sessions: Vec<TerminalSessionRecord> = self
                     .terminal_registry
                     .list(Some(project_path_key))
                     .sessions
@@ -1746,6 +1927,9 @@ impl GatewayController {
                     })
                     .filter_map(|session| self.terminal_registry.close(session.id).ok())
                     .collect();
+                for session in &sessions {
+                    self.sftp_registry.close_session(&session.id);
+                }
                 Ok(terminal_list_response_to_proto(action, sessions))
             }
             "detach" => Ok(proto::TerminalResponse {
@@ -3746,6 +3930,7 @@ fn terminal_session_to_proto(session: TerminalSessionRecord) -> proto::TerminalS
             status: ssh.status,
             reconnect_attempt: u32::from(ssh.reconnect_attempt),
             reconnect_max_attempts: u32::from(ssh.reconnect_max_attempts),
+            sftp_enabled: ssh.sftp_enabled,
         }),
     }
 }
@@ -3848,6 +4033,99 @@ fn terminal_ssh_create_response_to_proto(
     }
 }
 
+fn sftp_side_path(side: &str, local_path: &str, remote_path: &str) -> String {
+    if side.trim().eq_ignore_ascii_case("local") {
+        local_path.trim().to_string()
+    } else {
+        remote_path.trim().to_string()
+    }
+}
+
+fn sftp_entry_to_proto(entry: SftpEntry) -> proto::SftpEntry {
+    proto::SftpEntry {
+        path: entry.path,
+        name: entry.name,
+        kind: entry.kind,
+        size_bytes: entry.size_bytes,
+        mtime: entry.mtime,
+    }
+}
+
+fn sftp_transfer_to_proto(transfer: SftpTransferState) -> proto::SftpTransfer {
+    proto::SftpTransfer {
+        id: transfer.id,
+        session_id: transfer.session_id,
+        direction: transfer.direction,
+        status: transfer.status,
+        source_path: transfer.source_path,
+        target_path: transfer.target_path,
+        current_path: transfer.current_path,
+        bytes_done: transfer.bytes_done,
+        bytes_total: transfer.bytes_total,
+        files_done: transfer.files_done,
+        files_total: transfer.files_total,
+        error: transfer.error.unwrap_or_default(),
+    }
+}
+
+fn sftp_list_response_to_proto(action: String, response: SftpListResponse) -> proto::SftpResponse {
+    proto::SftpResponse {
+        action,
+        path: response.path,
+        entries: response
+            .entries
+            .into_iter()
+            .map(sftp_entry_to_proto)
+            .collect(),
+        entry: None,
+        exists: false,
+        transfer: None,
+    }
+}
+
+fn sftp_stat_response_to_proto(action: String, response: SftpStatResponse) -> proto::SftpResponse {
+    proto::SftpResponse {
+        action,
+        path: response
+            .entry
+            .as_ref()
+            .map(|entry| entry.path.clone())
+            .unwrap_or_default(),
+        entries: Vec::new(),
+        entry: response.entry.map(sftp_entry_to_proto),
+        exists: response.exists,
+        transfer: None,
+    }
+}
+
+fn sftp_action_response_to_proto(
+    action: String,
+    response: SftpActionResponse,
+) -> proto::SftpResponse {
+    proto::SftpResponse {
+        action,
+        path: response.path,
+        entries: Vec::new(),
+        entry: response.entry.map(sftp_entry_to_proto),
+        exists: false,
+        transfer: response.transfer.map(sftp_transfer_to_proto),
+    }
+}
+
+fn sftp_transfer_response_to_proto(
+    action: String,
+    response: SftpTransferResponse,
+) -> proto::SftpResponse {
+    proto::SftpResponse {
+        action,
+        path: response.transfer.target_path.clone(),
+        entries: Vec::new(),
+        entry: None,
+        exists: false,
+        transfer: Some(sftp_transfer_to_proto(response.transfer)),
+    }
+}
+
 fn build_terminal_event_envelope(payload: TerminalEventPayload) -> proto::AgentEnvelope {
     proto::AgentEnvelope {
         request_id: format!("terminal-event-{}", Uuid::new_v4()),
@@ -3866,6 +4144,19 @@ fn build_terminal_event_envelope(payload: TerminalEventPayload) -> proto::AgentE
     }
 }
 
+fn build_sftp_event_envelope(payload: SftpEventPayload) -> proto::AgentEnvelope {
+    proto::AgentEnvelope {
+        request_id: format!("sftp-event-{}", Uuid::new_v4()),
+        timestamp: now_unix_seconds(),
+        payload: Some(proto::agent_envelope::Payload::SftpEvent(
+            proto::SftpEvent {
+                kind: payload.kind,
+                transfer: Some(sftp_transfer_to_proto(payload.transfer)),
+            },
+        )),
+    }
+}
+
 async fn send_agent_envelope_to(
     sender: mpsc::Sender<proto::AgentEnvelope>,
     envelope: proto::AgentEnvelope,
diff --git a/crates/agent-gui/src/components/icons.tsx b/crates/agent-gui/src/components/icons.tsx
index cb1716447..29357000c 100644
--- a/crates/agent-gui/src/components/icons.tsx
+++ b/crates/agent-gui/src/components/icons.tsx
@@ -100,7 +100,84 @@ import WifiOffSource from "~icons/lucide/wifi-off";
 import WrenchSource from "~icons/lucide/wrench";
 import XSource from "~icons/lucide/x";
 import ZapSource from "~icons/lucide/zap";
+import DefaultFileSource from "~icons/vscode-icons/default-file";
+import FileTypeApacheSource from "~icons/vscode-icons/file-type-apache";
+import FileTypeAudioSource from "~icons/vscode-icons/file-type-audio";
+import FileTypeBinarySource from "~icons/vscode-icons/file-type-binary";
+import FileTypeBunSource from "~icons/vscode-icons/file-type-bun";
+import FileTypeCSource from "~icons/vscode-icons/file-type-c";
+import FileTypeCargoSource from "~icons/vscode-icons/file-type-cargo";
+import FileTypeCertSource from "~icons/vscode-icons/file-type-cert";
+import FileTypeCmakeSource from "~icons/vscode-icons/file-type-cmake";
+import FileTypeConfigSource from "~icons/vscode-icons/file-type-config";
+import FileTypeCppSource from "~icons/vscode-icons/file-type-cpp";
+import FileTypeCsharpSource from "~icons/vscode-icons/file-type-csharp";
+import FileTypeCssSource from "~icons/vscode-icons/file-type-css";
+import FileTypeDartSource from "~icons/vscode-icons/file-type-dartlang";
+import FileTypeDbSource from "~icons/vscode-icons/file-type-db";
+import FileTypeDockerSource from "~icons/vscode-icons/file-type-docker";
+import FileTypeDotenvSource from "~icons/vscode-icons/file-type-dotenv";
+import FileTypeEslintSource from "~icons/vscode-icons/file-type-eslint";
+import FileTypeExcelSource from "~icons/vscode-icons/file-type-excel";
+import FileTypeFontSource from "~icons/vscode-icons/file-type-font";
 import FileTypeGeminiSource from "~icons/vscode-icons/file-type-gemini";
+import FileTypeGitSource from "~icons/vscode-icons/file-type-git";
+import FileTypeGoSource from "~icons/vscode-icons/file-type-go";
+import FileTypeGoWorkSource from "~icons/vscode-icons/file-type-go-work";
+import FileTypeGradleSource from "~icons/vscode-icons/file-type-gradle";
+import FileTypeGraphqlSource from "~icons/vscode-icons/file-type-graphql";
+import FileTypeHtmlSource from "~icons/vscode-icons/file-type-html";
+import FileTypeImageSource from "~icons/vscode-icons/file-type-image";
+import FileTypeIniSource from "~icons/vscode-icons/file-type-ini";
+import FileTypeJavaSource from "~icons/vscode-icons/file-type-java";
+import FileTypeJsSource from "~icons/vscode-icons/file-type-js";
+import FileTypeJsConfigSource from "~icons/vscode-icons/file-type-jsconfig";
+import FileTypeJsonSource from "~icons/vscode-icons/file-type-json";
+import FileTypeKeySource from "~icons/vscode-icons/file-type-key";
+import FileTypeKotlinSource from "~icons/vscode-icons/file-type-kotlin";
+import FileTypeLicenseSource from "~icons/vscode-icons/file-type-license";
+import FileTypeLogSource from "~icons/vscode-icons/file-type-log";
+import FileTypeMarkdownSource from "~icons/vscode-icons/file-type-markdown";
+import FileTypeMavenSource from "~icons/vscode-icons/file-type-maven";
+import FileTypeNginxSource from "~icons/vscode-icons/file-type-nginx";
+import FileTypeNodeSource from "~icons/vscode-icons/file-type-node";
+import FileTypeNpmSource from "~icons/vscode-icons/file-type-npm";
+import FileTypePackageSource from "~icons/vscode-icons/file-type-package";
+import FileTypePdfSource from "~icons/vscode-icons/file-type-pdf2";
+import FileTypePhpSource from "~icons/vscode-icons/file-type-php";
+import FileTypePnpmSource from "~icons/vscode-icons/file-type-pnpm";
+import FileTypePowerpointSource from "~icons/vscode-icons/file-type-powerpoint";
+import FileTypePowershellSource from "~icons/vscode-icons/file-type-powershell";
+import FileTypePrettierSource from "~icons/vscode-icons/file-type-prettier";
+import FileTypePrismaSource from "~icons/vscode-icons/file-type-prisma";
+import FileTypePythonSource from "~icons/vscode-icons/file-type-python";
+import FileTypeReactJsSource from "~icons/vscode-icons/file-type-reactjs";
+import FileTypeReactTsSource from "~icons/vscode-icons/file-type-reactts";
+import FileTypeRubySource from "~icons/vscode-icons/file-type-ruby";
+import FileTypeRustSource from "~icons/vscode-icons/file-type-rust";
+import FileTypeScssSource from "~icons/vscode-icons/file-type-scss";
+import FileTypeShellSource from "~icons/vscode-icons/file-type-shell";
+import FileTypeSqlSource from "~icons/vscode-icons/file-type-sql";
+import FileTypeSqliteSource from "~icons/vscode-icons/file-type-sqlite";
+import FileTypeSvelteSource from "~icons/vscode-icons/file-type-svelte";
+import FileTypeSwiftSource from "~icons/vscode-icons/file-type-swift";
+import FileTypeSystemdSource from "~icons/vscode-icons/file-type-systemd";
+import FileTypeTerraformSource from "~icons/vscode-icons/file-type-terraform";
+import FileTypeTextSource from "~icons/vscode-icons/file-type-text";
+import FileTypeTomlSource from "~icons/vscode-icons/file-type-toml";
+import FileTypeTsConfigSource from "~icons/vscode-icons/file-type-tsconfig";
+import FileTypeTsSource from "~icons/vscode-icons/file-type-typescript";
+import FileTypeTsDefSource from "~icons/vscode-icons/file-type-typescriptdef";
+import FileTypeVideoSource from "~icons/vscode-icons/file-type-video";
+import FileTypeViteSource from "~icons/vscode-icons/file-type-vite";
+import FileTypeVitestSource from "~icons/vscode-icons/file-type-vitest";
+import FileTypeVueSource from "~icons/vscode-icons/file-type-vue";
+import FileTypeWebpackSource from "~icons/vscode-icons/file-type-webpack";
+import FileTypeWordSource from "~icons/vscode-icons/file-type-word";
+import FileTypeXmlSource from "~icons/vscode-icons/file-type-xml";
+import FileTypeYamlSource from "~icons/vscode-icons/file-type-yaml";
+import FileTypeYarnSource from "~icons/vscode-icons/file-type-yarn";
+import FileTypeZipSource from "~icons/vscode-icons/file-type-zip";
 
 type IconSource = ComponentType<SVGProps<SVGSVGElement> & { title?: string }>;
 
@@ -232,6 +309,83 @@ export const Wrench = createIcon(WrenchSource);
 export const X = createIcon(XSource);
 export const XCircle = createIcon(XCircleSource);
 export const Zap = createIcon(ZapSource);
+export const DefaultFile = createIcon(DefaultFileSource);
+export const FileTypeApache = createIcon(FileTypeApacheSource);
+export const FileTypeAudio = createIcon(FileTypeAudioSource);
+export const FileTypeBinary = createIcon(FileTypeBinarySource);
+export const FileTypeBun = createIcon(FileTypeBunSource);
+export const FileTypeC = createIcon(FileTypeCSource);
+export const FileTypeCargo = createIcon(FileTypeCargoSource);
+export const FileTypeCert = createIcon(FileTypeCertSource);
+export const FileTypeCmake = createIcon(FileTypeCmakeSource);
+export const FileTypeConfig = createIcon(FileTypeConfigSource);
+export const FileTypeCpp = createIcon(FileTypeCppSource);
+export const FileTypeCsharp = createIcon(FileTypeCsharpSource);
+export const FileTypeCss = createIcon(FileTypeCssSource);
+export const FileTypeDart = createIcon(FileTypeDartSource);
+export const FileTypeDb = createIcon(FileTypeDbSource);
+export const FileTypeDocker = createIcon(FileTypeDockerSource);
+export const FileTypeDotenv = createIcon(FileTypeDotenvSource);
+export const FileTypeEslint = createIcon(FileTypeEslintSource);
+export const FileTypeExcel = createIcon(FileTypeExcelSource);
+export const FileTypeFont = createIcon(FileTypeFontSource);
+export const FileTypeGit = createIcon(FileTypeGitSource);
+export const FileTypeGo = createIcon(FileTypeGoSource);
+export const FileTypeGoWork = createIcon(FileTypeGoWorkSource);
+export const FileTypeGradle = createIcon(FileTypeGradleSource);
+export const FileTypeGraphql = createIcon(FileTypeGraphqlSource);
+export const FileTypeHtml = createIcon(FileTypeHtmlSource);
+export const FileTypeImage = createIcon(FileTypeImageSource);
+export const FileTypeIni = createIcon(FileTypeIniSource);
+export const FileTypeJava = createIcon(FileTypeJavaSource);
+export const FileTypeJs = createIcon(FileTypeJsSource);
+export const FileTypeJsConfig = createIcon(FileTypeJsConfigSource);
+export const FileTypeJson = createIcon(FileTypeJsonSource);
+export const FileTypeKey = createIcon(FileTypeKeySource);
+export const FileTypeKotlin = createIcon(FileTypeKotlinSource);
+export const FileTypeLicense = createIcon(FileTypeLicenseSource);
+export const FileTypeLog = createIcon(FileTypeLogSource);
+export const FileTypeMarkdown = createIcon(FileTypeMarkdownSource);
+export const FileTypeMaven = createIcon(FileTypeMavenSource);
+export const FileTypeNginx = createIcon(FileTypeNginxSource);
+export const FileTypeNode = createIcon(FileTypeNodeSource);
+export const FileTypeNpm = createIcon(FileTypeNpmSource);
+export const FileTypePackage = createIcon(FileTypePackageSource);
+export const FileTypePdf = createIcon(FileTypePdfSource);
+export const FileTypePhp = createIcon(FileTypePhpSource);
+export const FileTypePnpm = createIcon(FileTypePnpmSource);
+export const FileTypePowerpoint = createIcon(FileTypePowerpointSource);
+export const FileTypePowershell = createIcon(FileTypePowershellSource);
+export const FileTypePrettier = createIcon(FileTypePrettierSource);
+export const FileTypePrisma = createIcon(FileTypePrismaSource);
+export const FileTypePython = createIcon(FileTypePythonSource);
+export const FileTypeReactJs = createIcon(FileTypeReactJsSource);
+export const FileTypeReactTs = createIcon(FileTypeReactTsSource);
+export const FileTypeRuby = createIcon(FileTypeRubySource);
+export const FileTypeRust = createIcon(FileTypeRustSource);
+export const FileTypeScss = createIcon(FileTypeScssSource);
+export const FileTypeShell = createIcon(FileTypeShellSource);
+export const FileTypeSql = createIcon(FileTypeSqlSource);
+export const FileTypeSqlite = createIcon(FileTypeSqliteSource);
+export const FileTypeSvelte = createIcon(FileTypeSvelteSource);
+export const FileTypeSwift = createIcon(FileTypeSwiftSource);
+export const FileTypeSystemd = createIcon(FileTypeSystemdSource);
+export const FileTypeTerraform = createIcon(FileTypeTerraformSource);
+export const FileTypeText = createIcon(FileTypeTextSource);
+export const FileTypeToml = createIcon(FileTypeTomlSource);
+export const FileTypeTs = createIcon(FileTypeTsSource);
+export const FileTypeTsConfig = createIcon(FileTypeTsConfigSource);
+export const FileTypeTsDef = createIcon(FileTypeTsDefSource);
+export const FileTypeVideo = createIcon(FileTypeVideoSource);
+export const FileTypeVite = createIcon(FileTypeViteSource);
+export const FileTypeVitest = createIcon(FileTypeVitestSource);
+export const FileTypeVue = createIcon(FileTypeVueSource);
+export const FileTypeWebpack = createIcon(FileTypeWebpackSource);
+export const FileTypeWord = createIcon(FileTypeWordSource);
+export const FileTypeXml = createIcon(FileTypeXmlSource);
+export const FileTypeYaml = createIcon(FileTypeYamlSource);
+export const FileTypeYarn = createIcon(FileTypeYarnSource);
+export const FileTypeZip = createIcon(FileTypeZipSource);
 const fileIconSvg = fileIconSvgSource as unknown as string;
 const folderIconSvg = folderIconSvgSource as unknown as string;
 
diff --git a/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx b/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
index 32cb46bd3..abff67f32 100644
--- a/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
@@ -105,7 +105,7 @@ type ProjectToolsPanelProps = {
   onTunnelOpenChange?: (open: boolean) => void;
   onSshTunnelOpenChange?: (open: boolean) => void;
   onSshProjectHostIdsChange?: (hostIds: string[]) => void;
-  onOpenSshSession?: (session: TerminalSession) => void;
+  onOpenSshSession?: (session: TerminalSession, kind?: "bash" | "sftp") => void;
   onSessionsChange?: (sessions: TerminalSession[]) => void;
   onInsertFileMention?: (path: string, kind: "file" | "dir") => void;
   onOpenFile?: (path: string) => void;
@@ -1824,7 +1824,7 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
                       sessions={sshSessions}
                       onSessionSnapshot={rememberTerminalSnapshot}
                       onSessionClosed={forgetTerminalSession}
-                      onOpenSession={(session) => onOpenSshSession?.(session)}
+                      onOpenSession={(session, kind) => onOpenSshSession?.(session, kind)}
                       onAssociatedHostIdsChange={(hostIds) => {
                         onSshProjectHostIdsChange?.(hostIds);
                       }}
diff --git a/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
index 891fa62f2..3629e5137 100644
--- a/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/SshTunnelPanel.tsx
@@ -15,6 +15,7 @@ import {
   Check,
   ChevronDown,
   Clock3,
+  FolderTree,
   Globe,
   Key,
   Loader2,
@@ -54,7 +55,7 @@ type SshTunnelPanelProps = {
   sessions: TerminalSession[];
   onSessionSnapshot: (snapshot: TerminalSnapshot) => void;
   onSessionClosed: (sessionId: string) => void;
-  onOpenSession: (session: TerminalSession) => void;
+  onOpenSession: (session: TerminalSession, kind?: "bash" | "sftp") => void;
   onAssociatedHostIdsChange: (hostIds: string[]) => void;
 };
 
@@ -350,6 +351,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
         projectPathKey,
         hostId: selectedCreateHost.id,
         title: createTitle.trim() || undefined,
+        sftpEnabled: createSftpEnabled,
       })
       .then((result) => {
         if (result.prompt) {
@@ -370,6 +372,7 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
   }, [
     canCreate,
     client,
+    createSftpEnabled,
     createTitle,
     cwd,
     finishCreatedSnapshot,
@@ -951,10 +954,22 @@ export function SshTunnelPanel(props: SshTunnelPanelProps) {
                           title={t("projectTools.sshTunnelOpenBash")}
                           aria-label={t("projectTools.sshTunnelOpenBash")}
                           disabled={!connected}
-                          onClick={() => onOpenSession(session)}
+                          onClick={() => onOpenSession(session, "bash")}
                         >
                           <Terminal className="h-4 w-4" />
                         </button>
+                        {session.ssh?.sftpEnabled ? (
+                          <button
+                            type="button"
+                            className="flex h-8 w-8 items-center justify-center rounded-lg border border-border/60 bg-background/70 text-muted-foreground transition-colors hover:border-sky-500/40 hover:bg-sky-500/10 hover:text-sky-600 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 dark:hover:text-sky-400"
+                            title={t("projectTools.sshTunnelOpenSftp")}
+                            aria-label={t("projectTools.sshTunnelOpenSftp")}
+                            disabled={!connected}
+                            onClick={() => onOpenSession(session, "sftp")}
+                          >
+                            <FolderTree className="h-4 w-4" />
+                          </button>
+                        ) : null}
                         <button
                           type="button"
                           className="flex h-8 w-8 items-center justify-center rounded-lg border border-border/60 bg-background/70 text-muted-foreground transition-colors hover:border-destructive/30 hover:bg-destructive/10 hover:text-destructive focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50"
diff --git a/crates/agent-gui/src/components/workspace-editor/WorkspaceSftpPanel.tsx b/crates/agent-gui/src/components/workspace-editor/WorkspaceSftpPanel.tsx
new file mode 100644
index 000000000..02ef2286c
--- /dev/null
+++ b/crates/agent-gui/src/components/workspace-editor/WorkspaceSftpPanel.tsx
@@ -0,0 +1,2105 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { createPortal } from "react-dom";
+import { useLocale } from "../../i18n";
+import { cn } from "../../lib/shared/utils";
+import type {
+  SftpClient,
+  SftpEntry,
+  SftpSide,
+  SftpTransfer,
+} from "../../lib/sftp/types";
+import type { TerminalSession } from "../../lib/terminal/types";
+import {
+  AlertTriangle,
+  CheckCircle2,
+  Copy,
+  DefaultFile,
+  Download,
+  FileTypeApache,
+  FileTypeAudio,
+  FileTypeBinary,
+  FileTypeBun,
+  FileTypeC,
+  FileTypeCargo,
+  FileTypeCert,
+  FileTypeCmake,
+  FileTypeConfig,
+  FileTypeCpp,
+  FileTypeCsharp,
+  FileTypeCss,
+  FileTypeDart,
+  FileTypeDb,
+  FileTypeDocker,
+  FileTypeDotenv,
+  FileTypeEslint,
+  FileTypeExcel,
+  FileTypeFont,
+  FileTypeGit,
+  FileTypeGo,
+  FileTypeGoWork,
+  FileTypeGradle,
+  FileTypeGraphql,
+  FileTypeHtml,
+  FileTypeImage,
+  FileTypeIni,
+  FileTypeJava,
+  FileTypeJs,
+  FileTypeJsConfig,
+  FileTypeJson,
+  FileTypeKey,
+  FileTypeKotlin,
+  FileTypeLicense,
+  FileTypeLog,
+  FileTypeMarkdown,
+  FileTypeMaven,
+  FileTypeNginx,
+  FileTypeNode,
+  FileTypeNpm,
+  FileTypePackage,
+  FileTypePdf,
+  FileTypePhp,
+  FileTypePnpm,
+  FileTypePowerpoint,
+  FileTypePowershell,
+  FileTypePrettier,
+  FileTypePrisma,
+  FileTypePython,
+  FileTypeReactJs,
+  FileTypeReactTs,
+  FileTypeRuby,
+  FileTypeRust,
+  FileTypeScss,
+  FileTypeShell,
+  FileTypeSql,
+  FileTypeSqlite,
+  FileTypeSvelte,
+  FileTypeSwift,
+  FileTypeSystemd,
+  FileTypeTerraform,
+  FileTypeText,
+  FileTypeToml,
+  FileTypeTs,
+  FileTypeTsConfig,
+  FileTypeTsDef,
+  FileTypeVideo,
+  FileTypeVite,
+  FileTypeVitest,
+  FileTypeVue,
+  FileTypeWebpack,
+  FileTypeWord,
+  FileTypeXml,
+  FileTypeYaml,
+  FileTypeYarn,
+  FileTypeZip,
+  Folder,
+  FolderOpen,
+  Loader2,
+  Pencil,
+  Plus,
+  RefreshCw,
+  Trash2,
+  type IconComponent,
+  Upload,
+} from "../icons";
+import { useConfirmDialog } from "../ui/confirm-dialog";
+
+type WorkspaceSftpPanelProps = {
+  session: TerminalSession;
+  client: SftpClient;
+  isActive: boolean;
+  onError?: (error: string | null) => void;
+};
+
+type PaneState = {
+  path: string;
+  entries: SftpEntry[];
+  loading: boolean;
+  error: string | null;
+  selectedPaths: string[];
+};
+
+type ContextMenuState = {
+  x: number;
+  y: number;
+  side: SftpSide;
+  path: string;
+  kind: string;
+  isEntry: boolean;
+  items: DragPayloadItem[];
+};
+
+type DragPayloadItem = {
+  path: string;
+  kind: string;
+};
+
+type DragPayload = DragPayloadItem & {
+  side: SftpSide;
+  items?: DragPayloadItem[];
+};
+
+type DragPreviewState = {
+  source: DragPayload;
+  x: number;
+  y: number;
+};
+
+type PointerDragState = {
+  pointerId: number;
+  source: DragPayload;
+  startX: number;
+  startY: number;
+  active: boolean;
+};
+
+type CreateFolderDialogState = {
+  side: SftpSide;
+  basePath: string;
+};
+
+type RenameEntryDialogState = {
+  side: SftpSide;
+  path: string;
+  currentName: string;
+};
+
+const SFTP_DRAG_MIME = "application/x-liveagent-sftp";
+const SFTP_DRAG_TEXT_PREFIX = "liveagent-sftp:";
+const INITIAL_LOCAL_PATH = "";
+const INITIAL_REMOTE_PATH = ".";
+const TERMINAL_TRANSFER_STATUSES = new Set(["completed", "failed", "cancelled"]);
+const POINTER_DRAG_THRESHOLD_PX = 6;
+const FILE_ICON_CLASS = "h-4 w-4 shrink-0";
+const FOLDER_ICON_CLASS = "h-4 w-4 shrink-0 text-amber-500";
+
+const EXACT_FILE_ICONS: Record<string, IconComponent> = {
+  ".bash_profile": FileTypeShell,
+  ".bashrc": FileTypeShell,
+  ".dockerignore": FileTypeDocker,
+  ".editorconfig": FileTypeConfig,
+  ".eslintignore": FileTypeEslint,
+  ".eslintrc": FileTypeEslint,
+  ".gitattributes": FileTypeGit,
+  ".gitconfig": FileTypeGit,
+  ".gitignore": FileTypeGit,
+  ".gitkeep": FileTypeGit,
+  ".htaccess": FileTypeApache,
+  ".npmrc": FileTypeNpm,
+  ".profile": FileTypeShell,
+  ".prettierignore": FileTypePrettier,
+  ".prettierrc": FileTypePrettier,
+  ".vimrc": FileTypeConfig,
+  ".yarnrc": FileTypeYarn,
+  ".zprofile": FileTypeShell,
+  ".zshrc": FileTypeShell,
+  "authorized_keys": FileTypeKey,
+  "bun.lock": FileTypeBun,
+  "bun.lockb": FileTypeBun,
+  "cargo.lock": FileTypeCargo,
+  "cargo.toml": FileTypeCargo,
+  "cmakelists.txt": FileTypeCmake,
+  "composer.json": FileTypePhp,
+  "composer.lock": FileTypePhp,
+  "containerfile": FileTypeDocker,
+  "copying": FileTypeLicense,
+  "copying.md": FileTypeLicense,
+  "copying.txt": FileTypeLicense,
+  "dockerfile": FileTypeDocker,
+  "d.ts": FileTypeTsDef,
+  "go.mod": FileTypeGo,
+  "go.sum": FileTypeGo,
+  "go.work": FileTypeGoWork,
+  "go.work.sum": FileTypeGoWork,
+  "gradle.properties": FileTypeGradle,
+  "gnumakefile": FileTypeConfig,
+  "httpd.conf": FileTypeApache,
+  "id_dsa": FileTypeKey,
+  "id_ecdsa": FileTypeKey,
+  "id_ed25519": FileTypeKey,
+  "id_rsa": FileTypeKey,
+  "jenkinsfile": FileTypeConfig,
+  "jsconfig.json": FileTypeJsConfig,
+  "known_hosts": FileTypeKey,
+  "license": FileTypeLicense,
+  "license.md": FileTypeLicense,
+  "license.txt": FileTypeLicense,
+  "makefile": FileTypeConfig,
+  "nginx.conf": FileTypeNginx,
+  "package-lock.json": FileTypeNpm,
+  "package.json": FileTypePackage,
+  "pnpm-lock.yaml": FileTypePnpm,
+  "pnpm-workspace.yaml": FileTypePnpm,
+  "pom.xml": FileTypeMaven,
+  "procfile": FileTypeConfig,
+  "requirements.txt": FileTypePython,
+  "resolv.conf": FileTypeConfig,
+  "robots.txt": FileTypeText,
+  "settings.gradle": FileTypeGradle,
+  "settings.gradle.kts": FileTypeGradle,
+  "ssh_config": FileTypeKey,
+  "sshd_config": FileTypeKey,
+  "sudoers": FileTypeConfig,
+  "tsconfig.json": FileTypeTsConfig,
+  "yarn.lock": FileTypeYarn,
+};
+
+const EXTENSION_FILE_ICONS: Record<string, IconComponent> = {
+  "7z": FileTypeZip,
+  a: FileTypeBinary,
+  aac: FileTypeAudio,
+  apk: FileTypeZip,
+  avi: FileTypeVideo,
+  avif: FileTypeImage,
+  bash: FileTypeShell,
+  bin: FileTypeBinary,
+  bmp: FileTypeImage,
+  bz2: FileTypeZip,
+  c: FileTypeC,
+  cc: FileTypeCpp,
+  cer: FileTypeCert,
+  cert: FileTypeCert,
+  cfg: FileTypeConfig,
+  cjs: FileTypeJs,
+  class: FileTypeBinary,
+  cmake: FileTypeCmake,
+  conf: FileTypeConfig,
+  config: FileTypeConfig,
+  cpp: FileTypeCpp,
+  crt: FileTypeCert,
+  cs: FileTypeCsharp,
+  csr: FileTypeCert,
+  css: FileTypeCss,
+  csv: FileTypeExcel,
+  cts: FileTypeTs,
+  cxx: FileTypeCpp,
+  dart: FileTypeDart,
+  db: FileTypeDb,
+  deb: FileTypeZip,
+  dll: FileTypeBinary,
+  dmg: FileTypeZip,
+  doc: FileTypeWord,
+  docx: FileTypeWord,
+  dylib: FileTypeBinary,
+  env: FileTypeDotenv,
+  eot: FileTypeFont,
+  exe: FileTypeBinary,
+  fish: FileTypeShell,
+  flac: FileTypeAudio,
+  gif: FileTypeImage,
+  go: FileTypeGo,
+  gql: FileTypeGraphql,
+  gradle: FileTypeGradle,
+  graphql: FileTypeGraphql,
+  gz: FileTypeZip,
+  h: FileTypeC,
+  hpp: FileTypeCpp,
+  htm: FileTypeHtml,
+  html: FileTypeHtml,
+  icns: FileTypeImage,
+  ico: FileTypeImage,
+  ini: FileTypeIni,
+  ipa: FileTypeZip,
+  ipynb: FileTypePython,
+  iso: FileTypeZip,
+  jar: FileTypeZip,
+  java: FileTypeJava,
+  jpeg: FileTypeImage,
+  jpg: FileTypeImage,
+  js: FileTypeJs,
+  json: FileTypeJson,
+  json5: FileTypeJson,
+  jsonc: FileTypeJson,
+  jsx: FileTypeReactJs,
+  key: FileTypeKey,
+  ksh: FileTypeShell,
+  kt: FileTypeKotlin,
+  kts: FileTypeKotlin,
+  less: FileTypeCss,
+  lib: FileTypeBinary,
+  lock: FileTypeConfig,
+  log: FileTypeLog,
+  m4a: FileTypeAudio,
+  markdown: FileTypeMarkdown,
+  md: FileTypeMarkdown,
+  mdx: FileTypeMarkdown,
+  mjs: FileTypeJs,
+  mkv: FileTypeVideo,
+  mov: FileTypeVideo,
+  mp3: FileTypeAudio,
+  mp4: FileTypeVideo,
+  mpeg: FileTypeVideo,
+  mpg: FileTypeVideo,
+  mts: FileTypeTs,
+  node: FileTypeNode,
+  o: FileTypeBinary,
+  ogg: FileTypeAudio,
+  opus: FileTypeAudio,
+  otf: FileTypeFont,
+  out: FileTypeLog,
+  p12: FileTypeCert,
+  pdf: FileTypePdf,
+  pem: FileTypeCert,
+  pfx: FileTypeCert,
+  php: FileTypePhp,
+  plist: FileTypeConfig,
+  png: FileTypeImage,
+  ppt: FileTypePowerpoint,
+  pptx: FileTypePowerpoint,
+  prisma: FileTypePrisma,
+  properties: FileTypeConfig,
+  ps1: FileTypePowershell,
+  psd1: FileTypePowershell,
+  psm1: FileTypePowershell,
+  pub: FileTypeKey,
+  py: FileTypePython,
+  pyc: FileTypeBinary,
+  pyw: FileTypePython,
+  rar: FileTypeZip,
+  rb: FileTypeRuby,
+  rpm: FileTypeZip,
+  rs: FileTypeRust,
+  rtf: FileTypeText,
+  sass: FileTypeScss,
+  scss: FileTypeScss,
+  service: FileTypeSystemd,
+  sh: FileTypeShell,
+  so: FileTypeBinary,
+  socket: FileTypeSystemd,
+  sql: FileTypeSql,
+  sqlite: FileTypeSqlite,
+  sqlite3: FileTypeSqlite,
+  svelte: FileTypeSvelte,
+  svg: FileTypeImage,
+  swift: FileTypeSwift,
+  tar: FileTypeZip,
+  target: FileTypeSystemd,
+  tf: FileTypeTerraform,
+  tfvars: FileTypeTerraform,
+  tgz: FileTypeZip,
+  timer: FileTypeSystemd,
+  toml: FileTypeToml,
+  ts: FileTypeTs,
+  tsx: FileTypeReactTs,
+  tsv: FileTypeExcel,
+  ttf: FileTypeFont,
+  txt: FileTypeText,
+  vue: FileTypeVue,
+  war: FileTypeZip,
+  wasm: FileTypeBinary,
+  wav: FileTypeAudio,
+  webm: FileTypeVideo,
+  webp: FileTypeImage,
+  woff: FileTypeFont,
+  woff2: FileTypeFont,
+  xls: FileTypeExcel,
+  xlsx: FileTypeExcel,
+  xml: FileTypeXml,
+  xz: FileTypeZip,
+  yaml: FileTypeYaml,
+  yml: FileTypeYaml,
+  zip: FileTypeZip,
+  zsh: FileTypeShell,
+};
+
+const PREFIX_FILE_ICONS: Array<[string, IconComponent]> = [
+  [".env", FileTypeDotenv],
+  [".eslintrc", FileTypeEslint],
+  [".git", FileTypeGit],
+  [".npmrc", FileTypeNpm],
+  [".prettierrc", FileTypePrettier],
+  [".yarnrc", FileTypeYarn],
+  ["compose.", FileTypeDocker],
+  ["docker-compose.", FileTypeDocker],
+  ["eslint.config.", FileTypeEslint],
+  ["prettier.config.", FileTypePrettier],
+  ["vite.config.", FileTypeVite],
+  ["vitest.config.", FileTypeVitest],
+  ["webpack.config.", FileTypeWebpack],
+];
+
+function initialPane(path: string): PaneState {
+  return {
+    path,
+    entries: [],
+    loading: false,
+    error: null,
+    selectedPaths: [],
+  };
+}
+
+function parentPath(path: string, side: SftpSide) {
+  const normalized = normalizePath(path, side);
+  if (!normalized || normalized === "." || normalized === "/") return side === "remote" ? "." : "";
+  const parts = normalized.split("/").filter(Boolean);
+  parts.pop();
+  if (side === "remote" && normalized.startsWith("/")) {
+    return parts.length ? `/${parts.join("/")}` : "/";
+  }
+  return parts.join("/") || (side === "remote" ? "." : "");
+}
+
+function basename(path: string) {
+  const normalized = path.replace(/\\/g, "/").replace(/\/+$/, "");
+  return normalized.split("/").filter(Boolean).pop() ?? normalized;
+}
+
+function normalizePath(path: string, side: SftpSide) {
+  const normalized = path.trim().replace(/\\/g, "/");
+  if (side === "remote") {
+    if (!normalized || normalized === ".") return ".";
+    return normalized.replace(/\/+/g, "/");
+  }
+  return normalized.replace(/^\/+/, "").replace(/\/+/g, "/");
+}
+
+function isAbsoluteLocalPath(path: string) {
+  const value = path.trim();
+  return (
+    value.startsWith("/") ||
+    /^[a-zA-Z]:[\\/]/.test(value) ||
+    /^\\\\/.test(value) ||
+    /^\/\/[^/\\]+[\\/][^/\\]+/.test(value)
+  );
+}
+
+function localPathSeparator(root: string) {
+  return root.includes("\\") && !root.includes("/") ? "\\" : "/";
+}
+
+function localAbsolutePathForCopy(workdir: string, path: string) {
+  const rawPath = path.trim();
+  if (isAbsoluteLocalPath(rawPath)) return rawPath;
+
+  const base = workdir.trim();
+  const relativePath = normalizePath(rawPath, "local");
+  if (!relativePath || relativePath === ".") return base;
+
+  const separator = localPathSeparator(base);
+  const normalizedRelativePath = relativePath.replace(/\//g, separator);
+  const trimmedBase = base.replace(/[\\/]+$/, "");
+  if (!trimmedBase) return `${separator}${normalizedRelativePath}`;
+
+  return `${trimmedBase}${separator}${normalizedRelativePath}`;
+}
+
+function remoteAbsolutePathForCopy(path: string) {
+  const normalized = normalizePath(path, "remote");
+  if (!normalized || normalized === ".") return "/";
+  if (normalized.startsWith("/")) return normalized;
+  return `/${normalized.replace(/^\/+/, "")}`;
+}
+
+function absolutePathForCopy(side: SftpSide, path: string, workdir: string) {
+  return side === "local" ? localAbsolutePathForCopy(workdir, path) : remoteAbsolutePathForCopy(path);
+}
+
+function joinPath(parent: string, child: string, side: SftpSide) {
+  const name = child.trim().replace(/\\/g, "/").replace(/^\/+|\/+$/g, "");
+  if (!name) return normalizePath(parent, side);
+  const base = normalizePath(parent, side);
+  if (side === "remote") {
+    if (base === "/") return `/${name}`;
+    if (!base || base === ".") return name;
+  }
+  if (!base) return name;
+  return `${base.replace(/\/+$/, "")}/${name}`;
+}
+
+function pathCrumbs(path: string, side: SftpSide, projectLabel: string) {
+  const normalized = normalizePath(path, side);
+  const root = side === "remote" ? (normalized.startsWith("/") ? "/" : ".") : "";
+  const parts = normalized === "." || normalized === "/" ? [] : normalized.split("/").filter(Boolean);
+  const crumbs = [{ label: side === "remote" ? root : projectLabel, path: root }];
+  let current = root;
+  for (const part of parts) {
+    current = joinPath(current, part, side);
+    crumbs.push({ label: part, path: current });
+  }
+  return crumbs;
+}
+
+function formatBytes(value: number) {
+  if (!Number.isFinite(value) || value <= 0) return "0 B";
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  let size = value;
+  let unit = 0;
+  while (size >= 1024 && unit < units.length - 1) {
+    size /= 1024;
+    unit += 1;
+  }
+  return `${size >= 10 || unit === 0 ? Math.round(size) : size.toFixed(1)} ${units[unit]}`;
+}
+
+function entryTypeLabel(entry: SftpEntry, t: (key: string) => string) {
+  if (entry.kind === "directory") return t("workspaceSftp.entry.folder");
+  const extension = basename(entry.name).split(".").pop();
+  if (extension && extension !== entry.name) return extension;
+  if (entry.kind === "file" || !entry.kind) return t("workspaceSftp.entry.file");
+  return entry.kind;
+}
+
+function iconForEntryName(name: string) {
+  const fileName = basename(name);
+  const normalized = fileName.toLowerCase();
+  const exactIcon = EXACT_FILE_ICONS[normalized];
+  if (exactIcon) return exactIcon;
+  for (const [prefix, Icon] of PREFIX_FILE_ICONS) {
+    if (normalized.startsWith(prefix)) return Icon;
+  }
+  const parts = normalized.split(".");
+  if (parts.length > 1) {
+    const compoundExtension = parts.slice(-2).join(".");
+    const compoundIcon = EXACT_FILE_ICONS[compoundExtension];
+    if (compoundIcon) return compoundIcon;
+    const extensionIcon = EXTENSION_FILE_ICONS[parts[parts.length - 1] ?? ""];
+    if (extensionIcon) return extensionIcon;
+  }
+  return DefaultFile;
+}
+
+function entryIcon(entry: SftpEntry, className?: string) {
+  if (entry.kind === "directory") return <Folder className={className ?? FOLDER_ICON_CLASS} />;
+  const Icon = iconForEntryName(entry.name || entry.path);
+  return <Icon className={className ?? FILE_ICON_CLASS} />;
+}
+
+function transferProgress(transfer: SftpTransfer | null) {
+  if (!transfer) return 0;
+  if (transfer.status === "completed") return 100;
+  if (transfer.bytesTotal > 0) {
+    return Math.min(100, Math.max(0, Math.round((transfer.bytesDone / transfer.bytesTotal) * 100)));
+  }
+  if (transfer.filesTotal > 0) {
+    return Math.min(100, Math.max(0, Math.round((transfer.filesDone / transfer.filesTotal) * 100)));
+  }
+  return transfer.status === "running" ? 8 : 0;
+}
+
+function transferTone(transfer: SftpTransfer | null) {
+  if (!transfer) return "bg-muted-foreground";
+  if (transfer.status === "completed") return "bg-emerald-500";
+  if (transfer.status === "failed") return "bg-destructive";
+  if (transfer.status === "cancelled") return "bg-muted-foreground";
+  return "bg-sky-500";
+}
+
+function isSftpSide(value: unknown): value is SftpSide {
+  return value === "local" || value === "remote";
+}
+
+function isDragPayloadItem(value: unknown): value is DragPayloadItem {
+  if (!value || typeof value !== "object") return false;
+  const item = value as Partial<DragPayloadItem>;
+  return typeof item.path === "string" && typeof item.kind === "string";
+}
+
+function isDragPayload(value: unknown): value is DragPayload {
+  if (!value || typeof value !== "object") return false;
+  const payload = value as Partial<DragPayload>;
+  return (
+    isSftpSide(payload.side) &&
+    typeof payload.path === "string" &&
+    typeof payload.kind === "string" &&
+    (payload.items === undefined || (Array.isArray(payload.items) && payload.items.every(isDragPayloadItem)))
+  );
+}
+
+function dragItems(payload: DragPayload): DragPayloadItem[] {
+  return payload.items?.length ? payload.items : [{ path: payload.path, kind: payload.kind }];
+}
+
+function encodeDragPayload(payload: DragPayload) {
+  return JSON.stringify(payload);
+}
+
+function writeDragPayload(dataTransfer: DataTransfer, payload: DragPayload) {
+  const encoded = encodeDragPayload(payload);
+  dataTransfer.setData(SFTP_DRAG_MIME, encoded);
+  dataTransfer.setData("text/plain", `${SFTP_DRAG_TEXT_PREFIX}${encoded}`);
+  dataTransfer.effectAllowed = "copy";
+}
+
+function readDragPayload(dataTransfer: DataTransfer): DragPayload | null {
+  const custom = dataTransfer.getData(SFTP_DRAG_MIME);
+  const text = dataTransfer.getData("text/plain");
+  const raw = custom || (text.startsWith(SFTP_DRAG_TEXT_PREFIX) ? text.slice(SFTP_DRAG_TEXT_PREFIX.length) : "");
+  if (!raw) return null;
+  try {
+    const payload = JSON.parse(raw) as unknown;
+    return isDragPayload(payload) ? payload : null;
+  } catch {
+    return null;
+  }
+}
+
+function isLeavingCurrentTarget(event: React.DragEvent) {
+  const related = event.relatedTarget;
+  return !related || !(related instanceof Node) || !event.currentTarget.contains(related);
+}
+
+export function WorkspaceSftpPanel(props: WorkspaceSftpPanelProps) {
+  const { session, client, isActive, onError } = props;
+  const { t } = useLocale();
+  const { confirm, dialog } = useConfirmDialog();
+  const panelRef = useRef<HTMLDivElement | null>(null);
+  const transferChainRef = useRef<Promise<void>>(Promise.resolve());
+  const transferWaitersRef = useRef(new Map<string, (transfer: SftpTransfer | null) => void>());
+  const terminalTransfersRef = useRef(new Map<string, SftpTransfer>());
+  const pendingTransferStartsRef = useRef(0);
+  const activeTransferIdsRef = useRef(new Set<string>());
+  const nativeDragPayloadRef = useRef<DragPayload | null>(null);
+  const pointerDragRef = useRef<PointerDragState | null>(null);
+  const suppressNextClickRef = useRef(false);
+  const suppressNextContextMenuRef = useRef(false);
+  const copyToastTimerRef = useRef<number | null>(null);
+  const panePathRef = useRef({ local: INITIAL_LOCAL_PATH, remote: INITIAL_REMOTE_PATH });
+  const [localPane, setLocalPane] = useState<PaneState>(() => initialPane(INITIAL_LOCAL_PATH));
+  const [remotePane, setRemotePane] = useState<PaneState>(() => initialPane(INITIAL_REMOTE_PATH));
+  const [contextMenu, setContextMenu] = useState<ContextMenuState | null>(null);
+  const [dropTarget, setDropTarget] = useState<{ side: SftpSide; path: string } | null>(null);
+  const [activeDragSource, setActiveDragSource] = useState<DragPayload | null>(null);
+  const [dragPreview, setDragPreview] = useState<DragPreviewState | null>(null);
+  const [transfer, setTransfer] = useState<SftpTransfer | null>(null);
+  const [queueCount, setQueueCount] = useState(0);
+  const [busyMessage, setBusyMessage] = useState("");
+  const [createFolderDialog, setCreateFolderDialog] = useState<CreateFolderDialogState | null>(null);
+  const [createFolderName, setCreateFolderName] = useState("");
+  const [creatingFolder, setCreatingFolder] = useState(false);
+  const [renameEntryDialog, setRenameEntryDialog] = useState<RenameEntryDialogState | null>(null);
+  const [renameEntryName, setRenameEntryName] = useState("");
+  const [renamingEntry, setRenamingEntry] = useState(false);
+  const [copyPathDialog, setCopyPathDialog] = useState<string | null>(null);
+  const [copyToastVisible, setCopyToastVisible] = useState(false);
+
+  const workdir = session.cwd;
+  const projectPathKey = session.projectPathKey || session.cwd;
+  const connected = session.running && (session.ssh?.status ?? "connected") === "connected";
+
+  const syncQueueCount = useCallback(() => {
+    setQueueCount(pendingTransferStartsRef.current + activeTransferIdsRef.current.size);
+  }, []);
+
+  useEffect(() => {
+    panePathRef.current = {
+      local: localPane.path,
+      remote: remotePane.path,
+    };
+  }, [localPane.path, remotePane.path]);
+
+  const findEntry = useCallback(
+    (source: DragPayload | null) => {
+      if (!source) return null;
+      const entries = source.side === "local" ? localPane.entries : remotePane.entries;
+      return entries.find((entry) => entry.path === source.path) ?? null;
+    },
+    [localPane.entries, remotePane.entries],
+  );
+
+  const loadPane = useCallback(
+    async (side: SftpSide, path: string) => {
+      const normalizedPath = normalizePath(path, side);
+      const setPane = side === "local" ? setLocalPane : setRemotePane;
+      setPane((current) => ({ ...current, path: normalizedPath, loading: true, error: null }));
+      try {
+        const response = await client.list({
+          sessionId: session.id,
+          projectPathKey,
+          workdir,
+          side,
+          path: normalizedPath,
+        });
+        setPane((current) => ({
+          ...current,
+          path: response.path,
+          entries: response.entries,
+          loading: false,
+          error: null,
+          selectedPaths: current.selectedPaths.filter((path) =>
+            response.entries.some((entry) => entry.path === path),
+          ),
+        }));
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        setPane((current) => ({ ...current, loading: false, error: message }));
+        onError?.(message);
+      }
+    },
+    [client, onError, projectPathKey, session.id, workdir],
+  );
+
+  useEffect(() => {
+    if (!isActive) return;
+    void loadPane("local", localPane.path || INITIAL_LOCAL_PATH);
+    void loadPane("remote", remotePane.path || INITIAL_REMOTE_PATH);
+    // Initial active load only; explicit path changes call loadPane directly.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isActive, session.id]);
+
+  useEffect(() => {
+    return () => {
+      for (const resolve of transferWaitersRef.current.values()) {
+        resolve(null);
+      }
+      transferWaitersRef.current.clear();
+      terminalTransfersRef.current.clear();
+      pendingTransferStartsRef.current = 0;
+      activeTransferIdsRef.current.clear();
+      if (copyToastTimerRef.current !== null) {
+        window.clearTimeout(copyToastTimerRef.current);
+      }
+    };
+  }, []);
+
+  useEffect(() => {
+    if (!contextMenu) return;
+    const close = () => setContextMenu(null);
+    window.addEventListener("click", close);
+    window.addEventListener("blur", close);
+    window.addEventListener("resize", close);
+    return () => {
+      window.removeEventListener("click", close);
+      window.removeEventListener("blur", close);
+      window.removeEventListener("resize", close);
+    };
+  }, [contextMenu]);
+
+  useEffect(() => {
+    return client.subscribeTransfers((event) => {
+      if (event.transfer.sessionId !== session.id) return;
+      setTransfer(event.transfer);
+      if (TERMINAL_TRANSFER_STATUSES.has(event.transfer.status)) {
+        terminalTransfersRef.current.set(event.transfer.id, event.transfer);
+        const resolve = transferWaitersRef.current.get(event.transfer.id);
+        if (resolve) {
+          transferWaitersRef.current.delete(event.transfer.id);
+          terminalTransfersRef.current.delete(event.transfer.id);
+          resolve(event.transfer);
+        }
+        if (event.transfer.id) {
+          activeTransferIdsRef.current.delete(event.transfer.id);
+          syncQueueCount();
+        }
+      }
+      if (event.transfer.status === "completed") {
+        const targetSide: SftpSide = event.transfer.direction === "upload" ? "remote" : "local";
+        void loadPane(targetSide, panePathRef.current[targetSide]);
+      }
+    });
+  }, [client, loadPane, session.id, syncQueueCount]);
+
+  const waitForTransferDone = useCallback((transferId: string) => {
+    const terminalTransfer = terminalTransfersRef.current.get(transferId);
+    if (terminalTransfer) {
+      terminalTransfersRef.current.delete(transferId);
+      return Promise.resolve(terminalTransfer);
+    }
+    return new Promise<SftpTransfer | null>((resolve) => {
+      transferWaitersRef.current.set(transferId, resolve);
+    });
+  }, []);
+
+  const paneForSide = (side: SftpSide) => (side === "local" ? localPane : remotePane);
+  const selectedItemsForSide = useCallback(
+    (side: SftpSide) => {
+      const pane = side === "local" ? localPane : remotePane;
+      const selected = new Set(pane.selectedPaths);
+      return pane.entries.filter((entry) => selected.has(entry.path));
+    },
+    [localPane, remotePane],
+  );
+
+  const getActionItems = useCallback(
+    (side: SftpSide, path: string, kind: string, isEntry = true): DragPayloadItem[] => {
+      if (!isEntry) return [{ path, kind }];
+      const selected = selectedItemsForSide(side);
+      if (selected.some((entry) => entry.path === path)) {
+        return selected.map((entry) => ({ path: entry.path, kind: entry.kind }));
+      }
+      return [{ path, kind }];
+    },
+    [selectedItemsForSide],
+  );
+
+  const selectEntry = (side: SftpSide, path: string, additive: boolean) => {
+    const setPane = side === "local" ? setLocalPane : setRemotePane;
+    setPane((current) => {
+      if (!additive) {
+        return { ...current, selectedPaths: [path] };
+      }
+      const selected = new Set(current.selectedPaths);
+      if (selected.has(path)) {
+        selected.delete(path);
+      } else {
+        selected.add(path);
+      }
+      return { ...current, selectedPaths: [...selected] };
+    });
+  };
+
+  const clearSelection = useCallback((side: SftpSide) => {
+    const setPane = side === "local" ? setLocalPane : setRemotePane;
+    setPane((current) => (current.selectedPaths.length ? { ...current, selectedPaths: [] } : current));
+  }, []);
+
+  const createDragPayload = useCallback(
+    (side: SftpSide, entry: SftpEntry): DragPayload => {
+      const items = getActionItems(side, entry.path, entry.kind, true);
+      return {
+        side,
+        path: entry.path,
+        kind: entry.kind,
+        items,
+      };
+    },
+    [getActionItems],
+  );
+
+  const refreshPane = useCallback(
+    (side: SftpSide) => {
+      const pane = side === "local" ? localPane : remotePane;
+      void loadPane(side, pane.path);
+    },
+    [loadPane, localPane, remotePane],
+  );
+
+  const openCreateFolderDialog = useCallback((side: SftpSide, basePath: string) => {
+    setCreateFolderDialog({ side, basePath });
+    setCreateFolderName("");
+  }, []);
+
+  const closeCreateFolderDialog = useCallback(() => {
+    if (creatingFolder) return;
+    setCreateFolderDialog(null);
+    setCreateFolderName("");
+  }, [creatingFolder]);
+
+  const submitCreateFolder = useCallback(
+    async () => {
+      if (!createFolderDialog) return;
+      const name = createFolderName.trim();
+      if (!name || creatingFolder) return;
+      setBusyMessage(t("workspaceSftp.creatingFolder"));
+      setCreatingFolder(true);
+      try {
+        await client.mkdir({
+          sessionId: session.id,
+          projectPathKey,
+          workdir,
+          side: createFolderDialog.side,
+          path: joinPath(createFolderDialog.basePath, name, createFolderDialog.side),
+        });
+        await loadPane(createFolderDialog.side, paneForSide(createFolderDialog.side).path);
+        setCreateFolderDialog(null);
+        setCreateFolderName("");
+      } catch (error) {
+        onError?.(error instanceof Error ? error.message : String(error));
+      } finally {
+        setCreatingFolder(false);
+        setBusyMessage("");
+      }
+    },
+    [
+      client,
+      createFolderDialog,
+      createFolderName,
+      creatingFolder,
+      loadPane,
+      onError,
+      projectPathKey,
+      session.id,
+      t,
+      workdir,
+      localPane,
+      remotePane,
+    ],
+  );
+
+  const openRenameEntryDialog = useCallback((side: SftpSide, path: string) => {
+    const currentName = basename(path);
+    if (!currentName) return;
+    setRenameEntryDialog({ side, path, currentName });
+    setRenameEntryName(currentName);
+  }, []);
+
+  const closeRenameEntryDialog = useCallback(() => {
+    if (renamingEntry) return;
+    setRenameEntryDialog(null);
+    setRenameEntryName("");
+  }, [renamingEntry]);
+
+  const submitRenameEntry = useCallback(
+    async () => {
+      if (!renameEntryDialog) return;
+      const nextName = renameEntryName.trim();
+      if (!nextName || nextName === renameEntryDialog.currentName || renamingEntry) return;
+      const toPath = joinPath(
+        parentPath(renameEntryDialog.path, renameEntryDialog.side),
+        nextName,
+        renameEntryDialog.side,
+      );
+      setBusyMessage(t("workspaceSftp.renaming"));
+      setRenamingEntry(true);
+      try {
+        await client.rename({
+          sessionId: session.id,
+          projectPathKey,
+          workdir,
+          side: renameEntryDialog.side,
+          fromPath: renameEntryDialog.path,
+          toPath,
+        });
+        await loadPane(renameEntryDialog.side, paneForSide(renameEntryDialog.side).path);
+        setRenameEntryDialog(null);
+        setRenameEntryName("");
+      } catch (error) {
+        onError?.(error instanceof Error ? error.message : String(error));
+      } finally {
+        setRenamingEntry(false);
+        setBusyMessage("");
+      }
+    },
+    [
+      client,
+      loadPane,
+      onError,
+      projectPathKey,
+      renameEntryDialog,
+      renameEntryName,
+      renamingEntry,
+      session.id,
+      t,
+      workdir,
+      localPane,
+      remotePane,
+    ],
+  );
+
+  const deleteEntries = useCallback(
+    async (side: SftpSide, items: DragPayloadItem[]) => {
+      const targets = items.filter((item) => item.path !== "" && item.path !== ".");
+      if (!targets.length) return;
+      const hasDirectory = targets.some((item) => item.kind === "directory");
+      const confirmed = await confirm({
+        title: hasDirectory ? t("workspaceSftp.confirmDeleteDirectory") : t("workspaceSftp.confirmDeleteFile"),
+        subtitle: hasDirectory
+          ? t("workspaceSftp.confirmDeleteDirectorySubtitle")
+          : t("workspaceSftp.confirmDeleteFileSubtitle"),
+        detail: targets.length === 1 ? targets[0].path : targets.map((target) => target.path).join(", "),
+        confirmLabel: t("workspaceSftp.deleteConfirm"),
+        cancelLabel: t("workspaceSftp.cancel"),
+        closeLabel: t("workspaceSftp.cancel"),
+        tone: "destructive",
+      });
+      if (!confirmed) return;
+      setBusyMessage(t("workspaceSftp.deleting"));
+      try {
+        for (const item of targets) {
+          await client.delete({
+            sessionId: session.id,
+            projectPathKey,
+            workdir,
+            side,
+            path: item.path,
+            recursive: item.kind === "directory",
+          });
+        }
+        await loadPane(side, paneForSide(side).path);
+      } catch (error) {
+        onError?.(error instanceof Error ? error.message : String(error));
+      } finally {
+        setBusyMessage("");
+      }
+    },
+    [client, confirm, loadPane, onError, projectPathKey, session.id, t, workdir, localPane, remotePane],
+  );
+
+  const showCopyToast = useCallback(() => {
+    if (copyToastTimerRef.current !== null) {
+      window.clearTimeout(copyToastTimerRef.current);
+    }
+    setCopyToastVisible(true);
+    copyToastTimerRef.current = window.setTimeout(() => {
+      setCopyToastVisible(false);
+      copyToastTimerRef.current = null;
+    }, 1600);
+  }, []);
+
+  const copyPath = useCallback(
+    async (path: string) => {
+      try {
+        await navigator.clipboard.writeText(path);
+        showCopyToast();
+      } catch {
+        setCopyPathDialog(path);
+      }
+    },
+    [showCopyToast],
+  );
+
+  const copyPaths = useCallback(
+    async (side: SftpSide, items: DragPayloadItem[]) => {
+      const text = items.map((item) => absolutePathForCopy(side, item.path, workdir)).join("\n");
+      if (!text) return;
+      await copyPath(text);
+    },
+    [copyPath, workdir],
+  );
+
+  const transferSingleItem = useCallback(
+    async (source: DragPayload, targetSide: SftpSide, targetPath: string) => {
+      const direction = source.side === "local" && targetSide === "remote" ? "upload" : "download";
+      if (source.side === targetSide) return;
+      const queuedTransfer: SftpTransfer = {
+        id: "",
+        sessionId: session.id,
+        direction,
+        status: "queued",
+        sourcePath: source.path,
+        targetPath,
+        currentPath: source.path,
+        bytesDone: 0,
+        bytesTotal: 0,
+        filesDone: 0,
+        filesTotal: 0,
+        error: null,
+      };
+      pendingTransferStartsRef.current += 1;
+      syncQueueCount();
+      setTransfer(queuedTransfer);
+
+      const runTransfer = async () => {
+        try {
+          const targetEntryPath = joinPath(targetPath, basename(source.path), targetSide);
+          const targetStat = await client.stat({
+            sessionId: session.id,
+            projectPathKey,
+            workdir,
+            side: targetSide,
+            path: targetEntryPath,
+          }).catch(() => ({ exists: false }));
+          let overwrite = false;
+          if (targetStat.exists) {
+            const confirmed = await confirm({
+              title: t("workspaceSftp.confirmOverwrite"),
+              subtitle: t("workspaceSftp.confirmOverwriteSubtitle"),
+              detail: targetEntryPath,
+              confirmLabel: t("workspaceSftp.overwrite"),
+              cancelLabel: t("workspaceSftp.cancel"),
+              closeLabel: t("workspaceSftp.cancel"),
+              tone: "warning",
+            });
+            if (!confirmed) {
+              pendingTransferStartsRef.current = Math.max(0, pendingTransferStartsRef.current - 1);
+              syncQueueCount();
+              setTransfer((current) => (current?.id ? current : null));
+              return;
+            }
+            overwrite = true;
+          }
+          setTransfer({ ...queuedTransfer, status: "running" });
+          const response = await client.transfer({
+            sessionId: session.id,
+            projectPathKey,
+            workdir,
+            direction,
+            sourcePath: source.path,
+            targetPath,
+            recursive: source.kind === "directory",
+            overwrite,
+          });
+          pendingTransferStartsRef.current = Math.max(0, pendingTransferStartsRef.current - 1);
+          if (response.transfer.id && !TERMINAL_TRANSFER_STATUSES.has(response.transfer.status)) {
+            activeTransferIdsRef.current.add(response.transfer.id);
+          }
+          syncQueueCount();
+          setTransfer(response.transfer);
+          if (!TERMINAL_TRANSFER_STATUSES.has(response.transfer.status)) {
+            const terminalTransfer = await waitForTransferDone(response.transfer.id);
+            if (terminalTransfer) {
+              activeTransferIdsRef.current.delete(response.transfer.id);
+              syncQueueCount();
+              setTransfer(terminalTransfer);
+            }
+          } else {
+            activeTransferIdsRef.current.delete(response.transfer.id);
+            syncQueueCount();
+          }
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          setTransfer({ ...queuedTransfer, status: "failed", error: message });
+          onError?.(message);
+          pendingTransferStartsRef.current = Math.max(0, pendingTransferStartsRef.current - 1);
+          syncQueueCount();
+        }
+      };
+
+      const nextTransfer = transferChainRef.current.then(runTransfer, runTransfer);
+      transferChainRef.current = nextTransfer.catch(() => undefined);
+      await nextTransfer;
+    },
+    [client, confirm, onError, projectPathKey, session.id, syncQueueCount, t, waitForTransferDone, workdir],
+  );
+
+  const transferItem = useCallback(
+    async (source: DragPayload, targetSide: SftpSide, targetPath: string) => {
+      if (source.side === targetSide) return;
+      const items = dragItems(source);
+      for (const item of items) {
+        await transferSingleItem({ side: source.side, path: item.path, kind: item.kind }, targetSide, targetPath);
+      }
+    },
+    [transferSingleItem],
+  );
+
+  const readDropTargetFromPoint = useCallback((clientX: number, clientY: number) => {
+    const panel = panelRef.current;
+    const element = document.elementFromPoint(clientX, clientY);
+    if (!panel || !element || !panel.contains(element)) return null;
+    const target = element.closest<HTMLElement>("[data-sftp-drop-side]");
+    if (!target || !panel.contains(target)) return null;
+    const side = target.dataset.sftpDropSide;
+    if (!isSftpSide(side)) return null;
+    return {
+      side,
+      path: target.dataset.sftpDropPath ?? "",
+    };
+  }, []);
+
+  useEffect(() => {
+    const handlePointerMove = (event: PointerEvent) => {
+      const drag = pointerDragRef.current;
+      if (!drag || drag.pointerId !== event.pointerId) return;
+      const distance = Math.hypot(event.clientX - drag.startX, event.clientY - drag.startY);
+      if (!drag.active && distance < POINTER_DRAG_THRESHOLD_PX) return;
+      if (!drag.active) {
+        drag.active = true;
+        setActiveDragSource(drag.source);
+      }
+      setDragPreview({ source: drag.source, x: event.clientX, y: event.clientY });
+      const target = readDropTargetFromPoint(event.clientX, event.clientY);
+      setDropTarget(target && target.side !== drag.source.side ? target : null);
+      event.preventDefault();
+    };
+
+    const finishPointerDrag = (event: PointerEvent | MouseEvent) => {
+      const drag = pointerDragRef.current;
+      if (!drag) return;
+      if ("pointerId" in event && drag.pointerId !== event.pointerId) return;
+      pointerDragRef.current = null;
+      const target = readDropTargetFromPoint(event.clientX, event.clientY);
+      setDropTarget(null);
+      setActiveDragSource(null);
+      setDragPreview(null);
+      if (drag.active) {
+        suppressNextClickRef.current = true;
+        window.setTimeout(() => {
+          suppressNextClickRef.current = false;
+        }, 0);
+        event.preventDefault();
+        event.stopPropagation();
+      }
+      if (drag.active && target && target.side !== drag.source.side) {
+        void transferItem(drag.source, target.side, target.path);
+      }
+    };
+    const cancelPointerDrag = () => {
+      pointerDragRef.current = null;
+      setDropTarget(null);
+      setActiveDragSource(null);
+      setDragPreview(null);
+    };
+
+    window.addEventListener("pointermove", handlePointerMove, { passive: false });
+    window.addEventListener("pointerup", finishPointerDrag, { passive: false });
+    window.addEventListener("pointercancel", finishPointerDrag, { passive: false });
+    window.addEventListener("blur", cancelPointerDrag);
+    return () => {
+      window.removeEventListener("pointermove", handlePointerMove);
+      window.removeEventListener("pointerup", finishPointerDrag);
+      window.removeEventListener("pointercancel", finishPointerDrag);
+      window.removeEventListener("blur", cancelPointerDrag);
+    };
+  }, [readDropTargetFromPoint, transferItem]);
+
+  const beginPointerDrag = useCallback((event: React.PointerEvent, source: DragPayload) => {
+    if (event.button !== 0 || !event.isPrimary) return;
+    pointerDragRef.current = {
+      pointerId: event.pointerId,
+      source,
+      startX: event.clientX,
+      startY: event.clientY,
+      active: false,
+    };
+  }, []);
+
+  const handleDragOver = useCallback((event: React.DragEvent, side: SftpSide, path: string) => {
+    event.preventDefault();
+    event.stopPropagation();
+    const payload = readDragPayload(event.dataTransfer) ?? nativeDragPayloadRef.current;
+    if (!payload || payload.side === side) {
+      event.dataTransfer.dropEffect = "none";
+      setDropTarget(null);
+      setDragPreview(null);
+      return;
+    }
+    event.dataTransfer.dropEffect = "copy";
+    setActiveDragSource(payload);
+    setDragPreview({ source: payload, x: event.clientX, y: event.clientY });
+    setDropTarget({ side, path });
+  }, []);
+
+  const handleDrop = useCallback(
+    (event: React.DragEvent, side: SftpSide, path: string) => {
+      event.preventDefault();
+      event.stopPropagation();
+      setDropTarget(null);
+      setActiveDragSource(null);
+      setDragPreview(null);
+      const payload = readDragPayload(event.dataTransfer) ?? nativeDragPayloadRef.current;
+      nativeDragPayloadRef.current = null;
+      if (!payload || payload.side === side) return;
+      void transferItem(payload, side, path);
+    },
+    [transferItem],
+  );
+
+  const handleDragLeave = useCallback((event: React.DragEvent) => {
+    if (isLeavingCurrentTarget(event)) {
+      setDropTarget(null);
+      if (!pointerDragRef.current) {
+        setDragPreview(null);
+      }
+    }
+  }, []);
+
+  const openContextMenu = useCallback(
+    (event: React.MouseEvent, side: SftpSide, path: string, kind: string, isEntry = false) => {
+      event.preventDefault();
+      event.stopPropagation();
+      const items = getActionItems(side, path, kind, isEntry);
+      if (isEntry && !selectedItemsForSide(side).some((entry) => entry.path === path)) {
+        selectEntry(side, path, false);
+      }
+      const rect = panelRef.current?.getBoundingClientRect();
+      const menuWidth = 220;
+      const menuHeight = 250;
+      const maxX = Math.max(8, (rect?.width ?? window.innerWidth) - menuWidth - 8);
+      const maxY = Math.max(8, (rect?.height ?? window.innerHeight) - menuHeight - 8);
+      setContextMenu({
+        x: Math.min(Math.max(8, event.clientX - (rect?.left ?? 0)), maxX),
+        y: Math.min(Math.max(8, event.clientY - (rect?.top ?? 0)), maxY),
+        side,
+        path,
+        kind,
+        isEntry,
+        items,
+      });
+    },
+    [getActionItems, selectedItemsForSide],
+  );
+
+  const panes = useMemo(
+    () => [
+      { side: "local" as const, label: t("workspaceSftp.local"), root: workdir, pane: localPane },
+      {
+        side: "remote" as const,
+        label: t("workspaceSftp.remote"),
+        root: session.ssh ? `${session.ssh.username}@${session.ssh.host}` : session.title,
+        pane: remotePane,
+      },
+    ],
+    [localPane, remotePane, session.ssh, session.title, t, workdir],
+  );
+
+  if (!connected) {
+    return (
+      <div className="flex h-full flex-col items-center justify-center gap-3 p-6 text-center text-sm text-muted-foreground">
+        <AlertTriangle className="h-8 w-8 text-amber-500" />
+        <div className="font-medium text-foreground">{t("workspaceSftp.disconnected")}</div>
+        <div className="max-w-md text-xs">{t("workspaceSftp.disconnectedHint")}</div>
+      </div>
+    );
+  }
+
+  return (
+    <div ref={panelRef} className="relative flex h-full min-h-0 flex-col bg-background">
+      <div className="flex min-h-0 flex-1 overflow-x-auto overflow-y-hidden">
+        <div className="grid h-full min-h-0 min-w-[860px] flex-1 grid-cols-2 divide-x divide-border">
+          {panes.map(({ side, label, root, pane }) => {
+            const dropMode =
+              activeDragSource?.side === "local" && side === "remote"
+                ? "upload"
+                : activeDragSource?.side === "remote" && side === "local"
+                  ? "download"
+                  : null;
+            const dropActive = dropMode !== null && dropTarget?.side === side;
+            const DropIcon = dropMode === "download" ? Download : Upload;
+            const dropPath = dropActive ? dropTarget?.path || pane.path : pane.path;
+
+            return (
+            <div
+              key={side}
+              data-sftp-drop-side={side}
+              data-sftp-drop-path={pane.path}
+              className={cn(
+                "relative flex min-h-0 min-w-0 flex-col overflow-hidden transition-colors",
+                dropMode && "bg-muted/20",
+                dropActive && "bg-emerald-500/5",
+              )}
+              onDragOver={(event) => handleDragOver(event, side, pane.path)}
+              onDragLeave={handleDragLeave}
+              onDrop={(event) => handleDrop(event, side, pane.path)}
+              onContextMenu={(event) => openContextMenu(event, side, pane.path, "directory", false)}
+            >
+              <div className="flex h-12 shrink-0 items-center gap-2 border-b border-border bg-muted/30 px-3">
+                <div className="flex h-8 w-8 items-center justify-center rounded-lg bg-background text-muted-foreground">
+                  {side === "local" ? <FolderOpen className="h-4 w-4" /> : <Folder className="h-4 w-4" />}
+                </div>
+                <div className="min-w-0 flex-1">
+                  <div className="truncate text-sm font-semibold text-foreground">{label}</div>
+                  <div className="truncate font-mono text-[11px] text-muted-foreground">{root}</div>
+                </div>
+                {pane.selectedPaths.length ? (
+                  <button
+                    type="button"
+                    className="inline-flex h-7 max-w-[112px] shrink-0 items-center rounded-full border border-emerald-500/20 bg-emerald-500/10 px-2 text-[11px] font-medium text-emerald-700 transition-colors hover:bg-emerald-500/15 dark:text-emerald-300"
+                    title={t("workspaceSftp.clearSelection")}
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      clearSelection(side);
+                    }}
+                  >
+                    <span className="truncate">
+                      {t("workspaceSftp.selectedCount").replace("{count}", String(pane.selectedPaths.length))}
+                    </span>
+                  </button>
+                ) : null}
+                <button
+                  type="button"
+                  className="flex h-8 w-8 items-center justify-center rounded-lg text-muted-foreground hover:bg-background hover:text-foreground"
+                  title={t("workspaceSftp.refresh")}
+                  onClick={() => refreshPane(side)}
+                >
+                  <RefreshCw className={cn("h-4 w-4", pane.loading && "animate-spin")} />
+                </button>
+              </div>
+
+              <div className="flex h-9 shrink-0 items-center gap-1 overflow-x-auto border-b border-border px-3 text-xs">
+                {pathCrumbs(pane.path, side, t("workspaceSftp.projectRoot")).map((crumb, index) => (
+                  <button
+                    key={`${crumb.path}-${index}`}
+                    type="button"
+                    className="shrink-0 rounded px-1.5 py-1 text-muted-foreground hover:bg-muted hover:text-foreground"
+                    onClick={() => void loadPane(side, crumb.path)}
+                  >
+                    {crumb.label || t("workspaceSftp.projectRoot")}
+                  </button>
+                ))}
+              </div>
+
+              {pane.error ? (
+                <div className="m-3 flex items-start gap-2 rounded-lg border border-destructive/20 bg-destructive/10 px-3 py-2 text-xs text-destructive">
+                  <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
+                  <span className="min-w-0 break-words">{pane.error}</span>
+                </div>
+              ) : null}
+
+              <div
+                className="relative min-h-0 flex-1 overscroll-contain overflow-auto p-2"
+                onClick={(event) => {
+                  const target = event.target;
+                  if (target instanceof HTMLElement && target.closest("[data-sftp-entry]")) return;
+                  clearSelection(side);
+                }}
+              >
+                {dropMode ? (
+                  <div
+                    className={cn(
+                      "pointer-events-none absolute inset-2 z-20 flex items-center justify-center rounded-lg bg-background/80 text-center opacity-75 shadow-inner backdrop-blur-[1px] transition-all",
+                      dropActive && "bg-emerald-500/10 opacity-100",
+                    )}
+                  >
+                    <span className={cn("absolute left-0 top-0 h-14 w-14 rounded-tl-lg border-l-2 border-t-2", dropActive ? "border-emerald-600" : "border-foreground/65")} />
+                    <span className={cn("absolute right-0 top-0 h-14 w-14 rounded-tr-lg border-r-2 border-t-2", dropActive ? "border-emerald-600" : "border-foreground/65")} />
+                    <span className={cn("absolute bottom-0 left-0 h-14 w-14 rounded-bl-lg border-b-2 border-l-2", dropActive ? "border-emerald-600" : "border-foreground/65")} />
+                    <span className={cn("absolute bottom-0 right-0 h-14 w-14 rounded-br-lg border-b-2 border-r-2", dropActive ? "border-emerald-600" : "border-foreground/65")} />
+                    <div className="flex max-w-[75%] flex-col items-center gap-3">
+                      <div className={cn("flex h-14 w-14 items-center justify-center rounded-xl border-2 bg-background/90 shadow-sm", dropActive ? "border-emerald-600 text-emerald-700 dark:text-emerald-300" : "border-foreground/70 text-foreground")}>
+                        <DropIcon className="h-7 w-7" />
+                      </div>
+                      <div>
+                        <div className="text-sm font-semibold text-foreground">{t("workspaceSftp.dropHere")}</div>
+                        <div className="mt-1 text-xs text-muted-foreground">
+                          {t(dropMode === "upload" ? "workspaceSftp.drop.upload" : "workspaceSftp.drop.download")}
+                        </div>
+                        {dropPath ? (
+                          <div className="mx-auto mt-2 max-w-full truncate rounded bg-background/70 px-2 py-1 font-mono text-[11px] text-muted-foreground">
+                            {normalizePath(dropPath, side)}
+                          </div>
+                        ) : null}
+                      </div>
+                    </div>
+                  </div>
+                ) : null}
+                {pane.loading && pane.entries.length === 0 ? (
+                  <div className="flex h-full items-center justify-center gap-2 text-xs text-muted-foreground">
+                    <Loader2 className="h-4 w-4 animate-spin" />
+                    {t("workspaceSftp.loading")}
+                  </div>
+                ) : pane.entries.length === 0 ? (
+                  <div className="flex h-full items-center justify-center text-xs text-muted-foreground">
+                    {t("workspaceSftp.empty")}
+                  </div>
+                ) : (
+                  <div className="space-y-1">
+                    {pane.entries.map((entry) => {
+                      const isSelected = pane.selectedPaths.includes(entry.path);
+                      return (
+                      <button
+                        key={entry.path}
+                        type="button"
+                        draggable={false}
+                        data-sftp-entry="true"
+                        data-sftp-drop-side={entry.kind === "directory" ? side : undefined}
+                        data-sftp-drop-path={entry.kind === "directory" ? entry.path : undefined}
+                        aria-selected={isSelected}
+                        className={cn(
+                          "grid w-full touch-none cursor-default grid-cols-[minmax(0,1fr)_5.5rem] items-center gap-3 rounded-md px-2 py-1.5 text-left text-xs hover:bg-muted",
+                          isSelected && "bg-emerald-500/10 text-foreground ring-1 ring-emerald-500/20",
+                          activeDragSource?.side === side &&
+                            dragItems(activeDragSource).some((item) => item.path === entry.path) &&
+                            "bg-muted text-muted-foreground opacity-70 ring-1 ring-border",
+                          dropTarget?.side === side &&
+                            dropTarget.path === entry.path &&
+                            entry.kind === "directory" &&
+                            "bg-emerald-500/10 text-foreground",
+                        )}
+                        onClick={(event) => {
+                          if (suppressNextClickRef.current) {
+                            suppressNextClickRef.current = false;
+                            event.preventDefault();
+                            event.stopPropagation();
+                            return;
+                          }
+                          selectEntry(side, entry.path, event.ctrlKey || event.metaKey);
+                        }}
+                        onDoubleClick={() => {
+                          if (entry.kind === "directory") void loadPane(side, entry.path);
+                        }}
+                        onDragOver={(event) => {
+                          if (entry.kind === "directory") {
+                            handleDragOver(event, side, entry.path);
+                          }
+                        }}
+                        onDragLeave={(event) => {
+                          if (entry.kind === "directory") {
+                            handleDragLeave(event);
+                          }
+                        }}
+                        onDrop={(event) => {
+                          if (entry.kind === "directory") {
+                            handleDrop(event, side, entry.path);
+                          }
+                        }}
+                        onDragStart={(event) => {
+                          const payload = createDragPayload(side, entry);
+                          nativeDragPayloadRef.current = payload;
+                          setActiveDragSource(payload);
+                          writeDragPayload(event.dataTransfer, payload);
+                        }}
+                        onPointerDown={(event) => {
+                          if (event.button === 0 && event.isPrimary && (event.ctrlKey || event.metaKey)) {
+                            event.preventDefault();
+                            event.stopPropagation();
+                            selectEntry(side, entry.path, true);
+                            suppressNextClickRef.current = true;
+                            suppressNextContextMenuRef.current = event.ctrlKey;
+                            window.setTimeout(() => {
+                              suppressNextContextMenuRef.current = false;
+                            }, 250);
+                            return;
+                          }
+                          try {
+                            event.currentTarget.setPointerCapture(event.pointerId);
+                          } catch {
+                            // Some WebViews reject capture during synthetic pointer streams.
+                          }
+                          beginPointerDrag(event, createDragPayload(side, entry));
+                        }}
+                        onDragEnd={() => {
+                          nativeDragPayloadRef.current = null;
+                          setDropTarget(null);
+                          setActiveDragSource(null);
+                          setDragPreview(null);
+                        }}
+                        onContextMenu={(event) => {
+                          if (suppressNextContextMenuRef.current) {
+                            event.preventDefault();
+                            event.stopPropagation();
+                            suppressNextContextMenuRef.current = false;
+                            return;
+                          }
+                          openContextMenu(event, side, entry.path, entry.kind, true);
+                        }}
+                      >
+                        <span className="flex min-w-0 items-center gap-2">
+                          {entryIcon(entry)}
+                          <span className="truncate">{entry.name}</span>
+                        </span>
+                        <span className="text-right font-mono text-[11px] text-muted-foreground">
+                          {entry.kind === "directory" ? "--" : formatBytes(entry.sizeBytes)}
+                        </span>
+                      </button>
+                    );
+                    })}
+                  </div>
+                )}
+              </div>
+            </div>
+          );
+          })}
+        </div>
+      </div>
+
+      <div className="flex h-10 shrink-0 items-center gap-2 border-t border-border bg-muted/30 px-3 text-xs text-muted-foreground">
+        {busyMessage ? <Loader2 className="h-3.5 w-3.5 animate-spin" /> : null}
+        <span className="min-w-0 flex-1 truncate">
+          {busyMessage || (transfer ? "" : t("workspaceSftp.transfer.idle"))}
+        </span>
+        {transfer ? (
+          <TransferToast
+            transfer={transfer}
+            queueCount={queueCount}
+            cancelLabel={t("workspaceSftp.cancel")}
+            filesLabel={t("workspaceSftp.transfer.files")}
+            statusLabel={t(`workspaceSftp.transfer.${transfer.status}`)}
+            onCancel={
+              transfer.id && transfer.status === "running"
+                ? () => void client.cancelTransfer({ sessionId: session.id, transferId: transfer.id })
+                : undefined
+            }
+          />
+        ) : null}
+      </div>
+
+      {contextMenu ? (
+        <div
+          className="editor-context-menu absolute z-[80] w-[220px] select-none overflow-hidden rounded-xl border border-border/60 bg-popover/90 p-1 text-xs text-popover-foreground shadow-2xl ring-1 ring-black/[0.03] backdrop-blur-xl dark:ring-white/[0.06]"
+          role="menu"
+          style={{ left: contextMenu.x, top: contextMenu.y }}
+          onContextMenu={(event) => event.preventDefault()}
+        >
+          {contextMenu.items.length > 1 ? (
+            <div className="mb-1 flex items-center justify-between rounded-lg bg-emerald-500/10 px-2 py-1 text-[11px] font-medium text-emerald-700 dark:text-emerald-300">
+              <span>{t("workspaceSftp.selectedCount").replace("{count}", String(contextMenu.items.length))}</span>
+              <button
+                type="button"
+                className="rounded px-1 text-emerald-700/80 hover:bg-emerald-500/10 hover:text-emerald-800 dark:text-emerald-300/80 dark:hover:text-emerald-200"
+                onClick={(event) => {
+                  event.stopPropagation();
+                  clearSelection(contextMenu.side);
+                  setContextMenu(null);
+                }}
+              >
+                {t("workspaceSftp.clearSelection")}
+              </button>
+            </div>
+          ) : null}
+          <MenuItem icon={<RefreshCw className="h-3.5 w-3.5" />} label={t("workspaceSftp.refresh")} onClick={() => { setContextMenu(null); refreshPane(contextMenu.side); }} />
+          <MenuItem icon={<Plus className="h-3.5 w-3.5" />} label={t("workspaceSftp.newFolder")} onClick={() => { setContextMenu(null); openCreateFolderDialog(contextMenu.side, contextMenu.kind === "directory" ? contextMenu.path : parentPath(contextMenu.path, contextMenu.side)); }} />
+          <MenuItem icon={<Pencil className="h-3.5 w-3.5" />} label={t("workspaceSftp.rename")} disabled={!contextMenu.isEntry || contextMenu.items.length !== 1 || contextMenu.path === "" || contextMenu.path === "."} onClick={() => { setContextMenu(null); openRenameEntryDialog(contextMenu.side, contextMenu.path); }} />
+          <MenuItem icon={<Trash2 className="h-3.5 w-3.5" />} label={t("workspaceSftp.delete")} disabled={!contextMenu.isEntry || contextMenu.items.length === 0} destructive onClick={() => { setContextMenu(null); void deleteEntries(contextMenu.side, contextMenu.items); }} />
+          <div className="my-1 h-px bg-border/70" />
+          {contextMenu.side === "local" ? (
+            <MenuItem icon={<Upload className="h-3.5 w-3.5" />} label={t("workspaceSftp.uploadToRemote")} disabled={!contextMenu.isEntry || contextMenu.items.length === 0} onClick={() => { setContextMenu(null); void transferItem({ side: "local", path: contextMenu.path, kind: contextMenu.kind, items: contextMenu.items }, "remote", remotePane.path); }} />
+          ) : (
+            <MenuItem icon={<Download className="h-3.5 w-3.5" />} label={t("workspaceSftp.downloadToLocal")} disabled={!contextMenu.isEntry || contextMenu.items.length === 0} onClick={() => { setContextMenu(null); void transferItem({ side: "remote", path: contextMenu.path, kind: contextMenu.kind, items: contextMenu.items }, "local", localPane.path); }} />
+          )}
+          <MenuItem icon={<Copy className="h-3.5 w-3.5" />} label={t("workspaceSftp.copyPath")} onClick={() => { setContextMenu(null); void copyPaths(contextMenu.side, contextMenu.items.length ? contextMenu.items : [{ path: contextMenu.path, kind: contextMenu.kind }]); }} />
+        </div>
+      ) : null}
+      {dragPreview ? (
+        <DragPreview
+          entry={findEntry(dragPreview.source)}
+          fallback={dragPreview.source}
+          x={dragPreview.x}
+          y={dragPreview.y}
+          typeLabel={(entry) => entryTypeLabel(entry, t)}
+        />
+      ) : null}
+      {createFolderDialog ? (
+        <CreateFolderDialog
+          title={t("workspaceSftp.newFolder")}
+          prompt={t("workspaceSftp.newFolderPrompt")}
+          confirmLabel={t("workspaceSftp.newFolder")}
+          cancelLabel={t("workspaceSftp.cancel")}
+          path={normalizePath(createFolderDialog.basePath, createFolderDialog.side)}
+          value={createFolderName}
+          submitting={creatingFolder}
+          onChange={setCreateFolderName}
+          onCancel={closeCreateFolderDialog}
+          onSubmit={() => void submitCreateFolder()}
+        />
+      ) : null}
+      {renameEntryDialog ? (
+        <RenameEntryDialog
+          title={t("workspaceSftp.rename")}
+          prompt={t("workspaceSftp.renamePrompt")}
+          confirmLabel={t("workspaceSftp.rename")}
+          cancelLabel={t("workspaceSftp.cancel")}
+          path={normalizePath(renameEntryDialog.path, renameEntryDialog.side)}
+          originalName={renameEntryDialog.currentName}
+          value={renameEntryName}
+          submitting={renamingEntry}
+          onChange={setRenameEntryName}
+          onCancel={closeRenameEntryDialog}
+          onSubmit={() => void submitRenameEntry()}
+        />
+      ) : null}
+      {copyPathDialog ? (
+        <CopyPathDialog
+          title={t("workspaceSftp.copyPath")}
+          prompt={t("workspaceSftp.copyPathFallback")}
+          closeLabel={t("workspaceSftp.cancel")}
+          text={copyPathDialog}
+          onClose={() => setCopyPathDialog(null)}
+        />
+      ) : null}
+      {copyToastVisible ? <CopyPathToast message={t("workspaceSftp.copyPathCopied")} /> : null}
+      {dialog}
+    </div>
+  );
+}
+
+function CreateFolderDialog(props: {
+  title: string;
+  prompt: string;
+  confirmLabel: string;
+  cancelLabel: string;
+  path: string;
+  value: string;
+  submitting: boolean;
+  onChange: (value: string) => void;
+  onCancel: () => void;
+  onSubmit: () => void;
+}) {
+  const {
+    title,
+    prompt,
+    confirmLabel,
+    cancelLabel,
+    path,
+    value,
+    submitting,
+    onChange,
+    onCancel,
+    onSubmit,
+  } = props;
+  const canSubmit = value.trim().length > 0 && !submitting;
+
+  useEffect(() => {
+    function handleKeyDown(event: KeyboardEvent) {
+      if (event.key === "Escape") {
+        onCancel();
+      }
+    }
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [onCancel]);
+
+  return createPortal(
+    <div
+      className="fixed inset-0 z-[120] flex items-center justify-center p-4"
+      role="dialog"
+      aria-modal="true"
+      aria-label={title}
+    >
+      <button
+        type="button"
+        tabIndex={-1}
+        className="absolute inset-0 cursor-default bg-black/55 backdrop-blur-sm"
+        onClick={onCancel}
+        aria-hidden="true"
+      />
+      <form
+        className="relative z-10 w-full max-w-md overflow-hidden rounded-2xl border border-border/70 bg-background shadow-2xl"
+        onSubmit={(event) => {
+          event.preventDefault();
+          if (canSubmit) {
+            onSubmit();
+          }
+        }}
+      >
+        <div className="border-b border-border/60 px-5 py-4">
+          <div className="text-base font-semibold text-foreground">{title}</div>
+          {path ? (
+            <div className="mt-1 truncate font-mono text-[11px] text-muted-foreground">{path}</div>
+          ) : null}
+        </div>
+        <div className="space-y-2 px-5 py-5">
+          <label className="block text-xs font-medium text-muted-foreground" htmlFor="workspace-sftp-new-folder-name">
+            {prompt}
+          </label>
+          <input
+            id="workspace-sftp-new-folder-name"
+            value={value}
+            autoFocus
+            disabled={submitting}
+            className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground/70 focus:border-ring focus:ring-2 focus:ring-ring/20 disabled:cursor-not-allowed disabled:opacity-60"
+            onChange={(event) => onChange(event.currentTarget.value)}
+          />
+        </div>
+        <div className="flex flex-col-reverse gap-2 border-t border-border/60 bg-muted/20 px-5 py-4 sm:flex-row sm:justify-end">
+          <button
+            type="button"
+            className="inline-flex h-9 items-center justify-center rounded-lg border border-input bg-background px-3 text-sm font-medium text-foreground transition-colors hover:bg-muted disabled:pointer-events-none disabled:opacity-50 sm:w-auto"
+            disabled={submitting}
+            onClick={onCancel}
+          >
+            {cancelLabel}
+          </button>
+          <button
+            type="submit"
+            className="inline-flex h-9 items-center justify-center rounded-lg bg-primary px-3 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-50 sm:w-auto"
+            disabled={!canSubmit}
+          >
+            {submitting ? <Loader2 className="mr-2 h-3.5 w-3.5 animate-spin" /> : null}
+            {confirmLabel}
+          </button>
+        </div>
+      </form>
+    </div>,
+    document.body,
+  );
+}
+
+function CopyPathDialog(props: {
+  title: string;
+  prompt: string;
+  closeLabel: string;
+  text: string;
+  onClose: () => void;
+}) {
+  const { title, prompt, closeLabel, text, onClose } = props;
+
+  useEffect(() => {
+    function handleKeyDown(event: KeyboardEvent) {
+      if (event.key === "Escape") {
+        onClose();
+      }
+    }
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [onClose]);
+
+  return createPortal(
+    <div
+      className="fixed inset-0 z-[120] flex items-center justify-center p-4"
+      role="dialog"
+      aria-modal="true"
+      aria-label={title}
+    >
+      <button
+        type="button"
+        tabIndex={-1}
+        className="absolute inset-0 cursor-default bg-black/55 backdrop-blur-sm"
+        onClick={onClose}
+        aria-hidden="true"
+      />
+      <div className="relative z-10 w-full max-w-md overflow-hidden rounded-2xl border border-border/70 bg-background shadow-2xl">
+        <div className="border-b border-border/60 px-5 py-4">
+          <div className="text-base font-semibold text-foreground">{title}</div>
+          <div className="mt-1 text-xs text-muted-foreground">{prompt}</div>
+        </div>
+        <div className="px-5 py-5">
+          <textarea
+            value={text}
+            readOnly
+            autoFocus
+            className="min-h-28 w-full resize-none rounded-lg border border-input bg-background px-3 py-2 font-mono text-xs text-foreground outline-none transition-colors focus:border-ring focus:ring-2 focus:ring-ring/20"
+            onFocus={(event) => event.currentTarget.select()}
+          />
+        </div>
+        <div className="flex justify-end border-t border-border/60 bg-muted/20 px-5 py-4">
+          <button
+            type="button"
+            className="inline-flex h-9 items-center justify-center rounded-lg border border-input bg-background px-3 text-sm font-medium text-foreground transition-colors hover:bg-muted"
+            onClick={onClose}
+          >
+            {closeLabel}
+          </button>
+        </div>
+      </div>
+    </div>,
+    document.body,
+  );
+}
+
+function CopyPathToast(props: { message: string }) {
+  return (
+    <div className="pointer-events-none absolute bottom-14 right-4 z-[90]">
+      <div className="notify-toast-enter flex min-w-56 items-center gap-2 rounded-lg border border-emerald-500/25 bg-background/95 px-3 py-2 text-sm font-medium text-foreground shadow-2xl backdrop-blur-xl">
+        <CheckCircle2 className="h-4 w-4 shrink-0 text-emerald-600 dark:text-emerald-300" />
+        <span>{props.message}</span>
+      </div>
+    </div>
+  );
+}
+
+function RenameEntryDialog(props: {
+  title: string;
+  prompt: string;
+  confirmLabel: string;
+  cancelLabel: string;
+  path: string;
+  originalName: string;
+  value: string;
+  submitting: boolean;
+  onChange: (value: string) => void;
+  onCancel: () => void;
+  onSubmit: () => void;
+}) {
+  const {
+    title,
+    prompt,
+    confirmLabel,
+    cancelLabel,
+    path,
+    originalName,
+    value,
+    submitting,
+    onChange,
+    onCancel,
+    onSubmit,
+  } = props;
+  const trimmedValue = value.trim();
+  const canSubmit = trimmedValue.length > 0 && trimmedValue !== originalName && !submitting;
+
+  useEffect(() => {
+    function handleKeyDown(event: KeyboardEvent) {
+      if (event.key === "Escape") {
+        onCancel();
+      }
+    }
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [onCancel]);
+
+  return createPortal(
+    <div
+      className="fixed inset-0 z-[120] flex items-center justify-center p-4"
+      role="dialog"
+      aria-modal="true"
+      aria-label={title}
+    >
+      <button
+        type="button"
+        tabIndex={-1}
+        className="absolute inset-0 cursor-default bg-black/55 backdrop-blur-sm"
+        onClick={onCancel}
+        aria-hidden="true"
+      />
+      <form
+        className="relative z-10 w-full max-w-md overflow-hidden rounded-2xl border border-border/70 bg-background shadow-2xl"
+        onSubmit={(event) => {
+          event.preventDefault();
+          if (canSubmit) {
+            onSubmit();
+          }
+        }}
+      >
+        <div className="border-b border-border/60 px-5 py-4">
+          <div className="text-base font-semibold text-foreground">{title}</div>
+          {path ? (
+            <div className="mt-1 truncate font-mono text-[11px] text-muted-foreground">{path}</div>
+          ) : null}
+        </div>
+        <div className="space-y-2 px-5 py-5">
+          <label className="block text-xs font-medium text-muted-foreground" htmlFor="workspace-sftp-rename-entry-name">
+            {prompt}
+          </label>
+          <input
+            id="workspace-sftp-rename-entry-name"
+            value={value}
+            autoFocus
+            disabled={submitting}
+            className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm text-foreground outline-none transition-colors placeholder:text-muted-foreground/70 focus:border-ring focus:ring-2 focus:ring-ring/20 disabled:cursor-not-allowed disabled:opacity-60"
+            onChange={(event) => onChange(event.currentTarget.value)}
+          />
+        </div>
+        <div className="flex flex-col-reverse gap-2 border-t border-border/60 bg-muted/20 px-5 py-4 sm:flex-row sm:justify-end">
+          <button
+            type="button"
+            className="inline-flex h-9 items-center justify-center rounded-lg border border-input bg-background px-3 text-sm font-medium text-foreground transition-colors hover:bg-muted disabled:pointer-events-none disabled:opacity-50 sm:w-auto"
+            disabled={submitting}
+            onClick={onCancel}
+          >
+            {cancelLabel}
+          </button>
+          <button
+            type="submit"
+            className="inline-flex h-9 items-center justify-center rounded-lg bg-primary px-3 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-50 sm:w-auto"
+            disabled={!canSubmit}
+          >
+            {submitting ? <Loader2 className="mr-2 h-3.5 w-3.5 animate-spin" /> : null}
+            {confirmLabel}
+          </button>
+        </div>
+      </form>
+    </div>,
+    document.body,
+  );
+}
+
+function TransferToast(props: {
+  transfer: SftpTransfer;
+  queueCount: number;
+  cancelLabel: string;
+  filesLabel: string;
+  statusLabel: string;
+  onCancel?: () => void;
+}) {
+  const { transfer, queueCount, cancelLabel, filesLabel, statusLabel, onCancel } = props;
+  const progress = transferProgress(transfer);
+  const TransferIcon = transfer.direction === "download" ? Download : Upload;
+  const currentPath = transfer.currentPath || transfer.sourcePath || transfer.targetPath;
+  const isRunning = transfer.status === "running" || transfer.status === "queued";
+  const isCompleted = transfer.status === "completed";
+  const isFailed = transfer.status === "failed";
+  const StatusIcon = isRunning ? Loader2 : isCompleted ? CheckCircle2 : TransferIcon;
+  const iconClass = isFailed
+    ? "text-destructive"
+    : isCompleted
+      ? "text-emerald-600 dark:text-emerald-300"
+      : "text-sky-600 dark:text-sky-300";
+
+  return (
+    <div className="pointer-events-auto relative ml-auto flex h-full w-[340px] max-w-[50%] shrink-0 items-center gap-2 pl-3 text-foreground before:absolute before:bottom-2 before:left-0 before:top-2 before:w-px before:bg-border/60">
+      <div className="flex h-4 w-4 shrink-0 items-center justify-center">
+        <StatusIcon className={cn("h-3.5 w-3.5", iconClass, isRunning && "animate-spin")} />
+      </div>
+      <div className="min-w-0 flex-1">
+        <div className="flex items-center gap-1.5">
+          <span className="shrink-0 text-[11px] font-medium leading-none text-foreground">{statusLabel}</span>
+          <span className="min-w-0 flex-1 truncate font-mono text-[11px] leading-none text-muted-foreground/90">
+            {currentPath}
+          </span>
+          <span className="shrink-0 font-mono text-[10px] leading-none text-muted-foreground">{progress}%</span>
+        </div>
+        {transfer.error ? (
+          <div className="mt-1.5 truncate text-[11px] leading-none text-destructive">{transfer.error}</div>
+        ) : (
+          <div className="mt-1.5 flex items-center gap-1.5">
+            <div className="h-1 min-w-16 flex-1 overflow-hidden rounded-full bg-border/60">
+              <div
+                className={cn("h-full rounded-full transition-all duration-300", transferTone(transfer))}
+                style={{ width: `${progress}%` }}
+              />
+            </div>
+            <span className="shrink-0 text-[10px] leading-none text-muted-foreground">
+              {transfer.filesDone}/{transfer.filesTotal || queueCount || 1} {filesLabel}
+            </span>
+            <span className="shrink-0 font-mono text-[10px] leading-none text-muted-foreground">
+              {formatBytes(transfer.bytesDone)} / {formatBytes(transfer.bytesTotal)}
+            </span>
+          </div>
+        )}
+      </div>
+      {onCancel ? (
+        <button
+          type="button"
+          className="shrink-0 rounded px-1.5 py-0.5 text-[11px] text-destructive hover:bg-destructive/10"
+          onClick={onCancel}
+        >
+          {cancelLabel}
+        </button>
+      ) : null}
+    </div>
+  );
+}
+
+function DragPreview(props: {
+  entry: SftpEntry | null;
+  fallback: DragPayload;
+  x: number;
+  y: number;
+  typeLabel: (entry: SftpEntry) => string;
+}) {
+  const { entry, fallback, x, y, typeLabel } = props;
+  const previewEntry: SftpEntry = entry ?? {
+    path: fallback.path,
+    name: basename(fallback.path) || fallback.path,
+    kind: fallback.kind,
+    sizeBytes: 0,
+    mtime: 0,
+  };
+  const count = dragItems(fallback).length;
+
+  return (
+    <div
+      className="pointer-events-none fixed z-[120] flex w-[260px] max-w-[calc(100vw-32px)] items-center gap-2 rounded-md bg-sky-500/90 px-2.5 py-2 text-xs text-white shadow-xl ring-1 ring-sky-200/50 backdrop-blur-sm"
+      style={{
+        left: x + 18,
+        top: y + 14,
+        transform: "translateY(-50%)",
+      }}
+    >
+      <span className="flex h-7 w-7 shrink-0 items-center justify-center rounded bg-white/15 text-white">
+        {entryIcon(previewEntry, "h-4 w-4 text-white")}
+      </span>
+      <span className="min-w-0 flex-1">
+        <span className="block truncate font-medium leading-4">
+          {previewEntry.name}
+          {count > 1 ? ` +${count - 1}` : ""}
+        </span>
+        <span className="block truncate text-[10px] leading-3 text-white/75">
+          {typeLabel(previewEntry)}
+          {previewEntry.kind === "directory" ? "" : ` · ${formatBytes(previewEntry.sizeBytes)}`}
+        </span>
+      </span>
+      {count > 1 ? (
+        <span className="shrink-0 rounded bg-white/15 px-1.5 py-0.5 font-mono text-[10px] text-white/90">
+          {count}
+        </span>
+      ) : previewEntry.kind === "directory" ? null : (
+        <span className="shrink-0 rounded bg-white/15 px-1.5 py-0.5 font-mono text-[10px] text-white/90">
+          {formatBytes(previewEntry.sizeBytes)}
+        </span>
+      )}
+    </div>
+  );
+}
+
+function MenuItem(props: {
+  icon: React.ReactNode;
+  label: string;
+  destructive?: boolean;
+  disabled?: boolean;
+  onClick: () => void;
+}) {
+  const { icon, label, destructive = false, disabled = false, onClick } = props;
+  return (
+    <button
+      type="button"
+      role="menuitem"
+      disabled={disabled}
+      className={cn(
+        "flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-left transition-colors",
+        destructive
+          ? "text-destructive hover:bg-destructive/10"
+          : "text-popover-foreground hover:bg-accent hover:text-accent-foreground",
+        disabled && "pointer-events-none opacity-45",
+      )}
+      onClick={(event) => {
+        event.stopPropagation();
+        onClick();
+      }}
+    >
+      {icon}
+      <span className="min-w-0 flex-1 truncate">{label}</span>
+    </button>
+  );
+}
diff --git a/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx b/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
index ac08b6042..b57ec8368 100644
--- a/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
+++ b/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
@@ -1,20 +1,32 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useLocale } from "../../i18n";
 import { cn } from "../../lib/shared/utils";
+import type { SftpClient } from "../../lib/sftp/types";
 import type { TerminalClient, TerminalSession } from "../../lib/terminal/types";
-import { AlertTriangle, RefreshCw, Terminal, Wifi, WifiOff, X } from "../icons";
+import { AlertTriangle, FolderTree, RefreshCw, Terminal, Wifi, WifiOff, X } from "../icons";
 import { MacOsTitleBarSpacer } from "../MacOsTitleBarSpacer";
 import { XTermViewport } from "../project-tools/XTermViewport";
+import { WorkspaceSftpPanel } from "./WorkspaceSftpPanel";
 
 export type WorkspaceSshTerminalOpenRequest = {
   id: number;
   sessionId: string;
+  kind?: WorkspaceSshTerminalTabKind;
+};
+
+type WorkspaceSshTerminalTabKind = "bash" | "sftp";
+
+type WorkspaceSshTerminalTab = {
+  id: string;
+  sessionId: string;
+  kind: WorkspaceSshTerminalTabKind;
 };
 
 type WorkspaceSshTerminalOverlayProps = {
   openRequest: WorkspaceSshTerminalOpenRequest | null;
   sessions: TerminalSession[];
   client: TerminalClient;
+  sftpClient: SftpClient;
   theme: "light" | "dark";
   isOpen: boolean;
   onHide: () => void;
@@ -68,12 +80,16 @@ function statusIcon(session: TerminalSession) {
   return <WifiOff className="h-3.5 w-3.5 text-destructive" />;
 }
 
+function tabIdFor(sessionId: string, kind: WorkspaceSshTerminalTabKind) {
+  return `${kind}:${sessionId}`;
+}
+
 export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayProps) {
-  const { openRequest, sessions, client, theme, isOpen, onHide } = props;
+  const { openRequest, sessions, client, sftpClient, theme, isOpen, onHide } = props;
   const { t } = useLocale();
   const [isVisible, setIsVisible] = useState(isOpen);
-  const [openSessionIds, setOpenSessionIds] = useState<string[]>([]);
-  const [activeSessionId, setActiveSessionId] = useState("");
+  const [openTabs, setOpenTabs] = useState<WorkspaceSshTerminalTab[]>([]);
+  const [activeTabId, setActiveTabId] = useState("");
   const [error, setError] = useState<string | null>(null);
   const openRequestIdRef = useRef<number | null>(null);
   const hideTimerRef = useRef<number | null>(null);
@@ -86,15 +102,18 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
     () => new Map(sshSessions.map((session) => [session.id, session])),
     [sshSessions],
   );
-  const openSessions = useMemo(
+  const openTabRecords = useMemo(
     () =>
-      openSessionIds
-        .map((sessionId) => sessionsById.get(sessionId))
-        .filter((session): session is TerminalSession => Boolean(session)),
-    [openSessionIds, sessionsById],
+      openTabs
+        .map((tab) => ({ tab, session: sessionsById.get(tab.sessionId) }))
+        .filter((record): record is { tab: WorkspaceSshTerminalTab; session: TerminalSession } =>
+          Boolean(record.session),
+        ),
+    [openTabs, sessionsById],
   );
-  const activeSession =
-    openSessions.find((session) => session.id === activeSessionId) ?? openSessions[0] ?? null;
+  const activeRecord =
+    openTabRecords.find((record) => record.tab.id === activeTabId) ?? openTabRecords[0] ?? null;
+  const activeSession = activeRecord?.session ?? null;
 
   const cancelPendingHide = useCallback(() => {
     if (hideTimerRef.current === null) return;
@@ -111,14 +130,14 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
     }, SSH_TERMINAL_OVERLAY_ANIMATION_MS);
   }, [cancelPendingHide, onHide]);
 
-  const closeTab = useCallback((sessionId: string) => {
-    setOpenSessionIds((current) => {
-      const index = current.indexOf(sessionId);
+  const closeTab = useCallback((tabId: string) => {
+    setOpenTabs((current) => {
+      const index = current.findIndex((tab) => tab.id === tabId);
       if (index < 0) return current;
-      const next = current.filter((id) => id !== sessionId);
-      setActiveSessionId((currentActive) => {
-        if (currentActive !== sessionId) return currentActive;
-        return next[Math.min(index, next.length - 1)] ?? "";
+      const next = current.filter((tab) => tab.id !== tabId);
+      setActiveTabId((currentActive) => {
+        if (currentActive !== tabId) return currentActive;
+        return next[Math.min(index, next.length - 1)]?.id ?? "";
       });
       return next;
     });
@@ -128,14 +147,18 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
     if (!openRequest || openRequestIdRef.current === openRequest.id) return;
     const session = sessionsById.get(openRequest.sessionId);
     if (!session) return;
+    const kind = openRequest.kind ?? "bash";
+    const tabId = tabIdFor(session.id, kind);
     openRequestIdRef.current = openRequest.id;
     cancelPendingHide();
     setIsVisible(true);
     setError(null);
-    setOpenSessionIds((current) =>
-      current.includes(session.id) ? current : [...current, session.id],
+    setOpenTabs((current) =>
+      current.some((tab) => tab.id === tabId)
+        ? current
+        : [...current, { id: tabId, sessionId: session.id, kind }],
     );
-    setActiveSessionId(session.id);
+    setActiveTabId(tabId);
   }, [cancelPendingHide, openRequest, sessionsById]);
 
   useEffect(() => {
@@ -149,16 +172,16 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
 
   useEffect(() => {
     const liveIds = new Set(sshSessions.map((session) => session.id));
-    setOpenSessionIds((current) => {
-      const next = current.filter((sessionId) => liveIds.has(sessionId));
+    setOpenTabs((current) => {
+      const next = current.filter((tab) => liveIds.has(tab.sessionId));
       return next.length === current.length ? current : next;
     });
   }, [sshSessions]);
 
   useEffect(() => {
-    if (activeSessionId && openSessions.some((session) => session.id === activeSessionId)) return;
-    setActiveSessionId(openSessions[0]?.id ?? "");
-  }, [activeSessionId, openSessions]);
+    if (activeTabId && openTabRecords.some((record) => record.tab.id === activeTabId)) return;
+    setActiveTabId(openTabRecords[0]?.tab.id ?? "");
+  }, [activeTabId, openTabRecords]);
 
   useEffect(
     () => () => {
@@ -207,23 +230,29 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
       </div>
 
       <div className="flex h-10 shrink-0 items-end gap-1 overflow-x-auto border-b border-border bg-background px-2 pt-1">
-        {openSessions.map((session) => (
+        {openTabRecords.map(({ tab, session }) => (
           <button
-            key={session.id}
+            key={tab.id}
             type="button"
             className={cn(
               "group flex h-8 max-w-[14rem] shrink-0 items-center gap-1.5 rounded-t-md border border-b-0 px-2 text-xs transition-colors",
-              session.id === activeSessionId
+              tab.id === activeTabId
                 ? "border-border bg-muted text-foreground"
                 : "border-transparent text-muted-foreground hover:bg-muted/60 hover:text-foreground",
             )}
             title={sessionEndpointLabel(session)}
-            onClick={() => setActiveSessionId(session.id)}
+            onClick={() => setActiveTabId(tab.id)}
           >
             <span className={cn("h-1.5 w-1.5 shrink-0 rounded-full", statusDotClassName(session))} />
-            <Terminal className="h-3.5 w-3.5 shrink-0" />
+            {tab.kind === "sftp" ? (
+              <FolderTree className="h-3.5 w-3.5 shrink-0" />
+            ) : (
+              <Terminal className="h-3.5 w-3.5 shrink-0" />
+            )}
             <span className="min-w-0 truncate">
-              {sessionTitle(session, t("workspaceSshTerminal.title"))}
+              {tab.kind === "sftp"
+                ? `${t("workspaceSshTerminal.sftpTab")} · ${sessionTitle(session, t("workspaceSshTerminal.title"))}`
+                : sessionTitle(session, t("workspaceSshTerminal.title"))}
             </span>
             <span
               role="button"
@@ -232,13 +261,13 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
               title={t("workspaceSshTerminal.closeTab")}
               onClick={(event) => {
                 event.stopPropagation();
-                closeTab(session.id);
+                closeTab(tab.id);
               }}
               onKeyDown={(event) => {
                 if (event.key !== "Enter" && event.key !== " ") return;
                 event.preventDefault();
                 event.stopPropagation();
-                closeTab(session.id);
+                closeTab(tab.id);
               }}
             >
               <X className="h-3 w-3" />
@@ -255,22 +284,31 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
       ) : null}
 
       <div className="relative min-h-0 flex-1 bg-background">
-        {openSessions.length > 0 ? (
-          openSessions.map((session) => {
-            const isActiveTerminal = isVisible && isOpen && activeSessionId === session.id;
+        {openTabRecords.length > 0 ? (
+          openTabRecords.map(({ tab, session }) => {
+            const isActiveTerminal = isVisible && isOpen && activeTabId === tab.id;
             return (
               <div
-                key={session.id}
+                key={tab.id}
                 aria-hidden={!isActiveTerminal}
                 className={cn("absolute inset-0 min-h-0", isActiveTerminal ? "block" : "hidden")}
               >
-                <XTermViewport
-                  client={client}
-                  session={session}
-                  theme={theme}
-                  isActive={isActiveTerminal}
-                  onError={setError}
-                />
+                {tab.kind === "sftp" ? (
+                  <WorkspaceSftpPanel
+                    client={sftpClient}
+                    session={session}
+                    isActive={isActiveTerminal}
+                    onError={setError}
+                  />
+                ) : (
+                  <XTermViewport
+                    client={client}
+                    session={session}
+                    theme={theme}
+                    isActive={isActiveTerminal}
+                    onError={setError}
+                  />
+                )}
               </div>
             );
           })
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index 187de4641..99ccb8b77 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -302,6 +302,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelLatencyChecking": "检测延迟",
     "projectTools.sshTunnelLatencyValue": "延迟 {ms}ms",
     "projectTools.sshTunnelOpenBash": "进入 Bash 交互",
+    "projectTools.sshTunnelOpenSftp": "打开 SFTP 文件管理",
     "projectTools.sshTunnelPromptTitle": "确认 SSH 主机密钥",
     "projectTools.sshTunnelAuthPromptTitle": "SSH 认证",
     "projectTools.sshTunnelTrustHost": "信任并连接",
@@ -554,6 +555,51 @@ export const translations: Record<Locale, Record<string, string>> = {
     "workspaceSshTerminal.empty": "未打开 SSH 连接",
     "workspaceSshTerminal.close": "关闭 SSH 终端",
     "workspaceSshTerminal.closeTab": "关闭 SSH 标签",
+    "workspaceSshTerminal.sftpTab": "SFTP",
+    "workspaceSftp.local": "本地项目",
+    "workspaceSftp.remote": "远端设备",
+    "workspaceSftp.projectRoot": "项目",
+    "workspaceSftp.entry.folder": "文件夹",
+    "workspaceSftp.entry.file": "文件",
+    "workspaceSftp.loading": "正在加载目录...",
+    "workspaceSftp.empty": "目录为空",
+    "workspaceSftp.refresh": "刷新",
+    "workspaceSftp.newFolder": "新建文件夹",
+    "workspaceSftp.newFolderPrompt": "请输入文件夹名称",
+    "workspaceSftp.creatingFolder": "正在创建文件夹",
+    "workspaceSftp.rename": "重命名",
+    "workspaceSftp.renamePrompt": "请输入新名称",
+    "workspaceSftp.renaming": "正在重命名",
+    "workspaceSftp.delete": "删除",
+    "workspaceSftp.deleting": "正在删除",
+    "workspaceSftp.copyPath": "复制路径",
+    "workspaceSftp.copyPathCopied": "已复制绝对路径",
+    "workspaceSftp.copyPathFallback": "复制此路径",
+    "workspaceSftp.selectedCount": "已选择 {count} 项",
+    "workspaceSftp.clearSelection": "清除",
+    "workspaceSftp.uploadToRemote": "上传远端",
+    "workspaceSftp.downloadToLocal": "下载至本地",
+    "workspaceSftp.dropHere": "释放到这里",
+    "workspaceSftp.drop.upload": "上传到远端",
+    "workspaceSftp.drop.download": "下载到本地",
+    "workspaceSftp.confirmOverwrite": "确认覆盖目标",
+    "workspaceSftp.confirmOverwriteSubtitle": "目标路径已存在，继续会覆盖现有内容。",
+    "workspaceSftp.overwrite": "覆盖",
+    "workspaceSftp.confirmDeleteFile": "确认删除文件",
+    "workspaceSftp.confirmDeleteFileSubtitle": "此文件会被删除，操作无法撤销。",
+    "workspaceSftp.confirmDeleteDirectory": "确认递归删除目录",
+    "workspaceSftp.confirmDeleteDirectorySubtitle": "此目录及其所有内容会被递归删除，操作无法撤销。",
+    "workspaceSftp.deleteConfirm": "删除",
+    "workspaceSftp.cancel": "取消",
+    "workspaceSftp.disconnected": "SSH 连接未连接",
+    "workspaceSftp.disconnectedHint": "SFTP 需要当前 SSH 会话保持连接。请重新连接后再试。",
+    "workspaceSftp.transfer.idle": "无传输任务",
+    "workspaceSftp.transfer.queued": "排队中",
+    "workspaceSftp.transfer.running": "传输中",
+    "workspaceSftp.transfer.completed": "已完成",
+    "workspaceSftp.transfer.failed": "传输失败",
+    "workspaceSftp.transfer.cancelled": "已取消",
+    "workspaceSftp.transfer.files": "文件",
     "workspaceSshTerminal.connected": "已连接",
     "workspaceSshTerminal.reconnecting": "重连中 {attempt}/{max}",
     "workspaceSshTerminal.disconnected": "已断连",
@@ -1717,6 +1763,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.sshTunnelLatencyChecking": "Checking latency",
     "projectTools.sshTunnelLatencyValue": "Latency {ms}ms",
     "projectTools.sshTunnelOpenBash": "Open Bash",
+    "projectTools.sshTunnelOpenSftp": "Open SFTP file manager",
     "projectTools.sshTunnelPromptTitle": "Confirm SSH host key",
     "projectTools.sshTunnelAuthPromptTitle": "SSH authentication",
     "projectTools.sshTunnelTrustHost": "Trust and connect",
@@ -1978,6 +2025,51 @@ export const translations: Record<Locale, Record<string, string>> = {
     "workspaceSshTerminal.empty": "No SSH connection open",
     "workspaceSshTerminal.close": "Close SSH terminal",
     "workspaceSshTerminal.closeTab": "Close SSH tab",
+    "workspaceSshTerminal.sftpTab": "SFTP",
+    "workspaceSftp.local": "Local Project",
+    "workspaceSftp.remote": "Remote Device",
+    "workspaceSftp.projectRoot": "Project",
+    "workspaceSftp.entry.folder": "Folder",
+    "workspaceSftp.entry.file": "File",
+    "workspaceSftp.loading": "Loading directory...",
+    "workspaceSftp.empty": "Directory is empty",
+    "workspaceSftp.refresh": "Refresh",
+    "workspaceSftp.newFolder": "New Folder",
+    "workspaceSftp.newFolderPrompt": "Folder name",
+    "workspaceSftp.creatingFolder": "Creating folder",
+    "workspaceSftp.rename": "Rename",
+    "workspaceSftp.renamePrompt": "New name",
+    "workspaceSftp.renaming": "Renaming",
+    "workspaceSftp.delete": "Delete",
+    "workspaceSftp.deleting": "Deleting",
+    "workspaceSftp.copyPath": "Copy Path",
+    "workspaceSftp.copyPathCopied": "Copied Absolute Path",
+    "workspaceSftp.copyPathFallback": "Copy this path",
+    "workspaceSftp.selectedCount": "{count} selected",
+    "workspaceSftp.clearSelection": "Clear",
+    "workspaceSftp.uploadToRemote": "Upload to remote folder",
+    "workspaceSftp.downloadToLocal": "Download to local folder",
+    "workspaceSftp.dropHere": "Drop files here",
+    "workspaceSftp.drop.upload": "Upload to remote",
+    "workspaceSftp.drop.download": "Download to local",
+    "workspaceSftp.confirmOverwrite": "Confirm overwrite",
+    "workspaceSftp.confirmOverwriteSubtitle": "The target path already exists. Continuing will overwrite existing content.",
+    "workspaceSftp.overwrite": "Overwrite",
+    "workspaceSftp.confirmDeleteFile": "Confirm file deletion",
+    "workspaceSftp.confirmDeleteFileSubtitle": "This file will be deleted. This cannot be undone.",
+    "workspaceSftp.confirmDeleteDirectory": "Confirm recursive directory deletion",
+    "workspaceSftp.confirmDeleteDirectorySubtitle": "This directory and all of its contents will be deleted recursively. This cannot be undone.",
+    "workspaceSftp.deleteConfirm": "Delete",
+    "workspaceSftp.cancel": "Cancel",
+    "workspaceSftp.disconnected": "SSH connection is not connected",
+    "workspaceSftp.disconnectedHint": "SFTP requires the SSH session to stay connected. Reconnect and try again.",
+    "workspaceSftp.transfer.idle": "No transfer",
+    "workspaceSftp.transfer.queued": "Queued",
+    "workspaceSftp.transfer.running": "Transferring",
+    "workspaceSftp.transfer.completed": "Completed",
+    "workspaceSftp.transfer.failed": "Failed",
+    "workspaceSftp.transfer.cancelled": "Cancelled",
+    "workspaceSftp.transfer.files": "files",
     "workspaceSshTerminal.connected": "Connected",
     "workspaceSshTerminal.reconnecting": "Reconnecting {attempt}/{max}",
     "workspaceSshTerminal.disconnected": "Disconnected",
diff --git a/crates/agent-gui/src/lib/sftp/tauriSftpClient.ts b/crates/agent-gui/src/lib/sftp/tauriSftpClient.ts
new file mode 100644
index 000000000..370dd4e2a
--- /dev/null
+++ b/crates/agent-gui/src/lib/sftp/tauriSftpClient.ts
@@ -0,0 +1,215 @@
+import { invoke } from "@tauri-apps/api/core";
+import { listen } from "@tauri-apps/api/event";
+import type {
+  SftpActionResponse,
+  SftpClient,
+  SftpEntry,
+  SftpListResponse,
+  SftpStatResponse,
+  SftpTransfer,
+  SftpTransferEvent,
+  SftpTransferResponse,
+} from "./types";
+
+type RawSftpEntry = Partial<SftpEntry> & {
+  size_bytes?: number;
+};
+
+type RawSftpTransfer = Partial<SftpTransfer> & {
+  session_id?: string;
+  source_path?: string;
+  target_path?: string;
+  current_path?: string;
+  bytes_done?: number;
+  bytes_total?: number;
+  files_done?: number;
+  files_total?: number;
+};
+
+type RawSftpListResponse = Partial<SftpListResponse> & {
+  entries?: RawSftpEntry[];
+};
+
+type RawSftpStatResponse = Partial<SftpStatResponse> & {
+  entry?: RawSftpEntry | null;
+};
+
+type RawSftpActionResponse = Partial<SftpActionResponse> & {
+  entry?: RawSftpEntry | null;
+  transfer?: RawSftpTransfer | null;
+};
+
+type RawSftpTransferResponse = {
+  transfer?: RawSftpTransfer | null;
+};
+
+type RawSftpTransferEvent = {
+  kind?: string;
+  transfer?: RawSftpTransfer | null;
+};
+
+function normalizeEntry(entry: RawSftpEntry): SftpEntry {
+  return {
+    path: entry.path ?? "",
+    name: entry.name ?? "",
+    kind: entry.kind ?? "file",
+    sizeBytes: Number(entry.sizeBytes ?? entry.size_bytes ?? 0),
+    mtime: Number(entry.mtime ?? 0),
+  };
+}
+
+function normalizeTransfer(transfer: RawSftpTransfer): SftpTransfer {
+  return {
+    id: transfer.id ?? "",
+    sessionId: transfer.sessionId ?? transfer.session_id ?? "",
+    direction: transfer.direction ?? "",
+    status: transfer.status ?? "",
+    sourcePath: transfer.sourcePath ?? transfer.source_path ?? "",
+    targetPath: transfer.targetPath ?? transfer.target_path ?? "",
+    currentPath: transfer.currentPath ?? transfer.current_path ?? "",
+    bytesDone: Number(transfer.bytesDone ?? transfer.bytes_done ?? 0),
+    bytesTotal: Number(transfer.bytesTotal ?? transfer.bytes_total ?? 0),
+    filesDone: Number(transfer.filesDone ?? transfer.files_done ?? 0),
+    filesTotal: Number(transfer.filesTotal ?? transfer.files_total ?? 0),
+    error: transfer.error ?? null,
+  };
+}
+
+function normalizeList(response: RawSftpListResponse): SftpListResponse {
+  return {
+    path: response.path ?? "",
+    entries: (response.entries ?? []).map(normalizeEntry),
+  };
+}
+
+function normalizeStat(response: RawSftpStatResponse): SftpStatResponse {
+  return {
+    exists: response.exists === true,
+    entry: response.entry ? normalizeEntry(response.entry) : null,
+  };
+}
+
+function normalizeAction(response: RawSftpActionResponse): SftpActionResponse {
+  return {
+    action: response.action ?? "",
+    path: response.path ?? "",
+    entry: response.entry ? normalizeEntry(response.entry) : null,
+    transfer: response.transfer ? normalizeTransfer(response.transfer) : null,
+  };
+}
+
+function normalizeTransferResponse(response: RawSftpTransferResponse): SftpTransferResponse {
+  if (!response.transfer) {
+    throw new Error("SFTP transfer response did not include a transfer");
+  }
+  return { transfer: normalizeTransfer(response.transfer) };
+}
+
+function normalizeTransferEvent(event: RawSftpTransferEvent): SftpTransferEvent | null {
+  if (!event.transfer) return null;
+  return {
+    kind: event.kind ?? "",
+    transfer: normalizeTransfer(event.transfer),
+  };
+}
+
+export const tauriSftpClient: SftpClient = {
+  async list(params) {
+    return normalizeList(
+      await invoke<RawSftpListResponse>("sftp_list", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        path: params.path,
+      }),
+    );
+  },
+  async stat(params) {
+    return normalizeStat(
+      await invoke<RawSftpStatResponse>("sftp_stat", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        path: params.path,
+      }),
+    );
+  },
+  async mkdir(params) {
+    return normalizeAction(
+      await invoke<RawSftpActionResponse>("sftp_mkdir", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        path: params.path,
+      }),
+    );
+  },
+  async rename(params) {
+    return normalizeAction(
+      await invoke<RawSftpActionResponse>("sftp_rename", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        from_path: params.fromPath,
+        to_path: params.toPath,
+      }),
+    );
+  },
+  async delete(params) {
+    return normalizeAction(
+      await invoke<RawSftpActionResponse>("sftp_delete", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: params.side,
+        path: params.path,
+        recursive: params.recursive ?? false,
+      }),
+    );
+  },
+  async transfer(params) {
+    return normalizeTransferResponse(
+      await invoke<RawSftpTransferResponse>("sftp_transfer", {
+        session_id: params.sessionId,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        direction: params.direction,
+        source_path: params.sourcePath,
+        target_path: params.targetPath,
+        recursive: params.recursive ?? false,
+        overwrite: params.overwrite ?? false,
+      }),
+    );
+  },
+  async cancelTransfer(params) {
+    await invoke("sftp_cancel_transfer", {
+      session_id: params.sessionId,
+      transfer_id: params.transferId,
+    });
+  },
+  subscribeTransfers(listener) {
+    let active = true;
+    let unlisten: (() => void) | null = null;
+    void listen<RawSftpTransferEvent>("sftp:event", (event) => {
+      if (!active) return;
+      const normalized = normalizeTransferEvent(event.payload);
+      if (normalized) {
+        listener(normalized);
+      }
+    }).then((cleanup) => {
+      if (!active) {
+        cleanup();
+        return;
+      }
+      unlisten = cleanup;
+    });
+    return () => {
+      active = false;
+      unlisten?.();
+    };
+  },
+};
diff --git a/crates/agent-gui/src/lib/sftp/types.ts b/crates/agent-gui/src/lib/sftp/types.ts
new file mode 100644
index 000000000..1fe3d5901
--- /dev/null
+++ b/crates/agent-gui/src/lib/sftp/types.ts
@@ -0,0 +1,103 @@
+export type SftpSide = "local" | "remote";
+export type SftpTransferDirection = "upload" | "download";
+
+export type SftpEntry = {
+  path: string;
+  name: string;
+  kind: "file" | "directory" | "symlink" | string;
+  sizeBytes: number;
+  mtime: number;
+};
+
+export type SftpListResponse = {
+  path: string;
+  entries: SftpEntry[];
+};
+
+export type SftpStatResponse = {
+  exists: boolean;
+  entry?: SftpEntry | null;
+};
+
+export type SftpTransfer = {
+  id: string;
+  sessionId: string;
+  direction: SftpTransferDirection | string;
+  status: "queued" | "running" | "completed" | "failed" | "cancelled" | string;
+  sourcePath: string;
+  targetPath: string;
+  currentPath: string;
+  bytesDone: number;
+  bytesTotal: number;
+  filesDone: number;
+  filesTotal: number;
+  error?: string | null;
+};
+
+export type SftpTransferResponse = {
+  transfer: SftpTransfer;
+};
+
+export type SftpTransferEvent = {
+  kind: string;
+  transfer: SftpTransfer;
+};
+
+export type SftpActionResponse = {
+  action?: string;
+  path?: string;
+  entry?: SftpEntry | null;
+  transfer?: SftpTransfer | null;
+};
+
+export type SftpClient = {
+  list(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    path?: string;
+  }): Promise<SftpListResponse>;
+  stat(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    path?: string;
+  }): Promise<SftpStatResponse>;
+  mkdir(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    path: string;
+  }): Promise<SftpActionResponse>;
+  rename(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    fromPath: string;
+    toPath: string;
+  }): Promise<SftpActionResponse>;
+  delete(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    side: SftpSide;
+    path: string;
+    recursive?: boolean;
+  }): Promise<SftpActionResponse>;
+  transfer(params: {
+    sessionId: string;
+    projectPathKey: string;
+    workdir: string;
+    direction: SftpTransferDirection;
+    sourcePath: string;
+    targetPath: string;
+    recursive?: boolean;
+    overwrite?: boolean;
+  }): Promise<SftpTransferResponse>;
+  cancelTransfer(params: { sessionId: string; transferId: string }): Promise<void>;
+  subscribeTransfers(listener: (event: SftpTransferEvent) => void): () => void;
+};
diff --git a/crates/agent-gui/src/lib/terminal/tauriTerminalClient.ts b/crates/agent-gui/src/lib/terminal/tauriTerminalClient.ts
index 220a0b23a..796784a9b 100644
--- a/crates/agent-gui/src/lib/terminal/tauriTerminalClient.ts
+++ b/crates/agent-gui/src/lib/terminal/tauriTerminalClient.ts
@@ -46,6 +46,7 @@ type RawTerminalSshMetadata = Partial<TerminalSshMetadata> & {
   auth_type?: string;
   reconnect_attempt?: number;
   reconnect_max_attempts?: number;
+  sftp_enabled?: boolean;
 };
 
 type RawTerminalSshPrompt = Partial<TerminalSshPrompt> & {
@@ -132,6 +133,7 @@ function normalizeSshMetadata(input: RawTerminalSshMetadata): TerminalSshMetadat
     status: input.status ?? "connected",
     reconnectAttempt: Number(input.reconnectAttempt ?? input.reconnect_attempt ?? 0),
     reconnectMaxAttempts: Number(input.reconnectMaxAttempts ?? input.reconnect_max_attempts ?? 3),
+    sftpEnabled: input.sftpEnabled ?? input.sftp_enabled ?? false,
   };
 }
 
@@ -260,6 +262,7 @@ export const tauriTerminalClient: TerminalClient = {
         title: params.title,
         cols: params.cols,
         rows: params.rows,
+        sftp_enabled: params.sftpEnabled ?? false,
       }),
     );
   },
diff --git a/crates/agent-gui/src/lib/terminal/types.ts b/crates/agent-gui/src/lib/terminal/types.ts
index 9ff629e33..e5210de5a 100644
--- a/crates/agent-gui/src/lib/terminal/types.ts
+++ b/crates/agent-gui/src/lib/terminal/types.ts
@@ -26,6 +26,7 @@ export type TerminalSshMetadata = {
   status: "connected" | "reconnecting" | "disconnected" | string;
   reconnectAttempt: number;
   reconnectMaxAttempts: number;
+  sftpEnabled: boolean;
 };
 
 export type TerminalSshPrompt = {
@@ -98,6 +99,7 @@ export type TerminalClient = {
     title?: string;
     cols?: number;
     rows?: number;
+    sftpEnabled?: boolean;
   }): Promise<TerminalSshCreateResult>;
   answerSshPrompt(params: {
     promptId: string;
diff --git a/crates/agent-gui/src/pages/ChatPage.tsx b/crates/agent-gui/src/pages/ChatPage.tsx
index 557804fbd..151ec2730 100644
--- a/crates/agent-gui/src/pages/ChatPage.tsx
+++ b/crates/agent-gui/src/pages/ChatPage.tsx
@@ -101,6 +101,7 @@ import { createSubagentRuntimeManager } from "../lib/chat/subagent/subagentRunti
 import { createStreamDebugLogger } from "../lib/debug/agentDebug";
 import { createConversationHookDispatcher } from "../lib/hooks/conversationHooks";
 import { tauriGitClient } from "../lib/git/tauriGitClient";
+import { tauriSftpClient } from "../lib/sftp/tauriSftpClient";
 import {
   lockMonacoNlsLocale,
   preparePreferredMonacoNlsLocale,
@@ -1542,12 +1543,13 @@ export function ChatPage(props: ChatPageProps) {
     [hideWorkspaceSshTerminalOverlay, terminalProjectPath, terminalProjectPathKey],
   );
   const handleOpenSshTerminal = useCallback(
-    (session: TerminalSession) => {
+    (session: TerminalSession, kind: WorkspaceSshTerminalOpenRequest["kind"] = "bash") => {
       if (session.kind !== "ssh") return;
       workspaceSshTerminalRequestIdRef.current += 1;
       const openRequest = {
         id: workspaceSshTerminalRequestIdRef.current,
         sessionId: session.id,
+        kind,
       };
       openWorkspaceSshTerminalRequest(openRequest);
     },
@@ -4670,6 +4672,7 @@ export function ChatPage(props: ChatPageProps) {
               openRequest={workspaceSshTerminalOpenRequest}
               sessions={terminalSessions}
               client={tauriTerminalClient}
+              sftpClient={tauriSftpClient}
               theme={settings.theme}
               isOpen={workspaceSshTerminalOpen}
               onHide={() => setWorkspaceSshTerminalOpen(false)}

From ff369d44ea00a5cb44b86fc1cf816ae344fd4d6d Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 17:35:20 +0800
Subject: [PATCH 07/28] fix(workspace): hide SSH terminal status badge

---
 .../WorkspaceSshTerminalOverlay.tsx           | 30 +------------------
 .../WorkspaceSshTerminalOverlay.tsx           | 30 +------------------
 2 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
index 702a9dd96..c0e95da61 100644
--- a/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
+++ b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
@@ -3,7 +3,7 @@ import { useLocale } from "@/i18n";
 import { cn } from "@/lib/shared/utils";
 import type { SftpClient } from "@/lib/sftp/types";
 import type { TerminalClient, TerminalSession } from "@/lib/terminal/types";
-import { AlertTriangle, FolderTree, RefreshCw, Terminal, Wifi, WifiOff, X } from "../icons";
+import { AlertTriangle, FolderTree, Terminal, X } from "../icons";
 import { XTermViewport } from "../project-tools/XTermViewport";
 import { WorkspaceSftpPanel } from "./WorkspaceSftpPanel";
 
@@ -39,19 +39,6 @@ function sshSessionStatus(session: TerminalSession) {
   return status;
 }
 
-function sshStatusLabel(session: TerminalSession, t: (key: string) => string) {
-  const status = sshSessionStatus(session);
-  if (status === "reconnecting") {
-    const attempt = Math.max(1, Number(session.ssh?.reconnectAttempt ?? 1));
-    const max = Math.max(attempt, Number(session.ssh?.reconnectMaxAttempts ?? 3));
-    return t("workspaceSshTerminal.reconnecting")
-      .replace("{attempt}", String(attempt))
-      .replace("{max}", String(max));
-  }
-  if (status === "disconnected") return t("workspaceSshTerminal.disconnected");
-  return t("workspaceSshTerminal.connected");
-}
-
 function sessionTitle(session: TerminalSession, fallback: string) {
   return session.title || session.ssh?.hostName || fallback;
 }
@@ -70,15 +57,6 @@ function statusDotClassName(session: TerminalSession) {
   return "bg-destructive";
 }
 
-function statusIcon(session: TerminalSession) {
-  const status = sshSessionStatus(session);
-  if (status === "connected") return <Wifi className="h-3.5 w-3.5 text-emerald-600" />;
-  if (status === "reconnecting") {
-    return <RefreshCw className="h-3.5 w-3.5 animate-spin text-amber-600" />;
-  }
-  return <WifiOff className="h-3.5 w-3.5 text-destructive" />;
-}
-
 function tabIdFor(sessionId: string, kind: WorkspaceSshTerminalTabKind) {
   return `${kind}:${sessionId}`;
 }
@@ -210,12 +188,6 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
               : t("workspaceSshTerminal.empty")}
           </div>
         </div>
-        {activeSession ? (
-          <div className="hidden shrink-0 items-center gap-1.5 rounded-md bg-background/70 px-2 py-1 text-[11px] text-muted-foreground sm:flex">
-            {statusIcon(activeSession)}
-            <span>{sshStatusLabel(activeSession, t)}</span>
-          </div>
-        ) : null}
         <button
           type="button"
           className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border hover:bg-background hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
diff --git a/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx b/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
index b57ec8368..538b23f42 100644
--- a/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
+++ b/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
@@ -3,7 +3,7 @@ import { useLocale } from "../../i18n";
 import { cn } from "../../lib/shared/utils";
 import type { SftpClient } from "../../lib/sftp/types";
 import type { TerminalClient, TerminalSession } from "../../lib/terminal/types";
-import { AlertTriangle, FolderTree, RefreshCw, Terminal, Wifi, WifiOff, X } from "../icons";
+import { AlertTriangle, FolderTree, Terminal, X } from "../icons";
 import { MacOsTitleBarSpacer } from "../MacOsTitleBarSpacer";
 import { XTermViewport } from "../project-tools/XTermViewport";
 import { WorkspaceSftpPanel } from "./WorkspaceSftpPanel";
@@ -40,19 +40,6 @@ function sshSessionStatus(session: TerminalSession) {
   return status;
 }
 
-function sshStatusLabel(session: TerminalSession, t: (key: string) => string) {
-  const status = sshSessionStatus(session);
-  if (status === "reconnecting") {
-    const attempt = Math.max(1, Number(session.ssh?.reconnectAttempt ?? 1));
-    const max = Math.max(attempt, Number(session.ssh?.reconnectMaxAttempts ?? 3));
-    return t("workspaceSshTerminal.reconnecting")
-      .replace("{attempt}", String(attempt))
-      .replace("{max}", String(max));
-  }
-  if (status === "disconnected") return t("workspaceSshTerminal.disconnected");
-  return t("workspaceSshTerminal.connected");
-}
-
 function sessionTitle(session: TerminalSession, fallback: string) {
   return session.title || session.ssh?.hostName || fallback;
 }
@@ -71,15 +58,6 @@ function statusDotClassName(session: TerminalSession) {
   return "bg-destructive";
 }
 
-function statusIcon(session: TerminalSession) {
-  const status = sshSessionStatus(session);
-  if (status === "connected") return <Wifi className="h-3.5 w-3.5 text-emerald-600" />;
-  if (status === "reconnecting") {
-    return <RefreshCw className="h-3.5 w-3.5 animate-spin text-amber-600" />;
-  }
-  return <WifiOff className="h-3.5 w-3.5 text-destructive" />;
-}
-
 function tabIdFor(sessionId: string, kind: WorkspaceSshTerminalTabKind) {
   return `${kind}:${sessionId}`;
 }
@@ -212,12 +190,6 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
               : t("workspaceSshTerminal.empty")}
           </div>
         </div>
-        {activeSession ? (
-          <div className="hidden shrink-0 items-center gap-1.5 rounded-md bg-background/70 px-2 py-1 text-[11px] text-muted-foreground sm:flex">
-            {statusIcon(activeSession)}
-            <span>{sshStatusLabel(activeSession, t)}</span>
-          </div>
-        ) : null}
         <button
           type="button"
           className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-transparent text-muted-foreground transition-colors hover:border-border hover:bg-background hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"

From abc574f2c8a8a7c53645fd4b5cedf3367781550c Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 20:07:50 +0800
Subject: [PATCH 08/28] feat(ssh): add built-in SSH manager with session reuse

---
 crates/agent-gateway/web/src/i18n/config.ts   |  12 +-
 .../web/src/lib/settings/index.ts             |   6 +-
 .../web/src/lib/tools/customSystemTools.ts    |  11 +-
 .../web/src/lib/tools/systemToolOptions.ts    |  27 +
 .../src/pages/settings/SystemSettingsForm.tsx |   6 +-
 .../agent-gui/src-tauri/src/commands/sftp.rs  |  49 +-
 .../src-tauri/src/commands/terminal.rs        |  18 +-
 crates/agent-gui/src-tauri/src/lib.rs         |   4 +
 .../agent-gui/src-tauri/src/runtime/sftp.rs   | 190 +++-
 .../src-tauri/src/runtime/terminal.rs         | 202 ++++
 .../src-tauri/src/services/gateway_bridge.rs  |   1 +
 crates/agent-gui/src/i18n/config.ts           |  12 +-
 crates/agent-gui/src/lib/settings/index.ts    |   6 +-
 .../src/lib/tools/builtinRegistry.ts          |  18 +-
 .../src/lib/tools/customSystemTools.ts        |  11 +-
 .../src/lib/tools/mcpManagerTools.ts          |   2 +-
 .../src/lib/tools/sshManagerTools.ts          | 943 ++++++++++++++++++
 .../src/lib/tools/systemToolOptions.ts        |  27 +
 crates/agent-gui/src/pages/ChatPage.tsx       |   6 +
 .../pages/chat/runAgentConversationTurn.ts    |  10 +
 .../src/pages/settings/SystemSettingsForm.tsx |   6 +-
 .../test/tools/path-and-system-tools.test.mjs |  13 +
 .../test/tools/ssh-manager-tools.test.mjs     | 741 ++++++++++++++
 23 files changed, 2279 insertions(+), 42 deletions(-)
 create mode 100644 crates/agent-gateway/web/src/lib/tools/systemToolOptions.ts
 create mode 100644 crates/agent-gui/src/lib/tools/sshManagerTools.ts
 create mode 100644 crates/agent-gui/src/lib/tools/systemToolOptions.ts
 create mode 100644 crates/agent-gui/test/tools/ssh-manager-tools.test.mjs

diff --git a/crates/agent-gateway/web/src/i18n/config.ts b/crates/agent-gateway/web/src/i18n/config.ts
index 9329afaad..bf8423f27 100644
--- a/crates/agent-gateway/web/src/i18n/config.ts
+++ b/crates/agent-gateway/web/src/i18n/config.ts
@@ -861,10 +861,10 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.createFolderFailed": "新建文件夹失败",
     "settings.workdirWarning": "Agent 模式需要先选择项目，否则无法执行文件工具。",
     "settings.workdirOpenFailed": "打开目录选择器失败：",
-    "settings.systemTools": "自定义系统工具",
+    "settings.systemTools": "系统工具",
     "settings.systemToolsDesc":
-      "这里仅展示用户自定义的系统工具；选中的工具会在 Agent 模式下注册，供模型在对话中调用。",
-    "settings.noSystemTools": "暂无可用的自定义系统工具",
+      "这里展示可选的系统内置工具与自定义系统工具；选中的工具会在 Agent 模式下注册，供模型在对话中调用。",
+    "settings.noSystemTools": "暂无可用的系统工具",
 
     /* ── Settings Providers ── */
     "settings.addProvider": "新增供应商",
@@ -2302,10 +2302,10 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.createFolderFailed": "Failed to create folder",
     "settings.workdirWarning": "Agent mode requires selecting a project before file tools can run.",
     "settings.workdirOpenFailed": "Failed to open directory picker: ",
-    "settings.systemTools": "Custom System Tools",
+    "settings.systemTools": "System Tools",
     "settings.systemToolsDesc":
-      "Only user-defined system tools are shown here. Selected tools are registered in Agent mode and can be called by the model during conversation.",
-    "settings.noSystemTools": "No custom system tools available",
+      "Optional built-in and custom system tools are shown here. Selected tools are registered in Agent mode and can be called by the model during conversation.",
+    "settings.noSystemTools": "No system tools available",
 
     /* ── Settings Providers ── */
     "settings.addProvider": "Add Provider",
diff --git a/crates/agent-gateway/web/src/lib/settings/index.ts b/crates/agent-gateway/web/src/lib/settings/index.ts
index 6f6f5a0be..a56ff94bc 100644
--- a/crates/agent-gateway/web/src/lib/settings/index.ts
+++ b/crates/agent-gateway/web/src/lib/settings/index.ts
@@ -1,8 +1,8 @@
 import { DEFAULT_LOCALE, normalizeLocale, type Locale } from "../../i18n/config";
 import { mergeAlwaysEnabledSkillNames } from "../skills/builtin";
 import { normalizeApiKey, normalizeBaseUrl, normalizeModels } from "./normalize";
-import { CUSTOM_SYSTEM_TOOL_OPTIONS, type SystemToolId } from "../tools/customSystemTools";
-export type { SystemToolId } from "../tools/customSystemTools";
+import { SYSTEM_TOOL_OPTIONS, type SystemToolId } from "../tools/systemToolOptions";
+export type { SystemToolId } from "../tools/systemToolOptions";
 
 export type ProviderId = "codex" | "claude_code" | "gemini";
 
@@ -1032,7 +1032,7 @@ function normalizeMcpTransport(input: unknown): McpTransport {
 }
 
 export function normalizeSystemToolSelection(input: unknown): SystemToolId[] {
-  const valid = new Set<SystemToolId>(CUSTOM_SYSTEM_TOOL_OPTIONS.map((tool) => tool.id));
+  const valid = new Set<SystemToolId>(SYSTEM_TOOL_OPTIONS.map((tool) => tool.id));
   const out: SystemToolId[] = [];
 
   for (const item of normalizeStringArray(input)) {
diff --git a/crates/agent-gateway/web/src/lib/tools/customSystemTools.ts b/crates/agent-gateway/web/src/lib/tools/customSystemTools.ts
index f63d1e5a0..89cc34030 100644
--- a/crates/agent-gateway/web/src/lib/tools/customSystemTools.ts
+++ b/crates/agent-gateway/web/src/lib/tools/customSystemTools.ts
@@ -7,6 +7,7 @@ import {
   createBuiltinMetadataMap,
   type BuiltinToolBundle,
 } from "./builtinTypes";
+import type { SystemToolRuntimeScope } from "./systemToolOptions";
 
 type SystemHttpGetResponse = {
   url: string;
@@ -16,8 +17,6 @@ type SystemHttpGetResponse = {
   content_type?: string | null;
 };
 
-export type SystemToolRuntimeScope = "chat" | "cron_auto_prompt";
-
 type SystemToolDefinition = {
   id: string;
   label: string;
@@ -89,10 +88,10 @@ const SELECTABLE_SYSTEM_TOOL_DEFINITIONS = [
   },
 ] as const satisfies readonly SystemToolDefinition[];
 
-export type SystemToolId = (typeof SELECTABLE_SYSTEM_TOOL_DEFINITIONS)[number]["id"];
+export type CustomSystemToolId = (typeof SELECTABLE_SYSTEM_TOOL_DEFINITIONS)[number]["id"];
 
 export const CUSTOM_SYSTEM_TOOL_OPTIONS: Array<{
-  id: SystemToolId;
+  id: CustomSystemToolId;
   label: string;
   description: string;
 }> = SELECTABLE_SYSTEM_TOOL_DEFINITIONS.map(({ id, label, description }) => ({
@@ -109,14 +108,14 @@ function supportsRuntimeScope(
 }
 
 export function createCustomSystemTools(params: {
-  selectedToolIds: SystemToolId[];
+  selectedToolIds: readonly string[];
   runtimeScope: SystemToolRuntimeScope;
   currentChatModel?: {
     customProviderId: string;
     model: string;
   };
 }): BuiltinToolBundle {
-  const selected = new Set<SystemToolId>(params.selectedToolIds);
+  const selected = new Set(params.selectedToolIds);
   const activeDefinitions = SELECTABLE_SYSTEM_TOOL_DEFINITIONS.filter(
     (definition) =>
       selected.has(definition.id) && supportsRuntimeScope(definition, params.runtimeScope),
diff --git a/crates/agent-gateway/web/src/lib/tools/systemToolOptions.ts b/crates/agent-gateway/web/src/lib/tools/systemToolOptions.ts
new file mode 100644
index 000000000..94fb6ec53
--- /dev/null
+++ b/crates/agent-gateway/web/src/lib/tools/systemToolOptions.ts
@@ -0,0 +1,27 @@
+import {
+  CUSTOM_SYSTEM_TOOL_OPTIONS,
+  type CustomSystemToolId,
+} from "./customSystemTools";
+
+export type SystemToolRuntimeScope = "chat" | "cron_auto_prompt";
+export type BuiltinSelectableSystemToolId = never;
+export type SystemToolId = CustomSystemToolId | BuiltinSelectableSystemToolId;
+
+export type SystemToolOption = {
+  id: SystemToolId;
+  label: string;
+  description: string;
+  kind: "builtin" | "custom";
+  runtimeScopes: readonly SystemToolRuntimeScope[];
+};
+
+export const BUILTIN_SYSTEM_TOOL_OPTIONS: SystemToolOption[] = [];
+
+export const SYSTEM_TOOL_OPTIONS: SystemToolOption[] = [
+  ...BUILTIN_SYSTEM_TOOL_OPTIONS,
+  ...CUSTOM_SYSTEM_TOOL_OPTIONS.map((tool) => ({
+    ...tool,
+    kind: "custom" as const,
+    runtimeScopes: ["chat", "cron_auto_prompt"] as const,
+  })),
+];
diff --git a/crates/agent-gateway/web/src/pages/settings/SystemSettingsForm.tsx b/crates/agent-gateway/web/src/pages/settings/SystemSettingsForm.tsx
index 099c2ca6e..156a520a0 100644
--- a/crates/agent-gateway/web/src/pages/settings/SystemSettingsForm.tsx
+++ b/crates/agent-gateway/web/src/pages/settings/SystemSettingsForm.tsx
@@ -14,7 +14,7 @@ import {
   type Theme,
   updateSystem,
 } from "../../lib/settings";
-import { CUSTOM_SYSTEM_TOOL_OPTIONS } from "../../lib/tools/customSystemTools";
+import { SYSTEM_TOOL_OPTIONS } from "../../lib/tools/systemToolOptions";
 import type { SettingsSectionProps } from "./types";
 
 export function SystemSettingsForm(props: SettingsSectionProps) {
@@ -266,7 +266,7 @@ export function SystemSettingsForm(props: SettingsSectionProps) {
         </p>
 
         <div className="space-y-2">
-          {CUSTOM_SYSTEM_TOOL_OPTIONS.map((tool) => {
+          {SYSTEM_TOOL_OPTIONS.map((tool) => {
             const checked = selectedSystemTools.includes(tool.id);
             return (
               <label
@@ -303,7 +303,7 @@ export function SystemSettingsForm(props: SettingsSectionProps) {
           })}
         </div>
 
-        {CUSTOM_SYSTEM_TOOL_OPTIONS.length === 0 ? (
+        {SYSTEM_TOOL_OPTIONS.length === 0 ? (
           <div className="rounded-xl border border-dashed bg-muted/20 px-4 py-6 text-center">
             <Wrench className="mx-auto mb-2 h-6 w-6 text-muted-foreground/40" />
             <p className="text-xs text-muted-foreground">{t("settings.noSystemTools")}</p>
diff --git a/crates/agent-gui/src-tauri/src/commands/sftp.rs b/crates/agent-gui/src-tauri/src/commands/sftp.rs
index 9127be29b..2c98186de 100644
--- a/crates/agent-gui/src-tauri/src/commands/sftp.rs
+++ b/crates/agent-gui/src-tauri/src/commands/sftp.rs
@@ -3,8 +3,8 @@ use std::sync::Arc;
 use tauri::State;
 
 use crate::runtime::sftp::{
-    SftpActionResponse, SftpListResponse, SftpSessionRegistry, SftpStatResponse,
-    SftpTransferResponse,
+    SftpActionResponse, SftpListResponse, SftpReadTextResponse, SftpSessionRegistry,
+    SftpStatResponse, SftpTransferResponse,
 };
 
 #[tauri::command(rename_all = "snake_case")]
@@ -35,6 +35,42 @@ pub async fn sftp_stat(
         .await
 }
 
+#[tauri::command(rename_all = "snake_case")]
+pub async fn sftp_read_text(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    project_path_key: Option<String>,
+    path: String,
+    offset: Option<u64>,
+    max_bytes: Option<usize>,
+) -> Result<SftpReadTextResponse, String> {
+    registry
+        .read_text(session_id, project_path_key, path, offset, max_bytes)
+        .await
+}
+
+#[tauri::command(rename_all = "snake_case")]
+pub async fn sftp_write_text(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    project_path_key: Option<String>,
+    path: String,
+    content: String,
+    overwrite: Option<bool>,
+    create_parent_dirs: Option<bool>,
+) -> Result<SftpActionResponse, String> {
+    registry
+        .write_text(
+            session_id,
+            project_path_key,
+            path,
+            content,
+            overwrite.unwrap_or(true),
+            create_parent_dirs.unwrap_or(true),
+        )
+        .await
+}
+
 #[tauri::command(rename_all = "snake_case")]
 pub async fn sftp_mkdir(
     registry: State<'_, Arc<SftpSessionRegistry>>,
@@ -129,3 +165,12 @@ pub fn sftp_cancel_transfer(
 ) -> Result<(), String> {
     registry.cancel_transfer(session_id, transfer_id)
 }
+
+#[tauri::command(rename_all = "snake_case")]
+pub fn sftp_transfer_status(
+    registry: State<'_, Arc<SftpSessionRegistry>>,
+    session_id: String,
+    transfer_id: String,
+) -> Result<SftpTransferResponse, String> {
+    registry.transfer_status(session_id, transfer_id)
+}
diff --git a/crates/agent-gui/src-tauri/src/commands/terminal.rs b/crates/agent-gui/src-tauri/src/commands/terminal.rs
index ccce622f0..b3c9a5234 100644
--- a/crates/agent-gui/src-tauri/src/commands/terminal.rs
+++ b/crates/agent-gui/src-tauri/src/commands/terminal.rs
@@ -7,7 +7,7 @@ use crate::runtime::terminal::{
     terminal_shell_options as runtime_terminal_shell_options, TerminalListResponse,
     TerminalReadTailResponse, TerminalSessionRecord, TerminalSessionRegistry,
     TerminalShellOptionsResponse, TerminalSnapshotResponse, TerminalSshCreateResponse,
-    TerminalSshLatencyResponse,
+    TerminalSshExecResponse, TerminalSshLatencyResponse,
 };
 
 #[tauri::command(rename_all = "snake_case")]
@@ -92,6 +92,22 @@ pub async fn terminal_ssh_latency(
     registry.ssh_latency(session_id).await
 }
 
+#[tauri::command(rename_all = "snake_case")]
+pub async fn terminal_ssh_exec(
+    registry: State<'_, Arc<TerminalSessionRegistry>>,
+    session_id: String,
+    command: String,
+    cwd: Option<String>,
+    timeout_ms: Option<u64>,
+    max_bytes: Option<usize>,
+) -> Result<TerminalSshExecResponse, String> {
+    registry
+        .inner()
+        .clone()
+        .ssh_exec(session_id, command, cwd, timeout_ms, max_bytes)
+        .await
+}
+
 #[tauri::command(rename_all = "snake_case")]
 pub fn terminal_snapshot(
     registry: State<'_, Arc<TerminalSessionRegistry>>,
diff --git a/crates/agent-gui/src-tauri/src/lib.rs b/crates/agent-gui/src-tauri/src/lib.rs
index 5235bb749..474bf3d27 100644
--- a/crates/agent-gui/src-tauri/src/lib.rs
+++ b/crates/agent-gui/src-tauri/src/lib.rs
@@ -150,6 +150,7 @@ macro_rules! app_invoke_handler {
             commands::terminal::terminal_answer_ssh_prompt,
             commands::terminal::terminal_cancel_ssh_prompt,
             commands::terminal::terminal_ssh_latency,
+            commands::terminal::terminal_ssh_exec,
             commands::terminal::terminal_snapshot,
             commands::terminal::terminal_input,
             commands::terminal::terminal_resize,
@@ -159,11 +160,14 @@ macro_rules! app_invoke_handler {
             commands::terminal::terminal_read_tail,
             commands::sftp::sftp_list,
             commands::sftp::sftp_stat,
+            commands::sftp::sftp_read_text,
+            commands::sftp::sftp_write_text,
             commands::sftp::sftp_mkdir,
             commands::sftp::sftp_rename,
             commands::sftp::sftp_delete,
             commands::sftp::sftp_transfer,
             commands::sftp::sftp_cancel_transfer,
+            commands::sftp::sftp_transfer_status,
             commands::git::git_status,
             commands::git::git_branches,
             commands::git::git_init,
diff --git a/crates/agent-gui/src-tauri/src/runtime/sftp.rs b/crates/agent-gui/src-tauri/src/runtime/sftp.rs
index b81c5fc2b..afd586b49 100644
--- a/crates/agent-gui/src-tauri/src/runtime/sftp.rs
+++ b/crates/agent-gui/src-tauri/src/runtime/sftp.rs
@@ -7,7 +7,7 @@ use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::{mpsc, Arc, Mutex};
 use std::time::{SystemTime, UNIX_EPOCH};
 use tauri::{AppHandle, Emitter};
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::io::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt};
 use uuid::Uuid;
 
 use crate::runtime::platform::expand_tilde_path;
@@ -17,6 +17,8 @@ use crate::runtime::terminal::{
 };
 
 const TRANSFER_BUFFER_BYTES: usize = 64 * 1024;
+const SFTP_READ_TEXT_DEFAULT_BYTES: usize = 200 * 1024;
+const SFTP_READ_TEXT_MAX_BYTES: usize = 1024 * 1024;
 pub const SFTP_EVENT_NAME: &str = "sftp:event";
 
 #[derive(Debug, Clone, Serialize)]
@@ -68,6 +70,17 @@ pub struct SftpTransferResponse {
     pub transfer: SftpTransferState,
 }
 
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SftpReadTextResponse {
+    pub path: String,
+    pub content: String,
+    pub offset: u64,
+    pub bytes_read: usize,
+    pub size_bytes: u64,
+    pub truncated: bool,
+}
+
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SftpEventPayload {
@@ -95,6 +108,7 @@ pub struct SftpSessionRegistry {
     terminal_registry: Arc<TerminalSessionRegistry>,
     sessions: Mutex<HashMap<String, Arc<tokio::sync::Mutex<TerminalSftpConnection>>>>,
     transfers: Mutex<HashMap<String, Arc<SftpTransferTask>>>,
+    transfer_states: Mutex<HashMap<String, SftpTransferState>>,
     app_handle: Mutex<Option<AppHandle>>,
     subscribers: Arc<Mutex<HashMap<usize, mpsc::Sender<SftpEvent>>>>,
     next_subscriber_id: AtomicUsize,
@@ -134,6 +148,7 @@ impl SftpSessionRegistry {
             terminal_registry,
             sessions: Mutex::new(HashMap::new()),
             transfers: Mutex::new(HashMap::new()),
+            transfer_states: Mutex::new(HashMap::new()),
             app_handle: Mutex::new(None),
             subscribers: Arc::new(Mutex::new(HashMap::new())),
             next_subscriber_id: AtomicUsize::new(0),
@@ -179,6 +194,10 @@ impl SftpSessionRegistry {
             }
             transfers.retain(|id, _| !id.starts_with(&prefix));
         }
+        if let Ok(mut transfer_states) = self.transfer_states.lock() {
+            let prefix = format!("{session_id}:");
+            transfer_states.retain(|id, _| !id.starts_with(&prefix));
+        }
     }
 
     pub async fn list(
@@ -225,6 +244,67 @@ impl SftpSessionRegistry {
         }
     }
 
+    pub async fn read_text(
+        &self,
+        session_id: String,
+        project_path_key: Option<String>,
+        path: String,
+        offset: Option<u64>,
+        max_bytes: Option<usize>,
+    ) -> Result<SftpReadTextResponse, String> {
+        self.ensure_session_allowed(&session_id, project_path_key.as_deref())?;
+        let remote_path = normalize_remote_path(&path);
+        self.read_text_remote(session_id, remote_path, offset.unwrap_or(0), max_bytes)
+            .await
+    }
+
+    pub async fn write_text(
+        &self,
+        session_id: String,
+        project_path_key: Option<String>,
+        path: String,
+        content: String,
+        overwrite: bool,
+        create_parent_dirs: bool,
+    ) -> Result<SftpActionResponse, String> {
+        self.ensure_session_allowed(&session_id, project_path_key.as_deref())?;
+        let remote_path = normalize_remote_path(&path);
+        let connection = self.connection_for_session(&session_id).await?;
+        let guard = connection.lock().await;
+        if !overwrite
+            && guard
+                .session
+                .try_exists(remote_path.clone())
+                .await
+                .unwrap_or(false)
+        {
+            return Err(format!("target already exists: {remote_path}"));
+        }
+        if create_parent_dirs {
+            if let Some(parent) = remote_parent_path(&remote_path) {
+                ensure_remote_dir_all(&guard.session, &parent).await?;
+            }
+        }
+        let mut file = guard
+            .session
+            .create(remote_path.clone())
+            .await
+            .map_err(|error| format!("failed to create remote file: {error}"))?;
+        file.write_all(content.as_bytes())
+            .await
+            .map_err(|error| format!("failed to write remote file: {error}"))?;
+        file.shutdown()
+            .await
+            .map_err(|error| format!("failed to close remote file: {error}"))?;
+        let entry = remote_entry_from_metadata(&guard.session, &remote_path).await?;
+        Ok(SftpActionResponse {
+            action: "write_text".to_string(),
+            path: remote_path,
+            entry: Some(entry),
+            transfer: None,
+        })
+    }
+
     pub async fn mkdir(
         &self,
         session_id: String,
@@ -479,6 +559,22 @@ impl SftpSessionRegistry {
         Ok(())
     }
 
+    pub fn transfer_status(
+        &self,
+        session_id: String,
+        transfer_id: String,
+    ) -> Result<SftpTransferResponse, String> {
+        let key = format!("{}:{}", session_id.trim(), transfer_id.trim());
+        let transfer = self
+            .transfer_states
+            .lock()
+            .map_err(|_| "SFTP transfer state registry poisoned".to_string())?
+            .get(&key)
+            .cloned()
+            .ok_or_else(|| "SFTP transfer not found".to_string())?;
+        Ok(SftpTransferResponse { transfer })
+    }
+
     fn ensure_session_allowed(
         &self,
         session_id: &str,
@@ -520,6 +616,14 @@ impl SftpSessionRegistry {
             kind: kind.to_string(),
             transfer,
         };
+        if let Ok(mut transfer_states) = self.transfer_states.lock() {
+            let key = format!(
+                "{}:{}",
+                payload.transfer.session_id.trim(),
+                payload.transfer.id.trim()
+            );
+            transfer_states.insert(key, payload.transfer.clone());
+        }
 
         if let Ok(app_handle) = self.app_handle.lock() {
             if let Some(app_handle) = app_handle.as_ref() {
@@ -727,6 +831,83 @@ impl SftpSessionRegistry {
         }
     }
 
+    async fn read_text_remote(
+        &self,
+        session_id: String,
+        remote_path: String,
+        offset: u64,
+        max_bytes: Option<usize>,
+    ) -> Result<SftpReadTextResponse, String> {
+        match self
+            .read_text_remote_once(&session_id, remote_path.clone(), offset, max_bytes)
+            .await
+        {
+            Ok(response) => Ok(response),
+            Err(error) if is_session_closed_error(&error) => {
+                self.invalidate_session_connection(&session_id);
+                self.read_text_remote_once(&session_id, remote_path, offset, max_bytes)
+                    .await
+            }
+            Err(error) => Err(error),
+        }
+    }
+
+    async fn read_text_remote_once(
+        &self,
+        session_id: &str,
+        remote_path: String,
+        offset: u64,
+        max_bytes: Option<usize>,
+    ) -> Result<SftpReadTextResponse, String> {
+        let limit = normalize_read_text_max_bytes(max_bytes);
+        let connection = self.connection_for_session(session_id).await?;
+        let guard = connection.lock().await;
+        let metadata = guard
+            .session
+            .metadata(remote_path.clone())
+            .await
+            .map_err(|error| format!("remote stat failed: {error}"))?;
+        if metadata.is_dir() {
+            return Err("remote path is a directory".to_string());
+        }
+        let size_bytes = metadata.size.unwrap_or(0);
+        let mut file = guard
+            .session
+            .open(remote_path.clone())
+            .await
+            .map_err(|error| format!("failed to open remote file: {error}"))?;
+        if offset > 0 {
+            file.seek(io::SeekFrom::Start(offset))
+                .await
+                .map_err(|error| format!("failed to seek remote file: {error}"))?;
+        }
+        let mut buffer = Vec::with_capacity(limit.saturating_add(1));
+        let mut chunk = vec![0u8; TRANSFER_BUFFER_BYTES.min(limit.saturating_add(1).max(1))];
+        while buffer.len() <= limit {
+            let want = (limit + 1 - buffer.len()).min(chunk.len());
+            let bytes_read = file
+                .read(&mut chunk[..want])
+                .await
+                .map_err(|error| format!("failed to read remote file: {error}"))?;
+            if bytes_read == 0 {
+                break;
+            }
+            buffer.extend_from_slice(&chunk[..bytes_read]);
+        }
+        let actual_read = buffer.len();
+        buffer.truncate(actual_read.min(limit));
+        let truncated = actual_read > limit
+            || (offset as u128).saturating_add(buffer.len() as u128) < u128::from(size_bytes);
+        Ok(SftpReadTextResponse {
+            path: remote_path,
+            content: String::from_utf8_lossy(&buffer).to_string(),
+            offset,
+            bytes_read: buffer.len(),
+            size_bytes,
+            truncated,
+        })
+    }
+
     async fn upload(
         &self,
         session_id: &str,
@@ -980,6 +1161,13 @@ fn normalize_transfer_target_path(direction: &str, path: &str) -> String {
     }
 }
 
+fn normalize_read_text_max_bytes(max_bytes: Option<usize>) -> usize {
+    max_bytes
+        .filter(|value| *value > 0)
+        .unwrap_or(SFTP_READ_TEXT_DEFAULT_BYTES)
+        .clamp(4 * 1024, SFTP_READ_TEXT_MAX_BYTES)
+}
+
 fn canonicalize_workdir(workdir: &str) -> Result<PathBuf, String> {
     let raw = workdir.trim();
     if raw.is_empty() {
diff --git a/crates/agent-gui/src-tauri/src/runtime/terminal.rs b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
index c853d90fc..f9c3d0fa3 100644
--- a/crates/agent-gui/src-tauri/src/runtime/terminal.rs
+++ b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
@@ -42,6 +42,10 @@ const SSH_STATUS_CONNECTED: &str = "connected";
 const SSH_STATUS_RECONNECTING: &str = "reconnecting";
 const SSH_STATUS_DISCONNECTED: &str = "disconnected";
 pub const TERMINAL_EVENT_NAME: &str = "terminal:event";
+const SSH_EXEC_DEFAULT_MAX_BYTES: usize = 64 * 1024;
+const SSH_EXEC_MAX_BYTES: usize = 256 * 1024;
+const SSH_EXEC_DEFAULT_TIMEOUT: Duration = Duration::from_secs(30);
+const SSH_EXEC_MAX_TIMEOUT: Duration = Duration::from_secs(300);
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -130,6 +134,25 @@ pub struct TerminalSshLatencyResponse {
     pub latency_ms: u32,
 }
 
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TerminalSshExecResponse {
+    pub session_id: String,
+    pub command: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exit_code: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exit_signal: Option<String>,
+    pub stdout: String,
+    pub stderr: String,
+    pub stdout_truncated: bool,
+    pub stderr_truncated: bool,
+    pub timed_out: bool,
+    pub duration_ms: u128,
+}
+
 #[derive(Debug, Clone)]
 pub struct TerminalSshSessionInfo {
     pub project_path_key: String,
@@ -1237,6 +1260,81 @@ impl TerminalSessionRegistry {
         })
     }
 
+    pub async fn ssh_exec(
+        self: &Arc<Self>,
+        session_id: String,
+        command: String,
+        cwd: Option<String>,
+        timeout_ms: Option<u64>,
+        max_bytes: Option<usize>,
+    ) -> Result<TerminalSshExecResponse, String> {
+        let command = command.trim().to_string();
+        if command.is_empty() {
+            return Err("command is required".to_string());
+        }
+        let entry = self.entry(&session_id)?;
+        let record = entry
+            .record
+            .lock()
+            .map_err(|_| "terminal session lock poisoned".to_string())?
+            .clone();
+        if record.kind.trim() != "ssh" {
+            return Err("terminal session is not an SSH connection".to_string());
+        }
+        if !record.running {
+            return Err("SSH connection is not running".to_string());
+        }
+        let TerminalSessionBackend::Ssh { runtime } = &entry.backend else {
+            return Err("terminal session is not an SSH connection".to_string());
+        };
+
+        let cwd = cwd
+            .map(|value| value.trim().to_string())
+            .filter(|value| !value.is_empty());
+        let wrapped_command = wrap_ssh_exec_command(&command, cwd.as_deref());
+        let timeout_duration = normalize_ssh_exec_timeout(timeout_ms);
+        let capture_limit = normalize_ssh_exec_max_bytes(max_bytes);
+        let start = Instant::now();
+        let result = timeout(
+            timeout_duration,
+            run_ssh_exec_channel(runtime, wrapped_command, capture_limit),
+        )
+        .await;
+        let duration_ms = start.elapsed().as_millis();
+
+        match result {
+            Ok(Ok(mut response)) => {
+                response.session_id = record.id;
+                response.command = command;
+                response.cwd = cwd;
+                response.duration_ms = duration_ms;
+                Ok(response)
+            }
+            Ok(Err(error)) => {
+                spawn_ssh_reconnect_runner(
+                    Arc::clone(self),
+                    record.id,
+                    Arc::clone(runtime),
+                    runtime.current_connection_id(),
+                );
+                Err(format!("SSH exec failed: {error}"))
+            }
+            Err(_) => Ok(TerminalSshExecResponse {
+                session_id: record.id,
+                command,
+                cwd,
+                exit_code: None,
+                exit_signal: None,
+                stdout: String::new(),
+                stderr: String::new(),
+                stdout_truncated: false,
+                stderr_truncated: false,
+                timed_out: true,
+                duration_ms,
+            }),
+        }
+    }
+
     pub fn input(&self, session_id: String, data: String) -> Result<TerminalSessionRecord, String> {
         if data.is_empty() {
             return self.record(session_id);
@@ -2010,6 +2108,110 @@ pub(crate) async fn open_sftp_connection_for_host(
     })
 }
 
+async fn run_ssh_exec_channel(
+    runtime: &Arc<SshSessionRuntime>,
+    command: String,
+    max_bytes: usize,
+) -> Result<TerminalSshExecResponse, String> {
+    let mut stdout = Vec::new();
+    let mut stderr = Vec::new();
+    let mut stdout_truncated = false;
+    let mut stderr_truncated = false;
+    let mut exit_code = None;
+    let mut exit_signal = None;
+
+    let channel = {
+        let handle = runtime.handle.lock().await;
+        let Some(handle) = handle.as_ref() else {
+            return Err("SSH connection is not connected".to_string());
+        };
+        handle
+            .channel_open_session()
+            .await
+            .map_err(|error| format!("SSH exec channel open failed: {error}"))?
+    };
+    channel
+        .exec(true, command.into_bytes())
+        .await
+        .map_err(|error| format!("SSH exec request failed: {error}"))?;
+    let (mut read_half, _write_half) = channel.split();
+
+    loop {
+        match read_half.wait().await {
+            Some(ChannelMsg::Data { data }) => {
+                append_limited(&mut stdout, data.as_ref(), max_bytes, &mut stdout_truncated);
+            }
+            Some(ChannelMsg::ExtendedData { data, .. }) => {
+                append_limited(&mut stderr, data.as_ref(), max_bytes, &mut stderr_truncated);
+            }
+            Some(ChannelMsg::ExitStatus { exit_status }) => {
+                exit_code = Some(exit_status);
+            }
+            Some(ChannelMsg::ExitSignal { signal_name, .. }) => {
+                exit_signal = Some(format!("{signal_name:?}"));
+            }
+            Some(ChannelMsg::Eof) | Some(ChannelMsg::Close) | None => break,
+            _ => {}
+        }
+    }
+
+    Ok(TerminalSshExecResponse {
+        session_id: String::new(),
+        command: String::new(),
+        cwd: None,
+        exit_code,
+        exit_signal,
+        stdout: String::from_utf8_lossy(&stdout).to_string(),
+        stderr: String::from_utf8_lossy(&stderr).to_string(),
+        stdout_truncated,
+        stderr_truncated,
+        timed_out: false,
+        duration_ms: 0,
+    })
+}
+
+fn normalize_ssh_exec_timeout(timeout_ms: Option<u64>) -> Duration {
+    let requested = timeout_ms
+        .filter(|value| *value > 0)
+        .map(Duration::from_millis)
+        .unwrap_or(SSH_EXEC_DEFAULT_TIMEOUT);
+    requested.clamp(Duration::from_secs(1), SSH_EXEC_MAX_TIMEOUT)
+}
+
+fn normalize_ssh_exec_max_bytes(max_bytes: Option<usize>) -> usize {
+    max_bytes
+        .filter(|value| *value > 0)
+        .unwrap_or(SSH_EXEC_DEFAULT_MAX_BYTES)
+        .clamp(4 * 1024, SSH_EXEC_MAX_BYTES)
+}
+
+fn append_limited(buffer: &mut Vec<u8>, data: &[u8], max_bytes: usize, truncated: &mut bool) {
+    if buffer.len() >= max_bytes {
+        if !data.is_empty() {
+            *truncated = true;
+        }
+        return;
+    }
+    let remaining = max_bytes - buffer.len();
+    if data.len() > remaining {
+        buffer.extend_from_slice(&data[..remaining]);
+        *truncated = true;
+    } else {
+        buffer.extend_from_slice(data);
+    }
+}
+
+fn wrap_ssh_exec_command(command: &str, cwd: Option<&str>) -> String {
+    match cwd.map(str::trim).filter(|value| !value.is_empty()) {
+        Some(cwd) => format!("cd {} && {}", shell_single_quote(cwd), command),
+        None => command.to_string(),
+    }
+}
+
+fn shell_single_quote(value: &str) -> String {
+    format!("'{}'", value.replace('\'', "'\\''"))
+}
+
 async fn run_ssh_session_io(
     registry: Arc<TerminalSessionRegistry>,
     session_id: String,
diff --git a/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs b/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs
index 6c7489e6a..afdf8e234 100644
--- a/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs
+++ b/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs
@@ -920,6 +920,7 @@ fn is_builtin_share_tool_name(name: &str) -> bool {
             | "MemoryManager"
             | "Read"
             | "SkillsManager"
+            | "SshManager"
             | "Write"
     )
 }
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index 99ccb8b77..7895f694a 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -904,10 +904,10 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.selectWorkdir": "选择文件夹",
     "settings.workdirWarning": "Agent 模式需要先选择项目，否则无法执行文件工具。",
     "settings.workdirOpenFailed": "打开目录选择器失败：",
-    "settings.systemTools": "自定义系统工具",
+    "settings.systemTools": "系统工具",
     "settings.systemToolsDesc":
-      "这里仅展示用户自定义的系统工具；选中的工具会在 Agent 模式下注册，供模型在对话中调用。",
-    "settings.noSystemTools": "暂无可用的自定义系统工具",
+      "这里展示可选的系统内置工具与自定义系统工具；选中的工具会在 Agent 模式下注册，供模型在对话中调用。",
+    "settings.noSystemTools": "暂无可用的系统工具",
 
     /* ── Settings Providers ── */
     "settings.addProvider": "新增供应商",
@@ -2391,10 +2391,10 @@ export const translations: Record<Locale, Record<string, string>> = {
     "settings.selectWorkdir": "Select Folder",
     "settings.workdirWarning": "Agent mode requires selecting a project before file tools can run.",
     "settings.workdirOpenFailed": "Failed to open directory picker: ",
-    "settings.systemTools": "Custom System Tools",
+    "settings.systemTools": "System Tools",
     "settings.systemToolsDesc":
-      "Only user-defined system tools are shown here. Selected tools are registered in Agent mode and can be called by the model during conversation.",
-    "settings.noSystemTools": "No custom system tools available",
+      "Optional built-in and custom system tools are shown here. Selected tools are registered in Agent mode and can be called by the model during conversation.",
+    "settings.noSystemTools": "No system tools available",
 
     /* ── Settings Providers ── */
     "settings.addProvider": "Add Provider",
diff --git a/crates/agent-gui/src/lib/settings/index.ts b/crates/agent-gui/src/lib/settings/index.ts
index 4b82032bc..7a125f9b2 100644
--- a/crates/agent-gui/src/lib/settings/index.ts
+++ b/crates/agent-gui/src/lib/settings/index.ts
@@ -1,9 +1,9 @@
 import { DEFAULT_LOCALE, type Locale, normalizeLocale } from "../../i18n/config";
 import { mergeAlwaysEnabledSkillNames } from "../skills/builtin";
-import { CUSTOM_SYSTEM_TOOL_OPTIONS, type SystemToolId } from "../tools/customSystemTools";
+import { SYSTEM_TOOL_OPTIONS, type SystemToolId } from "../tools/systemToolOptions";
 import { normalizeApiKey, normalizeBaseUrl, normalizeModels } from "./normalize";
 
-export type { SystemToolId } from "../tools/customSystemTools";
+export type { SystemToolId } from "../tools/systemToolOptions";
 
 export type ProviderId = "codex" | "claude_code" | "gemini";
 
@@ -1033,7 +1033,7 @@ function normalizeMcpTransport(input: unknown): McpTransport {
 }
 
 export function normalizeSystemToolSelection(input: unknown): SystemToolId[] {
-  const valid = new Set<SystemToolId>(CUSTOM_SYSTEM_TOOL_OPTIONS.map((tool) => tool.id));
+  const valid = new Set<SystemToolId>(SYSTEM_TOOL_OPTIONS.map((tool) => tool.id));
   const out: SystemToolId[] = [];
 
   for (const item of normalizeStringArray(input)) {
diff --git a/crates/agent-gui/src/lib/tools/builtinRegistry.ts b/crates/agent-gui/src/lib/tools/builtinRegistry.ts
index 2ae91e9a6..0b76f1ca7 100644
--- a/crates/agent-gui/src/lib/tools/builtinRegistry.ts
+++ b/crates/agent-gui/src/lib/tools/builtinRegistry.ts
@@ -14,6 +14,7 @@ import type {
   ProviderId,
   ProviderModelConfig,
   ReasoningLevel,
+  SshHostConfig,
 } from "../settings";
 import type {
   BuiltinToolBundle,
@@ -21,7 +22,6 @@ import type {
   BuiltinToolMetadata,
 } from "./builtinTypes";
 import { createCronTools } from "./cronTools";
-import type { SystemToolId, SystemToolRuntimeScope } from "./customSystemTools";
 import { createCustomSystemTools } from "./customSystemTools";
 import { createSubagentMessageTools } from "./delegate/messageTools";
 import { createDelegateTools } from "./delegateTools";
@@ -31,6 +31,8 @@ import { createMcpManagerTools } from "./mcpManagerTools";
 import { createMcpTools } from "./mcpTools";
 import { createMemoryTools } from "./memoryTools";
 import { createShellTools } from "./shellTools";
+import { createSshManagerTools } from "./sshManagerTools";
+import type { SystemToolId, SystemToolRuntimeScope } from "./systemToolOptions";
 import type { SkillAccessPolicy } from "./skillAccessPolicy";
 import { createSkillTools } from "./skillTools";
 import { createTerminalTools } from "./terminalTools";
@@ -170,6 +172,9 @@ type BuildBuiltinBaseToolRegistryParams = {
   remoteWebTunnelsEnabled?: boolean;
   remoteGatewayOnline?: boolean;
   tunnelProjectPathKey?: string;
+  sshHosts?: SshHostConfig[];
+  associatedSshHostIds?: string[];
+  sshManagerRemoteAllowed?: boolean;
   onTunnelsChanged?: (change: {
     action: "create" | "close";
     tunnel: {
@@ -244,6 +249,17 @@ async function buildBaseBuiltinToolBundles(params: BuildBuiltinBaseToolRegistryP
       projectPathKey: params.tunnelProjectPathKey,
       onTunnelsChanged: params.onTunnelsChanged,
     }),
+    createSshManagerTools({
+      enabled:
+        params.runtimeScope === "chat" &&
+        params.sshManagerRemoteAllowed !== false &&
+        (params.associatedSshHostIds?.length ?? 0) > 0,
+      runtimeScope: params.runtimeScope,
+      workdir: params.workdir,
+      projectPathKey: params.tunnelProjectPathKey,
+      hosts: params.sshHosts,
+      associatedHostIds: params.associatedSshHostIds,
+    }),
     ...(params.runtimeScope === "chat"
       ? [
           createTerminalTools({
diff --git a/crates/agent-gui/src/lib/tools/customSystemTools.ts b/crates/agent-gui/src/lib/tools/customSystemTools.ts
index 8493d677a..2b80f5065 100644
--- a/crates/agent-gui/src/lib/tools/customSystemTools.ts
+++ b/crates/agent-gui/src/lib/tools/customSystemTools.ts
@@ -3,6 +3,7 @@ import { Type } from "typebox";
 import { invoke } from "@tauri-apps/api/core";
 
 import { type BuiltinToolBundle, createBuiltinMetadataMap } from "./builtinTypes";
+import type { SystemToolRuntimeScope } from "./systemToolOptions";
 
 type SystemHttpGetResponse = {
   url: string;
@@ -12,8 +13,6 @@ type SystemHttpGetResponse = {
   content_type?: string | null;
 };
 
-export type SystemToolRuntimeScope = "chat" | "cron_auto_prompt";
-
 type SystemToolDefinition = {
   id: string;
   label: string;
@@ -82,10 +81,10 @@ const SELECTABLE_SYSTEM_TOOL_DEFINITIONS = [
   },
 ] as const satisfies readonly SystemToolDefinition[];
 
-export type SystemToolId = (typeof SELECTABLE_SYSTEM_TOOL_DEFINITIONS)[number]["id"];
+export type CustomSystemToolId = (typeof SELECTABLE_SYSTEM_TOOL_DEFINITIONS)[number]["id"];
 
 export const CUSTOM_SYSTEM_TOOL_OPTIONS: Array<{
-  id: SystemToolId;
+  id: CustomSystemToolId;
   label: string;
   description: string;
 }> = SELECTABLE_SYSTEM_TOOL_DEFINITIONS.map(({ id, label, description }) => ({
@@ -102,14 +101,14 @@ function supportsRuntimeScope(
 }
 
 export function createCustomSystemTools(params: {
-  selectedToolIds: SystemToolId[];
+  selectedToolIds: readonly string[];
   runtimeScope: SystemToolRuntimeScope;
   currentChatModel?: {
     customProviderId: string;
     model: string;
   };
 }): BuiltinToolBundle {
-  const selected = new Set<SystemToolId>(params.selectedToolIds);
+  const selected = new Set(params.selectedToolIds);
   const activeDefinitions = SELECTABLE_SYSTEM_TOOL_DEFINITIONS.filter(
     (definition) =>
       selected.has(definition.id) && supportsRuntimeScope(definition, params.runtimeScope),
diff --git a/crates/agent-gui/src/lib/tools/mcpManagerTools.ts b/crates/agent-gui/src/lib/tools/mcpManagerTools.ts
index e5042a565..5c46235bb 100644
--- a/crates/agent-gui/src/lib/tools/mcpManagerTools.ts
+++ b/crates/agent-gui/src/lib/tools/mcpManagerTools.ts
@@ -13,7 +13,7 @@ import {
   createBuiltinMetadataMap,
   type McpManagerResultDetails,
 } from "./builtinTypes";
-import type { SystemToolRuntimeScope } from "./customSystemTools";
+import type { SystemToolRuntimeScope } from "./systemToolOptions";
 
 type McpManagerAction =
   | "list"
diff --git a/crates/agent-gui/src/lib/tools/sshManagerTools.ts b/crates/agent-gui/src/lib/tools/sshManagerTools.ts
new file mode 100644
index 000000000..f5621e307
--- /dev/null
+++ b/crates/agent-gui/src/lib/tools/sshManagerTools.ts
@@ -0,0 +1,943 @@
+import type { Tool, ToolCall, ToolResultMessage } from "@earendil-works/pi-ai";
+import { invoke } from "@tauri-apps/api/core";
+import { Type } from "typebox";
+
+import type { SshHostConfig } from "../settings";
+import { type BuiltinToolBundle, createBuiltinMetadataMap } from "./builtinTypes";
+
+type SshManagerAction =
+  | "list_hosts"
+  | "list_sessions"
+  | "create_session"
+  | "read_session"
+  | "send_input"
+  | "resize_session"
+  | "close_session"
+  | "exec"
+  | "sftp_list"
+  | "sftp_stat"
+  | "sftp_read_text"
+  | "sftp_write_text"
+  | "sftp_mkdir"
+  | "sftp_rename"
+  | "sftp_delete"
+  | "sftp_upload"
+  | "sftp_download"
+  | "sftp_transfer_status"
+  | "sftp_cancel_transfer";
+
+type RawTerminalSession = {
+  id?: string;
+  projectPathKey?: string;
+  project_path_key?: string;
+  cwd?: string;
+  shell?: string;
+  title?: string;
+  kind?: string;
+  ssh?: {
+    hostId?: string;
+    host_id?: string;
+    hostName?: string;
+    host_name?: string;
+    username?: string;
+    host?: string;
+    port?: number;
+    authType?: string;
+    auth_type?: string;
+    status?: string;
+    sftpEnabled?: boolean;
+    sftp_enabled?: boolean;
+  } | null;
+  cols?: number;
+  rows?: number;
+  createdAt?: number;
+  created_at?: number;
+  updatedAt?: number;
+  updated_at?: number;
+  running?: boolean;
+};
+
+type RawTerminalListResponse = {
+  sessions?: RawTerminalSession[];
+};
+
+type RawTerminalSnapshotResponse = {
+  session?: RawTerminalSession;
+  output?: string;
+  truncated?: boolean;
+  outputStartOffset?: number;
+  output_start_offset?: number;
+  outputEndOffset?: number;
+  output_end_offset?: number;
+  sshPrompt?: unknown;
+  ssh_prompt?: unknown;
+};
+
+type SshSessionSummary = {
+  session_id: string;
+  host_id: string;
+  status: string;
+  sftpEnabled: boolean;
+  title: string;
+  running: boolean;
+  created_at: number;
+  updated_at: number;
+};
+
+type SshSessionStrategy = "reuse_or_create" | "new" | "require_existing";
+
+type ResolvedSshSession = {
+  session: SshSessionSummary;
+  reused: boolean;
+  created: boolean;
+  strategy: SshSessionStrategy | "session_id";
+};
+
+const SSH_MANAGER_TOOL: Tool = {
+  name: "SshManager",
+  description:
+    "Manage SSH sessions and remote SFTP files for SSH hosts explicitly associated with the current project. Use host_id from list_hosts. Default session strategy is reuse_or_create: exec and SFTP reuse the same running session for that host before LiveAgent creates a visible session. To intentionally run multiple SSH sessions, call create_session or set session_strategy=\"new\", then use the returned session_id for follow-up operations. Use session_strategy=\"require_existing\" when you want to fail instead of implicitly creating a session. Do not combine session_id with session_strategy=\"new\". Authentication prompts, unknown host keys, changed host keys, and MFA must be completed by the user in the SSH Tunnel tab before retrying.",
+  parameters: Type.Object({
+    action: Type.Union(
+      [
+        Type.Literal("list_hosts"),
+        Type.Literal("list_sessions"),
+        Type.Literal("create_session"),
+        Type.Literal("read_session"),
+        Type.Literal("send_input"),
+        Type.Literal("resize_session"),
+        Type.Literal("close_session"),
+        Type.Literal("exec"),
+        Type.Literal("sftp_list"),
+        Type.Literal("sftp_stat"),
+        Type.Literal("sftp_read_text"),
+        Type.Literal("sftp_write_text"),
+        Type.Literal("sftp_mkdir"),
+        Type.Literal("sftp_rename"),
+        Type.Literal("sftp_delete"),
+        Type.Literal("sftp_upload"),
+        Type.Literal("sftp_download"),
+        Type.Literal("sftp_transfer_status"),
+        Type.Literal("sftp_cancel_transfer"),
+      ],
+      { description: "SSH/SFTP action to perform." },
+    ),
+    host_id: Type.Optional(
+      Type.String({
+        description:
+          "Authorized SSH host id from list_hosts. Required when no session_id is supplied.",
+      }),
+    ),
+    session_id: Type.Optional(
+      Type.String({
+        description: "SSH session id from list_sessions or create_session.",
+      }),
+    ),
+    session_strategy: Type.Optional(
+      Type.Union(
+        [
+          Type.Literal("reuse_or_create"),
+          Type.Literal("new"),
+          Type.Literal("require_existing"),
+        ],
+        {
+          description:
+            'Session resolution strategy for exec and SFTP actions when session_id is omitted. Defaults to "reuse_or_create". Use "new" only when an additional SSH session is intentional; use "require_existing" to avoid implicit creation.',
+        },
+      ),
+    ),
+    title: Type.Optional(Type.String({ description: "Optional title for create_session." })),
+    cols: Type.Optional(Type.Number({ description: "PTY columns for create/resize." })),
+    rows: Type.Optional(Type.Number({ description: "PTY rows for create/resize." })),
+    sftp_enabled: Type.Optional(
+      Type.Boolean({
+        description: "Whether to enable SFTP for create_session. Defaults to true.",
+      }),
+    ),
+    data: Type.Optional(
+      Type.String({ description: "Raw PTY input for send_input, including newlines/control chars." }),
+    ),
+    command: Type.Optional(Type.String({ description: "Remote command for exec." })),
+    cwd: Type.Optional(
+      Type.String({ description: "Optional remote working directory for exec." }),
+    ),
+    timeout_ms: Type.Optional(Type.Number({ description: "Exec timeout in milliseconds." })),
+    max_bytes: Type.Optional(Type.Number({ description: "Maximum captured bytes for output." })),
+    path: Type.Optional(Type.String({ description: "Remote SFTP path." })),
+    from_path: Type.Optional(Type.String({ description: "Source path for rename." })),
+    to_path: Type.Optional(Type.String({ description: "Target path for rename." })),
+    content: Type.Optional(Type.String({ description: "Text content for sftp_write_text." })),
+    offset: Type.Optional(Type.Number({ description: "Byte offset for sftp_read_text." })),
+    limit: Type.Optional(Type.Number({ description: "Byte limit for sftp_read_text." })),
+    overwrite: Type.Optional(
+      Type.Boolean({ description: "Whether upload/download/write may overwrite existing files." }),
+    ),
+    recursive: Type.Optional(Type.Boolean({ description: "Recursive directory transfer/delete." })),
+    local_path: Type.Optional(
+      Type.String({ description: "Workspace-relative local path for upload/download." }),
+    ),
+    remote_path: Type.Optional(Type.String({ description: "Remote path for upload/download." })),
+    transfer_id: Type.Optional(Type.String({ description: "SFTP transfer id." })),
+  }),
+};
+
+function asArgs(value: unknown): Record<string, unknown> {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
+}
+
+function asErrorMessage(err: unknown) {
+  return err instanceof Error ? err.message : String(err);
+}
+
+function normalizeAction(value: unknown): SshManagerAction {
+  const action = typeof value === "string" ? value.trim() : "";
+  const actions = new Set<SshManagerAction>([
+    "list_hosts",
+    "list_sessions",
+    "create_session",
+    "read_session",
+    "send_input",
+    "resize_session",
+    "close_session",
+    "exec",
+    "sftp_list",
+    "sftp_stat",
+    "sftp_read_text",
+    "sftp_write_text",
+    "sftp_mkdir",
+    "sftp_rename",
+    "sftp_delete",
+    "sftp_upload",
+    "sftp_download",
+    "sftp_transfer_status",
+    "sftp_cancel_transfer",
+  ]);
+  if (actions.has(action as SshManagerAction)) {
+    return action as SshManagerAction;
+  }
+  throw new Error("SshManager.action is invalid.");
+}
+
+function normalizeOptionalString(value: unknown) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+function requireString(args: Record<string, unknown>, key: string) {
+  const value = normalizeOptionalString(args[key]);
+  if (!value) {
+    throw new Error(`SshManager.${key} is required.`);
+  }
+  return value;
+}
+
+function normalizePositiveInt(value: unknown, fallback: number, min: number, max: number) {
+  const number = typeof value === "number" ? value : Number(value);
+  if (!Number.isFinite(number)) return fallback;
+  return Math.min(max, Math.max(min, Math.floor(number)));
+}
+
+function normalizeOptionalPositiveInt(value: unknown, min: number, max: number) {
+  if (value === undefined || value === null || value === "") return undefined;
+  const number = typeof value === "number" ? value : Number(value);
+  if (!Number.isFinite(number)) return undefined;
+  return Math.min(max, Math.max(min, Math.floor(number)));
+}
+
+function normalizeBool(value: unknown, fallback: boolean) {
+  return typeof value === "boolean" ? value : fallback;
+}
+
+function normalizeSessionStrategy(value: unknown): SshSessionStrategy {
+  const strategy = typeof value === "string" ? value.trim() : "";
+  if (!strategy) return "reuse_or_create";
+  if (
+    strategy === "reuse_or_create" ||
+    strategy === "new" ||
+    strategy === "require_existing"
+  ) {
+    return strategy;
+  }
+  throw new Error("SshManager.session_strategy is invalid.");
+}
+
+function normalizeSession(input: RawTerminalSession): SshSessionSummary | null {
+  if (input.kind !== "ssh" || !input.ssh) return null;
+  const sessionId = input.id?.trim() ?? "";
+  const hostId = (input.ssh.hostId ?? input.ssh.host_id ?? "").trim();
+  if (!sessionId || !hostId) return null;
+  return {
+    session_id: sessionId,
+    host_id: hostId,
+    status: input.ssh.status ?? (input.running === true ? "connected" : "disconnected"),
+    sftpEnabled: input.ssh.sftpEnabled ?? input.ssh.sftp_enabled ?? false,
+    title: input.title ?? "SSH",
+    running: input.running === true,
+    created_at: input.createdAt ?? input.created_at ?? 0,
+    updated_at: input.updatedAt ?? input.updated_at ?? 0,
+  };
+}
+
+function hostSummary(host: SshHostConfig) {
+  return {
+    host_id: host.id,
+    name: host.name,
+    endpoint: `${host.username}@${host.host}:${host.port || 22}`,
+    username: host.username,
+    host: host.host,
+    port: host.port || 22,
+    authType: host.authType,
+  };
+}
+
+function formatHostLine(host: ReturnType<typeof hostSummary>) {
+  return `- ${host.host_id} · ${host.name || host.endpoint} · ${host.endpoint} · auth=${host.authType}`;
+}
+
+function formatSessionLine(session: SshSessionSummary) {
+  return `- ${session.session_id} · host=${session.host_id} · ${session.status} · sftp=${session.sftpEnabled ? "true" : "false"} · running=${session.running ? "true" : "false"} · created_at=${session.created_at} · updated_at=${session.updated_at} · ${session.title}`;
+}
+
+function promptErrorMessage() {
+  return "请先在 SSH 隧道 Tab 手动完成连接/信任/MFA 后重试。";
+}
+
+function okResult(params: {
+  toolCall: ToolCall;
+  action: SshManagerAction;
+  text: string;
+  details?: Record<string, unknown>;
+}): ToolResultMessage {
+  return {
+    role: "toolResult",
+    toolCallId: params.toolCall.id,
+    toolName: params.toolCall.name,
+    content: [{ type: "text", text: params.text }],
+    details: {
+      kind: "ssh_manager",
+      action: params.action,
+      ...(params.details ?? {}),
+    },
+    isError: false,
+    timestamp: Date.now(),
+  };
+}
+
+function errorResult(
+  toolCall: ToolCall,
+  action: SshManagerAction,
+  message: string,
+): ToolResultMessage {
+  return {
+    role: "toolResult",
+    toolCallId: toolCall.id,
+    toolName: toolCall.name,
+    content: [{ type: "text", text: `SshManager failed: ${message}` }],
+    details: {
+      kind: "ssh_manager",
+      action,
+      errors: [message],
+    },
+    isError: true,
+    timestamp: Date.now(),
+  };
+}
+
+async function listProjectSessions(projectPathKey: string) {
+  const response = await invoke<RawTerminalListResponse>("terminal_list", {
+    project_path_key: projectPathKey,
+  });
+  return (response.sessions ?? [])
+    .map(normalizeSession)
+    .filter((session): session is SshSessionSummary => Boolean(session));
+}
+
+function createAllowedHostMap(hosts: SshHostConfig[], associatedHostIds: readonly string[]) {
+  const allowedIds = new Set(associatedHostIds.map((id) => id.trim()).filter(Boolean));
+  return new Map(
+    hosts
+      .filter((host) => allowedIds.has(host.id))
+      .map((host) => [host.id, host] as const),
+  );
+}
+
+async function validateSession(params: {
+  sessionId: string;
+  projectPathKey: string;
+  allowedHostIds: Set<string>;
+  needsSftp?: boolean;
+}) {
+  const session = (await listProjectSessions(params.projectPathKey)).find(
+    (candidate) => candidate.session_id === params.sessionId,
+  );
+  if (!session) {
+    throw new Error("SSH session not found in the current project.");
+  }
+  if (!params.allowedHostIds.has(session.host_id)) {
+    throw new Error("SSH session host is not authorized for the current project.");
+  }
+  if (params.needsSftp && !session.sftpEnabled) {
+    throw new Error(
+      "SSH session does not have SFTP enabled. Use host_id to reuse or create an SFTP-enabled session.",
+    );
+  }
+  return session;
+}
+
+function findReusableSession(params: {
+  sessions: SshSessionSummary[];
+  hostId: string;
+  needsSftp: boolean;
+}) {
+  return params.sessions
+    .filter((session) => {
+      if (session.host_id !== params.hostId || !session.running) return false;
+      return !params.needsSftp || session.sftpEnabled;
+    })
+    .sort((left, right) => {
+      const connectedDelta =
+        Number(right.status === "connected") - Number(left.status === "connected");
+      if (connectedDelta !== 0) return connectedDelta;
+      const sftpDelta = Number(right.sftpEnabled) - Number(left.sftpEnabled);
+      if (sftpDelta !== 0) return sftpDelta;
+      const createdDelta = left.created_at - right.created_at;
+      if (createdDelta !== 0) return createdDelta;
+      return left.session_id.localeCompare(right.session_id);
+    })[0];
+}
+
+async function createSession(params: {
+  host: SshHostConfig;
+  workdir: string;
+  projectPathKey: string;
+  title?: string;
+  cols?: number;
+  rows?: number;
+  sftpEnabled?: boolean;
+}) {
+  const response = await invoke<RawTerminalSnapshotResponse>("terminal_create_ssh", {
+    cwd: params.workdir,
+    project_path_key: params.projectPathKey,
+    ssh_host_id: params.host.id,
+    title: params.title,
+    cols: params.cols,
+    rows: params.rows,
+    sftp_enabled: params.sftpEnabled ?? true,
+  });
+  if (response.sshPrompt || response.ssh_prompt) {
+    throw new Error(promptErrorMessage());
+  }
+  if (!response.session) {
+    throw new Error("SSH session was not created.");
+  }
+  const session = normalizeSession(response.session);
+  if (!session) {
+    throw new Error("SSH create response did not include an SSH session.");
+  }
+  return session;
+}
+
+async function resolveSession(params: {
+  args: Record<string, unknown>;
+  workdir: string;
+  projectPathKey: string;
+  allowedHosts: Map<string, SshHostConfig>;
+  allowedHostIds: Set<string>;
+  needsSftp?: boolean;
+}): Promise<ResolvedSshSession> {
+  const sessionId = normalizeOptionalString(params.args.session_id);
+  const strategy = normalizeSessionStrategy(params.args.session_strategy);
+  if (sessionId) {
+    if (strategy === "new") {
+      throw new Error("SshManager.session_strategy=new cannot be combined with session_id.");
+    }
+    const session = await validateSession({
+      sessionId,
+      projectPathKey: params.projectPathKey,
+      allowedHostIds: params.allowedHostIds,
+      needsSftp: params.needsSftp === true,
+    });
+    return { session, reused: true, created: false, strategy: "session_id" };
+  }
+  const hostId = requireString(params.args, "host_id");
+  const host = params.allowedHosts.get(hostId);
+  if (!host) {
+    throw new Error("SSH host is not associated with the current project.");
+  }
+  if (strategy !== "new") {
+    const reusable = findReusableSession({
+      sessions: await listProjectSessions(params.projectPathKey),
+      hostId,
+      needsSftp: params.needsSftp === true,
+    });
+    if (reusable) {
+      return { session: reusable, reused: true, created: false, strategy };
+    }
+    if (strategy === "require_existing") {
+      throw new Error("No reusable SSH session exists for this host in the current project.");
+    }
+  }
+  const session = await createSession({
+    host,
+    workdir: params.workdir,
+    projectPathKey: params.projectPathKey,
+    title:
+      normalizeOptionalString(params.args.title) ||
+      `SshManager: ${host.name || host.host || host.id}`,
+    sftpEnabled: true,
+  });
+  return { session, reused: false, created: true, strategy };
+}
+
+async function executeSshManager(
+  toolCall: ToolCall,
+  params: {
+    workdir: string;
+    projectPathKey: string;
+    hosts: SshHostConfig[];
+    associatedHostIds: string[];
+  },
+  signal?: AbortSignal,
+): Promise<ToolResultMessage> {
+  const args = asArgs(toolCall.arguments);
+  let action: SshManagerAction = "list_hosts";
+  try {
+    if (signal?.aborted) {
+      return errorResult(toolCall, action, "Cancelled");
+    }
+    action = normalizeAction(args.action);
+    const allowedHosts = createAllowedHostMap(params.hosts, params.associatedHostIds);
+    const allowedHostIds = new Set(allowedHosts.keys());
+    if (!params.projectPathKey.trim()) {
+      throw new Error("No current project is selected.");
+    }
+    if (allowedHosts.size === 0) {
+      throw new Error("No SSH hosts are associated with the current project.");
+    }
+
+    if (action === "list_hosts") {
+      const hosts = Array.from(allowedHosts.values()).map(hostSummary);
+      return okResult({
+        toolCall,
+        action,
+        text: hosts.length ? ["Authorized SSH hosts:", ...hosts.map(formatHostLine)].join("\n") : "No authorized SSH hosts.",
+        details: { hosts },
+      });
+    }
+
+    if (action === "list_sessions") {
+      const hostId = normalizeOptionalString(args.host_id);
+      if (hostId && !allowedHostIds.has(hostId)) {
+        throw new Error("SSH host is not associated with the current project.");
+      }
+      const sessions = (await listProjectSessions(params.projectPathKey)).filter(
+        (session) => allowedHostIds.has(session.host_id) && (!hostId || session.host_id === hostId),
+      );
+      return okResult({
+        toolCall,
+        action,
+        text: sessions.length
+          ? ["Project SSH sessions:", ...sessions.map(formatSessionLine)].join("\n")
+          : "No SSH sessions are open for the current project.",
+        details: { sessions },
+      });
+    }
+
+    if (action === "create_session") {
+      const hostId = requireString(args, "host_id");
+      const host = allowedHosts.get(hostId);
+      if (!host) {
+        throw new Error("SSH host is not associated with the current project.");
+      }
+      const session = await createSession({
+        host,
+        workdir: params.workdir,
+        projectPathKey: params.projectPathKey,
+        title: normalizeOptionalString(args.title) || undefined,
+        cols: normalizeOptionalPositiveInt(args.cols, 20, 400),
+        rows: normalizeOptionalPositiveInt(args.rows, 6, 200),
+        sftpEnabled: normalizeBool(args.sftp_enabled, true),
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: ["Created SSH session:", formatSessionLine(session)].join("\n"),
+        details: {
+          session,
+          session_strategy: "new",
+          session_reused: false,
+          session_created: true,
+        },
+      });
+    }
+
+    if (action === "read_session") {
+      const session = await validateSession({
+        sessionId: requireString(args, "session_id"),
+        projectPathKey: params.projectPathKey,
+        allowedHostIds,
+      });
+      const response = await invoke<RawTerminalSnapshotResponse>("terminal_snapshot", {
+        session_id: session.session_id,
+        max_bytes: normalizePositiveInt(args.max_bytes, 32 * 1024, 4 * 1024, 128 * 1024),
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: [
+          `session_id: ${session.session_id}`,
+          `host_id: ${session.host_id}`,
+          `truncated: ${response.truncated === true ? "true" : "false"}`,
+          "",
+          response.output || "(empty output)",
+        ].join("\n"),
+        details: {
+          session,
+          output: response.output ?? "",
+          truncated: response.truncated === true,
+        },
+      });
+    }
+
+    if (action === "send_input") {
+      const session = await validateSession({
+        sessionId: requireString(args, "session_id"),
+        projectPathKey: params.projectPathKey,
+        allowedHostIds,
+      });
+      const data = typeof args.data === "string" ? args.data : "";
+      if (data.length === 0) {
+        throw new Error("SshManager.data is required.");
+      }
+      await invoke("terminal_input", { session_id: session.session_id, data });
+      return okResult({
+        toolCall,
+        action,
+        text: `Sent ${data.length} characters to SSH session ${session.session_id}.`,
+        details: { session, bytes: data.length },
+      });
+    }
+
+    if (action === "resize_session") {
+      const session = await validateSession({
+        sessionId: requireString(args, "session_id"),
+        projectPathKey: params.projectPathKey,
+        allowedHostIds,
+      });
+      const cols = normalizePositiveInt(args.cols, 80, 20, 400);
+      const rows = normalizePositiveInt(args.rows, 24, 6, 200);
+      await invoke("terminal_resize", { session_id: session.session_id, cols, rows });
+      return okResult({
+        toolCall,
+        action,
+        text: `Resized SSH session ${session.session_id} to ${cols}x${rows}.`,
+        details: { session, cols, rows },
+      });
+    }
+
+    if (action === "close_session") {
+      const session = await validateSession({
+        sessionId: requireString(args, "session_id"),
+        projectPathKey: params.projectPathKey,
+        allowedHostIds,
+      });
+      await invoke("terminal_close", { session_id: session.session_id });
+      return okResult({
+        toolCall,
+        action,
+        text: `Closed SSH session ${session.session_id}.`,
+        details: { session },
+      });
+    }
+
+    if (action === "exec") {
+      const resolvedSession = await resolveSession({
+        args,
+        workdir: params.workdir,
+        projectPathKey: params.projectPathKey,
+        allowedHosts,
+        allowedHostIds,
+      });
+      const { session } = resolvedSession;
+      const command = requireString(args, "command");
+      const result = await invoke<Record<string, unknown>>("terminal_ssh_exec", {
+        session_id: session.session_id,
+        command,
+        cwd: normalizeOptionalString(args.cwd) || undefined,
+        timeout_ms: normalizeOptionalPositiveInt(args.timeout_ms, 1_000, 300_000),
+        max_bytes: normalizeOptionalPositiveInt(args.max_bytes, 4 * 1024, 256 * 1024),
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: [
+          `session_id: ${session.session_id}`,
+          `session_strategy: ${resolvedSession.strategy}`,
+          `session_reused: ${resolvedSession.reused ? "true" : "false"}`,
+          `session_created: ${resolvedSession.created ? "true" : "false"}`,
+          `exit_code: ${result.exitCode ?? result.exit_code ?? "unknown"}`,
+          `timed_out: ${result.timedOut === true || result.timed_out === true ? "true" : "false"}`,
+          "",
+          "stdout:",
+          String(result.stdout ?? "") || "(empty)",
+          "",
+          "stderr:",
+          String(result.stderr ?? "") || "(empty)",
+        ].join("\n"),
+        details: {
+          session,
+          session_strategy: resolvedSession.strategy,
+          session_reused: resolvedSession.reused,
+          session_created: resolvedSession.created,
+          result,
+        },
+      });
+    }
+
+    if (action === "sftp_transfer_status") {
+      const session = await validateSession({
+        sessionId: requireString(args, "session_id"),
+        projectPathKey: params.projectPathKey,
+        allowedHostIds,
+      });
+      const result = await invoke("sftp_transfer_status", {
+        session_id: session.session_id,
+        transfer_id: requireString(args, "transfer_id"),
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: JSON.stringify(result, null, 2),
+        details: { session, result },
+      });
+    }
+
+    if (action === "sftp_cancel_transfer") {
+      const session = await validateSession({
+        sessionId: requireString(args, "session_id"),
+        projectPathKey: params.projectPathKey,
+        allowedHostIds,
+      });
+      const transferId = requireString(args, "transfer_id");
+      await invoke("sftp_cancel_transfer", {
+        session_id: session.session_id,
+        transfer_id: transferId,
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: `Cancelled SFTP transfer ${transferId}.`,
+        details: { session, transfer_id: transferId },
+      });
+    }
+
+    const resolvedSession = await resolveSession({
+      args,
+      workdir: params.workdir,
+      projectPathKey: params.projectPathKey,
+      allowedHosts,
+      allowedHostIds,
+      needsSftp: true,
+    });
+    const { session } = resolvedSession;
+
+    if (action === "sftp_list" || action === "sftp_stat") {
+      const command = action === "sftp_list" ? "sftp_list" : "sftp_stat";
+      const result = await invoke(command, {
+        session_id: session.session_id,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: "remote",
+        path: normalizeOptionalString(args.path) || undefined,
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: JSON.stringify(result, null, 2),
+        details: {
+          session,
+          session_strategy: resolvedSession.strategy,
+          session_reused: resolvedSession.reused,
+          session_created: resolvedSession.created,
+          result,
+        },
+      });
+    }
+
+    if (action === "sftp_mkdir" || action === "sftp_delete") {
+      const command = action === "sftp_mkdir" ? "sftp_mkdir" : "sftp_delete";
+      const result = await invoke(command, {
+        session_id: session.session_id,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: "remote",
+        path: requireString(args, "path"),
+        ...(action === "sftp_delete" ? { recursive: normalizeBool(args.recursive, false) } : {}),
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: JSON.stringify(result, null, 2),
+        details: {
+          session,
+          session_strategy: resolvedSession.strategy,
+          session_reused: resolvedSession.reused,
+          session_created: resolvedSession.created,
+          result,
+        },
+      });
+    }
+
+    if (action === "sftp_rename") {
+      const result = await invoke("sftp_rename", {
+        session_id: session.session_id,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        side: "remote",
+        from_path: requireString(args, "from_path"),
+        to_path: requireString(args, "to_path"),
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: JSON.stringify(result, null, 2),
+        details: {
+          session,
+          session_strategy: resolvedSession.strategy,
+          session_reused: resolvedSession.reused,
+          session_created: resolvedSession.created,
+          result,
+        },
+      });
+    }
+
+    if (action === "sftp_upload" || action === "sftp_download") {
+      const direction = action === "sftp_upload" ? "upload" : "download";
+      const result = await invoke("sftp_transfer", {
+        session_id: session.session_id,
+        project_path_key: params.projectPathKey,
+        workdir: params.workdir,
+        direction,
+        source_path:
+          direction === "upload"
+            ? requireString(args, "local_path")
+            : requireString(args, "remote_path"),
+        target_path:
+          direction === "upload"
+            ? requireString(args, "remote_path")
+            : requireString(args, "local_path"),
+        recursive: normalizeBool(args.recursive, false),
+        overwrite: normalizeBool(args.overwrite, false),
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: JSON.stringify(result, null, 2),
+        details: {
+          session,
+          session_strategy: resolvedSession.strategy,
+          session_reused: resolvedSession.reused,
+          session_created: resolvedSession.created,
+          result,
+        },
+      });
+    }
+
+    if (action === "sftp_read_text") {
+      const result = await invoke("sftp_read_text", {
+        session_id: session.session_id,
+        project_path_key: params.projectPathKey,
+        path: requireString(args, "path"),
+        offset: normalizeOptionalPositiveInt(args.offset, 0, Number.MAX_SAFE_INTEGER),
+        max_bytes: normalizeOptionalPositiveInt(args.limit ?? args.max_bytes, 4 * 1024, 1024 * 1024),
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: JSON.stringify(result, null, 2),
+        details: {
+          session,
+          session_strategy: resolvedSession.strategy,
+          session_reused: resolvedSession.reused,
+          session_created: resolvedSession.created,
+          result,
+        },
+      });
+    }
+
+    if (action === "sftp_write_text") {
+      const result = await invoke("sftp_write_text", {
+        session_id: session.session_id,
+        project_path_key: params.projectPathKey,
+        path: requireString(args, "path"),
+        content: typeof args.content === "string" ? args.content : "",
+        overwrite: normalizeBool(args.overwrite, true),
+        create_parent_dirs: true,
+      });
+      return okResult({
+        toolCall,
+        action,
+        text: JSON.stringify(result, null, 2),
+        details: {
+          session,
+          session_strategy: resolvedSession.strategy,
+          session_reused: resolvedSession.reused,
+          session_created: resolvedSession.created,
+          result,
+        },
+      });
+    }
+
+    throw new Error("Unsupported SshManager action.");
+  } catch (err) {
+    return errorResult(toolCall, action, asErrorMessage(err));
+  }
+}
+
+export function createSshManagerTools(params: {
+  enabled: boolean;
+  runtimeScope: "chat" | "cron_auto_prompt";
+  workdir: string;
+  projectPathKey?: string;
+  hosts?: SshHostConfig[];
+  associatedHostIds?: string[];
+}): BuiltinToolBundle {
+  const projectPathKey = params.projectPathKey?.trim() || params.workdir.trim();
+  const hosts = params.hosts ?? [];
+  const associatedHostIds = params.associatedHostIds ?? [];
+  const tools =
+    params.enabled &&
+    params.runtimeScope === "chat" &&
+    projectPathKey.trim() &&
+    associatedHostIds.length > 0
+      ? [SSH_MANAGER_TOOL]
+      : [];
+
+  return {
+    groupId: "system",
+    tools,
+    executeToolCall: (toolCall, signal) =>
+      executeSshManager(
+        toolCall,
+        {
+          workdir: params.workdir,
+          projectPathKey,
+          hosts,
+          associatedHostIds,
+        },
+        signal,
+      ),
+    metadataByName: createBuiltinMetadataMap(
+      tools.map((tool) => [
+        tool.name,
+        {
+          groupId: "system" as const,
+          kind: "ssh_manager",
+          isReadOnly: false,
+          displayCategory: "terminal" as const,
+        },
+      ]),
+    ),
+  };
+}
diff --git a/crates/agent-gui/src/lib/tools/systemToolOptions.ts b/crates/agent-gui/src/lib/tools/systemToolOptions.ts
new file mode 100644
index 000000000..94fb6ec53
--- /dev/null
+++ b/crates/agent-gui/src/lib/tools/systemToolOptions.ts
@@ -0,0 +1,27 @@
+import {
+  CUSTOM_SYSTEM_TOOL_OPTIONS,
+  type CustomSystemToolId,
+} from "./customSystemTools";
+
+export type SystemToolRuntimeScope = "chat" | "cron_auto_prompt";
+export type BuiltinSelectableSystemToolId = never;
+export type SystemToolId = CustomSystemToolId | BuiltinSelectableSystemToolId;
+
+export type SystemToolOption = {
+  id: SystemToolId;
+  label: string;
+  description: string;
+  kind: "builtin" | "custom";
+  runtimeScopes: readonly SystemToolRuntimeScope[];
+};
+
+export const BUILTIN_SYSTEM_TOOL_OPTIONS: SystemToolOption[] = [];
+
+export const SYSTEM_TOOL_OPTIONS: SystemToolOption[] = [
+  ...BUILTIN_SYSTEM_TOOL_OPTIONS,
+  ...CUSTOM_SYSTEM_TOOL_OPTIONS.map((tool) => ({
+    ...tool,
+    kind: "custom" as const,
+    runtimeScopes: ["chat", "cron_auto_prompt"] as const,
+  })),
+];
diff --git a/crates/agent-gui/src/pages/ChatPage.tsx b/crates/agent-gui/src/pages/ChatPage.tsx
index 151ec2730..bb3eab95d 100644
--- a/crates/agent-gui/src/pages/ChatPage.tsx
+++ b/crates/agent-gui/src/pages/ChatPage.tsx
@@ -2657,6 +2657,8 @@ export function ChatPage(props: ChatPageProps) {
       overrides?.selectedSystemToolIdsOverride ??
       gatewayBridgeRequest?.selectedSystemToolIdsOverride ??
       settings.system.selectedSystemTools;
+    const effectiveProjectPathKey = workspaceProjectPathKey(effectiveWorkdir);
+    const effectiveAssociatedSshHostIds = getSshProjectHostIds(settings.ssh, effectiveProjectPathKey);
     const effectiveIsAgentDevExecutionMode = isAgentDevMode(effectiveExecutionMode);
     const effectiveSkillsEnabled = settings.skills.enabled && effectiveIsAgentMode;
     const hasRemoteGatewayTarget =
@@ -3625,6 +3627,10 @@ export function ChatPage(props: ChatPageProps) {
           selectableMcpServers,
           remoteWebTunnelsEnabled: settings.remote.enableWebTunnels,
           remoteGatewayOnline: canShareHistory,
+          sshHosts: settings.ssh.hosts,
+          associatedSshHostIds: effectiveAssociatedSshHostIds,
+          sshManagerRemoteAllowed:
+            !gatewayBridgeRequest || settings.remote.enableWebSshTerminal === true,
           onTunnelsChanged: (change) => {
             setTunnelRefreshToken((current) => current + 1);
             if (change.action === "create") {
diff --git a/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts b/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts
index 20709a4b3..2c893881b 100644
--- a/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts
+++ b/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts
@@ -53,6 +53,7 @@ import { assistantMessageToText } from "../../lib/providers/llm";
 import {
   type AppSettings,
   type ProviderId,
+  type SshHostConfig,
   type SystemToolId,
   workspaceProjectPathKey,
 } from "../../lib/settings";
@@ -288,6 +289,9 @@ type RunAgentConversationTurnParams = {
   remoteWebTunnelsEnabled?: boolean;
   remoteGatewayOnline?: boolean;
   onTunnelsChanged?: (change: TunnelManagerChange) => void;
+  sshHosts?: SshHostConfig[];
+  associatedSshHostIds?: string[];
+  sshManagerRemoteAllowed?: boolean;
   sessionId: string;
   conversationId: string;
   conversationCwd?: string;
@@ -372,6 +376,9 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
     remoteWebTunnelsEnabled,
     remoteGatewayOnline,
     onTunnelsChanged,
+    sshHosts,
+    associatedSshHostIds,
+    sshManagerRemoteAllowed,
     sessionId,
     conversationId,
     conversationCwd,
@@ -492,6 +499,9 @@ export async function runAgentConversationTurn(params: RunAgentConversationTurnP
     remoteWebTunnelsEnabled,
     remoteGatewayOnline,
     tunnelProjectPathKey: workspaceProjectPathKey(effectiveWorkdir),
+    sshHosts,
+    associatedSshHostIds,
+    sshManagerRemoteAllowed,
     onTunnelsChanged: (change) => {
       onTunnelsChanged?.(change);
       if (typeof window !== "undefined") {
diff --git a/crates/agent-gui/src/pages/settings/SystemSettingsForm.tsx b/crates/agent-gui/src/pages/settings/SystemSettingsForm.tsx
index c2a237172..9a354dd72 100644
--- a/crates/agent-gui/src/pages/settings/SystemSettingsForm.tsx
+++ b/crates/agent-gui/src/pages/settings/SystemSettingsForm.tsx
@@ -14,7 +14,7 @@ import {
   type Theme,
   updateSystem,
 } from "../../lib/settings";
-import { CUSTOM_SYSTEM_TOOL_OPTIONS } from "../../lib/tools/customSystemTools";
+import { SYSTEM_TOOL_OPTIONS } from "../../lib/tools/systemToolOptions";
 import type { SettingsSectionProps } from "./types";
 
 export function SystemSettingsForm(props: SettingsSectionProps) {
@@ -260,7 +260,7 @@ export function SystemSettingsForm(props: SettingsSectionProps) {
         </p>
 
         <div className="space-y-2">
-          {CUSTOM_SYSTEM_TOOL_OPTIONS.map((tool) => {
+          {SYSTEM_TOOL_OPTIONS.map((tool) => {
             const checked = selectedSystemTools.includes(tool.id);
             return (
               <label
@@ -295,7 +295,7 @@ export function SystemSettingsForm(props: SettingsSectionProps) {
           })}
         </div>
 
-        {CUSTOM_SYSTEM_TOOL_OPTIONS.length === 0 ? (
+        {SYSTEM_TOOL_OPTIONS.length === 0 ? (
           <div className="rounded-xl border border-dashed bg-muted/20 px-4 py-6 text-center">
             <Wrench className="mx-auto mb-2 h-6 w-6 text-muted-foreground/40" />
             <p className="text-xs text-muted-foreground">{t("settings.noSystemTools")}</p>
diff --git a/crates/agent-gui/test/tools/path-and-system-tools.test.mjs b/crates/agent-gui/test/tools/path-and-system-tools.test.mjs
index 60431c6b6..9a3b8ae35 100644
--- a/crates/agent-gui/test/tools/path-and-system-tools.test.mjs
+++ b/crates/agent-gui/test/tools/path-and-system-tools.test.mjs
@@ -5,6 +5,7 @@ import { createTsModuleLoader } from "../helpers/load-ts-module.mjs";
 const loader = createTsModuleLoader();
 const pathUtils = loader.loadModule("src/lib/tools/pathUtils.ts");
 const systemTools = loader.loadModule("src/lib/tools/customSystemTools.ts");
+const systemToolOptions = loader.loadModule("src/lib/tools/systemToolOptions.ts");
 const skillBuiltinHelpers = loader.loadModule("src/lib/skills/builtin.ts");
 
 test("required tool paths must be relative workspace paths", () => {
@@ -1728,3 +1729,15 @@ test("custom system tool options remain in sync with selectable definitions", ()
     },
   ]);
 });
+
+test("system tool options include user-selectable tools", () => {
+  assert.deepEqual(systemToolOptions.SYSTEM_TOOL_OPTIONS, [
+    {
+      id: "http_get_test",
+      label: "本地 HTTP Test",
+      description: "Call the network test endpoint and return the response body.",
+      kind: "custom",
+      runtimeScopes: ["chat", "cron_auto_prompt"],
+    },
+  ]);
+});
diff --git a/crates/agent-gui/test/tools/ssh-manager-tools.test.mjs b/crates/agent-gui/test/tools/ssh-manager-tools.test.mjs
new file mode 100644
index 000000000..fa8487d59
--- /dev/null
+++ b/crates/agent-gui/test/tools/ssh-manager-tools.test.mjs
@@ -0,0 +1,741 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { createTsModuleLoader } from "../helpers/load-ts-module.mjs";
+
+const SSH_HOST = {
+  id: "host-1",
+  name: "Prod",
+  description: "Production host",
+  host: "ssh.example.test",
+  port: 22,
+  username: "deploy",
+  authType: "privateKey",
+  password: "secret-password",
+  privateKey: "secret-key",
+  privateKeyPath: "/Users/me/.ssh/id_rsa",
+  privateKeyPassphrase: "secret-passphrase",
+  proxy: {
+    type: "socks5",
+    url: "",
+    port: 0,
+    username: "",
+    password: "",
+  },
+};
+
+function createToolCall(args) {
+  return {
+    type: "toolCall",
+    id: "call-ssh",
+    name: "SshManager",
+    arguments: args,
+  };
+}
+
+function createSshSession(overrides = {}) {
+  return {
+    id: "ssh-session-1",
+    projectPathKey: "/workspace",
+    cwd: "/workspace",
+    shell: "ssh",
+    title: "SshManager: Prod",
+    kind: "ssh",
+    ssh: {
+      hostId: "host-1",
+      hostName: "Prod",
+      username: "deploy",
+      host: "ssh.example.test",
+      port: 22,
+      authType: "privateKey",
+      status: "connected",
+      sftpEnabled: true,
+    },
+    createdAt: 1_700_000_000_000,
+    updatedAt: 1_700_000_000_000,
+    running: true,
+    ...overrides,
+  };
+}
+
+async function buildRegistry(params = {}) {
+  const loader = createTsModuleLoader();
+  const { buildBuiltinToolRegistry } = loader.loadModule("src/lib/tools/builtinRegistry.ts");
+  const { createFileToolState } = loader.loadModule("src/lib/tools/fileToolState.ts");
+  return buildBuiltinToolRegistry({
+    workdir: "/workspace",
+    providerId: "codex",
+    fileState: createFileToolState(),
+    skillsEnabled: false,
+    runtimeScope: "chat",
+    currentChatModel: { customProviderId: "p", model: "m" },
+    selectedSystemToolIds: [],
+    mcpSettings: { selected: [], servers: [] },
+    enabledMcpServerIds: [],
+    selectableMcpServers: [],
+    sshHosts: [SSH_HOST],
+    associatedSshHostIds: ["host-1"],
+    tunnelProjectPathKey: "/workspace",
+    ...params,
+  });
+}
+
+test("SshManager is auto-registered by project hosts, runtime, and remote switch", async () => {
+  const registry = await buildRegistry();
+  assert.equal(registry.hasTool("SshManager"), true);
+  assert.equal(registry.metadataByName.get("SshManager").kind, "ssh_manager");
+  assert.equal(registry.metadataByName.get("SshManager").displayCategory, "terminal");
+
+  assert.equal(
+    (
+      await buildRegistry({
+        associatedSshHostIds: [],
+      })
+    ).hasTool("SshManager"),
+    false,
+  );
+
+  assert.equal(
+    (
+      await buildRegistry({
+        runtimeScope: "cron_auto_prompt",
+      })
+    ).hasTool("SshManager"),
+    false,
+  );
+
+  assert.equal(
+    (
+      await buildRegistry({
+        sshManagerRemoteAllowed: false,
+      })
+    ).hasTool("SshManager"),
+    false,
+  );
+});
+
+test("SshManager list_hosts redacts configured secrets", async () => {
+  const loader = createTsModuleLoader();
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(createToolCall({ action: "list_hosts" }));
+  assert.equal(result.isError, false);
+  assert.deepEqual(result.details.hosts, [
+    {
+      host_id: "host-1",
+      name: "Prod",
+      endpoint: "deploy@ssh.example.test:22",
+      username: "deploy",
+      host: "ssh.example.test",
+      port: 22,
+      authType: "privateKey",
+    },
+  ]);
+  assert.doesNotMatch(result.content[0].text, /secret|privateKeyPath|passphrase/i);
+  assert.equal(JSON.stringify(result.details).includes("secret"), false);
+});
+
+test("SshManager create_session defaults SFTP on and refuses SSH prompts", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_create_ssh") {
+            return { session: createSshSession(), output: "", truncated: false };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({ action: "create_session", host_id: "host-1" }),
+  );
+  assert.equal(result.isError, false);
+  assert.equal(result.details.session.session_id, "ssh-session-1");
+  assert.deepEqual(invocations, [
+    {
+      command: "terminal_create_ssh",
+      args: {
+        cwd: "/workspace",
+        project_path_key: "/workspace",
+        ssh_host_id: "host-1",
+        title: undefined,
+        cols: undefined,
+        rows: undefined,
+        sftp_enabled: true,
+      },
+    },
+  ]);
+});
+
+test("SshManager exec auto-creates a visible session before running command", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_list") {
+            return { sessions: [] };
+          }
+          if (command === "terminal_create_ssh") {
+            return { session: createSshSession(), output: "", truncated: false };
+          }
+          if (command === "terminal_ssh_exec") {
+            return {
+              sessionId: args.session_id,
+              command: args.command,
+              cwd: args.cwd,
+              exitCode: 0,
+              stdout: "ok\n",
+              stderr: "",
+              timedOut: false,
+            };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({
+      action: "exec",
+      host_id: "host-1",
+      command: "pwd",
+      cwd: "/srv/app",
+      timeout_ms: 5_000,
+    }),
+  );
+  assert.equal(result.isError, false);
+  assert.match(result.content[0].text, /stdout:\nok/);
+  assert.deepEqual(
+    invocations.map((call) => call.command),
+    ["terminal_list", "terminal_create_ssh", "terminal_ssh_exec"],
+  );
+  assert.equal(invocations[2].args.session_id, "ssh-session-1");
+  assert.equal(invocations[2].args.command, "pwd");
+  assert.equal(invocations[2].args.cwd, "/srv/app");
+  assert.equal(result.details.session_reused, false);
+  assert.equal(result.details.session_created, true);
+});
+
+test("SshManager exec reuses an existing running SSH session for the same host", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_list") {
+            return {
+              sessions: [
+                createSshSession({
+                  id: "older-disconnected",
+                  running: false,
+                  createdAt: 1,
+                }),
+                createSshSession({
+                  id: "ssh-session-newer",
+                  createdAt: 3,
+                  ssh: { ...createSshSession().ssh, sftpEnabled: false },
+                }),
+                createSshSession({
+                  id: "ssh-session-reused",
+                  createdAt: 2,
+                  ssh: { ...createSshSession().ssh, sftpEnabled: false },
+                }),
+              ],
+            };
+          }
+          if (command === "terminal_ssh_exec") {
+            return {
+              sessionId: args.session_id,
+              command: args.command,
+              exitCode: 0,
+              stdout: "reused\n",
+              stderr: "",
+              timedOut: false,
+            };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({
+      action: "exec",
+      host_id: "host-1",
+      command: "whoami",
+    }),
+  );
+  assert.equal(result.isError, false);
+  assert.match(result.content[0].text, /session_reused: true/);
+  assert.deepEqual(
+    invocations.map((call) => call.command),
+    ["terminal_list", "terminal_ssh_exec"],
+  );
+  assert.equal(invocations[1].args.session_id, "ssh-session-reused");
+  assert.equal(result.details.session_strategy, "reuse_or_create");
+  assert.equal(result.details.session_reused, true);
+  assert.equal(result.details.session_created, false);
+});
+
+test("SshManager exec can intentionally create an additional SSH session", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_create_ssh") {
+            return {
+              session: createSshSession({
+                id: "ssh-session-second",
+                title: args.title,
+              }),
+              output: "",
+              truncated: false,
+            };
+          }
+          if (command === "terminal_ssh_exec") {
+            return {
+              sessionId: args.session_id,
+              command: args.command,
+              exitCode: 0,
+              stdout: "second\n",
+              stderr: "",
+              timedOut: false,
+            };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({
+      action: "exec",
+      host_id: "host-1",
+      session_strategy: "new",
+      title: "isolated diagnostics",
+      command: "hostname",
+    }),
+  );
+  assert.equal(result.isError, false);
+  assert.deepEqual(
+    invocations.map((call) => call.command),
+    ["terminal_create_ssh", "terminal_ssh_exec"],
+  );
+  assert.equal(invocations[0].args.title, "isolated diagnostics");
+  assert.equal(invocations[1].args.session_id, "ssh-session-second");
+  assert.equal(result.details.session_strategy, "new");
+  assert.equal(result.details.session_reused, false);
+  assert.equal(result.details.session_created, true);
+});
+
+test("SshManager can require an existing session without implicitly creating one", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_list") {
+            return { sessions: [] };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({
+      action: "exec",
+      host_id: "host-1",
+      session_strategy: "require_existing",
+      command: "pwd",
+    }),
+  );
+  assert.equal(result.isError, true);
+  assert.match(result.content[0].text, /No reusable SSH session exists/);
+  assert.deepEqual(invocations, [
+    {
+      command: "terminal_list",
+      args: { project_path_key: "/workspace" },
+    },
+  ]);
+});
+
+test("SshManager rejects conflicting session_id and new session strategy", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({
+      action: "exec",
+      session_id: "ssh-session-1",
+      session_strategy: "new",
+      command: "pwd",
+    }),
+  );
+  assert.equal(result.isError, true);
+  assert.match(result.content[0].text, /cannot be combined/);
+  assert.deepEqual(invocations, []);
+});
+
+test("SshManager validates current project sessions before SFTP actions", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_list") {
+            return { sessions: [createSshSession()] };
+          }
+          if (command === "sftp_list") {
+            return { path: ".", entries: [] };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({
+      action: "sftp_list",
+      session_id: "ssh-session-1",
+      path: "/var/log",
+    }),
+  );
+  assert.equal(result.isError, false);
+  assert.deepEqual(invocations, [
+    {
+      command: "terminal_list",
+      args: { project_path_key: "/workspace" },
+    },
+    {
+      command: "sftp_list",
+      args: {
+        session_id: "ssh-session-1",
+        project_path_key: "/workspace",
+        workdir: "/workspace",
+        side: "remote",
+        path: "/var/log",
+      },
+    },
+  ]);
+});
+
+test("SshManager SFTP actions reuse SFTP-enabled host sessions", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_list") {
+            return {
+              sessions: [
+                createSshSession({
+                  id: "ssh-no-sftp",
+                  ssh: { ...createSshSession().ssh, sftpEnabled: false },
+                }),
+                createSshSession({
+                  id: "ssh-sftp-reused",
+                  ssh: { ...createSshSession().ssh, sftpEnabled: true },
+                }),
+              ],
+            };
+          }
+          if (command === "sftp_list") {
+            return { path: "/tmp", entries: [] };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({
+      action: "sftp_list",
+      host_id: "host-1",
+      path: "/tmp",
+    }),
+  );
+  assert.equal(result.isError, false);
+  assert.deepEqual(
+    invocations.map((call) => call.command),
+    ["terminal_list", "sftp_list"],
+  );
+  assert.equal(invocations[1].args.session_id, "ssh-sftp-reused");
+  assert.equal(result.details.session_reused, true);
+  assert.equal(result.details.session_created, false);
+});
+
+test("SshManager SFTP actions create a new session when no SFTP-enabled session exists", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_list") {
+            return {
+              sessions: [
+                createSshSession({
+                  id: "ssh-no-sftp",
+                  ssh: { ...createSshSession().ssh, sftpEnabled: false },
+                }),
+              ],
+            };
+          }
+          if (command === "terminal_create_ssh") {
+            return {
+              session: createSshSession({ id: "ssh-created-for-sftp" }),
+              output: "",
+              truncated: false,
+            };
+          }
+          if (command === "sftp_stat") {
+            return { path: "/tmp", kind: "dir" };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({
+      action: "sftp_stat",
+      host_id: "host-1",
+      path: "/tmp",
+    }),
+  );
+  assert.equal(result.isError, false);
+  assert.deepEqual(
+    invocations.map((call) => call.command),
+    ["terminal_list", "terminal_create_ssh", "sftp_stat"],
+  );
+  assert.equal(invocations[1].args.sftp_enabled, true);
+  assert.equal(invocations[2].args.session_id, "ssh-created-for-sftp");
+  assert.equal(result.details.session_reused, false);
+  assert.equal(result.details.session_created, true);
+});
+
+test("SshManager SFTP actions can intentionally create an additional SFTP-enabled session", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_create_ssh") {
+            return {
+              session: createSshSession({
+                id: "ssh-extra-sftp",
+                title: args.title,
+              }),
+              output: "",
+              truncated: false,
+            };
+          }
+          if (command === "sftp_list") {
+            return { path: "/var", entries: [] };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const result = await bundle.executeToolCall(
+    createToolCall({
+      action: "sftp_list",
+      host_id: "host-1",
+      session_strategy: "new",
+      title: "isolated sftp",
+      path: "/var",
+    }),
+  );
+  assert.equal(result.isError, false);
+  assert.deepEqual(
+    invocations.map((call) => call.command),
+    ["terminal_create_ssh", "sftp_list"],
+  );
+  assert.equal(invocations[0].args.title, "isolated sftp");
+  assert.equal(invocations[0].args.sftp_enabled, true);
+  assert.equal(invocations[1].args.session_id, "ssh-extra-sftp");
+  assert.equal(result.details.session_strategy, "new");
+  assert.equal(result.details.session_reused, false);
+  assert.equal(result.details.session_created, true);
+});
+
+test("SshManager rejects unauthorized hosts and cross-project sessions before invoking actions", async () => {
+  const invocations = [];
+  const loader = createTsModuleLoader({
+    mocks: {
+      "@tauri-apps/api/core": {
+        async invoke(command, args) {
+          invocations.push({ command, args });
+          if (command === "terminal_list") {
+            return {
+              sessions: [
+                createSshSession({
+                  id: "other-session",
+                  ssh: { ...createSshSession().ssh, hostId: "other-host" },
+                }),
+              ],
+            };
+          }
+          throw new Error(`unexpected invoke ${command}`);
+        },
+      },
+    },
+  });
+  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSshManagerTools({
+    enabled: true,
+    runtimeScope: "chat",
+    workdir: "/workspace",
+    projectPathKey: "/workspace",
+    hosts: [SSH_HOST],
+    associatedHostIds: ["host-1"],
+  });
+
+  const hostResult = await bundle.executeToolCall(
+    createToolCall({ action: "exec", host_id: "other-host", command: "id" }),
+  );
+  assert.equal(hostResult.isError, true);
+  assert.match(hostResult.content[0].text, /not associated/);
+
+  const sessionResult = await bundle.executeToolCall(
+    createToolCall({ action: "read_session", session_id: "other-session" }),
+  );
+  assert.equal(sessionResult.isError, true);
+  assert.match(sessionResult.content[0].text, /not authorized|not found/);
+  assert.deepEqual(invocations, [
+    {
+      command: "terminal_list",
+      args: { project_path_key: "/workspace" },
+    },
+  ]);
+});

From 027e40789b8197d32aec243d728d1d1d5158e926 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 20:14:57 +0800
Subject: [PATCH 09/28] fix(chat): hide horizontal composer overflow

---
 crates/agent-gui/src/components/chat/MentionComposer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/agent-gui/src/components/chat/MentionComposer.tsx b/crates/agent-gui/src/components/chat/MentionComposer.tsx
index 38b3668df..83600cddc 100644
--- a/crates/agent-gui/src/components/chat/MentionComposer.tsx
+++ b/crates/agent-gui/src/components/chat/MentionComposer.tsx
@@ -2656,7 +2656,7 @@ export const MentionComposer = memo(
           onCompositionEnd={handleCompositionEnd}
           onBlur={handleBlur}
           className={cn(
-            "mention-composer min-h-[70px] max-h-[160px] w-full min-w-0 max-w-full overflow-y-auto whitespace-pre-wrap break-words [overflow-wrap:anywhere] outline-hidden",
+            "mention-composer min-h-[70px] max-h-[160px] w-full min-w-0 max-w-full overflow-x-hidden overflow-y-auto whitespace-pre-wrap break-words [overflow-wrap:anywhere] outline-hidden",
             "text-sm",
             isEmpty && "is-empty",
             disabled && "cursor-not-allowed opacity-60",

From 9a707950384f6dd33ae0501286293d5fe29a5d10 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 22:13:45 +0800
Subject: [PATCH 10/28] fix(ssh): prevent prompting for saved SSH credentials

---
 .../web/src/pages/chat/AssistantBubble.tsx    |  6 ++
 .../src-tauri/src/services/gateway_bridge.rs  |  1 +
 .../src/lib/tools/builtinRegistry.ts          |  4 +-
 .../src/lib/tools/sshManagerTools.ts          | 96 +++++++++++--------
 .../src/pages/chat/AssistantBubble.tsx        |  5 +
 .../test/tools/ssh-manager-tools.test.mjs     | 94 +++++++++---------
 6 files changed, 118 insertions(+), 88 deletions(-)

diff --git a/crates/agent-gateway/web/src/pages/chat/AssistantBubble.tsx b/crates/agent-gateway/web/src/pages/chat/AssistantBubble.tsx
index df5190a31..71770f29d 100644
--- a/crates/agent-gateway/web/src/pages/chat/AssistantBubble.tsx
+++ b/crates/agent-gateway/web/src/pages/chat/AssistantBubble.tsx
@@ -13,6 +13,7 @@ import {
   Loader2,
   Plug,
   Search,
+  Server,
   Sparkles,
   Terminal,
   Trash2,
@@ -488,6 +489,8 @@ function getToolMeta(name: string): { Icon: IconComponent; accent: string; categ
     case "SkillsManager": return { Icon: Eye,  accent: "var(--tool-file-accent)",   category: "file" };
     case "MemoryManager": return { Icon: Brain, accent: "var(--tool-list-accent)",   category: "system" };
     case "McpManager": return { Icon: Plug,     accent: "var(--tool-list-accent)",   category: "mcp" };
+    case "SSHManager":
+    case "SshManager": return { Icon: Server,   accent: "var(--tool-bash-accent)",   category: "terminal" };
     case "Agent":  return { Icon: Bot,         accent: "var(--tool-list-accent)",   category: "system" };
     case "SendMessage": return { Icon: Bot,     accent: "var(--tool-list-accent)",   category: "system" };
     case "Write":  return { Icon: FileText,    accent: "var(--tool-file-accent)",   category: "file" };
@@ -659,6 +662,7 @@ function isAgentToolName(name: string) {
 }
 
 function getToolDisplayName(name: string) {
+  if (name === "SshManager") return "SSHManager";
   return name;
 }
 
@@ -2344,6 +2348,8 @@ function isBuiltinShareToolName(name: string) {
     "MemoryManager",
     "Read",
     "SkillsManager",
+    "SSHManager",
+    "SshManager",
     "Write",
   ].includes(trimmed);
 }
diff --git a/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs b/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs
index afdf8e234..000a6111e 100644
--- a/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs
+++ b/crates/agent-gui/src-tauri/src/services/gateway_bridge.rs
@@ -920,6 +920,7 @@ fn is_builtin_share_tool_name(name: &str) -> bool {
             | "MemoryManager"
             | "Read"
             | "SkillsManager"
+            | "SSHManager"
             | "SshManager"
             | "Write"
     )
diff --git a/crates/agent-gui/src/lib/tools/builtinRegistry.ts b/crates/agent-gui/src/lib/tools/builtinRegistry.ts
index 0b76f1ca7..a53e8fd7f 100644
--- a/crates/agent-gui/src/lib/tools/builtinRegistry.ts
+++ b/crates/agent-gui/src/lib/tools/builtinRegistry.ts
@@ -31,7 +31,7 @@ import { createMcpManagerTools } from "./mcpManagerTools";
 import { createMcpTools } from "./mcpTools";
 import { createMemoryTools } from "./memoryTools";
 import { createShellTools } from "./shellTools";
-import { createSshManagerTools } from "./sshManagerTools";
+import { createSSHManagerTools } from "./sshManagerTools";
 import type { SystemToolId, SystemToolRuntimeScope } from "./systemToolOptions";
 import type { SkillAccessPolicy } from "./skillAccessPolicy";
 import { createSkillTools } from "./skillTools";
@@ -249,7 +249,7 @@ async function buildBaseBuiltinToolBundles(params: BuildBuiltinBaseToolRegistryP
       projectPathKey: params.tunnelProjectPathKey,
       onTunnelsChanged: params.onTunnelsChanged,
     }),
-    createSshManagerTools({
+    createSSHManagerTools({
       enabled:
         params.runtimeScope === "chat" &&
         params.sshManagerRemoteAllowed !== false &&
diff --git a/crates/agent-gui/src/lib/tools/sshManagerTools.ts b/crates/agent-gui/src/lib/tools/sshManagerTools.ts
index f5621e307..17ee7146d 100644
--- a/crates/agent-gui/src/lib/tools/sshManagerTools.ts
+++ b/crates/agent-gui/src/lib/tools/sshManagerTools.ts
@@ -5,7 +5,7 @@ import { Type } from "typebox";
 import type { SshHostConfig } from "../settings";
 import { type BuiltinToolBundle, createBuiltinMetadataMap } from "./builtinTypes";
 
-type SshManagerAction =
+type SSHManagerAction =
   | "list_hosts"
   | "list_sessions"
   | "create_session"
@@ -94,9 +94,9 @@ type ResolvedSshSession = {
 };
 
 const SSH_MANAGER_TOOL: Tool = {
-  name: "SshManager",
+  name: "SSHManager",
   description:
-    "Manage SSH sessions and remote SFTP files for SSH hosts explicitly associated with the current project. Use host_id from list_hosts. Default session strategy is reuse_or_create: exec and SFTP reuse the same running session for that host before LiveAgent creates a visible session. To intentionally run multiple SSH sessions, call create_session or set session_strategy=\"new\", then use the returned session_id for follow-up operations. Use session_strategy=\"require_existing\" when you want to fail instead of implicitly creating a session. Do not combine session_id with session_strategy=\"new\". Authentication prompts, unknown host keys, changed host keys, and MFA must be completed by the user in the SSH Tunnel tab before retrying.",
+    'Manage SSH sessions and remote SFTP files for SSH hosts explicitly associated with the current project. Use host_id from list_hosts. If list_hosts reports credential=saved, LiveAgent already has the configured password/private key/passphrase; do not ask the user to paste credentials into chat, and call create_session, exec, or SFTP actions directly. If list_hosts reports credential=missing, ask the user to configure credentials in Settings > SSH instead of requesting secrets in chat. Default session strategy is reuse_or_create: exec and SFTP reuse the same running session for that host before LiveAgent creates a visible session. To intentionally run multiple SSH sessions, call create_session or set session_strategy="new", then use the returned session_id for follow-up operations. Use session_strategy="require_existing" when you want to fail instead of implicitly creating a session. Do not combine session_id with session_strategy="new". Authentication prompts, unknown host keys, changed host keys, and MFA must be completed by the user in the SSH Tunnel tab before retrying.',
   parameters: Type.Object({
     action: Type.Union(
       [
@@ -135,11 +135,7 @@ const SSH_MANAGER_TOOL: Tool = {
     ),
     session_strategy: Type.Optional(
       Type.Union(
-        [
-          Type.Literal("reuse_or_create"),
-          Type.Literal("new"),
-          Type.Literal("require_existing"),
-        ],
+        [Type.Literal("reuse_or_create"), Type.Literal("new"), Type.Literal("require_existing")],
         {
           description:
             'Session resolution strategy for exec and SFTP actions when session_id is omitted. Defaults to "reuse_or_create". Use "new" only when an additional SSH session is intentional; use "require_existing" to avoid implicit creation.',
@@ -155,12 +151,12 @@ const SSH_MANAGER_TOOL: Tool = {
       }),
     ),
     data: Type.Optional(
-      Type.String({ description: "Raw PTY input for send_input, including newlines/control chars." }),
+      Type.String({
+        description: "Raw PTY input for send_input, including newlines/control chars.",
+      }),
     ),
     command: Type.Optional(Type.String({ description: "Remote command for exec." })),
-    cwd: Type.Optional(
-      Type.String({ description: "Optional remote working directory for exec." }),
-    ),
+    cwd: Type.Optional(Type.String({ description: "Optional remote working directory for exec." })),
     timeout_ms: Type.Optional(Type.Number({ description: "Exec timeout in milliseconds." })),
     max_bytes: Type.Optional(Type.Number({ description: "Maximum captured bytes for output." })),
     path: Type.Optional(Type.String({ description: "Remote SFTP path." })),
@@ -191,9 +187,9 @@ function asErrorMessage(err: unknown) {
   return err instanceof Error ? err.message : String(err);
 }
 
-function normalizeAction(value: unknown): SshManagerAction {
+function normalizeAction(value: unknown): SSHManagerAction {
   const action = typeof value === "string" ? value.trim() : "";
-  const actions = new Set<SshManagerAction>([
+  const actions = new Set<SSHManagerAction>([
     "list_hosts",
     "list_sessions",
     "create_session",
@@ -214,10 +210,10 @@ function normalizeAction(value: unknown): SshManagerAction {
     "sftp_transfer_status",
     "sftp_cancel_transfer",
   ]);
-  if (actions.has(action as SshManagerAction)) {
-    return action as SshManagerAction;
+  if (actions.has(action as SSHManagerAction)) {
+    return action as SSHManagerAction;
   }
-  throw new Error("SshManager.action is invalid.");
+  throw new Error("SSHManager.action is invalid.");
 }
 
 function normalizeOptionalString(value: unknown) {
@@ -227,7 +223,7 @@ function normalizeOptionalString(value: unknown) {
 function requireString(args: Record<string, unknown>, key: string) {
   const value = normalizeOptionalString(args[key]);
   if (!value) {
-    throw new Error(`SshManager.${key} is required.`);
+    throw new Error(`SSHManager.${key} is required.`);
   }
   return value;
 }
@@ -252,14 +248,10 @@ function normalizeBool(value: unknown, fallback: boolean) {
 function normalizeSessionStrategy(value: unknown): SshSessionStrategy {
   const strategy = typeof value === "string" ? value.trim() : "";
   if (!strategy) return "reuse_or_create";
-  if (
-    strategy === "reuse_or_create" ||
-    strategy === "new" ||
-    strategy === "require_existing"
-  ) {
+  if (strategy === "reuse_or_create" || strategy === "new" || strategy === "require_existing") {
     return strategy;
   }
-  throw new Error("SshManager.session_strategy is invalid.");
+  throw new Error("SSHManager.session_strategy is invalid.");
 }
 
 function normalizeSession(input: RawTerminalSession): SshSessionSummary | null {
@@ -279,7 +271,19 @@ function normalizeSession(input: RawTerminalSession): SshSessionSummary | null {
   };
 }
 
+function hostCredentialConfigured(host: SshHostConfig) {
+  if (host.authType === "privateKey") {
+    return (
+      host.privateKey.trim().length > 0 ||
+      host.privateKeyPath.trim().length > 0 ||
+      host.privateKeyConfigured === true
+    );
+  }
+  return host.password.trim().length > 0 || host.passwordConfigured === true;
+}
+
 function hostSummary(host: SshHostConfig) {
+  const credentialConfigured = hostCredentialConfigured(host);
   return {
     host_id: host.id,
     name: host.name,
@@ -288,11 +292,13 @@ function hostSummary(host: SshHostConfig) {
     host: host.host,
     port: host.port || 22,
     authType: host.authType,
+    credentialConfigured,
+    credentialStatus: credentialConfigured ? "saved" : "missing",
   };
 }
 
 function formatHostLine(host: ReturnType<typeof hostSummary>) {
-  return `- ${host.host_id} · ${host.name || host.endpoint} · ${host.endpoint} · auth=${host.authType}`;
+  return `- ${host.host_id} · ${host.name || host.endpoint} · ${host.endpoint} · auth=${host.authType} · credential=${host.credentialStatus}`;
 }
 
 function formatSessionLine(session: SshSessionSummary) {
@@ -305,7 +311,7 @@ function promptErrorMessage() {
 
 function okResult(params: {
   toolCall: ToolCall;
-  action: SshManagerAction;
+  action: SSHManagerAction;
   text: string;
   details?: Record<string, unknown>;
 }): ToolResultMessage {
@@ -326,14 +332,14 @@ function okResult(params: {
 
 function errorResult(
   toolCall: ToolCall,
-  action: SshManagerAction,
+  action: SSHManagerAction,
   message: string,
 ): ToolResultMessage {
   return {
     role: "toolResult",
     toolCallId: toolCall.id,
     toolName: toolCall.name,
-    content: [{ type: "text", text: `SshManager failed: ${message}` }],
+    content: [{ type: "text", text: `SSHManager failed: ${message}` }],
     details: {
       kind: "ssh_manager",
       action,
@@ -356,9 +362,7 @@ async function listProjectSessions(projectPathKey: string) {
 function createAllowedHostMap(hosts: SshHostConfig[], associatedHostIds: readonly string[]) {
   const allowedIds = new Set(associatedHostIds.map((id) => id.trim()).filter(Boolean));
   return new Map(
-    hosts
-      .filter((host) => allowedIds.has(host.id))
-      .map((host) => [host.id, host] as const),
+    hosts.filter((host) => allowedIds.has(host.id)).map((host) => [host.id, host] as const),
   );
 }
 
@@ -450,7 +454,7 @@ async function resolveSession(params: {
   const strategy = normalizeSessionStrategy(params.args.session_strategy);
   if (sessionId) {
     if (strategy === "new") {
-      throw new Error("SshManager.session_strategy=new cannot be combined with session_id.");
+      throw new Error("SSHManager.session_strategy=new cannot be combined with session_id.");
     }
     const session = await validateSession({
       sessionId,
@@ -484,13 +488,13 @@ async function resolveSession(params: {
     projectPathKey: params.projectPathKey,
     title:
       normalizeOptionalString(params.args.title) ||
-      `SshManager: ${host.name || host.host || host.id}`,
+      `SSHManager: ${host.name || host.host || host.id}`,
     sftpEnabled: true,
   });
   return { session, reused: false, created: true, strategy };
 }
 
-async function executeSshManager(
+async function executeSSHManager(
   toolCall: ToolCall,
   params: {
     workdir: string;
@@ -501,7 +505,7 @@ async function executeSshManager(
   signal?: AbortSignal,
 ): Promise<ToolResultMessage> {
   const args = asArgs(toolCall.arguments);
-  let action: SshManagerAction = "list_hosts";
+  let action: SSHManagerAction = "list_hosts";
   try {
     if (signal?.aborted) {
       return errorResult(toolCall, action, "Cancelled");
@@ -521,7 +525,13 @@ async function executeSshManager(
       return okResult({
         toolCall,
         action,
-        text: hosts.length ? ["Authorized SSH hosts:", ...hosts.map(formatHostLine)].join("\n") : "No authorized SSH hosts.",
+        text: hosts.length
+          ? [
+              "Authorized SSH hosts:",
+              "credential=saved means LiveAgent already has the configured SSH credential; use create_session directly and do not ask the user for that password/key.",
+              ...hosts.map(formatHostLine),
+            ].join("\n")
+          : "No authorized SSH hosts.",
         details: { hosts },
       });
     }
@@ -608,7 +618,7 @@ async function executeSshManager(
       });
       const data = typeof args.data === "string" ? args.data : "";
       if (data.length === 0) {
-        throw new Error("SshManager.data is required.");
+        throw new Error("SSHManager.data is required.");
       }
       await invoke("terminal_input", { session_id: session.session_id, data });
       return okResult({
@@ -850,7 +860,11 @@ async function executeSshManager(
         project_path_key: params.projectPathKey,
         path: requireString(args, "path"),
         offset: normalizeOptionalPositiveInt(args.offset, 0, Number.MAX_SAFE_INTEGER),
-        max_bytes: normalizeOptionalPositiveInt(args.limit ?? args.max_bytes, 4 * 1024, 1024 * 1024),
+        max_bytes: normalizeOptionalPositiveInt(
+          args.limit ?? args.max_bytes,
+          4 * 1024,
+          1024 * 1024,
+        ),
       });
       return okResult({
         toolCall,
@@ -889,13 +903,13 @@ async function executeSshManager(
       });
     }
 
-    throw new Error("Unsupported SshManager action.");
+    throw new Error("Unsupported SSHManager action.");
   } catch (err) {
     return errorResult(toolCall, action, asErrorMessage(err));
   }
 }
 
-export function createSshManagerTools(params: {
+export function createSSHManagerTools(params: {
   enabled: boolean;
   runtimeScope: "chat" | "cron_auto_prompt";
   workdir: string;
@@ -918,7 +932,7 @@ export function createSshManagerTools(params: {
     groupId: "system",
     tools,
     executeToolCall: (toolCall, signal) =>
-      executeSshManager(
+      executeSSHManager(
         toolCall,
         {
           workdir: params.workdir,
diff --git a/crates/agent-gui/src/pages/chat/AssistantBubble.tsx b/crates/agent-gui/src/pages/chat/AssistantBubble.tsx
index 215bce9ed..5f4762ee8 100644
--- a/crates/agent-gui/src/pages/chat/AssistantBubble.tsx
+++ b/crates/agent-gui/src/pages/chat/AssistantBubble.tsx
@@ -17,6 +17,7 @@ import {
   Loader2,
   Plug,
   Search,
+  Server,
   Sparkles,
   Terminal,
   Trash2,
@@ -473,6 +474,9 @@ function getToolMeta(name: string): { Icon: IconComponent; accent: string; categ
       return { Icon: Brain, accent: "var(--tool-list-accent)", category: "system" };
     case "McpManager":
       return { Icon: Plug, accent: "var(--tool-list-accent)", category: "mcp" };
+    case "SSHManager":
+    case "SshManager":
+      return { Icon: Server, accent: "var(--tool-bash-accent)", category: "terminal" };
     case "Agent":
       return { Icon: Bot, accent: "var(--tool-list-accent)", category: "system" };
     case "SendMessage":
@@ -654,6 +658,7 @@ function isAgentToolName(name: string) {
 }
 
 function getToolDisplayName(name: string) {
+  if (name === "SshManager") return "SSHManager";
   return name;
 }
 
diff --git a/crates/agent-gui/test/tools/ssh-manager-tools.test.mjs b/crates/agent-gui/test/tools/ssh-manager-tools.test.mjs
index fa8487d59..13756278f 100644
--- a/crates/agent-gui/test/tools/ssh-manager-tools.test.mjs
+++ b/crates/agent-gui/test/tools/ssh-manager-tools.test.mjs
@@ -27,7 +27,7 @@ function createToolCall(args) {
   return {
     type: "toolCall",
     id: "call-ssh",
-    name: "SshManager",
+    name: "SSHManager",
     arguments: args,
   };
 }
@@ -38,7 +38,7 @@ function createSshSession(overrides = {}) {
     projectPathKey: "/workspace",
     cwd: "/workspace",
     shell: "ssh",
-    title: "SshManager: Prod",
+    title: "SSHManager: Prod",
     kind: "ssh",
     ssh: {
       hostId: "host-1",
@@ -79,18 +79,18 @@ async function buildRegistry(params = {}) {
   });
 }
 
-test("SshManager is auto-registered by project hosts, runtime, and remote switch", async () => {
+test("SSHManager is auto-registered by project hosts, runtime, and remote switch", async () => {
   const registry = await buildRegistry();
-  assert.equal(registry.hasTool("SshManager"), true);
-  assert.equal(registry.metadataByName.get("SshManager").kind, "ssh_manager");
-  assert.equal(registry.metadataByName.get("SshManager").displayCategory, "terminal");
+  assert.equal(registry.hasTool("SSHManager"), true);
+  assert.equal(registry.metadataByName.get("SSHManager").kind, "ssh_manager");
+  assert.equal(registry.metadataByName.get("SSHManager").displayCategory, "terminal");
 
   assert.equal(
     (
       await buildRegistry({
         associatedSshHostIds: [],
       })
-    ).hasTool("SshManager"),
+    ).hasTool("SSHManager"),
     false,
   );
 
@@ -99,7 +99,7 @@ test("SshManager is auto-registered by project hosts, runtime, and remote switch
       await buildRegistry({
         runtimeScope: "cron_auto_prompt",
       })
-    ).hasTool("SshManager"),
+    ).hasTool("SSHManager"),
     false,
   );
 
@@ -108,15 +108,15 @@ test("SshManager is auto-registered by project hosts, runtime, and remote switch
       await buildRegistry({
         sshManagerRemoteAllowed: false,
       })
-    ).hasTool("SshManager"),
+    ).hasTool("SSHManager"),
     false,
   );
 });
 
-test("SshManager list_hosts redacts configured secrets", async () => {
+test("SSHManager list_hosts redacts configured secrets", async () => {
   const loader = createTsModuleLoader();
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -136,13 +136,17 @@ test("SshManager list_hosts redacts configured secrets", async () => {
       host: "ssh.example.test",
       port: 22,
       authType: "privateKey",
+      credentialConfigured: true,
+      credentialStatus: "saved",
     },
   ]);
   assert.doesNotMatch(result.content[0].text, /secret|privateKeyPath|passphrase/i);
+  assert.match(result.content[0].text, /credential=saved/);
+  assert.match(result.content[0].text, /do not ask the user/i);
   assert.equal(JSON.stringify(result.details).includes("secret"), false);
 });
 
-test("SshManager create_session defaults SFTP on and refuses SSH prompts", async () => {
+test("SSHManager create_session defaults SFTP on and refuses SSH prompts", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -157,8 +161,8 @@ test("SshManager create_session defaults SFTP on and refuses SSH prompts", async
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -188,7 +192,7 @@ test("SshManager create_session defaults SFTP on and refuses SSH prompts", async
   ]);
 });
 
-test("SshManager exec auto-creates a visible session before running command", async () => {
+test("SSHManager exec auto-creates a visible session before running command", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -217,8 +221,8 @@ test("SshManager exec auto-creates a visible session before running command", as
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -249,7 +253,7 @@ test("SshManager exec auto-creates a visible session before running command", as
   assert.equal(result.details.session_created, true);
 });
 
-test("SshManager exec reuses an existing running SSH session for the same host", async () => {
+test("SSHManager exec reuses an existing running SSH session for the same host", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -292,8 +296,8 @@ test("SshManager exec reuses an existing running SSH session for the same host",
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -321,7 +325,7 @@ test("SshManager exec reuses an existing running SSH session for the same host",
   assert.equal(result.details.session_created, false);
 });
 
-test("SshManager exec can intentionally create an additional SSH session", async () => {
+test("SSHManager exec can intentionally create an additional SSH session", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -353,8 +357,8 @@ test("SshManager exec can intentionally create an additional SSH session", async
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -384,7 +388,7 @@ test("SshManager exec can intentionally create an additional SSH session", async
   assert.equal(result.details.session_created, true);
 });
 
-test("SshManager can require an existing session without implicitly creating one", async () => {
+test("SSHManager can require an existing session without implicitly creating one", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -399,8 +403,8 @@ test("SshManager can require an existing session without implicitly creating one
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -427,7 +431,7 @@ test("SshManager can require an existing session without implicitly creating one
   ]);
 });
 
-test("SshManager rejects conflicting session_id and new session strategy", async () => {
+test("SSHManager rejects conflicting session_id and new session strategy", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -439,8 +443,8 @@ test("SshManager rejects conflicting session_id and new session strategy", async
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -462,7 +466,7 @@ test("SshManager rejects conflicting session_id and new session strategy", async
   assert.deepEqual(invocations, []);
 });
 
-test("SshManager validates current project sessions before SFTP actions", async () => {
+test("SSHManager validates current project sessions before SFTP actions", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -480,8 +484,8 @@ test("SshManager validates current project sessions before SFTP actions", async
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -516,7 +520,7 @@ test("SshManager validates current project sessions before SFTP actions", async
   ]);
 });
 
-test("SshManager SFTP actions reuse SFTP-enabled host sessions", async () => {
+test("SSHManager SFTP actions reuse SFTP-enabled host sessions", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -545,8 +549,8 @@ test("SshManager SFTP actions reuse SFTP-enabled host sessions", async () => {
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -572,7 +576,7 @@ test("SshManager SFTP actions reuse SFTP-enabled host sessions", async () => {
   assert.equal(result.details.session_created, false);
 });
 
-test("SshManager SFTP actions create a new session when no SFTP-enabled session exists", async () => {
+test("SSHManager SFTP actions create a new session when no SFTP-enabled session exists", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -604,8 +608,8 @@ test("SshManager SFTP actions create a new session when no SFTP-enabled session
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -632,7 +636,7 @@ test("SshManager SFTP actions create a new session when no SFTP-enabled session
   assert.equal(result.details.session_created, true);
 });
 
-test("SshManager SFTP actions can intentionally create an additional SFTP-enabled session", async () => {
+test("SSHManager SFTP actions can intentionally create an additional SFTP-enabled session", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -657,8 +661,8 @@ test("SshManager SFTP actions can intentionally create an additional SFTP-enable
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",
@@ -689,7 +693,7 @@ test("SshManager SFTP actions can intentionally create an additional SFTP-enable
   assert.equal(result.details.session_created, true);
 });
 
-test("SshManager rejects unauthorized hosts and cross-project sessions before invoking actions", async () => {
+test("SSHManager rejects unauthorized hosts and cross-project sessions before invoking actions", async () => {
   const invocations = [];
   const loader = createTsModuleLoader({
     mocks: {
@@ -711,8 +715,8 @@ test("SshManager rejects unauthorized hosts and cross-project sessions before in
       },
     },
   });
-  const { createSshManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
-  const bundle = createSshManagerTools({
+  const { createSSHManagerTools } = loader.loadModule("src/lib/tools/sshManagerTools.ts");
+  const bundle = createSSHManagerTools({
     enabled: true,
     runtimeScope: "chat",
     workdir: "/workspace",

From 33cb61abb54e4526aea9edc8a584318e9f8c6de2 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 22:13:49 +0800
Subject: [PATCH 11/28] fix(webui): wake stale desktop chat runtime

---
 .../server/websocket_chat_handlers.go         |  4 -
 .../test/websocket/chat_bridge_test.go        | 34 +++++---
 crates/agent-gateway/web/src/App.tsx          | 78 +++++++++++++++++--
 .../pages/chat/useGatewayBridgeListeners.ts   |  6 +-
 4 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/crates/agent-gateway/internal/server/websocket_chat_handlers.go b/crates/agent-gateway/internal/server/websocket_chat_handlers.go
index 63abbea85..bd30d4a8f 100644
--- a/crates/agent-gateway/internal/server/websocket_chat_handlers.go
+++ b/crates/agent-gateway/internal/server/websocket_chat_handlers.go
@@ -40,10 +40,6 @@ func (c *websocketConnection) handleChatStart(req websocketRequest) {
 		_ = c.writeError(req.ID, "agent offline")
 		return
 	}
-	if !status.ChatRuntimeReady {
-		_ = c.writeError(req.ID, "Desktop chat runtime is not ready. Please retry.")
-		return
-	}
 
 	snapshot, created, err := c.sm.StartPendingChatRunWithClientRequest(
 		req.ID,
diff --git a/crates/agent-gateway/test/websocket/chat_bridge_test.go b/crates/agent-gateway/test/websocket/chat_bridge_test.go
index f644ad2c3..b6e9e192e 100644
--- a/crates/agent-gateway/test/websocket/chat_bridge_test.go
+++ b/crates/agent-gateway/test/websocket/chat_bridge_test.go
@@ -318,7 +318,7 @@ func TestWebSocketChatStartForwardsNormalizedRequestAndStreamsEvents(t *testing.
 	}
 }
 
-func TestWebSocketChatStartRequiresRuntimeReady(t *testing.T) {
+func TestWebSocketChatStartWakesRuntimeWhenHeartbeatIsStale(t *testing.T) {
 	t.Parallel()
 
 	sm := session.NewManager()
@@ -339,19 +339,29 @@ func TestWebSocketChatStartRequiresRuntimeReady(t *testing.T) {
 		"message":         "hello gateway",
 	})
 
-	env := receiveEnvelope(t, conn)
-	if env.ID != "chat-not-ready" ||
-		env.Type != "error" ||
-		!strings.Contains(env.Error, "Desktop chat runtime is not ready") {
-		t.Fatalf("not-ready response = %#v, want chat runtime readiness error", env)
+	outbound := readOutboundEnvelope(t, agentSession)
+	if outbound.GetRequestId() != "chat-not-ready" {
+		t.Fatalf("outbound request id = %q, want chat-not-ready", outbound.GetRequestId())
 	}
-	select {
-	case outbound := <-agentSession.Outbound():
-		t.Fatalf("unexpected outbound request while runtime not ready: %#v", outbound)
-	case <-time.After(100 * time.Millisecond):
+	request := outbound.GetChatRequest()
+	if request == nil || request.GetMessage() != "hello gateway" {
+		t.Fatalf("outbound chat request = %#v", request)
 	}
-	if got := sm.ActiveChatRunConversationIDs(); len(got) != 0 {
-		t.Fatalf("active chat runs after not-ready request = %#v, want empty", got)
+
+	sm.DispatchFromAgent(&gatewayv1.AgentEnvelope{
+		RequestId: "chat-not-ready",
+		Timestamp: time.Now().Unix(),
+		Payload: &gatewayv1.AgentEnvelope_ChatEvent{
+			ChatEvent: &gatewayv1.ChatEvent{
+				Type:           gatewayv1.ChatEvent_DONE,
+				ConversationId: "conversation-not-ready",
+				Data:           `{"type":"done"}`,
+			},
+		},
+	})
+	done := receiveEnvelopeWithID(t, conn, "chat-not-ready")
+	if done.Type != "chat.event" {
+		t.Fatalf("done envelope = %#v, want chat.event", done)
 	}
 }
 
diff --git a/crates/agent-gateway/web/src/App.tsx b/crates/agent-gateway/web/src/App.tsx
index a215f7abe..7bb96d7ee 100644
--- a/crates/agent-gateway/web/src/App.tsx
+++ b/crates/agent-gateway/web/src/App.tsx
@@ -400,6 +400,9 @@ const LIVE_STREAM_HISTORY_REFRESH_SUPPRESS_MS = 30_000;
 const PAGE_RESTORE_HISTORY_REFRESH_THROTTLE_MS = 900;
 const CHAT_RUNTIME_PREPARE_TIMEOUT_MS = 2_500;
 const CHAT_RUNTIME_FOREGROUND_PREPARE_TIMEOUT_MS = 1_500;
+const CHAT_RUNTIME_KEEP_WARM_INTERVAL_MS = 10_000;
+const CHAT_RUNTIME_STARTING_STATUS_DELAY_MS = 1_200;
+const CHAT_RUNTIME_STARTING_STATUS = "Starting desktop runtime...";
 const DEFAULT_BROWSER_TITLE = "LiveAgent Gateway";
 const NEW_CONVERSATION_BROWSER_TITLE = "LiveAgent";
 const SHARED_HISTORY_BROWSER_TITLE = "分享会话";
@@ -4253,6 +4256,32 @@ export default function App() {
     };
   }, [api, historyShareToken, prepareChatRuntime, status?.online]);
 
+  useEffect(() => {
+    if (!api || historyShareToken || status?.online !== true) {
+      return;
+    }
+
+    const keepWarm = () => {
+      if (
+        typeof document !== "undefined" &&
+        document.visibilityState === "hidden"
+      ) {
+        return;
+      }
+      void prepareChatRuntime(
+        "keep-warm",
+        api,
+        CHAT_RUNTIME_FOREGROUND_PREPARE_TIMEOUT_MS,
+      ).catch(() => undefined);
+    };
+
+    keepWarm();
+    const intervalId = window.setInterval(keepWarm, CHAT_RUNTIME_KEEP_WARM_INTERVAL_MS);
+    return () => {
+      window.clearInterval(intervalId);
+    };
+  }, [api, historyShareToken, prepareChatRuntime, status?.online]);
+
   async function sendChat(message: string, options?: SendChatOptions) {
     if (!api || chatBusyRef.current) {
       return;
@@ -4329,7 +4358,7 @@ export default function App() {
     updateConversationRuntimeEntry(activeConversationId, (current) => ({
       ...current,
       error: null,
-      toolStatus: "Starting desktop runtime...",
+      toolStatus: null,
       toolStatusIsCompaction: false,
       isSending: true,
       workdir: effectiveWorkdir || undefined,
@@ -4365,12 +4394,31 @@ export default function App() {
 
     let terminalEventSeen = false;
     let runStarted = false;
+    let runtimeStartingStatusTimer: number | null = null;
+    const clearRuntimeStartingStatusTimer = () => {
+      if (runtimeStartingStatusTimer === null) {
+        return;
+      }
+      window.clearTimeout(runtimeStartingStatusTimer);
+      runtimeStartingStatusTimer = null;
+    };
     const markRunStarted = () => {
       if (runStarted) {
         return;
       }
       runStarted = true;
+      clearRuntimeStartingStatusTimer();
       setConversationRunningState(activeConversationId, true);
+      updateConversationRuntimeEntry(activeConversationId, (current) => {
+        if (current.toolStatus !== CHAT_RUNTIME_STARTING_STATUS) {
+          return current;
+        }
+        return {
+          ...current,
+          toolStatus: null,
+          toolStatusIsCompaction: false,
+        };
+      });
     };
     const runtimeControls = normalizeChatRuntimeControlsForProvider(
       options?.runtimeControls ?? settings.chatRuntimeControls,
@@ -4381,10 +4429,28 @@ export default function App() {
     );
     try {
       chatStartInFlightRef.current = true;
-      const preparedStatus = await prepareChatRuntime("send", api, CHAT_RUNTIME_PREPARE_TIMEOUT_MS);
-      if (preparedStatus.chat_runtime_ready !== true) {
-        throw new Error("Desktop chat runtime is not ready. Please retry.");
-      }
+      runtimeStartingStatusTimer = window.setTimeout(() => {
+        runtimeStartingStatusTimer = null;
+        if (runStarted || terminalEventSeen || controller.signal.aborted) {
+          return;
+        }
+        updateConversationRuntimeEntry(activeConversationId, (current) => {
+          if (!current.isSending || current.toolStatus) {
+            return current;
+          }
+          return {
+            ...current,
+            toolStatus: CHAT_RUNTIME_STARTING_STATUS,
+            toolStatusIsCompaction: false,
+          };
+        });
+      }, CHAT_RUNTIME_STARTING_STATUS_DELAY_MS);
+      // chat.start is itself the reliable wake-up signal for a suspended desktop
+      // WebView. Keep the status refresh in the background so a stale runtime
+      // heartbeat cannot block the request that would wake it.
+      void prepareChatRuntime("send", api, CHAT_RUNTIME_PREPARE_TIMEOUT_MS).catch(
+        () => undefined,
+      );
       for await (const event of api.chat(
         message,
         isLocalDraftConversationId(activeConversationId) ? undefined : activeConversationId,
@@ -4447,6 +4513,7 @@ export default function App() {
             }));
           } else if (isTerminalChatControlEvent(event)) {
             terminalEventSeen = true;
+            clearRuntimeStartingStatusTimer();
             clearConversationStreamingState(activeConversationId);
             if (event.type === "failed" || event.state === "failed") {
               updateConversationRuntimeEntry(activeConversationId, (current) => ({
@@ -4513,6 +4580,7 @@ export default function App() {
         }
       }
     } finally {
+      clearRuntimeStartingStatusTimer();
       chatStartInFlightRef.current = false;
       clearConversationStreamingState(activeConversationId);
       if (status?.online && !terminalEventSeen) {
diff --git a/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts b/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts
index 2397024b5..0e610b249 100644
--- a/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts
+++ b/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts
@@ -49,9 +49,9 @@ type GatewayBridgeClaimResult =
   | "conversation_busy";
 
 const GATEWAY_CHAT_RUNTIME_LEASE_MS = 15_000;
-const GATEWAY_CHAT_RUNTIME_HEARTBEAT_MS = 5_000;
-const GATEWAY_CHAT_RUNTIME_IDLE_POLL_MS = 5_000;
-const GATEWAY_CHAT_RUNTIME_STATUS_HEARTBEAT_MS = 5_000;
+const GATEWAY_CHAT_RUNTIME_HEARTBEAT_MS = 2_500;
+const GATEWAY_CHAT_RUNTIME_IDLE_POLL_MS = 1_000;
+const GATEWAY_CHAT_RUNTIME_STATUS_HEARTBEAT_MS = 2_000;
 const GATEWAY_CHAT_CONVERSATION_BUSY_MESSAGE =
   "Another remote gateway chat request is already running.";
 

From 1e26e623c3016233fc021e64ff2301037cf85e25 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 22:36:28 +0800
Subject: [PATCH 12/28] fix(terminal): prevent SSH reconnect from hanging

---
 .../agent-gui/src-tauri/src/runtime/terminal.rs  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/crates/agent-gui/src-tauri/src/runtime/terminal.rs b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
index f9c3d0fa3..be96c99ba 100644
--- a/crates/agent-gui/src-tauri/src/runtime/terminal.rs
+++ b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
@@ -38,6 +38,7 @@ const SSH_RECONNECT_DELAYS: [Duration; 3] = [
     Duration::from_secs(5),
     Duration::from_secs(10),
 ];
+const SSH_RECONNECT_ATTEMPT_TIMEOUT: Duration = Duration::from_secs(20);
 const SSH_STATUS_CONNECTED: &str = "connected";
 const SSH_STATUS_RECONNECTING: &str = "reconnecting";
 const SSH_STATUS_DISCONNECTED: &str = "disconnected";
@@ -984,10 +985,19 @@ impl TerminalSessionRegistry {
                 runtime.finish_reconnect_runner();
                 return;
             }
-            match self
-                .reconnect_ssh_session(Arc::clone(&entry), attempt)
-                .await
+            let reconnect_result = match timeout(
+                SSH_RECONNECT_ATTEMPT_TIMEOUT,
+                self.reconnect_ssh_session(Arc::clone(&entry), attempt),
+            )
+            .await
             {
+                Ok(result) => result,
+                Err(_) => Err(format!(
+                    "SSH reconnect timed out after {} seconds",
+                    SSH_RECONNECT_ATTEMPT_TIMEOUT.as_secs()
+                )),
+            };
+            match reconnect_result {
                 Ok(()) => {
                     runtime.finish_reconnect_runner();
                     return;

From b586598506b1572ed2f0c001c64f549605d47fab Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 23:57:43 +0800
Subject: [PATCH 13/28] fix(ssh): stop reconnecting after normal shell exits

---
 .../src-tauri/src/runtime/terminal.rs         | 154 +++++++++++++++---
 1 file changed, 128 insertions(+), 26 deletions(-)

diff --git a/crates/agent-gui/src-tauri/src/runtime/terminal.rs b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
index be96c99ba..7fc27ff61 100644
--- a/crates/agent-gui/src-tauri/src/runtime/terminal.rs
+++ b/crates/agent-gui/src-tauri/src/runtime/terminal.rs
@@ -307,6 +307,16 @@ enum SshSessionInput {
     Resize(u32, u32),
 }
 
+enum SshSessionIoEndReason {
+    Shutdown,
+    InputClosed,
+    WriteFailed,
+    RemoteClosed,
+    RemoteExitStatus(u32),
+    RemoteExitSignal(String),
+    ConnectionLost,
+}
+
 #[derive(Debug, Clone)]
 struct PendingSshConnectRequest {
     cwd: String,
@@ -1244,24 +1254,8 @@ impl TerminalSessionRegistry {
         .await;
         match ping {
             Ok(Ok(())) => {}
-            Ok(Err(error)) => {
-                spawn_ssh_reconnect_runner(
-                    Arc::clone(self),
-                    record.id.clone(),
-                    Arc::clone(runtime),
-                    runtime.current_connection_id(),
-                );
-                return Err(format!("SSH latency check failed: {error}"));
-            }
-            Err(_) => {
-                spawn_ssh_reconnect_runner(
-                    Arc::clone(self),
-                    record.id.clone(),
-                    Arc::clone(runtime),
-                    runtime.current_connection_id(),
-                );
-                return Err("SSH latency check timed out".to_string());
-            }
+            Ok(Err(error)) => return Err(format!("SSH latency check failed: {error}")),
+            Err(_) => return Err("SSH latency check timed out".to_string()),
         }
         let elapsed = start.elapsed().as_millis().clamp(1, u128::from(u32::MAX)) as u32;
         Ok(TerminalSshLatencyResponse {
@@ -1716,6 +1710,25 @@ impl TerminalSessionRegistry {
         self.broadcast("exit", entry, None, None, None);
     }
 
+    async fn mark_ssh_shell_ended(
+        self: Arc<Self>,
+        session_id: String,
+        runtime: Arc<SshSessionRuntime>,
+        connection_id: usize,
+        message: String,
+    ) {
+        if runtime.current_connection_id() != connection_id || runtime.is_closing() {
+            return;
+        }
+        runtime.clear_connection_if_current(connection_id).await;
+        if message.trim().len() > 0 {
+            self.append_output(&session_id, message);
+        }
+        if let Ok(entry) = self.entry(&session_id) {
+            self.mark_ssh_disconnected(&entry);
+        }
+    }
+
     fn broadcast(
         &self,
         kind: &str,
@@ -2234,26 +2247,29 @@ async fn run_ssh_session_io(
     let (mut read_half, write_half) = channel.split();
     let mut writer = write_half.make_writer();
     let mut decoder = TerminalUtf8Decoder::default();
-    loop {
+    let mut remote_exit_reason: Option<SshSessionIoEndReason> = None;
+    let end_reason = loop {
         tokio::select! {
             _ = shutdown_rx.recv() => {
                 let handle = runtime.handle.lock().await;
                 if let Some(handle) = handle.as_ref() {
                     let _ = handle.disconnect(russh::Disconnect::ByApplication, "User disconnected", "en").await;
                 }
-                break;
+                break SshSessionIoEndReason::Shutdown;
             }
             input = input_rx.recv() => {
                 match input {
                     Some(SshSessionInput::Data(data)) => {
                         if writer.write_all(&data).await.is_err() {
-                            break;
+                            break SshSessionIoEndReason::WriteFailed;
                         }
                     }
                     Some(SshSessionInput::Resize(cols, rows)) => {
                         let _ = write_half.window_change(cols, rows, 0, 0).await;
                     }
-                    None => break,
+                    None => {
+                        break SshSessionIoEndReason::InputClosed;
+                    },
                 }
             }
             message = read_half.wait() => {
@@ -2264,20 +2280,106 @@ async fn run_ssh_session_io(
                             registry.append_output(&session_id, text);
                         }
                     }
-                    Some(ChannelMsg::Eof) | Some(ChannelMsg::Close) | None => {
-                        break;
+                    Some(ChannelMsg::ExitStatus { exit_status }) => {
+                        remote_exit_reason = Some(SshSessionIoEndReason::RemoteExitStatus(exit_status));
+                    }
+                    Some(ChannelMsg::ExitSignal { signal_name, .. }) => {
+                        remote_exit_reason = Some(SshSessionIoEndReason::RemoteExitSignal(format!("{signal_name:?}")));
+                    }
+                    Some(ChannelMsg::Eof) | Some(ChannelMsg::Close) => {
+                        break remote_exit_reason.unwrap_or(SshSessionIoEndReason::RemoteClosed);
+                    }
+                    None => {
+                        break remote_exit_reason.unwrap_or(SshSessionIoEndReason::ConnectionLost);
                     }
                     _ => {}
                 }
             }
         }
-    }
+    };
 
     let text = decoder.finish();
     if !text.is_empty() {
         registry.append_output(&session_id, text);
     }
-    spawn_ssh_reconnect_runner(registry, session_id, runtime, connection_id);
+    finish_ssh_session_io(registry, session_id, runtime, connection_id, end_reason).await;
+}
+
+async fn finish_ssh_session_io(
+    registry: Arc<TerminalSessionRegistry>,
+    session_id: String,
+    runtime: Arc<SshSessionRuntime>,
+    connection_id: usize,
+    end_reason: SshSessionIoEndReason,
+) {
+    if runtime.is_closing() {
+        return;
+    }
+    match end_reason {
+        SshSessionIoEndReason::Shutdown | SshSessionIoEndReason::InputClosed => {}
+        SshSessionIoEndReason::RemoteExitStatus(status) => {
+            registry
+                .mark_ssh_shell_ended(
+                    session_id,
+                    runtime,
+                    connection_id,
+                    format!("\r\n[SSH] Remote shell exited with status {status}.\r\n"),
+                )
+                .await;
+        }
+        SshSessionIoEndReason::RemoteExitSignal(signal) => {
+            registry
+                .mark_ssh_shell_ended(
+                    session_id,
+                    runtime,
+                    connection_id,
+                    format!("\r\n[SSH] Remote shell exited after signal {signal}.\r\n"),
+                )
+                .await;
+        }
+        SshSessionIoEndReason::RemoteClosed => {
+            registry
+                .mark_ssh_shell_ended(
+                    session_id,
+                    runtime,
+                    connection_id,
+                    "\r\n[SSH] Remote shell closed.\r\n".to_string(),
+                )
+                .await;
+        }
+        SshSessionIoEndReason::ConnectionLost => {
+            if ssh_connection_alive(&runtime, connection_id).await {
+                registry
+                    .mark_ssh_shell_ended(
+                        session_id,
+                        runtime,
+                        connection_id,
+                        "\r\n[SSH] Remote shell closed.\r\n".to_string(),
+                    )
+                    .await;
+            } else {
+                spawn_ssh_reconnect_runner(registry, session_id, runtime, connection_id);
+            }
+        }
+        SshSessionIoEndReason::WriteFailed => {
+            spawn_ssh_reconnect_runner(registry, session_id, runtime, connection_id);
+        }
+    }
+}
+
+async fn ssh_connection_alive(runtime: &Arc<SshSessionRuntime>, connection_id: usize) -> bool {
+    if runtime.current_connection_id() != connection_id || runtime.is_closing() {
+        return false;
+    }
+    let ping = timeout(Duration::from_secs(2), async {
+        let handle = runtime.handle.lock().await;
+        let Some(handle) = handle.as_ref() else {
+            return Err(russh::Error::Disconnect);
+        };
+        handle.send_ping().await
+    })
+    .await;
+    matches!(ping, Ok(Ok(())))
 }
 
 fn spawn_ssh_reconnect_runner(

From c2e0a4bdac02ea6a1dca221b6a647f117c6ac1bd Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 23:59:39 +0800
Subject: [PATCH 14/28] feat(tunnel): allow IP address HTTP targets

---
 .../project-tools/LocalTunnelPanel.tsx        | 23 ++++++++++++++--
 crates/agent-gateway/web/src/i18n/config.ts   | 26 +++++++++----------
 .../src-tauri/src/services/gateway.rs         | 11 +++++---
 .../project-tools/LocalTunnelPanel.tsx        | 23 ++++++++++++++--
 crates/agent-gui/src/i18n/config.ts           | 26 +++++++++----------
 .../src/lib/tools/tunnelManagerTools.ts       | 13 ++++------
 6 files changed, 78 insertions(+), 44 deletions(-)

diff --git a/crates/agent-gateway/web/src/components/project-tools/LocalTunnelPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/LocalTunnelPanel.tsx
index 0738ddcc5..3ec40e7ba 100644
--- a/crates/agent-gateway/web/src/components/project-tools/LocalTunnelPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/LocalTunnelPanel.tsx
@@ -111,6 +111,25 @@ function TtlSegmented({
   );
 }
 
+function normalizeTunnelHostname(hostname: string) {
+  return hostname.toLowerCase().replace(/^\[/, "").replace(/\]$/, "");
+}
+
+function isIpv4Address(hostname: string) {
+  const parts = hostname.split(".");
+  if (parts.length !== 4) return false;
+  return parts.every((part) => {
+    if (!/^\d+$/.test(part)) return false;
+    const value = Number(part);
+    return value >= 0 && value <= 255 && String(value) === part;
+  });
+}
+
+function isIpAddress(hostname: string) {
+  if (isIpv4Address(hostname)) return true;
+  return hostname.includes(":");
+}
+
 function validateLocalHttpTarget(input: string) {
   const value = input.trim();
   if (!value) return "projectTools.tunnelTargetRequired";
@@ -119,8 +138,8 @@ function validateLocalHttpTarget(input: string) {
     if (url.protocol !== "http:") {
       return "projectTools.tunnelInvalidUrl";
     }
-    const hostname = url.hostname.toLowerCase();
-    if (!["localhost", "127.0.0.1", "::1", "[::1]"].includes(hostname)) {
+    const hostname = normalizeTunnelHostname(url.hostname);
+    if (hostname !== "localhost" && !isIpAddress(hostname)) {
       return "projectTools.tunnelLocalhostOnly";
     }
     if (url.username || url.password || url.hash) {
diff --git a/crates/agent-gateway/web/src/i18n/config.ts b/crates/agent-gateway/web/src/i18n/config.ts
index bf8423f27..b8002da75 100644
--- a/crates/agent-gateway/web/src/i18n/config.ts
+++ b/crates/agent-gateway/web/src/i18n/config.ts
@@ -237,7 +237,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.newGitReview": "新建审查",
     "projectTools.gitReviewDescription": "查看代码变更和提交历史",
     "projectTools.newTunnel": "新建内网穿透",
-    "projectTools.tunnelDescription": "通过 Gateway 暴露本机 HTTP 服务",
+    "projectTools.tunnelDescription": "通过 Gateway 暴露 HTTP 服务",
     "projectTools.sshTunnelTitle": "SSH 隧道",
     "projectTools.newSshTunnel": "新建 SSH 连接",
     "projectTools.sshTunnelDescription": "启动交互式 SSH 终端并关联项目主机",
@@ -315,7 +315,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.closeGitReview": "关闭 Git 审查",
     "projectTools.closeTunnelTab": "关闭内网穿透",
     "projectTools.closeSshTunnelTab": "关闭 SSH 隧道",
-    "projectTools.tunnelTargetUrl": "本地服务地址",
+    "projectTools.tunnelTargetUrl": "服务地址",
     "projectTools.tunnelTargetPlaceholder": "http://localhost:3000",
     "projectTools.tunnelName": "名称",
     "projectTools.tunnelNamePlaceholder": "可选",
@@ -336,10 +336,9 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.tunnelListSection": "链接列表",
     "projectTools.tunnelEmptyHintCreate": "在上方新建第一个临时链接",
     "projectTools.tunnelEmptyHintProject": "切换到「当前项目」即可创建链接",
-    "projectTools.tunnelTargetRequired": "请输入本地 HTTP 服务地址。",
-    "projectTools.tunnelInvalidUrl":
-      "请输入有效的 http://localhost 地址，不能包含账号、密码或片段。",
-    "projectTools.tunnelLocalhostOnly": "仅支持 localhost、127.0.0.1 或 [::1]。",
+    "projectTools.tunnelTargetRequired": "请输入 HTTP 服务地址。",
+    "projectTools.tunnelInvalidUrl": "请输入有效的 http 地址，不能包含账号、密码或片段。",
+    "projectTools.tunnelLocalhostOnly": "仅支持 localhost 或 IPv4/IPv6 地址。",
     "projectTools.tunnelRemoteOffline": "Remote Gateway 未连接，连接后才能创建或关闭 tunnel。",
     "projectTools.tunnelWebDisabled": "桌面端 Remote 设置未允许 WebUI 创建或关闭内网穿透。",
     "projectTools.tunnelStatusActive": "运行中",
@@ -1153,7 +1152,7 @@ export const translations: Record<Locale, Record<string, string>> = {
       "由桌面端 Remote 设置控制。开启后，已登录 WebUI 可对本机项目执行分支、暂存、提交和同步操作。",
     "settings.remoteWebTunnels": "允许 WebUI 内网穿透",
     "settings.remoteWebTunnelsHint":
-      "由桌面端 Remote 设置控制。开启后，已登录 WebUI 可为本机 localhost HTTP 服务创建和关闭临时访问链接。",
+      "由桌面端 Remote 设置控制。开启后，已登录 WebUI 可为 localhost 或 IP 地址 HTTP 服务创建和关闭临时访问链接。",
     "settings.remoteHeartbeat": "心跳间隔",
     "settings.remoteHeartbeatUnit": "秒",
     "settings.remoteHeartbeatHint": "与 Gateway 之间的心跳检测间隔，用于维持连接和检测在线状态",
@@ -1651,7 +1650,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.newGitReview": "New Review",
     "projectTools.gitReviewDescription": "Review code changes and commit history",
     "projectTools.newTunnel": "New Tunnel",
-    "projectTools.tunnelDescription": "Expose local HTTP services through Gateway",
+    "projectTools.tunnelDescription": "Expose HTTP services through Gateway",
     "projectTools.sshTunnelTitle": "SSH Tunnel",
     "projectTools.newSshTunnel": "New SSH Connection",
     "projectTools.sshTunnelDescription": "Start interactive SSH terminals and associate project hosts",
@@ -1735,7 +1734,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.closeGitReview": "Close Git Review",
     "projectTools.closeTunnelTab": "Close Tunnel",
     "projectTools.closeSshTunnelTab": "Close SSH Tunnel",
-    "projectTools.tunnelTargetUrl": "Local service URL",
+    "projectTools.tunnelTargetUrl": "Service URL",
     "projectTools.tunnelTargetPlaceholder": "http://localhost:3000",
     "projectTools.tunnelName": "Name",
     "projectTools.tunnelNamePlaceholder": "Optional",
@@ -1756,10 +1755,9 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.tunnelListSection": "Links",
     "projectTools.tunnelEmptyHintCreate": "Create your first temporary link above",
     "projectTools.tunnelEmptyHintProject": "Switch to Current Project to create links",
-    "projectTools.tunnelTargetRequired": "Enter a local HTTP service URL.",
-    "projectTools.tunnelInvalidUrl":
-      "Enter a valid http://localhost URL without credentials or fragments.",
-    "projectTools.tunnelLocalhostOnly": "Only localhost, 127.0.0.1, or [::1] are supported.",
+    "projectTools.tunnelTargetRequired": "Enter an HTTP service URL.",
+    "projectTools.tunnelInvalidUrl": "Enter a valid http URL without credentials or fragments.",
+    "projectTools.tunnelLocalhostOnly": "Only localhost or IPv4/IPv6 addresses are supported.",
     "projectTools.tunnelRemoteOffline":
       "Remote Gateway is not connected. Connect it before creating or closing tunnels.",
     "projectTools.tunnelWebDisabled":
@@ -2607,7 +2605,7 @@ export const translations: Record<Locale, Record<string, string>> = {
       "Controlled by the desktop Remote settings. When enabled, authenticated WebUI clients can run branch, stage, commit, and sync operations on local projects.",
     "settings.remoteWebTunnels": "Allow WebUI Tunnels",
     "settings.remoteWebTunnelsHint":
-      "Controlled by the desktop Remote settings. When enabled, authenticated WebUI clients can create and close temporary links for local localhost HTTP services.",
+      "Controlled by the desktop Remote settings. When enabled, authenticated WebUI clients can create and close temporary links for localhost or IP-address HTTP services.",
     "settings.remoteHeartbeat": "Heartbeat Interval",
     "settings.remoteHeartbeatUnit": "seconds",
     "settings.remoteHeartbeatHint":
diff --git a/crates/agent-gui/src-tauri/src/services/gateway.rs b/crates/agent-gui/src-tauri/src/services/gateway.rs
index 45c91afc4..4ba36f461 100644
--- a/crates/agent-gui/src-tauri/src/services/gateway.rs
+++ b/crates/agent-gui/src-tauri/src/services/gateway.rs
@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 use std::future::Future;
 use std::io;
+use std::net::IpAddr;
 use std::sync::{Arc, Mutex, Once};
 use std::thread;
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
@@ -3351,8 +3352,8 @@ fn validate_tunnel_target_url(input: &str) -> Result<TunnelTarget, String> {
         .map(|value| value.trim().to_ascii_lowercase())
         .ok_or_else(|| "targetUrl host is required".to_string())?;
     let host = host.trim_start_matches('[').trim_end_matches(']');
-    if host != "localhost" && host != "127.0.0.1" && host != "::1" {
-        return Err("targetUrl host must be localhost, 127.0.0.1, or ::1".to_string());
+    if host != "localhost" && host.parse::<IpAddr>().is_err() {
+        return Err("targetUrl host must be localhost or an IP address".to_string());
     }
     url.set_fragment(None);
     Ok(TunnelTarget { url })
@@ -4419,18 +4420,20 @@ mod tests {
     }
 
     #[test]
-    fn validate_tunnel_target_url_only_accepts_localhost_http() {
+    fn validate_tunnel_target_url_accepts_localhost_and_ip_http_targets() {
         for value in [
             "http://localhost:3000",
             "http://127.0.0.1:8080/app",
             "http://[::1]:5173",
+            "http://192.168.1.5:3000",
+            "http://10.0.0.20:8080/app",
+            "http://[fd00::1]:5173",
         ] {
             assert!(validate_tunnel_target_url(value).is_ok(), "{value}");
         }
 
         for value in [
             "https://localhost:3000",
-            "http://192.168.1.5:3000",
             "http://example.com",
             "http://user:pass@localhost:3000",
             "http://localhost:3000/#fragment",
diff --git a/crates/agent-gui/src/components/project-tools/LocalTunnelPanel.tsx b/crates/agent-gui/src/components/project-tools/LocalTunnelPanel.tsx
index 1679396d5..106e32125 100644
--- a/crates/agent-gui/src/components/project-tools/LocalTunnelPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/LocalTunnelPanel.tsx
@@ -131,6 +131,25 @@ function TtlSegmented({
   );
 }
 
+function normalizeTunnelHostname(hostname: string) {
+  return hostname.toLowerCase().replace(/^\[/, "").replace(/\]$/, "");
+}
+
+function isIpv4Address(hostname: string) {
+  const parts = hostname.split(".");
+  if (parts.length !== 4) return false;
+  return parts.every((part) => {
+    if (!/^\d+$/.test(part)) return false;
+    const value = Number(part);
+    return value >= 0 && value <= 255 && String(value) === part;
+  });
+}
+
+function isIpAddress(hostname: string) {
+  if (isIpv4Address(hostname)) return true;
+  return hostname.includes(":");
+}
+
 function validateLocalHttpTarget(input: string) {
   const value = input.trim();
   if (!value) return "projectTools.tunnelTargetRequired";
@@ -139,8 +158,8 @@ function validateLocalHttpTarget(input: string) {
     if (url.protocol !== "http:") {
       return "projectTools.tunnelInvalidUrl";
     }
-    const hostname = url.hostname.toLowerCase();
-    if (!["localhost", "127.0.0.1", "::1", "[::1]"].includes(hostname)) {
+    const hostname = normalizeTunnelHostname(url.hostname);
+    if (hostname !== "localhost" && !isIpAddress(hostname)) {
       return "projectTools.tunnelLocalhostOnly";
     }
     if (url.username || url.password || url.hash) {
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index 7895f694a..b42a863fe 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -249,7 +249,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.newGitReview": "新建审查",
     "projectTools.gitReviewDescription": "查看代码变更和提交历史",
     "projectTools.newTunnel": "新建内网穿透",
-    "projectTools.tunnelDescription": "通过 Gateway 暴露本机 HTTP 服务",
+    "projectTools.tunnelDescription": "通过 Gateway 暴露 HTTP 服务",
     "projectTools.sshTunnelTitle": "SSH 隧道",
     "projectTools.newSshTunnel": "新建 SSH 连接",
     "projectTools.sshTunnelDescription": "启动交互式 SSH 终端并关联项目主机",
@@ -327,7 +327,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.closeGitReview": "关闭 Git 审查",
     "projectTools.closeTunnelTab": "关闭内网穿透",
     "projectTools.closeSshTunnelTab": "关闭 SSH 隧道",
-    "projectTools.tunnelTargetUrl": "本地服务地址",
+    "projectTools.tunnelTargetUrl": "服务地址",
     "projectTools.tunnelTargetPlaceholder": "http://localhost:3000",
     "projectTools.tunnelName": "名称",
     "projectTools.tunnelNamePlaceholder": "可选",
@@ -348,10 +348,9 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.tunnelListSection": "链接列表",
     "projectTools.tunnelEmptyHintCreate": "在上方新建第一个临时链接",
     "projectTools.tunnelEmptyHintProject": "切换到「当前项目」即可创建链接",
-    "projectTools.tunnelTargetRequired": "请输入本地 HTTP 服务地址。",
-    "projectTools.tunnelInvalidUrl":
-      "请输入有效的 http://localhost 地址，不能包含账号、密码或片段。",
-    "projectTools.tunnelLocalhostOnly": "仅支持 localhost、127.0.0.1 或 [::1]。",
+    "projectTools.tunnelTargetRequired": "请输入 HTTP 服务地址。",
+    "projectTools.tunnelInvalidUrl": "请输入有效的 http 地址，不能包含账号、密码或片段。",
+    "projectTools.tunnelLocalhostOnly": "仅支持 localhost 或 IPv4/IPv6 地址。",
     "projectTools.tunnelRemoteOffline": "Remote Gateway 未连接，连接后才能创建或关闭 tunnel。",
     "projectTools.tunnelWebDisabled": "桌面端 Remote 设置未允许 WebUI 创建或关闭内网穿透。",
     "projectTools.tunnelStatusActive": "运行中",
@@ -1195,7 +1194,7 @@ export const translations: Record<Locale, Record<string, string>> = {
       "开启后，已登录 WebUI 可对本机项目执行分支、暂存、提交和同步操作。",
     "settings.remoteWebTunnels": "允许 WebUI 内网穿透",
     "settings.remoteWebTunnelsHint":
-      "开启后，已登录 WebUI 可为本机 localhost HTTP 服务创建和关闭临时访问链接。",
+      "开启后，已登录 WebUI 可为 localhost 或 IP 地址 HTTP 服务创建和关闭临时访问链接。",
     "settings.remoteHeartbeat": "心跳间隔",
     "settings.remoteHeartbeatUnit": "秒",
 
@@ -1704,7 +1703,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.newGitReview": "New Review",
     "projectTools.gitReviewDescription": "Review code changes and commit history",
     "projectTools.newTunnel": "New Tunnel",
-    "projectTools.tunnelDescription": "Expose local HTTP services through Gateway",
+    "projectTools.tunnelDescription": "Expose HTTP services through Gateway",
     "projectTools.sshTunnelTitle": "SSH Tunnel",
     "projectTools.newSshTunnel": "New SSH Connection",
     "projectTools.sshTunnelDescription": "Start interactive SSH terminals and associate project hosts",
@@ -1788,7 +1787,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.closeGitReview": "Close Git Review",
     "projectTools.closeTunnelTab": "Close Tunnel",
     "projectTools.closeSshTunnelTab": "Close SSH Tunnel",
-    "projectTools.tunnelTargetUrl": "Local service URL",
+    "projectTools.tunnelTargetUrl": "Service URL",
     "projectTools.tunnelTargetPlaceholder": "http://localhost:3000",
     "projectTools.tunnelName": "Name",
     "projectTools.tunnelNamePlaceholder": "Optional",
@@ -1809,10 +1808,9 @@ export const translations: Record<Locale, Record<string, string>> = {
     "projectTools.tunnelListSection": "Links",
     "projectTools.tunnelEmptyHintCreate": "Create your first temporary link above",
     "projectTools.tunnelEmptyHintProject": "Switch to Current Project to create links",
-    "projectTools.tunnelTargetRequired": "Enter a local HTTP service URL.",
-    "projectTools.tunnelInvalidUrl":
-      "Enter a valid http://localhost URL without credentials or fragments.",
-    "projectTools.tunnelLocalhostOnly": "Only localhost, 127.0.0.1, or [::1] are supported.",
+    "projectTools.tunnelTargetRequired": "Enter an HTTP service URL.",
+    "projectTools.tunnelInvalidUrl": "Enter a valid http URL without credentials or fragments.",
+    "projectTools.tunnelLocalhostOnly": "Only localhost or IPv4/IPv6 addresses are supported.",
     "projectTools.tunnelRemoteOffline":
       "Remote Gateway is not connected. Connect it before creating or closing tunnels.",
     "projectTools.tunnelWebDisabled":
@@ -2696,7 +2694,7 @@ export const translations: Record<Locale, Record<string, string>> = {
       "Allow authenticated WebUI clients to run branch, stage, commit, and sync operations on local projects.",
     "settings.remoteWebTunnels": "Allow WebUI Tunnels",
     "settings.remoteWebTunnelsHint":
-      "Allow authenticated WebUI clients to create and close temporary links for local localhost HTTP services.",
+      "Allow authenticated WebUI clients to create and close temporary links for localhost or IP-address HTTP services.",
     "settings.remoteHeartbeat": "Heartbeat Interval",
     "settings.remoteHeartbeatUnit": "seconds",
 
diff --git a/crates/agent-gui/src/lib/tools/tunnelManagerTools.ts b/crates/agent-gui/src/lib/tools/tunnelManagerTools.ts
index 310a0b98a..3416bb4d5 100644
--- a/crates/agent-gui/src/lib/tools/tunnelManagerTools.ts
+++ b/crates/agent-gui/src/lib/tools/tunnelManagerTools.ts
@@ -49,18 +49,15 @@ type TunnelManagerDetails = {
 const TUNNEL_MANAGER_TOOL: Tool = {
   name: "TunnelManager",
   description:
-    "Manage temporary Remote HTTP tunnels for localhost services through the Gateway. Use list to inspect active tunnels, create to expose a local http://localhost/127.0.0.1/[::1] service, and close to revoke a tunnel.",
+    "Manage temporary Remote HTTP tunnels through the Gateway. Use list to inspect active tunnels, create to expose a localhost or IPv4/IPv6 http service, and close to revoke a tunnel.",
   parameters: Type.Object({
-    action: Type.Union(
-      [Type.Literal("list"), Type.Literal("create"), Type.Literal("close")],
-      {
-        description: "Tunnel action to perform.",
-      },
-    ),
+    action: Type.Union([Type.Literal("list"), Type.Literal("create"), Type.Literal("close")], {
+      description: "Tunnel action to perform.",
+    }),
     targetUrl: Type.Optional(
       Type.String({
         description:
-          "Required for action=create. Local HTTP target, e.g. http://localhost:3000 or http://127.0.0.1:5173/app.",
+          "Required for action=create. HTTP target, e.g. http://localhost:3000, http://127.0.0.1:5173/app, or http://192.168.1.5:8080.",
       }),
     ),
     name: Type.Optional(

From 7d8096ab827b8704c42accf5a992b9a2bc4f1256 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 23:59:44 +0800
Subject: [PATCH 15/28] fix(gateway): avoid stale chat runtime starting status

---
 crates/agent-gateway/web/src/App.tsx | 92 ++++++++++++++++++++++------
 1 file changed, 72 insertions(+), 20 deletions(-)

diff --git a/crates/agent-gateway/web/src/App.tsx b/crates/agent-gateway/web/src/App.tsx
index 7bb96d7ee..97297cb31 100644
--- a/crates/agent-gateway/web/src/App.tsx
+++ b/crates/agent-gateway/web/src/App.tsx
@@ -402,6 +402,7 @@ const CHAT_RUNTIME_PREPARE_TIMEOUT_MS = 2_500;
 const CHAT_RUNTIME_FOREGROUND_PREPARE_TIMEOUT_MS = 1_500;
 const CHAT_RUNTIME_KEEP_WARM_INTERVAL_MS = 10_000;
 const CHAT_RUNTIME_STARTING_STATUS_DELAY_MS = 1_200;
+const CHAT_RUNTIME_READY_STATUS_TTL_MS = 20_000;
 const CHAT_RUNTIME_STARTING_STATUS = "Starting desktop runtime...";
 const DEFAULT_BROWSER_TITLE = "LiveAgent Gateway";
 const NEW_CONVERSATION_BROWSER_TITLE = "LiveAgent";
@@ -461,6 +462,33 @@ function normalizeGatewayTimestampMs(value: number | null | undefined) {
   return value < SECONDS_TIMESTAMP_MAX ? value * 1000 : value;
 }
 
+function isChatRuntimeReadyStatus(
+  status: AgentStatus | null | undefined,
+  now = Date.now(),
+) {
+  if (status?.online !== true) {
+    return false;
+  }
+
+  const runtimeState = normalizeOptionalStatus(status.runtime_state)?.toLowerCase() ?? "";
+  if (runtimeState === "suspended") {
+    return false;
+  }
+
+  const hasReadyState =
+    runtimeState === "ready" || runtimeState === "draining" || runtimeState === "busy";
+  if (status.chat_runtime_ready !== true && !hasReadyState) {
+    return false;
+  }
+
+  const runtimeHeartbeatAt = normalizeGatewayTimestampMs(status.runtime_last_heartbeat);
+  if (runtimeHeartbeatAt <= 0) {
+    return status.chat_runtime_ready === true;
+  }
+
+  return now - runtimeHeartbeatAt <= CHAT_RUNTIME_READY_STATUS_TTL_MS;
+}
+
 function isAbortError(error: unknown) {
   if (
     (error instanceof DOMException && error.name === "AbortError") ||
@@ -2606,6 +2634,7 @@ export default function App() {
     }
 
     const unsubscribe = api.subscribeStatus((nextStatus, error) => {
+      statusRef.current = nextStatus;
       setStatus(nextStatus);
       setStatusError(error);
     });
@@ -4402,13 +4431,7 @@ export default function App() {
       window.clearTimeout(runtimeStartingStatusTimer);
       runtimeStartingStatusTimer = null;
     };
-    const markRunStarted = () => {
-      if (runStarted) {
-        return;
-      }
-      runStarted = true;
-      clearRuntimeStartingStatusTimer();
-      setConversationRunningState(activeConversationId, true);
+    const clearRuntimeStartingStatus = () => {
       updateConversationRuntimeEntry(activeConversationId, (current) => {
         if (current.toolStatus !== CHAT_RUNTIME_STARTING_STATUS) {
           return current;
@@ -4420,18 +4443,21 @@ export default function App() {
         };
       });
     };
-    const runtimeControls = normalizeChatRuntimeControlsForProvider(
-      options?.runtimeControls ?? settings.chatRuntimeControls,
-      {
-        providerId: currentChatProvider?.type,
-        requestFormat: currentChatProvider?.requestFormat,
-      },
-    );
-    try {
-      chatStartInFlightRef.current = true;
+    const shouldShowRuntimeStartingStatus = () =>
+      !isChatRuntimeReadyStatus(statusRef.current);
+    const scheduleRuntimeStartingStatusTimer = () => {
+      clearRuntimeStartingStatusTimer();
+      if (!shouldShowRuntimeStartingStatus()) {
+        return;
+      }
       runtimeStartingStatusTimer = window.setTimeout(() => {
         runtimeStartingStatusTimer = null;
-        if (runStarted || terminalEventSeen || controller.signal.aborted) {
+        if (
+          runStarted ||
+          terminalEventSeen ||
+          controller.signal.aborted ||
+          !shouldShowRuntimeStartingStatus()
+        ) {
           return;
         }
         updateConversationRuntimeEntry(activeConversationId, (current) => {
@@ -4445,12 +4471,38 @@ export default function App() {
           };
         });
       }, CHAT_RUNTIME_STARTING_STATUS_DELAY_MS);
+    };
+    const markRunStarted = () => {
+      if (runStarted) {
+        return;
+      }
+      runStarted = true;
+      clearRuntimeStartingStatusTimer();
+      setConversationRunningState(activeConversationId, true);
+      clearRuntimeStartingStatus();
+    };
+    const runtimeControls = normalizeChatRuntimeControlsForProvider(
+      options?.runtimeControls ?? settings.chatRuntimeControls,
+      {
+        providerId: currentChatProvider?.type,
+        requestFormat: currentChatProvider?.requestFormat,
+      },
+    );
+    try {
+      chatStartInFlightRef.current = true;
+      scheduleRuntimeStartingStatusTimer();
       // chat.start is itself the reliable wake-up signal for a suspended desktop
       // WebView. Keep the status refresh in the background so a stale runtime
       // heartbeat cannot block the request that would wake it.
-      void prepareChatRuntime("send", api, CHAT_RUNTIME_PREPARE_TIMEOUT_MS).catch(
-        () => undefined,
-      );
+      void prepareChatRuntime("send", api, CHAT_RUNTIME_PREPARE_TIMEOUT_MS)
+        .then((nextStatus) => {
+          statusRef.current = nextStatus;
+          if (isChatRuntimeReadyStatus(nextStatus)) {
+            clearRuntimeStartingStatusTimer();
+            clearRuntimeStartingStatus();
+          }
+        })
+        .catch(() => undefined);
       for await (const event of api.chat(
         message,
         isLocalDraftConversationId(activeConversationId) ? undefined : activeConversationId,

From b67bc04e6332f49a155d9409ca3572755c6e83d5 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Sun, 14 Jun 2026 23:59:48 +0800
Subject: [PATCH 16/28] fix(chat): hydrate gateway bridge conversations

---
 crates/agent-gui/src/pages/ChatPage.tsx | 28 ++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/crates/agent-gui/src/pages/ChatPage.tsx b/crates/agent-gui/src/pages/ChatPage.tsx
index bb3eab95d..3bd549d3f 100644
--- a/crates/agent-gui/src/pages/ChatPage.tsx
+++ b/crates/agent-gui/src/pages/ChatPage.tsx
@@ -1362,6 +1362,7 @@ export function ChatPage(props: ChatPageProps) {
   const previousHistoryScopeKeyRef = useRef(historyScopeKey);
   const currentConversationHistoryUpdatedAtRef = useRef<number | null>(null);
   const locallySyncedHistoryUpdatedAtRef = useRef(new Map<string, number>());
+  const gatewayBridgeHistorySummaryRef = useRef(new Map<string, ChatHistorySummary>());
   const startNewConversationActionRef = useRef<(options?: { workdir?: string }) => void>(
     () => undefined,
   );
@@ -1772,6 +1773,7 @@ export function ChatPage(props: ChatPageProps) {
       composerDraftCacheRef.current.delete(key);
       locallySyncedHistoryUpdatedAtRef.current.delete(key);
       appliedGatewayHistoryTruncationsRef.current.delete(key);
+      gatewayBridgeHistorySummaryRef.current.delete(key);
       pendingUploadsByConversationRef.current.delete(key);
       clearMemoryExtractorState(key);
       clearSilentMemoryExtractionState(key);
@@ -2345,10 +2347,8 @@ export function ChatPage(props: ChatPageProps) {
     const knownConversation =
       requestedConversationId === currentConversationIdRef.current ||
       conversationRuntimeCacheRef.current.has(requestedConversationId) ||
-      historyItemsRef.current.some((item) => item.id === requestedConversationId);
-    if (!knownConversation) {
-      throw new Error(`Conversation not found: ${requestedConversationId}`);
-    }
+      historyItemsRef.current.some((item) => item.id === requestedConversationId) ||
+      gatewayBridgeHistorySummaryRef.current.has(requestedConversationId);
     if (isConversationRunning(requestedConversationId)) {
       throw new Error(`Conversation is already running: ${requestedConversationId}`);
     }
@@ -2373,6 +2373,7 @@ export function ChatPage(props: ChatPageProps) {
       (item) => item.id === requestedConversationId && item.isPending,
     );
     const shouldHydrateFromHistory =
+      !knownConversation ||
       forceHydrate ||
       hydratingConversationIdRef.current === requestedConversationId ||
       hydrationFailedConversationIdRef.current === requestedConversationId ||
@@ -2394,8 +2395,23 @@ export function ChatPage(props: ChatPageProps) {
       isSending: cached?.isSending,
       workdir: record.cwd,
     });
+    const historySummary: ChatHistorySummary = {
+      id: record.id,
+      title: record.title,
+      providerId: record.providerId,
+      model: record.model,
+      sessionId: record.sessionId,
+      cwd: record.cwd,
+      messageCount: record.state.meta.totalMessageCount,
+      createdAt: record.createdAt,
+      updatedAt: record.updatedAt,
+      isPinned: record.isPinned,
+      pinnedAt: record.pinnedAt,
+    };
     setConversationRuntimeCacheEntry(conversationRuntimeCacheRef.current, record.id, nextEntry);
     persistedConversationStateRef.current.set(record.id, record.state);
+    gatewayBridgeHistorySummaryRef.current.set(record.id, historySummary);
+    setHistoryItems((prev) => mergeHistoryItem(prev, historySummary));
     if (currentConversationIdRef.current === record.id) {
       syncVisibleConversationRuntime(record.id, nextEntry);
     }
@@ -2869,7 +2885,9 @@ export function ChatPage(props: ChatPageProps) {
     });
     const baseConversationState = runtimeEntry.state;
     const isFirstTurn = baseConversationState.meta.totalMessageCount === 0;
-    const existingHistoryItem = historyItemsRef.current.find((item) => item.id === conversationId);
+    const existingHistoryItem =
+      historyItemsRef.current.find((item) => item.id === conversationId) ??
+      gatewayBridgeHistorySummaryRef.current.get(conversationId);
     const shouldCreatePendingHistoryItem = isFirstTurn && !existingHistoryItem;
     const fallbackTitle =
       existingHistoryItem &&

From 9ff1af7941c76e28bb79fea7af44c0a96129e790 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 00:17:55 +0800
Subject: [PATCH 17/28] fix(composer): truncate long git branch names on mobile

---
 crates/agent-gui/src/components/git/GitBranchSelector.tsx | 2 +-
 crates/agent-gui/src/pages/chat/ChatComposerBar.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/agent-gui/src/components/git/GitBranchSelector.tsx b/crates/agent-gui/src/components/git/GitBranchSelector.tsx
index faa81d168..ca676f325 100644
--- a/crates/agent-gui/src/components/git/GitBranchSelector.tsx
+++ b/crates/agent-gui/src/components/git/GitBranchSelector.tsx
@@ -453,7 +453,7 @@ export function GitBranchSelector(props: {
         <DropdownMenuTrigger
           disabled={disabled || !gitClient || !workdir.trim()}
           className={cn(
-            "composer-reasoning-trigger inline-flex h-8 max-w-[13rem] shrink-0 items-center gap-1 rounded-full border px-2 text-xs font-medium outline-hidden transition-colors",
+            "composer-reasoning-trigger inline-flex h-8 min-w-0 max-w-[13rem] items-center gap-1 rounded-full border px-2 text-xs font-medium outline-hidden transition-colors",
             noRepo
               ? "border-transparent bg-foreground/[0.04] text-muted-foreground"
               : "border-emerald-300/25 bg-emerald-50/65 text-foreground hover:bg-emerald-50 dark:border-emerald-300/15 dark:bg-emerald-400/[0.08]",
diff --git a/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx b/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
index 75872e50e..75c277b49 100644
--- a/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
+++ b/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
@@ -209,7 +209,7 @@ export const ChatComposerBar = memo(function ChatComposerBar(props: {
           </div>
 
           <div className="relative flex items-center justify-between gap-2 px-3 pb-2 pt-1">
-            <div className="flex min-w-0 items-center gap-1">
+            <div className="flex min-w-0 flex-1 items-center gap-1">
               <RuntimeControlTooltip label={uploadTooltip}>
                 <button
                   type="button"

From 3c1ab040f4bf72bac81c54cd25854dee68dfb77a Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 01:04:21 +0800
Subject: [PATCH 18/28] fix(chat): keep composer controls from overflowing

---
 .../agent-gateway/web/src/components/git/GitBranchSelector.tsx  | 2 +-
 crates/agent-gateway/web/src/pages/chat/ChatComposerBar.tsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/agent-gateway/web/src/components/git/GitBranchSelector.tsx b/crates/agent-gateway/web/src/components/git/GitBranchSelector.tsx
index 60075c48b..5ff04c462 100644
--- a/crates/agent-gateway/web/src/components/git/GitBranchSelector.tsx
+++ b/crates/agent-gateway/web/src/components/git/GitBranchSelector.tsx
@@ -480,7 +480,7 @@ export function GitBranchSelector(props: {
         <DropdownMenuTrigger
           disabled={disabled || !gitClient || !workdir.trim()}
           className={cn(
-            "composer-reasoning-trigger inline-flex h-8 max-w-[13rem] shrink-0 items-center gap-1 rounded-full border px-2 text-xs font-medium outline-hidden transition-colors",
+            "composer-reasoning-trigger inline-flex h-8 min-w-0 max-w-[13rem] items-center gap-1 rounded-full border px-2 text-xs font-medium outline-hidden transition-colors",
             noRepo
               ? "border-transparent bg-foreground/[0.04] text-muted-foreground"
               : "border-emerald-300/25 bg-emerald-50/65 text-foreground hover:bg-emerald-50 dark:border-emerald-300/15 dark:bg-emerald-400/[0.08]",
diff --git a/crates/agent-gateway/web/src/pages/chat/ChatComposerBar.tsx b/crates/agent-gateway/web/src/pages/chat/ChatComposerBar.tsx
index 79a246cdf..c766102ee 100644
--- a/crates/agent-gateway/web/src/pages/chat/ChatComposerBar.tsx
+++ b/crates/agent-gateway/web/src/pages/chat/ChatComposerBar.tsx
@@ -259,7 +259,7 @@ export const ChatComposerBar = memo(function ChatComposerBar(props: {
           </div>
 
           <div className="relative flex items-center justify-between gap-2 px-3 pb-2 pt-1">
-            <div className="flex min-w-0 items-center gap-1">
+            <div className="flex min-w-0 flex-1 items-center gap-1">
               <RuntimeControlTooltip label={uploadTooltip}>
                 <button
                   type="button"

From a1e8533844c60f8c88f67fab7a7f3d1e15331035 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 01:08:43 +0800
Subject: [PATCH 19/28] fix(chat): keep composer controls from overflowing

---
 .../web/src/components/git/GitBranchSelector.tsx              | 4 ++--
 crates/agent-gui/src/components/git/GitBranchSelector.tsx     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/agent-gateway/web/src/components/git/GitBranchSelector.tsx b/crates/agent-gateway/web/src/components/git/GitBranchSelector.tsx
index 5ff04c462..f26b1e971 100644
--- a/crates/agent-gateway/web/src/components/git/GitBranchSelector.tsx
+++ b/crates/agent-gateway/web/src/components/git/GitBranchSelector.tsx
@@ -489,9 +489,9 @@ export function GitBranchSelector(props: {
           title={visibleError || (!canWrite ? disabledMessage : "") || label}
         >
           {loading || mutating || initializing ? (
-            <Loader2 className="h-3.5 w-3.5 animate-spin" />
+            <Loader2 className="h-3.5 w-3.5 shrink-0 animate-spin" />
           ) : (
-            <GitBranch className="h-3.5 w-3.5 text-emerald-600 dark:text-emerald-300" />
+            <GitBranch className="h-3.5 w-3.5 shrink-0 text-emerald-600 dark:text-emerald-300" />
           )}
           <span className="min-w-0 truncate">{label}</span>
         </DropdownMenuTrigger>
diff --git a/crates/agent-gui/src/components/git/GitBranchSelector.tsx b/crates/agent-gui/src/components/git/GitBranchSelector.tsx
index ca676f325..73776572c 100644
--- a/crates/agent-gui/src/components/git/GitBranchSelector.tsx
+++ b/crates/agent-gui/src/components/git/GitBranchSelector.tsx
@@ -462,9 +462,9 @@ export function GitBranchSelector(props: {
           title={visibleError || (!canWrite ? disabledMessage : "") || label}
         >
           {loading || mutating || initializing ? (
-            <Loader2 className="h-3.5 w-3.5 animate-spin" />
+            <Loader2 className="h-3.5 w-3.5 shrink-0 animate-spin" />
           ) : (
-            <GitBranch className="h-3.5 w-3.5 text-emerald-600 dark:text-emerald-300" />
+            <GitBranch className="h-3.5 w-3.5 shrink-0 text-emerald-600 dark:text-emerald-300" />
           )}
           <span className="min-w-0 truncate">{label}</span>
         </DropdownMenuTrigger>

From 0e7d4ede377d7d4d0ddb7d509a2b5d224f2c37be Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 01:36:21 +0800
Subject: [PATCH 20/28] fix(project-tools): align resize handle with panel edge

---
 .../web/src/components/project-tools/ProjectToolsPanel.tsx      | 2 +-
 .../src/components/project-tools/ProjectToolsPanel.tsx          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
index 0b237925d..d093a4594 100644
--- a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
@@ -1446,7 +1446,7 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
               aria-label={t("projectTools.resizePanel")}
               title={t("projectTools.resizePanel")}
               className={cn(
-                "group absolute inset-y-0 left-0 z-[90] hidden w-4 -translate-x-1/2 cursor-col-resize touch-none items-center justify-center border-0 bg-transparent p-0 md:flex",
+                "group absolute inset-y-0 left-0 z-[90] hidden w-3 cursor-col-resize touch-none items-center justify-center border-0 bg-transparent p-0 md:flex",
                 "focus-visible:outline-none",
               )}
               onMouseDown={handleResizeStart}
diff --git a/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx b/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
index abff67f32..c21b65d0d 100644
--- a/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/ProjectToolsPanel.tsx
@@ -1214,7 +1214,7 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
               aria-label={t("projectTools.resizePanel")}
               title={t("projectTools.resizePanel")}
               className={cn(
-                "group absolute inset-y-0 left-0 z-[90] hidden w-4 -translate-x-1/2 cursor-col-resize touch-none items-center justify-center border-0 bg-transparent p-0 md:flex",
+                "group absolute inset-y-0 left-0 z-[90] hidden w-3 cursor-col-resize touch-none items-center justify-center border-0 bg-transparent p-0 md:flex",
                 "focus-visible:outline-none",
               )}
               onMouseDown={handleResizeStart}

From 4d999c8383dad1725e38fd36b8862a021fad9a52 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 01:59:37 +0800
Subject: [PATCH 21/28] fix(gateway): prevent mobile sidebar flash during slide

---
 crates/agent-gateway/web/src/styles.css | 52 ++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/crates/agent-gateway/web/src/styles.css b/crates/agent-gateway/web/src/styles.css
index 70e03a639..c0211eb76 100644
--- a/crates/agent-gateway/web/src/styles.css
+++ b/crates/agent-gateway/web/src/styles.css
@@ -1883,17 +1883,34 @@ html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport:
     width: min(86vw, 272px) !important;
     max-width: min(86vw, 272px);
     box-shadow: 18px 0 48px hsl(220 22% 10% / 0.16);
-    opacity: 0;
+    /* The drawer is ~86vw wide — almost the full screen on mobile. Fading the
+       opaque panel in from opacity:0 lets the chat content show through it for
+       the duration of the transition, then it snaps solid, which reads as the
+       whole page flashing. Slide only; hide the closed panel (and its shadow)
+       with `visibility` so there is no translucent blend frame. */
+    opacity: 1;
+    visibility: hidden;
     transform: translate3d(-100%, 0, 0);
     transition:
       transform 180ms cubic-bezier(0.22, 1, 0.36, 1),
-      opacity 140ms ease !important;
-    will-change: transform, opacity;
+      visibility 0s linear 180ms !important;
+    will-change: transform;
+    /* As a fixed, layer-promoted drawer, `contain: paint` (inherited from the
+       base rule) makes the compositor intermittently re-raster the covered
+       region during the slide — a one-frame whole-screen flash. Drop paint
+       containment here and pin a stable backing layer so the transform plays
+       on its own compositor layer without re-painting the page behind it. */
+    contain: layout style;
+    -webkit-backface-visibility: hidden;
+    backface-visibility: hidden;
   }
 
   .gateway-editor-host > .chat-history-sidebar[data-state="open"] {
-    opacity: 1;
+    visibility: visible;
     transform: translate3d(0, 0, 0);
+    transition:
+      transform 180ms cubic-bezier(0.22, 1, 0.36, 1),
+      visibility 0s linear 0s !important;
   }
 
   .gateway-editor-host > .chat-history-sidebar[data-state="closed"] {
@@ -1904,6 +1921,8 @@ html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport:
     width: 100%;
     min-width: 0;
     transform: translateZ(0);
+    -webkit-backface-visibility: hidden;
+    backface-visibility: hidden;
   }
 
   .gateway-footer-strip {
@@ -1919,9 +1938,30 @@ html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport:
     max-height: none;
     border: 0;
     border-radius: 0;
-    background: hsl(var(--background) / 0.97);
+    /* This panel is a full-screen (inset:0) mobile sheet. A translucent
+       background plus `backdrop-filter: blur()` means the whole viewport behind
+       it is re-sampled and blurred every frame — and because the React open
+       animation also fades opacity 0→1 and slides translateY, the panel is
+       see-through *and* blurring mid-transition, before its content paints.
+       That translucent, blurred, content-less frame is the flash. An opaque
+       sheet with no backdrop blur covers everything it covers anyway, so drop
+       both and slide only. */
+    background: hsl(var(--background));
     box-shadow: none;
-    backdrop-filter: blur(18px);
+    opacity: 1 !important;
+    visibility: hidden;
+    transition:
+      transform 200ms ease,
+      visibility 0s linear 200ms !important;
+    -webkit-backface-visibility: hidden;
+    backface-visibility: hidden;
+  }
+
+  html[data-liveagent-webui="gateway"] .project-tools-panel[data-state="open"] {
+    visibility: visible;
+    transition:
+      transform 200ms ease,
+      visibility 0s linear 0s !important;
   }
 
   html[data-liveagent-webui="gateway"] .workspace-code-editor-overlay,

From 315718c2064f59185b8a55ca7b87232ea87a2aef Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 02:11:10 +0800
Subject: [PATCH 22/28] feat(sftp): support mobile pane switching

---
 .../workspace-editor/WorkspaceSftpPanel.tsx   | 67 +++++++++++++++++--
 1 file changed, 63 insertions(+), 4 deletions(-)

diff --git a/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSftpPanel.tsx b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSftpPanel.tsx
index d3395f05a..e88970d27 100644
--- a/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSftpPanel.tsx
+++ b/crates/agent-gateway/web/src/components/workspace-editor/WorkspaceSftpPanel.tsx
@@ -637,6 +637,15 @@ function isLeavingCurrentTarget(event: React.DragEvent) {
   return !related || !(related instanceof Node) || !event.currentTarget.contains(related);
 }
 
+const MOBILE_SFTP_MEDIA_QUERY = "(max-width: 820px)";
+
+function isMobileSftpLayout() {
+  if (typeof window === "undefined") {
+    return false;
+  }
+  return window.matchMedia(MOBILE_SFTP_MEDIA_QUERY).matches;
+}
+
 export function WorkspaceSftpPanel(props: WorkspaceSftpPanelProps) {
   const { session, client, isActive, onError } = props;
   const { t } = useLocale();
@@ -670,6 +679,23 @@ export function WorkspaceSftpPanel(props: WorkspaceSftpPanelProps) {
   const [renamingEntry, setRenamingEntry] = useState(false);
   const [copyPathDialog, setCopyPathDialog] = useState<string | null>(null);
   const [copyToastVisible, setCopyToastVisible] = useState(false);
+  const [isMobileLayout, setIsMobileLayout] = useState(isMobileSftpLayout);
+  const [mobilePane, setMobilePane] = useState<SftpSide>("remote");
+
+  useEffect(() => {
+    if (typeof window === "undefined") {
+      return;
+    }
+    const mediaQueryList = window.matchMedia(MOBILE_SFTP_MEDIA_QUERY);
+    const handleChange = (event: MediaQueryListEvent) => {
+      setIsMobileLayout(event.matches);
+    };
+    setIsMobileLayout(mediaQueryList.matches);
+    mediaQueryList.addEventListener("change", handleChange);
+    return () => {
+      mediaQueryList.removeEventListener("change", handleChange);
+    };
+  }, []);
 
   const workdir = session.cwd;
   const projectPathKey = session.projectPathKey || session.cwd;
@@ -1323,9 +1349,38 @@ export function WorkspaceSftpPanel(props: WorkspaceSftpPanelProps) {
 
   return (
     <div ref={panelRef} className="relative flex h-full min-h-0 flex-col bg-background">
-      <div className="flex min-h-0 flex-1 overflow-x-auto overflow-y-hidden">
-        <div className="grid h-full min-h-0 min-w-[860px] flex-1 grid-cols-2 divide-x divide-border">
-          {panes.map(({ side, label, root, pane }) => {
+      {isMobileLayout ? (
+        <div className="flex shrink-0 items-center gap-1 border-b border-border bg-muted/30 p-1">
+          {panes.map(({ side, label }) => (
+            <button
+              key={side}
+              type="button"
+              className={cn(
+                "flex-1 rounded-md px-2 py-1.5 text-xs font-medium transition-colors",
+                mobilePane === side
+                  ? "bg-background text-foreground shadow-sm"
+                  : "text-muted-foreground hover:text-foreground",
+              )}
+              onClick={() => setMobilePane(side)}
+            >
+              {label}
+            </button>
+          ))}
+        </div>
+      ) : null}
+      <div
+        className={cn(
+          "flex min-h-0 flex-1 overflow-y-hidden",
+          isMobileLayout ? "overflow-x-hidden" : "overflow-x-auto",
+        )}
+      >
+        <div
+          className={cn(
+            "grid h-full min-h-0 flex-1 divide-x divide-border",
+            isMobileLayout ? "grid-cols-1" : "min-w-[860px] grid-cols-2",
+          )}
+        >
+          {(isMobileLayout ? panes.filter((entry) => entry.side === mobilePane) : panes).map(({ side, label, root, pane }) => {
             const dropMode =
               activeDragSource?.side === "local" && side === "remote"
                 ? "upload"
@@ -1464,7 +1519,8 @@ export function WorkspaceSftpPanel(props: WorkspaceSftpPanelProps) {
                         data-sftp-drop-path={entry.kind === "directory" ? entry.path : undefined}
                         aria-selected={isSelected}
                         className={cn(
-                          "grid w-full touch-none cursor-default grid-cols-[minmax(0,1fr)_5.5rem] items-center gap-3 rounded-md px-2 py-1.5 text-left text-xs hover:bg-muted",
+                          "grid w-full cursor-default grid-cols-[minmax(0,1fr)_5.5rem] items-center gap-3 rounded-md px-2 py-1.5 text-left text-xs hover:bg-muted",
+                          !isMobileLayout && "touch-none",
                           isSelected && "bg-emerald-500/10 text-foreground ring-1 ring-emerald-500/20",
                           activeDragSource?.side === side &&
                             dragItems(activeDragSource).some((item) => item.path === entry.path) &&
@@ -1519,6 +1575,9 @@ export function WorkspaceSftpPanel(props: WorkspaceSftpPanelProps) {
                             }, 250);
                             return;
                           }
+                          // On mobile, leave the pointer to the browser so the list scrolls
+                          // natively; transfers happen through the long-press context menu.
+                          if (isMobileLayout) return;
                           try {
                             event.currentTarget.setPointerCapture(event.pointerId);
                           } catch {

From 1ac4f88e7c82e2f7286a9d3b4fa5d38b174f4d21 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 02:26:08 +0800
Subject: [PATCH 23/28] test(gateway): restore WebUI SharedWorker coverage

---
 .github/workflows/ci.yml                      |  2 +-
 crates/agent-gateway/test/README.md           |  3 +-
 .../test/webui/gateway-socket-client.test.mjs | 68 +++++++++++++++++++
 3 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5aa7ba3fc..edcc5d83c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -117,7 +117,7 @@ jobs:
 
       - name: Test WebUI modules
         working-directory: crates/agent-gateway
-        run: node --test test/webui/*.test.mjs
+        run: node --test test/webui/*.test.mjs web/test/*.test.mjs
 
   gui:
     name: GUI
diff --git a/crates/agent-gateway/test/README.md b/crates/agent-gateway/test/README.md
index 541e5dc01..a58eac37a 100644
--- a/crates/agent-gateway/test/README.md
+++ b/crates/agent-gateway/test/README.md
@@ -9,6 +9,7 @@ All project-level gateway tests live under `crates/agent-gateway/test` and are s
 | `upload/` | `/api/files/import` validation, multipart parsing, and agent forwarding |
 | `websocket/` | WebSocket auth, request forwarding, chat streaming, and cancellation-facing events |
 | `webui/` | Browser-side WebUI helpers, auth, upload normalization, history state, live stream state, and WebSocket client behavior |
+| `../web/test/` | WebUI source-adjacent module tests for chat transcript, history scope, and live conversation commit helpers |
 | `helpers/` | Shared Node test module loader for WebUI TypeScript modules |
 
 Run Go-side tests from `crates/agent-gateway`:
@@ -20,7 +21,7 @@ go test ./...
 Run WebUI Node tests from `crates/agent-gateway`:
 
 ```sh
-node --test test/webui/*.test.mjs
+node --test test/webui/*.test.mjs web/test/*.test.mjs
 ```
 
 Run the WebUI type/build gate separately from `crates/agent-gateway/web`:
diff --git a/crates/agent-gateway/test/webui/gateway-socket-client.test.mjs b/crates/agent-gateway/test/webui/gateway-socket-client.test.mjs
index 94f891844..b72dde0a0 100644
--- a/crates/agent-gateway/test/webui/gateway-socket-client.test.mjs
+++ b/crates/agent-gateway/test/webui/gateway-socket-client.test.mjs
@@ -366,6 +366,7 @@ test("SharedWorker gateway client keeps SSH create snapshots from worker payload
     title: undefined,
     cols: undefined,
     rows: undefined,
+    sftp_enabled: false,
   });
   port.emit({
     type: "response",
@@ -526,6 +527,7 @@ test("Gateway SharedWorker broadcasts events with each port connection id", asyn
     historyListeners = [];
     conversationListeners = [];
     settingsListeners = [];
+    sftpTransferListeners = [];
 
     constructor(token) {
       this.token = token;
@@ -556,6 +558,11 @@ test("Gateway SharedWorker broadcasts events with each port connection id", asyn
       return () => {};
     }
 
+    subscribeSftpTransfers(listener) {
+      this.sftpTransferListeners.push(listener);
+      return () => {};
+    }
+
     dispose() {}
   }
 
@@ -608,6 +615,31 @@ test("Gateway SharedWorker broadcasts events with each port connection id", asyn
     payload: historyEvent,
   });
 
+  const sftpEvent = {
+    kind: "progress",
+    transfer: {
+      id: "transfer-1",
+      sessionId: "ssh-1",
+      status: "running",
+      bytesTransferred: 12,
+      totalBytes: 24,
+    },
+  };
+  clientInstances[0].sftpTransferListeners[0](sftpEvent);
+
+  assert.deepEqual(firstPort.messages.at(-1), {
+    type: "event",
+    event_type: "sftp",
+    connection_id: "connection-1",
+    payload: sftpEvent,
+  });
+  assert.deepEqual(secondPort.messages.at(-1), {
+    type: "event",
+    event_type: "sftp",
+    connection_id: "connection-2",
+    payload: sftpEvent,
+  });
+
   globalThis.onconnect = previousOnConnect;
 });
 
@@ -645,6 +677,10 @@ test("Gateway SharedWorker applies foreground wakeups to the managed socket clie
       return () => {};
     }
 
+    subscribeSftpTransfers() {
+      return () => {};
+    }
+
     noteForegroundWakeup() {
       this.wakeups += 1;
     }
@@ -710,6 +746,10 @@ test("Gateway SharedWorker terminal metadata reaches every page while output sta
       return () => {};
     }
 
+    subscribeSftpTransfers() {
+      return () => {};
+    }
+
     async listTerminals(projectPathKey) {
       this.calls.push(["listTerminals", projectPathKey ?? ""]);
       return [
@@ -854,6 +894,10 @@ test("Gateway SharedWorker forwards terminal output while attach request is pend
       return () => {};
     }
 
+    subscribeSftpTransfers() {
+      return () => {};
+    }
+
     snapshotTerminal(sessionId, maxBytes, projectPathKey) {
       this.calls.push(["snapshotTerminal", sessionId, maxBytes, projectPathKey]);
       return new Promise((resolve) => {
@@ -973,6 +1017,10 @@ test("Gateway SharedWorker keeps upstream terminal attached until every port det
       return () => {};
     }
 
+    subscribeSftpTransfers() {
+      return () => {};
+    }
+
     async snapshotTerminal(sessionId, maxBytes, projectPathKey) {
       this.calls.push(["snapshotTerminal", sessionId, maxBytes, projectPathKey]);
       return {
@@ -1145,6 +1193,10 @@ test("Gateway SharedWorker forwards chat metadata and uploaded files", async ()
       return () => {};
     }
 
+    subscribeSftpTransfers() {
+      return () => {};
+    }
+
     async *chat(...args) {
       chatCalls.push(args);
       yield { type: "done", conversation_id: "conversation-1" };
@@ -1717,6 +1769,10 @@ test("Gateway SharedWorker forwards history share requests", async () => {
       return () => {};
     }
 
+    subscribeSftpTransfers() {
+      return () => {};
+    }
+
     getHistoryShare(conversationID) {
       this.calls.push(["getHistoryShare", conversationID]);
       return {
@@ -1858,6 +1914,10 @@ test("Gateway SharedWorker forwards tunnel requests", async () => {
       return () => {};
     }
 
+    subscribeSftpTransfers() {
+      return () => {};
+    }
+
     listTunnels() {
       this.calls.push(["listTunnels"]);
       return [
@@ -2068,6 +2128,10 @@ test("Gateway SharedWorker forwards chat.attach streams to the requesting port",
       return () => {};
     }
 
+    subscribeSftpTransfers() {
+      return () => {};
+    }
+
     async *attachChat(conversationID, options) {
       this.calls.push(["attachChat", conversationID, options.afterSeq]);
       yield {
@@ -2164,6 +2228,10 @@ test("Gateway SharedWorker forwards conversation cancel without a stream id", as
       return () => {};
     }
 
+    subscribeSftpTransfers() {
+      return () => {};
+    }
+
     async cancelChat(conversationID) {
       cancelCalls.push(conversationID);
     }

From 8e4d724650cb5a59e225b418dfdddbbc041e4b8d Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 09:10:28 +0800
Subject: [PATCH 24/28] refactor(tauri): organize commands by domain

---
 .gitignore                                    |  2 +
 .../src-tauri/src/commands/{ => app}/app.rs   |  0
 .../src-tauri/src/commands/app/mod.rs         |  4 ++
 .../src/commands/{ => app}/system.rs          |  0
 .../src/commands/{ => app}/system_tools.rs    |  0
 .../src/commands/{ => app}/update.rs          |  0
 .../src/commands/{ => automation}/cron.rs     |  0
 .../src/commands/{ => automation}/hook.rs     |  0
 .../src-tauri/src/commands/automation/mod.rs  |  2 +
 .../src-tauri/src/commands/config/mod.rs      |  1 +
 .../src/commands/{ => config}/settings.rs     |  0
 .../commands/{ => history}/chat_history.rs    |  0
 .../src/commands/{ => history}/history_db.rs  |  0
 .../src-tauri/src/commands/history/mod.rs     |  3 +
 .../{ => history}/subagent_history.rs         |  0
 .../src/commands/{ => integration}/gateway.rs |  0
 .../src/commands/{ => integration}/mcp.rs     |  0
 .../src/commands/{ => integration}/memory.rs  |  0
 .../src-tauri/src/commands/integration/mod.rs |  3 +
 .../agent-gui/src-tauri/src/commands/mod.rs   | 61 +++++++++++++------
 .../src-tauri/src/commands/runtime/mod.rs     |  4 ++
 .../src/commands/{ => runtime}/process.rs     |  0
 .../src/commands/{ => runtime}/sftp.rs        |  0
 .../src/commands/{ => runtime}/shell.rs       |  0
 .../src/commands/{ => runtime}/terminal.rs    |  0
 .../src/commands/{ => workspace}/delegate.rs  |  0
 .../src/commands/{ => workspace}/fs.rs        |  0
 .../src/commands/{ => workspace}/git.rs       |  0
 .../src-tauri/src/commands/workspace/mod.rs   |  3 +
 29 files changed, 63 insertions(+), 20 deletions(-)
 rename crates/agent-gui/src-tauri/src/commands/{ => app}/app.rs (100%)
 create mode 100644 crates/agent-gui/src-tauri/src/commands/app/mod.rs
 rename crates/agent-gui/src-tauri/src/commands/{ => app}/system.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => app}/system_tools.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => app}/update.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => automation}/cron.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => automation}/hook.rs (100%)
 create mode 100644 crates/agent-gui/src-tauri/src/commands/automation/mod.rs
 create mode 100644 crates/agent-gui/src-tauri/src/commands/config/mod.rs
 rename crates/agent-gui/src-tauri/src/commands/{ => config}/settings.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => history}/chat_history.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => history}/history_db.rs (100%)
 create mode 100644 crates/agent-gui/src-tauri/src/commands/history/mod.rs
 rename crates/agent-gui/src-tauri/src/commands/{ => history}/subagent_history.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => integration}/gateway.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => integration}/mcp.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => integration}/memory.rs (100%)
 create mode 100644 crates/agent-gui/src-tauri/src/commands/integration/mod.rs
 create mode 100644 crates/agent-gui/src-tauri/src/commands/runtime/mod.rs
 rename crates/agent-gui/src-tauri/src/commands/{ => runtime}/process.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => runtime}/sftp.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => runtime}/shell.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => runtime}/terminal.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => workspace}/delegate.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => workspace}/fs.rs (100%)
 rename crates/agent-gui/src-tauri/src/commands/{ => workspace}/git.rs (100%)
 create mode 100644 crates/agent-gui/src-tauri/src/commands/workspace/mod.rs

diff --git a/.gitignore b/.gitignore
index 898cbf387..ae1553e2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ lerna-debug.log*
 .codex-artifacts
 .liveagent
 workspace
+!crates/agent-gui/src-tauri/src/commands/workspace/
+!crates/agent-gui/src-tauri/src/commands/workspace/**
 cert/
 node_modules
 dist
diff --git a/crates/agent-gui/src-tauri/src/commands/app.rs b/crates/agent-gui/src-tauri/src/commands/app/app.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/app.rs
rename to crates/agent-gui/src-tauri/src/commands/app/app.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/app/mod.rs b/crates/agent-gui/src-tauri/src/commands/app/mod.rs
new file mode 100644
index 000000000..647106fec
--- /dev/null
+++ b/crates/agent-gui/src-tauri/src/commands/app/mod.rs
@@ -0,0 +1,4 @@
+pub mod app;
+pub mod system;
+pub mod system_tools;
+pub mod update;
diff --git a/crates/agent-gui/src-tauri/src/commands/system.rs b/crates/agent-gui/src-tauri/src/commands/app/system.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/system.rs
rename to crates/agent-gui/src-tauri/src/commands/app/system.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/system_tools.rs b/crates/agent-gui/src-tauri/src/commands/app/system_tools.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/system_tools.rs
rename to crates/agent-gui/src-tauri/src/commands/app/system_tools.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/update.rs b/crates/agent-gui/src-tauri/src/commands/app/update.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/update.rs
rename to crates/agent-gui/src-tauri/src/commands/app/update.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/cron.rs b/crates/agent-gui/src-tauri/src/commands/automation/cron.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/cron.rs
rename to crates/agent-gui/src-tauri/src/commands/automation/cron.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/hook.rs b/crates/agent-gui/src-tauri/src/commands/automation/hook.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/hook.rs
rename to crates/agent-gui/src-tauri/src/commands/automation/hook.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/automation/mod.rs b/crates/agent-gui/src-tauri/src/commands/automation/mod.rs
new file mode 100644
index 000000000..2764aff03
--- /dev/null
+++ b/crates/agent-gui/src-tauri/src/commands/automation/mod.rs
@@ -0,0 +1,2 @@
+pub mod cron;
+pub mod hook;
diff --git a/crates/agent-gui/src-tauri/src/commands/config/mod.rs b/crates/agent-gui/src-tauri/src/commands/config/mod.rs
new file mode 100644
index 000000000..6e98cefd0
--- /dev/null
+++ b/crates/agent-gui/src-tauri/src/commands/config/mod.rs
@@ -0,0 +1 @@
+pub mod settings;
diff --git a/crates/agent-gui/src-tauri/src/commands/settings.rs b/crates/agent-gui/src-tauri/src/commands/config/settings.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/settings.rs
rename to crates/agent-gui/src-tauri/src/commands/config/settings.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/chat_history.rs b/crates/agent-gui/src-tauri/src/commands/history/chat_history.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/chat_history.rs
rename to crates/agent-gui/src-tauri/src/commands/history/chat_history.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/history_db.rs b/crates/agent-gui/src-tauri/src/commands/history/history_db.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/history_db.rs
rename to crates/agent-gui/src-tauri/src/commands/history/history_db.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/history/mod.rs b/crates/agent-gui/src-tauri/src/commands/history/mod.rs
new file mode 100644
index 000000000..a4cbf3ede
--- /dev/null
+++ b/crates/agent-gui/src-tauri/src/commands/history/mod.rs
@@ -0,0 +1,3 @@
+pub mod chat_history;
+pub mod history_db;
+pub mod subagent_history;
diff --git a/crates/agent-gui/src-tauri/src/commands/subagent_history.rs b/crates/agent-gui/src-tauri/src/commands/history/subagent_history.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/subagent_history.rs
rename to crates/agent-gui/src-tauri/src/commands/history/subagent_history.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/gateway.rs b/crates/agent-gui/src-tauri/src/commands/integration/gateway.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/gateway.rs
rename to crates/agent-gui/src-tauri/src/commands/integration/gateway.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/mcp.rs b/crates/agent-gui/src-tauri/src/commands/integration/mcp.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/mcp.rs
rename to crates/agent-gui/src-tauri/src/commands/integration/mcp.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/memory.rs b/crates/agent-gui/src-tauri/src/commands/integration/memory.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/memory.rs
rename to crates/agent-gui/src-tauri/src/commands/integration/memory.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/integration/mod.rs b/crates/agent-gui/src-tauri/src/commands/integration/mod.rs
new file mode 100644
index 000000000..ceb9e695a
--- /dev/null
+++ b/crates/agent-gui/src-tauri/src/commands/integration/mod.rs
@@ -0,0 +1,3 @@
+pub mod gateway;
+pub mod mcp;
+pub mod memory;
diff --git a/crates/agent-gui/src-tauri/src/commands/mod.rs b/crates/agent-gui/src-tauri/src/commands/mod.rs
index 198c0bf76..7b8b3c43f 100644
--- a/crates/agent-gui/src-tauri/src/commands/mod.rs
+++ b/crates/agent-gui/src-tauri/src/commands/mod.rs
@@ -1,20 +1,41 @@
-pub mod app;
-pub mod chat_history;
-pub mod cron;
-pub mod delegate;
-pub mod fs;
-pub mod gateway;
-pub mod git;
-pub mod history_db;
-pub mod hook;
-pub mod mcp;
-pub mod memory;
-pub mod process;
-pub mod settings;
-pub mod sftp;
-pub mod shell;
-pub mod subagent_history;
-pub mod system;
-pub mod system_tools;
-pub mod terminal;
-pub mod update;
+#[path = "app/mod.rs"]
+pub mod app_commands;
+#[path = "automation/mod.rs"]
+pub mod automation_commands;
+#[path = "config/mod.rs"]
+pub mod config_commands;
+#[path = "history/mod.rs"]
+pub mod history_commands;
+#[path = "integration/mod.rs"]
+pub mod integration_commands;
+#[path = "runtime/mod.rs"]
+pub mod runtime_commands;
+#[path = "workspace/mod.rs"]
+pub mod workspace_commands;
+
+pub use app_commands::app;
+pub use app_commands::system;
+pub use app_commands::system_tools;
+pub use app_commands::update;
+
+pub use automation_commands::cron;
+pub use automation_commands::hook;
+
+pub use config_commands::settings;
+
+pub use history_commands::chat_history;
+pub use history_commands::history_db;
+pub use history_commands::subagent_history;
+
+pub use integration_commands::gateway;
+pub use integration_commands::mcp;
+pub use integration_commands::memory;
+
+pub use runtime_commands::process;
+pub use runtime_commands::sftp;
+pub use runtime_commands::shell;
+pub use runtime_commands::terminal;
+
+pub use workspace_commands::delegate;
+pub use workspace_commands::fs;
+pub use workspace_commands::git;
diff --git a/crates/agent-gui/src-tauri/src/commands/runtime/mod.rs b/crates/agent-gui/src-tauri/src/commands/runtime/mod.rs
new file mode 100644
index 000000000..377ffd9a2
--- /dev/null
+++ b/crates/agent-gui/src-tauri/src/commands/runtime/mod.rs
@@ -0,0 +1,4 @@
+pub mod process;
+pub mod sftp;
+pub mod shell;
+pub mod terminal;
diff --git a/crates/agent-gui/src-tauri/src/commands/process.rs b/crates/agent-gui/src-tauri/src/commands/runtime/process.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/process.rs
rename to crates/agent-gui/src-tauri/src/commands/runtime/process.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/sftp.rs b/crates/agent-gui/src-tauri/src/commands/runtime/sftp.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/sftp.rs
rename to crates/agent-gui/src-tauri/src/commands/runtime/sftp.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/shell.rs b/crates/agent-gui/src-tauri/src/commands/runtime/shell.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/shell.rs
rename to crates/agent-gui/src-tauri/src/commands/runtime/shell.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/terminal.rs b/crates/agent-gui/src-tauri/src/commands/runtime/terminal.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/terminal.rs
rename to crates/agent-gui/src-tauri/src/commands/runtime/terminal.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/delegate.rs b/crates/agent-gui/src-tauri/src/commands/workspace/delegate.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/delegate.rs
rename to crates/agent-gui/src-tauri/src/commands/workspace/delegate.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/fs.rs b/crates/agent-gui/src-tauri/src/commands/workspace/fs.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/fs.rs
rename to crates/agent-gui/src-tauri/src/commands/workspace/fs.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/git.rs b/crates/agent-gui/src-tauri/src/commands/workspace/git.rs
similarity index 100%
rename from crates/agent-gui/src-tauri/src/commands/git.rs
rename to crates/agent-gui/src-tauri/src/commands/workspace/git.rs
diff --git a/crates/agent-gui/src-tauri/src/commands/workspace/mod.rs b/crates/agent-gui/src-tauri/src/commands/workspace/mod.rs
new file mode 100644
index 000000000..ada650104
--- /dev/null
+++ b/crates/agent-gui/src-tauri/src/commands/workspace/mod.rs
@@ -0,0 +1,3 @@
+pub mod delegate;
+pub mod fs;
+pub mod git;

From 94d1d2c9334b44b550dbbc36fdfadd4b8e0352f1 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 09:10:34 +0800
Subject: [PATCH 25/28] refactor(chat): split chat page modules by feature

---
 .../src/components/cron/CronPromptRunner.tsx  |    2 +-
 crates/agent-gui/src/pages/ChatPage.tsx       |  159 +-
 .../src/pages/chat/AssistantBubble.tsx        | 2961 -----------------
 .../src/pages/chat/ChatTranscript.tsx         | 1329 --------
 .../pages/chat/components/AssistantBubble.tsx |   46 +
 .../chat/{ => components}/ChatComposerBar.tsx |   20 +-
 .../chat/{ => components}/ChatHeader.tsx      |   18 +-
 .../assistant-bubble/AssistantAvatar.tsx      |   22 +
 .../assistant-bubble/EditDiffView.tsx         |   94 +
 .../HostedSearchGroupView.tsx                 |  214 ++
 .../assistant-bubble/RoundContent.tsx         |  193 ++
 .../assistant-bubble/StatusText.tsx           |   42 +
 .../assistant-bubble/ToolCallItem.tsx         |  509 +++
 .../assistant-bubble/ToolImages.tsx           |  523 +++
 .../assistant-bubble/ToolResultDisplay.tsx    |  836 +++++
 .../assistant-bubble/ToolTraceGroup.tsx       |  139 +
 .../assistant-bubble/UsagePanel.tsx           |  105 +
 .../assistant-bubble/assistantBubbleUtils.ts  |  364 ++
 .../chat/{ => gateway}/gatewayBridgeTypes.ts  |   10 +-
 .../{ => gateway}/useGatewayBridgeBatcher.ts  |   20 +-
 .../useGatewayBridgeListeners.ts              |   72 +-
 .../chat/{ => history}/historyListScope.ts    |    9 +-
 .../chat/{ => history}/useChatHistoryList.ts  |   12 +-
 .../useConversationHistoryActions.ts          |    8 +-
 .../{ => hooks}/useChatPageRuntimeStore.ts    |    6 +-
 .../pages/chat/{ => hooks}/useChatSkills.ts   |    4 +-
 .../pages/chat/{ => hooks}/useEditResend.ts   |   12 +-
 .../useLiveTranscriptController.ts            |   10 +-
 .../chat/{ => hooks}/usePendingUploads.ts     |    6 +-
 crates/agent-gui/src/pages/chat/index.ts      |   40 +
 .../{ => memory}/silentMemoryExtraction.ts    |   22 +-
 .../silentMemoryExtractionFallback.ts         |    0
 .../chat/{ => runtime}/chatPageRuntime.ts     |   10 +-
 .../{ => runtime}/compactionStatusText.ts     |    2 +-
 .../conversationContextBuilders.ts            |    2 +-
 .../{ => runtime}/conversationTitleJob.ts     |   10 +-
 .../chat/{ => runtime}/modelSelection.ts      |   12 +-
 .../pages/chat/transcript/ChatTranscript.tsx  |  276 ++
 .../transcript/EditableUserMessageBubble.tsx  |   97 +
 .../chat/transcript/TranscriptHistory.tsx     |  307 ++
 .../chat/transcript/TranscriptLiveState.tsx   |  101 +
 .../transcript/TranscriptLoadingStates.tsx    |   33 +
 .../chat/transcript/UserAttachmentCards.tsx   |  278 ++
 .../pages/chat/transcript/transcriptTypes.ts  |   61 +
 .../pages/chat/transcript/transcriptUtils.ts  |  100 +
 .../chat/transcript/uploadedImagePreview.ts   |  113 +
 .../{ => turns}/runAgentConversationTurn.ts   |   58 +-
 .../{ => turns}/runTextConversationTurn.ts    |   33 +-
 .../chat/{ => utils}/chatScrollViewport.ts    |    0
 .../chat/chat-page-runtime-cache.test.mjs     |    2 +-
 .../test/chat/conversation-title-job.test.mjs |    4 +-
 .../test/chat/history-list-scope.test.mjs     |    2 +-
 .../test/chat/model-selection.test.mjs        |    2 +-
 .../test/chat/scroll-viewport.test.mjs        |    2 +-
 ...silent-memory-extraction-fallback.test.mjs |    8 +-
 .../chat/silent-memory-extraction.test.mjs    |   24 +-
 .../test/chat/silent-memory-throttle.test.mjs |    2 +-
 57 files changed, 4781 insertions(+), 4565 deletions(-)
 delete mode 100644 crates/agent-gui/src/pages/chat/AssistantBubble.tsx
 delete mode 100644 crates/agent-gui/src/pages/chat/ChatTranscript.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/AssistantBubble.tsx
 rename crates/agent-gui/src/pages/chat/{ => components}/ChatComposerBar.tsx (97%)
 rename crates/agent-gui/src/pages/chat/{ => components}/ChatHeader.tsx (95%)
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/AssistantAvatar.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/EditDiffView.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/HostedSearchGroupView.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/RoundContent.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/StatusText.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolCallItem.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolImages.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolResultDisplay.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolTraceGroup.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/UsagePanel.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/components/assistant-bubble/assistantBubbleUtils.ts
 rename crates/agent-gui/src/pages/chat/{ => gateway}/gatewayBridgeTypes.ts (90%)
 rename crates/agent-gui/src/pages/chat/{ => gateway}/useGatewayBridgeBatcher.ts (95%)
 rename crates/agent-gui/src/pages/chat/{ => gateway}/useGatewayBridgeListeners.ts (94%)
 rename crates/agent-gui/src/pages/chat/{ => history}/historyListScope.ts (84%)
 rename crates/agent-gui/src/pages/chat/{ => history}/useChatHistoryList.ts (96%)
 rename crates/agent-gui/src/pages/chat/{ => history}/useConversationHistoryActions.ts (98%)
 rename crates/agent-gui/src/pages/chat/{ => hooks}/useChatPageRuntimeStore.ts (97%)
 rename crates/agent-gui/src/pages/chat/{ => hooks}/useChatSkills.ts (97%)
 rename crates/agent-gui/src/pages/chat/{ => hooks}/useEditResend.ts (90%)
 rename crates/agent-gui/src/pages/chat/{ => hooks}/useLiveTranscriptController.ts (98%)
 rename crates/agent-gui/src/pages/chat/{ => hooks}/usePendingUploads.ts (98%)
 create mode 100644 crates/agent-gui/src/pages/chat/index.ts
 rename crates/agent-gui/src/pages/chat/{ => memory}/silentMemoryExtraction.ts (97%)
 rename crates/agent-gui/src/pages/chat/{ => memory}/silentMemoryExtractionFallback.ts (100%)
 rename crates/agent-gui/src/pages/chat/{ => runtime}/chatPageRuntime.ts (94%)
 rename crates/agent-gui/src/pages/chat/{ => runtime}/compactionStatusText.ts (90%)
 rename crates/agent-gui/src/pages/chat/{ => runtime}/conversationContextBuilders.ts (97%)
 rename crates/agent-gui/src/pages/chat/{ => runtime}/conversationTitleJob.ts (92%)
 rename crates/agent-gui/src/pages/chat/{ => runtime}/modelSelection.ts (85%)
 create mode 100644 crates/agent-gui/src/pages/chat/transcript/ChatTranscript.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/transcript/EditableUserMessageBubble.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/transcript/TranscriptHistory.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/transcript/TranscriptLiveState.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/transcript/TranscriptLoadingStates.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/transcript/UserAttachmentCards.tsx
 create mode 100644 crates/agent-gui/src/pages/chat/transcript/transcriptTypes.ts
 create mode 100644 crates/agent-gui/src/pages/chat/transcript/transcriptUtils.ts
 create mode 100644 crates/agent-gui/src/pages/chat/transcript/uploadedImagePreview.ts
 rename crates/agent-gui/src/pages/chat/{ => turns}/runAgentConversationTurn.ts (95%)
 rename crates/agent-gui/src/pages/chat/{ => turns}/runTextConversationTurn.ts (94%)
 rename crates/agent-gui/src/pages/chat/{ => utils}/chatScrollViewport.ts (100%)

diff --git a/crates/agent-gui/src/components/cron/CronPromptRunner.tsx b/crates/agent-gui/src/components/cron/CronPromptRunner.tsx
index 1ee47c1e7..85d5e3575 100644
--- a/crates/agent-gui/src/components/cron/CronPromptRunner.tsx
+++ b/crates/agent-gui/src/components/cron/CronPromptRunner.tsx
@@ -21,7 +21,7 @@ import {
 import { buildBuiltinToolRegistry } from "../../lib/tools/builtinRegistry";
 import { createFileToolState } from "../../lib/tools/fileToolState";
 import type { SkillAccessPolicy } from "../../lib/tools/skillAccessPolicy";
-import { appendSystemPrompt } from "../../pages/chat/chatPageRuntime";
+import { appendSystemPrompt } from "../../pages/chat";
 
 type CronPromptRunnerProps = {
   settings: AppSettings;
diff --git a/crates/agent-gui/src/pages/ChatPage.tsx b/crates/agent-gui/src/pages/ChatPage.tsx
index 3bd549d3f..f117aeca2 100644
--- a/crates/agent-gui/src/pages/ChatPage.tsx
+++ b/crates/agent-gui/src/pages/ChatPage.tsx
@@ -4,16 +4,15 @@ import { listen } from "@tauri-apps/api/event";
 import { getCurrentWebview } from "@tauri-apps/api/webview";
 import { revealItemInDir } from "@tauri-apps/plugin-opener";
 import {
-  Suspense,
   lazy,
   type SetStateAction,
+  Suspense,
   useCallback,
   useEffect,
   useMemo,
   useRef,
   useState,
 } from "react";
-import { MacOsTitleBarSpacer, MacOsTitleBarToggle } from "../components/MacOsTitleBarSpacer";
 import { ChatHistorySidebar } from "../components/chat/ChatHistorySidebar";
 import { HistoryShareModal } from "../components/chat/HistoryShareModal";
 import type {
@@ -26,19 +25,20 @@ import type {
 import { type NotifyItem, NotifyToast } from "../components/chat/NotifyToast";
 import { SharedHistoryManagerModal } from "../components/chat/SharedHistoryManagerModal";
 import { Ban, PanelRightClose, PanelRightOpen, Terminal, Upload } from "../components/icons";
-import { ProjectToolsPanel } from "../components/project-tools/ProjectToolsPanel";
+import { MacOsTitleBarSpacer, MacOsTitleBarToggle } from "../components/MacOsTitleBarSpacer";
 import type {
   LocalTunnelClient,
   TunnelCreateInput,
   TunnelSummary,
   TunnelUpdateInput,
 } from "../components/project-tools/LocalTunnelPanel";
+import { ProjectToolsPanel } from "../components/project-tools/ProjectToolsPanel";
+import { Button } from "../components/ui/button";
+import { useConfirmDialog } from "../components/ui/confirm-dialog";
 import type { WorkspaceCodeEditorOpenRequest } from "../components/workspace-editor/WorkspaceCodeEditorOverlay";
-import type { WorkspaceSshTerminalOpenRequest } from "../components/workspace-editor/WorkspaceSshTerminalOverlay";
 import type { WorkspaceImagePreviewOpenRequest } from "../components/workspace-editor/WorkspaceImagePreviewOverlay";
+import type { WorkspaceSshTerminalOpenRequest } from "../components/workspace-editor/WorkspaceSshTerminalOverlay";
 import { isWorkspaceImagePath } from "../components/workspace-editor/workspaceImagePreview";
-import { Button } from "../components/ui/button";
-import { useConfirmDialog } from "../components/ui/confirm-dialog";
 import { useLocale } from "../i18n";
 import {
   type CompactionStatus,
@@ -79,7 +79,6 @@ import {
 import { clearSilentMemoryDecisions } from "../lib/chat/memory/memoryDecisionLog";
 import { clearMemoryExtractorState } from "../lib/chat/memory/memoryExtractor";
 import { buildMemoryOverviewSection } from "../lib/chat/memory/memoryPrompt";
-import { memoryDeleteProject } from "../lib/memory/api";
 import {
   createUserMessageWithUploads,
   mergePendingUploadedFiles,
@@ -99,9 +98,9 @@ import {
 } from "../lib/chat/page/chatPageHelpers";
 import { createSubagentRuntimeManager } from "../lib/chat/subagent/subagentRuntimeManager";
 import { createStreamDebugLogger } from "../lib/debug/agentDebug";
-import { createConversationHookDispatcher } from "../lib/hooks/conversationHooks";
 import { tauriGitClient } from "../lib/git/tauriGitClient";
-import { tauriSftpClient } from "../lib/sftp/tauriSftpClient";
+import { createConversationHookDispatcher } from "../lib/hooks/conversationHooks";
+import { memoryDeleteProject } from "../lib/memory/api";
 import {
   lockMonacoNlsLocale,
   preparePreferredMonacoNlsLocale,
@@ -111,6 +110,7 @@ import { createModelFromConfig, toModelValue } from "../lib/providers/llm";
 import {
   type AppSettings,
   type ChatRuntimeControls,
+  DEFAULT_WORKSPACE_PROJECT_ID,
   type ExecutionMode,
   findProviderModelConfig,
   getChatRuntimeReasoningLevelsForProvider,
@@ -125,27 +125,32 @@ import {
   isProjectToolsSshTunnelOpen,
   isProjectToolsTunnelOpen,
   normalizeChatRuntimeControlsForProvider,
-  type SelectedModel,
-  type SystemToolId,
-  type WorkspaceProject,
   removeProjectToolsProjectState,
-  DEFAULT_WORKSPACE_PROJECT_ID,
   resolveWorkspaceProjects,
-  workspaceProjectPathKey,
+  type SelectedModel,
+  type SystemToolId,
+  updateChatRuntimeControlsForProvider,
   updateCustomSettings,
-  updateProjectToolsFileTreeProjectState,
+  updateMcp,
+  updateMemorySettings,
   updateProjectToolsFileTreeOpen,
+  updateProjectToolsFileTreeProjectState,
   updateProjectToolsGitReviewOpen,
-  updateProjectToolsSshTunnelOpen,
-  updateProjectToolsTunnelOpen,
   updateProjectToolsPanelActiveTab,
   updateProjectToolsPanelTabOrder,
-  updateSshProjectHostIds,
-  updateChatRuntimeControlsForProvider,
-  updateMcp,
-  updateMemorySettings,
+  updateProjectToolsSshTunnelOpen,
+  updateProjectToolsTunnelOpen,
   updateSkills,
+  updateSshProjectHostIds,
+  type WorkspaceProject,
+  workspaceProjectPathKey,
 } from "../lib/settings";
+import { tauriSftpClient } from "../lib/sftp/tauriSftpClient";
+import {
+  buildSkillsSystemPrompt,
+  mergeAlwaysEnabledSkillNames,
+  resolveExplicitSkillMentions,
+} from "../lib/skills";
 import {
   applyTerminalEventToSessions,
   sortTerminalSessions,
@@ -153,6 +158,7 @@ import {
 } from "../lib/terminal/sessionStore";
 import { tauriTerminalClient } from "../lib/terminal/tauriTerminalClient";
 import type { TerminalSession } from "../lib/terminal/types";
+import type { SkillAccessPolicy } from "../lib/tools/skillAccessPolicy";
 import {
   applyWorkspaceProjectConversationActivityMap,
   buildWorkspaceProjectActivityUpdatedAts,
@@ -163,49 +169,38 @@ import {
   workspaceProjectActivityUpdatedAtsEqual,
 } from "../lib/workspaceProjects";
 import {
-  buildSkillsSystemPrompt,
-  mergeAlwaysEnabledSkillNames,
-  resolveExplicitSkillMentions,
-} from "../lib/skills";
-import type { SkillAccessPolicy } from "../lib/tools/skillAccessPolicy";
-import { ChatComposerBar } from "./chat/ChatComposerBar";
-import { ChatHeader } from "./chat/ChatHeader";
-import { ChatTranscript } from "./chat/ChatTranscript";
-import {
-  buildErrorAssistantMessage,
-  createConversationRuntimeEntry,
-  formatHookWarningMessage,
-  pruneIdleConversationRuntimeCaches,
-  setConversationRuntimeCacheEntry,
-} from "./chat/chatPageRuntime";
-import { buildPreCompactionStatus } from "./chat/compactionStatusText";
-import {
+  type ActiveGatewayBridgeRequest,
   buildCompactionContext,
+  buildErrorAssistantMessage,
+  buildPreCompactionStatus,
   buildPreparedContext as buildPreparedConversationContext,
   buildResumeContext as buildResumeConversationContext,
-} from "./chat/conversationContextBuilders";
-import { startConversationTitleJob } from "./chat/conversationTitleJob";
-import {
-  type ActiveGatewayBridgeRequest,
-  type EnsureGatewayBridgeConversationReadyOptions,
-  type SendChatAction,
-} from "./chat/gatewayBridgeTypes";
-import {
+  ChatComposerBar,
+  ChatHeader,
+  ChatTranscript,
+  clearSilentMemoryExtractionState,
+  createConversationRuntimeEntry,
   type EffectiveChatModelSelection,
+  type EnsureGatewayBridgeConversationReadyOptions,
+  formatHookWarningMessage,
+  MAX_UPLOAD_FILES,
+  pruneIdleConversationRuntimeCaches,
   resolveEffectiveChatModelSelection,
-} from "./chat/modelSelection";
-import { runAgentConversationTurn } from "./chat/runAgentConversationTurn";
-import { runTextConversationTurn } from "./chat/runTextConversationTurn";
-import { clearSilentMemoryExtractionState } from "./chat/silentMemoryExtraction";
-import { useChatHistoryList } from "./chat/useChatHistoryList";
-import { useChatPageRuntimeStore } from "./chat/useChatPageRuntimeStore";
-import { useChatSkills } from "./chat/useChatSkills";
-import { useConversationHistoryActions } from "./chat/useConversationHistoryActions";
-import { useEditResend } from "./chat/useEditResend";
-import { useGatewayBridgeBatcher } from "./chat/useGatewayBridgeBatcher";
-import { useGatewayBridgeListeners } from "./chat/useGatewayBridgeListeners";
-import { useLiveTranscriptController } from "./chat/useLiveTranscriptController";
-import { MAX_UPLOAD_FILES, usePendingUploads } from "./chat/usePendingUploads";
+  runAgentConversationTurn,
+  runTextConversationTurn,
+  type SendChatAction,
+  setConversationRuntimeCacheEntry,
+  startConversationTitleJob,
+  useChatHistoryList,
+  useChatPageRuntimeStore,
+  useChatSkills,
+  useConversationHistoryActions,
+  useEditResend,
+  useGatewayBridgeBatcher,
+  useGatewayBridgeListeners,
+  useLiveTranscriptController,
+  usePendingUploads,
+} from "./chat";
 import { McpHubPage } from "./mcp-hub/McpHubPage";
 import type { SectionId } from "./settings/types";
 import { SkillsHubPage } from "./skills-hub/SkillsHubPage";
@@ -1062,20 +1057,24 @@ export function ChatPage(props: ChatPageProps) {
     [activateWorkspaceProject, checkWorkspaceProjectDirectory, setSettings],
   );
 
-  const openTunnelToolPanel = useCallback((projectPathKey?: string) => {
-    const targetProjectPathKey =
-      workspaceProjectPathKey(projectPathKey) || workspaceProjectPathKey(activeWorkspaceProjectPath);
-    if (!targetProjectPathKey) return;
-    setActiveView("chat");
-    setProjectToolsPanelOpen(true);
-    setSettings((prev) =>
-      updateProjectToolsTunnelOpen(
-        updateProjectToolsPanelActiveTab(prev, targetProjectPathKey, "tunnel"),
-        targetProjectPathKey,
-        true,
-      ),
-    );
-  }, [activeWorkspaceProjectPath, setSettings]);
+  const openTunnelToolPanel = useCallback(
+    (projectPathKey?: string) => {
+      const targetProjectPathKey =
+        workspaceProjectPathKey(projectPathKey) ||
+        workspaceProjectPathKey(activeWorkspaceProjectPath);
+      if (!targetProjectPathKey) return;
+      setActiveView("chat");
+      setProjectToolsPanelOpen(true);
+      setSettings((prev) =>
+        updateProjectToolsTunnelOpen(
+          updateProjectToolsPanelActiveTab(prev, targetProjectPathKey, "tunnel"),
+          targetProjectPathKey,
+          true,
+        ),
+      );
+    },
+    [activeWorkspaceProjectPath, setSettings],
+  );
 
   const handleBrowseWorkspaceProjectInSystemFileManager = useCallback(
     async (project: WorkspaceProject) => {
@@ -2674,7 +2673,10 @@ export function ChatPage(props: ChatPageProps) {
       gatewayBridgeRequest?.selectedSystemToolIdsOverride ??
       settings.system.selectedSystemTools;
     const effectiveProjectPathKey = workspaceProjectPathKey(effectiveWorkdir);
-    const effectiveAssociatedSshHostIds = getSshProjectHostIds(settings.ssh, effectiveProjectPathKey);
+    const effectiveAssociatedSshHostIds = getSshProjectHostIds(
+      settings.ssh,
+      effectiveProjectPathKey,
+    );
     const effectiveIsAgentDevExecutionMode = isAgentDevMode(effectiveExecutionMode);
     const effectiveSkillsEnabled = settings.skills.enabled && effectiveIsAgentMode;
     const hasRemoteGatewayTarget =
@@ -4713,10 +4715,7 @@ export function ChatPage(props: ChatPageProps) {
         width={settings.customSettings.projectToolsPanel.width}
         theme={settings.theme}
         disabledMessage={terminalDisabledMessage}
-        activeTab={getProjectToolsPanelActiveTab(
-          settings.customSettings,
-          terminalProjectPathKey,
-        )}
+        activeTab={getProjectToolsPanelActiveTab(settings.customSettings, terminalProjectPathKey)}
         tabOrder={getProjectToolsPanelTabOrder(settings.customSettings, terminalProjectPathKey)}
         fileTreeOpen={projectToolsFileTreeOpen}
         fileTreeState={getProjectToolsFileTreeProjectState(
@@ -4770,9 +4769,7 @@ export function ChatPage(props: ChatPageProps) {
           setSettings((prev) => updateProjectToolsTunnelOpen(prev, terminalProjectPathKey, open))
         }
         onSshTunnelOpenChange={(open) =>
-          setSettings((prev) =>
-            updateProjectToolsSshTunnelOpen(prev, terminalProjectPathKey, open),
-          )
+          setSettings((prev) => updateProjectToolsSshTunnelOpen(prev, terminalProjectPathKey, open))
         }
         onSshProjectHostIdsChange={(hostIds) =>
           setSettings((prev) => updateSshProjectHostIds(prev, terminalProjectPathKey, hostIds))
diff --git a/crates/agent-gui/src/pages/chat/AssistantBubble.tsx b/crates/agent-gui/src/pages/chat/AssistantBubble.tsx
deleted file mode 100644
index 5f4762ee8..000000000
--- a/crates/agent-gui/src/pages/chat/AssistantBubble.tsx
+++ /dev/null
@@ -1,2961 +0,0 @@
-import { generateDiffFile } from "@git-diff-view/file";
-import { DiffModeEnum, DiffView } from "@git-diff-view/react";
-import type { ImageContent, ToolResultMessage, Usage } from "@earendil-works/pi-ai";
-import { memo, type ReactNode, useEffect, useMemo, useRef, useState } from "react";
-import iconSimpleUrl from "../../../src-tauri/icons/icon-simple.png";
-import type { IconComponent } from "../../components/icons";
-import {
-  Bot,
-  Brain,
-  ChevronRight,
-  Eye,
-  FilePenLine,
-  FileText,
-  FolderTree,
-  ImageIcon,
-  ImageOff,
-  Loader2,
-  Plug,
-  Search,
-  Server,
-  Sparkles,
-  Terminal,
-  Trash2,
-  Wrench,
-} from "../../components/icons";
-import "@git-diff-view/react/styles/diff-view.css";
-
-import { ImagePreview, type ImagePreviewSlide } from "../../components/chat/ImagePreview";
-import { LiveMarkdown, Markdown } from "../../components/Markdown";
-import { useLocale } from "../../i18n";
-import type { HostedSearchBlock } from "../../lib/chat/messages/hostedSearch";
-import {
-  previewText,
-  safeStringify,
-  summarizeToolCall,
-  type ToolTraceItem,
-  toolCallArgsForDisplay,
-  toolResultMessageToText,
-  type UiRound,
-} from "../../lib/chat/messages/uiMessages";
-import { normalizeLiveToolStatus, VIBING_STATUS } from "../../lib/chat/page/chatPageHelpers";
-import { prepareImageProxyUrl } from "../../lib/providers/proxy";
-import { cn } from "../../lib/shared/utils";
-import type {
-  DelegateAgentCardResultDetails,
-  DeleteResultDetails,
-  DisplayImageItemDetails,
-  DisplayImageResultDetails,
-  EditResultDetails,
-  GlobResultDetails,
-  GrepResultDetails,
-  ListResultDetails,
-  McpManagerResultDetails,
-  ReadDocumentResultDetails,
-  ReadImageResultDetails,
-  ReadNotebookResultDetails,
-  ReadPdfResultDetails,
-  ReadTextResultDetails,
-  SkillsManagerResultDetails,
-  SubagentMessageResultDetails,
-  WriteResultDetails,
-} from "../../lib/tools/builtinTypes";
-
-export function AssistantAvatar(props: { className?: string }) {
-  const { className } = props;
-  return (
-    <div
-      className={cn(
-        "mt-0.5 flex h-7 w-7 shrink-0 items-center justify-center rounded-full border border-border/60 bg-background/80 shadow-sm dark:bg-background/70",
-        className,
-      )}
-    >
-      <img
-        src={iconSimpleUrl}
-        alt=""
-        aria-hidden="true"
-        draggable={false}
-        className="h-6 w-6 select-none object-contain"
-      />
-    </div>
-  );
-}
-
-function hasDisplayableUsage(usage: Usage | undefined): usage is Usage {
-  if (!usage) return false;
-
-  return (
-    usage.totalTokens > 0 ||
-    usage.input > 0 ||
-    usage.output > 0 ||
-    usage.cacheRead > 0 ||
-    usage.cacheWrite > 0 ||
-    (usage.cost?.total ?? 0) > 0
-  );
-}
-
-function formatUsageNumber(value: number, locale: string) {
-  return new Intl.NumberFormat(locale, {
-    maximumFractionDigits: 0,
-  }).format(value);
-}
-
-function formatUsageCost(value: number, locale: string) {
-  if (value <= 0) return "$0";
-
-  const maximumFractionDigits = value >= 1 ? 2 : value >= 0.01 ? 4 : 6;
-  return `$${new Intl.NumberFormat(locale, {
-    minimumFractionDigits: 0,
-    maximumFractionDigits,
-  }).format(value)}`;
-}
-
-function UsagePanel(props: { usage?: Usage; contextWindow?: number }) {
-  const { usage, contextWindow } = props;
-  const { t, locale } = useLocale();
-
-  if (!hasDisplayableUsage(usage)) return null;
-
-  const stats: Array<{ key: string; label: string; value: string }> = [
-    ...(typeof contextWindow === "number" && contextWindow > 0
-      ? [
-          {
-            key: "context-window",
-            label: t("chat.contextWindow"),
-            value: formatUsageNumber(contextWindow, locale),
-          },
-        ]
-      : []),
-    {
-      key: "total",
-      label: t("chat.usageTotal"),
-      value: formatUsageNumber(usage.totalTokens, locale),
-    },
-    {
-      key: "input",
-      label: t("chat.usageInput"),
-      value: formatUsageNumber(usage.input, locale),
-    },
-    {
-      key: "output",
-      label: t("chat.usageOutput"),
-      value: formatUsageNumber(usage.output, locale),
-    },
-    ...(usage.cacheRead > 0
-      ? [
-          {
-            key: "cache-read",
-            label: t("chat.usageCacheRead"),
-            value: formatUsageNumber(usage.cacheRead, locale),
-          },
-        ]
-      : []),
-    ...(usage.cacheWrite > 0
-      ? [
-          {
-            key: "cache-write",
-            label: t("chat.usageCacheWrite"),
-            value: formatUsageNumber(usage.cacheWrite, locale),
-          },
-        ]
-      : []),
-    ...((usage.cost?.total ?? 0) > 0
-      ? [
-          {
-            key: "cost",
-            label: t("chat.usageCost"),
-            value: formatUsageCost(usage.cost?.total ?? 0, locale),
-          },
-        ]
-      : []),
-  ];
-
-  return (
-    <div className="overflow-x-auto pt-0.5 text-[12px] leading-5 whitespace-nowrap text-muted-foreground/80">
-      {stats.map((item, index) => (
-        <span key={item.key}>
-          {index > 0 ? <span className="px-1.5 text-muted-foreground/45">·</span> : null}
-          <span>{item.label}</span>
-          <span className="ml-1 font-medium text-foreground/85">{item.value}</span>
-        </span>
-      ))}
-    </div>
-  );
-}
-
-export function VibingText({ className }: { className?: string }) {
-  return <AnimatedStatusText text={VIBING_STATUS} className={className} />;
-}
-
-export function CompactingText({ className }: { className?: string }) {
-  const { t } = useLocale();
-  return <AnimatedStatusText text={t("chat.compactingContext")} className={className} />;
-}
-
-function AnimatedStatusText(props: { text: string; className?: string }) {
-  const { text, className } = props;
-  return (
-    <span className={cn("vibing-status", className)} aria-label={text}>
-      {Array.from(text).map((char, idx) => (
-        <span
-          key={`${char}-${idx}`}
-          aria-hidden="true"
-          className="vibing-status-char"
-          style={{ animationDelay: `${idx * 0.08}s` }}
-        >
-          {char === " " ? "\u00A0" : char}
-        </span>
-      ))}
-    </span>
-  );
-}
-
-function ThinkingBlock({ text, open }: { text: string; open?: boolean }) {
-  if (!/\S/.test(text || "")) return null;
-  const { t } = useLocale();
-  const [isOpen, setIsOpen] = useState(typeof open === "boolean" ? open : false);
-  const userInteractedRef = useRef(false);
-
-  useEffect(() => {
-    if (!userInteractedRef.current && typeof open === "boolean") {
-      setIsOpen(open);
-    }
-  }, [open]);
-
-  return (
-    <div className="group/think rounded-lg border border-border/40 bg-muted/30">
-      <button
-        type="button"
-        aria-expanded={isOpen}
-        onClick={() => {
-          userInteractedRef.current = true;
-          setIsOpen((prev) => !prev);
-        }}
-        className="thinking-block-toggle flex w-full cursor-pointer select-none items-center gap-2 px-3 py-2 text-[13px] text-muted-foreground transition-colors hover:text-foreground"
-      >
-        <Sparkles className="h-3.5 w-3.5 text-muted-foreground/70" />
-        <span className="thinking-block-label font-medium">{t("chat.thinkingProcess")}</span>
-        <ChevronRight
-          className={`ml-auto h-3 w-3 transition-transform ${isOpen ? "rotate-90" : ""}`}
-        />
-      </button>
-      {isOpen ? (
-        <div className="border-t border-border/30 px-3 pb-3 pt-2">
-          <pre className="thinking-block-pre max-h-64 overflow-auto whitespace-pre-wrap rounded-md bg-muted/40 p-3 text-[12.5px] leading-relaxed text-muted-foreground">
-            {text}
-          </pre>
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-function getHostedSearchStatusLabel(
-  t: (key: string) => string,
-  status: HostedSearchBlock["status"],
-) {
-  switch (status) {
-    case "failed":
-      return t("chat.search.failed");
-    case "completed":
-      return t("chat.search.completed");
-    case "searching":
-    default:
-      return t("chat.search.searching");
-  }
-}
-
-function getSourceHost(url: string) {
-  try {
-    return new URL(url).hostname.replace(/^www\./, "");
-  } catch {
-    return url;
-  }
-}
-
-function getHostedSearchGroupStatus(items: HostedSearchBlock[]): HostedSearchBlock["status"] {
-  if (items.some((item) => item.status === "searching")) return "searching";
-  if (items.every((item) => item.status === "failed")) return "failed";
-  return "completed";
-}
-
-function getUniqueHostedSearchQueries(items: HostedSearchBlock[]) {
-  const out: string[] = [];
-  for (const item of items) {
-    for (const query of item.queries) {
-      const text = query.trim();
-      if (text && !out.includes(text)) out.push(text);
-    }
-  }
-  return out;
-}
-
-function getUniqueHostedSearchSources(items: HostedSearchBlock[]) {
-  const out = new Map<string, HostedSearchBlock["sources"][number]>();
-  for (const item of items) {
-    for (const source of item.sources) {
-      if (!source.url || out.has(source.url)) continue;
-      out.set(source.url, source);
-    }
-  }
-  return [...out.values()];
-}
-
-function getLatestHostedSearchTitle(
-  items: HostedSearchBlock[],
-  t: (key: string) => string,
-  status: HostedSearchBlock["status"],
-) {
-  for (let itemIndex = items.length - 1; itemIndex >= 0; itemIndex -= 1) {
-    const item = items[itemIndex];
-    for (let queryIndex = item.queries.length - 1; queryIndex >= 0; queryIndex -= 1) {
-      const query = item.queries[queryIndex]?.trim();
-      if (query) return query;
-    }
-    const latestSource = item.sources[item.sources.length - 1];
-    if (latestSource?.title) return latestSource.title;
-    if (latestSource?.url) return getSourceHost(latestSource.url);
-  }
-  if (status !== "searching") return getHostedSearchStatusLabel(t, status);
-  return t("chat.search.noQuery");
-}
-
-function getHostedSearchCountLabel(count: number, t: (key: string) => string) {
-  return count <= 1 ? t("chat.search.oneSearch") : `${count} ${t("chat.search.searches")}`;
-}
-
-function HostedSearchGroupView({ items }: { items: HostedSearchBlock[] }) {
-  const { t } = useLocale();
-  const [open, setOpen] = useState(false);
-  const queries = useMemo(() => getUniqueHostedSearchQueries(items), [items]);
-  const sources = useMemo(() => getUniqueHostedSearchSources(items), [items]);
-  const visibleSources = sources.slice(0, 10);
-  const status = getHostedSearchGroupStatus(items);
-  const statusLabel = getHostedSearchStatusLabel(t, status);
-  const latestTitle = getLatestHostedSearchTitle(items, t, status);
-  const isSearching = status === "searching";
-  const hasDetails = queries.length > 0 || visibleSources.length > 0;
-  const statusBgClass =
-    status === "failed"
-      ? "bg-[hsl(var(--chat-error)/0.1)] text-[hsl(var(--chat-error))]"
-      : status === "searching"
-        ? "bg-[hsl(var(--chat-running)/0.1)] text-[hsl(var(--chat-running))]"
-        : "bg-[hsl(var(--chat-success)/0.1)] text-[hsl(var(--chat-success))]";
-  const dotClass =
-    status === "failed"
-      ? "bg-[hsl(var(--chat-error))]"
-      : status === "searching"
-        ? "bg-[hsl(var(--chat-running))] animate-pulse"
-        : "bg-[hsl(var(--chat-success))]";
-
-  return (
-    <div className="tool-card-enter min-w-0 max-w-full overflow-hidden rounded-[12px] border border-black/[0.06] bg-white/[0.72] shadow-[0_0_0_0.5px_rgba(0,0,0,0.03),0_1px_2px_rgba(0,0,0,0.03),0_2px_6px_rgba(0,0,0,0.02)] backdrop-blur-xl backdrop-saturate-[1.8] transition-shadow duration-200 hover:shadow-[0_0_0_0.5px_rgba(0,0,0,0.04),0_1px_3px_rgba(0,0,0,0.05),0_4px_14px_rgba(0,0,0,0.04)] dark:border-white/[0.1] dark:bg-white/[0.06] dark:shadow-[0_0_0_0.5px_rgba(255,255,255,0.04),0_1px_2px_rgba(0,0,0,0.2),0_3px_8px_rgba(0,0,0,0.12)] dark:backdrop-saturate-[1.4] dark:hover:shadow-[0_0_0_0.5px_rgba(255,255,255,0.06),0_1px_3px_rgba(0,0,0,0.25),0_4px_14px_rgba(0,0,0,0.18)]">
-      <button
-        type="button"
-        aria-expanded={open}
-        aria-label={open ? t("chat.search.collapseActivity") : t("chat.search.expandActivity")}
-        className="grid w-full cursor-pointer select-none grid-cols-[auto_minmax(0,1fr)_auto] items-start gap-x-2 gap-y-1 px-2.5 py-2 text-left transition-colors hover:bg-black/[0.018] active:bg-black/[0.035] dark:hover:bg-white/[0.025] dark:active:bg-white/[0.045] sm:items-center"
-        onClick={() => setOpen((prev) => !prev)}
-      >
-        <div
-          className="relative mt-0.5 flex h-[24px] w-[24px] shrink-0 items-center justify-center rounded-[7px] sm:mt-0"
-          style={{
-            background:
-              "linear-gradient(135deg, hsl(var(--tool-search-accent) / 0.13), hsl(var(--tool-search-accent) / 0.06))",
-          }}
-        >
-          {isSearching ? (
-            <span className="absolute inset-0 animate-ping rounded-[7px] bg-[hsl(var(--tool-search-accent)/0.16)]" />
-          ) : null}
-          <Search className="relative h-3.5 w-3.5 text-[hsl(var(--tool-search-accent))]" />
-        </div>
-
-        <div className="min-w-0 space-y-0.5 sm:grid sm:grid-cols-[auto_minmax(0,1fr)] sm:items-center sm:gap-2 sm:space-y-0">
-          <div className="flex min-w-0 items-center gap-1.5">
-            <span className="inline-flex h-5 shrink-0 items-center text-[12.5px] font-semibold leading-none text-foreground/90">
-              {t("chat.search.webSearch")}
-            </span>
-            <span className="inline-flex h-5 max-w-[5.75rem] shrink-0 items-center truncate rounded-full bg-black/[0.04] px-1.5 text-[10.5px] font-semibold leading-none text-muted-foreground/70 dark:bg-white/[0.06]">
-              {getHostedSearchCountLabel(items.length, t)}
-            </span>
-          </div>
-          <span
-            key={latestTitle}
-            className={cn(
-              "block h-4 min-w-0 truncate text-[11px] leading-4 text-muted-foreground/60 transition-opacity duration-200 sm:inline-flex sm:h-5 sm:items-center sm:leading-none",
-              isSearching ? "animate-pulse" : "",
-            )}
-            title={latestTitle}
-          >
-            {latestTitle}
-          </span>
-        </div>
-
-        <div className="flex h-5 min-w-0 shrink-0 items-center gap-1.5 justify-self-end">
-          <span className={cn("inline-block h-1.5 w-1.5 rounded-full", dotClass)} />
-          <span
-            className={cn(
-              "inline-flex h-5 max-w-[5.5rem] items-center truncate rounded-full px-1.5 text-[10px] font-semibold leading-none",
-              statusBgClass,
-            )}
-          >
-            {statusLabel}
-          </span>
-          <ChevronRight
-            className={cn(
-              "h-3 w-3 text-muted-foreground/35 transition-transform duration-200 ease-out",
-              open ? "rotate-90" : "",
-            )}
-          />
-        </div>
-      </button>
-
-      {open && hasDetails ? (
-        <div className="tool-trace-group-body space-y-2 border-t border-black/[0.04] px-2.5 py-2.5 dark:border-white/[0.05]">
-          {queries.length > 0 ? (
-            <div className="flex flex-wrap gap-1.5">
-              {queries.map((query) => (
-                <span
-                  key={query}
-                  className="tool-arg-pill min-w-0 max-w-full truncate rounded-[6px] border border-border/35 bg-background/65 px-2 py-1 text-[12px] text-foreground/85"
-                  title={query}
-                >
-                  {query}
-                </span>
-              ))}
-            </div>
-          ) : null}
-
-          {visibleSources.length > 0 ? (
-            <div className="space-y-1.5">
-              <div className="text-[11px] font-medium uppercase tracking-normal text-muted-foreground/70">
-                {t("chat.search.sources")}
-              </div>
-              <div className="grid gap-1 sm:grid-cols-2">
-                {visibleSources.map((source) => {
-                  const label = source.title || getSourceHost(source.url);
-                  return (
-                    <a
-                      key={source.url}
-                      href={source.url}
-                      target="_blank"
-                      rel="noreferrer"
-                      className="block min-w-0 max-w-full rounded-[6px] border border-transparent px-2 py-1 text-[12px] transition-colors hover:border-border/45 hover:bg-background/60"
-                      title={source.url}
-                    >
-                      <span className="block truncate font-medium text-foreground/85">{label}</span>
-                      <span className="block truncate text-muted-foreground">
-                        {getSourceHost(source.url)}
-                      </span>
-                    </a>
-                  );
-                })}
-              </div>
-            </div>
-          ) : null}
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-function getToolMeta(name: string): { Icon: IconComponent; accent: string; category: string } {
-  switch (name) {
-    case "Bash":
-    case "ManagedProcess":
-      return { Icon: Terminal, accent: "var(--tool-bash-accent)", category: "terminal" };
-    case "Read":
-      return { Icon: Eye, accent: "var(--tool-file-accent)", category: "file" };
-    case "Image":
-      return { Icon: ImageIcon, accent: "var(--tool-file-accent)", category: "file" };
-    case "SkillsManager":
-      return { Icon: Eye, accent: "var(--tool-file-accent)", category: "file" };
-    case "MemoryManager":
-      return { Icon: Brain, accent: "var(--tool-list-accent)", category: "system" };
-    case "McpManager":
-      return { Icon: Plug, accent: "var(--tool-list-accent)", category: "mcp" };
-    case "SSHManager":
-    case "SshManager":
-      return { Icon: Server, accent: "var(--tool-bash-accent)", category: "terminal" };
-    case "Agent":
-      return { Icon: Bot, accent: "var(--tool-list-accent)", category: "system" };
-    case "SendMessage":
-      return { Icon: Bot, accent: "var(--tool-list-accent)", category: "system" };
-    case "Write":
-      return { Icon: FileText, accent: "var(--tool-file-accent)", category: "file" };
-    case "Edit":
-      return { Icon: FilePenLine, accent: "var(--tool-file-accent)", category: "file" };
-    case "Delete":
-      return { Icon: Trash2, accent: "var(--tool-file-accent)", category: "file" };
-    case "Glob":
-      return { Icon: Search, accent: "var(--tool-search-accent)", category: "search" };
-    case "Grep":
-      return { Icon: Search, accent: "var(--tool-search-accent)", category: "search" };
-    case "List":
-      return { Icon: FolderTree, accent: "var(--tool-list-accent)", category: "list" };
-    default:
-      return { Icon: Wrench, accent: "var(--tool-file-accent)", category: "other" };
-  }
-}
-
-type MetaTag = { label: string; value: string };
-
-function displayString(value: unknown) {
-  return typeof value === "string" ? value.trim() : "";
-}
-
-function compactInlineText(value: unknown, maxChars = 120) {
-  const text = displayString(value).replace(/\s+/g, " ");
-  if (text.length <= maxChars) return text;
-  return `${text.slice(0, maxChars)}...`;
-}
-
-function isDelegateAgentCardToolCall(toolCall: {
-  name: string;
-  arguments?: Record<string, unknown>;
-}) {
-  return toolCall.name === "Agent" && toolCall.arguments?.delegate_agent_card === true;
-}
-
-function getDelegateAgentTask(agent: { prompt?: unknown; description?: unknown }) {
-  return displayString(agent.prompt) || displayString(agent.description);
-}
-
-function getDelegateAgentInlineSummary(item: ToolTraceItem) {
-  const details = item.toolResult?.details as Partial<DelegateAgentCardResultDetails> | undefined;
-  const agent = details?.kind === "delegate_agent_item" ? details.agent : undefined;
-  const args = item.toolCall.arguments || {};
-  const name =
-    displayString(agent?.name) ||
-    displayString(agent?.agentName) ||
-    displayString(args.name) ||
-    displayString(args.agent_id) ||
-    displayString(args.id);
-  const task = agent
-    ? getDelegateAgentTask(agent)
-    : displayString(args.prompt) || displayString(args.description);
-
-  if (name && task) return `${name} - ${compactInlineText(task, 96)}`;
-  return name || compactInlineText(task, 120);
-}
-
-function shouldShowDelegateApplyStatus(agent: DelegateAgentCardResultDetails["agent"]) {
-  if (!agent.applyStatus) return false;
-  if (agent.applyStatus === "applied" || agent.applyStatus === "failed") return true;
-  return Boolean(agent.applySkippedReason && agent.applySkippedReason !== "no_changes");
-}
-
-function shouldShowDelegateCleanupStatus(agent: DelegateAgentCardResultDetails["agent"]) {
-  return Boolean(
-    agent.worktreeCleanupStatus &&
-      agent.worktreeCleanupStatus !== "removed" &&
-      agent.worktreeCleanupStatus !== "skipped",
-  );
-}
-
-function shouldShowDelegateWorktreeLocation(agent: DelegateAgentCardResultDetails["agent"]) {
-  return Boolean(
-    agent.worktreeRoot &&
-      (agent.status === "failed" ||
-        agent.worktreeCleanupStatus === "retained" ||
-        agent.worktreeCleanupStatus === "failed"),
-  );
-}
-
-type GroupedRoundBlock =
-  | {
-      kind: "thinking";
-      key: string;
-      text: string;
-    }
-  | {
-      kind: "text";
-      key: string;
-      text: string;
-    }
-  | {
-      kind: "tool";
-      key: string;
-      item: ToolTraceItem;
-    }
-  | {
-      kind: "hostedSearch";
-      key: string;
-      item: HostedSearchBlock;
-    }
-  | {
-      kind: "hostedSearchGroup";
-      key: string;
-      items: HostedSearchBlock[];
-    }
-  | {
-      kind: "toolGroup";
-      key: string;
-      items: ToolTraceItem[];
-    };
-
-type ShellResultDetails = {
-  exit_code: number;
-  shell: string;
-  stdout: string;
-  stderr: string;
-  stdout_truncated: boolean;
-  stderr_truncated: boolean;
-  timed_out: boolean;
-  cancelled?: boolean;
-  effective_timeout_ms?: number;
-  duration_ms: number;
-};
-
-function isShellResultDetails(value: unknown): value is ShellResultDetails {
-  if (!value || typeof value !== "object") return false;
-  const candidate = value as Record<string, unknown>;
-  return (
-    typeof candidate.exit_code === "number" &&
-    typeof candidate.shell === "string" &&
-    typeof candidate.stdout === "string" &&
-    typeof candidate.stderr === "string" &&
-    typeof candidate.stdout_truncated === "boolean" &&
-    typeof candidate.stderr_truncated === "boolean" &&
-    typeof candidate.timed_out === "boolean" &&
-    typeof candidate.duration_ms === "number"
-  );
-}
-
-function summarizeShellStream(text: string, truncated: boolean) {
-  const length = text.length;
-  if (length === 0) return "empty";
-  return truncated ? `${length} chars, truncated` : `${length} chars`;
-}
-
-const stableValueSignatureCache = new WeakMap<object, string>();
-
-function getStableValueSignature(value: unknown) {
-  if (value && typeof value === "object") {
-    const cached = stableValueSignatureCache.get(value);
-    if (cached !== undefined) {
-      return cached;
-    }
-    const signature = safeStringify(value);
-    stableValueSignatureCache.set(value, signature);
-    return signature;
-  }
-  return safeStringify(value);
-}
-
-function areStableValuesEqual(previous: unknown, next: unknown) {
-  return previous === next || getStableValueSignature(previous) === getStableValueSignature(next);
-}
-
-function getToolTraceKey(item: ToolTraceItem, index: number) {
-  const id = item.toolCall.id?.trim();
-  if (id) return id;
-  return `${item.toolCall.name}-${index}-${getStableValueSignature(item.toolCall.arguments)}`;
-}
-
-function isAgentToolName(name: string) {
-  return name === "Agent";
-}
-
-function getToolDisplayName(name: string) {
-  if (name === "SshManager") return "SSHManager";
-  return name;
-}
-
-function groupRoundBlocks(blocks: UiRound["blocks"]): GroupedRoundBlock[] {
-  const groupedBlocks: GroupedRoundBlock[] = [];
-  let pendingTools: ToolTraceItem[] = [];
-  let pendingStartIndex = 0;
-  let pendingSearches: HostedSearchBlock[] = [];
-  let pendingSearchStartIndex = 0;
-
-  const flushPendingTools = () => {
-    if (pendingTools.length === 0) return;
-    if (pendingTools.length === 1) {
-      const item = pendingTools[0];
-      groupedBlocks.push({
-        kind: "tool",
-        key: `tool-${getToolTraceKey(item, pendingStartIndex)}`,
-        item,
-      });
-    } else {
-      groupedBlocks.push({
-        kind: "toolGroup",
-        key: `tool-group-${pendingStartIndex}-${pendingTools
-          .map((item, index) => getToolTraceKey(item, pendingStartIndex + index))
-          .join("|")}`,
-        items: pendingTools,
-      });
-    }
-    pendingTools = [];
-  };
-
-  const flushPendingSearches = () => {
-    if (pendingSearches.length === 0) return;
-    const firstSearch = pendingSearches[0];
-    groupedBlocks.push({
-      kind: "hostedSearchGroup",
-      key: `hosted-search-group-${firstSearch?.id || pendingSearchStartIndex}`,
-      items: pendingSearches,
-    });
-    pendingSearches = [];
-  };
-
-  blocks.forEach((block, index) => {
-    if (block.kind === "tool") {
-      flushPendingSearches();
-      if (block.item.toolCall.name === "Image" || isAgentToolName(block.item.toolCall.name)) {
-        flushPendingTools();
-        groupedBlocks.push({
-          kind: "tool",
-          key: `tool-${getToolTraceKey(block.item, index)}`,
-          item: block.item,
-        });
-        return;
-      }
-      if (pendingTools.length === 0) {
-        pendingStartIndex = index;
-      }
-      pendingTools.push(block.item);
-      return;
-    }
-
-    flushPendingTools();
-    if (block.kind === "hostedSearch") {
-      if (pendingSearches.length === 0) {
-        pendingSearchStartIndex = index;
-      }
-      pendingSearches.push(block.item);
-      return;
-    }
-    flushPendingSearches();
-    if (block.kind === "thinking") {
-      groupedBlocks.push({ kind: "thinking", key: `thinking-${index}`, text: block.text });
-      return;
-    }
-    groupedBlocks.push({ kind: "text", key: `text-${index}`, text: block.text });
-  });
-
-  flushPendingTools();
-  flushPendingSearches();
-  return groupedBlocks;
-}
-
-function getToolGroupCounts(items: ToolTraceItem[], runningToolCallIds: string[]) {
-  const runningIds = new Set(runningToolCallIds);
-  let running = 0;
-  let failed = 0;
-  let completed = 0;
-  let waiting = 0;
-
-  for (const item of items) {
-    if (item.toolCall.id && runningIds.has(item.toolCall.id)) {
-      running += 1;
-      continue;
-    }
-    if (!item.toolResult) {
-      waiting += 1;
-      continue;
-    }
-    if (item.toolResult.isError) {
-      failed += 1;
-      continue;
-    }
-    completed += 1;
-  }
-
-  return { running, failed, completed, waiting };
-}
-
-function getToolGroupComposition(items: ToolTraceItem[]) {
-  const counts = new Map<string, number>();
-  for (const item of items) {
-    const name = getToolDisplayName(item.toolCall.name);
-    counts.set(name, (counts.get(name) ?? 0) + 1);
-  }
-  return [...counts.entries()]
-    .sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]))
-    .slice(0, 4)
-    .map(([name, count]) => `${name} ${count}`)
-    .join(" · ");
-}
-
-function getDominantToolName(items: ToolTraceItem[]) {
-  const counts = new Map<string, number>();
-  for (const item of items) {
-    counts.set(item.toolCall.name, (counts.get(item.toolCall.name) ?? 0) + 1);
-  }
-  return [...counts.entries()].sort((a, b) => b[1] - a[1])[0]?.[0] ?? "Tool";
-}
-
-function ToolSection(props: { label: string; trailing?: ReactNode; children: ReactNode }) {
-  const { label, trailing, children } = props;
-  return (
-    <section className="space-y-2">
-      <div className="flex items-center gap-2">
-        <span className="shrink-0 text-[10px] font-semibold uppercase tracking-[0.18em] text-muted-foreground/52">
-          {label}
-        </span>
-        <div className="h-px flex-1 bg-black/[0.05] dark:bg-white/[0.08]" />
-        {trailing}
-      </div>
-      {children}
-    </section>
-  );
-}
-
-function ToolSurface(props: { children: ReactNode; className?: string }) {
-  const { children, className } = props;
-  return (
-    <div
-      className={cn(
-        "rounded-[10px] border border-black/[0.05] bg-white/[0.56] px-2.5 py-2 shadow-[inset_0_1px_0_rgba(255,255,255,0.58)] dark:border-white/[0.08] dark:bg-white/[0.04] dark:shadow-none",
-        className,
-      )}
-    >
-      {children}
-    </div>
-  );
-}
-
-function ToolSurfaceLabel({ label }: { label: string }) {
-  return (
-    <div className="mb-1.5 text-[10px] font-semibold uppercase tracking-[0.16em] text-muted-foreground/45">
-      {label}
-    </div>
-  );
-}
-
-function ToolFactGrid({ tags }: { tags: MetaTag[] }) {
-  if (tags.length === 0) return null;
-  return (
-    <div className="grid gap-1.5 sm:grid-cols-2">
-      {tags.map((tag) => (
-        <ToolSurface key={`${tag.label}-${tag.value}`} className="px-2.5 py-2">
-          <ToolSurfaceLabel label={tag.label} />
-          <div className="break-all font-mono text-[11px] leading-[1.55] text-foreground/78">
-            {tag.value}
-          </div>
-        </ToolSurface>
-      ))}
-    </div>
-  );
-}
-
-function buildPagedResultTags(params: {
-  label: string;
-  returned: number;
-  total: number;
-  offset: number;
-  hasMore: boolean;
-}) {
-  const { label, returned, total, offset, hasMore } = params;
-  return [
-    { label, value: `${returned}/${total}` },
-    ...(offset > 0 ? [{ label: "offset", value: String(offset) }] : []),
-    { label: "state", value: hasMore ? "partial" : "complete" },
-  ];
-}
-
-function fileRootTags(root?: string | null): MetaTag[] {
-  return root && root !== "workspace" ? [{ label: "root", value: root }] : [];
-}
-
-/** Render path with dir dimmed and filename highlighted */
-function PathDisplay({ path, className }: { path: string; className?: string }) {
-  const lastSlash = path.lastIndexOf("/");
-  if (lastSlash < 0) {
-    return (
-      <span
-        className={cn(
-          className,
-          "block max-w-full overflow-hidden text-ellipsis whitespace-nowrap break-normal",
-        )}
-        title={path}
-      >
-        {path}
-      </span>
-    );
-  }
-  const dir = path.slice(0, lastSlash + 1);
-  const file = path.slice(lastSlash + 1);
-  return (
-    <span
-      className={cn(
-        className,
-        "inline-flex max-w-full min-w-0 items-baseline overflow-hidden whitespace-nowrap break-normal",
-      )}
-      title={path}
-    >
-      <span className="min-w-0 flex-1 truncate text-muted-foreground/40">
-        {dir.length > 50 ? `…${dir.slice(-50)}` : dir}
-      </span>
-      <span className="max-w-[70%] truncate text-foreground/85">{file}</span>
-    </span>
-  );
-}
-
-/** Extract tool-specific display info */
-function getToolDisplay(toolCall: { name: string; arguments?: Record<string, unknown> }) {
-  const args = toolCall.arguments || {};
-  const name = toolCall.name;
-  const path = typeof args.path === "string" ? (args.path as string) : null;
-  const pattern = typeof args.pattern === "string" ? (args.pattern as string) : null;
-  const tags: MetaTag[] = [];
-
-  switch (name) {
-    case "Read":
-      if (typeof args.start_line === "number")
-        tags.push({ label: "start", value: String(args.start_line) });
-      if (typeof args.limit === "number") tags.push({ label: "limit", value: String(args.limit) });
-      if (typeof args.page_start === "number")
-        tags.push({ label: "page", value: String(args.page_start) });
-      if (typeof args.page_limit === "number")
-        tags.push({ label: "pages", value: String(args.page_limit) });
-      if (typeof args.cell_start === "number")
-        tags.push({ label: "cell", value: String(args.cell_start) });
-      if (typeof args.cell_limit === "number")
-        tags.push({ label: "cells", value: String(args.cell_limit) });
-      return { type: "file" as const, path, tags };
-    case "SkillsManager":
-      if (typeof args.offset === "number")
-        tags.push({ label: "start", value: String(args.offset + 1) });
-      if (typeof args.length === "number")
-        tags.push({ label: "limit", value: String(args.length) });
-      return { type: "file" as const, path, tags };
-    case "MemoryManager":
-      if (typeof args.action === "string")
-        tags.push({ label: "action", value: args.action as string });
-      if (typeof args.slug === "string") tags.push({ label: "slug", value: args.slug as string });
-      if (typeof args.scope === "string")
-        tags.push({ label: "scope", value: args.scope as string });
-      if (typeof args.type === "string") tags.push({ label: "type", value: args.type as string });
-      return { type: "generic" as const, path: null, pattern: null, tags };
-    case "McpManager":
-      if (typeof args.action === "string")
-        tags.push({ label: "action", value: args.action as string });
-      if (typeof args.server_id === "string")
-        tags.push({ label: "server", value: args.server_id as string });
-      if (Array.isArray(args.server_ids))
-        tags.push({ label: "servers", value: String(args.server_ids.length) });
-      if (typeof args.conflict === "string")
-        tags.push({ label: "conflict", value: args.conflict as string });
-      if (args.include_schema === true) tags.push({ label: "schema", value: "true" });
-      return { type: "generic" as const, path: null, pattern: null, tags };
-    case "SendMessage":
-      if (typeof args.to === "string") tags.push({ label: "to", value: args.to as string });
-      if (typeof args.channel === "string")
-        tags.push({ label: "channel", value: args.channel as string });
-      if (typeof args.subject === "string")
-        tags.push({ label: "subject", value: args.subject as string });
-      if (typeof args.summary === "string" && typeof args.subject !== "string")
-        tags.push({ label: "subject", value: args.summary as string });
-      if (typeof args.message === "string")
-        tags.push({ label: "message", value: `${(args.message as string).length} chars` });
-      return { type: "generic" as const, path: null, pattern: null, tags };
-    case "Write":
-      tags.push({ label: "mode", value: "rewrite" });
-      if (typeof args.content === "string")
-        tags.push({ label: "content", value: `${(args.content as string).length} chars` });
-      return { type: "file" as const, path, tags };
-    case "Edit":
-      if (typeof args.old_string === "string")
-        tags.push({ label: "old", value: `${(args.old_string as string).length}c` });
-      if (typeof args.new_string === "string")
-        tags.push({ label: "new", value: `${(args.new_string as string).length}c` });
-      if (typeof args.expected_replacements === "number")
-        tags.push({ label: "×", value: String(args.expected_replacements) });
-      if (args.replace_all === true) tags.push({ label: "all", value: "true" });
-      return { type: "file" as const, path, tags };
-    case "Delete":
-      return { type: "file" as const, path, tags };
-    case "List":
-      if (typeof args.depth === "number") tags.push({ label: "depth", value: String(args.depth) });
-      if (typeof args.offset === "number")
-        tags.push({ label: "offset", value: String(args.offset) });
-      if (typeof args.max_results === "number")
-        tags.push({ label: "max", value: String(args.max_results) });
-      return { type: "file" as const, path: path || "/", tags };
-    case "Glob":
-      if (typeof args.offset === "number")
-        tags.push({ label: "offset", value: String(args.offset) });
-      if (typeof args.max_results === "number")
-        tags.push({ label: "max", value: String(args.max_results) });
-      return { type: "search" as const, path, pattern, tags };
-    case "Grep":
-      if (typeof args.file_pattern === "string")
-        tags.push({ label: "filter", value: args.file_pattern as string });
-      if (typeof args.output_mode === "string")
-        tags.push({ label: "mode", value: args.output_mode as string });
-      if (typeof args.ignore_case === "boolean" && args.ignore_case)
-        tags.push({ label: "flag", value: "-i" });
-      if (typeof args.context === "number" && args.context > 0)
-        tags.push({ label: "ctx", value: String(args.context) });
-      if (typeof args.head_limit === "number")
-        tags.push({ label: "head", value: String(args.head_limit) });
-      if (args.multiline === true) tags.push({ label: "multi", value: "true" });
-      return { type: "search" as const, path, pattern, tags };
-    case "Bash":
-      return { type: "bash" as const, path: null, pattern: null, tags };
-    default: {
-      // Generic: collect all string/number/boolean args
-      const entries: MetaTag[] = [];
-      for (const [k, v] of Object.entries(args)) {
-        if (typeof v === "string")
-          entries.push({ label: k, value: v.length > 60 ? `${v.slice(0, 60)}…` : v });
-        else if (typeof v === "number" || typeof v === "boolean")
-          entries.push({ label: k, value: String(v) });
-      }
-      return { type: "generic" as const, path: null, pattern: null, tags: entries };
-    }
-  }
-}
-
-/** Inline meta tags */
-function MetaTags({ tags }: { tags: MetaTag[] }) {
-  if (tags.length === 0) return null;
-  return (
-    <div className="flex flex-wrap gap-1.5">
-      {tags.map((tag) => (
-        <span
-          key={`${tag.label}-${tag.value}`}
-          className="tool-arg-pill inline-flex min-h-6 items-center gap-1.5 rounded-full border border-black/[0.05] bg-white/[0.78] px-2 py-1 text-[10.5px] leading-none shadow-[inset_0_1px_0_rgba(255,255,255,0.65)] dark:border-white/[0.08] dark:bg-white/[0.04] dark:shadow-none"
-        >
-          <span className="font-semibold uppercase tracking-[0.12em] text-muted-foreground/55">
-            {tag.label}
-          </span>
-          <span className="h-3 w-px bg-black/[0.06] dark:bg-white/[0.08]" />
-          <span className="font-mono text-foreground/75">{tag.value}</span>
-        </span>
-      ))}
-    </div>
-  );
-}
-
-/** Expanded args display — tool-aware layout */
-function ToolArgsDisplay({ item }: { item: ToolTraceItem }) {
-  const toolCall = item.toolCall;
-  const display = getToolDisplay(toolCall);
-
-  if (isDelegateAgentCardToolCall(toolCall)) {
-    const args = toolCall.arguments || {};
-    const name = displayString(args.name) || displayString(args.agent_id) || displayString(args.id);
-    const role = displayString(args.role);
-    const task = displayString(args.prompt) || displayString(args.description);
-
-    return (
-      <div className="tool-expand flex flex-col gap-2">
-        {name ? (
-          <ToolSurface>
-            <ToolSurfaceLabel label="agent" />
-            <div className="break-words text-[11.5px] font-semibold leading-[1.55] text-foreground/86">
-              {name}
-            </div>
-          </ToolSurface>
-        ) : null}
-        {role ? (
-          <ToolSurface>
-            <ToolSurfaceLabel label="role" />
-            <div className="break-words text-[11.5px] leading-[1.55] text-foreground/78">
-              {role}
-            </div>
-          </ToolSurface>
-        ) : null}
-        {task ? (
-          <ToolSurface>
-            <ToolSurfaceLabel label="task" />
-            <div className="break-words text-[11.5px] leading-[1.6] text-foreground/82">{task}</div>
-          </ToolSurface>
-        ) : null}
-      </div>
-    );
-  }
-
-  // Bash: terminal block
-  if (display.type === "bash") {
-    const cmd =
-      typeof toolCall.arguments?.command === "string"
-        ? (toolCall.arguments.command as string).trim()
-        : "";
-    if (!cmd) return null;
-    return (
-      <ToolSurface className="overflow-hidden border-emerald-500/15 bg-zinc-950/90 px-0 py-0 shadow-[inset_0_1px_0_rgba(255,255,255,0.04)] dark:border-white/[0.08] dark:bg-zinc-950/90">
-        <ToolScrollablePre className="max-h-44 rounded-none text-emerald-300/90">
-          <span className="mr-1 select-none text-emerald-500/30">$</span>
-          {cmd}
-        </ToolScrollablePre>
-      </ToolSurface>
-    );
-  }
-
-  // File tools: target path + compact request facts
-  if (display.type === "file" && (display.path || display.tags.length > 0)) {
-    return (
-      <div className="tool-expand flex flex-col gap-2">
-        {display.path ? (
-          <ToolSurface>
-            <ToolSurfaceLabel label="path" />
-            <PathDisplay
-              path={display.path}
-              className="block min-w-0 break-all font-mono text-[11.5px] leading-[1.6]"
-            />
-          </ToolSurface>
-        ) : null}
-        {display.tags.length > 0 ? <MetaTags tags={display.tags} /> : null}
-      </div>
-    );
-  }
-
-  // Search tools: query, scope, and request facts
-  if (display.type === "search" && (display.pattern || display.path || display.tags.length > 0)) {
-    return (
-      <div className="tool-expand flex flex-col gap-2">
-        {display.pattern ? (
-          <ToolSurface>
-            <ToolSurfaceLabel label="query" />
-            <div className="flex items-start gap-2">
-              <Search className="mt-[2px] h-3.5 w-3.5 shrink-0 text-muted-foreground/35" />
-              <span className="min-w-0 break-all font-mono text-[11.5px] leading-[1.6] text-foreground/82">
-                {display.pattern}
-              </span>
-            </div>
-          </ToolSurface>
-        ) : null}
-        {display.path ? (
-          <ToolSurface>
-            <ToolSurfaceLabel label="scope" />
-            <PathDisplay
-              path={display.path}
-              className="block min-w-0 break-all font-mono text-[11.5px] leading-[1.6]"
-            />
-          </ToolSurface>
-        ) : null}
-        {display.tags.length > 0 ? <MetaTags tags={display.tags} /> : null}
-      </div>
-    );
-  }
-
-  // Generic: key-value grid
-  if (display.type === "generic" && display.tags.length > 0) {
-    return <ToolFactGrid tags={display.tags} />;
-  }
-
-  // Fallback: raw JSON
-  return (
-    <ToolSurface className="overflow-hidden px-0 py-0">
-      <ToolScrollablePre className="max-h-44 rounded-none">
-        {safeStringify(toolCallArgsForDisplay(toolCall))}
-      </ToolScrollablePre>
-    </ToolSurface>
-  );
-}
-
-function getBuiltinResultKind(result?: ToolResultMessage) {
-  if (!result?.details || typeof result.details !== "object") return null;
-  const kind = (result.details as { kind?: unknown }).kind;
-  return typeof kind === "string" ? kind : null;
-}
-
-function getToolResultImages(result?: ToolResultMessage) {
-  if (!result) return [];
-  return result.content.filter((block): block is ImageContent => block.type === "image");
-}
-
-type NativeDisplayImageEntry = {
-  detail: DisplayImageItemDetails;
-  image?: ImageContent;
-};
-
-type NativeDisplayImageProxyRequest = {
-  index: number;
-  source: string;
-};
-
-type NativeDisplayImageSourceState = {
-  src: string;
-  status: "loading" | "ready" | "error";
-};
-
-type ToolImageLoadState = "loading" | "loaded" | "error";
-
-function getImageDataUrl(image: ImageContent) {
-  return `data:${image.mimeType};base64,${image.data}`;
-}
-
-function isDisplayImageItemDetails(value: unknown): value is DisplayImageItemDetails {
-  return (
-    Boolean(value) &&
-    typeof value === "object" &&
-    typeof (value as { path?: unknown }).path === "string"
-  );
-}
-
-function getDisplayImageDetails(result: ToolResultMessage): DisplayImageItemDetails[] {
-  const details = result.details as DisplayImageResultDetails | undefined;
-  if (!details || details.kind !== "display_image" || !Array.isArray(details.images)) {
-    return [];
-  }
-  return details.images.filter(isDisplayImageItemDetails);
-}
-
-function shouldRenderDisplayImageThroughProxy(detail: DisplayImageItemDetails) {
-  return detail.renderMode === "proxy" || detail.sourceType === "url";
-}
-
-function getProxyImageSource(detail: DisplayImageItemDetails) {
-  if (!shouldRenderDisplayImageThroughProxy(detail)) return "";
-  const source = (detail.sourceUrl || detail.path || "").trim();
-  return /^https?:\/\//i.test(source) ? source : "";
-}
-
-function getNativeDisplayImageEntries(result: ToolResultMessage): NativeDisplayImageEntry[] {
-  const inlineImages = getToolResultImages(result);
-  const detailImages = getDisplayImageDetails(result);
-  if (detailImages.length > 0) {
-    let inlineImageIndex = 0;
-    const entries = detailImages
-      .map((detail) => {
-        if (shouldRenderDisplayImageThroughProxy(detail)) {
-          return { detail, image: undefined };
-        }
-        const image = inlineImages[inlineImageIndex];
-        inlineImageIndex += 1;
-        return { detail, image };
-      })
-      .filter((entry) => Boolean(entry.image) || Boolean(getProxyImageSource(entry.detail)));
-    if (entries.length > 0) return entries;
-  }
-  return inlineImages.map((image, index) => ({
-    image,
-    detail: {
-      path: `inline-image-${index + 1}`,
-      renderMode: "inline",
-      mimeType: image.mimeType,
-      sizeBytes: Math.ceil((image.data.length * 3) / 4),
-    },
-  }));
-}
-
-function getNativeDisplayImageProxyKey(entries: NativeDisplayImageEntry[]) {
-  const requests = entries
-    .map((entry, index) => {
-      const source = getProxyImageSource(entry.detail);
-      return source ? { index, source } : null;
-    })
-    .filter((request): request is NativeDisplayImageProxyRequest => request !== null);
-  return JSON.stringify(requests);
-}
-
-function parseNativeDisplayImageProxyKey(proxyKey: string): NativeDisplayImageProxyRequest[] {
-  if (!proxyKey || proxyKey === "[]") return [];
-  try {
-    const parsed = JSON.parse(proxyKey);
-    if (!Array.isArray(parsed)) return [];
-    return parsed.filter(
-      (item): item is NativeDisplayImageProxyRequest =>
-        item !== null &&
-        typeof item === "object" &&
-        typeof item.index === "number" &&
-        Number.isInteger(item.index) &&
-        item.index >= 0 &&
-        typeof item.source === "string" &&
-        item.source.length > 0,
-    );
-  } catch {
-    return [];
-  }
-}
-
-function useNativeDisplayImageSources(entries: NativeDisplayImageEntry[]) {
-  const proxyKey = getNativeDisplayImageProxyKey(entries);
-  const [proxySources, setProxySources] = useState<Record<number, NativeDisplayImageSourceState>>(
-    {},
-  );
-
-  useEffect(() => {
-    let cancelled = false;
-    const pending = parseNativeDisplayImageProxyKey(proxyKey);
-
-    if (pending.length === 0) {
-      setProxySources({});
-      return;
-    }
-
-    setProxySources(
-      Object.fromEntries(
-        pending.map(({ index }) => [index, { src: "", status: "loading" as const }]),
-      ),
-    );
-    void Promise.all(
-      pending.map(async ({ index, source }) => {
-        try {
-          const preparedSource = await prepareImageProxyUrl(source);
-          return [
-            index,
-            preparedSource
-              ? { src: preparedSource, status: "ready" as const }
-              : { src: "", status: "error" as const },
-          ] as const;
-        } catch {
-          return [index, { src: "", status: "error" as const }] as const;
-        }
-      }),
-    ).then((items) => {
-      if (cancelled) return;
-      const next: Record<number, NativeDisplayImageSourceState> = {};
-      for (const [index, source] of items) {
-        next[index] = source;
-      }
-      setProxySources(next);
-    });
-
-    return () => {
-      cancelled = true;
-    };
-  }, [proxyKey]);
-
-  return entries.map((entry, index) => {
-    if (entry.image) {
-      return { src: getImageDataUrl(entry.image), status: "ready" as const };
-    }
-    if (!getProxyImageSource(entry.detail)) {
-      return { src: "", status: "error" as const };
-    }
-    return proxySources[index] ?? { src: "", status: "loading" as const };
-  });
-}
-
-function estimateBase64Bytes(data: string) {
-  return Math.ceil((data.length * 3) / 4);
-}
-
-function formatToolResultBytes(sizeBytes: number) {
-  if (sizeBytes >= 1024 * 1024) {
-    return `${(sizeBytes / (1024 * 1024)).toFixed(1)} MB`;
-  }
-  if (sizeBytes >= 1024) {
-    return `${Math.round(sizeBytes / 1024)} KB`;
-  }
-  return `${sizeBytes} B`;
-}
-
-function getInitialImageLoadState(source: NativeDisplayImageSourceState): ToolImageLoadState {
-  if (source.status === "error") return "error";
-  if (source.status === "ready" && !source.src) return "error";
-  return "loading";
-}
-
-function formatDisplayImageLabel(t: (key: string) => string, imageCount: number, index: number) {
-  if (imageCount <= 1) return t("chat.image.display");
-  return t("chat.image.displayNumber").replace("{index}", String(index + 1));
-}
-
-function ToolImageStatusCard(props: {
-  status: "loading" | "error";
-  title?: string;
-  detail?: string;
-  className?: string;
-}) {
-  const { status, title, detail, className } = props;
-  const { t } = useLocale();
-  const isError = status === "error";
-  const Icon = isError ? ImageOff : Loader2;
-
-  return (
-    <div
-      className={cn(
-        "relative flex min-h-28 w-full flex-col items-center justify-center gap-2 overflow-hidden rounded-[8px] border border-dashed px-4 py-5 text-center",
-        isError
-          ? "border-red-500/25 bg-red-500/[0.04] text-red-700 dark:border-red-400/25 dark:bg-red-400/[0.06] dark:text-red-300"
-          : "border-black/[0.08] bg-black/[0.025] text-muted-foreground dark:border-white/[0.1] dark:bg-white/[0.035]",
-        className,
-      )}
-    >
-      <div
-        className={cn(
-          "flex h-9 w-9 items-center justify-center rounded-[8px] border bg-white/80 shadow-sm dark:bg-black/20",
-          isError ? "border-red-500/20" : "border-black/[0.06] dark:border-white/[0.08]",
-        )}
-      >
-        <Icon className={cn("h-4 w-4", !isError && "animate-spin text-primary")} />
-      </div>
-      <div className="max-w-full space-y-1">
-        <div className="text-[12px] font-medium">
-          {title ?? (isError ? t("chat.image.unavailable") : t("chat.image.loading"))}
-        </div>
-        {detail ? (
-          <div
-            className={cn(
-              "max-w-full truncate text-[11px]",
-              isError ? "text-red-700/75 dark:text-red-200/75" : "text-muted-foreground",
-            )}
-            title={detail}
-          >
-            {detail}
-          </div>
-        ) : null}
-      </div>
-      {!isError ? (
-        <div className="h-1 w-24 overflow-hidden rounded-full bg-black/[0.06] dark:bg-white/[0.08]">
-          <div className="h-full w-1/2 animate-pulse rounded-full bg-primary/55" />
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-function ToolResultImagePreview(props: {
-  image: ImageContent;
-  alt: string;
-  id: string;
-  sizeBytes?: number;
-}) {
-  const { image, alt, id, sizeBytes } = props;
-  const { t } = useLocale();
-  const [previewOpen, setPreviewOpen] = useState(false);
-  const [imageStatus, setImageStatus] = useState<ToolImageLoadState>("loading");
-  const src = getImageDataUrl(image);
-  const estimatedBytes = sizeBytes ?? estimateBase64Bytes(image.data);
-  const imageDetail = `${alt} · ${formatToolResultBytes(estimatedBytes)}`;
-  const slides = useMemo<ImagePreviewSlide[]>(
-    () => [
-      {
-        src,
-        alt,
-        title: alt,
-      },
-    ],
-    [alt, src],
-  );
-
-  useEffect(() => {
-    setImageStatus(src ? "loading" : "error");
-    setPreviewOpen(false);
-  }, [src]);
-
-  const canPreview = imageStatus === "loaded";
-
-  return (
-    <>
-      <button
-        type="button"
-        className={cn(
-          "relative block w-full overflow-hidden rounded-[8px] text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/45 disabled:opacity-100",
-          canPreview ? "cursor-zoom-in" : "cursor-default",
-        )}
-        disabled={!canPreview}
-        onClick={() => {
-          if (canPreview) setPreviewOpen(true);
-        }}
-        title={alt}
-        aria-label={
-          canPreview ? `${t("chat.image.preview")} ${alt}` : `${t("chat.image.loading")} ${alt}`
-        }
-      >
-        <div className={cn("relative w-full", imageStatus !== "loaded" && "min-h-32")}>
-          {imageStatus !== "loaded" ? (
-            <ToolImageStatusCard
-              status={imageStatus === "error" ? "error" : "loading"}
-              title={
-                imageStatus === "error" ? t("chat.image.unavailable") : t("chat.image.loading")
-              }
-              detail={imageStatus === "error" ? t("chat.image.checkGenerated") : imageDetail}
-              className="absolute inset-0 min-h-32"
-            />
-          ) : null}
-          {imageStatus !== "error" ? (
-            <img
-              key={id}
-              src={src}
-              alt={alt}
-              loading="lazy"
-              decoding="async"
-              className={cn(
-                "max-h-72 w-full rounded-[8px] object-contain transition-opacity duration-200",
-                imageStatus === "loaded"
-                  ? "opacity-100"
-                  : "pointer-events-none absolute inset-0 h-full max-h-none opacity-0",
-              )}
-              onLoad={() => setImageStatus("loaded")}
-              onError={() => setImageStatus("error")}
-            />
-          ) : null}
-        </div>
-      </button>
-      {previewOpen ? (
-        <ImagePreview open={previewOpen} slides={slides} onClose={() => setPreviewOpen(false)} />
-      ) : null}
-    </>
-  );
-}
-
-function extractResultText(result?: ToolResultMessage) {
-  return result ? toolResultMessageToText(result) : "";
-}
-
-function getNativeDisplayImagePayload(item: ToolTraceItem) {
-  const result = item.toolResult;
-  if (!result || result.isError || getBuiltinResultKind(result) !== "display_image") {
-    return null;
-  }
-
-  const entries = getNativeDisplayImageEntries(result);
-  if (entries.length === 0) {
-    return null;
-  }
-
-  return {
-    details: result.details as DisplayImageResultDetails,
-    entries,
-  };
-}
-
-function getNativeImageGridClass(imageCount: number) {
-  if (imageCount <= 1) {
-    return "my-1 flex max-w-full flex-col items-start gap-2";
-  }
-  if (imageCount === 2) {
-    return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2";
-  }
-  if (imageCount === 3) {
-    return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2 sm:grid-cols-3";
-  }
-  if (imageCount === 4) {
-    return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2 sm:grid-cols-4";
-  }
-  if (imageCount === 5) {
-    return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2 sm:grid-cols-3 lg:grid-cols-5";
-  }
-  return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2 sm:grid-cols-3 lg:grid-cols-6";
-}
-
-function isSvgDisplayImageEntry(entry: NativeDisplayImageEntry) {
-  const mimeType = entry.image?.mimeType || entry.detail.mimeType || "";
-  return mimeType.split(";")[0]?.trim().toLowerCase() === "image/svg+xml";
-}
-
-function NativeDisplayImageTile(props: {
-  source: NativeDisplayImageSourceState;
-  alt: string;
-  isGallery: boolean;
-  isSvgImage: boolean;
-  loading: "lazy" | "eager";
-  onPreview: () => void;
-}) {
-  const { source, alt, isGallery, isSvgImage, loading, onPreview } = props;
-  const { t } = useLocale();
-  const [imageStatus, setImageStatus] = useState<ToolImageLoadState>(() =>
-    getInitialImageLoadState(source),
-  );
-
-  useEffect(() => {
-    setImageStatus(getInitialImageLoadState(source));
-  }, [source.src, source.status]);
-
-  const canPreview = source.status === "ready" && imageStatus === "loaded";
-  const isWaiting = !canPreview;
-  const statusTitle =
-    imageStatus === "error"
-      ? t("chat.image.unavailable")
-      : source.status === "loading"
-        ? t("chat.image.preparing")
-        : t("chat.image.loading");
-
-  return (
-    <button
-      type="button"
-      className={cn(
-        "relative flex max-w-full items-center justify-center overflow-hidden rounded-[10px] text-left shadow-sm transition-[filter,transform] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/45 disabled:opacity-100",
-        canPreview
-          ? "cursor-zoom-in hover:brightness-[0.98]"
-          : "cursor-default hover:brightness-100",
-        isGallery && "aspect-square w-full bg-muted/30",
-        !isGallery && (isSvgImage || isWaiting) && "min-h-28 w-full max-w-3xl bg-muted/30",
-        imageStatus === "error" && "shadow-none",
-      )}
-      disabled={!canPreview}
-      aria-label={canPreview ? `${t("chat.image.preview")} ${alt}` : statusTitle}
-      onClick={() => {
-        if (canPreview) onPreview();
-      }}
-    >
-      {source.status === "ready" && source.src && imageStatus !== "error" ? (
-        <img
-          src={source.src}
-          alt={alt}
-          loading={loading}
-          decoding="async"
-          className={cn(
-            "block object-contain transition-opacity duration-200",
-            isGallery
-              ? "absolute inset-0 h-full w-full p-1"
-              : isSvgImage
-                ? "h-auto max-h-[32rem] w-full max-w-full p-1"
-                : "h-auto max-h-[32rem] max-w-full",
-            imageStatus === "loaded"
-              ? "opacity-100"
-              : "pointer-events-none absolute inset-0 h-full w-full max-h-none opacity-0",
-          )}
-          onLoad={() => setImageStatus("loaded")}
-          onError={() => setImageStatus("error")}
-        />
-      ) : null}
-      {imageStatus !== "loaded" ? (
-        <ToolImageStatusCard
-          status={imageStatus === "error" ? "error" : "loading"}
-          title={statusTitle}
-          detail={imageStatus === "error" ? t("chat.image.checkSource") : alt}
-          className={cn(
-            "rounded-[10px]",
-            isGallery ? "absolute inset-0 min-h-0" : "min-h-28 w-full max-w-3xl",
-          )}
-        />
-      ) : null}
-    </button>
-  );
-}
-
-function NativeDisplayImageBlock(props: {
-  payload: NonNullable<ReturnType<typeof getNativeDisplayImagePayload>>;
-}) {
-  const { payload } = props;
-  const { t } = useLocale();
-  const isGallery = payload.entries.length > 1;
-  const [previewIndex, setPreviewIndex] = useState<number | null>(null);
-  const imageSources = useNativeDisplayImageSources(payload.entries);
-  const slides = useMemo<ImagePreviewSlide[]>(
-    () =>
-      payload.entries.map((_entry, index) => ({
-        src: imageSources[index]?.src ?? "",
-        alt: formatDisplayImageLabel(t, payload.entries.length, index),
-        title: formatDisplayImageLabel(t, payload.entries.length, index),
-      })),
-    [imageSources, payload.entries, t],
-  );
-
-  return (
-    <>
-      <div className={getNativeImageGridClass(payload.entries.length)}>
-        {payload.entries.map((entry, index) => {
-          const id = entry.image
-            ? `${entry.image.mimeType}-${entry.image.data.length}-${index}`
-            : `${entry.detail.sourceUrl ?? entry.detail.path}-${index}`;
-          const slide = slides[index];
-          const alt = slide?.alt ?? formatDisplayImageLabel(t, payload.entries.length, index);
-          const isSvgImage = isSvgDisplayImageEntry(entry);
-          return (
-            <NativeDisplayImageTile
-              key={id}
-              source={imageSources[index] ?? { src: "", status: "loading" }}
-              alt={alt}
-              isGallery={isGallery}
-              isSvgImage={isSvgImage}
-              loading={isGallery ? "eager" : "lazy"}
-              onPreview={() => setPreviewIndex(index)}
-            />
-          );
-        })}
-      </div>
-      {previewIndex !== null ? (
-        <ImagePreview
-          open={previewIndex !== null}
-          slides={slides}
-          index={previewIndex}
-          onClose={() => setPreviewIndex(null)}
-        />
-      ) : null}
-    </>
-  );
-}
-
-function extractReadBody(text: string) {
-  const marker = text.indexOf("\n\n");
-  return marker >= 0 ? text.slice(marker + 2) : text;
-}
-
-function ToolScrollablePre(props: { children: ReactNode; className?: string }) {
-  const { children, className } = props;
-  return (
-    <pre
-      className={cn(
-        "tool-text-scroll overflow-x-auto overflow-y-auto whitespace-pre break-normal rounded-[8px] px-2.5 py-2 text-[11.5px] leading-[1.6]",
-        className,
-      )}
-    >
-      {children}
-    </pre>
-  );
-}
-
-function CodePreview(props: { text: string; maxChars?: number }) {
-  const { text, maxChars = 4000 } = props;
-  if (!/\S/.test(text)) return null;
-  return (
-    <ToolScrollablePre className="max-h-56 bg-black/[0.02] dark:bg-white/[0.03]">
-      {previewText(text, maxChars)}
-    </ToolScrollablePre>
-  );
-}
-
-function guessLangFromPath(filePath?: string): string {
-  if (!filePath) return "txt";
-  const ext = filePath.split(".").pop()?.toLowerCase();
-  const map: Record<string, string> = {
-    ts: "typescript",
-    tsx: "typescript",
-    js: "javascript",
-    jsx: "javascript",
-    py: "python",
-    rs: "rust",
-    go: "go",
-    java: "java",
-    kt: "kotlin",
-    rb: "ruby",
-    swift: "swift",
-    c: "c",
-    cpp: "cpp",
-    h: "c",
-    hpp: "cpp",
-    cs: "csharp",
-    css: "css",
-    scss: "scss",
-    html: "html",
-    vue: "vue",
-    json: "json",
-    yaml: "yaml",
-    yml: "yaml",
-    toml: "toml",
-    xml: "xml",
-    md: "markdown",
-    sql: "sql",
-    sh: "bash",
-    zsh: "bash",
-    bash: "bash",
-    dockerfile: "dockerfile",
-    lua: "lua",
-    php: "php",
-    dart: "dart",
-  };
-  return (ext && map[ext]) || "txt";
-}
-
-function useIsDark() {
-  const [isDark, setIsDark] = useState(() => document.documentElement.classList.contains("dark"));
-  useEffect(() => {
-    const observer = new MutationObserver(() => {
-      setIsDark(document.documentElement.classList.contains("dark"));
-    });
-    observer.observe(document.documentElement, { attributes: true, attributeFilter: ["class"] });
-    return () => observer.disconnect();
-  }, []);
-  return isDark;
-}
-
-function EditDiffView(props: { beforeText: string; afterText: string; filePath?: string }) {
-  const { beforeText, afterText, filePath } = props;
-  const isDark = useIsDark();
-  const lang = guessLangFromPath(filePath);
-
-  const diffFile = useMemo(() => {
-    if (!beforeText && !afterText) return undefined;
-    const instance = generateDiffFile(
-      filePath ?? "old",
-      beforeText,
-      filePath ?? "new",
-      afterText,
-      lang,
-      lang,
-    );
-    instance.init();
-    instance.buildSplitDiffLines();
-    return instance;
-  }, [beforeText, afterText, filePath, lang]);
-
-  if (!diffFile) return null;
-
-  return (
-    <div className="tool-text-scroll overflow-x-auto overflow-y-hidden rounded-[10px] border border-black/[0.06] shadow-sm dark:border-white/[0.08] dark:shadow-none">
-      <DiffView
-        diffFile={diffFile}
-        diffViewMode={DiffModeEnum.Unified}
-        diffViewTheme={isDark ? "dark" : "light"}
-        diffViewHighlight
-        diffViewWrap={false}
-        diffViewFontSize={12}
-      />
-    </div>
-  );
-}
-
-function ToolResultDisplay({ item, result }: { item: ToolTraceItem; result: ToolResultMessage }) {
-  const kind = getBuiltinResultKind(result);
-  const text = extractResultText(result);
-  const images = getToolResultImages(result);
-  const shellDetails = isShellResultDetails(result.details) ? result.details : null;
-
-  if (item.toolCall.name === "Bash") {
-    if (!shellDetails) return null;
-
-    return (
-      <ToolSurface>
-        <MetaTags
-          tags={[
-            { label: "shell", value: shellDetails.shell || "unknown" },
-            { label: "exit", value: String(shellDetails.exit_code) },
-            { label: "duration", value: `${shellDetails.duration_ms} ms` },
-            ...(typeof shellDetails.effective_timeout_ms === "number"
-              ? [{ label: "timeout_ms", value: `${shellDetails.effective_timeout_ms}` }]
-              : []),
-            {
-              label: "stdout",
-              value: summarizeShellStream(shellDetails.stdout, shellDetails.stdout_truncated),
-            },
-            {
-              label: "stderr",
-              value: summarizeShellStream(shellDetails.stderr, shellDetails.stderr_truncated),
-            },
-            ...(shellDetails.timed_out ? [{ label: "timeout", value: "true" }] : []),
-            ...(shellDetails.cancelled ? [{ label: "cancelled", value: "true" }] : []),
-          ]}
-        />
-      </ToolSurface>
-    );
-  }
-
-  if (kind === "read_text") {
-    const details = result.details as ReadTextResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              ...fileRootTags(details.root),
-              {
-                label: "lines",
-                value:
-                  details.numLines > 0
-                    ? `${details.startLine}-${details.startLine + details.numLines - 1}/${details.totalLines}`
-                    : `empty/${details.totalLines}`,
-              },
-              { label: "view", value: details.isPartialView ? "partial" : "full" },
-              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
-              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
-            ]}
-          />
-        </ToolSurface>
-        {!details.reusedExisting ? (
-          <CodePreview text={extractReadBody(text)} maxChars={8000} />
-        ) : null}
-      </div>
-    );
-  }
-
-  if (kind === "read_skill") {
-    const details = result.details as SkillsManagerResultDetails;
-    if (details.kind !== "read_skill") return null;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              {
-                label: "lines",
-                value:
-                  details.numLines > 0
-                    ? `${details.startLine}-${details.startLine + details.numLines - 1}`
-                    : `empty @ ${details.startLine}`,
-              },
-              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
-            ]}
-          />
-        </ToolSurface>
-        <CodePreview text={extractReadBody(text)} maxChars={8000} />
-      </div>
-    );
-  }
-
-  if (kind === "manage_skill") {
-    const details = result.details as Extract<SkillsManagerResultDetails, { kind: "manage_skill" }>;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              { label: "action", value: details.action },
-              { label: "root", value: details.rootDir },
-              ...(typeof details.skillsCount === "number"
-                ? [{ label: "skills", value: String(details.skillsCount) }]
-                : []),
-              ...(typeof details.installedCount === "number"
-                ? [{ label: "installed", value: String(details.installedCount) }]
-                : []),
-              ...(details.createdName ? [{ label: "created", value: details.createdName }] : []),
-              ...(typeof details.clawhubResultCount === "number"
-                ? [{ label: "clawhub", value: String(details.clawhubResultCount) }]
-                : []),
-              ...(details.clawhubSlug ? [{ label: "slug", value: details.clawhubSlug }] : []),
-              ...(typeof details.validationOk === "boolean"
-                ? [{ label: "valid", value: details.validationOk ? "true" : "false" }]
-                : []),
-              ...(details.packageArchive
-                ? [{ label: "archive", value: details.packageArchive }]
-                : []),
-              ...(details.clawhubNextCursor
-                ? [{ label: "cursor", value: details.clawhubNextCursor }]
-                : []),
-              ...(typeof details.invalidCount === "number" && details.invalidCount > 0
-                ? [{ label: "invalid", value: String(details.invalidCount) }]
-                : []),
-              ...(details.backup ? [{ label: "backup", value: details.backup }] : []),
-            ]}
-          />
-        </ToolSurface>
-        <CodePreview text={text} maxChars={8000} />
-      </div>
-    );
-  }
-
-  if (kind === "manage_mcp") {
-    const details = result.details as McpManagerResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              { label: "action", value: details.action },
-              ...(details.serverId ? [{ label: "server", value: details.serverId }] : []),
-              ...(details.transport ? [{ label: "transport", value: details.transport }] : []),
-              ...(typeof details.ok === "boolean"
-                ? [{ label: "ok", value: details.ok ? "true" : "false" }]
-                : []),
-              ...(details.phase ? [{ label: "phase", value: details.phase }] : []),
-              ...(typeof details.serverCount === "number"
-                ? [{ label: "servers", value: String(details.serverCount) }]
-                : []),
-              ...(typeof details.enabledCount === "number"
-                ? [{ label: "enabled", value: String(details.enabledCount) }]
-                : []),
-              ...(typeof details.toolsCount === "number"
-                ? [{ label: "tools", value: String(details.toolsCount) }]
-                : []),
-              ...(typeof details.changed === "boolean"
-                ? [{ label: "changed", value: details.changed ? "true" : "false" }]
-                : []),
-              ...(typeof details.stopped === "boolean"
-                ? [{ label: "stopped", value: details.stopped ? "true" : "false" }]
-                : []),
-            ]}
-          />
-        </ToolSurface>
-        <CodePreview text={text} maxChars={8000} />
-      </div>
-    );
-  }
-
-  if (kind === "read_image") {
-    const details = result.details as ReadImageResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              ...fileRootTags(details.root),
-              { label: "mime", value: details.mimeType },
-              { label: "size", value: `${details.sizeBytes} bytes` },
-              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
-            ]}
-          />
-        </ToolSurface>
-        {!details.reusedExisting && images.length > 0 ? (
-          <div className="overflow-hidden rounded-[10px] border border-black/[0.06] bg-white/[0.55] p-2 dark:border-white/[0.08] dark:bg-white/[0.04]">
-            {images.map((image, index) => (
-              <ToolResultImagePreview
-                key={`${details.path}-${index}`}
-                id={`${details.path}-${index}`}
-                image={image}
-                alt={details.path}
-                sizeBytes={details.sizeBytes}
-              />
-            ))}
-          </div>
-        ) : null}
-      </div>
-    );
-  }
-
-  if (kind === "read_pdf") {
-    const details = result.details as ReadPdfResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              ...fileRootTags(details.root),
-              {
-                label: "pages",
-                value:
-                  details.numPages > 0
-                    ? `${details.pageStart}-${details.pageStart + details.numPages - 1}/${details.totalPages}`
-                    : `empty/${details.totalPages}`,
-              },
-              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
-              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
-            ]}
-          />
-        </ToolSurface>
-        {!details.reusedExisting ? (
-          <CodePreview text={extractReadBody(text)} maxChars={8000} />
-        ) : null}
-      </div>
-    );
-  }
-
-  if (kind === "read_notebook") {
-    const details = result.details as ReadNotebookResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              ...fileRootTags(details.root),
-              {
-                label: "cells",
-                value:
-                  details.numCells > 0
-                    ? `${details.cellStart}-${details.cellStart + details.numCells - 1}/${details.totalCells}`
-                    : `empty/${details.totalCells}`,
-              },
-              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
-              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
-            ]}
-          />
-        </ToolSurface>
-        {!details.reusedExisting ? (
-          <CodePreview text={extractReadBody(text)} maxChars={8000} />
-        ) : null}
-      </div>
-    );
-  }
-
-  if (kind === "read_word" || kind === "read_spreadsheet" || kind === "read_archive") {
-    const details = result.details as ReadDocumentResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              ...fileRootTags(details.root),
-              ...(details.mimeType ? [{ label: "mime", value: details.mimeType }] : []),
-              ...(typeof details.sizeBytes === "number"
-                ? [{ label: "size", value: `${details.sizeBytes} bytes` }]
-                : []),
-              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
-              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
-            ]}
-          />
-        </ToolSurface>
-        {!details.reusedExisting ? (
-          <CodePreview text={extractReadBody(text)} maxChars={8000} />
-        ) : null}
-      </div>
-    );
-  }
-
-  if (kind === "write") {
-    const details = result.details as WriteResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              ...fileRootTags(details.root),
-              { label: "target", value: details.existedBefore ? "existing" : "new" },
-              { label: "bytes", value: String(details.bytesWritten) },
-              { label: "lines", value: String(details.totalLines) },
-            ]}
-          />
-        </ToolSurface>
-        <CodePreview text={details.preview} />
-      </div>
-    );
-  }
-
-  if (kind === "edit") {
-    const details = result.details as EditResultDetails;
-    return (
-      <EditDiffView
-        beforeText={details.oldPreview}
-        afterText={details.newPreview}
-        filePath={details.root === "skills" ? `skills:${details.path}` : details.path}
-      />
-    );
-  }
-
-  if (kind === "delete") {
-    const details = result.details as DeleteResultDetails;
-    return (
-      <ToolSurface>
-        <MetaTags
-          tags={[...fileRootTags(details.root), { label: "kind", value: details.targetKind }]}
-        />
-      </ToolSurface>
-    );
-  }
-
-  if (kind === "list") {
-    const details = result.details as ListResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={buildPagedResultTags({
-              label: "items",
-              returned: details.entries.length,
-              total: details.total,
-              offset: details.offset,
-              hasMore: details.hasMore,
-            }).concat(fileRootTags(details.root))}
-          />
-        </ToolSurface>
-        <ToolSurface className="max-h-56 overflow-auto">
-          <div className="space-y-1">
-            {details.entries.map((entry) => (
-              <div
-                key={`${entry.kind}-${entry.path}`}
-                className="flex items-start gap-2 rounded-[8px] px-1.5 py-1 text-[11px] leading-[1.5] even:bg-black/[0.02] dark:even:bg-white/[0.03]"
-              >
-                <span className="mt-[1px] shrink-0 text-[10px] font-semibold uppercase text-muted-foreground/35">
-                  {entry.kind}
-                </span>
-                <PathDisplay
-                  path={entry.path}
-                  className="min-w-0 break-all font-mono text-[11px]"
-                />
-              </div>
-            ))}
-          </div>
-        </ToolSurface>
-      </div>
-    );
-  }
-
-  if (kind === "glob") {
-    const details = result.details as GlobResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={buildPagedResultTags({
-              label: "matches",
-              returned: details.paths.length,
-              total: details.total,
-              offset: details.offset,
-              hasMore: details.hasMore,
-            }).concat(fileRootTags(details.root))}
-          />
-        </ToolSurface>
-        <ToolSurface className="max-h-56 overflow-auto">
-          <div className="space-y-1">
-            {details.paths.map((entry) => (
-              <PathDisplay
-                key={entry}
-                path={entry}
-                className="block rounded-[8px] px-1.5 py-1 break-all font-mono text-[11px] leading-[1.5] even:bg-black/[0.02] dark:even:bg-white/[0.03]"
-              />
-            ))}
-          </div>
-        </ToolSurface>
-      </div>
-    );
-  }
-
-  if (kind === "grep") {
-    const details = result.details as GrepResultDetails;
-    return (
-      <div className="space-y-2">
-        <ToolSurface>
-          <MetaTags
-            tags={[
-              ...fileRootTags(details.root),
-              { label: "mode", value: details.outputMode },
-              { label: "matches", value: String(details.matchCount) },
-              { label: "files", value: String(details.fileCount) },
-              ...(details.offset > 0 ? [{ label: "offset", value: String(details.offset) }] : []),
-              { label: "state", value: details.hasMore ? "partial" : "complete" },
-            ]}
-          />
-        </ToolSurface>
-        {details.outputMode === "count" ? null : details.outputMode === "files" ? (
-          <ToolSurface className="max-h-56 overflow-auto">
-            <div className="space-y-1.5">
-              {details.files.map((file) => (
-                <div
-                  key={file.path}
-                  className="space-y-1 rounded-[8px] px-1.5 py-1 even:bg-black/[0.02] dark:even:bg-white/[0.03]"
-                >
-                  <PathDisplay
-                    path={file.path}
-                    className="block break-all font-mono text-[11px] leading-[1.5]"
-                  />
-                  <MetaTags
-                    tags={[
-                      { label: "count", value: String(file.count) },
-                      ...(typeof file.firstLine === "number"
-                        ? [{ label: "first", value: String(file.firstLine) }]
-                        : []),
-                    ]}
-                  />
-                </div>
-              ))}
-            </div>
-          </ToolSurface>
-        ) : (
-          <ToolSurface className="max-h-64 overflow-auto space-y-2">
-            {details.matches.map((match, index) => (
-              <div
-                key={`${match.path}:${match.line}:${index}`}
-                className="rounded-[8px] border border-black/[0.05] bg-white/[0.55] p-2 dark:border-white/[0.06] dark:bg-white/[0.03]"
-              >
-                <div className="flex items-start gap-2">
-                  <PathDisplay
-                    path={match.path}
-                    className="min-w-0 break-all font-mono text-[11px] leading-[1.5]"
-                  />
-                  <span className="shrink-0 rounded bg-black/[0.04] px-1.5 py-[1px] text-[10px] font-semibold text-muted-foreground/60 dark:bg-white/[0.05]">
-                    line {match.line}
-                  </span>
-                </div>
-                {match.before.length > 0 ? (
-                  <CodePreview text={match.before.join("\n")} maxChars={1500} />
-                ) : null}
-                <CodePreview text={match.text} maxChars={1500} />
-                {match.after.length > 0 ? (
-                  <CodePreview text={match.after.join("\n")} maxChars={1500} />
-                ) : null}
-              </div>
-            ))}
-          </ToolSurface>
-        )}
-      </div>
-    );
-  }
-
-  if (kind === "delegate_agent") {
-    return null;
-  }
-
-  if (kind === "delegate_agent_item") {
-    const details = result.details as DelegateAgentCardResultDetails;
-    const agent = details.agent;
-    const agentDisplayName = agent.name || agent.agentName || agent.id;
-    const agentTask = getDelegateAgentTask(agent);
-    const tags: MetaTag[] = [
-      { label: "agent", value: `${details.index + 1}/${details.total}` },
-      { label: "status", value: agent.status },
-    ];
-    if (agent.mode === "worktree") {
-      tags.push({ label: "mode", value: agent.mode });
-    }
-    if (shouldShowDelegateApplyStatus(agent) && agent.applyStatus) {
-      tags.push({ label: "apply", value: agent.applyStatus });
-    }
-    if (shouldShowDelegateCleanupStatus(agent) && agent.worktreeCleanupStatus) {
-      tags.push({ label: "cleanup", value: agent.worktreeCleanupStatus });
-    }
-
-    const untrackedFiles = agent.untrackedFiles ?? [];
-    const candidateArtifacts = agent.candidateArtifacts ?? [];
-    const showUntrackedFiles = agent.applyStatus !== "applied" && untrackedFiles.length > 0;
-    const showCandidateArtifacts = Boolean(
-      candidateArtifacts.length > 0 &&
-        (agent.taskIntent === "document_generation" ||
-          (agent.applySkippedReason && agent.applySkippedReason !== "no_changes")),
-    );
-
-    return (
-      <ToolSurface className="space-y-2">
-        <MetaTags tags={tags} />
-        <div className="space-y-2">
-          <div className="text-[12px] font-semibold leading-[1.45] text-foreground/90">
-            {agentDisplayName}
-          </div>
-          {agent.role ? (
-            <div className="text-[11px] font-medium leading-[1.55] text-foreground/78">
-              <span className="text-muted-foreground">role</span> {agent.role}
-            </div>
-          ) : null}
-          {agentTask ? (
-            <div className="break-words text-[11px] font-medium leading-[1.6] text-foreground/80">
-              <span className="text-muted-foreground">task</span> {agentTask}
-            </div>
-          ) : null}
-          {shouldShowDelegateWorktreeLocation(agent) ? (
-            <div className="break-all text-[10px] text-muted-foreground/70">
-              {agent.branchName ? `${agent.branchName} | ` : ""}
-              {agent.worktreeRoot}
-            </div>
-          ) : null}
-          {agent.diffStat ? <CodePreview text={agent.diffStat} maxChars={1200} /> : null}
-          {showUntrackedFiles ? (
-            <CodePreview
-              text={`untracked:\n${untrackedFiles.map((file) => `- ${file}`).join("\n")}`}
-              maxChars={1200}
-            />
-          ) : null}
-          {agent.worktreeStatusError ? (
-            <CodePreview text={agent.worktreeStatusError} maxChars={1200} />
-          ) : null}
-          {agent.applyError ? (
-            <CodePreview text={`apply failed:\n${agent.applyError}`} maxChars={1200} />
-          ) : agent.applySkippedReason && agent.applySkippedReason !== "no_changes" ? (
-            <CodePreview text={`apply skipped: ${agent.applySkippedReason}`} maxChars={1200} />
-          ) : null}
-          {agent.applyFallbackReason ? (
-            <CodePreview text={`fallback reason:\n${agent.applyFallbackReason}`} maxChars={1200} />
-          ) : null}
-          {agent.applyCopiedFiles && agent.applyCopiedFiles.length > 0 ? (
-            <CodePreview
-              text={`copied:\n${agent.applyCopiedFiles.map((file) => `- ${file}`).join("\n")}`}
-              maxChars={1200}
-            />
-          ) : null}
-          {agent.applyDeletedFiles && agent.applyDeletedFiles.length > 0 ? (
-            <CodePreview
-              text={`deleted:\n${agent.applyDeletedFiles.map((file) => `- ${file}`).join("\n")}`}
-              maxChars={1200}
-            />
-          ) : null}
-          {agent.applyConflictFiles && agent.applyConflictFiles.length > 0 ? (
-            <CodePreview
-              text={`apply conflicts:\n${agent.applyConflictFiles.map((file) => `- ${file}`).join("\n")}`}
-              maxChars={1200}
-            />
-          ) : null}
-          {agent.worktreeCleanupError ? (
-            <CodePreview
-              text={`worktree cleanup failed:\n${agent.worktreeCleanupError}`}
-              maxChars={1200}
-            />
-          ) : agent.worktreeCleanupReason && agent.worktreeCleanupStatus === "retained" ? (
-            <CodePreview
-              text={`worktree retained: ${agent.worktreeCleanupReason}`}
-              maxChars={1200}
-            />
-          ) : null}
-          {showCandidateArtifacts ? (
-            <CodePreview
-              text={`candidate artifacts:\n${candidateArtifacts.map((file) => `- ${file}`).join("\n")}`}
-              maxChars={1200}
-            />
-          ) : null}
-          {agent.error ? (
-            <CodePreview text={agent.error} maxChars={1200} />
-          ) : agent.summary ? (
-            <CodePreview text={agent.summary} maxChars={2400} />
-          ) : null}
-        </div>
-      </ToolSurface>
-    );
-  }
-
-  if (kind === "subagent_message") {
-    const details = result.details as SubagentMessageResultDetails;
-    const from = details.senderDisplayName || details.senderAgentId;
-    const to = details.recipientDisplayName || details.recipientAgentId;
-    return (
-      <ToolSurface className="space-y-2">
-        <MetaTags
-          tags={[
-            { label: "seq", value: String(details.seq) },
-            { label: "channel", value: details.channel },
-            { label: "from", value: from },
-            { label: "to", value: to },
-          ]}
-        />
-        {details.subject ? (
-          <div className="break-words text-[11.5px] font-semibold leading-[1.5] text-foreground/86">
-            {details.subject}
-          </div>
-        ) : null}
-        {details.bodyPreview ? (
-          <div className="rounded-[8px] border border-black/[0.05] bg-white/[0.45] px-2.5 py-2 text-[11.5px] leading-[1.6] dark:border-white/[0.07] dark:bg-white/[0.03]">
-            <Markdown content={details.bodyPreview} />
-          </div>
-        ) : null}
-      </ToolSurface>
-    );
-  }
-
-  if (images.length > 0) {
-    return (
-      <div className="space-y-2">
-        <div className="overflow-hidden rounded-[10px] border border-black/[0.06] bg-white/[0.55] p-2 dark:border-white/[0.08] dark:bg-white/[0.04]">
-          {images.map((image, index) => (
-            <ToolResultImagePreview
-              key={`${item.toolCall.id}-${index}`}
-              id={`${item.toolCall.id}-${index}`}
-              image={image}
-              alt={item.toolCall.name}
-            />
-          ))}
-        </div>
-        {/\S/.test(text) ? <CodePreview text={text} maxChars={3000} /> : null}
-      </div>
-    );
-  }
-
-  if (result.details && typeof result.details === "object") {
-    return (
-      <ToolSurface className="overflow-hidden px-0 py-0">
-        <ToolScrollablePre className="max-h-32 rounded-none">
-          {safeStringify(result.details)}
-        </ToolScrollablePre>
-      </ToolSurface>
-    );
-  }
-
-  return null;
-}
-
-function ToolCallItem({
-  item,
-  isRunning,
-  variant = "standalone",
-}: {
-  item: ToolTraceItem;
-  isRunning?: boolean;
-  variant?: "standalone" | "grouped";
-}) {
-  const { t } = useLocale();
-  const result = item.toolResult;
-  const builtinResultKind = getBuiltinResultKind(result);
-  const shouldAutoOpen = item.toolCall.name === "Image" || builtinResultKind === "display_image";
-  const [open, setOpen] = useState(shouldAutoOpen);
-  const isDelegateAgentCard = isDelegateAgentCardToolCall(item.toolCall);
-  const hasArgs = Object.keys(item.toolCall.arguments || {}).length > 0;
-  const shouldShowArgs = hasArgs && (!isDelegateAgentCard || !result);
-  const isBash = item.toolCall.name === "Bash";
-  const bashCmd =
-    isBash && typeof item.toolCall.arguments?.command === "string"
-      ? item.toolCall.arguments.command.trim()
-      : "";
-  const firstLine = bashCmd ? bashCmd.split("\n")[0] : "";
-  const toolArgsSummary = isBash
-    ? ""
-    : isDelegateAgentCard
-      ? getDelegateAgentInlineSummary(item)
-      : summarizeToolCall(item.toolCall, { includeName: false });
-  const meta = getToolMeta(item.toolCall.name);
-  const ToolIcon = meta.Icon;
-
-  const dotClass = isRunning
-    ? "bg-[hsl(var(--chat-running))] animate-pulse"
-    : result
-      ? result.isError
-        ? "bg-[hsl(var(--chat-error))]"
-        : "bg-[hsl(var(--chat-success))]"
-      : "bg-zinc-400";
-
-  const statusLabel = isRunning
-    ? t("chat.tool.running")
-    : result
-      ? result.isError
-        ? t("chat.tool.failed")
-        : t("chat.tool.success")
-      : t("chat.tool.waiting");
-
-  const statusBgClass = isRunning
-    ? "bg-[hsl(var(--chat-running)/0.1)] text-[hsl(var(--chat-running))]"
-    : result
-      ? result.isError
-        ? "bg-[hsl(var(--chat-error)/0.1)] text-[hsl(var(--chat-error))]"
-        : "bg-[hsl(var(--chat-success)/0.1)] text-[hsl(var(--chat-success))]"
-      : "bg-black/[0.05] text-muted-foreground dark:bg-white/[0.08]";
-
-  useEffect(() => {
-    if (shouldAutoOpen) {
-      setOpen(true);
-    }
-  }, [shouldAutoOpen]);
-
-  return (
-    <details
-      open={open}
-      className={cn(
-        "group/tool overflow-hidden",
-        variant === "grouped"
-          ? "tool-card-grouped rounded-[10px]"
-          : "tool-card-enter rounded-[12px]",
-        // Frosted glass with saturate
-        "border border-black/[0.06] bg-white/[0.72] backdrop-blur-xl backdrop-saturate-[1.8]",
-        variant === "grouped"
-          ? "shadow-none"
-          : [
-              // Subtle layered shadow
-              "shadow-[0_0_0_0.5px_rgba(0,0,0,0.03),0_1px_2px_rgba(0,0,0,0.03),0_2px_6px_rgba(0,0,0,0.02)]",
-              // Hover lift
-              "transition-shadow duration-200",
-              "hover:shadow-[0_0_0_0.5px_rgba(0,0,0,0.04),0_1px_3px_rgba(0,0,0,0.05),0_4px_14px_rgba(0,0,0,0.04)]",
-            ],
-        // Dark
-        "dark:border-white/[0.1] dark:bg-white/[0.06] dark:backdrop-saturate-[1.4]",
-        variant === "grouped"
-          ? "dark:shadow-none"
-          : [
-              "dark:shadow-[0_0_0_0.5px_rgba(255,255,255,0.04),0_1px_2px_rgba(0,0,0,0.2),0_3px_8px_rgba(0,0,0,0.12)]",
-              "dark:hover:shadow-[0_0_0_0.5px_rgba(255,255,255,0.06),0_1px_3px_rgba(0,0,0,0.25),0_4px_14px_rgba(0,0,0,0.18)]",
-            ],
-      )}
-      onToggle={(e) => setOpen((e.currentTarget as HTMLDetailsElement).open)}
-    >
-      {/* Compact single-line summary */}
-      <summary
-        className={cn(
-          "flex cursor-pointer select-none items-center gap-2 hover:bg-black/[0.015] dark:hover:bg-white/[0.025]",
-          variant === "grouped" ? "px-2 py-[6px]" : "px-2.5 py-[7px]",
-        )}
-      >
-        {/* Small icon with accent tint */}
-        <div
-          className="flex h-[22px] w-[22px] shrink-0 items-center justify-center rounded-[6px]"
-          style={{
-            background: `linear-gradient(135deg, hsl(${meta.accent} / 0.13), hsl(${meta.accent} / 0.06))`,
-          }}
-        >
-          <ToolIcon className="h-3 w-3" style={{ color: `hsl(${meta.accent})` }} />
-        </div>
-
-        {/* Tool name + inline summary on same line */}
-        <div className="flex min-w-0 flex-1 items-center gap-1.5">
-          <span className="shrink-0 text-[12.5px] font-semibold tracking-[-0.01em] text-foreground/90">
-            {getToolDisplayName(item.toolCall.name)}
-          </span>
-
-          {/* Inline summary — truncated */}
-          {isBash && firstLine ? (
-            <span className="min-w-0 truncate font-mono text-[11px] text-muted-foreground/55">
-              <span className="text-muted-foreground/30">$</span>{" "}
-              {firstLine.length > 48 ? `${firstLine.slice(0, 48)}…` : firstLine}
-            </span>
-          ) : toolArgsSummary ? (
-            <span
-              className="min-w-0 truncate font-mono text-[11px] text-muted-foreground/55"
-              title={toolArgsSummary}
-            >
-              {toolArgsSummary}
-            </span>
-          ) : null}
-        </div>
-
-        {/* Status badge + dot + chevron */}
-        <div className="flex shrink-0 items-center gap-1.5">
-          <span className={cn("inline-block h-1.5 w-1.5 rounded-full", dotClass)} />
-          <span
-            className={cn(
-              "inline-flex items-center rounded-full px-1.5 py-[1px] text-[10px] font-semibold",
-              statusBgClass,
-            )}
-          >
-            {statusLabel}
-          </span>
-          <ChevronRight className="h-3 w-3 text-muted-foreground/35 transition-transform duration-200 ease-out group-open/tool:rotate-90" />
-        </div>
-      </summary>
-
-      {open ? (
-        <div className="space-y-3 border-t border-black/[0.04] px-2.5 py-2.5 dark:border-white/[0.05]">
-          {shouldShowArgs ? (
-            <ToolSection label={isBash ? t("chat.tool.command") : t("chat.tool.args")}>
-              <ToolArgsDisplay item={item} />
-            </ToolSection>
-          ) : null}
-
-          {result ? (
-            <ToolSection
-              label={t("chat.tool.return")}
-              trailing={
-                result.isError ? (
-                  <span className="inline-flex items-center rounded-full bg-red-500/10 px-2 py-[1px] text-[10px] font-bold text-red-500 dark:bg-red-500/15">
-                    {t("chat.tool.error")}
-                  </span>
-                ) : null
-              }
-            >
-              <div className="space-y-1.5">
-                <ToolResultDisplay item={item} result={result} />
-
-                {(() => {
-                  const resultText = toolResultMessageToText(result);
-                  if (!/\S/.test(resultText)) return null;
-                  if (builtinResultKind && builtinResultKind !== "read_image") return null;
-
-                  if (isBash) {
-                    return (
-                      <ToolScrollablePre className="max-h-56 bg-zinc-950/85 text-zinc-300/90 shadow-[inset_0_1px_2px_rgba(0,0,0,0.25)] dark:bg-zinc-900/80">
-                        {previewText(resultText, 6000)}
-                      </ToolScrollablePre>
-                    );
-                  }
-
-                  return (
-                    <details className="group/result">
-                      <summary className="flex cursor-pointer select-none items-center gap-1 text-[10.5px] text-muted-foreground/50 transition-colors duration-150 hover:text-foreground/60">
-                        <ChevronRight className="h-2.5 w-2.5 transition-transform duration-200 group-open/result:rotate-90" />
-                        {t("chat.tool.viewReturn")}
-                      </summary>
-                      <ToolScrollablePre
-                        className={cn(
-                          "mt-1.5 max-h-56",
-                          isBash
-                            ? "bg-zinc-950/85 text-zinc-300/90 shadow-[inset_0_1px_2px_rgba(0,0,0,0.25)] dark:bg-zinc-900/80"
-                            : "bg-black/[0.02] dark:bg-white/[0.03]",
-                        )}
-                      >
-                        {previewText(resultText, 6000)}
-                      </ToolScrollablePre>
-                    </details>
-                  );
-                })()}
-              </div>
-            </ToolSection>
-          ) : null}
-        </div>
-      ) : null}
-    </details>
-  );
-}
-
-function areToolResultsEqual(
-  previous: ToolResultMessage | undefined,
-  next: ToolResultMessage | undefined,
-) {
-  if (!previous || !next) {
-    return previous === next;
-  }
-
-  return (
-    previous.toolCallId === next.toolCallId &&
-    previous.toolName === next.toolName &&
-    previous.isError === next.isError &&
-    areStableValuesEqual(previous.content, next.content) &&
-    areStableValuesEqual(previous.details, next.details)
-  );
-}
-
-function areToolTraceItemsEqual(previous: ToolTraceItem, next: ToolTraceItem) {
-  return (
-    previous.toolCall.id === next.toolCall.id &&
-    previous.toolCall.name === next.toolCall.name &&
-    areStableValuesEqual(previous.toolCall.arguments, next.toolCall.arguments) &&
-    areToolResultsEqual(previous.toolResult, next.toolResult)
-  );
-}
-
-const MemoToolCallItem = memo(
-  ToolCallItem,
-  (previousProps, nextProps) =>
-    previousProps.isRunning === nextProps.isRunning &&
-    previousProps.variant === nextProps.variant &&
-    areToolTraceItemsEqual(previousProps.item, nextProps.item),
-);
-
-function ToolTraceGroup(props: { items: ToolTraceItem[]; runningToolCallIds?: string[] }) {
-  const { items, runningToolCallIds = [] } = props;
-  const { t } = useLocale();
-  const counts = useMemo(
-    () => getToolGroupCounts(items, runningToolCallIds),
-    [items, runningToolCallIds],
-  );
-  const composition = useMemo(() => getToolGroupComposition(items), [items]);
-  const dominantToolName = useMemo(() => getDominantToolName(items), [items]);
-  const allBash = useMemo(() => items.every((item) => item.toolCall.name === "Bash"), [items]);
-  const meta = useMemo(
-    () => (allBash ? getToolMeta("Bash") : getToolMeta(dominantToolName)),
-    [allBash, dominantToolName],
-  );
-  const ToolIcon = allBash ? Terminal : meta.Icon;
-  const shouldAutoOpen = counts.failed > 0 || (counts.running > 0 && items.length <= 3);
-  const [open, setOpen] = useState(shouldAutoOpen);
-  const userInteractedRef = useRef(false);
-
-  useEffect(() => {
-    if (!userInteractedRef.current && shouldAutoOpen) {
-      setOpen(true);
-    }
-  }, [shouldAutoOpen]);
-
-  const statusLabel =
-    counts.failed > 0
-      ? `${counts.failed} ${t("chat.tool.failed")}`
-      : counts.running > 0
-        ? `${counts.running} ${t("chat.tool.running")}`
-        : counts.waiting > 0
-          ? `${counts.waiting} ${t("chat.tool.waiting")}`
-          : t("chat.tool.success");
-
-  const statusBgClass =
-    counts.failed > 0
-      ? "bg-[hsl(var(--chat-error)/0.1)] text-[hsl(var(--chat-error))]"
-      : counts.running > 0
-        ? "bg-[hsl(var(--chat-running)/0.1)] text-[hsl(var(--chat-running))]"
-        : counts.waiting > 0
-          ? "bg-black/[0.05] text-muted-foreground dark:bg-white/[0.08]"
-          : "bg-[hsl(var(--chat-success)/0.1)] text-[hsl(var(--chat-success))]";
-
-  const dotClass =
-    counts.failed > 0
-      ? "bg-[hsl(var(--chat-error))]"
-      : counts.running > 0
-        ? "bg-[hsl(var(--chat-running))] animate-pulse"
-        : counts.waiting > 0
-          ? "bg-zinc-400"
-          : "bg-[hsl(var(--chat-success))]";
-
-  const countLabel = `${items.length} tools`;
-  const title = allBash ? "Bash Batch" : "Tool Activity";
-
-  return (
-    <div className="tool-trace-group overflow-hidden rounded-[12px] border border-black/[0.06] bg-white/[0.62] shadow-[0_1px_2px_rgba(0,0,0,0.03)] backdrop-blur-xl backdrop-saturate-[1.6] dark:border-white/[0.1] dark:bg-white/[0.055] dark:shadow-none">
-      <button
-        type="button"
-        aria-expanded={open}
-        aria-label={open ? t("chat.tool.collapseActivity") : t("chat.tool.expandActivity")}
-        className="grid w-full cursor-pointer select-none grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 px-2.5 py-2 text-left transition-colors hover:bg-black/[0.018] dark:hover:bg-white/[0.025]"
-        onClick={() => {
-          userInteractedRef.current = true;
-          setOpen((prev) => !prev);
-        }}
-      >
-        <div
-          className="flex h-[24px] w-[24px] shrink-0 items-center justify-center rounded-[7px]"
-          style={{
-            background: `linear-gradient(135deg, hsl(${meta.accent} / 0.13), hsl(${meta.accent} / 0.06))`,
-          }}
-        >
-          <ToolIcon className="h-3.5 w-3.5" style={{ color: `hsl(${meta.accent})` }} />
-        </div>
-
-        <div className="grid min-w-0 grid-cols-[auto_auto_minmax(0,1fr)] items-center gap-2">
-          <span className="min-w-0 truncate text-[12.5px] font-semibold leading-5 text-foreground/90">
-            {title}
-          </span>
-          <span className="inline-flex h-5 shrink-0 items-center rounded-full bg-black/[0.04] px-1.5 text-[10.5px] font-semibold leading-none text-muted-foreground/70 dark:bg-white/[0.06]">
-            {countLabel}
-          </span>
-          {composition ? (
-            <span className="inline-flex h-5 min-w-0 items-center truncate font-mono text-[11px] leading-none text-muted-foreground/55">
-              {composition}
-            </span>
-          ) : null}
-        </div>
-
-        <div className="flex h-5 shrink-0 items-center gap-1.5">
-          <span className={cn("inline-block h-1.5 w-1.5 rounded-full", dotClass)} />
-          <span
-            className={cn(
-              "inline-flex h-5 items-center rounded-full px-1.5 text-[10px] font-semibold leading-none",
-              statusBgClass,
-            )}
-          >
-            {statusLabel}
-          </span>
-          <ChevronRight
-            className={cn(
-              "h-3 w-3 text-muted-foreground/35 transition-transform duration-200 ease-out",
-              open ? "rotate-90" : "",
-            )}
-          />
-        </div>
-      </button>
-
-      {open ? (
-        <div className="tool-trace-group-body space-y-1.5 border-t border-black/[0.04] p-1.5 dark:border-white/[0.05]">
-          {items.map((item, index) => (
-            <MemoToolCallItem
-              key={getToolTraceKey(item, index)}
-              item={item}
-              variant="grouped"
-              isRunning={Boolean(item.toolCall.id && runningToolCallIds.includes(item.toolCall.id))}
-            />
-          ))}
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-function RoundContent(props: {
-  round: UiRound;
-  showLabel: boolean;
-  showUsage?: boolean;
-  usageContextWindow?: number;
-  isLive?: boolean;
-  isActive?: boolean;
-  toolStatus?: string | null;
-  toolStatusVariant?: "default" | "compaction";
-  runningToolCallIds?: string[];
-  thinkingOpen?: boolean;
-}) {
-  const {
-    round,
-    showLabel,
-    showUsage,
-    usageContextWindow,
-    isLive,
-    isActive,
-    toolStatus,
-    toolStatusVariant,
-    runningToolCallIds,
-    thinkingOpen,
-  } = props;
-  const hasContent =
-    round.blocks.some((block) => {
-      if (block.kind === "tool" || block.kind === "hostedSearch") return true;
-      return block.text.trim().length > 0;
-    }) ||
-    (isActive && isLive);
-  const normalizedToolStatus =
-    isActive && isLive ? normalizeLiveToolStatus(toolStatus ?? null) : null;
-  const isCompactionStatus = toolStatusVariant === "compaction";
-  const isVibingStatus = normalizedToolStatus === VIBING_STATUS;
-  const groupedBlocks = useMemo(() => groupRoundBlocks(round.blocks), [round.blocks]);
-  const latestThinkingKey = useMemo(() => {
-    for (let index = groupedBlocks.length - 1; index >= 0; index -= 1) {
-      const block = groupedBlocks[index];
-      if (block?.kind === "thinking") return block.key;
-    }
-    return null;
-  }, [groupedBlocks]);
-  const autoOpenThinking = isLive ? Boolean(isActive && thinkingOpen) : false;
-
-  if (!hasContent) return null;
-
-  return (
-    <div className="space-y-3">
-      {showLabel ? <div className="h-px bg-border/40" /> : null}
-
-      {isActive && isLive && normalizedToolStatus ? (
-        <div className="flex items-center gap-2 py-1 text-[13px]">
-          <Loader2 className="h-3.5 w-3.5 animate-spin text-muted-foreground" />
-          {isCompactionStatus ? (
-            <CompactingText className="font-medium text-muted-foreground" />
-          ) : isVibingStatus ? (
-            <VibingText className="font-medium text-muted-foreground" />
-          ) : (
-            <span className="font-medium text-muted-foreground">{normalizedToolStatus}</span>
-          )}
-        </div>
-      ) : null}
-
-      {groupedBlocks.map((block) => {
-        if (block.kind === "thinking") {
-          return (
-            <ThinkingBlock
-              key={block.key}
-              text={block.text}
-              open={autoOpenThinking && block.key === latestThinkingKey}
-            />
-          );
-        }
-
-        if (block.kind === "tool") {
-          const displayImagePayload = getNativeDisplayImagePayload(block.item);
-          if (displayImagePayload) {
-            return <NativeDisplayImageBlock key={block.key} payload={displayImagePayload} />;
-          }
-
-          if (block.item.toolCall.name === "Image" && !block.item.toolResult?.isError) {
-            return null;
-          }
-
-          return (
-            <MemoToolCallItem
-              key={block.key}
-              item={block.item}
-              isRunning={Boolean(
-                isLive &&
-                  block.item.toolCall.id &&
-                  (runningToolCallIds || []).includes(block.item.toolCall.id),
-              )}
-            />
-          );
-        }
-
-        if (block.kind === "toolGroup") {
-          return (
-            <ToolTraceGroup
-              key={block.key}
-              items={block.items}
-              runningToolCallIds={isLive ? (runningToolCallIds ?? []) : []}
-            />
-          );
-        }
-
-        if (block.kind === "hostedSearch" || block.kind === "hostedSearchGroup") {
-          return (
-            <HostedSearchGroupView
-              key={block.key}
-              items={block.kind === "hostedSearch" ? [block.item] : block.items}
-            />
-          );
-        }
-
-        if (!block.text.trim()) return null;
-
-        return isLive && isActive ? (
-          <LiveMarkdown
-            key={block.key}
-            content={block.text}
-            className="font-openai-chat"
-            isAnimating
-          />
-        ) : (
-          <Markdown key={block.key} content={block.text} className="font-openai-chat" />
-        );
-      })}
-
-      {showUsage ? (
-        <UsagePanel usage={round.meta?.usage} contextWindow={usageContextWindow} />
-      ) : null}
-    </div>
-  );
-}
-
-export function AssistantBubble(props: {
-  rounds: (UiRound & {
-    key?: string;
-    runningToolCallIds?: string[];
-    thinkingOpen?: boolean;
-  })[];
-  showUsage?: boolean;
-  usageContextWindow?: number;
-  isLive?: boolean;
-  toolStatus?: string | null;
-  toolStatusVariant?: "default" | "compaction";
-}) {
-  const { rounds, showUsage, usageContextWindow, isLive, toolStatus, toolStatusVariant } = props;
-  const showLabels = rounds.length > 1;
-
-  return (
-    <div className="flex w-full max-w-full items-start gap-3">
-      <AssistantAvatar />
-      <div className="min-w-0 flex-1 space-y-3 pt-0.5">
-        {rounds.map((round, idx) => (
-          <RoundContent
-            key={"key" in round && round.key ? round.key : `round-${round.round}`}
-            round={round}
-            showLabel={showLabels}
-            showUsage={showUsage}
-            usageContextWindow={usageContextWindow}
-            isLive={isLive}
-            isActive={isLive && idx === rounds.length - 1}
-            toolStatus={idx === rounds.length - 1 ? toolStatus : null}
-            toolStatusVariant={idx === rounds.length - 1 ? toolStatusVariant : "default"}
-            runningToolCallIds={round.runningToolCallIds ?? []}
-            thinkingOpen={round.thinkingOpen}
-          />
-        ))}
-      </div>
-    </div>
-  );
-}
diff --git a/crates/agent-gui/src/pages/chat/ChatTranscript.tsx b/crates/agent-gui/src/pages/chat/ChatTranscript.tsx
deleted file mode 100644
index 22c87c98a..000000000
--- a/crates/agent-gui/src/pages/chat/ChatTranscript.tsx
+++ /dev/null
@@ -1,1329 +0,0 @@
-import { useVirtualizer } from "@tanstack/react-virtual";
-import { invoke } from "@tauri-apps/api/core";
-import {
-  memo,
-  type MouseEvent as ReactMouseEvent,
-  type RefObject,
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-  useState,
-  useSyncExternalStore,
-} from "react";
-import { createPortal } from "react-dom";
-import iconSimpleUrl from "../../../src-tauri/icons/icon-simple.png";
-import { ImagePreview, type ImagePreviewSlide } from "../../components/chat/ImagePreview";
-import {
-  Check,
-  CheckCircle2,
-  ChevronDown,
-  Copy,
-  File,
-  FileText,
-  LoaderCircle,
-  Pencil,
-  Settings,
-  X,
-} from "../../components/icons";
-import { LiveMarkdown, Markdown } from "../../components/Markdown";
-import { ScrollArea } from "../../components/ui/scroll-area";
-import { useLocale } from "../../i18n";
-import type {
-  HistoryMessageRef,
-  RenderSummaryCard,
-  RenderTimelineItem,
-} from "../../lib/chat/conversation/conversationState";
-import type { LiveTranscriptStore } from "../../lib/chat/conversation/liveTranscriptStore";
-import { getRoundText } from "../../lib/chat/messages/uiMessages";
-import {
-  formatUploadedFileSize,
-  type PendingUploadedFile,
-  parsePastedTextDisplayReferences,
-} from "../../lib/chat/messages/uploadedFiles";
-import {
-  buildGitHubCommitUrl,
-  type CommitDetailsLoader,
-  type CommitDisplayReference,
-  UserMessageContent,
-} from "../../lib/chat/messages/userMessageContent";
-import { normalizeLiveToolStatus, VIBING_STATUS } from "../../lib/chat/page/chatPageHelpers";
-import type { GitClient } from "../../lib/git/types";
-import { cn } from "../../lib/shared/utils";
-import type { SectionId } from "../settings/types";
-import { AssistantAvatar, AssistantBubble, CompactingText, VibingText } from "./AssistantBubble";
-import { resolveNearestScrollViewport, resolveScrollViewport } from "./chatScrollViewport";
-
-type UploadedImagePreviewResponse = {
-  mimeType: string;
-  data: string;
-};
-
-const uploadedImagePreviewCache = new Map<string, string>();
-const uploadedImagePreviewRequests = new Map<string, Promise<string | null>>();
-const UPLOADED_IMAGE_PREVIEW_CACHE_LIMIT = 64;
-
-function getUploadedImagePreviewCacheKey(workspaceRoot: string, absolutePath: string) {
-  return `${workspaceRoot}\n${absolutePath}`;
-}
-
-function readUploadedImagePreviewCache(cacheKey: string) {
-  const cached = uploadedImagePreviewCache.get(cacheKey);
-  if (cached === undefined) return undefined;
-  uploadedImagePreviewCache.delete(cacheKey);
-  uploadedImagePreviewCache.set(cacheKey, cached);
-  return cached;
-}
-
-function writeUploadedImagePreviewCache(cacheKey: string, value: string) {
-  uploadedImagePreviewCache.delete(cacheKey);
-  uploadedImagePreviewCache.set(cacheKey, value);
-
-  while (uploadedImagePreviewCache.size > UPLOADED_IMAGE_PREVIEW_CACHE_LIMIT) {
-    const oldestKey = uploadedImagePreviewCache.keys().next().value;
-    if (typeof oldestKey !== "string") break;
-    uploadedImagePreviewCache.delete(oldestKey);
-  }
-}
-
-async function loadUploadedImagePreview(params: { workspaceRoot: string; absolutePath: string }) {
-  const { workspaceRoot, absolutePath } = params;
-  const cacheKey = getUploadedImagePreviewCacheKey(workspaceRoot, absolutePath);
-  const cached = readUploadedImagePreviewCache(cacheKey);
-  if (cached !== undefined) return cached;
-
-  const existing = uploadedImagePreviewRequests.get(cacheKey);
-  if (existing) return existing;
-
-  const request = invoke<UploadedImagePreviewResponse>("system_read_uploaded_image_preview", {
-    workdir: workspaceRoot,
-    absolute_path: absolutePath,
-  })
-    .then((result) => {
-      const mimeType =
-        typeof result.mimeType === "string" && result.mimeType.trim()
-          ? result.mimeType
-          : "application/octet-stream";
-      const data = typeof result.data === "string" ? result.data.trim() : "";
-      const next = data ? `data:${mimeType};base64,${data}` : null;
-      if (next) {
-        writeUploadedImagePreviewCache(cacheKey, next);
-      }
-      return next;
-    })
-    .catch(() => null)
-    .finally(() => {
-      uploadedImagePreviewRequests.delete(cacheKey);
-    });
-
-  uploadedImagePreviewRequests.set(cacheKey, request);
-  return request;
-}
-
-function useUploadedImagePreview(absolutePath?: string, workspaceRoot?: string) {
-  const normalizedPath = typeof absolutePath === "string" ? absolutePath.trim() : "";
-  const normalizedWorkspaceRoot = typeof workspaceRoot === "string" ? workspaceRoot.trim() : "";
-  const cacheKey =
-    normalizedPath && normalizedWorkspaceRoot
-      ? getUploadedImagePreviewCacheKey(normalizedWorkspaceRoot, normalizedPath)
-      : "";
-  const [imageSrc, setImageSrc] = useState<string | null | undefined>(() => {
-    if (!cacheKey) return null;
-    return readUploadedImagePreviewCache(cacheKey);
-  });
-
-  useEffect(() => {
-    if (!cacheKey || !normalizedPath || !normalizedWorkspaceRoot) {
-      setImageSrc(null);
-      return;
-    }
-
-    const cached = readUploadedImagePreviewCache(cacheKey);
-    if (cached !== undefined) {
-      setImageSrc(cached);
-      return;
-    }
-
-    let cancelled = false;
-    setImageSrc(undefined);
-    void loadUploadedImagePreview({
-      workspaceRoot: normalizedWorkspaceRoot,
-      absolutePath: normalizedPath,
-    }).then((value) => {
-      if (!cancelled) {
-        setImageSrc(value);
-      }
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [cacheKey, normalizedPath, normalizedWorkspaceRoot]);
-
-  return {
-    imageSrc: imageSrc ?? null,
-    isLoading: Boolean(cacheKey) && imageSrc === undefined,
-  };
-}
-
-function UserImageAttachmentCard({
-  file,
-  imageSrc,
-  isLoading,
-  compact,
-  onRemove,
-  removeLabel,
-  previewLabel,
-  closePreviewLabel,
-}: {
-  file: PendingUploadedFile;
-  imageSrc: string | null;
-  isLoading: boolean;
-  compact: boolean;
-  onRemove?: ((relativePath: string) => void) | undefined;
-  removeLabel?: string;
-  previewLabel: string;
-  closePreviewLabel: string;
-}) {
-  const [previewOpen, setPreviewOpen] = useState(false);
-  const labeledPreview = `${previewLabel}: ${file.fileName}`;
-  const previewSlides = useMemo<ImagePreviewSlide[]>(
-    () =>
-      imageSrc
-        ? [
-            {
-              src: imageSrc,
-              alt: file.fileName,
-              title: file.fileName,
-            },
-          ]
-        : [],
-    [file.fileName, imageSrc],
-  );
-  return (
-    <div
-      title={file.relativePath}
-      className={cn(
-        "group relative overflow-hidden rounded-xl border border-white/60 bg-white/50 shadow-[0_1px_3px_rgba(0,0,0,0.06),0_1px_2px_rgba(0,0,0,0.04)] backdrop-blur-xl transition-shadow hover:shadow-[0_2px_8px_rgba(0,0,0,0.1)] dark:border-white/[0.12] dark:bg-white/[0.06]",
-        compact ? "min-w-0 basis-[calc(33.333%-5.33px)] grow" : "w-full max-w-[280px]",
-      )}
-    >
-      {onRemove ? (
-        <button
-          type="button"
-          onClick={() => onRemove(file.relativePath)}
-          className="absolute top-1.5 right-1.5 z-10 flex h-5 w-5 items-center justify-center rounded-full bg-black/30 text-white/90 opacity-0 backdrop-blur-sm transition-all hover:bg-black/45 group-hover:opacity-100"
-          aria-label={removeLabel ?? file.fileName}
-          title={removeLabel}
-        >
-          <X className="h-3 w-3" />
-        </button>
-      ) : null}
-      {imageSrc ? (
-        <>
-          <button
-            type="button"
-            className="block w-full cursor-zoom-in overflow-hidden text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/45"
-            aria-label={labeledPreview}
-            title={labeledPreview}
-            onClick={() => setPreviewOpen(true)}
-          >
-            <img
-              src={imageSrc}
-              alt={file.fileName}
-              className={cn(
-                "w-full bg-black/[0.02] transition-transform hover:scale-[1.01] dark:bg-white/5",
-                compact ? "h-28 object-cover" : "max-h-56 object-contain",
-              )}
-            />
-          </button>
-          {previewOpen ? (
-            <ImagePreview
-              open={previewOpen}
-              slides={previewSlides}
-              closeLabel={closePreviewLabel}
-              onClose={() => setPreviewOpen(false)}
-            />
-          ) : null}
-        </>
-      ) : (
-        <div
-          className={cn(
-            "flex w-full items-center justify-center bg-black/[0.02] dark:bg-white/5",
-            compact ? "h-28" : "h-36",
-          )}
-        >
-          <div
-            className={
-              isLoading
-                ? "h-16 w-16 animate-pulse rounded-xl bg-black/5 dark:bg-white/10"
-                : "flex h-10 w-10 items-center justify-center rounded-xl bg-black/[0.03] dark:bg-white/10"
-            }
-          >
-            {isLoading ? null : <File className="h-5 w-5 opacity-40" />}
-          </div>
-        </div>
-      )}
-      <div className="flex items-center gap-1.5 px-2.5 py-1.5">
-        <div className="min-w-0 flex-1">
-          <div className="truncate text-[11px] font-medium leading-tight text-[hsl(var(--chat-user-fg)/0.85)]">
-            {file.fileName}
-          </div>
-        </div>
-        <span className="shrink-0 text-[10px] tabular-nums text-[hsl(var(--chat-user-fg)/0.4)]">
-          {formatUploadedFileSize(file.sizeBytes)}
-        </span>
-      </div>
-    </div>
-  );
-}
-
-function UserFileAttachmentCard({
-  file,
-  onRemove,
-  removeLabel,
-  compact,
-}: {
-  file: PendingUploadedFile;
-  onRemove?: ((relativePath: string) => void) | undefined;
-  removeLabel?: string;
-  compact: boolean;
-}) {
-  return (
-    <div
-      title={file.relativePath}
-      className={cn(
-        "group relative flex items-center gap-2 rounded-xl border border-white/60 bg-white/50 px-2.5 py-2 text-left shadow-[0_1px_3px_rgba(0,0,0,0.06),0_1px_2px_rgba(0,0,0,0.04)] backdrop-blur-xl transition-shadow hover:shadow-[0_2px_8px_rgba(0,0,0,0.1)] dark:border-white/[0.12] dark:bg-white/[0.06]",
-        compact ? "min-w-0 basis-[calc(33.333%-5.33px)] grow" : "w-full",
-      )}
-    >
-      <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-gradient-to-b from-black/[0.03] to-black/[0.06] dark:from-white/[0.06] dark:to-white/[0.1]">
-        <FileText className="h-4 w-4 text-[hsl(var(--chat-user-fg)/0.45)]" />
-      </div>
-      <div className="min-w-0 flex-1">
-        <div className="truncate text-[11px] font-medium leading-tight text-[hsl(var(--chat-user-fg)/0.85)]">
-          {file.fileName}
-        </div>
-        <div className="mt-0.5 text-[10px] tabular-nums leading-tight text-[hsl(var(--chat-user-fg)/0.4)]">
-          {formatUploadedFileSize(file.sizeBytes)}
-        </div>
-      </div>
-      {onRemove ? (
-        <button
-          type="button"
-          onClick={() => onRemove(file.relativePath)}
-          className="absolute top-1/2 right-1.5 z-10 flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded-full text-[hsl(var(--chat-user-fg)/0.3)] opacity-0 transition-all hover:bg-black/5 hover:text-[hsl(var(--chat-user-fg)/0.6)] group-hover:opacity-100 dark:hover:bg-white/10"
-          aria-label={removeLabel ?? file.fileName}
-          title={removeLabel}
-        >
-          <X className="h-3 w-3" />
-        </button>
-      ) : null}
-    </div>
-  );
-}
-
-function UserAttachmentCard({
-  file,
-  workspaceRoot,
-  compactImageLayout,
-  compactFileLayout,
-  onRemove,
-  removeLabel,
-  previewLabel,
-  closePreviewLabel,
-}: {
-  file: PendingUploadedFile;
-  workspaceRoot?: string;
-  compactImageLayout: boolean;
-  compactFileLayout: boolean;
-  onRemove?: ((relativePath: string) => void) | undefined;
-  removeLabel?: string;
-  previewLabel: string;
-  closePreviewLabel: string;
-}) {
-  const shouldPreviewImage =
-    file.kind === "image" && typeof file.absolutePath === "string" && file.absolutePath.trim();
-  const { imageSrc, isLoading } = useUploadedImagePreview(
-    shouldPreviewImage ? file.absolutePath : undefined,
-    workspaceRoot,
-  );
-
-  if (shouldPreviewImage) {
-    return (
-      <UserImageAttachmentCard
-        file={file}
-        imageSrc={imageSrc}
-        isLoading={isLoading}
-        compact={compactImageLayout}
-        onRemove={onRemove}
-        removeLabel={removeLabel}
-        previewLabel={previewLabel}
-        closePreviewLabel={closePreviewLabel}
-      />
-    );
-  }
-
-  return (
-    <UserFileAttachmentCard
-      file={file}
-      onRemove={onRemove}
-      removeLabel={removeLabel}
-      compact={compactFileLayout}
-    />
-  );
-}
-
-function UserAttachmentCards({
-  files,
-  workspaceRoot,
-  onRemove,
-}: {
-  files: PendingUploadedFile[];
-  workspaceRoot?: string;
-  onRemove?: ((relativePath: string) => void) | undefined;
-}) {
-  const { t } = useLocale();
-  if (files.length === 0) return null;
-  const imageFiles = files.filter((file) => file.kind === "image");
-  const otherFiles = files.filter((file) => file.kind !== "image");
-  const compactImageLayout = imageFiles.length > 1;
-  const compactFileLayout = otherFiles.length > 1;
-  const removeLabel = onRemove ? t("chat.upload.removeFile") : undefined;
-  const previewLabel = t("chat.upload.previewImage");
-  const closePreviewLabel = t("chat.upload.closePreview");
-
-  return (
-    <div className="mb-2 flex flex-col gap-2">
-      {imageFiles.length > 0 ? (
-        <div className="flex flex-wrap gap-2">
-          {imageFiles.map((file) => (
-            <UserAttachmentCard
-              key={`${file.relativePath}-${file.absolutePath ?? file.fileName}`}
-              file={file}
-              workspaceRoot={workspaceRoot}
-              compactImageLayout={compactImageLayout}
-              compactFileLayout={false}
-              onRemove={onRemove}
-              removeLabel={removeLabel}
-              previewLabel={previewLabel}
-              closePreviewLabel={closePreviewLabel}
-            />
-          ))}
-        </div>
-      ) : null}
-      {otherFiles.length > 0 ? (
-        <div className="flex flex-wrap gap-2">
-          {otherFiles.map((file) => (
-            <UserAttachmentCard
-              key={`${file.relativePath}-${file.absolutePath ?? file.fileName}`}
-              file={file}
-              workspaceRoot={workspaceRoot}
-              compactImageLayout={false}
-              compactFileLayout={compactFileLayout}
-              onRemove={onRemove}
-              removeLabel={removeLabel}
-              previewLabel={previewLabel}
-              closePreviewLabel={closePreviewLabel}
-            />
-          ))}
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-function splitUserAttachmentsForDisplay(files: PendingUploadedFile[], text: string) {
-  const pastedTextReferences = parsePastedTextDisplayReferences(text);
-  if (pastedTextReferences.length === 0 || files.length === 0) {
-    return {
-      visibleFiles: files,
-      pastedTextFiles: [],
-    };
-  }
-
-  const pastedTextPaths = new Set(pastedTextReferences.map((reference) => reference.relativePath));
-  const pastedTextFiles: PendingUploadedFile[] = [];
-  const visibleFiles: PendingUploadedFile[] = [];
-
-  for (const file of files) {
-    if (pastedTextPaths.has(file.relativePath)) {
-      pastedTextFiles.push(file);
-    } else {
-      visibleFiles.push(file);
-    }
-  }
-
-  return {
-    visibleFiles,
-    pastedTextFiles,
-  };
-}
-
-function TypingDots() {
-  return (
-    <div className="flex items-center gap-2 py-1">
-      <div className="flex gap-1">
-        <span className="typing-dot inline-block h-1.5 w-1.5 rounded-full bg-muted-foreground/40" />
-        <span className="typing-dot inline-block h-1.5 w-1.5 rounded-full bg-muted-foreground/40" />
-        <span className="typing-dot inline-block h-1.5 w-1.5 rounded-full bg-muted-foreground/40" />
-      </div>
-    </div>
-  );
-}
-
-function HistorySwitchLoadingOverlay() {
-  const { locale } = useLocale();
-  const label = locale === "en-US" ? "Loading conversation..." : "正在加载对话...";
-
-  return (
-    <div
-      className="absolute inset-0 z-30 flex items-center justify-center bg-background/95 backdrop-blur-[2px]"
-      role="status"
-      aria-live="polite"
-      aria-label={label}
-    >
-      <div className="flex items-center gap-2 rounded-full border border-border/60 bg-background/95 px-3.5 py-2 text-xs font-medium text-muted-foreground shadow-sm">
-        <LoaderCircle className="h-4 w-4 animate-spin text-primary" />
-        <span>{label}</span>
-      </div>
-    </div>
-  );
-}
-
-type TranscriptContextMenuState = {
-  x: number;
-  y: number;
-  selectedText: string;
-};
-
-const TRANSCRIPT_CONTEXT_MENU_WIDTH = 184;
-const TRANSCRIPT_CONTEXT_MENU_HEIGHT = 52;
-const TRANSCRIPT_CONTEXT_MENU_MARGIN = 12;
-
-function writeTextToClipboard(text: string) {
-  if (!text) return;
-
-  if (navigator.clipboard?.writeText) {
-    void navigator.clipboard.writeText(text).catch(() => {
-      fallbackWriteTextToClipboard(text);
-    });
-    return;
-  }
-
-  fallbackWriteTextToClipboard(text);
-}
-
-function fallbackWriteTextToClipboard(text: string) {
-  const textarea = document.createElement("textarea");
-  textarea.value = text;
-  textarea.setAttribute("readonly", "");
-  textarea.style.position = "fixed";
-  textarea.style.left = "-9999px";
-  textarea.style.top = "0";
-  document.body.appendChild(textarea);
-  textarea.select();
-  document.execCommand("copy");
-  document.body.removeChild(textarea);
-}
-
-function resolveTranscriptSelectionText(root: HTMLElement | null) {
-  if (!root) return "";
-
-  const selection = window.getSelection();
-  if (!selection || selection.isCollapsed || selection.rangeCount === 0) {
-    return "";
-  }
-
-  const selectedText = selection.toString();
-  if (!selectedText.trim()) return "";
-
-  const range = selection.getRangeAt(0);
-  if (!root.contains(range.commonAncestorContainer)) {
-    return "";
-  }
-
-  return selectedText;
-}
-
-function clampTranscriptContextMenuPosition(x: number, y: number) {
-  const maxLeft = Math.max(
-    TRANSCRIPT_CONTEXT_MENU_MARGIN,
-    window.innerWidth - TRANSCRIPT_CONTEXT_MENU_WIDTH - TRANSCRIPT_CONTEXT_MENU_MARGIN,
-  );
-  const maxTop = Math.max(
-    TRANSCRIPT_CONTEXT_MENU_MARGIN,
-    window.innerHeight - TRANSCRIPT_CONTEXT_MENU_HEIGHT - TRANSCRIPT_CONTEXT_MENU_MARGIN,
-  );
-
-  return {
-    left: Math.min(Math.max(TRANSCRIPT_CONTEXT_MENU_MARGIN, x), maxLeft),
-    top: Math.min(Math.max(TRANSCRIPT_CONTEXT_MENU_MARGIN, y), maxTop),
-  };
-}
-
-type ChatTranscriptProps = {
-  conversationId: string;
-  workspaceRoot?: string;
-  gitClient?: GitClient | null;
-  scrollAreaRef: RefObject<HTMLDivElement | null>;
-  bottomRef: RefObject<HTMLDivElement | null>;
-  hasModels: boolean;
-  historyItems: RenderTimelineItem[];
-  isHistorySwitching: boolean;
-  isSending: boolean;
-  isAgentMode: boolean;
-  showUsage: boolean;
-  usageContextWindow?: number;
-  liveTranscriptStore: LiveTranscriptStore;
-  isCompactionRunning: boolean;
-  copiedMessageKey: string | null;
-  setCopiedMessageKey: (key: string | null) => void;
-  onResendFromEdit: (
-    messageRef: HistoryMessageRef,
-    text: string,
-    attachments: PendingUploadedFile[],
-  ) => void;
-  onOpenSettings: (section?: SectionId) => void;
-};
-
-type TranscriptHistoryProps = Pick<
-  ChatTranscriptProps,
-  | "historyItems"
-  | "conversationId"
-  | "workspaceRoot"
-  | "gitClient"
-  | "showUsage"
-  | "usageContextWindow"
-  | "copiedMessageKey"
-  | "setCopiedMessageKey"
-  | "onResendFromEdit"
-> & {
-  isSending: boolean;
-  scrollViewport: HTMLDivElement | null;
-};
-
-type TranscriptLiveStateProps = Pick<
-  ChatTranscriptProps,
-  | "isSending"
-  | "isAgentMode"
-  | "showUsage"
-  | "usageContextWindow"
-  | "liveTranscriptStore"
-  | "isCompactionRunning"
->;
-
-const TRANSCRIPT_ROW_ESTIMATED_HEIGHT = 260;
-const TRANSCRIPT_ROW_GAP = 24;
-const TRANSCRIPT_ROW_OVERSCAN_COUNT = 5;
-
-const SummaryCard = memo(function SummaryCard(props: { item: RenderSummaryCard }) {
-  const { item } = props;
-  const { locale } = useLocale();
-  const [expanded, setExpanded] = useState(false);
-  const isEn = locale === "en-US";
-
-  return (
-    <div className="flex justify-center px-2">
-      <div className="checkpoint-card w-full max-w-3xl overflow-hidden rounded-[14px] border border-black/[0.06] bg-white/[0.72] shadow-[0_1px_3px_rgba(0,0,0,0.04),0_4px_12px_rgba(0,0,0,0.03)] backdrop-blur-xl dark:border-white/[0.1] dark:bg-white/[0.06] dark:shadow-[0_1px_3px_rgba(0,0,0,0.2),0_4px_12px_rgba(0,0,0,0.15)]">
-        <button
-          type="button"
-          onClick={() => setExpanded((prev) => !prev)}
-          className="flex w-full items-center gap-3 px-3.5 py-3 text-left transition-colors duration-150 hover:bg-black/[0.02] dark:hover:bg-white/[0.03]"
-        >
-          {/* Icon */}
-          <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-[8px] bg-black/[0.04] dark:bg-white/[0.08]">
-            <CheckCircle2 size={16} strokeWidth={1.8} className="text-muted-foreground" />
-          </div>
-
-          {/* Text content */}
-          <div className="min-w-0 flex-1">
-            <div className="flex items-center gap-2">
-              <span className="text-[13px] font-medium text-foreground/90">
-                {isEn ? "Context Checkpoint" : "上下文检查点"}
-              </span>
-              <span className="inline-flex items-center rounded-md bg-black/[0.05] px-1.5 py-[1px] text-[11px] font-normal tabular-nums text-muted-foreground dark:bg-white/[0.08]">
-                {item.coveredMessageCount} {isEn ? "msgs" : "条消息"}
-              </span>
-            </div>
-            <div className="mt-[2px] text-[11px] text-muted-foreground/70">
-              {item.generatedBy.providerId} · {item.generatedBy.model}
-            </div>
-          </div>
-
-          {/* Expand/collapse chevron */}
-          <ChevronDown
-            className={`h-3.5 w-3.5 shrink-0 text-muted-foreground/50 transition-transform duration-200 ${expanded ? "rotate-0" : "-rotate-90"}`}
-          />
-        </button>
-
-        {/* Expandable content */}
-        {expanded ? (
-          <div className="checkpoint-expand border-t border-black/[0.05] px-3.5 py-3 dark:border-white/[0.06]">
-            <Markdown content={item.content} className="font-openai-chat text-sm" />
-          </div>
-        ) : null}
-      </div>
-    </div>
-  );
-});
-
-const EditableUserMessageBubble = memo(function EditableUserMessageBubble(props: {
-  initialText: string;
-  attachments: PendingUploadedFile[];
-  workspaceRoot?: string;
-  compactedClass: string;
-  onCancel: () => void;
-  onSubmit: (text: string, attachments: PendingUploadedFile[]) => void;
-}) {
-  const { initialText, attachments, workspaceRoot, compactedClass, onCancel, onSubmit } = props;
-  const { t } = useLocale();
-  const [draftText, setDraftText] = useState(initialText);
-  const [draftAttachments, setDraftAttachments] = useState(attachments);
-  const textareaRef = useRef<HTMLTextAreaElement | null>(null);
-
-  useEffect(() => {
-    const textarea = textareaRef.current;
-    if (!textarea) {
-      return;
-    }
-    const viewport = resolveNearestScrollViewport(textarea);
-    const scrollTopBeforeFocus = viewport?.scrollTop ?? null;
-    const restoreViewportScroll = () => {
-      if (viewport && scrollTopBeforeFocus !== null) {
-        viewport.scrollTop = scrollTopBeforeFocus;
-      }
-    };
-
-    textarea.focus({ preventScroll: true });
-    const cursorPosition = textarea.value.length;
-    textarea.setSelectionRange(cursorPosition, cursorPosition);
-    restoreViewportScroll();
-
-    const rafId = requestAnimationFrame(restoreViewportScroll);
-    return () => cancelAnimationFrame(rafId);
-  }, []);
-
-  useEffect(() => {
-    setDraftAttachments(attachments);
-  }, [attachments]);
-
-  const canSubmit = draftText.trim().length > 0 || draftAttachments.length > 0;
-
-  return (
-    <div
-      className={`w-full max-w-[min(85%,calc(50em+2.5rem))] rounded-2xl border border-border bg-[hsl(var(--chat-user-bg))] p-3 ${compactedClass}`}
-    >
-      <UserAttachmentCards
-        files={draftAttachments}
-        workspaceRoot={workspaceRoot}
-        onRemove={(relativePath) => {
-          setDraftAttachments((prev) => prev.filter((file) => file.relativePath !== relativePath));
-        }}
-      />
-      <textarea
-        ref={textareaRef}
-        className="w-full resize-none rounded-lg bg-transparent p-2 font-openai-chat text-[14.5px] leading-relaxed text-[hsl(var(--chat-user-fg))] outline-none"
-        value={draftText}
-        onChange={(e) => setDraftText(e.target.value)}
-        rows={Math.max(2, draftText.split("\n").length)}
-        aria-label={t("chat.editMessage")}
-        onKeyDown={(e) => {
-          if (e.key === "Escape") {
-            onCancel();
-          }
-        }}
-      />
-      <div className="mt-2 flex justify-end gap-2">
-        <button
-          type="button"
-          className="rounded-lg border border-border bg-background px-3 py-1.5 text-xs text-foreground transition-colors hover:bg-muted"
-          onClick={onCancel}
-        >
-          {t("chat.cancel")}
-        </button>
-        <button
-          type="button"
-          className="rounded-lg bg-primary px-3 py-1.5 text-xs text-primary-foreground transition-colors hover:bg-primary/90"
-          disabled={!canSubmit}
-          onClick={() => {
-            const newText = draftText.trim();
-            if (!canSubmit) return;
-            onSubmit(newText, draftAttachments);
-          }}
-        >
-          {t("chat.send")}
-        </button>
-      </div>
-    </div>
-  );
-});
-
-const TranscriptHistory = memo(function TranscriptHistory(props: TranscriptHistoryProps) {
-  const {
-    conversationId,
-    historyItems,
-    scrollViewport,
-    showUsage,
-    usageContextWindow,
-    copiedMessageKey,
-    setCopiedMessageKey,
-    onResendFromEdit,
-    workspaceRoot,
-    gitClient,
-    isSending,
-  } = props;
-  const { t } = useLocale();
-  const [editingMessageKey, setEditingMessageKey] = useState<string | null>(null);
-  const copiedResetTimerRef = useRef<number | null>(null);
-  const commitDetailsCacheRef = useRef(new Map<string, CommitDisplayReference>());
-
-  const loadCommitDetails = useCallback<CommitDetailsLoader>(
-    async (commit) => {
-      const workdir = workspaceRoot?.trim() ?? "";
-      const sha = commit.sha.trim();
-      if (!gitClient || !workdir || !sha) return null;
-      const cacheKey = `${workdir}\u0000${sha}`;
-      const cached = commitDetailsCacheRef.current.get(cacheKey);
-      if (cached) return cached;
-      const response = await gitClient.commitDetails(workdir, sha);
-      const details = response.commit;
-      const resolved: CommitDisplayReference = {
-        sha: details.sha,
-        shortSha: details.shortSha,
-        subject: details.subject,
-        body: details.body,
-        authorName: details.authorName,
-        authorEmail: details.authorEmail,
-        authorDate: details.authorDate,
-        fileCount: details.fileCount,
-        filesChanged: details.filesChanged,
-        insertions: details.insertions,
-        deletions: details.deletions,
-        stat: details.stat,
-        remoteName: details.remoteName,
-        remoteUrl: details.remoteUrl,
-        githubUrl:
-          commit.githubUrl ||
-          buildGitHubCommitUrl(details.remoteUrl || response.state.remoteUrl, details.sha) ||
-          undefined,
-      };
-      commitDetailsCacheRef.current.set(cacheKey, resolved);
-      return resolved;
-    },
-    [gitClient, workspaceRoot],
-  );
-
-  useEffect(() => {
-    setEditingMessageKey(null);
-    commitDetailsCacheRef.current.clear();
-  }, [conversationId]);
-
-  useEffect(
-    () => () => {
-      if (copiedResetTimerRef.current !== null) {
-        window.clearTimeout(copiedResetTimerRef.current);
-      }
-    },
-    [],
-  );
-
-  useEffect(() => {
-    if (!editingMessageKey) {
-      return;
-    }
-    const hasEditingMessage = historyItems.some(
-      (item) => item.kind === "user" && item.key === editingMessageKey,
-    );
-    if (!hasEditingMessage) {
-      setEditingMessageKey(null);
-    }
-  }, [editingMessageKey, historyItems]);
-
-  const getTranscriptItemKey = useCallback(
-    (index: number) => historyItems[index]?.key ?? index,
-    [historyItems],
-  );
-  const transcriptVirtualizer = useVirtualizer({
-    count: historyItems.length,
-    getScrollElement: () => scrollViewport,
-    estimateSize: () => TRANSCRIPT_ROW_ESTIMATED_HEIGHT,
-    getItemKey: getTranscriptItemKey,
-    gap: TRANSCRIPT_ROW_GAP,
-    overscan: TRANSCRIPT_ROW_OVERSCAN_COUNT,
-    enabled: scrollViewport !== null,
-  });
-  const virtualRows = transcriptVirtualizer.getVirtualItems();
-
-  return (
-    <div className="relative" style={{ height: transcriptVirtualizer.getTotalSize() }}>
-      {virtualRows.map((virtualRow) => {
-        const item = historyItems[virtualRow.index];
-        if (!item) return null;
-
-        if (item.kind === "summary") {
-          return (
-            <div
-              key={virtualRow.key}
-              data-index={virtualRow.index}
-              ref={transcriptVirtualizer.measureElement}
-              className="absolute left-0 right-0 top-0"
-              style={{ transform: `translateY(${virtualRow.start}px)` }}
-            >
-              <SummaryCard item={item} />
-            </div>
-          );
-        }
-
-        if (item.kind === "user") {
-          const isEditing = editingMessageKey === item.key;
-          const isCopied = copiedMessageKey === item.key;
-          const compactedClass = item.isFromCompactedSegment ? "opacity-70" : "";
-          const { visibleFiles, pastedTextFiles } = splitUserAttachmentsForDisplay(
-            item.attachments,
-            item.text,
-          );
-          return (
-            <div
-              key={virtualRow.key}
-              data-index={virtualRow.index}
-              ref={transcriptVirtualizer.measureElement}
-              className="absolute left-0 right-0 top-0 flex justify-end"
-              style={{ transform: `translateY(${virtualRow.start}px)` }}
-            >
-              {isEditing ? (
-                <EditableUserMessageBubble
-                  initialText={item.text}
-                  attachments={item.attachments}
-                  workspaceRoot={workspaceRoot}
-                  compactedClass={compactedClass}
-                  onCancel={() => setEditingMessageKey(null)}
-                  onSubmit={(newText, nextAttachments) => {
-                    setEditingMessageKey(null);
-                    onResendFromEdit(item.messageRef, newText, nextAttachments);
-                  }}
-                />
-              ) : (
-                <div
-                  className={`chat-user-bubble-wrap group relative ml-auto max-w-[min(85%,calc(50em+2rem))] ${compactedClass}`}
-                >
-                  <div className="chat-bubble-enter chat-user-bubble rounded-2xl rounded-br-md bg-[hsl(var(--chat-user-bg))] px-4 py-2.5 font-openai-chat text-[14.5px] leading-relaxed text-[hsl(var(--chat-user-fg))]">
-                    <UserAttachmentCards files={visibleFiles} workspaceRoot={workspaceRoot} />
-                    {item.text ? (
-                      <UserMessageContent
-                        text={item.text}
-                        pastedTextFiles={pastedTextFiles}
-                        loadCommitDetails={loadCommitDetails}
-                      />
-                    ) : null}
-                  </div>
-                  <div className="mt-1 flex justify-end gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
-                    <button
-                      type="button"
-                      className="rounded-md p-1 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
-                      title={t("chat.copy")}
-                      onClick={() => {
-                        navigator.clipboard.writeText(item.text);
-                        setCopiedMessageKey(item.key);
-                        if (copiedResetTimerRef.current !== null) {
-                          window.clearTimeout(copiedResetTimerRef.current);
-                        }
-                        copiedResetTimerRef.current = window.setTimeout(() => {
-                          copiedResetTimerRef.current = null;
-                          setCopiedMessageKey(null);
-                        }, 1500);
-                      }}
-                    >
-                      {isCopied ? (
-                        <Check className="h-3.5 w-3.5" />
-                      ) : (
-                        <Copy className="h-3.5 w-3.5" />
-                      )}
-                    </button>
-                    <button
-                      type="button"
-                      className="rounded-md p-1 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
-                      title={t("chat.edit")}
-                      disabled={isSending}
-                      onClick={() => setEditingMessageKey(item.key)}
-                    >
-                      <Pencil className="h-3.5 w-3.5" />
-                    </button>
-                  </div>
-                </div>
-              )}
-            </div>
-          );
-        }
-
-        return (
-          <div
-            key={virtualRow.key}
-            data-index={virtualRow.index}
-            ref={transcriptVirtualizer.measureElement}
-            className={`absolute left-0 right-0 top-0 flex justify-start ${
-              item.isFromCompactedSegment ? "opacity-70" : ""
-            }`}
-            style={{ transform: `translateY(${virtualRow.start}px)` }}
-          >
-            {item.rounds.length > 0 ? (
-              <AssistantBubble
-                rounds={item.rounds}
-                showUsage={showUsage}
-                usageContextWindow={usageContextWindow}
-              />
-            ) : (
-              <div className="flex w-full max-w-full items-start gap-3">
-                <AssistantAvatar />
-                <div className="min-w-0 flex-1 pt-0.5">
-                  {getRoundText(item.rounds[item.rounds.length - 1] ?? { blocks: [] }).trim() ? (
-                    <Markdown
-                      content={getRoundText(item.rounds[item.rounds.length - 1] ?? { blocks: [] })}
-                      className="font-openai-chat"
-                    />
-                  ) : null}
-                </div>
-              </div>
-            )}
-          </div>
-        );
-      })}
-    </div>
-  );
-});
-
-const TranscriptLiveState = memo(function TranscriptLiveState(props: TranscriptLiveStateProps) {
-  const {
-    isSending,
-    isAgentMode,
-    showUsage,
-    usageContextWindow,
-    liveTranscriptStore,
-    isCompactionRunning,
-  } = props;
-  const liveState = useSyncExternalStore(
-    liveTranscriptStore.subscribe,
-    liveTranscriptStore.getSnapshot,
-    liveTranscriptStore.getSnapshot,
-  );
-  const { draftAssistantText, liveRounds, toolStatus } = liveState;
-  const displayedToolStatus = normalizeLiveToolStatus(toolStatus);
-
-  if (!isSending) {
-    return null;
-  }
-
-  if (liveRounds.length > 0) {
-    return (
-      <div className="flex justify-start">
-        <AssistantBubble
-          rounds={liveRounds}
-          showUsage={showUsage}
-          usageContextWindow={usageContextWindow}
-          isLive
-          toolStatus={displayedToolStatus}
-          toolStatusVariant={isCompactionRunning ? "compaction" : "default"}
-        />
-      </div>
-    );
-  }
-
-  if (isAgentMode) {
-    return (
-      <div className="flex justify-start">
-        <div className="flex w-full max-w-full items-start gap-3">
-          <AssistantAvatar />
-          <div className="min-w-0 flex-1 pt-1">
-            {isCompactionRunning ? (
-              <div className="flex items-center py-1">
-                <CompactingText className="text-sm font-medium text-muted-foreground" />
-              </div>
-            ) : displayedToolStatus === VIBING_STATUS ? (
-              <div className="flex items-center py-1">
-                <VibingText className="text-sm font-medium text-muted-foreground" />
-              </div>
-            ) : displayedToolStatus ? (
-              <div className="py-1 text-sm text-muted-foreground">{displayedToolStatus}</div>
-            ) : (
-              <TypingDots />
-            )}
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex justify-start">
-      <div className="flex w-full max-w-full items-start gap-3">
-        <AssistantAvatar />
-        <div className="min-w-0 flex-1 pt-0.5">
-          {draftAssistantText ? (
-            <LiveMarkdown content={draftAssistantText} className="font-openai-chat" isAnimating />
-          ) : isCompactionRunning ? (
-            <div className="flex items-center py-1">
-              <CompactingText className="text-sm font-medium text-muted-foreground" />
-            </div>
-          ) : displayedToolStatus === VIBING_STATUS ? (
-            <div className="flex items-center py-1">
-              <VibingText className="text-sm font-medium text-muted-foreground" />
-            </div>
-          ) : displayedToolStatus ? (
-            <div className="py-1 text-sm text-muted-foreground">{displayedToolStatus}</div>
-          ) : (
-            <TypingDots />
-          )}
-        </div>
-      </div>
-    </div>
-  );
-});
-
-export const ChatTranscript = memo(function ChatTranscript(props: ChatTranscriptProps) {
-  const {
-    conversationId,
-    workspaceRoot,
-    gitClient,
-    scrollAreaRef,
-    bottomRef,
-    hasModels,
-    historyItems,
-    isHistorySwitching,
-    isSending,
-    isAgentMode,
-    showUsage,
-    usageContextWindow,
-    liveTranscriptStore,
-    isCompactionRunning,
-    copiedMessageKey,
-    setCopiedMessageKey,
-    onResendFromEdit,
-    onOpenSettings,
-  } = props;
-  const { t, locale } = useLocale();
-  const showNoModelsState = !hasModels;
-  const showStartChatState = hasModels && historyItems.length === 0 && !isSending;
-  const shouldReserveTranscriptBottomSpace = !(showNoModelsState || showStartChatState);
-  const [scrollViewport, setScrollViewport] = useState<HTMLDivElement | null>(null);
-  const transcriptRootRef = useRef<HTMLDivElement | null>(null);
-  const transcriptContextMenuRef = useRef<HTMLDivElement | null>(null);
-  const [transcriptContextMenu, setTranscriptContextMenu] =
-    useState<TranscriptContextMenuState | null>(null);
-
-  const closeTranscriptContextMenu = useCallback(() => {
-    setTranscriptContextMenu(null);
-  }, []);
-
-  useLayoutEffect(() => {
-    const nextViewport = resolveScrollViewport(scrollAreaRef.current);
-    setScrollViewport((current) => (current === nextViewport ? current : nextViewport));
-  });
-
-  useEffect(() => {
-    closeTranscriptContextMenu();
-  }, [closeTranscriptContextMenu, conversationId]);
-
-  useEffect(() => {
-    if (!transcriptContextMenu) return;
-
-    const handlePointerDown = (event: PointerEvent) => {
-      const target = event.target;
-      if (!(target instanceof Node)) {
-        closeTranscriptContextMenu();
-        return;
-      }
-      if (transcriptContextMenuRef.current?.contains(target)) {
-        return;
-      }
-      closeTranscriptContextMenu();
-    };
-
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key === "Escape") {
-        closeTranscriptContextMenu();
-      }
-    };
-
-    const handleSelectionChange = () => {
-      if (!resolveTranscriptSelectionText(transcriptRootRef.current)) {
-        closeTranscriptContextMenu();
-      }
-    };
-
-    const handleScroll = () => {
-      closeTranscriptContextMenu();
-    };
-
-    window.addEventListener("pointerdown", handlePointerDown, true);
-    window.addEventListener("keydown", handleKeyDown, true);
-    window.addEventListener("scroll", handleScroll, true);
-    window.addEventListener("resize", handleScroll);
-    window.addEventListener("blur", handleScroll);
-    document.addEventListener("selectionchange", handleSelectionChange);
-
-    return () => {
-      window.removeEventListener("pointerdown", handlePointerDown, true);
-      window.removeEventListener("keydown", handleKeyDown, true);
-      window.removeEventListener("scroll", handleScroll, true);
-      window.removeEventListener("resize", handleScroll);
-      window.removeEventListener("blur", handleScroll);
-      document.removeEventListener("selectionchange", handleSelectionChange);
-    };
-  }, [closeTranscriptContextMenu, transcriptContextMenu]);
-
-  const handleTranscriptContextMenu = useCallback(
-    (event: ReactMouseEvent<HTMLDivElement>) => {
-      event.preventDefault();
-      const selectedText = resolveTranscriptSelectionText(transcriptRootRef.current);
-      if (!selectedText) {
-        closeTranscriptContextMenu();
-        return;
-      }
-      setTranscriptContextMenu({
-        x: event.clientX,
-        y: event.clientY,
-        selectedText,
-      });
-    },
-    [closeTranscriptContextMenu],
-  );
-
-  const transcriptContextMenuPosition = transcriptContextMenu
-    ? clampTranscriptContextMenuPosition(transcriptContextMenu.x, transcriptContextMenu.y)
-    : null;
-  const copySelectedTextLabel =
-    locale === "en-US" ? "Copy selected text" : "复制选中文本";
-
-  return (
-    <div
-      ref={transcriptRootRef}
-      className="relative min-h-0 flex-1"
-      onContextMenu={handleTranscriptContextMenu}
-    >
-      <ScrollArea ref={scrollAreaRef} className="h-full">
-        <div className="mx-auto w-full max-w-[768px] px-5 py-4">
-          {showNoModelsState ? (
-            <div className="flex min-h-[calc(100vh-220px)] flex-col items-center justify-center">
-              <div className="pointer-events-none absolute inset-0 flex items-center justify-center overflow-hidden">
-                <div className="hero-glow-pulse h-[360px] w-[360px] rounded-full bg-[radial-gradient(closest-side,hsl(var(--foreground)/0.08),transparent_70%)] blur-3xl" />
-              </div>
-
-              <div className="relative flex flex-col items-center">
-                <div className="hero-entrance hero-icon-float mb-5 flex h-24 w-24 items-center justify-center">
-                  <img
-                    src={iconSimpleUrl}
-                    alt=""
-                    aria-hidden="true"
-                    draggable={false}
-                    className="h-[72px] w-[72px] select-none object-contain"
-                  />
-                </div>
-                <h2 className="hero-entrance-delay-1 mb-2 bg-gradient-to-b from-foreground to-foreground/65 bg-clip-text text-2xl font-semibold leading-tight tracking-tight text-transparent">
-                  {t("chat.welcome")}
-                </h2>
-                <p className="hero-entrance-delay-2 mb-1 text-sm text-muted-foreground">
-                  {t("chat.noModelSelected")}
-                </p>
-                <p className="hero-entrance-delay-2 mb-7 text-sm text-muted-foreground">
-                  {t("chat.configureModel")}
-                </p>
-                <button
-                  type="button"
-                  onClick={() => onOpenSettings("providers")}
-                  className="hero-entrance-delay-3 group inline-flex items-center gap-2 rounded-full border border-white/70 bg-white/65 px-5 py-2 text-sm font-medium text-foreground/85 shadow-[0_1px_2px_rgba(0,0,0,0.04),0_8px_24px_rgba(0,0,0,0.06),inset_0_1px_0_rgba(255,255,255,0.85)] backdrop-blur-xl transition-all duration-200 hover:-translate-y-[1px] hover:bg-white/80 hover:text-foreground hover:shadow-[0_2px_4px_rgba(0,0,0,0.05),0_12px_32px_rgba(0,0,0,0.08),inset_0_1px_0_rgba(255,255,255,0.9)] active:translate-y-0 active:shadow-[0_1px_2px_rgba(0,0,0,0.04)] dark:border-white/[0.1] dark:bg-white/[0.06] dark:text-foreground/90 dark:shadow-[0_1px_2px_rgba(0,0,0,0.2),0_8px_24px_rgba(0,0,0,0.25),inset_0_1px_0_rgba(255,255,255,0.06)] dark:hover:bg-white/[0.1]"
-                >
-                  <Settings className="h-3.5 w-3.5 text-foreground/55 transition-colors group-hover:text-foreground/80" />
-                  {t("chat.goToSettings")}
-                </button>
-              </div>
-            </div>
-          ) : showStartChatState ? (
-            <div className="flex min-h-[calc(100vh-220px)] flex-col items-center justify-center">
-              <div className="pointer-events-none absolute inset-0 flex items-center justify-center overflow-hidden">
-                <div className="hero-glow-pulse h-[360px] w-[360px] rounded-full bg-[radial-gradient(closest-side,hsl(var(--foreground)/0.08),transparent_70%)] blur-3xl" />
-              </div>
-
-              <div className="relative flex flex-col items-center">
-                <div className="hero-entrance hero-icon-float mb-5 flex h-24 w-24 items-center justify-center">
-                  <img
-                    src={iconSimpleUrl}
-                    alt=""
-                    aria-hidden="true"
-                    draggable={false}
-                    className="h-[72px] w-[72px] select-none object-contain"
-                  />
-                </div>
-
-                <h2 className="hero-entrance-delay-1 mb-2 bg-gradient-to-b from-foreground to-foreground/65 bg-clip-text text-2xl font-semibold leading-tight tracking-tight text-transparent">
-                  {t("chat.startChat")}
-                </h2>
-
-                <p className="hero-entrance-delay-2 max-w-[280px] text-center text-sm leading-relaxed text-muted-foreground">
-                  {t("chat.startChatDesc")}
-                </p>
-              </div>
-            </div>
-          ) : null}
-
-          <div className="space-y-6 select-text">
-            <TranscriptHistory
-              conversationId={conversationId}
-              workspaceRoot={workspaceRoot}
-              gitClient={gitClient}
-              scrollViewport={scrollViewport}
-              historyItems={historyItems}
-              showUsage={showUsage}
-              usageContextWindow={usageContextWindow}
-              copiedMessageKey={copiedMessageKey}
-              setCopiedMessageKey={setCopiedMessageKey}
-              onResendFromEdit={onResendFromEdit}
-              isSending={isSending}
-            />
-
-            <TranscriptLiveState
-              isSending={isSending}
-              isAgentMode={isAgentMode}
-              showUsage={showUsage}
-              usageContextWindow={usageContextWindow}
-              liveTranscriptStore={liveTranscriptStore}
-              isCompactionRunning={isCompactionRunning}
-            />
-          </div>
-
-          <div ref={bottomRef} className={shouldReserveTranscriptBottomSpace ? "h-48" : "h-0"} />
-        </div>
-      </ScrollArea>
-      {transcriptContextMenu && transcriptContextMenuPosition
-        ? createPortal(
-            <div
-              ref={transcriptContextMenuRef}
-              role="menu"
-              className="fixed z-[120] w-max min-w-[9.5rem] max-w-[calc(100vw-1.5rem)] overflow-hidden rounded-lg border border-border/70 bg-popover p-1.5 text-popover-foreground shadow-[0_20px_60px_-20px_rgba(15,23,42,0.35)]"
-              style={{
-                left: transcriptContextMenuPosition.left,
-                top: transcriptContextMenuPosition.top,
-              }}
-              onContextMenu={(event) => {
-                event.preventDefault();
-              }}
-            >
-              <button
-                type="button"
-                role="menuitem"
-                className="flex w-full items-center gap-2 rounded-md px-2.5 py-1.5 text-left text-[13px] text-foreground/90 transition-colors hover:bg-accent hover:text-accent-foreground"
-                onClick={() => {
-                  writeTextToClipboard(transcriptContextMenu.selectedText);
-                  closeTranscriptContextMenu();
-                }}
-              >
-                <Copy className="h-3.5 w-3.5 shrink-0" />
-                <span className="min-w-0 flex-1 truncate">{copySelectedTextLabel}</span>
-              </button>
-            </div>,
-            document.body,
-          )
-        : null}
-      {isHistorySwitching ? <HistorySwitchLoadingOverlay /> : null}
-    </div>
-  );
-});
diff --git a/crates/agent-gui/src/pages/chat/components/AssistantBubble.tsx b/crates/agent-gui/src/pages/chat/components/AssistantBubble.tsx
new file mode 100644
index 000000000..cfe14c6f8
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/AssistantBubble.tsx
@@ -0,0 +1,46 @@
+import type { UiRound } from "../../../lib/chat/messages/uiMessages";
+
+import { AssistantAvatar } from "./assistant-bubble/AssistantAvatar";
+import { RoundContent } from "./assistant-bubble/RoundContent";
+
+export { AssistantAvatar } from "./assistant-bubble/AssistantAvatar";
+export { CompactingText, VibingText } from "./assistant-bubble/StatusText";
+
+export function AssistantBubble(props: {
+  rounds: (UiRound & {
+    key?: string;
+    runningToolCallIds?: string[];
+    thinkingOpen?: boolean;
+  })[];
+  showUsage?: boolean;
+  usageContextWindow?: number;
+  isLive?: boolean;
+  toolStatus?: string | null;
+  toolStatusVariant?: "default" | "compaction";
+}) {
+  const { rounds, showUsage, usageContextWindow, isLive, toolStatus, toolStatusVariant } = props;
+  const showLabels = rounds.length > 1;
+
+  return (
+    <div className="flex w-full max-w-full items-start gap-3">
+      <AssistantAvatar />
+      <div className="min-w-0 flex-1 space-y-3 pt-0.5">
+        {rounds.map((round, idx) => (
+          <RoundContent
+            key={"key" in round && round.key ? round.key : `round-${round.round}`}
+            round={round}
+            showLabel={showLabels}
+            showUsage={showUsage}
+            usageContextWindow={usageContextWindow}
+            isLive={isLive}
+            isActive={isLive && idx === rounds.length - 1}
+            toolStatus={idx === rounds.length - 1 ? toolStatus : null}
+            toolStatusVariant={idx === rounds.length - 1 ? toolStatusVariant : "default"}
+            runningToolCallIds={round.runningToolCallIds ?? []}
+            thinkingOpen={round.thinkingOpen}
+          />
+        ))}
+      </div>
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx b/crates/agent-gui/src/pages/chat/components/ChatComposerBar.tsx
similarity index 97%
rename from crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
rename to crates/agent-gui/src/pages/chat/components/ChatComposerBar.tsx
index 75c277b49..093b8e66a 100644
--- a/crates/agent-gui/src/pages/chat/ChatComposerBar.tsx
+++ b/crates/agent-gui/src/pages/chat/components/ChatComposerBar.tsx
@@ -3,8 +3,8 @@ import {
   MentionComposer,
   type MentionComposerHandle,
   type MentionComposerSkill,
-} from "../../components/chat/MentionComposer";
-import { GitBranchSelector } from "../../components/git/GitBranchSelector";
+} from "../../../components/chat/MentionComposer";
+import { GitBranchSelector } from "../../../components/git/GitBranchSelector";
 import {
   Brain,
   Globe2,
@@ -14,27 +14,27 @@ import {
   Send,
   Square,
   X,
-} from "../../components/icons";
-import { Button } from "../../components/ui/button";
+} from "../../../components/icons";
+import { Button } from "../../../components/ui/button";
 import {
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from "../../components/ui/select";
-import { useLocale } from "../../i18n";
+} from "../../../components/ui/select";
+import { useLocale } from "../../../i18n";
 import {
   formatUploadedFileSize,
   type PendingUploadedFile,
-} from "../../lib/chat/messages/uploadedFiles";
-import type { GitClient } from "../../lib/git/types";
+} from "../../../lib/chat/messages/uploadedFiles";
+import type { GitClient } from "../../../lib/git/types";
 import {
   type ChatRuntimeControls,
   DEFAULT_CHAT_RUNTIME_CONTROLS,
   type ReasoningLevel,
-} from "../../lib/settings";
-import { cn } from "../../lib/shared/utils";
+} from "../../../lib/settings";
+import { cn } from "../../../lib/shared/utils";
 
 const REASONING_I18N_KEYS: Record<ReasoningLevel, string> = {
   off: "settings.reasoning.off",
diff --git a/crates/agent-gui/src/pages/chat/ChatHeader.tsx b/crates/agent-gui/src/pages/chat/components/ChatHeader.tsx
similarity index 95%
rename from crates/agent-gui/src/pages/chat/ChatHeader.tsx
rename to crates/agent-gui/src/pages/chat/components/ChatHeader.tsx
index 673b85a58..bf73809a7 100644
--- a/crates/agent-gui/src/pages/chat/ChatHeader.tsx
+++ b/crates/agent-gui/src/pages/chat/components/ChatHeader.tsx
@@ -10,10 +10,10 @@ import {
   Search,
   Settings,
   Sun,
-} from "../../components/icons";
+} from "../../../components/icons";
 
-import { isMacOsTauri } from "../../components/MacOsTitleBarSpacer";
-import { Button } from "../../components/ui/button";
+import { isMacOsTauri } from "../../../components/MacOsTitleBarSpacer";
+import { Button } from "../../../components/ui/button";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -21,12 +21,12 @@ import {
   DropdownMenuLabel,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
-} from "../../components/ui/dropdown-menu";
-import { useLocale } from "../../i18n";
-import { type ModelOption, parseModelValue } from "../../lib/providers/llm";
-import { type AppSettings, type ProviderId, setSelectedModel } from "../../lib/settings";
-import { cn } from "../../lib/shared/utils";
-import type { SectionId } from "../settings/types";
+} from "../../../components/ui/dropdown-menu";
+import { useLocale } from "../../../i18n";
+import { type ModelOption, parseModelValue } from "../../../lib/providers/llm";
+import { type AppSettings, type ProviderId, setSelectedModel } from "../../../lib/settings";
+import { cn } from "../../../lib/shared/utils";
+import type { SectionId } from "../../settings/types";
 
 function ProviderBrandIcon({ type, className }: { type: ProviderId; className?: string }) {
   const cls = cn("h-4 w-4 shrink-0", className);
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/AssistantAvatar.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/AssistantAvatar.tsx
new file mode 100644
index 000000000..20eaa50ea
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/AssistantAvatar.tsx
@@ -0,0 +1,22 @@
+import iconSimpleUrl from "../../../../../src-tauri/icons/icon-simple.png";
+import { cn } from "../../../../lib/shared/utils";
+
+export function AssistantAvatar(props: { className?: string }) {
+  const { className } = props;
+  return (
+    <div
+      className={cn(
+        "mt-0.5 flex h-7 w-7 shrink-0 items-center justify-center rounded-full border border-border/60 bg-background/80 shadow-sm dark:bg-background/70",
+        className,
+      )}
+    >
+      <img
+        src={iconSimpleUrl}
+        alt=""
+        aria-hidden="true"
+        draggable={false}
+        className="h-6 w-6 select-none object-contain"
+      />
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/EditDiffView.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/EditDiffView.tsx
new file mode 100644
index 000000000..223b2b15c
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/EditDiffView.tsx
@@ -0,0 +1,94 @@
+import { generateDiffFile } from "@git-diff-view/file";
+import { DiffModeEnum, DiffView } from "@git-diff-view/react";
+import { useEffect, useMemo, useState } from "react";
+import "@git-diff-view/react/styles/diff-view.css";
+
+function guessLangFromPath(filePath?: string): string {
+  if (!filePath) return "txt";
+  const ext = filePath.split(".").pop()?.toLowerCase();
+  const map: Record<string, string> = {
+    ts: "typescript",
+    tsx: "typescript",
+    js: "javascript",
+    jsx: "javascript",
+    py: "python",
+    rs: "rust",
+    go: "go",
+    java: "java",
+    kt: "kotlin",
+    rb: "ruby",
+    swift: "swift",
+    c: "c",
+    cpp: "cpp",
+    h: "c",
+    hpp: "cpp",
+    cs: "csharp",
+    css: "css",
+    scss: "scss",
+    html: "html",
+    vue: "vue",
+    json: "json",
+    yaml: "yaml",
+    yml: "yaml",
+    toml: "toml",
+    xml: "xml",
+    md: "markdown",
+    sql: "sql",
+    sh: "bash",
+    zsh: "bash",
+    bash: "bash",
+    dockerfile: "dockerfile",
+    lua: "lua",
+    php: "php",
+    dart: "dart",
+  };
+  return (ext && map[ext]) || "txt";
+}
+
+function useIsDark() {
+  const [isDark, setIsDark] = useState(() => document.documentElement.classList.contains("dark"));
+  useEffect(() => {
+    const observer = new MutationObserver(() => {
+      setIsDark(document.documentElement.classList.contains("dark"));
+    });
+    observer.observe(document.documentElement, { attributes: true, attributeFilter: ["class"] });
+    return () => observer.disconnect();
+  }, []);
+  return isDark;
+}
+
+export function EditDiffView(props: { beforeText: string; afterText: string; filePath?: string }) {
+  const { beforeText, afterText, filePath } = props;
+  const isDark = useIsDark();
+  const lang = guessLangFromPath(filePath);
+
+  const diffFile = useMemo(() => {
+    if (!beforeText && !afterText) return undefined;
+    const instance = generateDiffFile(
+      filePath ?? "old",
+      beforeText,
+      filePath ?? "new",
+      afterText,
+      lang,
+      lang,
+    );
+    instance.init();
+    instance.buildSplitDiffLines();
+    return instance;
+  }, [beforeText, afterText, filePath, lang]);
+
+  if (!diffFile) return null;
+
+  return (
+    <div className="tool-text-scroll overflow-x-auto overflow-y-hidden rounded-[10px] border border-black/[0.06] shadow-sm dark:border-white/[0.08] dark:shadow-none">
+      <DiffView
+        diffFile={diffFile}
+        diffViewMode={DiffModeEnum.Unified}
+        diffViewTheme={isDark ? "dark" : "light"}
+        diffViewHighlight
+        diffViewWrap={false}
+        diffViewFontSize={12}
+      />
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/HostedSearchGroupView.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/HostedSearchGroupView.tsx
new file mode 100644
index 000000000..55726456c
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/HostedSearchGroupView.tsx
@@ -0,0 +1,214 @@
+import { useMemo, useState } from "react";
+
+import { ChevronRight, Search } from "../../../../components/icons";
+import { useLocale } from "../../../../i18n";
+import type { HostedSearchBlock } from "../../../../lib/chat/messages/hostedSearch";
+import { cn } from "../../../../lib/shared/utils";
+
+function getHostedSearchStatusLabel(
+  t: (key: string) => string,
+  status: HostedSearchBlock["status"],
+) {
+  switch (status) {
+    case "failed":
+      return t("chat.search.failed");
+    case "completed":
+      return t("chat.search.completed");
+    default:
+      return t("chat.search.searching");
+  }
+}
+
+function getSourceHost(url: string) {
+  try {
+    return new URL(url).hostname.replace(/^www\./, "");
+  } catch {
+    return url;
+  }
+}
+
+function getHostedSearchGroupStatus(items: HostedSearchBlock[]): HostedSearchBlock["status"] {
+  if (items.some((item) => item.status === "searching")) return "searching";
+  if (items.every((item) => item.status === "failed")) return "failed";
+  return "completed";
+}
+
+function getUniqueHostedSearchQueries(items: HostedSearchBlock[]) {
+  const out: string[] = [];
+  for (const item of items) {
+    for (const query of item.queries) {
+      const text = query.trim();
+      if (text && !out.includes(text)) out.push(text);
+    }
+  }
+  return out;
+}
+
+function getUniqueHostedSearchSources(items: HostedSearchBlock[]) {
+  const out = new Map<string, HostedSearchBlock["sources"][number]>();
+  for (const item of items) {
+    for (const source of item.sources) {
+      if (!source.url || out.has(source.url)) continue;
+      out.set(source.url, source);
+    }
+  }
+  return [...out.values()];
+}
+
+function getLatestHostedSearchTitle(
+  items: HostedSearchBlock[],
+  t: (key: string) => string,
+  status: HostedSearchBlock["status"],
+) {
+  for (let itemIndex = items.length - 1; itemIndex >= 0; itemIndex -= 1) {
+    const item = items[itemIndex];
+    for (let queryIndex = item.queries.length - 1; queryIndex >= 0; queryIndex -= 1) {
+      const query = item.queries[queryIndex]?.trim();
+      if (query) return query;
+    }
+    const latestSource = item.sources[item.sources.length - 1];
+    if (latestSource?.title) return latestSource.title;
+    if (latestSource?.url) return getSourceHost(latestSource.url);
+  }
+  if (status !== "searching") return getHostedSearchStatusLabel(t, status);
+  return t("chat.search.noQuery");
+}
+
+function getHostedSearchCountLabel(count: number, t: (key: string) => string) {
+  return count <= 1 ? t("chat.search.oneSearch") : `${count} ${t("chat.search.searches")}`;
+}
+
+export function HostedSearchGroupView({ items }: { items: HostedSearchBlock[] }) {
+  const { t } = useLocale();
+  const [open, setOpen] = useState(false);
+  const queries = useMemo(() => getUniqueHostedSearchQueries(items), [items]);
+  const sources = useMemo(() => getUniqueHostedSearchSources(items), [items]);
+  const visibleSources = sources.slice(0, 10);
+  const status = getHostedSearchGroupStatus(items);
+  const statusLabel = getHostedSearchStatusLabel(t, status);
+  const latestTitle = getLatestHostedSearchTitle(items, t, status);
+  const isSearching = status === "searching";
+  const hasDetails = queries.length > 0 || visibleSources.length > 0;
+  const statusBgClass =
+    status === "failed"
+      ? "bg-[hsl(var(--chat-error)/0.1)] text-[hsl(var(--chat-error))]"
+      : status === "searching"
+        ? "bg-[hsl(var(--chat-running)/0.1)] text-[hsl(var(--chat-running))]"
+        : "bg-[hsl(var(--chat-success)/0.1)] text-[hsl(var(--chat-success))]";
+  const dotClass =
+    status === "failed"
+      ? "bg-[hsl(var(--chat-error))]"
+      : status === "searching"
+        ? "bg-[hsl(var(--chat-running))] animate-pulse"
+        : "bg-[hsl(var(--chat-success))]";
+
+  return (
+    <div className="tool-card-enter min-w-0 max-w-full overflow-hidden rounded-[12px] border border-black/[0.06] bg-white/[0.72] shadow-[0_0_0_0.5px_rgba(0,0,0,0.03),0_1px_2px_rgba(0,0,0,0.03),0_2px_6px_rgba(0,0,0,0.02)] backdrop-blur-xl backdrop-saturate-[1.8] transition-shadow duration-200 hover:shadow-[0_0_0_0.5px_rgba(0,0,0,0.04),0_1px_3px_rgba(0,0,0,0.05),0_4px_14px_rgba(0,0,0,0.04)] dark:border-white/[0.1] dark:bg-white/[0.06] dark:shadow-[0_0_0_0.5px_rgba(255,255,255,0.04),0_1px_2px_rgba(0,0,0,0.2),0_3px_8px_rgba(0,0,0,0.12)] dark:backdrop-saturate-[1.4] dark:hover:shadow-[0_0_0_0.5px_rgba(255,255,255,0.06),0_1px_3px_rgba(0,0,0,0.25),0_4px_14px_rgba(0,0,0,0.18)]">
+      <button
+        type="button"
+        aria-expanded={open}
+        aria-label={open ? t("chat.search.collapseActivity") : t("chat.search.expandActivity")}
+        className="grid w-full cursor-pointer select-none grid-cols-[auto_minmax(0,1fr)_auto] items-start gap-x-2 gap-y-1 px-2.5 py-2 text-left transition-colors hover:bg-black/[0.018] active:bg-black/[0.035] dark:hover:bg-white/[0.025] dark:active:bg-white/[0.045] sm:items-center"
+        onClick={() => setOpen((prev) => !prev)}
+      >
+        <div
+          className="relative mt-0.5 flex h-[24px] w-[24px] shrink-0 items-center justify-center rounded-[7px] sm:mt-0"
+          style={{
+            background:
+              "linear-gradient(135deg, hsl(var(--tool-search-accent) / 0.13), hsl(var(--tool-search-accent) / 0.06))",
+          }}
+        >
+          {isSearching ? (
+            <span className="absolute inset-0 animate-ping rounded-[7px] bg-[hsl(var(--tool-search-accent)/0.16)]" />
+          ) : null}
+          <Search className="relative h-3.5 w-3.5 text-[hsl(var(--tool-search-accent))]" />
+        </div>
+
+        <div className="min-w-0 space-y-0.5 sm:grid sm:grid-cols-[auto_minmax(0,1fr)] sm:items-center sm:gap-2 sm:space-y-0">
+          <div className="flex min-w-0 items-center gap-1.5">
+            <span className="inline-flex h-5 shrink-0 items-center text-[12.5px] font-semibold leading-none text-foreground/90">
+              {t("chat.search.webSearch")}
+            </span>
+            <span className="inline-flex h-5 max-w-[5.75rem] shrink-0 items-center truncate rounded-full bg-black/[0.04] px-1.5 text-[10.5px] font-semibold leading-none text-muted-foreground/70 dark:bg-white/[0.06]">
+              {getHostedSearchCountLabel(items.length, t)}
+            </span>
+          </div>
+          <span
+            key={latestTitle}
+            className={cn(
+              "block h-4 min-w-0 truncate text-[11px] leading-4 text-muted-foreground/60 transition-opacity duration-200 sm:inline-flex sm:h-5 sm:items-center sm:leading-none",
+              isSearching ? "animate-pulse" : "",
+            )}
+            title={latestTitle}
+          >
+            {latestTitle}
+          </span>
+        </div>
+
+        <div className="flex h-5 min-w-0 shrink-0 items-center gap-1.5 justify-self-end">
+          <span className={cn("inline-block h-1.5 w-1.5 rounded-full", dotClass)} />
+          <span
+            className={cn(
+              "inline-flex h-5 max-w-[5.5rem] items-center truncate rounded-full px-1.5 text-[10px] font-semibold leading-none",
+              statusBgClass,
+            )}
+          >
+            {statusLabel}
+          </span>
+          <ChevronRight
+            className={cn(
+              "h-3 w-3 text-muted-foreground/35 transition-transform duration-200 ease-out",
+              open ? "rotate-90" : "",
+            )}
+          />
+        </div>
+      </button>
+
+      {open && hasDetails ? (
+        <div className="tool-trace-group-body space-y-2 border-t border-black/[0.04] px-2.5 py-2.5 dark:border-white/[0.05]">
+          {queries.length > 0 ? (
+            <div className="flex flex-wrap gap-1.5">
+              {queries.map((query) => (
+                <span
+                  key={query}
+                  className="tool-arg-pill min-w-0 max-w-full truncate rounded-[6px] border border-border/35 bg-background/65 px-2 py-1 text-[12px] text-foreground/85"
+                  title={query}
+                >
+                  {query}
+                </span>
+              ))}
+            </div>
+          ) : null}
+
+          {visibleSources.length > 0 ? (
+            <div className="space-y-1.5">
+              <div className="text-[11px] font-medium uppercase tracking-normal text-muted-foreground/70">
+                {t("chat.search.sources")}
+              </div>
+              <div className="grid gap-1 sm:grid-cols-2">
+                {visibleSources.map((source) => {
+                  const label = source.title || getSourceHost(source.url);
+                  return (
+                    <a
+                      key={source.url}
+                      href={source.url}
+                      target="_blank"
+                      rel="noreferrer"
+                      className="block min-w-0 max-w-full rounded-[6px] border border-transparent px-2 py-1 text-[12px] transition-colors hover:border-border/45 hover:bg-background/60"
+                      title={source.url}
+                    >
+                      <span className="block truncate font-medium text-foreground/85">{label}</span>
+                      <span className="block truncate text-muted-foreground">
+                        {getSourceHost(source.url)}
+                      </span>
+                    </a>
+                  );
+                })}
+              </div>
+            </div>
+          ) : null}
+        </div>
+      ) : null}
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/RoundContent.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/RoundContent.tsx
new file mode 100644
index 000000000..682e84204
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/RoundContent.tsx
@@ -0,0 +1,193 @@
+import { useEffect, useMemo, useRef, useState } from "react";
+
+import { ChevronRight, Loader2, Sparkles } from "../../../../components/icons";
+import { LiveMarkdown, Markdown } from "../../../../components/Markdown";
+import { useLocale } from "../../../../i18n";
+import type { UiRound } from "../../../../lib/chat/messages/uiMessages";
+import { normalizeLiveToolStatus, VIBING_STATUS } from "../../../../lib/chat/page/chatPageHelpers";
+import { groupRoundBlocks } from "./assistantBubbleUtils";
+import { HostedSearchGroupView } from "./HostedSearchGroupView";
+import { CompactingText, VibingText } from "./StatusText";
+import { MemoToolCallItem } from "./ToolCallItem";
+import { getNativeDisplayImagePayload, NativeDisplayImageBlock } from "./ToolImages";
+import { ToolTraceGroup } from "./ToolTraceGroup";
+import { UsagePanel } from "./UsagePanel";
+
+function ThinkingBlock({ text, open }: { text: string; open?: boolean }) {
+  const hasText = /\S/.test(text || "");
+  const { t } = useLocale();
+  const [isOpen, setIsOpen] = useState(typeof open === "boolean" ? open : false);
+  const userInteractedRef = useRef(false);
+
+  useEffect(() => {
+    if (!userInteractedRef.current && typeof open === "boolean") {
+      setIsOpen(open);
+    }
+  }, [open]);
+
+  if (!hasText) return null;
+
+  return (
+    <div className="group/think rounded-lg border border-border/40 bg-muted/30">
+      <button
+        type="button"
+        aria-expanded={isOpen}
+        onClick={() => {
+          userInteractedRef.current = true;
+          setIsOpen((prev) => !prev);
+        }}
+        className="thinking-block-toggle flex w-full cursor-pointer select-none items-center gap-2 px-3 py-2 text-[13px] text-muted-foreground transition-colors hover:text-foreground"
+      >
+        <Sparkles className="h-3.5 w-3.5 text-muted-foreground/70" />
+        <span className="thinking-block-label font-medium">{t("chat.thinkingProcess")}</span>
+        <ChevronRight
+          className={`ml-auto h-3 w-3 transition-transform ${isOpen ? "rotate-90" : ""}`}
+        />
+      </button>
+      {isOpen ? (
+        <div className="border-t border-border/30 px-3 pb-3 pt-2">
+          <pre className="thinking-block-pre max-h-64 overflow-auto whitespace-pre-wrap rounded-md bg-muted/40 p-3 text-[12.5px] leading-relaxed text-muted-foreground">
+            {text}
+          </pre>
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
+export function RoundContent(props: {
+  round: UiRound;
+  showLabel: boolean;
+  showUsage?: boolean;
+  usageContextWindow?: number;
+  isLive?: boolean;
+  isActive?: boolean;
+  toolStatus?: string | null;
+  toolStatusVariant?: "default" | "compaction";
+  runningToolCallIds?: string[];
+  thinkingOpen?: boolean;
+}) {
+  const {
+    round,
+    showLabel,
+    showUsage,
+    usageContextWindow,
+    isLive,
+    isActive,
+    toolStatus,
+    toolStatusVariant,
+    runningToolCallIds,
+    thinkingOpen,
+  } = props;
+  const hasContent =
+    round.blocks.some((block) => {
+      if (block.kind === "tool" || block.kind === "hostedSearch") return true;
+      return block.text.trim().length > 0;
+    }) ||
+    (isActive && isLive);
+  const normalizedToolStatus =
+    isActive && isLive ? normalizeLiveToolStatus(toolStatus ?? null) : null;
+  const isCompactionStatus = toolStatusVariant === "compaction";
+  const isVibingStatus = normalizedToolStatus === VIBING_STATUS;
+  const groupedBlocks = useMemo(() => groupRoundBlocks(round.blocks), [round.blocks]);
+  const latestThinkingKey = useMemo(() => {
+    for (let index = groupedBlocks.length - 1; index >= 0; index -= 1) {
+      const block = groupedBlocks[index];
+      if (block?.kind === "thinking") return block.key;
+    }
+    return null;
+  }, [groupedBlocks]);
+  const autoOpenThinking = isLive ? Boolean(isActive && thinkingOpen) : false;
+
+  if (!hasContent) return null;
+
+  return (
+    <div className="space-y-3">
+      {showLabel ? <div className="h-px bg-border/40" /> : null}
+
+      {isActive && isLive && normalizedToolStatus ? (
+        <div className="flex items-center gap-2 py-1 text-[13px]">
+          <Loader2 className="h-3.5 w-3.5 animate-spin text-muted-foreground" />
+          {isCompactionStatus ? (
+            <CompactingText className="font-medium text-muted-foreground" />
+          ) : isVibingStatus ? (
+            <VibingText className="font-medium text-muted-foreground" />
+          ) : (
+            <span className="font-medium text-muted-foreground">{normalizedToolStatus}</span>
+          )}
+        </div>
+      ) : null}
+
+      {groupedBlocks.map((block) => {
+        if (block.kind === "thinking") {
+          return (
+            <ThinkingBlock
+              key={block.key}
+              text={block.text}
+              open={autoOpenThinking && block.key === latestThinkingKey}
+            />
+          );
+        }
+
+        if (block.kind === "tool") {
+          const displayImagePayload = getNativeDisplayImagePayload(block.item);
+          if (displayImagePayload) {
+            return <NativeDisplayImageBlock key={block.key} payload={displayImagePayload} />;
+          }
+
+          if (block.item.toolCall.name === "Image" && !block.item.toolResult?.isError) {
+            return null;
+          }
+
+          return (
+            <MemoToolCallItem
+              key={block.key}
+              item={block.item}
+              isRunning={Boolean(
+                isLive &&
+                  block.item.toolCall.id &&
+                  (runningToolCallIds || []).includes(block.item.toolCall.id),
+              )}
+            />
+          );
+        }
+
+        if (block.kind === "toolGroup") {
+          return (
+            <ToolTraceGroup
+              key={block.key}
+              items={block.items}
+              runningToolCallIds={isLive ? (runningToolCallIds ?? []) : []}
+            />
+          );
+        }
+
+        if (block.kind === "hostedSearch" || block.kind === "hostedSearchGroup") {
+          return (
+            <HostedSearchGroupView
+              key={block.key}
+              items={block.kind === "hostedSearch" ? [block.item] : block.items}
+            />
+          );
+        }
+
+        if (!block.text.trim()) return null;
+
+        return isLive && isActive ? (
+          <LiveMarkdown
+            key={block.key}
+            content={block.text}
+            className="font-openai-chat"
+            isAnimating
+          />
+        ) : (
+          <Markdown key={block.key} content={block.text} className="font-openai-chat" />
+        );
+      })}
+
+      {showUsage ? (
+        <UsagePanel usage={round.meta?.usage} contextWindow={usageContextWindow} />
+      ) : null}
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/StatusText.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/StatusText.tsx
new file mode 100644
index 000000000..8b0d90ab7
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/StatusText.tsx
@@ -0,0 +1,42 @@
+import { useLocale } from "../../../../i18n";
+import { VIBING_STATUS } from "../../../../lib/chat/page/chatPageHelpers";
+import { cn } from "../../../../lib/shared/utils";
+
+export function VibingText({ className }: { className?: string }) {
+  return <AnimatedStatusText text={VIBING_STATUS} className={className} />;
+}
+
+export function CompactingText({ className }: { className?: string }) {
+  const { t } = useLocale();
+  return <AnimatedStatusText text={t("chat.compactingContext")} className={className} />;
+}
+
+function AnimatedStatusText(props: { text: string; className?: string }) {
+  const { text, className } = props;
+  const seenCharacters = new Map<string, number>();
+  const characters = Array.from(text, (char, delayIndex) => {
+    const count = seenCharacters.get(char) ?? 0;
+    seenCharacters.set(char, count + 1);
+    return {
+      char,
+      delayIndex,
+      key: `${char}-${count}`,
+    };
+  });
+
+  return (
+    <span className={cn("vibing-status", className)}>
+      <span className="sr-only">{text}</span>
+      {characters.map(({ char, delayIndex, key }) => (
+        <span
+          key={key}
+          aria-hidden="true"
+          className="vibing-status-char"
+          style={{ animationDelay: `${delayIndex * 0.08}s` }}
+        >
+          {char === " " ? "\u00A0" : char}
+        </span>
+      ))}
+    </span>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolCallItem.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolCallItem.tsx
new file mode 100644
index 000000000..06fec7a06
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolCallItem.tsx
@@ -0,0 +1,509 @@
+import type { ToolResultMessage } from "@earendil-works/pi-ai";
+import { memo, useEffect, useState } from "react";
+
+import { ChevronRight, Search } from "../../../../components/icons";
+import { useLocale } from "../../../../i18n";
+import {
+  previewText,
+  safeStringify,
+  summarizeToolCall,
+  type ToolTraceItem,
+  toolCallArgsForDisplay,
+  toolResultMessageToText,
+} from "../../../../lib/chat/messages/uiMessages";
+import { cn } from "../../../../lib/shared/utils";
+import {
+  areStableValuesEqual,
+  displayString,
+  getBuiltinResultKind,
+  getDelegateAgentInlineSummary,
+  getToolDisplayName,
+  getToolMeta,
+  isDelegateAgentCardToolCall,
+  type MetaTag,
+} from "./assistantBubbleUtils";
+import {
+  MetaTags,
+  PathDisplay,
+  ToolFactGrid,
+  ToolResultDisplay,
+  ToolScrollablePre,
+  ToolSection,
+  ToolSurface,
+  ToolSurfaceLabel,
+} from "./ToolResultDisplay";
+
+function getToolDisplay(toolCall: { name: string; arguments?: Record<string, unknown> }) {
+  const args = toolCall.arguments || {};
+  const name = toolCall.name;
+  const path = typeof args.path === "string" ? (args.path as string) : null;
+  const pattern = typeof args.pattern === "string" ? (args.pattern as string) : null;
+  const tags: MetaTag[] = [];
+
+  switch (name) {
+    case "Read":
+      if (typeof args.start_line === "number")
+        tags.push({ label: "start", value: String(args.start_line) });
+      if (typeof args.limit === "number") tags.push({ label: "limit", value: String(args.limit) });
+      if (typeof args.page_start === "number")
+        tags.push({ label: "page", value: String(args.page_start) });
+      if (typeof args.page_limit === "number")
+        tags.push({ label: "pages", value: String(args.page_limit) });
+      if (typeof args.cell_start === "number")
+        tags.push({ label: "cell", value: String(args.cell_start) });
+      if (typeof args.cell_limit === "number")
+        tags.push({ label: "cells", value: String(args.cell_limit) });
+      return { type: "file" as const, path, tags };
+    case "SkillsManager":
+      if (typeof args.offset === "number")
+        tags.push({ label: "start", value: String(args.offset + 1) });
+      if (typeof args.length === "number")
+        tags.push({ label: "limit", value: String(args.length) });
+      return { type: "file" as const, path, tags };
+    case "MemoryManager":
+      if (typeof args.action === "string")
+        tags.push({ label: "action", value: args.action as string });
+      if (typeof args.slug === "string") tags.push({ label: "slug", value: args.slug as string });
+      if (typeof args.scope === "string")
+        tags.push({ label: "scope", value: args.scope as string });
+      if (typeof args.type === "string") tags.push({ label: "type", value: args.type as string });
+      return { type: "generic" as const, path: null, pattern: null, tags };
+    case "McpManager":
+      if (typeof args.action === "string")
+        tags.push({ label: "action", value: args.action as string });
+      if (typeof args.server_id === "string")
+        tags.push({ label: "server", value: args.server_id as string });
+      if (Array.isArray(args.server_ids))
+        tags.push({ label: "servers", value: String(args.server_ids.length) });
+      if (typeof args.conflict === "string")
+        tags.push({ label: "conflict", value: args.conflict as string });
+      if (args.include_schema === true) tags.push({ label: "schema", value: "true" });
+      return { type: "generic" as const, path: null, pattern: null, tags };
+    case "SendMessage":
+      if (typeof args.to === "string") tags.push({ label: "to", value: args.to as string });
+      if (typeof args.channel === "string")
+        tags.push({ label: "channel", value: args.channel as string });
+      if (typeof args.subject === "string")
+        tags.push({ label: "subject", value: args.subject as string });
+      if (typeof args.summary === "string" && typeof args.subject !== "string")
+        tags.push({ label: "subject", value: args.summary as string });
+      if (typeof args.message === "string")
+        tags.push({ label: "message", value: `${(args.message as string).length} chars` });
+      return { type: "generic" as const, path: null, pattern: null, tags };
+    case "Write":
+      tags.push({ label: "mode", value: "rewrite" });
+      if (typeof args.content === "string")
+        tags.push({ label: "content", value: `${(args.content as string).length} chars` });
+      return { type: "file" as const, path, tags };
+    case "Edit":
+      if (typeof args.old_string === "string")
+        tags.push({ label: "old", value: `${(args.old_string as string).length}c` });
+      if (typeof args.new_string === "string")
+        tags.push({ label: "new", value: `${(args.new_string as string).length}c` });
+      if (typeof args.expected_replacements === "number")
+        tags.push({ label: "×", value: String(args.expected_replacements) });
+      if (args.replace_all === true) tags.push({ label: "all", value: "true" });
+      return { type: "file" as const, path, tags };
+    case "Delete":
+      return { type: "file" as const, path, tags };
+    case "List":
+      if (typeof args.depth === "number") tags.push({ label: "depth", value: String(args.depth) });
+      if (typeof args.offset === "number")
+        tags.push({ label: "offset", value: String(args.offset) });
+      if (typeof args.max_results === "number")
+        tags.push({ label: "max", value: String(args.max_results) });
+      return { type: "file" as const, path: path || "/", tags };
+    case "Glob":
+      if (typeof args.offset === "number")
+        tags.push({ label: "offset", value: String(args.offset) });
+      if (typeof args.max_results === "number")
+        tags.push({ label: "max", value: String(args.max_results) });
+      return { type: "search" as const, path, pattern, tags };
+    case "Grep":
+      if (typeof args.file_pattern === "string")
+        tags.push({ label: "filter", value: args.file_pattern as string });
+      if (typeof args.output_mode === "string")
+        tags.push({ label: "mode", value: args.output_mode as string });
+      if (typeof args.ignore_case === "boolean" && args.ignore_case)
+        tags.push({ label: "flag", value: "-i" });
+      if (typeof args.context === "number" && args.context > 0)
+        tags.push({ label: "ctx", value: String(args.context) });
+      if (typeof args.head_limit === "number")
+        tags.push({ label: "head", value: String(args.head_limit) });
+      if (args.multiline === true) tags.push({ label: "multi", value: "true" });
+      return { type: "search" as const, path, pattern, tags };
+    case "Bash":
+      return { type: "bash" as const, path: null, pattern: null, tags };
+    default: {
+      // Generic: collect all string/number/boolean args
+      const entries: MetaTag[] = [];
+      for (const [k, v] of Object.entries(args)) {
+        if (typeof v === "string")
+          entries.push({ label: k, value: v.length > 60 ? `${v.slice(0, 60)}…` : v });
+        else if (typeof v === "number" || typeof v === "boolean")
+          entries.push({ label: k, value: String(v) });
+      }
+      return { type: "generic" as const, path: null, pattern: null, tags: entries };
+    }
+  }
+}
+
+/** Expanded args display — tool-aware layout */
+function ToolArgsDisplay({ item }: { item: ToolTraceItem }) {
+  const toolCall = item.toolCall;
+  const display = getToolDisplay(toolCall);
+
+  if (isDelegateAgentCardToolCall(toolCall)) {
+    const args = toolCall.arguments || {};
+    const name = displayString(args.name) || displayString(args.agent_id) || displayString(args.id);
+    const role = displayString(args.role);
+    const task = displayString(args.prompt) || displayString(args.description);
+
+    return (
+      <div className="tool-expand flex flex-col gap-2">
+        {name ? (
+          <ToolSurface>
+            <ToolSurfaceLabel label="agent" />
+            <div className="break-words text-[11.5px] font-semibold leading-[1.55] text-foreground/86">
+              {name}
+            </div>
+          </ToolSurface>
+        ) : null}
+        {role ? (
+          <ToolSurface>
+            <ToolSurfaceLabel label="role" />
+            <div className="break-words text-[11.5px] leading-[1.55] text-foreground/78">
+              {role}
+            </div>
+          </ToolSurface>
+        ) : null}
+        {task ? (
+          <ToolSurface>
+            <ToolSurfaceLabel label="task" />
+            <div className="break-words text-[11.5px] leading-[1.6] text-foreground/82">{task}</div>
+          </ToolSurface>
+        ) : null}
+      </div>
+    );
+  }
+
+  // Bash: terminal block
+  if (display.type === "bash") {
+    const cmd =
+      typeof toolCall.arguments?.command === "string"
+        ? (toolCall.arguments.command as string).trim()
+        : "";
+    if (!cmd) return null;
+    return (
+      <ToolSurface className="overflow-hidden border-emerald-500/15 bg-zinc-950/90 px-0 py-0 shadow-[inset_0_1px_0_rgba(255,255,255,0.04)] dark:border-white/[0.08] dark:bg-zinc-950/90">
+        <ToolScrollablePre className="max-h-44 rounded-none text-emerald-300/90">
+          <span className="mr-1 select-none text-emerald-500/30">$</span>
+          {cmd}
+        </ToolScrollablePre>
+      </ToolSurface>
+    );
+  }
+
+  // File tools: target path + compact request facts
+  if (display.type === "file" && (display.path || display.tags.length > 0)) {
+    return (
+      <div className="tool-expand flex flex-col gap-2">
+        {display.path ? (
+          <ToolSurface>
+            <ToolSurfaceLabel label="path" />
+            <PathDisplay
+              path={display.path}
+              className="block min-w-0 break-all font-mono text-[11.5px] leading-[1.6]"
+            />
+          </ToolSurface>
+        ) : null}
+        {display.tags.length > 0 ? <MetaTags tags={display.tags} /> : null}
+      </div>
+    );
+  }
+
+  // Search tools: query, scope, and request facts
+  if (display.type === "search" && (display.pattern || display.path || display.tags.length > 0)) {
+    return (
+      <div className="tool-expand flex flex-col gap-2">
+        {display.pattern ? (
+          <ToolSurface>
+            <ToolSurfaceLabel label="query" />
+            <div className="flex items-start gap-2">
+              <Search className="mt-[2px] h-3.5 w-3.5 shrink-0 text-muted-foreground/35" />
+              <span className="min-w-0 break-all font-mono text-[11.5px] leading-[1.6] text-foreground/82">
+                {display.pattern}
+              </span>
+            </div>
+          </ToolSurface>
+        ) : null}
+        {display.path ? (
+          <ToolSurface>
+            <ToolSurfaceLabel label="scope" />
+            <PathDisplay
+              path={display.path}
+              className="block min-w-0 break-all font-mono text-[11.5px] leading-[1.6]"
+            />
+          </ToolSurface>
+        ) : null}
+        {display.tags.length > 0 ? <MetaTags tags={display.tags} /> : null}
+      </div>
+    );
+  }
+
+  // Generic: key-value grid
+  if (display.type === "generic" && display.tags.length > 0) {
+    return <ToolFactGrid tags={display.tags} />;
+  }
+
+  // Fallback: raw JSON
+  return (
+    <ToolSurface className="overflow-hidden px-0 py-0">
+      <ToolScrollablePre className="max-h-44 rounded-none">
+        {safeStringify(toolCallArgsForDisplay(toolCall))}
+      </ToolScrollablePre>
+    </ToolSurface>
+  );
+}
+
+function ToolCallItem({
+  item,
+  isRunning,
+  variant = "standalone",
+}: {
+  item: ToolTraceItem;
+  isRunning?: boolean;
+  variant?: "standalone" | "grouped";
+}) {
+  const { t } = useLocale();
+  const result = item.toolResult;
+  const builtinResultKind = getBuiltinResultKind(result);
+  const shouldAutoOpen = item.toolCall.name === "Image" || builtinResultKind === "display_image";
+  const [open, setOpen] = useState(shouldAutoOpen);
+  const isDelegateAgentCard = isDelegateAgentCardToolCall(item.toolCall);
+  const hasArgs = Object.keys(item.toolCall.arguments || {}).length > 0;
+  const shouldShowArgs = hasArgs && (!isDelegateAgentCard || !result);
+  const isBash = item.toolCall.name === "Bash";
+  const bashCmd =
+    isBash && typeof item.toolCall.arguments?.command === "string"
+      ? item.toolCall.arguments.command.trim()
+      : "";
+  const firstLine = bashCmd ? bashCmd.split("\n")[0] : "";
+  const toolArgsSummary = isBash
+    ? ""
+    : isDelegateAgentCard
+      ? getDelegateAgentInlineSummary(item)
+      : summarizeToolCall(item.toolCall, { includeName: false });
+  const meta = getToolMeta(item.toolCall.name);
+  const ToolIcon = meta.Icon;
+
+  const dotClass = isRunning
+    ? "bg-[hsl(var(--chat-running))] animate-pulse"
+    : result
+      ? result.isError
+        ? "bg-[hsl(var(--chat-error))]"
+        : "bg-[hsl(var(--chat-success))]"
+      : "bg-zinc-400";
+
+  const statusLabel = isRunning
+    ? t("chat.tool.running")
+    : result
+      ? result.isError
+        ? t("chat.tool.failed")
+        : t("chat.tool.success")
+      : t("chat.tool.waiting");
+
+  const statusBgClass = isRunning
+    ? "bg-[hsl(var(--chat-running)/0.1)] text-[hsl(var(--chat-running))]"
+    : result
+      ? result.isError
+        ? "bg-[hsl(var(--chat-error)/0.1)] text-[hsl(var(--chat-error))]"
+        : "bg-[hsl(var(--chat-success)/0.1)] text-[hsl(var(--chat-success))]"
+      : "bg-black/[0.05] text-muted-foreground dark:bg-white/[0.08]";
+
+  useEffect(() => {
+    if (shouldAutoOpen) {
+      setOpen(true);
+    }
+  }, [shouldAutoOpen]);
+
+  return (
+    <details
+      open={open}
+      className={cn(
+        "group/tool overflow-hidden",
+        variant === "grouped"
+          ? "tool-card-grouped rounded-[10px]"
+          : "tool-card-enter rounded-[12px]",
+        // Frosted glass with saturate
+        "border border-black/[0.06] bg-white/[0.72] backdrop-blur-xl backdrop-saturate-[1.8]",
+        variant === "grouped"
+          ? "shadow-none"
+          : [
+              // Subtle layered shadow
+              "shadow-[0_0_0_0.5px_rgba(0,0,0,0.03),0_1px_2px_rgba(0,0,0,0.03),0_2px_6px_rgba(0,0,0,0.02)]",
+              // Hover lift
+              "transition-shadow duration-200",
+              "hover:shadow-[0_0_0_0.5px_rgba(0,0,0,0.04),0_1px_3px_rgba(0,0,0,0.05),0_4px_14px_rgba(0,0,0,0.04)]",
+            ],
+        // Dark
+        "dark:border-white/[0.1] dark:bg-white/[0.06] dark:backdrop-saturate-[1.4]",
+        variant === "grouped"
+          ? "dark:shadow-none"
+          : [
+              "dark:shadow-[0_0_0_0.5px_rgba(255,255,255,0.04),0_1px_2px_rgba(0,0,0,0.2),0_3px_8px_rgba(0,0,0,0.12)]",
+              "dark:hover:shadow-[0_0_0_0.5px_rgba(255,255,255,0.06),0_1px_3px_rgba(0,0,0,0.25),0_4px_14px_rgba(0,0,0,0.18)]",
+            ],
+      )}
+      onToggle={(e) => setOpen((e.currentTarget as HTMLDetailsElement).open)}
+    >
+      {/* Compact single-line summary */}
+      <summary
+        className={cn(
+          "flex cursor-pointer select-none items-center gap-2 hover:bg-black/[0.015] dark:hover:bg-white/[0.025]",
+          variant === "grouped" ? "px-2 py-[6px]" : "px-2.5 py-[7px]",
+        )}
+      >
+        {/* Small icon with accent tint */}
+        <div
+          className="flex h-[22px] w-[22px] shrink-0 items-center justify-center rounded-[6px]"
+          style={{
+            background: `linear-gradient(135deg, hsl(${meta.accent} / 0.13), hsl(${meta.accent} / 0.06))`,
+          }}
+        >
+          <ToolIcon className="h-3 w-3" style={{ color: `hsl(${meta.accent})` }} />
+        </div>
+
+        {/* Tool name + inline summary on same line */}
+        <div className="flex min-w-0 flex-1 items-center gap-1.5">
+          <span className="shrink-0 text-[12.5px] font-semibold tracking-[-0.01em] text-foreground/90">
+            {getToolDisplayName(item.toolCall.name)}
+          </span>
+
+          {/* Inline summary — truncated */}
+          {isBash && firstLine ? (
+            <span className="min-w-0 truncate font-mono text-[11px] text-muted-foreground/55">
+              <span className="text-muted-foreground/30">$</span>{" "}
+              {firstLine.length > 48 ? `${firstLine.slice(0, 48)}…` : firstLine}
+            </span>
+          ) : toolArgsSummary ? (
+            <span
+              className="min-w-0 truncate font-mono text-[11px] text-muted-foreground/55"
+              title={toolArgsSummary}
+            >
+              {toolArgsSummary}
+            </span>
+          ) : null}
+        </div>
+
+        {/* Status badge + dot + chevron */}
+        <div className="flex shrink-0 items-center gap-1.5">
+          <span className={cn("inline-block h-1.5 w-1.5 rounded-full", dotClass)} />
+          <span
+            className={cn(
+              "inline-flex items-center rounded-full px-1.5 py-[1px] text-[10px] font-semibold",
+              statusBgClass,
+            )}
+          >
+            {statusLabel}
+          </span>
+          <ChevronRight className="h-3 w-3 text-muted-foreground/35 transition-transform duration-200 ease-out group-open/tool:rotate-90" />
+        </div>
+      </summary>
+
+      {open ? (
+        <div className="space-y-3 border-t border-black/[0.04] px-2.5 py-2.5 dark:border-white/[0.05]">
+          {shouldShowArgs ? (
+            <ToolSection label={isBash ? t("chat.tool.command") : t("chat.tool.args")}>
+              <ToolArgsDisplay item={item} />
+            </ToolSection>
+          ) : null}
+
+          {result ? (
+            <ToolSection
+              label={t("chat.tool.return")}
+              trailing={
+                result.isError ? (
+                  <span className="inline-flex items-center rounded-full bg-red-500/10 px-2 py-[1px] text-[10px] font-bold text-red-500 dark:bg-red-500/15">
+                    {t("chat.tool.error")}
+                  </span>
+                ) : null
+              }
+            >
+              <div className="space-y-1.5">
+                <ToolResultDisplay item={item} result={result} />
+
+                {(() => {
+                  const resultText = toolResultMessageToText(result);
+                  if (!/\S/.test(resultText)) return null;
+                  if (builtinResultKind && builtinResultKind !== "read_image") return null;
+
+                  if (isBash) {
+                    return (
+                      <ToolScrollablePre className="max-h-56 bg-zinc-950/85 text-zinc-300/90 shadow-[inset_0_1px_2px_rgba(0,0,0,0.25)] dark:bg-zinc-900/80">
+                        {previewText(resultText, 6000)}
+                      </ToolScrollablePre>
+                    );
+                  }
+
+                  return (
+                    <details className="group/result">
+                      <summary className="flex cursor-pointer select-none items-center gap-1 text-[10.5px] text-muted-foreground/50 transition-colors duration-150 hover:text-foreground/60">
+                        <ChevronRight className="h-2.5 w-2.5 transition-transform duration-200 group-open/result:rotate-90" />
+                        {t("chat.tool.viewReturn")}
+                      </summary>
+                      <ToolScrollablePre
+                        className={cn(
+                          "mt-1.5 max-h-56",
+                          isBash
+                            ? "bg-zinc-950/85 text-zinc-300/90 shadow-[inset_0_1px_2px_rgba(0,0,0,0.25)] dark:bg-zinc-900/80"
+                            : "bg-black/[0.02] dark:bg-white/[0.03]",
+                        )}
+                      >
+                        {previewText(resultText, 6000)}
+                      </ToolScrollablePre>
+                    </details>
+                  );
+                })()}
+              </div>
+            </ToolSection>
+          ) : null}
+        </div>
+      ) : null}
+    </details>
+  );
+}
+
+function areToolResultsEqual(
+  previous: ToolResultMessage | undefined,
+  next: ToolResultMessage | undefined,
+) {
+  if (!previous || !next) {
+    return previous === next;
+  }
+
+  return (
+    previous.toolCallId === next.toolCallId &&
+    previous.toolName === next.toolName &&
+    previous.isError === next.isError &&
+    areStableValuesEqual(previous.content, next.content) &&
+    areStableValuesEqual(previous.details, next.details)
+  );
+}
+
+function areToolTraceItemsEqual(previous: ToolTraceItem, next: ToolTraceItem) {
+  return (
+    previous.toolCall.id === next.toolCall.id &&
+    previous.toolCall.name === next.toolCall.name &&
+    areStableValuesEqual(previous.toolCall.arguments, next.toolCall.arguments) &&
+    areToolResultsEqual(previous.toolResult, next.toolResult)
+  );
+}
+
+export const MemoToolCallItem = memo(
+  ToolCallItem,
+  (previousProps, nextProps) =>
+    previousProps.isRunning === nextProps.isRunning &&
+    previousProps.variant === nextProps.variant &&
+    areToolTraceItemsEqual(previousProps.item, nextProps.item),
+);
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolImages.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolImages.tsx
new file mode 100644
index 000000000..4b87e3bee
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolImages.tsx
@@ -0,0 +1,523 @@
+import type { ImageContent, ToolResultMessage } from "@earendil-works/pi-ai";
+import { useEffect, useMemo, useState } from "react";
+
+import { ImagePreview, type ImagePreviewSlide } from "../../../../components/chat/ImagePreview";
+import { ImageOff, Loader2 } from "../../../../components/icons";
+import { useLocale } from "../../../../i18n";
+import type { ToolTraceItem } from "../../../../lib/chat/messages/uiMessages";
+import { prepareImageProxyUrl } from "../../../../lib/providers/proxy";
+import { cn } from "../../../../lib/shared/utils";
+import type {
+  DisplayImageItemDetails,
+  DisplayImageResultDetails,
+} from "../../../../lib/tools/builtinTypes";
+import { getBuiltinResultKind } from "./assistantBubbleUtils";
+
+export function getToolResultImages(result?: ToolResultMessage) {
+  if (!result) return [];
+  return result.content.filter((block): block is ImageContent => block.type === "image");
+}
+
+export type NativeDisplayImageEntry = {
+  detail: DisplayImageItemDetails;
+  image?: ImageContent;
+};
+
+type NativeDisplayImageProxyRequest = {
+  index: number;
+  source: string;
+};
+
+export type NativeDisplayImageSourceState = {
+  src: string;
+  status: "loading" | "ready" | "error";
+};
+
+type ToolImageLoadState = "loading" | "loaded" | "error";
+
+function getImageDataUrl(image: ImageContent) {
+  return `data:${image.mimeType};base64,${image.data}`;
+}
+
+function isDisplayImageItemDetails(value: unknown): value is DisplayImageItemDetails {
+  return (
+    Boolean(value) &&
+    typeof value === "object" &&
+    typeof (value as { path?: unknown }).path === "string"
+  );
+}
+
+function getDisplayImageDetails(result: ToolResultMessage): DisplayImageItemDetails[] {
+  const details = result.details as DisplayImageResultDetails | undefined;
+  if (!details || details.kind !== "display_image" || !Array.isArray(details.images)) {
+    return [];
+  }
+  return details.images.filter(isDisplayImageItemDetails);
+}
+
+function shouldRenderDisplayImageThroughProxy(detail: DisplayImageItemDetails) {
+  return detail.renderMode === "proxy" || detail.sourceType === "url";
+}
+
+function getProxyImageSource(detail: DisplayImageItemDetails) {
+  if (!shouldRenderDisplayImageThroughProxy(detail)) return "";
+  const source = (detail.sourceUrl || detail.path || "").trim();
+  return /^https?:\/\//i.test(source) ? source : "";
+}
+
+function getNativeDisplayImageEntries(result: ToolResultMessage): NativeDisplayImageEntry[] {
+  const inlineImages = getToolResultImages(result);
+  const detailImages = getDisplayImageDetails(result);
+  if (detailImages.length > 0) {
+    let inlineImageIndex = 0;
+    const entries = detailImages
+      .map((detail) => {
+        if (shouldRenderDisplayImageThroughProxy(detail)) {
+          return { detail, image: undefined };
+        }
+        const image = inlineImages[inlineImageIndex];
+        inlineImageIndex += 1;
+        return { detail, image };
+      })
+      .filter((entry) => Boolean(entry.image) || Boolean(getProxyImageSource(entry.detail)));
+    if (entries.length > 0) return entries;
+  }
+  return inlineImages.map((image, index) => ({
+    image,
+    detail: {
+      path: `inline-image-${index + 1}`,
+      renderMode: "inline",
+      mimeType: image.mimeType,
+      sizeBytes: Math.ceil((image.data.length * 3) / 4),
+    },
+  }));
+}
+
+function getNativeDisplayImageProxyKey(entries: NativeDisplayImageEntry[]) {
+  const requests = entries
+    .map((entry, index) => {
+      const source = getProxyImageSource(entry.detail);
+      return source ? { index, source } : null;
+    })
+    .filter((request): request is NativeDisplayImageProxyRequest => request !== null);
+  return JSON.stringify(requests);
+}
+
+function parseNativeDisplayImageProxyKey(proxyKey: string): NativeDisplayImageProxyRequest[] {
+  if (!proxyKey || proxyKey === "[]") return [];
+  try {
+    const parsed = JSON.parse(proxyKey);
+    if (!Array.isArray(parsed)) return [];
+    return parsed.filter(
+      (item): item is NativeDisplayImageProxyRequest =>
+        item !== null &&
+        typeof item === "object" &&
+        typeof item.index === "number" &&
+        Number.isInteger(item.index) &&
+        item.index >= 0 &&
+        typeof item.source === "string" &&
+        item.source.length > 0,
+    );
+  } catch {
+    return [];
+  }
+}
+
+function useNativeDisplayImageSources(entries: NativeDisplayImageEntry[]) {
+  const proxyKey = getNativeDisplayImageProxyKey(entries);
+  const [proxySources, setProxySources] = useState<Record<number, NativeDisplayImageSourceState>>(
+    {},
+  );
+
+  useEffect(() => {
+    let cancelled = false;
+    const pending = parseNativeDisplayImageProxyKey(proxyKey);
+
+    if (pending.length === 0) {
+      setProxySources({});
+      return;
+    }
+
+    setProxySources(
+      Object.fromEntries(
+        pending.map(({ index }) => [index, { src: "", status: "loading" as const }]),
+      ),
+    );
+    void Promise.all(
+      pending.map(async ({ index, source }) => {
+        try {
+          const preparedSource = await prepareImageProxyUrl(source);
+          return [
+            index,
+            preparedSource
+              ? { src: preparedSource, status: "ready" as const }
+              : { src: "", status: "error" as const },
+          ] as const;
+        } catch {
+          return [index, { src: "", status: "error" as const }] as const;
+        }
+      }),
+    ).then((items) => {
+      if (cancelled) return;
+      const next: Record<number, NativeDisplayImageSourceState> = {};
+      for (const [index, source] of items) {
+        next[index] = source;
+      }
+      setProxySources(next);
+    });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [proxyKey]);
+
+  return entries.map((entry, index) => {
+    if (entry.image) {
+      return { src: getImageDataUrl(entry.image), status: "ready" as const };
+    }
+    if (!getProxyImageSource(entry.detail)) {
+      return { src: "", status: "error" as const };
+    }
+    return proxySources[index] ?? { src: "", status: "loading" as const };
+  });
+}
+
+function estimateBase64Bytes(data: string) {
+  return Math.ceil((data.length * 3) / 4);
+}
+
+function formatToolResultBytes(sizeBytes: number) {
+  if (sizeBytes >= 1024 * 1024) {
+    return `${(sizeBytes / (1024 * 1024)).toFixed(1)} MB`;
+  }
+  if (sizeBytes >= 1024) {
+    return `${Math.round(sizeBytes / 1024)} KB`;
+  }
+  return `${sizeBytes} B`;
+}
+
+function getInitialImageLoadState(source: NativeDisplayImageSourceState): ToolImageLoadState {
+  if (source.status === "error") return "error";
+  if (source.status === "ready" && !source.src) return "error";
+  return "loading";
+}
+
+function formatDisplayImageLabel(t: (key: string) => string, imageCount: number, index: number) {
+  if (imageCount <= 1) return t("chat.image.display");
+  return t("chat.image.displayNumber").replace("{index}", String(index + 1));
+}
+
+function ToolImageStatusCard(props: {
+  status: "loading" | "error";
+  title?: string;
+  detail?: string;
+  className?: string;
+}) {
+  const { status, title, detail, className } = props;
+  const { t } = useLocale();
+  const isError = status === "error";
+  const Icon = isError ? ImageOff : Loader2;
+
+  return (
+    <div
+      className={cn(
+        "relative flex min-h-28 w-full flex-col items-center justify-center gap-2 overflow-hidden rounded-[8px] border border-dashed px-4 py-5 text-center",
+        isError
+          ? "border-red-500/25 bg-red-500/[0.04] text-red-700 dark:border-red-400/25 dark:bg-red-400/[0.06] dark:text-red-300"
+          : "border-black/[0.08] bg-black/[0.025] text-muted-foreground dark:border-white/[0.1] dark:bg-white/[0.035]",
+        className,
+      )}
+    >
+      <div
+        className={cn(
+          "flex h-9 w-9 items-center justify-center rounded-[8px] border bg-white/80 shadow-sm dark:bg-black/20",
+          isError ? "border-red-500/20" : "border-black/[0.06] dark:border-white/[0.08]",
+        )}
+      >
+        <Icon className={cn("h-4 w-4", !isError && "animate-spin text-primary")} />
+      </div>
+      <div className="max-w-full space-y-1">
+        <div className="text-[12px] font-medium">
+          {title ?? (isError ? t("chat.image.unavailable") : t("chat.image.loading"))}
+        </div>
+        {detail ? (
+          <div
+            className={cn(
+              "max-w-full truncate text-[11px]",
+              isError ? "text-red-700/75 dark:text-red-200/75" : "text-muted-foreground",
+            )}
+            title={detail}
+          >
+            {detail}
+          </div>
+        ) : null}
+      </div>
+      {!isError ? (
+        <div className="h-1 w-24 overflow-hidden rounded-full bg-black/[0.06] dark:bg-white/[0.08]">
+          <div className="h-full w-1/2 animate-pulse rounded-full bg-primary/55" />
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
+export function ToolResultImagePreview(props: {
+  image: ImageContent;
+  alt: string;
+  id: string;
+  sizeBytes?: number;
+}) {
+  const { image, alt, id, sizeBytes } = props;
+  const { t } = useLocale();
+  const [previewOpen, setPreviewOpen] = useState(false);
+  const [imageStatus, setImageStatus] = useState<ToolImageLoadState>("loading");
+  const src = getImageDataUrl(image);
+  const estimatedBytes = sizeBytes ?? estimateBase64Bytes(image.data);
+  const imageDetail = `${alt} · ${formatToolResultBytes(estimatedBytes)}`;
+  const slides = useMemo<ImagePreviewSlide[]>(
+    () => [
+      {
+        src,
+        alt,
+        title: alt,
+      },
+    ],
+    [alt, src],
+  );
+
+  useEffect(() => {
+    setImageStatus(src ? "loading" : "error");
+    setPreviewOpen(false);
+  }, [src]);
+
+  const canPreview = imageStatus === "loaded";
+
+  return (
+    <>
+      <button
+        type="button"
+        className={cn(
+          "relative block w-full overflow-hidden rounded-[8px] text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/45 disabled:opacity-100",
+          canPreview ? "cursor-zoom-in" : "cursor-default",
+        )}
+        disabled={!canPreview}
+        onClick={() => {
+          if (canPreview) setPreviewOpen(true);
+        }}
+        title={alt}
+        aria-label={
+          canPreview ? `${t("chat.image.preview")} ${alt}` : `${t("chat.image.loading")} ${alt}`
+        }
+      >
+        <div className={cn("relative w-full", imageStatus !== "loaded" && "min-h-32")}>
+          {imageStatus !== "loaded" ? (
+            <ToolImageStatusCard
+              status={imageStatus === "error" ? "error" : "loading"}
+              title={
+                imageStatus === "error" ? t("chat.image.unavailable") : t("chat.image.loading")
+              }
+              detail={imageStatus === "error" ? t("chat.image.checkGenerated") : imageDetail}
+              className="absolute inset-0 min-h-32"
+            />
+          ) : null}
+          {imageStatus !== "error" ? (
+            <img
+              key={id}
+              src={src}
+              alt={alt}
+              loading="lazy"
+              decoding="async"
+              className={cn(
+                "max-h-72 w-full rounded-[8px] object-contain transition-opacity duration-200",
+                imageStatus === "loaded"
+                  ? "opacity-100"
+                  : "pointer-events-none absolute inset-0 h-full max-h-none opacity-0",
+              )}
+              onLoad={() => setImageStatus("loaded")}
+              onError={() => setImageStatus("error")}
+            />
+          ) : null}
+        </div>
+      </button>
+      {previewOpen ? (
+        <ImagePreview open={previewOpen} slides={slides} onClose={() => setPreviewOpen(false)} />
+      ) : null}
+    </>
+  );
+}
+
+export function getNativeDisplayImagePayload(item: ToolTraceItem) {
+  const result = item.toolResult;
+  if (!result || result.isError || getBuiltinResultKind(result) !== "display_image") {
+    return null;
+  }
+
+  const entries = getNativeDisplayImageEntries(result);
+  if (entries.length === 0) {
+    return null;
+  }
+
+  return {
+    details: result.details as DisplayImageResultDetails,
+    entries,
+  };
+}
+
+function getNativeImageGridClass(imageCount: number) {
+  if (imageCount <= 1) {
+    return "my-1 flex max-w-full flex-col items-start gap-2";
+  }
+  if (imageCount === 2) {
+    return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2";
+  }
+  if (imageCount === 3) {
+    return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2 sm:grid-cols-3";
+  }
+  if (imageCount === 4) {
+    return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2 sm:grid-cols-4";
+  }
+  if (imageCount === 5) {
+    return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2 sm:grid-cols-3 lg:grid-cols-5";
+  }
+  return "my-1 grid w-full max-w-3xl grid-cols-2 gap-2 sm:grid-cols-3 lg:grid-cols-6";
+}
+
+function isSvgDisplayImageEntry(entry: NativeDisplayImageEntry) {
+  const mimeType = entry.image?.mimeType || entry.detail.mimeType || "";
+  return mimeType.split(";")[0]?.trim().toLowerCase() === "image/svg+xml";
+}
+
+function NativeDisplayImageTile(props: {
+  source: NativeDisplayImageSourceState;
+  alt: string;
+  isGallery: boolean;
+  isSvgImage: boolean;
+  loading: "lazy" | "eager";
+  onPreview: () => void;
+}) {
+  const { source, alt, isGallery, isSvgImage, loading, onPreview } = props;
+  const { src, status } = source;
+  const { t } = useLocale();
+  const [imageStatus, setImageStatus] = useState<ToolImageLoadState>(() =>
+    getInitialImageLoadState({ src, status }),
+  );
+
+  useEffect(() => {
+    setImageStatus(getInitialImageLoadState({ src, status }));
+  }, [src, status]);
+
+  const canPreview = status === "ready" && imageStatus === "loaded";
+  const isWaiting = !canPreview;
+  const statusTitle =
+    imageStatus === "error"
+      ? t("chat.image.unavailable")
+      : status === "loading"
+        ? t("chat.image.preparing")
+        : t("chat.image.loading");
+
+  return (
+    <button
+      type="button"
+      className={cn(
+        "relative flex max-w-full items-center justify-center overflow-hidden rounded-[10px] text-left shadow-sm transition-[filter,transform] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/45 disabled:opacity-100",
+        canPreview
+          ? "cursor-zoom-in hover:brightness-[0.98]"
+          : "cursor-default hover:brightness-100",
+        isGallery && "aspect-square w-full bg-muted/30",
+        !isGallery && (isSvgImage || isWaiting) && "min-h-28 w-full max-w-3xl bg-muted/30",
+        imageStatus === "error" && "shadow-none",
+      )}
+      disabled={!canPreview}
+      aria-label={canPreview ? `${t("chat.image.preview")} ${alt}` : statusTitle}
+      onClick={() => {
+        if (canPreview) onPreview();
+      }}
+    >
+      {source.status === "ready" && source.src && imageStatus !== "error" ? (
+        <img
+          src={source.src}
+          alt={alt}
+          loading={loading}
+          decoding="async"
+          className={cn(
+            "block object-contain transition-opacity duration-200",
+            isGallery
+              ? "absolute inset-0 h-full w-full p-1"
+              : isSvgImage
+                ? "h-auto max-h-[32rem] w-full max-w-full p-1"
+                : "h-auto max-h-[32rem] max-w-full",
+            imageStatus === "loaded"
+              ? "opacity-100"
+              : "pointer-events-none absolute inset-0 h-full w-full max-h-none opacity-0",
+          )}
+          onLoad={() => setImageStatus("loaded")}
+          onError={() => setImageStatus("error")}
+        />
+      ) : null}
+      {imageStatus !== "loaded" ? (
+        <ToolImageStatusCard
+          status={imageStatus === "error" ? "error" : "loading"}
+          title={statusTitle}
+          detail={imageStatus === "error" ? t("chat.image.checkSource") : alt}
+          className={cn(
+            "rounded-[10px]",
+            isGallery ? "absolute inset-0 min-h-0" : "min-h-28 w-full max-w-3xl",
+          )}
+        />
+      ) : null}
+    </button>
+  );
+}
+
+export function NativeDisplayImageBlock(props: {
+  payload: NonNullable<ReturnType<typeof getNativeDisplayImagePayload>>;
+}) {
+  const { payload } = props;
+  const { t } = useLocale();
+  const isGallery = payload.entries.length > 1;
+  const [previewIndex, setPreviewIndex] = useState<number | null>(null);
+  const imageSources = useNativeDisplayImageSources(payload.entries);
+  const slides = useMemo<ImagePreviewSlide[]>(
+    () =>
+      payload.entries.map((_entry, index) => ({
+        src: imageSources[index]?.src ?? "",
+        alt: formatDisplayImageLabel(t, payload.entries.length, index),
+        title: formatDisplayImageLabel(t, payload.entries.length, index),
+      })),
+    [imageSources, payload.entries, t],
+  );
+
+  return (
+    <>
+      <div className={getNativeImageGridClass(payload.entries.length)}>
+        {payload.entries.map((entry, index) => {
+          const id = entry.image
+            ? `${entry.image.mimeType}-${entry.image.data.length}-${index}`
+            : `${entry.detail.sourceUrl ?? entry.detail.path}-${index}`;
+          const slide = slides[index];
+          const alt = slide?.alt ?? formatDisplayImageLabel(t, payload.entries.length, index);
+          const isSvgImage = isSvgDisplayImageEntry(entry);
+          return (
+            <NativeDisplayImageTile
+              key={id}
+              source={imageSources[index] ?? { src: "", status: "loading" }}
+              alt={alt}
+              isGallery={isGallery}
+              isSvgImage={isSvgImage}
+              loading={isGallery ? "eager" : "lazy"}
+              onPreview={() => setPreviewIndex(index)}
+            />
+          );
+        })}
+      </div>
+      {previewIndex !== null ? (
+        <ImagePreview
+          open={previewIndex !== null}
+          slides={slides}
+          index={previewIndex}
+          onClose={() => setPreviewIndex(null)}
+        />
+      ) : null}
+    </>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolResultDisplay.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolResultDisplay.tsx
new file mode 100644
index 000000000..5f20b19ec
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolResultDisplay.tsx
@@ -0,0 +1,836 @@
+import type { ToolResultMessage } from "@earendil-works/pi-ai";
+import type { ReactNode } from "react";
+
+import { Markdown } from "../../../../components/Markdown";
+import {
+  previewText,
+  safeStringify,
+  type ToolTraceItem,
+  toolResultMessageToText,
+} from "../../../../lib/chat/messages/uiMessages";
+import { cn } from "../../../../lib/shared/utils";
+import type {
+  DelegateAgentCardResultDetails,
+  DeleteResultDetails,
+  EditResultDetails,
+  GlobResultDetails,
+  GrepResultDetails,
+  ListResultDetails,
+  McpManagerResultDetails,
+  ReadDocumentResultDetails,
+  ReadImageResultDetails,
+  ReadNotebookResultDetails,
+  ReadPdfResultDetails,
+  ReadTextResultDetails,
+  SkillsManagerResultDetails,
+  SubagentMessageResultDetails,
+  WriteResultDetails,
+} from "../../../../lib/tools/builtinTypes";
+import {
+  getBuiltinResultKind,
+  getDelegateAgentTask,
+  isShellResultDetails,
+  type MetaTag,
+  shouldShowDelegateApplyStatus,
+  shouldShowDelegateCleanupStatus,
+  shouldShowDelegateWorktreeLocation,
+  summarizeShellStream,
+} from "./assistantBubbleUtils";
+import { EditDiffView } from "./EditDiffView";
+import { getToolResultImages, ToolResultImagePreview } from "./ToolImages";
+
+export function ToolSection(props: { label: string; trailing?: ReactNode; children: ReactNode }) {
+  const { label, trailing, children } = props;
+  return (
+    <section className="space-y-2">
+      <div className="flex items-center gap-2">
+        <span className="shrink-0 text-[10px] font-semibold uppercase tracking-[0.18em] text-muted-foreground/52">
+          {label}
+        </span>
+        <div className="h-px flex-1 bg-black/[0.05] dark:bg-white/[0.08]" />
+        {trailing}
+      </div>
+      {children}
+    </section>
+  );
+}
+
+export function ToolSurface(props: { children: ReactNode; className?: string }) {
+  const { children, className } = props;
+  return (
+    <div
+      className={cn(
+        "rounded-[10px] border border-black/[0.05] bg-white/[0.56] px-2.5 py-2 shadow-[inset_0_1px_0_rgba(255,255,255,0.58)] dark:border-white/[0.08] dark:bg-white/[0.04] dark:shadow-none",
+        className,
+      )}
+    >
+      {children}
+    </div>
+  );
+}
+
+export function ToolSurfaceLabel({ label }: { label: string }) {
+  return (
+    <div className="mb-1.5 text-[10px] font-semibold uppercase tracking-[0.16em] text-muted-foreground/45">
+      {label}
+    </div>
+  );
+}
+
+export function ToolFactGrid({ tags }: { tags: MetaTag[] }) {
+  if (tags.length === 0) return null;
+  return (
+    <div className="grid gap-1.5 sm:grid-cols-2">
+      {tags.map((tag) => (
+        <ToolSurface key={`${tag.label}-${tag.value}`} className="px-2.5 py-2">
+          <ToolSurfaceLabel label={tag.label} />
+          <div className="break-all font-mono text-[11px] leading-[1.55] text-foreground/78">
+            {tag.value}
+          </div>
+        </ToolSurface>
+      ))}
+    </div>
+  );
+}
+
+function buildPagedResultTags(params: {
+  label: string;
+  returned: number;
+  total: number;
+  offset: number;
+  hasMore: boolean;
+}) {
+  const { label, returned, total, offset, hasMore } = params;
+  return [
+    { label, value: `${returned}/${total}` },
+    ...(offset > 0 ? [{ label: "offset", value: String(offset) }] : []),
+    { label: "state", value: hasMore ? "partial" : "complete" },
+  ];
+}
+
+function fileRootTags(root?: string | null): MetaTag[] {
+  return root && root !== "workspace" ? [{ label: "root", value: root }] : [];
+}
+
+export function PathDisplay({ path, className }: { path: string; className?: string }) {
+  const lastSlash = path.lastIndexOf("/");
+  if (lastSlash < 0) {
+    return (
+      <span
+        className={cn(
+          className,
+          "block max-w-full overflow-hidden text-ellipsis whitespace-nowrap break-normal",
+        )}
+        title={path}
+      >
+        {path}
+      </span>
+    );
+  }
+  const dir = path.slice(0, lastSlash + 1);
+  const file = path.slice(lastSlash + 1);
+  return (
+    <span
+      className={cn(
+        className,
+        "inline-flex max-w-full min-w-0 items-baseline overflow-hidden whitespace-nowrap break-normal",
+      )}
+      title={path}
+    >
+      <span className="min-w-0 flex-1 truncate text-muted-foreground/40">
+        {dir.length > 50 ? `…${dir.slice(-50)}` : dir}
+      </span>
+      <span className="max-w-[70%] truncate text-foreground/85">{file}</span>
+    </span>
+  );
+}
+
+/** Inline meta tags */
+export function MetaTags({ tags }: { tags: MetaTag[] }) {
+  if (tags.length === 0) return null;
+  return (
+    <div className="flex flex-wrap gap-1.5">
+      {tags.map((tag) => (
+        <span
+          key={`${tag.label}-${tag.value}`}
+          className="tool-arg-pill inline-flex min-h-6 items-center gap-1.5 rounded-full border border-black/[0.05] bg-white/[0.78] px-2 py-1 text-[10.5px] leading-none shadow-[inset_0_1px_0_rgba(255,255,255,0.65)] dark:border-white/[0.08] dark:bg-white/[0.04] dark:shadow-none"
+        >
+          <span className="font-semibold uppercase tracking-[0.12em] text-muted-foreground/55">
+            {tag.label}
+          </span>
+          <span className="h-3 w-px bg-black/[0.06] dark:bg-white/[0.08]" />
+          <span className="font-mono text-foreground/75">{tag.value}</span>
+        </span>
+      ))}
+    </div>
+  );
+}
+
+function extractReadBody(text: string) {
+  const marker = text.indexOf("\n\n");
+  return marker >= 0 ? text.slice(marker + 2) : text;
+}
+
+export function ToolScrollablePre(props: { children: ReactNode; className?: string }) {
+  const { children, className } = props;
+  return (
+    <pre
+      className={cn(
+        "tool-text-scroll overflow-x-auto overflow-y-auto whitespace-pre break-normal rounded-[8px] px-2.5 py-2 text-[11.5px] leading-[1.6]",
+        className,
+      )}
+    >
+      {children}
+    </pre>
+  );
+}
+
+export function CodePreview(props: { text: string; maxChars?: number }) {
+  const { text, maxChars = 4000 } = props;
+  if (!/\S/.test(text)) return null;
+  return (
+    <ToolScrollablePre className="max-h-56 bg-black/[0.02] dark:bg-white/[0.03]">
+      {previewText(text, maxChars)}
+    </ToolScrollablePre>
+  );
+}
+
+function extractResultText(result?: ToolResultMessage) {
+  return result ? toolResultMessageToText(result) : "";
+}
+
+export function ToolResultDisplay({
+  item,
+  result,
+}: {
+  item: ToolTraceItem;
+  result: ToolResultMessage;
+}) {
+  const kind = getBuiltinResultKind(result);
+  const text = extractResultText(result);
+  const images = getToolResultImages(result);
+  const shellDetails = isShellResultDetails(result.details) ? result.details : null;
+
+  if (item.toolCall.name === "Bash") {
+    if (!shellDetails) return null;
+
+    return (
+      <ToolSurface>
+        <MetaTags
+          tags={[
+            { label: "shell", value: shellDetails.shell || "unknown" },
+            { label: "exit", value: String(shellDetails.exit_code) },
+            { label: "duration", value: `${shellDetails.duration_ms} ms` },
+            ...(typeof shellDetails.effective_timeout_ms === "number"
+              ? [{ label: "timeout_ms", value: `${shellDetails.effective_timeout_ms}` }]
+              : []),
+            {
+              label: "stdout",
+              value: summarizeShellStream(shellDetails.stdout, shellDetails.stdout_truncated),
+            },
+            {
+              label: "stderr",
+              value: summarizeShellStream(shellDetails.stderr, shellDetails.stderr_truncated),
+            },
+            ...(shellDetails.timed_out ? [{ label: "timeout", value: "true" }] : []),
+            ...(shellDetails.cancelled ? [{ label: "cancelled", value: "true" }] : []),
+          ]}
+        />
+      </ToolSurface>
+    );
+  }
+
+  if (kind === "read_text") {
+    const details = result.details as ReadTextResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              ...fileRootTags(details.root),
+              {
+                label: "lines",
+                value:
+                  details.numLines > 0
+                    ? `${details.startLine}-${details.startLine + details.numLines - 1}/${details.totalLines}`
+                    : `empty/${details.totalLines}`,
+              },
+              { label: "view", value: details.isPartialView ? "partial" : "full" },
+              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
+              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
+            ]}
+          />
+        </ToolSurface>
+        {!details.reusedExisting ? (
+          <CodePreview text={extractReadBody(text)} maxChars={8000} />
+        ) : null}
+      </div>
+    );
+  }
+
+  if (kind === "read_skill") {
+    const details = result.details as SkillsManagerResultDetails;
+    if (details.kind !== "read_skill") return null;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              {
+                label: "lines",
+                value:
+                  details.numLines > 0
+                    ? `${details.startLine}-${details.startLine + details.numLines - 1}`
+                    : `empty @ ${details.startLine}`,
+              },
+              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
+            ]}
+          />
+        </ToolSurface>
+        <CodePreview text={extractReadBody(text)} maxChars={8000} />
+      </div>
+    );
+  }
+
+  if (kind === "manage_skill") {
+    const details = result.details as Extract<SkillsManagerResultDetails, { kind: "manage_skill" }>;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              { label: "action", value: details.action },
+              { label: "root", value: details.rootDir },
+              ...(typeof details.skillsCount === "number"
+                ? [{ label: "skills", value: String(details.skillsCount) }]
+                : []),
+              ...(typeof details.installedCount === "number"
+                ? [{ label: "installed", value: String(details.installedCount) }]
+                : []),
+              ...(details.createdName ? [{ label: "created", value: details.createdName }] : []),
+              ...(typeof details.clawhubResultCount === "number"
+                ? [{ label: "clawhub", value: String(details.clawhubResultCount) }]
+                : []),
+              ...(details.clawhubSlug ? [{ label: "slug", value: details.clawhubSlug }] : []),
+              ...(typeof details.validationOk === "boolean"
+                ? [{ label: "valid", value: details.validationOk ? "true" : "false" }]
+                : []),
+              ...(details.packageArchive
+                ? [{ label: "archive", value: details.packageArchive }]
+                : []),
+              ...(details.clawhubNextCursor
+                ? [{ label: "cursor", value: details.clawhubNextCursor }]
+                : []),
+              ...(typeof details.invalidCount === "number" && details.invalidCount > 0
+                ? [{ label: "invalid", value: String(details.invalidCount) }]
+                : []),
+              ...(details.backup ? [{ label: "backup", value: details.backup }] : []),
+            ]}
+          />
+        </ToolSurface>
+        <CodePreview text={text} maxChars={8000} />
+      </div>
+    );
+  }
+
+  if (kind === "manage_mcp") {
+    const details = result.details as McpManagerResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              { label: "action", value: details.action },
+              ...(details.serverId ? [{ label: "server", value: details.serverId }] : []),
+              ...(details.transport ? [{ label: "transport", value: details.transport }] : []),
+              ...(typeof details.ok === "boolean"
+                ? [{ label: "ok", value: details.ok ? "true" : "false" }]
+                : []),
+              ...(details.phase ? [{ label: "phase", value: details.phase }] : []),
+              ...(typeof details.serverCount === "number"
+                ? [{ label: "servers", value: String(details.serverCount) }]
+                : []),
+              ...(typeof details.enabledCount === "number"
+                ? [{ label: "enabled", value: String(details.enabledCount) }]
+                : []),
+              ...(typeof details.toolsCount === "number"
+                ? [{ label: "tools", value: String(details.toolsCount) }]
+                : []),
+              ...(typeof details.changed === "boolean"
+                ? [{ label: "changed", value: details.changed ? "true" : "false" }]
+                : []),
+              ...(typeof details.stopped === "boolean"
+                ? [{ label: "stopped", value: details.stopped ? "true" : "false" }]
+                : []),
+            ]}
+          />
+        </ToolSurface>
+        <CodePreview text={text} maxChars={8000} />
+      </div>
+    );
+  }
+
+  if (kind === "read_image") {
+    const details = result.details as ReadImageResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              ...fileRootTags(details.root),
+              { label: "mime", value: details.mimeType },
+              { label: "size", value: `${details.sizeBytes} bytes` },
+              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
+            ]}
+          />
+        </ToolSurface>
+        {!details.reusedExisting && images.length > 0 ? (
+          <div className="overflow-hidden rounded-[10px] border border-black/[0.06] bg-white/[0.55] p-2 dark:border-white/[0.08] dark:bg-white/[0.04]">
+            {images.map((image, index) => (
+              <ToolResultImagePreview
+                key={`${details.path}-${index}`}
+                id={`${details.path}-${index}`}
+                image={image}
+                alt={details.path}
+                sizeBytes={details.sizeBytes}
+              />
+            ))}
+          </div>
+        ) : null}
+      </div>
+    );
+  }
+
+  if (kind === "read_pdf") {
+    const details = result.details as ReadPdfResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              ...fileRootTags(details.root),
+              {
+                label: "pages",
+                value:
+                  details.numPages > 0
+                    ? `${details.pageStart}-${details.pageStart + details.numPages - 1}/${details.totalPages}`
+                    : `empty/${details.totalPages}`,
+              },
+              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
+              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
+            ]}
+          />
+        </ToolSurface>
+        {!details.reusedExisting ? (
+          <CodePreview text={extractReadBody(text)} maxChars={8000} />
+        ) : null}
+      </div>
+    );
+  }
+
+  if (kind === "read_notebook") {
+    const details = result.details as ReadNotebookResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              ...fileRootTags(details.root),
+              {
+                label: "cells",
+                value:
+                  details.numCells > 0
+                    ? `${details.cellStart}-${details.cellStart + details.numCells - 1}/${details.totalCells}`
+                    : `empty/${details.totalCells}`,
+              },
+              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
+              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
+            ]}
+          />
+        </ToolSurface>
+        {!details.reusedExisting ? (
+          <CodePreview text={extractReadBody(text)} maxChars={8000} />
+        ) : null}
+      </div>
+    );
+  }
+
+  if (kind === "read_word" || kind === "read_spreadsheet" || kind === "read_archive") {
+    const details = result.details as ReadDocumentResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              ...fileRootTags(details.root),
+              ...(details.mimeType ? [{ label: "mime", value: details.mimeType }] : []),
+              ...(typeof details.sizeBytes === "number"
+                ? [{ label: "size", value: `${details.sizeBytes} bytes` }]
+                : []),
+              ...(details.truncated ? [{ label: "truncated", value: "true" }] : []),
+              ...(details.reusedExisting ? [{ label: "cache", value: "unchanged" }] : []),
+            ]}
+          />
+        </ToolSurface>
+        {!details.reusedExisting ? (
+          <CodePreview text={extractReadBody(text)} maxChars={8000} />
+        ) : null}
+      </div>
+    );
+  }
+
+  if (kind === "write") {
+    const details = result.details as WriteResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              ...fileRootTags(details.root),
+              { label: "target", value: details.existedBefore ? "existing" : "new" },
+              { label: "bytes", value: String(details.bytesWritten) },
+              { label: "lines", value: String(details.totalLines) },
+            ]}
+          />
+        </ToolSurface>
+        <CodePreview text={details.preview} />
+      </div>
+    );
+  }
+
+  if (kind === "edit") {
+    const details = result.details as EditResultDetails;
+    return (
+      <EditDiffView
+        beforeText={details.oldPreview}
+        afterText={details.newPreview}
+        filePath={details.root === "skills" ? `skills:${details.path}` : details.path}
+      />
+    );
+  }
+
+  if (kind === "delete") {
+    const details = result.details as DeleteResultDetails;
+    return (
+      <ToolSurface>
+        <MetaTags
+          tags={[...fileRootTags(details.root), { label: "kind", value: details.targetKind }]}
+        />
+      </ToolSurface>
+    );
+  }
+
+  if (kind === "list") {
+    const details = result.details as ListResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={buildPagedResultTags({
+              label: "items",
+              returned: details.entries.length,
+              total: details.total,
+              offset: details.offset,
+              hasMore: details.hasMore,
+            }).concat(fileRootTags(details.root))}
+          />
+        </ToolSurface>
+        <ToolSurface className="max-h-56 overflow-auto">
+          <div className="space-y-1">
+            {details.entries.map((entry) => (
+              <div
+                key={`${entry.kind}-${entry.path}`}
+                className="flex items-start gap-2 rounded-[8px] px-1.5 py-1 text-[11px] leading-[1.5] even:bg-black/[0.02] dark:even:bg-white/[0.03]"
+              >
+                <span className="mt-[1px] shrink-0 text-[10px] font-semibold uppercase text-muted-foreground/35">
+                  {entry.kind}
+                </span>
+                <PathDisplay
+                  path={entry.path}
+                  className="min-w-0 break-all font-mono text-[11px]"
+                />
+              </div>
+            ))}
+          </div>
+        </ToolSurface>
+      </div>
+    );
+  }
+
+  if (kind === "glob") {
+    const details = result.details as GlobResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={buildPagedResultTags({
+              label: "matches",
+              returned: details.paths.length,
+              total: details.total,
+              offset: details.offset,
+              hasMore: details.hasMore,
+            }).concat(fileRootTags(details.root))}
+          />
+        </ToolSurface>
+        <ToolSurface className="max-h-56 overflow-auto">
+          <div className="space-y-1">
+            {details.paths.map((entry) => (
+              <PathDisplay
+                key={entry}
+                path={entry}
+                className="block rounded-[8px] px-1.5 py-1 break-all font-mono text-[11px] leading-[1.5] even:bg-black/[0.02] dark:even:bg-white/[0.03]"
+              />
+            ))}
+          </div>
+        </ToolSurface>
+      </div>
+    );
+  }
+
+  if (kind === "grep") {
+    const details = result.details as GrepResultDetails;
+    return (
+      <div className="space-y-2">
+        <ToolSurface>
+          <MetaTags
+            tags={[
+              ...fileRootTags(details.root),
+              { label: "mode", value: details.outputMode },
+              { label: "matches", value: String(details.matchCount) },
+              { label: "files", value: String(details.fileCount) },
+              ...(details.offset > 0 ? [{ label: "offset", value: String(details.offset) }] : []),
+              { label: "state", value: details.hasMore ? "partial" : "complete" },
+            ]}
+          />
+        </ToolSurface>
+        {details.outputMode === "count" ? null : details.outputMode === "files" ? (
+          <ToolSurface className="max-h-56 overflow-auto">
+            <div className="space-y-1.5">
+              {details.files.map((file) => (
+                <div
+                  key={file.path}
+                  className="space-y-1 rounded-[8px] px-1.5 py-1 even:bg-black/[0.02] dark:even:bg-white/[0.03]"
+                >
+                  <PathDisplay
+                    path={file.path}
+                    className="block break-all font-mono text-[11px] leading-[1.5]"
+                  />
+                  <MetaTags
+                    tags={[
+                      { label: "count", value: String(file.count) },
+                      ...(typeof file.firstLine === "number"
+                        ? [{ label: "first", value: String(file.firstLine) }]
+                        : []),
+                    ]}
+                  />
+                </div>
+              ))}
+            </div>
+          </ToolSurface>
+        ) : (
+          <ToolSurface className="max-h-64 overflow-auto space-y-2">
+            {details.matches.map((match, index) => (
+              <div
+                key={`${match.path}:${match.line}:${index}`}
+                className="rounded-[8px] border border-black/[0.05] bg-white/[0.55] p-2 dark:border-white/[0.06] dark:bg-white/[0.03]"
+              >
+                <div className="flex items-start gap-2">
+                  <PathDisplay
+                    path={match.path}
+                    className="min-w-0 break-all font-mono text-[11px] leading-[1.5]"
+                  />
+                  <span className="shrink-0 rounded bg-black/[0.04] px-1.5 py-[1px] text-[10px] font-semibold text-muted-foreground/60 dark:bg-white/[0.05]">
+                    line {match.line}
+                  </span>
+                </div>
+                {match.before.length > 0 ? (
+                  <CodePreview text={match.before.join("\n")} maxChars={1500} />
+                ) : null}
+                <CodePreview text={match.text} maxChars={1500} />
+                {match.after.length > 0 ? (
+                  <CodePreview text={match.after.join("\n")} maxChars={1500} />
+                ) : null}
+              </div>
+            ))}
+          </ToolSurface>
+        )}
+      </div>
+    );
+  }
+
+  if (kind === "delegate_agent") {
+    return null;
+  }
+
+  if (kind === "delegate_agent_item") {
+    const details = result.details as DelegateAgentCardResultDetails;
+    const agent = details.agent;
+    const agentDisplayName = agent.name || agent.agentName || agent.id;
+    const agentTask = getDelegateAgentTask(agent);
+    const tags: MetaTag[] = [
+      { label: "agent", value: `${details.index + 1}/${details.total}` },
+      { label: "status", value: agent.status },
+    ];
+    if (agent.mode === "worktree") {
+      tags.push({ label: "mode", value: agent.mode });
+    }
+    if (shouldShowDelegateApplyStatus(agent) && agent.applyStatus) {
+      tags.push({ label: "apply", value: agent.applyStatus });
+    }
+    if (shouldShowDelegateCleanupStatus(agent) && agent.worktreeCleanupStatus) {
+      tags.push({ label: "cleanup", value: agent.worktreeCleanupStatus });
+    }
+
+    const untrackedFiles = agent.untrackedFiles ?? [];
+    const candidateArtifacts = agent.candidateArtifacts ?? [];
+    const showUntrackedFiles = agent.applyStatus !== "applied" && untrackedFiles.length > 0;
+    const showCandidateArtifacts = Boolean(
+      candidateArtifacts.length > 0 &&
+        (agent.taskIntent === "document_generation" ||
+          (agent.applySkippedReason && agent.applySkippedReason !== "no_changes")),
+    );
+
+    return (
+      <ToolSurface className="space-y-2">
+        <MetaTags tags={tags} />
+        <div className="space-y-2">
+          <div className="text-[12px] font-semibold leading-[1.45] text-foreground/90">
+            {agentDisplayName}
+          </div>
+          {agent.role ? (
+            <div className="text-[11px] font-medium leading-[1.55] text-foreground/78">
+              <span className="text-muted-foreground">role</span> {agent.role}
+            </div>
+          ) : null}
+          {agentTask ? (
+            <div className="break-words text-[11px] font-medium leading-[1.6] text-foreground/80">
+              <span className="text-muted-foreground">task</span> {agentTask}
+            </div>
+          ) : null}
+          {shouldShowDelegateWorktreeLocation(agent) ? (
+            <div className="break-all text-[10px] text-muted-foreground/70">
+              {agent.branchName ? `${agent.branchName} | ` : ""}
+              {agent.worktreeRoot}
+            </div>
+          ) : null}
+          {agent.diffStat ? <CodePreview text={agent.diffStat} maxChars={1200} /> : null}
+          {showUntrackedFiles ? (
+            <CodePreview
+              text={`untracked:\n${untrackedFiles.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
+          ) : null}
+          {agent.worktreeStatusError ? (
+            <CodePreview text={agent.worktreeStatusError} maxChars={1200} />
+          ) : null}
+          {agent.applyError ? (
+            <CodePreview text={`apply failed:\n${agent.applyError}`} maxChars={1200} />
+          ) : agent.applySkippedReason && agent.applySkippedReason !== "no_changes" ? (
+            <CodePreview text={`apply skipped: ${agent.applySkippedReason}`} maxChars={1200} />
+          ) : null}
+          {agent.applyFallbackReason ? (
+            <CodePreview text={`fallback reason:\n${agent.applyFallbackReason}`} maxChars={1200} />
+          ) : null}
+          {agent.applyCopiedFiles && agent.applyCopiedFiles.length > 0 ? (
+            <CodePreview
+              text={`copied:\n${agent.applyCopiedFiles.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
+          ) : null}
+          {agent.applyDeletedFiles && agent.applyDeletedFiles.length > 0 ? (
+            <CodePreview
+              text={`deleted:\n${agent.applyDeletedFiles.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
+          ) : null}
+          {agent.applyConflictFiles && agent.applyConflictFiles.length > 0 ? (
+            <CodePreview
+              text={`apply conflicts:\n${agent.applyConflictFiles.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
+          ) : null}
+          {agent.worktreeCleanupError ? (
+            <CodePreview
+              text={`worktree cleanup failed:\n${agent.worktreeCleanupError}`}
+              maxChars={1200}
+            />
+          ) : agent.worktreeCleanupReason && agent.worktreeCleanupStatus === "retained" ? (
+            <CodePreview
+              text={`worktree retained: ${agent.worktreeCleanupReason}`}
+              maxChars={1200}
+            />
+          ) : null}
+          {showCandidateArtifacts ? (
+            <CodePreview
+              text={`candidate artifacts:\n${candidateArtifacts.map((file) => `- ${file}`).join("\n")}`}
+              maxChars={1200}
+            />
+          ) : null}
+          {agent.error ? (
+            <CodePreview text={agent.error} maxChars={1200} />
+          ) : agent.summary ? (
+            <CodePreview text={agent.summary} maxChars={2400} />
+          ) : null}
+        </div>
+      </ToolSurface>
+    );
+  }
+
+  if (kind === "subagent_message") {
+    const details = result.details as SubagentMessageResultDetails;
+    const from = details.senderDisplayName || details.senderAgentId;
+    const to = details.recipientDisplayName || details.recipientAgentId;
+    return (
+      <ToolSurface className="space-y-2">
+        <MetaTags
+          tags={[
+            { label: "seq", value: String(details.seq) },
+            { label: "channel", value: details.channel },
+            { label: "from", value: from },
+            { label: "to", value: to },
+          ]}
+        />
+        {details.subject ? (
+          <div className="break-words text-[11.5px] font-semibold leading-[1.5] text-foreground/86">
+            {details.subject}
+          </div>
+        ) : null}
+        {details.bodyPreview ? (
+          <div className="rounded-[8px] border border-black/[0.05] bg-white/[0.45] px-2.5 py-2 text-[11.5px] leading-[1.6] dark:border-white/[0.07] dark:bg-white/[0.03]">
+            <Markdown content={details.bodyPreview} />
+          </div>
+        ) : null}
+      </ToolSurface>
+    );
+  }
+
+  if (images.length > 0) {
+    return (
+      <div className="space-y-2">
+        <div className="overflow-hidden rounded-[10px] border border-black/[0.06] bg-white/[0.55] p-2 dark:border-white/[0.08] dark:bg-white/[0.04]">
+          {images.map((image, index) => (
+            <ToolResultImagePreview
+              key={`${item.toolCall.id}-${index}`}
+              id={`${item.toolCall.id}-${index}`}
+              image={image}
+              alt={item.toolCall.name}
+            />
+          ))}
+        </div>
+        {/\S/.test(text) ? <CodePreview text={text} maxChars={3000} /> : null}
+      </div>
+    );
+  }
+
+  if (result.details && typeof result.details === "object") {
+    return (
+      <ToolSurface className="overflow-hidden px-0 py-0">
+        <ToolScrollablePre className="max-h-32 rounded-none">
+          {safeStringify(result.details)}
+        </ToolScrollablePre>
+      </ToolSurface>
+    );
+  }
+
+  return null;
+}
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolTraceGroup.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolTraceGroup.tsx
new file mode 100644
index 000000000..2441e7fb5
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/ToolTraceGroup.tsx
@@ -0,0 +1,139 @@
+import { useEffect, useMemo, useRef, useState } from "react";
+
+import { ChevronRight, Terminal } from "../../../../components/icons";
+import { useLocale } from "../../../../i18n";
+import type { ToolTraceItem } from "../../../../lib/chat/messages/uiMessages";
+import { cn } from "../../../../lib/shared/utils";
+import {
+  getDominantToolName,
+  getToolGroupComposition,
+  getToolGroupCounts,
+  getToolMeta,
+  getToolTraceKey,
+} from "./assistantBubbleUtils";
+import { MemoToolCallItem } from "./ToolCallItem";
+
+export function ToolTraceGroup(props: { items: ToolTraceItem[]; runningToolCallIds?: string[] }) {
+  const { items, runningToolCallIds = [] } = props;
+  const { t } = useLocale();
+  const counts = useMemo(
+    () => getToolGroupCounts(items, runningToolCallIds),
+    [items, runningToolCallIds],
+  );
+  const composition = useMemo(() => getToolGroupComposition(items), [items]);
+  const dominantToolName = useMemo(() => getDominantToolName(items), [items]);
+  const allBash = useMemo(() => items.every((item) => item.toolCall.name === "Bash"), [items]);
+  const meta = useMemo(
+    () => (allBash ? getToolMeta("Bash") : getToolMeta(dominantToolName)),
+    [allBash, dominantToolName],
+  );
+  const ToolIcon = allBash ? Terminal : meta.Icon;
+  const shouldAutoOpen = counts.failed > 0 || (counts.running > 0 && items.length <= 3);
+  const [open, setOpen] = useState(shouldAutoOpen);
+  const userInteractedRef = useRef(false);
+
+  useEffect(() => {
+    if (!userInteractedRef.current && shouldAutoOpen) {
+      setOpen(true);
+    }
+  }, [shouldAutoOpen]);
+
+  const statusLabel =
+    counts.failed > 0
+      ? `${counts.failed} ${t("chat.tool.failed")}`
+      : counts.running > 0
+        ? `${counts.running} ${t("chat.tool.running")}`
+        : counts.waiting > 0
+          ? `${counts.waiting} ${t("chat.tool.waiting")}`
+          : t("chat.tool.success");
+
+  const statusBgClass =
+    counts.failed > 0
+      ? "bg-[hsl(var(--chat-error)/0.1)] text-[hsl(var(--chat-error))]"
+      : counts.running > 0
+        ? "bg-[hsl(var(--chat-running)/0.1)] text-[hsl(var(--chat-running))]"
+        : counts.waiting > 0
+          ? "bg-black/[0.05] text-muted-foreground dark:bg-white/[0.08]"
+          : "bg-[hsl(var(--chat-success)/0.1)] text-[hsl(var(--chat-success))]";
+
+  const dotClass =
+    counts.failed > 0
+      ? "bg-[hsl(var(--chat-error))]"
+      : counts.running > 0
+        ? "bg-[hsl(var(--chat-running))] animate-pulse"
+        : counts.waiting > 0
+          ? "bg-zinc-400"
+          : "bg-[hsl(var(--chat-success))]";
+
+  const countLabel = `${items.length} tools`;
+  const title = allBash ? "Bash Batch" : "Tool Activity";
+
+  return (
+    <div className="tool-trace-group overflow-hidden rounded-[12px] border border-black/[0.06] bg-white/[0.62] shadow-[0_1px_2px_rgba(0,0,0,0.03)] backdrop-blur-xl backdrop-saturate-[1.6] dark:border-white/[0.1] dark:bg-white/[0.055] dark:shadow-none">
+      <button
+        type="button"
+        aria-expanded={open}
+        aria-label={open ? t("chat.tool.collapseActivity") : t("chat.tool.expandActivity")}
+        className="grid w-full cursor-pointer select-none grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-2 px-2.5 py-2 text-left transition-colors hover:bg-black/[0.018] dark:hover:bg-white/[0.025]"
+        onClick={() => {
+          userInteractedRef.current = true;
+          setOpen((prev) => !prev);
+        }}
+      >
+        <div
+          className="flex h-[24px] w-[24px] shrink-0 items-center justify-center rounded-[7px]"
+          style={{
+            background: `linear-gradient(135deg, hsl(${meta.accent} / 0.13), hsl(${meta.accent} / 0.06))`,
+          }}
+        >
+          <ToolIcon className="h-3.5 w-3.5" style={{ color: `hsl(${meta.accent})` }} />
+        </div>
+
+        <div className="grid min-w-0 grid-cols-[auto_auto_minmax(0,1fr)] items-center gap-2">
+          <span className="min-w-0 truncate text-[12.5px] font-semibold leading-5 text-foreground/90">
+            {title}
+          </span>
+          <span className="inline-flex h-5 shrink-0 items-center rounded-full bg-black/[0.04] px-1.5 text-[10.5px] font-semibold leading-none text-muted-foreground/70 dark:bg-white/[0.06]">
+            {countLabel}
+          </span>
+          {composition ? (
+            <span className="inline-flex h-5 min-w-0 items-center truncate font-mono text-[11px] leading-none text-muted-foreground/55">
+              {composition}
+            </span>
+          ) : null}
+        </div>
+
+        <div className="flex h-5 shrink-0 items-center gap-1.5">
+          <span className={cn("inline-block h-1.5 w-1.5 rounded-full", dotClass)} />
+          <span
+            className={cn(
+              "inline-flex h-5 items-center rounded-full px-1.5 text-[10px] font-semibold leading-none",
+              statusBgClass,
+            )}
+          >
+            {statusLabel}
+          </span>
+          <ChevronRight
+            className={cn(
+              "h-3 w-3 text-muted-foreground/35 transition-transform duration-200 ease-out",
+              open ? "rotate-90" : "",
+            )}
+          />
+        </div>
+      </button>
+
+      {open ? (
+        <div className="tool-trace-group-body space-y-1.5 border-t border-black/[0.04] p-1.5 dark:border-white/[0.05]">
+          {items.map((item, index) => (
+            <MemoToolCallItem
+              key={getToolTraceKey(item, index)}
+              item={item}
+              variant="grouped"
+              isRunning={Boolean(item.toolCall.id && runningToolCallIds.includes(item.toolCall.id))}
+            />
+          ))}
+        </div>
+      ) : null}
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/UsagePanel.tsx b/crates/agent-gui/src/pages/chat/components/assistant-bubble/UsagePanel.tsx
new file mode 100644
index 000000000..dc93c9a38
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/UsagePanel.tsx
@@ -0,0 +1,105 @@
+import type { Usage } from "@earendil-works/pi-ai";
+
+import { useLocale } from "../../../../i18n";
+
+function hasDisplayableUsage(usage: Usage | undefined): usage is Usage {
+  if (!usage) return false;
+
+  return (
+    usage.totalTokens > 0 ||
+    usage.input > 0 ||
+    usage.output > 0 ||
+    usage.cacheRead > 0 ||
+    usage.cacheWrite > 0 ||
+    (usage.cost?.total ?? 0) > 0
+  );
+}
+
+function formatUsageNumber(value: number, locale: string) {
+  return new Intl.NumberFormat(locale, {
+    maximumFractionDigits: 0,
+  }).format(value);
+}
+
+function formatUsageCost(value: number, locale: string) {
+  if (value <= 0) return "$0";
+
+  const maximumFractionDigits = value >= 1 ? 2 : value >= 0.01 ? 4 : 6;
+  return `$${new Intl.NumberFormat(locale, {
+    minimumFractionDigits: 0,
+    maximumFractionDigits,
+  }).format(value)}`;
+}
+
+export function UsagePanel(props: { usage?: Usage; contextWindow?: number }) {
+  const { usage, contextWindow } = props;
+  const { t, locale } = useLocale();
+
+  if (!hasDisplayableUsage(usage)) return null;
+
+  const stats: Array<{ key: string; label: string; value: string }> = [
+    ...(typeof contextWindow === "number" && contextWindow > 0
+      ? [
+          {
+            key: "context-window",
+            label: t("chat.contextWindow"),
+            value: formatUsageNumber(contextWindow, locale),
+          },
+        ]
+      : []),
+    {
+      key: "total",
+      label: t("chat.usageTotal"),
+      value: formatUsageNumber(usage.totalTokens, locale),
+    },
+    {
+      key: "input",
+      label: t("chat.usageInput"),
+      value: formatUsageNumber(usage.input, locale),
+    },
+    {
+      key: "output",
+      label: t("chat.usageOutput"),
+      value: formatUsageNumber(usage.output, locale),
+    },
+    ...(usage.cacheRead > 0
+      ? [
+          {
+            key: "cache-read",
+            label: t("chat.usageCacheRead"),
+            value: formatUsageNumber(usage.cacheRead, locale),
+          },
+        ]
+      : []),
+    ...(usage.cacheWrite > 0
+      ? [
+          {
+            key: "cache-write",
+            label: t("chat.usageCacheWrite"),
+            value: formatUsageNumber(usage.cacheWrite, locale),
+          },
+        ]
+      : []),
+    ...((usage.cost?.total ?? 0) > 0
+      ? [
+          {
+            key: "cost",
+            label: t("chat.usageCost"),
+            value: formatUsageCost(usage.cost?.total ?? 0, locale),
+          },
+        ]
+      : []),
+  ];
+
+  return (
+    <div className="overflow-x-auto pt-0.5 text-[12px] leading-5 whitespace-nowrap text-muted-foreground/80">
+      {stats.map((item, index) => (
+        <span key={item.key}>
+          {index > 0 ? <span className="px-1.5 text-muted-foreground/45">·</span> : null}
+          <span>{item.label}</span>
+          <span className="ml-1 font-medium text-foreground/85">{item.value}</span>
+        </span>
+      ))}
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/components/assistant-bubble/assistantBubbleUtils.ts b/crates/agent-gui/src/pages/chat/components/assistant-bubble/assistantBubbleUtils.ts
new file mode 100644
index 000000000..e2553f850
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/components/assistant-bubble/assistantBubbleUtils.ts
@@ -0,0 +1,364 @@
+import type { ToolResultMessage } from "@earendil-works/pi-ai";
+
+import type { IconComponent } from "../../../../components/icons";
+import {
+  Bot,
+  Brain,
+  Eye,
+  FilePenLine,
+  FileText,
+  FolderTree,
+  ImageIcon,
+  Plug,
+  Search,
+  Server,
+  Terminal,
+  Trash2,
+  Wrench,
+} from "../../../../components/icons";
+import type { HostedSearchBlock } from "../../../../lib/chat/messages/hostedSearch";
+import {
+  safeStringify,
+  type ToolTraceItem,
+  type UiRound,
+} from "../../../../lib/chat/messages/uiMessages";
+import type { DelegateAgentCardResultDetails } from "../../../../lib/tools/builtinTypes";
+
+export function getToolMeta(name: string): {
+  Icon: IconComponent;
+  accent: string;
+  category: string;
+} {
+  switch (name) {
+    case "Bash":
+    case "ManagedProcess":
+      return { Icon: Terminal, accent: "var(--tool-bash-accent)", category: "terminal" };
+    case "Read":
+      return { Icon: Eye, accent: "var(--tool-file-accent)", category: "file" };
+    case "Image":
+      return { Icon: ImageIcon, accent: "var(--tool-file-accent)", category: "file" };
+    case "SkillsManager":
+      return { Icon: Eye, accent: "var(--tool-file-accent)", category: "file" };
+    case "MemoryManager":
+      return { Icon: Brain, accent: "var(--tool-list-accent)", category: "system" };
+    case "McpManager":
+      return { Icon: Plug, accent: "var(--tool-list-accent)", category: "mcp" };
+    case "SSHManager":
+    case "SshManager":
+      return { Icon: Server, accent: "var(--tool-bash-accent)", category: "terminal" };
+    case "Agent":
+      return { Icon: Bot, accent: "var(--tool-list-accent)", category: "system" };
+    case "SendMessage":
+      return { Icon: Bot, accent: "var(--tool-list-accent)", category: "system" };
+    case "Write":
+      return { Icon: FileText, accent: "var(--tool-file-accent)", category: "file" };
+    case "Edit":
+      return { Icon: FilePenLine, accent: "var(--tool-file-accent)", category: "file" };
+    case "Delete":
+      return { Icon: Trash2, accent: "var(--tool-file-accent)", category: "file" };
+    case "Glob":
+      return { Icon: Search, accent: "var(--tool-search-accent)", category: "search" };
+    case "Grep":
+      return { Icon: Search, accent: "var(--tool-search-accent)", category: "search" };
+    case "List":
+      return { Icon: FolderTree, accent: "var(--tool-list-accent)", category: "list" };
+    default:
+      return { Icon: Wrench, accent: "var(--tool-file-accent)", category: "other" };
+  }
+}
+
+export type MetaTag = { label: string; value: string };
+
+export function displayString(value: unknown) {
+  return typeof value === "string" ? value.trim() : "";
+}
+
+export function compactInlineText(value: unknown, maxChars = 120) {
+  const text = displayString(value).replace(/\s+/g, " ");
+  if (text.length <= maxChars) return text;
+  return `${text.slice(0, maxChars)}...`;
+}
+
+export function isDelegateAgentCardToolCall(toolCall: {
+  name: string;
+  arguments?: Record<string, unknown>;
+}) {
+  return toolCall.name === "Agent" && toolCall.arguments?.delegate_agent_card === true;
+}
+
+export function getDelegateAgentTask(agent: { prompt?: unknown; description?: unknown }) {
+  return displayString(agent.prompt) || displayString(agent.description);
+}
+
+export function getDelegateAgentInlineSummary(item: ToolTraceItem) {
+  const details = item.toolResult?.details as Partial<DelegateAgentCardResultDetails> | undefined;
+  const agent = details?.kind === "delegate_agent_item" ? details.agent : undefined;
+  const args = item.toolCall.arguments || {};
+  const name =
+    displayString(agent?.name) ||
+    displayString(agent?.agentName) ||
+    displayString(args.name) ||
+    displayString(args.agent_id) ||
+    displayString(args.id);
+  const task = agent
+    ? getDelegateAgentTask(agent)
+    : displayString(args.prompt) || displayString(args.description);
+
+  if (name && task) return `${name} - ${compactInlineText(task, 96)}`;
+  return name || compactInlineText(task, 120);
+}
+
+export function shouldShowDelegateApplyStatus(agent: DelegateAgentCardResultDetails["agent"]) {
+  if (!agent.applyStatus) return false;
+  if (agent.applyStatus === "applied" || agent.applyStatus === "failed") return true;
+  return Boolean(agent.applySkippedReason && agent.applySkippedReason !== "no_changes");
+}
+
+export function shouldShowDelegateCleanupStatus(agent: DelegateAgentCardResultDetails["agent"]) {
+  return Boolean(
+    agent.worktreeCleanupStatus &&
+      agent.worktreeCleanupStatus !== "removed" &&
+      agent.worktreeCleanupStatus !== "skipped",
+  );
+}
+
+export function shouldShowDelegateWorktreeLocation(agent: DelegateAgentCardResultDetails["agent"]) {
+  return Boolean(
+    agent.worktreeRoot &&
+      (agent.status === "failed" ||
+        agent.worktreeCleanupStatus === "retained" ||
+        agent.worktreeCleanupStatus === "failed"),
+  );
+}
+
+export type GroupedRoundBlock =
+  | {
+      kind: "thinking";
+      key: string;
+      text: string;
+    }
+  | {
+      kind: "text";
+      key: string;
+      text: string;
+    }
+  | {
+      kind: "tool";
+      key: string;
+      item: ToolTraceItem;
+    }
+  | {
+      kind: "hostedSearch";
+      key: string;
+      item: HostedSearchBlock;
+    }
+  | {
+      kind: "hostedSearchGroup";
+      key: string;
+      items: HostedSearchBlock[];
+    }
+  | {
+      kind: "toolGroup";
+      key: string;
+      items: ToolTraceItem[];
+    };
+
+export type ShellResultDetails = {
+  exit_code: number;
+  shell: string;
+  stdout: string;
+  stderr: string;
+  stdout_truncated: boolean;
+  stderr_truncated: boolean;
+  timed_out: boolean;
+  cancelled?: boolean;
+  effective_timeout_ms?: number;
+  duration_ms: number;
+};
+
+export function isShellResultDetails(value: unknown): value is ShellResultDetails {
+  if (!value || typeof value !== "object") return false;
+  const candidate = value as Record<string, unknown>;
+  return (
+    typeof candidate.exit_code === "number" &&
+    typeof candidate.shell === "string" &&
+    typeof candidate.stdout === "string" &&
+    typeof candidate.stderr === "string" &&
+    typeof candidate.stdout_truncated === "boolean" &&
+    typeof candidate.stderr_truncated === "boolean" &&
+    typeof candidate.timed_out === "boolean" &&
+    typeof candidate.duration_ms === "number"
+  );
+}
+
+export function summarizeShellStream(text: string, truncated: boolean) {
+  const length = text.length;
+  if (length === 0) return "empty";
+  return truncated ? `${length} chars, truncated` : `${length} chars`;
+}
+
+const stableValueSignatureCache = new WeakMap<object, string>();
+
+export function getStableValueSignature(value: unknown) {
+  if (value && typeof value === "object") {
+    const cached = stableValueSignatureCache.get(value);
+    if (cached !== undefined) {
+      return cached;
+    }
+    const signature = safeStringify(value);
+    stableValueSignatureCache.set(value, signature);
+    return signature;
+  }
+  return safeStringify(value);
+}
+
+export function areStableValuesEqual(previous: unknown, next: unknown) {
+  return previous === next || getStableValueSignature(previous) === getStableValueSignature(next);
+}
+
+export function getToolTraceKey(item: ToolTraceItem, index: number) {
+  const id = item.toolCall.id?.trim();
+  if (id) return id;
+  return `${item.toolCall.name}-${index}-${getStableValueSignature(item.toolCall.arguments)}`;
+}
+
+export function isAgentToolName(name: string) {
+  return name === "Agent";
+}
+
+export function getToolDisplayName(name: string) {
+  if (name === "SshManager") return "SSHManager";
+  return name;
+}
+
+export function groupRoundBlocks(blocks: UiRound["blocks"]): GroupedRoundBlock[] {
+  const groupedBlocks: GroupedRoundBlock[] = [];
+  let pendingTools: ToolTraceItem[] = [];
+  let pendingStartIndex = 0;
+  let pendingSearches: HostedSearchBlock[] = [];
+  let pendingSearchStartIndex = 0;
+
+  const flushPendingTools = () => {
+    if (pendingTools.length === 0) return;
+    if (pendingTools.length === 1) {
+      const item = pendingTools[0];
+      groupedBlocks.push({
+        kind: "tool",
+        key: `tool-${getToolTraceKey(item, pendingStartIndex)}`,
+        item,
+      });
+    } else {
+      groupedBlocks.push({
+        kind: "toolGroup",
+        key: `tool-group-${pendingStartIndex}-${pendingTools
+          .map((item, index) => getToolTraceKey(item, pendingStartIndex + index))
+          .join("|")}`,
+        items: pendingTools,
+      });
+    }
+    pendingTools = [];
+  };
+
+  const flushPendingSearches = () => {
+    if (pendingSearches.length === 0) return;
+    const firstSearch = pendingSearches[0];
+    groupedBlocks.push({
+      kind: "hostedSearchGroup",
+      key: `hosted-search-group-${firstSearch?.id || pendingSearchStartIndex}`,
+      items: pendingSearches,
+    });
+    pendingSearches = [];
+  };
+
+  blocks.forEach((block, index) => {
+    if (block.kind === "tool") {
+      flushPendingSearches();
+      if (block.item.toolCall.name === "Image" || isAgentToolName(block.item.toolCall.name)) {
+        flushPendingTools();
+        groupedBlocks.push({
+          kind: "tool",
+          key: `tool-${getToolTraceKey(block.item, index)}`,
+          item: block.item,
+        });
+        return;
+      }
+      if (pendingTools.length === 0) {
+        pendingStartIndex = index;
+      }
+      pendingTools.push(block.item);
+      return;
+    }
+
+    flushPendingTools();
+    if (block.kind === "hostedSearch") {
+      if (pendingSearches.length === 0) {
+        pendingSearchStartIndex = index;
+      }
+      pendingSearches.push(block.item);
+      return;
+    }
+    flushPendingSearches();
+    if (block.kind === "thinking") {
+      groupedBlocks.push({ kind: "thinking", key: `thinking-${index}`, text: block.text });
+      return;
+    }
+    groupedBlocks.push({ kind: "text", key: `text-${index}`, text: block.text });
+  });
+
+  flushPendingTools();
+  flushPendingSearches();
+  return groupedBlocks;
+}
+
+export function getToolGroupCounts(items: ToolTraceItem[], runningToolCallIds: string[]) {
+  const runningIds = new Set(runningToolCallIds);
+  let running = 0;
+  let failed = 0;
+  let completed = 0;
+  let waiting = 0;
+
+  for (const item of items) {
+    if (item.toolCall.id && runningIds.has(item.toolCall.id)) {
+      running += 1;
+      continue;
+    }
+    if (!item.toolResult) {
+      waiting += 1;
+      continue;
+    }
+    if (item.toolResult.isError) {
+      failed += 1;
+      continue;
+    }
+    completed += 1;
+  }
+
+  return { running, failed, completed, waiting };
+}
+
+export function getToolGroupComposition(items: ToolTraceItem[]) {
+  const counts = new Map<string, number>();
+  for (const item of items) {
+    const name = getToolDisplayName(item.toolCall.name);
+    counts.set(name, (counts.get(name) ?? 0) + 1);
+  }
+  return [...counts.entries()]
+    .sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]))
+    .slice(0, 4)
+    .map(([name, count]) => `${name} ${count}`)
+    .join(" · ");
+}
+
+export function getDominantToolName(items: ToolTraceItem[]) {
+  const counts = new Map<string, number>();
+  for (const item of items) {
+    counts.set(item.toolCall.name, (counts.get(item.toolCall.name) ?? 0) + 1);
+  }
+  return [...counts.entries()].sort((a, b) => b[1] - a[1])[0]?.[0] ?? "Tool";
+}
+
+export function getBuiltinResultKind(result?: ToolResultMessage) {
+  if (!result?.details || typeof result.details !== "object") return null;
+  const kind = (result.details as { kind?: unknown }).kind;
+  return typeof kind === "string" ? kind : null;
+}
diff --git a/crates/agent-gui/src/pages/chat/gatewayBridgeTypes.ts b/crates/agent-gui/src/pages/chat/gateway/gatewayBridgeTypes.ts
similarity index 90%
rename from crates/agent-gui/src/pages/chat/gatewayBridgeTypes.ts
rename to crates/agent-gui/src/pages/chat/gateway/gatewayBridgeTypes.ts
index b79d2caa5..4faca9771 100644
--- a/crates/agent-gui/src/pages/chat/gatewayBridgeTypes.ts
+++ b/crates/agent-gui/src/pages/chat/gateway/gatewayBridgeTypes.ts
@@ -1,14 +1,14 @@
 import type { MutableRefObject } from "react";
-import type { ConversationViewState } from "../../lib/chat/conversation/conversationState";
-import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
-import type { PendingUploadedFile } from "../../lib/chat/messages/uploadedFiles";
+import type { ConversationViewState } from "../../../lib/chat/conversation/conversationState";
+import type { ChatHistorySummary } from "../../../lib/chat/history/chatHistory";
+import type { PendingUploadedFile } from "../../../lib/chat/messages/uploadedFiles";
 import type {
   ChatRuntimeControls,
   ExecutionMode,
   ProviderId,
   SystemToolId,
-} from "../../lib/settings";
-import type { ConversationRuntimeEntry } from "./chatPageRuntime";
+} from "../../../lib/settings";
+import type { ConversationRuntimeEntry } from "../runtime/chatPageRuntime";
 
 export type GatewaySelectedModelEvent = {
   customProviderId: string;
diff --git a/crates/agent-gui/src/pages/chat/useGatewayBridgeBatcher.ts b/crates/agent-gui/src/pages/chat/gateway/useGatewayBridgeBatcher.ts
similarity index 95%
rename from crates/agent-gui/src/pages/chat/useGatewayBridgeBatcher.ts
rename to crates/agent-gui/src/pages/chat/gateway/useGatewayBridgeBatcher.ts
index f379e774d..b70e3f4f1 100644
--- a/crates/agent-gui/src/pages/chat/useGatewayBridgeBatcher.ts
+++ b/crates/agent-gui/src/pages/chat/gateway/useGatewayBridgeBatcher.ts
@@ -104,14 +104,18 @@ export function useGatewayBridgeBatcher() {
         return;
       }
 
-      sendGatewayBridgeEventForRequest(requestId, {
-        type: pending.type,
-        text: pending.text,
-        conversation_id: pending.conversationId,
-        ...(pending.round !== null ? { round: pending.round } : {}),
-      }, {
-        workerId: pending.workerId,
-      });
+      sendGatewayBridgeEventForRequest(
+        requestId,
+        {
+          type: pending.type,
+          text: pending.text,
+          conversation_id: pending.conversationId,
+          ...(pending.round !== null ? { round: pending.round } : {}),
+        },
+        {
+          workerId: pending.workerId,
+        },
+      );
     },
     [sendGatewayBridgeEventForRequest],
   );
diff --git a/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts b/crates/agent-gui/src/pages/chat/gateway/useGatewayBridgeListeners.ts
similarity index 94%
rename from crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts
rename to crates/agent-gui/src/pages/chat/gateway/useGatewayBridgeListeners.ts
index 0e610b249..d1127e0f2 100644
--- a/crates/agent-gui/src/pages/chat/useGatewayBridgeListeners.ts
+++ b/crates/agent-gui/src/pages/chat/gateway/useGatewayBridgeListeners.ts
@@ -5,18 +5,18 @@ import { useEffect } from "react";
 import {
   type ConversationViewState,
   truncateConversationFromMessage,
-} from "../../lib/chat/conversation/conversationState";
-import { normalizeChatRuntimeControls, normalizeSystemToolSelection } from "../../lib/settings";
+} from "../../../lib/chat/conversation/conversationState";
+import { normalizeChatRuntimeControls, normalizeSystemToolSelection } from "../../../lib/settings";
 import {
   type ConversationRuntimeEntry,
   createConversationRuntimeEntry,
   setConversationRuntimeCacheEntry,
-} from "./chatPageRuntime";
+} from "../runtime/chatPageRuntime";
 import {
   type ActiveGatewayBridgeRequest,
   type GatewayBridgeRuntimeRefs,
-  type GatewayChatClaimedRequest,
   type GatewayChatCancelEvent,
+  type GatewayChatClaimedRequest,
   type GatewayChatRequestReadyEvent,
   type GatewayHistoryTruncatedEvent,
   normalizeGatewayExecutionMode,
@@ -300,13 +300,17 @@ export function useGatewayBridgeListeners(params: UseGatewayBridgeListenersParam
       }
       startHeartbeat(requestId);
       if (!message && uploadedFiles.length === 0) {
-        queueGatewayBridgeEventForRequest(requestId, {
-          type: "error",
-          message: "Remote chat message cannot be empty.",
-          conversation_id: targetConversationId,
-        }, {
-          workerId,
-        });
+        queueGatewayBridgeEventForRequest(
+          requestId,
+          {
+            type: "error",
+            message: "Remote chat message cannot be empty.",
+            conversation_id: targetConversationId,
+          },
+          {
+            workerId,
+          },
+        );
         failClaimedRequest(
           requestId,
           targetConversationId,
@@ -404,19 +408,25 @@ export function useGatewayBridgeListeners(params: UseGatewayBridgeListenersParam
 
         const runningRequest =
           getActiveGatewayBridgeRequestByConversationId(resolvedConversationId) ||
-          (clientRequestId ? getActiveGatewayBridgeRequestByClientRequestId(clientRequestId) : null);
+          (clientRequestId
+            ? getActiveGatewayBridgeRequestByClientRequestId(clientRequestId)
+            : null);
         if (
           runningRequest ||
           isConversationRunning(resolvedConversationId) ||
           getConversationAbortController(resolvedConversationId)
         ) {
-          queueGatewayBridgeEventForRequest(requestId, {
-            type: "error",
-            message: GATEWAY_CHAT_CONVERSATION_BUSY_MESSAGE,
-            conversation_id: runningRequest?.conversationId || resolvedConversationId,
-          }, {
-            workerId,
-          });
+          queueGatewayBridgeEventForRequest(
+            requestId,
+            {
+              type: "error",
+              message: GATEWAY_CHAT_CONVERSATION_BUSY_MESSAGE,
+              conversation_id: runningRequest?.conversationId || resolvedConversationId,
+            },
+            {
+              workerId,
+            },
+          );
           failClaimedRequest(
             requestId,
             runningRequest?.conversationId || resolvedConversationId,
@@ -468,17 +478,19 @@ export function useGatewayBridgeListeners(params: UseGatewayBridgeListenersParam
           "Failed to execute the remote gateway chat request.",
         );
         const conversationBusy = isConversationAlreadyRunningError(rawMessage);
-        const message = conversationBusy
-          ? GATEWAY_CHAT_CONVERSATION_BUSY_MESSAGE
-          : rawMessage;
-        queueGatewayBridgeEventForRequest(requestId, {
-          type: "error",
-          message,
-          conversation_id:
-            resolvedConversationId || targetConversationId || currentConversationIdRef.current,
-        }, {
-          workerId,
-        });
+        const message = conversationBusy ? GATEWAY_CHAT_CONVERSATION_BUSY_MESSAGE : rawMessage;
+        queueGatewayBridgeEventForRequest(
+          requestId,
+          {
+            type: "error",
+            message,
+            conversation_id:
+              resolvedConversationId || targetConversationId || currentConversationIdRef.current,
+          },
+          {
+            workerId,
+          },
+        );
         failClaimedRequest(
           requestId,
           resolvedConversationId || targetConversationId || currentConversationIdRef.current,
diff --git a/crates/agent-gui/src/pages/chat/historyListScope.ts b/crates/agent-gui/src/pages/chat/history/historyListScope.ts
similarity index 84%
rename from crates/agent-gui/src/pages/chat/historyListScope.ts
rename to crates/agent-gui/src/pages/chat/history/historyListScope.ts
index 369f7a5c9..4a3b6d11a 100644
--- a/crates/agent-gui/src/pages/chat/historyListScope.ts
+++ b/crates/agent-gui/src/pages/chat/history/historyListScope.ts
@@ -1,8 +1,8 @@
 import type {
   ChatHistoryListFilter,
   ChatHistorySummary,
-} from "../../lib/chat/history/chatHistory";
-import { sortHistoryItems } from "../../lib/chat/page/chatPageHelpers";
+} from "../../../lib/chat/history/chatHistory";
+import { sortHistoryItems } from "../../../lib/chat/page/chatPageHelpers";
 
 export function chatHistoryFilterKey(filter?: ChatHistoryListFilter) {
   if (filter?.cwdEmpty) return "cwd-empty";
@@ -10,10 +10,7 @@ export function chatHistoryFilterKey(filter?: ChatHistoryListFilter) {
   return cwd ? `cwd:${cwd}` : "all";
 }
 
-export function historyItemMatchesFilter(
-  item: ChatHistorySummary,
-  filter?: ChatHistoryListFilter,
-) {
+export function historyItemMatchesFilter(item: ChatHistorySummary, filter?: ChatHistoryListFilter) {
   if (filter?.cwdEmpty) {
     return !item.cwd?.trim();
   }
diff --git a/crates/agent-gui/src/pages/chat/useChatHistoryList.ts b/crates/agent-gui/src/pages/chat/history/useChatHistoryList.ts
similarity index 96%
rename from crates/agent-gui/src/pages/chat/useChatHistoryList.ts
rename to crates/agent-gui/src/pages/chat/history/useChatHistoryList.ts
index 38420161d..fda20c5ad 100644
--- a/crates/agent-gui/src/pages/chat/useChatHistoryList.ts
+++ b/crates/agent-gui/src/pages/chat/history/useChatHistoryList.ts
@@ -11,13 +11,13 @@ import {
 import type {
   ChatHistoryListFilter,
   ChatHistorySummary,
-} from "../../lib/chat/history/chatHistory";
-import { listChatHistory } from "../../lib/chat/history/chatHistory";
+} from "../../../lib/chat/history/chatHistory";
+import { listChatHistory } from "../../../lib/chat/history/chatHistory";
 import {
   applyChatHistorySyncEvent,
   CHAT_HISTORY_SYNC_EVENT,
   type ChatHistorySyncEvent,
-} from "../../lib/chat/history/chatHistorySync";
+} from "../../../lib/chat/history/chatHistorySync";
 import {
   chatHistoryFilterKey,
   filterHistoryItemsForScope,
@@ -208,11 +208,7 @@ export function useChatHistoryList(filter?: ChatHistoryListFilter) {
     try {
       const pageNumber = nextHistoryPageRef.current;
       const requestFilterKey = filterKeyRef.current;
-      const page = await listChatHistory(
-        pageNumber,
-        HISTORY_LIST_PAGE_SIZE,
-        filterRef.current,
-      );
+      const page = await listChatHistory(pageNumber, HISTORY_LIST_PAGE_SIZE, filterRef.current);
       if (disposedRef.current || requestFilterKey !== filterKeyRef.current) {
         return;
       }
diff --git a/crates/agent-gui/src/pages/chat/useConversationHistoryActions.ts b/crates/agent-gui/src/pages/chat/history/useConversationHistoryActions.ts
similarity index 98%
rename from crates/agent-gui/src/pages/chat/useConversationHistoryActions.ts
rename to crates/agent-gui/src/pages/chat/history/useConversationHistoryActions.ts
index 5b5cf2914..17878fcb0 100644
--- a/crates/agent-gui/src/pages/chat/useConversationHistoryActions.ts
+++ b/crates/agent-gui/src/pages/chat/history/useConversationHistoryActions.ts
@@ -3,7 +3,7 @@ import {
   type ConversationViewState,
   createConversationStateFromContext,
   normalizeConversationState,
-} from "../../lib/chat/conversation/conversationState";
+} from "../../../lib/chat/conversation/conversationState";
 import {
   type ChatHistorySummary,
   deleteChatHistory,
@@ -12,20 +12,20 @@ import {
   persistConversationState,
   renameChatHistory,
   setChatHistoryPinned,
-} from "../../lib/chat/history/chatHistory";
+} from "../../../lib/chat/history/chatHistory";
 import {
   createConversationIdentity,
   mergeHistoryItem,
   normalizeConversationTitle,
   PENDING_CONVERSATION_TITLE,
   waitForTitleLookahead,
-} from "../../lib/chat/page/chatPageHelpers";
+} from "../../../lib/chat/page/chatPageHelpers";
 import {
   type ConversationRuntimeEntry,
   createConversationRuntimeEntry,
   pruneIdleConversationRuntimeCaches,
   setConversationRuntimeCacheEntry,
-} from "./chatPageRuntime";
+} from "../runtime/chatPageRuntime";
 
 type TitleJobRefValue = {
   conversationId: string;
diff --git a/crates/agent-gui/src/pages/chat/useChatPageRuntimeStore.ts b/crates/agent-gui/src/pages/chat/hooks/useChatPageRuntimeStore.ts
similarity index 97%
rename from crates/agent-gui/src/pages/chat/useChatPageRuntimeStore.ts
rename to crates/agent-gui/src/pages/chat/hooks/useChatPageRuntimeStore.ts
index a5d239fac..f5effd111 100644
--- a/crates/agent-gui/src/pages/chat/useChatPageRuntimeStore.ts
+++ b/crates/agent-gui/src/pages/chat/hooks/useChatPageRuntimeStore.ts
@@ -1,14 +1,14 @@
 import { type Dispatch, type SetStateAction, useCallback, useEffect, useRef } from "react";
-import type { CompactionStatus } from "../../lib/chat/compaction/contextCompaction";
+import type { CompactionStatus } from "../../../lib/chat/compaction/contextCompaction";
 import {
   type ConversationViewState,
   createConversationStateFromContext,
-} from "../../lib/chat/conversation/conversationState";
+} from "../../../lib/chat/conversation/conversationState";
 import {
   type ConversationRuntimeEntry,
   createConversationRuntimeEntry,
   setConversationRuntimeCacheEntry,
-} from "./chatPageRuntime";
+} from "../runtime/chatPageRuntime";
 
 type ConversationIdentity = {
   conversationId: string;
diff --git a/crates/agent-gui/src/pages/chat/useChatSkills.ts b/crates/agent-gui/src/pages/chat/hooks/useChatSkills.ts
similarity index 97%
rename from crates/agent-gui/src/pages/chat/useChatSkills.ts
rename to crates/agent-gui/src/pages/chat/hooks/useChatSkills.ts
index b23cf829d..063080b1b 100644
--- a/crates/agent-gui/src/pages/chat/useChatSkills.ts
+++ b/crates/agent-gui/src/pages/chat/hooks/useChatSkills.ts
@@ -1,12 +1,12 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-import { type AppSettings, updateSkills } from "../../lib/settings";
+import { type AppSettings, updateSkills } from "../../../lib/settings";
 import {
   discoverSkills,
   isAlwaysEnabledSkillName,
   mergeAlwaysEnabledSkillNames,
   type SkillSummary,
   subscribeSkillsDiscoveryUpdated,
-} from "../../lib/skills";
+} from "../../../lib/skills";
 
 type UseChatSkillsParams = {
   skillsEnabled: boolean;
diff --git a/crates/agent-gui/src/pages/chat/useEditResend.ts b/crates/agent-gui/src/pages/chat/hooks/useEditResend.ts
similarity index 90%
rename from crates/agent-gui/src/pages/chat/useEditResend.ts
rename to crates/agent-gui/src/pages/chat/hooks/useEditResend.ts
index 2de524f78..b2a06a774 100644
--- a/crates/agent-gui/src/pages/chat/useEditResend.ts
+++ b/crates/agent-gui/src/pages/chat/hooks/useEditResend.ts
@@ -1,17 +1,17 @@
 import { type MutableRefObject, useCallback, useEffect, useRef } from "react";
-import type { MentionComposerHandle } from "../../components/chat/MentionComposer";
+import type { MentionComposerHandle } from "../../../components/chat/MentionComposer";
 import {
   type ConversationViewState,
   type HistoryMessageRef,
   truncateConversationFromMessage,
-} from "../../lib/chat/conversation/conversationState";
-import type { PendingUploadedFile } from "../../lib/chat/messages/uploadedFiles";
+} from "../../../lib/chat/conversation/conversationState";
+import type { PendingUploadedFile } from "../../../lib/chat/messages/uploadedFiles";
 import {
   collectRetainedSubagentParentToolCallIds,
   pruneSubagentRunsForConversation,
-} from "../../lib/chat/subagent/subagentHistory";
-import type { ConversationRuntimeEntry } from "./chatPageRuntime";
-import type { SendChatAction } from "./gatewayBridgeTypes";
+} from "../../../lib/chat/subagent/subagentHistory";
+import type { SendChatAction } from "../gateway/gatewayBridgeTypes";
+import type { ConversationRuntimeEntry } from "../runtime/chatPageRuntime";
 
 type UseEditResendParams = {
   conversationState: ConversationViewState;
diff --git a/crates/agent-gui/src/pages/chat/useLiveTranscriptController.ts b/crates/agent-gui/src/pages/chat/hooks/useLiveTranscriptController.ts
similarity index 98%
rename from crates/agent-gui/src/pages/chat/useLiveTranscriptController.ts
rename to crates/agent-gui/src/pages/chat/hooks/useLiveTranscriptController.ts
index b1d7eafb5..c97623b23 100644
--- a/crates/agent-gui/src/pages/chat/useLiveTranscriptController.ts
+++ b/crates/agent-gui/src/pages/chat/hooks/useLiveTranscriptController.ts
@@ -7,17 +7,17 @@ import {
   useMemo,
   useRef,
 } from "react";
-import { createCompactionThrottleState } from "../../lib/chat/compaction/contextCompaction";
+import { createCompactionThrottleState } from "../../../lib/chat/compaction/contextCompaction";
 import {
   cloneLiveRoundSnapshots,
   type LiveRoundSnapshot,
-} from "../../lib/chat/conversation/chatAbort";
+} from "../../../lib/chat/conversation/chatAbort";
 import {
   createLiveTranscriptStore,
   type LiveTranscriptStore,
-} from "../../lib/chat/conversation/liveTranscriptStore";
-import type { LiveRound } from "../../lib/chat/messages/uiMessages";
-import { resolveScrollViewport } from "./chatScrollViewport";
+} from "../../../lib/chat/conversation/liveTranscriptStore";
+import type { LiveRound } from "../../../lib/chat/messages/uiMessages";
+import { resolveScrollViewport } from "../utils/chatScrollViewport";
 
 const AUTO_SCROLL_LOCK_THRESHOLD_PX = 2;
 const SCROLL_OVERFLOW_THRESHOLD_PX = 4;
diff --git a/crates/agent-gui/src/pages/chat/usePendingUploads.ts b/crates/agent-gui/src/pages/chat/hooks/usePendingUploads.ts
similarity index 98%
rename from crates/agent-gui/src/pages/chat/usePendingUploads.ts
rename to crates/agent-gui/src/pages/chat/hooks/usePendingUploads.ts
index 005bc0b77..565f45e0e 100644
--- a/crates/agent-gui/src/pages/chat/usePendingUploads.ts
+++ b/crates/agent-gui/src/pages/chat/hooks/usePendingUploads.ts
@@ -1,12 +1,12 @@
 import { invoke } from "@tauri-apps/api/core";
 import { type MutableRefObject, useCallback, useEffect, useRef, useState } from "react";
 
-import type { MentionComposerHandle } from "../../components/chat/MentionComposer";
-import type { NotifyItem } from "../../components/chat/NotifyToast";
+import type { MentionComposerHandle } from "../../../components/chat/MentionComposer";
+import type { NotifyItem } from "../../../components/chat/NotifyToast";
 import {
   mergePendingUploadedFiles,
   type PendingUploadedFile,
-} from "../../lib/chat/messages/uploadedFiles";
+} from "../../../lib/chat/messages/uploadedFiles";
 
 type SystemPickReadableFilesResponse = {
   files: PendingUploadedFile[];
diff --git a/crates/agent-gui/src/pages/chat/index.ts b/crates/agent-gui/src/pages/chat/index.ts
new file mode 100644
index 000000000..0b0af033e
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/index.ts
@@ -0,0 +1,40 @@
+export { ChatComposerBar } from "./components/ChatComposerBar";
+export { ChatHeader } from "./components/ChatHeader";
+export type {
+  ActiveGatewayBridgeRequest,
+  EnsureGatewayBridgeConversationReadyOptions,
+  SendChatAction,
+} from "./gateway/gatewayBridgeTypes";
+export { useGatewayBridgeBatcher } from "./gateway/useGatewayBridgeBatcher";
+export { useGatewayBridgeListeners } from "./gateway/useGatewayBridgeListeners";
+export { useChatHistoryList } from "./history/useChatHistoryList";
+export { useConversationHistoryActions } from "./history/useConversationHistoryActions";
+export { useChatPageRuntimeStore } from "./hooks/useChatPageRuntimeStore";
+export { useChatSkills } from "./hooks/useChatSkills";
+export { useEditResend } from "./hooks/useEditResend";
+export { useLiveTranscriptController } from "./hooks/useLiveTranscriptController";
+export { MAX_UPLOAD_FILES, usePendingUploads } from "./hooks/usePendingUploads";
+export { clearSilentMemoryExtractionState } from "./memory/silentMemoryExtraction";
+export {
+  appendSystemPrompt,
+  buildErrorAssistantMessage,
+  createConversationRuntimeEntry,
+  formatHookWarningMessage,
+  pruneIdleConversationRuntimeCaches,
+  setConversationRuntimeCacheEntry,
+} from "./runtime/chatPageRuntime";
+export { buildPreCompactionStatus } from "./runtime/compactionStatusText";
+export {
+  buildCompactionContext,
+  buildPreparedContext,
+  buildResumeContext,
+} from "./runtime/conversationContextBuilders";
+export { startConversationTitleJob } from "./runtime/conversationTitleJob";
+export {
+  type EffectiveChatModelSelection,
+  resolveEffectiveChatModelSelection,
+} from "./runtime/modelSelection";
+export { ChatTranscript } from "./transcript/ChatTranscript";
+
+export { runAgentConversationTurn } from "./turns/runAgentConversationTurn";
+export { runTextConversationTurn } from "./turns/runTextConversationTurn";
diff --git a/crates/agent-gui/src/pages/chat/silentMemoryExtraction.ts b/crates/agent-gui/src/pages/chat/memory/silentMemoryExtraction.ts
similarity index 97%
rename from crates/agent-gui/src/pages/chat/silentMemoryExtraction.ts
rename to crates/agent-gui/src/pages/chat/memory/silentMemoryExtraction.ts
index 6247a3fbd..7e3dc5d29 100644
--- a/crates/agent-gui/src/pages/chat/silentMemoryExtraction.ts
+++ b/crates/agent-gui/src/pages/chat/memory/silentMemoryExtraction.ts
@@ -9,8 +9,8 @@ import type {
 import {
   recordSilentMemoryDecision,
   recordSilentMemorySkip,
-} from "../../lib/chat/memory/memoryDecisionLog";
-import { collectHeuristicSuggestions } from "../../lib/chat/memory/memoryExtractor";
+} from "../../../lib/chat/memory/memoryDecisionLog";
+import { collectHeuristicSuggestions } from "../../../lib/chat/memory/memoryExtractor";
 import {
   buildAlreadyWrittenBlock,
   buildExistingCandidatesBlock,
@@ -24,30 +24,30 @@ import {
   SILENT_MEMORY_SYSTEM_PROMPT,
   type SilentMemoryCandidateEntry,
   type SilentMemoryRejectionEntry,
-} from "../../lib/chat/memory/memoryPolicy";
+} from "../../../lib/chat/memory/memoryPolicy";
 import {
   parseSilentMemoryProtocol,
   type SilentMemoryBlockPlanItem,
   type SilentMemoryParseResult,
-} from "../../lib/chat/memory/memoryProtocol";
-import { isAbortLikeError } from "../../lib/chat/page/chatPageHelpers";
-import { runAssistantWithTools } from "../../lib/chat/runner/agentRunner";
-import type { StreamDebugLogger } from "../../lib/debug/agentDebug";
+} from "../../../lib/chat/memory/memoryProtocol";
+import { isAbortLikeError } from "../../../lib/chat/page/chatPageHelpers";
+import { runAssistantWithTools } from "../../../lib/chat/runner/agentRunner";
+import type { StreamDebugLogger } from "../../../lib/debug/agentDebug";
 import {
   type MemoryMeta,
   memoryList,
   memoryRecentRejections,
   memoryTodayLocalDate,
-} from "../../lib/memory/api";
+} from "../../../lib/memory/api";
 import type {
   CodexRequestFormat,
   ProviderId,
   ProviderModelConfig,
   ReasoningLevel,
   SelectedModel,
-} from "../../lib/settings";
-import { createMemoryTools } from "../../lib/tools/memoryTools";
-import { appendSystemPrompt } from "./chatPageRuntime";
+} from "../../../lib/settings";
+import { createMemoryTools } from "../../../lib/tools/memoryTools";
+import { appendSystemPrompt } from "../runtime/chatPageRuntime";
 
 const SILENT_MEMORY_EXTRACTION_TIMEOUT_MS = 45_000;
 const SILENT_MEMORY_CANDIDATE_LIMIT = 30;
diff --git a/crates/agent-gui/src/pages/chat/silentMemoryExtractionFallback.ts b/crates/agent-gui/src/pages/chat/memory/silentMemoryExtractionFallback.ts
similarity index 100%
rename from crates/agent-gui/src/pages/chat/silentMemoryExtractionFallback.ts
rename to crates/agent-gui/src/pages/chat/memory/silentMemoryExtractionFallback.ts
diff --git a/crates/agent-gui/src/pages/chat/chatPageRuntime.ts b/crates/agent-gui/src/pages/chat/runtime/chatPageRuntime.ts
similarity index 94%
rename from crates/agent-gui/src/pages/chat/chatPageRuntime.ts
rename to crates/agent-gui/src/pages/chat/runtime/chatPageRuntime.ts
index 5d78a684b..4d15d12a8 100644
--- a/crates/agent-gui/src/pages/chat/chatPageRuntime.ts
+++ b/crates/agent-gui/src/pages/chat/runtime/chatPageRuntime.ts
@@ -1,9 +1,9 @@
 import type { AssistantMessage } from "@earendil-works/pi-ai";
-import type { CompactionStatus } from "../../lib/chat/compaction/contextCompaction";
-import type { ConversationViewState } from "../../lib/chat/conversation/conversationState";
-import type { ConversationHookWarning } from "../../lib/hooks/conversationHooks";
-import { normalizeErrorMessage } from "../../lib/providers/llm";
-import { type AppSettings, HOOK_EVENT_TRANSLATION_KEYS } from "../../lib/settings";
+import type { CompactionStatus } from "../../../lib/chat/compaction/contextCompaction";
+import type { ConversationViewState } from "../../../lib/chat/conversation/conversationState";
+import type { ConversationHookWarning } from "../../../lib/hooks/conversationHooks";
+import { normalizeErrorMessage } from "../../../lib/providers/llm";
+import { type AppSettings, HOOK_EVENT_TRANSLATION_KEYS } from "../../../lib/settings";
 
 export const MAX_IDLE_CONVERSATION_RUNTIME_CACHE_ENTRIES = 12;
 
diff --git a/crates/agent-gui/src/pages/chat/compactionStatusText.ts b/crates/agent-gui/src/pages/chat/runtime/compactionStatusText.ts
similarity index 90%
rename from crates/agent-gui/src/pages/chat/compactionStatusText.ts
rename to crates/agent-gui/src/pages/chat/runtime/compactionStatusText.ts
index a78ddc708..1e2f17f85 100644
--- a/crates/agent-gui/src/pages/chat/compactionStatusText.ts
+++ b/crates/agent-gui/src/pages/chat/runtime/compactionStatusText.ts
@@ -1,4 +1,4 @@
-import type { PreCompactionDecision } from "../../lib/chat/compaction/contextCompaction";
+import type { PreCompactionDecision } from "../../../lib/chat/compaction/contextCompaction";
 
 export function buildPreCompactionStatus(decision: PreCompactionDecision) {
   if (decision.thresholdMode === "context-window") {
diff --git a/crates/agent-gui/src/pages/chat/conversationContextBuilders.ts b/crates/agent-gui/src/pages/chat/runtime/conversationContextBuilders.ts
similarity index 97%
rename from crates/agent-gui/src/pages/chat/conversationContextBuilders.ts
rename to crates/agent-gui/src/pages/chat/runtime/conversationContextBuilders.ts
index 7844534e5..407a2d1fa 100644
--- a/crates/agent-gui/src/pages/chat/conversationContextBuilders.ts
+++ b/crates/agent-gui/src/pages/chat/runtime/conversationContextBuilders.ts
@@ -3,7 +3,7 @@ import type { Context, UserMessage } from "@earendil-works/pi-ai";
 import {
   buildRequestContext,
   type ConversationViewState,
-} from "../../lib/chat/conversation/conversationState";
+} from "../../../lib/chat/conversation/conversationState";
 import { appendSystemPrompt } from "./chatPageRuntime";
 
 export type ConversationContextBuildOptions = {
diff --git a/crates/agent-gui/src/pages/chat/conversationTitleJob.ts b/crates/agent-gui/src/pages/chat/runtime/conversationTitleJob.ts
similarity index 92%
rename from crates/agent-gui/src/pages/chat/conversationTitleJob.ts
rename to crates/agent-gui/src/pages/chat/runtime/conversationTitleJob.ts
index faf445d9b..33b1b304b 100644
--- a/crates/agent-gui/src/pages/chat/conversationTitleJob.ts
+++ b/crates/agent-gui/src/pages/chat/runtime/conversationTitleJob.ts
@@ -1,13 +1,13 @@
 import type { Dispatch, MutableRefObject, SetStateAction } from "react";
-import type { GatewayBridgeEventController } from "../../lib/chat/conversation/run";
-import type { ChatHistorySummary } from "../../lib/chat/history/chatHistory";
+import type { GatewayBridgeEventController } from "../../../lib/chat/conversation/run";
+import type { ChatHistorySummary } from "../../../lib/chat/history/chatHistory";
 import {
   buildConversationTitlePrompt,
   mergeHistoryItem,
   normalizeConversationTitle,
-} from "../../lib/chat/page/chatPageHelpers";
-import { assistantMessageToText, streamAssistantMessage } from "../../lib/providers/llm";
-import type { ProviderId } from "../../lib/settings";
+} from "../../../lib/chat/page/chatPageHelpers";
+import { assistantMessageToText, streamAssistantMessage } from "../../../lib/providers/llm";
+import type { ProviderId } from "../../../lib/settings";
 
 type TitleJobRefValue = {
   conversationId: string;
diff --git a/crates/agent-gui/src/pages/chat/modelSelection.ts b/crates/agent-gui/src/pages/chat/runtime/modelSelection.ts
similarity index 85%
rename from crates/agent-gui/src/pages/chat/modelSelection.ts
rename to crates/agent-gui/src/pages/chat/runtime/modelSelection.ts
index 654fc867e..f2447789d 100644
--- a/crates/agent-gui/src/pages/chat/modelSelection.ts
+++ b/crates/agent-gui/src/pages/chat/runtime/modelSelection.ts
@@ -1,8 +1,8 @@
-import type { AppSettings, ProviderId, SelectedModel } from "../../lib/settings";
+import type { AppSettings, ProviderId, SelectedModel } from "../../../lib/settings";
 import {
   type GatewaySelectedModelEvent,
   normalizeGatewayProviderType,
-} from "./gatewayBridgeTypes";
+} from "../gateway/gatewayBridgeTypes";
 
 export type EffectiveChatModelSelection = {
   selectedModel: SelectedModel;
@@ -50,10 +50,14 @@ export function resolveEffectiveChatModelSelection(
 
   const provider = settings.customProviders.find((item) => item.id === customProviderId);
   if (!provider) {
-    throw new Error("远程请求所选模型对应的供应商不存在，请同步桌面端设置后在 WebUI 重新选择模型。");
+    throw new Error(
+      "远程请求所选模型对应的供应商不存在，请同步桌面端设置后在 WebUI 重新选择模型。",
+    );
   }
   if (provider.type !== providerType) {
-    throw new Error("远程请求所选模型的供应商类型与桌面端配置不一致，请同步桌面端设置后在 WebUI 重新选择模型。");
+    throw new Error(
+      "远程请求所选模型的供应商类型与桌面端配置不一致，请同步桌面端设置后在 WebUI 重新选择模型。",
+    );
   }
   if (!provider.activeModels.includes(model)) {
     throw new Error("远程请求所选模型未在桌面端启用，请同步桌面端设置后在 WebUI 重新选择模型。");
diff --git a/crates/agent-gui/src/pages/chat/transcript/ChatTranscript.tsx b/crates/agent-gui/src/pages/chat/transcript/ChatTranscript.tsx
new file mode 100644
index 000000000..9790dd203
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/transcript/ChatTranscript.tsx
@@ -0,0 +1,276 @@
+import {
+  memo,
+  type MouseEvent as ReactMouseEvent,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+} from "react";
+import { createPortal } from "react-dom";
+
+import iconSimpleUrl from "../../../../src-tauri/icons/icon-simple.png";
+import { Copy, Settings } from "../../../components/icons";
+import { ScrollArea } from "../../../components/ui/scroll-area";
+import { useLocale } from "../../../i18n";
+import { resolveScrollViewport } from "../utils/chatScrollViewport";
+import { TranscriptHistory } from "./TranscriptHistory";
+import { TranscriptLiveState } from "./TranscriptLiveState";
+import { HistorySwitchLoadingOverlay } from "./TranscriptLoadingStates";
+import type { ChatTranscriptProps } from "./transcriptTypes";
+import {
+  clampTranscriptContextMenuPosition,
+  resolveTranscriptSelectionText,
+  type TranscriptContextMenuState,
+  writeTextToClipboard,
+} from "./transcriptUtils";
+
+export type { ChatTranscriptProps } from "./transcriptTypes";
+
+export const ChatTranscript = memo(function ChatTranscript(props: ChatTranscriptProps) {
+  const {
+    conversationId,
+    workspaceRoot,
+    gitClient,
+    scrollAreaRef,
+    bottomRef,
+    hasModels,
+    historyItems,
+    isHistorySwitching,
+    isSending,
+    isAgentMode,
+    showUsage,
+    usageContextWindow,
+    liveTranscriptStore,
+    isCompactionRunning,
+    copiedMessageKey,
+    setCopiedMessageKey,
+    onResendFromEdit,
+    onOpenSettings,
+  } = props;
+  const { t, locale } = useLocale();
+  const showNoModelsState = !hasModels;
+  const showStartChatState = hasModels && historyItems.length === 0 && !isSending;
+  const shouldReserveTranscriptBottomSpace = !(showNoModelsState || showStartChatState);
+  const [scrollViewport, setScrollViewport] = useState<HTMLDivElement | null>(null);
+  const transcriptRootRef = useRef<HTMLDivElement | null>(null);
+  const transcriptContextMenuRef = useRef<HTMLDivElement | null>(null);
+  const [transcriptContextMenu, setTranscriptContextMenu] =
+    useState<TranscriptContextMenuState | null>(null);
+
+  const closeTranscriptContextMenu = useCallback(() => {
+    setTranscriptContextMenu(null);
+  }, []);
+
+  useLayoutEffect(() => {
+    const nextViewport = resolveScrollViewport(scrollAreaRef.current);
+    setScrollViewport((current) => (current === nextViewport ? current : nextViewport));
+  });
+
+  useEffect(() => {
+    closeTranscriptContextMenu();
+  }, [closeTranscriptContextMenu, conversationId]);
+
+  useEffect(() => {
+    if (!transcriptContextMenu) return;
+
+    const handlePointerDown = (event: PointerEvent) => {
+      const target = event.target;
+      if (!(target instanceof Node)) {
+        closeTranscriptContextMenu();
+        return;
+      }
+      if (transcriptContextMenuRef.current?.contains(target)) {
+        return;
+      }
+      closeTranscriptContextMenu();
+    };
+
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "Escape") {
+        closeTranscriptContextMenu();
+      }
+    };
+
+    const handleSelectionChange = () => {
+      if (!resolveTranscriptSelectionText(transcriptRootRef.current)) {
+        closeTranscriptContextMenu();
+      }
+    };
+
+    const handleScroll = () => {
+      closeTranscriptContextMenu();
+    };
+
+    window.addEventListener("pointerdown", handlePointerDown, true);
+    window.addEventListener("keydown", handleKeyDown, true);
+    window.addEventListener("scroll", handleScroll, true);
+    window.addEventListener("resize", handleScroll);
+    window.addEventListener("blur", handleScroll);
+    document.addEventListener("selectionchange", handleSelectionChange);
+
+    return () => {
+      window.removeEventListener("pointerdown", handlePointerDown, true);
+      window.removeEventListener("keydown", handleKeyDown, true);
+      window.removeEventListener("scroll", handleScroll, true);
+      window.removeEventListener("resize", handleScroll);
+      window.removeEventListener("blur", handleScroll);
+      document.removeEventListener("selectionchange", handleSelectionChange);
+    };
+  }, [closeTranscriptContextMenu, transcriptContextMenu]);
+
+  const handleTranscriptContextMenu = useCallback(
+    (event: ReactMouseEvent<HTMLDivElement>) => {
+      event.preventDefault();
+      const selectedText = resolveTranscriptSelectionText(transcriptRootRef.current);
+      if (!selectedText) {
+        closeTranscriptContextMenu();
+        return;
+      }
+      setTranscriptContextMenu({
+        x: event.clientX,
+        y: event.clientY,
+        selectedText,
+      });
+    },
+    [closeTranscriptContextMenu],
+  );
+
+  const transcriptContextMenuPosition = transcriptContextMenu
+    ? clampTranscriptContextMenuPosition(transcriptContextMenu.x, transcriptContextMenu.y)
+    : null;
+  const copySelectedTextLabel = locale === "en-US" ? "Copy selected text" : "复制选中文本";
+
+  return (
+    <div
+      ref={transcriptRootRef}
+      className="relative min-h-0 flex-1"
+      onContextMenu={handleTranscriptContextMenu}
+    >
+      <ScrollArea ref={scrollAreaRef} className="h-full">
+        <div className="mx-auto w-full max-w-[768px] px-5 py-4">
+          {showNoModelsState ? (
+            <div className="flex min-h-[calc(100vh-220px)] flex-col items-center justify-center">
+              <div className="pointer-events-none absolute inset-0 flex items-center justify-center overflow-hidden">
+                <div className="hero-glow-pulse h-[360px] w-[360px] rounded-full bg-[radial-gradient(closest-side,hsl(var(--foreground)/0.08),transparent_70%)] blur-3xl" />
+              </div>
+
+              <div className="relative flex flex-col items-center">
+                <div className="hero-entrance hero-icon-float mb-5 flex h-24 w-24 items-center justify-center">
+                  <img
+                    src={iconSimpleUrl}
+                    alt=""
+                    aria-hidden="true"
+                    draggable={false}
+                    className="h-[72px] w-[72px] select-none object-contain"
+                  />
+                </div>
+                <h2 className="hero-entrance-delay-1 mb-2 bg-gradient-to-b from-foreground to-foreground/65 bg-clip-text text-2xl font-semibold leading-tight tracking-tight text-transparent">
+                  {t("chat.welcome")}
+                </h2>
+                <p className="hero-entrance-delay-2 mb-1 text-sm text-muted-foreground">
+                  {t("chat.noModelSelected")}
+                </p>
+                <p className="hero-entrance-delay-2 mb-7 text-sm text-muted-foreground">
+                  {t("chat.configureModel")}
+                </p>
+                <button
+                  type="button"
+                  onClick={() => onOpenSettings("providers")}
+                  className="hero-entrance-delay-3 group inline-flex items-center gap-2 rounded-full border border-white/70 bg-white/65 px-5 py-2 text-sm font-medium text-foreground/85 shadow-[0_1px_2px_rgba(0,0,0,0.04),0_8px_24px_rgba(0,0,0,0.06),inset_0_1px_0_rgba(255,255,255,0.85)] backdrop-blur-xl transition-all duration-200 hover:-translate-y-[1px] hover:bg-white/80 hover:text-foreground hover:shadow-[0_2px_4px_rgba(0,0,0,0.05),0_12px_32px_rgba(0,0,0,0.08),inset_0_1px_0_rgba(255,255,255,0.9)] active:translate-y-0 active:shadow-[0_1px_2px_rgba(0,0,0,0.04)] dark:border-white/[0.1] dark:bg-white/[0.06] dark:text-foreground/90 dark:shadow-[0_1px_2px_rgba(0,0,0,0.2),0_8px_24px_rgba(0,0,0,0.25),inset_0_1px_0_rgba(255,255,255,0.06)] dark:hover:bg-white/[0.1]"
+                >
+                  <Settings className="h-3.5 w-3.5 text-foreground/55 transition-colors group-hover:text-foreground/80" />
+                  {t("chat.goToSettings")}
+                </button>
+              </div>
+            </div>
+          ) : showStartChatState ? (
+            <div className="flex min-h-[calc(100vh-220px)] flex-col items-center justify-center">
+              <div className="pointer-events-none absolute inset-0 flex items-center justify-center overflow-hidden">
+                <div className="hero-glow-pulse h-[360px] w-[360px] rounded-full bg-[radial-gradient(closest-side,hsl(var(--foreground)/0.08),transparent_70%)] blur-3xl" />
+              </div>
+
+              <div className="relative flex flex-col items-center">
+                <div className="hero-entrance hero-icon-float mb-5 flex h-24 w-24 items-center justify-center">
+                  <img
+                    src={iconSimpleUrl}
+                    alt=""
+                    aria-hidden="true"
+                    draggable={false}
+                    className="h-[72px] w-[72px] select-none object-contain"
+                  />
+                </div>
+
+                <h2 className="hero-entrance-delay-1 mb-2 bg-gradient-to-b from-foreground to-foreground/65 bg-clip-text text-2xl font-semibold leading-tight tracking-tight text-transparent">
+                  {t("chat.startChat")}
+                </h2>
+
+                <p className="hero-entrance-delay-2 max-w-[280px] text-center text-sm leading-relaxed text-muted-foreground">
+                  {t("chat.startChatDesc")}
+                </p>
+              </div>
+            </div>
+          ) : null}
+
+          <div className="space-y-6 select-text">
+            <TranscriptHistory
+              conversationId={conversationId}
+              workspaceRoot={workspaceRoot}
+              gitClient={gitClient}
+              scrollViewport={scrollViewport}
+              historyItems={historyItems}
+              showUsage={showUsage}
+              usageContextWindow={usageContextWindow}
+              copiedMessageKey={copiedMessageKey}
+              setCopiedMessageKey={setCopiedMessageKey}
+              onResendFromEdit={onResendFromEdit}
+              isSending={isSending}
+            />
+
+            <TranscriptLiveState
+              isSending={isSending}
+              isAgentMode={isAgentMode}
+              showUsage={showUsage}
+              usageContextWindow={usageContextWindow}
+              liveTranscriptStore={liveTranscriptStore}
+              isCompactionRunning={isCompactionRunning}
+            />
+          </div>
+
+          <div ref={bottomRef} className={shouldReserveTranscriptBottomSpace ? "h-48" : "h-0"} />
+        </div>
+      </ScrollArea>
+      {transcriptContextMenu && transcriptContextMenuPosition
+        ? createPortal(
+            <div
+              ref={transcriptContextMenuRef}
+              role="menu"
+              className="fixed z-[120] w-max min-w-[9.5rem] max-w-[calc(100vw-1.5rem)] overflow-hidden rounded-lg border border-border/70 bg-popover p-1.5 text-popover-foreground shadow-[0_20px_60px_-20px_rgba(15,23,42,0.35)]"
+              style={{
+                left: transcriptContextMenuPosition.left,
+                top: transcriptContextMenuPosition.top,
+              }}
+              onContextMenu={(event) => {
+                event.preventDefault();
+              }}
+            >
+              <button
+                type="button"
+                role="menuitem"
+                className="flex w-full items-center gap-2 rounded-md px-2.5 py-1.5 text-left text-[13px] text-foreground/90 transition-colors hover:bg-accent hover:text-accent-foreground"
+                onClick={() => {
+                  writeTextToClipboard(transcriptContextMenu.selectedText);
+                  closeTranscriptContextMenu();
+                }}
+              >
+                <Copy className="h-3.5 w-3.5 shrink-0" />
+                <span className="min-w-0 flex-1 truncate">{copySelectedTextLabel}</span>
+              </button>
+            </div>,
+            document.body,
+          )
+        : null}
+      {isHistorySwitching ? <HistorySwitchLoadingOverlay /> : null}
+    </div>
+  );
+});
diff --git a/crates/agent-gui/src/pages/chat/transcript/EditableUserMessageBubble.tsx b/crates/agent-gui/src/pages/chat/transcript/EditableUserMessageBubble.tsx
new file mode 100644
index 000000000..c9fd87f10
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/transcript/EditableUserMessageBubble.tsx
@@ -0,0 +1,97 @@
+import { memo, useEffect, useRef, useState } from "react";
+
+import { useLocale } from "../../../i18n";
+import type { PendingUploadedFile } from "../../../lib/chat/messages/uploadedFiles";
+import { resolveNearestScrollViewport } from "../utils/chatScrollViewport";
+import { UserAttachmentCards } from "./UserAttachmentCards";
+
+export const EditableUserMessageBubble = memo(function EditableUserMessageBubble(props: {
+  initialText: string;
+  attachments: PendingUploadedFile[];
+  workspaceRoot?: string;
+  compactedClass: string;
+  onCancel: () => void;
+  onSubmit: (text: string, attachments: PendingUploadedFile[]) => void;
+}) {
+  const { initialText, attachments, workspaceRoot, compactedClass, onCancel, onSubmit } = props;
+  const { t } = useLocale();
+  const [draftText, setDraftText] = useState(initialText);
+  const [draftAttachments, setDraftAttachments] = useState(attachments);
+  const textareaRef = useRef<HTMLTextAreaElement | null>(null);
+
+  useEffect(() => {
+    const textarea = textareaRef.current;
+    if (!textarea) {
+      return;
+    }
+    const viewport = resolveNearestScrollViewport(textarea);
+    const scrollTopBeforeFocus = viewport?.scrollTop ?? null;
+    const restoreViewportScroll = () => {
+      if (viewport && scrollTopBeforeFocus !== null) {
+        viewport.scrollTop = scrollTopBeforeFocus;
+      }
+    };
+
+    textarea.focus({ preventScroll: true });
+    const cursorPosition = textarea.value.length;
+    textarea.setSelectionRange(cursorPosition, cursorPosition);
+    restoreViewportScroll();
+
+    const rafId = requestAnimationFrame(restoreViewportScroll);
+    return () => cancelAnimationFrame(rafId);
+  }, []);
+
+  useEffect(() => {
+    setDraftAttachments(attachments);
+  }, [attachments]);
+
+  const canSubmit = draftText.trim().length > 0 || draftAttachments.length > 0;
+
+  return (
+    <div
+      className={`w-full max-w-[min(85%,calc(50em+2.5rem))] rounded-2xl border border-border bg-[hsl(var(--chat-user-bg))] p-3 ${compactedClass}`}
+    >
+      <UserAttachmentCards
+        files={draftAttachments}
+        workspaceRoot={workspaceRoot}
+        onRemove={(relativePath) => {
+          setDraftAttachments((prev) => prev.filter((file) => file.relativePath !== relativePath));
+        }}
+      />
+      <textarea
+        ref={textareaRef}
+        className="w-full resize-none rounded-lg bg-transparent p-2 font-openai-chat text-[14.5px] leading-relaxed text-[hsl(var(--chat-user-fg))] outline-none"
+        value={draftText}
+        onChange={(e) => setDraftText(e.target.value)}
+        rows={Math.max(2, draftText.split("\n").length)}
+        aria-label={t("chat.editMessage")}
+        onKeyDown={(e) => {
+          if (e.key === "Escape") {
+            onCancel();
+          }
+        }}
+      />
+      <div className="mt-2 flex justify-end gap-2">
+        <button
+          type="button"
+          className="rounded-lg border border-border bg-background px-3 py-1.5 text-xs text-foreground transition-colors hover:bg-muted"
+          onClick={onCancel}
+        >
+          {t("chat.cancel")}
+        </button>
+        <button
+          type="button"
+          className="rounded-lg bg-primary px-3 py-1.5 text-xs text-primary-foreground transition-colors hover:bg-primary/90"
+          disabled={!canSubmit}
+          onClick={() => {
+            const newText = draftText.trim();
+            if (!canSubmit) return;
+            onSubmit(newText, draftAttachments);
+          }}
+        >
+          {t("chat.send")}
+        </button>
+      </div>
+    </div>
+  );
+});
diff --git a/crates/agent-gui/src/pages/chat/transcript/TranscriptHistory.tsx b/crates/agent-gui/src/pages/chat/transcript/TranscriptHistory.tsx
new file mode 100644
index 000000000..76b031c59
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/transcript/TranscriptHistory.tsx
@@ -0,0 +1,307 @@
+import { useVirtualizer } from "@tanstack/react-virtual";
+import { memo, useCallback, useEffect, useRef, useState } from "react";
+
+import { Check, CheckCircle2, ChevronDown, Copy, Pencil } from "../../../components/icons";
+import { Markdown } from "../../../components/Markdown";
+import { useLocale } from "../../../i18n";
+import type { RenderSummaryCard } from "../../../lib/chat/conversation/conversationState";
+import { getRoundText } from "../../../lib/chat/messages/uiMessages";
+import {
+  buildGitHubCommitUrl,
+  type CommitDetailsLoader,
+  type CommitDisplayReference,
+  UserMessageContent,
+} from "../../../lib/chat/messages/userMessageContent";
+import { AssistantAvatar, AssistantBubble } from "../components/AssistantBubble";
+import { EditableUserMessageBubble } from "./EditableUserMessageBubble";
+import type { TranscriptHistoryProps } from "./transcriptTypes";
+import { splitUserAttachmentsForDisplay } from "./transcriptUtils";
+import { UserAttachmentCards } from "./UserAttachmentCards";
+
+const TRANSCRIPT_ROW_ESTIMATED_HEIGHT = 260;
+const TRANSCRIPT_ROW_GAP = 24;
+const TRANSCRIPT_ROW_OVERSCAN_COUNT = 5;
+
+const SummaryCard = memo(function SummaryCard(props: { item: RenderSummaryCard }) {
+  const { item } = props;
+  const { locale } = useLocale();
+  const [expanded, setExpanded] = useState(false);
+  const isEn = locale === "en-US";
+
+  return (
+    <div className="flex justify-center px-2">
+      <div className="checkpoint-card w-full max-w-3xl overflow-hidden rounded-[14px] border border-black/[0.06] bg-white/[0.72] shadow-[0_1px_3px_rgba(0,0,0,0.04),0_4px_12px_rgba(0,0,0,0.03)] backdrop-blur-xl dark:border-white/[0.1] dark:bg-white/[0.06] dark:shadow-[0_1px_3px_rgba(0,0,0,0.2),0_4px_12px_rgba(0,0,0,0.15)]">
+        <button
+          type="button"
+          onClick={() => setExpanded((prev) => !prev)}
+          className="flex w-full items-center gap-3 px-3.5 py-3 text-left transition-colors duration-150 hover:bg-black/[0.02] dark:hover:bg-white/[0.03]"
+        >
+          {/* Icon */}
+          <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-[8px] bg-black/[0.04] dark:bg-white/[0.08]">
+            <CheckCircle2 size={16} strokeWidth={1.8} className="text-muted-foreground" />
+          </div>
+
+          {/* Text content */}
+          <div className="min-w-0 flex-1">
+            <div className="flex items-center gap-2">
+              <span className="text-[13px] font-medium text-foreground/90">
+                {isEn ? "Context Checkpoint" : "上下文检查点"}
+              </span>
+              <span className="inline-flex items-center rounded-md bg-black/[0.05] px-1.5 py-[1px] text-[11px] font-normal tabular-nums text-muted-foreground dark:bg-white/[0.08]">
+                {item.coveredMessageCount} {isEn ? "msgs" : "条消息"}
+              </span>
+            </div>
+            <div className="mt-[2px] text-[11px] text-muted-foreground/70">
+              {item.generatedBy.providerId} · {item.generatedBy.model}
+            </div>
+          </div>
+
+          {/* Expand/collapse chevron */}
+          <ChevronDown
+            className={`h-3.5 w-3.5 shrink-0 text-muted-foreground/50 transition-transform duration-200 ${expanded ? "rotate-0" : "-rotate-90"}`}
+          />
+        </button>
+
+        {/* Expandable content */}
+        {expanded ? (
+          <div className="checkpoint-expand border-t border-black/[0.05] px-3.5 py-3 dark:border-white/[0.06]">
+            <Markdown content={item.content} className="font-openai-chat text-sm" />
+          </div>
+        ) : null}
+      </div>
+    </div>
+  );
+});
+
+export const TranscriptHistory = memo(function TranscriptHistory(props: TranscriptHistoryProps) {
+  const {
+    conversationId,
+    historyItems,
+    scrollViewport,
+    showUsage,
+    usageContextWindow,
+    copiedMessageKey,
+    setCopiedMessageKey,
+    onResendFromEdit,
+    workspaceRoot,
+    gitClient,
+    isSending,
+  } = props;
+  const { t } = useLocale();
+  const [editingMessageKey, setEditingMessageKey] = useState<string | null>(null);
+  const copiedResetTimerRef = useRef<number | null>(null);
+  const commitDetailsCacheRef = useRef(new Map<string, CommitDisplayReference>());
+
+  const loadCommitDetails = useCallback<CommitDetailsLoader>(
+    async (commit) => {
+      const workdir = workspaceRoot?.trim() ?? "";
+      const sha = commit.sha.trim();
+      if (!gitClient || !workdir || !sha) return null;
+      const cacheKey = `${workdir}\u0000${sha}`;
+      const cached = commitDetailsCacheRef.current.get(cacheKey);
+      if (cached) return cached;
+      const response = await gitClient.commitDetails(workdir, sha);
+      const details = response.commit;
+      const resolved: CommitDisplayReference = {
+        sha: details.sha,
+        shortSha: details.shortSha,
+        subject: details.subject,
+        body: details.body,
+        authorName: details.authorName,
+        authorEmail: details.authorEmail,
+        authorDate: details.authorDate,
+        fileCount: details.fileCount,
+        filesChanged: details.filesChanged,
+        insertions: details.insertions,
+        deletions: details.deletions,
+        stat: details.stat,
+        remoteName: details.remoteName,
+        remoteUrl: details.remoteUrl,
+        githubUrl:
+          commit.githubUrl ||
+          buildGitHubCommitUrl(details.remoteUrl || response.state.remoteUrl, details.sha) ||
+          undefined,
+      };
+      commitDetailsCacheRef.current.set(cacheKey, resolved);
+      return resolved;
+    },
+    [gitClient, workspaceRoot],
+  );
+
+  useEffect(() => {
+    setEditingMessageKey(null);
+    commitDetailsCacheRef.current.clear();
+  }, [conversationId]);
+
+  useEffect(
+    () => () => {
+      if (copiedResetTimerRef.current !== null) {
+        window.clearTimeout(copiedResetTimerRef.current);
+      }
+    },
+    [],
+  );
+
+  useEffect(() => {
+    if (!editingMessageKey) {
+      return;
+    }
+    const hasEditingMessage = historyItems.some(
+      (item) => item.kind === "user" && item.key === editingMessageKey,
+    );
+    if (!hasEditingMessage) {
+      setEditingMessageKey(null);
+    }
+  }, [editingMessageKey, historyItems]);
+
+  const getTranscriptItemKey = useCallback(
+    (index: number) => historyItems[index]?.key ?? index,
+    [historyItems],
+  );
+  const transcriptVirtualizer = useVirtualizer({
+    count: historyItems.length,
+    getScrollElement: () => scrollViewport,
+    estimateSize: () => TRANSCRIPT_ROW_ESTIMATED_HEIGHT,
+    getItemKey: getTranscriptItemKey,
+    gap: TRANSCRIPT_ROW_GAP,
+    overscan: TRANSCRIPT_ROW_OVERSCAN_COUNT,
+    enabled: scrollViewport !== null,
+  });
+  const virtualRows = transcriptVirtualizer.getVirtualItems();
+
+  return (
+    <div className="relative" style={{ height: transcriptVirtualizer.getTotalSize() }}>
+      {virtualRows.map((virtualRow) => {
+        const item = historyItems[virtualRow.index];
+        if (!item) return null;
+
+        if (item.kind === "summary") {
+          return (
+            <div
+              key={virtualRow.key}
+              data-index={virtualRow.index}
+              ref={transcriptVirtualizer.measureElement}
+              className="absolute left-0 right-0 top-0"
+              style={{ transform: `translateY(${virtualRow.start}px)` }}
+            >
+              <SummaryCard item={item} />
+            </div>
+          );
+        }
+
+        if (item.kind === "user") {
+          const isEditing = editingMessageKey === item.key;
+          const isCopied = copiedMessageKey === item.key;
+          const compactedClass = item.isFromCompactedSegment ? "opacity-70" : "";
+          const { visibleFiles, pastedTextFiles } = splitUserAttachmentsForDisplay(
+            item.attachments,
+            item.text,
+          );
+          return (
+            <div
+              key={virtualRow.key}
+              data-index={virtualRow.index}
+              ref={transcriptVirtualizer.measureElement}
+              className="absolute left-0 right-0 top-0 flex justify-end"
+              style={{ transform: `translateY(${virtualRow.start}px)` }}
+            >
+              {isEditing ? (
+                <EditableUserMessageBubble
+                  initialText={item.text}
+                  attachments={item.attachments}
+                  workspaceRoot={workspaceRoot}
+                  compactedClass={compactedClass}
+                  onCancel={() => setEditingMessageKey(null)}
+                  onSubmit={(newText, nextAttachments) => {
+                    setEditingMessageKey(null);
+                    onResendFromEdit(item.messageRef, newText, nextAttachments);
+                  }}
+                />
+              ) : (
+                <div
+                  className={`chat-user-bubble-wrap group relative ml-auto max-w-[min(85%,calc(50em+2rem))] ${compactedClass}`}
+                >
+                  <div className="chat-bubble-enter chat-user-bubble rounded-2xl rounded-br-md bg-[hsl(var(--chat-user-bg))] px-4 py-2.5 font-openai-chat text-[14.5px] leading-relaxed text-[hsl(var(--chat-user-fg))]">
+                    <UserAttachmentCards files={visibleFiles} workspaceRoot={workspaceRoot} />
+                    {item.text ? (
+                      <UserMessageContent
+                        text={item.text}
+                        pastedTextFiles={pastedTextFiles}
+                        loadCommitDetails={loadCommitDetails}
+                      />
+                    ) : null}
+                  </div>
+                  <div className="mt-1 flex justify-end gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
+                    <button
+                      type="button"
+                      className="rounded-md p-1 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
+                      title={t("chat.copy")}
+                      onClick={() => {
+                        navigator.clipboard.writeText(item.text);
+                        setCopiedMessageKey(item.key);
+                        if (copiedResetTimerRef.current !== null) {
+                          window.clearTimeout(copiedResetTimerRef.current);
+                        }
+                        copiedResetTimerRef.current = window.setTimeout(() => {
+                          copiedResetTimerRef.current = null;
+                          setCopiedMessageKey(null);
+                        }, 1500);
+                      }}
+                    >
+                      {isCopied ? (
+                        <Check className="h-3.5 w-3.5" />
+                      ) : (
+                        <Copy className="h-3.5 w-3.5" />
+                      )}
+                    </button>
+                    <button
+                      type="button"
+                      className="rounded-md p-1 text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
+                      title={t("chat.edit")}
+                      disabled={isSending}
+                      onClick={() => setEditingMessageKey(item.key)}
+                    >
+                      <Pencil className="h-3.5 w-3.5" />
+                    </button>
+                  </div>
+                </div>
+              )}
+            </div>
+          );
+        }
+
+        return (
+          <div
+            key={virtualRow.key}
+            data-index={virtualRow.index}
+            ref={transcriptVirtualizer.measureElement}
+            className={`absolute left-0 right-0 top-0 flex justify-start ${
+              item.isFromCompactedSegment ? "opacity-70" : ""
+            }`}
+            style={{ transform: `translateY(${virtualRow.start}px)` }}
+          >
+            {item.rounds.length > 0 ? (
+              <AssistantBubble
+                rounds={item.rounds}
+                showUsage={showUsage}
+                usageContextWindow={usageContextWindow}
+              />
+            ) : (
+              <div className="flex w-full max-w-full items-start gap-3">
+                <AssistantAvatar />
+                <div className="min-w-0 flex-1 pt-0.5">
+                  {getRoundText(item.rounds[item.rounds.length - 1] ?? { blocks: [] }).trim() ? (
+                    <Markdown
+                      content={getRoundText(item.rounds[item.rounds.length - 1] ?? { blocks: [] })}
+                      className="font-openai-chat"
+                    />
+                  ) : null}
+                </div>
+              </div>
+            )}
+          </div>
+        );
+      })}
+    </div>
+  );
+});
diff --git a/crates/agent-gui/src/pages/chat/transcript/TranscriptLiveState.tsx b/crates/agent-gui/src/pages/chat/transcript/TranscriptLiveState.tsx
new file mode 100644
index 000000000..1718a5936
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/transcript/TranscriptLiveState.tsx
@@ -0,0 +1,101 @@
+import { memo, useSyncExternalStore } from "react";
+
+import { LiveMarkdown } from "../../../components/Markdown";
+import { normalizeLiveToolStatus, VIBING_STATUS } from "../../../lib/chat/page/chatPageHelpers";
+import {
+  AssistantAvatar,
+  AssistantBubble,
+  CompactingText,
+  VibingText,
+} from "../components/AssistantBubble";
+import { TypingDots } from "./TranscriptLoadingStates";
+import type { TranscriptLiveStateProps } from "./transcriptTypes";
+
+export const TranscriptLiveState = memo(function TranscriptLiveState(
+  props: TranscriptLiveStateProps,
+) {
+  const {
+    isSending,
+    isAgentMode,
+    showUsage,
+    usageContextWindow,
+    liveTranscriptStore,
+    isCompactionRunning,
+  } = props;
+  const liveState = useSyncExternalStore(
+    liveTranscriptStore.subscribe,
+    liveTranscriptStore.getSnapshot,
+    liveTranscriptStore.getSnapshot,
+  );
+  const { draftAssistantText, liveRounds, toolStatus } = liveState;
+  const displayedToolStatus = normalizeLiveToolStatus(toolStatus);
+
+  if (!isSending) {
+    return null;
+  }
+
+  if (liveRounds.length > 0) {
+    return (
+      <div className="flex justify-start">
+        <AssistantBubble
+          rounds={liveRounds}
+          showUsage={showUsage}
+          usageContextWindow={usageContextWindow}
+          isLive
+          toolStatus={displayedToolStatus}
+          toolStatusVariant={isCompactionRunning ? "compaction" : "default"}
+        />
+      </div>
+    );
+  }
+
+  if (isAgentMode) {
+    return (
+      <div className="flex justify-start">
+        <div className="flex w-full max-w-full items-start gap-3">
+          <AssistantAvatar />
+          <div className="min-w-0 flex-1 pt-1">
+            {isCompactionRunning ? (
+              <div className="flex items-center py-1">
+                <CompactingText className="text-sm font-medium text-muted-foreground" />
+              </div>
+            ) : displayedToolStatus === VIBING_STATUS ? (
+              <div className="flex items-center py-1">
+                <VibingText className="text-sm font-medium text-muted-foreground" />
+              </div>
+            ) : displayedToolStatus ? (
+              <div className="py-1 text-sm text-muted-foreground">{displayedToolStatus}</div>
+            ) : (
+              <TypingDots />
+            )}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex justify-start">
+      <div className="flex w-full max-w-full items-start gap-3">
+        <AssistantAvatar />
+        <div className="min-w-0 flex-1 pt-0.5">
+          {draftAssistantText ? (
+            <LiveMarkdown content={draftAssistantText} className="font-openai-chat" isAnimating />
+          ) : isCompactionRunning ? (
+            <div className="flex items-center py-1">
+              <CompactingText className="text-sm font-medium text-muted-foreground" />
+            </div>
+          ) : displayedToolStatus === VIBING_STATUS ? (
+            <div className="flex items-center py-1">
+              <VibingText className="text-sm font-medium text-muted-foreground" />
+            </div>
+          ) : displayedToolStatus ? (
+            <div className="py-1 text-sm text-muted-foreground">{displayedToolStatus}</div>
+          ) : (
+            <TypingDots />
+          )}
+        </div>
+      </div>
+    </div>
+  );
+});
diff --git a/crates/agent-gui/src/pages/chat/transcript/TranscriptLoadingStates.tsx b/crates/agent-gui/src/pages/chat/transcript/TranscriptLoadingStates.tsx
new file mode 100644
index 000000000..d23475074
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/transcript/TranscriptLoadingStates.tsx
@@ -0,0 +1,33 @@
+import { LoaderCircle } from "../../../components/icons";
+import { useLocale } from "../../../i18n";
+
+export function TypingDots() {
+  return (
+    <div className="flex items-center gap-2 py-1">
+      <div className="flex gap-1">
+        <span className="typing-dot inline-block h-1.5 w-1.5 rounded-full bg-muted-foreground/40" />
+        <span className="typing-dot inline-block h-1.5 w-1.5 rounded-full bg-muted-foreground/40" />
+        <span className="typing-dot inline-block h-1.5 w-1.5 rounded-full bg-muted-foreground/40" />
+      </div>
+    </div>
+  );
+}
+
+export function HistorySwitchLoadingOverlay() {
+  const { locale } = useLocale();
+  const label = locale === "en-US" ? "Loading conversation..." : "正在加载对话...";
+
+  return (
+    <div
+      className="absolute inset-0 z-30 flex items-center justify-center bg-background/95 backdrop-blur-[2px]"
+      role="status"
+      aria-live="polite"
+      aria-label={label}
+    >
+      <div className="flex items-center gap-2 rounded-full border border-border/60 bg-background/95 px-3.5 py-2 text-xs font-medium text-muted-foreground shadow-sm">
+        <LoaderCircle className="h-4 w-4 animate-spin text-primary" />
+        <span>{label}</span>
+      </div>
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/transcript/UserAttachmentCards.tsx b/crates/agent-gui/src/pages/chat/transcript/UserAttachmentCards.tsx
new file mode 100644
index 000000000..2022fdfd7
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/transcript/UserAttachmentCards.tsx
@@ -0,0 +1,278 @@
+import { useMemo, useState } from "react";
+
+import { ImagePreview, type ImagePreviewSlide } from "../../../components/chat/ImagePreview";
+import { File, FileText, X } from "../../../components/icons";
+import { useLocale } from "../../../i18n";
+import {
+  formatUploadedFileSize,
+  type PendingUploadedFile,
+} from "../../../lib/chat/messages/uploadedFiles";
+import { cn } from "../../../lib/shared/utils";
+import { useUploadedImagePreview } from "./uploadedImagePreview";
+
+function UserImageAttachmentCard({
+  file,
+  imageSrc,
+  isLoading,
+  compact,
+  onRemove,
+  removeLabel,
+  previewLabel,
+  closePreviewLabel,
+}: {
+  file: PendingUploadedFile;
+  imageSrc: string | null;
+  isLoading: boolean;
+  compact: boolean;
+  onRemove?: ((relativePath: string) => void) | undefined;
+  removeLabel?: string;
+  previewLabel: string;
+  closePreviewLabel: string;
+}) {
+  const [previewOpen, setPreviewOpen] = useState(false);
+  const labeledPreview = `${previewLabel}: ${file.fileName}`;
+  const previewSlides = useMemo<ImagePreviewSlide[]>(
+    () =>
+      imageSrc
+        ? [
+            {
+              src: imageSrc,
+              alt: file.fileName,
+              title: file.fileName,
+            },
+          ]
+        : [],
+    [file.fileName, imageSrc],
+  );
+  return (
+    <div
+      title={file.relativePath}
+      className={cn(
+        "group relative overflow-hidden rounded-xl border border-white/60 bg-white/50 shadow-[0_1px_3px_rgba(0,0,0,0.06),0_1px_2px_rgba(0,0,0,0.04)] backdrop-blur-xl transition-shadow hover:shadow-[0_2px_8px_rgba(0,0,0,0.1)] dark:border-white/[0.12] dark:bg-white/[0.06]",
+        compact ? "min-w-0 basis-[calc(33.333%-5.33px)] grow" : "w-full max-w-[280px]",
+      )}
+    >
+      {onRemove ? (
+        <button
+          type="button"
+          onClick={() => onRemove(file.relativePath)}
+          className="absolute top-1.5 right-1.5 z-10 flex h-5 w-5 items-center justify-center rounded-full bg-black/30 text-white/90 opacity-0 backdrop-blur-sm transition-all hover:bg-black/45 group-hover:opacity-100"
+          aria-label={removeLabel ?? file.fileName}
+          title={removeLabel}
+        >
+          <X className="h-3 w-3" />
+        </button>
+      ) : null}
+      {imageSrc ? (
+        <>
+          <button
+            type="button"
+            className="block w-full cursor-zoom-in overflow-hidden text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/45"
+            aria-label={labeledPreview}
+            title={labeledPreview}
+            onClick={() => setPreviewOpen(true)}
+          >
+            <img
+              src={imageSrc}
+              alt={file.fileName}
+              className={cn(
+                "w-full bg-black/[0.02] transition-transform hover:scale-[1.01] dark:bg-white/5",
+                compact ? "h-28 object-cover" : "max-h-56 object-contain",
+              )}
+            />
+          </button>
+          {previewOpen ? (
+            <ImagePreview
+              open={previewOpen}
+              slides={previewSlides}
+              closeLabel={closePreviewLabel}
+              onClose={() => setPreviewOpen(false)}
+            />
+          ) : null}
+        </>
+      ) : (
+        <div
+          className={cn(
+            "flex w-full items-center justify-center bg-black/[0.02] dark:bg-white/5",
+            compact ? "h-28" : "h-36",
+          )}
+        >
+          <div
+            className={
+              isLoading
+                ? "h-16 w-16 animate-pulse rounded-xl bg-black/5 dark:bg-white/10"
+                : "flex h-10 w-10 items-center justify-center rounded-xl bg-black/[0.03] dark:bg-white/10"
+            }
+          >
+            {isLoading ? null : <File className="h-5 w-5 opacity-40" />}
+          </div>
+        </div>
+      )}
+      <div className="flex items-center gap-1.5 px-2.5 py-1.5">
+        <div className="min-w-0 flex-1">
+          <div className="truncate text-[11px] font-medium leading-tight text-[hsl(var(--chat-user-fg)/0.85)]">
+            {file.fileName}
+          </div>
+        </div>
+        <span className="shrink-0 text-[10px] tabular-nums text-[hsl(var(--chat-user-fg)/0.4)]">
+          {formatUploadedFileSize(file.sizeBytes)}
+        </span>
+      </div>
+    </div>
+  );
+}
+
+function UserFileAttachmentCard({
+  file,
+  onRemove,
+  removeLabel,
+  compact,
+}: {
+  file: PendingUploadedFile;
+  onRemove?: ((relativePath: string) => void) | undefined;
+  removeLabel?: string;
+  compact: boolean;
+}) {
+  return (
+    <div
+      title={file.relativePath}
+      className={cn(
+        "group relative flex items-center gap-2 rounded-xl border border-white/60 bg-white/50 px-2.5 py-2 text-left shadow-[0_1px_3px_rgba(0,0,0,0.06),0_1px_2px_rgba(0,0,0,0.04)] backdrop-blur-xl transition-shadow hover:shadow-[0_2px_8px_rgba(0,0,0,0.1)] dark:border-white/[0.12] dark:bg-white/[0.06]",
+        compact ? "min-w-0 basis-[calc(33.333%-5.33px)] grow" : "w-full",
+      )}
+    >
+      <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-gradient-to-b from-black/[0.03] to-black/[0.06] dark:from-white/[0.06] dark:to-white/[0.1]">
+        <FileText className="h-4 w-4 text-[hsl(var(--chat-user-fg)/0.45)]" />
+      </div>
+      <div className="min-w-0 flex-1">
+        <div className="truncate text-[11px] font-medium leading-tight text-[hsl(var(--chat-user-fg)/0.85)]">
+          {file.fileName}
+        </div>
+        <div className="mt-0.5 text-[10px] tabular-nums leading-tight text-[hsl(var(--chat-user-fg)/0.4)]">
+          {formatUploadedFileSize(file.sizeBytes)}
+        </div>
+      </div>
+      {onRemove ? (
+        <button
+          type="button"
+          onClick={() => onRemove(file.relativePath)}
+          className="absolute top-1/2 right-1.5 z-10 flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded-full text-[hsl(var(--chat-user-fg)/0.3)] opacity-0 transition-all hover:bg-black/5 hover:text-[hsl(var(--chat-user-fg)/0.6)] group-hover:opacity-100 dark:hover:bg-white/10"
+          aria-label={removeLabel ?? file.fileName}
+          title={removeLabel}
+        >
+          <X className="h-3 w-3" />
+        </button>
+      ) : null}
+    </div>
+  );
+}
+
+function UserAttachmentCard({
+  file,
+  workspaceRoot,
+  compactImageLayout,
+  compactFileLayout,
+  onRemove,
+  removeLabel,
+  previewLabel,
+  closePreviewLabel,
+}: {
+  file: PendingUploadedFile;
+  workspaceRoot?: string;
+  compactImageLayout: boolean;
+  compactFileLayout: boolean;
+  onRemove?: ((relativePath: string) => void) | undefined;
+  removeLabel?: string;
+  previewLabel: string;
+  closePreviewLabel: string;
+}) {
+  const shouldPreviewImage =
+    file.kind === "image" && typeof file.absolutePath === "string" && file.absolutePath.trim();
+  const { imageSrc, isLoading } = useUploadedImagePreview(
+    shouldPreviewImage ? file.absolutePath : undefined,
+    workspaceRoot,
+  );
+
+  if (shouldPreviewImage) {
+    return (
+      <UserImageAttachmentCard
+        file={file}
+        imageSrc={imageSrc}
+        isLoading={isLoading}
+        compact={compactImageLayout}
+        onRemove={onRemove}
+        removeLabel={removeLabel}
+        previewLabel={previewLabel}
+        closePreviewLabel={closePreviewLabel}
+      />
+    );
+  }
+
+  return (
+    <UserFileAttachmentCard
+      file={file}
+      onRemove={onRemove}
+      removeLabel={removeLabel}
+      compact={compactFileLayout}
+    />
+  );
+}
+
+export function UserAttachmentCards({
+  files,
+  workspaceRoot,
+  onRemove,
+}: {
+  files: PendingUploadedFile[];
+  workspaceRoot?: string;
+  onRemove?: ((relativePath: string) => void) | undefined;
+}) {
+  const { t } = useLocale();
+  if (files.length === 0) return null;
+  const imageFiles = files.filter((file) => file.kind === "image");
+  const otherFiles = files.filter((file) => file.kind !== "image");
+  const compactImageLayout = imageFiles.length > 1;
+  const compactFileLayout = otherFiles.length > 1;
+  const removeLabel = onRemove ? t("chat.upload.removeFile") : undefined;
+  const previewLabel = t("chat.upload.previewImage");
+  const closePreviewLabel = t("chat.upload.closePreview");
+
+  return (
+    <div className="mb-2 flex flex-col gap-2">
+      {imageFiles.length > 0 ? (
+        <div className="flex flex-wrap gap-2">
+          {imageFiles.map((file) => (
+            <UserAttachmentCard
+              key={`${file.relativePath}-${file.absolutePath ?? file.fileName}`}
+              file={file}
+              workspaceRoot={workspaceRoot}
+              compactImageLayout={compactImageLayout}
+              compactFileLayout={false}
+              onRemove={onRemove}
+              removeLabel={removeLabel}
+              previewLabel={previewLabel}
+              closePreviewLabel={closePreviewLabel}
+            />
+          ))}
+        </div>
+      ) : null}
+      {otherFiles.length > 0 ? (
+        <div className="flex flex-wrap gap-2">
+          {otherFiles.map((file) => (
+            <UserAttachmentCard
+              key={`${file.relativePath}-${file.absolutePath ?? file.fileName}`}
+              file={file}
+              workspaceRoot={workspaceRoot}
+              compactImageLayout={false}
+              compactFileLayout={compactFileLayout}
+              onRemove={onRemove}
+              removeLabel={removeLabel}
+              previewLabel={previewLabel}
+              closePreviewLabel={closePreviewLabel}
+            />
+          ))}
+        </div>
+      ) : null}
+    </div>
+  );
+}
diff --git a/crates/agent-gui/src/pages/chat/transcript/transcriptTypes.ts b/crates/agent-gui/src/pages/chat/transcript/transcriptTypes.ts
new file mode 100644
index 000000000..38e82f21e
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/transcript/transcriptTypes.ts
@@ -0,0 +1,61 @@
+import type { RefObject } from "react";
+
+import type {
+  HistoryMessageRef,
+  RenderTimelineItem,
+} from "../../../lib/chat/conversation/conversationState";
+import type { LiveTranscriptStore } from "../../../lib/chat/conversation/liveTranscriptStore";
+import type { PendingUploadedFile } from "../../../lib/chat/messages/uploadedFiles";
+import type { GitClient } from "../../../lib/git/types";
+import type { SectionId } from "../../settings/types";
+
+export type ChatTranscriptProps = {
+  conversationId: string;
+  workspaceRoot?: string;
+  gitClient?: GitClient | null;
+  scrollAreaRef: RefObject<HTMLDivElement | null>;
+  bottomRef: RefObject<HTMLDivElement | null>;
+  hasModels: boolean;
+  historyItems: RenderTimelineItem[];
+  isHistorySwitching: boolean;
+  isSending: boolean;
+  isAgentMode: boolean;
+  showUsage: boolean;
+  usageContextWindow?: number;
+  liveTranscriptStore: LiveTranscriptStore;
+  isCompactionRunning: boolean;
+  copiedMessageKey: string | null;
+  setCopiedMessageKey: (key: string | null) => void;
+  onResendFromEdit: (
+    messageRef: HistoryMessageRef,
+    text: string,
+    attachments: PendingUploadedFile[],
+  ) => void;
+  onOpenSettings: (section?: SectionId) => void;
+};
+
+export type TranscriptHistoryProps = Pick<
+  ChatTranscriptProps,
+  | "historyItems"
+  | "conversationId"
+  | "workspaceRoot"
+  | "gitClient"
+  | "showUsage"
+  | "usageContextWindow"
+  | "copiedMessageKey"
+  | "setCopiedMessageKey"
+  | "onResendFromEdit"
+> & {
+  isSending: boolean;
+  scrollViewport: HTMLDivElement | null;
+};
+
+export type TranscriptLiveStateProps = Pick<
+  ChatTranscriptProps,
+  | "isSending"
+  | "isAgentMode"
+  | "showUsage"
+  | "usageContextWindow"
+  | "liveTranscriptStore"
+  | "isCompactionRunning"
+>;
diff --git a/crates/agent-gui/src/pages/chat/transcript/transcriptUtils.ts b/crates/agent-gui/src/pages/chat/transcript/transcriptUtils.ts
new file mode 100644
index 000000000..0ca39fe8b
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/transcript/transcriptUtils.ts
@@ -0,0 +1,100 @@
+import type { PendingUploadedFile } from "../../../lib/chat/messages/uploadedFiles";
+import { parsePastedTextDisplayReferences } from "../../../lib/chat/messages/uploadedFiles";
+
+export function splitUserAttachmentsForDisplay(files: PendingUploadedFile[], text: string) {
+  const pastedTextReferences = parsePastedTextDisplayReferences(text);
+  if (pastedTextReferences.length === 0 || files.length === 0) {
+    return {
+      visibleFiles: files,
+      pastedTextFiles: [],
+    };
+  }
+
+  const pastedTextPaths = new Set(pastedTextReferences.map((reference) => reference.relativePath));
+  const pastedTextFiles: PendingUploadedFile[] = [];
+  const visibleFiles: PendingUploadedFile[] = [];
+
+  for (const file of files) {
+    if (pastedTextPaths.has(file.relativePath)) {
+      pastedTextFiles.push(file);
+    } else {
+      visibleFiles.push(file);
+    }
+  }
+
+  return {
+    visibleFiles,
+    pastedTextFiles,
+  };
+}
+
+export type TranscriptContextMenuState = {
+  x: number;
+  y: number;
+  selectedText: string;
+};
+
+const TRANSCRIPT_CONTEXT_MENU_WIDTH = 184;
+const TRANSCRIPT_CONTEXT_MENU_HEIGHT = 52;
+const TRANSCRIPT_CONTEXT_MENU_MARGIN = 12;
+
+export function writeTextToClipboard(text: string) {
+  if (!text) return;
+
+  if (navigator.clipboard?.writeText) {
+    void navigator.clipboard.writeText(text).catch(() => {
+      fallbackWriteTextToClipboard(text);
+    });
+    return;
+  }
+
+  fallbackWriteTextToClipboard(text);
+}
+
+function fallbackWriteTextToClipboard(text: string) {
+  const textarea = document.createElement("textarea");
+  textarea.value = text;
+  textarea.setAttribute("readonly", "");
+  textarea.style.position = "fixed";
+  textarea.style.left = "-9999px";
+  textarea.style.top = "0";
+  document.body.appendChild(textarea);
+  textarea.select();
+  document.execCommand("copy");
+  document.body.removeChild(textarea);
+}
+
+export function resolveTranscriptSelectionText(root: HTMLElement | null) {
+  if (!root) return "";
+
+  const selection = window.getSelection();
+  if (!selection || selection.isCollapsed || selection.rangeCount === 0) {
+    return "";
+  }
+
+  const selectedText = selection.toString();
+  if (!selectedText.trim()) return "";
+
+  const range = selection.getRangeAt(0);
+  if (!root.contains(range.commonAncestorContainer)) {
+    return "";
+  }
+
+  return selectedText;
+}
+
+export function clampTranscriptContextMenuPosition(x: number, y: number) {
+  const maxLeft = Math.max(
+    TRANSCRIPT_CONTEXT_MENU_MARGIN,
+    window.innerWidth - TRANSCRIPT_CONTEXT_MENU_WIDTH - TRANSCRIPT_CONTEXT_MENU_MARGIN,
+  );
+  const maxTop = Math.max(
+    TRANSCRIPT_CONTEXT_MENU_MARGIN,
+    window.innerHeight - TRANSCRIPT_CONTEXT_MENU_HEIGHT - TRANSCRIPT_CONTEXT_MENU_MARGIN,
+  );
+
+  return {
+    left: Math.min(Math.max(TRANSCRIPT_CONTEXT_MENU_MARGIN, x), maxLeft),
+    top: Math.min(Math.max(TRANSCRIPT_CONTEXT_MENU_MARGIN, y), maxTop),
+  };
+}
diff --git a/crates/agent-gui/src/pages/chat/transcript/uploadedImagePreview.ts b/crates/agent-gui/src/pages/chat/transcript/uploadedImagePreview.ts
new file mode 100644
index 000000000..54bede0ee
--- /dev/null
+++ b/crates/agent-gui/src/pages/chat/transcript/uploadedImagePreview.ts
@@ -0,0 +1,113 @@
+import { invoke } from "@tauri-apps/api/core";
+import { useEffect, useState } from "react";
+
+type UploadedImagePreviewResponse = {
+  mimeType: string;
+  data: string;
+};
+
+const uploadedImagePreviewCache = new Map<string, string>();
+const uploadedImagePreviewRequests = new Map<string, Promise<string | null>>();
+const UPLOADED_IMAGE_PREVIEW_CACHE_LIMIT = 64;
+
+function getUploadedImagePreviewCacheKey(workspaceRoot: string, absolutePath: string) {
+  return `${workspaceRoot}\n${absolutePath}`;
+}
+
+function readUploadedImagePreviewCache(cacheKey: string) {
+  const cached = uploadedImagePreviewCache.get(cacheKey);
+  if (cached === undefined) return undefined;
+  uploadedImagePreviewCache.delete(cacheKey);
+  uploadedImagePreviewCache.set(cacheKey, cached);
+  return cached;
+}
+
+function writeUploadedImagePreviewCache(cacheKey: string, value: string) {
+  uploadedImagePreviewCache.delete(cacheKey);
+  uploadedImagePreviewCache.set(cacheKey, value);
+
+  while (uploadedImagePreviewCache.size > UPLOADED_IMAGE_PREVIEW_CACHE_LIMIT) {
+    const oldestKey = uploadedImagePreviewCache.keys().next().value;
+    if (typeof oldestKey !== "string") break;
+    uploadedImagePreviewCache.delete(oldestKey);
+  }
+}
+
+async function loadUploadedImagePreview(params: { workspaceRoot: string; absolutePath: string }) {
+  const { workspaceRoot, absolutePath } = params;
+  const cacheKey = getUploadedImagePreviewCacheKey(workspaceRoot, absolutePath);
+  const cached = readUploadedImagePreviewCache(cacheKey);
+  if (cached !== undefined) return cached;
+
+  const existing = uploadedImagePreviewRequests.get(cacheKey);
+  if (existing) return existing;
+
+  const request = invoke<UploadedImagePreviewResponse>("system_read_uploaded_image_preview", {
+    workdir: workspaceRoot,
+    absolute_path: absolutePath,
+  })
+    .then((result) => {
+      const mimeType =
+        typeof result.mimeType === "string" && result.mimeType.trim()
+          ? result.mimeType
+          : "application/octet-stream";
+      const data = typeof result.data === "string" ? result.data.trim() : "";
+      const next = data ? `data:${mimeType};base64,${data}` : null;
+      if (next) {
+        writeUploadedImagePreviewCache(cacheKey, next);
+      }
+      return next;
+    })
+    .catch(() => null)
+    .finally(() => {
+      uploadedImagePreviewRequests.delete(cacheKey);
+    });
+
+  uploadedImagePreviewRequests.set(cacheKey, request);
+  return request;
+}
+
+export function useUploadedImagePreview(absolutePath?: string, workspaceRoot?: string) {
+  const normalizedPath = typeof absolutePath === "string" ? absolutePath.trim() : "";
+  const normalizedWorkspaceRoot = typeof workspaceRoot === "string" ? workspaceRoot.trim() : "";
+  const cacheKey =
+    normalizedPath && normalizedWorkspaceRoot
+      ? getUploadedImagePreviewCacheKey(normalizedWorkspaceRoot, normalizedPath)
+      : "";
+  const [imageSrc, setImageSrc] = useState<string | null | undefined>(() => {
+    if (!cacheKey) return null;
+    return readUploadedImagePreviewCache(cacheKey);
+  });
+
+  useEffect(() => {
+    if (!cacheKey || !normalizedPath || !normalizedWorkspaceRoot) {
+      setImageSrc(null);
+      return;
+    }
+
+    const cached = readUploadedImagePreviewCache(cacheKey);
+    if (cached !== undefined) {
+      setImageSrc(cached);
+      return;
+    }
+
+    let cancelled = false;
+    setImageSrc(undefined);
+    void loadUploadedImagePreview({
+      workspaceRoot: normalizedWorkspaceRoot,
+      absolutePath: normalizedPath,
+    }).then((value) => {
+      if (!cancelled) {
+        setImageSrc(value);
+      }
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [cacheKey, normalizedPath, normalizedWorkspaceRoot]);
+
+  return {
+    imageSrc: imageSrc ?? null,
+    isLoading: Boolean(cacheKey) && imageSrc === undefined,
+  };
+}
diff --git a/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts b/crates/agent-gui/src/pages/chat/turns/runAgentConversationTurn.ts
similarity index 95%
rename from crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts
rename to crates/agent-gui/src/pages/chat/turns/runAgentConversationTurn.ts
index 2c893881b..37a6a1017 100644
--- a/crates/agent-gui/src/pages/chat/runAgentConversationTurn.ts
+++ b/crates/agent-gui/src/pages/chat/turns/runAgentConversationTurn.ts
@@ -10,19 +10,19 @@ import {
   noteCompactionRound,
   type ProviderRuntimeConfig,
   shouldProtectionCompactConversation,
-} from "../../lib/chat/compaction/contextCompaction";
-import { isAbortedAssistantMessage } from "../../lib/chat/conversation/chatAbort";
+} from "../../../lib/chat/compaction/contextCompaction";
+import { isAbortedAssistantMessage } from "../../../lib/chat/conversation/chatAbort";
 import {
   appendMessagesToConversation,
   appendRenderOnlyMessagesToConversation,
   type ConversationViewState,
-} from "../../lib/chat/conversation/conversationState";
-import type { LiveTranscriptStore } from "../../lib/chat/conversation/liveTranscriptStore";
+} from "../../../lib/chat/conversation/conversationState";
+import type { LiveTranscriptStore } from "../../../lib/chat/conversation/liveTranscriptStore";
 import type {
   ConversationHookLifecycle,
   GatewayBridgeEventController,
-} from "../../lib/chat/conversation/run";
-import type { HostedSearchBlock } from "../../lib/chat/messages/hostedSearch";
+} from "../../../lib/chat/conversation/run";
+import type { HostedSearchBlock } from "../../../lib/chat/messages/hostedSearch";
 import {
   appendTextDeltaToRound,
   appendThinkingDeltaToRound,
@@ -32,51 +32,51 @@ import {
   updateLiveRound,
   upsertHostedSearchToRound,
   upsertToolCallToRound,
-} from "../../lib/chat/messages/uiMessages";
-import { runAssistantWithTools } from "../../lib/chat/runner/agentRunner";
+} from "../../../lib/chat/messages/uiMessages";
+import { runAssistantWithTools } from "../../../lib/chat/runner/agentRunner";
 import {
   listSubagentIdentities,
   listSubagentMessages,
   listSubagentRuns,
   type SubagentIdentityRecord,
   type SubagentRunSummary,
-} from "../../lib/chat/subagent/subagentHistory";
+} from "../../../lib/chat/subagent/subagentHistory";
 import {
   renderSubagentMessageBusSnapshot,
   SUBAGENT_PARENT_AGENT_ID,
-} from "../../lib/chat/subagent/subagentMessageBus";
-import { buildExistingSubagentsReminder } from "../../lib/chat/subagent/subagentReminders";
-import type { SubagentRuntimeManager } from "../../lib/chat/subagent/subagentRuntimeManager";
-import { createSubagentScheduler } from "../../lib/chat/subagent/subagentScheduler";
-import type { StreamDebugLogger } from "../../lib/debug/agentDebug";
-import { assistantMessageToText } from "../../lib/providers/llm";
+} from "../../../lib/chat/subagent/subagentMessageBus";
+import { buildExistingSubagentsReminder } from "../../../lib/chat/subagent/subagentReminders";
+import type { SubagentRuntimeManager } from "../../../lib/chat/subagent/subagentRuntimeManager";
+import { createSubagentScheduler } from "../../../lib/chat/subagent/subagentScheduler";
+import type { StreamDebugLogger } from "../../../lib/debug/agentDebug";
+import { assistantMessageToText } from "../../../lib/providers/llm";
 import {
   type AppSettings,
   type ProviderId,
   type SshHostConfig,
   type SystemToolId,
   workspaceProjectPathKey,
-} from "../../lib/settings";
+} from "../../../lib/settings";
+import { buildBuiltinToolRegistry } from "../../../lib/tools/builtinRegistry";
+import type { BuiltinToolExecutionContext } from "../../../lib/tools/builtinTypes";
+import { createFileToolState } from "../../../lib/tools/fileToolState";
+import type { SkillAccessPolicy } from "../../../lib/tools/skillAccessPolicy";
 import {
   TUNNEL_MANAGER_CHANGED_EVENT,
   type TunnelManagerChange,
-} from "../../lib/tools/tunnelManagerTools";
-import { buildBuiltinToolRegistry } from "../../lib/tools/builtinRegistry";
-import type { BuiltinToolExecutionContext } from "../../lib/tools/builtinTypes";
-import { createFileToolState } from "../../lib/tools/fileToolState";
-import type { SkillAccessPolicy } from "../../lib/tools/skillAccessPolicy";
-import {
-  appendSystemPrompt,
-  buildPartialAssistantMessage,
-  type ConversationRuntimeEntry,
-} from "./chatPageRuntime";
-import { buildProtectionCompactionStatus } from "./compactionStatusText";
+} from "../../../lib/tools/tunnelManagerTools";
 import {
   recordSilentMemoryTurnBoundary,
   type runSilentMemoryExtraction,
   type SilentMemoryExtractionModelConfig,
-} from "./silentMemoryExtraction";
-import { runSilentMemoryExtractionWithFallback } from "./silentMemoryExtractionFallback";
+} from "../memory/silentMemoryExtraction";
+import { runSilentMemoryExtractionWithFallback } from "../memory/silentMemoryExtractionFallback";
+import {
+  appendSystemPrompt,
+  buildPartialAssistantMessage,
+  type ConversationRuntimeEntry,
+} from "../runtime/chatPageRuntime";
+import { buildProtectionCompactionStatus } from "../runtime/compactionStatusText";
 
 type RuntimeModel = {
   api: AssistantMessage["api"];
diff --git a/crates/agent-gui/src/pages/chat/runTextConversationTurn.ts b/crates/agent-gui/src/pages/chat/turns/runTextConversationTurn.ts
similarity index 94%
rename from crates/agent-gui/src/pages/chat/runTextConversationTurn.ts
rename to crates/agent-gui/src/pages/chat/turns/runTextConversationTurn.ts
index 5863ecdfb..7ce304106 100644
--- a/crates/agent-gui/src/pages/chat/runTextConversationTurn.ts
+++ b/crates/agent-gui/src/pages/chat/turns/runTextConversationTurn.ts
@@ -4,39 +4,42 @@ import {
   noteCompactionRound,
   type ProviderRuntimeConfig,
   shouldProtectionCompactConversation,
-} from "../../lib/chat/compaction/contextCompaction";
+} from "../../../lib/chat/compaction/contextCompaction";
 import {
   appendMessagesToConversation,
   type ConversationViewState,
-} from "../../lib/chat/conversation/conversationState";
-import type { LiveTranscriptStore } from "../../lib/chat/conversation/liveTranscriptStore";
+} from "../../../lib/chat/conversation/conversationState";
+import type { LiveTranscriptStore } from "../../../lib/chat/conversation/liveTranscriptStore";
 import type {
   ConversationHookLifecycle,
   GatewayBridgeEventController,
-} from "../../lib/chat/conversation/run";
-import type { HostedSearchBlock } from "../../lib/chat/messages/hostedSearch";
+} from "../../../lib/chat/conversation/run";
+import type { HostedSearchBlock } from "../../../lib/chat/messages/hostedSearch";
 import {
   appendTextDeltaToRound,
   collapseThinking,
   type LiveRound,
   updateLiveRound,
   upsertHostedSearchToRound,
-} from "../../lib/chat/messages/uiMessages";
-import { isAbortLikeError } from "../../lib/chat/page/chatPageHelpers";
+} from "../../../lib/chat/messages/uiMessages";
+import { isAbortLikeError } from "../../../lib/chat/page/chatPageHelpers";
 import {
   createDeferredProviderNativeWebSearchStatus,
   resolveProviderNativeWebSearchStatus,
-} from "../../lib/chat/search/providerNativeSearchStatus";
-import type { StreamDebugLogger } from "../../lib/debug/agentDebug";
-import { assistantMessageToText, streamAssistantMessage } from "../../lib/providers/llm";
-import type { ProviderId } from "../../lib/settings";
-import { buildPartialAssistantMessage, type ConversationRuntimeEntry } from "./chatPageRuntime";
-import { buildProtectionCompactionStatus } from "./compactionStatusText";
+} from "../../../lib/chat/search/providerNativeSearchStatus";
+import type { StreamDebugLogger } from "../../../lib/debug/agentDebug";
+import { assistantMessageToText, streamAssistantMessage } from "../../../lib/providers/llm";
+import type { ProviderId } from "../../../lib/settings";
 import {
   recordSilentMemoryTurnBoundary,
   type SilentMemoryExtractionModelConfig,
-} from "./silentMemoryExtraction";
-import { runSilentMemoryExtractionWithFallback } from "./silentMemoryExtractionFallback";
+} from "../memory/silentMemoryExtraction";
+import { runSilentMemoryExtractionWithFallback } from "../memory/silentMemoryExtractionFallback";
+import {
+  buildPartialAssistantMessage,
+  type ConversationRuntimeEntry,
+} from "../runtime/chatPageRuntime";
+import { buildProtectionCompactionStatus } from "../runtime/compactionStatusText";
 
 type RuntimeModel = {
   api: AssistantMessage["api"];
diff --git a/crates/agent-gui/src/pages/chat/chatScrollViewport.ts b/crates/agent-gui/src/pages/chat/utils/chatScrollViewport.ts
similarity index 100%
rename from crates/agent-gui/src/pages/chat/chatScrollViewport.ts
rename to crates/agent-gui/src/pages/chat/utils/chatScrollViewport.ts
diff --git a/crates/agent-gui/test/chat/chat-page-runtime-cache.test.mjs b/crates/agent-gui/test/chat/chat-page-runtime-cache.test.mjs
index 8969b6652..247e74cfd 100644
--- a/crates/agent-gui/test/chat/chat-page-runtime-cache.test.mjs
+++ b/crates/agent-gui/test/chat/chat-page-runtime-cache.test.mjs
@@ -21,7 +21,7 @@ const loader = createTsModuleLoader({
 const {
   pruneIdleConversationRuntimeCaches,
   setConversationRuntimeCacheEntry,
-} = loader.loadModule("src/pages/chat/chatPageRuntime.ts");
+} = loader.loadModule("src/pages/chat/runtime/chatPageRuntime.ts");
 
 function createEntry(id, options = {}) {
   return {
diff --git a/crates/agent-gui/test/chat/conversation-title-job.test.mjs b/crates/agent-gui/test/chat/conversation-title-job.test.mjs
index 9926d075a..4c3c54151 100644
--- a/crates/agent-gui/test/chat/conversation-title-job.test.mjs
+++ b/crates/agent-gui/test/chat/conversation-title-job.test.mjs
@@ -18,12 +18,12 @@ test("conversation title job disables thinking, caching, and native web search",
   };
   const loader = createTsModuleLoader({
     mocks: {
-      "../../lib/providers/llm": llmMock,
+      "../../../lib/providers/llm": llmMock,
       [llmModulePath]: llmMock,
     },
   });
   const { buildConversationTitleRuntime, startConversationTitleJob } = loader.loadModule(
-    "src/pages/chat/conversationTitleJob.ts",
+    "src/pages/chat/runtime/conversationTitleJob.ts",
   );
   const runtime = {
     baseUrl: "https://example.test",
diff --git a/crates/agent-gui/test/chat/history-list-scope.test.mjs b/crates/agent-gui/test/chat/history-list-scope.test.mjs
index d46179844..f00ff4a9b 100644
--- a/crates/agent-gui/test/chat/history-list-scope.test.mjs
+++ b/crates/agent-gui/test/chat/history-list-scope.test.mjs
@@ -4,7 +4,7 @@ import test from "node:test";
 import { createTsModuleLoader } from "../helpers/load-ts-module.mjs";
 
 const loader = createTsModuleLoader();
-const historyListScope = loader.loadModule("src/pages/chat/historyListScope.ts");
+const historyListScope = loader.loadModule("src/pages/chat/history/historyListScope.ts");
 
 function summary(id, cwd, updatedAt = 1) {
   return {
diff --git a/crates/agent-gui/test/chat/model-selection.test.mjs b/crates/agent-gui/test/chat/model-selection.test.mjs
index dbd627a4e..e5f28be6f 100644
--- a/crates/agent-gui/test/chat/model-selection.test.mjs
+++ b/crates/agent-gui/test/chat/model-selection.test.mjs
@@ -4,7 +4,7 @@ import { createTsModuleLoader } from "../helpers/load-ts-module.mjs";
 
 const loader = createTsModuleLoader();
 const settings = loader.loadModule("src/lib/settings/index.ts");
-const modelSelection = loader.loadModule("src/pages/chat/modelSelection.ts");
+const modelSelection = loader.loadModule("src/pages/chat/runtime/modelSelection.ts");
 
 function provider(overrides = {}) {
   const id = overrides.id ?? "provider-1";
diff --git a/crates/agent-gui/test/chat/scroll-viewport.test.mjs b/crates/agent-gui/test/chat/scroll-viewport.test.mjs
index 423c53301..d57f63dd5 100644
--- a/crates/agent-gui/test/chat/scroll-viewport.test.mjs
+++ b/crates/agent-gui/test/chat/scroll-viewport.test.mjs
@@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url";
 import { createTsModuleLoader } from "../helpers/load-ts-module.mjs";
 
 const rootDir = path.resolve(fileURLToPath(new URL("../..", import.meta.url)));
-const modulePath = path.join(rootDir, "src/pages/chat/chatScrollViewport.ts");
+const modulePath = path.join(rootDir, "src/pages/chat/utils/chatScrollViewport.ts");
 const {
   CHAT_SCROLL_VIEWPORT_SELECTOR,
   resolveNearestScrollViewport,
diff --git a/crates/agent-gui/test/chat/silent-memory-extraction-fallback.test.mjs b/crates/agent-gui/test/chat/silent-memory-extraction-fallback.test.mjs
index 9040ed916..2380edc2f 100644
--- a/crates/agent-gui/test/chat/silent-memory-extraction-fallback.test.mjs
+++ b/crates/agent-gui/test/chat/silent-memory-extraction-fallback.test.mjs
@@ -41,7 +41,7 @@ test("silent memory extraction fallback clears failed configured model and retri
   const calls = [];
   const loader = createTsModuleLoader({
     mocks: {
-      [rootPath("src/pages/chat/silentMemoryExtraction.ts")]: {
+      [rootPath("src/pages/chat/memory/silentMemoryExtraction.ts")]: {
         async runSilentMemoryExtraction(params) {
           calls.push(params.model);
           if (params.model === "configured-model") {
@@ -56,7 +56,7 @@ test("silent memory extraction fallback clears failed configured model and retri
     },
   });
   const { runSilentMemoryExtractionWithFallback } = loader.loadModule(
-    "src/pages/chat/silentMemoryExtractionFallback.ts",
+    "src/pages/chat/memory/silentMemoryExtractionFallback.ts",
   );
   const failedModels = [];
 
@@ -81,7 +81,7 @@ test("silent memory extraction fallback does not retry or clear on abort", async
   const calls = [];
   const loader = createTsModuleLoader({
     mocks: {
-      [rootPath("src/pages/chat/silentMemoryExtraction.ts")]: {
+      [rootPath("src/pages/chat/memory/silentMemoryExtraction.ts")]: {
         async runSilentMemoryExtraction(params) {
           calls.push(params.model);
           return { ok: false, emittedMessages: [], aborted: true };
@@ -90,7 +90,7 @@ test("silent memory extraction fallback does not retry or clear on abort", async
     },
   });
   const { runSilentMemoryExtractionWithFallback } = loader.loadModule(
-    "src/pages/chat/silentMemoryExtractionFallback.ts",
+    "src/pages/chat/memory/silentMemoryExtractionFallback.ts",
   );
   const failedModels = [];
 
diff --git a/crates/agent-gui/test/chat/silent-memory-extraction.test.mjs b/crates/agent-gui/test/chat/silent-memory-extraction.test.mjs
index e6c5166cf..5f455b103 100644
--- a/crates/agent-gui/test/chat/silent-memory-extraction.test.mjs
+++ b/crates/agent-gui/test/chat/silent-memory-extraction.test.mjs
@@ -148,7 +148,7 @@ test("silent memory extraction builds a hidden MemoryManager-only request", asyn
     },
   });
   const { runSilentMemoryExtraction } = loader.loadModule(
-    "src/pages/chat/silentMemoryExtraction.ts",
+    "src/pages/chat/memory/silentMemoryExtraction.ts",
   );
   const visibleMessages = [
     createUser("请记住：以后默认用陕西腔跟我交流。"),
@@ -267,7 +267,7 @@ test("silent memory extraction does not skip short confirmations for unreviewed
     },
   });
   const { runSilentMemoryExtraction } = loader.loadModule(
-    "src/pages/chat/silentMemoryExtraction.ts",
+    "src/pages/chat/memory/silentMemoryExtraction.ts",
   );
 
   const result = await runSilentMemoryExtraction({
@@ -347,7 +347,7 @@ test("silent memory extraction applies a validated block-3 plan with extractor w
     },
   });
   const { runSilentMemoryExtraction } = loader.loadModule(
-    "src/pages/chat/silentMemoryExtraction.ts",
+    "src/pages/chat/memory/silentMemoryExtraction.ts",
   );
 
   const result = await runSilentMemoryExtraction({
@@ -451,7 +451,7 @@ test("silent memory extraction applies accept plans for confirmed unreviewed mem
     },
   });
   const { runSilentMemoryExtraction } = loader.loadModule(
-    "src/pages/chat/silentMemoryExtraction.ts",
+    "src/pages/chat/memory/silentMemoryExtraction.ts",
   );
 
   const result = await runSilentMemoryExtraction({
@@ -544,7 +544,7 @@ test("silent memory extraction forwards model reply and MemoryManager traces as
     },
   });
   const { runSilentMemoryExtraction } = loader.loadModule(
-    "src/pages/chat/silentMemoryExtraction.ts",
+    "src/pages/chat/memory/silentMemoryExtraction.ts",
   );
 
   await runSilentMemoryExtraction({
@@ -656,7 +656,7 @@ test("silent memory extraction does not expose four-block protocol text through
     },
   });
   const { runSilentMemoryExtraction } = loader.loadModule(
-    "src/pages/chat/silentMemoryExtraction.ts",
+    "src/pages/chat/memory/silentMemoryExtraction.ts",
   );
 
   const result = await runSilentMemoryExtraction({
@@ -787,7 +787,7 @@ test("agent mode runs silent extraction hidden in background without delaying do
           return {};
         },
       },
-      [rootPath("src/pages/chat/silentMemoryExtraction.ts")]: {
+      [rootPath("src/pages/chat/memory/silentMemoryExtraction.ts")]: {
         recordSilentMemoryTurnBoundary() {},
         async runSilentMemoryExtraction(params) {
           capturedVisibleEvents = params.visibleEvents;
@@ -809,7 +809,7 @@ test("agent mode runs silent extraction hidden in background without delaying do
     "src/lib/chat/conversation/conversationState.ts",
   );
   const { runAgentConversationTurn } = loader.loadModule(
-    "src/pages/chat/runAgentConversationTurn.ts",
+    "src/pages/chat/turns/runAgentConversationTurn.ts",
   );
 
   let state = createConversationStateFromContext({
@@ -1049,7 +1049,7 @@ test("agent dev mode shows silent extraction and delays done until extraction fi
           return {};
         },
       },
-      [rootPath("src/pages/chat/silentMemoryExtraction.ts")]: {
+      [rootPath("src/pages/chat/memory/silentMemoryExtraction.ts")]: {
         recordSilentMemoryTurnBoundary() {},
         async runSilentMemoryExtraction(params) {
           capturedVisibleEvents = params.visibleEvents;
@@ -1090,7 +1090,7 @@ test("agent dev mode shows silent extraction and delays done until extraction fi
     "src/lib/chat/conversation/conversationState.ts",
   );
   const { runAgentConversationTurn } = loader.loadModule(
-    "src/pages/chat/runAgentConversationTurn.ts",
+    "src/pages/chat/turns/runAgentConversationTurn.ts",
   );
 
   let state = createConversationStateFromContext({
@@ -1306,7 +1306,7 @@ test("text mode runs silent extraction hidden in background without delaying don
           return { shouldCompact: false, reason: "within-budget" };
         },
       },
-      [rootPath("src/pages/chat/silentMemoryExtraction.ts")]: {
+      [rootPath("src/pages/chat/memory/silentMemoryExtraction.ts")]: {
         recordSilentMemoryTurnBoundary() {},
         async runSilentMemoryExtraction(params) {
           capturedVisibleEvents = params.visibleEvents;
@@ -1328,7 +1328,7 @@ test("text mode runs silent extraction hidden in background without delaying don
     "src/lib/chat/conversation/conversationState.ts",
   );
   const { runTextConversationTurn } = loader.loadModule(
-    "src/pages/chat/runTextConversationTurn.ts",
+    "src/pages/chat/turns/runTextConversationTurn.ts",
   );
 
   let state = createConversationStateFromContext({
diff --git a/crates/agent-gui/test/chat/silent-memory-throttle.test.mjs b/crates/agent-gui/test/chat/silent-memory-throttle.test.mjs
index b7d031929..aaaaab1f3 100644
--- a/crates/agent-gui/test/chat/silent-memory-throttle.test.mjs
+++ b/crates/agent-gui/test/chat/silent-memory-throttle.test.mjs
@@ -4,7 +4,7 @@ import { createTsModuleLoader } from "../helpers/load-ts-module.mjs";
 
 const loader = createTsModuleLoader();
 const { silentMemorySkipReason, recordSilentMemoryTurnBoundary } = loader.loadModule(
-  "src/pages/chat/silentMemoryExtraction.ts",
+  "src/pages/chat/memory/silentMemoryExtraction.ts",
 );
 
 test("empty user text is skipped with empty-user-message reason", () => {

From 4e393ed6bc7f228ae633632dacffc93eec764734 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 10:16:08 +0800
Subject: [PATCH 26/28] feat(gateway): add settings sync loading state

---
 crates/agent-gateway/web/src/App.tsx          |   3 +-
 crates/agent-gateway/web/src/i18n/config.ts   |   2 +
 .../web/src/pages/SettingsSyncLoading.tsx     |  39 ++++
 crates/agent-gateway/web/src/styles.css       | 186 +++++++++++++++++-
 4 files changed, 227 insertions(+), 3 deletions(-)
 create mode 100644 crates/agent-gateway/web/src/pages/SettingsSyncLoading.tsx

diff --git a/crates/agent-gateway/web/src/App.tsx b/crates/agent-gateway/web/src/App.tsx
index 97297cb31..b61a6a932 100644
--- a/crates/agent-gateway/web/src/App.tsx
+++ b/crates/agent-gateway/web/src/App.tsx
@@ -183,6 +183,7 @@ import { GatewayTranscript } from "./components/GatewayTranscript";
 import { HistoryShareModal } from "./components/chat/HistoryShareModal";
 import { useGatewayScrollAffordance } from "./components/useGatewayScrollAffordance";
 import { LoginPage } from "./pages/LoginPage";
+import { SettingsSyncLoading } from "./pages/SettingsSyncLoading";
 import { SharedHistoryPage } from "./pages/SharedHistoryPage";
 import { WorkdirPickerModal } from "./pages/settings/WorkdirPickerModal";
 import {
@@ -6620,7 +6621,7 @@ export default function App() {
           <main className="gateway-main-shell">
             <div className="gateway-main-backdrop" />
             <div className="gateway-chat-frame flex items-center justify-center">
-              <div className="text-sm text-muted-foreground">正在同步桌面端设置...</div>
+              <SettingsSyncLoading locale={settings.locale} />
             </div>
           </main>
         </div>
diff --git a/crates/agent-gateway/web/src/i18n/config.ts b/crates/agent-gateway/web/src/i18n/config.ts
index b8002da75..616bc5b7b 100644
--- a/crates/agent-gateway/web/src/i18n/config.ts
+++ b/crates/agent-gateway/web/src/i18n/config.ts
@@ -85,6 +85,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "chat.runtime.tunnelWebDisabled": "Remote 设置未允许 WebUI 内网穿透",
     "chat.runtime.tunnelRemoteOffline": "Remote Gateway 未连接",
     "chat.runtime.tunnelSettingsSyncing": "正在同步桌面端设置",
+    "chat.runtime.settingsSyncTitle": "正在同步桌面端设置",
     "chat.runtime.reasoning": "思考程度",
     "chat.emptyRound": "（无回复）",
     "chat.inputHint": "输入消息，@ 引用文件，Enter 发送，Shift+Enter 换行",
@@ -1493,6 +1494,7 @@ export const translations: Record<Locale, Record<string, string>> = {
     "chat.runtime.tunnelWebDisabled": "Remote WebUI tunnels are not allowed",
     "chat.runtime.tunnelRemoteOffline": "Remote Gateway is offline",
     "chat.runtime.tunnelSettingsSyncing": "Syncing desktop settings",
+    "chat.runtime.settingsSyncTitle": "Syncing desktop settings",
     "chat.runtime.reasoning": "Thinking effort",
     "chat.emptyRound": "(No reply)",
     "chat.inputHint": "Type a message, @ to mention files, Enter to send, Shift+Enter for newline",
diff --git a/crates/agent-gateway/web/src/pages/SettingsSyncLoading.tsx b/crates/agent-gateway/web/src/pages/SettingsSyncLoading.tsx
new file mode 100644
index 000000000..84b07771c
--- /dev/null
+++ b/crates/agent-gateway/web/src/pages/SettingsSyncLoading.tsx
@@ -0,0 +1,39 @@
+import { type Locale, t as translate } from "../i18n";
+
+type SettingsSyncLoadingProps = {
+  locale: Locale;
+};
+
+export function SettingsSyncLoading({ locale }: SettingsSyncLoadingProps) {
+  return (
+    <div className="sync-loading sync-loading-entrance" role="status" aria-live="polite">
+      <div className="sync-loading-orb sync-loading-orb--1" aria-hidden="true" />
+      <div className="sync-loading-orb sync-loading-orb--2" aria-hidden="true" />
+
+      <div className="sync-loading-stage">
+        <span className="sync-loading-pulse" aria-hidden="true" />
+        <span className="sync-loading-pulse sync-loading-pulse--2" aria-hidden="true" />
+        <div className="sync-loading-icon">
+          <img
+            src="/favicon.svg"
+            alt=""
+            width={60}
+            height={60}
+            className="sync-loading-logo"
+            draggable={false}
+          />
+        </div>
+      </div>
+
+      <strong className="sync-loading-title">
+        {translate("chat.runtime.settingsSyncTitle", locale)}
+      </strong>
+
+      <span className="sync-loading-dots" aria-hidden="true">
+        <i />
+        <i />
+        <i />
+      </span>
+    </div>
+  );
+}
diff --git a/crates/agent-gateway/web/src/styles.css b/crates/agent-gateway/web/src/styles.css
index c0211eb76..e83d93f32 100644
--- a/crates/agent-gateway/web/src/styles.css
+++ b/crates/agent-gateway/web/src/styles.css
@@ -1649,6 +1649,182 @@ html[data-liveagent-webui="gateway"] .external-link-modal-overlay[data-state="cl
   }
 }
 
+/* ── Settings sync loading ── */
+
+.sync-loading {
+  position: relative;
+  z-index: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 18px;
+  padding: 38px 46px 32px;
+  border-radius: 24px;
+  border: 1px solid hsl(0 0% 100% / 0.7);
+  background: hsl(0 0% 100% / 0.55);
+  -webkit-backdrop-filter: blur(40px) saturate(1.6);
+  backdrop-filter: blur(40px) saturate(1.6);
+  box-shadow:
+    0 0 0 1px hsl(0 0% 0% / 0.03),
+    0 1px 3px hsl(0 0% 0% / 0.03),
+    0 8px 30px hsl(0 0% 0% / 0.05),
+    0 30px 80px hsl(0 0% 0% / 0.04);
+  overflow: hidden;
+}
+
+.dark .sync-loading {
+  border-color: hsl(0 0% 100% / 0.08);
+  background: hsl(224 20% 12% / 0.6);
+  box-shadow:
+    0 0 0 1px hsl(0 0% 100% / 0.04),
+    0 1px 3px hsl(0 0% 0% / 0.15),
+    0 8px 30px hsl(0 0% 0% / 0.3),
+    0 30px 80px hsl(0 0% 0% / 0.25);
+}
+
+.sync-loading-orb {
+  position: absolute;
+  pointer-events: none;
+  z-index: -1;
+  border-radius: 50%;
+  filter: blur(60px);
+  opacity: 0.55;
+  will-change: transform;
+}
+
+.sync-loading-orb--1 {
+  width: 200px;
+  height: 200px;
+  top: -80px;
+  left: -64px;
+  background: hsl(210 100% 86% / 0.55);
+  animation: loginOrbFloat 18s ease-in-out infinite;
+}
+
+.sync-loading-orb--2 {
+  width: 170px;
+  height: 170px;
+  bottom: -72px;
+  right: -54px;
+  background: hsl(250 70% 86% / 0.45);
+  animation: loginOrbFloat 22s ease-in-out infinite reverse;
+}
+
+.dark .sync-loading-orb--1 {
+  background: hsl(210 80% 32% / 0.25);
+}
+
+.dark .sync-loading-orb--2 {
+  background: hsl(250 60% 32% / 0.2);
+}
+
+/* Icon + soft emanating pulses (no rotation) */
+.sync-loading-stage {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  margin-top: 2px;
+}
+
+.sync-loading-pulse {
+  position: absolute;
+  inset: 0;
+  border-radius: 18px;
+  border: 1.5px solid hsl(var(--primary) / 0.4);
+  opacity: 0;
+  will-change: transform, opacity;
+  animation: syncPulse 2.8s cubic-bezier(0.16, 1, 0.3, 1) infinite;
+}
+
+.sync-loading-pulse--2 {
+  animation-delay: 1.4s;
+}
+
+.sync-loading-icon {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  will-change: transform;
+  animation: syncIconBreathe 2.8s ease-in-out infinite;
+}
+
+.sync-loading-logo {
+  display: block;
+  width: 60px;
+  height: 60px;
+  border-radius: 16px;
+  filter: drop-shadow(0 6px 14px hsl(206 45% 28% / 0.18));
+  user-select: none;
+}
+
+.sync-loading-title {
+  font-size: 14px;
+  font-weight: 600;
+  letter-spacing: -0.01em;
+  color: hsl(var(--foreground));
+}
+
+/* Three bouncing dots */
+.sync-loading-dots {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  height: 8px;
+}
+
+.sync-loading-dots i {
+  width: 7px;
+  height: 7px;
+  border-radius: 50%;
+  background: hsl(var(--primary));
+  will-change: transform, opacity;
+  animation: syncDotBounce 1.2s ease-in-out infinite;
+}
+
+.sync-loading-dots i:nth-child(2) {
+  animation-delay: 0.16s;
+}
+
+.sync-loading-dots i:nth-child(3) {
+  animation-delay: 0.32s;
+}
+
+.sync-loading-entrance {
+  animation: loginSlideUp 0.55s cubic-bezier(0.16, 1, 0.3, 1) both;
+}
+
+@keyframes syncIconBreathe {
+  0%, 100% { transform: scale(1); }
+  50% { transform: scale(1.05); }
+}
+
+@keyframes syncPulse {
+  0% { transform: scale(0.9); opacity: 0; }
+  35% { opacity: 0.45; }
+  100% { transform: scale(1.85); opacity: 0; }
+}
+
+@keyframes syncDotBounce {
+  0%, 80%, 100% { transform: translateY(0); opacity: 0.35; }
+  40% { transform: translateY(-7px); opacity: 1; }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .sync-loading-entrance,
+  .sync-loading-icon,
+  .sync-loading-orb,
+  .sync-loading-pulse,
+  .sync-loading-dots i {
+    animation: none;
+  }
+}
+
 @media (hover: none), (pointer: coarse) {
   .login-feat:hover {
     background: hsl(0 0% 100% / 0.5);
@@ -2516,9 +2692,15 @@ html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport:
   }
 
   .login-shell {
-    padding: 16px;
-    align-content: start;
+    /* Center the card vertically on phones so it isn't pinned to the very top
+       with a large empty gap below. `safe center` falls back to top-alignment
+       only if the card ever grows taller than the viewport, avoiding clipping. */
+    padding: 24px 16px;
+    align-content: safe center;
     padding-top: max(env(safe-area-inset-top, 0px), 24px);
+    padding-bottom: max(env(safe-area-inset-bottom, 0px), 24px);
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
   }
 
   .login-container {

From 1b83d84541da31c2dfe43db10ad52b29571095e2 Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 11:51:34 +0800
Subject: [PATCH 27/28] fix(webui): fade mobile project tools panel

---
 .../project-tools/ProjectToolsPanel.tsx       |  6 +++-
 crates/agent-gateway/web/src/styles.css       | 29 +++++++++++++------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
index d093a4594..00fc3b1c1 100644
--- a/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/ProjectToolsPanel.tsx
@@ -442,7 +442,11 @@ export function ProjectToolsPanel(props: ProjectToolsPanelProps) {
     "--project-tools-panel-width": panelWidthStyleValue(panelStyleWidth),
   } as CSSProperties;
   const effectiveWidthCollapsed = !isOpen && collapseImmediately ? true : widthCollapsed;
-  const effectiveShouldRenderContent = !isOpen && collapseImmediately ? false : shouldRenderContent;
+  const effectiveShouldRenderContent = isOpen
+    ? true
+    : collapseImmediately
+      ? false
+      : shouldRenderContent;
   const isControlled = externalSessions !== undefined;
   const localSessions = useMemo(
     () =>
diff --git a/crates/agent-gateway/web/src/styles.css b/crates/agent-gateway/web/src/styles.css
index e83d93f32..8223722d4 100644
--- a/crates/agent-gateway/web/src/styles.css
+++ b/crates/agent-gateway/web/src/styles.css
@@ -2114,29 +2114,34 @@ html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport:
     max-height: none;
     border: 0;
     border-radius: 0;
-    /* This panel is a full-screen (inset:0) mobile sheet. A translucent
+    /* This panel is a full-screen (inset:0) mobile surface. A translucent
        background plus `backdrop-filter: blur()` means the whole viewport behind
-       it is re-sampled and blurred every frame — and because the React open
-       animation also fades opacity 0→1 and slides translateY, the panel is
+       it is re-sampled and blurred every frame - and because the React open
+       animation also fades opacity 0->1 and moves the panel, the panel is
        see-through *and* blurring mid-transition, before its content paints.
        That translucent, blurred, content-less frame is the flash. An opaque
-       sheet with no backdrop blur covers everything it covers anyway, so drop
-       both and slide only. */
+       surface with no backdrop blur covers everything it covers anyway, so
+       keep the mobile transition to the same simple fade used by settings. */
     background: hsl(var(--background));
     box-shadow: none;
-    opacity: 1 !important;
+    opacity: 0 !important;
     visibility: hidden;
     transition:
-      transform 200ms ease,
-      visibility 0s linear 200ms !important;
+      opacity 220ms ease,
+      visibility 0s linear 220ms !important;
+    will-change: opacity;
+    contain: layout style;
+    translate: 0 0 !important;
+    transform: none !important;
     -webkit-backface-visibility: hidden;
     backface-visibility: hidden;
   }
 
   html[data-liveagent-webui="gateway"] .project-tools-panel[data-state="open"] {
+    opacity: 1 !important;
     visibility: visible;
     transition:
-      transform 200ms ease,
+      opacity 220ms ease,
       visibility 0s linear 0s !important;
   }
 
@@ -2148,6 +2153,12 @@ html[data-liveagent-webui="gateway"] .project-terminal-viewport .xterm-viewport:
 
   html[data-liveagent-webui="gateway"] .project-tools-panel-inner {
     min-width: 0;
+    opacity: 1 !important;
+    translate: 0 0 !important;
+    transform: translate3d(0, 0, 0) !important;
+    transition: none !important;
+    -webkit-backface-visibility: hidden;
+    backface-visibility: hidden;
   }
 
   html[data-liveagent-webui="gateway"] .project-tools-panel-handle {

From 3f0a9dc4ae5cd33876c9309fb9d4110326ee929f Mon Sep 17 00:00:00 2001
From: su-fen <715041@qq.com>
Date: Mon, 15 Jun 2026 12:23:50 +0800
Subject: [PATCH 28/28] test(webui): use gateway loader for web module tests

---
 crates/agent-gateway/web/test/chatUi-agent.test.mjs         | 6 +++---
 crates/agent-gateway/web/test/historyListScope.test.mjs     | 4 ++--
 .../agent-gateway/web/test/liveConversationCommit.test.mjs  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/agent-gateway/web/test/chatUi-agent.test.mjs b/crates/agent-gateway/web/test/chatUi-agent.test.mjs
index 3d1c856dd..05b5a5cc8 100644
--- a/crates/agent-gateway/web/test/chatUi-agent.test.mjs
+++ b/crates/agent-gateway/web/test/chatUi-agent.test.mjs
@@ -2,14 +2,14 @@ import assert from "node:assert/strict";
 import test from "node:test";
 import { fileURLToPath } from "node:url";
 
-import { createTsModuleLoader } from "../../../agent-gui/test/helpers/load-ts-module.mjs";
+import { createWebModuleLoader } from "../../test/helpers/load-web-module.mjs";
 
 const rootDir = fileURLToPath(new URL("../", import.meta.url));
-const uiMessagesLoader = createTsModuleLoader({ rootDir });
+const uiMessagesLoader = createWebModuleLoader({ rootDir });
 const uiMessages = uiMessagesLoader.loadModule("src/lib/chat/uiMessages.ts");
 const hostedSearch = uiMessagesLoader.loadModule("src/lib/chat/hostedSearch.ts");
 const uploadedImagePreview = uiMessagesLoader.loadModule("src/lib/chat/uploadedImagePreview.ts");
-const loader = createTsModuleLoader({
+const loader = createWebModuleLoader({
   rootDir,
   mocks: {
     "@/lib/chat/chatPageHelpers": {
diff --git a/crates/agent-gateway/web/test/historyListScope.test.mjs b/crates/agent-gateway/web/test/historyListScope.test.mjs
index 786abe181..88ef425b4 100644
--- a/crates/agent-gateway/web/test/historyListScope.test.mjs
+++ b/crates/agent-gateway/web/test/historyListScope.test.mjs
@@ -2,9 +2,9 @@ import assert from "node:assert/strict";
 import test from "node:test";
 import { fileURLToPath } from "node:url";
 
-import { createTsModuleLoader } from "../../../agent-gui/test/helpers/load-ts-module.mjs";
+import { createWebModuleLoader } from "../../test/helpers/load-web-module.mjs";
 
-const loader = createTsModuleLoader({
+const loader = createWebModuleLoader({
   rootDir: fileURLToPath(new URL("../", import.meta.url)),
 });
 const historyListScope = loader.loadModule("src/lib/chat/historyListScope.ts");
diff --git a/crates/agent-gateway/web/test/liveConversationCommit.test.mjs b/crates/agent-gateway/web/test/liveConversationCommit.test.mjs
index a86b8f25b..408fcefdc 100644
--- a/crates/agent-gateway/web/test/liveConversationCommit.test.mjs
+++ b/crates/agent-gateway/web/test/liveConversationCommit.test.mjs
@@ -2,9 +2,9 @@ import assert from "node:assert/strict";
 import test from "node:test";
 import { fileURLToPath } from "node:url";
 
-import { createTsModuleLoader } from "../../../agent-gui/test/helpers/load-ts-module.mjs";
+import { createWebModuleLoader } from "../../test/helpers/load-web-module.mjs";
 
-const loader = createTsModuleLoader({
+const loader = createWebModuleLoader({
   rootDir: fileURLToPath(new URL("../", import.meta.url)),
 });
 const liveConversationCommit = loader.loadModule("src/lib/liveConversationCommit.ts");