test: share the global default proxy settings harness

The peer-window case and the multi-instance cleanup case were mounting
the same JSDOM fixture twice.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

README.ja-JP.md

@@ -130,7 +130,6 @@ Catty Agent にサーバーの健全性チェックを依頼すると、適切
 - **分割ペイン** — 水平・垂直分割でマルチタスク
 - **セッション管理** — 複数の接続を並行して扱う
 - **インライン画像** — リモートプログラムが出力する Kitty グラフィックス、SIXEL、iTerm インライン画像を描画
-- **アーカイブショートカット** — Linux セッションでは、出力された `.tar`、`.tar.gz`/`.tgz`、`.tar.bz2`/`.tbz2`、`.tar.xz`、`.zip` の名前を Ctrl/Cmd+クリックすると、アーカイブの絶対パスを含む展開コマンドがカーソル位置に挿入されます（入力済みの文字は残ります）。Enter で実行します。カレントディレクトリからの相対名にはディレクトリ追跡（OSC 7、ツールバーの Configure directory tracking）が必要です。絶対パスは常に対象です。Windows、WSL、macOS のセッションは対象外です。
 
 ### 📁 SFTP + 内蔵エディタ
 - **ファイル作業** — ドラッグ＆ドロップでアップロード/ダウンロード

README.md

@@ -87,7 +87,6 @@ Watch Catty Agent orchestrate a Docker Swarm cluster across two servers in one c
   - [Split Terminals](#split-terminals)
 - [Supported Distros](#supported-distros)
 - [Getting Started](#getting-started)
-  - [Open a local terminal from the command line](#open-a-local-terminal-from-the-command-line)
 - [Build & Package](#build--package)
 - [Tech Stack](#tech-stack)
 - [Contributing](#contributing)
@@ -133,7 +132,6 @@ If you regularly work with a fleet of servers, Netcatty is built for speed and f
 - **Session management** — run multiple connections side-by-side
 - **Save current screen** — right-click a terminal to save the visible final text, without replaying keystrokes or overwritten output; scroll first to save an earlier screen.
 - **Inline images** — render Kitty graphics, SIXEL and iTerm inline images from remote programs
-- **Archive shortcuts** — on Linux sessions, Ctrl/Cmd+click a printed `.tar`, `.tar.gz`/`.tgz`, `.tar.bz2`/`.tbz2`, `.tar.xz` or `.zip` name to fill an extraction command with the archive's absolute path into the prompt (kept next to any typed text); press Enter to run it. Names relative to the current directory need directory tracking (OSC 7, see the toolbar's Configure directory tracking); absolute paths always work. Windows, WSL, and macOS sessions are excluded.
 
 ### 📁 SFTP + Built-in Editor
 - **File workflows** — drag & drop uploads/downloads
@@ -243,24 +241,6 @@ application and integration are complete.
 
 > **macOS Users:** Current releases are expected to be code-signed and notarized. If Gatekeeper still warns, make sure you downloaded the latest official build from GitHub Releases.
 
-<a name="open-a-local-terminal-from-the-command-line"></a>
-### Open a local terminal from the command line
-
-`--open-terminal-path <dir>` opens a local terminal in that folder. `--open-terminal-shell <id-or-path>` selects the shell: a discovered id such as `pwsh`, `cmd`, or `wsl-ubuntu`, or a path to a shell executable. Either flag is enough. A shell alone opens a local tab in the default directory. A path alone uses the configured local shell. If Netcatty is already running, the tab opens in that window.
-
-Windows needs an extra `--` so Electron forwards the flags:
-
-```bat
-Netcatty.exe -- --open-terminal-shell=pwsh --open-terminal-path="D:\\proj"
-```
-
-On macOS, start a new instance with `open`, or run the binary directly:
-
-```bash
-open -n -a Netcatty --args --open-terminal-shell=zsh --open-terminal-path="$HOME/proj"
-/Applications/Netcatty.app/Contents/MacOS/Netcatty --open-terminal-shell=zsh --open-terminal-path="$HOME/proj"
-```
-
 ### Scoop (Windows x64, community-maintained)
 
 With [Scoop](https://scoop.sh/) installed, you can install Netcatty from the community-maintained [lemon bucket](https://github.com/hoilc/scoop-lemon/blob/master/bucket/netcatty.json), which downloads the installer from Netcatty's official GitHub Releases:

README.zh-CN.md

@@ -130,7 +130,6 @@
 - **分屏** —— 水平/垂直分割，多任务并行
 - **多会话管理** —— 多连接并排处理
 - **内联图片** —— 直接渲染远端程序输出的 Kitty 图形、SIXEL 与 iTerm 内联图片
-- **压缩包快捷填充** —— 在 Linux 会话里，按住 Ctrl/Cmd 点击输出中的 `.tar`、`.tar.gz`/`.tgz`、`.tar.bz2`/`.tbz2`、`.tar.xz` 或 `.zip` 文件名，会在光标处填入带绝对路径的解压命令（保留已经输入的文字）；按 Enter 才会执行。相对当前目录的文件名需要目录追踪（OSC 7，见工具栏「配置目录追踪」）；绝对路径始终可点。Windows、WSL 与 macOS 会话不在范围内。
 
 ### 📁 SFTP + 内置编辑器
 - **文件工作流** —— 拖拽上传/下载更直观

README.zh-TW.md

@@ -130,7 +130,6 @@
 - **分割窗格** —— 水平與垂直分割，方便多工
 - **工作階段管理** —— 多條連線並排處理
 - **內嵌圖片** —— 直接顯示遠端程式輸出的 Kitty 圖形、SIXEL 與 iTerm 內嵌圖片
-- **壓縮檔捷徑** —— 在 Linux 工作階段的終端機裡，按住 Ctrl/Cmd 點選輸出中的 `.tar`、`.tar.gz`/`.tgz`、`.tar.bz2`/`.tbz2`、`.tar.xz` 或 `.zip` 檔名，會在游標處填入含絕對路徑的解壓縮命令（保留已輸入的文字）；按 Enter 才會執行。相對於目前目錄的檔名需要目錄追蹤（OSC 7，見工具列「設定目錄追蹤」）；絕對路徑一律可點。Windows、WSL 與 macOS 工作階段不支援。
 
 ### 📁 SFTP + 內建編輯器
 - **檔案工作流** —— 拖放上傳／下載

application/app/AppHandlers.ts

@@ -534,10 +534,9 @@ async function captureCtxInheritedCwd(getCtx: AppContextGetter, sessionId: strin
   const source = sessions?.find((s: { id: string }) => s.id === sessionId);
   if (!source) return undefined;
 
-  // Freshest cwd: the live value tracked in terminal state (OSC 7 or the
-  // post-command probe, including local shells). lastCwd on the session object
-  // is only the startup snapshot. Falls through to the SSH probe / lastCwd
-  // when absent.
+  // Freshest cwd: the live OSC 7 value tracked in terminal state (the only
+  // source that reflects `cd`s in a running local terminal — lastCwd is a
+  // startup snapshot). Falls through to the SSH probe / lastCwd when absent.
   const liveCwd: string | undefined = getSessionRestoreCwd?.(sessionId);
 
   const bridge = netcattyBridge?.get?.();

application/app/AppSideEffects.appLock.test.ts

@@ -15,14 +15,4 @@ test("open-terminal requests wait behind App Lock and resume after unlock", () =
   assert.match(handlerSource, /shouldDeferExternalActionWhileAppLocked/);
   assert.match(handlerSource, /kind: 'open-terminal-path'/);
   assert.match(drainSource, /_processOpenTerminalPath\(item\.payload\)/);
-
-  const processStart = source.indexOf("const _processOpenTerminalPath");
-  const processSource = source.slice(processStart, handlerStart);
-  assert.match(processSource, /handleCreateLocalTerminal\(undefined, \{ localStartDir \}\)/);
-  assert.match(processSource, /resolveShellSetting\(shellSetting, shells\)/);
-  assert.match(source, /const openTerminalQueueRef = useRef\(createOpenTerminalQueue\(\)\)/);
-  const enqueueAt = processSource.indexOf("openTerminalQueueRef.current.enqueue(() => {");
-  const createAt = processSource.indexOf("handleCreateLocalTerminal");
-  assert.ok(enqueueAt >= 0 && createAt > enqueueAt);
-  assert.match(processSource, /await ensureDiscoveredShells\(\)/);
 });

application/app/AppSideEffects.temporaryConnectionSettings.test.ts

@@ -1,21 +0,0 @@
-import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import test from "node:test";
-
-const source = readFileSync(new URL("./AppSideEffects.tsx", import.meta.url), "utf8");
-
-test("handleConnectToHost reads temporary connection settings at call time", () => {
-  assert.match(source, /const temporaryConnectionSettingsRef = useRef\(terminalSettings\)/);
-  assert.match(source, /temporaryConnectionSettingsRef\.current = terminalSettings/);
-
-  const handlerStart = source.indexOf("const handleConnectToHost = useCallback");
-  const handlerEnd = source.indexOf("const handleConnectToHostWithTabName");
-  assert.ok(handlerStart >= 0 && handlerEnd > handlerStart);
-  const handler = source.slice(handlerStart, handlerEnd);
-
-  assert.match(handler, /temporaryConnectionSettingsRef\.current/);
-  assert.match(handler, /temporaryConnectionPrepareOptions\(liveTerminalSettings\)/);
-  assert.match(handler, /terminalSettings: liveTerminalSettings/);
-  assert.doesNotMatch(handler, /terminalSettings\.temporaryConnections/);
-  assert.doesNotMatch(handler, /\[addConnectionLog, connectToHost, resolveEffectiveHost, identities, keys, discoveredShells, terminalSettings\]/);
-});

application/app/AppSideEffects.tsx

@@ -47,7 +47,6 @@ import { buildSshDeepLinkConnectionHost, buildSshDeepLinkEphemeralHost, buildSsh
 import { buildTelnetDeepLinkConnectionHost, buildTelnetDeepLinkEphemeralHostFromSaved, buildTelnetDeepLinkOpenHost, findTelnetDeepLinkHost, materializeTelnetDeepLinkMatchHost, parseTelnetDeepLink } from '../../domain/telnetDeepLink';
 import { buildJmsDeepLinkEphemeralHost, isSupportedJmsProtocol, parseJmsDeepLink } from '../../domain/jmsDeepLink';
 import { applyEphemeralHostDistroUpdate, applyEphemeralHostsUpdate, splitHostsUpdateByEphemeral } from '../../domain/ephemeralHosts';
-import { prepareConnectionHost, temporaryConnectionPrepareOptions } from '../../domain/legacyAlgorithms';
 import { resolveHostAuth } from '../../domain/sshAuth';
 import { isEncryptedCredentialPlaceholder, stripSyncPayloadEncryptedCredentials } from '../../domain/credentials';
 import {
@@ -95,7 +94,6 @@ import { resolveSnippetCommand } from '../../components/SnippetExecutionProvider
 import { isScriptSnippet } from '../../domain/snippetScript.ts';
 import { collectSnippetDeleteIds } from '../../domain/snippetSelection.ts';
 import { shouldOpenLocalTerminalOnStartup, resolveStartupLandingSetting } from '../../domain/startupLanding';
-import { createOpenTerminalQueue } from './openTerminalQueue';
 import { useAppStartupEffects } from './useAppStartupEffects';
 import { handleTrayJumpToSessionImpl, handleTrayTogglePortForwardImpl, handleTrayPanelConnectImpl, handleTrayPanelConnectRequestImpl, flushQueuedTrayPanelConnectHostsImpl, handleGlobalHotkeyKeyDownImpl, handleEscapeKeyDownImpl, handleKeyboardInteractiveSubmitImpl, handleKeyboardInteractiveCancelImpl, handlePassphraseSubmitImpl, handlePassphraseCancelImpl, handlePassphraseSkipImpl, handleFidoPromptSubmitImpl, handleFidoPromptCancelImpl, createLocalTerminalWithCurrentShellImpl, splitSessionWithCurrentShellImpl, copySessionWithCurrentShellImpl, duplicateSessionWithCurrentShellImpl, copyWorkspaceWithCurrentShellImpl, copySessionToNewWindowWithCurrentShellImpl, confirmIfBusyLocalTerminalImpl, closeTabsBatchImpl, executeHotkeyActionImpl, handleCreateLocalTerminalImpl, handleConnectToHostImpl, handleTerminalDataCaptureImpl, hasMultipleProtocolsImpl, handleHostConnectWithProtocolCheckImpl, handleProtocolSelectImpl, handleRootContextMenuImpl, markForwardedNativeShortcutEvent } from './AppHandlers';
 
@@ -1449,24 +1447,13 @@ export function AppSideEffects() {
     name,
   ), [createWorkspaceFromTargets, resolveEffectiveHost]);
 
-  // VaultView memo ignores onConnect identity, so this callback can stay
-  // closed over an older render. Temporary-connection toggles are read here,
-  // at connect time, so turning them on or off applies without a reload.
-  const temporaryConnectionSettingsRef = useRef(terminalSettings);
-  temporaryConnectionSettingsRef.current = terminalSettings;
-
   // Wrapper to connect to host with logging
   const handleConnectToHost = useCallback((host: Host, alreadyEffective = false, hidden = false) => {
-    const liveTerminalSettings = temporaryConnectionSettingsRef.current;
-    const connectionHost = prepareConnectionHost(
-      host,
-      temporaryConnectionPrepareOptions(liveTerminalSettings),
-    );
-    if (connectionHost.ephemeral) {
+    if (host.ephemeral) {
       setEphemeralHosts((previous) => {
-        const existingIndex = previous.findIndex((candidate) => candidate.id === connectionHost.id);
-        if (existingIndex < 0) return [...previous, connectionHost];
-        return previous.map((candidate, index) => index === existingIndex ? connectionHost : candidate);
+        const existingIndex = previous.findIndex((candidate) => candidate.id === host.id);
+        if (existingIndex < 0) return [...previous, host];
+        return previous.map((candidate, index) => index === existingIndex ? host : candidate);
       });
     }
     const effectiveHostResolver = alreadyEffective
@@ -1476,16 +1463,16 @@ export function AppSideEffects() {
       addConnectionLog,
       connectToHost,
       discoveredShells,
-      host: connectionHost,
+      host,
       identities,
       keys,
       resolveEffectiveHost: effectiveHostResolver,
       resolveHostAuth,
       resolveShellSetting,
       systemInfoRef,
-      terminalSettings: liveTerminalSettings,
-    }), connectionHost, hidden);
-  }, [addConnectionLog, connectToHost, resolveEffectiveHost, identities, keys, discoveredShells]);
+      terminalSettings,
+    }), host, hidden);
+  }, [addConnectionLog, connectToHost, resolveEffectiveHost, identities, keys, discoveredShells, terminalSettings]);
 
   const handleConnectToHostWithTabName = useCallback((host: Host, tabName?: string) => {
     const sessionId = handleConnectToHost(host);
@@ -1570,7 +1557,7 @@ export function AppSideEffects() {
     | { kind: 'ssh'; payload: DeepLinkPayload }
     | { kind: 'telnet'; payload: DeepLinkPayload }
     | { kind: 'jms'; payload: { url?: string } }
-    | { kind: 'open-terminal-path'; payload: { path?: string; shell?: string } }
+    | { kind: 'open-terminal-path'; payload: { path?: string } }
   >>([]);
 
   const _processSshDeepLink = useEffectEvent((payload: DeepLinkPayload) => {
@@ -1734,44 +1721,14 @@ export function AppSideEffects() {
     });
   }, [isPeerSessionWindow]);
 
-  // Shell discovery is part of this queue. A later path-only request, including
-  // one drained after App Lock, cannot create its tab ahead of an in-flight shell.
-  const openTerminalQueueRef = useRef(createOpenTerminalQueue());
-
-  const _processOpenTerminalPath = useEffectEvent((payload: { path?: string; shell?: string }) => {
+  const _processOpenTerminalPath = useEffectEvent((payload: { path?: string }) => {
     startupLaunchIntentReceivedRef.current = true;
     const localStartDir = typeof payload?.path === 'string' ? payload.path : '';
-    const shellSetting = typeof payload?.shell === 'string' ? payload.shell.trim() : '';
-    void openTerminalQueueRef.current.enqueue(() => {
-      if (!shellSetting) {
-        if (!localStartDir.trim()) return;
-        handleCreateLocalTerminal(undefined, { localStartDir });
-        return;
-      }
-
-      return (async () => {
-        const shells = await ensureDiscoveredShells();
-        const resolved = resolveShellSetting(shellSetting, shells);
-        if (!resolved?.command) {
-          if (!localStartDir.trim()) return;
-          handleCreateLocalTerminal(undefined, { localStartDir });
-          return;
-        }
-        const matchedShell = shells.find((shell) => shell.id === shellSetting);
-        handleCreateLocalTerminal(
-          {
-            command: resolved.command,
-            args: resolved.args,
-            name: matchedShell?.name,
-            icon: matchedShell?.icon,
-          },
-          localStartDir.trim() ? { localStartDir } : undefined,
-        );
-      })();
-    });
+    if (!localStartDir.trim()) return;
+    handleCreateLocalTerminal(undefined, { localStartDir });
   });
 
-  const _handleOpenTerminalPath = useEffectEvent((payload: { path?: string; shell?: string }) => {
+  const _handleOpenTerminalPath = useEffectEvent((payload: { path?: string }) => {
     if (shouldDeferExternalActionWhileAppLocked({ locked: appLockLocked })) {
       pendingDeepLinksWhileLockedRef.current.push({
         kind: 'open-terminal-path',

application/app/AppView.tsx

@@ -22,7 +22,6 @@ import { Input } from '../../components/ui/input';
 import { Label } from '../../components/ui/label';
 import { LazyLoadBoundary } from '../../components/ui/lazy-load-boundary';
 import { toast } from '../../components/ui/toast';
-import { openQuickConnectFromInput } from '../quickConnectBridge';
 import { AppHostTreeLayer } from './AppHostTreeLayer';
 import { AppHostEditorLayer } from './AppHostEditorLayer';
 import { AppPluginKeybindingHost } from './AppPluginKeybindingHost';
@@ -377,14 +376,6 @@ function AppViewInner({ domains }: AppViewProps) {
     appendHostToWorkspace(workspaceId, resolveWorkspaceAppendHost(host), rootDir);
   }, [appendHostToWorkspace, hosts, resolveWorkspaceAppendHost, workspaces]);
 
-  const pendingKeyboardRequest = keyboardInteractiveQueue[0] || null;
-  const pendingTotpUri = pendingKeyboardRequest?.totpUri;
-  const handleFillTotp = useCallback(async () => {
-    if (!pendingTotpUri) return null;
-    const result = await netcattyBridge.get()?.previewTotp?.({ uri: pendingTotpUri });
-    return result?.ok && result.code ? result.code : null;
-  }, [pendingTotpUri]);
-
   const isPeerSessionWindow = typeof window !== 'undefined'
     && window.location.hash.startsWith('#/session-window');
   const externalMcpToggle = useExternalMcpToggleState();
@@ -939,7 +930,6 @@ function AppViewInner({ domains }: AppViewProps) {
               showSftpTab={showSftpTab}
               onQueryChange={setQuickSearch}
               onSelect={handleHostConnectWithProtocolCheck}
-              onQuickConnect={openQuickConnectFromInput}
               onEditHost={(host) => {
                 setIsQuickSwitcherOpen(false);
                 setQuickSearch('');
@@ -1032,8 +1022,6 @@ function AppViewInner({ domains }: AppViewProps) {
         request={keyboardInteractiveQueue[0] || null}
         onSubmit={handleKeyboardInteractiveSubmit}
         onCancel={handleKeyboardInteractiveCancel}
-        canFillTotp={Boolean(pendingTotpUri)}
-        onFillTotp={handleFillTotp}
       />
       {/* Indicator when more 2FA requests are pending */}
       {keyboardInteractiveQueue.length > 1 && (

application/app/openTerminalQueue.test.ts

@@ -1,54 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import { createOpenTerminalQueue } from './openTerminalQueue';
-
-test('idle open-terminal work stays in call order on the caller turn', () => {
-  const queue = createOpenTerminalQueue();
-  const order: string[] = [];
-
-  queue.enqueue(() => { order.push('path-a'); });
-  queue.enqueue(() => { order.push('path-b'); });
-
-  assert.deepEqual(order, ['path-a', 'path-b']);
-});
-
-test('a path-only open waits for an in-flight shell discovery', async () => {
-  const queue = createOpenTerminalQueue();
-  const order: string[] = [];
-  let releaseDiscovery: () => void = () => {};
-  const discovery = new Promise<void>((resolve) => {
-    releaseDiscovery = resolve;
-  });
-
-  const shellRequest = queue.enqueue(async () => {
-    order.push('shell');
-    await discovery;
-    order.push('shell-tab');
-  });
-  const pathRequest = queue.enqueue(() => {
-    order.push('path-tab');
-  });
-
-  assert.deepEqual(order, ['shell']);
-  releaseDiscovery();
-  await shellRequest;
-  await pathRequest;
-  assert.deepEqual(order, ['shell', 'shell-tab', 'path-tab']);
-});
-
-test('a failed open-terminal request does not block the next one', async () => {
-  const queue = createOpenTerminalQueue();
-  const order: string[] = [];
-
-  const failed = queue.enqueue(async () => {
-    order.push('shell');
-    throw new Error('discovery failed');
-  });
-  const next = queue.enqueue(() => {
-    order.push('path-tab');
-  });
-
-  await assert.rejects(failed, /discovery failed/);
-  await next;
-  assert.deepEqual(order, ['shell', 'path-tab']);
-});

application/app/openTerminalQueue.ts

@@ -1,50 +0,0 @@
-type OpenTerminalTask = () => Promise<void> | void;
-
-function isPromise(value: Promise<void> | void): value is Promise<void> {
-  return Boolean(value) && typeof (value as Promise<void>).then === 'function';
-}
-
-/**
- * Ordered launcher queue. An idle queue runs the task in the caller turn so a
- * path-only open still creates its tab synchronously. A task that awaits (shell
- * discovery) holds the tail, and later requests cannot pass it.
- */
-export function createOpenTerminalQueue() {
-  let tail: Promise<void> = Promise.resolve();
-  let depth = 0;
-
-  return {
-    enqueue(task: OpenTerminalTask): Promise<void> {
-      depth += 1;
-      let release: () => void;
-      const finished = new Promise<void>((resolve) => {
-        release = () => {
-          depth -= 1;
-          resolve();
-        };
-      });
-      const previous = tail;
-      tail = finished;
-
-      const run = (): Promise<void> => {
-        try {
-          const result = task();
-          if (isPromise(result)) {
-            return result.then(release, (error: unknown) => {
-              release();
-              throw error;
-            });
-          }
-          release();
-          return Promise.resolve();
-        } catch (error) {
-          release();
-          throw error;
-        }
-      };
-
-      if (depth === 1) return run();
-      return previous.then(run, run);
-    },
-  };
-}

application/app/useAppStartupEffects.ts

@@ -554,9 +554,6 @@ export function useAppStartupEffects(ctx: StartupEffectsContext) {
         hostname: request.hostname,
         savedPassword: request.savedPassword,
         allowSavePassword: request.allowSavePassword !== false,
-        ...(typeof request.totpUri === "string" && request.totpUri && !request.totpUri.startsWith("enc:v1:")
-          ? { totpUri: request.totpUri }
-          : {}),
       }]);
     });
     const unsubscribeCancelled = bridge.onKeyboardInteractiveCancelled?.((event) => {

application/i18n/locales/en/ai.ts

@@ -289,14 +289,6 @@ export const enAiMessages: Messages = {
   'ai.opencode.customPathPlaceholder': 'e.g. /usr/local/bin/opencode',
   'ai.opencode.check': 'Check',
   'ai.opencode.resetPath': 'Reset',
-  'ai.opencode.v2.startupTimeout': 'OpenCode 2 did not become ready in time. Confirm `opencode serve` works in a terminal, then retry.',
-  'ai.opencode.v2.exited': 'OpenCode 2 stopped before the chat could start.',
-  'ai.opencode.v2.unauthorized': 'OpenCode 2 refused the connection. Retry the chat.',
-  'ai.opencode.v2.unavailable': 'OpenCode 2 could not be reached. Check that it is installed and try again.',
-  'ai.opencode.v2.sessionFailed': 'OpenCode 2 could not finish this turn.',
-  'ai.opencode.v2.empty': 'OpenCode 2 returned an empty response. Run `opencode` in a terminal to configure authentication and models.',
-  'ai.opencode.v2.contextSkipped': 'OpenCode 2 could not apply the Netcatty conversation context.',
-  'ai.opencode.v2.mcpSkipped': 'OpenCode 2 could not attach an MCP tool. The chat will continue without it.',
 
   // AI MiMo Code (Xiaomi MiMo Code CLI — OpenCode fork)
   'ai.mimo.title': 'MiMo Code',
@@ -364,14 +356,6 @@ export const enAiMessages: Messages = {
   'ai.externalMcp.idleTimeout.minutes': 'min',
   'ai.externalMcp.focusOnHostOpen': 'Focus window on host_open',
   'ai.externalMcp.focusOnHostOpen.description': 'When an MCP client opens a host, bring the main window to the foreground. Turn off to keep working without interruption.',
-  'ai.externalMcp.approvalAlert': 'Approval alerts',
-  'ai.externalMcp.approvalAlert.description': 'When an external MCP client asks for confirmation, show a system notification. While Netcatty is unfocused, the taskbar or Dock asks for attention. The notification uses the system sound.',
-  'ai.externalMcp.approvalAlert.off': 'Off',
-  'ai.externalMcp.approvalAlert.unfocused': 'When unfocused',
-  'ai.externalMcp.approvalAlert.always': 'Always',
-  'ai.externalMcp.approvalAlert.notificationTitle': 'External MCP approval',
-  'ai.externalMcp.approvalAlert.notificationBody': '{tool} is waiting for approval',
-  'ai.externalMcp.approvalAlert.notificationBodyOnHost': '{tool} on {host} is waiting for approval',
   'ai.externalMcp.silentSessions': 'Silent MCP sessions',
   'ai.externalMcp.silentSessions.description': 'Sessions opened by AI stay out of your tab bar and are not restored after restart. View them anytime from the tray panel.',
   'ai.externalMcp.sessionIdleTimeout': 'Opened session idle timeout',
@@ -384,38 +368,6 @@ export const enAiMessages: Messages = {
   'ai.externalMcp.help.ariaLabel': 'External MCP help',
   'ai.externalMcp.security': 'Security',
   'ai.externalMcp.security.description': 'Listens on 127.0.0.1 with a rotating token, reuses AI Permission Mode for writes, and removes discovery when disabled. No OAuth — this is a local desktop bridge.',
-  'ai.externalMcp.http.title': 'Streamable HTTP',
-  'ai.externalMcp.http.description': 'Serve the same External MCP tools over Streamable HTTP for clients that cannot launch the stdio CLI, such as Codex inside WSL. Off by default.',
-  'ai.externalMcp.http.enable': 'Enable HTTP',
-  'ai.externalMcp.http.port': 'Port',
-  'ai.externalMcp.http.portHint': 'Fixed port, default 47391. Client URLs stay the same across restarts. Allowed range: 1024–65535.',
-  'ai.externalMcp.http.allowCustomBind': 'Listen on another address',
-  'ai.externalMcp.http.allowCustomBind.description': 'By default the endpoint binds to 127.0.0.1. Turn this on for WSL2 NAT and set 0.0.0.0 or the vEthernet IP.',
-  'ai.externalMcp.http.listenAddress': 'Listen address',
-  'ai.externalMcp.http.listenAddress.placeholder': '0.0.0.0',
-  'ai.externalMcp.http.clientHost': 'Client address',
-  'ai.externalMcp.http.clientHost.description': 'Used in copied configs when the listener is 0.0.0.0 or ::. Enter the IP clients can reach, such as the Windows host IP.',
-  'ai.externalMcp.http.clientHost.placeholder': '172.22.0.1',
-  'ai.externalMcp.http.clientHostRequired': 'Enter the IP clients should connect to. 0.0.0.0 is not a reachable address.',
-  'ai.externalMcp.http.invalidClientHost': 'Client address must be a reachable IP, not 0.0.0.0 or ::.',
-  'ai.externalMcp.http.warning': 'Listening beyond 127.0.0.1 exposes External MCP to other machines that can reach this address. Keep the bearer token private and do not publish this port.',
-  'ai.externalMcp.http.url': 'URL',
-  'ai.externalMcp.http.token': 'Bearer token',
-  'ai.externalMcp.http.regenerate': 'Regenerate',
-  'ai.externalMcp.http.regenerateHint': 'Issues a new bearer token. HTTP clients must use the new token. The stdio discovery file is updated; clients that are already connected over stdio stay connected.',
-  'ai.externalMcp.http.wslHint': 'With WSL mirrored networking, localhost works. Otherwise listen on 0.0.0.0 or the vEthernet IP and set Client address to the Windows host IP.',
-  'ai.externalMcp.http.codexSnippet': 'Codex config.toml',
-  'ai.externalMcp.http.claudeCommand': 'Claude Code',
-  'ai.externalMcp.http.genericSnippet': 'Generic JSON',
-  'ai.externalMcp.http.envLine': 'Codex token env',
-  'ai.externalMcp.http.notListening': 'Not listening',
-  'ai.externalMcp.http.listening': 'Listening',
-  'ai.externalMcp.http.portInUse': 'Port {port} is already in use.',
-  'ai.externalMcp.http.requiresExternalMcp': 'Turn on External MCP before this endpoint will listen.',
-  'ai.externalMcp.http.invalidPort': 'Enter a port from 1024 to 65535.',
-  'ai.externalMcp.http.invalidAddress': 'Listen address must be an IP, such as 0.0.0.0 or the vEthernet IP.',
-  'ai.externalMcp.http.listenFailed': 'HTTP failed to listen.',
-  'ai.externalMcp.http.legacySseNote': 'Legacy HTTP+SSE (2024-11-05) is not offered. Use this Streamable HTTP URL.',
   'ai.externalMcp.permissionMode': 'Current permission mode: {mode}',
   'ai.externalMcp.permissionMode.label': 'Write permission mode',
   'ai.externalMcp.permissionMode.hint': 'Same setting as Settings → AI → Safety. Auto runs Netcatty write tools without Netcatty approval prompts; Confirm asks each time. External clients (Codex / Claude / Grok) may still show their own tool approval UI.',

application/i18n/locales/en/core.ts

@@ -413,7 +413,7 @@ export const enCoreMessages: Messages = {
   'settings.appearance.themeColor.dark': 'Dark palette',
   'settings.appearance.customCss': 'Custom CSS',
   'settings.appearance.customCss.desc':
-    'Add custom CSS to personalize the app appearance. Changes apply immediately. Selected top tabs (`.top-tab[data-active="true"]`) read `--top-tab-active-bg`, `--top-tab-active-fg`, and `--top-tab-active-border`. Leave them unset to keep the current look.',
+    'Add custom CSS to personalize the app appearance. Changes apply immediately.',
   'settings.appearance.customCss.help.ariaLabel': 'Custom CSS help',
   'settings.appearance.customCss.help.title': 'Custom CSS guide',
   'settings.appearance.customCss.help.body': `Major UI regions expose a \`data-section\` attribute you can target. Changes apply as soon as you edit the CSS.
@@ -440,22 +440,6 @@ Because many styles come from Tailwind utilities, you often need \`!important\`
 - \`top-tabs-host-tree-toggle\`
 - \`top-tabs-quick-switcher-toggle\`
 
-Selected top tabs use the class \`top-tab\` and \`data-active="true"\`. Set these variables to recolor the selected tab. Leave them unset to keep the current look. They apply without \`!important\`.
-
-- \`--top-tab-active-bg\` — selected fill (defaults to the current tab background)
-- \`--top-tab-active-fg\` — selected label color (defaults to the current tab text)
-- \`--top-tab-active-border\` — 1px inset outline (defaults to transparent, so there is no border)
-
-The Vaults tab stays flat and does not use the fill.
-
-\`\`\`css
-.top-tab[data-active="true"] {
-  --top-tab-active-bg: #2563eb;
-  --top-tab-active-fg: #ffffff;
-  --top-tab-active-border: #1d4ed8;
-}
-\`\`\`
-
 ### Vault
 
 - \`vault-view\`
@@ -549,7 +533,7 @@ Highlight the focused split pane:
 \`\`\`
 `,
   'settings.appearance.customCss.placeholder':
-    '/* Examples — use !important to beat Tailwind utility specificity */\n\n/* Selected top tab. Leave these unset to keep the current look. */\n.top-tab[data-active="true"] {\n  --top-tab-active-bg: #2563eb;\n  --top-tab-active-fg: #ffffff;\n  --top-tab-active-border: #1d4ed8;\n}\n\n/* Hide the host-list toggle in the top tab bar */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* Hide the plus button that opens the quick switcher */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* Border around the SFTP / side panel (does not linger after closing) */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* Change the whole side panel background, not only the top tabs */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* Style selected SFTP file rows */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* Thicker split dividers */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* Highlight the focused split pane */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* Or use Settings → Terminal → Workspace Focus Indicator → Border on focused pane */',
+    '/* Examples — use !important to beat Tailwind utility specificity */\n\n/* Hide the host-list toggle in the top tab bar */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* Hide the plus button that opens the quick switcher */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* Border around the SFTP / side panel (does not linger after closing) */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* Change the whole side panel background, not only the top tabs */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* Style selected SFTP file rows */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* Thicker split dividers */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* Highlight the focused split pane */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* Or use Settings → Terminal → Workspace Focus Indicator → Border on focused pane */',
   'settings.appearance.language': 'Language',
   'settings.appearance.language.desc': 'Choose the UI language',
   'settings.appearance.uiFont': 'Interface Font',
@@ -728,7 +712,7 @@ Highlight the focused split pane:
     'Send configured text instead of normal Enter when pressing Shift+Enter in the terminal.',
   'settings.terminal.behavior.shiftEnterNewlineText': 'Text to send',
   'settings.terminal.behavior.shiftEnterNewlineText.desc':
-    'Use \\n for newline, \\t for tab, \\e for Escape, and \\\\ for backslash. Defaults to \\e\\r (Escape + Enter, the legacy Alt+Enter encoding), which most TUI CLIs treat as a newline.',
+    'Use \\n for newline, \\t for tab, \\e for Escape, and \\\\ for backslash.',
   'settings.terminal.behavior.shiftEnterForceText': 'Send text in Win32 input mode',
   'settings.terminal.behavior.shiftEnterForceText.desc':
     'Also send the text above when a local Windows ConPTY session negotiates Win32 input mode. Needed for Node/Bun CLIs (Claude Code, CodeBuddy) that cannot read modifier keys from console input records.',
@@ -836,10 +820,6 @@ Highlight the focused split pane:
   'settings.terminal.section.connection': 'Connection',
   'settings.terminal.connection.verifyHostKeys': 'Verify SSH host keys',
   'settings.terminal.connection.verifyHostKeys.desc': 'Ask before connecting to a new or changed SSH host key. Turn this off only for trusted private networks.',
-  'settings.terminal.connection.temporaryLegacyAlgorithms': 'Allow legacy algorithms for temporary connections',
-  'settings.terminal.connection.temporaryLegacyAlgorithms.desc': 'SSH connections with no saved host, including PuTTY-style launches and quick connect, offer the same deprecated algorithms as the per-host option. Saved hosts keep their own setting. Off by default; these algorithms have known weaknesses.',
-  'settings.terminal.connection.temporaryNetworkDeviceMode': 'Network device mode for temporary connections',
-  'settings.terminal.connection.temporaryNetworkDeviceMode.desc': 'SSH connections with no saved host, including external launches and quick connect, start in network device mode. Saved hosts and groups keep their own device type. Off by default.',
   'settings.terminal.connection.sshAutoReconnectEnabled': 'Automatically reconnect SSH sessions',
   'settings.terminal.connection.sshAutoReconnectEnabled.desc': 'When turned on, established SSH sessions that drop unexpectedly try to reconnect every 5 seconds until the tab is closed or the connection succeeds.',
   'settings.terminal.connection.keepaliveInterval': 'Keepalive Interval',

application/i18n/locales/en/terminal.ts

@@ -109,8 +109,6 @@ export const enTerminalMessages: Messages = {
   'terminal.serverStats.cpu': 'CPU Usage',
   'terminal.serverStats.cpuCores': 'CPU Core Usage',
   'terminal.serverStats.gpu': 'GPU Usage',
-  'terminal.serverStats.gpuDevices': 'GPU Device Usage',
-  'terminal.serverStats.gpuIndex': 'GPU {{index}}',
   'terminal.serverStats.memory': 'Memory Usage',
   'terminal.serverStats.memoryDetails': 'Memory Details',
   'terminal.serverStats.memUsed': 'Used',
@@ -912,13 +910,11 @@ export const enTerminalMessages: Messages = {
   'keyboard.interactive.desc': 'The server requires additional authentication.',
   'keyboard.interactive.descWithHost': 'The server {hostname} requires additional authentication.',
   'keyboard.interactive.response': 'Response',
-  'keyboard.interactive.verificationCode': 'Verification code',
   'keyboard.interactive.enterCode': 'Enter verification code',
   'keyboard.interactive.enterResponse': 'Enter response',
   'keyboard.interactive.submit': 'Submit',
   'keyboard.interactive.verifying': 'Verifying...',
   'keyboard.interactive.savePassword': 'Save password',
-  'keyboard.interactive.fillTotp': 'Fill verification code',
 
   // Passphrase Modal for encrypted SSH keys
   'passphrase.title': 'SSH Key Passphrase',

application/i18n/locales/en/vault.ts

@@ -668,10 +668,6 @@ export const enVaultMessages: Messages = {
 
   // Quick Switcher
   'qs.search.placeholder': 'Search hosts or tabs',
-  'qs.quickConnectTo': 'Quick connect to {target}',
-  'qs.hosts': 'Hosts',
-  'qs.tabs': 'Tabs',
-  'qs.newWorkspace': 'New Workspace',
   'qs.jumpTo': 'Jump To',
   'qs.localTerminal': 'Local Terminal',
   'qs.localShells': 'Local Shells',
@@ -880,35 +876,6 @@ export const enVaultMessages: Messages = {
   'hostDetails.auth.certificate.desc': 'Use the selected SSH certificate, with the saved password as a fallback when present.',
   'hostDetails.auth.mfaFirst': 'Prefer interactive auth',
   'hostDetails.auth.mfaFirst.desc': 'For servers that require password and MFA through keyboard-interactive.',
-  'hostDetails.totp.title': 'Authenticator (TOTP)',
-  'hostDetails.totp.enable': 'Save a TOTP secret for this host',
-  'hostDetails.totp.setup': 'Set up…',
-  'hostDetails.totp.edit': 'Edit',
-  'hostDetails.totp.modalTitle': 'Set up authenticator',
-  'hostDetails.totp.replacePlaceholder': 'Paste a new secret to replace the current one',
-  'hostDetails.totp.warning': 'Anyone who can open this vault gets this code and the password. Use it only on a personal device.',
-  'hostDetails.totp.secret': 'Secret or otpauth URI',
-  'hostDetails.totp.secretPlaceholder': 'Paste otpauth://totp/... or a Base32 secret',
-  'hostDetails.totp.importQr': 'Import QR image',
-  'hostDetails.totp.scanScreen': 'Scan QR code from screen',
-  'hostDetails.totp.scanning': 'Scanning screens…',
-  'hostDetails.totp.importedAccount': 'Imported {account}',
-  'hostDetails.totp.preview': 'Current code',
-  'hostDetails.totp.countdown': '{seconds}s remaining',
-  'hostDetails.totp.autoSubmit': 'Auto-submit on known TOTP prompts',
-  'hostDetails.totp.autoSubmitDesc': 'Submits once per connection, and only when the prompt exactly matches JumpServer, Google Authenticator PAM, or your pattern.',
-  'hostDetails.totp.promptPattern': 'Custom prompt pattern',
-  'hostDetails.totp.promptPatternPlaceholder': 'Optional RE2 regular expression',
-  'hostDetails.totp.clear': 'Remove authenticator',
-  'hostDetails.totp.removeTitle': 'Remove authenticator?',
-  'hostDetails.totp.removeMessage': 'This host will no longer store this TOTP secret.',
-  'hostDetails.totp.error.hotp': 'HOTP is not supported. Use a TOTP secret.',
-  'hostDetails.totp.error.migration': 'otpauth-migration QR codes are not supported. Use the service binding QR code for a single account.',
-  'hostDetails.totp.error.invalid': 'Could not read a TOTP secret from that value.',
-  'hostDetails.totp.error.notFound': 'No TOTP QR code was found.',
-  'hostDetails.totp.error.permission': 'Screen recording permission is required. Allow Netcatty to record the screen in System Settings, then try again.',
-  'hostDetails.totp.error.unavailable': 'Screen capture is not available.',
-  'hostDetails.totp.error.pattern': 'The custom prompt pattern is not a valid RE2 regular expression.',
   'hostDetails.auth.credentialRequired': 'Select a key or certificate before saving this login method.',
   'hostDetails.identity.suggestions': 'Identities',
   'hostDetails.identity.missing': 'Identity not found',

application/i18n/locales/es/ai.ts

@@ -347,14 +347,6 @@ export const esAiMessages: Messages = {
   'ai.externalMcp.idleTimeout.minutes': 'min',
   'ai.externalMcp.focusOnHostOpen': 'Enfocar ventana en host_open',
   'ai.externalMcp.focusOnHostOpen.description': 'Cuando un cliente de MCP abre un host, trae la ventana principal al frente. Apágalo para seguir trabajando sin interrupciones.',
-  'ai.externalMcp.approvalAlert': 'Alertas de aprobación',
-  'ai.externalMcp.approvalAlert.description': 'Cuando un cliente MCP externo pide confirmación, muestra una notificación del sistema. Si Netcatty no tiene el foco, la barra de tareas o el Dock pide atención. La notificación usa el sonido del sistema.',
-  'ai.externalMcp.approvalAlert.off': 'Desactivado',
-  'ai.externalMcp.approvalAlert.unfocused': 'Si no tiene el foco',
-  'ai.externalMcp.approvalAlert.always': 'Siempre',
-  'ai.externalMcp.approvalAlert.notificationTitle': 'Aprobación de MCP externo',
-  'ai.externalMcp.approvalAlert.notificationBody': '{tool} espera aprobación',
-  'ai.externalMcp.approvalAlert.notificationBodyOnHost': '{tool} en {host} espera aprobación',
   'ai.externalMcp.silentSessions': 'Sesiones MCP silenciosas',
   'ai.externalMcp.silentSessions.description': 'Las sesiones abiertas por la IA se mantienen fuera de tu barra de pestañas y no se restauran tras reiniciar. Puedes verlas en cualquier momento desde el panel de la bandeja.',
   'ai.externalMcp.sessionIdleTimeout': 'Tiempo de inactividad de la sesión abierta',
@@ -367,38 +359,6 @@ export const esAiMessages: Messages = {
   'ai.externalMcp.help.ariaLabel': 'Ayuda del MCP externo',
   'ai.externalMcp.security': 'Seguridad',
   'ai.externalMcp.security.description': 'Escucha en 127.0.0.1 con un token rotativo, reutiliza el modo de permisos de IA para las escrituras y elimina el descubrimiento al desactivarse. Sin OAuth: este es un puente local de escritorio.',
-  'ai.externalMcp.http.title': 'Streamable HTTP',
-  'ai.externalMcp.http.description': 'Expone las mismas herramientas de MCP externo por Streamable HTTP para clientes que no pueden iniciar el CLI stdio, como Codex dentro de WSL. Desactivado de forma predeterminada.',
-  'ai.externalMcp.http.enable': 'Activar HTTP',
-  'ai.externalMcp.http.port': 'Puerto',
-  'ai.externalMcp.http.portHint': 'Puerto fijo, predeterminado 47391. Las URL de los clientes se mantienen al reiniciar. Rango permitido: 1024–65535.',
-  'ai.externalMcp.http.allowCustomBind': 'Escuchar en otra dirección',
-  'ai.externalMcp.http.allowCustomBind.description': 'De forma predeterminada el extremo se enlaza a 127.0.0.1. Actívalo para NAT de WSL2 y usa 0.0.0.0 o la IP de vEthernet.',
-  'ai.externalMcp.http.listenAddress': 'Dirección de escucha',
-  'ai.externalMcp.http.listenAddress.placeholder': '0.0.0.0',
-  'ai.externalMcp.http.clientHost': 'Dirección del cliente',
-  'ai.externalMcp.http.clientHost.description': 'Se usa en las configuraciones copiadas cuando la escucha es 0.0.0.0 o ::. Introduce una IP alcanzable, como la IP del host de Windows.',
-  'ai.externalMcp.http.clientHost.placeholder': '172.22.0.1',
-  'ai.externalMcp.http.clientHostRequired': 'Introduce la IP a la que deben conectarse los clientes. 0.0.0.0 no es una dirección alcanzable.',
-  'ai.externalMcp.http.invalidClientHost': 'La dirección del cliente debe ser una IP alcanzable, no 0.0.0.0 ni ::.',
-  'ai.externalMcp.http.warning': 'Escuchar fuera de 127.0.0.1 expone el MCP externo a otros equipos que puedan alcanzar esta dirección. Mantén el bearer token en privado y no publiques este puerto.',
-  'ai.externalMcp.http.url': 'URL',
-  'ai.externalMcp.http.token': 'Bearer token',
-  'ai.externalMcp.http.regenerate': 'Regenerar',
-  'ai.externalMcp.http.regenerateHint': 'Emite un bearer token nuevo. Los clientes HTTP deben usar el token nuevo. El archivo de descubrimiento stdio se actualiza; los clientes stdio ya conectados siguen conectados.',
-  'ai.externalMcp.http.wslHint': 'Con la red reflejada de WSL, localhost funciona. Si no, escucha en 0.0.0.0 o la IP de vEthernet y pon la IP del host de Windows en Dirección del cliente.',
-  'ai.externalMcp.http.codexSnippet': 'Codex config.toml',
-  'ai.externalMcp.http.claudeCommand': 'Claude Code',
-  'ai.externalMcp.http.genericSnippet': 'JSON genérico',
-  'ai.externalMcp.http.envLine': 'Variable de entorno del token de Codex',
-  'ai.externalMcp.http.notListening': 'Sin escucha',
-  'ai.externalMcp.http.listening': 'Escuchando',
-  'ai.externalMcp.http.portInUse': 'El puerto {port} ya está en uso.',
-  'ai.externalMcp.http.requiresExternalMcp': 'Activa el MCP externo para que este extremo empiece a escuchar.',
-  'ai.externalMcp.http.invalidPort': 'Introduce un puerto entre 1024 y 65535.',
-  'ai.externalMcp.http.invalidAddress': 'La dirección de escucha debe ser una IP, como 0.0.0.0 o la IP de vEthernet.',
-  'ai.externalMcp.http.listenFailed': 'HTTP no pudo escuchar.',
-  'ai.externalMcp.http.legacySseNote': 'No se ofrece el HTTP+SSE heredado (2024-11-05). Usa esta URL de Streamable HTTP.',
   'ai.externalMcp.permissionMode': 'Modo de permisos actual: {mode}',
   'ai.externalMcp.permissionMode.label': 'Modo de permiso de escritura',
   'ai.externalMcp.permissionMode.hint': 'La misma configuración que Configuración → IA → Seguridad. Automático ejecuta las herramientas de escritura de Netcatty sin solicitar aprobación de Netcatty; Confirmar pregunta cada vez. Los clientes externos (Codex / Claude / Grok) aún pueden mostrar su propia interfaz de aprobación de herramientas.',

application/i18n/locales/es/core.ts

@@ -328,7 +328,7 @@ export const esCoreMessages: Messages = {
   'settings.appearance.themeColor.dark': 'Paleta oscura',
   'settings.appearance.customCss': 'CSS personalizado',
   'settings.appearance.customCss.desc':
-    'Agrega CSS personalizado para personalizar la apariencia de la aplicación. Los cambios se aplican de inmediato. Las pestañas superiores seleccionadas (`.top-tab[data-active="true"]`) leen `--top-tab-active-bg`, `--top-tab-active-fg` y `--top-tab-active-border`. Si no las defines, se conserva el aspecto actual.',
+    'Agrega CSS personalizado para personalizar la apariencia de la aplicación. Los cambios se aplican de inmediato.',
   'settings.appearance.customCss.help.ariaLabel': 'Ayuda de CSS personalizado',
   'settings.appearance.customCss.help.title': 'Guía de CSS personalizado',
   'settings.appearance.customCss.help.body': `Las principales regiones de la interfaz exponen un atributo \`data-section\` que puedes usar como destino. Los cambios se aplican en cuanto editas el CSS.
@@ -355,22 +355,6 @@ Como muchos estilos provienen de utilidades de Tailwind, a menudo necesitas \`!i
 - \`top-tabs-host-tree-toggle\`
 - \`top-tabs-quick-switcher-toggle\`
 
-Las pestañas superiores seleccionadas usan la clase \`top-tab\` y \`data-active="true"\`. Define estas variables para cambiar el color de la pestaña seleccionada. Si no las defines, se conserva el aspecto actual. Se aplican sin \`!important\`.
-
-- \`--top-tab-active-bg\` — relleno seleccionado (por defecto, el fondo actual de la pestaña)
-- \`--top-tab-active-fg\` — color del texto seleccionado (por defecto, el texto actual)
-- \`--top-tab-active-border\` — contorno interior de 1px (transparente por defecto, así que no hay borde)
-
-La pestaña Vaults permanece plana y no usa el relleno.
-
-\`\`\`css
-.top-tab[data-active="true"] {
-  --top-tab-active-bg: #2563eb;
-  --top-tab-active-fg: #ffffff;
-  --top-tab-active-border: #1d4ed8;
-}
-\`\`\`
-
 ### Vault
 
 - \`vault-view\`
@@ -464,7 +448,7 @@ Resalta el panel dividido enfocado:
 \`\`\`
 `,
   'settings.appearance.customCss.placeholder':
-    '/* Ejemplos: usa !important para superar la especificidad de las utilidades de Tailwind */\n\n/* Pestaña superior seleccionada. Si no defines estas variables, se conserva el aspecto actual. */\n.top-tab[data-active="true"] {\n  --top-tab-active-bg: #2563eb;\n  --top-tab-active-fg: #ffffff;\n  --top-tab-active-border: #1d4ed8;\n}\n\n/* Oculta el botón de lista de hosts en la barra de pestañas superior */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* Oculta el botón + que abre el selector rápido */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* Borde alrededor del panel SFTP / lateral (no persiste tras cerrarlo) */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* Cambia el fondo de todo el panel lateral, no solo las pestañas superiores */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* Estiliza las filas de archivos SFTP seleccionadas */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* Divisores de división más gruesos */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* Resalta el panel dividido enfocado */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* O usa Configuración → Terminal → Indicador de foco del espacio de trabajo → Borde en el panel enfocado */',
+    '/* Ejemplos: usa !important para superar la especificidad de las utilidades de Tailwind */\n\n/* Oculta el botón de lista de hosts en la barra de pestañas superior */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* Oculta el botón + que abre el selector rápido */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* Borde alrededor del panel SFTP / lateral (no persiste tras cerrarlo) */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* Cambia el fondo de todo el panel lateral, no solo las pestañas superiores */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* Estiliza las filas de archivos SFTP seleccionadas */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* Divisores de división más gruesos */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* Resalta el panel dividido enfocado */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* O usa Configuración → Terminal → Indicador de foco del espacio de trabajo → Borde en el panel enfocado */',
   'settings.appearance.language': 'Idioma',
   'settings.appearance.language.desc': 'Elige el idioma de la interfaz',
   'settings.appearance.uiFont': 'Fuente de la interfaz',
@@ -643,7 +627,7 @@ Resalta el panel dividido enfocado:
     'Envía el texto configurado en lugar del Enter normal al presionar Shift+Enter en la terminal.',
   'settings.terminal.behavior.shiftEnterNewlineText': 'Texto a enviar',
   'settings.terminal.behavior.shiftEnterNewlineText.desc':
-    'Usa \\n para nueva línea, \\t para tabulación, \\e para Escape y \\\\ para barra invertida. Por defecto \\e\\r (Escape + Enter, la codificación clásica de Alt+Enter), que la mayoría de las CLI TUI interpretan como nueva línea.',
+    'Usa \\n para nueva línea, \\t para tabulación, \\e para Escape y \\\\ para barra invertida.',
   'settings.terminal.behavior.shiftEnterForceText': 'Enviar texto también en modo de entrada Win32',
   'settings.terminal.behavior.shiftEnterForceText.desc':
     'Envía también el texto anterior cuando una sesión ConPTY local de Windows negocia el modo de entrada Win32. Necesario para CLI escritas en Node/Bun (Claude Code, CodeBuddy) que no pueden leer modificadores desde los registros de entrada de la consola.',
@@ -751,10 +735,6 @@ Resalta el panel dividido enfocado:
   'settings.terminal.section.connection': 'Conexión',
   'settings.terminal.connection.verifyHostKeys': 'Verificar las claves de host SSH',
   'settings.terminal.connection.verifyHostKeys.desc': 'Pregunta antes de conectarse a una clave de host SSH nueva o modificada. Desactívalo solo en redes privadas de confianza.',
-  'settings.terminal.connection.temporaryLegacyAlgorithms': 'Permitir algoritmos heredados en conexiones temporales',
-  'settings.terminal.connection.temporaryLegacyAlgorithms.desc': 'Las conexiones SSH sin un host guardado, incluidos los inicios al estilo PuTTY y la conexión rápida, ofrecen los mismos algoritmos obsoletos que la opción por host. Los hosts guardados conservan su propio ajuste. Desactivado de forma predeterminada; estos algoritmos tienen debilidades conocidas.',
-  'settings.terminal.connection.temporaryNetworkDeviceMode': 'Modo de dispositivo de red para conexiones temporales',
-  'settings.terminal.connection.temporaryNetworkDeviceMode.desc': 'Las conexiones SSH sin un host guardado, incluidos los inicios externos y la conexión rápida, se inician en modo de dispositivo de red. Los hosts y grupos guardados conservan su propio tipo de dispositivo. Desactivado de forma predeterminada.',
   'settings.terminal.connection.sshAutoReconnectEnabled': 'Reconectar sesiones SSH automáticamente',
   'settings.terminal.connection.sshAutoReconnectEnabled.desc': 'Cuando está activado, las sesiones SSH establecidas que se caen inesperadamente intentan reconectarse cada 5 segundos hasta que la pestaña se cierra o la conexión se establece.',
   'settings.terminal.connection.keepaliveInterval': 'Intervalo de keepalive',

application/i18n/locales/es/terminal.ts

@@ -109,8 +109,6 @@ export const esTerminalMessages: Messages = {
   'terminal.serverStats.cpu': 'Uso de CPU',
   'terminal.serverStats.cpuCores': 'Uso de núcleos de CPU',
   'terminal.serverStats.gpu': 'Uso de GPU',
-  'terminal.serverStats.gpuDevices': 'Uso de cada GPU',
-  'terminal.serverStats.gpuIndex': 'GPU {{index}}',
   'terminal.serverStats.memory': 'Uso de memoria',
   'terminal.serverStats.memoryDetails': 'Detalles de memoria',
   'terminal.serverStats.memUsed': 'Usada',
@@ -874,13 +872,11 @@ export const esTerminalMessages: Messages = {
   'keyboard.interactive.desc': 'El servidor requiere autenticación adicional.',
   'keyboard.interactive.descWithHost': 'El servidor {hostname} requiere autenticación adicional.',
   'keyboard.interactive.response': 'Respuesta',
-  'keyboard.interactive.verificationCode': 'Código de verificación',
   'keyboard.interactive.enterCode': 'Ingresa el código de verificación',
   'keyboard.interactive.enterResponse': 'Ingresa la respuesta',
   'keyboard.interactive.submit': 'Enviar',
   'keyboard.interactive.verifying': 'Verificando...',
   'keyboard.interactive.savePassword': 'Guardar contraseña',
-  'keyboard.interactive.fillTotp': 'Rellenar código de verificación',
 
   // Passphrase Modal for encrypted SSH keys
   'passphrase.title': 'Frase de contraseña de la clave SSH',

application/i18n/locales/es/vault.ts

@@ -668,10 +668,6 @@ export const esVaultMessages: Messages = {
 
   // Quick Switcher
   'qs.search.placeholder': 'Buscar hosts o pestañas',
-  'qs.quickConnectTo': 'Conexión rápida a {target}',
-  'qs.hosts': 'Hosts',
-  'qs.tabs': 'Pestañas',
-  'qs.newWorkspace': 'Nuevo espacio de trabajo',
   'qs.jumpTo': 'Ir a',
   'qs.localTerminal': 'Terminal local',
   'qs.localShells': 'Shells locales',
@@ -870,35 +866,6 @@ export const esVaultMessages: Messages = {
   'hostDetails.auth.certificate.desc': 'Usa el certificado SSH seleccionado, con la contraseña guardada como respaldo cuando esté presente.',
   'hostDetails.auth.mfaFirst': 'Preferir autenticación interactiva',
   'hostDetails.auth.mfaFirst.desc': 'Para servidores que requieren contraseña y MFA a través de keyboard-interactive.',
-  'hostDetails.totp.title': 'Autenticador (TOTP)',
-  'hostDetails.totp.enable': 'Guardar un secreto TOTP para este host',
-  'hostDetails.totp.setup': 'Configurar…',
-  'hostDetails.totp.edit': 'Editar',
-  'hostDetails.totp.modalTitle': 'Configurar autenticador',
-  'hostDetails.totp.replacePlaceholder': 'Pega un secreto nuevo para reemplazar el actual',
-  'hostDetails.totp.warning': 'Quien abra esta caja fuerte obtiene este código y la contraseña. Úsalo solo en un dispositivo personal.',
-  'hostDetails.totp.secret': 'Secreto o URI otpauth',
-  'hostDetails.totp.secretPlaceholder': 'Pega otpauth://totp/... o un secreto Base32',
-  'hostDetails.totp.importQr': 'Importar imagen QR',
-  'hostDetails.totp.scanScreen': 'Escanear código QR de la pantalla',
-  'hostDetails.totp.scanning': 'Escaneando pantallas…',
-  'hostDetails.totp.importedAccount': 'Importado: {account}',
-  'hostDetails.totp.preview': 'Código actual',
-  'hostDetails.totp.countdown': 'Quedan {seconds} s',
-  'hostDetails.totp.autoSubmit': 'Enviar automáticamente en avisos TOTP conocidos',
-  'hostDetails.totp.autoSubmitDesc': 'Se envía una sola vez por conexión y solo si el aviso coincide exactamente con JumpServer, Google Authenticator PAM o tu patrón.',
-  'hostDetails.totp.promptPattern': 'Patrón de aviso personalizado',
-  'hostDetails.totp.promptPatternPlaceholder': 'Expresión regular RE2 opcional',
-  'hostDetails.totp.clear': 'Quitar autenticador',
-  'hostDetails.totp.removeTitle': '¿Quitar el autenticador?',
-  'hostDetails.totp.removeMessage': 'Este host ya no guardará este secreto TOTP.',
-  'hostDetails.totp.error.hotp': 'HOTP no es compatible. Usa un secreto TOTP.',
-  'hostDetails.totp.error.migration': 'Los códigos otpauth-migration no son compatibles. Usa el código QR de vinculación de una sola cuenta.',
-  'hostDetails.totp.error.invalid': 'No se pudo leer un secreto TOTP de ese valor.',
-  'hostDetails.totp.error.notFound': 'No se encontró un código QR TOTP.',
-  'hostDetails.totp.error.permission': 'Se necesita permiso de grabación de pantalla. Permite que Netcatty grabe la pantalla en Ajustes del sistema e inténtalo de nuevo.',
-  'hostDetails.totp.error.unavailable': 'La captura de pantalla no está disponible.',
-  'hostDetails.totp.error.pattern': 'El patrón personalizado no es una expresión regular RE2 válida.',
   'hostDetails.auth.credentialRequired': 'Selecciona una clave o un certificado antes de guardar este método de inicio de sesión.',
   'hostDetails.identity.suggestions': 'Identidades',
   'hostDetails.identity.missing': 'Identidad no encontrada',

application/i18n/locales/externalMcpApprovalAlertLocales.test.ts

@@ -1,29 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import en from './en.ts';
-import ru from './ru.ts';
-import es from './es.ts';
-import zhCN from './zh-CN.ts';
-import zhTW from './zh-TW.ts';
-
-const KEYS = [
-  'ai.externalMcp.approvalAlert',
-  'ai.externalMcp.approvalAlert.description',
-  'ai.externalMcp.approvalAlert.off',
-  'ai.externalMcp.approvalAlert.unfocused',
-  'ai.externalMcp.approvalAlert.always',
-  'ai.externalMcp.approvalAlert.notificationTitle',
-  'ai.externalMcp.approvalAlert.notificationBody',
-  'ai.externalMcp.approvalAlert.notificationBodyOnHost',
-] as const;
-
-test('External MCP approval alerts are localized in every supported locale', () => {
-  for (const [name, messages] of Object.entries({ en, es, 'zh-CN': zhCN, 'zh-TW': zhTW, ru })) {
-    const missing = KEYS.filter((key) => !messages[key]);
-    assert.deepEqual(missing, [], `${name} is missing approval alert labels`);
-    assert.match(messages['ai.externalMcp.approvalAlert.notificationBody'], /\{tool\}/);
-    assert.match(messages['ai.externalMcp.approvalAlert.notificationBodyOnHost'], /\{tool\}/);
-    assert.match(messages['ai.externalMcp.approvalAlert.notificationBodyOnHost'], /\{host\}/);
-  }
-});

application/i18n/locales/externalMcpHttpLocales.test.ts

@@ -1,58 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-
-import en from "./en.ts";
-import ru from "./ru.ts";
-import es from "./es.ts";
-import zhCN from "./zh-CN.ts";
-import zhTW from "./zh-TW.ts";
-
-const KEYS = [
-  "ai.externalMcp.http.title",
-  "ai.externalMcp.http.description",
-  "ai.externalMcp.http.enable",
-  "ai.externalMcp.http.port",
-  "ai.externalMcp.http.portHint",
-  "ai.externalMcp.http.allowCustomBind",
-  "ai.externalMcp.http.allowCustomBind.description",
-  "ai.externalMcp.http.listenAddress",
-  "ai.externalMcp.http.listenAddress.placeholder",
-  "ai.externalMcp.http.clientHost",
-  "ai.externalMcp.http.clientHost.description",
-  "ai.externalMcp.http.clientHost.placeholder",
-  "ai.externalMcp.http.clientHostRequired",
-  "ai.externalMcp.http.invalidClientHost",
-  "ai.externalMcp.http.warning",
-  "ai.externalMcp.http.url",
-  "ai.externalMcp.http.token",
-  "ai.externalMcp.http.regenerate",
-  "ai.externalMcp.http.regenerateHint",
-  "ai.externalMcp.http.wslHint",
-  "ai.externalMcp.http.codexSnippet",
-  "ai.externalMcp.http.claudeCommand",
-  "ai.externalMcp.http.genericSnippet",
-  "ai.externalMcp.http.envLine",
-  "ai.externalMcp.http.notListening",
-  "ai.externalMcp.http.listening",
-  "ai.externalMcp.http.portInUse",
-  "ai.externalMcp.http.requiresExternalMcp",
-  "ai.externalMcp.http.invalidPort",
-  "ai.externalMcp.http.invalidAddress",
-  "ai.externalMcp.http.listenFailed",
-  "ai.externalMcp.http.legacySseNote",
-] as const;
-
-test("External MCP HTTP strings exist in every locale", () => {
-  for (const [name, messages] of Object.entries({ en, es, "zh-CN": zhCN, "zh-TW": zhTW, ru })) {
-    const missing = KEYS.filter((key) => !messages[key]);
-    assert.deepEqual(missing, [], `${name} is missing HTTP MCP labels`);
-    assert.match(messages["ai.externalMcp.http.portInUse"], /\{port\}/);
-  }
-  assert.match(zhTW["ai.externalMcp.http.port"], /連接埠/);
-  assert.match(zhTW["ai.externalMcp.http.listenAddress"], /位址/);
-  assert.match(zhTW["ai.externalMcp.http.clientHost"], /位址/);
-  assert.doesNotMatch(zhTW["ai.externalMcp.http.clientHost"], /地址/);
-  assert.doesNotMatch(zhTW["ai.externalMcp.http.port"], /端口/);
-  assert.doesNotMatch(zhTW["ai.externalMcp.http.listenAddress"], /地址/);
-  assert.match(zhTW["ai.externalMcp.http.wslHint"], /鏡像網路/);
-});

application/i18n/locales/opencodeV2Locales.test.ts

@@ -1,39 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import en from './en';
-import zhCN from './zh-CN';
-import zhTW from './zh-TW';
-
-const KEYS = [
-  'ai.opencode.v2.startupTimeout',
-  'ai.opencode.v2.exited',
-  'ai.opencode.v2.unauthorized',
-  'ai.opencode.v2.unavailable',
-  'ai.opencode.v2.sessionFailed',
-  'ai.opencode.v2.empty',
-  'ai.opencode.v2.contextSkipped',
-  'ai.opencode.v2.mcpSkipped',
-];
-
-test('OpenCode 2 strings exist in English, Simplified Chinese, and Taiwan Chinese', () => {
-  for (const key of KEYS) {
-    assert.equal(typeof en[key], 'string', `en missing ${key}`);
-    assert.equal(typeof zhCN[key], 'string', `zh-CN missing ${key}`);
-    assert.equal(typeof zhTW[key], 'string', `zh-TW missing ${key}`);
-    assert.notEqual(en[key], zhCN[key]);
-    assert.notEqual(en[key], zhTW[key]);
-    assert.notEqual(zhCN[key], zhTW[key]);
-  }
-});
-
-test('Taiwan OpenCode 2 wording uses Taiwan terms', () => {
-  const text = KEYS.map((key) => zhTW[key]).join('\n');
-  assert.match(text, /終端機/);
-  assert.match(text, /連線/);
-  assert.match(text, /設定/);
-  assert.match(text, /傳回/);
-  assert.equal(text.includes('终端'), false);
-  assert.equal(text.includes('连接'), false);
-  assert.equal(text.includes('设置'), false);
-  assert.equal(text.includes('返回'), false);
-});

application/i18n/locales/ru/ai.ts

@@ -303,14 +303,6 @@ export const ruAiMessages: Messages = {
   'ai.externalMcp.idleTimeout.minutes': 'мин',
   'ai.externalMcp.focusOnHostOpen': 'Активировать окно при host_open',
   'ai.externalMcp.focusOnHostOpen.description': 'Когда MCP-клиент открывает хост, выводить главное окно на передний план. Отключите, чтобы работать без прерываний.',
-  'ai.externalMcp.approvalAlert': 'Оповещения об одобрении',
-  'ai.externalMcp.approvalAlert.description': 'Когда внешний MCP-клиент запрашивает подтверждение, показать системное уведомление. Пока Netcatty не в фокусе, панель задач или Dock привлекают внимание. Уведомление использует системный звук.',
-  'ai.externalMcp.approvalAlert.off': 'Выкл.',
-  'ai.externalMcp.approvalAlert.unfocused': 'Без фокуса',
-  'ai.externalMcp.approvalAlert.always': 'Всегда',
-  'ai.externalMcp.approvalAlert.notificationTitle': 'Одобрение External MCP',
-  'ai.externalMcp.approvalAlert.notificationBody': '{tool} ожидает одобрения',
-  'ai.externalMcp.approvalAlert.notificationBodyOnHost': '{tool} на {host} ожидает одобрения',
   'ai.externalMcp.silentSessions': 'Бесшумные сеансы MCP',
   'ai.externalMcp.silentSessions.description': 'Сеансы, открытые ИИ, не отображаются на панели вкладок и не восстанавливаются после перезапуска. Их можно посмотреть в любой момент через панель в трее.',
   'ai.externalMcp.sessionIdleTimeout': 'Тайм-аут открытого сеанса',
@@ -323,38 +315,6 @@ export const ruAiMessages: Messages = {
   'ai.externalMcp.help.ariaLabel': 'Справка External MCP',
   'ai.externalMcp.security': 'Безопасность',
   'ai.externalMcp.security.description': 'Слушает только 127.0.0.1 с ротацией token, использует AI Permission Mode для записи и удаляет discovery при отключении.',
-  'ai.externalMcp.http.title': 'Streamable HTTP',
-  'ai.externalMcp.http.description': 'Отдает те же инструменты External MCP по Streamable HTTP клиентам, которые не могут запустить stdio CLI, например Codex в WSL. По умолчанию выключено.',
-  'ai.externalMcp.http.enable': 'Включить HTTP',
-  'ai.externalMcp.http.port': 'Порт',
-  'ai.externalMcp.http.portHint': 'Фиксированный порт, по умолчанию 47391. URL клиентов не меняется после перезапуска. Допустимый диапазон: 1024–65535.',
-  'ai.externalMcp.http.allowCustomBind': 'Слушать другой адрес',
-  'ai.externalMcp.http.allowCustomBind.description': 'По умолчанию endpoint привязан к 127.0.0.1. Включите для WSL2 NAT и укажите 0.0.0.0 или IP vEthernet.',
-  'ai.externalMcp.http.listenAddress': 'Адрес прослушивания',
-  'ai.externalMcp.http.listenAddress.placeholder': '0.0.0.0',
-  'ai.externalMcp.http.clientHost': 'Адрес клиента',
-  'ai.externalMcp.http.clientHost.description': 'Подставляется в копируемые конфиги, если слушатель 0.0.0.0 или ::. Укажите доступный IP, например IP узла Windows.',
-  'ai.externalMcp.http.clientHost.placeholder': '172.22.0.1',
-  'ai.externalMcp.http.clientHostRequired': 'Укажите IP, к которому должны подключаться клиенты. 0.0.0.0 недоступен для подключения.',
-  'ai.externalMcp.http.invalidClientHost': 'Адрес клиента должен быть доступным IP, а не 0.0.0.0 или ::.',
-  'ai.externalMcp.http.warning': 'Прослушивание не только 127.0.0.1 открывает External MCP другим машинам, которые могут достичь этого адреса. Храните bearer token в секрете и не публикуйте этот порт.',
-  'ai.externalMcp.http.url': 'URL',
-  'ai.externalMcp.http.token': 'Bearer token',
-  'ai.externalMcp.http.regenerate': 'Создать заново',
-  'ai.externalMcp.http.regenerateHint': 'Выпускает новый bearer token. HTTP-клиенты должны использовать новый token. Файл discovery для stdio обновляется; уже подключенные stdio-клиенты остаются подключенными.',
-  'ai.externalMcp.http.wslHint': 'При mirrored networking в WSL достаточно localhost. Иначе слушайте 0.0.0.0 или IP vEthernet и укажите IP узла Windows как адрес клиента.',
-  'ai.externalMcp.http.codexSnippet': 'Codex config.toml',
-  'ai.externalMcp.http.claudeCommand': 'Claude Code',
-  'ai.externalMcp.http.genericSnippet': 'Общий JSON',
-  'ai.externalMcp.http.envLine': 'Переменная окружения token для Codex',
-  'ai.externalMcp.http.notListening': 'Не слушает',
-  'ai.externalMcp.http.listening': 'Слушает',
-  'ai.externalMcp.http.portInUse': 'Порт {port} уже занят.',
-  'ai.externalMcp.http.requiresExternalMcp': 'Сначала включите External MCP, чтобы endpoint начал слушать.',
-  'ai.externalMcp.http.invalidPort': 'Введите порт от 1024 до 65535.',
-  'ai.externalMcp.http.invalidAddress': 'Адрес прослушивания должен быть IP, например 0.0.0.0 или IP vEthernet.',
-  'ai.externalMcp.http.listenFailed': 'Не удалось начать прослушивание HTTP.',
-  'ai.externalMcp.http.legacySseNote': 'Устаревший HTTP+SSE (2024-11-05) не предоставляется. Используйте этот URL Streamable HTTP.',
   'ai.externalMcp.permissionMode': 'Текущий режим разрешений: {mode}',
   'ai.externalMcp.permissionMode.label': 'Режим разрешений на запись',
   'ai.externalMcp.permissionMode.hint': 'Тот же параметр, что Settings → AI → Safety. Auto выполняет write-инструменты Netcatty без запросов; Confirm спрашивает каждый раз. Внешние клиенты (Codex / Claude / Grok) могут показывать своё подтверждение инструментов.',

application/i18n/locales/ru/core.ts

@@ -397,7 +397,7 @@ export const ruCoreMessages: Messages = {
   'settings.appearance.themeColor.dark': 'Палитра тёмной темы',
   'settings.appearance.customCss': 'Пользовательский CSS',
   'settings.appearance.customCss.desc':
-    'Добавьте пользовательский CSS, чтобы настроить внешний вид. Изменения применяются сразу. Выбранные верхние вкладки (`.top-tab[data-active="true"]`) читают `--top-tab-active-bg`, `--top-tab-active-fg` и `--top-tab-active-border`. Не задавайте их, чтобы сохранить текущий вид.',
+    'Добавьте пользовательский CSS, чтобы настроить внешний вид. Изменения применяются сразу.',
   'settings.appearance.customCss.help.ariaLabel': 'Справка по пользовательскому CSS',
   'settings.appearance.customCss.help.title': 'Руководство по пользовательскому CSS',
   'settings.appearance.customCss.help.body': `Основные области интерфейса помечены атрибутом \`data-section\` для CSS-селекторов. Изменения применяются сразу после правки.
@@ -423,22 +423,6 @@ export const ruCoreMessages: Messages = {
 - \`top-tabs-host-tree-toggle\`
 - \`top-tabs-quick-switcher-toggle\`
 
-У выбранных верхних вкладок есть класс \`top-tab\` и атрибут \`data-active="true"\`. Задайте эти переменные, чтобы перекрасить выбранную вкладку. Не задавайте их, чтобы сохранить текущий вид. \`!important\` не нужен.
-
-- \`--top-tab-active-bg\` — заливка выбранной вкладки (по умолчанию текущий фон вкладки)
-- \`--top-tab-active-fg\` — цвет подписи (по умолчанию текущий цвет текста)
-- \`--top-tab-active-border\` — внутренняя обводка 1px (по умолчанию прозрачная, то есть без рамки)
-
-Вкладка Vaults остаётся плоской и не использует заливку.
-
-\`\`\`css
-.top-tab[data-active="true"] {
-  --top-tab-active-bg: #2563eb;
-  --top-tab-active-fg: #ffffff;
-  --top-tab-active-border: #1d4ed8;
-}
-\`\`\`
-
 ### Хранилище
 
 - \`vault-view\`
@@ -518,7 +502,7 @@ export const ruCoreMessages: Messages = {
 \`\`\`
 `,
   'settings.appearance.customCss.placeholder':
-    '/* Примеры — используйте !important, чтобы переопределить специфичность утилит Tailwind */\n\n/* Выбранная верхняя вкладка. Не задавайте переменные, чтобы сохранить текущий вид. */\n.top-tab[data-active="true"] {\n  --top-tab-active-bg: #2563eb;\n  --top-tab-active-fg: #ffffff;\n  --top-tab-active-border: #1d4ed8;\n}\n\n/* Скрыть переключатель списка хостов в верхней панели вкладок */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* Скрыть кнопку плюса, открывающую быстрый переключатель */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* Рамка вокруг боковой панели SFTP (не остаётся после закрытия) */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* Изменить фон всей боковой панели, а не только верхних вкладок */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* Настроить выбранные строки SFTP */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* Более заметные разделители сплита */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* Подсветка активной панели сплита */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* Или: Настройки → Терминал → Индикатор фокуса → Рамка вокруг активной панели */',
+    '/* Примеры — используйте !important, чтобы переопределить специфичность утилит Tailwind */\n\n/* Скрыть переключатель списка хостов в верхней панели вкладок */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* Скрыть кнопку плюса, открывающую быстрый переключатель */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* Рамка вокруг боковой панели SFTP (не остаётся после закрытия) */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* Изменить фон всей боковой панели, а не только верхних вкладок */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* Настроить выбранные строки SFTP */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* Более заметные разделители сплита */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* Подсветка активной панели сплита */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* Или: Настройки → Терминал → Индикатор фокуса → Рамка вокруг активной панели */',
   'settings.appearance.language': 'Язык',
   'settings.appearance.language.desc': 'Выберите язык интерфейса',
   'settings.appearance.uiFont': 'Шрифт интерфейса',
@@ -679,7 +663,7 @@ export const ruCoreMessages: Messages = {
     'Отправлять настроенный текст вместо обычного Enter при нажатии Shift+Enter в терминале.',
   'settings.terminal.behavior.shiftEnterNewlineText': 'Отправляемый текст',
   'settings.terminal.behavior.shiftEnterNewlineText.desc':
-    'Используйте \\n для перевода строки, \\t для табуляции, \\e для Escape и \\\\ для обратной косой черты. По умолчанию \\e\\r (Escape + Enter, классическая кодировка Alt+Enter), которую большинство TUI-CLI распознают как перевод строки.',
+    'Используйте \\n для перевода строки, \\t для табуляции, \\e для Escape и \\\\ для обратной косой черты.',
   'settings.terminal.behavior.shiftEnterForceText': 'Отправлять текст и в режиме ввода Win32',
   'settings.terminal.behavior.shiftEnterForceText.desc':
     'Отправлять указанный выше текст даже когда локальная сессия Windows ConPTY согласует режим ввода Win32. Нужно для CLI на Node/Bun (Claude Code, CodeBuddy), которые не читают модификаторы из записей ввода консоли.',
@@ -791,10 +775,6 @@ export const ruCoreMessages: Messages = {
   'settings.terminal.localShellSidePanel.autoOpenPane.desc': 'Выберите, какую панель открывать в первую очередь.',
   'settings.terminal.localShellSidePanel.pane.files': 'Файлы',
   'settings.terminal.section.connection': 'Подключение',
-  'settings.terminal.connection.temporaryLegacyAlgorithms': 'Устаревшие алгоритмы для временных подключений',
-  'settings.terminal.connection.temporaryLegacyAlgorithms.desc': 'SSH-подключения без сохранённого хоста, включая запуск в стиле PuTTY и быстрое подключение, предлагают те же устаревшие алгоритмы, что и настройка хоста. Сохранённые хосты используют свою настройку. По умолчанию выключено: у этих алгоритмов есть известные слабости.',
-  'settings.terminal.connection.temporaryNetworkDeviceMode': 'Режим сетевого устройства для временных подключений',
-  'settings.terminal.connection.temporaryNetworkDeviceMode.desc': 'SSH-подключения без сохранённого хоста, включая внешний запуск и быстрое подключение, открываются в режиме сетевого устройства. Сохранённые хосты и группы сохраняют свой тип устройства. По умолчанию выключено.',
   'settings.terminal.connection.keepaliveInterval': 'Интервал keepalive',
   'settings.terminal.connection.keepaliveInterval.desc': 'Как часто (в секундах) отправлять keepalive-пакеты на уровне SSH. Установите 0, чтобы отключить глобально. Учтите, что отдельные хосты могут переопределять это значение в своих настройках.',
   'settings.terminal.connection.keepaliveCountMax': 'Макс. число пропущенных keepalive',

application/i18n/locales/ru/terminal.ts

@@ -130,8 +130,6 @@ export const ruTerminalMessages: Messages = {
   'terminal.serverStats.cpu': 'Использование CPU',
   'terminal.serverStats.cpuCores': 'Использование ядер CPU',
   'terminal.serverStats.gpu': 'Использование GPU',
-  'terminal.serverStats.gpuDevices': 'Использование видеокарт',
-  'terminal.serverStats.gpuIndex': 'GPU {{index}}',
   'terminal.serverStats.memory': 'Использование памяти',
   'terminal.serverStats.memoryDetails': 'Сведения о памяти',
   'terminal.serverStats.memUsed': 'Использовано',
@@ -919,13 +917,11 @@ export const ruTerminalMessages: Messages = {
   'keyboard.interactive.desc': 'Сервер требует дополнительную аутентификацию.',
   'keyboard.interactive.descWithHost': 'Сервер {hostname} требует дополнительную аутентификацию.',
   'keyboard.interactive.response': 'Ответ',
-  'keyboard.interactive.verificationCode': 'Код подтверждения',
   'keyboard.interactive.enterCode': 'Введите код подтверждения',
   'keyboard.interactive.enterResponse': 'Введите ответ',
   'keyboard.interactive.submit': 'Отправить',
   'keyboard.interactive.verifying': 'Проверка...',
   'keyboard.interactive.savePassword': 'Сохранить пароль',
-  'keyboard.interactive.fillTotp': 'Подставить код подтверждения',
 
   // Passphrase Modal for encrypted SSH keys
   'passphrase.title': 'Парольная фраза SSH-ключа',

application/i18n/locales/ru/vault.ts

@@ -710,10 +710,6 @@ export const ruVaultMessages: Messages = {
 
   // Quick Switcher
   'qs.search.placeholder': 'Поиск хостов или вкладок',
-  'qs.quickConnectTo': 'Быстрое подключение к {target}',
-  'qs.hosts': 'Хосты',
-  'qs.tabs': 'Вкладки',
-  'qs.newWorkspace': 'Новая рабочая область',
   'qs.jumpTo': 'Перейти к',
   'qs.localTerminal': 'Локальный терминал',
   'qs.localShells': 'Локальные оболочки',
@@ -918,35 +914,6 @@ export const ruVaultMessages: Messages = {
   'hostDetails.auth.certificate.desc': 'Использовать выбранный SSH-сертификат и сохранённый пароль как запасной вариант.',
   'hostDetails.auth.mfaFirst': 'Сначала интерактивная аутентификация',
   'hostDetails.auth.mfaFirst.desc': 'Для серверов, которым нужны пароль и MFA через keyboard-interactive.',
-  'hostDetails.totp.title': 'Аутентификатор (TOTP)',
-  'hostDetails.totp.enable': 'Сохранить секрет TOTP для этого хоста',
-  'hostDetails.totp.setup': 'Настроить…',
-  'hostDetails.totp.edit': 'Изменить',
-  'hostDetails.totp.modalTitle': 'Настройка аутентификатора',
-  'hostDetails.totp.replacePlaceholder': 'Вставьте новый секрет, чтобы заменить текущий',
-  'hostDetails.totp.warning': 'Тот, кто откроет это хранилище, получит этот код и пароль. Используйте только на личном устройстве.',
-  'hostDetails.totp.secret': 'Секрет или URI otpauth',
-  'hostDetails.totp.secretPlaceholder': 'Вставьте otpauth://totp/... или секрет Base32',
-  'hostDetails.totp.importQr': 'Импорт изображения QR',
-  'hostDetails.totp.scanScreen': 'Сканировать QR-код с экрана',
-  'hostDetails.totp.scanning': 'Сканирование экранов…',
-  'hostDetails.totp.importedAccount': 'Импортировано: {account}',
-  'hostDetails.totp.preview': 'Текущий код',
-  'hostDetails.totp.countdown': 'Осталось {seconds} с',
-  'hostDetails.totp.autoSubmit': 'Автоотправка на известных запросах TOTP',
-  'hostDetails.totp.autoSubmitDesc': 'Отправляется один раз за подключение и только если запрос точно совпадает с JumpServer, Google Authenticator PAM или вашим шаблоном.',
-  'hostDetails.totp.promptPattern': 'Свой шаблон запроса',
-  'hostDetails.totp.promptPatternPlaceholder': 'Необязательное регулярное выражение RE2',
-  'hostDetails.totp.clear': 'Удалить аутентификатор',
-  'hostDetails.totp.removeTitle': 'Удалить аутентификатор?',
-  'hostDetails.totp.removeMessage': 'Этот хост больше не будет хранить этот секрет TOTP.',
-  'hostDetails.totp.error.hotp': 'HOTP не поддерживается. Используйте секрет TOTP.',
-  'hostDetails.totp.error.migration': 'Коды otpauth-migration не поддерживаются. Используйте QR-код привязки одной учетной записи.',
-  'hostDetails.totp.error.invalid': 'Не удалось прочитать секрет TOTP.',
-  'hostDetails.totp.error.notFound': 'QR-код TOTP не найден.',
-  'hostDetails.totp.error.permission': 'Нужно разрешение на запись экрана. Разрешите Netcatty запись экрана в системных настройках и повторите попытку.',
-  'hostDetails.totp.error.unavailable': 'Захват экрана недоступен.',
-  'hostDetails.totp.error.pattern': 'Пользовательский шаблон не является допустимым регулярным выражением RE2.',
   'hostDetails.auth.credentialRequired': 'Перед сохранением этого способа входа выберите ключ или сертификат.',
   'hostDetails.identity.suggestions': 'Идентификаторы',
   'hostDetails.identity.missing': 'Идентификатор не найден',

application/i18n/locales/serverStatsGpu.test.ts

@@ -1,23 +0,0 @@
-import test from "node:test";
-import assert from "node:assert/strict";
-
-import { enTerminalMessages } from "./en/terminal";
-import { esTerminalMessages } from "./es/terminal";
-import { ruTerminalMessages } from "./ru/terminal";
-import { zhCNVaultMessages } from "./zh-CN/vault";
-import { zhTWVaultMessages } from "./zh-TW/vault";
-
-test("per-GPU stats strings exist in every locale", () => {
-  const labels = [
-    [enTerminalMessages, "GPU Device Usage", "GPU {{index}}"],
-    [esTerminalMessages, "Uso de cada GPU", "GPU {{index}}"],
-    [ruTerminalMessages, "Использование видеокарт", "GPU {{index}}"],
-    [zhCNVaultMessages, "GPU 设备使用率", "GPU {{index}}"],
-    [zhTWVaultMessages, "GPU 裝置使用率", "GPU {{index}}"],
-  ] as const;
-
-  for (const [messages, devices, indexLabel] of labels) {
-    assert.equal(messages["terminal.serverStats.gpuDevices"], devices);
-    assert.equal(messages["terminal.serverStats.gpuIndex"], indexLabel);
-  }
-});

application/i18n/locales/settingsLocales.test.ts

@@ -47,40 +47,6 @@ test("localized settings include workspace focus indicator labels", () => {
   }
 });
 
-test("localized settings include temporary-connection legacy algorithm labels", () => {
-  const keys = [
-    "settings.terminal.connection.temporaryLegacyAlgorithms",
-    "settings.terminal.connection.temporaryLegacyAlgorithms.desc",
-  ];
-  const locales = [{ name: "en", messages: en }, ...LOCALIZED_SETTINGS_LOCALES];
-
-  for (const locale of locales) {
-    const missing = keys.filter((key) => !locale.messages[key]);
-    assert.deepEqual(missing, [], `${locale.name} is missing temporary legacy algorithm labels`);
-  }
-
-  assert.match(zhCN["settings.terminal.connection.temporaryLegacyAlgorithms"], /临时连接允许旧版算法/);
-  assert.match(zhTW["settings.terminal.connection.temporaryLegacyAlgorithms"], /臨時連線允許舊版演算法/);
-});
-
-test("localized settings include temporary-connection network device mode labels", () => {
-  const keys = [
-    "settings.terminal.connection.temporaryNetworkDeviceMode",
-    "settings.terminal.connection.temporaryNetworkDeviceMode.desc",
-  ];
-  const locales = [{ name: "en", messages: en }, ...LOCALIZED_SETTINGS_LOCALES];
-
-  for (const locale of locales) {
-    const missing = keys.filter((key) => !locale.messages[key]);
-    assert.deepEqual(missing, [], `${locale.name} is missing temporary network device mode labels`);
-  }
-
-  assert.match(zhCN["settings.terminal.connection.temporaryNetworkDeviceMode"], /临时连接使用网络设备模式/);
-  assert.match(zhTW["settings.terminal.connection.temporaryNetworkDeviceMode"], /臨時連線使用網路裝置模式/);
-  assert.match(zhTW["settings.terminal.connection.temporaryNetworkDeviceMode.desc"], /連線/);
-  assert.match(zhTW["settings.terminal.connection.temporaryNetworkDeviceMode.desc"], /設定|群組|裝置/);
-});
-
 test("localized settings include the global default proxy labels", () => {
   const keys = [
     "settings.terminal.connection.defaultProxy",

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

@@ -289,14 +289,6 @@ export const zhCNAiMessages: Messages = {
   'ai.opencode.customPathPlaceholder': '例如 /usr/local/bin/opencode',
   'ai.opencode.check': '检查',
   'ai.opencode.resetPath': '重置',
-  'ai.opencode.v2.startupTimeout': 'OpenCode 2 未能及时就绪。请先在终端确认 `opencode serve` 可以启动，然后重试。',
-  'ai.opencode.v2.exited': 'OpenCode 2 在对话开始前已退出。',
-  'ai.opencode.v2.unauthorized': 'OpenCode 2 拒绝了连接。请重试这次对话。',
-  'ai.opencode.v2.unavailable': '无法连接到 OpenCode 2。请确认已安装后再试。',
-  'ai.opencode.v2.sessionFailed': 'OpenCode 2 未能完成这一轮对话。',
-  'ai.opencode.v2.empty': 'OpenCode 2 没有返回内容。请在终端运行 `opencode` 完成登录和模型配置。',
-  'ai.opencode.v2.contextSkipped': 'OpenCode 2 无法应用 Netcatty 的对话上下文。',
-  'ai.opencode.v2.mcpSkipped': 'OpenCode 2 无法接入 MCP 工具，对话会继续，但没有该工具。',
 
   // AI MiMo Code（小米 MiMo Code CLI，OpenCode 分支）
   'ai.mimo.title': 'MiMo Code',
@@ -364,14 +356,6 @@ export const zhCNAiMessages: Messages = {
   'ai.externalMcp.idleTimeout.minutes': '分钟',
   'ai.externalMcp.focusOnHostOpen': 'host_open 时激活窗口',
   'ai.externalMcp.focusOnHostOpen.description': '当 MCP 客户端打开主机连接时，将主窗口切换到前台。关闭后可不受打扰地继续当前工作。',
-  'ai.externalMcp.approvalAlert': '审批提醒',
-  'ai.externalMcp.approvalAlert.description': '外部 MCP 客户端请求确认时显示系统通知。Netcatty 未聚焦时，任务栏或 Dock 会请求注意。通知使用系统提示音。',
-  'ai.externalMcp.approvalAlert.off': '关闭',
-  'ai.externalMcp.approvalAlert.unfocused': '未聚焦时',
-  'ai.externalMcp.approvalAlert.always': '始终',
-  'ai.externalMcp.approvalAlert.notificationTitle': '对外 MCP 审批',
-  'ai.externalMcp.approvalAlert.notificationBody': '{tool} 正在等待审批',
-  'ai.externalMcp.approvalAlert.notificationBodyOnHost': '{host} 上的 {tool} 正在等待审批',
   'ai.externalMcp.silentSessions': 'AI 会话静默运行',
   'ai.externalMcp.silentSessions.description': 'AI 打开的会话不会出现在标签栏，重启后也不会恢复。可随时在托盘面板中查看。',
   'ai.externalMcp.sessionIdleTimeout': '已打开会话空闲超时',
@@ -384,38 +368,6 @@ export const zhCNAiMessages: Messages = {
   'ai.externalMcp.help.ariaLabel': '对外 MCP 使用说明',
   'ai.externalMcp.security': '安全',
   'ai.externalMcp.security.description': '仅监听 127.0.0.1，使用轮换 token，写操作复用 AI 权限模式，关闭时删除 discovery。不做 OAuth——这是本机桌面桥接。',
-  'ai.externalMcp.http.title': 'Streamable HTTP',
-  'ai.externalMcp.http.description': '用 Streamable HTTP 提供同一套对外 MCP 工具，方便无法启动 stdio CLI 的客户端，例如 WSL 里的 Codex。默认关闭。',
-  'ai.externalMcp.http.enable': '启用 HTTP',
-  'ai.externalMcp.http.port': '端口',
-  'ai.externalMcp.http.portHint': '固定端口，默认 47391。重启后客户端地址保持不变。允许范围：1024–65535。',
-  'ai.externalMcp.http.allowCustomBind': '监听其他地址',
-  'ai.externalMcp.http.allowCustomBind.description': '默认只绑定 127.0.0.1。WSL2 NAT 可改为监听 0.0.0.0 或 vEthernet IP。',
-  'ai.externalMcp.http.listenAddress': '监听地址',
-  'ai.externalMcp.http.listenAddress.placeholder': '0.0.0.0',
-  'ai.externalMcp.http.clientHost': '客户端地址',
-  'ai.externalMcp.http.clientHost.description': '监听 0.0.0.0 或 :: 时，复制的配置会使用这个地址。请填写客户端能访问的 IP，例如 Windows 主机 IP。',
-  'ai.externalMcp.http.clientHost.placeholder': '172.22.0.1',
-  'ai.externalMcp.http.clientHostRequired': '请填写客户端要连接的 IP。0.0.0.0 不是可连接的地址。',
-  'ai.externalMcp.http.invalidClientHost': '客户端地址必须是可连接的 IP，不能是 0.0.0.0 或 ::。',
-  'ai.externalMcp.http.warning': '监听 127.0.0.1 以外的地址会让能访问这台电脑的其他设备使用对外 MCP。请保管 bearer token，不要把这个端口暴露到公网。',
-  'ai.externalMcp.http.url': 'URL',
-  'ai.externalMcp.http.token': 'Bearer token',
-  'ai.externalMcp.http.regenerate': '重新生成',
-  'ai.externalMcp.http.regenerateHint': '生成新的 bearer token。HTTP 客户端必须改用新 token。stdio 的 discovery 文件会一起更新；已经通过 stdio 连上的客户端保持连接。',
-  'ai.externalMcp.http.wslHint': 'WSL 若使用镜像网络，localhost 即可连接。否则请监听 0.0.0.0 或 vEthernet IP，并把客户端地址设为 Windows 主机 IP。',
-  'ai.externalMcp.http.codexSnippet': 'Codex config.toml',
-  'ai.externalMcp.http.claudeCommand': 'Claude Code',
-  'ai.externalMcp.http.genericSnippet': '通用 JSON',
-  'ai.externalMcp.http.envLine': 'Codex token 环境变量',
-  'ai.externalMcp.http.notListening': '未监听',
-  'ai.externalMcp.http.listening': '监听中',
-  'ai.externalMcp.http.portInUse': '端口 {port} 已被占用。',
-  'ai.externalMcp.http.requiresExternalMcp': '请先打开对外 MCP，HTTP 端点才会开始监听。',
-  'ai.externalMcp.http.invalidPort': '请输入 1024 到 65535 的端口。',
-  'ai.externalMcp.http.invalidAddress': '监听地址必须是 IP，例如 0.0.0.0 或 vEthernet IP。',
-  'ai.externalMcp.http.listenFailed': 'HTTP 监听失败。',
-  'ai.externalMcp.http.legacySseNote': '不提供旧版 HTTP+SSE（2024-11-05）。请使用这个 Streamable HTTP 地址。',
   'ai.externalMcp.permissionMode': '当前权限模式：{mode}',
   'ai.externalMcp.permissionMode.label': '写操作权限模式',
   'ai.externalMcp.permissionMode.hint': '与「设置 → AI → 安全」为同一项。自动：Netcatty 写操作不再弹本应用审批；确认：每次询问。外部客户端（Codex / Claude / Grok）仍可能有自己的工具审批界面。',

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

@@ -417,7 +417,7 @@ export const zhCNCoreMessages: Messages = {
   'settings.appearance.themeColor.dark': '深色主题',
   'settings.appearance.customCss': '自定义 CSS',
   'settings.appearance.customCss.desc':
-    '使用自定义 CSS 个性化界面，修改会立即生效。选中的顶部标签（`.top-tab[data-active="true"]`）会读取 `--top-tab-active-bg`、`--top-tab-active-fg` 和 `--top-tab-active-border`。不设置则保持当前外观。',
+    '使用自定义 CSS 个性化界面，修改会立即生效。',
   'settings.appearance.customCss.help.ariaLabel': '自定义 CSS 说明',
   'settings.appearance.customCss.help.title': '自定义 CSS 说明',
   'settings.appearance.customCss.help.body': `主要 UI 区块都暴露了 \`data-section\` 属性，供你用 CSS 定位。编辑后会立即生效。
@@ -444,22 +444,6 @@ export const zhCNCoreMessages: Messages = {
 - \`top-tabs-host-tree-toggle\`
 - \`top-tabs-quick-switcher-toggle\`
 
-选中的顶部标签带有 \`top-tab\` 类和 \`data-active="true"\`。设置下面的变量即可改变选中标签的颜色；不设置则保持当前外观。这些变量不需要 \`!important\`。
-
-- \`--top-tab-active-bg\` — 选中标签的背景（默认是现在的标签背景）
-- \`--top-tab-active-fg\` — 选中标签的文字颜色（默认是现在的文字颜色）
-- \`--top-tab-active-border\` — 1px 内描边（默认透明，也就是没有边框）
-
-Vaults 标签保持扁平，不使用这块背景。
-
-\`\`\`css
-.top-tab[data-active="true"] {
-  --top-tab-active-bg: #2563eb;
-  --top-tab-active-fg: #ffffff;
-  --top-tab-active-border: #1d4ed8;
-}
-\`\`\`
-
 ### 保险库
 
 - \`vault-view\`
@@ -553,7 +537,7 @@ Vaults 标签保持扁平，不使用这块背景。
 \`\`\`
 `,
   'settings.appearance.customCss.placeholder':
-    '/* 示例 — 由于 Tailwind 优先级较高，需要使用 !important */\n\n/* 选中的顶部标签。不设置这些变量则保持当前外观。 */\n.top-tab[data-active="true"] {\n  --top-tab-active-bg: #2563eb;\n  --top-tab-active-fg: #ffffff;\n  --top-tab-active-border: #1d4ed8;\n}\n\n/* 隐藏顶部标签栏里的主机列表开关 */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* 隐藏打开快速切换器的加号按钮 */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* SFTP / 操作侧栏边框（关闭侧栏后不会残留） */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* 修改整个操作侧栏背景，而不只是顶部标签 */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* 修改选中的 SFTP 文件行 */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* 加粗分屏分割线 */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* 高亮当前聚焦的分屏 */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* 也可在 设置 → 终端 → 工作区聚焦指示 → 聚焦窗格显示边框 */',
+    '/* 示例 — 由于 Tailwind 优先级较高，需要使用 !important */\n\n/* 隐藏顶部标签栏里的主机列表开关 */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* 隐藏打开快速切换器的加号按钮 */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* SFTP / 操作侧栏边框（关闭侧栏后不会残留） */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* 修改整个操作侧栏背景，而不只是顶部标签 */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* 修改选中的 SFTP 文件行 */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* 加粗分屏分割线 */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* 高亮当前聚焦的分屏 */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* 也可在 设置 → 终端 → 工作区聚焦指示 → 聚焦窗格显示边框 */',
   'settings.appearance.language': '语言',
   'settings.appearance.language.desc': '选择界面语言',
   'settings.appearance.uiFont': '界面字体',
@@ -1139,10 +1123,6 @@ Vaults 标签保持扁平，不使用这块背景。
 
   // Quick Switcher
   'qs.search.placeholder': '搜索主机或标签页',
-  'qs.quickConnectTo': '快速连接到 {target}',
-  'qs.hosts': '主机',
-  'qs.tabs': '标签页',
-  'qs.newWorkspace': '新建工作区',
   'qs.jumpTo': '跳转到',
   'qs.localTerminal': '本地终端',
   'qs.localShells': '本地 Shell',

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

@@ -352,7 +352,7 @@ export const zhCNTerminalMessages: Messages = {
     '在终端中按 Shift+Enter 时发送配置的文本，而不是普通回车。',
   'settings.terminal.behavior.shiftEnterNewlineText': '发送内容',
   'settings.terminal.behavior.shiftEnterNewlineText.desc':
-    '使用 \\n 表示换行，\\t 表示 Tab，\\e 表示 ESC，\\\\ 表示反斜杠。默认 \\e\\r（ESC+回车，传统 Alt+Enter 编码），大多数 TUI CLI 会将其识别为换行。',
+    '使用 \\n 表示换行，\\t 表示 Tab，\\e 表示 ESC，\\\\ 表示反斜杠。',
   'settings.terminal.behavior.shiftEnterForceText': '在 Win32 输入模式下也发送文本',
   'settings.terminal.behavior.shiftEnterForceText.desc':
     '本机 Windows ConPTY 会话协商 Win32 输入模式时，仍然发送上面的文本。Node/Bun 写的 CLI（Claude Code、CodeBuddy）读不到控制台输入记录里的修饰键，需要这个开关才能区分 Shift+Enter。',
@@ -454,10 +454,6 @@ export const zhCNTerminalMessages: Messages = {
   'settings.terminal.localShell.startDir.notFound': '目录不存在',
   'settings.terminal.localShell.startDir.isFile': '路径是文件，不是目录',
   'settings.terminal.section.connection': '连接',
-  'settings.terminal.connection.temporaryLegacyAlgorithms': '临时连接允许旧版算法',
-  'settings.terminal.connection.temporaryLegacyAlgorithms.desc': '没有对应已保存主机的 SSH 连接（包括外部程序以 PuTTY 参数启动，以及快速连接）会使用与主机「允许旧版算法」相同的已弃用算法。已保存主机仍使用自己的设置。默认关闭，这些算法有已知安全问题。',
-  'settings.terminal.connection.temporaryNetworkDeviceMode': '临时连接使用网络设备模式',
-  'settings.terminal.connection.temporaryNetworkDeviceMode.desc': '没有对应已保存主机的 SSH 连接（包括外部程序启动以及快速连接）会以网络设备模式连接。已保存主机和分组仍使用自己的设备类型。默认关闭。',
   'settings.terminal.connection.defaultProxy': '默认代理',
   'settings.terminal.connection.defaultProxy.desc': '主机没有单独设置、也没有从分组继承代理时使用的已保存代理。选择“无”则直接连接。',
   'settings.terminal.connection.defaultProxy.none': '无',
@@ -1003,13 +999,11 @@ export const zhCNTerminalMessages: Messages = {
   'keyboard.interactive.desc': '服务器需要额外的身份验证。',
   'keyboard.interactive.descWithHost': '服务器 {hostname} 需要额外的身份验证。',
   'keyboard.interactive.response': '响应',
-  'keyboard.interactive.verificationCode': '验证码',
   'keyboard.interactive.enterCode': '输入验证码',
   'keyboard.interactive.enterResponse': '输入响应',
   'keyboard.interactive.submit': '提交',
   'keyboard.interactive.verifying': '验证中...',
   'keyboard.interactive.savePassword': '保存密码',
-  'keyboard.interactive.fillTotp': '填入验证码',
 
   // Passphrase Modal for encrypted SSH keys
   'passphrase.title': 'SSH 密钥密码',

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

@@ -290,35 +290,6 @@ export const zhCNVaultMessages: Messages = {
   'hostDetails.auth.certificate.desc': '使用选中的 SSH 证书；如果同时保存了密码，可在失败后尝试密码。',
   'hostDetails.auth.mfaFirst': '优先交互式认证',
   'hostDetails.auth.mfaFirst.desc': '适用于必须通过 keyboard-interactive 输入密码和 MFA 的服务器。',
-  'hostDetails.totp.title': '验证器 (TOTP)',
-  'hostDetails.totp.enable': '为这台主机保存 TOTP 密钥',
-  'hostDetails.totp.setup': '设置…',
-  'hostDetails.totp.edit': '编辑',
-  'hostDetails.totp.modalTitle': '设置验证器',
-  'hostDetails.totp.replacePlaceholder': '粘贴新密钥以替换当前密钥',
-  'hostDetails.totp.warning': '能打开这个保险库的人会同时得到验证码和密码。请只在个人设备上使用。',
-  'hostDetails.totp.secret': '密钥或 otpauth URI',
-  'hostDetails.totp.secretPlaceholder': '粘贴 otpauth://totp/... 或 Base32 密钥',
-  'hostDetails.totp.importQr': '导入二维码图片',
-  'hostDetails.totp.scanScreen': '从屏幕扫描二维码',
-  'hostDetails.totp.scanning': '正在扫描屏幕…',
-  'hostDetails.totp.importedAccount': '已导入 {account}',
-  'hostDetails.totp.preview': '当前验证码',
-  'hostDetails.totp.countdown': '剩余 {seconds} 秒',
-  'hostDetails.totp.autoSubmit': '在已知 TOTP 提示上自动提交',
-  'hostDetails.totp.autoSubmitDesc': '每次连接只提交一次，且提示必须精确匹配 JumpServer、Google Authenticator PAM，或你填写的正则。',
-  'hostDetails.totp.promptPattern': '自定义提示正则',
-  'hostDetails.totp.promptPatternPlaceholder': '可选的 RE2 正则表达式',
-  'hostDetails.totp.clear': '移除验证器',
-  'hostDetails.totp.removeTitle': '移除验证器？',
-  'hostDetails.totp.removeMessage': '这台主机将不再保存这个 TOTP 密钥。',
-  'hostDetails.totp.error.hotp': '不支持 HOTP。请使用 TOTP 密钥。',
-  'hostDetails.totp.error.migration': '不支持 otpauth-migration 二维码。请使用服务提供的单个账号绑定二维码。',
-  'hostDetails.totp.error.invalid': '无法从该内容读取 TOTP 密钥。',
-  'hostDetails.totp.error.notFound': '没有找到 TOTP 二维码。',
-  'hostDetails.totp.error.permission': '需要屏幕录制权限。请在系统设置中允许 Netcatty 录制屏幕后再试。',
-  'hostDetails.totp.error.unavailable': '无法使用屏幕捕获。',
-  'hostDetails.totp.error.pattern': '自定义提示正则不是有效的 RE2 正则表达式。',
   'hostDetails.auth.credentialRequired': '保存这种登录方式前，请先选择密钥或证书。',
   'hostDetails.identity.suggestions': '身份',
   'hostDetails.identity.missing': '身份不存在',
@@ -563,8 +534,6 @@ export const zhCNVaultMessages: Messages = {
   'terminal.serverStats.cpu': 'CPU 使用率',
   'terminal.serverStats.cpuCores': 'CPU 核心使用率',
   'terminal.serverStats.gpu': 'GPU 使用率',
-  'terminal.serverStats.gpuDevices': 'GPU 设备使用率',
-  'terminal.serverStats.gpuIndex': 'GPU {{index}}',
   'terminal.serverStats.memory': '内存使用',
   'terminal.serverStats.memoryDetails': '内存详情',
   'terminal.serverStats.memUsed': '已用',

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

@@ -280,14 +280,6 @@ export const zhTWAiMessages: Messages = {
   'ai.opencode.customPathPlaceholder': '例如 /usr/local/bin/opencode',
   'ai.opencode.check': '檢查',
   'ai.opencode.resetPath': '重設',
-  'ai.opencode.v2.startupTimeout': 'OpenCode 2 未能及時就緒。請先在終端機確認 `opencode serve` 可以啟動，然後重試。',
-  'ai.opencode.v2.exited': 'OpenCode 2 在對話開始前已結束。',
-  'ai.opencode.v2.unauthorized': 'OpenCode 2 拒絕了連線。請重試這次對話。',
-  'ai.opencode.v2.unavailable': '無法連線到 OpenCode 2。請確認已安裝後再試。',
-  'ai.opencode.v2.sessionFailed': 'OpenCode 2 未能完成這一輪對話。',
-  'ai.opencode.v2.empty': 'OpenCode 2 沒有傳回內容。請在終端機執行 `opencode` 完成登入和模型設定。',
-  'ai.opencode.v2.contextSkipped': 'OpenCode 2 無法套用 Netcatty 的對話內容。',
-  'ai.opencode.v2.mcpSkipped': 'OpenCode 2 無法掛接 MCP 工具，對話會繼續，但沒有該工具。',
 
   // AI MiMo Code（小米 MiMo Code CLI，OpenCode 分支）
   'ai.mimo.title': 'MiMo Code',
@@ -354,14 +346,6 @@ export const zhTWAiMessages: Messages = {
   'ai.externalMcp.idleTimeout.minutes': '分鐘',
   'ai.externalMcp.focusOnHostOpen': 'host_open 時啟用視窗',
   'ai.externalMcp.focusOnHostOpen.description': '當 MCP 用戶端開啟主機連線時，將主視窗切換到前景。關閉後可不受打擾地繼續目前工作。',
-  'ai.externalMcp.approvalAlert': '核准提醒',
-  'ai.externalMcp.approvalAlert.description': '外部 MCP 用戶端請求確認時顯示系統通知。Netcatty 未聚焦時，工作列或 Dock 會要求注意。通知使用系統提示音。',
-  'ai.externalMcp.approvalAlert.off': '關閉',
-  'ai.externalMcp.approvalAlert.unfocused': '未聚焦時',
-  'ai.externalMcp.approvalAlert.always': '一律',
-  'ai.externalMcp.approvalAlert.notificationTitle': '對外 MCP 核准',
-  'ai.externalMcp.approvalAlert.notificationBody': '{tool} 正在等待核准',
-  'ai.externalMcp.approvalAlert.notificationBodyOnHost': '{host} 上的 {tool} 正在等待核准',
   'ai.externalMcp.silentSessions': 'AI 工作階段靜默執行',
   'ai.externalMcp.silentSessions.description': 'AI 開啟的工作階段不會出現在分頁列，重新啟動後也不會還原。可隨時在系統匣面板中查看。',
   'ai.externalMcp.sessionIdleTimeout': '已開啟工作階段閒置逾時',
@@ -374,38 +358,6 @@ export const zhTWAiMessages: Messages = {
   'ai.externalMcp.help.ariaLabel': '對外 MCP 使用說明',
   'ai.externalMcp.security': '安全',
   'ai.externalMcp.security.description': '僅監聽 127.0.0.1，使用輪替 token，寫入操作重用 AI 權限模式，關閉時刪除 discovery。',
-  'ai.externalMcp.http.title': 'Streamable HTTP',
-  'ai.externalMcp.http.description': '以 Streamable HTTP 提供同一套對外 MCP 工具，給無法啟動 stdio CLI 的用戶端使用，例如 WSL 裡的 Codex。預設關閉。',
-  'ai.externalMcp.http.enable': '啟用 HTTP',
-  'ai.externalMcp.http.port': '連接埠',
-  'ai.externalMcp.http.portHint': '固定連接埠，預設 47391。重新啟動後用戶端網址維持不變。允許範圍：1024–65535。',
-  'ai.externalMcp.http.allowCustomBind': '監聽其他位址',
-  'ai.externalMcp.http.allowCustomBind.description': '預設只綁定 127.0.0.1。WSL2 NAT 可改為監聽 0.0.0.0 或 vEthernet IP。',
-  'ai.externalMcp.http.listenAddress': '監聽位址',
-  'ai.externalMcp.http.listenAddress.placeholder': '0.0.0.0',
-  'ai.externalMcp.http.clientHost': '用戶端位址',
-  'ai.externalMcp.http.clientHost.description': '監聽 0.0.0.0 或 :: 時，複製的設定會使用這個位址。請填用戶端連得到的 IP，例如 Windows 主機 IP。',
-  'ai.externalMcp.http.clientHost.placeholder': '172.22.0.1',
-  'ai.externalMcp.http.clientHostRequired': '請填用戶端要連線的 IP。0.0.0.0 不是可連線的位址。',
-  'ai.externalMcp.http.invalidClientHost': '用戶端位址必須是可連線的 IP，不能是 0.0.0.0 或 ::。',
-  'ai.externalMcp.http.warning': '監聽 127.0.0.1 以外的位址，會讓能連到這台電腦的其他裝置使用對外 MCP。請保管 bearer token，不要把這個連接埠暴露到公開網路。',
-  'ai.externalMcp.http.url': 'URL',
-  'ai.externalMcp.http.token': 'Bearer token',
-  'ai.externalMcp.http.regenerate': '重新產生',
-  'ai.externalMcp.http.regenerateHint': '產生新的 bearer token。HTTP 用戶端必須改用新 token。stdio 的 discovery 檔會一併更新；已經透過 stdio 連上的用戶端維持連線。',
-  'ai.externalMcp.http.wslHint': 'WSL 若使用鏡像網路，localhost 即可連線。否則請監聽 0.0.0.0 或 vEthernet IP，並把用戶端位址設成 Windows 主機 IP。',
-  'ai.externalMcp.http.codexSnippet': 'Codex config.toml',
-  'ai.externalMcp.http.claudeCommand': 'Claude Code',
-  'ai.externalMcp.http.genericSnippet': '通用 JSON',
-  'ai.externalMcp.http.envLine': 'Codex token 環境變數',
-  'ai.externalMcp.http.notListening': '未監聽',
-  'ai.externalMcp.http.listening': '監聽中',
-  'ai.externalMcp.http.portInUse': '連接埠 {port} 已被占用。',
-  'ai.externalMcp.http.requiresExternalMcp': '請先開啟對外 MCP，HTTP 端點才會開始監聽。',
-  'ai.externalMcp.http.invalidPort': '請輸入 1024 到 65535 的連接埠。',
-  'ai.externalMcp.http.invalidAddress': '監聽位址必須是 IP，例如 0.0.0.0 或 vEthernet IP。',
-  'ai.externalMcp.http.listenFailed': 'HTTP 監聽失敗。',
-  'ai.externalMcp.http.legacySseNote': '不提供舊版 HTTP+SSE（2024-11-05）。請使用這個 Streamable HTTP 網址。',
   'ai.externalMcp.permissionMode': '目前權限模式：{mode}',
   'ai.externalMcp.permissionMode.label': '寫入權限模式',
   'ai.externalMcp.permissionMode.hint': '與「設定 → AI → 安全」為同一項。自動：Netcatty 寫入操作不再彈本應用核准；確認：每次詢問。外部用戶端（Codex / Claude / Grok）仍可能有自己的工具核准介面。',

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

@@ -419,7 +419,7 @@ export const zhTWCoreMessages: Messages = {
   'settings.appearance.themeColor.dark': '深色主題',
   'settings.appearance.customCss': '自訂 CSS',
   'settings.appearance.customCss.desc':
-    '使用自訂 CSS 個人化介面，修改會立即生效。選取的頂部分頁（`.top-tab[data-active="true"]`）會讀取 `--top-tab-active-bg`、`--top-tab-active-fg` 和 `--top-tab-active-border`。不設定則維持目前外觀。',
+    '使用自訂 CSS 個人化介面，修改會立即生效。',
   'settings.appearance.customCss.help.ariaLabel': '自訂 CSS 說明',
   'settings.appearance.customCss.help.title': '自訂 CSS 說明',
   'settings.appearance.customCss.help.body': `主要 UI 區塊都公開了 \`data-section\` 屬性，供你用 CSS 定位。編輯後會立即生效。
@@ -446,22 +446,6 @@ export const zhTWCoreMessages: Messages = {
 - \`top-tabs-host-tree-toggle\`
 - \`top-tabs-quick-switcher-toggle\`
 
-選取的頂部分頁帶有 \`top-tab\` 類別和 \`data-active="true"\`。設定下列變數即可改變選取分頁的顏色；不設定則維持目前外觀。這些變數不需要 \`!important\`。
-
-- \`--top-tab-active-bg\` — 選取分頁的背景（預設為目前的分頁背景）
-- \`--top-tab-active-fg\` — 選取分頁的文字顏色（預設為目前的文字顏色）
-- \`--top-tab-active-border\` — 1px 內描邊（預設透明，也就是沒有邊框）
-
-Vaults 分頁維持扁平，不使用這塊背景。
-
-\`\`\`css
-.top-tab[data-active="true"] {
-  --top-tab-active-bg: #2563eb;
-  --top-tab-active-fg: #ffffff;
-  --top-tab-active-border: #1d4ed8;
-}
-\`\`\`
-
 ### 保險庫
 
 - \`vault-view\`
@@ -555,7 +539,7 @@ Vaults 分頁維持扁平，不使用這塊背景。
 \`\`\`
 `,
   'settings.appearance.customCss.placeholder':
-    '/* 範例 — 由於 Tailwind 優先順序較高，需要使用 !important */\n\n/* 選取的頂部分頁。不設定這些變數則維持目前外觀。 */\n.top-tab[data-active="true"] {\n  --top-tab-active-bg: #2563eb;\n  --top-tab-active-fg: #ffffff;\n  --top-tab-active-border: #1d4ed8;\n}\n\n/* 隱藏頂部分頁列裡的主機列表開關 */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* 隱藏開啟快速切換器的加號按鈕 */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* SFTP / 操作側欄邊框（關閉側欄後不會殘留） */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* 修改整個操作側欄背景，而不只是頂部分頁 */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* 修改選取的 SFTP 檔案行 */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* 加粗分割分割線 */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* 標示目前聚焦的分割 */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* 也可在 設定 → 終端 → 工作區聚焦指示 → 聚焦窗格顯示邊框 */',
+    '/* 範例 — 由於 Tailwind 優先順序較高，需要使用 !important */\n\n/* 隱藏頂部分頁列裡的主機列表開關 */\n[data-section="top-tabs-host-tree-toggle"] {\n  width: 0 !important;\n  opacity: 0 !important;\n  pointer-events: none !important;\n}\n\n/* 隱藏開啟快速切換器的加號按鈕 */\n[data-section="top-tabs-quick-switcher-toggle"] {\n  display: none !important;\n}\n\n/* SFTP / 操作側欄邊框（關閉側欄後不會殘留） */\n[data-section="terminal-side-panel"] {\n  border: 2px solid #00c851 !important;\n  border-radius: 6px !important;\n}\n\n/* 修改整個操作側欄背景，而不只是頂部分頁 */\n[data-section="terminal-side-panel"],\n[data-section="terminal-side-panel-tabs"],\n[data-section="terminal-side-panel-content"],\n[data-section="terminal-sftp-panel"],\n[data-section="terminal-sftp-pane"],\n[data-section="terminal-sftp-list"],\n[data-section="terminal-sftp-tree"],\n[data-section="terminal-sftp-transfer-queue"] {\n  background-color: #1c384a !important;\n}\n\n/* 修改選取的 SFTP 檔案行 */\n[data-section="terminal-sftp-list-row"][data-selected="true"] {\n  background-color: #00c851 !important;\n  color: #001b10 !important;\n}\n\n/* 加粗分割分割線 */\n[data-section="terminal-split-resizer-bar"] {\n  background-color: hsl(var(--primary)) !important;\n  transform: scale(2) !important;\n}\n\n/* 標示目前聚焦的分割 */\n[data-section="terminal-split-pane"][data-focused="true"] {\n  outline: 2px solid hsl(var(--primary)) !important;\n  outline-offset: -2px;\n}\n\n/* 也可在 設定 → 終端 → 工作區聚焦指示 → 聚焦窗格顯示邊框 */',
   'settings.appearance.language': '語言',
   'settings.appearance.language.desc': '選擇介面語言',
   'settings.appearance.uiFont': '介面字型',
@@ -1141,10 +1125,6 @@ Vaults 分頁維持扁平，不使用這塊背景。
 
   // Quick Switcher
   'qs.search.placeholder': '搜尋主機或分頁',
-  'qs.quickConnectTo': '快速連線到 {target}',
-  'qs.hosts': '主機',
-  'qs.tabs': '分頁',
-  'qs.newWorkspace': '新增工作區',
   'qs.jumpTo': '跳轉到',
   'qs.localTerminal': '本機終端',
   'qs.localShells': '本機 Shell',

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

@@ -352,7 +352,7 @@ export const zhTWTerminalMessages: Messages = {
     '在終端中按 Shift+Enter 時傳送設定的文字，而不是一般 Enter。',
   'settings.terminal.behavior.shiftEnterNewlineText': '傳送內容',
   'settings.terminal.behavior.shiftEnterNewlineText.desc':
-    '使用 \\n 表示換行，\\t 表示 Tab，\\e 表示 ESC，\\\\ 表示反斜線。預設 \\e\\r（ESC+Enter，傳統 Alt+Enter 編碼），大多數 TUI CLI 會將其識別為換行。',
+    '使用 \\n 表示換行，\\t 表示 Tab，\\e 表示 ESC，\\\\ 表示反斜線。',
   'settings.terminal.behavior.shiftEnterForceText': '在 Win32 輸入模式下也傳送文字',
   'settings.terminal.behavior.shiftEnterForceText.desc':
     '本機 Windows ConPTY 工作階段協商 Win32 輸入模式時，仍然傳送上面的文字。Node/Bun 寫的 CLI（Claude Code、CodeBuddy）讀不到主控台輸入記錄中的修飾鍵，需要這個開關才能區分 Shift+Enter。',
@@ -454,10 +454,6 @@ export const zhTWTerminalMessages: Messages = {
   'settings.terminal.localShell.startDir.notFound': '目錄不存在',
   'settings.terminal.localShell.startDir.isFile': '路徑是檔案，不是目錄',
   'settings.terminal.section.connection': '連線',
-  'settings.terminal.connection.temporaryLegacyAlgorithms': '臨時連線允許舊版演算法',
-  'settings.terminal.connection.temporaryLegacyAlgorithms.desc': '沒有對應已儲存主機的 SSH 連線（包括外部程式以 PuTTY 參數啟動，以及快速連線）會使用與主機「允許舊版演算法」相同的已棄用演算法。已儲存主機仍使用自己的設定。預設關閉，這些演算法有已知安全問題。',
-  'settings.terminal.connection.temporaryNetworkDeviceMode': '臨時連線使用網路裝置模式',
-  'settings.terminal.connection.temporaryNetworkDeviceMode.desc': '沒有對應已儲存主機的 SSH 連線（包括外部程式啟動以及快速連線）會以網路裝置模式連線。已儲存主機和群組仍使用自己的裝置型別。預設關閉。',
   'settings.terminal.connection.defaultProxy': '預設代理',
   'settings.terminal.connection.defaultProxy.desc': '主機沒有單獨設定、也沒有從群組繼承代理時使用的已儲存代理。選擇「無」則直接連線。',
   'settings.terminal.connection.defaultProxy.none': '無',
@@ -1003,13 +999,11 @@ export const zhTWTerminalMessages: Messages = {
   'keyboard.interactive.desc': '伺服器需要額外的身分驗證。',
   'keyboard.interactive.descWithHost': '伺服器 {hostname} 需要額外的身分驗證。',
   'keyboard.interactive.response': '回應',
-  'keyboard.interactive.verificationCode': '驗證碼',
   'keyboard.interactive.enterCode': '輸入驗證碼',
   'keyboard.interactive.enterResponse': '輸入回應',
-  'keyboard.interactive.submit': '送出',
+  'keyboard.interactive.submit': '提交',
   'keyboard.interactive.verifying': '驗證中...',
   'keyboard.interactive.savePassword': '儲存密碼',
-  'keyboard.interactive.fillTotp': '填入驗證碼',
 
   // Passphrase Modal for encrypted SSH keys
   'passphrase.title': 'SSH 金鑰密碼',

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

@@ -290,35 +290,6 @@ export const zhTWVaultMessages: Messages = {
   'hostDetails.auth.certificate.desc': '使用選取的 SSH 憑證；如果同時儲存了密碼，可在失敗後嘗試密碼。',
   'hostDetails.auth.mfaFirst': '優先互動式驗證',
   'hostDetails.auth.mfaFirst.desc': '適用於必須透過 keyboard-interactive 輸入密碼和 MFA 的伺服器。',
-  'hostDetails.totp.title': '驗證器 (TOTP)',
-  'hostDetails.totp.enable': '為這台主機儲存 TOTP 金鑰',
-  'hostDetails.totp.setup': '設定…',
-  'hostDetails.totp.edit': '編輯',
-  'hostDetails.totp.modalTitle': '設定驗證器',
-  'hostDetails.totp.replacePlaceholder': '貼上新金鑰以取代目前的金鑰',
-  'hostDetails.totp.warning': '能開啟這個保險庫的人會同時取得驗證碼和密碼。請只在個人裝置上使用。',
-  'hostDetails.totp.secret': '金鑰或 otpauth URI',
-  'hostDetails.totp.secretPlaceholder': '貼上 otpauth://totp/... 或 Base32 金鑰',
-  'hostDetails.totp.importQr': '匯入 QR 碼圖片',
-  'hostDetails.totp.scanScreen': '從螢幕掃描 QR 碼',
-  'hostDetails.totp.scanning': '正在掃描螢幕…',
-  'hostDetails.totp.importedAccount': '已匯入 {account}',
-  'hostDetails.totp.preview': '目前驗證碼',
-  'hostDetails.totp.countdown': '剩餘 {seconds} 秒',
-  'hostDetails.totp.autoSubmit': '在已知 TOTP 提示上自動送出',
-  'hostDetails.totp.autoSubmitDesc': '每次連線只送出一次，且提示必須精確符合 JumpServer、Google Authenticator PAM，或你填寫的規則運算式。',
-  'hostDetails.totp.promptPattern': '自訂提示規則',
-  'hostDetails.totp.promptPatternPlaceholder': '可選的 RE2 規則運算式',
-  'hostDetails.totp.clear': '移除驗證器',
-  'hostDetails.totp.removeTitle': '移除驗證器？',
-  'hostDetails.totp.removeMessage': '這台主機將不再保存這個 TOTP 金鑰。',
-  'hostDetails.totp.error.hotp': '不支援 HOTP。請使用 TOTP 金鑰。',
-  'hostDetails.totp.error.migration': '不支援 otpauth-migration QR 碼。請使用服務提供的單一帳號綁定 QR 碼。',
-  'hostDetails.totp.error.invalid': '無法從該內容讀取 TOTP 金鑰。',
-  'hostDetails.totp.error.notFound': '沒有找到 TOTP QR 碼。',
-  'hostDetails.totp.error.permission': '需要螢幕錄製權限。請在系統設定中允許 Netcatty 錄製螢幕後再試。',
-  'hostDetails.totp.error.unavailable': '無法使用螢幕擷取。',
-  'hostDetails.totp.error.pattern': '自訂提示規則不是有效的 RE2 規則運算式。',
   'hostDetails.auth.credentialRequired': '儲存這種登入方式前，請先選擇金鑰或憑證。',
   'hostDetails.identity.suggestions': '身分',
   'hostDetails.identity.missing': '身分不存在',
@@ -563,8 +534,6 @@ export const zhTWVaultMessages: Messages = {
   'terminal.serverStats.cpu': 'CPU 使用率',
   'terminal.serverStats.cpuCores': 'CPU 核心使用率',
   'terminal.serverStats.gpu': 'GPU 使用率',
-  'terminal.serverStats.gpuDevices': 'GPU 裝置使用率',
-  'terminal.serverStats.gpuIndex': 'GPU {{index}}',
   'terminal.serverStats.memory': '記憶體使用',
   'terminal.serverStats.memoryDetails': '記憶體詳情',
   'terminal.serverStats.memUsed': '已用',

application/quickConnectBridge.test.ts

@@ -1,35 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-
-import {
-  openQuickConnectFromInput,
-  registerQuickConnectOpener,
-  type QuickConnectOpenRequest,
-} from "./quickConnectBridge.ts";
-
-test("openQuickConnectFromInput reuses the registered quick connect wizard", () => {
-  const seen: QuickConnectOpenRequest[] = [];
-  const unregister = registerQuickConnectOpener((request) => {
-    seen.push(request);
-  });
-
-  assert.equal(openQuickConnectFromInput(" root@10.1.1.1:2222 "), true);
-  assert.deepEqual(seen, [{
-    target: { hostname: "10.1.1.1", username: "root", port: 2222 },
-    warnings: [],
-  }]);
-
-  unregister();
-  assert.equal(openQuickConnectFromInput("10.1.1.1"), false);
-});
-
-test("openQuickConnectFromInput ignores text that is not an address", () => {
-  const seen: QuickConnectOpenRequest[] = [];
-  const unregister = registerQuickConnectOpener((request) => {
-    seen.push(request);
-  });
-
-  assert.equal(openQuickConnectFromInput("core switch"), false);
-  assert.deepEqual(seen, []);
-  unregister();
-});

application/quickConnectBridge.ts

@@ -1,28 +0,0 @@
-import {
-  parseQuickConnectInputWithWarnings,
-  type QuickConnectTarget,
-} from "../domain/quickConnect";
-
-export interface QuickConnectOpenRequest {
-  target: QuickConnectTarget;
-  warnings: string[];
-}
-
-type QuickConnectOpener = (request: QuickConnectOpenRequest) => void;
-
-let opener: QuickConnectOpener | null = null;
-
-/** Vault owns the single QuickConnectWizard. The switcher asks it to open. */
-export function registerQuickConnectOpener(next: QuickConnectOpener): () => void {
-  opener = next;
-  return () => {
-    if (opener === next) opener = null;
-  };
-}
-
-export function openQuickConnectFromInput(input: string): boolean {
-  const parsed = parseQuickConnectInputWithWarnings(input);
-  if (!parsed.target || !opener) return false;
-  opener({ target: parsed.target, warnings: parsed.warnings });
-  return true;
-}

application/state/externalMcpApprovalAlert.test.ts

@@ -1,90 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import { presentExternalMcpApprovalNotification } from './externalMcpApprovalAlert.ts';
-
-const t = (key: string, values?: Record<string, string | number | boolean | null | undefined>) => {
-  if (key === 'ai.externalMcp.approvalAlert.notificationTitle') return 'External MCP approval';
-  if (key === 'ai.externalMcp.approvalAlert.notificationBody') return `${values?.tool} is waiting for approval`;
-  if (key === 'ai.externalMcp.approvalAlert.notificationBodyOnHost') {
-    return `${values?.tool} on ${values?.host} is waiting for approval`;
-  }
-  return key;
-};
-
-test('approval alerts stay quiet when the preference is off', () => {
-  const calls: unknown[] = [];
-  const shown = presentExternalMcpApprovalNotification({
-    toolName: 'sftp.write',
-    dedupeKey: 'mcp_approval_1',
-    mode: 'off',
-    t,
-    notify: (payload) => calls.push(payload),
-  });
-  assert.equal(shown, false);
-  assert.deepEqual(calls, []);
-});
-
-test('unfocused approval alerts name the tool and host and defer focus to the main process', () => {
-  const calls: Array<{ title: string; body: string; whenUnfocused: boolean; dedupeKey: string }> = [];
-  const shown = presentExternalMcpApprovalNotification({
-    toolName: 'sftp.write',
-    hostLabel: 'bastion',
-    dedupeKey: 'mcp_approval_2',
-    mode: 'unfocused',
-    t,
-    notify: (payload) => calls.push(payload),
-  });
-  assert.equal(shown, true);
-  assert.deepEqual(calls, [{
-    title: 'External MCP approval',
-    body: 'sftp.write on bastion is waiting for approval',
-    dedupeKey: 'mcp_approval_2',
-    whenUnfocused: true,
-  }]);
-});
-
-test('approval alerts show the MCP tool name for an internal rpc id', () => {
-  const calls: Array<{ body: string }> = [];
-  const shown = presentExternalMcpApprovalNotification({
-    toolName: 'netcatty/exec',
-    hostLabel: '127.0.0.1',
-    dedupeKey: 'mcp_approval_exec',
-    mode: 'always',
-    t,
-    notify: (payload) => calls.push(payload),
-  });
-  assert.equal(shown, true);
-  assert.equal(calls.length, 1);
-  assert.match(calls[0].body, /terminal_execute/);
-  assert.equal(calls[0].body, 'terminal_execute on 127.0.0.1 is waiting for approval');
-});
-
-test('approval alerts keep an id that has no MCP tool name', () => {
-  const calls: Array<{ body: string }> = [];
-  presentExternalMcpApprovalNotification({
-    toolName: 'netcatty/not-a-tool',
-    dedupeKey: 'mcp_approval_unknown',
-    mode: 'unfocused',
-    t,
-    notify: (payload) => calls.push(payload),
-  });
-  assert.equal(calls[0].body, 'netcatty/not-a-tool is waiting for approval');
-});
-
-test('always approval alerts notify even while a window may be focused', () => {
-  const calls: Array<{ title: string; body: string; whenUnfocused: boolean; dedupeKey: string }> = [];
-  presentExternalMcpApprovalNotification({
-    toolName: 'terminal.execute',
-    dedupeKey: 'mcp_approval_3',
-    mode: 'always',
-    t,
-    notify: (payload) => calls.push(payload),
-  });
-  assert.deepEqual(calls, [{
-    title: 'External MCP approval',
-    body: 'terminal.execute is waiting for approval',
-    dedupeKey: 'mcp_approval_3',
-    whenUnfocused: false,
-  }]);
-});

application/state/externalMcpApprovalAlert.ts

@@ -1,91 +0,0 @@
-import type { ApprovalRequest } from '../../infrastructure/ai/shared/approvalGate';
-import cattyToolSpecs from '../../infrastructure/ai/harness/generated/cattyToolSpecs.json';
-import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
-import {
-  readExternalMcpApprovalAlertMode,
-  type ExternalMcpApprovalAlertMode,
-} from './useExternalMcpToggleState';
-
-type CatalogToolSpec = {
-  toolName?: string;
-  rpcMethod?: string | null;
-};
-
-const mcpToolNameByRpcMethod = new Map<string, string>();
-for (const spec of cattyToolSpecs as CatalogToolSpec[]) {
-  if (!spec.rpcMethod || !spec.toolName || mcpToolNameByRpcMethod.has(spec.rpcMethod)) continue;
-  mcpToolNameByRpcMethod.set(spec.rpcMethod, spec.toolName);
-}
-
-/**
- * Name shown on the External MCP approval card.
- * Catalog MCP tool names win over internal RPC ids such as `netcatty/exec`.
- * An id with no catalog tool name is shown as-is.
- */
-export function externalMcpApprovalToolLabel(toolName: string | undefined): string {
-  const raw = toolName?.trim() || '';
-  if (!raw) return '';
-  return mcpToolNameByRpcMethod.get(raw) || raw;
-}
-
-export type ExternalMcpApprovalNotification = {
-  title: string;
-  body: string;
-  dedupeKey: string;
-  whenUnfocused: boolean;
-};
-
-type Translate = (
-  key: string,
-  values?: Record<string, string | number | boolean | null | undefined>,
-) => string;
-
-/**
- * Build the system notification for one External MCP approval.
- * Returns null when the preference is off. Focus gating stays in the main
- * process so every Netcatty window is considered, not only the sender.
- */
-export function presentExternalMcpApprovalNotification(options: {
-  toolName: string;
-  hostLabel?: string;
-  dedupeKey: string;
-  mode: ExternalMcpApprovalAlertMode;
-  t: Translate;
-  notify: (payload: ExternalMcpApprovalNotification) => void;
-}): boolean {
-  if (options.mode === 'off') return false;
-  const tool = externalMcpApprovalToolLabel(options.toolName);
-  const host = options.hostLabel?.trim() || '';
-  const body = host
-    ? options.t('ai.externalMcp.approvalAlert.notificationBodyOnHost', { tool, host })
-    : options.t('ai.externalMcp.approvalAlert.notificationBody', { tool });
-  options.notify({
-    title: options.t('ai.externalMcp.approvalAlert.notificationTitle'),
-    body,
-    dedupeKey: options.dedupeKey,
-    whenUnfocused: options.mode === 'unfocused',
-  });
-  return true;
-}
-
-export function publishExternalMcpApprovalAlertMode(): void {
-  void netcattyBridge.get()?.setExternalMcpApprovalAlertMode?.({
-    mode: readExternalMcpApprovalAlertMode(),
-  });
-}
-
-export function notifyExternalMcpApproval(
-  request: Pick<ApprovalRequest, 'toolName' | 'toolCallId' | 'target'>,
-  t: Translate,
-): boolean {
-  return presentExternalMcpApprovalNotification({
-    toolName: request.toolName,
-    hostLabel: request.target?.label || request.target?.hostname || '',
-    dedupeKey: request.toolCallId,
-    mode: readExternalMcpApprovalAlertMode(),
-    t,
-    notify: (payload) => {
-      void netcattyBridge.get()?.showSystemNotification?.(payload);
-    },
-  });
-}

application/state/inheritedCwd.ts

@@ -13,11 +13,10 @@ type CaptureSession = Pick<TerminalSession, "id" | "protocol" | "status" | "last
 
 export interface CaptureInheritedCwdOptions {
   /**
-   * The session's live tracked cwd (OSC 7 or the post-command cwd probe),
-   * sourced from the terminal-state cwd map rather than the session object.
-   * This is the freshest value and the one that reflects `cd`s in a running
-   * local terminal. The live value stays off `TerminalSession.lastCwd` until
-   * session restore persists it.
+   * The session's live tracked cwd (OSC 7), sourced from the terminal-state
+   * cwd map rather than the session object. This is the freshest value and the
+   * only one that reflects `cd`s in a running LOCAL terminal (whose live cwd is
+   * never mirrored onto `TerminalSession.lastCwd`).
    */
   liveCwd?: string;
   /**
@@ -36,7 +35,7 @@ export const DEFAULT_INHERITED_CWD_PROBE_TIMEOUT_MS = 1500;
 /**
  * Resolve the working directory a clone/split should inherit from its source.
  *
- * Priority: live tracked cwd (OSC 7 or post-command probe) -> live SSH `/proc` probe (when allowed)
+ * Priority: live tracked cwd (OSC 7) -> live SSH `/proc` probe (when allowed)
  * -> tracked `lastCwd` snapshot -> local `localStartDir`. The probe is raced
  * against a short timeout so a slow/wedged connection can't block tab creation,
  * and is skipped entirely when `allowSshProbe` is false. Returns undefined when

application/state/settingsStateDefaults.test.ts

@@ -10,14 +10,12 @@ import {
   resolveThemeAccentForeground,
   migrateIncomingTerminalFontId,
   migrateMaterializedAutoCloseOnExitDefault,
-  migrateMaterializedShiftEnterNewlineDefault,
 } from "./settingsStateDefaults.ts";
 import { TERMINAL_FONT_AUTO } from "../../infrastructure/config/fonts.ts";
 import {
   STORAGE_KEY_TERM_AUTO_CLOSE_EXIT_MIGRATED,
   STORAGE_KEY_TERM_FONT_FAMILY,
   STORAGE_KEY_TERM_SETTINGS,
-  STORAGE_KEY_TERM_SHIFT_ENTER_NEWLINE_MIGRATED,
 } from "../../infrastructure/config/storageKeys.ts";
 import type { UiThemeTokens } from "../../infrastructure/config/uiThemes.ts";
 
@@ -216,76 +214,3 @@ test("migrateMaterializedAutoCloseOnExitDefault leaves fresh installs and explic
     delete (globalThis as { localStorage?: unknown }).localStorage;
   }
 });
-
-test("migrateMaterializedShiftEnterNewlineDefault rewrites the old default once", () => {
-  const store = installMemoryLocalStorage();
-  try {
-    store.set(
-      STORAGE_KEY_TERM_SETTINGS,
-      JSON.stringify({ scrollback: 3000, shiftEnterNewlineText: "\\n" }),
-    );
-    migrateMaterializedShiftEnterNewlineDefault();
-    const migrated = JSON.parse(store.get(STORAGE_KEY_TERM_SETTINGS)!);
-    assert.equal(migrated.shiftEnterNewlineText, "\\e\\r");
-    assert.equal(migrated.scrollback, 3000);
-    assert.equal(store.get(STORAGE_KEY_TERM_SHIFT_ENTER_NEWLINE_MIGRATED), "true");
-
-    store.set(
-      STORAGE_KEY_TERM_SETTINGS,
-      JSON.stringify({ scrollback: 3000, shiftEnterNewlineText: "\\n" }),
-    );
-    migrateMaterializedShiftEnterNewlineDefault();
-    assert.equal(
-      JSON.parse(store.get(STORAGE_KEY_TERM_SETTINGS)!).shiftEnterNewlineText,
-      "\\n",
-    );
-  } finally {
-    delete (globalThis as { localStorage?: unknown }).localStorage;
-  }
-});
-
-test("migrateMaterializedShiftEnterNewlineDefault rewrites a raw stored newline", () => {
-  const store = installMemoryLocalStorage();
-  try {
-    store.set(
-      STORAGE_KEY_TERM_SETTINGS,
-      JSON.stringify({ shiftEnterNewlineText: "\n" }),
-    );
-    migrateMaterializedShiftEnterNewlineDefault();
-    assert.equal(
-      JSON.parse(store.get(STORAGE_KEY_TERM_SETTINGS)!).shiftEnterNewlineText,
-      "\\e\\r",
-    );
-  } finally {
-    delete (globalThis as { localStorage?: unknown }).localStorage;
-  }
-});
-
-test("migrateMaterializedShiftEnterNewlineDefault keeps custom Shift+Enter text", () => {
-  const store = installMemoryLocalStorage();
-  try {
-    store.set(
-      STORAGE_KEY_TERM_SETTINGS,
-      JSON.stringify({ shiftEnterNewlineText: "\\r", scrollback: 1000 }),
-    );
-    migrateMaterializedShiftEnterNewlineDefault();
-    assert.deepEqual(JSON.parse(store.get(STORAGE_KEY_TERM_SETTINGS)!), {
-      shiftEnterNewlineText: "\\r",
-      scrollback: 1000,
-    });
-    assert.equal(store.get(STORAGE_KEY_TERM_SHIFT_ENTER_NEWLINE_MIGRATED), "true");
-  } finally {
-    delete (globalThis as { localStorage?: unknown }).localStorage;
-  }
-});
-
-test("migrateMaterializedShiftEnterNewlineDefault leaves a fresh install without a settings blob", () => {
-  const store = installMemoryLocalStorage();
-  try {
-    migrateMaterializedShiftEnterNewlineDefault();
-    assert.equal(store.has(STORAGE_KEY_TERM_SETTINGS), false);
-    assert.equal(store.get(STORAGE_KEY_TERM_SHIFT_ENTER_NEWLINE_MIGRATED), "true");
-  } finally {
-    delete (globalThis as { localStorage?: unknown }).localStorage;
-  }
-});

application/state/settingsStateDefaults.ts

@@ -1,15 +1,8 @@
-import {
-  DEFAULT_SHIFT_ENTER_NEWLINE_TEXT,
-  isLegacyDefaultShiftEnterNewlineText,
-  type HotkeyScheme,
-  type SessionLogFormat,
-  type TerminalSettings,
-} from '../../domain/models';
+import type { HotkeyScheme, SessionLogFormat, TerminalSettings } from '../../domain/models';
 import {
   STORAGE_KEY_TERM_AUTO_CLOSE_EXIT_MIGRATED,
   STORAGE_KEY_TERM_FONT_FAMILY,
   STORAGE_KEY_TERM_SETTINGS,
-  STORAGE_KEY_TERM_SHIFT_ENTER_NEWLINE_MIGRATED,
 } from '../../infrastructure/config/storageKeys';
 import {
   isDeprecatedPrimaryFontId,
@@ -98,26 +91,6 @@ export function migrateMaterializedAutoCloseOnExitDefault(): void {
   localStorageAdapter.writeBoolean(STORAGE_KEY_TERM_AUTO_CLOSE_EXIT_MIGRATED, true);
 }
 
-/**
- * One-time migration for the Shift+Enter default flip (#3770). Builds before
- * that change materialized `\\n` into saved settings, so upgraders kept a
- * bare newline and TUI CLIs still submitted. Rewrite only that old default
- * (escaped or raw) to ESC+CR, then persist the marker. A later explicit `\\n`
- * is left alone. Custom text is never rewritten. Sync and import do not
- * read this marker; an old `\\n` from another device stays as stored.
- */
-export function migrateMaterializedShiftEnterNewlineDefault(): void {
-  if (localStorageAdapter.readBoolean(STORAGE_KEY_TERM_SHIFT_ENTER_NEWLINE_MIGRATED)) return;
-  const stored = localStorageAdapter.read<Partial<TerminalSettings>>(STORAGE_KEY_TERM_SETTINGS);
-  if (stored && isLegacyDefaultShiftEnterNewlineText(stored.shiftEnterNewlineText)) {
-    localStorageAdapter.write(STORAGE_KEY_TERM_SETTINGS, {
-      ...stored,
-      shiftEnterNewlineText: DEFAULT_SHIFT_ENTER_NEWLINE_TEXT,
-    });
-  }
-  localStorageAdapter.writeBoolean(STORAGE_KEY_TERM_SHIFT_ENTER_NEWLINE_MIGRATED, true);
-}
-
 // Auto-detect default hotkey scheme based on platform
 export const DEFAULT_HOTKEY_SCHEME: HotkeyScheme =
   typeof navigator !== 'undefined' && /Mac|iPhone|iPad|iPod/i.test(navigator.platform)

application/state/sftp/useSftpHostCredentials.ts

@@ -3,7 +3,6 @@ import type { Host, Identity, KnownHost, SSHKey, TerminalSettings } from "../../
 import { isEncryptedCredentialPlaceholder, sanitizeCredentialValue } from "../../../domain/credentials";
 import { resolveBridgeKeyAuth, resolveBridgeSshAgentAuth, resolveHostAuth } from "../../../domain/sshAuth";
 import { resolveHostKeepalive } from "../../../domain/host";
-import { connectionTotpFields } from "../../../domain/totpConfig";
 import { resolveHostSshConnectionTimeouts } from "../../../domain/sshConnectionTimeouts";
 import {
   findIncompleteProxyIdentityId,
@@ -122,7 +121,6 @@ export const buildSftpHostCredentials = ({
         authMethod: jumpAuth.authMethod,
         requiresMfa: !!jumpHost.requiresMfa,
         password: jumpPassword,
-        ...connectionTotpFields(jumpHost),
         privateKey: jumpKeyAuth.privateKey,
         certificate: jumpKey?.certificate,
         passphrase: jumpKeyAuth.passphrase,
@@ -184,7 +182,6 @@ export const buildSftpHostCredentials = ({
     requiresMfa: !!host.requiresMfa,
     port: host.port || 22,
     password,
-    ...connectionTotpFields(host),
     privateKey: keyAuth.privateKey,
     certificate: key?.certificate,
     passphrase: keyAuth.passphrase,

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

@@ -712,127 +712,3 @@ test("owned cancelled directory settles recoverable children without dropping co
     await rm(root, { recursive: true, force: true });
   }
 });
-
-for (const liveSize of [37, 3, 0]) {
-  test(`same-pane local copy discovers ${liveSize} bytes after the listed file changes`, async () => {
-    const pane = makePane("right");
-    pane.files = [{ ...makePane("left").files[0], name: "edited.txt", size: 15 }];
-    const started: StartOptions[] = [];
-    const restore = installGlobals({
-      statLocal: async (path: string) => path.endsWith("edited.txt")
-        ? { type: "file", size: liveSize, lastModified: 1758000002000 }
-        : null,
-      startStreamTransfer: async (options: StartOptions) => { started.push(options); return {}; },
-      pauseTransfer: async () => ({ success: false }),
-      resumeTransfer: async () => ({ success: false }),
-    });
-    let ops: ReturnType<typeof useSftpTransfers> | undefined;
-    let renderer: ReactTestRenderer | undefined;
-    function Probe() {
-      ops = useSftpTransfers({
-        ownerId: `local-edited-${liveSize}`,
-        getActivePane: () => pane,
-        getPaneByConnectionId: () => pane,
-        getTabByConnectionId: () => null,
-        updateTab: () => undefined,
-        refresh: async () => undefined,
-        clearCacheForConnection: () => undefined,
-        handleSessionError: () => undefined,
-        sftpSessionsRef: { current: new Map() },
-        connectionCacheKeyMapRef: { current: new Map() },
-        listLocalFiles: async () => [],
-        listRemoteFiles: async () => [],
-      });
-      return null;
-    }
-    try {
-      await act(async () => { renderer = create(React.createElement(Probe)); });
-      await act(async () => {
-        await ops!.startTransfer([{ name: "edited.txt", isDirectory: false }], "right", "right");
-      });
-      assert.equal(ops!.conflicts.length, 1);
-      assert.equal(ops!.conflicts[0].newSize, liveSize, "conflict must show the saved file's current size");
-      assert.equal(ops!.conflicts[0].newModified, 1758000002000);
-      await act(async () => {
-        await ops!.resolveConflict(ops!.conflicts[0].transferId, "duplicate", false);
-        await new Promise((resolve) => setTimeout(resolve, 300));
-      });
-      assert.equal(started.length, 1);
-      assert.equal(started[0].totalBytes, liveSize || undefined, "copy must not retain the cached 15-byte size");
-    } finally {
-      await act(async () => { renderer?.unmount(); });
-      restore();
-    }
-  });
-}
-
-test("no-conflict local copy awaits discovery so a late stat cannot overwrite the settled total", async () => {
-  const pane = makePane("right");
-  pane.files = [{ ...makePane("left").files[0], name: "late.txt", size: 15 }];
-  const started: StartOptions[] = [];
-  const restore = installGlobals({
-    // Target conflict stat: missing path means the copy has no conflict.
-    lstatLocal: async () => null,
-    statLocal: async (path: string) => {
-      if (!path.endsWith("late.txt")) return null;
-      // Let the stream finish before the stat resolves — fired-and-forgotten
-      // discovery used to patch the terminal task with this stale total.
-      await new Promise((resolve) => setTimeout(resolve, 200));
-      return { type: "file", size: 9_999, lastModified: 1758000002000 };
-    },
-    startStreamTransfer: async (options: StartOptions) => {
-      started.push(options);
-      sftpTransferCenterStore.ingestBackgroundEvent({
-        type: "completed",
-        transferId: options.transferId,
-        transferred: 15,
-        totalBytes: 15,
-        lifecycleEpoch: 0,
-      });
-      return {};
-    },
-    pauseTransfer: async () => ({ success: false }),
-    resumeTransfer: async () => ({ success: false }),
-  });
-
-  let ops: ReturnType<typeof useSftpTransfers> | undefined;
-  let renderer: ReactTestRenderer | undefined;
-  function Probe() {
-    ops = useSftpTransfers({
-      ownerId: "local-late-stat",
-      getActivePane: () => pane,
-      getPaneByConnectionId: () => pane,
-      getTabByConnectionId: () => null,
-      updateTab: () => undefined,
-      refresh: async () => undefined,
-      clearCacheForConnection: () => undefined,
-      handleSessionError: () => undefined,
-      sftpSessionsRef: { current: new Map() },
-      connectionCacheKeyMapRef: { current: new Map() },
-      listLocalFiles: async () => [],
-      listRemoteFiles: async () => [],
-    });
-    return null;
-  }
-  try {
-    await act(async () => { renderer = create(React.createElement(Probe)); });
-    await act(async () => {
-      await ops!.startTransfer([{ name: "late.txt", isDirectory: false }], "right", "right");
-    });
-    // Give the no longer pending deferred stat time to land if it leaked.
-    await act(async () => { await new Promise((resolve) => setTimeout(resolve, 600)); });
-    const row = sftpTransferCenterStore.getSnapshot().tasks.find(
-      (candidate) => candidate.originalFileName === "late.txt",
-    );
-    assert.ok(row);
-    assert.equal(row.status, "completed");
-    assert.equal(
-      row.transferredBytes,
-      row.totalBytes,
-      "a deferred stat must not desync the completed row's total from its transferred bytes",
-    );
-  } finally {
-    await act(async () => { renderer?.unmount(); });
-    restore();
-  }
-});

application/state/sftp/useSftpTransfers.ts

@@ -811,8 +811,8 @@ export const useSftpTransfers = ({
       })();
 
       // For single files: start size discovery without blocking the conflict
-      // check, but always settle the promise before any dialog or transfer
-      // launch (bounded per-task; the task is already visible/cancellable).
+      // check, but keep the promise so an actual conflict can await fresh
+      // size metadata before the dialog is shown.
       const sizeDiscoveryPromise = task.isDirectory ? null : discoverTransferSize();
 
       // Only await conflict check (fast single stat call)
@@ -823,23 +823,19 @@ export const useSftpTransfers = ({
       // null means the plan size is still unknown. A verified 0-byte stat is 0,
       // not null, so an empty file does not pick up a stale listing size.
       let verifiedPlanBytes: number | null = task.totalBytes > 0 ? task.totalBytes : null;
-      if (sizeDiscoveryPromise) {
+      if (conflict && sizeDiscoveryPromise) {
         // The task's totalBytes may still be 0 here because discovery ran
         // deferred and updateTask never mutates the local task copy. Await
-        // discovery even without a conflict so its statLocal updateTask cannot
-        // resolve after the transfer finished and overwrite the bridge's
-        // authoritative total with a stale late size (the conflict dialog also
-        // needs it: #3559).
+        // discovery (bounded per-task; the task is already visible/cancellable)
+        // so the overwrite dialog shows the real source size, not 0 (#3559).
         const discovered = await sizeDiscoveryPromise;
         // Cancel during this stat must win before an apply-to-all Replace
         // deletes an existing symlink.
         if (cancelledTasksRef.current.has(task.id)) return "cancelled";
         if (discovered && discovered.size >= 0) {
-          if (conflict) {
-            conflict.newSize = discovered.size;
-            if (discovered.lastModified) conflict.newModified = discovered.lastModified;
-            if (discovered.plan) verifiedPlanBytes = discovered.size;
-          }
+          conflict.newSize = discovered.size;
+          if (discovered.lastModified) conflict.newModified = discovered.lastModified;
+          if (discovered.plan) verifiedPlanBytes = discovered.size;
         }
       }
 
@@ -1271,24 +1267,25 @@ export const useSftpTransfers = ({
         // Prefer the fresh re-stat for remote files: a cached listing size can
         // be stale and undersized, which would silently truncate downloads
         // (#3559). Remote files without a live stat use plan 0 so the bridge
-        // measures the live size. Local files also start unknown so deferred
-        // discovery reads their current size after edits, not the cached listing.
+        // measures the live size; local sources keep the pane metadata.
         const fileEntry = fileEntryMap?.get(file.name);
         const freshMetadata = freshRemoteMetadata.get(file.name);
         const fileSize = file.isDirectory
           ? 0
           : freshMetadata
             ? freshMetadata.size
-            : 0;
-        // Only keep an mtime paired with a live re-stat or directory totals.
-        // A file without a live stat must stay fully unknown
-        // (size 0 AND mtime 0 in the plan):
+            : sourcePane.connection!.isLocal
+              ? (fileEntry?.size ?? 0)
+              : 0;
+        // Only keep an mtime that is paired with trusted metadata (live re-stat,
+        // local source size, or directory totals). A remote file whose re-stat
+        // failed must stay fully unknown (size 0 AND mtime 0 in the plan):
         // discoverTransferSize and the conflict check both treat a nonzero
         // sourceLastModified as proof the size is already known, so a stale
         // mtime would suppress the deferred source re-stat. The overwrite
         // dialog still gets the pane listing's cached entry via
         // discoverTransferSize's cachedListingStatForDialog fallback.
-        const sourceLastModified = !file.isDirectory && !freshMetadata
+        const sourceLastModified = !file.isDirectory && !sourcePane.connection!.isLocal && !freshMetadata
           ? 0
           : (freshMetadata?.lastModified ?? fileEntry?.lastModified ?? 0);
 

application/state/terminalReconnectRegistry.test.ts

@@ -56,28 +56,6 @@ test('active reconnect state blocks duplicate requests and notifies subscribers'
   unsubscribe();
 });
 
-test('enter reconnect stays off until the session allows it and does not queue', () => {
-  const registry = createTerminalReconnectRegistry();
-  const requests: string[] = [];
-
-  assert.equal(registry.requestEnterReconnect('session-1'), false);
-  registry.register('session-1', () => requests.push('session-1'));
-  assert.deepEqual(requests, []);
-
-  registry.setEnterReconnectEnabled('session-1', true);
-  assert.equal(registry.requestEnterReconnect('session-1'), true);
-  assert.deepEqual(requests, ['session-1']);
-
-  registry.setActive('session-1', true);
-  assert.equal(registry.requestEnterReconnect('session-1'), false);
-  assert.deepEqual(requests, ['session-1']);
-
-  registry.setActive('session-1', false);
-  registry.setEnterReconnectEnabled('session-1', false);
-  assert.equal(registry.requestEnterReconnect('session-1'), false);
-  assert.deepEqual(requests, ['session-1']);
-});
-
 test('unregistering the current handler clears active reconnect state', () => {
   const registry = createTerminalReconnectRegistry();
   const unregister = registry.register('session-1', () => {});

application/state/terminalReconnectRegistry.ts

@@ -4,7 +4,6 @@ export const createTerminalReconnectRegistry = () => {
   const handlers = new Map<string, TerminalReconnectHandler>();
   const pendingRequests = new Set<string>();
   const activeSessionIds = new Set<string>();
-  const enterReconnectEnabledIds = new Set<string>();
   const listeners = new Set<() => void>();
 
   const emit = () => {
@@ -52,27 +51,7 @@ export const createTerminalReconnectRegistry = () => {
     return true;
   };
 
-  // Enter-reconnect while a compose bar is open. Explicit reconnect clicks use
-  // request(); this path stays off during auth, host-key, and blocking overlays.
-  const setEnterReconnectEnabled = (sessionId: string, enabled: boolean): void => {
-    if (enabled) enterReconnectEnabledIds.add(sessionId);
-    else enterReconnectEnabledIds.delete(sessionId);
-  };
-
-  const requestEnterReconnect = (sessionId: string): boolean => {
-    if (!enterReconnectEnabledIds.has(sessionId)) return false;
-    return request(sessionId);
-  };
-
-  return {
-    register,
-    request,
-    requestEnterReconnect,
-    setEnterReconnectEnabled,
-    setActive,
-    isActive,
-    subscribe,
-  };
+  return { register, request, setActive, isActive, subscribe };
 };
 
 export const terminalReconnectRegistry = createTerminalReconnectRegistry();

application/state/useExternalMcpToggleState.test.ts

@@ -3,17 +3,6 @@ import { describe, it } from 'node:test';
 import { createSessionIdleManager } from '../../electron/bridges/mcpServerBridge/sessionIdleManager.cjs';
 import { STORAGE_KEY_AI_SESSION_IDLE_TIMEOUT_MINUTES } from '../../infrastructure/config/storageKeys';
 import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
-import {
-  readExternalMcpHttpAllowCustomBind,
-  readExternalMcpHttpEnabled,
-  readExternalMcpHttpListenAddress,
-  readExternalMcpHttpPort,
-  readExternalMcpHttpSettings,
-  writeExternalMcpHttpAllowCustomBind,
-  writeExternalMcpHttpEnabled,
-  writeExternalMcpHttpListenAddress,
-  writeExternalMcpHttpPort,
-} from "./useExternalMcpToggleState.ts";
 import {
   EXTERNAL_MCP_RUNTIME_STATUS_POLL_MS,
   bumpExternalMcpEnableGenerationForTests,
@@ -22,11 +11,9 @@ import {
   getExternalMcpStartupReadyWaiterCountForTests,
   isExternalMcpStartupReady,
   markExternalMcpStartupReady,
-  normalizeExternalMcpApprovalAlertMode,
   normalizeExternalMcpIdleTimeoutMinutes,
   normalizeExternalMcpMode,
   normalizeSessionIdleTimeoutMinutes,
-  readExternalMcpApprovalAlertMode,
   readExternalMcpFocusOnHostOpen,
   readExternalMcpSilentSessions,
   readExternalMcpStoredEnabled,
@@ -38,7 +25,6 @@ import {
   syncExternalMcpStartupState,
   syncExternalMcpStartupStateOnce,
   waitForExternalMcpStartupReady,
-  writeExternalMcpApprovalAlertMode,
   writeExternalMcpFocusOnHostOpen,
   writeExternalMcpSilentSessions,
 } from './useExternalMcpToggleState.ts';
@@ -83,22 +69,6 @@ describe('useExternalMcpToggleState helpers', () => {
     assert.equal(normalizeExternalMcpIdleTimeoutMinutes(99999), 24 * 60);
     assert.equal(normalizeSessionIdleTimeoutMinutes(null), 8 * 60);
     assert.equal(normalizeSessionIdleTimeoutMinutes(0), 1);
-    assert.equal(normalizeExternalMcpApprovalAlertMode(null), 'unfocused');
-    assert.equal(normalizeExternalMcpApprovalAlertMode('always'), 'always');
-    assert.equal(normalizeExternalMcpApprovalAlertMode('nope'), 'unfocused');
-  });
-
-  it('stores the approval alert preference and defaults to unfocused', () => {
-    const restore = installMemoryLocalStorage();
-    try {
-      assert.equal(readExternalMcpApprovalAlertMode(), 'unfocused');
-      assert.equal(writeExternalMcpApprovalAlertMode('off'), 'off');
-      assert.equal(readExternalMcpApprovalAlertMode(), 'off');
-      assert.equal(writeExternalMcpApprovalAlertMode('always'), 'always');
-      assert.equal(readExternalMcpApprovalAlertMode(), 'always');
-    } finally {
-      restore();
-    }
   });
 
   for (const savedMinutes of [null, 30]) {
@@ -425,30 +395,3 @@ describe('syncExternalMcpStartupState generation guard', () => {
     }
   });
 });
-
-describe("external MCP HTTP settings", () => {
-  it("defaults HTTP off on loopback and round-trips the explicit listen option", () => {
-    const restore = installMemoryLocalStorage();
-    try {
-      assert.deepEqual(readExternalMcpHttpSettings(), {
-        enabled: false,
-        port: 47391,
-        allowCustomBind: false,
-        listenAddress: "0.0.0.0",
-        clientHost: "",
-      });
-      assert.equal(readExternalMcpHttpEnabled(), false);
-      writeExternalMcpHttpEnabled(true);
-      assert.equal(writeExternalMcpHttpPort(80), 47391);
-      assert.equal(writeExternalMcpHttpPort(48080), 48080);
-      writeExternalMcpHttpAllowCustomBind(true);
-      writeExternalMcpHttpListenAddress("172.22.0.1");
-      assert.equal(readExternalMcpHttpEnabled(), true);
-      assert.equal(readExternalMcpHttpPort(), 48080);
-      assert.equal(readExternalMcpHttpAllowCustomBind(), true);
-      assert.equal(readExternalMcpHttpListenAddress(), "172.22.0.1");
-    } finally {
-      restore();
-    }
-  });
-});

application/state/useExternalMcpToggleState.ts

@@ -1,13 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import {
-  STORAGE_KEY_AI_EXTERNAL_MCP_APPROVAL_ALERT,
   STORAGE_KEY_AI_EXTERNAL_MCP_ENABLED,
   STORAGE_KEY_AI_EXTERNAL_MCP_FOCUS_ON_HOST_OPEN,
-  STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_ALLOW_CUSTOM_BIND,
-  STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_CLIENT_HOST,
-  STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_ENABLED,
-  STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_LISTEN_ADDRESS,
-  STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_PORT,
   STORAGE_KEY_AI_EXTERNAL_MCP_IDLE_TIMEOUT_MINUTES,
   STORAGE_KEY_AI_EXTERNAL_MCP_MODE,
   STORAGE_KEY_AI_EXTERNAL_MCP_SILENT_SESSIONS,
@@ -15,15 +9,11 @@ import {
   STORAGE_KEY_AI_SESSION_IDLE_TIMEOUT_MINUTES,
 } from '../../infrastructure/config/storageKeys';
 import type { AIPermissionMode } from '../../infrastructure/ai/types';
-import { DEFAULT_EXTERNAL_MCP_HTTP_PORT } from '../../domain/externalMcpHttp';
 import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
 import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
 import { AI_STATE_CHANGED_EVENT, emitAIStateChanged } from './aiStateEvents';
 
 export type ExternalMcpMode = 'temporary' | 'persistent';
-export type ExternalMcpApprovalAlertMode = 'off' | 'unfocused' | 'always';
-
-export const DEFAULT_EXTERNAL_MCP_APPROVAL_ALERT_MODE: ExternalMcpApprovalAlertMode = 'unfocused';
 
 const DEFAULT_EXTERNAL_MCP_IDLE_TIMEOUT_MINUTES = 10;
 const MIN_EXTERNAL_MCP_IDLE_TIMEOUT_MINUTES = 1;
@@ -110,23 +100,10 @@ export function waitForExternalMcpStartupReady(hash?: string): Promise<void> {
   return externalMcpStartupReadyWaitPromise;
 }
 
-export type ExternalMcpHttpSettings = {
-  enabled: boolean;
-  port: number;
-  allowCustomBind: boolean;
-  listenAddress: string;
-  clientHost: string;
-};
-
 type ExternalMcpConfig = {
   mode: ExternalMcpMode;
   idleTimeoutMinutes: number;
   sessionIdleTimeoutMinutes: number;
-  httpEnabled?: boolean;
-  httpPort?: number;
-  httpAllowCustomBind?: boolean;
-  httpListenAddress?: string;
-  httpClientHost?: string;
 };
 
 type ExternalMcpBridge = {
@@ -206,26 +183,6 @@ export function writeExternalMcpFocusOnHostOpen(focusOnHostOpen: boolean): void
   emitAIStateChanged(STORAGE_KEY_AI_EXTERNAL_MCP_FOCUS_ON_HOST_OPEN);
 }
 
-export function normalizeExternalMcpApprovalAlertMode(value: string | null): ExternalMcpApprovalAlertMode {
-  return value === 'off' || value === 'always' || value === 'unfocused'
-    ? value
-    : DEFAULT_EXTERNAL_MCP_APPROVAL_ALERT_MODE;
-}
-
-/** System notification preference for confirm-mode External MCP approvals. */
-export function readExternalMcpApprovalAlertMode(): ExternalMcpApprovalAlertMode {
-  return normalizeExternalMcpApprovalAlertMode(
-    localStorageAdapter.readString(STORAGE_KEY_AI_EXTERNAL_MCP_APPROVAL_ALERT),
-  );
-}
-
-export function writeExternalMcpApprovalAlertMode(mode: ExternalMcpApprovalAlertMode): ExternalMcpApprovalAlertMode {
-  const normalized = normalizeExternalMcpApprovalAlertMode(mode);
-  localStorageAdapter.writeString(STORAGE_KEY_AI_EXTERNAL_MCP_APPROVAL_ALERT, normalized);
-  emitAIStateChanged(STORAGE_KEY_AI_EXTERNAL_MCP_APPROVAL_ALERT);
-  return normalized;
-}
-
 /** Whether host_open sessions stay hidden from the tab bar. Defaults to false (existing behavior). */
 export function readExternalMcpSilentSessions(): boolean {
   return localStorageAdapter.readBoolean(STORAGE_KEY_AI_EXTERNAL_MCP_SILENT_SESSIONS) ?? false;
@@ -260,109 +217,6 @@ export function writeSessionIdleTimeoutMinutes(minutes: number): number {
   return normalized;
 }
 
-const MIN_EXTERNAL_MCP_HTTP_PORT = 1024;
-const MAX_EXTERNAL_MCP_HTTP_PORT = 65535;
-
-export function normalizeExternalMcpHttpPort(value: number | null): number {
-  if (!Number.isInteger(value)) return DEFAULT_EXTERNAL_MCP_HTTP_PORT;
-  if (value < MIN_EXTERNAL_MCP_HTTP_PORT || value > MAX_EXTERNAL_MCP_HTTP_PORT) {
-    return DEFAULT_EXTERNAL_MCP_HTTP_PORT;
-  }
-  return value;
-}
-
-export function normalizeExternalMcpHttpListenAddress(value: string | null): string {
-  const address = (value ?? '').trim();
-  if (!address) return '0.0.0.0';
-  return address;
-}
-
-export function readExternalMcpHttpEnabled(): boolean {
-  return localStorageAdapter.readBoolean(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_ENABLED) ?? false;
-}
-
-export function writeExternalMcpHttpEnabled(enabled: boolean): boolean {
-  localStorageAdapter.writeBoolean(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_ENABLED, enabled);
-  emitAIStateChanged(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_ENABLED);
-  return enabled;
-}
-
-export function readExternalMcpHttpPort(): number {
-  return normalizeExternalMcpHttpPort(
-    localStorageAdapter.readNumber(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_PORT),
-  );
-}
-
-export function writeExternalMcpHttpPort(port: number): number {
-  const normalized = normalizeExternalMcpHttpPort(port);
-  localStorageAdapter.writeNumber(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_PORT, normalized);
-  emitAIStateChanged(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_PORT);
-  return normalized;
-}
-
-export function readExternalMcpHttpAllowCustomBind(): boolean {
-  return localStorageAdapter.readBoolean(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_ALLOW_CUSTOM_BIND) ?? false;
-}
-
-export function writeExternalMcpHttpAllowCustomBind(allowCustomBind: boolean): boolean {
-  localStorageAdapter.writeBoolean(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_ALLOW_CUSTOM_BIND, allowCustomBind);
-  emitAIStateChanged(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_ALLOW_CUSTOM_BIND);
-  return allowCustomBind;
-}
-
-export function readExternalMcpHttpListenAddress(): string {
-  return normalizeExternalMcpHttpListenAddress(
-    localStorageAdapter.readString(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_LISTEN_ADDRESS),
-  );
-}
-
-export function writeExternalMcpHttpListenAddress(listenAddress: string): string {
-  const normalized = normalizeExternalMcpHttpListenAddress(listenAddress);
-  localStorageAdapter.writeString(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_LISTEN_ADDRESS, normalized);
-  emitAIStateChanged(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_LISTEN_ADDRESS);
-  return normalized;
-}
-
-export function normalizeExternalMcpHttpClientHost(value: string | null): string {
-  return (value ?? '').trim();
-}
-
-export function readExternalMcpHttpClientHost(): string {
-  return normalizeExternalMcpHttpClientHost(
-    localStorageAdapter.readString(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_CLIENT_HOST),
-  );
-}
-
-export function writeExternalMcpHttpClientHost(clientHost: string): string {
-  const normalized = normalizeExternalMcpHttpClientHost(clientHost);
-  localStorageAdapter.writeString(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_CLIENT_HOST, normalized);
-  emitAIStateChanged(STORAGE_KEY_AI_EXTERNAL_MCP_HTTP_CLIENT_HOST);
-  return normalized;
-}
-
-export function readExternalMcpHttpSettings(): ExternalMcpHttpSettings {
-  return {
-    enabled: readExternalMcpHttpEnabled(),
-    port: readExternalMcpHttpPort(),
-    allowCustomBind: readExternalMcpHttpAllowCustomBind(),
-    listenAddress: readExternalMcpHttpListenAddress(),
-    clientHost: readExternalMcpHttpClientHost(),
-  };
-}
-
-function httpConfigFromSettings(settings: ExternalMcpHttpSettings): Pick<
-  ExternalMcpConfig,
-  'httpEnabled' | 'httpPort' | 'httpAllowCustomBind' | 'httpListenAddress' | 'httpClientHost'
-> {
-  return {
-    httpEnabled: settings.enabled,
-    httpPort: settings.port,
-    httpAllowCustomBind: settings.allowCustomBind,
-    httpListenAddress: settings.listenAddress,
-    httpClientHost: settings.clientHost,
-  };
-}
-
 export function shouldStartExternalMcpOnStartup({
   enabled,
   mode,
@@ -385,19 +239,11 @@ export function createExternalMcpStartupSyncPlan({
   mode,
   idleTimeoutMinutes,
   sessionIdleTimeoutMinutes,
-  http = {
-    enabled: false,
-    port: DEFAULT_EXTERNAL_MCP_HTTP_PORT,
-    allowCustomBind: false,
-    listenAddress: '0.0.0.0',
-    clientHost: '',
-  },
 }: {
   enabled: boolean;
   mode: ExternalMcpMode;
   idleTimeoutMinutes: number;
   sessionIdleTimeoutMinutes: number;
-  http?: ExternalMcpHttpSettings;
 }): ExternalMcpStartupSyncPlan {
   const runtimeEnabled = shouldStartExternalMcpOnStartup({ enabled, mode });
   const storedEnabled = runtimeEnabled;
@@ -406,7 +252,6 @@ export function createExternalMcpStartupSyncPlan({
       mode,
       idleTimeoutMinutes,
       sessionIdleTimeoutMinutes,
-      ...httpConfigFromSettings(http),
     },
     runtimeEnabled,
     storedEnabled,
@@ -420,17 +265,14 @@ export function readExternalMcpStartupSyncPlan(): ExternalMcpStartupSyncPlan {
     mode: readExternalMcpMode(),
     idleTimeoutMinutes: readExternalMcpIdleTimeoutMinutes(),
     sessionIdleTimeoutMinutes: readSessionIdleTimeoutMinutes(),
-    http: readExternalMcpHttpSettings(),
   });
 }
 
 export function syncExternalMcpConfig(bridge: ExternalMcpBridge | undefined = netcattyBridge.get()): void {
-  const http = readExternalMcpHttpSettings();
   void bridge?.externalMcpSetConfig?.({
     mode: readExternalMcpMode(),
     idleTimeoutMinutes: readExternalMcpIdleTimeoutMinutes(),
     sessionIdleTimeoutMinutes: readSessionIdleTimeoutMinutes(),
-    ...httpConfigFromSettings(http),
   });
 }
 

application/state/useServerStats.ts

@@ -24,14 +24,6 @@ export interface ProcessInfo {
   command: string;
 }
 
-export interface GpuDeviceStats {
-  index: number;
-  name: string;
-  utilization: number | null; // percent, null when nvidia-smi reports N/A
-  memoryUsed: number | null;  // MiB
-  memoryTotal: number | null; // MiB
-}
-
 export interface ServerStats {
   hostname?: string;            // Remote hostname
   osName?: string;              // Remote operating system name
@@ -45,7 +37,6 @@ export interface ServerStats {
   gpuName: string | null;       // First GPU name (tooltip)
   gpuMemUsed: number | null;    // Summed VRAM used in MB
   gpuMemTotal: number | null;   // Summed VRAM total in MB
-  gpus: GpuDeviceStats[];       // Per-GPU utilization and VRAM
   memTotal: number | null;      // Total memory in MB
   memUsed: number | null;       // Used memory in MB (excluding buffers/cache)
   memFree: number | null;       // Free memory in MB
@@ -125,7 +116,6 @@ function createEmptyServerStats(): ServerStats {
     gpuName: null,
     gpuMemUsed: null,
     gpuMemTotal: null,
-    gpus: [],
     memTotal: null,
     memUsed: null,
     memFree: null,
@@ -228,7 +218,6 @@ function normalizeServerStats(stats: Partial<ServerStats>): ServerStats {
     gpuName: stats.gpuName ?? null,
     gpuMemUsed: stats.gpuMemUsed ?? null,
     gpuMemTotal: stats.gpuMemTotal ?? null,
-    gpus: Array.isArray(stats.gpus) ? stats.gpus : [],
     memTotal: stats.memTotal ?? null,
     memUsed: stats.memUsed ?? null,
     memFree: stats.memFree ?? null,

application/state/useSettingsState.ts

@@ -157,7 +157,6 @@ import {
   isValidUiThemeId,
   migrateIncomingTerminalFontId,
   migrateMaterializedAutoCloseOnExitDefault,
-  migrateMaterializedShiftEnterNewlineDefault,
   readStoredString,
   serializeTerminalSettings,
   type HostClickBehavior,
@@ -367,7 +366,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     // One-time reset of the pre-flip materialized autoCloseOnExit: true before
     // it is ingested; afterwards stored values are the user's own and win.
     migrateMaterializedAutoCloseOnExitDefault();
-    migrateMaterializedShiftEnterNewlineDefault();
     const stored = localStorageAdapter.read<TerminalSettings>(STORAGE_KEY_TERM_SETTINGS);
     return normalizeTerminalSettings(stored);
   });

components/GroupDetailsPanel.test.tsx

@@ -15,11 +15,6 @@ test("GroupDetailsPanel treats an empty SSH identity as an explicit setting", ()
   assert.equal(hasGroupSshFields({}), false);
 });
 
-test("GroupDetailsPanel keeps the SSH section when X11 forwarding is set", () => {
-  assert.equal(hasGroupSshFields({ x11Forwarding: true }), true);
-  assert.equal(hasGroupSshFields({ x11Forwarding: false }), true);
-});
-
 test("GroupDetailsPanel treats cleared telnet credentials as explicit settings", () => {
   assert.equal(hasGroupTelnetFields({ telnetUsername: "" }), true);
   assert.equal(hasGroupTelnetFields({ telnetPassword: "" }), true);

components/GroupDetailsPanel.tsx

@@ -102,7 +102,7 @@ export const hasGroupSshFields = (c: Partial<GroupConfig>): boolean =>
   c.protocol === 'ssh' ||
   c.port !== undefined || !!c.username || !!c.password || !!c.identityFileId ||
   c.deviceType !== undefined ||
-  c.agentForwarding !== undefined || c.x11Forwarding !== undefined || c.authMethod !== undefined || c.identityId !== undefined ||
+  c.agentForwarding !== undefined || c.authMethod !== undefined || c.identityId !== undefined ||
   !!c.proxyProfileId || !!c.proxyConfig || !!c.hostChain || !!c.startupCommand || c.startupCommandRunMode !== undefined || c.legacyAlgorithms !== undefined || c.skipEcdsaHostKey !== undefined || c.algorithms !== undefined || c.backspaceBehavior !== undefined ||
   Boolean(c.environmentVariables && c.environmentVariables.length > 0) ||
   c.moshEnabled !== undefined || !!c.moshServerPath ||
@@ -262,7 +262,6 @@ const GroupDetailsPanel: React.FC<GroupDetailsPanelPropsWithResize> = ({
       delete next.identityFilePaths;
       delete next.deviceType;
       delete next.agentForwarding;
-      delete next.x11Forwarding;
       delete next.startupCommand;
       delete next.startupCommandRunMode;
       delete next.legacyAlgorithms;
@@ -500,10 +499,6 @@ const GroupDetailsPanel: React.FC<GroupDetailsPanelPropsWithResize> = ({
     if (!parentGroup || groupConfigs.length === 0) return false;
     return !!resolveGroupDefaults(parentGroup, groupConfigs).skipEcdsaHostKey;
   }, [groupConfigs, parentGroup]);
-  const inheritedX11Forwarding = useMemo(() => {
-    if (!parentGroup || groupConfigs.length === 0) return false;
-    return !!resolveGroupDefaults(parentGroup, groupConfigs).x11Forwarding;
-  }, [groupConfigs, parentGroup]);
   const inheritedStartupCommandRunMode = useMemo(() => {
     if (!parentGroup || groupConfigs.length === 0) return "paste";
     return resolveGroupDefaults(parentGroup, groupConfigs).startupCommandRunMode ?? "paste";
@@ -573,7 +568,6 @@ const GroupDetailsPanel: React.FC<GroupDetailsPanelPropsWithResize> = ({
         ...(form.identityFilePaths !== undefined && { identityFilePaths: form.identityFilePaths }),
         ...(form.deviceType !== undefined && { deviceType: form.deviceType }),
         ...(form.agentForwarding !== undefined && { agentForwarding: form.agentForwarding }),
-        ...(form.x11Forwarding !== undefined && { x11Forwarding: form.x11Forwarding }),
         ...(form.startupCommand !== undefined && { startupCommand: form.startupCommand }),
         ...(form.startupCommandRunMode !== undefined && { startupCommandRunMode: form.startupCommandRunMode }),
         ...(form.legacyAlgorithms !== undefined && { legacyAlgorithms: form.legacyAlgorithms }),
@@ -784,7 +778,6 @@ const GroupDetailsPanel: React.FC<GroupDetailsPanelPropsWithResize> = ({
           setNewKeyFilePath={setNewKeyFilePath}
           inheritedLegacyAlgorithms={inheritedLegacyAlgorithms}
           inheritedSkipEcdsaHostKey={inheritedSkipEcdsaHostKey}
-          inheritedX11Forwarding={inheritedX11Forwarding}
           inheritedStartupCommandRunMode={inheritedStartupCommandRunMode}
           showAlgorithmOverrides={showAlgorithmOverrides}
           setShowAlgorithmOverrides={setShowAlgorithmOverrides}

components/GroupSshSettingsSection.tsx

@@ -47,7 +47,6 @@ export const GroupSshSettingsSection: React.FC<GroupSshSettingsSectionProps> = (
   setNewKeyFilePath,
   inheritedLegacyAlgorithms,
   inheritedSkipEcdsaHostKey,
-  inheritedX11Forwarding,
   inheritedStartupCommandRunMode,
   showAlgorithmOverrides,
   setShowAlgorithmOverrides,
@@ -396,16 +395,6 @@ export const GroupSshSettingsSection: React.FC<GroupSshSettingsSectionProps> = (
               onToggle={() => update("agentForwarding", !form.agentForwarding)}
             />
 
-            <ToggleRow
-              label={t("hostDetails.x11Forwarding")}
-              hint={t("hostDetails.x11Forwarding.desc")}
-              enabled={!!(form.x11Forwarding ?? inheritedX11Forwarding)}
-              onToggle={() => update(
-                "x11Forwarding",
-                !(form.x11Forwarding ?? inheritedX11Forwarding),
-              )}
-            />
-
             {/* Startup Command — Textarea so multi-line sequences are typeable
                 here just like on the per-host details panel (#1083 follow-up). */}
             <Textarea

components/HostDetailsAdvancedSections.test.ts

@@ -30,17 +30,6 @@ test('enabling SSH agent login clears an imported none sentinel', () => {
   assert.match(source, /resolveSshAgentToggleUpdate/);
 });
 
-test('X11 forwarding display follows the effective host after group defaults', () => {
-  assert.match(source, /applyGroupDefaults\(form, effectiveGroupDefaults\)/);
-  assert.match(source, /const showX11Forwarding = \(!effectiveConnectionHost\.protocol \|\| effectiveConnectionHost\.protocol === "ssh"\)/);
-  assert.match(source, /!effectiveConnectionHost\.moshEnabled/);
-  assert.match(source, /!effectiveConnectionHost\.etEnabled/);
-  assert.match(source, /const effectiveX11Forwarding = !!effectiveConnectionHost\.x11Forwarding/);
-  assert.match(source, /\{showX11Forwarding && \(/);
-  assert.match(source, /enabled=\{effectiveX11Forwarding\}/);
-  assert.doesNotMatch(source, /effectiveGroupDefaults\?\.x11Forwarding/);
-});
-
 test('login and forwarding warnings use independent agent status', () => {
   assert.match(source, /systemSshAgentEnabled && sshAgentStatus && !sshAgentStatus\.running/);
   assert.match(source, /form\.agentForwarding && sshForwardingAgentStatus && !sshForwardingAgentStatus\.running/);

components/HostDetailsAdvancedSections.tsx

@@ -1,5 +1,4 @@
 import { getHostOsSelection, HOST_OS_SELECTIONS, resolveHostOs } from '../domain/host';
-import { applyGroupDefaults } from "../domain/groupConfig";
 import React from "react";
 import { AlertTriangle, ChevronDown, ChevronUp, Forward, Globe, HeartPulse, KeyRound, Link2, Palette, Plus, Router, ShieldAlert, TerminalSquare, Timer, Wifi, X, Variable } from "lucide-react";
 import { customThemeStore } from "../application/state/customThemeStore";
@@ -64,15 +63,6 @@ export const HostDetailsAdvancedSections: React.FC<HostDetailsAdvancedSectionsPr
   const systemSshAgentEnabled = effectiveAuthMethod === "auto"
     ? form.useSshAgent !== false
     : effectiveAuthMethod === "key" && form.useSshAgent === true;
-  // Match the connection: inherited X11 is dropped when the effective transport
-  // is Mosh, Eternal Terminal, or anything other than plain SSH.
-  const effectiveConnectionHost = effectiveGroupDefaults
-    ? applyGroupDefaults(form, effectiveGroupDefaults)
-    : form;
-  const showX11Forwarding = (!effectiveConnectionHost.protocol || effectiveConnectionHost.protocol === "ssh")
-    && !effectiveConnectionHost.moshEnabled
-    && !effectiveConnectionHost.etEnabled;
-  const effectiveX11Forwarding = !!effectiveConnectionHost.x11Forwarding;
 
   return (
   <>
@@ -347,7 +337,7 @@ export const HostDetailsAdvancedSections: React.FC<HostDetailsAdvancedSectionsPr
         </HostDetailsSection>
 
         {/* X11 Forwarding */}
-        {showX11Forwarding && (
+        {(!form.protocol || form.protocol === "ssh") && !form.moshEnabled && !form.etEnabled && (
           <HostDetailsSection
             icon={<TerminalSquare size={14} className="text-muted-foreground" />}
             title={t("hostDetails.section.x11Forwarding")}
@@ -355,8 +345,8 @@ export const HostDetailsAdvancedSections: React.FC<HostDetailsAdvancedSectionsPr
             <ToggleRow
               label={t("hostDetails.x11Forwarding")}
               hint={t("hostDetails.x11Forwarding.desc")}
-              enabled={effectiveX11Forwarding}
-              onToggle={() => update("x11Forwarding", !effectiveX11Forwarding)}
+              enabled={!!form.x11Forwarding}
+              onToggle={() => update("x11Forwarding", !form.x11Forwarding)}
             />
           </HostDetailsSection>
         )}

components/HostDetailsConnectionSections.tsx

@@ -2,7 +2,6 @@ import React from "react";
 import { ChevronDown, Eye, EyeOff, FileKey, FolderLock, FolderOpen, Key, KeyRound, MapPin, Plus, Shapes, Shield, Trash2, User, X } from "lucide-react";
 import type { Host } from "../types";
 import { applyHostAuthMethodSelection } from "../domain/sshAuth";
-import { HostTotpFields } from "./HostTotpFields";
 import { HostIconPicker } from "./HostIconPicker";
 import { Button } from "./ui/button";
 import { Combobox } from "./ui/combobox";
@@ -102,7 +101,6 @@ export const HostDetailsConnectionSections: React.FC<HostDetailsConnectionSectio
   distroOptions,
   effectiveFormDistro,
   getDistroOptionLabel,
-  totpFlushRef,
 }) => {
   const selectAuthMethod = (authMethod: "auto" | "password" | "key" | "certificate") => {
     setForm((previous: Host) => applyEffectiveHostAuthMethodSelection(
@@ -741,13 +739,6 @@ export const HostDetailsConnectionSections: React.FC<HostDetailsConnectionSectio
                   </div>
                 </div>
               )}
-            <HostTotpFields
-              t={t}
-              form={form}
-              setForm={setForm}
-              effectiveProtocol={effectiveProtocol}
-              flushRef={totpFlushRef}
-            />
           </div>
         </HostDetailsSection>
 

components/HostDetailsPanel.proxyProfile.test.tsx

@@ -92,7 +92,7 @@ test("HostDetailsPanel labels command proxy summaries consistently", () => {
   assert.match(markup, /ProxyCommand/);
   assert.doesNotMatch(markup, /COMMAND/);
   assert.doesNotMatch(markup, /cloudflared access ssh/);
-  assert.doesNotMatch(markup, /--token secret/);
+  assert.doesNotMatch(markup, /secret/);
 });
 
 test("HostDetailsPanel keeps explicitly cleared telnet credentials empty", () => {

components/HostDetailsPanel.tsx

@@ -44,7 +44,6 @@ import {
 } from "./ui/aside-panel";
 import { HostDetailsAdvancedSections } from "./HostDetailsAdvancedSections";
 import { detachEffectiveHostIdentity, HostDetailsConnectionSections } from "./HostDetailsConnectionSections";
-import type { HostTotpFlushResult } from "./HostTotpFields";
 import {
   LINUX_DISTRO_OPTION_IDS,
   parseOptionalPortInput,
@@ -164,8 +163,6 @@ const HostDetailsPanel: React.FC<HostDetailsPanelPropsWithResize> = ({
   };
   const { checkSshAgent } = useApplicationBackend();
   const baselineSnippetsRef = useRef(snippets);
-  const totpFlushRef = useRef<(() => Promise<HostTotpFlushResult>) | null>(null);
-  const savingHostRef = useRef(false);
   const baselineHydratedRef = useRef(snippets.length > 0);
   const openingQueueIdsRef = useRef<string[]>([]);
   const [form, setForm] = useState<Host>(
@@ -537,12 +534,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelPropsWithResize> = ({
     ? pluginConnectionValid && Boolean(sanitizePluginConnection(form.pluginConnection, form.protocol))
     : hasHostname;
 
-  const handleSubmit = async () => {
-    if (savingHostRef.current) return;
-    savingHostRef.current = true;
-    try {
-    const flushed = await totpFlushRef.current?.();
-    if (flushed && !flushed.ok) return;
+  const handleSubmit = () => {
     const hostname = form.hostname.trim()
       || (pluginProtocolActive ? form.label.trim() || form.pluginConnection?.providerId || "plugin" : "");
     if (!hostname || !canSaveHost) return;
@@ -623,10 +615,6 @@ const HostDetailsPanel: React.FC<HostDetailsPanelPropsWithResize> = ({
       authPolicyVersion: 1,
       managedSourceId: finalManagedSourceId,
     };
-    if (flushed?.ok) {
-      if (flushed.totp) cleaned.totp = flushed.totp;
-      else delete cleaned.totp;
-    }
     if (pluginProtocolActive) {
       const pluginConnection = sanitizePluginConnection(cleaned.pluginConnection, cleaned.protocol);
       if (!pluginConnection) return;
@@ -754,9 +742,6 @@ const HostDetailsPanel: React.FC<HostDetailsPanelPropsWithResize> = ({
       }
     }
     onSave(stripBuiltInConnectionFieldsForPluginHost(cleaned));
-    } finally {
-      savingHostRef.current = false;
-    }
   };
 
   const handleCreateGroup = () => {
@@ -1152,7 +1137,6 @@ const HostDetailsPanel: React.FC<HostDetailsPanelPropsWithResize> = ({
           t={t}
           form={form}
           setForm={setForm}
-          totpFlushRef={totpFlushRef}
           update={update}
           groupDefaults={effectiveGroupDefaults}
           effectiveAuthMethod={effectiveAuthMethod}

components/HostTotpFields.test.tsx

@@ -1,104 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import { readFileSync } from "node:fs";
-import { JSDOM } from "jsdom";
-import type { Host } from "../domain/models";
-
-test("host totp setup stays on the shared setting row and opens a dialog", async () => {
-  const dom = new JSDOM("<!doctype html><html><body><div id=\"root\"></div></body></html>", {
-    url: "http://localhost",
-    pretendToBeVisual: true,
-  });
-  const previous = new Map<string, PropertyDescriptor | undefined>();
-  const install = (key: string, value: unknown) => {
-    previous.set(key, Object.getOwnPropertyDescriptor(globalThis, key));
-    Object.defineProperty(globalThis, key, { configurable: true, writable: true, value });
-  };
-  class ResizeObserverStub {
-    observe() {}
-    unobserve() {}
-    disconnect() {}
-  }
-  install("window", dom.window);
-  install("document", dom.window.document);
-  install("navigator", dom.window.navigator);
-  install("HTMLElement", dom.window.HTMLElement);
-  install("HTMLInputElement", dom.window.HTMLInputElement);
-  install("HTMLButtonElement", dom.window.HTMLButtonElement);
-  install("Element", dom.window.Element);
-  install("Node", dom.window.Node);
-  install("MutationObserver", dom.window.MutationObserver);
-  install("Event", dom.window.Event);
-  install("CustomEvent", dom.window.CustomEvent);
-  install("MouseEvent", dom.window.MouseEvent);
-  install("KeyboardEvent", dom.window.KeyboardEvent);
-  install("FocusEvent", dom.window.FocusEvent);
-  install("PointerEvent", dom.window.PointerEvent);
-  install("getComputedStyle", dom.window.getComputedStyle.bind(dom.window));
-  install("requestAnimationFrame", dom.window.requestAnimationFrame.bind(dom.window));
-  install("cancelAnimationFrame", dom.window.cancelAnimationFrame.bind(dom.window));
-  install("ResizeObserver", ResizeObserverStub);
-  install("IS_REACT_ACT_ENVIRONMENT", true);
-  Object.assign(dom.window, { netcatty: {} });
-
-  const { act } = await import("react");
-  const { createRoot } = await import("react-dom/client");
-  const { HostTotpFields } = await import("./HostTotpFields.tsx");
-  const { TooltipProvider } = await import("./ui/tooltip.tsx");
-
-  const form = {
-    id: "host-1",
-    label: "Jump",
-    hostname: "127.0.0.1",
-    port: 22,
-    username: "root",
-    protocol: "ssh",
-  } as Host;
-  let latest = form;
-  const root = createRoot(dom.window.document.getElementById("root")!);
-  const t = (key: string) => key;
-  try {
-    await act(async () => {
-      root.render(
-        <TooltipProvider>
-          <HostTotpFields
-            t={t}
-            form={latest}
-            setForm={(updater) => {
-              latest = typeof updater === "function" ? updater(latest) : updater;
-            }}
-            effectiveProtocol="ssh"
-          />
-        </TooltipProvider>,
-      );
-    });
-    const markup = dom.window.document.body.innerHTML;
-    assert.match(markup, /hostDetails\.totp\.setup/);
-    assert.doesNotMatch(markup, /rounded-md border border-border\/60 p-3/);
-    assert.equal(dom.window.document.querySelector("[role='dialog']"), null);
-    assert.equal(dom.window.document.querySelector("[role='switch']"), null);
-
-    const button = [...dom.window.document.querySelectorAll("button")]
-      .find((node) => node.textContent?.includes("hostDetails.totp.setup"));
-    assert.ok(button);
-    await act(async () => { button.click(); });
-    assert.ok(dom.window.document.body.textContent?.includes("hostDetails.totp.modalTitle"));
-    assert.ok(dom.window.document.body.innerHTML.includes("hostDetails.totp.secretPlaceholder"));
-    assert.equal(latest.totp, undefined);
-    const fields = readFileSync(new URL("./HostTotpFields.tsx", import.meta.url), "utf8");
-    assert.match(fields, /label=\{t\("hostDetails\.totp\.title"\)\}/);
-    assert.match(fields, /setConfirmClear\(true\)/);
-    assert.match(fields, /variant="secondary"/);
-    const sections = readFileSync(new URL("./HostDetailsConnectionSections.tsx", import.meta.url), "utf8");
-    const passwordAt = sections.indexOf("hostDetails.password.placeholder");
-    const totpAt = sections.indexOf("<HostTotpFields");
-    assert.ok(passwordAt > 0 && totpAt > passwordAt);
-  } finally {
-    await act(async () => { root.unmount(); });
-    await new Promise((resolve) => setTimeout(resolve, 50));
-    for (const [key, descriptor] of previous) {
-      if (descriptor) Object.defineProperty(globalThis, key, descriptor);
-      else delete (globalThis as Record<string, unknown>)[key];
-    }
-  }
-});

components/HostTotpFields.tsx

@@ -1,568 +0,0 @@
-import React, { useEffect, useRef, useState } from "react";
-import jsQR from "jsqr";
-import { RE2JS } from "re2js";
-import type { Host, HostTotpConfig } from "../domain/models";
-import { netcattyBridge } from "@/infrastructure/services/netcattyBridge.ts";
-import { Button } from "./ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "./ui/dialog";
-import { HostDetailsSettingRow } from "./host-details";
-import { SystemPanelConfirmDialog } from "./systemManager/SystemPanelConfirmDialog";
-import { Input } from "./ui/input";
-import { Label } from "./ui/label";
-import { Switch } from "./ui/switch";
-
-type Preview = {
-  uri: string;
-  code: string;
-  secondsRemaining: number;
-  issuer?: string;
-  label?: string;
-};
-
-export type HostTotpFlushResult =
-  | { ok: true; totp: HostTotpConfig | undefined }
-  | { ok: false };
-
-type HostTotpFieldsProps = {
-  t: (key: string, params?: Record<string, string | number>) => string;
-  form: Host;
-  setForm: (updater: Host | ((host: Host) => Host)) => void;
-  effectiveProtocol?: string;
-  flushRef?: React.MutableRefObject<(() => Promise<HostTotpFlushResult>) | null>;
-};
-
-const HIDDEN_PROTOCOLS = new Set(["telnet", "serial"]);
-
-function errorKey(error: string | undefined): string {
-  switch (error) {
-    case "hotp":
-      return "hostDetails.totp.error.hotp";
-    case "migration":
-      return "hostDetails.totp.error.migration";
-    case "not-found":
-      return "hostDetails.totp.error.notFound";
-    case "screen-permission-denied":
-      return "hostDetails.totp.error.permission";
-    case "unavailable":
-      return "hostDetails.totp.error.unavailable";
-    case "pattern":
-      return "hostDetails.totp.error.pattern";
-    default:
-      return "hostDetails.totp.error.invalid";
-  }
-}
-
-async function decodeQrFile(file: File): Promise<string> {
-  const bitmap = await createImageBitmap(file);
-  try {
-    const canvas = document.createElement("canvas");
-    canvas.width = bitmap.width;
-    canvas.height = bitmap.height;
-    const context = canvas.getContext("2d", { willReadFrequently: true });
-    if (!context) throw new Error("unavailable");
-    context.drawImage(bitmap, 0, 0);
-    const image = context.getImageData(0, 0, canvas.width, canvas.height);
-    return jsQR(image.data, image.width, image.height)?.data || "";
-  } finally {
-    bitmap.close?.();
-  }
-}
-
-function validPattern(value: string): string | null {
-  const trimmed = value.trim();
-  if (!trimmed) return "";
-  if (trimmed.length > 200) return null;
-  try {
-    RE2JS.compile(trimmed);
-    return trimmed;
-  } catch {
-    return null;
-  }
-}
-
-function importedAccount(preview: Preview): string {
-  const issuer = preview.issuer?.trim() || "";
-  const label = preview.label?.trim() || "";
-  if (issuer && label && !label.toLowerCase().startsWith(issuer.toLowerCase())) {
-    return `${issuer} (${label})`;
-  }
-  return label || issuer;
-}
-
-function useLiveTotp(source: string | undefined, hostId: string): Preview | null {
-  const [preview, setPreview] = useState<Preview | null>(null);
-  const hostRef = useRef(hostId);
-  hostRef.current = hostId;
-
-  useEffect(() => {
-    if (!source) {
-      setPreview(null);
-      return undefined;
-    }
-    const expectedHostId = hostId;
-    let cancelled = false;
-    const bridge = netcattyBridge.get();
-    if (!bridge?.previewTotp) return undefined;
-    const endsAtRef = { current: 0 };
-    let refreshed = false;
-    const apply = (next: Preview) => {
-      if (cancelled || hostRef.current !== expectedHostId) return;
-      endsAtRef.current = Date.now() + next.secondsRemaining * 1000;
-      refreshed = false;
-      setPreview(next);
-    };
-    void bridge.previewTotp({ text: source }).then((result) => {
-      if (!result?.ok || !result.uri || !result.code) return;
-      apply({
-        uri: result.uri,
-        code: result.code,
-        secondsRemaining: result.secondsRemaining || result.period || 30,
-        issuer: result.issuer,
-        label: result.label,
-      });
-    }).catch(() => undefined);
-    const timer = setInterval(() => {
-      if (cancelled || !endsAtRef.current) return;
-      const left = Math.max(0, Math.ceil((endsAtRef.current - Date.now()) / 1000));
-      setPreview((current) => (
-        current && current.secondsRemaining !== left
-          ? { ...current, secondsRemaining: left }
-          : current
-      ));
-      if (left !== 0 || refreshed) return;
-      refreshed = true;
-      void bridge.previewTotp({ text: source }).then((result) => {
-        if (!result?.ok || !result.uri || !result.code) return;
-        apply({
-          uri: result.uri,
-          code: result.code,
-          secondsRemaining: result.secondsRemaining || result.period || 30,
-          issuer: result.issuer,
-          label: result.label,
-        });
-      }).catch(() => undefined);
-    }, 250);
-    return () => {
-      cancelled = true;
-      clearInterval(timer);
-    };
-  }, [hostId, source]);
-
-  return source ? preview : null;
-}
-
-export const HostTotpFields: React.FC<HostTotpFieldsProps> = ({
-  t,
-  form,
-  setForm,
-  effectiveProtocol,
-  flushRef,
-}) => {
-  const configured = Boolean(form.totp?.uri);
-  const [setupOpen, setSetupOpen] = useState(false);
-  const [draft, setDraft] = useState("");
-  const [pattern, setPattern] = useState(form.totp?.promptPattern || "");
-  const [autoSubmit, setAutoSubmit] = useState(form.totp?.autoSubmit !== false);
-  const [modalUri, setModalUri] = useState<string | undefined>(undefined);
-  const [error, setError] = useState<string | null>(null);
-  const [busy, setBusy] = useState(false);
-  const [scanning, setScanning] = useState(false);
-  const [confirmClear, setConfirmClear] = useState(false);
-  const fileRef = useRef<HTMLInputElement>(null);
-  const hostIdRef = useRef(form.id);
-  const formRef = useRef(form);
-  const setupOpenRef = useRef(setupOpen);
-  const draftRef = useRef(draft);
-  const patternRef = useRef(pattern);
-  const autoSubmitRef = useRef(autoSubmit);
-  const modalUriRef = useRef(modalUri);
-  const requestRef = useRef(0);
-  formRef.current = form;
-  setupOpenRef.current = setupOpen;
-  draftRef.current = draft;
-  patternRef.current = pattern;
-  autoSubmitRef.current = autoSubmit;
-  modalUriRef.current = modalUri;
-
-  const [trackedHostId, setTrackedHostId] = useState(form.id);
-  if (form.id !== trackedHostId) {
-    setTrackedHostId(form.id);
-    setSetupOpen(false);
-    setDraft("");
-    setPattern(form.totp?.promptPattern || "");
-    setAutoSubmit(form.totp?.autoSubmit !== false);
-    setModalUri(undefined);
-    setError(null);
-    setBusy(false);
-    setScanning(false);
-    setConfirmClear(false);
-    draftRef.current = "";
-    patternRef.current = form.totp?.promptPattern || "";
-    autoSubmitRef.current = form.totp?.autoSubmit !== false;
-    modalUriRef.current = undefined;
-    setupOpenRef.current = false;
-  }
-  hostIdRef.current = form.id;
-
-  const rowPreview = useLiveTotp(form.totp?.uri, form.id);
-  const modalPreview = useLiveTotp(setupOpen ? (modalUri || form.totp?.uri) : undefined, form.id);
-
-  const writeTotp = (next: HostTotpConfig | undefined) => {
-    const expectedHostId = hostIdRef.current;
-    setForm((current) => {
-      if (current.id !== expectedHostId) return current;
-      const updated = { ...current };
-      if (next?.uri) updated.totp = next;
-      else delete updated.totp;
-      return updated;
-    });
-  };
-
-  const previewText = async (text: string): Promise<string | null> => {
-    const expectedHostId = hostIdRef.current;
-    const requestId = ++requestRef.current;
-    const bridge = netcattyBridge.get();
-    if (!bridge?.previewTotp) {
-      setError("unavailable");
-      return null;
-    }
-    setBusy(true);
-    try {
-      const result = await bridge.previewTotp({ text });
-      if (hostIdRef.current !== expectedHostId || requestRef.current !== requestId) return null;
-      if (!result?.ok || !result.uri || !result.code) {
-        setError(result?.error || "invalid");
-        return null;
-      }
-      setError(null);
-      setModalUri(result.uri);
-      modalUriRef.current = result.uri;
-      setDraft("");
-      draftRef.current = "";
-      return result.uri;
-    } catch {
-      if (hostIdRef.current === expectedHostId && requestRef.current === requestId) setError("unavailable");
-      return null;
-    } finally {
-      if (hostIdRef.current === expectedHostId && requestRef.current === requestId) setBusy(false);
-    }
-  };
-
-  const commitSetup = async (options?: { requireSecret?: boolean }): Promise<HostTotpFlushResult> => {
-    const expectedHostId = hostIdRef.current;
-    const patternValue = validPattern(patternRef.current);
-    if (patternValue == null) {
-      setError("pattern");
-      return { ok: false };
-    }
-    let uri = modalUriRef.current || formRef.current.totp?.uri;
-    const text = draftRef.current.trim();
-    if (text) {
-      uri = await previewText(text) || undefined;
-      if (hostIdRef.current !== expectedHostId) return { ok: false };
-      if (!uri) return { ok: false };
-    }
-    if (!uri) {
-      if (options?.requireSecret) {
-        setError("invalid");
-        return { ok: false };
-      }
-      return { ok: true, totp: formRef.current.totp };
-    }
-    const next: HostTotpConfig = {
-      uri,
-      autoSubmit: autoSubmitRef.current,
-      ...(patternValue ? { promptPattern: patternValue } : {}),
-    };
-    writeTotp(next);
-    setSetupOpen(false);
-    setupOpenRef.current = false;
-    setDraft("");
-    draftRef.current = "";
-    setModalUri(undefined);
-    modalUriRef.current = undefined;
-    setError(null);
-    return { ok: true, totp: next };
-  };
-  const commitRef = useRef(commitSetup);
-  commitRef.current = commitSetup;
-
-  useEffect(() => {
-    if (!flushRef) return undefined;
-    const flush = async (): Promise<HostTotpFlushResult> => {
-      const expectedHostId = hostIdRef.current;
-      if (hostIdRef.current !== expectedHostId) return { ok: false };
-      if (!setupOpenRef.current) return { ok: true, totp: formRef.current.totp };
-      return commitRef.current();
-    };
-    flushRef.current = flush;
-    return () => {
-      if (flushRef.current === flush) flushRef.current = null;
-    };
-  }, [flushRef]);
-
-  const openSetup = () => {
-    setPattern(form.totp?.promptPattern || "");
-    patternRef.current = form.totp?.promptPattern || "";
-    setAutoSubmit(form.totp?.autoSubmit !== false);
-    autoSubmitRef.current = form.totp?.autoSubmit !== false;
-    setDraft("");
-    draftRef.current = "";
-    setModalUri(undefined);
-    modalUriRef.current = undefined;
-    setError(null);
-    setSetupOpen(true);
-    setupOpenRef.current = true;
-  };
-
-  const cancelSetup = () => {
-    requestRef.current += 1;
-    setSetupOpen(false);
-    setupOpenRef.current = false;
-    setDraft("");
-    draftRef.current = "";
-    setModalUri(undefined);
-    modalUriRef.current = undefined;
-    setError(null);
-    setBusy(false);
-    setScanning(false);
-  };
-
-  const clearTotp = () => {
-    cancelSetup();
-    writeTotp(undefined);
-  };
-
-  if (effectiveProtocol && HIDDEN_PROTOCOLS.has(effectiveProtocol)) return null;
-
-  const scanScreen = async () => {
-    const expectedHostId = form.id;
-    const requestId = ++requestRef.current;
-    const bridge = netcattyBridge.get();
-    if (!bridge?.scanTotpQrFromScreen) {
-      setError("unavailable");
-      return;
-    }
-    setBusy(true);
-    setScanning(true);
-    try {
-      const result = await bridge.scanTotpQrFromScreen();
-      if (hostIdRef.current !== expectedHostId || requestRef.current !== requestId) return;
-      if (!result?.ok || !result.uri || !result.code) {
-        setError(result?.error || "not-found");
-        return;
-      }
-      setError(null);
-      setModalUri(result.uri);
-      modalUriRef.current = result.uri;
-      setDraft("");
-      draftRef.current = "";
-    } catch {
-      if (hostIdRef.current === expectedHostId && requestRef.current === requestId) setError("unavailable");
-    } finally {
-      if (hostIdRef.current === expectedHostId && requestRef.current === requestId) {
-        setBusy(false);
-        setScanning(false);
-      }
-    }
-  };
-
-  return (
-    <>
-      <HostDetailsSettingRow
-        label={t("hostDetails.totp.title")}
-        hint={t("hostDetails.totp.warning")}
-      >
-        <div className="flex items-center gap-2">
-          {rowPreview && (
-            <span
-              className="font-mono text-xs font-normal tabular-nums tracking-widest text-muted-foreground"
-              title={t("hostDetails.totp.countdown", { seconds: rowPreview.secondsRemaining })}
-            >
-              {rowPreview.code}
-            </span>
-          )}
-          <Button
-            type="button"
-            variant="ghost"
-            size="sm"
-            className="h-7 px-2"
-            onClick={openSetup}
-          >
-            {configured ? t("hostDetails.totp.edit") : t("hostDetails.totp.setup")}
-          </Button>
-        </div>
-      </HostDetailsSettingRow>
-
-      <Dialog open={setupOpen} onOpenChange={(open) => { if (!open) cancelSetup(); }}>
-        <DialogContent className="sm:max-w-[440px]">
-          <DialogHeader>
-            <DialogTitle>{t("hostDetails.totp.modalTitle")}</DialogTitle>
-            <DialogDescription>{t("hostDetails.totp.warning")}</DialogDescription>
-          </DialogHeader>
-          <div className="space-y-3">
-            <div className="space-y-2">
-              <Label htmlFor="host-totp-secret">{t("hostDetails.totp.secret")}</Label>
-              <Input
-                id="host-totp-secret"
-                value={draft}
-                onChange={(event) => {
-                  setDraft(event.target.value);
-                  draftRef.current = event.target.value;
-                }}
-                onBlur={() => {
-                  if (draftRef.current.trim()) void previewText(draftRef.current);
-                }}
-                onKeyDown={(event) => {
-                  if (event.key === "Enter") {
-                    event.preventDefault();
-                    void commitSetup({ requireSecret: true });
-                  }
-                }}
-                placeholder={configured ? t("hostDetails.totp.replacePlaceholder") : t("hostDetails.totp.secretPlaceholder")}
-                aria-label={t("hostDetails.totp.secret")}
-                className="h-8 font-mono text-xs"
-                disabled={busy}
-                spellCheck={false}
-                autoFocus
-              />
-            </div>
-            <div className="flex flex-wrap gap-2">
-              <Button
-                type="button"
-                variant="secondary"
-                size="sm"
-                className="h-8 focus:bg-secondary focus:text-secondary-foreground focus-visible:bg-secondary focus-visible:text-secondary-foreground"
-                disabled={busy}
-                onClick={() => fileRef.current?.click()}
-              >
-                {t("hostDetails.totp.importQr")}
-              </Button>
-              <Button
-                type="button"
-                variant="secondary"
-                size="sm"
-                className="h-8 focus:bg-secondary focus:text-secondary-foreground focus-visible:bg-secondary focus-visible:text-secondary-foreground"
-                disabled={busy}
-                onClick={() => { void scanScreen(); }}
-              >
-                {scanning ? t("hostDetails.totp.scanning") : t("hostDetails.totp.scanScreen")}
-              </Button>
-              <input
-                ref={fileRef}
-                type="file"
-                accept="image/*"
-                className="hidden"
-                onChange={(event) => {
-                  const file = event.target.files?.[0];
-                  event.target.value = "";
-                  if (!file) return;
-                  const expectedHostId = form.id;
-                  const requestId = ++requestRef.current;
-                  setBusy(true);
-                  void decodeQrFile(file)
-                    .then((text) => {
-                      if (hostIdRef.current !== expectedHostId || requestRef.current !== requestId) return;
-                      if (!text) {
-                        setError("not-found");
-                        setBusy(false);
-                        return;
-                      }
-                      return previewText(text);
-                    })
-                    .catch(() => {
-                      if (hostIdRef.current !== expectedHostId || requestRef.current !== requestId) return;
-                      setError("invalid");
-                      setBusy(false);
-                    });
-                }}
-              />
-            </div>
-            {modalPreview && (
-              <div className="space-y-1">
-                {importedAccount(modalPreview) ? (
-                  <p className="text-sm text-foreground">
-                    {t("hostDetails.totp.importedAccount", { account: importedAccount(modalPreview) })}
-                  </p>
-                ) : null}
-                <p className="text-sm text-muted-foreground">
-                  {t("hostDetails.totp.preview")}
-                  {" "}
-                  <span className="font-mono tracking-widest text-foreground">{modalPreview.code}</span>
-                  <span className="ml-2">{t("hostDetails.totp.countdown", { seconds: modalPreview.secondsRemaining })}</span>
-                </p>
-              </div>
-            )}
-            {error && <p className="text-xs text-destructive">{t(errorKey(error))}</p>}
-            <div className="flex items-center justify-between gap-3">
-              <div className="min-w-0">
-                <p className="text-sm font-medium text-foreground">{t("hostDetails.totp.autoSubmit")}</p>
-                <p className="text-xs text-muted-foreground">{t("hostDetails.totp.autoSubmitDesc")}</p>
-              </div>
-              <Switch
-                checked={autoSubmit}
-                onCheckedChange={(checked) => {
-                  setAutoSubmit(checked);
-                  autoSubmitRef.current = checked;
-                }}
-                aria-label={t("hostDetails.totp.autoSubmit")}
-              />
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="host-totp-pattern">{t("hostDetails.totp.promptPattern")}</Label>
-              <Input
-                id="host-totp-pattern"
-                value={pattern}
-                onChange={(event) => {
-                  setPattern(event.target.value);
-                  patternRef.current = event.target.value;
-                  setError((current) => (current === "pattern" ? null : current));
-                }}
-                placeholder={t("hostDetails.totp.promptPatternPlaceholder")}
-                aria-label={t("hostDetails.totp.promptPattern")}
-                className="h-8 font-mono text-xs"
-                spellCheck={false}
-              />
-            </div>
-          </div>
-          <DialogFooter className="gap-2 sm:justify-between">
-            {configured ? (
-              <Button type="button" variant="ghost" onClick={() => setConfirmClear(true)}>
-                {t("hostDetails.totp.clear")}
-              </Button>
-            ) : <span />}
-            <div className="flex gap-2">
-              <Button type="button" variant="secondary" onClick={cancelSetup}>
-                {t("common.cancel")}
-              </Button>
-              <Button type="button" onClick={() => { void commitSetup({ requireSecret: true }); }} disabled={busy}>
-                {t("common.save")}
-              </Button>
-            </div>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-      {confirmClear ? (
-        <SystemPanelConfirmDialog
-          open
-          destructive
-          title={t("hostDetails.totp.removeTitle")}
-          message={t("hostDetails.totp.removeMessage")}
-          confirmLabel={t("hostDetails.totp.clear")}
-          onOpenChange={(open) => { if (!open) setConfirmClear(false); }}
-          onConfirm={() => {
-            setConfirmClear(false);
-            clearTotp();
-          }}
-        />
-      ) : null}
-    </>
-  );
-};

components/KeyboardInteractiveModal.test.ts

@@ -4,94 +4,48 @@
 import test from "node:test";
 import assert from "node:assert/strict";
 import { readFileSync } from "node:fs";
-import { createRequire } from "node:module";
 
-const require = createRequire(import.meta.url);
-
-import {
-  keyboardInteractiveFieldLabel,
-  keyboardInteractiveGuidance,
-  totpFillPlacement,
-  visibleTotpFillPlacements,
-} from "./KeyboardInteractiveModal.tsx";
+import { formatKeyboardInteractiveServerPrompt } from "./KeyboardInteractiveModal.tsx";
 
 const modalSource = readFileSync(new URL("./KeyboardInteractiveModal.tsx", import.meta.url), "utf8");
 
-test("keyboardInteractiveFieldLabel uses the cleaned last prompt line", () => {
-  assert.equal(keyboardInteractiveFieldLabel("Secondary Authentication Password:", "Verification code"), "Secondary Authentication Password");
-  assert.equal(keyboardInteractiveFieldLabel("JumpServer:\n| SMS code:", "Verification code"), "SMS code");
-  assert.equal(keyboardInteractiveFieldLabel("[OTP Code]: ", "Verification code"), "OTP Code");
-  assert.equal(keyboardInteractiveFieldLabel("   ", "Verification code"), "Verification code");
+test("formatKeyboardInteractiveServerPrompt preserves server instructions and prompt labels", () => {
+  const text = formatKeyboardInteractiveServerPrompt({
+    hostname: "192.168.9.138",
+    name: "Keyboard-interactive authentication prompts from server",
+    instructions: "为保障主机安全，请输入二次认证密码，如有疑问，请联系xxx，电话xxx。",
+    prompts: [
+      {
+        prompt: "Secondary Authentication Password:",
+        echo: false,
+      },
+    ],
+  });
+
+  assert.equal(
+    text,
+    [
+      "Keyboard-interactive authentication prompts from server:",
+      "| 为保障主机安全，请输入二次认证密码，如有疑问，请联系xxx，电话xxx。",
+      "| Secondary Authentication Password:",
+    ].join("\n"),
+  );
 });
 
-test("keyboard-interactive dialog shows a field label and an inline TOTP action", async () => {
-  assert.doesNotMatch(modalSource, /<pre/);
-  assert.match(modalSource, /keyboardInteractiveFieldLabel\(/);
-  assert.match(modalSource, /keyboardInteractiveGuidance\(/);
-  assert.match(modalSource, /data-totp-fill=\{fillPlacement\}/);
-  assert.match(modalSource, /variant="secondary"/);
-  assert.doesNotMatch(modalSource, /variant=\{fillPlacement/);
-  assert.match(modalSource, /totpPrompt\.shared\.mjs/);
-  const shared = require("../domain/totpPrompt.shared.cjs") as { NON_TOTP_PROMPT: RegExp };
-  const runtime = require("../domain/totp.shared.cjs") as { NON_TOTP_PROMPT: RegExp };
-  const esm = await import("../domain/totpPrompt.shared.mjs");
-  assert.equal(shared.NON_TOTP_PROMPT, runtime.NON_TOTP_PROMPT);
-  assert.equal(esm.NON_TOTP_PROMPT.source, shared.NON_TOTP_PROMPT.source);
-  assert.doesNotMatch(modalSource, /ring-primary/);
-  assert.doesNotMatch(modalSource, /className="w-full"/);
-  assert.doesNotMatch(modalSource, /onTypeTotp/);
-});
-
-test("keyboardInteractiveGuidance keeps directions that are not already the field label", () => {
-  assert.equal(keyboardInteractiveGuidance({
-    name: "bastion",
-    hostname: "bastion",
+test("formatKeyboardInteractiveServerPrompt omits hostname-only fallback prompts", () => {
+  const text = formatKeyboardInteractiveServerPrompt({
+    hostname: "192.168.9.138",
+    name: "192.168.9.138",
     instructions: "",
-    prompts: [{ prompt: "Verification code:", echo: false }],
-  }), "");
-  assert.equal(keyboardInteractiveGuidance({
-    name: "Duo Security",
-    hostname: "vpn.example",
-    instructions: "1. Duo Push\n2. SMS\nPasscode or option (1-3):",
-    prompts: [{ prompt: "Passcode or option (1-3):", echo: true }],
-  }), "Duo Security\n1. Duo Push\n2. SMS");
-  assert.equal(keyboardInteractiveGuidance({
-    name: "host",
-    hostname: "other",
-    instructions: "| Verification code:",
-    prompts: [{ prompt: "Verification code:", echo: false }],
-  }), "host");
-  assert.equal(keyboardInteractiveGuidance({
-    name: "bastion",
-    hostname: "bastion",
-    instructions: "",
-    prompts: [{ prompt: "1. OTP\n2. SMS\nOption> ", echo: true }],
-  }), "1. OTP\n2. SMS");
-  assert.equal(keyboardInteractiveGuidance({
-    name: "bastion",
-    hostname: "bastion",
-    instructions: "1. OTP",
-    prompts: [{ prompt: "1. OTP\nOption>", echo: true }],
-  }), "1. OTP");
-});
+    prompts: [
+      {
+        prompt: "Password:",
+        echo: false,
+      },
+    ],
+  });
 
-test("TOTP fill stays off password prompts and prefers verification prompts", () => {
-  assert.equal(totpFillPlacement({ prompt: "Password:", echo: false }), "hidden");
-  assert.equal(totpFillPlacement({ prompt: "Verification code:", echo: false }), "preferred");
-  assert.equal(totpFillPlacement({ prompt: "[OTP Code]:", echo: false }), "preferred");
-  assert.equal(totpFillPlacement({ prompt: "One-time password:", echo: false }), "preferred");
-  assert.equal(totpFillPlacement({ prompt: "SMS code:", echo: false }), "hidden");
-  assert.equal(totpFillPlacement({ prompt: "1. OTP\n2. SMS\nOption> ", echo: true }), "hidden");
-  assert.equal(totpFillPlacement({ prompt: "[Y/n]", echo: true }), "hidden");
-  assert.equal(totpFillPlacement({ prompt: "1. OTP\nVerification code:", echo: false }), "preferred");
-  assert.equal(totpFillPlacement({ prompt: "Response:", echo: true }), "available");
-  assert.deepEqual(visibleTotpFillPlacements([
-    { prompt: "Password:", echo: false },
-    { prompt: "Verification code:", echo: false },
-  ]), ["hidden", "preferred"]);
-  assert.deepEqual(visibleTotpFillPlacements([
-    { prompt: "Password:", echo: false },
-  ]), ["hidden"]);
+  assert.equal(text, "");
 });
 
 test("keyboard-interactive modal cannot be dismissed by outside click or Escape", () => {

components/KeyboardInteractiveModal.tsx

@@ -5,7 +5,6 @@
  */
 import { Eye, EyeOff, KeyRound, Loader2 } from "lucide-react";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { NON_TOTP_PROMPT } from "../domain/totpPrompt.shared.mjs";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { Button } from "./ui/button";
 import {
@@ -35,54 +34,35 @@ export interface KeyboardInteractiveRequest {
   savedPassword?: string | null;
   /** When false, hide save-password UI (second-factor / EDR challenges). Default true. */
   allowSavePassword?: boolean;
-  /** otpauth URI from the connection attempt that opened this dialog. */
-  totpUri?: string;
 }
 
-/** Last meaningful line of a server prompt, without the raw banner. */
-export function keyboardInteractiveFieldLabel(prompt: string | undefined, fallback: string): string {
-  const lines = String(prompt || "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-  const last = lines.at(-1) || "";
-  const cleaned = last
-    .replace(/^[\s|｜>•*-]+/, "")
-    .replace(/[:：]\s*$/, "")
-    .trim()
-    .replace(/^\[(.+)\]$/, "$1")
-    .trim();
-  return cleaned || fallback;
-}
+type KeyboardInteractiveServerPromptInput = Pick<
+  KeyboardInteractiveRequest,
+  "name" | "instructions" | "prompts" | "hostname"
+>;
 
-function guidanceKeys(text: string): string[] {
-  const trimmed = text.trim().toLowerCase();
-  const label = keyboardInteractiveFieldLabel(text, "").toLowerCase();
-  return [trimmed, label].filter(Boolean);
-}
-
-/** Server directions that are not already the field label. Plain text, not a prompt dump. */
-export function keyboardInteractiveGuidance(request: Pick<KeyboardInteractiveRequest, "name" | "instructions" | "prompts" | "hostname">): string {
-  const labelKeys = new Set<string>();
-  const promptLines: string[] = [];
-  for (const prompt of request.prompts || []) {
-    const parts = String(prompt?.prompt || "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-    const last = parts.at(-1) || "";
-    for (const key of guidanceKeys(last)) labelKeys.add(key);
-    promptLines.push(...parts.slice(0, -1));
-  }
-  const seen = new Set<string>();
+/** Formats the server-supplied keyboard-interactive prompt block for display. */
+export function formatKeyboardInteractiveServerPrompt(request: KeyboardInteractiveServerPromptInput): string {
   const lines: string[] = [];
-  const push = (text: string) => {
-    const line = text.trim().replace(/^\|\s*/, "");
-    if (!line) return;
-    const keys = guidanceKeys(line);
-    if (keys.some((key) => labelKeys.has(key) || seen.has(key))) return;
-    for (const key of keys) seen.add(key);
-    lines.push(line);
-  };
-  const hostname = (request.hostname || "").trim().toLowerCase();
-  const name = (request.name || "").trim();
-  if (name && name.toLowerCase() !== hostname) push(name);
-  for (const part of String(request.instructions || "").split(/\r?\n/)) push(part);
-  for (const part of promptLines) push(part);
+  const name = request.name?.trim();
+  const hostname = request.hostname?.trim();
+  const instructions = request.instructions?.trim();
+  const hasServerText = !!instructions || !!(name && name !== hostname);
+  if (!hasServerText) return "";
+  if (name && name !== hostname) {
+    lines.push(name.endsWith(":") ? name : `${name}:`);
+  }
+  if (instructions) {
+    for (const line of instructions.split(/\r?\n/).map((part) => part.trim()).filter(Boolean)) {
+      lines.push(`| ${line}`);
+    }
+  }
+  for (const prompt of request.prompts || []) {
+    const promptText = prompt.prompt?.trim();
+    if (promptText) {
+      lines.push(`| ${promptText}`);
+    }
+  }
   return lines.join("\n");
 }
 
@@ -127,43 +107,12 @@ interface KeyboardInteractiveModalProps {
   request: KeyboardInteractiveRequest | null;
   onSubmit: (requestId: string, responses: string[], savePassword?: string) => boolean | Promise<boolean>;
   onCancel: (requestId: string) => boolean | Promise<boolean>;
-  canFillTotp?: boolean;
-  onFillTotp?: () => Promise<string | null> | string | null;
-}
-
-const OTP_PROMPT = /otp|one[-\s]?time|totp|verification|passcode|authenticator|\bmfa\b|\b2fa\b|two[-\s]?factor|验证码|驗證碼|动态口令|動態口令|二次认证|二次認證|二次验证|二次驗證/i;
-
-export type TotpFillPlacement = "preferred" | "available" | "hidden";
-
-function lastPromptLine(prompt: string | undefined): string {
-  const lines = String(prompt || "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-  return lines.at(-1) || "";
-}
-
-/** Where a TOTP fill action may appear. Password prompts never receive the code. */
-export function totpFillPlacement(prompt: KeyboardInteractivePrompt): TotpFillPlacement {
-  const rawLast = lastPromptLine(prompt.prompt);
-  const label = keyboardInteractiveFieldLabel(prompt.prompt, "");
-  if (!label || NON_TOTP_PROMPT.test(rawLast) || NON_TOTP_PROMPT.test(label)) return "hidden";
-  if (OTP_PROMPT.test(label)) return "preferred";
-  if (isAPasswordPrompt({ prompt: label, echo: prompt.echo })) return "hidden";
-  if (/\b(password|passwd|passphrase)\b/i.test(label)) return "hidden";
-  return "available";
-}
-
-export function visibleTotpFillPlacements(prompts: KeyboardInteractivePrompt[]): TotpFillPlacement[] {
-  const placements = prompts.map(totpFillPlacement);
-  const hasPreferred = placements.some((placement) => placement === "preferred");
-  if (!hasPreferred) return placements;
-  return placements.map((placement) => (placement === "preferred" ? placement : "hidden"));
 }
 
 export const KeyboardInteractiveModal: React.FC<KeyboardInteractiveModalProps> = ({
   request,
   onSubmit,
   onCancel,
-  canFillTotp = false,
-  onFillTotp,
 }) => {
   const { t } = useI18n();
   const [responses, setResponses] = useState<string[]>([]);
@@ -236,15 +185,6 @@ export const KeyboardInteractiveModal: React.FC<KeyboardInteractiveModalProps> =
     }
   }, [request, onCancel, isSubmitting]);
 
-  const handleFillTotp = useCallback(async (index: number) => {
-    if (!request || isSubmitting || !onFillTotp) return;
-    const prompt = request.prompts[index];
-    if (!prompt || totpFillPlacement(prompt) === "hidden") return;
-    const code = await onFillTotp();
-    if (!code) return;
-    handleResponseChange(index, code);
-  }, [request, isSubmitting, onFillTotp, handleResponseChange]);
-
   const handleKeyDown = useCallback(
     (e: React.KeyboardEvent) => {
       if (e.key === "Enter" && !isSubmitting) {
@@ -257,14 +197,12 @@ export const KeyboardInteractiveModal: React.FC<KeyboardInteractiveModalProps> =
 
   if (!request) return null;
 
+  const serverPromptText = formatKeyboardInteractiveServerPrompt(request);
   const title = t("keyboard.interactive.title");
   const description =
     request.hostname
       ? t("keyboard.interactive.descWithHost", { hostname: request.hostname })
       : t("keyboard.interactive.desc");
-  const fillPlacements = canFillTotp ? visibleTotpFillPlacements(request.prompts) : [];
-  const preferredFillIndex = fillPlacements.findIndex((placement) => placement === "preferred");
-  const guidance = keyboardInteractiveGuidance(request);
 
   return (
     <Dialog open={!!request} onOpenChange={() => {/* intentionally non-dismissable */}}>
@@ -289,40 +227,26 @@ export const KeyboardInteractiveModal: React.FC<KeyboardInteractiveModalProps> =
         </DialogHeader>
 
         <div className="space-y-4 py-2">
-          {guidance ? (
-            <p className="max-h-36 overflow-auto whitespace-pre-wrap text-sm leading-relaxed text-muted-foreground [overflow-wrap:anywhere]">
-              {guidance}
-            </p>
-          ) : null}
+          {serverPromptText && (
+            <pre className="max-h-36 overflow-auto rounded-md border border-border/60 bg-muted/45 px-3 py-2 text-xs leading-relaxed text-foreground whitespace-pre-wrap [overflow-wrap:anywhere]">
+              {serverPromptText}
+            </pre>
+          )}
+
           {request.prompts.map((prompt, index) => {
             const isPassword = !prompt.echo;
             const showPassword = showPasswords[index];
-            const promptLabel = keyboardInteractiveFieldLabel(
-              prompt.prompt,
-              t("keyboard.interactive.verificationCode"),
-            );
-            const fillPlacement = fillPlacements[index] ?? "hidden";
+            const showPromptLabel = !(serverPromptText && request.prompts.length === 1);
+            // Clean up prompt text (remove trailing colon and whitespace)
+            const promptLabel = prompt.prompt.replace(/:\s*$/, "").trim();
 
             return (
               <div key={index} className="space-y-2">
-                <div className="flex items-center justify-between gap-2">
+                {showPromptLabel && (
                   <Label htmlFor={`ki-prompt-${index}`}>
-                    {promptLabel}
+                    {promptLabel || t("keyboard.interactive.response")}
                   </Label>
-                  {fillPlacement !== "hidden" && (
-                    <Button
-                      type="button"
-                      variant="secondary"
-                      size="sm"
-                      className="h-7 shrink-0 px-2 font-normal focus:bg-secondary focus:text-secondary-foreground focus-visible:bg-secondary focus-visible:text-secondary-foreground"
-                      data-totp-fill={fillPlacement}
-                      onClick={() => { void handleFillTotp(index); }}
-                      disabled={isSubmitting}
-                    >
-                      {t("keyboard.interactive.fillTotp")}
-                    </Button>
-                  )}
-                </div>
+                )}
                 <div className="relative">
                   <Input
                     id={`ki-prompt-${index}`}
@@ -332,7 +256,7 @@ export const KeyboardInteractiveModal: React.FC<KeyboardInteractiveModalProps> =
                     onKeyDown={handleKeyDown}
                     placeholder=""
                     className={isPassword ? "pr-10" : undefined}
-                    autoFocus={preferredFillIndex >= 0 ? index === preferredFillIndex : index === 0}
+                    autoFocus={index === 0}
                     disabled={isSubmitting}
                   />
                   {isPassword && (
@@ -364,7 +288,7 @@ export const KeyboardInteractiveModal: React.FC<KeyboardInteractiveModalProps> =
               </div>
             );
           })}
-        </div>
+</div>
 
         <div className="flex items-center justify-between pt-2">
           <Button

components/KeychainExportPanel.tsx

@@ -4,7 +4,6 @@ import { applyGroupDefaults, resolveGroupDefaults } from "../domain/groupConfig"
 import { sanitizeCredentialValue } from "../domain/credentials";
 import { hasBridgeSshCredentials, resolveBridgeKeyAuth, resolveBridgeSshAgentAuth, resolveHostAuth } from "../domain/sshAuth";
 import { resolveHostSshConnectionTimeouts } from "../domain/sshConnectionTimeouts";
-import { connectionTotpFields } from "../domain/totpConfig";
 import { cn } from "../lib/utils";
 import { Button } from "./ui/button";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "./ui/collapsible";
@@ -259,7 +258,6 @@ export const KeychainExportPanel: React.FC<KeychainExportPanelProps> = ({
                         sshAuthReadyTimeoutMs: connectionTimeouts.authReadyTimeoutSeconds * 1000,
                         enableKeyboardInteractive: true,
                         requiresMfa: !!effectiveExportHost.requiresMfa,
-                        ...connectionTotpFields(effectiveExportHost),
                         sessionId: `export-key:${effectiveExportHost.id}:${panel.key.id}`,
                       });
 

components/QuickConnectWizard.tsx

@@ -10,7 +10,6 @@ import {
   User,
 } from "lucide-react";
 import React, { useMemo, useState } from "react";
-import { createPortal } from "react-dom";
 import { useI18n } from "../application/i18n/I18nProvider";
 import type { QuickConnectTarget } from "../domain/quickConnect";
 import { formatHostPort } from "../domain/host";
@@ -672,7 +671,7 @@ const QuickConnectWizard: React.FC<QuickConnectWizardProps> = ({
         : `${protocolLabel} ${hostEndpoint}`
     );
 
-  const wizard = (
+  return (
     <div
       className="fixed inset-0 z-50 flex items-center justify-center"
       onClick={onClose}
@@ -799,13 +798,6 @@ const QuickConnectWizard: React.FC<QuickConnectWizardProps> = ({
       </div>
     </div>
   );
-
-  // The vault surface is visibility:hidden while a terminal tab is active.
-  // Portal so the same wizard opened from the tab-bar switcher stays visible.
-  if (typeof document !== "undefined" && document.body) {
-    return createPortal(wizard, document.body);
-  }
-  return wizard;
 };
 
 export default QuickConnectWizard;

components/QuickSwitcher.quickConnect.test.tsx

@@ -1,163 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import React from "react";
-import { renderToStaticMarkup } from "react-dom/server";
-
-import { I18nProvider } from "../application/i18n/I18nProvider";
-import type { Host, TerminalSession } from "../types";
-import { QuickSwitcher } from "./QuickSwitcher";
-
-const host = (overrides: Partial<Host> = {}): Host => ({
-  id: "saved-1",
-  label: "core-switch",
-  hostname: "10.1.1.1",
-  username: "admin",
-  tags: [],
-  os: "linux",
-  protocol: "ssh",
-  ...overrides,
-}) as Host;
-
-const renderSwitcher = (
-  query: string,
-  results: Host[] = [],
-  locale = "en",
-) => renderToStaticMarkup(
-  <I18nProvider locale={locale}>
-    <QuickSwitcher
-      isOpen
-      query={query}
-      results={results}
-      sessions={[]}
-      workspaces={[]}
-      onQueryChange={() => undefined}
-      onSelect={() => undefined}
-      onSelectTab={() => undefined}
-      onClose={() => undefined}
-      onQuickConnect={() => undefined}
-      showSftpTab={false}
-    />
-  </I18nProvider>,
-);
-
-test("quick switcher keeps a matching host ahead of an address row", () => {
-  const markup = renderSwitcher("10.1.1.1", [host()]);
-  const quickConnectAt = markup.indexOf("Quick connect to 10.1.1.1");
-  const hostAt = markup.indexOf("core-switch");
-  const selectedAt = markup.indexOf("bg-primary/15");
-
-  assert.ok(selectedAt >= 0);
-  assert.ok(hostAt > selectedAt);
-  assert.ok(quickConnectAt > hostAt);
-  assert.equal(markup.indexOf("bg-primary/15", selectedAt + 1), -1);
-});
-
-test("quick switcher does not steal Enter from a saved host label", () => {
-  for (const label of ["lab", "web01", "prod", "lab-switch"]) {
-    const markup = renderSwitcher(label, [host({ id: label, label, hostname: "10.0.0.5" })]);
-    const hostAt = markup.indexOf(`>${label}<`);
-    const selectedAt = markup.indexOf("bg-primary/15");
-
-    assert.equal(markup.includes("Quick connect to"), false, label);
-    assert.ok(selectedAt >= 0 && hostAt > selectedAt, label);
-  }
-});
-
-test("quick switcher keeps a matching open session ahead of an address row", () => {
-  const markup = renderToStaticMarkup(
-    <I18nProvider locale="en">
-      <QuickSwitcher
-        isOpen
-        query="10.4.4.4"
-        results={[]}
-        sessions={[{
-          id: "sess-1",
-          hostId: "host-1",
-          hostLabel: "open-core",
-          username: "admin",
-          hostname: "10.4.4.4",
-          status: "connected",
-        } as TerminalSession]}
-        workspaces={[]}
-        onQueryChange={() => undefined}
-        onSelect={() => undefined}
-        onSelectTab={() => undefined}
-        onClose={() => undefined}
-        onQuickConnect={() => undefined}
-        showSftpTab={false}
-      />
-    </I18nProvider>,
-  );
-  const sessionAt = markup.indexOf("open-core");
-  const quickConnectAt = markup.indexOf("Quick connect to 10.4.4.4");
-  const selectedAt = markup.indexOf("bg-primary/15");
-
-  assert.ok(selectedAt >= 0);
-  assert.ok(sessionAt > selectedAt);
-  assert.ok(quickConnectAt > sessionAt);
-  assert.equal(markup.indexOf("bg-primary/15", selectedAt + 1), -1);
-});
-
-test("quick switcher offers quick connect when nothing else matches", () => {
-  const markup = renderSwitcher("root@10.2.0.8:2222");
-
-  assert.match(markup, /Quick connect to root@10\.2\.0\.8:2222/);
-  assert.match(markup, /bg-primary\/15[\s\S]*Quick connect to root@10\.2\.0\.8:2222/);
-});
-
-test("quick switcher does not offer quick connect for ordinary search text", () => {
-  const markup = renderSwitcher("core switch");
-
-  assert.doesNotMatch(markup, /Quick connect to/);
-});
-
-test("quick switcher quick connect row uses zh-TW wording", () => {
-  const markup = renderToStaticMarkup(
-    <I18nProvider locale="zh-TW">
-      <QuickSwitcher
-        isOpen
-        query="10.0.0.8"
-        results={[host()]}
-        sessions={[]}
-        workspaces={[]}
-        onQueryChange={() => undefined}
-        onSelect={() => undefined}
-        onSelectTab={() => undefined}
-        onClose={() => undefined}
-        onQuickConnect={() => undefined}
-        onCreateWorkspace={() => undefined}
-        showSftpTab={false}
-      />
-    </I18nProvider>,
-  );
-
-  assert.match(markup, /快速連線到 10\.0\.0\.8/);
-  assert.match(markup, />主機</);
-  assert.match(markup, />新增工作區</);
-  assert.doesNotMatch(markup, /New Workspace/);
-});
-
-test("quick switcher section labels use zh-CN wording", () => {
-  const markup = renderToStaticMarkup(
-    <I18nProvider locale="zh-CN">
-      <QuickSwitcher
-        isOpen
-        query=""
-        results={[host()]}
-        sessions={[]}
-        workspaces={[]}
-        onQueryChange={() => undefined}
-        onSelect={() => undefined}
-        onSelectTab={() => undefined}
-        onClose={() => undefined}
-        onQuickConnect={() => undefined}
-        onCreateWorkspace={() => undefined}
-        showSftpTab={false}
-      />
-    </I18nProvider>,
-  );
-
-  assert.match(markup, />主机</);
-  assert.match(markup, />标签页</);
-  assert.match(markup, />新建工作区</);
-});

components/QuickSwitcher.tsx

@@ -14,7 +14,6 @@ import { useI18n } from "../application/i18n/I18nProvider";
 import { Host, TerminalSession, TerminalSettings, Workspace } from "../types";
 import { KeyBinding } from "../domain/models";
 import type { PaneMagnificationState } from "../domain/paneMagnification";
-import { isSwitcherQuickConnectInput } from "../domain/quickConnect";
 import { matchesSearchQuery } from "../lib/searchMatcher";
 import { buildQuickSwitcherShells, useDiscoveredShells, getShellIconPath, isMonochromeShellIcon } from "../lib/useDiscoveredShells";
 import { usePluginContributions } from "../application/state/usePluginContributions";
@@ -31,12 +30,11 @@ type QuickSwitcherItemBase = {
   shortcut?: string;
   pluginId?: string;
   icon?: NetcattyPluginIconReference;
-  quickConnectInput?: string;
 };
 
 type QuickSwitcherItem = QuickSwitcherItemBase & (
   | { type: "plugin-command"; commandId: string }
-  | { type: "host" | "tab" | "workspace" | "action" | "shell" | "plugin-view" | "quick-connect"; commandId?: never }
+  | { type: "host" | "tab" | "workspace" | "action" | "shell" | "plugin-view"; commandId?: never }
 );
 
 export function buildPaneMagnificationPaletteAction(
@@ -167,7 +165,6 @@ interface QuickSwitcherProps {
   paneMagnificationState?: PaneMagnificationState;
   onMagnifyCurrentPane?: () => void;
   onRestoreMagnifiedPane?: () => void;
-  onQuickConnect?: (input: string) => void;
 }
 
 const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
@@ -189,7 +186,6 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
   paneMagnificationState = 'unavailable',
   onMagnifyCurrentPane,
   onRestoreMagnifiedPane,
-  onQuickConnect,
 }) => {
   const { t } = useI18n();
   const discoveredShells = useDiscoveredShells();
@@ -339,37 +335,19 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
       });
     };
 
-    const quickConnectItem: QuickSwitcherItem | null =
-      trimmedQuery && isSwitcherQuickConnectInput(trimmedQuery)
-        ? {
-            type: "quick-connect",
-            id: "quick-connect",
-            title: t("qs.quickConnectTo", { target: trimmedQuery }),
-            quickConnectInput: trimmedQuery,
-          }
-        : null;
+    if (results.length > 0) {
+      pushHeader("header:hosts", "Hosts");
+      results.forEach((host) =>
+        pushItem({ type: "host", id: host.id, data: host }),
+      );
+    }
 
     const hasTabsSection =
       builtInTabs.length > 0
       || filteredOrphanSessions.length > 0
       || filteredWorkspaces.length > 0;
-
-    // The address row is the default Enter target only when nothing else matches.
-    // Matching hosts and open tabs stay ahead of it.
-    if (quickConnectItem && results.length === 0 && !hasTabsSection) {
-      pushItem(quickConnectItem);
-    }
-
-    if (results.length > 0) {
-      pushHeader("header:hosts", t("qs.hosts"));
-      results.forEach((host) =>
-        pushItem({ type: "host", id: host.id, data: host }),
-      );
-      if (quickConnectItem) pushItem(quickConnectItem);
-    }
-
     if (hasTabsSection) {
-      pushHeader("header:tabs", t("qs.tabs"));
+      pushHeader("header:tabs", "Tabs");
       builtInTabs.forEach((tabId) => {
         pushItem({ type: "tab", id: tabId });
       });
@@ -379,7 +357,6 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
       filteredOrphanSessions.forEach((s) =>
         pushItem({ type: "tab", id: s.id, data: s }),
       );
-      if (quickConnectItem && results.length === 0) pushItem(quickConnectItem);
     }
 
     if (filteredShells.length > 0) {
@@ -468,10 +445,6 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
 
   const handleItemSelect = (item: QuickSwitcherItem, useAlternate = false) => {
     switch (item.type) {
-      case "quick-connect":
-        if (item.quickConnectInput) onQuickConnect?.(item.quickConnectInput);
-        onClose();
-        break;
       case "host":
         onSelect(item.data as Host);
         break;
@@ -569,7 +542,7 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
               className="ml-auto inline-flex items-center gap-1 text-[11px] text-muted-foreground hover:text-foreground border border-border rounded px-1.5 py-0.5 transition-colors hover:bg-muted/50"
             >
               <Plus size={11} />
-              <span>{t("qs.newWorkspace")}</span>
+              <span>New Workspace</span>
             </button>
           )}
         </div>
@@ -603,20 +576,6 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
               // Fixed virtual slots: keep content single-line (or plugin two-line) and clip overflow.
               const rowClass = `flex h-full min-h-0 items-center gap-3 overflow-hidden px-4 py-2.5 cursor-pointer transition-colors ${getQuickSwitcherRowStateClass(isSelected, isKeyboardNavigating)}`;
 
-              if (item.type === "quick-connect") {
-                return (
-                  <div
-                    className={rowClass}
-                    onClick={() => handleItemSelect(item)}
-                  >
-                    <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded text-muted-foreground">
-                      <Terminal size={16} />
-                    </div>
-                    <span className="min-w-0 truncate text-sm font-medium">{item.title}</span>
-                  </div>
-                );
-              }
-
               if (item.type === "host") {
                 const host = item.data as Host;
                 const hostRow = (

components/Terminal.tsx

@@ -59,7 +59,7 @@ import { MULTILINE_PASTE_CONFIRM_MIN_LINES_DEFAULT } from "../domain/terminalPas
 import { isPluginHostProtocol } from "../domain/pluginConnection";
 import { clearTerminalBootEpoch, setTerminalBootEpoch } from "../domain/terminalBootEpoch";
 import {
-  foldTerminalPromptSecurityOutput,
+  appendTerminalPromptSecurityTail,
   isConfirmedTerminalShellPrompt,
   isUntrustedTerminalInputPrompt,
 } from "../domain/terminalPromptSecurity";
@@ -163,12 +163,8 @@ import {
 import { clearKittyKeyboardBroadcastSession } from "./terminal/runtime/kittyKeyboardBroadcast";
 import { registerTerminalSensitiveInputReader } from "./terminal/runtime/terminalSensitiveInputRegistry";
 import { registerTerminalCommandInjectionReadyReader } from "./terminal/runtime/terminalCommandInjectionReadyRegistry";
-import {
-  isIdleShellReadyForCommandInjection,
-  isShellPromptReadyForInsertion,
-} from "../domain/terminalCommandInjectionReady";
+import { isIdleShellReadyForCommandInjection } from "../domain/terminalCommandInjectionReady";
 import { detectPrompt } from "./terminal/autocomplete/promptDetector";
-import type { SensitiveInputActiveRef } from "./terminal/autocomplete/terminalAutocompletePrompt";
 import {
   applyUserCursorPreference,
   applyUserCursorWidthPreference,
@@ -443,7 +439,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   const recorder = useScriptRecorder(sessionId);
   const recorderRef = useRef(recorder);
   recorderRef.current = recorder;
-  const passwordPromptActiveRef = useRef(false) as SensitiveInputActiveRef;
+  const passwordPromptActiveRef = useRef(false);
   const terminalTitleRef = useRef<string | undefined>(undefined);
   const pluginTerminalLifecycleRef = useRef<ReturnType<typeof usePluginTerminalSessionLifecycle> | null>(null);
   useEffect(() => registerTerminalSensitiveInputReader(
@@ -452,8 +448,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   ), [sessionId]);
   useEffect(() => () => clearTerminalBroadcastUserInput(sessionId), [sessionId]);
   const sensitivePromptOutputTailRef = useRef("");
-  const heredocPromptOriginRef = useRef("");
-  const promptSecurityPendingCrRef = useRef(false);
   const [activeScriptRun, setActiveScriptRun] = useState<import('@/types/global/netcatty-bridge-script.d.ts').ScriptRun | undefined>(undefined);
   const dismissedScriptRunIdsRef = useRef(new Set<string>());
 
@@ -605,21 +599,18 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   const onTerminalDataCaptureRef = useRef(onTerminalDataCapture);
   const onSessionExitRef = useRef(onSessionExit);
   const commandBufferRef = useRef<string>("");
-  useEffect(() => registerTerminalCommandInjectionReadyReader(sessionId, (options) => {
+  useEffect(() => registerTerminalCommandInjectionReadyReader(sessionId, () => {
     const term = termRef.current;
     if (!term) return false;
     const prompt = detectPrompt(term);
-    const readiness = {
+    return isIdleShellReadyForCommandInjection({
       sensitiveInputActive: passwordPromptActiveRef.current,
       hasLiveTerminal: true,
       alternateScreenActive: isTerminalAlternateScreenActive(term),
       isAtPrompt: prompt.isAtPrompt,
       userInputLength: prompt.userInput.length,
       pendingTypedInputLength: commandBufferRef.current.length,
-    };
-    return options?.allowDraft
-      ? isShellPromptReadyForInsertion(readiness)
-      : isIdleShellReadyForCommandInjection(readiness);
+    });
   }), [sessionId]);
   const promptLineBreakStateRef = useRef<PromptLineBreakState>(createPromptLineBreakState());
   const [hasMouseTracking, setHasMouseTracking] = useState(false);
@@ -1704,9 +1695,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
         }
         if (typeof payload.passwordPromptActive === "boolean") {
           passwordPromptActiveRef.current = payload.passwordPromptActive;
-          // The snapshot boolean has no source. A restored true latch stays
-          // explicit so Email:/Username: cannot bypass a plugin-marked field.
-          if (payload.passwordPromptActive) passwordPromptActiveRef.source = "explicit";
         }
         if (payload.cwd !== undefined) {
           const cwd = terminalCwdTracker.setRendererCwd(payload.cwd, "snapshot");
@@ -2013,14 +2001,10 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     chunk: string,
     meta?: TerminalSessionDataMeta,
   ) => {
-    const folded = foldTerminalPromptSecurityOutput({
-      origin: heredocPromptOriginRef.current,
-      current: sensitivePromptOutputTailRef.current,
-      pendingCr: promptSecurityPendingCrRef.current,
-    }, chunk);
-    heredocPromptOriginRef.current = folded.origin;
-    sensitivePromptOutputTailRef.current = folded.current;
-    promptSecurityPendingCrRef.current = folded.pendingCr;
+    sensitivePromptOutputTailRef.current = appendTerminalPromptSecurityTail(
+      sensitivePromptOutputTailRef.current,
+      chunk,
+    );
     const promptSecurityOptions = {
       allowHostStyleGreaterThan: isNetworkDevice,
       alternateScreen: termRef.current
@@ -2029,30 +2013,23 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     };
     if (typeof meta?.pluginPipelineSensitiveInput === "boolean") {
       passwordPromptActiveRef.current = meta.pluginPipelineSensitiveInput;
-      // Authoritative metadata must not be downgraded to the heuristic latch,
-      // or trusted labels such as Email: would bypass snippet blocking.
-      passwordPromptActiveRef.source = meta.pluginPipelineSensitiveInput ? "explicit" : "heuristic";
       if (meta.pluginPipelineSensitiveInput) {
         autocompleteCloseRef.current?.();
       } else {
         sensitivePromptOutputTailRef.current = "";
-        heredocPromptOriginRef.current = "";
-        promptSecurityPendingCrRef.current = false;
       }
       return;
     } else if (isUntrustedTerminalInputPrompt(
-      folded.promptText,
+      sensitivePromptOutputTailRef.current,
       promptSecurityOptions,
     )) {
       passwordPromptActiveRef.current = true;
-      passwordPromptActiveRef.source = "heuristic";
       autocompleteCloseRef.current?.();
     } else if (isConfirmedTerminalShellPrompt(
-      folded.promptText,
+      sensitivePromptOutputTailRef.current,
       promptSecurityOptions,
     )) {
       passwordPromptActiveRef.current = false;
-      passwordPromptActiveRef.source = "heuristic";
     }
   }, [isNetworkDevice]);
 
@@ -2364,8 +2341,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   }), []);
 
   const xTermRuntimeContextRef = useRef<Omit<CreateXTermRuntimeContext, "container" | "initiallyVisible"> | null>(null);
-  const archiveHostRef = useRef(host);
-  archiveHostRef.current = host;
   const pluginDecorationRulesRef = useRef<readonly PluginTerminalDecorationRule[]>(Object.freeze([]));
   const pluginDecorationRefreshRef = useRef<(reason: string) => void>(() => {});
 
@@ -2455,12 +2430,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   const pluginAwareOnCommandCompleted = useCallback(() => {
     pluginTerminalLifecycle.onCommandCompleted();
     void xtermRuntimeRef.current?.pluginProviderHost?.commandCompleted();
-    // Hibernate wake builds its runtime from this callback. Same local
-    // prompt-return refresh as useTerminalEffects (#1952).
-    if (host.protocol === "local") {
-      onCommandSubmitted?.("", host.id, host.label, sessionId);
-    }
-  }, [host.id, host.label, host.protocol, onCommandSubmitted, pluginTerminalLifecycle, sessionId]);
+  }, [pluginTerminalLifecycle]);
   const pluginAwareOnTerminalCwdChange = useCallback((
     changedSessionId: string,
     cwd: string | null,
@@ -4361,7 +4331,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
 
   xTermRuntimeContextRef.current = {
     host,
-    getHost: () => archiveHostRef.current,
     fontFamilyId,
     resolvedFontFamily,
     fontSize: effectiveFontSize,
@@ -4685,7 +4654,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     onWake: wakeFromHibernateRuntime,
   });
 
-  useTerminalEffects({ CONNECTION_TIMEOUT, Error, XTERM_PERFORMANCE_CONFIG, applyUserCursorPreference, applyUserCursorWidthPreference, shouldApplyUserCursorPreference, snapshotUserCursorPreference, auth, autocompleteCloseRef, autocompleteInputRef, autocompleteKeyEventRef, autocompleteRepositionRef, captureTerminalLogData, chainHosts: resolvedChainHosts, chainProgress, clearTerminalCwd, commandBufferRef, connectionLogBufferRef, containerRef, createPromptLineBreakState, createReplaySafeTerminalLogSanitizer, createXTermRuntime, deferTerminalResizeRef, disableTerminalFontZoomRef, effectiveFontSize, effectiveFontWeight, effectiveTheme, error, executeSnippetCommand, finalizeTerminalLogData, fitAddonRef, fontFamilyId, fontSize, fontWeightFixupDoneRef, forceCloseHibernatedSession, forceSyncRenderAfterResize, handleOsc52ReadRequest, handleTerminalDataCaptureOnce, hasConnectedRef, hasRuntimeRef, host, hotkeySchemeRef, hibernatedRef, identities, inWorkspace, isBootActiveRef, bootEpochRef, isBroadcastEnabledRef, broadcastPasswordBypassRef, isComposeBarOpen: effectiveComposeBarOpen, isConnectionAwaitingUserInput, isConnectionPastTcpDial, isFocusMode, isFocused, isLocalConnection, isNetworkDevice, isResizing: deferTerminalResize, isRestoringSelectionRef, isSearchOpen, isSerialConnection, isVisible, isVisibleRef, keyBindingsRef, keys, kittyKeyboardProtocolEnabledForSession, knownCwdRef, lastFittedSizeRef, lastToastedErrorRef, logger, mouseTrackingRef, needsHostKeyVerification, onBroadcastInputRef, onBroadcastInterruptPriorityChange, onCommandExecuted, onCommandSubmitted: cwdAwareOnCommandSubmitted, onCommandSettled: onCommandSubmitted, onHotkeyActionRef, onOpenExternalError, onOutputTriggerUserInputRef: noteOutputTriggerUserInputRef, onPluginRuntimeCwdChange: pluginAwareOnRuntimeCwdChange, onSnippetShortkeyRef, onSnippetExecutorChange, onTerminalCwdChange, onTerminalTitleChange, onTerminalBell, onTerminalFontSizeChange, paneLayoutKey, passwordPromptActiveRef, pendingAuthRef, pendingOutputScrollRef, pluginDecorationRefreshRef, pluginDecorationRules, pluginDecorationRulesRef, pluginTerminalLifecycle, pluginTerminalProviderRevision, isPluginTerminalProviderAvailable, requestPluginTerminalProviders, prepareRestoredReconnect, prepareInitialCwdIntent, prevIsResizingRef, promptLineBreakStateRef, resizeSession, resolveHostAuth, resolvedFontFamily, safeFit, scriptRecorderRef: recorderRef, searchAddonRef, serialConfig, serialLineBufferRef, serializeAddonRef, sessionId, sessionRef, sessionStarters, setError, setHasMouseTracking, setIsCancelling, setIsDisconnectedDialogDismissed, requestSearchFocus, setNeedsHostKeyVerification, setPendingHostKeyInfo, setPendingHostKeyRequestId, setProgressLogs, setProgressValue, setShowLogs, setStatus, setTimeLeft, shellType, shouldEnableNativeUserInputAutoScroll, shouldProbeSessionCwd, shouldStartTerminalBackend, vaultInitialized, attachExistingSession, attachAuthorization, attachHomeWebContentsIdRef, snippetsRef, splitResizeActive: isResizing, status, statusRef, sudoAutofillRef, t, teardown, telnetLocalEchoRef, termRef, terminalAltKeyOptions, terminalBackend, terminalContextActionsRef, terminalCwdTracker, terminalDataCapturedRef, terminalLogSanitizerRef, terminalOutputHistory: terminalOutputHistoryRef.current, terminalSettings, terminalSettingsRef, terminalTitleRef, toHostKeyInfo, toast, updateStatus, useEffect, useLayoutEffect, workspaceId, xtermRuntimeRef, zmodem, zmodemToastedRef, restoreState });
+  useTerminalEffects({ CONNECTION_TIMEOUT, Error, XTERM_PERFORMANCE_CONFIG, applyUserCursorPreference, applyUserCursorWidthPreference, shouldApplyUserCursorPreference, snapshotUserCursorPreference, auth, autocompleteCloseRef, autocompleteInputRef, autocompleteKeyEventRef, autocompleteRepositionRef, captureTerminalLogData, chainHosts: resolvedChainHosts, chainProgress, clearTerminalCwd, commandBufferRef, connectionLogBufferRef, containerRef, createPromptLineBreakState, createReplaySafeTerminalLogSanitizer, createXTermRuntime, deferTerminalResizeRef, disableTerminalFontZoomRef, effectiveFontSize, effectiveFontWeight, effectiveTheme, error, executeSnippetCommand, finalizeTerminalLogData, fitAddonRef, fontFamilyId, fontSize, fontWeightFixupDoneRef, forceCloseHibernatedSession, forceSyncRenderAfterResize, handleOsc52ReadRequest, handleTerminalDataCaptureOnce, hasConnectedRef, hasRuntimeRef, host, hotkeySchemeRef, hibernatedRef, identities, inWorkspace, isBootActiveRef, bootEpochRef, isBroadcastEnabledRef, broadcastPasswordBypassRef, isComposeBarOpen: effectiveComposeBarOpen, isConnectionAwaitingUserInput, isConnectionPastTcpDial, isFocusMode, isFocused, isLocalConnection, isNetworkDevice, isResizing: deferTerminalResize, isRestoringSelectionRef, isSearchOpen, isSerialConnection, isVisible, isVisibleRef, keyBindingsRef, keys, kittyKeyboardProtocolEnabledForSession, knownCwdRef, lastFittedSizeRef, lastToastedErrorRef, logger, mouseTrackingRef, needsHostKeyVerification, onBroadcastInputRef, onBroadcastInterruptPriorityChange, onCommandExecuted, onCommandSubmitted: cwdAwareOnCommandSubmitted, onHotkeyActionRef, onOpenExternalError, onOutputTriggerUserInputRef: noteOutputTriggerUserInputRef, onPluginRuntimeCwdChange: pluginAwareOnRuntimeCwdChange, onSnippetShortkeyRef, onSnippetExecutorChange, onTerminalCwdChange, onTerminalTitleChange, onTerminalBell, onTerminalFontSizeChange, paneLayoutKey, passwordPromptActiveRef, pendingAuthRef, pendingOutputScrollRef, pluginDecorationRefreshRef, pluginDecorationRules, pluginDecorationRulesRef, pluginTerminalLifecycle, pluginTerminalProviderRevision, isPluginTerminalProviderAvailable, requestPluginTerminalProviders, prepareRestoredReconnect, prepareInitialCwdIntent, prevIsResizingRef, promptLineBreakStateRef, resizeSession, resolveHostAuth, resolvedFontFamily, safeFit, scriptRecorderRef: recorderRef, searchAddonRef, serialConfig, serialLineBufferRef, serializeAddonRef, sessionId, sessionRef, sessionStarters, setError, setHasMouseTracking, setIsCancelling, setIsDisconnectedDialogDismissed, requestSearchFocus, setNeedsHostKeyVerification, setPendingHostKeyInfo, setPendingHostKeyRequestId, setProgressLogs, setProgressValue, setShowLogs, setStatus, setTimeLeft, shellType, shouldEnableNativeUserInputAutoScroll, shouldProbeSessionCwd, shouldStartTerminalBackend, vaultInitialized, attachExistingSession, attachAuthorization, attachHomeWebContentsIdRef, snippetsRef, splitResizeActive: isResizing, status, statusRef, sudoAutofillRef, t, teardown, telnetLocalEchoRef, termRef, terminalAltKeyOptions, terminalBackend, terminalContextActionsRef, terminalCwdTracker, terminalDataCapturedRef, terminalLogSanitizerRef, terminalOutputHistory: terminalOutputHistoryRef.current, terminalSettings, terminalSettingsRef, terminalTitleRef, toHostKeyInfo, toast, updateStatus, useEffect, useLayoutEffect, workspaceId, xtermRuntimeRef, zmodem, zmodemToastedRef, restoreState });
 
   return (
     <>

components/TerminalLayer.tsx

@@ -6,6 +6,7 @@ import { FolderTree, History, MessageSquare, PanelLeft, PanelRight, Palette, X,
 import React, { memo, startTransition, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { activeTabStore } from '../application/state/activeTabStore';
 import { getScriptRecordingSnapshot } from '../application/state/scriptRecordingStore.ts';
+import { canReuseTerminalConnection } from '../application/state/terminalConnectionReuse';
 import { resolveTerminalSessionExitIntent, type TerminalSessionExitEvent } from '../application/state/resolveTerminalSessionExitIntent';
 import { prewarmAIStateStorageSnapshots } from '../application/state/aiStateSnapshots';
 import {
@@ -113,7 +114,7 @@ import {
   DEFAULT_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
   resolveSessionSidePanelAutoOpen,
 } from '../domain/terminalSidePanelAutoOpen';
-import { canScheduleCommandCwdProbe, shouldProbeCommandCwd } from './terminalLayer/commandCwdProbe';
+import { shouldProbeCommandCwd } from './terminalLayer/commandCwdProbe';
 import {
   resolvePreferredTerminalCwd,
   scheduleBackendCwdProbeAfterCommand,
@@ -1347,12 +1348,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
 
     const tabId = activeTabIdRef.current;
     const session = sessionsRef.current.find((candidate) => candidate.id === sessionId);
-    // Local POSIX shells do not emit OSC 7. They share this probe so session
-    // restore can `cd` back after restart (#1952). Prompt return calls this
-    // again with an empty command once the shell is idle, so a slow command
-    // such as `sleep 1; cd /tmp` is not recorded at the 150ms snapshot.
-    // SSH keeps the extra-exec eligibility check inside canScheduleCommandCwdProbe.
-    if (!session || !canScheduleCommandCwdProbe(session)) return;
+    if (!session || !canReuseTerminalConnection(session)) return;
     const sessionHost = sessionHostsMapRef.current.get(sessionId);
     const visibleSftpHost = tabId && sidePanelLayoutHasTool(sidePanelLayoutsRef.current.get(tabId), 'sftp')
       ? sftpHostForTabRef.current.get(tabId) ?? null
@@ -1376,8 +1372,6 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
       getSessionPwd: (id, options) => terminalBackend.getSessionPwd(id, options),
       canProbe: async () => {
         if (cwdProbeGenerationRef.current.get(sessionId) !== probeGeneration) return false;
-        // Local cwd is the PTY process directory, not an extra SSH channel.
-        if (session.protocol === "local") return true;
         const host = sessionHostsMapRef.current.get(sessionId);
         if (!host) return false;
         const hostDeviceClass = classifyDistroId(host.distro);

components/VaultView.tsx

@@ -44,7 +44,6 @@ import React, {
   useState,
 } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
-import { registerQuickConnectOpener } from "../application/quickConnectBridge";
 import { useStoredViewMode } from "../application/state/useStoredViewMode";
 import { useStoredBoolean } from "../application/state/useStoredBoolean";
 import { useStoredNumber } from "../application/state/useStoredNumber";
@@ -562,12 +561,6 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
     [],
   );
 
-  useEffect(() => registerQuickConnectOpener(({ target, warnings }) => {
-    setQuickConnectTarget(target);
-    setQuickConnectWarnings(warnings);
-    setIsQuickConnectOpen(true);
-  }), []);
-
   // Protocol select state (for hosts with multiple protocols)
   const [protocolSelectHost, setProtocolSelectHost] = useState<Host | null>(
     null,
@@ -1799,8 +1792,7 @@ export const vaultViewAreEqual = (
     // Only these terminal connection settings are forwarded to
     // PortForwarding inside the vault, so compare them directly. Other
     // terminal settings (fonts, themes, etc.) don't affect this subtree
-    // and we don't want to re-render for them. onConnect is also omitted:
-    // temporary-connection toggles are read from a ref at connect time.
+    // and we don't want to re-render for them.
     prev.terminalSettings?.verifyHostKeys ===
       next.terminalSettings?.verifyHostKeys &&
     prev.terminalSettings?.keepaliveInterval ===

components/VaultViewLayout.test.ts

@@ -51,17 +51,3 @@ test("Vault import entry is disabled while an import is running", () => {
   assert.match(vaultViewLayoutSource, /disabled=\{importProgress\?\.status === "running"\}/);
   assert.match(vaultViewLayoutSource, /if \(importProgress\?\.status === "running"\) return;/);
 });
-
-test("new host menu keeps the local shell icon at the same size as its siblings", () => {
-  const menuStart = vaultViewLayoutSource.indexOf('<DropdownContent className="flex w-max min-w-44 flex-col" align="end" alignToParent>');
-  assert.ok(menuStart >= 0);
-  const menuEnd = vaultViewLayoutSource.indexOf("</DropdownContent>", menuStart);
-  const menu = vaultViewLayoutSource.slice(menuStart, menuEnd);
-  assert.match(menu, /className="flex w-max min-w-44 flex-col"/);
-  assert.doesNotMatch(menu, /className="w-44"/);
-  assert.match(menu, /<TerminalSquare size=\{14\} className="shrink-0" \/>/);
-  assert.match(menu, /<FolderTree size=\{14\} className="shrink-0" \/>/);
-  assert.match(menu, /<Upload size=\{14\} className="shrink-0" \/>/);
-  assert.match(menu, /<Download size=\{14\} className="shrink-0" \/>/);
-  assert.doesNotMatch(menu, /className="w-full justify-start gap-2"/);
-});

components/ai/ExternalMcpApprovalsHost.tsx

@@ -4,7 +4,7 @@
  * even when the Catty AI side panel has never been opened.
  */
 
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { ToolCall } from '../ai-elements/tool-call';
 import { Button } from '../ui/button';
 import {
@@ -20,13 +20,6 @@ import {
   resolveCapabilityId,
 } from '../../infrastructure/ai/harness/permissionGrants';
 import { useI18n } from '../../application/i18n/I18nProvider';
-import { AI_STATE_CHANGED_EVENT } from '../../application/state/aiStateEvents';
-import {
-  externalMcpApprovalToolLabel,
-  notifyExternalMcpApproval,
-  publishExternalMcpApprovalAlertMode,
-} from '../../application/state/externalMcpApprovalAlert';
-import { STORAGE_KEY_AI_EXTERNAL_MCP_APPROVAL_ALERT } from '../../infrastructure/config/storageKeys';
 
 const EXTERNAL_MCP_CHAT_SESSION_ID = '__external_mcp__';
 
@@ -38,37 +31,19 @@ function isExternalMcpApproval(request: ApprovalRequest): boolean {
 export const ExternalMcpApprovalsHost: React.FC = () => {
   const { t } = useI18n();
   const [pendingApprovals, setPendingApprovals] = useState<Map<string, ApprovalRequest>>(new Map());
-  const alertedIdsRef = useRef(new Set<string>());
-
-  useEffect(() => {
-    const pushMode = () => {
-      publishExternalMcpApprovalAlertMode();
-    };
-    pushMode();
-    const onChange = (event: Event) => {
-      const key = (event as CustomEvent<{ key?: string }>).detail?.key;
-      if (key === STORAGE_KEY_AI_EXTERNAL_MCP_APPROVAL_ALERT) pushMode();
-    };
-    window.addEventListener(AI_STATE_CHANGED_EVENT, onChange);
-    return () => window.removeEventListener(AI_STATE_CHANGED_EVENT, onChange);
-  }, []);
 
   useEffect(() => {
     const handler = (request: ApprovalRequest) => {
       if (!isExternalMcpApproval(request)) return;
       setPendingApprovals((prev) => new Map(prev).set(request.toolCallId, request));
-      if (alertedIdsRef.current.has(request.toolCallId)) return;
-      alertedIdsRef.current.add(request.toolCallId);
-      notifyExternalMcpApproval(request, t);
     };
     const unsub = onApprovalRequest(handler);
     replayPendingApprovals(handler);
     return unsub;
-  }, [t]);
+  }, []);
 
   useEffect(() => {
     return onApprovalCleared((clearedIds) => {
-      for (const id of clearedIds) alertedIdsRef.current.delete(id);
       setPendingApprovals((prev) => {
         const next = new Map(prev);
         for (const id of clearedIds) next.delete(id);
@@ -154,7 +129,7 @@ export const ExternalMcpApprovalsHost: React.FC = () => {
           {entries.map(([id, req]) => (
             <div key={id} className="space-y-1.5">
               <ToolCall
-                name={externalMcpApprovalToolLabel(req.toolName)}
+                name={req.toolName}
                 args={req.args}
                 approvalTarget={req.target}
                 isLoading={false}

components/settings/tabs/SettingsTerminalTab.tsx

@@ -998,26 +998,6 @@ function SettingsTerminalTab(props: {
             onChange={(v) => updateTerminalSetting("verifyHostKeys", v)}
           />
         </SettingRow>
-        <SettingRow
-          anchorId="terminal-temporary-legacy-algorithms"
-          label={t("settings.terminal.connection.temporaryLegacyAlgorithms")}
-          description={t("settings.terminal.connection.temporaryLegacyAlgorithms.desc")}
-        >
-          <Toggle
-            checked={terminalSettings.temporaryConnectionsAllowLegacyAlgorithms}
-            onChange={(v) => updateTerminalSetting("temporaryConnectionsAllowLegacyAlgorithms", v)}
-          />
-        </SettingRow>
-        <SettingRow
-          anchorId="terminal-temporary-network-device-mode"
-          label={t("settings.terminal.connection.temporaryNetworkDeviceMode")}
-          description={t("settings.terminal.connection.temporaryNetworkDeviceMode.desc")}
-        >
-          <Toggle
-            checked={terminalSettings.temporaryConnectionsNetworkDeviceMode}
-            onChange={(v) => updateTerminalSetting("temporaryConnectionsNetworkDeviceMode", v)}
-          />
-        </SettingRow>
         <SettingRow
           anchorId="terminal-ssh-auto-reconnect"
           label={t("settings.terminal.connection.sshAutoReconnectEnabled")}

components/settings/tabs/TerminalBehaviorSettings.tsx

@@ -224,9 +224,9 @@ export const TerminalBehaviorSettings: React.FC<TerminalBehaviorSettingsProps> =
           description={t("settings.terminal.behavior.shiftEnterNewlineText.desc")}
         >
           <Input
-            value={terminalSettings.shiftEnterNewlineText ?? "\\e\\r"}
+            value={terminalSettings.shiftEnterNewlineText ?? "\\n"}
             onChange={(e) => updateTerminalSetting("shiftEnterNewlineText", e.target.value)}
-            placeholder="\\e\\r"
+            placeholder="\\n"
             className="w-56 font-mono"
             spellCheck={false}
           />

components/settings/tabs/ai/CopyableCodeBlock.tsx

@@ -1,62 +0,0 @@
-import React from "react";
-import { Check, Copy } from "lucide-react";
-import { cn } from "../../../../lib/utils";
-import { Button } from "../../../ui/button";
-
-type CopyableCodeBlockProps = {
-  label?: string;
-  value: string;
-  copyKey: string;
-  copied: string | null;
-  onCopy: (key: string, text: string) => void;
-  copyLabel: string;
-  copiedLabel: string;
-  emptyLabel?: string;
-  className?: string;
-};
-
-export const CopyableCodeBlock: React.FC<CopyableCodeBlockProps> = ({
-  label,
-  value,
-  copyKey,
-  copied,
-  onCopy,
-  copyLabel,
-  copiedLabel,
-  emptyLabel,
-  className,
-}) => {
-  const display = value || emptyLabel || "";
-  const canCopy = Boolean(value);
-  const isCopied = copied === copyKey;
-
-  return (
-    <div className={cn("space-y-1.5", className)}>
-      {label ? (
-        <div className="text-xs font-medium text-muted-foreground">{label}</div>
-      ) : null}
-      <div className="group relative rounded-md border border-border/60 bg-muted/20">
-        <pre
-          className={cn(
-            "max-h-40 overflow-auto whitespace-pre-wrap break-all px-3 py-2.5 pr-11 font-mono text-xs leading-5",
-            !value && "text-muted-foreground",
-          )}
-        >
-          {display}
-        </pre>
-        <Button
-          type="button"
-          variant="ghost"
-          size="sm"
-          disabled={!canCopy}
-          className="absolute right-1.5 top-1.5 h-7 w-7 p-0 text-muted-foreground hover:text-foreground"
-          onClick={() => void onCopy(copyKey, value)}
-          aria-label={isCopied ? copiedLabel : copyLabel}
-          title={isCopied ? copiedLabel : copyLabel}
-        >
-          {isCopied ? <Check size={14} className="text-emerald-500" /> : <Copy size={14} />}
-        </Button>
-      </div>
-    </div>
-  );
-};

components/settings/tabs/ai/ExternalMcpCard.tsx

@@ -1,31 +1,17 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { HelpCircle, RefreshCw } from "lucide-react";
+import { Check, Copy, HelpCircle, RefreshCw } from "lucide-react";
 import { useI18n } from "../../../../application/i18n/I18nProvider";
 import {
-  readExternalMcpApprovalAlertMode,
   readExternalMcpFocusOnHostOpen,
   readExternalMcpIdleTimeoutMinutes,
   readExternalMcpMode,
   readExternalMcpSilentSessions,
   readSessionIdleTimeoutMinutes,
-  writeExternalMcpApprovalAlertMode,
   writeExternalMcpFocusOnHostOpen,
   writeExternalMcpIdleTimeoutMinutes,
   writeExternalMcpMode,
   writeExternalMcpSilentSessions,
   writeSessionIdleTimeoutMinutes,
-  readExternalMcpHttpAllowCustomBind,
-  readExternalMcpHttpClientHost,
-  readExternalMcpHttpEnabled,
-  readExternalMcpHttpListenAddress,
-  readExternalMcpHttpPort,
-  writeExternalMcpHttpAllowCustomBind,
-  writeExternalMcpHttpClientHost,
-  writeExternalMcpHttpEnabled,
-  writeExternalMcpHttpListenAddress,
-  writeExternalMcpHttpPort,
-  type ExternalMcpApprovalAlertMode,
-  type ExternalMcpHttpSettings,
   type ExternalMcpMode,
   useExternalMcpToggleState,
 } from "../../../../application/state/useExternalMcpToggleState";
@@ -33,14 +19,70 @@ import { cn } from "../../../../lib/utils";
 import { Button } from "../../../ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../../../ui/tooltip";
 import { Select, SettingCard, SettingRow, Toggle } from "../../../settings/settings-ui";
-import { CopyableCodeBlock } from "./CopyableCodeBlock";
-import { ExternalMcpHttpSection, type ExternalMcpHttpViewStatus } from "./ExternalMcpHttpSection";
 import { getBridge } from "./types";
 
 type ExternalMcpClient = "codex" | "claude" | "grok" | "cursor" | "other";
 
 const CLIENT_TABS: ExternalMcpClient[] = ["codex", "claude", "grok", "cursor", "other"];
 
+type CopyableCodeBlockProps = {
+  label?: string;
+  value: string;
+  copyKey: string;
+  copied: string | null;
+  onCopy: (key: string, text: string) => void;
+  copyLabel: string;
+  copiedLabel: string;
+  emptyLabel?: string;
+  className?: string;
+};
+
+const CopyableCodeBlock: React.FC<CopyableCodeBlockProps> = ({
+  label,
+  value,
+  copyKey,
+  copied,
+  onCopy,
+  copyLabel,
+  copiedLabel,
+  emptyLabel,
+  className,
+}) => {
+  const display = value || emptyLabel || "";
+  const canCopy = Boolean(value);
+  const isCopied = copied === copyKey;
+
+  return (
+    <div className={cn("space-y-1.5", className)}>
+      {label ? (
+        <div className="text-xs font-medium text-muted-foreground">{label}</div>
+      ) : null}
+      <div className="group relative rounded-md border border-border/60 bg-muted/20">
+        <pre
+          className={cn(
+            "max-h-40 overflow-auto whitespace-pre-wrap break-all px-3 py-2.5 pr-11 font-mono text-xs leading-5",
+            !value && "text-muted-foreground",
+          )}
+        >
+          {display}
+        </pre>
+        <Button
+          type="button"
+          variant="ghost"
+          size="sm"
+          disabled={!canCopy}
+          className="absolute right-1.5 top-1.5 h-7 w-7 p-0 text-muted-foreground hover:text-foreground"
+          onClick={() => void onCopy(copyKey, value)}
+          aria-label={isCopied ? copiedLabel : copyLabel}
+          title={isCopied ? copiedLabel : copyLabel}
+        >
+          {isCopied ? <Check size={14} className="text-emerald-500" /> : <Copy size={14} />}
+        </Button>
+      </div>
+    </div>
+  );
+};
+
 type ExternalMcpStatus = {
   ok: boolean;
   enabled?: boolean;
@@ -55,7 +97,6 @@ type ExternalMcpStatus = {
   sessionIdleTimeoutMinutes?: number;
   permissionMode?: string;
   error?: string | null;
-  http?: ExternalMcpHttpViewStatus | null;
 };
 
 type ClientSetupStatus = {
@@ -256,19 +297,8 @@ export const ExternalMcpCard: React.FC = () => {
   const [mode, setModeRaw] = useState<ExternalMcpMode>(() => readExternalMcpMode());
   const [idleTimeoutMinutes, setIdleTimeoutRaw] = useState<number>(() => readExternalMcpIdleTimeoutMinutes());
   const [focusOnHostOpen, setFocusOnHostOpenRaw] = useState<boolean>(() => readExternalMcpFocusOnHostOpen());
-  const [approvalAlert, setApprovalAlertRaw] = useState<ExternalMcpApprovalAlertMode>(
-    () => readExternalMcpApprovalAlertMode(),
-  );
   const [sessionIdleTimeoutMinutes, setSessionIdleTimeoutRaw] = useState<number>(() => readSessionIdleTimeoutMinutes());
   const [silentSessions, setSilentSessionsRaw] = useState<boolean>(() => readExternalMcpSilentSessions());
-  const [httpSettings, setHttpSettings] = useState<ExternalMcpHttpSettings>(() => ({
-    enabled: readExternalMcpHttpEnabled(),
-    port: readExternalMcpHttpPort(),
-    allowCustomBind: readExternalMcpHttpAllowCustomBind(),
-    listenAddress: readExternalMcpHttpListenAddress(),
-    clientHost: readExternalMcpHttpClientHost(),
-  }));
-  const [isRotatingHttpToken, setIsRotatingHttpToken] = useState(false);
   const [status, setStatus] = useState<ExternalMcpStatus | null>(null);
   const [selectedClient, setSelectedClient] = useState<ExternalMcpClient>("codex");
   const [codexStatus, setCodexStatus] = useState<ClientSetupStatus | null>(null);
@@ -314,51 +344,11 @@ export const ExternalMcpCard: React.FC = () => {
     writeExternalMcpFocusOnHostOpen(nextFocusOnHostOpen);
   }, []);
 
-  const setApprovalAlert = useCallback((next: ExternalMcpApprovalAlertMode) => {
-    setApprovalAlertRaw(writeExternalMcpApprovalAlertMode(next));
-  }, []);
-
   const setSilentSessions = useCallback((nextSilentSessions: boolean) => {
     setSilentSessionsRaw(nextSilentSessions);
     writeExternalMcpSilentSessions(nextSilentSessions);
   }, []);
 
-  const applyHttpSettings = useCallback(async (next: ExternalMcpHttpSettings) => {
-    const normalized: ExternalMcpHttpSettings = {
-      enabled: writeExternalMcpHttpEnabled(next.enabled),
-      port: writeExternalMcpHttpPort(next.port),
-      allowCustomBind: writeExternalMcpHttpAllowCustomBind(next.allowCustomBind),
-      listenAddress: writeExternalMcpHttpListenAddress(next.listenAddress),
-      clientHost: writeExternalMcpHttpClientHost(next.clientHost),
-    };
-    setHttpSettings(normalized);
-    const nextStatus = await getBridge()?.externalMcpSetConfig?.({
-      httpEnabled: normalized.enabled,
-      httpPort: normalized.port,
-      httpAllowCustomBind: normalized.allowCustomBind,
-      httpListenAddress: normalized.listenAddress,
-      httpClientHost: normalized.clientHost,
-    });
-    if (nextStatus && typeof nextStatus === "object") {
-      setStatus(nextStatus as ExternalMcpStatus);
-    }
-  }, []);
-
-  const rotateHttpToken = useCallback(async () => {
-    const bridge = getBridge();
-    if (!bridge?.externalMcpSetConfig) return;
-    setIsRotatingHttpToken(true);
-    setActionMessage(null);
-    try {
-      const nextStatus = await bridge.externalMcpSetConfig({ rotateHttpToken: true });
-      if (nextStatus && typeof nextStatus === "object") {
-        setStatus(nextStatus as ExternalMcpStatus);
-      }
-    } finally {
-      setIsRotatingHttpToken(false);
-    }
-  }, []);
-
   const refreshStatus = useCallback(async (options?: { quiet?: boolean; clients?: boolean }) => {
     const bridge = getBridge();
     const includeClients = options?.clients !== false;
@@ -708,24 +698,6 @@ export const ExternalMcpCard: React.FC = () => {
       </div>
 
       <SettingCard divided className="rounded-md border-border/60 bg-background/70">
-        <SettingRow
-          anchorId="ai-external-mcp-approval-alert"
-          label={t("ai.externalMcp.approvalAlert")}
-          description={t("ai.externalMcp.approvalAlert.description")}
-        >
-          <Select
-            value={approvalAlert}
-            options={[
-              { value: "always", label: t("ai.externalMcp.approvalAlert.always") },
-              { value: "unfocused", label: t("ai.externalMcp.approvalAlert.unfocused") },
-              { value: "off", label: t("ai.externalMcp.approvalAlert.off") },
-            ]}
-            onChange={(value) => setApprovalAlert(
-              value === "always" || value === "off" ? value : "unfocused",
-            )}
-            className="w-40"
-          />
-        </SettingRow>
         <SettingRow
           label={t("ai.externalMcp.mode")}
           description={t("ai.externalMcp.mode.description")}
@@ -806,17 +778,6 @@ export const ExternalMcpCard: React.FC = () => {
         </SettingRow>
       </SettingCard>
 
-      <ExternalMcpHttpSection
-        externalMcpEnabled={enabled}
-        settings={httpSettings}
-        status={status?.http || null}
-        copied={copied}
-        rotating={isRotatingHttpToken}
-        onCopy={copyText}
-        onChange={(next) => { void applyHttpSettings(next); }}
-        onRotateToken={() => { void rotateHttpToken(); }}
-      />
-
       <div className="space-y-2">
         <div className="flex min-h-8 items-center justify-between gap-2">
           <div className="text-sm font-semibold text-foreground">{t("ai.externalMcp.discovery")}</div>

components/settings/tabs/ai/ExternalMcpHttpSection.tsx

@@ -1,323 +0,0 @@
-import React, { useState } from "react";
-import {
-  buildClaudeHttpAddCommand,
-  buildCodexHttpEnvLine,
-  buildCodexHttpToml,
-  buildExternalMcpHttpUrl,
-  buildGenericHttpMcpJson,
-  DEFAULT_EXTERNAL_MCP_HTTP_PORT,
-} from "../../../../domain/externalMcpHttp";
-import { useI18n } from "../../../../application/i18n/I18nProvider";
-import { cn } from "../../../../lib/utils";
-import { Button } from "../../../ui/button";
-import { SettingCard, SettingRow, Toggle } from "../../settings-ui";
-import { CopyableCodeBlock } from "./CopyableCodeBlock";
-
-export type ExternalMcpHttpViewStatus = {
-  enabled?: boolean;
-  listening?: boolean;
-  port?: number;
-  listenAddress?: string;
-  allowCustomBind?: boolean;
-  clientHost?: string;
-  url?: string | null;
-  bearerToken?: string | null;
-  state?: string;
-  error?: string | null;
-  errorCode?: string | null;
-};
-
-export type ExternalMcpHttpViewSettings = {
-  enabled: boolean;
-  port: number;
-  allowCustomBind: boolean;
-  listenAddress: string;
-  clientHost: string;
-};
-
-type ExternalMcpHttpSectionProps = {
-  externalMcpEnabled: boolean;
-  settings: ExternalMcpHttpViewSettings;
-  status: ExternalMcpHttpViewStatus | null;
-  copied: string | null;
-  rotating: boolean;
-  onCopy: (key: string, text: string) => void;
-  onChange: (next: ExternalMcpHttpViewSettings) => void;
-  onRotateToken: () => void;
-};
-
-function isWildcardAddress(value: string): boolean {
-  const address = value.trim();
-  return address === "0.0.0.0" || address === "::";
-}
-
-function isIpAddress(value: string): boolean {
-  const address = value.trim();
-  const ipv4 = address.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/);
-  if (ipv4) {
-    return ipv4.slice(1).every((part) => Number(part) <= 255 && String(Number(part)) === part);
-  }
-  return address.includes(":") && /^[0-9a-fA-F:]+$/.test(address);
-}
-
-function parsePort(value: string): number | null {
-  if (!/^\d+$/.test(value.trim())) return null;
-  const port = Number(value);
-  if (!Number.isInteger(port) || port < 1024 || port > 65535) return null;
-  return port;
-}
-
-export const ExternalMcpHttpSection: React.FC<ExternalMcpHttpSectionProps> = ({
-  externalMcpEnabled,
-  settings,
-  status,
-  copied,
-  rotating,
-  onCopy,
-  onChange,
-  onRotateToken,
-}) => {
-  const { t } = useI18n();
-  const [portDraft, setPortDraft] = useState(String(settings.port || DEFAULT_EXTERNAL_MCP_HTTP_PORT));
-  const [addressDraft, setAddressDraft] = useState(settings.listenAddress || "0.0.0.0");
-  const [clientHostDraft, setClientHostDraft] = useState(settings.clientHost || "");
-  const [portError, setPortError] = useState(false);
-  const [addressError, setAddressError] = useState(false);
-  const [clientHostError, setClientHostError] = useState(false);
-
-  const listenAddress = settings.allowCustomBind
-    ? (status?.listenAddress || settings.listenAddress)
-    : "127.0.0.1";
-  const advertisedHost = status?.clientHost ?? settings.clientHost;
-  const url = status
-    ? (status.url || "")
-    : buildExternalMcpHttpUrl(listenAddress, settings.port, advertisedHost);
-  const showClientHost = settings.allowCustomBind && (
-    isWildcardAddress(settings.listenAddress) || isWildcardAddress(addressDraft)
-  );
-  const token = status?.bearerToken || "";
-  const listening = Boolean(status?.listening);
-  const statusLabel = listening
-    ? t("ai.externalMcp.http.listening")
-    : t("ai.externalMcp.http.notListening");
-  const statusClass = status?.errorCode
-    ? "text-destructive"
-    : listening
-      ? "text-emerald-500"
-      : "text-muted-foreground";
-
-  let errorText = "";
-  if (portError) errorText = t("ai.externalMcp.http.invalidPort");
-  else if (addressError) errorText = t("ai.externalMcp.http.invalidAddress");
-  else if (clientHostError) errorText = t("ai.externalMcp.http.invalidClientHost");
-  else if (status?.errorCode === "client_host_required") errorText = t("ai.externalMcp.http.clientHostRequired");
-  else if (status?.errorCode === "port_in_use") {
-    errorText = t("ai.externalMcp.http.portInUse", { port: String(status.port ?? settings.port) });
-  } else if (status?.errorCode === "invalid_address") errorText = t("ai.externalMcp.http.invalidAddress");
-  else if (status?.errorCode === "invalid_port") errorText = t("ai.externalMcp.http.invalidPort");
-  else if (status?.errorCode === "listen_failed") errorText = status.error || t("ai.externalMcp.http.listenFailed");
-
-  const commitPort = () => {
-    const port = parsePort(portDraft);
-    if (port == null) {
-      setPortError(true);
-      return;
-    }
-    setPortError(false);
-    setPortDraft(String(port));
-    if (port !== settings.port) onChange({ ...settings, port });
-  };
-
-  const commitClientHost = () => {
-    const clientHost = clientHostDraft.trim();
-    if (clientHost && (!isIpAddress(clientHost) || isWildcardAddress(clientHost))) {
-      setClientHostError(true);
-      return;
-    }
-    setClientHostError(false);
-    setClientHostDraft(clientHost);
-    if (clientHost !== settings.clientHost) onChange({ ...settings, clientHost });
-  };
-
-  const commitAddress = () => {
-    const address = addressDraft.trim();
-    if (!isIpAddress(address)) {
-      setAddressError(true);
-      return;
-    }
-    setAddressError(false);
-    setAddressDraft(address);
-    if (address !== settings.listenAddress) onChange({ ...settings, listenAddress: address });
-  };
-
-  return (
-    <div className="space-y-2">
-      <div className="flex items-center justify-between gap-3">
-        <div className="text-sm font-semibold text-foreground">{t("ai.externalMcp.http.title")}</div>
-        <div className={cn("text-xs font-medium", statusClass)}>{statusLabel}</div>
-      </div>
-      <p className="text-xs text-muted-foreground leading-5">{t("ai.externalMcp.http.description")}</p>
-      <p className="text-xs text-muted-foreground leading-5">{t("ai.externalMcp.http.legacySseNote")}</p>
-      <SettingCard divided className="rounded-md border-border/60 bg-background/70">
-        <SettingRow
-          anchorId="ai-external-mcp-http"
-          label={t("ai.externalMcp.http.enable")}
-        >
-          <Toggle
-            checked={settings.enabled}
-            onChange={(enabled) => onChange({ ...settings, enabled })}
-            ariaLabel={t("ai.externalMcp.http.enable")}
-          />
-        </SettingRow>
-        <SettingRow
-          label={t("ai.externalMcp.http.port")}
-          description={t("ai.externalMcp.http.portHint")}
-        >
-          <input
-            type="number"
-            aria-label={t("ai.externalMcp.http.port")}
-            min={1024}
-            max={65535}
-            value={portDraft}
-            onChange={(event) => {
-              setPortDraft(event.currentTarget.value);
-              setPortError(false);
-            }}
-            onBlur={commitPort}
-            onKeyDown={(event) => {
-              if (event.key === "Enter") {
-                event.currentTarget.blur();
-              }
-            }}
-            className="w-24 rounded-md border border-border/60 bg-background px-2 py-1 text-sm"
-          />
-        </SettingRow>
-        <SettingRow
-          label={t("ai.externalMcp.http.allowCustomBind")}
-          description={t("ai.externalMcp.http.allowCustomBind.description")}
-        >
-          <Toggle
-            checked={settings.allowCustomBind}
-            onChange={(allowCustomBind) => onChange({ ...settings, allowCustomBind })}
-            ariaLabel={t("ai.externalMcp.http.allowCustomBind")}
-          />
-        </SettingRow>
-        {settings.allowCustomBind ? (
-          <SettingRow label={t("ai.externalMcp.http.listenAddress")}>
-            <input
-              type="text"
-              aria-label={t("ai.externalMcp.http.listenAddress")}
-              placeholder={t("ai.externalMcp.http.listenAddress.placeholder")}
-              value={addressDraft}
-              onChange={(event) => {
-                setAddressDraft(event.currentTarget.value);
-                setAddressError(false);
-              }}
-              onBlur={commitAddress}
-              className="w-36 rounded-md border border-border/60 bg-background px-2 py-1 font-mono text-sm"
-            />
-          </SettingRow>
-        ) : null}
-        {showClientHost ? (
-          <SettingRow
-            label={t("ai.externalMcp.http.clientHost")}
-            description={t("ai.externalMcp.http.clientHost.description")}
-          >
-            <input
-              type="text"
-              aria-label={t("ai.externalMcp.http.clientHost")}
-              placeholder={t("ai.externalMcp.http.clientHost.placeholder")}
-              value={clientHostDraft}
-              onChange={(event) => {
-                setClientHostDraft(event.currentTarget.value);
-                setClientHostError(false);
-              }}
-              onBlur={commitClientHost}
-              className="w-36 rounded-md border border-border/60 bg-background px-2 py-1 font-mono text-sm"
-            />
-          </SettingRow>
-        ) : null}
-      </SettingCard>
-      {settings.allowCustomBind ? (
-        <p className="text-xs text-amber-500 leading-5">{t("ai.externalMcp.http.warning")}</p>
-      ) : null}
-      <p className="text-xs text-muted-foreground leading-5">{t("ai.externalMcp.http.wslHint")}</p>
-      {settings.enabled && !externalMcpEnabled ? (
-        <p className="text-xs text-amber-500">{t("ai.externalMcp.http.requiresExternalMcp")}</p>
-      ) : null}
-      {errorText ? <p className="text-xs text-destructive">{errorText}</p> : null}
-      <div className="space-y-2.5 rounded-md border border-border/60 bg-background/50 p-3">
-        <CopyableCodeBlock
-          label={t("ai.externalMcp.http.url")}
-          value={url}
-          copyKey="http-url"
-          copied={copied}
-          onCopy={onCopy}
-          copyLabel={t("ai.externalMcp.copy")}
-          copiedLabel={t("ai.externalMcp.copied")}
-        />
-        <CopyableCodeBlock
-          label={t("ai.externalMcp.http.token")}
-          value={token}
-          copyKey="http-token"
-          copied={copied}
-          onCopy={onCopy}
-          copyLabel={t("ai.externalMcp.copy")}
-          copiedLabel={t("ai.externalMcp.copied")}
-          emptyLabel={t("ai.externalMcp.unavailable")}
-        />
-        <div className="flex items-center justify-between gap-3">
-          <p className="text-xs text-muted-foreground leading-5">{t("ai.externalMcp.http.regenerateHint")}</p>
-          <Button
-            type="button"
-            variant="outline"
-            size="sm"
-            disabled={!externalMcpEnabled || !settings.enabled || rotating}
-            onClick={onRotateToken}
-          >
-            {t("ai.externalMcp.http.regenerate")}
-          </Button>
-        </div>
-        <CopyableCodeBlock
-          label={t("ai.externalMcp.http.codexSnippet")}
-          value={buildCodexHttpToml(url)}
-          copyKey="http-codex"
-          copied={copied}
-          onCopy={onCopy}
-          copyLabel={t("ai.externalMcp.copy")}
-          copiedLabel={t("ai.externalMcp.copied")}
-        />
-        <CopyableCodeBlock
-          label={t("ai.externalMcp.http.envLine")}
-          value={token ? buildCodexHttpEnvLine(token) : ""}
-          copyKey="http-env"
-          copied={copied}
-          onCopy={onCopy}
-          copyLabel={t("ai.externalMcp.copy")}
-          copiedLabel={t("ai.externalMcp.copied")}
-          emptyLabel={t("ai.externalMcp.unavailable")}
-        />
-        <CopyableCodeBlock
-          label={t("ai.externalMcp.http.claudeCommand")}
-          value={token ? buildClaudeHttpAddCommand(url, token) : ""}
-          copyKey="http-claude"
-          copied={copied}
-          onCopy={onCopy}
-          copyLabel={t("ai.externalMcp.copy")}
-          copiedLabel={t("ai.externalMcp.copied")}
-          emptyLabel={t("ai.externalMcp.unavailable")}
-        />
-        <CopyableCodeBlock
-          label={t("ai.externalMcp.http.genericSnippet")}
-          value={token ? buildGenericHttpMcpJson(url, token) : ""}
-          copyKey="http-json"
-          copied={copied}
-          onCopy={onCopy}
-          copyLabel={t("ai.externalMcp.copy")}
-          copiedLabel={t("ai.externalMcp.copied")}
-          emptyLabel={t("ai.externalMcp.unavailable")}
-        />
-      </div>
-    </div>
-  );
-};

components/settings/tabs/ai/types.ts

@@ -177,12 +177,6 @@ export interface NetcattyAiBridge {
     mode?: 'temporary' | 'persistent';
     idleTimeoutMinutes?: number;
     sessionIdleTimeoutMinutes?: number;
-    httpEnabled?: boolean;
-    httpPort?: number;
-    httpAllowCustomBind?: boolean;
-    httpListenAddress?: string;
-    httpClientHost?: string;
-    rotateHttpToken?: boolean;
   }) => Promise<Record<string, unknown>>;
   externalMcpGetUniversalSetupPrompt?: () => Promise<{
     ok: boolean;

components/terminal/PromptDetector.test.ts

@@ -1,7 +1,7 @@
 import test from "node:test";
 import assert from "node:assert/strict";
 
-import { detectPrompt, getAlignedPrompt, isProgramInputPromptText } from "./autocomplete/promptDetector.ts";
+import { detectPrompt, getAlignedPrompt } from "./autocomplete/promptDetector.ts";
 import { resolveAutocompleteQueryInput } from "./autocomplete/terminalAutocompletePrompt.ts";
 import { getSnippetSuggestions } from "./autocomplete/snippetCompleter.ts";
 import { stringCellWidth } from "./autocomplete/terminalStringCellWidth.ts";
@@ -817,63 +817,3 @@ test("CMD path prompts with CJK directories do not absorb padding into echoed Ch
     "zh",
   );
 });
-
-test("program input prompts expose snippet text and stay out of shell history (#3622)", () => {
-  const line = "Email: use";
-  const term = createFakeTerm(line, line.length);
-  const snippet = { id: "mail", label: "邮箱", command: "user@example.com", noAutoRun: true };
-
-  assert.equal(detectPrompt(term as never).isAtPrompt, false);
-
-  const echoed = getAlignedPrompt(term as never, "use", true);
-  assert.equal(echoed.prompt.isAtPrompt, true);
-  assert.equal(echoed.prompt.promptText, "Email: ");
-  assert.equal(echoed.prompt.userInput, "use");
-  assert.equal(echoed.alignedTyped, null);
-  assert.equal(resolveAutocompleteQueryInput(echoed.prompt, "use", true), "use");
-  assert.equal(
-    getSnippetSuggestions(echoed.prompt.userInput, [snippet as never])[0]?.snippet?.command,
-    "user@example.com",
-  );
-  assert.equal(getCommandToRecordOnEnter(echoed.prompt, echoed.alignedTyped, "use", true), null);
-
-  const pending = getAlignedPrompt(createFakeTerm("Email: ", "Email: ".length) as never, "use", true);
-  assert.equal(pending.prompt.promptText, "Email: ");
-  assert.equal(resolveAutocompleteQueryInput(pending.prompt, "use", true), "use");
-  assert.equal(pending.alignedTyped, null);
-
-  const shell = "user@host:~$ git pull use";
-  const shellPrompt = getAlignedPrompt(createFakeTerm(shell, shell.length) as never, "git pull use", true);
-  assert.equal(shellPrompt.prompt.promptText, "user@host:~$ ");
-  assert.equal(shellPrompt.prompt.userInput, "git pull use");
-  assert.equal(shellPrompt.alignedTyped, "git pull use");
-});
-
-test("a colon shell prompt is not a program input prompt (#3622)", () => {
-  for (const prompt of ["dev: ", "development: ", "PS1: "]) {
-    assert.equal(isProgramInputPromptText(prompt), false, prompt);
-    const line = `${prompt}ls`;
-    const term = createFakeTerm(line, line.length);
-    const aligned = getAlignedPrompt(term as never, "ls", true);
-    assert.equal(aligned.prompt.isAtPrompt, true, prompt);
-    assert.equal(aligned.prompt.promptText, prompt, prompt);
-    assert.equal(aligned.prompt.userInput, "ls", prompt);
-    assert.equal(
-      getCommandToRecordOnEnter(aligned.prompt, aligned.alignedTyped, "ls", true),
-      "ls",
-      prompt,
-    );
-  }
-
-  assert.equal(isProgramInputPromptText("Email: "), true);
-  assert.equal(isProgramInputPromptText("Enter your username: "), true);
-  assert.equal(isProgramInputPromptText("用户名: "), true);
-});
-
-test("password, passphrase, PIN, and secret prompts stay uncompletable (#3622)", () => {
-  for (const line of ["Password: use", "Passphrase: use", "PIN: use", "Secret: use", "Enter secret: use"]) {
-    const result = getAlignedPrompt(createFakeTerm(line, line.length) as never, "use", true);
-    assert.equal(result.prompt.isAtPrompt, false, line);
-    assert.equal(resolveAutocompleteQueryInput(result.prompt, "use", true), null, line);
-  }
-});

components/terminal/TerminalAutocomplete.tsx

@@ -7,7 +7,6 @@ import {
   type AutocompleteSettings,
 } from "./autocomplete";
 import type { Snippet } from "../../domain/models";
-import { useI18n } from "../../application/i18n/I18nProvider";
 import { usePaneVisible } from "./paneVisibilityStore";
 import { getWindowPluginTerminalProviderRegistry } from "../../application/state/pluginTerminalProviderRegistry";
 import { provideTerminalCompletions } from "./autocomplete/terminalCompletionProviders";
@@ -96,7 +95,6 @@ export function TerminalAutocomplete({
   // flow through (and re-render) the TerminalView ctx. Popup / standalone
   // Terminal mounts never publish the store — fall back to the isVisible prop
   // (same contract as hibernate).
-  const { resolvedLocale } = useI18n();
   const visible = usePaneVisible(sessionId, isVisible);
   const provideCompletions = useCallback(async (
     input: string,
@@ -133,9 +131,8 @@ export function TerminalAutocomplete({
       historyScope: options.historyScope ?? settings?.historyScope,
       signal: options.signal,
       onLatePathSuggestions: options.onLatePathSuggestions,
-      locale: resolvedLocale,
     });
-  }, [allowHostStyleGreaterThanPrompt, hostGroup, hostId, hostOs, isPluginCompletionProviderAvailable, protocol, resolvedLocale, sensitiveInputActiveRef, sessionId, settings?.historyScope, status, workspaceId]);
+  }, [allowHostStyleGreaterThanPrompt, hostGroup, hostId, hostOs, isPluginCompletionProviderAvailable, protocol, sensitiveInputActiveRef, sessionId, settings?.historyScope, status, workspaceId]);
   const autocomplete = useTerminalAutocomplete({
     termRef,
     containerRef,

components/terminal/TerminalComposeBar.test.tsx

@@ -6,7 +6,6 @@ import { act, create, type ReactTestRenderer } from 'react-test-renderer';
 import { TerminalComposeBar } from './TerminalComposeBar';
 import { TooltipProvider } from '../ui/tooltip';
 import { getComposeBarHistory, pruneComposeBarHistory, recordComposeBarHistory } from '../../application/state/composeBarHistoryStore';
-import { terminalReconnectRegistry } from '../../application/state/terminalReconnectRegistry';
 
 test('compose bar preserves a draft on pane focus and records only successful async sends', async (t) => {
   const dom = new JSDOM('<!doctype html><html><body></body></html>', { url: 'http://localhost' });
@@ -103,95 +102,3 @@ test('compose bar preserves a draft on pane focus and records only successful as
   await act(async () => { root.unmount(); });
   pruneComposeBarHistory([]);
 });
-
-test('empty compose draft Enter reconnects; a typed draft still sends', async (t) => {
-  const dom = new JSDOM('<!doctype html><html><body></body></html>', { url: 'http://localhost' });
-  const originals = new Map<string, PropertyDescriptor | undefined>();
-  for (const name of ['window', 'document', 'localStorage']) {
-    originals.set(name, Object.getOwnPropertyDescriptor(globalThis, name));
-    Object.defineProperty(globalThis, name, { configurable: true, value: dom.window[name as keyof Window] });
-  }
-  const sessionId = 'compose-enter-reconnect';
-  const reconnects: string[] = [];
-  const unregister = terminalReconnectRegistry.register(sessionId, () => {
-    reconnects.push(sessionId);
-  });
-  t.after(() => {
-    unregister();
-    terminalReconnectRegistry.setEnterReconnectEnabled(sessionId, false);
-    dom.window.close();
-    for (const [name, descriptor] of originals) {
-      if (descriptor) Object.defineProperty(globalThis, name, descriptor);
-      else Reflect.deleteProperty(globalThis, name);
-    }
-  });
-  Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
-  const createTextarea = () => ({
-    value: '', selectionStart: 0, selectionEnd: 0,
-    focus() {},
-    setSelectionRange() {},
-  });
-  let textarea = createTextarea();
-  const sent: string[] = [];
-  let root!: ReactTestRenderer;
-  await act(async () => {
-    root = create(
-      <TooltipProvider>
-        <TerminalComposeBar sessionId={sessionId} onSend={(text) => { sent.push(text); return true; }} onClose={() => {}} />
-      </TooltipProvider>,
-      { createNodeMock: (el) => {
-        if (el.type !== 'textarea') return null;
-        textarea = createTextarea();
-        return textarea;
-      } },
-    );
-  });
-  const key = (name: string, extra: Record<string, unknown> = {}) => {
-    let prevented = false;
-    root.root.findByType('textarea').props.onKeyDown({
-      key: name,
-      shiftKey: false,
-      altKey: false,
-      ctrlKey: false,
-      metaKey: false,
-      nativeEvent: {},
-      currentTarget: textarea,
-      preventDefault() { prevented = true; },
-      ...extra,
-    });
-    return prevented;
-  };
-
-  terminalReconnectRegistry.setEnterReconnectEnabled(sessionId, true);
-  assert.equal(key('Enter'), true);
-  assert.deepEqual(reconnects, [sessionId]);
-  assert.deepEqual(sent, []);
-  assert.equal(textarea.value, '');
-
-  textarea.value = 'echo hi';
-  assert.equal(key('Enter'), true);
-  assert.deepEqual(reconnects, [sessionId]);
-  assert.deepEqual(sent, ['echo hi']);
-  assert.equal(textarea.value, '');
-
-  textarea.value = 'keep me';
-  assert.equal(key('Enter', { shiftKey: true }), false);
-  assert.equal(textarea.value, 'keep me');
-  assert.deepEqual(sent, ['echo hi']);
-  assert.deepEqual(reconnects, [sessionId]);
-
-  textarea.value = '';
-  assert.equal(key('Enter', { ctrlKey: true }), true);
-  assert.deepEqual(sent, ['echo hi']);
-  assert.deepEqual(reconnects, [sessionId]);
-
-  assert.equal(key('Enter', { nativeEvent: { isComposing: true, keyCode: 229 } }), false);
-  assert.deepEqual(reconnects, [sessionId]);
-
-  terminalReconnectRegistry.setEnterReconnectEnabled(sessionId, false);
-  assert.equal(key('Enter'), true);
-  assert.deepEqual(reconnects, [sessionId]);
-  assert.deepEqual(sent, ['echo hi']);
-
-  await act(async () => { root.unmount(); });
-});

components/terminal/TerminalComposeBar.tsx

@@ -5,7 +5,6 @@
  */
 import { GripHorizontal, Pin, Plus, Radio, Search, X } from 'lucide-react';
 import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { terminalReconnectRegistry } from '../../application/state/terminalReconnectRegistry';
 import { useComposeBarHistory } from '../../application/state/useComposeBarHistory';
 import { canNavigateComposeBarHistory } from '../../domain/composeBarHistory';
 import { STORAGE_KEY_TERMINAL_BROADCAST_PASSWORD_BYPASS } from '../../infrastructure/config/storageKeys';
@@ -497,22 +496,12 @@ export const TerminalComposeBar: React.FC<TerminalComposeBarProps> = ({
     }
     if (e.key === 'Enter' && !e.shiftKey && !isComposingRef.current) {
       e.preventDefault();
-      // Plain Enter on an empty draft reconnects a disconnected session.
-      // Modified Enter and a non-empty draft keep the existing send path (#3767).
-      const plainEnter = !e.altKey && !e.ctrlKey && !e.metaKey;
-      if (
-        plainEnter
-        && !e.currentTarget.value
-        && terminalReconnectRegistry.requestEnterReconnect(sessionId)
-      ) {
-        return;
-      }
       handleSend();
     } else if (e.key === 'Escape') {
       e.preventDefault();
       onClose();
     }
-  }, [handleSend, navigate, onClose, sessionId]);
+  }, [handleSend, navigate, onClose]);
 
   const handleResizeStart = useCallback((e: React.MouseEvent) => {
     e.preventDefault();

components/terminal/TerminalGpuCards.test.tsx

@@ -1,90 +0,0 @@
-import test from "node:test";
-import assert from "node:assert/strict";
-import React from "react";
-import { renderToStaticMarkup } from "react-dom/server";
-
-import { I18nProvider } from "../../application/i18n/I18nProvider.tsx";
-import type { GpuDeviceStats } from "../../application/state/useServerStats.ts";
-import { TerminalGpuCards } from "./TerminalGpuCards.tsx";
-
-function renderCards(gpus: GpuDeviceStats[], gpu = 40) {
-  return renderToStaticMarkup(
-    <I18nProvider locale="en">
-      <TerminalGpuCards
-        gpus={gpus}
-        gpu={gpu}
-        gpuName="NVIDIA GeForce RTX 4090"
-        gpuMemUsed={2048}
-        gpuMemTotal={24576}
-      />
-    </I18nProvider>,
-  );
-}
-
-const card = (index: number, utilization: number | null, name = `NVIDIA A${index}`): GpuDeviceStats => ({
-  index,
-  name,
-  utilization,
-  memoryUsed: 1024 * (index + 1),
-  memoryTotal: 8192,
-});
-
-test("one GPU uses the same per-core bar, colors, and spacing", () => {
-  const markup = renderCards([card(0, 73, "NVIDIA GeForce RTX 4090")], 73);
-
-  assert.match(markup, /GPU Device Usage/);
-  assert.match(markup, /GPU 0/);
-  assert.match(markup, /NVIDIA GeForce RTX 4090/);
-  assert.match(markup, /73%/);
-  assert.match(markup, /1\.0\/8\.0G/);
-  assert.match(markup, /grid gap-1\.5 max-h-\[260px\] overflow-y-auto/);
-  assert.match(markup, /min-w-\[160px\]/);
-  assert.match(markup, /line-clamp-2/);
-  assert.match(markup, /title="NVIDIA GeForce RTX 4090"/);
-  assert.doesNotMatch(markup, /max-w-\[88px\]/);
-  assert.match(markup, /h-1\.5 bg-muted rounded-full overflow-hidden/);
-  assert.match(markup, /bg-amber-500/);
-  assert.match(markup, /text-amber-400/);
-  assert.match(markup, /repeat\(1, 1fr\)/);
-});
-
-test("eight GPUs stay in four scrolling columns", () => {
-  const markup = renderCards(Array.from({ length: 8 }, (_, index) => card(index, 10 + index)));
-
-  assert.match(markup, /repeat\(4, 1fr\)/);
-  assert.match(markup, /max-h-\[260px\] overflow-y-auto/);
-  assert.match(markup, /max-w-\[26rem\]/);
-  assert.match(markup, /line-clamp-2/);
-  assert.match(markup, /title="NVIDIA A0"/);
-  assert.doesNotMatch(markup, /max-w-\[88px\]/);
-  for (let index = 0; index < 8; index += 1) {
-    assert.match(markup, new RegExp(`GPU ${index}`));
-  }
-  assert.match(markup, /text-emerald-400/);
-  assert.doesNotMatch(markup, /repeat\(8,/);
-});
-
-test("high utilization uses the CPU red threshold and unknown cards stay muted", () => {
-  const markup = renderCards([
-    card(0, 95, "NVIDIA H100"),
-    { index: 3, name: "NVIDIA A100", utilization: null, memoryUsed: null, memoryTotal: null },
-  ], 95);
-
-  assert.match(markup, /bg-red-500/);
-  assert.match(markup, /text-red-400/);
-  assert.match(markup, /95%/);
-  assert.match(markup, /GPU 3/);
-  assert.match(markup, />--</);
-  assert.match(markup, /repeat\(2, 1fr\)/);
-});
-
-test("a summary without per-GPU rows falls back to one aggregate bar", () => {
-  const markup = renderCards([], 12);
-
-  assert.match(markup, /min-w-\[160px\]/);
-  assert.match(markup, /h-2 bg-muted rounded-full/);
-  assert.match(markup, /12%/);
-  assert.match(markup, /2\.0\/24\.0G/);
-  assert.match(markup, /text-emerald-400/);
-  assert.doesNotMatch(markup, /grid gap-1\.5/);
-});

components/terminal/TerminalGpuCards.tsx

@@ -1,109 +0,0 @@
-import React from "react";
-
-import { useI18n } from "../../application/i18n/I18nProvider";
-import type { GpuDeviceStats } from "../../application/state/useServerStats";
-import { cn } from "../../lib/utils";
-
-export function formatGpuMemoryGib(usedMb: number | null, totalMb: number | null): string | null {
-  if (usedMb === null || totalMb === null || !(totalMb > 0)) return null;
-  return `${(usedMb / 1024).toFixed(1)}/${(totalMb / 1024).toFixed(1)}G`;
-}
-
-function usageBarClass(usage: number): string {
-  return usage >= 90 ? "bg-red-500" : usage >= 70 ? "bg-amber-500" : "bg-emerald-500";
-}
-
-function usageTextClass(usage: number): string {
-  return usage >= 90 ? "text-red-400" : usage >= 70 ? "text-amber-400" : "text-emerald-400";
-}
-
-interface TerminalGpuCardsProps {
-  gpus: GpuDeviceStats[];
-  gpu: number;
-  gpuName: string | null;
-  gpuMemUsed: number | null;
-  gpuMemTotal: number | null;
-}
-
-/**
- * Per-GPU details for the terminal stats hover card.
- * Mirrors the CPU per-core grid: four columns, the same bar heights,
- * threshold colors, and a scroll cap so many cards stay inside the popover.
- */
-export const TerminalGpuCards: React.FC<TerminalGpuCardsProps> = ({
-  gpus,
-  gpu,
-  gpuName,
-  gpuMemUsed,
-  gpuMemTotal,
-}) => {
-  const { t } = useI18n();
-  const aggregateMemory = formatGpuMemoryGib(gpuMemUsed, gpuMemTotal);
-
-  const columns = Math.min(4, gpus.length);
-
-  return (
-    <div className={cn("text-xs space-y-2 w-max max-w-[26rem]", gpus.length === 1 && "min-w-[160px]")}>
-      <div className="font-medium text-sm mb-2">{t("terminal.serverStats.gpuDevices")}</div>
-      {gpus.length > 0 ? (
-        <div
-          className="grid gap-1.5 max-h-[260px] overflow-y-auto pr-1 overscroll-contain"
-          style={{ gridTemplateColumns: `repeat(${columns}, 1fr)` }}
-        >
-          {gpus.map((device) => {
-            const usage = device.utilization;
-            const memory = formatGpuMemoryGib(device.memoryUsed, device.memoryTotal);
-            return (
-              <div key={device.index} className="flex w-full min-w-0 flex-col items-center gap-1">
-                <div className="text-[10px] text-muted-foreground">
-                  {t("terminal.serverStats.gpuIndex", { index: device.index })}
-                </div>
-                {device.name ? (
-                  <div
-                    className="line-clamp-2 w-full break-words text-center text-[10px] leading-tight text-muted-foreground"
-                    title={device.name}
-                  >
-                    {device.name}
-                  </div>
-                ) : null}
-                <div className="w-full h-1.5 bg-muted rounded-full overflow-hidden">
-                  <div
-                    className={cn(
-                      "h-full rounded-full transition-all",
-                      usage === null ? "bg-muted" : usageBarClass(usage),
-                    )}
-                    style={{ width: `${usage ?? 0}%` }}
-                  />
-                </div>
-                <div className={cn(
-                  "text-[11px] font-medium",
-                  usage === null ? "text-muted-foreground" : usageTextClass(usage),
-                )}>
-                  {usage === null ? "--" : `${usage}%`}
-                </div>
-                {memory ? (
-                  <div className="text-[10px] text-muted-foreground whitespace-nowrap">{memory}</div>
-                ) : null}
-              </div>
-            );
-          })}
-        </div>
-      ) : (
-        <div className="flex flex-col gap-1.5 min-w-[160px]">
-          {gpuName ? (
-            <div className="text-[10px] text-muted-foreground truncate" title={gpuName}>{gpuName}</div>
-          ) : null}
-          <div className="w-full h-2 bg-muted rounded-full overflow-hidden">
-            <div
-              className={cn("h-full rounded-full transition-all", usageBarClass(gpu))}
-              style={{ width: `${gpu}%` }}
-            />
-          </div>
-          <div className={cn("text-center text-[11px] font-medium", usageTextClass(gpu))}>
-            {gpu}%{aggregateMemory ? ` · ${aggregateMemory}` : ""}
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};

components/terminal/TerminalServerStats.test.ts

@@ -28,7 +28,4 @@ test("GPU chip only renders when the remote reports GPU utilization", () => {
     source,
     /terminal\.serverStats\.gpu[\s\S]{0,2000}terminal\.serverStats\.memory/,
   );
-  // Same hover card as CPU: compact aggregate trigger, per-device body.
-  assert.match(source, /HoverCardTrigger asChild[\s\S]*terminal\.serverStats\.gpu[\s\S]*<TerminalGpuCards/);
-  assert.match(source, /className="w-auto p-3"[\s\S]*side="bottom"[\s\S]*align="start"[\s\S]*sideOffset=\{8\}[\s\S]*<TerminalGpuCards/);
 });

components/terminal/TerminalServerStats.tsx

@@ -8,7 +8,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
 import { formatNetSpeed } from './terminalHelpers';
 import { useServerStats } from '../../application/state/useServerStats';
 import { formatDiskCapacityRange, resolveTerminalDiskSummary } from './serverStatsFormat';
-import { formatGpuMemoryGib, TerminalGpuCards } from './TerminalGpuCards';
 
 interface TerminalServerStatsProps {
   sessionId: string;
@@ -49,7 +48,6 @@ export const TerminalServerStats: React.FC<TerminalServerStatsProps> = ({
   const hasNetworkDetails = serverStats.netInterfaces.length > 0;
   const hasLatency = serverStats.latencyMs !== null;
   const diskSummary = resolveTerminalDiskSummary(serverStats);
-  const gpuMemory = formatGpuMemoryGib(serverStats.gpuMemUsed, serverStats.gpuMemTotal);
 
   if (!enabled || !isConnected || !serverStats.lastUpdated) return null;
 
@@ -124,37 +122,28 @@ export const TerminalServerStats: React.FC<TerminalServerStatsProps> = ({
                     </div>
                   </HoverCardContent>
                 </HoverCard>
-                {/* GPU — only rendered when the remote reports NVIDIA GPU data (Linux nvidia-smi).
-                    Compact chip stays aggregate, matching CPU; per-card detail is the hover card. */}
+                {/* GPU — only rendered when the remote reports NVIDIA GPU data (Linux nvidia-smi) */}
                 {serverStats.gpu !== null && (
-                  <HoverCard openDelay={200} closeDelay={100}>
-                    <HoverCardTrigger asChild>
-                      <button
-                        className="flex items-center gap-0.5 hover:opacity-100 opacity-80 transition-opacity cursor-pointer min-w-0 shrink"
-                        aria-label={t("terminal.serverStats.gpu")}
-                      >
-                        <Gpu size={10} className="flex-shrink-0" />
-                        <span className="truncate">
-                          {serverStats.gpu}%
-                          {gpuMemory ? ` (${gpuMemory})` : ''}
-                        </span>
-                      </button>
-                    </HoverCardTrigger>
-                    <HoverCardContent
-                      className="w-auto p-3"
-                      side="bottom"
-                      align="start"
-                      sideOffset={8}
-                    >
-                      <TerminalGpuCards
-                        gpus={serverStats.gpus}
-                        gpu={serverStats.gpu}
-                        gpuName={serverStats.gpuName}
-                        gpuMemUsed={serverStats.gpuMemUsed}
-                        gpuMemTotal={serverStats.gpuMemTotal}
-                      />
-                    </HoverCardContent>
-                  </HoverCard>
+                  <div
+                    className="flex items-center gap-0.5 min-w-0 shrink"
+                    aria-label={t("terminal.serverStats.gpu")}
+                    title={
+                      [
+                        serverStats.gpuName,
+                        serverStats.gpuMemUsed !== null && serverStats.gpuMemTotal !== null && serverStats.gpuMemTotal > 0
+                          ? `VRAM ${(serverStats.gpuMemUsed / 1024).toFixed(1)}/${(serverStats.gpuMemTotal / 1024).toFixed(1)}G`
+                          : null,
+                      ].filter(Boolean).join(' · ') || undefined
+                    }
+                  >
+                    <Gpu size={10} className="flex-shrink-0" />
+                    <span className="truncate">
+                      {serverStats.gpu}%
+                      {serverStats.gpuMemUsed !== null && serverStats.gpuMemTotal !== null && serverStats.gpuMemTotal > 0
+                        ? ` (${(serverStats.gpuMemUsed / 1024).toFixed(1)}/${(serverStats.gpuMemTotal / 1024).toFixed(1)}G)`
+                        : ''}
+                    </span>
+                  </div>
                 )}
                 {/* Memory with HoverCard for htop-style bar and top processes */}
                 <HoverCard openDelay={200} closeDelay={100}>

components/terminal/TerminalView.test.tsx

@@ -220,6 +220,7 @@ test("disconnected terminal reconnects on plain Enter when input is not claimed
       key: "Enter",
       status: "disconnected",
       hasRetryHandler: true,
+      isComposeBarOpen: false,
       needsAuth: false,
       needsHostKeyVerification: false,
       hasBlockingOverlay: false,
@@ -233,6 +234,7 @@ test("terminal enter reconnect ignores active controls and non-disconnected stat
     key: "Enter",
     status: "disconnected" as const,
     hasRetryHandler: true,
+    isComposeBarOpen: false,
     needsAuth: false,
     needsHostKeyVerification: false,
     hasBlockingOverlay: false,
@@ -241,16 +243,14 @@ test("terminal enter reconnect ignores active controls and non-disconnected stat
   assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, status: "connected" }), false);
   assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, key: "a" }), false);
   assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, hasRetryHandler: false }), false);
-  // Open search and an open compose bar must not globally suppress Enter
-  // reconnect / the hint (#2546 / #3767).
+  // Open search must not globally suppress Enter reconnect / the hint (#2546).
   assert.equal(shouldReconnectTerminalOnEnterKey({ ...base }), true);
+  assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, isComposeBarOpen: true }), false);
   assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, needsAuth: true }), false);
   assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, needsHostKeyVerification: true }), false);
   assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, hasBlockingOverlay: true }), false);
   assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, isReconnectActive: true }), false);
   assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, altKey: true }), false);
-  assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, shiftKey: true }), false);
-  assert.equal(shouldReconnectTerminalOnEnterKey({ ...base, isComposing: true }), false);
 });
 
 test("terminal enter reconnect ignores interactive controls outside xterm only", () => {

components/terminal/TerminalView.tsx

@@ -7,7 +7,6 @@ import { isSessionReconnectDisabled } from '../top-tabs/SessionTabContextMenuCon
 import { resolveEffectiveTerminalProtocol } from '../../domain/terminalProtocol';
 import { classifyDistroId } from '../../domain/host';
 import type { HostInfoBarTitleMode } from '../../domain/models';
-import { terminalReconnectRegistry } from '../../application/state/terminalReconnectRegistry';
 import { useNetworkDeviceModeSuggestion } from '../../application/state/useNetworkDeviceModeSuggestion';
 import { isPluginHostProtocol } from '../../domain/pluginConnection';
 import { OSC7_SETUP_TARGETS } from './osc7Setup';
@@ -185,6 +184,7 @@ export function shouldReconnectTerminalOnEnterKey({
   key,
   status,
   hasRetryHandler,
+  isComposeBarOpen,
   needsAuth,
   needsHostKeyVerification,
   hasBlockingOverlay,
@@ -198,6 +198,7 @@ export function shouldReconnectTerminalOnEnterKey({
   key: string;
   status?: string;
   hasRetryHandler: boolean;
+  isComposeBarOpen: boolean;
   needsAuth: boolean;
   needsHostKeyVerification: boolean;
   hasBlockingOverlay: boolean;
@@ -208,15 +209,15 @@ export function shouldReconnectTerminalOnEnterKey({
   shiftKey?: boolean;
   isComposing?: boolean;
 }): boolean {
-  // Search and compose bars are not global gates. While disconnected, plain
-  // Enter still reconnects from the terminal and the disconnected dialog.
-  // Capture still skips real controls outside xterm (compose textarea, auth,
-  // buttons). Search input is allow-listed so an open search bar cannot hide
-  // the hint or swallow reconnect (#2544 / #2546). An empty compose draft
-  // reconnects from TerminalComposeBar; a non-empty draft keeps send (#3767).
+  // Search-bar open state is intentionally not a global gate. While disconnected,
+  // find-next is less useful than reconnect; the capture handler still refuses
+  // Enter only when a real interactive control outside xterm owns the event
+  // (compose/auth/buttons). The terminal search input is allow-listed so an open
+  // search bar cannot hide the hint or swallow reconnect (#2544 / #2546).
   return key === "Enter"
     && status === "disconnected"
     && hasRetryHandler
+    && !isComposeBarOpen
     && !needsAuth
     && !needsHostKeyVerification
     && !hasBlockingOverlay
@@ -528,24 +529,18 @@ function TerminalViewInner({ ctx, isPaneMagnified = false }: { ctx: TerminalView
     key: "Enter",
     status,
     hasRetryHandler: Boolean(handleRetry) && terminalReconnectAvailable !== false,
+    isComposeBarOpen,
     needsAuth: Boolean(auth.needsAuth),
     needsHostKeyVerification: Boolean(needsHostKeyVerification),
     hasBlockingOverlay: hasBlockingReconnectOverlay,
     isReconnectActive,
   });
-  // Publish Enter-reconnect so an empty compose draft can reconnect this
-  // session, including the workspace compose bar (#3767).
-  useEffect(() => {
-    terminalReconnectRegistry.setEnterReconnectEnabled(sessionId, showEnterReconnectHint);
-    return () => {
-      terminalReconnectRegistry.setEnterReconnectEnabled(sessionId, false);
-    };
-  }, [sessionId, showEnterReconnectHint]);
   const handleTerminalKeyDownCapture = useCallback((event: React.KeyboardEvent<HTMLDivElement>) => {
     if (!shouldReconnectTerminalOnEnterKey({
       key: event.key,
       status,
       hasRetryHandler: Boolean(handleRetry) && terminalReconnectAvailable !== false,
+      isComposeBarOpen,
       needsAuth: Boolean(auth.needsAuth),
       needsHostKeyVerification: Boolean(needsHostKeyVerification),
       hasBlockingOverlay: hasBlockingReconnectOverlay,
@@ -568,6 +563,7 @@ function TerminalViewInner({ ctx, isPaneMagnified = false }: { ctx: TerminalView
     auth.needsAuth,
     handleRetry,
     hasBlockingReconnectOverlay,
+    isComposeBarOpen,
     isReconnectActive,
     needsHostKeyVerification,
     status,

components/terminal/autocomplete/autocompleteDescriptionI18n.ts

@@ -1,67 +0,0 @@
-/**
- * zh-CN / zh-TW overlays for bundled Fig autocomplete descriptions.
- * Each dictionary is keyed by the exact English description string.
- * Spec objects stay in English; only suggestion copies shown in the popup change.
- *
- * The two dictionaries are separate dynamic imports so the renderer fetches
- * only the chunk for the active UI locale. zh-TW is generated from zh-CN with
- * OpenCC s2twp via scripts/generate-autocomplete-descriptions-zh-TW.mjs.
- */
-
-type DescriptionDictionary = Record<string, string>;
-
-let zhCnDictionaryPromise: Promise<DescriptionDictionary> | undefined;
-let zhTwDictionaryPromise: Promise<DescriptionDictionary> | undefined;
-
-function dictionaryFromModule(
-  mod: { default?: DescriptionDictionary } | DescriptionDictionary,
-): DescriptionDictionary {
-  const loaded = mod as { default?: DescriptionDictionary };
-  return loaded.default ?? (mod as DescriptionDictionary);
-}
-
-function loadZhCnDescriptions(): Promise<DescriptionDictionary> {
-  zhCnDictionaryPromise ??= import("./descriptions.zh-CN.json").then(dictionaryFromModule);
-  return zhCnDictionaryPromise;
-}
-
-function loadZhTwDescriptions(): Promise<DescriptionDictionary> {
-  zhTwDictionaryPromise ??= import("./descriptions.zh-TW.json").then(dictionaryFromModule);
-  return zhTwDictionaryPromise;
-}
-
-function loadDescriptionsForLocale(locale: string): Promise<DescriptionDictionary> | undefined {
-  if (locale === "zh-CN") return loadZhCnDescriptions();
-  if (locale === "zh-TW") return loadZhTwDescriptions();
-  return undefined;
-}
-
-/**
- * Copy spec-backed suggestions so a locale overlay cannot leak into the
- * cached spec or into a later query in another locale.
- */
-export async function localizeSpecSuggestionDescriptions<T extends { description?: string }>(
-  suggestions: readonly T[],
-  locale: string | undefined,
-): Promise<readonly T[]> {
-  if (!locale || suggestions.length === 0) return suggestions;
-  const pending = loadDescriptionsForLocale(locale);
-  if (!pending) return suggestions;
-
-  let dictionary: DescriptionDictionary;
-  try {
-    dictionary = await pending;
-  } catch {
-    return suggestions;
-  }
-  let changed = false;
-  const localized = suggestions.map((suggestion) => {
-    const description = suggestion.description;
-    if (!description) return suggestion;
-    const translated = dictionary[description];
-    if (!translated) return suggestion;
-    changed = true;
-    return { ...suggestion, description: translated };
-  });
-  return changed ? localized : suggestions;
-}

components/terminal/autocomplete/completionEngine.ts

@@ -31,7 +31,6 @@ import {
   resolvePathComponents,
 } from "./remotePathCompleter";
 import { getSnippetSuggestions } from "./snippetCompleter";
-import { localizeSpecSuggestionDescriptions } from "./autocompleteDescriptionI18n";
 import type { AutocompleteHistoryScope, Snippet } from "../../../domain/models";
 import type { AutocompleteCwdSource } from "./terminalAutocompleteLayout";
 
@@ -273,12 +272,6 @@ export async function getCompletions(
      * the shared directory cache for a later keystroke.
      */
     onLatePathSuggestions?: (suggestions: CompletionSuggestion[]) => void;
-    /**
-     * UI locale. zh-CN and zh-TW overlay bundled spec descriptions from their
-     * own dictionaries; any other locale keeps the original English text.
-     * Cached specs are not rewritten.
-     */
-    locale?: string;
   } = {},
 ): Promise<CompletionSuggestion[]> {
   const { hostId, maxResults = 15, historyScope = "host" } = options;
@@ -375,11 +368,7 @@ export async function getCompletions(
     )
     : [];
 
-  const specSuggestions = await localizeSpecSuggestionDescriptions(
-    specResult.suggestions,
-    options.locale,
-  );
-  for (const suggestion of specSuggestions) {
+  for (const suggestion of specResult.suggestions) {
     suggestions.push(suggestion);
     seenSuggestionTexts.add(suggestion.text);
   }

components/terminal/autocomplete/promptDetector.ts

@@ -31,55 +31,10 @@ export function isNonPromptLine(lineText: string): boolean {
   return NON_PROMPT_PATTERNS.some((pattern) => pattern.test(lineText));
 }
 
-const PROGRAM_INPUT_LABEL = /^(?=[\p{L}\p{N}])[\p{L}\p{N} ._'()-]{1,60}$/u;
-
-/** Identity prompts this feature targets. A custom PS1 like `dev: ` is not one. */
-const ORDINARY_INPUT_LABEL =
-  /^(?:e-?mail(?: address)?|user(?: ?name| ?id)?|login(?: name)?|(?:full )?name|account(?: name)?|\u90ae\u7bb1|\u7535\u5b50\u90ae\u7bb1|\u7535\u5b50\u90ae\u4ef6|\u7528\u6237\u540d|\u7528\u6237|\u59d3\u540d|\u8d26\u53f7|\u5e10\u6237|\u8d26\u6237|\u767b\u5f55\u540d)$/u;
-
-function colonLabelText(promptText: string): string | null {
-  if (!promptText || promptText.length > 80) return null;
-  if (isSensitiveTerminalChallenge(promptText)) return null;
-  if (/\b(?:secret|passphrase|password|pin)\b/iu.test(promptText)) return null;
-
-  const trimmedEnd = promptText.trimEnd();
-  const marker = trimmedEnd.at(-1);
-  if (marker !== ":" && marker !== "\uFF1A") return null;
-
-  const label = trimmedEnd.slice(0, -1).trim();
-  if (!PROGRAM_INPUT_LABEL.test(label)) return null;
-  if (startsWithCommonShellCommand(label)) return null;
-  return label;
-}
-
-/** Colon label shape, including a custom shell PS1 (`dev: `). */
-function isColonLabelPromptText(promptText: string): boolean {
-  return colonLabelText(promptText) !== null;
-}
-
-/**
- * A program waiting for ordinary input (`read -p 'Email: '`).
- * Password, passphrase, PIN, and secret prompts stay closed.
- * Only the identity-label allowlist matches, so `PS1='dev: '` stays a shell prompt.
- */
-export function isProgramInputPromptText(promptText: string): boolean {
-  const label = colonLabelText(promptText);
-  if (!label) return false;
-  const normalized = label
-    .replace(/\s+/g, " ")
-    .toLowerCase()
-    .replace(/^(?:please\s+)?(?:enter|input|type)\s+(?:your\s+)?/u, "")
-    .replace(/^your\s+/u, "")
-    .replace(/^(?:\u8bf7\u8f93\u5165|\u8bf7|\u8f93\u5165)/u, "")
-    .trim();
-  return ORDINARY_INPUT_LABEL.test(normalized);
-}
-
 function isSpecificShellPromptCandidate(
   promptText: string,
   options: { allowGreaterThanTerminator?: boolean } = {},
 ): boolean {
-  if (isProgramInputPromptText(promptText)) return true;
   const trimmed = promptText.trim();
   if (
     !options.allowGreaterThanTerminator &&
@@ -203,9 +158,6 @@ function inferPromptTextBeforeTypedInput(
     if (isLikelyNoSpaceShellPromptText(promptText)) return promptText;
   }
 
-  // `Email: ` with the reply still in the keystroke buffer (echo not painted yet).
-  if (isProgramInputPromptText(cursorPrefix)) return cursorPrefix;
-
   return null;
 }
 
@@ -436,11 +388,6 @@ function alignTypedInputFromCursorPrefix(
     return null;
   }
 
-  // Program read-prompts are snippet queries only. Do not override a real shell
-  // prompt, and do not authorize Enter history recording.
-  const programInput = isProgramInputPromptText(promptText);
-  if (programInput && raw.isAtPrompt) return null;
-
   return {
     prompt: {
       isAtPrompt: true,
@@ -448,7 +395,7 @@ function alignTypedInputFromCursorPrefix(
       userInput: typedBuffer,
       cursorOffset: typedBuffer.length,
     },
-    alignedTyped: programInput ? null : typedBuffer,
+    alignedTyped: typedBuffer,
   };
 }
 
@@ -624,9 +571,7 @@ export function detectPrompt(term: XTerm): PromptDetectionResult {
     ? lineText
     : cursorLinePrefix;
   const promptEnd = findPromptBoundary(promptScanText);
-  // Colon read-prompts (`Email: `) stay out of shell prompt detection. Autocomplete
-  // opts in later via alignTypedInputFromCursorPrefix.
-  if (promptEnd >= 0 && !isProgramInputPromptText(lineText.substring(0, promptEnd))) {
+  if (promptEnd >= 0) {
     const promptText = lineText.substring(0, promptEnd);
     // Input is whatever sits between the prompt and the cursor on the cell-
     // accurate prefix — don't use cursorX as a character index.
@@ -656,7 +601,7 @@ export function detectPrompt(term: XTerm): PromptDetectionResult {
       const promptLineText = promptLine.translateToString(false);
       if (isSensitiveTerminalChallenge(promptLineText) || isNonPromptLine(promptLineText)) return NO_PROMPT;
       const pEnd = findPromptBoundary(promptLineText);
-      if (pEnd >= 0 && !isProgramInputPromptText(promptLineText.substring(0, pEnd))) {
+      if (pEnd >= 0) {
         const promptText = promptLineText.substring(0, pEnd);
         // Concatenate all rows from promptRow to cursorY to get full input
         let fullInput = promptLineText.substring(pEnd);
@@ -872,24 +817,7 @@ function findPromptBoundary(lineText: string): number {
     }
   }
 
-  if (lastStandardBoundary >= 0) return lastStandardBoundary;
-  if (lastPuaBoundary >= 0) return lastPuaBoundary;
-  return findProgramInputPromptBoundary(lineText);
-}
-
-function findProgramInputPromptBoundary(lineText: string): number {
-  const scanLimit = Math.min(lineText.trimEnd().length, 200);
-  let last = -1;
-  for (let i = 0; i < scanLimit; i++) {
-    const ch = lineText[i];
-    if (ch !== ":" && ch !== "\uFF1A") continue;
-    const next = i + 1 < lineText.length ? lineText[i + 1] : null;
-    if (next !== null && next !== " ") continue;
-    const boundary = next === " " ? i + 2 : i + 1;
-    if (!isColonLabelPromptText(lineText.slice(0, boundary))) continue;
-    last = boundary;
-  }
-  return last;
+  return lastStandardBoundary >= 0 ? lastStandardBoundary : lastPuaBoundary;
 }
 
 /**

components/terminal/autocomplete/terminalAutocompletePrompt.ts

@@ -1,12 +1,10 @@
 import { isSensitiveTerminalChallenge } from "../../../domain/terminalPromptSecurity";
 import {
   isNonPromptLine,
-  isProgramInputPromptText,
   reconcilePromptWithExternalCommand,
   type PromptDetectionResult,
 } from "./promptDetector";
-import { parseCommandLine, type CompletionSuggestion } from "./completionEngine";
-import { computeLivePreviewWrite, isWindowsShellLineInput } from "./livePreviewSequence";
+import { computeLivePreviewWrite } from "./livePreviewSequence";
 
 const THEMED_PROMPT_MARKERS = /[❯❮→➜➤⟩»›]/;
 
@@ -105,87 +103,10 @@ export function isSameAutocompleteQuery(options: {
   return options.previewActive && options.previewBaseline === options.queryInput;
 }
 
-const TRUSTED_ORDINARY_INPUT_LABELS = new Set([
-  "email",
-  "e-mail",
-  "email address",
-  "e-mail address",
-  "username",
-  "user name",
-  "user",
-  "userid",
-  "user id",
-  "login",
-  "login name",
-  "name",
-  "full name",
-  "account",
-  "account name",
-  "\u90ae\u7bb1",
-  "\u7535\u5b50\u90ae\u7bb1",
-  "\u7535\u5b50\u90ae\u4ef6",
-  "\u7528\u6237\u540d",
-  "\u7528\u6237",
-  "\u59d3\u540d",
-  "\u8d26\u53f7",
-  "\u5e10\u6237",
-  "\u8d26\u6237",
-  "\u767b\u5f55\u540d",
-]);
-
-const UNTRUSTED_INPUT_LABEL = /(?:\b(?:secret|passphrase|password|passcode|token|key|pin|otp)\b|\u5bc6\u7801|\u53e3\u4ee4|\u4ee4\u724c|\u5bc6\u94a5|\u9a8c\u8bc1\u7801)/iu;
-
-function trustedOrdinaryInputLabel(promptText: string): string | null {
-  const trimmedEnd = promptText.trimEnd();
-  const marker = trimmedEnd.at(-1);
-  if (marker !== ":" && marker !== "\uFF1A") return null;
-  return trimmedEnd
-    .slice(0, -1)
-    .trim()
-    .replace(/\s+/g, " ")
-    .toLowerCase()
-    .replace(/^(?:please\s+)?(?:enter|input|type)\s+(?:your\s+)?/u, "")
-    .replace(/^your\s+/u, "")
-    .replace(/^(?:\u8bf7\u8f93\u5165|\u8bf7|\u8f93\u5165)/u, "")
-    .trim();
-}
-
-/**
- * Positively identified ordinary identity prompts (`Email:`, `Username:`).
- * Unknown labels stay fail-closed so they cannot bypass the sensitive latch.
- */
-function isTrustedOrdinaryInputPromptText(promptText: string): boolean {
-  if (UNTRUSTED_INPUT_LABEL.test(promptText)) return false;
-  const label = trustedOrdinaryInputLabel(promptText);
-  if (!label || UNTRUSTED_INPUT_LABEL.test(label)) return false;
-  return TRUSTED_ORDINARY_INPUT_LABELS.has(label);
-}
-
-/**
- * Why `sensitiveInputActive` is latched.
- *
- * `heuristic` is the untrusted-prompt detector (`Email:`, unknown `Label:`).
- * `explicit` is authoritative metadata such as `pluginPipelineSensitiveInput`.
- * Omitted means heuristic, so existing callers keep the trusted-label bypass.
- */
-export type SensitiveAutocompleteLatchSource = "heuristic" | "explicit";
-
-export type SensitiveInputActiveRef = {
-  current: boolean;
-  source?: SensitiveAutocompleteLatchSource;
-};
-
 /**
  * Whether fetchSuggestions must refuse to query/render for an already-known
  * sensitive line (host latch or auth-challenge prompt text).
  *
- * The heuristic latch is set for every untrusted input boundary, including
- * safe program prompts such as `Email:`. Only a small allowlist of plain
- * identity labels may bypass that latch so snippet candidates can render.
- * An explicit latch (plugin pipeline or other authoritative sensitive
- * metadata) stays closed for those labels too. Unknown labels, and anything
- * password/token/key/PIN/OTP-like, stay closed.
- *
  * This is *not* a substitute for the empty-echo / `allowExternalProviders:
  * false` wait in useTerminalAutocomplete: `read -s -p '$ '` still looks like
  * a normal shell PS1 until echo validates, so that path stays fail-closed
@@ -194,16 +115,7 @@ export type SensitiveInputActiveRef = {
 export function shouldBlockAutocompleteForSensitivePrompt(options: {
   sensitiveInputActive: boolean;
   promptText: string;
-  sensitiveSource?: SensitiveAutocompleteLatchSource;
 }): boolean {
-  const explicitLatch = options.sensitiveInputActive && options.sensitiveSource === "explicit";
-  if (
-    options.sensitiveInputActive
-    && !explicitLatch
-    && isTrustedOrdinaryInputPromptText(options.promptText)
-  ) {
-    return false;
-  }
   if (options.sensitiveInputActive) return true;
   return isSensitiveTerminalChallenge(options.promptText);
 }
@@ -257,7 +169,6 @@ export function getCommandToRecordOnEnter(
   typedBufferReliable: boolean,
 ): string | null {
   if (!livePrompt.isAtPrompt) return null;
-  if (isProgramInputPromptText(livePrompt.promptText)) return null;
   const alignedCommand = alignedTyped?.trim();
   if (alignedCommand) return alignedCommand;
 
@@ -298,46 +209,3 @@ export function getCommandToRecordOnEnter(
   return liveCommand;
 }
 
-/**
- * Keystrokes that remove the text a snippet acceptance replaces.
- * Line-start keeps the shell kill-line (Ctrl+U, or backspaces on Windows).
- * Mid-line and program read-prompts delete only the word being typed.
- * POSIX word delete sends DEL, the tty erase character. Ctrl-H is literal
- * input to canonical `read` when erase is ^?, while readline still deletes
- * on DEL. Windows line editing keeps backspace.
- * Script snippets run automation and do not replace the line, so they keep
- * the full-line clear.
- */
-export function computeSnippetAcceptClearSequence(options: {
-  line: string | null;
-  os: string;
-  promptText: string;
-  snippetKind?: "snippet" | "script";
-}): string {
-  const line = options.line ?? "";
-  if (line.length === 0) return "";
-
-  const { currentWord, wordIndex } = parseCommandLine(line);
-  const replaceWord = options.snippetKind !== "script"
-    && currentWord.length > 0
-    && line.endsWith(currentWord)
-    && (wordIndex > 0 || isProgramInputPromptText(options.promptText));
-  if (replaceWord) {
-    const eraseChar = isWindowsShellLineInput(options.os, options.promptText) ? "\b" : "\x7f";
-    return eraseChar.repeat(Array.from(currentWord).length);
-  }
-
-  return isWindowsShellLineInput(options.os, options.promptText)
-    ? "\b".repeat(line.length)
-    : "\x15";
-}
-
-/** Program read-prompts offer snippets only; shell lines keep every source. */
-export function limitSuggestionsForPrompt(
-  promptText: string,
-  suggestions: CompletionSuggestion[],
-): CompletionSuggestion[] {
-  if (!isProgramInputPromptText(promptText)) return suggestions;
-  return suggestions.filter((suggestion) => suggestion.source === "snippet");
-}
-

components/terminal/autocomplete/terminalCompletionProviders.ts

@@ -29,8 +29,6 @@ export interface TerminalCompletionProviderRequest {
    * soft budget (cache-bypassed relative SSH cwd).
    */
   onLatePathSuggestions?: (suggestions: CompletionSuggestion[]) => void;
-  /** UI locale forwarded to built-in spec description overlay. */
-  locale?: string;
 }
 
 const DEFAULT_PLUGIN_COMPLETION_RESPONSE_TIMEOUT_MS = 800;
@@ -76,7 +74,6 @@ export async function provideTerminalCompletions(
     snippets: request.snippets,
     historyScope: request.historyScope,
     onLatePathSuggestions: request.onLatePathSuggestions,
-    locale: request.locale,
   });
   const pluginRequestController = new AbortController();
   const abortPluginRequest = () => pluginRequestController.abort();

components/terminal/autocomplete/useTerminalAutocomplete.ts

@@ -27,7 +27,7 @@ import {
   shouldPreferRemoteShellCwd,
 } from "./remotePathCompleter";
 import { decideGhostSuggestion } from "./ghostSuggestionPolicy";
-import { shouldWriteAutocompleteLivePreview } from "./livePreviewSequence";
+import { isWindowsShellLineInput, shouldWriteAutocompleteLivePreview } from "./livePreviewSequence";
 import {
   areSubDirPanelsEqual,
   areSuggestionsEqual,
@@ -41,12 +41,9 @@ import { handleTerminalAutocompleteInput } from "./terminalAutocompleteInput";
 import { handleTerminalAutocompleteKeyEvent } from "./terminalAutocompleteKeyEvent";
 import {
   computeAutocompleteAcceptWrite,
-  computeSnippetAcceptClearSequence,
   isSameAutocompleteQuery,
-  limitSuggestionsForPrompt,
   resolveAutocompleteQueryInput,
   shouldBlockAutocompleteForSensitivePrompt,
-  type SensitiveInputActiveRef,
 } from "./terminalAutocompletePrompt";
 import { sliceStringByCellColumns } from "./terminalStringCellWidth";
 import { isTerminalAlternateScreenActive } from "../terminalHibernateRuntime";
@@ -237,7 +234,7 @@ interface UseTerminalAutocompleteOptions {
    * Host-owned password/auth prompt latch. When true, suppress autocomplete
    * even if the PS1 still looks like a normal shell (e.g. `read -s -p '$ '`).
    */
-  sensitiveInputActiveRef?: SensitiveInputActiveRef;
+  sensitiveInputActiveRef?: RefObject<boolean>;
   /** Host-owned completion Provider adapter; defaults to Netcatty's built-in Provider. */
   provideCompletions?: (
     input: string,
@@ -879,7 +876,6 @@ export function useTerminalAutocomplete(
     if (
       shouldBlockAutocompleteForSensitivePrompt({
         sensitiveInputActive: sensitiveInputActiveRef?.current === true,
-        sensitiveSource: sensitiveInputActiveRef?.source,
         promptText: prompt.promptText,
       })
     ) {
@@ -1008,11 +1004,10 @@ export function useTerminalAutocomplete(
     };
 
     const applyCompletions = (
-      incomingCompletions: CompletionSuggestion[],
+      completions: CompletionSuggestion[],
       currentPrompt: ReturnType<typeof getAlignedPrompt>["prompt"],
       options?: { preserveSelection?: boolean },
     ) => {
-      const completions = limitSuggestionsForPrompt(currentPrompt.promptText, incomingCompletions);
       // Echo-lag-aware logical caret: resolved query `input` can be ahead of
       // the live xterm cursor / currentPrompt.userInput. When a late path
       // refresh lands while live-preview has already rewritten the shell line,
@@ -1345,8 +1340,8 @@ export function useTerminalAutocomplete(
     [handleCommandHistoryCleared],
   );
 
-  /** Accept a snippet: clear the matched word (or the whole line for a script
-   *  or a shell prompt), then run it via onAcceptSnippet. */
+  /** Accept a snippet: clear the user's typed input, then run it via the
+   *  host-canonical send path (onAcceptSnippet). */
   const acceptSnippet = useCallback((snippet: Snippet): boolean => {
     const term = termRef.current;
     if (term) {
@@ -1358,13 +1353,10 @@ export function useTerminalAutocomplete(
       );
       if (line !== null && line.length > 0) {
         if (!settingsRef.current.allowLineReplacement) return false;
-        const clearSequence = computeSnippetAcceptClearSequence({
-          line,
-          os: hostOsRef.current,
-          promptText: prompt.promptText,
-          snippetKind: snippet.kind,
-        });
-        if (clearSequence) writeToTerminal(clearSequence);
+        const clearSequence = isWindowsShellLineInput(hostOsRef.current, prompt.promptText)
+          ? "\b".repeat(line.length)
+          : "\x15"; // Ctrl+U (readline kill-line)
+        writeToTerminal(clearSequence);
       }
     }
     typedInputBufferRef.current = "";

components/terminal/autocompleteDescriptionI18n.test.ts

@@ -1,178 +0,0 @@
-import test from "node:test";
-import assert from "node:assert/strict";
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-import type { FigSpec } from "./autocomplete/figSpecLoader.ts";
-
-const SINCE = "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)";
-const SINCE_ZH = "从指定时间起显示日志（例如 2013-01-02T13:23:37Z），也可用相对时间（例如 42m 表示 42 分钟）";
-const SINCE_TW = "從指定時間起顯示日誌（例如 2013-01-02T13:23:37Z），也可用相對時間（例如 42m 表示 42 分鐘）";
-const FILE_REMOVED = "\"%s: File removed before we read it\"";
-const FILE_REMOVED_TW = "\"%s: 讀取前檔案已被刪除\"";
-const DEFAULT_LABEL = "(Default)";
-const NETWORK = "Add a network";
-const PROCESS_TREE = "ASCII art process tree";
-const COMPRESSION_PROGRAM = "Do not use archive suffix to determine the compression program";
-const UNTRANSLATED = "This autocomplete description is intentionally untranslated.";
-
-const dockerSpec: FigSpec = {
-  name: "docker",
-  subcommands: [
-    {
-      name: "logs",
-      options: [
-        { name: "--since", description: SINCE },
-        { name: "--mystery", description: UNTRANSLATED },
-        { name: "--default-sample", description: DEFAULT_LABEL },
-        { name: "--network-sample", description: NETWORK },
-        { name: "--process-sample", description: PROCESS_TREE },
-        { name: "--file-sample", description: FILE_REMOVED },
-      ],
-    },
-  ],
-};
-
-Object.defineProperty(globalThis, "localStorage", {
-  value: {
-    getItem: () => null,
-    setItem: () => {},
-    removeItem: () => {},
-    clear: () => {},
-  },
-  configurable: true,
-});
-
-Object.defineProperty(globalThis, "window", {
-  value: {
-    netcatty: {
-      listFigSpecs: async () => ["docker"],
-      loadFigSpec: async (commandName: string) => commandName === "docker" ? dockerSpec : null,
-    },
-  },
-  configurable: true,
-});
-
-const { getCompletions } = await import("./autocomplete/completionEngine.ts");
-
-function sinceSuggestion(suggestions: Awaited<ReturnType<typeof getCompletions>>) {
-  return suggestions.find((suggestion) => suggestion.displayText === "--since");
-}
-
-function suggestionNamed(
-  suggestions: Awaited<ReturnType<typeof getCompletions>>,
-  displayText: string,
-) {
-  return suggestions.find((suggestion) => suggestion.displayText === displayText);
-}
-
-test("zh-CN translates docker logs --since and falls back for unknown descriptions", async () => {
-  const suggestions = await getCompletions("docker logs --", {
-    locale: "zh-CN",
-    skipPathCompletion: true,
-    maxResults: 20,
-  });
-  const since = sinceSuggestion(suggestions);
-  const mystery = suggestions.find((suggestion) => suggestion.displayText === "--mystery");
-
-  assert.equal(since?.displayText, "--since");
-  assert.equal(since?.description, SINCE_ZH);
-  assert.equal(mystery?.description, UNTRANSLATED);
-  assert.equal(dockerSpec.subcommands?.[0].options?.[0].description, SINCE);
-});
-
-test("en locale leaves autocomplete descriptions unchanged", async () => {
-  const suggestions = await getCompletions("docker logs --", {
-    locale: "en",
-    skipPathCompletion: true,
-    maxResults: 20,
-  });
-  const since = sinceSuggestion(suggestions);
-
-  assert.equal(since?.displayText, "--since");
-  assert.equal(since?.description, SINCE);
-  assert.equal(dockerSpec.subcommands?.[0].options?.[0].description, SINCE);
-});
-
-test("zh-TW translates descriptions with Taiwan phrases and falls back when missing", async () => {
-  const suggestions = await getCompletions("docker logs --", {
-    locale: "zh-TW",
-    skipPathCompletion: true,
-    maxResults: 20,
-  });
-
-  assert.equal(sinceSuggestion(suggestions)?.description, SINCE_TW);
-  assert.equal(suggestionNamed(suggestions, "--default-sample")?.description, "（預設）");
-  assert.equal(suggestionNamed(suggestions, "--network-sample")?.description, "新增網路");
-  assert.equal(suggestionNamed(suggestions, "--process-sample")?.description, "ASCII 藝術行程樹");
-  assert.equal(suggestionNamed(suggestions, "--file-sample")?.description, FILE_REMOVED_TW);
-  assert.equal(suggestionNamed(suggestions, "--mystery")?.description, UNTRANSLATED);
-  assert.equal(dockerSpec.subcommands?.[0].options?.[0].description, SINCE);
-});
-
-test("locales other than zh-CN and zh-TW keep English descriptions", async () => {
-  for (const locale of ["ru", "es", "zh-Hant", undefined]) {
-    const suggestions = await getCompletions("docker logs --", {
-      locale,
-      skipPathCompletion: true,
-      maxResults: 20,
-    });
-    assert.equal(sinceSuggestion(suggestions)?.description, SINCE);
-    assert.equal(suggestionNamed(suggestions, "--process-sample")?.description, PROCESS_TREE);
-  }
-  assert.equal(dockerSpec.subcommands?.[0].options?.[0].description, SINCE);
-});
-
-test("zh-CN and zh-TW overlays do not leak across later lookups", async () => {
-  const traditional = await getCompletions("docker logs --", {
-    locale: "zh-TW",
-    skipPathCompletion: true,
-    maxResults: 20,
-  });
-  const simplified = await getCompletions("docker logs --", {
-    locale: "zh-CN",
-    skipPathCompletion: true,
-    maxResults: 20,
-  });
-  const english = await getCompletions("docker logs --", {
-    locale: "en",
-    skipPathCompletion: true,
-    maxResults: 20,
-  });
-
-  assert.equal(sinceSuggestion(traditional)?.description, SINCE_TW);
-  assert.equal(sinceSuggestion(simplified)?.description, SINCE_ZH);
-  assert.equal(sinceSuggestion(english)?.description, SINCE);
-  assert.equal(dockerSpec.subcommands?.[0].options?.[0].description, SINCE);
-});
-
-test("committed zh-TW dictionary keeps zh-CN keys and Taiwan terminology", () => {
-  const dictDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "autocomplete");
-  const simplified = JSON.parse(fs.readFileSync(path.join(dictDir, "descriptions.zh-CN.json"), "utf8"));
-  const traditional = JSON.parse(fs.readFileSync(path.join(dictDir, "descriptions.zh-TW.json"), "utf8"));
-
-  assert.deepEqual(Object.keys(traditional), Object.keys(simplified));
-  assert.equal(simplified[DEFAULT_LABEL], "（默认）");
-  assert.equal(traditional[DEFAULT_LABEL], "（預設）");
-  assert.equal(traditional[NETWORK], "新增網路");
-  assert.equal(traditional[PROCESS_TREE], "ASCII 藝術行程樹");
-  assert.equal(traditional[FILE_REMOVED], FILE_REMOVED_TW);
-  assert.equal(traditional[SINCE], SINCE_TW);
-  assert.equal(traditional[COMPRESSION_PROGRAM], "不根據歸檔字尾判斷壓縮程式");
-
-  let processCount = 0;
-  let tripCount = 0;
-  for (const key of Object.keys(simplified)) {
-    const source = simplified[key];
-    const converted = traditional[key];
-    assert.equal(typeof converted, "string");
-    assert.equal(converted.includes("进程"), false);
-    assert.equal(converted.includes("默认"), false);
-    assert.equal(converted.includes("网络"), false);
-    processCount += source.split("进程").length - 1;
-    tripCount += converted.split("行程").length - 1;
-  }
-  assert.ok(processCount > 0);
-  assert.equal(tripCount, processCount);
-});

components/terminal/restoredSessionGate.test.ts

@@ -389,23 +389,6 @@ test("disconnected connection dialog keeps an Enter-reconnect focus sink", () =>
   assert.match(source, /restoreTerminalFocusFromDisconnectedDialog\(\{[\s\S]*isFocusedPane/);
 });
 
-test("open compose bar does not globally gate enter reconnect", () => {
-  const viewSource = readFileSync(new URL("./TerminalView.tsx", import.meta.url), "utf8");
-  const gateIndex = viewSource.indexOf("export function shouldReconnectTerminalOnEnterKey");
-  const bodyEnd = viewSource.indexOf("export function shouldBlockTerminalReconnectForTarget", gateIndex);
-  const gateBody = viewSource.slice(gateIndex, bodyEnd);
-  assert.equal(gateBody.includes("!isComposeBarOpen"), false);
-  assert.match(viewSource, /setEnterReconnectEnabled\(sessionId, showEnterReconnectHint\)/);
-  assert.match(
-    readFileSync(new URL("./TerminalComposeBar.tsx", import.meta.url), "utf8"),
-    /requestEnterReconnect\(sessionId\)/,
-  );
-  assert.match(
-    readFileSync(new URL("./terminalHelpers.ts", import.meta.url), "utf8"),
-    /data-section='terminal-compose-bar'/,
-  );
-});
-
 test("open terminal search does not globally gate enter reconnect", () => {
   const viewSource = readFileSync(new URL("./TerminalView.tsx", import.meta.url), "utf8");
   const gateIndex = viewSource.indexOf("export function shouldReconnectTerminalOnEnterKey");
@@ -419,7 +402,7 @@ test("open terminal search does not globally gate enter reconnect", () => {
   );
 });
 
-test("terminal view receives the effective compose bar state", () => {
+test("terminal view receives the effective compose bar state for enter reconnect gating", () => {
   const source = readFileSync(new URL("../Terminal.tsx", import.meta.url), "utf8");
   const effectiveDefinitionIndex = source.indexOf("const effectiveComposeBarOpen =");
   const viewIndex = source.indexOf("<TerminalView ctx={{");
@@ -430,7 +413,7 @@ test("terminal view receives the effective compose bar state", () => {
   assert.notEqual(passEffectiveIndex, -1);
   assert.ok(
     effectiveDefinitionIndex < passEffectiveIndex,
-    "TerminalView must receive the visible workspace compose state",
+    "TerminalView must use the visible workspace compose state before deciding whether Enter can reconnect",
   );
 });