fix: cap unlimited terminal scrollback

* Enable sudo fallback for Docker panel

* Prefer sudo for Docker panel commands

* Use pending saved sudo password immediately

* Try plain Docker before sudo fallback

* Detect Docker before sudo fallback

* Add sudo fallback for Docker popup commands

* Harden Docker popup sudo fallback

.gitignore

@@ -8,6 +8,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
+
 dist
 dist-ssr
 *.local
@@ -41,6 +42,15 @@ coverage
 # Codex
 /.codex/
 
+# Qoder
+.qoder
+
+# Workbuddy
+.workbuddy
+
+# Codebuddy
+.codebuddy
+
 # AI / Superpowers generated docs (local only)
 /docs/superpowers/
 

App.tsx

@@ -28,6 +28,7 @@ import { resolveHostAuth } from './domain/sshAuth';
 import { isEncryptedCredentialPlaceholder } from './domain/credentials';
 import {
   mergeTerminalHostUpdate,
+  type TerminalHostUpdate,
 } from './domain/terminalAppearance';
 import { selectConnectionLogForTerminalDataCapture } from './domain/connectionLog';
 import { collectSessionIds } from './domain/workspace';
@@ -193,7 +194,6 @@ function App({ settings }: { settings: SettingsState }) {
   const keysRef = useRef(keys);
   keysRef.current = keys;
   const knownHostsRef = useRef(knownHosts);
-  knownHostsRef.current = knownHosts;
   // Bridge the gap while useVaultState hydrates: its async init awaits
   // hosts/keys/identities/proxyProfiles decryption before reading knownHosts,
   // so the state is briefly [] at boot even when localStorage has entries.
@@ -204,6 +204,7 @@ function App({ settings }: { settings: SettingsState }) {
     () => getEffectiveKnownHosts(knownHosts) ?? [],
     [knownHosts],
   );
+  knownHostsRef.current = effectiveKnownHosts;
 
   const {
     sessions,
@@ -215,6 +216,7 @@ function App({ settings }: { settings: SettingsState }) {
     sessionRenameValue,
     setSessionRenameValue,
     startSessionRename,
+    renameSessionInline,
     submitSessionRename,
     resetSessionRename,
     workspaceRenameTarget,
@@ -234,6 +236,7 @@ function App({ settings }: { settings: SettingsState }) {
     createWorkspaceWithHosts,
     createWorkspaceFromSessions,
     addSessionToWorkspace,
+    removeSessionFromWorkspace,
     appendHostToWorkspace,
     appendLocalTerminalToWorkspace,
     createWorkspaceFromTargets,
@@ -727,7 +730,7 @@ function App({ settings }: { settings: SettingsState }) {
   );
 
   // Shared hotkey action handler - used by both global handler and terminal callback
-  const executeHotkeyAction = useCallback((action: string, e: KeyboardEvent) => { return executeHotkeyActionImpl(() => ({ IS_DEV, MOVE_FOCUS_DEBOUNCE_MS, action, activeTabStore, addConnectionLogRef, closeSession, closeTabInFlightRef, closeWorkspace, collectSessionIds, confirmIfBusyLocalTerminal, createLocalTerminalWithCurrentShell, e, editorTabs, fromEditorTabId, handleOpenSettingsRef, handleRequestCloseEditorTabRef, isEditorTabId, lastMoveFocusTimeRef, moveFocusInWorkspace, orderedTabs, resolveCloseIntent, resolveSnippetsShortcutIntent, sessions, setActiveTabId, setAddToWorkspaceDialog, setIsQuickSwitcherOpen, setNavigateToSection, settings, splitSessionWithCurrentShell, systemInfoRef, toEditorTabId, toggleBroadcast, toggleScriptsSidePanelRef, toggleSidePanelRef, workspaces }), action, e); }, [orderedTabs, editorTabs, sessions, workspaces, setActiveTabId, closeSession, closeWorkspace, createLocalTerminalWithCurrentShell, splitSessionWithCurrentShell, moveFocusInWorkspace, toggleBroadcast, settings, confirmIfBusyLocalTerminal]);
+  const executeHotkeyAction = useCallback((action: string, e: KeyboardEvent) => { return executeHotkeyActionImpl(() => ({ IS_DEV, MOVE_FOCUS_DEBOUNCE_MS, action, activeTabStore, addConnectionLogRef, closeSession, closeTabInFlightRef, closeWorkspace, collectSessionIds, confirmIfBusyLocalTerminal, createLocalTerminalWithCurrentShell, e, editorTabs, fromEditorTabId, handleOpenSettingsRef, handleRequestCloseEditorTabRef, isEditorTabId, isQuickSwitcherOpen, lastMoveFocusTimeRef, moveFocusInWorkspace, orderedTabs, resolveCloseIntent, resolveSnippetsShortcutIntent, sessions, setActiveTabId, setAddToWorkspaceDialog, setIsQuickSwitcherOpen, setNavigateToSection, settings, splitSessionWithCurrentShell, systemInfoRef, toEditorTabId, toggleBroadcast, toggleScriptsSidePanelRef, toggleSidePanelRef, toggleWorkspaceViewMode, workspaces }), action, e); }, [orderedTabs, editorTabs, sessions, workspaces, isQuickSwitcherOpen, setActiveTabId, closeSession, closeWorkspace, createLocalTerminalWithCurrentShell, splitSessionWithCurrentShell, moveFocusInWorkspace, toggleBroadcast, toggleWorkspaceViewMode, settings, confirmIfBusyLocalTerminal]);
 
   const handleWindowCommandCloseRequest = useCallback(async () => {
     const openDialogs = Array.from(document.querySelectorAll<HTMLElement>('[role="dialog"][data-state="open"]'));
@@ -874,7 +877,7 @@ function App({ settings }: { settings: SettingsState }) {
     }
   }, [updateSessionStatus, updateHostLastConnected]);
 
-  const handleUpdateHostFromTerminal = useCallback((host: Host) => {
+  const handleUpdateHostFromTerminal = useCallback((host: TerminalHostUpdate) => {
     updateHosts(hosts.map((h) => (
       h.id === host.id ? mergeTerminalHostUpdate(h, host) : h
     )));
@@ -987,7 +990,7 @@ function App({ settings }: { settings: SettingsState }) {
         logViews={logViews}
         t={t}
       />
-      <AppView ctx={{ accentMode, addShellHistoryEntry, addSessionToWorkspace, addToWorkspaceDialog, appendHostToWorkspace, appendLocalTerminalToWorkspace, clearAndRemoveSource, clearAndRemoveSources, clearUnsavedConnectionLogs, clearSessionFontSizeOverride, closeLogView, closeSession, closeTabsBatch, copySessionWithCurrentShell, copySessionToNewWindowWithCurrentShell, closeWorkspace, connectionLogs, convertKnownHostToHost, createWorkspaceFromSessions, createWorkspaceFromTargets, createWorkspaceWithHosts, customAccent, customGroups, currentTerminalTheme, deleteConnectionLog, draggingSessionId, effectiveKnownHosts, editorTabs, editorWordWrap, emptyVaultConflict, followAppTerminalTheme, groupConfigs, handleAddKnownHost, handleConnectSerial, handleConnectToHost, handleCreateLocalTerminal, handleDeleteHost, handleEndSessionDrag, handleHostConnectWithProtocolCheck, handleHotkeyAction, handleKeyboardInteractiveCancel, handleKeyboardInteractiveSubmit, handleOpenQuickSwitcher, handleOpenSettings, handleRootContextMenu, handlePassphraseCancel, handlePassphraseSkip, handlePassphraseSubmit, handleProtocolSelect, handleRequestCloseEditorTabRef, handleSessionStatusChange, handleSyncNowManual, handleTerminalDataCapture, handleToggleTheme, handleUpdateHostFromTerminal, hostById, hosts, hotkeyScheme, identities, importOrReuseKey, isBroadcastEnabled, isCreateWorkspaceOpen, isMacClient, isQuickSwitcherOpen, keyBindings, keyboardInteractiveQueue, keys, logViews, managedSources, navigateToSection, openLogView, orderedTabsWithEditors, orphanSessions, passphraseQueue, protocolSelectHost, proxyProfiles, quickResults, quickSearch, reorderWorkTabs, reorderWorkspaceSessions, resetSessionRename, resetWorkspaceRename, resolveEmptyVaultConflict, resolvedTheme, runSnippet: handleRunSnippet, sessionLogsDir, sessionLogsEnabled, sessionLogsFormat, sessionLogsTimestampsEnabled, sessionRenameTarget, sessionRenameValue, sessions, setActiveTabId, setAddToWorkspaceDialog, setDraggingSessionId, setEditorWordWrap, setIsCreateWorkspaceOpen, setIsQuickSwitcherOpen, setNavigateToSection, setProtocolSelectHost, setQuickSearch, setSessionRenameValue, setTerminalFontFamilyId, setTerminalFontSize, setTerminalThemeId, setWorkspaceFocusedSession, setWorkspaceRenameValue, settings, sftpAutoOpenSidebar, sftpFollowTerminalCwd, setSftpFollowTerminalCwd, sftpAutoSync, sftpDefaultViewMode, sftpDoubleClickBehavior, sftpShowHiddenFiles, sftpUseCompressedUpload, shellHistory, snippetPackages, snippets, splitSessionWithCurrentShell, sshDebugLogsEnabled: settings.sshDebugLogsEnabled, startSessionRename, startWorkspaceRename, submitSessionRename, submitWorkspaceRename, t, terminalFontFamilyId, terminalFontSize, terminalSettings, terminalThemeId, toggleBroadcast, toggleConnectionLogSaved, toggleScriptsSidePanelRef, toggleSidePanelRef, toggleWorkspaceViewMode, unmanageSource, updateConnectionLog, updateCustomGroups, updateGroupConfigs, updateHostDistro, updateHosts, updateIdentities, updateKeys, updateKnownHosts, updateManagedSources, updateProxyProfiles, updateSnippetPackages, updateSnippets, updateSplitSizes, updateSessionFontSize, updateTerminalSetting, workspaceRenameTarget, workspaceRenameValue, workspaces, VaultViewContainer, SftpViewMount, TerminalLayerMount, LogViewWrapper }} />
+      <AppView ctx={{ accentMode, addShellHistoryEntry, addSessionToWorkspace, addToWorkspaceDialog, appendHostToWorkspace, appendLocalTerminalToWorkspace, clearAndRemoveSource, clearAndRemoveSources, clearUnsavedConnectionLogs, clearSessionFontSizeOverride, closeLogView, closeSession, closeTabsBatch, copySessionWithCurrentShell, copySessionToNewWindowWithCurrentShell, closeWorkspace, connectionLogs, convertKnownHostToHost, createWorkspaceFromSessions, createWorkspaceFromTargets, createWorkspaceWithHosts, customAccent, customGroups, currentTerminalTheme, deleteConnectionLog, draggingSessionId, effectiveKnownHosts, editorTabs, editorWordWrap, emptyVaultConflict, followAppTerminalTheme, groupConfigs, handleAddKnownHost, handleConnectSerial, handleConnectToHost, handleCreateLocalTerminal, handleDeleteHost, handleEndSessionDrag, handleHostConnectWithProtocolCheck, handleHotkeyAction, handleKeyboardInteractiveCancel, handleKeyboardInteractiveSubmit, handleOpenQuickSwitcher, handleOpenSettings, handleRootContextMenu, handlePassphraseCancel, handlePassphraseSkip, handlePassphraseSubmit, handleProtocolSelect, handleRequestCloseEditorTabRef, handleSessionStatusChange, handleSyncNowManual, handleTerminalDataCapture, handleToggleTheme, handleUpdateHostFromTerminal, hostById, hosts, hotkeyScheme, identities, importOrReuseKey, isBroadcastEnabled, isCreateWorkspaceOpen, isMacClient, isQuickSwitcherOpen, keyBindings, keyboardInteractiveQueue, keys, logViews, managedSources, navigateToSection, openLogView, orderedTabsWithEditors, orphanSessions, passphraseQueue, protocolSelectHost, proxyProfiles, quickResults, quickSearch, removeSessionFromWorkspace, reorderWorkTabs, reorderWorkspaceSessions, resetSessionRename, resetWorkspaceRename, resolveEmptyVaultConflict, resolvedTheme, runSnippet: handleRunSnippet, sessionLogsDir, sessionLogsEnabled, sessionLogsFormat, sessionLogsTimestampsEnabled, sessionRenameTarget, sessionRenameValue, sessions, setActiveTabId, setAddToWorkspaceDialog, setDraggingSessionId, setEditorWordWrap, setIsCreateWorkspaceOpen, setIsQuickSwitcherOpen, setNavigateToSection, setProtocolSelectHost, setQuickSearch, setSessionRenameValue, setTerminalFontFamilyId, setTerminalFontSize, setTerminalThemeId, setWorkspaceFocusedSession, setWorkspaceRenameValue, settings, sftpAutoOpenSidebar, sftpFollowTerminalCwd, setSftpFollowTerminalCwd, sftpAutoSync, sftpDefaultViewMode, sftpDoubleClickBehavior, sftpShowHiddenFiles, sftpUseCompressedUpload, shellHistory, snippetPackages, snippets, splitSessionWithCurrentShell, sshDebugLogsEnabled: settings.sshDebugLogsEnabled, startSessionRename, renameSessionInline, startWorkspaceRename, submitSessionRename, submitWorkspaceRename, t, terminalFontFamilyId, terminalFontSize, terminalSettings, terminalThemeId, themeById, toggleBroadcast, toggleConnectionLogSaved, toggleScriptsSidePanelRef, toggleSidePanelRef, toggleWorkspaceViewMode, unmanageSource, updateConnectionLog, updateCustomGroups, updateGroupConfigs, updateHostDistro, updateHosts, updateIdentities, updateKeys, updateKnownHosts, updateManagedSources, updateProxyProfiles, updateSnippetPackages, updateSnippets, updateSplitSizes, updateSessionFontSize, updateTerminalSetting, workspaceRenameTarget, workspaceRenameValue, workspaces, VaultViewContainer, SftpViewMount, TerminalLayerMount, LogViewWrapper }} />
     </>
   );
 }

application/AppHandlers.globalHotkeys.test.ts

@@ -1,10 +1,19 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 
-import { handleGlobalHotkeyKeyDownImpl } from './app/AppHandlers.ts';
+import { executeHotkeyActionImpl, getLogHostVisualSnapshot, handleGlobalHotkeyKeyDownImpl } from './app/AppHandlers.ts';
 import { matchesKeyBinding } from '../domain/models.ts';
 import { DEFAULT_KEY_BINDINGS } from '../domain/models/keyBindings.ts';
 
+class FakeInputHTMLElement {
+  tagName = 'INPUT';
+  isContentEditable = false;
+
+  closest(): FakeInputHTMLElement | null {
+    return null;
+  }
+}
+
 class FakeHTMLElement {
   tagName = 'TEXTAREA';
   isContentEditable = false;
@@ -68,3 +77,119 @@ test('global hotkey handler lets terminal font size shortcuts reach xterm', () =
   assert.equal(prevented, false);
   assert.equal(stopped, false);
 });
+
+test('global hotkey handler routes quick switch through focused search inputs', () => {
+  const target = new FakeInputHTMLElement();
+  const handledActions: string[] = [];
+  const event = {
+    key: 'j',
+    code: 'KeyJ',
+    ctrlKey: true,
+    metaKey: false,
+    altKey: false,
+    shiftKey: false,
+    target,
+    composedPath: () => [target],
+    preventDefault: () => {},
+    stopPropagation: () => {},
+  } as unknown as KeyboardEvent;
+
+  handleGlobalHotkeyKeyDownImpl(
+    () => ({
+      HOTKEY_DEBUG: false,
+      closeTabKeyStr: 'Ctrl + W',
+      executeHotkeyAction: (action: string) => {
+        handledActions.push(action);
+      },
+      hotkeyScheme: 'pc',
+      keyBindings: DEFAULT_KEY_BINDINGS,
+      matchesKeyBinding,
+    }),
+    event,
+  );
+
+  assert.deepEqual(handledActions, ['quickSwitch']);
+});
+
+test('quick switch hotkey toggles the quick switcher open state', () => {
+  let isQuickSwitcherOpen = false;
+  const setIsQuickSwitcherOpen = (next: boolean) => {
+    isQuickSwitcherOpen = next;
+  };
+  const noop = () => {};
+  const baseCtx = {
+    IS_DEV: false,
+    MOVE_FOCUS_DEBOUNCE_MS: 0,
+    activeTabStore: { getActiveTabId: () => 'vault' },
+    addConnectionLogRef: { current: noop },
+    closeSession: noop,
+    closeTabInFlightRef: { current: false },
+    closeWorkspace: noop,
+    collectSessionIds: () => [],
+    confirmIfBusyLocalTerminal: async () => true,
+    createLocalTerminalWithCurrentShell: noop,
+    editorTabs: [],
+    fromEditorTabId: () => null,
+    handleOpenSettingsRef: { current: noop },
+    handleRequestCloseEditorTabRef: { current: noop },
+    isEditorTabId: () => false,
+    isQuickSwitcherOpen,
+    lastMoveFocusTimeRef: { current: 0 },
+    moveFocusInWorkspace: noop,
+    orderedTabs: [],
+    resolveCloseIntent: () => ({ kind: 'noop' }),
+    resolveSnippetsShortcutIntent: () => ({ kind: 'noop' }),
+    sessions: [],
+    setActiveTabId: noop,
+    setAddToWorkspaceDialog: noop,
+    setIsQuickSwitcherOpen,
+    setNavigateToSection: noop,
+    settings: { showSftpTab: true, shellOnlyTabNumberShortcuts: false },
+    splitSessionWithCurrentShell: noop,
+    systemInfoRef: { current: { username: 'user', hostname: 'host' } },
+    toEditorTabId: (id: string) => `editor:${id}`,
+    toggleBroadcast: noop,
+    toggleScriptsSidePanelRef: { current: noop },
+    toggleSidePanelRef: { current: noop },
+    workspaces: [],
+  };
+
+  const event = {
+    key: 'j',
+    code: 'KeyJ',
+    ctrlKey: true,
+    metaKey: false,
+    altKey: false,
+    shiftKey: false,
+  } as KeyboardEvent;
+
+  executeHotkeyActionImpl(() => baseCtx, 'quickSwitch', event);
+  assert.equal(isQuickSwitcherOpen, true);
+
+  executeHotkeyActionImpl(() => ({ ...baseCtx, isQuickSwitcherOpen: true }), 'quickSwitch', event);
+  assert.equal(isQuickSwitcherOpen, false);
+});
+
+test('connection log host snapshot includes custom host icon fields', () => {
+  assert.deepEqual(
+    getLogHostVisualSnapshot({
+      id: 'host-1',
+      label: 'Database',
+      hostname: 'db.example.com',
+      username: 'root',
+      tags: [],
+      os: 'linux',
+      distro: 'ubuntu',
+      iconMode: 'custom',
+      iconId: 'database',
+      iconColor: 'blue',
+    }),
+    {
+      hostOs: 'linux',
+      hostDistro: 'ubuntu',
+      hostIconMode: 'custom',
+      hostIconId: 'database',
+      hostIconColor: 'blue',
+    },
+  );
+});

application/app/AppHandlers.ts

@@ -3,16 +3,23 @@ import type React from 'react';
 import type { Host, HostProtocol } from '../../types';
 import type { PassphraseRequest } from '../../components/PassphraseModal';
 import { getEffectiveHostDistro } from '../../domain/host';
+import { sanitizeHostIconFields } from '../../domain/hostIcon';
 import { getTerminalPassthroughActions } from '../state/useGlobalHotkeys';
 import { buildNumberShortcutTabTargets } from './tabShortcutTargets';
 
 type AppContextGetter = () => Record<string, any>;
 const TERMINAL_PASSTHROUGH_ACTIONS = getTerminalPassthroughActions();
 
-const getLogHostVisualSnapshot = (host: Host) => ({
-  hostOs: host.os,
-  hostDistro: getEffectiveHostDistro(host) || undefined,
-});
+export const getLogHostVisualSnapshot = (host: Host) => {
+  const icon = sanitizeHostIconFields(host);
+  return {
+    hostOs: host.os,
+    hostDistro: getEffectiveHostDistro(host) || undefined,
+    hostIconMode: icon.iconMode,
+    hostIconId: icon.iconId,
+    hostIconColor: icon.iconColor,
+  };
+};
 
 export function handleTrayJumpToSessionImpl(getCtx: AppContextGetter, sessionId: string) {
   const { sessions, setActiveTabId, setWorkspaceFocusedSession } = getCtx();
@@ -132,7 +139,11 @@ export function handleGlobalHotkeyKeyDownImpl(getCtx: AppContextGetter, e: Keybo
       target instanceof HTMLElement &&
       !!target.closest?.(".xterm, .xterm-helper-textarea, .xterm-screen, .xterm-viewport");
 
-    if ((isFormElement || isMonacoElement) && !isXtermInput && e.key !== 'Escape') {
+    const quickSwitchBinding = keyBindings.find((binding) => binding.action === 'quickSwitch');
+    const quickSwitchKeyStr = quickSwitchBinding ? (isMac ? quickSwitchBinding.mac : quickSwitchBinding.pc) : null;
+    const isQuickSwitchHotkey = quickSwitchKeyStr ? matchesKeyBinding(e, quickSwitchKeyStr, isMac) : false;
+
+    if ((isFormElement || isMonacoElement) && !isXtermInput && e.key !== 'Escape' && !isQuickSwitchHotkey) {
       return;
     }
 
@@ -436,7 +447,7 @@ export async function closeTabsBatchImpl(getCtx: AppContextGetter, targetIds: st
 }
 
 export function executeHotkeyActionImpl(getCtx: AppContextGetter, action: string, e: KeyboardEvent) {
-  const { IS_DEV, MOVE_FOCUS_DEBOUNCE_MS, activeTabStore, addConnectionLogRef, closeSession, closeTabInFlightRef, closeWorkspace, collectSessionIds, confirmIfBusyLocalTerminal, createLocalTerminalWithCurrentShell, editorTabs, fromEditorTabId, handleOpenSettingsRef, handleRequestCloseEditorTabRef, isEditorTabId, lastMoveFocusTimeRef, moveFocusInWorkspace, orderedTabs, resolveCloseIntent, resolveSnippetsShortcutIntent, sessions, setActiveTabId, setAddToWorkspaceDialog, setIsQuickSwitcherOpen, setNavigateToSection, settings, splitSessionWithCurrentShell, systemInfoRef, toEditorTabId, toggleBroadcast, toggleScriptsSidePanelRef, toggleSidePanelRef, workspaces } = getCtx();
+  const { IS_DEV, MOVE_FOCUS_DEBOUNCE_MS, activeTabStore, addConnectionLogRef, closeSession, closeTabInFlightRef, closeWorkspace, collectSessionIds, confirmIfBusyLocalTerminal, createLocalTerminalWithCurrentShell, editorTabs, fromEditorTabId, handleOpenSettingsRef, handleRequestCloseEditorTabRef, isEditorTabId, isQuickSwitcherOpen, lastMoveFocusTimeRef, moveFocusInWorkspace, orderedTabs, resolveCloseIntent, resolveSnippetsShortcutIntent, sessions, setActiveTabId, setAddToWorkspaceDialog, setIsQuickSwitcherOpen, setNavigateToSection, settings, splitSessionWithCurrentShell, systemInfoRef, toEditorTabId, toggleBroadcast, toggleScriptsSidePanelRef, toggleSidePanelRef, toggleWorkspaceViewMode, workspaces } = getCtx();
 {
     // Build complete tab list: vault + (sftp when visible) + sessions/workspaces + editor tabs.
     // Hiding the SFTP tab must also remove it from keyboard cycling so nextTab
@@ -535,6 +546,40 @@ export function executeHotkeyActionImpl(getCtx: AppContextGetter, action: string
 
         break;
       }
+      case 'closeSession': {
+        const currentId = activeTabStore.getActiveTabId();
+        if (!currentId || currentId === 'vault' || currentId === 'sftp') break;
+        if (closeTabInFlightRef.current) break;
+
+        const session = sessions.find((s) => s.id === currentId) ?? null;
+        const workspace = workspaces.find((w) => w.id === currentId) ?? null;
+
+        closeTabInFlightRef.current = true;
+        (async () => {
+          try {
+            // If active tab is a workspace, close the focused session (pane)
+            if (workspace) {
+              // Validate focusedSessionId is still valid — it can become stale
+              // if the previously focused session was already closed
+              const aliveIds = collectSessionIds(workspace.root);
+              const focusedId = aliveIds.includes(workspace.focusedSessionId)
+                ? workspace.focusedSessionId
+                : aliveIds[0];
+              if (focusedId) {
+                const ok = await confirmIfBusyLocalTerminal([focusedId]);
+                if (ok) closeSession(focusedId);
+              }
+            } else if (session) {
+              // Standalone session tab — close the session
+              const ok = await confirmIfBusyLocalTerminal([session.id]);
+              if (ok) closeSession(session.id);
+            }
+          } finally {
+            closeTabInFlightRef.current = false;
+          }
+        })();
+        break;
+      }
       case 'newTab':
       case 'openLocal':
         // Add connection log for local terminal
@@ -560,6 +605,8 @@ export function executeHotkeyActionImpl(getCtx: AppContextGetter, action: string
         }
         break;
       case 'quickSwitch':
+        setIsQuickSwitcherOpen(!isQuickSwitcherOpen);
+        break;
       case 'commandPalette':
         setIsQuickSwitcherOpen(true);
         break;
@@ -638,6 +685,15 @@ export function executeHotkeyActionImpl(getCtx: AppContextGetter, action: string
         }
         break;
       }
+      case 'togglePaneZoom': {
+        // Toggle workspace between split and focus (zoom) mode
+        const currentId = activeTabStore.getActiveTabId();
+        const activeWs = workspaces.find(w => w.id === currentId);
+        if (activeWs) {
+          toggleWorkspaceViewMode(activeWs.id);
+        }
+        break;
+      }
       case 'moveFocus': {
         // Debounce to prevent double-triggering when focus switches between terminals
         const now = Date.now();

application/app/AppHostTreeLayer.test.ts

@@ -14,7 +14,6 @@ Object.defineProperty(globalThis, 'localStorage', {
 
 const {
   getAppHostTreeLayerStyle,
-  shouldAutoOpenHostTreeOnSurfaceChange,
 } = await import('./AppHostTreeLayer');
 const hostTreeLayerSource = readFileSync(new URL('./AppHostTreeLayer.tsx', import.meta.url), 'utf8');
 
@@ -34,28 +33,9 @@ test('shared host tree layer is hidden behind root pages', () => {
   });
 });
 
-test('shared host tree auto-opens when entering a work tab surface', () => {
-  assert.equal(shouldAutoOpenHostTreeOnSurfaceChange({
-    enabled: true,
-    previousSurfaceVisible: false,
-    surfaceVisible: true,
-  }), true);
-});
-
-test('shared host tree does not force reopen while already on work tab surfaces', () => {
-  assert.equal(shouldAutoOpenHostTreeOnSurfaceChange({
-    enabled: true,
-    previousSurfaceVisible: true,
-    surfaceVisible: true,
-  }), false);
-});
-
-test('shared host tree does not auto-open when disabled', () => {
-  assert.equal(shouldAutoOpenHostTreeOnSurfaceChange({
-    enabled: false,
-    previousSurfaceVisible: false,
-    surfaceVisible: true,
-  }), false);
+test('shared host tree does not force open when entering a work tab surface', () => {
+  assert.doesNotMatch(hostTreeLayerSource, /setIsOpen\(true\)/);
+  assert.doesNotMatch(hostTreeLayerSource, /shouldAutoOpenHostTreeOnSurfaceChange/);
 });
 
 test('host tree layer hides immediately when leaving work tab surfaces', () => {

application/app/AppHostTreeLayer.tsx

@@ -1,27 +1,32 @@
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { useMemo } from 'react';
 
 import { useActiveTabId } from '../state/activeTabStore';
 import type { EditorTab } from '../state/editorTabStore';
 import type { LogView } from '../state/logViewState';
-import { scheduleAfterInstantThemeSwitch } from '../state/useActiveChromeTheme';
-import { terminalHostTreeStore } from '../state/terminalHostTreeStore';
 import { TerminalHostTreeSidebar } from '../../components/terminalLayer/TerminalHostTreeSidebar';
-import type { Host, TerminalSession, TerminalTheme, Workspace } from '../../types';
+import type { GroupConfig, Host, TerminalSession, TerminalTheme, Workspace } from '../../types';
 import {
   isHostTreeWorkTabSurface,
   resolveWorkTabActiveHostId,
+  resolveWorkTabHostTreeTheme,
 } from './workTabSurface';
 
 interface AppHostTreeLayerProps {
   enabled: boolean;
   hosts: Host[];
   customGroups: string[];
+  groupConfigs: GroupConfig[];
   sessions: TerminalSession[];
   workspaces: Workspace[];
   editorTabs: readonly EditorTab[];
   logViews: readonly LogView[];
   orderedTabs: readonly string[];
-  resolvedPreviewTheme: TerminalTheme;
+  accentMode: 'theme' | 'custom';
+  currentTerminalTheme: TerminalTheme;
+  customAccent: string;
+  followAppTerminalTheme: boolean;
+  hostById: ReadonlyMap<string, Host>;
+  themeById: ReadonlyMap<string, TerminalTheme>;
   onConnect: (host: Host) => void;
   onCreateLocalTerminal?: () => void;
 }
@@ -34,34 +39,26 @@ export function getAppHostTreeLayerStyle(surfaceVisible: boolean): React.CSSProp
   };
 }
 
-export function shouldAutoOpenHostTreeOnSurfaceChange({
-  enabled,
-  previousSurfaceVisible,
-  surfaceVisible,
-}: {
-  enabled: boolean;
-  previousSurfaceVisible: boolean;
-  surfaceVisible: boolean;
-}): boolean {
-  return enabled && surfaceVisible && !previousSurfaceVisible;
-}
-
 export const AppHostTreeLayer: React.FC<AppHostTreeLayerProps> = ({
   enabled,
   hosts,
   customGroups,
+  groupConfigs,
   sessions,
   workspaces,
   editorTabs,
   logViews,
   orderedTabs,
-  resolvedPreviewTheme,
+  accentMode,
+  currentTerminalTheme,
+  customAccent,
+  followAppTerminalTheme,
+  hostById,
+  themeById,
   onConnect,
   onCreateLocalTerminal,
 }) => {
   const activeTabId = useActiveTabId();
-  const previousSurfaceVisibleRef = useRef(false);
-  const cancelAutoOpenRef = useRef<(() => void) | null>(null);
   const sessionIds = useMemo(() => new Set(sessions.map((session) => session.id)), [sessions]);
   const workspaceIds = useMemo(() => new Set(workspaces.map((workspace) => workspace.id)), [workspaces]);
   const logViewIds = useMemo(() => new Set(logViews.map((logView) => logView.id)), [logViews]);
@@ -73,28 +70,6 @@ export const AppHostTreeLayer: React.FC<AppHostTreeLayerProps> = ({
     sessionIds,
     workspaceIds,
   });
-  useEffect(() => {
-    cancelAutoOpenRef.current?.();
-    cancelAutoOpenRef.current = null;
-
-    const previousSurfaceVisible = previousSurfaceVisibleRef.current;
-    previousSurfaceVisibleRef.current = surfaceVisible;
-    if (shouldAutoOpenHostTreeOnSurfaceChange({
-      enabled,
-      previousSurfaceVisible,
-      surfaceVisible,
-    })) {
-      cancelAutoOpenRef.current = scheduleAfterInstantThemeSwitch(() => {
-        cancelAutoOpenRef.current = null;
-        terminalHostTreeStore.setIsOpen(true);
-      });
-    }
-
-    return () => {
-      cancelAutoOpenRef.current?.();
-      cancelAutoOpenRef.current = null;
-    };
-  }, [enabled, surfaceVisible]);
 
   const activeHostId = useMemo(() => resolveWorkTabActiveHostId({
     activeTabId,
@@ -103,6 +78,24 @@ export const AppHostTreeLayer: React.FC<AppHostTreeLayerProps> = ({
     workspaces,
   }), [activeTabId, editorTabs, sessions, workspaces]);
 
+  const hostTreeTheme = useMemo(() => resolveWorkTabHostTreeTheme({
+    activeHostId,
+    accentMode,
+    currentTerminalTheme,
+    customAccent,
+    followAppTerminalTheme,
+    hostById,
+    themeById,
+  }), [
+    activeHostId,
+    accentMode,
+    currentTerminalTheme,
+    customAccent,
+    followAppTerminalTheme,
+    hostById,
+    themeById,
+  ]);
+
   return (
     <div
       className="absolute left-0 top-0 bottom-0 flex min-h-0"
@@ -114,7 +107,8 @@ export const AppHostTreeLayer: React.FC<AppHostTreeLayerProps> = ({
         surfaceVisible={surfaceVisible}
         hosts={hosts}
         customGroups={customGroups}
-        resolvedPreviewTheme={resolvedPreviewTheme}
+        groupConfigs={groupConfigs}
+        resolvedPreviewTheme={hostTreeTheme}
         activeHostId={activeHostId}
         onConnect={onConnect}
         onCreateLocalTerminal={onCreateLocalTerminal}

application/app/AppView.tsx

@@ -42,13 +42,13 @@ export function AppView({ ctx }: { ctx: AppViewContext }) {
     handleRequestCloseEditorTabRef, handleSessionStatusChange, handleSyncNowManual, handleTerminalDataCapture, handleToggleTheme, handleUpdateHostFromTerminal,
     hostById, hosts, hotkeyScheme, identities, importOrReuseKey, isBroadcastEnabled, isCreateWorkspaceOpen, isMacClient, isQuickSwitcherOpen,
     keyBindings, keyboardInteractiveQueue, keys, logViews, managedSources, navigateToSection, openLogView, orderedTabsWithEditors, orphanSessions,
-    passphraseQueue, protocolSelectHost, proxyProfiles, quickResults, quickSearch, reorderWorkTabs, reorderWorkspaceSessions, resetSessionRename,
+    passphraseQueue, protocolSelectHost, proxyProfiles, quickResults, quickSearch, removeSessionFromWorkspace, reorderWorkTabs, reorderWorkspaceSessions, resetSessionRename,
     resetWorkspaceRename, resolveEmptyVaultConflict, resolvedTheme, runSnippet, sessionLogsDir, sessionLogsEnabled, sessionLogsFormat, sessionLogsTimestampsEnabled, sessionRenameTarget, sshDebugLogsEnabled,
     sessionRenameValue, sessions, setActiveTabId, setAddToWorkspaceDialog, setDraggingSessionId, setEditorWordWrap, setIsCreateWorkspaceOpen, setIsQuickSwitcherOpen,
     setNavigateToSection, setProtocolSelectHost, setQuickSearch, setSessionRenameValue, setTerminalFontFamilyId, setTerminalFontSize, setTerminalThemeId, updateSessionFontSize, clearSessionFontSizeOverride,
     setWorkspaceFocusedSession, setWorkspaceRenameValue, settings, sftpAutoOpenSidebar, sftpFollowTerminalCwd, setSftpFollowTerminalCwd, sftpAutoSync, sftpDefaultViewMode, sftpDoubleClickBehavior,
     sftpShowHiddenFiles, sftpUseCompressedUpload, shellHistory, snippetPackages, snippets, splitSessionWithCurrentShell, startSessionRename,
-    startWorkspaceRename, submitSessionRename, submitWorkspaceRename, t, terminalFontFamilyId, terminalFontSize, terminalSettings, terminalThemeId,
+    startWorkspaceRename, submitSessionRename, submitWorkspaceRename, t, terminalFontFamilyId, terminalFontSize, terminalSettings, terminalThemeId, themeById,
     toggleBroadcast, toggleConnectionLogSaved, toggleScriptsSidePanelRef, toggleSidePanelRef, toggleWorkspaceViewMode, unmanageSource, updateConnectionLog,
     updateCustomGroups, updateGroupConfigs, updateHostDistro, updateHosts, updateIdentities, updateKeys, updateKnownHosts, updateManagedSources,
     updateProxyProfiles, updateSnippetPackages, updateSnippets, updateSplitSizes, updateTerminalSetting, workspaceRenameTarget, workspaceRenameValue, workspaces,
@@ -134,6 +134,7 @@ export function AppView({ ctx }: { ctx: AppViewContext }) {
         onStartSessionDrag={setDraggingSessionId}
         onEndSessionDrag={handleEndSessionDrag}
         onReorderTabs={reorderWorkTabs}
+        onRemoveSessionFromWorkspace={removeSessionFromWorkspace}
         showSftpTab={settings.showSftpTab}
         showHostTreeSidebar={settings.showHostTreeSidebar}
         editorTabs={editorTabs}
@@ -146,12 +147,18 @@ export function AppView({ ctx }: { ctx: AppViewContext }) {
           enabled={settings.showHostTreeSidebar}
           hosts={hosts}
           customGroups={customGroups}
+          groupConfigs={groupConfigs}
           sessions={sessions}
           workspaces={workspaces}
           editorTabs={editorTabs}
           logViews={logViews}
           orderedTabs={orderedTabsWithEditors}
-          resolvedPreviewTheme={currentTerminalTheme}
+          accentMode={accentMode}
+          currentTerminalTheme={currentTerminalTheme}
+          customAccent={customAccent}
+          followAppTerminalTheme={followAppTerminalTheme}
+          hostById={hostById}
+          themeById={themeById}
           onConnect={handleConnectToHost}
           onCreateLocalTerminal={handleCreateLocalTerminal}
         />
@@ -213,9 +220,11 @@ export function AppView({ ctx }: { ctx: AppViewContext }) {
           hosts={hosts}
           keys={keys}
           identities={identities}
+          knownHosts={effectiveKnownHosts}
           proxyProfiles={proxyProfiles}
           groupConfigs={groupConfigs}
           updateHosts={updateHosts}
+          onAddKnownHost={handleAddKnownHost}
           sftpDefaultViewMode={sftpDefaultViewMode}
           sftpDoubleClickBehavior={sftpDoubleClickBehavior}
           sftpAutoSync={sftpAutoSync}
@@ -249,6 +258,7 @@ export function AppView({ ctx }: { ctx: AppViewContext }) {
           terminalFontFamilyId={terminalFontFamilyId}
           fontSize={terminalFontSize}
           hotkeyScheme={hotkeyScheme}
+          disableTerminalFontZoom={settings.disableTerminalFontZoom}
           keyBindings={keyBindings}
           onHotkeyAction={handleHotkeyAction}
           onUpdateTerminalThemeId={setTerminalThemeId}
@@ -265,6 +275,7 @@ export function AppView({ ctx }: { ctx: AppViewContext }) {
           onCommandExecuted={(command, hostId, hostLabel, sessionId) => {
             addShellHistoryEntry({ command, hostId, hostLabel, sessionId });
           }}
+          shellHistory={shellHistory}
           onTerminalDataCapture={handleTerminalDataCapture}
           onCreateWorkspaceFromSessions={createWorkspaceFromSessions}
           onAddSessionToWorkspace={addSessionToWorkspace}
@@ -276,12 +287,17 @@ export function AppView({ ctx }: { ctx: AppViewContext }) {
           onToggleWorkspaceViewMode={toggleWorkspaceViewMode}
           onSetWorkspaceFocusedSession={setWorkspaceFocusedSession}
           onReorderWorkspaceSessions={reorderWorkspaceSessions}
+          onReorderTabs={reorderWorkTabs}
+          onCopySession={copySessionWithCurrentShell}
+          onCopySessionToNewWindow={copySessionToNewWindowWithCurrentShell}
           onSplitSession={splitSessionWithCurrentShell}
           onConnectToHost={handleConnectToHost}
           onCreateLocalTerminal={handleCreateLocalTerminal}
           isBroadcastEnabled={isBroadcastEnabled}
           onToggleBroadcast={toggleBroadcast}
           updateHosts={updateHosts}
+          updateSnippets={updateSnippets}
+          updateSnippetPackages={updateSnippetPackages}
           sftpDefaultViewMode={sftpDefaultViewMode}
           sftpDoubleClickBehavior={sftpDoubleClickBehavior}
           sftpAutoSync={sftpAutoSync}
@@ -300,6 +316,9 @@ export function AppView({ ctx }: { ctx: AppViewContext }) {
           showHostTreeSidebar={settings.showHostTreeSidebar}
           toggleScriptsSidePanelRef={toggleScriptsSidePanelRef}
           toggleSidePanelRef={toggleSidePanelRef}
+          onStartSessionRename={startSessionRename}
+          onSubmitSessionRename={submitSessionRename}
+          onRemoveSessionFromWorkspace={removeSessionFromWorkspace}
         />
 
         {/* Log Views - readonly terminal replays */}

application/app/activeChromeTheme.test.ts

@@ -39,7 +39,7 @@ const baseInput = {
   workspaceById: new Map<string, Workspace>(),
 };
 
-test("editor tabs use the theme from their owning host", () => {
+test("editor tabs use the owning host terminal theme when follow-app terminal theme is off", () => {
   const editorTab = {
     id: "editor-1",
     hostId: "host-1",
@@ -58,6 +58,26 @@ test("editor tabs use the theme from their owning host", () => {
   assert.equal(resolved?.id, hostTheme.id);
 });
 
+test("editor tabs use the followed terminal theme when follow-app terminal theme is on", () => {
+  const editorTab = {
+    id: "editor-1",
+    hostId: "host-1",
+    sessionId: "sftp-1",
+  };
+
+  const resolved = resolveActiveChromeTheme({
+    ...baseInput,
+    activeTabId: toEditorTabId(editorTab.id),
+    editorTabs: [editorTab as unknown as EditorTab],
+    followAppTerminalTheme: true,
+    hostById: new Map([
+      ["host-1", { id: "host-1", theme: hostTheme.id } as unknown as Host],
+    ]),
+  });
+
+  assert.equal(resolved?.id, currentTheme.id);
+});
+
 test("log tabs use the saved log theme when available", () => {
   const resolved = resolveActiveChromeTheme({
     ...baseInput,

application/app/activeChromeTheme.ts

@@ -54,22 +54,21 @@ export function resolveActiveChromeTheme({
 }: ResolveActiveChromeThemeInput): TerminalTheme | null {
   if (activeTabId === "vault" || activeTabId === "sftp") return null;
 
-  const resolveSessionTheme = (session: TerminalSession): TerminalTheme => {
+  const resolveHostTheme = (hostId: string): TerminalTheme => {
     if (followAppTerminalTheme) return currentTerminalTheme;
-    const host = hostById.get(session.hostId) ?? null;
+    const host = hostById.get(hostId) ?? null;
     const themeId = resolveHostTerminalThemeId(host, currentTerminalTheme.id);
     const baseTheme = themeById.get(themeId) ?? currentTerminalTheme;
     return applyCustomAccentToTerminalTheme(baseTheme, accentMode, customAccent);
   };
 
+  const resolveSessionTheme = (session: TerminalSession): TerminalTheme => resolveHostTheme(session.hostId);
+
   if (isEditorTabId(activeTabId)) {
     const editorTabId = fromEditorTabId(activeTabId);
     const editorTab = editorTabs.find((tab) => tab.id === editorTabId);
     if (!editorTab) return null;
-    const host = hostById.get(editorTab.hostId) ?? null;
-    const themeId = resolveHostTerminalThemeId(host, currentTerminalTheme.id);
-    const baseTheme = themeById.get(themeId) ?? currentTerminalTheme;
-    return applyCustomAccentToTerminalTheme(baseTheme, accentMode, customAccent);
+    return resolveHostTheme(editorTab.hostId);
   }
 
   const logView = logViews.find((item) => item.id === activeTabId);

application/app/workTabSurface.test.ts

@@ -6,10 +6,40 @@ import {
   isHostTreeWorkTabSurface,
   isRootPageTabId,
   isTerminalContentTabSurface,
+  reorderWorkTabIds,
   resolveWorkTabActiveHostId,
+  resolveWorkTabHostTreeTheme,
 } from './workTabSurface';
 import type { EditorTab } from '../state/editorTabStore';
-import type { TerminalSession, Workspace } from '../../types';
+import type { Host, TerminalSession, TerminalTheme, Workspace } from '../../types';
+
+const makeTheme = (id: string, type: TerminalTheme['type'], background: string): TerminalTheme => ({
+  id,
+  name: id,
+  type,
+  colors: {
+    background,
+    foreground: type === 'dark' ? '#ffffff' : '#000000',
+    cursor: '#888888',
+    selection: '#555555',
+    black: '#000000',
+    red: '#ff0000',
+    green: '#00ff00',
+    yellow: '#ffff00',
+    blue: '#0000ff',
+    magenta: '#ff00ff',
+    cyan: '#00ffff',
+    white: '#ffffff',
+    brightBlack: '#444444',
+    brightRed: '#ff5555',
+    brightGreen: '#55ff55',
+    brightYellow: '#ffff55',
+    brightBlue: '#5555ff',
+    brightMagenta: '#ff55ff',
+    brightCyan: '#55ffff',
+    brightWhite: '#ffffff',
+  },
+});
 
 test('work tab order keeps custom positions and appends new tabs', () => {
   assert.deepEqual(
@@ -18,6 +48,29 @@ test('work tab order keeps custom positions and appends new tabs', () => {
   );
 });
 
+test('work tab order removes duplicate ids before rendering', () => {
+  assert.deepEqual(
+    buildOrderedWorkTabIds(
+      ['session-2', 'session-1', 'session-2', 'session-1'],
+      ['session-1', 'session-2', 'session-3', 'session-3'],
+    ),
+    ['session-2', 'session-1', 'session-3'],
+  );
+});
+
+test('work tab order reorders with newly materialized tabs', () => {
+  assert.deepEqual(
+    reorderWorkTabIds(
+      ['session-1', 'session-2', 'session-3'],
+      ['session-1', 'session-2', 'session-3'],
+      'session-1',
+      'session-3',
+      'after',
+    ),
+    ['session-2', 'session-3', 'session-1'],
+  );
+});
+
 test('root pages are not work tab surfaces', () => {
   assert.equal(isRootPageTabId('vault'), true);
   assert.equal(isRootPageTabId('sftp'), true);
@@ -80,3 +133,73 @@ test('shared host tree resolves active host ids across work tab types', () => {
   assert.equal(resolveWorkTabActiveHostId({ activeTabId: 'editor:file-1', sessions, workspaces, editorTabs }), 'host-3');
   assert.equal(resolveWorkTabActiveHostId({ activeTabId: 'log-1', sessions, workspaces, editorTabs }), null);
 });
+
+test('shared host tree uses the active host theme when follow-app terminal theme is off', () => {
+  const currentTheme = makeTheme('app-dark', 'dark', '#111111');
+  const hostTheme = makeTheme('host-light', 'light', '#fafafa');
+  const host = {
+    id: 'host-1',
+    label: 'Host',
+    hostname: 'host.local',
+    username: 'root',
+    tags: [],
+    os: 'linux',
+    theme: hostTheme.id,
+    themeOverride: true,
+  } as Host;
+
+  const resolved = resolveWorkTabHostTreeTheme({
+    activeHostId: host.id,
+    accentMode: 'theme',
+    currentTerminalTheme: currentTheme,
+    customAccent: '#8b5cf6',
+    followAppTerminalTheme: false,
+    hostById: new Map([[host.id, host]]),
+    themeById: new Map([[currentTheme.id, currentTheme], [hostTheme.id, hostTheme]]),
+  });
+
+  assert.equal(resolved.id, hostTheme.id);
+});
+
+test('shared host tree uses the followed terminal theme when follow-app terminal theme is on', () => {
+  const currentTheme = makeTheme('app-light', 'light', '#ffffff');
+  const hostTheme = makeTheme('host-dark', 'dark', '#050505');
+  const host = {
+    id: 'host-1',
+    label: 'Host',
+    hostname: 'host.local',
+    username: 'root',
+    tags: [],
+    os: 'linux',
+    theme: hostTheme.id,
+    themeOverride: true,
+  } as Host;
+
+  const resolved = resolveWorkTabHostTreeTheme({
+    activeHostId: host.id,
+    accentMode: 'theme',
+    currentTerminalTheme: currentTheme,
+    customAccent: '#8b5cf6',
+    followAppTerminalTheme: true,
+    hostById: new Map([[host.id, host]]),
+    themeById: new Map([[currentTheme.id, currentTheme], [hostTheme.id, hostTheme]]),
+  });
+
+  assert.equal(resolved.id, currentTheme.id);
+});
+
+test('shared host tree falls back to the current terminal theme without an active host', () => {
+  const currentTheme = makeTheme('app-dark', 'dark', '#111111');
+
+  const resolved = resolveWorkTabHostTreeTheme({
+    activeHostId: null,
+    accentMode: 'theme',
+    currentTerminalTheme: currentTheme,
+    customAccent: '#8b5cf6',
+    followAppTerminalTheme: false,
+    hostById: new Map(),
+    themeById: new Map([[currentTheme.id, currentTheme]]),
+  });
+
+  assert.equal(resolved.id, currentTheme.id);
+});

application/app/workTabSurface.ts

@@ -2,8 +2,20 @@ import {
   fromEditorTabId,
   isEditorTabId,
 } from '../state/activeTabStore';
+import { applyCustomAccentToTerminalTheme, resolveHostTerminalThemeId } from '../../domain/terminalAppearance';
 import type { EditorTab } from '../state/editorTabStore';
-import type { TerminalSession, Workspace } from '../../types';
+import type { Host, TerminalSession, TerminalTheme, Workspace } from '../../types';
+
+function uniqueTabIds(tabIds: readonly string[]): string[] {
+  const seen = new Set<string>();
+  const uniqueIds: string[] = [];
+  for (const tabId of tabIds) {
+    if (!tabId || seen.has(tabId)) continue;
+    seen.add(tabId);
+    uniqueIds.push(tabId);
+  }
+  return uniqueIds;
+}
 
 export function isRootPageTabId(activeTabId: string): boolean {
   return activeTabId === 'vault' || activeTabId === 'sftp';
@@ -13,13 +25,42 @@ export function buildOrderedWorkTabIds(
   tabOrder: readonly string[],
   allTabIds: readonly string[],
 ): string[] {
-  const allTabIdSet = new Set(allTabIds);
-  const orderedIds = tabOrder.filter((id) => allTabIdSet.has(id));
+  const uniqueAllTabIds = uniqueTabIds(allTabIds);
+  const allTabIdSet = new Set(uniqueAllTabIds);
+  const orderedIds = uniqueTabIds(tabOrder.filter((id) => allTabIdSet.has(id)));
   const orderedIdSet = new Set(orderedIds);
-  const newIds = allTabIds.filter((id) => !orderedIdSet.has(id));
+  const newIds = uniqueAllTabIds.filter((id) => !orderedIdSet.has(id));
   return [...orderedIds, ...newIds];
 }
 
+export function reorderWorkTabIds(
+  tabOrder: readonly string[],
+  allTabIds: readonly string[],
+  draggedId: string,
+  targetId: string,
+  position: 'before' | 'after' = 'before',
+): string[] {
+  if (draggedId === targetId) return buildOrderedWorkTabIds(tabOrder, allTabIds);
+
+  const currentOrder = buildOrderedWorkTabIds(tabOrder, allTabIds);
+  const draggedIndex = currentOrder.indexOf(draggedId);
+  const targetIndex = currentOrder.indexOf(targetId);
+  if (draggedIndex === -1 || targetIndex === -1) return [...tabOrder];
+
+  currentOrder.splice(draggedIndex, 1);
+
+  let nextTargetIndex = targetIndex;
+  if (draggedIndex < targetIndex) {
+    nextTargetIndex -= 1;
+  }
+  if (position === 'after') {
+    nextTargetIndex += 1;
+  }
+
+  currentOrder.splice(nextTargetIndex, 0, draggedId);
+  return currentOrder;
+}
+
 export function isHostTreeWorkTabSurface({
   enabled,
   activeTabId,
@@ -85,3 +126,28 @@ export function resolveWorkTabActiveHostId({
 
   return null;
 }
+
+export function resolveWorkTabHostTreeTheme({
+  activeHostId,
+  accentMode,
+  currentTerminalTheme,
+  customAccent,
+  followAppTerminalTheme,
+  hostById,
+  themeById,
+}: {
+  activeHostId: string | null;
+  accentMode: 'theme' | 'custom';
+  currentTerminalTheme: TerminalTheme;
+  customAccent: string;
+  followAppTerminalTheme: boolean;
+  hostById: ReadonlyMap<string, Host>;
+  themeById: ReadonlyMap<string, TerminalTheme>;
+}): TerminalTheme {
+  if (!activeHostId || followAppTerminalTheme) return currentTerminalTheme;
+
+  const host = hostById.get(activeHostId) ?? null;
+  const themeId = resolveHostTerminalThemeId(host, currentTerminalTheme.id);
+  const baseTheme = themeById.get(themeId) ?? currentTerminalTheme;
+  return applyCustomAccentToTerminalTheme(baseTheme, accentMode, customAccent);
+}

application/i18n/I18nProvider.tsx

@@ -14,11 +14,19 @@ const I18nContext = createContext<I18nContextValue | null>(null);
 
 const interpolate = (template: string, values?: InterpolationValues): string => {
   if (!values) return template;
-  return template.replace(/\{(\w+)\}/g, (_match, key: string) => {
+  const replaceDoubleBraceToken = (match: string, key: string) => {
+    const v = values[key];
+    if (v === null || v === undefined) return match;
+    return String(v);
+  };
+  const replaceSingleBraceToken = (_match: string, key: string) => {
     const v = values[key];
     if (v === null || v === undefined) return '';
     return String(v);
-  });
+  };
+  return template
+    .replace(/\{\{(\w+)\}\}/g, replaceDoubleBraceToken)
+    .replace(/\{(\w+)\}/g, replaceSingleBraceToken);
 };
 
 const resolveMessage = (resolvedLocale: string, key: string): string | undefined => {

application/i18n/locales/en.ts

@@ -3,6 +3,7 @@ import { enCoreMessages } from './en/core';
 import { enVaultMessages } from './en/vault';
 import { enTerminalMessages } from './en/terminal';
 import { enAiMessages } from './en/ai';
+import { enSystemManagerMessages } from './en/systemManager';
 
 export type { Messages } from './types';
 
@@ -11,6 +12,7 @@ const en: Messages = {
   ...enVaultMessages,
   ...enTerminalMessages,
   ...enAiMessages,
+  ...enSystemManagerMessages,
 };
 
 export default en;

application/i18n/locales/en/ai.ts

@@ -3,9 +3,11 @@ import type { Messages } from '../types';
 export const enAiMessages: Messages = {
   // AI Settings
   'ai.agentSettings': 'Agent Settings',
+  'ai.chat.preparing': 'Preparing…',
   'ai.title': 'AI',
   'ai.description': 'Configure AI providers, agents, and safety settings',
   'ai.providers': 'Providers',
+  'ai.agents': 'Agents',
   'ai.providers.empty': 'No providers configured. Add a provider to get started.',
   'ai.providers.add': 'Add Provider',
   'ai.providers.active': 'Active',
@@ -106,6 +108,54 @@ export const enAiMessages: Messages = {
   'ai.copilot.customPathPlaceholder': 'e.g. /usr/local/bin/copilot',
   'ai.copilot.check': 'Check',
 
+  // AI Cursor SDK
+  'ai.cursor.title': 'Cursor',
+  'ai.cursor.description': 'Uses the Cursor SDK.',
+  'ai.cursor.detecting': 'Detecting...',
+  'ai.cursor.detected': 'Available',
+  'ai.cursor.notFound': 'Unavailable',
+  'ai.cursor.path': 'Runtime:',
+  'ai.cursor.notFoundHint': 'Enter an API key to enable Cursor.',
+  'ai.cursor.notInstalledHint': 'Cursor SDK was not detected.',
+  'ai.cursor.installStatus': 'Cursor SDK',
+  'ai.cursor.installed': 'Detected',
+  'ai.cursor.notInstalled': 'Not detected',
+  'ai.cursor.apiKeyStatus': 'API Key',
+  'ai.cursor.apiKeyConfigured': 'Configured',
+  'ai.cursor.apiKeyMissing': 'Missing',
+  'ai.cursor.apiKeyFromEnv': 'From environment',
+  'ai.cursor.apiKey': 'API Key',
+  'ai.cursor.apiKeyPlaceholder': 'Enter Cursor API key',
+  'ai.cursor.apiKeyPlaceholder.env': 'Using CURSOR_API_KEY; enter a key to override',
+  'ai.cursor.apiKeyEnvHint': 'Cursor can use CURSOR_API_KEY from your shell. Save a key here only if you want Netcatty to override it.',
+  'ai.cursor.apiKeyOverrideHint': 'Netcatty will use the saved key here before CURSOR_API_KEY.',
+  'ai.cursor.saveApiKey': 'Save',
+  'ai.cursor.saved': 'Saved',
+  'ai.cursor.showApiKey': 'Show API key',
+  'ai.cursor.hideApiKey': 'Hide API key',
+  'ai.cursor.customPathPlaceholder': 'e.g. /usr/local/bin/cursor',
+  'ai.cursor.check': 'Check',
+
+  // AI CodeBuddy Code
+  'ai.codebuddy.title': 'CodeBuddy Code',
+  'ai.codebuddy.description': 'Uses CodeBuddy Code via the official Agent SDK (`@tencent-ai/agent-sdk`). Once detected, it can be selected as an external coding agent.',
+  'ai.codebuddy.detecting': 'Detecting...',
+  'ai.codebuddy.detected': 'Detected',
+  'ai.codebuddy.notFound': 'Not found',
+  'ai.codebuddy.path': 'Path:',
+  'ai.codebuddy.notFoundHint': 'Could not find codebuddy in PATH. Install it or specify the executable path below.',
+  'ai.codebuddy.customPathPlaceholder': 'e.g. /usr/local/bin/codebuddy',
+  'ai.codebuddy.check': 'Check',
+  'ai.codebuddy.configSection': 'Authentication & config (optional)',
+  'ai.codebuddy.internetEnv': 'Internet Environment',
+  'ai.codebuddy.internetEnv.default': 'Default (overseas)',
+  'ai.codebuddy.internetEnv.internal': 'Internal',
+  'ai.codebuddy.internetEnv.ioa': 'IOA',
+  'ai.codebuddy.internetEnv.hint': 'Sets CODEBUDDY_INTERNET_ENVIRONMENT — choose Internal or IOA for restricted network environments.',
+  'ai.codebuddy.envVars': 'Environment variables',
+  'ai.codebuddy.envVars.placeholder': 'CODEBUDDY_API_KEY=...\nCODEBUDDY_AUTH_TOKEN=...\nOTHER_VAR=...',
+  'ai.codebuddy.envVars.hint': 'One KEY=VALUE per line, passed to the CodeBuddy agent. Set CODEBUDDY_API_KEY or CODEBUDDY_AUTH_TOKEN here for authentication. Stored locally in plaintext.',
+
   // AI Default Agent
   'ai.defaultAgent': 'Default Agent',
   'ai.defaultAgent.description': 'Agent to use when starting a new AI session',
@@ -127,6 +177,29 @@ export const enAiMessages: Messages = {
   'ai.userSkills.status.ready': 'Ready',
   'ai.userSkills.status.warning': 'Warning',
 
+  // AI Quick Messages
+  'ai.quickMessages.title': 'Quick Messages',
+  'ai.quickMessages.description': 'Create reusable prompts you can insert from the AI chat with / or the quick-message button. Unlike user skills, quick messages fill the composer with text.',
+  'ai.quickMessages.add': 'Add Quick Message',
+  'ai.quickMessages.createTitle': 'New Quick Message',
+  'ai.quickMessages.editTitle': 'Edit Quick Message',
+  'ai.quickMessages.name': 'Name',
+  'ai.quickMessages.name.placeholder': 'e.g. Check disk space',
+  'ai.quickMessages.slug': 'Command',
+  'ai.quickMessages.slug.placeholder': 'disk-check',
+  'ai.quickMessages.descriptionField': 'Description (optional)',
+  'ai.quickMessages.descriptionField.placeholder': 'Short hint about what this prompt does',
+  'ai.quickMessages.content': 'Message content',
+  'ai.quickMessages.content.placeholder': 'Full prompt text to insert when selected...',
+  'ai.quickMessages.empty': 'No quick messages yet. Add a few prompts you use often.',
+  'ai.quickMessages.confirmDelete': 'Delete quick message "{name}"?',
+  'ai.quickMessages.error.nameRequired': 'Name is required.',
+  'ai.quickMessages.error.invalidSlug': 'Command may only contain lowercase letters, numbers, and hyphens.',
+  'ai.quickMessages.error.contentRequired': 'Message content is required.',
+  'ai.quickMessages.error.slugTaken': 'This command is already used by another quick message.',
+  'ai.quickMessages.error.slugConflictsWithSkill': 'This command conflicts with user skill "/{slug}". Choose another.',
+  'ai.quickMessages.error.maxItems': 'You can save at most {max} quick messages.',
+
   // AI Chat
   'ai.chat.noProvider': 'No AI provider is configured. Go to **Settings → AI → Providers** to add and enable a provider.',
   'ai.chat.toolDenied': 'Action was rejected by the user.',
@@ -175,6 +248,7 @@ export const enAiMessages: Messages = {
   'ai.chat.newChat': 'New Chat',
   'ai.chat.allSessions': 'All Sessions',
   'ai.chat.loadEarlierMessages': 'Load earlier messages ({n} more)',
+  'ai.chat.usedTools': 'Tools used: {n}',
   'ai.chat.loadMoreSessions': 'Load more sessions ({n} more)',
   'ai.chat.noSessions': 'No previous sessions',
   'ai.chat.retryHint': 'You can retry by sending your message again.',
@@ -185,6 +259,18 @@ export const enAiMessages: Messages = {
   'ai.chat.menuImage': 'Image',
   'ai.chat.menuMentionHost': 'Mention Host',
   'ai.chat.menuUserSkills': 'User Skills',
+  'ai.chat.menuSlashCommands': 'Slash Commands',
+  'ai.chat.slashCommands': 'Slash commands',
+  'ai.chat.slashQuickMessages': 'Quick messages',
+  'ai.chat.slashUserSkills': 'User skills',
+  'ai.chat.quickMessages': 'Slash commands',
+  'ai.chat.slashNoResults': 'No matching commands',
+  'ai.chat.slashEmptyHint': 'Add prompts in Settings → AI → Quick Messages.',
+
+  // AI Chat Shortcuts
+  'ai.chatShortcuts.title': 'Chat Shortcuts',
+  'ai.chatShortcuts.selectionAction': 'Show Add to Conversation when selecting terminal text',
+  'ai.chatShortcuts.selectionAction.description': 'Show a small AI button next to selected terminal text.',
 
   // AI Error
   'ai.codex.bridgeError': 'Codex main-process handlers are not loaded yet. Fully restart Netcatty, or restart the Electron dev process, then try again.',
@@ -228,6 +314,7 @@ export const enAiMessages: Messages = {
   'terminal.layer.switchToSplitView': 'Switch to Split View',
   'terminal.layer.sftp': 'SFTP',
   'terminal.layer.scripts': 'Scripts',
+  'terminal.layer.history': 'History',
   'terminal.layer.theme': 'Theme',
   'terminal.layer.aiChat': 'AI Chat',
   'terminal.layer.movePanelLeft': 'Move panel to left',

application/i18n/locales/en/core.ts

@@ -42,6 +42,7 @@ export const enCoreMessages: Messages = {
   'common.more': 'More',
   'common.selectAHost': 'Select a host',
   'common.selectAHostPlaceholder': 'Select a host...',
+  'sort.manual': 'Manual order',
   'sort.az': 'A-z',
   'sort.za': 'Z-a',
   'sort.newest': 'Newest to oldest',
@@ -266,9 +267,9 @@ 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. Major UI regions expose a [data-section="..."] attribute you can target — e.g. snippets-panel, host-details-panel, group-details-panel, serial-host-details-panel, ai-chat-panel, vault-sidebar, vault-main, vault-hosts-header, vault-host-list, vault-view, terminal-workspace, terminal-workspace-sidebar (focus-mode terminal list), terminal-host-tree-sidebar, terminal-host-tree-sidebar-content, terminal-host-tree-sidebar-row, terminal-side-panel (SFTP/Scripts/Theme/AI panel, available while open), terminal-side-panel-tabs, terminal-side-panel-content, terminal-sftp-panel, terminal-sftp-host-header, terminal-sftp-pane, terminal-sftp-toolbar, terminal-sftp-path, terminal-sftp-filter-bar, terminal-sftp-list, terminal-sftp-list-header, terminal-sftp-list-row, terminal-sftp-tree, terminal-sftp-tree-row, terminal-sftp-transfer-queue, terminal-sftp-transfer-row, terminal-split-pane, terminal-split-resizer, top-tabs.',
+    'Add custom CSS to personalize the app appearance. Changes apply immediately. Major UI regions expose a [data-section="..."] attribute you can target — e.g. snippets-panel, host-details-panel, group-details-panel, serial-host-details-panel, ai-chat-panel, vault-sidebar, vault-main, vault-hosts-header, vault-host-list, vault-view, terminal-workspace, terminal-workspace-sidebar (focus-mode terminal list), terminal-host-tree-sidebar, terminal-host-tree-sidebar-content, terminal-host-tree-sidebar-row, terminal-side-panel (SFTP/Scripts/Theme/AI panel, available while open), terminal-side-panel-tabs, terminal-side-panel-content, terminal-sftp-panel, terminal-sftp-host-header, terminal-sftp-pane, terminal-sftp-toolbar, terminal-sftp-path, terminal-sftp-filter-bar, terminal-sftp-list, terminal-sftp-list-header, terminal-sftp-list-row, terminal-sftp-tree, terminal-sftp-tree-row, terminal-sftp-transfer-queue, terminal-sftp-transfer-row, terminal-split-pane, terminal-split-resizer, top-tabs, top-tabs-host-tree-toggle, top-tabs-quick-switcher-toggle.',
   'settings.appearance.customCss.placeholder':
-    '/* Examples — use !important to beat Tailwind utility specificity */\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',
@@ -311,6 +312,15 @@ export const enCoreMessages: Messages = {
   'settings.terminal.font.size.desc': 'Terminal text size',
   'settings.terminal.font.weight': 'Font weight',
   'settings.terminal.font.weight.desc': 'Weight for regular text (100-900)',
+  'settings.terminal.font.weight.thin': 'Thin',
+  'settings.terminal.font.weight.extraLight': 'Extra Light',
+  'settings.terminal.font.weight.light': 'Light',
+  'settings.terminal.font.weight.normal': 'Normal',
+  'settings.terminal.font.weight.medium': 'Medium',
+  'settings.terminal.font.weight.semiBold': 'Semi Bold',
+  'settings.terminal.font.weight.bold': 'Bold',
+  'settings.terminal.font.weight.extraBold': 'Extra Bold',
+  'settings.terminal.font.weight.black': 'Black',
   'settings.terminal.font.weightBold': 'Bold font weight',
   'settings.terminal.font.weightBold.desc': 'Weight for bold text (100-900)',
   'settings.terminal.font.linePadding': 'Line padding',
@@ -340,6 +350,11 @@ export const enCoreMessages: Messages = {
   'settings.terminal.behavior.middleClickPaste': 'Middle-click paste',
   'settings.terminal.behavior.middleClickPaste.desc':
     'Paste clipboard content on middle-click',
+  'settings.terminal.behavior.middleClick': 'Middle-click behavior',
+  'settings.terminal.behavior.middleClick.desc': 'Action when middle-clicking in terminal',
+  'settings.terminal.behavior.middleClick.menu': 'Show menu',
+  'settings.terminal.behavior.middleClick.paste': 'Paste',
+  'settings.terminal.behavior.middleClick.disabled': 'Do nothing',
   'settings.terminal.behavior.bracketedPaste': 'Bracketed paste mode',
   'settings.terminal.behavior.bracketedPaste.desc':
     'Wrap pasted text with escape sequences so the shell can distinguish paste from typed input. Disable if you see ^[[200~ artifacts.',
@@ -431,6 +446,15 @@ export const enCoreMessages: Messages = {
   'settings.terminal.connection.x11Display.desc': 'Optional local display address for X11 forwarding. Leave empty to use the system default.',
   'settings.terminal.connection.x11Display.placeholder': 'Auto (:0 or DISPLAY)',
   'settings.terminal.section.serverStats': 'Server Stats (Linux)',
+  'settings.terminal.section.systemManager': 'System Manager',
+  'settings.terminal.systemManager.processRefreshInterval': 'Process list refresh',
+  'settings.terminal.systemManager.processRefreshInterval.desc': 'How often to refresh the process list in the system manager side panel.',
+  'settings.terminal.systemManager.tmuxRefreshInterval': 'tmux session refresh',
+  'settings.terminal.systemManager.tmuxRefreshInterval.desc': 'How often to refresh the tmux session list.',
+  'settings.terminal.systemManager.dockerListRefreshInterval': 'Docker container list refresh',
+  'settings.terminal.systemManager.dockerListRefreshInterval.desc': 'How often to refresh the Docker container list.',
+  'settings.terminal.systemManager.dockerStatsRefreshInterval': 'Docker stats refresh',
+  'settings.terminal.systemManager.dockerStatsRefreshInterval.desc': 'How often to refresh Docker container CPU/memory/network stats.',
   'settings.terminal.serverStats.show': 'Show Server Stats',
   'settings.terminal.serverStats.show.desc': 'Display CPU, memory, and disk usage in the terminal statusbar (Linux servers only).',
   'settings.terminal.serverStats.refreshInterval': 'Refresh Interval',
@@ -442,8 +466,6 @@ export const enCoreMessages: Messages = {
   'settings.terminal.rendering.renderer': 'Renderer',
   'settings.terminal.rendering.renderer.desc': 'Choose the terminal rendering technology. Auto will use DOM on low-memory devices. Changes take effect on new terminal sessions.',
   'settings.terminal.rendering.auto': 'Auto',
-  'settings.terminal.rendering.lineTimestamps': 'Prefix output with timestamps',
-  'settings.terminal.rendering.lineTimestamps.desc': 'Insert local time before terminal output lines. The timestamp becomes part of the visible terminal content.',
 
   // Settings > Terminal > Workspace Focus Indicator
   'settings.terminal.section.workspaceFocus': 'Workspace Focus Indicator',
@@ -468,6 +490,8 @@ export const enCoreMessages: Messages = {
   'settings.shortcuts.scheme.disabled': 'Disabled',
   'settings.shortcuts.scheme.mac': 'Mac (Cmd)',
   'settings.shortcuts.scheme.pc': 'PC (Ctrl)',
+  'settings.shortcuts.disableTerminalFontZoom.label': 'Disable terminal zoom',
+  'settings.shortcuts.disableTerminalFontZoom.desc': 'Turn off terminal font zoom shortcuts, including Cmd/Ctrl + mouse wheel.',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.label': 'Number keys skip pinned tabs',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.desc': 'When enabled, Cmd/Ctrl+[1...9] switches only work tabs (terminals, workspaces, editors), not the pinned Vault or SFTP tabs.',
   'settings.shortcuts.section.custom': 'Custom Shortcuts',

application/i18n/locales/en/systemManager.ts

@@ -0,0 +1,181 @@
+import type { Messages } from '../types';
+
+export const enSystemManagerMessages: Messages = {
+  'terminal.layer.system': 'System',
+
+  'systemManager.noSession': 'No active terminal session.',
+  'systemManager.notConnected': 'Connect to a host to manage processes and services.',
+  'systemManager.empty': 'No data available.',
+  'systemManager.tabs.processes': 'Processes',
+  'systemManager.tabs.tmux': 'tmux',
+  'systemManager.tabs.docker': 'Docker',
+  'systemManager.popup.loading': 'Opening terminal…',
+  'systemManager.popup.startupFailed': 'The startup command did not complete successfully. Check that the target is still available and try again.',
+
+  'systemManager.errors.loadProcesses': 'Failed to load processes',
+  'systemManager.errors.loadTmux': 'Failed to load tmux sessions',
+  'systemManager.errors.loadTmuxWindows': 'Failed to load tmux windows',
+  'systemManager.errors.loadTmuxPanes': 'Failed to load tmux panes',
+  'systemManager.errors.loadTmuxClients': 'Failed to load tmux clients',
+  'systemManager.errors.actionFailed': 'Action failed',
+  'systemManager.errors.loadDocker': 'Failed to load containers',
+  'systemManager.errors.loadDockerStats': 'Failed to load container stats',
+  'systemManager.errors.loadDockerImages': 'Failed to load images',
+  'systemManager.errors.sshChannelUnavailable': 'The server refused to open a new execution channel. Try again later, or reconnect this host.',
+
+  'systemManager.processes.search': 'Search processes…',
+  'systemManager.processes.command': 'Command',
+  'systemManager.processes.user': 'User',
+  'systemManager.processes.term': 'Terminate',
+  'systemManager.processes.kill': 'Kill',
+  'systemManager.processes.stop': 'Stop (SIGSTOP)',
+  'systemManager.processes.cont': 'Continue (SIGCONT)',
+  'systemManager.processes.hup': 'Hang up (SIGHUP)',
+  'systemManager.processes.renice': 'Renice',
+  'systemManager.processes.renicePrompt': 'Nice value (-20 to 19)',
+  'systemManager.processes.reniceInvalid': 'Nice value must be between -20 and 19',
+  'systemManager.processes.confirmKill': 'Send SIGKILL to process {{pid}}?',
+  'systemManager.processes.confirmSignal': 'Send SIG{{signal}} to process {{pid}}?',
+  'systemManager.processes.filter.all': 'All',
+  'systemManager.processes.filter.running': 'Running',
+  'systemManager.processes.ppid': 'Parent PID',
+  'systemManager.processes.rss': 'RSS',
+  'systemManager.processes.vsz': 'Virtual size',
+  'systemManager.processes.elapsed': 'Elapsed',
+  'systemManager.processes.stat': 'State',
+  'systemManager.processes.meta': '{{count}} process(es)',
+  'systemManager.processes.loading': 'Loading processes…',
+  'systemManager.processes.loadingMore': 'Loading more processes…',
+  'systemManager.processes.state.running': 'Running',
+  'systemManager.processes.state.sleeping': 'Sleeping',
+  'systemManager.processes.state.stopped': 'Stopped',
+  'systemManager.processes.state.zombie': 'Zombie',
+  'systemManager.processes.sort.cpu': 'CPU',
+  'systemManager.processes.sort.mem': 'MEM',
+  'systemManager.processes.sort.pid': 'PID',
+  'systemManager.processes.sort.command': 'Command',
+  'systemManager.processes.sort.user': 'User',
+
+  'systemManager.common.dismiss': 'Dismiss',
+  'systemManager.common.checkingAvailability': 'Checking availability…',
+  'systemManager.common.loading': 'Loading…',
+  'systemManager.common.loadingDetails': 'Loading details…',
+  'systemManager.common.loadingStats': 'Loading stats…',
+
+  'systemManager.tmux.new': 'New',
+  'systemManager.tmux.search': 'Search sessions…',
+  'systemManager.tmux.newSessionTitle': 'New tmux session',
+  'systemManager.tmux.newSessionDesc': 'Name the session and optionally run a script on start.',
+  'systemManager.tmux.newSessionTabCustom': 'Custom command',
+  'systemManager.tmux.newSessionTabSnippet': 'From snippet',
+  'systemManager.tmux.pickSnippet': 'From snippets',
+  'systemManager.tmux.pickSnippetEmpty': 'No snippets yet — add some in the Scripts panel or Vault.',
+  'systemManager.tmux.selectedSnippet': 'Using snippet: {{label}}',
+  'systemManager.tmux.newSessionName': 'Session name',
+  'systemManager.tmux.newSessionCommand': 'Start command',
+  'systemManager.tmux.newSessionCommandPlaceholder': 'e.g. htop or npm run dev (optional)',
+  'systemManager.tmux.newSessionCommandHint': 'Leave empty for a default shell session.',
+  'systemManager.tmux.creating': 'Creating…',
+  'systemManager.tmux.newSessionPlaceholder': 'my-session',
+  'systemManager.tmux.newSessionRequired': 'Enter a session name first',
+  'systemManager.tmux.empty': 'No tmux sessions',
+  'systemManager.tmux.attach': 'Attach',
+  'systemManager.tmux.attached': 'Attached',
+  'systemManager.tmux.detached': 'Detached',
+  'systemManager.tmux.windows': '{{count}} window(s)',
+  'systemManager.tmux.created': 'Created',
+  'systemManager.tmux.activity': 'Activity',
+  'systemManager.tmux.rename': 'Rename',
+  'systemManager.tmux.detach': 'Detach all',
+  'systemManager.tmux.killSession': 'Kill session',
+  'systemManager.tmux.killServer': 'Kill server',
+  'systemManager.tmux.loadingDetails': 'Loading details…',
+  'systemManager.tmux.clients': 'Attached clients',
+  'systemManager.tmux.windowList': 'Windows',
+  'systemManager.tmux.newWindow': 'New window',
+  'systemManager.tmux.newWindowPlaceholder': 'Window name (optional)',
+  'systemManager.tmux.noWindows': 'No windows',
+  'systemManager.tmux.unavailable': 'tmux is not available on this host',
+  'systemManager.docker.unavailable': 'Docker is not available on this host',
+  'systemManager.tmux.windowsMismatch': 'Session reports {{count}} window(s) but list-windows returned none',
+  'systemManager.tmux.lastCommand': 'last command: {{command}}',
+  'systemManager.tmux.noPanes': 'No panes',
+  'systemManager.tmux.panes': '{{count}} pane(s)',
+  'systemManager.tmux.active': 'active',
+  'systemManager.tmux.unnamedWindow': 'Unnamed window',
+  'systemManager.tmux.unnamedPane': 'Unnamed pane',
+  'systemManager.tmux.attachWindow': 'Attach to window',
+  'systemManager.tmux.selectWindow': 'Select window',
+  'systemManager.tmux.killWindow': 'Kill window',
+  'systemManager.tmux.killPane': 'Kill pane',
+  'systemManager.tmux.splitHorizontal': 'Split horizontal',
+  'systemManager.tmux.splitVertical': 'Split vertical',
+  'systemManager.tmux.sendKeys': 'Send keys',
+  'systemManager.tmux.sendKeysTo': 'Send keys to window {{window}} pane {{pane}}',
+  'systemManager.tmux.sendKeysPlaceholder': 'Command or text…',
+  'systemManager.tmux.renameSessionPrompt': 'Rename session',
+  'systemManager.tmux.renameWindowPrompt': 'Rename window',
+  'systemManager.tmux.windowName': 'Window name',
+  'systemManager.tmux.confirmKillSession': 'Kill tmux session "{{name}}"?',
+  'systemManager.tmux.confirmDetachSession': 'Detach all clients from "{{name}}"?',
+  'systemManager.tmux.confirmKillWindow': 'Kill window "{{name}}"?',
+  'systemManager.tmux.confirmKillPane': 'Kill pane #{{index}}?',
+  'systemManager.tmux.confirmKillServer': 'Kill tmux server? All sessions will be terminated.',
+  'systemManager.tmux.meta': '{{count}} session(s)',
+
+  'systemManager.docker.title': 'Containers',
+  'systemManager.docker.subTabs.containers': 'Containers',
+  'systemManager.docker.subTabs.images': 'Images',
+  'systemManager.docker.empty': 'No containers found',
+  'systemManager.docker.imagesEmpty': 'No images found',
+  'systemManager.docker.search': 'Search containers…',
+  'systemManager.docker.searchImages': 'Search images…',
+  'systemManager.docker.filter.all': 'All',
+  'systemManager.docker.filter.running': 'Running',
+  'systemManager.docker.filter.stopped': 'Stopped',
+  'systemManager.docker.filter.paused': 'Paused',
+  'systemManager.docker.shell': 'Shell',
+  'systemManager.docker.logs': 'Logs',
+  'systemManager.docker.details': 'Details',
+  'systemManager.docker.inspect': 'Inspect',
+  'systemManager.docker.imageInspect': 'Image inspect',
+  'systemManager.docker.confirmRemove': 'Remove this container?',
+  'systemManager.docker.confirmKill': 'Force kill this container?',
+  'systemManager.docker.confirmRemoveImage': 'Remove image "{{name}}"?',
+  'systemManager.docker.confirmPrune': 'Remove dangling images?',
+  'systemManager.docker.confirmPruneAll': 'Remove all unused images?',
+  'systemManager.docker.pause': 'Pause',
+  'systemManager.docker.unpause': 'Unpause',
+  'systemManager.docker.restart': 'Restart',
+  'systemManager.docker.kill': 'Kill',
+  'systemManager.docker.renamePrompt': 'Container name',
+  'systemManager.docker.prune': 'Prune',
+  'systemManager.docker.pruneAll': 'Prune all',
+  'systemManager.docker.tag': 'Tag',
+  'systemManager.docker.tagRepoPrompt': 'Repository name',
+  'systemManager.docker.tagNamePrompt': 'Tag name',
+  'systemManager.docker.meta': '{{count}} container(s)',
+  'systemManager.docker.imagesMeta': '{{count}} image(s)',
+  'systemManager.docker.start': 'Start',
+  'systemManager.docker.stop': 'Stop',
+
+  'systemManager.inspect.status': 'Status',
+  'systemManager.inspect.image': 'Image',
+  'systemManager.inspect.created': 'Created',
+  'systemManager.inspect.started': 'Started',
+  'systemManager.inspect.restartPolicy': 'Restart policy',
+  'systemManager.inspect.command': 'Command',
+  'systemManager.inspect.ports': 'Ports',
+  'systemManager.inspect.networks': 'Networks',
+  'systemManager.inspect.mounts': 'Mounts',
+  'systemManager.inspect.env': 'Environment',
+  'systemManager.inspect.labels': 'Labels',
+  'systemManager.inspect.tags': 'Tags',
+  'systemManager.inspect.digests': 'Digests',
+  'systemManager.inspect.size': 'Size',
+  'systemManager.inspect.platform': 'Platform',
+  'systemManager.inspect.workdir': 'Working dir',
+  'systemManager.inspect.exposedPorts': 'Exposed ports',
+  'systemManager.inspect.showRaw': 'JSON',
+  'systemManager.inspect.hideRaw': 'Hide JSON',
+};

application/i18n/locales/en/terminal.ts

@@ -5,14 +5,34 @@ export const enTerminalMessages: Messages = {
   // Terminal toolbar / search / context menu / auth
   'terminal.toolbar.openSftp': 'Open SFTP',
   'terminal.toolbar.availableAfterConnect': 'Available after connect',
+  'terminal.toolbar.sendYmodem': 'Send with YMODEM',
+  'terminal.toolbar.receiveYmodem': 'Receive with YMODEM',
   'terminal.toolbar.sftp': 'SFTP',
   'terminal.toolbar.more': 'More actions',
   'terminal.toolbar.scripts': 'Scripts',
+  'terminal.toolbar.history': 'Command history',
+  'history.scope.label': 'History scope',
+  'history.tab.host': 'Host',
+  'history.tab.global': 'Global',
+  'history.searchPlaceholder': 'Search history...',
+  'history.loading': 'Loading remote history...',
+  'history.meta.count': '{count} commands',
+  'history.empty.noSession': 'Open a remote session to view its command history.',
+  'history.empty.unsupportedProtocol': 'Command history is only available for SSH/Mosh/ET sessions.',
+  'history.empty.noHistory': 'No command history found on this host.',
+  'history.empty.noGlobalHistory': 'No global command history yet. Commands you run will appear here.',
+  'history.action.refresh': 'Refresh',
+  'history.action.retry': 'Retry',
+  'history.action.paste': 'Paste to terminal',
+  'history.action.run': 'Run in terminal',
+  'history.action.saveAsSnippet': 'Save as snippet',
   'terminal.toolbar.library': 'Library',
   'terminal.toolbar.noSnippets': 'No snippets available',
   'terminal.toolbar.terminalSettings': 'Terminal settings',
   'terminal.toolbar.searchTerminal': 'Search terminal',
   'terminal.toolbar.search': 'Search',
+  'terminal.toolbar.timestampsEnable': 'Show timestamps',
+  'terminal.toolbar.timestampsDisable': 'Hide timestamps',
   'terminal.toolbar.broadcast': 'Broadcast',
   'terminal.toolbar.broadcastEnable': 'Enable Broadcast Mode',
   'terminal.toolbar.broadcastDisable': 'Disable Broadcast Mode',
@@ -31,6 +51,7 @@ export const enTerminalMessages: Messages = {
   'terminal.composeBar.snippetClickHint': 'Click to insert · Shift+Click to send',
   'terminal.toolbar.focus': 'Focus',
   'terminal.toolbar.focusMode': 'Focus Mode',
+  'terminal.toolbar.detach': 'Detach to standalone tab',
   'terminal.toolbar.encoding': 'Terminal Encoding',
   'terminal.toolbar.encoding.utf8': 'UTF-8',
   'terminal.toolbar.encoding.gb18030': 'GB18030',
@@ -69,7 +90,9 @@ export const enTerminalMessages: Messages = {
   'terminal.dragDrop.localTitle': 'Drop to Insert Paths',
   'terminal.dragDrop.localMessage': 'File paths will be inserted into the terminal',
   'terminal.dragDrop.remoteTitle': 'Drop to Upload Files',
-  'terminal.dragDrop.remoteMessage': 'Files will be uploaded via SFTP',
+  'terminal.dragDrop.remoteZmodemMessage': 'Files will be uploaded via ZMODEM (PTY)',
+  'terminal.dragDrop.remoteSftpMessage': 'Files will be uploaded via SFTP',
+  'terminal.dragDrop.noFiles': 'No files to upload',
   'terminal.dragDrop.notConnected': 'Cannot drop files - terminal is not connected',
   'terminal.dragDrop.errorTitle': 'Drop Error',
   'terminal.dragDrop.errorMessage': 'Failed to process dropped files',
@@ -83,10 +106,27 @@ export const enTerminalMessages: Messages = {
   'terminal.menu.pasteSelection': 'Paste Selection',
   'terminal.menu.selectAll': 'Select All',
   'terminal.menu.reconnect': 'Reconnect',
+  'terminal.menu.sendYmodem': 'Send with YMODEM',
+  'terminal.menu.receiveYmodem': 'Receive with YMODEM',
   'terminal.menu.splitHorizontal': 'Split Horizontal',
   'terminal.menu.splitVertical': 'Split Vertical',
   'terminal.menu.clearBuffer': 'Clear Buffer',
   'terminal.menu.closeTerminal': 'Close terminal',
+  'terminal.menu.rename': 'Rename',
+  'terminal.menu.detach': 'Detach from workspace',
+  'terminal.menu.detachSession': 'Detach {name}',
+  'terminal.ymodem.selectFile': 'Select file to send',
+  'terminal.ymodem.allFiles': 'All files',
+  'terminal.ymodem.started': 'YMODEM sending {fileName}',
+  'terminal.ymodem.complete': 'YMODEM sent {fileName}',
+  'terminal.ymodem.failed': 'YMODEM send failed',
+  'terminal.ymodem.selectReceiveDirectory': 'Select folder to save received files',
+  'terminal.ymodem.receiveStarted': 'YMODEM receiving...',
+  'terminal.ymodem.receiveComplete': 'YMODEM received {fileName}',
+  'terminal.ymodem.receiveCompleteMultiple': 'YMODEM received {count} files',
+  'terminal.ymodem.receiveEmpty': 'No YMODEM files received',
+  'terminal.ymodem.receiveFailed': 'YMODEM receive failed',
+  'terminal.ymodem.unavailable': 'YMODEM is unavailable',
   'terminal.selection.addToAI': 'Add to Conversation',
   'terminal.selection.addToAIDesc': 'Attach selected terminal output to the AI draft',
   'terminal.auth.password': 'Password',

application/i18n/locales/en/vault.ts

@@ -151,6 +151,9 @@ export const enVaultMessages: Messages = {
   'sftp.moveTo.pathNotFound': 'Directory not found or inaccessible',
   'sftp.context.download': 'Download',
   'sftp.context.copyToOtherPane': 'Copy to other pane',
+  'sftp.copyCurrentPath': 'Copy current path',
+  'sftp.copyCurrentPath.success': 'Current path copied',
+  'sftp.copyCurrentPath.error': 'Could not copy current path',
   'sftp.viewMode.label': 'View mode',
   'sftp.viewMode.list': 'List view',
   'sftp.viewMode.tree': 'Tree view',
@@ -258,6 +261,8 @@ export const enVaultMessages: Messages = {
   'sftp.tabs.addTab': 'Add new tab',
   'sftp.tabs.closeTab': 'Close tab',
   'sftp.tabs.newTab': 'New Tab',
+  'sftp.tabs.copyDefaultPath': 'Copy tab (default path)',
+  'sftp.tabs.copyCurrentPath': 'Copy and go to current path',
   'sftp.conflict.title': 'File Conflict',
   'sftp.conflict.desc': 'A file with the same name already exists at the destination',
   'sftp.conflict.alreadyExistsSuffix': 'already exists',
@@ -462,7 +467,52 @@ export const enVaultMessages: Messages = {
   'hostDetails.section.portCredentials': 'Port & Credentials',
   'hostDetails.section.appearance': 'Appearance',
   'hostDetails.distro.title': 'Linux Distribution',
-  'hostDetails.distro.desc': 'Auto-detect on connect, or override the distro icon manually.',
+  'hostDetails.distro.desc': 'Controls the automatic host icon. A custom Host Icon overrides this display.',
+  'hostDetails.icon.title': 'Host Icon',
+  'hostDetails.icon.desc': 'Use automatic distro icons with optional color, or choose a built-in icon.',
+  'hostDetails.icon.mode.auto': 'Automatic',
+  'hostDetails.icon.mode.custom': 'Custom',
+  'hostDetails.icon.reset': 'Reset host icon',
+  'hostDetails.icon.showLibrary': 'Show icon library',
+  'hostDetails.icon.hideLibrary': 'Hide icon library',
+  'hostDetails.icon.autoUsesDistro': 'Use Linux Distribution icon and selected color for this host.',
+  'hostDetails.icon.customOverridesDistro': 'Built-in icon replaces Linux Distribution for this host.',
+  'hostDetails.icon.option.server': 'Server',
+  'hostDetails.icon.option.terminal': 'Terminal',
+  'hostDetails.icon.option.database': 'Database',
+  'hostDetails.icon.option.cloud': 'Cloud',
+  'hostDetails.icon.option.router': 'Router',
+  'hostDetails.icon.option.shield': 'Shield',
+  'hostDetails.icon.option.code': 'Code',
+  'hostDetails.icon.option.box': 'Box',
+  'hostDetails.icon.option.globe': 'Globe',
+  'hostDetails.icon.option.cpu': 'CPU',
+  'hostDetails.icon.option.hard-drive': 'Storage',
+  'hostDetails.icon.option.network': 'Network',
+  'hostDetails.icon.option.wifi': 'Wireless',
+  'hostDetails.icon.option.lock': 'Lock',
+  'hostDetails.icon.option.key': 'Key',
+  'hostDetails.icon.option.monitor': 'Monitor',
+  'hostDetails.icon.option.container': 'Container',
+  'hostDetails.icon.option.activity': 'Activity',
+  'hostDetails.icon.option.zap': 'Fast',
+  'hostDetails.icon.option.server-cog': 'Server settings',
+  'hostDetails.icon.color.blue': 'Blue',
+  'hostDetails.icon.color.green': 'Green',
+  'hostDetails.icon.color.red': 'Red',
+  'hostDetails.icon.color.amber': 'Amber',
+  'hostDetails.icon.color.purple': 'Purple',
+  'hostDetails.icon.color.cyan': 'Cyan',
+  'hostDetails.icon.color.orange': 'Orange',
+  'hostDetails.icon.color.slate': 'Slate',
+  'hostDetails.icon.color.violet': 'Violet',
+  'hostDetails.icon.color.pink': 'Pink',
+  'hostDetails.icon.color.rose': 'Rose',
+  'hostDetails.icon.color.lime': 'Lime',
+  'hostDetails.icon.color.teal': 'Teal',
+  'hostDetails.icon.color.sky': 'Sky',
+  'hostDetails.icon.color.indigo': 'Indigo',
+  'hostDetails.icon.color.zinc': 'Zinc',
   'hostDetails.distro.mode': 'Source',
   'hostDetails.distro.mode.auto': 'Auto-detect',
   'hostDetails.distro.mode.manual': 'Manual override',
@@ -483,6 +533,7 @@ export const enVaultMessages: Messages = {
   'hostDetails.distro.option.redhat': 'Red Hat / RHEL',
   'hostDetails.distro.option.almalinux': 'AlmaLinux',
   'hostDetails.distro.option.alinux': 'Alibaba Cloud Linux',
+  'hostDetails.distro.option.openeuler': 'openEuler',
   'hostDetails.distro.option.oracle': 'Oracle Linux',
   'hostDetails.distro.option.kali': 'Kali Linux',
   'hostDetails.distro.option.cisco': 'Cisco',
@@ -530,6 +581,8 @@ export const enVaultMessages: Messages = {
   'hostDetails.deviceType.warning': 'AI agent commands will be sent directly without exit code tracking. Only enable for devices that do not run a standard shell.',
   'hostDetails.section.sshAlgorithms': 'SSH Algorithms',
   'hostDetails.section.terminalBehavior': 'Terminal Behavior',
+  'hostDetails.lineTimestamps': 'Show output timestamps',
+  'hostDetails.lineTimestamps.desc': 'Show local time beside visible output lines for this host without changing terminal text.',
   'hostDetails.legacyAlgorithms': 'Allow Legacy Algorithms',
   'hostDetails.legacyAlgorithms.desc': 'Enable deprecated SSH algorithms (diffie-hellman-group1, ssh-dss, 3des-cbc, etc.) for connecting to older network equipment.',
   'hostDetails.legacyAlgorithms.warning': 'These algorithms have known security weaknesses. Only enable for legacy devices that do not support modern cryptography.',

application/i18n/locales/ru.ts

@@ -3,6 +3,7 @@ import { ruCoreMessages } from './ru/core';
 import { ruVaultMessages } from './ru/vault';
 import { ruTerminalMessages } from './ru/terminal';
 import { ruAiMessages } from './ru/ai';
+import { ruSystemManagerMessages } from './ru/systemManager';
 
 export type { Messages } from './types';
 
@@ -11,6 +12,7 @@ const ru: Messages = {
   ...ruVaultMessages,
   ...ruTerminalMessages,
   ...ruAiMessages,
+  ...ruSystemManagerMessages,
 };
 
 export default ru;

application/i18n/locales/ru/ai.ts

@@ -3,9 +3,11 @@ import type { Messages } from '../types';
 export const ruAiMessages: Messages = {
   // AI Settings
   'ai.agentSettings': 'Настройки агента',
+  'ai.chat.preparing': 'Подготовка…',
   'ai.title': 'AI',
   'ai.description': 'Настройка AI-провайдеров, агентов и параметров безопасности',
   'ai.providers': 'Провайдеры',
+  'ai.agents': 'Агенты',
   'ai.providers.empty': 'Провайдеры не настроены. Добавьте провайдера, чтобы начать.',
   'ai.providers.add': 'Добавить провайдера',
   'ai.providers.active': 'Активен',
@@ -106,6 +108,54 @@ export const ruAiMessages: Messages = {
   'ai.copilot.customPathPlaceholder': 'например, /usr/local/bin/copilot',
   'ai.copilot.check': 'Проверить',
 
+  // AI Cursor SDK
+  'ai.cursor.title': 'Cursor',
+  'ai.cursor.description': 'Использует Cursor SDK.',
+  'ai.cursor.detecting': 'Обнаружение...',
+  'ai.cursor.detected': 'Доступен',
+  'ai.cursor.notFound': 'Недоступен',
+  'ai.cursor.path': 'Среда:',
+  'ai.cursor.notFoundHint': 'Укажите API-ключ, чтобы включить Cursor.',
+  'ai.cursor.notInstalledHint': 'Cursor SDK не обнаружен.',
+  'ai.cursor.installStatus': 'Cursor SDK',
+  'ai.cursor.installed': 'Обнаружено',
+  'ai.cursor.notInstalled': 'Не обнаружено',
+  'ai.cursor.apiKeyStatus': 'API-ключ',
+  'ai.cursor.apiKeyConfigured': 'Настроен',
+  'ai.cursor.apiKeyMissing': 'Не указан',
+  'ai.cursor.apiKeyFromEnv': 'Из окружения',
+  'ai.cursor.apiKey': 'API-ключ',
+  'ai.cursor.apiKeyPlaceholder': 'Введите API-ключ Cursor',
+  'ai.cursor.apiKeyPlaceholder.env': 'Используется CURSOR_API_KEY; введите ключ для замены',
+  'ai.cursor.apiKeyEnvHint': 'Cursor может использовать CURSOR_API_KEY из shell. Сохраняйте ключ здесь только если хотите переопределить его в Netcatty.',
+  'ai.cursor.apiKeyOverrideHint': 'Netcatty сначала использует сохранённый здесь ключ, затем CURSOR_API_KEY.',
+  'ai.cursor.saveApiKey': 'Сохранить',
+  'ai.cursor.saved': 'Сохранено',
+  'ai.cursor.showApiKey': 'Показать API-ключ',
+  'ai.cursor.hideApiKey': 'Скрыть API-ключ',
+  'ai.cursor.customPathPlaceholder': 'например, /usr/local/bin/cursor',
+  'ai.cursor.check': 'Проверить',
+
+  // AI CodeBuddy Code
+  'ai.codebuddy.title': 'CodeBuddy Code',
+  'ai.codebuddy.description': 'Использует CodeBuddy Code через официальный Agent SDK (`@tencent-ai/agent-sdk`). После обнаружения может быть выбран как внешний агент для программирования.',
+  'ai.codebuddy.detecting': 'Обнаружение...',
+  'ai.codebuddy.detected': 'Обнаружен',
+  'ai.codebuddy.notFound': 'Не найден',
+  'ai.codebuddy.path': 'Путь:',
+  'ai.codebuddy.notFoundHint': 'Не удалось найти codebuddy в PATH. Установите его или укажите путь к исполняемому файлу ниже.',
+  'ai.codebuddy.customPathPlaceholder': 'например, /usr/local/bin/codebuddy',
+  'ai.codebuddy.check': 'Проверить',
+  'ai.codebuddy.configSection': 'Аутентификация и конфигурация (необязательно)',
+  'ai.codebuddy.internetEnv': 'Сетевая среда',
+  'ai.codebuddy.internetEnv.default': 'По умолчанию (зарубежная)',
+  'ai.codebuddy.internetEnv.internal': 'Internal',
+  'ai.codebuddy.internetEnv.ioa': 'IOA',
+  'ai.codebuddy.internetEnv.hint': 'Устанавливает CODEBUDDY_INTERNET_ENVIRONMENT — выберите Internal или IOA для ограниченных сетевых сред.',
+  'ai.codebuddy.envVars': 'Переменные окружения',
+  'ai.codebuddy.envVars.placeholder': 'CODEBUDDY_API_KEY=...\nCODEBUDDY_AUTH_TOKEN=...\nOTHER_VAR=...',
+  'ai.codebuddy.envVars.hint': 'По одной записи KEY=VALUE на строку, передаются агенту CodeBuddy. Укажите CODEBUDDY_API_KEY или CODEBUDDY_AUTH_TOKEN для аутентификации. Хранятся локально в открытом виде.',
+
   // AI Default Agent
   'ai.defaultAgent': 'Агент по умолчанию',
   'ai.defaultAgent.description': 'Агент, который будет использоваться при запуске новой AI-сессии',
@@ -127,6 +177,29 @@ export const ruAiMessages: Messages = {
   'ai.userSkills.status.ready': 'Готово',
   'ai.userSkills.status.warning': 'Предупреждение',
 
+  // AI Quick Messages
+  'ai.quickMessages.title': 'Быстрые сообщения',
+  'ai.quickMessages.description': 'Создавайте часто используемые подсказки и вставляйте их в AI-чат через / или кнопку быстрых сообщений. В отличие от user skills, быстрые сообщения заполняют поле ввода текстом.',
+  'ai.quickMessages.add': 'Добавить быстрое сообщение',
+  'ai.quickMessages.createTitle': 'Новое быстрое сообщение',
+  'ai.quickMessages.editTitle': 'Редактировать быстрое сообщение',
+  'ai.quickMessages.name': 'Название',
+  'ai.quickMessages.name.placeholder': 'например: Проверить диск',
+  'ai.quickMessages.slug': 'Команда',
+  'ai.quickMessages.slug.placeholder': 'disk-check',
+  'ai.quickMessages.descriptionField': 'Описание (необязательно)',
+  'ai.quickMessages.descriptionField.placeholder': 'Краткая подсказка о назначении',
+  'ai.quickMessages.content': 'Текст сообщения',
+  'ai.quickMessages.content.placeholder': 'Полный текст подсказки для вставки...',
+  'ai.quickMessages.empty': 'Быстрых сообщений пока нет. Добавьте несколько часто используемых подсказок.',
+  'ai.quickMessages.confirmDelete': 'Удалить быстрое сообщение «{name}»?',
+  'ai.quickMessages.error.nameRequired': 'Укажите название.',
+  'ai.quickMessages.error.invalidSlug': 'Команда может содержать только строчные буквы, цифры и дефисы.',
+  'ai.quickMessages.error.contentRequired': 'Укажите текст сообщения.',
+  'ai.quickMessages.error.slugTaken': 'Эта команда уже используется другим быстрым сообщением.',
+  'ai.quickMessages.error.slugConflictsWithSkill': 'Команда конфликтует с user skill «/{slug}». Выберите другую.',
+  'ai.quickMessages.error.maxItems': 'Можно сохранить не более {max} быстрых сообщений.',
+
   // AI Chat
   'ai.chat.noProvider': 'AI-провайдер не настроен. Перейдите в **Настройки → AI → Провайдеры**, чтобы добавить и включить провайдера.',
   'ai.chat.toolDenied': 'Действие было отклонено пользователем.',
@@ -175,6 +248,7 @@ export const ruAiMessages: Messages = {
   'ai.chat.newChat': 'Новый чат',
   'ai.chat.allSessions': 'Все сессии',
   'ai.chat.loadEarlierMessages': 'Загрузить более ранние сообщения (ещё {n})',
+  'ai.chat.usedTools': 'Использовано инструментов: {n}',
   'ai.chat.loadMoreSessions': 'Загрузить больше сессий (ещё {n})',
   'ai.chat.noSessions': 'Предыдущих сессий нет',
   'ai.chat.retryHint': 'Вы можете повторить попытку, отправив сообщение ещё раз.',
@@ -185,6 +259,18 @@ export const ruAiMessages: Messages = {
   'ai.chat.menuImage': 'Изображение',
   'ai.chat.menuMentionHost': 'Упомянуть хост',
   'ai.chat.menuUserSkills': 'Пользовательские skills',
+  'ai.chat.menuSlashCommands': 'Команды /',
+  'ai.chat.slashCommands': 'Команды /',
+  'ai.chat.slashQuickMessages': 'Быстрые сообщения',
+  'ai.chat.slashUserSkills': 'User skills',
+  'ai.chat.quickMessages': 'Команды /',
+  'ai.chat.slashNoResults': 'Нет подходящих команд',
+  'ai.chat.slashEmptyHint': 'Добавьте подсказки в Настройки → AI → Быстрые сообщения.',
+
+  // AI Chat Shortcuts
+  'ai.chatShortcuts.title': 'Быстрые действия чата',
+  'ai.chatShortcuts.selectionAction': 'Показывать «Добавить в чат» при выделении в терминале',
+  'ai.chatShortcuts.selectionAction.description': 'Показывать небольшую кнопку AI рядом с выделенным текстом терминала.',
 
   // AI Error
   'ai.codex.bridgeError': 'Обработчики главного процесса Codex ещё не загружены. Полностью перезапустите Netcatty или dev-процесс Electron и попробуйте снова.',
@@ -228,6 +314,7 @@ export const ruAiMessages: Messages = {
   'terminal.layer.switchToSplitView': 'Переключить в режим разделения',
   'terminal.layer.sftp': 'SFTP',
   'terminal.layer.scripts': 'Скрипты',
+  'terminal.layer.history': 'История',
   'terminal.layer.theme': 'Тема',
   'terminal.layer.aiChat': 'AI-чат',
   'terminal.layer.movePanelLeft': 'Переместить панель влево',

application/i18n/locales/ru/core.ts

@@ -42,6 +42,7 @@ export const ruCoreMessages: Messages = {
   'common.more': 'Ещё',
   'common.selectAHost': 'Выберите хост',
   'common.selectAHostPlaceholder': 'Выберите хост...',
+  'sort.manual': 'Ручной порядок',
   'sort.az': 'А-Я',
   'sort.za': 'Я-А',
   'sort.newest': 'Сначала новые',
@@ -266,9 +267,9 @@ export const ruCoreMessages: Messages = {
   'settings.appearance.themeColor.dark': 'Палитра тёмной темы',
   'settings.appearance.customCss': 'Пользовательский CSS',
   'settings.appearance.customCss.desc':
-    'Добавьте пользовательский CSS, чтобы настроить внешний вид приложения. Изменения применяются сразу. Основные области интерфейса имеют атрибут [data-section="..."], который можно использовать для выбора элементов, например: snippets-panel, host-details-panel, group-details-panel, serial-host-details-panel, ai-chat-panel, vault-sidebar, vault-main, vault-hosts-header, vault-host-list, vault-view, terminal-workspace, terminal-workspace-sidebar (список терминалов в режиме Focus), terminal-host-tree-sidebar, terminal-host-tree-sidebar-content, terminal-host-tree-sidebar-row, terminal-side-panel (панель SFTP/скриптов/темы/AI, доступна пока открыта), terminal-side-panel-tabs, terminal-side-panel-content, terminal-sftp-panel, terminal-sftp-host-header, terminal-sftp-pane, terminal-sftp-toolbar, terminal-sftp-path, terminal-sftp-filter-bar, terminal-sftp-list, terminal-sftp-list-header, terminal-sftp-list-row, terminal-sftp-tree, terminal-sftp-tree-row, terminal-sftp-transfer-queue, terminal-sftp-transfer-row, terminal-split-pane, terminal-split-resizer, top-tabs.',
+    'Добавьте пользовательский CSS, чтобы настроить внешний вид приложения. Изменения применяются сразу. Основные области интерфейса имеют атрибут [data-section="..."], который можно использовать для выбора элементов, например: snippets-panel, host-details-panel, group-details-panel, serial-host-details-panel, ai-chat-panel, vault-sidebar, vault-main, vault-hosts-header, vault-host-list, vault-view, terminal-workspace, terminal-workspace-sidebar (список терминалов в режиме Focus), terminal-host-tree-sidebar, terminal-host-tree-sidebar-content, terminal-host-tree-sidebar-row, terminal-side-panel (панель SFTP/скриптов/темы/AI, доступна пока открыта), terminal-side-panel-tabs, terminal-side-panel-content, terminal-sftp-panel, terminal-sftp-host-header, terminal-sftp-pane, terminal-sftp-toolbar, terminal-sftp-path, terminal-sftp-filter-bar, terminal-sftp-list, terminal-sftp-list-header, terminal-sftp-list-row, terminal-sftp-tree, terminal-sftp-tree-row, terminal-sftp-transfer-queue, terminal-sftp-transfer-row, terminal-split-pane, terminal-split-resizer, top-tabs, top-tabs-host-tree-toggle, top-tabs-quick-switcher-toggle.',
   'settings.appearance.customCss.placeholder':
-    '/* Примеры — используйте !important, чтобы переопределить специфичность утилит Tailwind */\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': 'Шрифт интерфейса',
@@ -311,6 +312,15 @@ export const ruCoreMessages: Messages = {
   'settings.terminal.font.size.desc': 'Размер текста терминала',
   'settings.terminal.font.weight': 'Толщина шрифта',
   'settings.terminal.font.weight.desc': 'Толщина обычного текста (100-900)',
+  'settings.terminal.font.weight.thin': 'Тонкий',
+  'settings.terminal.font.weight.extraLight': 'Очень светлый',
+  'settings.terminal.font.weight.light': 'Светлый',
+  'settings.terminal.font.weight.normal': 'Обычный',
+  'settings.terminal.font.weight.medium': 'Средний',
+  'settings.terminal.font.weight.semiBold': 'Полужирный',
+  'settings.terminal.font.weight.bold': 'Жирный',
+  'settings.terminal.font.weight.extraBold': 'Очень жирный',
+  'settings.terminal.font.weight.black': 'Максимально жирный',
   'settings.terminal.font.weightBold': 'Толщина жирного шрифта',
   'settings.terminal.font.weightBold.desc': 'Толщина жирного текста (100-900)',
   'settings.terminal.font.linePadding': 'Межстрочный отступ',
@@ -340,6 +350,11 @@ export const ruCoreMessages: Messages = {
   'settings.terminal.behavior.middleClickPaste': 'Вставка средней кнопкой мыши',
   'settings.terminal.behavior.middleClickPaste.desc':
     'Вставлять содержимое буфера обмена по щелчку средней кнопкой',
+  'settings.terminal.behavior.middleClick': 'Поведение средней кнопки мыши',
+  'settings.terminal.behavior.middleClick.desc': 'Действие при щелчке средней кнопкой в терминале',
+  'settings.terminal.behavior.middleClick.menu': 'Показать меню',
+  'settings.terminal.behavior.middleClick.paste': 'Вставить',
+  'settings.terminal.behavior.middleClick.disabled': 'Ничего не делать',
   'settings.terminal.behavior.bracketedPaste': 'Режим bracketed paste',
   'settings.terminal.behavior.bracketedPaste.desc':
     'Оборачивать вставляемый текст escape-последовательностями, чтобы оболочка отличала вставку от обычного ввода. Отключите, если видите артефакты вида ^[[200~.',
@@ -431,6 +446,15 @@ export const ruCoreMessages: Messages = {
   'settings.terminal.connection.x11Display.desc': 'Необязательный адрес локального дисплея для перенаправления X11. Оставьте пустым, чтобы использовать системное значение по умолчанию.',
   'settings.terminal.connection.x11Display.placeholder': 'Авто (:0 или DISPLAY)',
   'settings.terminal.section.serverStats': 'Статистика сервера (Linux)',
+  'settings.terminal.section.systemManager': 'Системный менеджер',
+  'settings.terminal.systemManager.processRefreshInterval': 'Обновление списка процессов',
+  'settings.terminal.systemManager.processRefreshInterval.desc': 'Как часто обновлять список процессов в боковой панели системного менеджера.',
+  'settings.terminal.systemManager.tmuxRefreshInterval': 'Обновление сессий tmux',
+  'settings.terminal.systemManager.tmuxRefreshInterval.desc': 'Как часто обновлять список сессий tmux.',
+  'settings.terminal.systemManager.dockerListRefreshInterval': 'Обновление списка контейнеров Docker',
+  'settings.terminal.systemManager.dockerListRefreshInterval.desc': 'Как часто обновлять список контейнеров Docker.',
+  'settings.terminal.systemManager.dockerStatsRefreshInterval': 'Обновление статистики Docker',
+  'settings.terminal.systemManager.dockerStatsRefreshInterval.desc': 'Как часто обновлять CPU/память/сеть контейнеров Docker.',
   'settings.terminal.serverStats.show': 'Показывать статистику сервера',
   'settings.terminal.serverStats.show.desc': 'Показывать загрузку CPU, памяти и диска в строке состояния терминала (только для Linux-серверов).',
   'settings.terminal.serverStats.refreshInterval': 'Интервал обновления',
@@ -442,8 +466,6 @@ export const ruCoreMessages: Messages = {
   'settings.terminal.rendering.renderer': 'Рендерер',
   'settings.terminal.rendering.renderer.desc': 'Выберите технологию рендеринга терминала. В режиме "Авто" на устройствах с малым объёмом памяти будет использоваться DOM. Изменения применяются к новым терминальным сессиям.',
   'settings.terminal.rendering.auto': 'Авто',
-  'settings.terminal.rendering.lineTimestamps': 'Добавлять время к выводу',
-  'settings.terminal.rendering.lineTimestamps.desc': 'Вставлять локальное время перед строками вывода терминала. Метка времени становится частью видимого содержимого терминала.',
 
   // Settings > Terminal > Workspace Focus Indicator
   'settings.terminal.section.workspaceFocus': 'Индикатор фокуса рабочей области',
@@ -468,6 +490,8 @@ export const ruCoreMessages: Messages = {
   'settings.shortcuts.scheme.disabled': 'Отключено',
   'settings.shortcuts.scheme.mac': 'Mac (Cmd)',
   'settings.shortcuts.scheme.pc': 'PC (Ctrl)',
+  'settings.shortcuts.disableTerminalFontZoom.label': 'Отключить масштаб терминала',
+  'settings.shortcuts.disableTerminalFontZoom.desc': 'Отключает быстрый масштаб текста в терминале, включая Cmd/Ctrl + колесо мыши.',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.label': 'Цифры без закреплённых вкладок',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.desc': 'Если включено, Cmd/Ctrl+[1...9] переключает только рабочие вкладки (терминалы, рабочие области, редакторы), а не закреплённые Vault и SFTP.',
   'settings.shortcuts.section.custom': 'Пользовательские сочетания',
@@ -485,6 +509,7 @@ export const ruCoreMessages: Messages = {
   'settings.shortcuts.binding.next-tab': 'Следующая вкладка',
   'settings.shortcuts.binding.prev-tab': 'Предыдущая вкладка',
   'settings.shortcuts.binding.close-tab': 'Закрыть вкладку',
+  'settings.shortcuts.binding.close-session': 'Закрыть панель сессии',
   'settings.shortcuts.binding.new-tab': 'Новая локальная вкладка',
   'settings.shortcuts.binding.copy': 'Копировать из терминала',
   'settings.shortcuts.binding.paste': 'Вставить в терминал',
@@ -492,9 +517,13 @@ export const ruCoreMessages: Messages = {
   'settings.shortcuts.binding.select-all': 'Выделить всё содержимое терминала',
   'settings.shortcuts.binding.clear-buffer': 'Очистить буфер терминала',
   'settings.shortcuts.binding.search-terminal': 'Открыть поиск по терминалу',
+  'settings.shortcuts.binding.increase-terminal-font-size': 'Увеличить размер шрифта терминала',
+  'settings.shortcuts.binding.decrease-terminal-font-size': 'Уменьшить размер шрифта терминала',
+  'settings.shortcuts.binding.reset-terminal-font-size': 'Сбросить размер шрифта терминала',
   'settings.shortcuts.binding.move-focus': 'Переместить фокус между разделёнными окнами',
   'settings.shortcuts.binding.split-horizontal': 'Горизонтальное разделение',
   'settings.shortcuts.binding.split-vertical': 'Вертикальное разделение',
+  'settings.shortcuts.binding.toggle-pane-zoom': 'Переключить масштаб панели',
   'settings.shortcuts.binding.open-hosts': 'Открыть список хостов',
   'settings.shortcuts.binding.open-local': 'Открыть локальный терминал',
   'settings.shortcuts.binding.open-sftp': 'Открыть SFTP',

application/i18n/locales/ru/systemManager.ts

@@ -0,0 +1,181 @@
+import type { Messages } from '../types';
+
+export const ruSystemManagerMessages: Messages = {
+  'terminal.layer.system': 'Система',
+
+  'systemManager.noSession': 'Нет активного терминального сеанса.',
+  'systemManager.notConnected': 'Подключитесь к хосту для управления процессами и сервисами.',
+  'systemManager.empty': 'Нет данных.',
+  'systemManager.tabs.processes': 'Процессы',
+  'systemManager.tabs.tmux': 'tmux',
+  'systemManager.tabs.docker': 'Docker',
+  'systemManager.popup.loading': 'Открытие терминала…',
+  'systemManager.popup.startupFailed': 'Команда запуска не была выполнена успешно. Проверьте, что цель доступна, и повторите попытку.',
+
+  'systemManager.errors.loadProcesses': 'Не удалось загрузить процессы',
+  'systemManager.errors.loadTmux': 'Не удалось загрузить сессии tmux',
+  'systemManager.errors.loadTmuxWindows': 'Не удалось загрузить окна tmux',
+  'systemManager.errors.loadTmuxPanes': 'Не удалось загрузить панели tmux',
+  'systemManager.errors.loadTmuxClients': 'Не удалось загрузить клиентов tmux',
+  'systemManager.errors.actionFailed': 'Не удалось выполнить действие',
+  'systemManager.errors.loadDocker': 'Не удалось загрузить контейнеры',
+  'systemManager.errors.loadDockerStats': 'Не удалось загрузить статистику контейнеров',
+  'systemManager.errors.loadDockerImages': 'Не удалось загрузить образы',
+  'systemManager.errors.sshChannelUnavailable': 'Сервер отказался открыть новый канал выполнения. Повторите попытку позже или переподключите этот хост.',
+
+  'systemManager.processes.search': 'Поиск процессов…',
+  'systemManager.processes.command': 'Команда',
+  'systemManager.processes.user': 'Пользователь',
+  'systemManager.processes.term': 'Завершить',
+  'systemManager.processes.kill': 'Убить',
+  'systemManager.processes.stop': 'Остановить (SIGSTOP)',
+  'systemManager.processes.cont': 'Продолжить (SIGCONT)',
+  'systemManager.processes.hup': 'Сигнал SIGHUP',
+  'systemManager.processes.renice': 'Renice',
+  'systemManager.processes.renicePrompt': 'Значение nice (-20 до 19)',
+  'systemManager.processes.reniceInvalid': 'Nice должно быть от -20 до 19',
+  'systemManager.processes.confirmKill': 'Отправить SIGKILL процессу {{pid}}?',
+  'systemManager.processes.confirmSignal': 'Отправить SIG{{signal}} процессу {{pid}}?',
+  'systemManager.processes.filter.all': 'Все',
+  'systemManager.processes.filter.running': 'Активные',
+  'systemManager.processes.ppid': 'Родительский PID',
+  'systemManager.processes.rss': 'RSS',
+  'systemManager.processes.vsz': 'Виртуальный размер',
+  'systemManager.processes.elapsed': 'Время работы',
+  'systemManager.processes.stat': 'Состояние',
+  'systemManager.processes.meta': '{{count}} проц.',
+  'systemManager.processes.loading': 'Загрузка процессов…',
+  'systemManager.processes.loadingMore': 'Загрузка следующих процессов…',
+  'systemManager.processes.state.running': 'Активен',
+  'systemManager.processes.state.sleeping': 'Сон',
+  'systemManager.processes.state.stopped': 'Остановлен',
+  'systemManager.processes.state.zombie': 'Зомби',
+  'systemManager.processes.sort.cpu': 'CPU',
+  'systemManager.processes.sort.mem': 'Память',
+  'systemManager.processes.sort.pid': 'PID',
+  'systemManager.processes.sort.command': 'Команда',
+  'systemManager.processes.sort.user': 'Пользователь',
+
+  'systemManager.common.dismiss': 'Закрыть',
+  'systemManager.common.checkingAvailability': 'Проверка доступности…',
+  'systemManager.common.loading': 'Загрузка…',
+  'systemManager.common.loadingDetails': 'Загрузка деталей…',
+  'systemManager.common.loadingStats': 'Загрузка статистики…',
+
+  'systemManager.tmux.new': 'Создать',
+  'systemManager.tmux.search': 'Поиск сессий…',
+  'systemManager.tmux.newSessionTitle': 'Новая сессия tmux',
+  'systemManager.tmux.newSessionDesc': 'Задайте имя сессии и при необходимости команду запуска.',
+  'systemManager.tmux.newSessionTabCustom': 'Своя команда',
+  'systemManager.tmux.newSessionTabSnippet': 'Из сниппета',
+  'systemManager.tmux.pickSnippet': 'Из сниппетов',
+  'systemManager.tmux.pickSnippetEmpty': 'Сниппетов пока нет — добавьте их на панели скриптов или в хранилище.',
+  'systemManager.tmux.selectedSnippet': 'Выбран сниппет: {{label}}',
+  'systemManager.tmux.newSessionName': 'Имя сессии',
+  'systemManager.tmux.newSessionCommand': 'Команда запуска',
+  'systemManager.tmux.newSessionCommandPlaceholder': 'например htop или npm run dev (необяз.)',
+  'systemManager.tmux.newSessionCommandHint': 'Оставьте пустым для сессии с shell по умолчанию.',
+  'systemManager.tmux.creating': 'Создание…',
+  'systemManager.tmux.newSessionPlaceholder': 'my-session',
+  'systemManager.tmux.newSessionRequired': 'Сначала введите имя сессии',
+  'systemManager.tmux.empty': 'Нет сессий tmux',
+  'systemManager.tmux.attach': 'Подключить',
+  'systemManager.tmux.attached': 'Подключена',
+  'systemManager.tmux.detached': 'Отключена',
+  'systemManager.tmux.windows': '{{count}} окон',
+  'systemManager.tmux.created': 'Создана',
+  'systemManager.tmux.activity': 'Активность',
+  'systemManager.tmux.rename': 'Переименовать',
+  'systemManager.tmux.detach': 'Отключить всех',
+  'systemManager.tmux.killSession': 'Завершить сессию',
+  'systemManager.tmux.killServer': 'Остановить сервер',
+  'systemManager.tmux.loadingDetails': 'Загрузка деталей…',
+  'systemManager.tmux.clients': 'Подключённые клиенты',
+  'systemManager.tmux.windowList': 'Окна',
+  'systemManager.tmux.newWindow': 'Новое окно',
+  'systemManager.tmux.newWindowPlaceholder': 'Имя окна (необязательно)',
+  'systemManager.tmux.noWindows': 'Нет окон',
+  'systemManager.tmux.unavailable': 'tmux недоступен на этом хосте',
+  'systemManager.docker.unavailable': 'Docker недоступен на этом хосте',
+  'systemManager.tmux.windowsMismatch': 'В сессии указано {{count}} окон, но list-windows ничего не вернул',
+  'systemManager.tmux.lastCommand': 'последняя команда: {{command}}',
+  'systemManager.tmux.noPanes': 'Нет панелей',
+  'systemManager.tmux.panes': '{{count}} пан.',
+  'systemManager.tmux.active': 'активно',
+  'systemManager.tmux.unnamedWindow': 'Безымянное окно',
+  'systemManager.tmux.unnamedPane': 'Безымянная панель',
+  'systemManager.tmux.attachWindow': 'Подключить к окну',
+  'systemManager.tmux.selectWindow': 'Выбрать окно',
+  'systemManager.tmux.killWindow': 'Закрыть окно',
+  'systemManager.tmux.killPane': 'Закрыть панель',
+  'systemManager.tmux.splitHorizontal': 'Разделить горизонтально',
+  'systemManager.tmux.splitVertical': 'Разделить вертикально',
+  'systemManager.tmux.sendKeys': 'Отправить клавиши',
+  'systemManager.tmux.sendKeysTo': 'Отправить клавиши в окно {{window}} панель {{pane}}',
+  'systemManager.tmux.sendKeysPlaceholder': 'Команда или текст…',
+  'systemManager.tmux.renameSessionPrompt': 'Переименовать сессию',
+  'systemManager.tmux.renameWindowPrompt': 'Переименовать окно',
+  'systemManager.tmux.windowName': 'Имя окна',
+  'systemManager.tmux.confirmKillSession': 'Завершить сессию tmux «{{name}}»?',
+  'systemManager.tmux.confirmDetachSession': 'Отключить всех клиентов от «{{name}}»?',
+  'systemManager.tmux.confirmKillWindow': 'Закрыть окно «{{name}}»?',
+  'systemManager.tmux.confirmKillPane': 'Закрыть панель #{{index}}?',
+  'systemManager.tmux.confirmKillServer': 'Остановить сервер tmux? Все сессии будут завершены.',
+  'systemManager.tmux.meta': '{{count}} сессий',
+
+  'systemManager.docker.title': 'Контейнеры',
+  'systemManager.docker.subTabs.containers': 'Контейнеры',
+  'systemManager.docker.subTabs.images': 'Образы',
+  'systemManager.docker.empty': 'Контейнеры не найдены',
+  'systemManager.docker.imagesEmpty': 'Образы не найдены',
+  'systemManager.docker.search': 'Поиск контейнеров…',
+  'systemManager.docker.searchImages': 'Поиск образов…',
+  'systemManager.docker.filter.all': 'Все',
+  'systemManager.docker.filter.running': 'Запущены',
+  'systemManager.docker.filter.stopped': 'Остановлены',
+  'systemManager.docker.filter.paused': 'На паузе',
+  'systemManager.docker.shell': 'Shell',
+  'systemManager.docker.logs': 'Логи',
+  'systemManager.docker.details': 'Детали',
+  'systemManager.docker.inspect': 'Inspect',
+  'systemManager.docker.imageInspect': 'Inspect образа',
+  'systemManager.docker.confirmRemove': 'Удалить этот контейнер?',
+  'systemManager.docker.confirmKill': 'Принудительно завершить контейнер?',
+  'systemManager.docker.confirmRemoveImage': 'Удалить образ «{{name}}»?',
+  'systemManager.docker.confirmPrune': 'Удалить dangling-образы?',
+  'systemManager.docker.confirmPruneAll': 'Удалить все неиспользуемые образы?',
+  'systemManager.docker.pause': 'Пауза',
+  'systemManager.docker.unpause': 'Возобновить',
+  'systemManager.docker.restart': 'Перезапустить',
+  'systemManager.docker.kill': 'Kill',
+  'systemManager.docker.renamePrompt': 'Имя контейнера',
+  'systemManager.docker.prune': 'Prune',
+  'systemManager.docker.pruneAll': 'Prune all',
+  'systemManager.docker.tag': 'Tag',
+  'systemManager.docker.tagRepoPrompt': 'Имя репозитория',
+  'systemManager.docker.tagNamePrompt': 'Имя тега',
+  'systemManager.docker.meta': '{{count}} конт.',
+  'systemManager.docker.imagesMeta': '{{count}} образов',
+  'systemManager.docker.start': 'Запустить',
+  'systemManager.docker.stop': 'Остановить',
+
+  'systemManager.inspect.status': 'Статус',
+  'systemManager.inspect.image': 'Образ',
+  'systemManager.inspect.created': 'Создан',
+  'systemManager.inspect.started': 'Запущен',
+  'systemManager.inspect.restartPolicy': 'Перезапуск',
+  'systemManager.inspect.command': 'Команда',
+  'systemManager.inspect.ports': 'Порты',
+  'systemManager.inspect.networks': 'Сети',
+  'systemManager.inspect.mounts': 'Тома',
+  'systemManager.inspect.env': 'Окружение',
+  'systemManager.inspect.labels': 'Метки',
+  'systemManager.inspect.tags': 'Теги',
+  'systemManager.inspect.digests': 'Дайджесты',
+  'systemManager.inspect.size': 'Размер',
+  'systemManager.inspect.platform': 'Платформа',
+  'systemManager.inspect.workdir': 'Рабочий каталог',
+  'systemManager.inspect.exposedPorts': 'Открытые порты',
+  'systemManager.inspect.showRaw': 'JSON',
+  'systemManager.inspect.hideRaw': 'Скрыть JSON',
+};

application/i18n/locales/ru/terminal.ts

@@ -26,14 +26,34 @@ export const ruTerminalMessages: Messages = {
   // Terminal toolbar / search / context menu / auth
   'terminal.toolbar.openSftp': 'Открыть SFTP',
   'terminal.toolbar.availableAfterConnect': 'Доступно после подключения',
+  'terminal.toolbar.sendYmodem': 'Отправить через YMODEM',
+  'terminal.toolbar.receiveYmodem': 'Получить через YMODEM',
   'terminal.toolbar.sftp': 'SFTP',
   'terminal.toolbar.more': 'Другие действия',
   'terminal.toolbar.scripts': 'Скрипты',
+  'terminal.toolbar.history': 'История команд',
+  'history.scope.label': 'Область истории',
+  'history.tab.host': 'Хост',
+  'history.tab.global': 'Глобальная',
+  'history.searchPlaceholder': 'Поиск по истории...',
+  'history.loading': 'Загрузка удалённой истории...',
+  'history.meta.count': '{count} команд',
+  'history.empty.noSession': 'Откройте удалённую сессию, чтобы просмотреть историю команд.',
+  'history.empty.unsupportedProtocol': 'История команд доступна только для сессий SSH/Mosh/ET.',
+  'history.empty.noHistory': 'История команд на этом хосте не найдена.',
+  'history.empty.noGlobalHistory': 'Глобальной истории команд пока нет. Выполненные команды появятся здесь.',
+  'history.action.refresh': 'Обновить',
+  'history.action.retry': 'Повторить',
+  'history.action.paste': 'Вставить в терминал',
+  'history.action.run': 'Выполнить в терминале',
+  'history.action.saveAsSnippet': 'Сохранить как сниппет',
   'terminal.toolbar.library': 'Библиотека',
   'terminal.toolbar.noSnippets': 'Нет доступных сниппетов',
   'terminal.toolbar.terminalSettings': 'Настройки терминала',
   'terminal.toolbar.searchTerminal': 'Поиск по терминалу',
   'terminal.toolbar.search': 'Поиск',
+  'terminal.toolbar.timestampsEnable': 'Показать время',
+  'terminal.toolbar.timestampsDisable': 'Скрыть время',
   'terminal.toolbar.broadcast': 'Трансляция',
   'terminal.toolbar.broadcastEnable': 'Включить режим трансляции',
   'terminal.toolbar.broadcastDisable': 'Отключить режим трансляции',
@@ -52,6 +72,7 @@ export const ruTerminalMessages: Messages = {
   'terminal.composeBar.snippetClickHint': 'Клик — вставить · Shift+клик — отправить',
   'terminal.toolbar.focus': 'Фокус',
   'terminal.toolbar.focusMode': 'Режим фокуса',
+  'terminal.toolbar.detach': 'Открепить в отдельную вкладку',
   'terminal.toolbar.encoding': 'Кодировка терминала',
   'terminal.toolbar.encoding.utf8': 'UTF-8',
   'terminal.toolbar.encoding.gb18030': 'GB18030',
@@ -90,7 +111,9 @@ export const ruTerminalMessages: Messages = {
   'terminal.dragDrop.localTitle': 'Перетащите для вставки путей',
   'terminal.dragDrop.localMessage': 'Пути к файлам будут вставлены в терминал',
   'terminal.dragDrop.remoteTitle': 'Перетащите для загрузки файлов',
-  'terminal.dragDrop.remoteMessage': 'Файлы будут загружены через SFTP',
+  'terminal.dragDrop.remoteZmodemMessage': 'Файлы будут загружены через ZMODEM (PTY)',
+  'terminal.dragDrop.remoteSftpMessage': 'Файлы будут загружены через SFTP',
+  'terminal.dragDrop.noFiles': 'Нет файлов для загрузки',
   'terminal.dragDrop.notConnected': 'Нельзя перетащить файлы — терминал не подключён',
   'terminal.dragDrop.errorTitle': 'Ошибка перетаскивания',
   'terminal.dragDrop.errorMessage': 'Не удалось обработать перетащенные файлы',
@@ -104,10 +127,27 @@ export const ruTerminalMessages: Messages = {
   'terminal.menu.pasteSelection': 'Вставить выделенное',
   'terminal.menu.selectAll': 'Выбрать всё',
   'terminal.menu.reconnect': 'Переподключиться',
+  'terminal.menu.sendYmodem': 'Отправить через YMODEM',
+  'terminal.menu.receiveYmodem': 'Получить через YMODEM',
   'terminal.menu.splitHorizontal': 'Разделить по горизонтали',
   'terminal.menu.splitVertical': 'Разделить по вертикали',
   'terminal.menu.clearBuffer': 'Очистить буфер',
   'terminal.menu.closeTerminal': 'Закрыть терминал',
+  'terminal.menu.rename': 'Переименовать',
+  'terminal.menu.detach': 'Открепить из рабочей области',
+  'terminal.menu.detachSession': 'Открепить {name}',
+  'terminal.ymodem.selectFile': 'Выберите файл для отправки',
+  'terminal.ymodem.allFiles': 'Все файлы',
+  'terminal.ymodem.started': 'YMODEM отправляет {fileName}',
+  'terminal.ymodem.complete': 'YMODEM отправил {fileName}',
+  'terminal.ymodem.failed': 'Не удалось отправить через YMODEM',
+  'terminal.ymodem.selectReceiveDirectory': 'Выберите папку для полученных файлов',
+  'terminal.ymodem.receiveStarted': 'YMODEM получает...',
+  'terminal.ymodem.receiveComplete': 'YMODEM получил {fileName}',
+  'terminal.ymodem.receiveCompleteMultiple': 'YMODEM получил файлов: {count}',
+  'terminal.ymodem.receiveEmpty': 'Файлы YMODEM не получены',
+  'terminal.ymodem.receiveFailed': 'Не удалось получить через YMODEM',
+  'terminal.ymodem.unavailable': 'YMODEM недоступен',
   'terminal.selection.addToAI': 'Добавить в чат',
   'terminal.selection.addToAIDesc': 'Прикрепить выбранный вывод терминала к черновику AI',
   'terminal.auth.password': 'Пароль',

application/i18n/locales/ru/vault.ts

@@ -186,6 +186,9 @@ export const ruVaultMessages: Messages = {
   'sftp.moveTo.pathNotFound': 'Каталог не найден или недоступен',
   'sftp.context.download': 'Скачать',
   'sftp.context.copyToOtherPane': 'Копировать в другую панель',
+  'sftp.copyCurrentPath': 'Копировать текущий путь',
+  'sftp.copyCurrentPath.success': 'Текущий путь скопирован',
+  'sftp.copyCurrentPath.error': 'Не удалось скопировать текущий путь',
   'sftp.viewMode.label': 'Режим просмотра',
   'sftp.viewMode.list': 'Список',
   'sftp.viewMode.tree': 'Дерево',
@@ -293,6 +296,8 @@ export const ruVaultMessages: Messages = {
   'sftp.tabs.addTab': 'Добавить новую вкладку',
   'sftp.tabs.closeTab': 'Закрыть вкладку',
   'sftp.tabs.newTab': 'Новая вкладка',
+  'sftp.tabs.copyDefaultPath': 'Копировать вкладку (путь по умолчанию)',
+  'sftp.tabs.copyCurrentPath': 'Копировать и перейти к текущему пути',
   'sftp.conflict.title': 'Конфликт файлов',
   'sftp.conflict.desc': 'В месте назначения уже существует файл с таким именем',
   'sftp.conflict.alreadyExistsSuffix': 'уже существует',
@@ -497,7 +502,52 @@ export const ruVaultMessages: Messages = {
   'hostDetails.section.portCredentials': 'Порт и учётные данные',
   'hostDetails.section.appearance': 'Внешний вид',
   'hostDetails.distro.title': 'Дистрибутив Linux',
-  'hostDetails.distro.desc': 'Автоопределение при подключении или ручное переопределение значка дистрибутива.',
+  'hostDetails.distro.desc': 'Управляет автоматическим значком хоста. Свой значок хоста переопределяет это отображение.',
+  'hostDetails.icon.title': 'Значок хоста',
+  'hostDetails.icon.desc': 'Используйте автоматический значок дистрибутива с отдельным цветом или выберите встроенный значок.',
+  'hostDetails.icon.mode.auto': 'Авто',
+  'hostDetails.icon.mode.custom': 'Свой',
+  'hostDetails.icon.reset': 'Сбросить значок',
+  'hostDetails.icon.showLibrary': 'Показать библиотеку значков',
+  'hostDetails.icon.hideLibrary': 'Скрыть библиотеку значков',
+  'hostDetails.icon.autoUsesDistro': 'Использует значок дистрибутива Linux и выбранный цвет для этого хоста.',
+  'hostDetails.icon.customOverridesDistro': 'Встроенный значок заменяет значок дистрибутива Linux для этого хоста.',
+  'hostDetails.icon.option.server': 'Сервер',
+  'hostDetails.icon.option.terminal': 'Терминал',
+  'hostDetails.icon.option.database': 'База данных',
+  'hostDetails.icon.option.cloud': 'Облако',
+  'hostDetails.icon.option.router': 'Маршрутизатор',
+  'hostDetails.icon.option.shield': 'Защита',
+  'hostDetails.icon.option.code': 'Код',
+  'hostDetails.icon.option.box': 'Узел',
+  'hostDetails.icon.option.globe': 'Глобус',
+  'hostDetails.icon.option.cpu': 'CPU',
+  'hostDetails.icon.option.hard-drive': 'Хранилище',
+  'hostDetails.icon.option.network': 'Сеть',
+  'hostDetails.icon.option.wifi': 'Wi-Fi',
+  'hostDetails.icon.option.lock': 'Замок',
+  'hostDetails.icon.option.key': 'Ключ',
+  'hostDetails.icon.option.monitor': 'Монитор',
+  'hostDetails.icon.option.container': 'Контейнер',
+  'hostDetails.icon.option.activity': 'Активность',
+  'hostDetails.icon.option.zap': 'Быстрый',
+  'hostDetails.icon.option.server-cog': 'Настройки сервера',
+  'hostDetails.icon.color.blue': 'Синий',
+  'hostDetails.icon.color.green': 'Зеленый',
+  'hostDetails.icon.color.red': 'Красный',
+  'hostDetails.icon.color.amber': 'Янтарный',
+  'hostDetails.icon.color.purple': 'Фиолетовый',
+  'hostDetails.icon.color.cyan': 'Голубой',
+  'hostDetails.icon.color.orange': 'Оранжевый',
+  'hostDetails.icon.color.slate': 'Серый',
+  'hostDetails.icon.color.violet': 'Фиолетово-синий',
+  'hostDetails.icon.color.pink': 'Розовый',
+  'hostDetails.icon.color.rose': 'Розово-красный',
+  'hostDetails.icon.color.lime': 'Лаймовый',
+  'hostDetails.icon.color.teal': 'Бирюзовый',
+  'hostDetails.icon.color.sky': 'Небесный',
+  'hostDetails.icon.color.indigo': 'Индиго',
+  'hostDetails.icon.color.zinc': 'Цинковый',
   'hostDetails.distro.mode': 'Источник',
   'hostDetails.distro.mode.auto': 'Автоопределение',
   'hostDetails.distro.mode.manual': 'Ручное переопределение',
@@ -518,6 +568,7 @@ export const ruVaultMessages: Messages = {
   'hostDetails.distro.option.redhat': 'Red Hat / RHEL',
   'hostDetails.distro.option.almalinux': 'AlmaLinux',
   'hostDetails.distro.option.alinux': 'Alibaba Cloud Linux',
+  'hostDetails.distro.option.openeuler': 'openEuler',
   'hostDetails.distro.option.oracle': 'Oracle Linux',
   'hostDetails.distro.option.kali': 'Kali Linux',
   'hostDetails.distro.option.cisco': 'Cisco',
@@ -562,6 +613,8 @@ export const ruVaultMessages: Messages = {
   'hostDetails.deviceType.warning': 'Команды AI-агента будут отправляться напрямую без отслеживания кода выхода. Включайте только для устройств, на которых нет стандартной оболочки.',
   'hostDetails.section.sshAlgorithms': 'SSH-алгоритмы',
   'hostDetails.section.terminalBehavior': 'Поведение терминала',
+  'hostDetails.lineTimestamps': 'Показывать время вывода',
+  'hostDetails.lineTimestamps.desc': 'Показывать локальное время рядом с видимыми строками вывода для этого хоста, не изменяя текст терминала.',
   'hostDetails.legacyAlgorithms': 'Разрешить устаревшие алгоритмы',
   'hostDetails.legacyAlgorithms.desc': 'Включить устаревшие SSH-алгоритмы (diffie-hellman-group1, ssh-dss, 3des-cbc и т. д.) для подключения к старому сетевому оборудованию.',
   'hostDetails.legacyAlgorithms.warning': 'У этих алгоритмов есть известные слабые места безопасности. Включайте только для устаревших устройств, которые не поддерживают современную криптографию.',

application/i18n/locales/settingsLocales.test.ts

@@ -0,0 +1,77 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { DEFAULT_KEY_BINDINGS } from "../../../domain/models/keyBindings.ts";
+import { HOST_ICON_COLORS, HOST_ICON_IDS } from "../../../domain/hostIcon.ts";
+import zhCN from "./zh-CN.ts";
+import ru from "./ru.ts";
+
+const LOCALIZED_SETTINGS_LOCALES = [
+  { name: "zh-CN", messages: zhCN },
+  { name: "ru", messages: ru },
+];
+
+test("localized settings include names for every default shortcut", () => {
+  for (const locale of LOCALIZED_SETTINGS_LOCALES) {
+    const missing = DEFAULT_KEY_BINDINGS
+      .map((binding) => `settings.shortcuts.binding.${binding.id}`)
+      .filter((key) => !locale.messages[key]);
+
+    assert.deepEqual(missing, [], `${locale.name} is missing shortcut labels`);
+  }
+});
+
+test("localized settings include workspace focus indicator labels", () => {
+  const keys = [
+    "settings.terminal.section.workspaceFocus",
+    "settings.terminal.workspaceFocus.style",
+    "settings.terminal.workspaceFocus.style.desc",
+    "settings.terminal.workspaceFocus.dim",
+    "settings.terminal.workspaceFocus.border",
+  ];
+
+  for (const locale of LOCALIZED_SETTINGS_LOCALES) {
+    const missing = keys.filter((key) => !locale.messages[key]);
+    assert.deepEqual(missing, [], `${locale.name} is missing workspace focus labels`);
+  }
+});
+
+test("localized settings include terminal font weight option labels", () => {
+  const keys = [
+    "settings.terminal.font.weight.thin",
+    "settings.terminal.font.weight.extraLight",
+    "settings.terminal.font.weight.light",
+    "settings.terminal.font.weight.normal",
+    "settings.terminal.font.weight.medium",
+    "settings.terminal.font.weight.semiBold",
+    "settings.terminal.font.weight.bold",
+    "settings.terminal.font.weight.extraBold",
+    "settings.terminal.font.weight.black",
+  ];
+
+  for (const locale of LOCALIZED_SETTINGS_LOCALES) {
+    const missing = keys.filter((key) => !locale.messages[key]);
+    assert.deepEqual(missing, [], `${locale.name} is missing font weight labels`);
+  }
+});
+
+test("localized vault messages include host icon labels", () => {
+  const keys = [
+    "hostDetails.icon.title",
+    "hostDetails.icon.desc",
+    "hostDetails.icon.mode.auto",
+    "hostDetails.icon.mode.custom",
+    "hostDetails.icon.reset",
+    "hostDetails.icon.showLibrary",
+    "hostDetails.icon.hideLibrary",
+    "hostDetails.icon.autoUsesDistro",
+    "hostDetails.icon.customOverridesDistro",
+    ...HOST_ICON_IDS.map((id) => `hostDetails.icon.option.${id}`),
+    ...HOST_ICON_COLORS.map((color) => `hostDetails.icon.color.${color.id}`),
+  ];
+
+  for (const locale of LOCALIZED_SETTINGS_LOCALES) {
+    const missing = keys.filter((key) => !locale.messages[key]);
+    assert.deepEqual(missing, [], `${locale.name} is missing host icon labels`);
+  }
+});

application/i18n/locales/zh-CN.ts

@@ -3,6 +3,7 @@ import { zhCNCoreMessages } from './zh-CN/core';
 import { zhCNVaultMessages } from './zh-CN/vault';
 import { zhCNTerminalMessages } from './zh-CN/terminal';
 import { zhCNAiMessages } from './zh-CN/ai';
+import { zhCnSystemManagerMessages } from './zh-CN/systemManager';
 
 export type { Messages } from './types';
 
@@ -11,6 +12,7 @@ const zhCN: Messages = {
   ...zhCNVaultMessages,
   ...zhCNTerminalMessages,
   ...zhCNAiMessages,
+  ...zhCnSystemManagerMessages,
 };
 
 export default zhCN;

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

@@ -3,9 +3,11 @@ import type { Messages } from '../types';
 export const zhCNAiMessages: Messages = {
   // AI Settings
   'ai.agentSettings': 'Agent 设置',
+  'ai.chat.preparing': '准备中…',
   'ai.title': 'AI',
   'ai.description': '配置 AI 提供商、Agent 和安全设置',
   'ai.providers': '提供商',
+  'ai.agents': 'Agent',
   'ai.providers.empty': '尚未配置提供商。添加一个提供商以开始使用。',
   'ai.providers.add': '添加提供商',
   'ai.providers.active': '活跃',
@@ -106,6 +108,54 @@ export const zhCNAiMessages: Messages = {
   'ai.copilot.customPathPlaceholder': '例如 /usr/local/bin/copilot',
   'ai.copilot.check': '检查',
 
+  // AI Cursor SDK
+  'ai.cursor.title': 'Cursor',
+  'ai.cursor.description': '使用 Cursor SDK。',
+  'ai.cursor.detecting': '检测中...',
+  'ai.cursor.detected': '可用',
+  'ai.cursor.notFound': '不可用',
+  'ai.cursor.path': '运行环境：',
+  'ai.cursor.notFoundHint': '填写 API Key 后即可使用。',
+  'ai.cursor.notInstalledHint': '未检测到 Cursor SDK。',
+  'ai.cursor.installStatus': 'Cursor SDK',
+  'ai.cursor.installed': '已检测到',
+  'ai.cursor.notInstalled': '未检测到',
+  'ai.cursor.apiKeyStatus': 'API Key',
+  'ai.cursor.apiKeyConfigured': '已填写',
+  'ai.cursor.apiKeyMissing': '未填写',
+  'ai.cursor.apiKeyFromEnv': '来自环境变量',
+  'ai.cursor.apiKey': 'API Key',
+  'ai.cursor.apiKeyPlaceholder': '输入 Cursor API Key',
+  'ai.cursor.apiKeyPlaceholder.env': '已使用 CURSOR_API_KEY；填写后会覆盖',
+  'ai.cursor.apiKeyEnvHint': '已检测到本机 CURSOR_API_KEY。留空即可继续使用，填写保存后会覆盖它。',
+  'ai.cursor.apiKeyOverrideHint': '当前优先使用这里保存的 Key；清空保存后会回到 CURSOR_API_KEY。',
+  'ai.cursor.saveApiKey': '保存',
+  'ai.cursor.saved': '已保存',
+  'ai.cursor.showApiKey': '显示 API Key',
+  'ai.cursor.hideApiKey': '隐藏 API Key',
+  'ai.cursor.customPathPlaceholder': '例如 /usr/local/bin/cursor',
+  'ai.cursor.check': '检查',
+
+  // AI CodeBuddy Code
+  'ai.codebuddy.title': 'CodeBuddy Code',
+  'ai.codebuddy.description': '通过官方 Agent SDK（`@tencent-ai/agent-sdk`）接入 CodeBuddy Code。检测到后即可作为外部编程 Agent 使用。',
+  'ai.codebuddy.detecting': '检测中...',
+  'ai.codebuddy.detected': '已检测到',
+  'ai.codebuddy.notFound': '未找到',
+  'ai.codebuddy.path': '路径：',
+  'ai.codebuddy.notFoundHint': '在 PATH 中未找到 codebuddy。请安装或在下方指定可执行文件路径。',
+  'ai.codebuddy.customPathPlaceholder': '例如 /usr/local/bin/codebuddy',
+  'ai.codebuddy.check': '检查',
+  'ai.codebuddy.configSection': '认证与配置（可选）',
+  'ai.codebuddy.internetEnv': '网络环境',
+  'ai.codebuddy.internetEnv.default': '默认（海外）',
+  'ai.codebuddy.internetEnv.internal': 'Internal',
+  'ai.codebuddy.internetEnv.ioa': 'IOA',
+  'ai.codebuddy.internetEnv.hint': '设置 CODEBUDDY_INTERNET_ENVIRONMENT —— 受限网络环境请选择 Internal 或 IOA。',
+  'ai.codebuddy.envVars': '环境变量',
+  'ai.codebuddy.envVars.placeholder': 'CODEBUDDY_API_KEY=...\nCODEBUDDY_AUTH_TOKEN=...\nOTHER_VAR=...',
+  'ai.codebuddy.envVars.hint': '每行一个 KEY=VALUE，传给 CodeBuddy agent。可在此设置 CODEBUDDY_API_KEY 或 CODEBUDDY_AUTH_TOKEN 完成认证。明文存在本地。',
+
   // AI Default Agent
   'ai.defaultAgent': '默认 Agent',
   'ai.defaultAgent.description': '创建新 AI 会话时使用的 Agent',
@@ -127,6 +177,29 @@ export const zhCNAiMessages: Messages = {
   'ai.userSkills.status.ready': '正常',
   'ai.userSkills.status.warning': '警告',
 
+  // AI Quick Messages
+  'ai.quickMessages.title': '快捷消息',
+  'ai.quickMessages.description': '创建常用提示词，在 AI 聊天框输入 / 或点击快捷按钮即可插入到输入框。与用户 Skills 不同，快捷消息会直接填入消息内容。',
+  'ai.quickMessages.add': '添加快捷消息',
+  'ai.quickMessages.createTitle': '新建快捷消息',
+  'ai.quickMessages.editTitle': '编辑快捷消息',
+  'ai.quickMessages.name': '名称',
+  'ai.quickMessages.name.placeholder': '例如：检查磁盘空间',
+  'ai.quickMessages.slug': '命令',
+  'ai.quickMessages.slug.placeholder': 'disk-check',
+  'ai.quickMessages.descriptionField': '说明（可选）',
+  'ai.quickMessages.descriptionField.placeholder': '简短描述这条快捷消息的用途',
+  'ai.quickMessages.content': '消息内容',
+  'ai.quickMessages.content.placeholder': '输入选择后要插入的完整提示词...',
+  'ai.quickMessages.empty': '还没有快捷消息。添加几条常用提示，聊天时就能一键插入。',
+  'ai.quickMessages.confirmDelete': '确定删除快捷消息「{name}」吗？',
+  'ai.quickMessages.error.nameRequired': '请填写名称。',
+  'ai.quickMessages.error.invalidSlug': '命令只能包含小写字母、数字和连字符。',
+  'ai.quickMessages.error.contentRequired': '请填写消息内容。',
+  'ai.quickMessages.error.slugTaken': '该命令已被其他快捷消息使用。',
+  'ai.quickMessages.error.slugConflictsWithSkill': '该命令与用户 Skill「/{slug}」冲突，请换一个命令。',
+  'ai.quickMessages.error.maxItems': '最多只能保存 {max} 条快捷消息。',
+
   // AI Chat
   'ai.chat.noProvider': '尚未配置 AI 提供商。请前往 **设置 → AI → 提供商** 添加并启用一个提供商。',
   'ai.chat.toolDenied': '操作已被用户拒绝。',
@@ -175,6 +248,7 @@ export const zhCNAiMessages: Messages = {
   'ai.chat.newChat': '新对话',
   'ai.chat.allSessions': '所有会话',
   'ai.chat.loadEarlierMessages': '加载更早的消息（还有 {n} 条）',
+  'ai.chat.usedTools': '已使用 {n} 个工具',
   'ai.chat.loadMoreSessions': '加载更多会话（还有 {n} 条）',
   'ai.chat.noSessions': '没有历史会话',
   'ai.chat.retryHint': '你可以重新发送消息来重试。',
@@ -185,6 +259,18 @@ export const zhCNAiMessages: Messages = {
   'ai.chat.menuImage': '图片',
   'ai.chat.menuMentionHost': '提及主机',
   'ai.chat.menuUserSkills': '用户 Skills',
+  'ai.chat.menuSlashCommands': '快捷命令',
+  'ai.chat.slashCommands': '快捷命令',
+  'ai.chat.slashQuickMessages': '快捷消息',
+  'ai.chat.slashUserSkills': '用户 Skills',
+  'ai.chat.quickMessages': '快捷命令',
+  'ai.chat.slashNoResults': '没有匹配的命令',
+  'ai.chat.slashEmptyHint': '可在 设置 → AI → 快捷消息 中添加常用提示词。',
+
+  // AI 聊天快捷入口
+  'ai.chatShortcuts.title': '聊天快捷入口',
+  'ai.chatShortcuts.selectionAction': '选中终端内容时显示“添加到对话”',
+  'ai.chatShortcuts.selectionAction.description': '在终端里选中文本后显示 AI 快捷按钮。',
 
   // AI Error
   'ai.codex.bridgeError': 'Codex 主进程处理器尚未加载。请完全重启 Netcatty 或重启 Electron 开发进程，然后重试。',
@@ -228,6 +314,7 @@ export const zhCNAiMessages: Messages = {
   'terminal.layer.switchToSplitView': '切换到分屏视图',
   'terminal.layer.sftp': '文件传输',
   'terminal.layer.scripts': '脚本',
+  'terminal.layer.history': '命令历史',
   'terminal.layer.theme': '主题',
   'terminal.layer.aiChat': 'AI 助手',
   'terminal.layer.movePanelLeft': '面板移至左侧',

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

@@ -29,6 +29,7 @@ export const zhCNCoreMessages: Messages = {
   'common.right': '右侧',
   'common.more': '更多',
   'common.selectAHost': '选择主机',
+  'sort.manual': '手动顺序',
   'sort.az': 'A-z',
   'sort.za': 'Z-a',
   'sort.newest': '从新到旧',
@@ -250,9 +251,9 @@ export const zhCNCoreMessages: Messages = {
   'settings.appearance.themeColor.dark': '深色主题',
   'settings.appearance.customCss': '自定义 CSS',
   'settings.appearance.customCss.desc':
-    '使用自定义 CSS 个性化界面，修改会立即生效。主要 UI 区块都暴露了 [data-section="..."] 属性供你定位，比如：snippets-panel、host-details-panel、group-details-panel、serial-host-details-panel、ai-chat-panel、vault-sidebar、vault-main、vault-hosts-header、vault-host-list、vault-view、terminal-workspace、terminal-workspace-sidebar（Focus 模式终端列表）、terminal-host-tree-sidebar、terminal-host-tree-sidebar-content、terminal-host-tree-sidebar-row、terminal-side-panel（SFTP/脚本/主题/AI 侧栏，打开时生效）、terminal-side-panel-tabs、terminal-side-panel-content、terminal-sftp-panel、terminal-sftp-host-header、terminal-sftp-pane、terminal-sftp-toolbar、terminal-sftp-path、terminal-sftp-filter-bar、terminal-sftp-list、terminal-sftp-list-header、terminal-sftp-list-row、terminal-sftp-tree、terminal-sftp-tree-row、terminal-sftp-transfer-queue、terminal-sftp-transfer-row、terminal-split-pane、terminal-split-resizer、top-tabs。',
+    '使用自定义 CSS 个性化界面，修改会立即生效。主要 UI 区块都暴露了 [data-section="..."] 属性供你定位，比如：snippets-panel、host-details-panel、group-details-panel、serial-host-details-panel、ai-chat-panel、vault-sidebar、vault-main、vault-hosts-header、vault-host-list、vault-view、terminal-workspace、terminal-workspace-sidebar（Focus 模式终端列表）、terminal-host-tree-sidebar、terminal-host-tree-sidebar-content、terminal-host-tree-sidebar-row、terminal-side-panel（SFTP/脚本/主题/AI 侧栏，打开时生效）、terminal-side-panel-tabs、terminal-side-panel-content、terminal-sftp-panel、terminal-sftp-host-header、terminal-sftp-pane、terminal-sftp-toolbar、terminal-sftp-path、terminal-sftp-filter-bar、terminal-sftp-list、terminal-sftp-list-header、terminal-sftp-list-row、terminal-sftp-tree、terminal-sftp-tree-row、terminal-sftp-transfer-queue、terminal-sftp-transfer-row、terminal-split-pane、terminal-split-resizer、top-tabs、top-tabs-host-tree-toggle、top-tabs-quick-switcher-toggle。',
   'settings.appearance.customCss.placeholder':
-    '/* 示例 — 由于 Tailwind 优先级较高，需要使用 !important */\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': '界面字体',
@@ -572,6 +573,9 @@ export const zhCNCoreMessages: Messages = {
   'sftp.moveTo.pathNotFound': '目录不存在或无法访问',
   'sftp.context.download': '下载',
   'sftp.context.copyToOtherPane': '复制到另一侧',
+  'sftp.copyCurrentPath': '复制当前路径',
+  'sftp.copyCurrentPath.success': '已复制当前路径',
+  'sftp.copyCurrentPath.error': '无法复制当前路径',
   'sftp.viewMode.label': '视图模式',
   'sftp.viewMode.list': '列表视图',
   'sftp.viewMode.tree': '树形视图',

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

@@ -0,0 +1,181 @@
+import type { Messages } from '../types';
+
+export const zhCnSystemManagerMessages: Messages = {
+  'terminal.layer.system': '系统',
+
+  'systemManager.noSession': '没有活动的终端会话。',
+  'systemManager.notConnected': '请先连接到主机以管理进程与服务。',
+  'systemManager.empty': '暂无数据。',
+  'systemManager.tabs.processes': '进程',
+  'systemManager.tabs.tmux': 'tmux',
+  'systemManager.tabs.docker': 'Docker',
+  'systemManager.popup.loading': '正在打开终端…',
+  'systemManager.popup.startupFailed': '启动命令未成功。请确认目标仍然可用后重试。',
+
+  'systemManager.errors.loadProcesses': '加载进程列表失败',
+  'systemManager.errors.loadTmux': '加载 tmux 会话失败',
+  'systemManager.errors.loadTmuxWindows': '加载 tmux 窗口失败',
+  'systemManager.errors.loadTmuxPanes': '加载 tmux 面板失败',
+  'systemManager.errors.loadTmuxClients': '加载 tmux 客户端失败',
+  'systemManager.errors.actionFailed': '操作失败',
+  'systemManager.errors.loadDocker': '加载容器列表失败',
+  'systemManager.errors.loadDockerStats': '加载容器性能数据失败',
+  'systemManager.errors.loadDockerImages': '加载镜像列表失败',
+  'systemManager.errors.sshChannelUnavailable': '服务器拒绝打开新的执行通道。请稍后重试，或重新连接当前主机。',
+
+  'systemManager.processes.search': '搜索进程…',
+  'systemManager.processes.command': '命令',
+  'systemManager.processes.user': '用户',
+  'systemManager.processes.term': '终止',
+  'systemManager.processes.kill': '强杀',
+  'systemManager.processes.stop': '暂停 (SIGSTOP)',
+  'systemManager.processes.cont': '继续 (SIGCONT)',
+  'systemManager.processes.hup': '挂断 (SIGHUP)',
+  'systemManager.processes.renice': '调整优先级',
+  'systemManager.processes.renicePrompt': 'Nice 值 (-20 到 19)',
+  'systemManager.processes.reniceInvalid': 'Nice 值必须在 -20 到 19 之间',
+  'systemManager.processes.confirmKill': '向进程 {{pid}} 发送 SIGKILL？',
+  'systemManager.processes.confirmSignal': '向进程 {{pid}} 发送 SIG{{signal}}？',
+  'systemManager.processes.filter.all': '全部',
+  'systemManager.processes.filter.running': '运行中',
+  'systemManager.processes.ppid': '父进程 PID',
+  'systemManager.processes.rss': '物理内存',
+  'systemManager.processes.vsz': '虚拟内存',
+  'systemManager.processes.elapsed': '运行时长',
+  'systemManager.processes.stat': '状态',
+  'systemManager.processes.meta': '{{count}} 个进程',
+  'systemManager.processes.loading': '正在加载进程…',
+  'systemManager.processes.loadingMore': '正在显示更多进程…',
+  'systemManager.processes.state.running': '运行中',
+  'systemManager.processes.state.sleeping': '睡眠',
+  'systemManager.processes.state.stopped': '已暂停',
+  'systemManager.processes.state.zombie': '僵尸',
+  'systemManager.processes.sort.cpu': 'CPU',
+  'systemManager.processes.sort.mem': '内存',
+  'systemManager.processes.sort.pid': 'PID',
+  'systemManager.processes.sort.command': '命令',
+  'systemManager.processes.sort.user': '用户',
+
+  'systemManager.common.dismiss': '关闭',
+  'systemManager.common.checkingAvailability': '正在检查可用状态…',
+  'systemManager.common.loading': '正在加载…',
+  'systemManager.common.loadingDetails': '正在加载详情…',
+  'systemManager.common.loadingStats': '正在加载性能数据…',
+
+  'systemManager.tmux.new': '新建',
+  'systemManager.tmux.search': '搜索会话…',
+  'systemManager.tmux.newSessionTitle': '新建 tmux 会话',
+  'systemManager.tmux.newSessionDesc': '为会话命名，并可选在启动时执行脚本。',
+  'systemManager.tmux.newSessionTabCustom': '自定义命令',
+  'systemManager.tmux.newSessionTabSnippet': '从代码片段',
+  'systemManager.tmux.pickSnippet': '从代码片段选择',
+  'systemManager.tmux.pickSnippetEmpty': '暂无代码片段，可在脚本侧栏或仓库中添加。',
+  'systemManager.tmux.selectedSnippet': '已选片段：{{label}}',
+  'systemManager.tmux.newSessionName': '会话名称',
+  'systemManager.tmux.newSessionCommand': '启动命令',
+  'systemManager.tmux.newSessionCommandPlaceholder': '例如 htop 或 npm run dev（可选）',
+  'systemManager.tmux.newSessionCommandHint': '留空则创建默认 shell 会话。',
+  'systemManager.tmux.creating': '创建中…',
+  'systemManager.tmux.newSessionPlaceholder': 'my-session',
+  'systemManager.tmux.newSessionRequired': '请先输入会话名称',
+  'systemManager.tmux.empty': '没有 tmux 会话',
+  'systemManager.tmux.attach': '附加',
+  'systemManager.tmux.attached': '已附加',
+  'systemManager.tmux.detached': '未附加',
+  'systemManager.tmux.windows': '{{count}} 个窗口',
+  'systemManager.tmux.created': '创建时间',
+  'systemManager.tmux.activity': '活动时间',
+  'systemManager.tmux.rename': '重命名',
+  'systemManager.tmux.detach': '全部分离',
+  'systemManager.tmux.killSession': '结束会话',
+  'systemManager.tmux.killServer': '结束 tmux 服务',
+  'systemManager.tmux.loadingDetails': '正在加载详情…',
+  'systemManager.tmux.clients': '已附加客户端',
+  'systemManager.tmux.windowList': '窗口',
+  'systemManager.tmux.newWindow': '新建窗口',
+  'systemManager.tmux.newWindowPlaceholder': '窗口名称（可选）',
+  'systemManager.tmux.noWindows': '没有窗口',
+  'systemManager.tmux.unavailable': '此主机未检测到 tmux',
+  'systemManager.docker.unavailable': '此主机未检测到 Docker',
+  'systemManager.tmux.windowsMismatch': '会话显示有 {{count}} 个窗口，但 list-windows 未返回任何窗口',
+  'systemManager.tmux.lastCommand': '最后执行的命令：{{command}}',
+  'systemManager.tmux.noPanes': '没有面板',
+  'systemManager.tmux.panes': '{{count}} 个面板',
+  'systemManager.tmux.active': '当前',
+  'systemManager.tmux.unnamedWindow': '未命名窗口',
+  'systemManager.tmux.unnamedPane': '未命名面板',
+  'systemManager.tmux.attachWindow': '附加到窗口',
+  'systemManager.tmux.selectWindow': '选中窗口',
+  'systemManager.tmux.killWindow': '关闭窗口',
+  'systemManager.tmux.killPane': '关闭面板',
+  'systemManager.tmux.splitHorizontal': '水平分屏',
+  'systemManager.tmux.splitVertical': '垂直分屏',
+  'systemManager.tmux.sendKeys': '发送按键',
+  'systemManager.tmux.sendKeysTo': '向窗口 {{window}} 面板 {{pane}} 发送按键',
+  'systemManager.tmux.sendKeysPlaceholder': '命令或文本…',
+  'systemManager.tmux.renameSessionPrompt': '重命名会话',
+  'systemManager.tmux.renameWindowPrompt': '重命名窗口',
+  'systemManager.tmux.windowName': '窗口名称',
+  'systemManager.tmux.confirmKillSession': '确定结束 tmux 会话「{{name}}」？',
+  'systemManager.tmux.confirmDetachSession': '确定将所有客户端从「{{name}}」分离？',
+  'systemManager.tmux.confirmKillWindow': '确定关闭窗口「{{name}}」？',
+  'systemManager.tmux.confirmKillPane': '确定关闭面板 #{{index}}？',
+  'systemManager.tmux.confirmKillServer': '确定结束 tmux 服务？所有会话将被终止。',
+  'systemManager.tmux.meta': '{{count}} 个会话',
+
+  'systemManager.docker.title': '容器',
+  'systemManager.docker.subTabs.containers': '容器',
+  'systemManager.docker.subTabs.images': '镜像',
+  'systemManager.docker.empty': '未找到容器',
+  'systemManager.docker.imagesEmpty': '未找到镜像',
+  'systemManager.docker.search': '搜索容器…',
+  'systemManager.docker.searchImages': '搜索镜像…',
+  'systemManager.docker.filter.all': '全部',
+  'systemManager.docker.filter.running': '运行中',
+  'systemManager.docker.filter.stopped': '已停止',
+  'systemManager.docker.filter.paused': '已暂停',
+  'systemManager.docker.shell': 'Shell',
+  'systemManager.docker.logs': '日志',
+  'systemManager.docker.details': '详情',
+  'systemManager.docker.inspect': 'Inspect',
+  'systemManager.docker.imageInspect': '镜像 Inspect',
+  'systemManager.docker.confirmRemove': '确定删除此容器？',
+  'systemManager.docker.confirmKill': '确定强制终止此容器？',
+  'systemManager.docker.confirmRemoveImage': '确定删除镜像「{{name}}」？',
+  'systemManager.docker.confirmPrune': '确定清理悬空镜像？',
+  'systemManager.docker.confirmPruneAll': '确定清理所有未使用镜像？',
+  'systemManager.docker.pause': '暂停',
+  'systemManager.docker.unpause': '恢复',
+  'systemManager.docker.restart': '重启',
+  'systemManager.docker.kill': '强杀',
+  'systemManager.docker.renamePrompt': '容器名称',
+  'systemManager.docker.prune': '清理悬空',
+  'systemManager.docker.pruneAll': '清理全部',
+  'systemManager.docker.tag': '打标签',
+  'systemManager.docker.tagRepoPrompt': '仓库名',
+  'systemManager.docker.tagNamePrompt': '标签名',
+  'systemManager.docker.meta': '{{count}} 个容器',
+  'systemManager.docker.imagesMeta': '{{count}} 个镜像',
+  'systemManager.docker.start': '启动',
+  'systemManager.docker.stop': '停止',
+
+  'systemManager.inspect.status': '状态',
+  'systemManager.inspect.image': '镜像',
+  'systemManager.inspect.created': '创建时间',
+  'systemManager.inspect.started': '启动时间',
+  'systemManager.inspect.restartPolicy': '重启策略',
+  'systemManager.inspect.command': '启动命令',
+  'systemManager.inspect.ports': '端口映射',
+  'systemManager.inspect.networks': '网络',
+  'systemManager.inspect.mounts': '挂载',
+  'systemManager.inspect.env': '环境变量',
+  'systemManager.inspect.labels': '标签',
+  'systemManager.inspect.tags': '镜像标签',
+  'systemManager.inspect.digests': '摘要',
+  'systemManager.inspect.size': '大小',
+  'systemManager.inspect.platform': '平台',
+  'systemManager.inspect.workdir': '工作目录',
+  'systemManager.inspect.exposedPorts': '暴露端口',
+  'systemManager.inspect.showRaw': 'JSON',
+  'systemManager.inspect.hideRaw': '收起 JSON',
+};

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

@@ -2,9 +2,30 @@ import type { Messages } from '../types';
 
 export const zhCNTerminalMessages: Messages = {
   'terminal.sudoHint.pressEnter': '按 Enter 粘贴 sudo 密码',
+  'terminal.menu.rename': '重命名',
+  'terminal.toolbar.detach': '移出到独立标签',
+  'terminal.menu.detach': '从工作区移出',
+  'terminal.toolbar.timestampsEnable': '显示时间戳',
+  'terminal.toolbar.timestampsDisable': '隐藏时间戳',
   'terminal.connection.protocol.et': 'EternalTerminal',
   'terminal.et.proxyUnsupported': 'EternalTerminal 目前不支持 Netcatty 的代理设置。请改用 SSH，或移除该主机的代理。',
   'terminal.et.multiJumpUnsupported': 'EternalTerminal 目前在 Netcatty 中最多支持一个跳板机。',
+  // Command history side panel
+  'history.scope.label': '历史范围',
+  'history.tab.host': '主机',
+  'history.tab.global': '全局',
+  'history.searchPlaceholder': '搜索历史命令...',
+  'history.loading': '正在读取远程历史...',
+  'history.meta.count': '{count} 条',
+  'history.empty.noSession': '请先打开一个远程会话以查看其命令历史。',
+  'history.empty.unsupportedProtocol': '仅 SSH/Mosh/ET 会话支持命令历史。',
+  'history.empty.noHistory': '该主机上未找到命令历史。',
+  'history.empty.noGlobalHistory': '暂无全局命令历史。你执行的命令会记录在这里。',
+  'history.action.refresh': '刷新',
+  'history.action.retry': '重试',
+  'history.action.paste': '粘贴到终端',
+  'history.action.run': '在终端执行',
+  'history.action.saveAsSnippet': '保存为代码片段',
   // SFTP File Opener
   'sftp.context.copyPath': '复制文件路径',
   'sftp.context.openWith': '打开方式...',
@@ -169,6 +190,15 @@ export const zhCNTerminalMessages: Messages = {
   'settings.terminal.font.size.desc': '终端文字大小',
   'settings.terminal.font.weight': '字重',
   'settings.terminal.font.weight.desc': '常规文本字重 (100-900)',
+  'settings.terminal.font.weight.thin': '极细',
+  'settings.terminal.font.weight.extraLight': '特细',
+  'settings.terminal.font.weight.light': '细',
+  'settings.terminal.font.weight.normal': '常规',
+  'settings.terminal.font.weight.medium': '中等',
+  'settings.terminal.font.weight.semiBold': '半粗',
+  'settings.terminal.font.weight.bold': '粗',
+  'settings.terminal.font.weight.extraBold': '特粗',
+  'settings.terminal.font.weight.black': '黑体',
   'settings.terminal.font.weightBold': '粗体字重',
   'settings.terminal.font.weightBold.desc': '粗体文本字重 (100-900)',
   'settings.terminal.font.linePadding': '行间距',
@@ -194,6 +224,11 @@ export const zhCNTerminalMessages: Messages = {
   'settings.terminal.behavior.copyOnSelect.desc': '自动复制选中的文本。在 tmux/vim 鼠标模式下，macOS 按住 Option，Windows/Linux 按住 Shift 拖选即可选中文本',
   'settings.terminal.behavior.middleClickPaste': '中键粘贴',
   'settings.terminal.behavior.middleClickPaste.desc': '中键点击时粘贴剪贴板内容',
+  'settings.terminal.behavior.middleClick': '中键行为',
+  'settings.terminal.behavior.middleClick.desc': '在终端中点击鼠标中键时执行的操作',
+  'settings.terminal.behavior.middleClick.menu': '显示菜单',
+  'settings.terminal.behavior.middleClick.paste': '粘贴',
+  'settings.terminal.behavior.middleClick.disabled': '无动作',
   'settings.terminal.behavior.bracketedPaste': '括号粘贴模式',
   'settings.terminal.behavior.bracketedPaste.desc':
     '粘贴文本时使用转义序列包裹，以便终端区分粘贴和键入。如果出现 ^[[200~ 字样请关闭此选项。',
@@ -286,14 +321,28 @@ export const zhCNTerminalMessages: Messages = {
   'settings.terminal.serverStats.refreshInterval': '刷新间隔',
   'settings.terminal.serverStats.refreshInterval.desc': '服务器状态刷新的频率。',
   'settings.terminal.serverStats.seconds': '秒',
+  'settings.terminal.section.systemManager': '系统管理',
+  'settings.terminal.systemManager.processRefreshInterval': '进程列表刷新间隔',
+  'settings.terminal.systemManager.processRefreshInterval.desc': '系统管理侧栏中进程列表的刷新频率。',
+  'settings.terminal.systemManager.tmuxRefreshInterval': 'tmux 会话刷新间隔',
+  'settings.terminal.systemManager.tmuxRefreshInterval.desc': 'tmux 会话列表的刷新频率。',
+  'settings.terminal.systemManager.dockerListRefreshInterval': 'Docker 容器列表刷新间隔',
+  'settings.terminal.systemManager.dockerListRefreshInterval.desc': 'Docker 容器列表的刷新频率。',
+  'settings.terminal.systemManager.dockerStatsRefreshInterval': 'Docker 性能数据刷新间隔',
+  'settings.terminal.systemManager.dockerStatsRefreshInterval.desc': 'Docker 容器 CPU/内存/网络指标的刷新频率。',
 
   // Settings > Terminal > Rendering
   'settings.terminal.section.rendering': '渲染',
   'settings.terminal.rendering.renderer': '渲染器',
   'settings.terminal.rendering.renderer.desc': '选择终端渲染技术。自动模式会在低内存设备上使用 DOM 渲染。更改将在新终端会话中生效。',
   'settings.terminal.rendering.auto': '自动',
-  'settings.terminal.rendering.lineTimestamps': '给输出加时间戳',
-  'settings.terminal.rendering.lineTimestamps.desc': '在终端输出行前插入本地时间，时间戳会成为终端可见内容的一部分。',
+
+  // Settings > Terminal > Workspace Focus Indicator
+  'settings.terminal.section.workspaceFocus': '工作区焦点提示',
+  'settings.terminal.workspaceFocus.style': '焦点提示样式',
+  'settings.terminal.workspaceFocus.style.desc': '在分屏视图中如何标识当前聚焦的窗格。',
+  'settings.terminal.workspaceFocus.dim': '淡化未聚焦窗格',
+  'settings.terminal.workspaceFocus.border': '为聚焦窗格显示边框',
 
   // Settings > Terminal > Autocomplete
   'settings.terminal.section.autocomplete': '自动补全',
@@ -311,6 +360,8 @@ export const zhCNTerminalMessages: Messages = {
   'settings.shortcuts.scheme.disabled': '禁用',
   'settings.shortcuts.scheme.mac': 'Mac (Cmd)',
   'settings.shortcuts.scheme.pc': 'PC (Ctrl)',
+  'settings.shortcuts.disableTerminalFontZoom.label': '禁用终端缩放',
+  'settings.shortcuts.disableTerminalFontZoom.desc': '关闭终端文字缩放快捷操作，包括 Cmd/Ctrl 加滚轮。',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.label': '数字键跳过固定标签',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.desc': '开启后，Cmd/Ctrl+[1...9] 仅在终端、工作区、编辑器等可关闭标签页之间切换，不包括固定的 Vault 和 SFTP 标签页。',
   'settings.shortcuts.section.custom': '自定义快捷键',
@@ -327,18 +378,25 @@ export const zhCNTerminalMessages: Messages = {
   'settings.shortcuts.binding.next-tab': '下一个标签页',
   'settings.shortcuts.binding.prev-tab': '上一个标签页',
   'settings.shortcuts.binding.close-tab': '关闭标签页',
+  'settings.shortcuts.binding.close-session': '关闭会话窗格',
   'settings.shortcuts.binding.new-tab': '新建本地标签页',
   'settings.shortcuts.binding.copy': '从终端复制',
   'settings.shortcuts.binding.paste': '粘贴到终端',
+  'settings.shortcuts.binding.paste-selection': '将选区粘贴到终端',
   'settings.shortcuts.binding.select-all': '全选终端内容',
   'settings.shortcuts.binding.clear-buffer': '清空终端缓冲区',
   'settings.shortcuts.binding.search-terminal': '打开终端搜索',
+  'settings.shortcuts.binding.increase-terminal-font-size': '增大终端字号',
+  'settings.shortcuts.binding.decrease-terminal-font-size': '减小终端字号',
+  'settings.shortcuts.binding.reset-terminal-font-size': '重置终端字号',
   'settings.shortcuts.binding.move-focus': '在分屏间移动焦点',
   'settings.shortcuts.binding.split-horizontal': '水平分屏',
   'settings.shortcuts.binding.split-vertical': '垂直分屏',
+  'settings.shortcuts.binding.toggle-pane-zoom': '切换窗格缩放',
   'settings.shortcuts.binding.open-hosts': '打开主机列表',
   'settings.shortcuts.binding.open-local': '打开本地终端',
   'settings.shortcuts.binding.open-sftp': '打开 SFTP',
+  'settings.shortcuts.binding.open-settings': '打开设置',
   'settings.shortcuts.binding.port-forwarding': '打开端口转发',
   'settings.shortcuts.binding.command-palette': '打开命令面板',
   'settings.shortcuts.binding.quick-switch': '快速切换',
@@ -354,6 +412,9 @@ export const zhCNTerminalMessages: Messages = {
   'settings.shortcuts.binding.sftp-delete': '删除文件',
   'settings.shortcuts.binding.sftp-refresh': '刷新',
   'settings.shortcuts.binding.sftp-new-folder': '新建文件夹',
+  'settings.shortcuts.binding.sftp-open': '打开文件 / 进入目录',
+  'settings.shortcuts.binding.sftp-go-parent': '转到上级目录',
+  'settings.shortcuts.binding.sftp-navigate-to': '转到选中的目录',
 
   // Host Details (sub-panels)
   'hostDetails.proxyPanel.title': '通过 HTTP/SOCKS5/命令代理',

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

@@ -45,7 +45,52 @@ export const zhCNVaultMessages: Messages = {
   'hostDetails.section.portCredentials': '端口与凭据',
   'hostDetails.section.appearance': '外观',
   'hostDetails.distro.title': 'Linux 发行版',
-  'hostDetails.distro.desc': '可在连接后自动探测，也可以手动覆盖图标所用的发行版。',
+  'hostDetails.distro.desc': '控制自动主机图标。自定义主机图标会覆盖此显示。',
+  'hostDetails.icon.title': '主机图标',
+  'hostDetails.icon.desc': '使用自动发行版图标并可单独改色，或选择内置图标。',
+  'hostDetails.icon.mode.auto': '自动',
+  'hostDetails.icon.mode.custom': '自定义',
+  'hostDetails.icon.reset': '重置主机图标',
+  'hostDetails.icon.showLibrary': '展开图标库',
+  'hostDetails.icon.hideLibrary': '收起图标库',
+  'hostDetails.icon.autoUsesDistro': '使用 Linux 发行版图标和所选颜色显示此主机。',
+  'hostDetails.icon.customOverridesDistro': '内置图标会替换此主机的 Linux 发行版图标。',
+  'hostDetails.icon.option.server': '服务器',
+  'hostDetails.icon.option.terminal': '终端',
+  'hostDetails.icon.option.database': '数据库',
+  'hostDetails.icon.option.cloud': '云主机',
+  'hostDetails.icon.option.router': '路由器',
+  'hostDetails.icon.option.shield': '安全',
+  'hostDetails.icon.option.code': '代码',
+  'hostDetails.icon.option.box': '节点',
+  'hostDetails.icon.option.globe': '公网',
+  'hostDetails.icon.option.cpu': '计算',
+  'hostDetails.icon.option.hard-drive': '存储',
+  'hostDetails.icon.option.network': '网络',
+  'hostDetails.icon.option.wifi': '无线',
+  'hostDetails.icon.option.lock': '锁定',
+  'hostDetails.icon.option.key': '密钥',
+  'hostDetails.icon.option.monitor': '显示器',
+  'hostDetails.icon.option.container': '容器',
+  'hostDetails.icon.option.activity': '活动',
+  'hostDetails.icon.option.zap': '高速',
+  'hostDetails.icon.option.server-cog': '服务器设置',
+  'hostDetails.icon.color.blue': '蓝色',
+  'hostDetails.icon.color.green': '绿色',
+  'hostDetails.icon.color.red': '红色',
+  'hostDetails.icon.color.amber': '琥珀色',
+  'hostDetails.icon.color.purple': '紫色',
+  'hostDetails.icon.color.cyan': '青色',
+  'hostDetails.icon.color.orange': '橙色',
+  'hostDetails.icon.color.slate': '石板灰',
+  'hostDetails.icon.color.violet': '紫罗兰',
+  'hostDetails.icon.color.pink': '粉色',
+  'hostDetails.icon.color.rose': '玫瑰红',
+  'hostDetails.icon.color.lime': '青柠',
+  'hostDetails.icon.color.teal': '蓝绿色',
+  'hostDetails.icon.color.sky': '天蓝',
+  'hostDetails.icon.color.indigo': '靛蓝',
+  'hostDetails.icon.color.zinc': '锌灰',
   'hostDetails.distro.mode': '来源',
   'hostDetails.distro.mode.auto': '自动探测',
   'hostDetails.distro.mode.manual': '手动覆盖',
@@ -66,6 +111,7 @@ export const zhCNVaultMessages: Messages = {
   'hostDetails.distro.option.redhat': 'Red Hat / RHEL',
   'hostDetails.distro.option.almalinux': 'AlmaLinux',
   'hostDetails.distro.option.alinux': '阿里云 Linux',
+  'hostDetails.distro.option.openeuler': 'openEuler',
   'hostDetails.distro.option.oracle': 'Oracle Linux',
   'hostDetails.distro.option.kali': 'Kali Linux',
   'hostDetails.distro.option.cisco': '思科',
@@ -113,6 +159,8 @@ export const zhCNVaultMessages: Messages = {
   'hostDetails.deviceType.warning': 'AI 代理命令将直接发送，无法获取退出码。仅建议在设备不运行标准 Shell 时启用。',
   'hostDetails.section.sshAlgorithms': 'SSH 算法',
   'hostDetails.section.terminalBehavior': '终端行为',
+  'hostDetails.lineTimestamps': '显示输出时间',
+  'hostDetails.lineTimestamps.desc': '在终端输出行旁边显示本地时间，不改变终端文本内容。',
   'hostDetails.legacyAlgorithms': '允许旧版算法',
   'hostDetails.legacyAlgorithms.desc': '启用已弃用的 SSH 算法（diffie-hellman-group1、ssh-dss、3des-cbc 等）以连接老旧网络设备。',
   'hostDetails.legacyAlgorithms.warning': '这些算法存在已知安全漏洞，仅建议在老旧设备不支持现代加密时启用。',
@@ -213,9 +261,12 @@ export const zhCNVaultMessages: Messages = {
   // Terminal toolbar / search / context menu / auth
   'terminal.toolbar.openSftp': '打开 SFTP',
   'terminal.toolbar.availableAfterConnect': '连接后可用',
+  'terminal.toolbar.sendYmodem': 'YMODEM 发送',
+  'terminal.toolbar.receiveYmodem': 'YMODEM 接收',
   'terminal.toolbar.sftp': 'SFTP',
   'terminal.toolbar.more': '更多操作',
   'terminal.toolbar.scripts': '脚本',
+  'terminal.toolbar.history': '命令历史',
   'terminal.toolbar.library': '库',
   'terminal.toolbar.noSnippets': '暂无代码片段',
   'terminal.toolbar.terminalSettings': '终端设置',
@@ -239,6 +290,7 @@ export const zhCNVaultMessages: Messages = {
   'terminal.composeBar.snippetClickHint': '单击插入 · Shift+单击直接发送',
   'terminal.toolbar.focus': '聚焦',
   'terminal.toolbar.focusMode': '聚焦模式',
+  'terminal.toolbar.detach': '移出到独立标签',
   'terminal.toolbar.encoding': '终端编码',
   'terminal.toolbar.encoding.utf8': 'UTF-8',
   'terminal.toolbar.encoding.gb18030': 'GB18030',
@@ -277,7 +329,9 @@ export const zhCNVaultMessages: Messages = {
   'terminal.dragDrop.localTitle': '拖放以插入路径',
   'terminal.dragDrop.localMessage': '文件路径将被插入到终端',
   'terminal.dragDrop.remoteTitle': '拖放以上传文件',
-  'terminal.dragDrop.remoteMessage': '文件将通过 SFTP 上传',
+  'terminal.dragDrop.remoteZmodemMessage': '文件将通过 ZMODEM（PTY）上传',
+  'terminal.dragDrop.remoteSftpMessage': '文件将通过 SFTP 上传',
+  'terminal.dragDrop.noFiles': '没有可上传的文件',
   'terminal.dragDrop.notConnected': '无法拖放文件 - 终端未连接',
   'terminal.dragDrop.errorTitle': '拖放错误',
   'terminal.dragDrop.errorMessage': '处理拖放文件失败',
@@ -291,10 +345,27 @@ export const zhCNVaultMessages: Messages = {
   'terminal.menu.pasteSelection': '粘贴选中文本',
   'terminal.menu.selectAll': '全选',
   'terminal.menu.reconnect': '重新连接',
+  'terminal.menu.sendYmodem': 'YMODEM 发送',
+  'terminal.menu.receiveYmodem': 'YMODEM 接收',
   'terminal.menu.splitHorizontal': '水平分屏',
   'terminal.menu.splitVertical': '垂直分屏',
   'terminal.menu.clearBuffer': '清空缓冲区',
   'terminal.menu.closeTerminal': '关闭终端',
+  'terminal.menu.rename': '重命名',
+  'terminal.menu.detach': '从工作区移出',
+  'terminal.menu.detachSession': '移出 {name}',
+  'terminal.ymodem.selectFile': '选择要发送的文件',
+  'terminal.ymodem.allFiles': '所有文件',
+  'terminal.ymodem.started': '正在通过 YMODEM 发送 {fileName}',
+  'terminal.ymodem.complete': 'YMODEM 已发送 {fileName}',
+  'terminal.ymodem.failed': 'YMODEM 发送失败',
+  'terminal.ymodem.selectReceiveDirectory': '选择接收文件保存位置',
+  'terminal.ymodem.receiveStarted': '正在通过 YMODEM 接收...',
+  'terminal.ymodem.receiveComplete': 'YMODEM 已接收 {fileName}',
+  'terminal.ymodem.receiveCompleteMultiple': 'YMODEM 已接收 {count} 个文件',
+  'terminal.ymodem.receiveEmpty': '没有接收到 YMODEM 文件',
+  'terminal.ymodem.receiveFailed': 'YMODEM 接收失败',
+  'terminal.ymodem.unavailable': 'YMODEM 当前不可用',
   'terminal.selection.addToAI': '添加到对话',
   'terminal.selection.addToAIDesc': '将选中的终端输出作为附件加入 AI 草稿',
   'terminal.auth.password': '密码',
@@ -665,6 +736,8 @@ export const zhCNVaultMessages: Messages = {
   'sftp.tabs.addTab': '新建标签页',
   'sftp.tabs.closeTab': '关闭标签页',
   'sftp.tabs.newTab': '新标签页',
+  'sftp.tabs.copyDefaultPath': '复制标签页（默认路径）',
+  'sftp.tabs.copyCurrentPath': '复制并跳转到当前路径',
   'sftp.conflict.title': '文件冲突',
   'sftp.conflict.desc': '目标位置已存在同名文件',
   'sftp.conflict.alreadyExistsSuffix': '已存在',

application/state/aiDraftState.test.ts

@@ -10,6 +10,7 @@ import {
   ensureDraftForScopeState,
   getDraftMutationVersionState,
   getDraftUploadGenerationState,
+  pruneStaleSessionPanelViews,
   pruneTerminalScopeState,
   pruneTerminalTransientState,
   resolvePanelView,
@@ -89,6 +90,39 @@ test("setSessionView records target session id", () => {
   });
 });
 
+test("pruneStaleSessionPanelViews resets session views that no longer exist", () => {
+  const panelViewByScope = {
+    "terminal:1": { mode: "session", sessionId: "deleted-session" },
+    "workspace:2": { mode: "session", sessionId: "session-keep" },
+    "terminal:3": { mode: "draft" },
+  } satisfies Record<string, { mode: "draft" } | { mode: "session"; sessionId: string }>;
+
+  const next = pruneStaleSessionPanelViews(
+    panelViewByScope,
+    new Set(["session-keep"]),
+  );
+
+  assert.deepEqual(next, {
+    "terminal:1": { mode: "draft" },
+    "workspace:2": { mode: "session", sessionId: "session-keep" },
+    "terminal:3": { mode: "draft" },
+  });
+});
+
+test("pruneStaleSessionPanelViews returns the original ref when nothing is stale", () => {
+  const panelViewByScope = {
+    "terminal:1": { mode: "session", sessionId: "session-keep" },
+    "terminal:2": { mode: "draft" },
+  } satisfies Record<string, { mode: "draft" } | { mode: "session"; sessionId: string }>;
+
+  const next = pruneStaleSessionPanelViews(
+    panelViewByScope,
+    new Set(["session-keep"]),
+  );
+
+  assert.equal(next, panelViewByScope);
+});
+
 test("clearScopeDraftState removes both the draft and current panel view", () => {
   const draftsByScope = {
     "terminal:1": createEmptyDraft("agent-alpha"),

application/state/aiDraftState.ts

@@ -115,6 +115,25 @@ export function setSessionView(
   };
 }
 
+export function pruneStaleSessionPanelViews(
+  panelViewByScope: PanelViewByScope,
+  validSessionIds: Set<string>,
+): PanelViewByScope {
+  let next = panelViewByScope;
+
+  for (const [scopeKey, panelView] of Object.entries(panelViewByScope)) {
+    if (panelView?.mode !== 'session' || validSessionIds.has(panelView.sessionId)) {
+      continue;
+    }
+    const updated = setDraftView(next, scopeKey);
+    if (updated !== next) {
+      next = updated;
+    }
+  }
+
+  return next;
+}
+
 export function updateDraftForScope(
   draftsByScope: DraftsByScope,
   scopeKey: string,

application/state/aiStateSnapshots.ts

@@ -196,6 +196,21 @@ export function setLatestAIActiveSessionMapSnapshot(activeSessionIdMap: Record<s
   latestAIActiveSessionMapSnapshot = activeSessionIdMap;
 }
 
+export function prewarmAIStateStorageSnapshots() {
+  try {
+    if (latestAISessionsSnapshot === null) {
+      latestAISessionsSnapshot =
+        localStorageAdapter.read<AISession[]>(STORAGE_KEY_AI_SESSIONS) ?? [];
+    }
+    if (latestAIActiveSessionMapSnapshot === null) {
+      latestAIActiveSessionMapSnapshot =
+        localStorageAdapter.read<Record<string, string | null>>(STORAGE_KEY_AI_ACTIVE_SESSION_MAP) ?? {};
+    }
+  } catch (error) {
+    console.warn('[AIState] Failed to prewarm AI state storage snapshots:', error);
+  }
+}
+
 export function setLatestAIDraftsByScopeSnapshot(draftsByScope: DraftsByScope) {
   latestAIDraftsByScopeSnapshot = draftsByScope;
 }

application/state/resolveTerminalSessionExitIntent.test.ts

@@ -1,7 +1,10 @@
 import test from "node:test";
 import assert from "node:assert/strict";
 
-import { resolveTerminalSessionExitIntent } from "./resolveTerminalSessionExitIntent.ts";
+import {
+  resolveTerminalSessionExitIntent,
+  shouldCloseTerminalPopupOnExit,
+} from "./resolveTerminalSessionExitIntent.ts";
 
 test("normal backend exited events close the session tab", () => {
   assert.deepEqual(
@@ -30,3 +33,10 @@ test("backend closed events keep the tab and mark it disconnected", () => {
     { kind: "markDisconnected" },
   );
 });
+
+test("terminal popup only auto-closes after clean command exit", () => {
+  assert.equal(shouldCloseTerminalPopupOnExit({ reason: "exited", exitCode: 0 }), true);
+  assert.equal(shouldCloseTerminalPopupOnExit({ reason: "exited", exitCode: 1 }), false);
+  assert.equal(shouldCloseTerminalPopupOnExit({ reason: "error", error: "connection reset" }), false);
+  assert.equal(shouldCloseTerminalPopupOnExit({ reason: "closed", exitCode: 0 }), false);
+});

application/state/resolveTerminalSessionExitIntent.ts

@@ -20,3 +20,7 @@ export function resolveTerminalSessionExitIntent(
   // so the user can inspect output and reconnect.
   return { kind: "markDisconnected" };
 }
+
+export function shouldCloseTerminalPopupOnExit(evt: TerminalSessionExitEvent): boolean {
+  return evt.reason === "exited" && evt.exitCode === 0;
+}

application/state/sessionCapabilitiesStore.ts

@@ -0,0 +1,76 @@
+import type { SessionCapabilities } from '../../domain/systemManager/types';
+
+/** Internal entry: capabilities plus computed expiry timestamp. */
+interface StoreEntry {
+  capabilities: SessionCapabilities;
+  expiresAt: number;
+}
+
+type Listener = () => void;
+
+const capabilitiesBySessionId = new Map<string, StoreEntry>();
+const listenersBySessionId = new Map<string, Set<Listener>>();
+
+function isExpired(entry: StoreEntry): boolean {
+  return Date.now() > entry.expiresAt;
+}
+
+function notifySession(sessionId: string) {
+  listenersBySessionId.get(sessionId)?.forEach((listener) => listener());
+}
+
+export const sessionCapabilitiesStore = {
+  get(sessionId: string): SessionCapabilities | undefined {
+    const entry = capabilitiesBySessionId.get(sessionId);
+    if (!entry) return undefined;
+    if (isExpired(entry)) {
+      capabilitiesBySessionId.delete(sessionId);
+      notifySession(sessionId);
+      return undefined;
+    }
+    return entry.capabilities;
+  },
+
+  set(sessionId: string, capabilities: SessionCapabilities, ttlMs: number) {
+    const entry: StoreEntry = {
+      capabilities: {
+        ...capabilities,
+        probedAt: Date.now(),
+      },
+      expiresAt: Date.now() + ttlMs,
+    };
+    capabilitiesBySessionId.set(sessionId, entry);
+    notifySession(sessionId);
+  },
+
+  delete(sessionId: string) {
+    if (!capabilitiesBySessionId.delete(sessionId)) return;
+    notifySession(sessionId);
+    listenersBySessionId.delete(sessionId);
+  },
+
+  /** Drop cached capabilities for sessions that no longer exist. */
+  prune(liveSessionIds: ReadonlySet<string>) {
+    for (const sessionId of capabilitiesBySessionId.keys()) {
+      if (!liveSessionIds.has(sessionId)) {
+        capabilitiesBySessionId.delete(sessionId);
+        listenersBySessionId.delete(sessionId);
+      }
+    }
+  },
+
+  subscribe(sessionId: string, listener: Listener): () => void {
+    let set = listenersBySessionId.get(sessionId);
+    if (!set) {
+      set = new Set();
+      listenersBySessionId.set(sessionId, set);
+    }
+    set.add(listener);
+    return () => {
+      set?.delete(listener);
+      if (set && set.size === 0) {
+        listenersBySessionId.delete(sessionId);
+      }
+    };
+  },
+};

application/state/sessionWorkspaceDetach.test.ts

@@ -0,0 +1,123 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import type { TerminalSession, Workspace } from "../../domain/models";
+import {
+  closeSessionWorkspaceLayoutState,
+  detachSessionFromWorkspaceState,
+  replaceDissolvedWorkspaceTabOrder,
+} from "./sessionWorkspaceDetach";
+
+const session = (id: string, workspaceId = "ws-1"): TerminalSession => ({
+  id,
+  hostId: id,
+  hostLabel: id,
+  status: "connected",
+  workspaceId,
+});
+
+const workspace = (sessionIds: string[]): Workspace => ({
+  id: "ws-1",
+  title: "Workspace",
+  focusedSessionId: sessionIds[0],
+  focusSessionOrder: sessionIds,
+  root: sessionIds.length === 1
+    ? { id: "pane-1", type: "pane", sessionId: sessionIds[0] }
+    : {
+        id: "split-1",
+        type: "split",
+        direction: "vertical",
+        children: sessionIds.map((sessionId, index) => ({
+          id: `pane-${index + 1}`,
+          type: "pane" as const,
+          sessionId,
+        })),
+        sizes: sessionIds.map(() => 1),
+      },
+});
+
+test("detach dissolves the original workspace when one session remains", () => {
+  const result = detachSessionFromWorkspaceState({
+    sessions: [session("s1"), session("s2")],
+    workspaces: [workspace(["s1", "s2"])],
+    sessionId: "s1",
+  });
+
+  assert.equal(result.changed, true);
+  assert.equal(result.activeTabId, "s1");
+  assert.deepEqual(result.sessions.map((s) => [s.id, s.workspaceId]), [
+    ["s1", undefined],
+    ["s2", undefined],
+  ]);
+  assert.equal(result.workspaces.length, 0);
+  assert.equal(result.dissolvedWorkspaceId, "ws-1");
+  assert.deepEqual(result.replacementTabIds, ["s1", "s2"]);
+});
+
+test("detach preserves the other sessions in a multi-pane workspace", () => {
+  const result = detachSessionFromWorkspaceState({
+    sessions: [session("s1"), session("s2"), session("s3")],
+    workspaces: [workspace(["s1", "s2", "s3"])],
+    sessionId: "s2",
+  });
+
+  assert.equal(result.changed, true);
+  assert.deepEqual(result.sessions.map((s) => [s.id, s.workspaceId]), [
+    ["s1", "ws-1"],
+    ["s2", undefined],
+    ["s3", "ws-1"],
+  ]);
+  assert.deepEqual(result.workspaces[0].focusSessionOrder, ["s1", "s3"]);
+  assert.equal(result.workspaces[0].focusedSessionId, "s1");
+  assert.deepEqual(
+    result.workspaces[0].root.type === "split"
+      ? result.workspaces[0].root.children.map((child) => child.type === "pane" ? child.sessionId : null)
+      : [],
+    ["s1", "s3"],
+  );
+});
+
+test("dissolved workspace replacement preserves its tab position", () => {
+  assert.deepEqual(
+    replaceDissolvedWorkspaceTabOrder(["log-1", "ws-1", "session-3"], "ws-1", ["s1", "s2"]),
+    ["log-1", "s1", "s2", "session-3"],
+  );
+});
+
+test("dissolved workspace replacement removes duplicate replacement ids", () => {
+  assert.deepEqual(
+    replaceDissolvedWorkspaceTabOrder(["s1", "ws-1", "session-3"], "ws-1", ["s1", "s2"]),
+    ["s1", "s2", "session-3"],
+  );
+});
+
+test("dissolved workspace replacement is idempotent", () => {
+  const once = replaceDissolvedWorkspaceTabOrder(["log-1", "ws-1", "session-3"], "ws-1", ["s1", "s2"]);
+
+  assert.deepEqual(
+    replaceDissolvedWorkspaceTabOrder(once, "ws-1", ["s1", "s2"]),
+    once,
+  );
+});
+
+test("single remaining session preserves dissolved workspace tab position", () => {
+  assert.deepEqual(
+    replaceDissolvedWorkspaceTabOrder(["log-1", "ws-1", "session-3"], "ws-1", ["s2"]),
+    ["log-1", "s2", "session-3"],
+  );
+});
+
+test("closing a workspace session dissolves the workspace when one terminal remains", () => {
+  const result = closeSessionWorkspaceLayoutState([workspace(["s1", "s2"])], "ws-1", "s1");
+
+  assert.equal(result.dissolvedWorkspaceId, "ws-1");
+  assert.equal(result.lastRemainingSessionId, "s2");
+  assert.deepEqual(result.workspaces, []);
+  assert.deepEqual(
+    replaceDissolvedWorkspaceTabOrder(
+      ["log-1", result.dissolvedWorkspaceId!, "session-3"],
+      result.dissolvedWorkspaceId,
+      result.lastRemainingSessionId ? [result.lastRemainingSessionId] : undefined,
+    ),
+    ["log-1", "s2", "session-3"],
+  );
+});

application/state/sessionWorkspaceDetach.ts

@@ -0,0 +1,182 @@
+import type { TerminalSession, Workspace } from "../../domain/models";
+import { collectSessionIds, pruneWorkspaceNode } from "../../domain/workspace";
+
+export type DetachSessionFromWorkspaceStateResult = {
+  changed: boolean;
+  sessions: TerminalSession[];
+  workspaces: Workspace[];
+  activeTabId?: string;
+  dissolvedWorkspaceId?: string;
+  replacementTabIds?: string[];
+};
+
+export type CloseSessionWorkspaceLayoutResult = {
+  workspaces: Workspace[];
+  removedWorkspaceId?: string;
+  dissolvedWorkspaceId?: string;
+  lastRemainingSessionId?: string;
+};
+
+type DetachSessionFromWorkspaceStateOptions = {
+  sessions: TerminalSession[];
+  workspaces: Workspace[];
+  sessionId: string;
+};
+
+export function replaceDissolvedWorkspaceTabOrder(
+  tabOrder: readonly string[],
+  workspaceId: string | undefined,
+  replacementTabIds: readonly string[] | undefined,
+): string[] {
+  if (!workspaceId || !replacementTabIds?.length) return [...tabOrder];
+
+  const uniqueReplacementIds = replacementTabIds.filter((tabId, index, list) => (
+    tabId && list.indexOf(tabId) === index
+  ));
+  if (uniqueReplacementIds.length === 0) return [...tabOrder];
+
+  if (!tabOrder.includes(workspaceId)) {
+    const hasAllReplacementIds = uniqueReplacementIds.every((tabId) => tabOrder.includes(tabId));
+    return hasAllReplacementIds ? [...tabOrder] : [
+      ...tabOrder,
+      ...uniqueReplacementIds.filter((tabId) => !tabOrder.includes(tabId)),
+    ];
+  }
+
+  const replacementIdSet = new Set(uniqueReplacementIds);
+  let inserted = false;
+  const nextOrder: string[] = [];
+
+  for (const tabId of tabOrder) {
+    if (tabId === workspaceId) {
+      if (!inserted) {
+        nextOrder.push(...uniqueReplacementIds);
+        inserted = true;
+      }
+      continue;
+    }
+    if (!replacementIdSet.has(tabId)) {
+      nextOrder.push(tabId);
+    }
+  }
+
+  return nextOrder;
+}
+
+export function closeSessionWorkspaceLayoutState(
+  workspaces: readonly Workspace[],
+  workspaceId: string | undefined,
+  sessionId: string,
+): CloseSessionWorkspaceLayoutResult {
+  if (!workspaceId) return { workspaces: [...workspaces] };
+
+  let removedWorkspaceId: string | undefined;
+  let dissolvedWorkspaceId: string | undefined;
+  let lastRemainingSessionId: string | undefined;
+  const nextWorkspaces = workspaces
+    .map((workspace) => {
+      if (workspace.id !== workspaceId) return workspace;
+      const prunedRoot = pruneWorkspaceNode(workspace.root, sessionId);
+      if (!prunedRoot) {
+        removedWorkspaceId = workspace.id;
+        return null;
+      }
+
+      const remainingSessionIds = collectSessionIds(prunedRoot);
+      if (remainingSessionIds.length === 1) {
+        dissolvedWorkspaceId = workspace.id;
+        lastRemainingSessionId = remainingSessionIds[0];
+        return null;
+      }
+
+      return { ...workspace, root: prunedRoot };
+    })
+    .filter((workspace): workspace is Workspace => Boolean(workspace));
+
+  return {
+    workspaces: nextWorkspaces,
+    removedWorkspaceId,
+    dissolvedWorkspaceId,
+    lastRemainingSessionId,
+  };
+}
+
+export function detachSessionFromWorkspaceState({
+  sessions,
+  workspaces,
+  sessionId,
+}: DetachSessionFromWorkspaceStateOptions): DetachSessionFromWorkspaceStateResult {
+  const session = sessions.find((candidate) => candidate.id === sessionId);
+  if (!session?.workspaceId) {
+    return { changed: false, sessions, workspaces };
+  }
+
+  const workspaceId = session.workspaceId;
+  const targetWorkspace = workspaces.find((workspace) => workspace.id === workspaceId);
+  if (!targetWorkspace) {
+    return { changed: false, sessions, workspaces };
+  }
+
+  const prunedRoot = pruneWorkspaceNode(targetWorkspace.root, sessionId);
+  let nextSessions = sessions.map((candidate) => (
+    candidate.id === sessionId ? { ...candidate, workspaceId: undefined } : candidate
+  ));
+
+  if (!prunedRoot) {
+    return {
+      changed: true,
+      sessions: nextSessions,
+      workspaces: workspaces.filter((workspace) => workspace.id !== workspaceId),
+      activeTabId: sessionId,
+      dissolvedWorkspaceId: workspaceId,
+      replacementTabIds: [sessionId],
+    };
+  }
+
+  const remainingSessionIds = collectSessionIds(prunedRoot);
+  if (remainingSessionIds.length === 1) {
+    nextSessions = nextSessions.map((candidate) => (
+      candidate.id === remainingSessionIds[0] ? { ...candidate, workspaceId: undefined } : candidate
+    ));
+
+    return {
+      changed: true,
+      sessions: nextSessions,
+      workspaces: workspaces.filter((workspace) => workspace.id !== workspaceId),
+      activeTabId: sessionId,
+      dissolvedWorkspaceId: workspaceId,
+      replacementTabIds: [sessionId, ...remainingSessionIds],
+    };
+  }
+
+  const nextFocusedSessionId = remainingSessionIds.includes(targetWorkspace.focusedSessionId)
+    ? targetWorkspace.focusedSessionId
+    : remainingSessionIds[0];
+  const nextFocusSessionOrder = (targetWorkspace.focusSessionOrder ?? [])
+    .filter((candidateId, index, list) => (
+      candidateId !== sessionId &&
+      remainingSessionIds.includes(candidateId) &&
+      list.indexOf(candidateId) === index
+    ));
+  for (const remainingSessionId of remainingSessionIds) {
+    if (!nextFocusSessionOrder.includes(remainingSessionId)) {
+      nextFocusSessionOrder.push(remainingSessionId);
+    }
+  }
+
+  return {
+    changed: true,
+    sessions: nextSessions,
+    workspaces: workspaces.map((workspace) => (
+      workspace.id === workspaceId
+        ? {
+            ...workspace,
+            root: prunedRoot,
+            focusedSessionId: nextFocusedSessionId,
+            focusSessionOrder: nextFocusSessionOrder,
+          }
+        : workspace
+    )),
+    activeTabId: sessionId,
+  };
+}

application/state/settingsIpcSync.ts

@@ -12,6 +12,7 @@ import {
   STORAGE_KEY_GLOBAL_HOTKEY_ENABLED,
   STORAGE_KEY_HOTKEY_RECORDING,
   STORAGE_KEY_HOTKEY_SCHEME,
+  STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
   STORAGE_KEY_SESSION_LOGS_DIR,
   STORAGE_KEY_SESSION_LOGS_ENABLED,
   STORAGE_KEY_SESSION_LOGS_FORMAT,
@@ -73,6 +74,7 @@ interface UseSettingsIpcSyncParams {
   setSftpDefaultViewMode: Dispatch<SetStateAction<'list' | 'tree'>>;
   setWorkspaceFocusStyleState: Dispatch<SetStateAction<'dim' | 'border'>>;
   setShowHostTreeSidebarState: Dispatch<SetStateAction<boolean>>;
+  setDisableTerminalFontZoomState: Dispatch<SetStateAction<boolean>>;
   setSftpTransferConcurrencyState: Dispatch<SetStateAction<number>>;
 }
 
@@ -105,6 +107,7 @@ export function useSettingsIpcSync({
   setSftpDefaultViewMode,
   setWorkspaceFocusStyleState,
   setShowHostTreeSidebarState,
+  setDisableTerminalFontZoomState,
   setSftpTransferConcurrencyState,
 }: UseSettingsIpcSyncParams) {
   // Listen for settings changes from other windows via IPC
@@ -228,6 +231,9 @@ export function useSettingsIpcSync({
       if (key === STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR && typeof value === 'boolean') {
         setShowHostTreeSidebarState((prev) => (prev === value ? prev : value));
       }
+      if (key === STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM && typeof value === 'boolean') {
+        setDisableTerminalFontZoomState((prev) => (prev === value ? prev : value));
+      }
       if (key === STORAGE_KEY_SFTP_TRANSFER_CONCURRENCY && typeof value === 'number') {
         setSftpTransferConcurrencyState((prev) => (prev === value ? prev : value));
       }
@@ -258,6 +264,7 @@ export function useSettingsIpcSync({
     setSftpFollowTerminalCwd,
     setSftpDefaultViewMode,
     setShowHostTreeSidebarState,
+    setDisableTerminalFontZoomState,
     setSftpTransferConcurrencyState,
     setTerminalFontFamilyId,
     setTerminalFontSize,

application/state/settingsStateDefaults.ts

@@ -65,6 +65,7 @@ export const DEFAULT_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT = false;
 export const DEFAULT_SHOW_SFTP_TAB = true;
 export const DEFAULT_SHOW_HOST_TREE_SIDEBAR = true;
 export const DEFAULT_SHELL_ONLY_TAB_NUMBER_SHORTCUTS = false;
+export const DEFAULT_DISABLE_TERMINAL_FONT_ZOOM = false;
 
 // Editor defaults
 export const DEFAULT_EDITOR_WORD_WRAP = false;

application/state/settingsStorageSync.ts

@@ -29,6 +29,7 @@ import {
   STORAGE_KEY_SHOW_SFTP_TAB,
   STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
+  STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
   STORAGE_KEY_TERM_FOLLOW_APP_THEME,
   STORAGE_KEY_TERM_FONT_FAMILY,
   STORAGE_KEY_TERM_FONT_SIZE,
@@ -79,6 +80,7 @@ interface UseSettingsStorageSyncParams {
   showSftpTab: boolean;
   showHostTreeSidebar: boolean;
   shellOnlyTabNumberShortcuts: boolean;
+  disableTerminalFontZoom: boolean;
   editorWordWrap: boolean;
   sessionLogsEnabled: boolean;
   sessionLogsDir: string;
@@ -115,6 +117,7 @@ interface UseSettingsStorageSyncParams {
   setShowSftpTabState: Dispatch<SetStateAction<boolean>>;
   setShowHostTreeSidebarState: Dispatch<SetStateAction<boolean>>;
   setShellOnlyTabNumberShortcutsState: Dispatch<SetStateAction<boolean>>;
+  setDisableTerminalFontZoomState: Dispatch<SetStateAction<boolean>>;
   setEditorWordWrapState: Dispatch<SetStateAction<boolean>>;
   setSessionLogsEnabled: Dispatch<SetStateAction<boolean>>;
   setSessionLogsDir: Dispatch<SetStateAction<string>>;
@@ -136,7 +139,7 @@ export function useSettingsStorageSync({
   terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
   sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
   sftpUseCompressedUpload, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-  showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts,
+  showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts, disableTerminalFontZoom,
   editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled,
   globalHotkeyEnabled, autoUpdateEnabled, windowOpacity,
   setTheme, setLightUiThemeId, setDarkUiThemeId, setAccentMode, setCustomAccent,
@@ -145,7 +148,7 @@ export function useSettingsStorageSync({
   setFollowAppTerminalThemeState, setTerminalFontFamilyId, setTerminalFontSize,
   setSftpDoubleClickBehavior, setSftpAutoSync, setSftpShowHiddenFiles,
   setSftpUseCompressedUpload, setSftpAutoOpenSidebar, setSftpFollowTerminalCwd, setSftpDefaultViewMode,
-  setShowRecentHostsState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setShellOnlyTabNumberShortcutsState,
+  setShowRecentHostsState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setShellOnlyTabNumberShortcutsState, setDisableTerminalFontZoomState,
   setEditorWordWrapState, setSessionLogsEnabled, setSessionLogsDir, setSessionLogsFormat, setSessionLogsTimestampsEnabled, setSshDebugLogsEnabled,
   setGlobalHotkeyEnabled, setWindowOpacity, setAutoUpdateEnabled, setWorkspaceFocusStyleState,
   setSftpTransferConcurrencyState, applyIncomingCustomKeyBindings, mergeIncomingTerminalSettings,
@@ -159,7 +162,7 @@ export function useSettingsStorageSync({
     terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
     sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
     sftpUseCompressedUpload, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-    showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts,
+    showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts, disableTerminalFontZoom,
     editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled,
     globalHotkeyEnabled, autoUpdateEnabled, windowOpacity,
   });
@@ -169,7 +172,7 @@ export function useSettingsStorageSync({
     terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
     sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
     sftpUseCompressedUpload, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-    showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts,
+    showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts, disableTerminalFontZoom,
     editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled,
     globalHotkeyEnabled, autoUpdateEnabled, windowOpacity,
   };
@@ -389,6 +392,12 @@ export function useSettingsStorageSync({
           setShellOnlyTabNumberShortcutsState(newValue);
         }
       }
+      if (e.key === STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM && e.newValue !== null) {
+        const newValue = e.newValue === 'true';
+        if (newValue !== s.disableTerminalFontZoom) {
+          setDisableTerminalFontZoomState(newValue);
+        }
+      }
       // Sync global hotkey enabled setting from other windows
       if (e.key === STORAGE_KEY_GLOBAL_HOTKEY_ENABLED && e.newValue !== null) {
         const newValue = e.newValue === 'true';
@@ -458,6 +467,7 @@ export function useSettingsStorageSync({
     setShowRecentHostsState,
     setShowSftpTabState,
     setShellOnlyTabNumberShortcutsState,
+    setDisableTerminalFontZoomState,
     setTerminalFontFamilyId,
     setTerminalFontSize,
     setTerminalThemeDarkId,

application/state/sftp/sftpConnectStartPath.test.ts

@@ -0,0 +1,56 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import type { RemoteSftpStartCache } from "./sftpConnectStartPath.ts";
+import {
+  normalizeSftpInitialPath,
+  resolveRemoteSftpStartState,
+} from "./sftpConnectStartPath.ts";
+
+const cached: RemoteSftpStartCache = {
+  path: "/var/cache",
+  homeDir: "/home/deploy",
+  files: [],
+  filenameEncoding: "auto",
+};
+
+test("remote SFTP default-path duplication ignores the shared host cache", () => {
+  const state = resolveRemoteSftpStartState({
+    filenameEncoding: "auto",
+    ignoreSharedCache: true,
+    sharedHostCacheCandidate: cached,
+  });
+
+  assert.equal(state.initialPath, undefined);
+  assert.equal(state.sharedHostCache, null);
+  assert.equal(state.cachedStartPath, "/");
+});
+
+test("remote SFTP current-path duplication uses the requested path instead of stale cache", () => {
+  const state = resolveRemoteSftpStartState({
+    filenameEncoding: "auto",
+    initialPath: "/var/www/app",
+    sharedHostCacheCandidate: cached,
+  });
+
+  assert.equal(state.initialPath, "/var/www/app");
+  assert.equal(state.sharedHostCache, null);
+  assert.equal(state.cachedStartPath, "/var/www/app");
+});
+
+test("remote SFTP initial paths preserve meaningful whitespace", () => {
+  assert.equal(normalizeSftpInitialPath("/var/www/app "), "/var/www/app ");
+
+  const state = resolveRemoteSftpStartState({
+    filenameEncoding: "auto",
+    initialPath: "/var/www/app ",
+    sharedHostCacheCandidate: {
+      ...cached,
+      path: "/var/www/app",
+    },
+  });
+
+  assert.equal(state.initialPath, "/var/www/app ");
+  assert.equal(state.sharedHostCache, null);
+  assert.equal(state.cachedStartPath, "/var/www/app ");
+});

application/state/sftp/sftpConnectStartPath.ts

@@ -0,0 +1,44 @@
+import type { SftpFileEntry, SftpFilenameEncoding } from "../../../domain/models";
+
+export interface RemoteSftpStartCache {
+  path: string;
+  homeDir: string;
+  files: SftpFileEntry[];
+  filenameEncoding: SftpFilenameEncoding;
+}
+
+interface ResolveRemoteSftpStartStateParams {
+  filenameEncoding: SftpFilenameEncoding;
+  ignoreSharedCache?: boolean;
+  initialPath?: string;
+  sharedHostCacheCandidate: RemoteSftpStartCache | null;
+}
+
+export function normalizeSftpInitialPath(initialPath?: string): string | undefined {
+  return initialPath === undefined || initialPath.length === 0 ? undefined : initialPath;
+}
+
+export function resolveRemoteSftpStartState({
+  filenameEncoding,
+  ignoreSharedCache,
+  initialPath,
+  sharedHostCacheCandidate,
+}: ResolveRemoteSftpStartStateParams): {
+  initialPath: string | undefined;
+  sharedHostCache: RemoteSftpStartCache | null;
+  cachedStartPath: string;
+} {
+  const requestedInitialPath = normalizeSftpInitialPath(initialPath);
+  const sharedHostCache =
+    !ignoreSharedCache
+      && sharedHostCacheCandidate?.filenameEncoding === filenameEncoding
+      && (!requestedInitialPath || sharedHostCacheCandidate.path === requestedInitialPath)
+      ? sharedHostCacheCandidate
+      : null;
+
+  return {
+    initialPath: requestedInitialPath,
+    sharedHostCache,
+    cachedStartPath: requestedInitialPath ?? sharedHostCache?.path ?? "/",
+  };
+}

application/state/sftp/sharedRemoteHostCache.ts

@@ -1,6 +1,6 @@
 import type { SftpFileEntry, SftpFilenameEncoding } from "../../../domain/models";
 
-interface SharedRemoteHostCacheEntry {
+export interface SharedRemoteHostCacheEntry {
   path: string;
   homeDir: string;
   files: SftpFileEntry[];

application/state/sftp/types.ts

@@ -1,4 +1,4 @@
-import { SftpConnection, SftpFileEntry, SftpFilenameEncoding } from "../../../domain/models";
+import { KnownHost, SftpConnection, SftpFileEntry, SftpFilenameEncoding } from "../../../domain/models";
 
 export interface SftpPane {
   id: string;
@@ -15,6 +15,22 @@ export interface SftpPane {
   transferMutationToken: number;
 }
 
+export interface SftpHostKeyInfo {
+  hostname: string;
+  port: number;
+  keyType: string;
+  fingerprint: string;
+  publicKey?: string;
+  status?: "unknown" | "changed";
+  knownHostId?: string;
+  knownFingerprint?: string;
+}
+
+export interface SftpHostKeyVerificationState {
+  hostKeyInfo: SftpHostKeyInfo;
+  progressLogs: string[];
+}
+
 // Multi-tab state for left and right sides
 export interface SftpSideTabs {
   tabs: SftpPane[];
@@ -70,4 +86,6 @@ export interface SftpStateOptions {
    * is honored for SFTP browsing too (not just the terminal session).
    */
   terminalSettings?: { keepaliveInterval: number; keepaliveCountMax: number };
+  knownHosts?: KnownHost[];
+  onAddKnownHost?: (knownHost: KnownHost) => void;
 }

application/state/sftp/useSftpConnections.ts

@@ -1,16 +1,19 @@
-import React, { useCallback, useEffect, useRef } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 import type { MutableRefObject } from "react";
 import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-import type { Host, Identity, SftpConnection, SftpFileEntry, SftpFilenameEncoding, SSHKey } from "../../../domain/models";
-import type { SftpPane } from "./types";
+import type { Host, Identity, KnownHost, SftpConnection, SftpFileEntry, SftpFilenameEncoding, SSHKey } from "../../../domain/models";
+import type { SftpHostKeyInfo, SftpHostKeyVerificationState, SftpPane } from "./types";
 import { useSftpDirectoryListing } from "./useSftpDirectoryListing";
 import { useSftpHostCredentials } from "./useSftpHostCredentials";
 import { buildCacheKey, getSharedRemoteHostCache, setSharedRemoteHostCache } from "./sharedRemoteHostCache";
+import { resolveRemoteSftpStartState } from "./sftpConnectStartPath";
 
 interface UseSftpConnectionsParams {
   hosts: Host[];
   keys: SSHKey[];
   identities: Identity[];
+  knownHosts?: KnownHost[];
+  onAddKnownHost?: (knownHost: KnownHost) => void;
   terminalSettings?: { keepaliveInterval: number; keepaliveCountMax: number };
   leftTabsRef: MutableRefObject<{ tabs: SftpPane[]; activeTabId: string | null }>;
   rightTabsRef: MutableRefObject<{ tabs: SftpPane[]; activeTabId: string | null }>;
@@ -34,17 +37,61 @@ interface UseSftpConnectionsParams {
   autoConnectLocalOnMount?: boolean;
 }
 
+export interface SftpConnectOptions {
+  forceNewTab?: boolean;
+  ignoreSharedCache?: boolean;
+  initialPath?: string;
+  onTabCreated?: (tabId: string) => void;
+  sourceSessionId?: string;
+}
+
 interface UseSftpConnectionsResult {
-  connect: (side: "left" | "right", host: Host | "local", options?: { forceNewTab?: boolean; onTabCreated?: (tabId: string) => void }) => Promise<void>;
+  connect: (side: "left" | "right", host: Host | "local", options?: SftpConnectOptions) => Promise<void>;
   disconnect: (side: "left" | "right") => Promise<void>;
   listLocalFiles: (path: string) => Promise<SftpFileEntry[]>;
   listRemoteFiles: (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => Promise<SftpFileEntry[]>;
+  hostKeyVerification: SftpHostKeyVerificationState | null;
+  rejectHostKeyVerification: () => void;
+  acceptHostKeyVerification: () => void;
+  acceptAndSaveHostKeyVerification: () => void;
 }
 
+type HostKeyVerificationRequest = SftpHostKeyInfo & {
+  requestId: string;
+  sessionId?: string;
+};
+
+const toSftpHostKeyInfo = (request: HostKeyVerificationRequest): SftpHostKeyInfo => ({
+  hostname: request.hostname,
+  port: request.port || 22,
+  keyType: request.keyType,
+  fingerprint: request.fingerprint,
+  publicKey: request.publicKey,
+  status: request.status,
+  knownHostId: request.knownHostId,
+  knownFingerprint: request.knownFingerprint,
+});
+
+const createKnownHostFromSftpHostKeyInfo = (
+  hostKeyInfo: SftpHostKeyInfo,
+  now = Date.now(),
+  idSuffix = Math.random().toString(36).slice(2, 11),
+): KnownHost => ({
+  id: hostKeyInfo.knownHostId || `kh-${now}-${idSuffix}`,
+  hostname: hostKeyInfo.hostname,
+  port: hostKeyInfo.port || 22,
+  keyType: hostKeyInfo.keyType,
+  publicKey: hostKeyInfo.publicKey || `SHA256:${hostKeyInfo.fingerprint}`,
+  fingerprint: hostKeyInfo.fingerprint,
+  discoveredAt: now,
+});
+
 export const useSftpConnections = ({
   hosts,
   keys,
   identities,
+  knownHosts,
+  onAddKnownHost,
   terminalSettings,
   leftTabsRef,
   rightTabsRef,
@@ -67,11 +114,79 @@ export const useSftpConnections = ({
   createEmptyPane,
   autoConnectLocalOnMount = true,
 }: UseSftpConnectionsParams): UseSftpConnectionsResult => {
-  const getHostCredentials = useSftpHostCredentials({ hosts, keys, identities, terminalSettings });
+  const getHostCredentials = useSftpHostCredentials({ hosts, keys, identities, knownHosts, terminalSettings });
   const { listLocalFiles, listRemoteFiles } = useSftpDirectoryListing();
+  const [hostKeyVerification, setHostKeyVerification] = useState<SftpHostKeyVerificationState | null>(null);
+  const hostKeyVerificationRef = useRef<(SftpHostKeyVerificationState & { requestId: string; sessionId: string }) | null>(null);
+  const activeHostKeySessionsRef = useRef<Map<string, { side: "left" | "right"; tabId: string }>>(new Map());
+
+  const setPendingHostKeyVerification = useCallback((
+    next: (SftpHostKeyVerificationState & { requestId: string; sessionId: string }) | null,
+  ) => {
+    hostKeyVerificationRef.current = next;
+    setHostKeyVerification(next ? {
+      hostKeyInfo: next.hostKeyInfo,
+      progressLogs: next.progressLogs,
+    } : null);
+  }, []);
+
+  useEffect(() => {
+    const dispose = netcattyBridge.get()?.onHostKeyVerification?.((request: HostKeyVerificationRequest) => {
+      const sessionId = request.sessionId;
+      if (!sessionId) return;
+      const activeSession = activeHostKeySessionsRef.current.get(sessionId);
+      if (!activeSession) return;
+
+      const hostKeyInfo = toSftpHostKeyInfo(request);
+      const logLine = request.status === "changed"
+        ? `Host key changed for ${request.hostname}. Waiting for confirmation...`
+        : `Host key verification required for ${request.hostname}.`;
+
+      updateTab(activeSession.side, activeSession.tabId, (prev) => ({
+        ...prev,
+        connectionLogs: [...prev.connectionLogs, logLine],
+      }));
+      setPendingHostKeyVerification({
+        requestId: request.requestId,
+        sessionId,
+        hostKeyInfo,
+        progressLogs: [logLine],
+      });
+    });
+
+    return () => {
+      dispose?.();
+    };
+  }, [setPendingHostKeyVerification, updateTab]);
+
+  const respondToHostKeyVerification = useCallback((accept: boolean, addToKnownHosts = false) => {
+    const pending = hostKeyVerificationRef.current;
+    if (!pending) return;
+    if (accept && addToKnownHosts) {
+      onAddKnownHost?.(createKnownHostFromSftpHostKeyInfo(pending.hostKeyInfo));
+    }
+    void netcattyBridge.get()?.respondHostKeyVerification?.(
+      pending.requestId,
+      accept,
+      addToKnownHosts,
+    );
+    setPendingHostKeyVerification(null);
+  }, [onAddKnownHost, setPendingHostKeyVerification]);
+
+  const rejectHostKeyVerification = useCallback(() => {
+    respondToHostKeyVerification(false);
+  }, [respondToHostKeyVerification]);
+
+  const acceptHostKeyVerification = useCallback(() => {
+    respondToHostKeyVerification(true, false);
+  }, [respondToHostKeyVerification]);
+
+  const acceptAndSaveHostKeyVerification = useCallback(() => {
+    respondToHostKeyVerification(true, true);
+  }, [respondToHostKeyVerification]);
 
   const connect = useCallback(
-    async (side: "left" | "right", host: Host | "local", options?: { forceNewTab?: boolean; onTabCreated?: (tabId: string) => void; sourceSessionId?: string }) => {
+    async (side: "left" | "right", host: Host | "local", options?: SftpConnectOptions) => {
       const setTabs = side === "left" ? setLeftTabs : setRightTabs;
 
       let activeTabId: string | null = null;
@@ -101,6 +216,33 @@ export const useSftpConnections = ({
 
       navSeqRef.current[side] += 1;
       const connectRequestId = navSeqRef.current[side];
+      const getTargetPane = () => {
+        const tabs = side === "left" ? leftTabsRef.current.tabs : rightTabsRef.current.tabs;
+        return tabs.find((tab) => tab.id === activeTabId) ?? null;
+      };
+      const isTargetConnectionCurrent = () => {
+        const pane = getTargetPane();
+        if (!pane) return false;
+        if (pane.connection?.id === connectionId) return true;
+        return !pane.connection && navSeqRef.current[side] === connectRequestId;
+      };
+      const isTargetConnectionAtPath = (path: string) => {
+        const connection = getTargetPane()?.connection;
+        if (!connection) return navSeqRef.current[side] === connectRequestId;
+        return connection?.id === connectionId && connection.currentPath === path;
+      };
+      const closeSftpSessionForConnection = async () => {
+        const sftpId = sftpSessionsRef.current.get(connectionId);
+        sftpSessionsRef.current.delete(connectionId);
+        connectionCacheKeyMapRef.current.delete(connectionId);
+        clearCacheForConnection(connectionId);
+        if (!sftpId) return;
+        try {
+          await netcattyBridge.get()?.closeSftp(sftpId);
+        } catch {
+          // Ignore errors when closing stale SFTP sessions
+        }
+      };
 
       lastConnectedHostRef.current[side] = host;
       // Store the cache key for this connection so pane actions can look it up
@@ -147,13 +289,15 @@ export const useSftpConnections = ({
           homeDir = isWindows ? "C:\\Users\\damao" : "/Users/damao";
         }
 
+        const startPath = options?.initialPath || homeDir;
+
         const connection: SftpConnection = {
           id: connectionId,
           hostId: "local",
           hostLabel: "Local",
           isLocal: true,
           status: "connected",
-          currentPath: homeDir,
+          currentPath: startPath,
           homeDir,
         };
 
@@ -168,9 +312,9 @@ export const useSftpConnections = ({
         }));
 
         try {
-          const files = await listLocalFiles(homeDir);
-          if (navSeqRef.current[side] !== connectRequestId) return;
-          dirCacheRef.current.set(makeCacheKey(connectionId, homeDir, filenameEncoding), {
+          const files = await listLocalFiles(startPath);
+          if (!isTargetConnectionAtPath(startPath)) return;
+          dirCacheRef.current.set(makeCacheKey(connectionId, startPath, filenameEncoding), {
             files,
             timestamp: Date.now(),
           });
@@ -182,7 +326,7 @@ export const useSftpConnections = ({
             reconnecting: false,
           }));
         } catch (err) {
-          if (navSeqRef.current[side] !== connectRequestId) return;
+          if (!isTargetConnectionAtPath(startPath)) return;
           reconnectingRef.current[side] = false;
           updateTab(side, activeTabId, (prev) => ({
             ...prev,
@@ -193,12 +337,15 @@ export const useSftpConnections = ({
         }
       } else {
         const hostCacheKey = buildCacheKey(host.id, host.hostname, host.port, host.protocol, host.sftpSudo, host.username);
-        const sharedHostCacheCandidate = getSharedRemoteHostCache(hostCacheKey);
-        const sharedHostCache =
-          sharedHostCacheCandidate?.filenameEncoding === filenameEncoding
-            ? sharedHostCacheCandidate
-            : null;
-        const cachedStartPath = sharedHostCache?.path ?? "/";
+        const sharedHostCacheCandidate = options?.ignoreSharedCache
+          ? null
+          : getSharedRemoteHostCache(hostCacheKey);
+        const { initialPath, sharedHostCache, cachedStartPath } = resolveRemoteSftpStartState({
+          filenameEncoding,
+          ignoreSharedCache: options?.ignoreSharedCache,
+          initialPath: options?.initialPath,
+          sharedHostCacheCandidate,
+        });
 
         const connection: SftpConnection = {
           id: connectionId,
@@ -230,6 +377,7 @@ export const useSftpConnections = ({
 
         // Subscribe to SFTP connection progress events for auth logging
         const sftpSessionId = `sftp-${connectionId}`;
+        activeHostKeySessionsRef.current.set(sftpSessionId, { side, tabId: activeTabId });
         let unsubSftpProgress: (() => void) | undefined;
         const bridge = netcattyBridge.get();
         if (bridge?.onSftpConnectionProgress) {
@@ -264,7 +412,7 @@ export const useSftpConnections = ({
                 logLine = `${label} - ${status}${detail ? `: ${detail}` : ''}`;
             }
             // Only update if this is still the active request (avoids stale logs leaking)
-            if (navSeqRef.current[side] !== connectRequestId) return;
+            if (!isTargetConnectionCurrent()) return;
             updateTab(side, activeTabId, (prev) => ({
               ...prev,
               connectionLogs: [...prev.connectionLogs, logLine],
@@ -295,7 +443,7 @@ export const useSftpConnections = ({
           if (hasKey) {
             try {
               const keyFirstCredentials = {
-                sessionId: `sftp-${connectionId}`,
+                sessionId: sftpSessionId,
                 ...credentials,
                 sourceSessionId: options?.sourceSessionId,
               };
@@ -306,7 +454,7 @@ export const useSftpConnections = ({
             } catch (err) {
               if (hasPassword && isAuthError(err)) {
                 sftpId = await openSftp({
-                  sessionId: `sftp-${connectionId}`,
+                  sessionId: sftpSessionId,
                   ...credentials,
                   sourceSessionId: options?.sourceSessionId,
                   privateKey: undefined,
@@ -322,7 +470,7 @@ export const useSftpConnections = ({
             }
           } else {
             sftpId = await openSftp({
-              sessionId: `sftp-${connectionId}`,
+              sessionId: sftpSessionId,
               ...credentials,
               sourceSessionId: options?.sourceSessionId,
             });
@@ -331,6 +479,10 @@ export const useSftpConnections = ({
           if (!sftpId) throw new Error("Failed to open SFTP session");
 
           sftpSessionsRef.current.set(connectionId, sftpId);
+          if (!isTargetConnectionCurrent()) {
+            await closeSftpSessionForConnection();
+            return;
+          }
 
           let startPath = sharedHostCache?.path ?? "/";
           let homeDir = sharedHostCache?.homeDir ?? startPath;
@@ -395,6 +547,10 @@ export const useSftpConnections = ({
             }
           }
 
+          if (initialPath) {
+            startPath = initialPath;
+          }
+
           const provisionalCacheKey = sharedHostCache
             ? makeCacheKey(connectionId, startPath, filenameEncoding)
             : null;
@@ -438,7 +594,10 @@ export const useSftpConnections = ({
               throw new Error("Cannot list any remote directory");
             }
           }
-          if (navSeqRef.current[side] !== connectRequestId) return;
+          if (!isTargetConnectionCurrent()) {
+            await closeSftpSessionForConnection();
+            return;
+          }
           dirCacheRef.current.set(makeCacheKey(connectionId, startPath, filenameEncoding), {
             files,
             timestamp: Date.now(),
@@ -469,7 +628,10 @@ export const useSftpConnections = ({
             connectionLogs: [], // Clear after successful connect to avoid replay during navigation
           }));
         } catch (err) {
-          if (navSeqRef.current[side] !== connectRequestId) return;
+          if (!isTargetConnectionCurrent()) {
+            await closeSftpSessionForConnection();
+            return;
+          }
           reconnectingRef.current[side] = false;
           updateTab(side, activeTabId, (prev) => ({
             ...prev,
@@ -489,6 +651,10 @@ export const useSftpConnections = ({
             reconnecting: false,
           }));
         } finally {
+          activeHostKeySessionsRef.current.delete(sftpSessionId);
+          if (hostKeyVerificationRef.current?.sessionId === sftpSessionId) {
+            setPendingHostKeyVerification(null);
+          }
           unsubSftpProgress?.();
         }
       }
@@ -503,6 +669,7 @@ export const useSftpConnections = ({
       makeCacheKey,
       listLocalFiles,
       listRemoteFiles,
+      setPendingHostKeyVerification,
     ],
   );
 
@@ -588,5 +755,9 @@ export const useSftpConnections = ({
     disconnect,
     listLocalFiles,
     listRemoteFiles,
+    hostKeyVerification,
+    rejectHostKeyVerification,
+    acceptHostKeyVerification,
+    acceptAndSaveHostKeyVerification,
   };
 };

application/state/sftp/useSftpExternalOperations.ts

@@ -1,5 +1,6 @@
 import { useCallback, useRef, useMemo, useState } from "react";
 import { FileConflict, FileConflictAction, TransferStatus, SftpFilenameEncoding } from "../../../domain/models";
+import { getSftpConflictTypeKey } from "../../../domain/sftpConflict";
 import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
 import { logger } from "../../../lib/logger";
 import { notify } from "../../notification";
@@ -501,7 +502,7 @@ export const useSftpExternalOperations = (
       newModified: number;
       applyToAllCount: number;
     }): Promise<FileConflictAction> => {
-      const conflictType = conflict.isDirectory ? "directory" : "file";
+      const conflictType = getSftpConflictTypeKey(conflict.isDirectory, conflict.existingType);
       const defaultAction = conflictDefaults.get(conflictType);
       if (defaultAction) return defaultAction;
 

application/state/sftp/useSftpHostCredentials.test.ts

@@ -2,7 +2,7 @@ import test from "node:test";
 import assert from "node:assert/strict";
 
 import { buildSftpHostCredentials } from "./useSftpHostCredentials.ts";
-import type { Host, SSHKey } from "../../../domain/models.ts";
+import type { Host, KnownHost, SSHKey } from "../../../domain/models.ts";
 
 const host = (overrides: Partial<Host> = {}): Host => ({
   id: "host-1",
@@ -102,6 +102,28 @@ test("buildSftpHostCredentials passes reference keys as identity file paths", ()
   assert.equal(credentials.passphrase, "saved-passphrase");
 });
 
+test("buildSftpHostCredentials forwards known hosts for SFTP host-key checks", () => {
+  const knownHosts: KnownHost[] = [{
+    id: "kh-1",
+    hostname: "example.com",
+    port: 22,
+    keyType: "ssh-ed25519",
+    publicKey: "SHA256:abc",
+    fingerprint: "abc",
+    discoveredAt: 1,
+  }];
+
+  const credentials = buildSftpHostCredentials({
+    host: host(),
+    hosts: [],
+    keys: [],
+    identities: [],
+    knownHosts,
+  });
+
+  assert.equal(credentials.knownHosts, knownHosts);
+});
+
 test("buildSftpHostCredentials passes jump host reference keys as identity file paths", () => {
   const key: SSHKey = {
     id: "jump-key",

application/state/sftp/useSftpHostCredentials.ts

@@ -1,5 +1,5 @@
 import { useCallback } from "react";
-import type { Host, Identity, SSHKey, TerminalSettings } from "../../../domain/models";
+import type { Host, Identity, KnownHost, SSHKey, TerminalSettings } from "../../../domain/models";
 import { isEncryptedCredentialPlaceholder, sanitizeCredentialValue } from "../../../domain/credentials";
 import { resolveBridgeKeyAuth, resolveHostAuth } from "../../../domain/sshAuth";
 import { resolveHostKeepalive } from "../../../domain/host";
@@ -14,6 +14,7 @@ interface UseSftpHostCredentialsParams {
   hosts: Host[];
   keys: SSHKey[];
   identities: Identity[];
+  knownHosts?: KnownHost[];
   terminalSettings?: Pick<TerminalSettings, 'keepaliveInterval' | 'keepaliveCountMax'>;
 }
 
@@ -22,6 +23,7 @@ export const buildSftpHostCredentials = ({
   hosts,
   keys,
   identities,
+  knownHosts,
   terminalSettings,
 }: UseSftpHostCredentialsParams & { host: Host }): NetcattySSHOptions => {
   const globalKeepalive = terminalSettings ?? FALLBACK_KEEPALIVE;
@@ -165,6 +167,7 @@ export const buildSftpHostCredentials = ({
     identityFilePaths: keyAuth.identityFilePaths,
     keepaliveInterval: targetKeepalive.interval,
     keepaliveCountMax: targetKeepalive.countMax,
+    knownHosts,
     // Algorithm settings — must reach the SFTP bridge or hosts that need
     // legacy mode / the ECDSA skip / advanced overrides would still hit
     // the original negotiation failure when opening their SFTP pane,
@@ -179,9 +182,10 @@ export const useSftpHostCredentials = ({
   hosts,
   keys,
   identities,
+  knownHosts,
   terminalSettings,
 }: UseSftpHostCredentialsParams) =>
   useCallback(
-    (host: Host): NetcattySSHOptions => buildSftpHostCredentials({ host, hosts, keys, identities, terminalSettings }),
-    [hosts, identities, keys, terminalSettings],
+    (host: Host): NetcattySSHOptions => buildSftpHostCredentials({ host, hosts, keys, identities, knownHosts, terminalSettings }),
+    [hosts, identities, keys, knownHosts, terminalSettings],
   );

application/state/sftp/useSftpTransfers.ts

@@ -7,6 +7,12 @@ import {
   TransferStatus,
   TransferTask,
 } from "../../../domain/models";
+import {
+  canReplaceSftpConflict,
+  describeSftpExistingKind,
+  describeSftpIncomingKind,
+  getSftpConflictTypeKey,
+} from "../../../domain/sftpConflict";
 import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
 import { logger } from "../../../lib/logger";
 import { SftpPane } from "./types";
@@ -69,8 +75,14 @@ export const useSftpTransfers = ({
   );
 
   const conflictDefaultKey = useCallback(
-    (batchId: string | undefined, isDirectory: boolean) =>
-      `${batchId ?? "global"}:${isDirectory ? "directory" : "file"}`,
+    (batchId: string | undefined, isDirectory: boolean, existingType?: "file" | "directory" | "symlink") =>
+      `${batchId ?? "global"}:${getSftpConflictTypeKey(isDirectory, existingType)}`,
+    [],
+  );
+
+  const buildReplaceTypeMismatchError = useCallback(
+    (isDirectory: boolean, existingType: "file" | "directory" | "symlink" | undefined, targetPath: string) =>
+      `Cannot replace existing ${describeSftpExistingKind(existingType)} with ${describeSftpIncomingKind(isDirectory)}: ${targetPath}`,
     [],
   );
 
@@ -233,6 +245,33 @@ export const useSftpTransfers = ({
           const existingStat = await statTargetPath(targetPane, targetSftpId, task.targetPath, targetEncoding);
 
           if (existingStat) {
+            const applyToAllCount = task.batchId
+              ? await (async () => {
+                  const candidates = transfersRef.current.filter((candidate) =>
+                    candidate.batchId === task.batchId &&
+                    candidate.isDirectory === task.isDirectory &&
+                    !candidate.parentTaskId &&
+                    candidate.status !== "completed" &&
+                    candidate.status !== "cancelled",
+                  );
+                  const matches = await Promise.all(candidates.map(async (candidate) => {
+                    if (candidate.id === task.id) return true;
+                    try {
+                      const candidateStat = await statTargetPath(
+                        targetPane,
+                        targetSftpId,
+                        candidate.targetPath,
+                        targetEncoding,
+                      );
+                      return candidateStat?.type === existingStat.type;
+                    } catch {
+                      return false;
+                    }
+                  }));
+                  return Math.max(1, matches.filter(Boolean).length);
+                })()
+              : 1;
+
             return {
               transferId: task.id,
               batchId: task.batchId,
@@ -241,15 +280,7 @@ export const useSftpTransfers = ({
               targetPath: task.targetPath,
               isDirectory: task.isDirectory,
               existingType: existingStat.type,
-              applyToAllCount: task.batchId
-                ? transfersRef.current.filter((candidate) =>
-                    candidate.batchId === task.batchId &&
-                    candidate.isDirectory === task.isDirectory &&
-                    !candidate.parentTaskId &&
-                    candidate.status !== "completed" &&
-                    candidate.status !== "cancelled",
-                  ).length
-                : 1,
+              applyToAllCount,
               existingSize: existingStat.size,
               newSize: sourceStat?.size || task.totalBytes || 0,
               existingModified: existingStat.mtime,
@@ -271,7 +302,9 @@ export const useSftpTransfers = ({
       const conflict = await conflictCheckPromise;
 
       if (conflict) {
-        const defaultAction = conflictDefaultsRef.current.get(conflictDefaultKey(task.batchId, task.isDirectory));
+        const defaultAction = conflictDefaultsRef.current.get(
+          conflictDefaultKey(task.batchId, task.isDirectory, conflict.existingType),
+        );
         if (defaultAction) {
           if (defaultAction === "stop") {
             await markBatchStopped(task);
@@ -285,6 +318,16 @@ export const useSftpTransfers = ({
             return "cancelled";
           }
 
+          if (defaultAction === "replace" && !canReplaceSftpConflict(task.isDirectory, conflict.existingType)) {
+            updateTask({
+              status: "failed",
+              endTime: Date.now(),
+              error: buildReplaceTypeMismatchError(task.isDirectory, conflict.existingType, task.targetPath),
+              retryable: false,
+            });
+            return "failed";
+          }
+
           const duplicateTarget = defaultAction === "duplicate"
             ? await getDuplicateTarget(task, targetPane, targetSftpId, targetEncoding)
             : null;
@@ -728,16 +771,19 @@ export const useSftpTransfers = ({
         return;
       }
 
-      const selectedConflictKey = conflictDefaultKey(task.batchId, task.isDirectory);
+      const selectedConflictKey = conflictDefaultKey(conflict.batchId, conflict.isDirectory, conflict.existingType);
       const affectedConflicts = applyToAll
         ? conflictsRef.current.filter((candidate) =>
-            conflictDefaultKey(candidate.batchId, candidate.isDirectory) === selectedConflictKey,
+            conflictDefaultKey(candidate.batchId, candidate.isDirectory, candidate.existingType) === selectedConflictKey,
           )
         : [conflict];
       const affectedConflictIds = new Set(affectedConflicts.map((candidate) => candidate.transferId));
       const affectedTasks = affectedConflicts
         .map((candidate) => transfersRef.current.find((transfer) => transfer.id === candidate.transferId))
         .filter((candidate): candidate is TransferTask => Boolean(candidate));
+      const affectedConflictById = new Map<string, FileConflict>(
+        affectedConflicts.map((candidate): [string, FileConflict] => [candidate.transferId, candidate]),
+      );
 
       if (applyToAll) {
         conflictDefaultsRef.current.set(selectedConflictKey, action);
@@ -771,9 +817,11 @@ export const useSftpTransfers = ({
       }
 
       const updatedTasks: TransferTask[] = [];
+      const blockedReplaceTasks: Array<{ task: TransferTask; conflict: FileConflict }> = [];
 
       for (const affectedTask of affectedTasks) {
         let updatedTask = { ...affectedTask };
+        const affectedConflict = affectedConflictById.get(affectedTask.id);
 
         if (action === "duplicate") {
           const endpoints = resolveTaskEndpoints(affectedTask);
@@ -792,6 +840,13 @@ export const useSftpTransfers = ({
             skipConflictCheck: true,
           };
         } else if (action === "replace") {
+          if (
+            affectedConflict &&
+            !canReplaceSftpConflict(affectedTask.isDirectory, affectedConflict.existingType)
+          ) {
+            blockedReplaceTasks.push({ task: affectedTask, conflict: affectedConflict });
+            continue;
+          }
           updatedTask = {
             ...affectedTask,
             skipConflictCheck: true,
@@ -808,6 +863,28 @@ export const useSftpTransfers = ({
         updatedTasks.push(updatedTask);
       }
 
+      if (blockedReplaceTasks.length > 0) {
+        const blockedTaskIds = new Set(blockedReplaceTasks.map(({ task }) => task.id));
+        const blockedErrors = new Map(
+          blockedReplaceTasks.map(({ task, conflict }) => [
+            task.id,
+            buildReplaceTypeMismatchError(task.isDirectory, conflict.existingType, task.targetPath),
+          ]),
+        );
+        setTransfers((prev) =>
+          prev.map((t) => blockedTaskIds.has(t.id)
+            ? {
+                ...t,
+                status: "failed" as TransferStatus,
+                endTime: Date.now(),
+                error: blockedErrors.get(t.id),
+                retryable: false,
+              }
+            : t,
+          ),
+        );
+      }
+
       const updatedTaskMap = new Map(updatedTasks.map((updatedTask) => [updatedTask.id, updatedTask]));
       setTransfers((prev) =>
         prev.map((t) => {

application/state/shellHistoryPersistence.test.ts

@@ -0,0 +1,53 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+
+import { buildDockerLogsCommand } from '../../domain/systemManager/dockerShell.ts';
+import { loadSanitizedShellHistory } from './shellHistoryPersistence.ts';
+import type { ShellHistoryEntry } from '../../domain/models.ts';
+
+const entry = (id: string, command: string): ShellHistoryEntry => ({
+  id,
+  command,
+  hostId: 'host-1',
+  hostLabel: 'Host',
+  sessionId: 'session-1',
+  timestamp: 1000,
+});
+
+test('loadSanitizedShellHistory removes persisted managed startup commands and writes back cleaned history', () => {
+  const stored = [
+    entry('managed', buildDockerLogsCommand('587abcdef123')),
+    entry('user', 'docker ps -a'),
+  ];
+  let written: ShellHistoryEntry[] | null = null;
+
+  const loaded = loadSanitizedShellHistory({
+    read: () => stored,
+    write: (_key, value) => {
+      written = value;
+      return true;
+    },
+  });
+
+  assert.deepEqual(
+    loaded?.map((item) => item.command),
+    ['docker ps -a'],
+  );
+  assert.deepEqual(written, loaded);
+});
+
+test('loadSanitizedShellHistory does not write when persisted history is already clean', () => {
+  const stored = [entry('user', 'docker ps -a')];
+  let writeCount = 0;
+
+  const loaded = loadSanitizedShellHistory({
+    read: () => stored,
+    write: () => {
+      writeCount += 1;
+      return true;
+    },
+  });
+
+  assert.deepEqual(loaded, stored);
+  assert.equal(writeCount, 0);
+});

application/state/shellHistoryPersistence.ts

@@ -0,0 +1,23 @@
+import type { ShellHistoryEntry } from '../../domain/models';
+import { sanitizeGlobalHistoryEntries } from '../../domain/globalHistory';
+import { STORAGE_KEY_SHELL_HISTORY } from '../../infrastructure/config/storageKeys';
+import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
+
+type ShellHistoryStorage = {
+  read<T>(key: string): T | null;
+  write<T>(key: string, value: T): boolean;
+};
+
+export function loadSanitizedShellHistory(
+  storage: ShellHistoryStorage = localStorageAdapter,
+  storageKey = STORAGE_KEY_SHELL_HISTORY,
+): ShellHistoryEntry[] | null {
+  const savedShellHistory = storage.read<ShellHistoryEntry[]>(storageKey);
+  if (!savedShellHistory) return null;
+
+  const cleanedShellHistory = sanitizeGlobalHistoryEntries(savedShellHistory);
+  if (cleanedShellHistory.length !== savedShellHistory.length) {
+    storage.write(storageKey, cleanedShellHistory);
+  }
+  return cleanedShellHistory;
+}

application/state/systemManagerDiagnostics.ts

@@ -0,0 +1,16 @@
+import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
+
+export async function writeSystemManagerDiagnostic(
+  message: string,
+  extra?: Record<string, unknown>,
+) {
+  try {
+    await netcattyBridge.get()?.logDiagnostic?.({
+      source: 'system-manager',
+      message,
+      extra,
+    });
+  } catch {
+    // Diagnostics must never block the user action being diagnosed.
+  }
+}

application/state/terminalDragData.ts

@@ -0,0 +1,62 @@
+export const WORKSPACE_SESSION_DRAG_TYPE = 'application/x-netcatty-workspace-session';
+
+type DataTransferLike = {
+  types: DOMStringList | readonly string[];
+  getData: (format: string) => string;
+};
+
+export function dataTransferHasType(dataTransfer: Pick<DataTransferLike, 'types'>, type: string): boolean {
+  return Array.prototype.includes.call(dataTransfer.types, type);
+}
+
+export function hasWorkspaceSessionDrag(dataTransfer: Pick<DataTransferLike, 'types'>): boolean {
+  return dataTransferHasType(dataTransfer, WORKSPACE_SESSION_DRAG_TYPE);
+}
+
+export function getWorkspaceSessionDragId(dataTransfer: DataTransferLike): string {
+  return dataTransfer.getData(WORKSPACE_SESSION_DRAG_TYPE) || dataTransfer.getData('session-id');
+}
+
+export function isPointInsideRect(
+  point: { clientX: number; clientY: number },
+  rect: Pick<DOMRect, 'left' | 'right' | 'top' | 'bottom'>,
+): boolean {
+  return point.clientX >= rect.left
+    && point.clientX <= rect.right
+    && point.clientY >= rect.top
+    && point.clientY <= rect.bottom;
+}
+
+export type TopTabInsertionTarget = {
+  tabId: string;
+  position: 'before' | 'after';
+};
+
+export function getTopTabInsertionTarget(
+  point: { clientX: number; clientY: number },
+  topTabsRoot: HTMLElement | null,
+): TopTabInsertionTarget | null {
+  if (!topTabsRoot || !isPointInsideRect(point, topTabsRoot.getBoundingClientRect())) return null;
+
+  const tabs = Array.from(topTabsRoot.querySelectorAll<HTMLElement>('[data-tab-id]'))
+    .filter((tab) => tab.dataset.tabType !== 'root');
+
+  if (tabs.length === 0) return null;
+
+  for (const tab of tabs) {
+    const rect = tab.getBoundingClientRect();
+    const midpoint = rect.left + rect.width / 2;
+    const tabId = tab.dataset.tabId;
+    if (!tabId) continue;
+    if (point.clientX <= midpoint) {
+      return { tabId, position: 'before' };
+    }
+    if (point.clientX <= rect.right) {
+      return { tabId, position: 'after' };
+    }
+  }
+
+  const lastTab = tabs[tabs.length - 1];
+  const lastTabId = lastTab?.dataset.tabId;
+  return lastTabId ? { tabId: lastTabId, position: 'after' } : null;
+}

application/state/themeTransition.test.ts

@@ -74,3 +74,56 @@ test("runThemeTransition uses view transition API when available", async () => {
   await new Promise((resolve) => setTimeout(resolve, 0));
   assert.equal(finished, true);
 });
+
+test("runThemeTransition handles skipped view transitions", async () => {
+  const root = createRoot();
+  let applied = false;
+  let rejectFinished!: (reason: unknown) => void;
+  const doc = {
+    startViewTransition: (callback: () => void) => {
+      callback();
+      return {
+        finished: new Promise<void>((_, reject) => {
+          rejectFinished = reject;
+        }),
+        skipTransition: () => {},
+      };
+    },
+  };
+  (root as { ownerDocument: typeof doc }).ownerDocument = doc;
+
+  runThemeTransition(() => {
+    applied = true;
+  }, root);
+
+  rejectFinished(new DOMException("Transition was skipped", "AbortError"));
+  await new Promise((resolve) => setTimeout(resolve, 0));
+
+  assert.equal(applied, true);
+  assert.equal(root.getAttribute(THEME_TRANSITION_ATTR), null);
+});
+
+test("runThemeTransition can apply without animation for heavy tab switches", () => {
+  const root = createRoot();
+  let applied = false;
+  let startViewTransitionCalled = false;
+  const doc = {
+    startViewTransition: (callback: () => void) => {
+      startViewTransitionCalled = true;
+      callback();
+      return {
+        finished: Promise.resolve(),
+        skipTransition: () => {},
+      };
+    },
+  };
+  (root as { ownerDocument: typeof doc }).ownerDocument = doc;
+
+  runThemeTransition(() => {
+    applied = true;
+  }, { root, mode: "instant" });
+
+  assert.equal(applied, true);
+  assert.equal(startViewTransitionCalled, false);
+  assert.equal(root.getAttribute(THEME_TRANSITION_ATTR), null);
+});

application/state/themeTransition.ts

@@ -2,6 +2,7 @@ import { TERMINAL_HOST_TREE_ANIMATION_MS } from './terminalHostTreeAnimation';
 
 export const THEME_TRANSITION_ATTR = 'data-theme-transition';
 export const THEME_TRANSITION_MS = TERMINAL_HOST_TREE_ANIMATION_MS;
+export type ThemeTransitionMode = 'view' | 'css' | 'instant';
 
 type DocumentWithViewTransition = Document & {
   startViewTransition?: (callback: () => void | Promise<void>) => {
@@ -10,12 +11,57 @@ type DocumentWithViewTransition = Document & {
   };
 };
 
+type ThemeTransitionOptions = {
+  root?: HTMLElement;
+  mode?: ThemeTransitionMode;
+};
+
 let cancelThemeTransitionReset: (() => void) | null = null;
 
+function resolveOptions(rootOrOptions?: HTMLElement | ThemeTransitionOptions): Required<ThemeTransitionOptions> {
+  if (
+    rootOrOptions
+    && (
+      Object.prototype.hasOwnProperty.call(rootOrOptions, 'root')
+      || Object.prototype.hasOwnProperty.call(rootOrOptions, 'mode')
+    )
+  ) {
+    const options = rootOrOptions as ThemeTransitionOptions;
+    return {
+      root: options.root ?? document.documentElement,
+      mode: options.mode ?? 'view',
+    };
+  }
+
+  return {
+    root: rootOrOptions as HTMLElement | undefined ?? document.documentElement,
+    mode: 'view',
+  };
+}
+
+function runCssThemeTransition(apply: () => void, root: HTMLElement, cleanup: () => void): void {
+  root.setAttribute(THEME_TRANSITION_ATTR, 'true');
+  apply();
+  const timer = globalThis.setTimeout(cleanup, THEME_TRANSITION_MS + 40);
+  cancelThemeTransitionReset = () => {
+    globalThis.clearTimeout(timer);
+    cleanup();
+  };
+}
+
+function skipViewTransition(transition: ReturnType<NonNullable<DocumentWithViewTransition['startViewTransition']>>): void {
+  try {
+    transition.skipTransition();
+  } catch {
+    // Already finished or skipped by the browser.
+  }
+}
+
 export function runThemeTransition(
   apply: () => void,
-  root: HTMLElement = document.documentElement,
+  rootOrOptions?: HTMLElement | ThemeTransitionOptions,
 ): void {
+  const { root, mode } = resolveOptions(rootOrOptions);
   cancelThemeTransitionReset?.();
 
   const cleanup = () => {
@@ -23,6 +69,17 @@ export function runThemeTransition(
     cancelThemeTransitionReset = null;
   };
 
+  if (mode === 'instant') {
+    apply();
+    cleanup();
+    return;
+  }
+
+  if (mode === 'css') {
+    runCssThemeTransition(apply, root, cleanup);
+    return;
+  }
+
   const doc = root.ownerDocument as DocumentWithViewTransition | null;
   const startViewTransition = doc?.startViewTransition?.bind(doc);
 
@@ -33,29 +90,19 @@ export function runThemeTransition(
         apply();
       });
     } catch {
-      root.setAttribute(THEME_TRANSITION_ATTR, 'true');
-      apply();
-      const timer = globalThis.setTimeout(cleanup, THEME_TRANSITION_MS + 40);
-      cancelThemeTransitionReset = () => {
-        globalThis.clearTimeout(timer);
-        cleanup();
-      };
+      runCssThemeTransition(apply, root, cleanup);
       return;
     }
 
     cancelThemeTransitionReset = () => {
-      transition?.skipTransition();
+      if (transition) {
+        skipViewTransition(transition);
+      }
       cleanup();
     };
-    void transition.finished.finally(cleanup);
+    void transition.finished.then(cleanup, cleanup);
     return;
   }
 
-  root.setAttribute(THEME_TRANSITION_ATTR, 'true');
-  apply();
-  const timer = globalThis.setTimeout(cleanup, THEME_TRANSITION_MS + 40);
-  cancelThemeTransitionReset = () => {
-    globalThis.clearTimeout(timer);
-    cleanup();
-  };
+  runCssThemeTransition(apply, root, cleanup);
 }

application/state/uploadService.test.ts

@@ -139,6 +139,86 @@ test("uploads picked folder files with their relative directory structure", asyn
   ]);
 });
 
+test("does not replace an existing directory when uploading a same-named file", async () => {
+  const file = new File(["local"], "dddd", { lastModified: 1234 });
+  const deletedPaths: string[] = [];
+  const uploadedPaths: string[] = [];
+
+  const results = await uploadFromFileList(
+    [file],
+    {
+      targetPath: "/target",
+      sftpId: "sftp-1",
+      isLocal: false,
+      bridge: {
+        mkdirSftp: async () => {},
+        statSftp: async (_sftpId, path) =>
+          path === "/target/dddd"
+            ? { type: "directory", size: 0, lastModified: 1000 }
+            : null,
+        deleteSftp: async (_sftpId, path) => {
+          deletedPaths.push(path);
+        },
+        writeSftpBinary: async (_sftpId, path) => {
+          uploadedPaths.push(path);
+        },
+      },
+      joinPath: (base, name) => `${base}/${name}`,
+      resolveConflict: async () => "replace",
+    },
+  );
+
+  assert.deepEqual(deletedPaths, []);
+  assert.deepEqual(uploadedPaths, []);
+  assert.equal(results.length, 1);
+  assert.equal(results[0].fileName, "dddd");
+  assert.equal(results[0].success, false);
+  assert.match(results[0].error ?? "", /directory/i);
+});
+
+test("counts apply-to-all upload conflicts by incoming and existing type", async () => {
+  const files = [
+    new File(["local"], "existing-file", { lastModified: 1234 }),
+    new File(["local"], "existing-directory", { lastModified: 1234 }),
+  ];
+  const conflictCounts: number[] = [];
+
+  const results = await uploadFromFileList(
+    files,
+    {
+      targetPath: "/target",
+      sftpId: "sftp-1",
+      isLocal: false,
+      bridge: {
+        mkdirSftp: async () => {},
+        statSftp: async (_sftpId, path) => {
+          if (path === "/target/existing-file") {
+            return { type: "file", size: 2, lastModified: 1000 };
+          }
+          if (path === "/target/existing-directory") {
+            return { type: "directory", size: 0, lastModified: 1000 };
+          }
+          return null;
+        },
+        writeSftpBinary: async () => {
+          throw new Error("skipped conflicts should not upload");
+        },
+      },
+      joinPath: (base, name) => `${base}/${name}`,
+      resolveConflict: async (conflict) => {
+        conflictCounts.push(conflict.applyToAllCount);
+        return "skip";
+      },
+    },
+  );
+
+  assert.deepEqual(conflictCounts, [1, 1]);
+  assert.deepEqual(results, [
+    { fileName: "existing-file", success: false, cancelled: true },
+    { fileName: "existing-directory", success: false, cancelled: true },
+  ]);
+});
+
 test("uploads path-backed clipboard files through stream transfer", async () => {
   const transfers: Array<{ sourcePath: string; targetPath: string; totalBytes?: number }> = [];
   const taskTotals: number[] = [];

application/state/useAISettingsState.ts

@@ -0,0 +1,350 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
+import {
+  STORAGE_KEY_AI_PROVIDERS,
+  STORAGE_KEY_AI_ACTIVE_PROVIDER,
+  STORAGE_KEY_AI_ACTIVE_MODEL,
+  STORAGE_KEY_AI_PERMISSION_MODE,
+  STORAGE_KEY_AI_TOOL_INTEGRATION_MODE,
+  STORAGE_KEY_AI_EXTERNAL_AGENTS,
+  STORAGE_KEY_AI_DEFAULT_AGENT,
+  STORAGE_KEY_AI_COMMAND_BLOCKLIST,
+  STORAGE_KEY_AI_COMMAND_TIMEOUT,
+  STORAGE_KEY_AI_MAX_ITERATIONS,
+  STORAGE_KEY_AI_AGENT_MODEL_MAP,
+  STORAGE_KEY_AI_AGENT_PROVIDER_MAP,
+  STORAGE_KEY_AI_WEB_SEARCH,
+  STORAGE_KEY_AI_QUICK_MESSAGES,
+  STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION,
+} from '../../infrastructure/config/storageKeys';
+import type { AIQuickMessage } from '../../infrastructure/ai/quickMessages';
+import { sanitizeQuickMessages } from '../../infrastructure/ai/quickMessages';
+import type {
+  AIPermissionMode,
+  AIToolIntegrationMode,
+  ExternalAgentConfig,
+  ProviderConfig,
+  WebSearchConfig,
+} from '../../infrastructure/ai/types';
+import { DEFAULT_COMMAND_BLOCKLIST } from '../../infrastructure/ai/types';
+import { removeProviderReferences } from './aiProviderCleanup';
+import { AI_STATE_CHANGED_EVENT, emitAIStateChanged } from './aiStateEvents';
+import { getAIBridge } from './aiStateSnapshots';
+import { useStoredBoolean } from './useStoredBoolean';
+
+function readPermissionMode(): AIPermissionMode {
+  const stored = localStorageAdapter.readString(STORAGE_KEY_AI_PERMISSION_MODE);
+  if (stored === 'observer' || stored === 'confirm' || stored === 'autonomous') return stored;
+  return 'confirm';
+}
+
+function readToolIntegrationMode(): AIToolIntegrationMode {
+  return localStorageAdapter.readString(STORAGE_KEY_AI_TOOL_INTEGRATION_MODE) === 'skills'
+    ? 'skills'
+    : 'mcp';
+}
+
+export function useAISettingsState() {
+  const [providers, setProvidersRaw] = useState<ProviderConfig[]>(() =>
+    localStorageAdapter.read<ProviderConfig[]>(STORAGE_KEY_AI_PROVIDERS) ?? []
+  );
+  const [activeProviderId, setActiveProviderIdRaw] = useState<string>(() =>
+    localStorageAdapter.readString(STORAGE_KEY_AI_ACTIVE_PROVIDER) ?? ''
+  );
+  const [activeModelId, setActiveModelIdRaw] = useState<string>(() =>
+    localStorageAdapter.readString(STORAGE_KEY_AI_ACTIVE_MODEL) ?? ''
+  );
+  const [globalPermissionMode, setGlobalPermissionModeRaw] = useState<AIPermissionMode>(readPermissionMode);
+  const [toolIntegrationMode, setToolIntegrationModeRaw] = useState<AIToolIntegrationMode>(readToolIntegrationMode);
+  const [externalAgents, setExternalAgentsRaw] = useState<ExternalAgentConfig[]>(() =>
+    localStorageAdapter.read<ExternalAgentConfig[]>(STORAGE_KEY_AI_EXTERNAL_AGENTS) ?? []
+  );
+  const [defaultAgentId, setDefaultAgentIdRaw] = useState<string>(() =>
+    localStorageAdapter.readString(STORAGE_KEY_AI_DEFAULT_AGENT) ?? 'catty'
+  );
+  const [commandBlocklist, setCommandBlocklistRaw] = useState<string[]>(() =>
+    localStorageAdapter.read<string[]>(STORAGE_KEY_AI_COMMAND_BLOCKLIST) ?? [...DEFAULT_COMMAND_BLOCKLIST]
+  );
+  const [commandTimeout, setCommandTimeoutRaw] = useState<number>(() =>
+    localStorageAdapter.readNumber(STORAGE_KEY_AI_COMMAND_TIMEOUT) ?? 60
+  );
+  const [maxIterations, setMaxIterationsRaw] = useState<number>(() =>
+    localStorageAdapter.readNumber(STORAGE_KEY_AI_MAX_ITERATIONS) ?? 20
+  );
+  const [webSearchConfig, setWebSearchConfigRaw] = useState<WebSearchConfig | null>(() =>
+    localStorageAdapter.read<WebSearchConfig>(STORAGE_KEY_AI_WEB_SEARCH) ?? null
+  );
+  const [quickMessages, setQuickMessagesRaw] = useState<AIQuickMessage[]>(() =>
+    sanitizeQuickMessages(localStorageAdapter.read<unknown>(STORAGE_KEY_AI_QUICK_MESSAGES)),
+  );
+  const [showTerminalSelectionAIAction, setShowTerminalSelectionAIAction] = useStoredBoolean(
+    STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION,
+    true,
+  );
+
+  const setProviders = useCallback((value: ProviderConfig[] | ((prev: ProviderConfig[]) => ProviderConfig[])) => {
+    setProvidersRaw((prev) => {
+      const next = typeof value === 'function' ? value(prev) : value;
+      localStorageAdapter.write(STORAGE_KEY_AI_PROVIDERS, next);
+      return next;
+    });
+  }, []);
+
+  const addProvider = useCallback((provider: ProviderConfig) => {
+    setProviders((prev) => [...prev, provider]);
+  }, [setProviders]);
+
+  const updateProvider = useCallback((id: string, updates: Partial<ProviderConfig>) => {
+    setProviders((prev) => prev.map((provider) => (
+      provider.id === id ? { ...provider, ...updates } : provider
+    )));
+  }, [setProviders]);
+
+  const removeProvider = useCallback((id: string) => {
+    setProviders((prev) => prev.filter((provider) => provider.id !== id));
+    setActiveProviderIdRaw((prevId) => {
+      if (prevId !== id) return prevId;
+      localStorageAdapter.writeString(STORAGE_KEY_AI_ACTIVE_PROVIDER, '');
+      return '';
+    });
+
+    const agentProviderMap =
+      localStorageAdapter.read<Record<string, string>>(STORAGE_KEY_AI_AGENT_PROVIDER_MAP) ?? {};
+    const agentModelMap =
+      localStorageAdapter.read<Record<string, string>>(STORAGE_KEY_AI_AGENT_MODEL_MAP) ?? {};
+    const cleanup = removeProviderReferences(id, agentProviderMap, agentModelMap);
+    if (cleanup.providerMapChanged) {
+      localStorageAdapter.write(STORAGE_KEY_AI_AGENT_PROVIDER_MAP, cleanup.agentProviderMap);
+    }
+    if (cleanup.modelMapChanged) {
+      localStorageAdapter.write(STORAGE_KEY_AI_AGENT_MODEL_MAP, cleanup.agentModelMap);
+    }
+  }, [setProviders]);
+
+  const setActiveProviderId = useCallback((id: string) => {
+    setActiveProviderIdRaw(id);
+    localStorageAdapter.writeString(STORAGE_KEY_AI_ACTIVE_PROVIDER, id);
+  }, []);
+
+  const setActiveModelId = useCallback((id: string) => {
+    setActiveModelIdRaw(id);
+    localStorageAdapter.writeString(STORAGE_KEY_AI_ACTIVE_MODEL, id);
+  }, []);
+
+  const setGlobalPermissionMode = useCallback((mode: AIPermissionMode) => {
+    setGlobalPermissionModeRaw(mode);
+    localStorageAdapter.writeString(STORAGE_KEY_AI_PERMISSION_MODE, mode);
+    getAIBridge()?.aiMcpSetPermissionMode?.(mode);
+  }, []);
+
+  const setToolIntegrationMode = useCallback((mode: AIToolIntegrationMode) => {
+    setToolIntegrationModeRaw(mode);
+    localStorageAdapter.writeString(STORAGE_KEY_AI_TOOL_INTEGRATION_MODE, mode);
+    getAIBridge()?.aiMcpSetToolIntegrationMode?.(mode);
+  }, []);
+
+  const setExternalAgents = useCallback((value: ExternalAgentConfig[] | ((prev: ExternalAgentConfig[]) => ExternalAgentConfig[])) => {
+    setExternalAgentsRaw((prev) => {
+      const next = typeof value === 'function' ? value(prev) : value;
+      localStorageAdapter.write(STORAGE_KEY_AI_EXTERNAL_AGENTS, next);
+      return next;
+    });
+  }, []);
+
+  const setDefaultAgentId = useCallback((id: string) => {
+    setDefaultAgentIdRaw(id);
+    localStorageAdapter.writeString(STORAGE_KEY_AI_DEFAULT_AGENT, id);
+  }, []);
+
+  const setCommandBlocklist = useCallback((value: string[]) => {
+    setCommandBlocklistRaw(value);
+    localStorageAdapter.write(STORAGE_KEY_AI_COMMAND_BLOCKLIST, value);
+    getAIBridge()?.aiMcpSetCommandBlocklist?.(value);
+  }, []);
+
+  const setCommandTimeout = useCallback((value: number) => {
+    setCommandTimeoutRaw(value);
+    localStorageAdapter.writeNumber(STORAGE_KEY_AI_COMMAND_TIMEOUT, value);
+    getAIBridge()?.aiMcpSetCommandTimeout?.(value);
+  }, []);
+
+  const setMaxIterations = useCallback((value: number) => {
+    setMaxIterationsRaw(value);
+    localStorageAdapter.writeNumber(STORAGE_KEY_AI_MAX_ITERATIONS, value);
+    getAIBridge()?.aiMcpSetMaxIterations?.(value);
+  }, []);
+
+  const setWebSearchConfig = useCallback((config: WebSearchConfig | null) => {
+    setWebSearchConfigRaw(config);
+    if (config) {
+      localStorageAdapter.write(STORAGE_KEY_AI_WEB_SEARCH, config);
+    } else {
+      localStorageAdapter.remove(STORAGE_KEY_AI_WEB_SEARCH);
+    }
+  }, []);
+
+  const setQuickMessages = useCallback((value: AIQuickMessage[] | ((prev: AIQuickMessage[]) => AIQuickMessage[])) => {
+    setQuickMessagesRaw((prev) => {
+      const nextRaw = typeof value === 'function' ? value(prev) : value;
+      const next = sanitizeQuickMessages(nextRaw);
+      localStorageAdapter.write(STORAGE_KEY_AI_QUICK_MESSAGES, next);
+      emitAIStateChanged(STORAGE_KEY_AI_QUICK_MESSAGES);
+      return next;
+    });
+  }, []);
+
+  useEffect(() => {
+    const syncFromStorageKey = (key: string | null) => {
+      try {
+        switch (key) {
+          case STORAGE_KEY_AI_PROVIDERS: {
+            const parsed = localStorageAdapter.read<ProviderConfig[]>(STORAGE_KEY_AI_PROVIDERS);
+            if (parsed != null && !Array.isArray(parsed)) break;
+            setProvidersRaw(parsed ?? []);
+            break;
+          }
+          case STORAGE_KEY_AI_ACTIVE_PROVIDER:
+            setActiveProviderIdRaw(localStorageAdapter.readString(STORAGE_KEY_AI_ACTIVE_PROVIDER) ?? '');
+            break;
+          case STORAGE_KEY_AI_ACTIVE_MODEL:
+            setActiveModelIdRaw(localStorageAdapter.readString(STORAGE_KEY_AI_ACTIVE_MODEL) ?? '');
+            break;
+          case STORAGE_KEY_AI_PERMISSION_MODE:
+            setGlobalPermissionModeRaw(readPermissionMode());
+            getAIBridge()?.aiMcpSetPermissionMode?.(readPermissionMode());
+            break;
+          case STORAGE_KEY_AI_TOOL_INTEGRATION_MODE:
+            setToolIntegrationModeRaw(readToolIntegrationMode());
+            getAIBridge()?.aiMcpSetToolIntegrationMode?.(readToolIntegrationMode());
+            break;
+          case STORAGE_KEY_AI_EXTERNAL_AGENTS: {
+            const agents = localStorageAdapter.read<ExternalAgentConfig[]>(STORAGE_KEY_AI_EXTERNAL_AGENTS);
+            if (agents != null && !Array.isArray(agents)) break;
+            setExternalAgentsRaw(agents ?? []);
+            break;
+          }
+          case STORAGE_KEY_AI_DEFAULT_AGENT:
+            setDefaultAgentIdRaw(localStorageAdapter.readString(STORAGE_KEY_AI_DEFAULT_AGENT) ?? 'catty');
+            break;
+          case STORAGE_KEY_AI_COMMAND_BLOCKLIST: {
+            const list = localStorageAdapter.read<string[]>(STORAGE_KEY_AI_COMMAND_BLOCKLIST);
+            if (list != null && !Array.isArray(list)) break;
+            const blocklist = list ?? [...DEFAULT_COMMAND_BLOCKLIST];
+            setCommandBlocklistRaw(blocklist);
+            getAIBridge()?.aiMcpSetCommandBlocklist?.(blocklist);
+            break;
+          }
+          case STORAGE_KEY_AI_COMMAND_TIMEOUT: {
+            const timeout = localStorageAdapter.readNumber(STORAGE_KEY_AI_COMMAND_TIMEOUT) ?? 60;
+            if (!Number.isFinite(timeout)) break;
+            setCommandTimeoutRaw(timeout);
+            getAIBridge()?.aiMcpSetCommandTimeout?.(timeout);
+            break;
+          }
+          case STORAGE_KEY_AI_MAX_ITERATIONS: {
+            const iters = localStorageAdapter.readNumber(STORAGE_KEY_AI_MAX_ITERATIONS) ?? 20;
+            if (!Number.isFinite(iters)) break;
+            setMaxIterationsRaw(iters);
+            getAIBridge()?.aiMcpSetMaxIterations?.(iters);
+            break;
+          }
+          case STORAGE_KEY_AI_WEB_SEARCH:
+            setWebSearchConfigRaw(localStorageAdapter.read<WebSearchConfig>(STORAGE_KEY_AI_WEB_SEARCH) ?? null);
+            break;
+          case STORAGE_KEY_AI_QUICK_MESSAGES:
+            setQuickMessagesRaw(sanitizeQuickMessages(localStorageAdapter.read<unknown>(STORAGE_KEY_AI_QUICK_MESSAGES)));
+            break;
+        }
+      } catch (err) {
+        console.warn('[useAISettingsState] Failed to process AI settings storage change', key, err);
+      }
+    };
+
+    const handleStorage = (event: StorageEvent) => syncFromStorageKey(event.key);
+    const handleLocalStateChanged = (event: Event) => {
+      syncFromStorageKey((event as CustomEvent<{ key?: string }>).detail?.key ?? null);
+    };
+
+    window.addEventListener('storage', handleStorage);
+    window.addEventListener(AI_STATE_CHANGED_EVENT, handleLocalStateChanged);
+    return () => {
+      window.removeEventListener('storage', handleStorage);
+      window.removeEventListener(AI_STATE_CHANGED_EVENT, handleLocalStateChanged);
+    };
+  }, []);
+
+  useEffect(() => {
+    const bridge = getAIBridge();
+    bridge?.aiMcpSetCommandBlocklist?.(commandBlocklist);
+    bridge?.aiMcpSetCommandTimeout?.(commandTimeout);
+    bridge?.aiMcpSetMaxIterations?.(maxIterations);
+    bridge?.aiMcpSetPermissionMode?.(globalPermissionMode);
+    bridge?.aiMcpSetToolIntegrationMode?.(toolIntegrationMode);
+  }, [commandBlocklist, commandTimeout, globalPermissionMode, maxIterations, toolIntegrationMode]);
+
+  const activeProvider = providers.find((provider) => provider.id === activeProviderId) ?? null;
+
+  return useMemo(() => ({
+    providers,
+    setProviders,
+    addProvider,
+    updateProvider,
+    removeProvider,
+    activeProviderId,
+    setActiveProviderId,
+    activeModelId,
+    setActiveModelId,
+    activeProvider,
+    globalPermissionMode,
+    setGlobalPermissionMode,
+    toolIntegrationMode,
+    setToolIntegrationMode,
+    externalAgents,
+    setExternalAgents,
+    defaultAgentId,
+    setDefaultAgentId,
+    commandBlocklist,
+    setCommandBlocklist,
+    commandTimeout,
+    setCommandTimeout,
+    maxIterations,
+    setMaxIterations,
+    webSearchConfig,
+    setWebSearchConfig,
+    quickMessages,
+    setQuickMessages,
+    showTerminalSelectionAIAction,
+    setShowTerminalSelectionAIAction,
+  }), [
+    providers,
+    setProviders,
+    addProvider,
+    updateProvider,
+    removeProvider,
+    activeProviderId,
+    setActiveProviderId,
+    activeModelId,
+    setActiveModelId,
+    activeProvider,
+    globalPermissionMode,
+    setGlobalPermissionMode,
+    toolIntegrationMode,
+    setToolIntegrationMode,
+    externalAgents,
+    setExternalAgents,
+    defaultAgentId,
+    setDefaultAgentId,
+    commandBlocklist,
+    setCommandBlocklist,
+    commandTimeout,
+    setCommandTimeout,
+    maxIterations,
+    setMaxIterations,
+    webSearchConfig,
+    setWebSearchConfig,
+    quickMessages,
+    setQuickMessages,
+    showTerminalSelectionAIAction,
+    setShowTerminalSelectionAIAction,
+  ]);
+}

application/state/useAIState.ts

@@ -17,7 +17,10 @@ import {
   STORAGE_KEY_AI_AGENT_MODEL_MAP,
   STORAGE_KEY_AI_AGENT_PROVIDER_MAP,
   STORAGE_KEY_AI_WEB_SEARCH,
+  STORAGE_KEY_AI_QUICK_MESSAGES,
 } from '../../infrastructure/config/storageKeys';
+import type { AIQuickMessage } from '../../infrastructure/ai/quickMessages';
+import { sanitizeQuickMessages } from '../../infrastructure/ai/quickMessages';
 import type {
   AIDraft,
   AISession,
@@ -35,6 +38,8 @@ import {
   activateDraftView,
   clearScopeDraftState,
   ensureDraftForScopeState,
+  pruneStaleSessionPanelViews,
+  setDraftView,
   setSessionView,
   updateDraftForScope,
 } from './aiDraftState';
@@ -110,7 +115,9 @@ export function useAIState() {
 
   // ── Sessions ──
   const [sessions, setSessionsRaw] = useState<AISession[]>(() =>
-    localStorageAdapter.read<AISession[]>(STORAGE_KEY_AI_SESSIONS) ?? []
+    latestAISessionsSnapshot
+      ?? localStorageAdapter.read<AISession[]>(STORAGE_KEY_AI_SESSIONS)
+      ?? []
   );
   // Ref that always holds the latest sessions for use inside debounced callbacks
   const sessionsRef = useRef(sessions);
@@ -119,7 +126,9 @@ export function useAIState() {
   }, [sessions]);
   // Per-scope active session: keyed by `${scopeType}:${scopeTargetId}`
   const [activeSessionIdMap, setActiveSessionIdMapRaw] = useState<Record<string, string | null>>(() =>
-    localStorageAdapter.read<Record<string, string | null>>(STORAGE_KEY_AI_ACTIVE_SESSION_MAP) ?? {}
+    latestAIActiveSessionMapSnapshot
+      ?? localStorageAdapter.read<Record<string, string | null>>(STORAGE_KEY_AI_ACTIVE_SESSION_MAP)
+      ?? {}
   );
   // Per-scope draft/view state is intentionally memory-only so a relaunch
   // does not restore stale composer input or panel intent against new history.
@@ -158,6 +167,11 @@ export function useAIState() {
     localStorageAdapter.read<WebSearchConfig>(STORAGE_KEY_AI_WEB_SEARCH) ?? null
   );
 
+  // ── Quick Messages (slash prompts) ──
+  const [quickMessages, setQuickMessagesRaw] = useState<AIQuickMessage[]>(() =>
+    sanitizeQuickMessages(localStorageAdapter.read<unknown>(STORAGE_KEY_AI_QUICK_MESSAGES)),
+  );
+
   useEffect(() => {
     setLatestAISessionsSnapshot(sessions);
   }, [sessions]);
@@ -175,7 +189,7 @@ export function useAIState() {
   }, [panelViewByScope]);
 
   useEffect(() => {
-    const validSessionIds = new Set(sessions.map((session) => session.id));
+    const validSessionIds = new Set<string>(sessions.map((session) => session.id));
     let changed = false;
     const nextActiveSessionIdMap: Record<string, string | null> = {};
 
@@ -187,12 +201,22 @@ export function useAIState() {
       }
     }
 
-    if (!changed) return;
+    if (changed) {
+      setLatestAIActiveSessionMapSnapshot(nextActiveSessionIdMap);
+      localStorageAdapter.write(STORAGE_KEY_AI_ACTIVE_SESSION_MAP, nextActiveSessionIdMap);
+      setActiveSessionIdMapRaw(nextActiveSessionIdMap);
+      emitAIStateChanged(STORAGE_KEY_AI_ACTIVE_SESSION_MAP);
+    }
 
-    setLatestAIActiveSessionMapSnapshot(nextActiveSessionIdMap);
-    localStorageAdapter.write(STORAGE_KEY_AI_ACTIVE_SESSION_MAP, nextActiveSessionIdMap);
-    setActiveSessionIdMapRaw(nextActiveSessionIdMap);
-    emitAIStateChanged(STORAGE_KEY_AI_ACTIVE_SESSION_MAP);
+    setPanelViewByScopeRaw((prev) => {
+      const next = pruneStaleSessionPanelViews(prev, validSessionIds);
+      if (next === prev) {
+        return prev;
+      }
+      setLatestAIPanelViewByScopeSnapshot(next);
+      emitAIStateChanged(AI_STATE_CHANGED_PANEL_VIEW_BY_SCOPE);
+      return next;
+    });
   }, [sessions, activeSessionIdMap]);
 
   const setActiveSessionId = useCallback((scopeKey: string, id: string | null) => {
@@ -263,6 +287,16 @@ export function useAIState() {
     }
   }, []);
 
+  const setQuickMessages = useCallback((value: AIQuickMessage[] | ((prev: AIQuickMessage[]) => AIQuickMessage[])) => {
+    setQuickMessagesRaw((prev) => {
+      const nextRaw = typeof value === 'function' ? value(prev) : value;
+      const next = sanitizeQuickMessages(nextRaw);
+      localStorageAdapter.write(STORAGE_KEY_AI_QUICK_MESSAGES, next);
+      emitAIStateChanged(STORAGE_KEY_AI_QUICK_MESSAGES);
+      return next;
+    });
+  }, []);
+
   // ── Persist helpers ──
   const setProviders = useCallback((value: ProviderConfig[] | ((prev: ProviderConfig[]) => ProviderConfig[])) => {
     setProvidersRaw(prev => {
@@ -454,6 +488,11 @@ export function useAIState() {
           case STORAGE_KEY_AI_WEB_SEARCH:
             setWebSearchConfigRaw(localStorageAdapter.read<WebSearchConfig>(STORAGE_KEY_AI_WEB_SEARCH) ?? null);
             break;
+          case STORAGE_KEY_AI_QUICK_MESSAGES: {
+            const messages = localStorageAdapter.read<unknown>(STORAGE_KEY_AI_QUICK_MESSAGES);
+            setQuickMessagesRaw(sanitizeQuickMessages(messages));
+            break;
+          }
         }
       } catch (err) {
         console.warn('[useAIState] Cross-window sync: failed to process storage event for key', e.key, err);
@@ -593,6 +632,19 @@ export function useAIState() {
         }
         return prev;
       });
+      setPanelViewByScopeRaw((prev) => {
+        const currentPanelView = prev[scopeKey];
+        if (currentPanelView?.mode !== 'session' || currentPanelView.sessionId !== sessionId) {
+          return prev;
+        }
+        const next = setDraftView(prev, scopeKey);
+        if (next === prev) {
+          return prev;
+        }
+        setLatestAIPanelViewByScopeSnapshot(next);
+        emitAIStateChanged(AI_STATE_CHANGED_PANEL_VIEW_BY_SCOPE);
+        return next;
+      });
     }
   }, [persistSessions]);
 
@@ -974,6 +1026,8 @@ export function useAIState() {
     setAgentProvider,
     webSearchConfig,
     setWebSearchConfig,
+    quickMessages,
+    setQuickMessages,
     sessions,
     activeSessionIdMap,
     draftsByScope,
@@ -1029,6 +1083,8 @@ export function useAIState() {
     setAgentProvider,
     webSearchConfig,
     setWebSearchConfig,
+    quickMessages,
+    setQuickMessages,
     sessions,
     activeSessionIdMap,
     draftsByScope,

application/state/useActiveChromeTheme.test.ts

@@ -3,7 +3,19 @@ import test from "node:test";
 
 import {
   scheduleChromeLayoutAnimation,
+  syncActiveChromeTheme,
+  themeFingerprint,
 } from "./useActiveChromeTheme.ts";
+import { TERMINAL_THEMES } from "../../infrastructure/config/terminalThemes.ts";
+
+function createInlineStyle() {
+  const values = new Map<string, string>();
+  return {
+    getPropertyValue: (name: string) => values.get(name) ?? "",
+    setProperty: (name: string, value: string) => values.set(name, value),
+    removeProperty: (name: string) => values.delete(name),
+  };
+}
 
 function createRafRoot() {
   const callbacks = new Map<number, FrameRequestCallback>();
@@ -47,3 +59,37 @@ test("chrome layout animations wait until theme settle frames complete", () => {
   assert.equal(ran, true);
   cancel();
 });
+
+test("syncActiveChromeTheme refreshes top tabs when the active theme fingerprint is unchanged", () => {
+  const globalWithDocument = globalThis as typeof globalThis & { document?: Document };
+  const originalDocument = globalWithDocument.document;
+  const theme = TERMINAL_THEMES[0];
+  assert.ok(theme);
+  const topTabsRoot = {
+    style: createInlineStyle(),
+  };
+  const documentElement = {
+    dataset: { activeChromeTheme: themeFingerprint(theme) },
+  };
+  const fakeDocument = {
+    documentElement,
+    querySelector: (selector: string) => selector === "[data-top-tabs-root]" ? topTabsRoot : null,
+  };
+  globalWithDocument.document = fakeDocument as unknown as Document;
+
+  try {
+    syncActiveChromeTheme(theme, () => {
+      throw new Error("app theme should not be restored for an unchanged active chrome theme");
+    });
+
+    assert.notEqual(topTabsRoot.style.getPropertyValue("--top-tabs-bg"), "");
+    assert.notEqual(topTabsRoot.style.getPropertyValue("--top-tabs-active-bg"), "");
+    assert.notEqual(topTabsRoot.style.getPropertyValue("--top-tabs-accent"), "");
+  } finally {
+    if (originalDocument) {
+      globalWithDocument.document = originalDocument;
+    } else {
+      delete globalWithDocument.document;
+    }
+  }
+});

application/state/useActiveChromeTheme.ts

@@ -208,10 +208,17 @@ function applyActiveChromeTheme(theme: TerminalTheme) {
     }
     style.textContent = getChromeCss(theme);
     root.dataset.activeChromeTheme = themeFingerprint(theme);
+    refreshActiveChromeThemeSurfaces(theme);
+  }, { mode: "instant" });
+}
+
+function refreshActiveChromeThemeSurfaces(theme: TerminalTheme) {
+  const targetClass = theme.type === "dark" ? "dark" : "light";
+  if (typeof window !== "undefined") {
     netcattyBridge.get()?.setTheme?.(targetClass);
     netcattyBridge.get()?.setBackgroundColor?.(theme.colors.background);
-    applyTopTabsChromeThemeVars(theme);
-  });
+  }
+  applyTopTabsChromeThemeVars(theme);
 }
 
 export function syncActiveChromeTheme(
@@ -220,7 +227,14 @@ export function syncActiveChromeTheme(
 ): void {
   const nextFingerprint = activeTheme ? themeFingerprint(activeTheme) : null;
   const appliedFingerprint = getAppliedChromeFingerprint();
-  if (nextFingerprint === appliedFingerprint) return;
+  if (nextFingerprint === appliedFingerprint) {
+    if (activeTheme) {
+      refreshActiveChromeThemeSurfaces(activeTheme);
+    } else {
+      clearTopTabsChromeThemeVars();
+    }
+    return;
+  }
 
   if (activeTheme) {
     applyActiveChromeTheme(activeTheme);
@@ -231,7 +245,7 @@ export function syncActiveChromeTheme(
   runThemeTransition(() => {
     removeActiveChromeTheme();
     applyAppTheme();
-  });
+  }, { mode: "instant" });
 }
 
 export function useActiveChromeTheme({

application/state/useAgentDiscovery.ts

@@ -1,15 +1,24 @@
-import { useCallback, useEffect, useState } from 'react';
+import { startTransition, useCallback, useEffect, useRef, useState } from 'react';
 import type { DiscoveredAgent, ExternalAgentConfig } from '../../infrastructure/ai/types';
 import { getExternalAgentSdkBackend } from '../../infrastructure/ai/managedAgents';
 
 interface NetcattyBridge {
-  aiDiscoverAgents(): Promise<DiscoveredAgent[]>;
+  aiDiscoverAgents(options?: { refreshShellEnv?: boolean; apiKeyPresent?: boolean }): Promise<DiscoveredAgent[]>;
 }
 
 function getBridge(): NetcattyBridge | undefined {
   return (window as unknown as { netcatty?: NetcattyBridge }).netcatty;
 }
 
+const AGENT_DISCOVERY_CACHE_TTL_MS = 60_000;
+let agentDiscoveryCache: {
+  agents: DiscoveredAgent[];
+  apiKeyPresent: boolean;
+  updatedAt: number;
+} | null = null;
+const agentDiscoveryPromises = new Map<string, Promise<DiscoveredAgent[]>>();
+let agentDiscoveryWriteGeneration = 0;
+
 export function useAgentDiscovery(
   externalAgents: ExternalAgentConfig[],
   setExternalAgents?: (value: ExternalAgentConfig[] | ((prev: ExternalAgentConfig[]) => ExternalAgentConfig[])) => void,
@@ -18,21 +27,86 @@ export function useAgentDiscovery(
   const enabled = options?.enabled ?? true;
   const [discoveredAgents, setDiscoveredAgents] = useState<DiscoveredAgent[]>([]);
   const [isDiscovering, setIsDiscovering] = useState(false);
+  const discoverSeqRef = useRef(0);
+  const mountedRef = useRef(true);
+  const enabledRef = useRef(enabled);
 
-  const discover = useCallback(async () => {
+  enabledRef.current = enabled;
+
+  useEffect(() => () => {
+    mountedRef.current = false;
+    discoverSeqRef.current += 1;
+  }, []);
+
+  const cursorApiKeyPresent = externalAgents.some(
+    (agent) => agent.id === "discovered_cursor" && Boolean(agent.apiKey),
+  );
+
+  const discover = useCallback(async (discoverOptions?: { refreshShellEnv?: boolean }) => {
+    if (!enabledRef.current) return;
     const bridge = getBridge();
     if (!bridge) return;
 
+    const forceRefresh = discoverOptions?.refreshShellEnv === true;
+    const cacheFresh =
+      agentDiscoveryCache
+      && agentDiscoveryCache.apiKeyPresent === cursorApiKeyPresent
+      && Date.now() - agentDiscoveryCache.updatedAt < AGENT_DISCOVERY_CACHE_TTL_MS;
+
+    if (!forceRefresh && cacheFresh) {
+      startTransition(() => setDiscoveredAgents(agentDiscoveryCache?.agents ?? []));
+      return;
+    }
+
     setIsDiscovering(true);
+    const discoverSeq = ++discoverSeqRef.current;
+    const writeGeneration = ++agentDiscoveryWriteGeneration;
+    const promiseKey = JSON.stringify({
+      apiKeyPresent: cursorApiKeyPresent,
+      refreshShellEnv: forceRefresh,
+    });
     try {
-      const agents = await bridge.aiDiscoverAgents();
-      setDiscoveredAgents(agents);
+      let discoveryPromise = agentDiscoveryPromises.get(promiseKey) ?? null;
+      if (!discoveryPromise) {
+        const sharedPromise = bridge.aiDiscoverAgents({
+          ...discoverOptions,
+          apiKeyPresent: cursorApiKeyPresent,
+        }).finally(() => {
+          if (agentDiscoveryPromises.get(promiseKey) === sharedPromise) {
+            agentDiscoveryPromises.delete(promiseKey);
+          }
+        });
+        agentDiscoveryPromises.set(promiseKey, sharedPromise);
+        discoveryPromise = sharedPromise;
+      }
+      const agents = await discoveryPromise;
+      if (
+        !mountedRef.current
+        || !enabledRef.current
+        || discoverSeq !== discoverSeqRef.current
+        || writeGeneration !== agentDiscoveryWriteGeneration
+      ) return;
+      agentDiscoveryCache = {
+        agents,
+        apiKeyPresent: cursorApiKeyPresent,
+        updatedAt: Date.now(),
+      };
+      startTransition(() => setDiscoveredAgents(agents));
     } catch (err) {
       console.error('Agent discovery failed:', err);
     } finally {
+      if (mountedRef.current && discoverSeq === discoverSeqRef.current) {
+        setIsDiscovering(false);
+      }
+    }
+  }, [cursorApiKeyPresent]);
+
+  useEffect(() => {
+    discoverSeqRef.current += 1;
+    if (!enabled) {
       setIsDiscovering(false);
     }
-  }, []);
+  }, [cursorApiKeyPresent, enabled]);
 
   useEffect(() => {
     if (!enabled) return;
@@ -61,6 +135,7 @@ export function useAgentDiscovery(
   // the canonical args from discovery change (e.g. after an app update).
   useEffect(() => {
     if (!setExternalAgents || discoveredAgents.length === 0) return;
+    if (!enabled) return;
 
     setExternalAgents((prev) => {
       let changed = false;
@@ -95,7 +170,7 @@ export function useAgentDiscovery(
       });
       return changed ? next : prev;
     });
-  }, [discoveredAgents, setExternalAgents]);
+  }, [discoveredAgents, enabled, setExternalAgents]);
 
   // Filter out agents that are already configured as external agents
   const unconfiguredAgents = discoveredAgents.filter(
@@ -128,7 +203,7 @@ export function useAgentDiscovery(
     discoveredAgents,
     unconfiguredAgents,
     isDiscovering,
-    rediscover: discover,
+    rediscover: () => discover({ refreshShellEnv: true }),
     enableAgent,
   };
 }

application/state/useGlobalHotkeys.ts

@@ -23,6 +23,7 @@ export const getAppLevelActions = (): Set<string> => {
     'nextTab',
     'prevTab',
     'closeTab',
+    'closeSession',
     'newTab',
     'openHosts',
     'openSftp',
@@ -35,6 +36,7 @@ export const getAppLevelActions = (): Set<string> => {
     'splitVertical',
     'moveFocus',
     'broadcast',
+    'togglePaneZoom',
     'openLocal',
     'openSettings',
   ]);

application/state/usePortForwardingState.ts

@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Host, Identity, PortForwardingRule, SSHKey } from "../../domain/models";
+import { getNextVaultOrder, normalizeVaultOrder, reorderVaultItems, sortByVaultOrder, type VaultOrderPosition } from "../../domain/vaultOrder";
 import {
   STORAGE_KEY_PF_PREFER_FORM_MODE,
   STORAGE_KEY_PF_VIEW_MODE,
@@ -30,7 +31,7 @@ let heartbeatIntervalId: ReturnType<typeof setInterval> | undefined;
 
 export type { ViewMode };
 
-export type SortMode = "az" | "za" | "newest" | "oldest";
+export type SortMode = "manual" | "az" | "za" | "newest" | "oldest";
 
 export interface UsePortForwardingStateResult {
   rules: PortForwardingRule[];
@@ -52,6 +53,7 @@ export interface UsePortForwardingStateResult {
   updateRule: (id: string, updates: Partial<PortForwardingRule>) => void;
   deleteRule: (id: string) => void;
   duplicateRule: (id: string) => void;
+  reorderRule: (sourceId: string, targetId: string, position: VaultOrderPosition) => void;
   importRules: (rules: PortForwardingRule[]) => void;
 
   setRuleStatus: (
@@ -90,9 +92,9 @@ const notifyListeners = () => {
 };
 
 const setGlobalRules = (newRules: PortForwardingRule[]) => {
-  globalRules = newRules;
+  globalRules = normalizeVaultOrder(newRules);
   notifyListeners();
-  localStorageAdapter.write(STORAGE_KEY_PORT_FORWARDING, newRules);
+  localStorageAdapter.write(STORAGE_KEY_PORT_FORWARDING, globalRules);
 };
 
 const normalizeRulesWithConnections = (rules: PortForwardingRule[]): PortForwardingRule[] => {
@@ -136,7 +138,7 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
     STORAGE_KEY_PF_VIEW_MODE,
     "grid",
   );
-  const [sortMode, setSortMode] = useState<SortMode>("newest");
+  const [sortMode, setSortMode] = useState<SortMode>("manual");
   const [search, setSearch] = useState("");
   const [preferFormMode, setPreferFormModeState] = useState<boolean>(() => {
     return localStorageAdapter.readBoolean(STORAGE_KEY_PF_PREFER_FORM_MODE) ?? false;
@@ -249,6 +251,7 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
         id: crypto.randomUUID(),
         createdAt: Date.now(),
         status: "inactive",
+        order: getNextVaultOrder(globalRules),
       };
       const updated = [...globalRules, newRule];
       setGlobalRules(updated);
@@ -294,6 +297,7 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
         status: "inactive",
         error: undefined,
         lastUsedAt: undefined,
+        order: getNextVaultOrder(globalRules),
       };
       const updated = [...globalRules, copy];
       setGlobalRules(updated);
@@ -302,6 +306,14 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
     [],
   );
 
+  const reorderRule = useCallback(
+    (sourceId: string, targetId: string, position: VaultOrderPosition) => {
+      setGlobalRules(reorderVaultItems(globalRules, sourceId, targetId, position));
+      setSortMode("manual");
+    },
+    [],
+  );
+
   const importRules = useCallback((newRules: PortForwardingRule[]) => {
     // When clearing all rules (e.g. "Clear local data"), stop ALL tunnels
     // and broadcast per-rule reconnect cancellation.  stopAllPortForwards
@@ -444,6 +456,9 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
       case "oldest":
         result.sort((a, b) => a.createdAt - b.createdAt);
         break;
+      case "manual":
+        result = sortByVaultOrder(result);
+        break;
     }
 
     return result;
@@ -469,6 +484,7 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
     updateRule,
     deleteRule,
     duplicateRule,
+    reorderRule,
     importRules,
 
     setRuleStatus,

application/state/useRemoteHistoryState.ts

@@ -0,0 +1,174 @@
+import { useCallback, useRef, useState } from 'react';
+import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
+import {
+  mergeRemoteHistory,
+  parseBashHistory,
+  parseFishHistory,
+  parseZshHistory,
+} from '../../domain/remoteHistory';
+import type { RemoteHistoryEntry } from '../../domain/models';
+
+export interface RemoteHistoryHostState {
+  entries: RemoteHistoryEntry[];
+  loading: boolean;
+  error: string | null;
+  fetchedAt: number | null;
+}
+
+const EMPTY_STATE: RemoteHistoryHostState = {
+  entries: [],
+  loading: false,
+  error: null,
+  fetchedAt: null,
+};
+
+const PENDING_RETRY_MS = 1500;
+const PENDING_MAX_RETRIES = 12;
+
+export interface UseRemoteHistoryState {
+  getState: (
+    hostId: string | null | undefined,
+    sessionId?: string | null,
+  ) => RemoteHistoryHostState;
+  fetch: (sessionId: string, hostId: string) => Promise<void>;
+  clear: (hostId: string, sessionId?: string | null) => void;
+}
+
+function cacheKey(hostId: string, sessionId: string): string {
+  return `${hostId}\0${sessionId}`;
+}
+
+/**
+ * Owns per-session remote shell history state. Fetches the remote host's shell
+ * history via the SSH bridge — which detects the login shell and returns only
+ * the matching file(s) — parses and de-dupes them, and keeps an in-memory
+ * cache keyed by (hostId, sessionId). The cache is intentionally not persisted
+ * — history files can contain sensitive content.
+ */
+export function useRemoteHistoryState(): UseRemoteHistoryState {
+  const [byKey, setByKey] = useState<Record<string, RemoteHistoryHostState>>({});
+  const requestIdByKey = useRef<Record<string, number>>({});
+
+  const getState = useCallback(
+    (
+      hostId: string | null | undefined,
+      sessionId?: string | null,
+    ): RemoteHistoryHostState => {
+      if (!hostId || !sessionId) return EMPTY_STATE;
+      return byKey[cacheKey(hostId, sessionId)] ?? EMPTY_STATE;
+    },
+    [byKey],
+  );
+
+  const fetch = useCallback(async (sessionId: string, hostId: string) => {
+    if (!sessionId || !hostId) return;
+    const key = cacheKey(hostId, sessionId);
+    const bridge = netcattyBridge.get();
+    if (!bridge?.readRemoteHistory) {
+      setByKey((prev) => ({
+        ...prev,
+        [key]: {
+          entries: prev[key]?.entries ?? [],
+          loading: false,
+          error: 'Remote history is not available in this build.',
+          fetchedAt: prev[key]?.fetchedAt ?? null,
+        },
+      }));
+      return;
+    }
+
+    const reqId = (requestIdByKey.current[key] ?? 0) + 1;
+    requestIdByKey.current[key] = reqId;
+
+    setByKey((prev) => ({
+      ...prev,
+      [key]: {
+        entries: prev[key]?.entries ?? [],
+        loading: true,
+        error: null,
+        fetchedAt: prev[key]?.fetchedAt ?? null,
+      },
+    }));
+
+    const isStale = () => requestIdByKey.current[key] !== reqId;
+
+    try {
+      for (let attempt = 0; attempt <= PENDING_MAX_RETRIES; attempt += 1) {
+        const result = await bridge.readRemoteHistory(sessionId, 1000);
+        if (isStale()) return;
+
+        if (!result?.success) {
+          if (result?.pending && attempt < PENDING_MAX_RETRIES) {
+            await new Promise((resolve) => {
+              window.setTimeout(resolve, PENDING_RETRY_MS);
+            });
+            if (isStale()) return;
+            continue;
+          }
+
+          setByKey((prev) => ({
+            ...prev,
+            [key]: {
+              entries: prev[key]?.entries ?? [],
+              loading: false,
+              error: result?.pending
+                ? 'Remote history is not ready yet. Try again shortly.'
+                : (result?.error || 'Failed to read remote history'),
+              fetchedAt: prev[key]?.fetchedAt ?? null,
+            },
+          }));
+          return;
+        }
+
+        const lists: RemoteHistoryEntry[][] = [];
+        if (result.shell === 'bash') {
+          lists.push(parseBashHistory(result.bash ?? ''));
+        } else if (result.shell === 'zsh') {
+          lists.push(parseZshHistory(result.zsh ?? ''));
+        } else if (result.shell === 'fish') {
+          lists.push(parseFishHistory(result.fish ?? ''));
+        } else {
+          lists.push(parseBashHistory(result.bash ?? ''));
+          lists.push(parseZshHistory(result.zsh ?? ''));
+          lists.push(parseFishHistory(result.fish ?? ''));
+        }
+        const merged = mergeRemoteHistory(lists);
+
+        setByKey((prev) => ({
+          ...prev,
+          [key]: {
+            entries: merged,
+            loading: false,
+            error: null,
+            fetchedAt: Date.now(),
+          },
+        }));
+        return;
+      }
+    } catch (err) {
+      if (isStale()) return;
+      setByKey((prev) => ({
+        ...prev,
+        [key]: {
+          entries: prev[key]?.entries ?? [],
+          loading: false,
+          error: err instanceof Error ? err.message : String(err),
+          fetchedAt: prev[key]?.fetchedAt ?? null,
+        },
+      }));
+    }
+  }, []);
+
+  const clear = useCallback((hostId: string, sessionId?: string | null) => {
+    const key = sessionId ? cacheKey(hostId, sessionId) : hostId;
+    requestIdByKey.current[key] = (requestIdByKey.current[key] ?? 0) + 1;
+    setByKey((prev) => {
+      if (!(key in prev)) return prev;
+      const next = { ...prev };
+      delete next[key];
+      return next;
+    });
+  }, []);
+
+  return { getState, fetch, clear };
+}

application/state/useSessionState.ts

@@ -17,8 +17,13 @@ SplitHint,
 updateWorkspaceSplitSizes,
 } from '../../domain/workspace';
 import { clearSessionFontSizeOverride as clearSessionFontSizeOverrideFields } from '../../domain/terminalAppearance';
-import { buildOrderedWorkTabIds } from '../app/workTabSurface';
+import { buildOrderedWorkTabIds, reorderWorkTabIds } from '../app/workTabSurface';
 import { activeTabStore } from './activeTabStore';
+import {
+  closeSessionWorkspaceLayoutState,
+  detachSessionFromWorkspaceState,
+  replaceDissolvedWorkspaceTabOrder,
+} from './sessionWorkspaceDetach';
 import {
   createCopiedTerminalSessionClone,
   createSplitTerminalSessionClone,
@@ -122,33 +127,12 @@ export const useSessionState = () => {
       const wsId = targetSession?.workspaceId;
 
       setWorkspaces(prevWorkspaces => {
-        let removedWorkspaceId: string | null = null;
-        let nextWorkspaces = prevWorkspaces;
-        let dissolvedWorkspaceId: string | null = null;
-        let lastRemainingSessionId: string | null = null;
-
-        if (wsId) {
-          nextWorkspaces = prevWorkspaces
-            .map(ws => {
-              if (ws.id !== wsId) return ws;
-              const pruned = pruneWorkspaceNode(ws.root, sessionId);
-              if (!pruned) {
-                removedWorkspaceId = ws.id;
-                return null;
-              }
-
-              // Check if only 1 session remains - dissolve workspace
-              const remainingSessionIds = collectSessionIds(pruned);
-              if (remainingSessionIds.length === 1) {
-                dissolvedWorkspaceId = ws.id;
-                lastRemainingSessionId = remainingSessionIds[0];
-                return null;
-              }
-
-              return { ...ws, root: pruned };
-            })
-            .filter((ws): ws is Workspace => Boolean(ws));
-        }
+        const {
+          workspaces: nextWorkspaces,
+          removedWorkspaceId,
+          dissolvedWorkspaceId,
+          lastRemainingSessionId,
+        } = closeSessionWorkspaceLayoutState(prevWorkspaces, wsId, sessionId);
 
         const remainingSessions = prevSessions.filter(s => s.id !== sessionId);
         const fallbackWorkspace = nextWorkspaces[nextWorkspaces.length - 1];
@@ -162,6 +146,14 @@ export const useSessionState = () => {
           return 'vault';
         };
 
+        if (dissolvedWorkspaceId && lastRemainingSessionId) {
+          setTabOrder(prevTabOrder => replaceDissolvedWorkspaceTabOrder(
+            prevTabOrder,
+            dissolvedWorkspaceId,
+            [lastRemainingSessionId],
+          ));
+        }
+
         if (dissolvedWorkspaceId && currentActiveTabId === dissolvedWorkspaceId) {
           setActiveTabId(getFallback());
         } else if (currentActiveTabId === sessionId) {
@@ -205,20 +197,39 @@ export const useSessionState = () => {
       const target = prevSessions.find(s => s.id === sessionId);
       if (target) {
         setSessionRenameTarget(target);
-        setSessionRenameValue(target.hostLabel);
+        setSessionRenameValue(target.customName || target.hostLabel);
       }
       return prevSessions;
     });
   }, []);
 
-  const submitSessionRename = useCallback(() => {
+  const renameSessionInline = useCallback((sessionId: string, name: string) => {
+    const trimmed = name.trim();
+    if (!trimmed) return;
+    setSessions(prev => prev.map(s => (
+      s.id === sessionId ? { ...s, customName: trimmed, hostLabel: trimmed } : s
+    )));
+  }, []);
+
+  const submitSessionRename = useCallback((sessionId?: string, name?: string) => {
+    if (sessionId !== undefined && name !== undefined) {
+      const trimmed = name.trim();
+      if (!trimmed) return;
+      setSessions(prev => prev.map(s => (
+        s.id === sessionId ? { ...s, customName: trimmed, hostLabel: trimmed } : s
+      )));
+      return;
+    }
+
     setSessionRenameValue(prevValue => {
-      const name = prevValue.trim();
-      if (!name) return prevValue;
+      const trimmed = prevValue.trim();
+      if (!trimmed) return prevValue;
 
       setSessionRenameTarget(prevTarget => {
         if (!prevTarget) return prevTarget;
-        setSessions(prev => prev.map(s => s.id === prevTarget.id ? { ...s, hostLabel: name } : s));
+        setSessions(prev => prev.map(s => (
+          s.id === prevTarget.id ? { ...s, customName: trimmed, hostLabel: trimmed } : s
+        )));
         return null;
       });
 
@@ -888,6 +899,50 @@ export const useSessionState = () => {
     [getOrderedWorkTabs],
   );
 
+  const removeSessionFromWorkspace = useCallback((
+    sessionId: string,
+    tabInsertionTarget?: {
+      tabId: string;
+      position: 'before' | 'after';
+      additionalTabIds?: readonly string[];
+    },
+  ) => {
+    setSessions(prevSessions => {
+      const result = detachSessionFromWorkspaceState({
+        sessions: prevSessions,
+        workspaces: workspacesRef.current,
+        sessionId,
+      });
+
+      if (!result.changed) return prevSessions;
+      setWorkspaces(result.workspaces);
+      setTabOrder(prevTabOrder => {
+        const replacedOrder = replaceDissolvedWorkspaceTabOrder(
+          prevTabOrder,
+          result.dissolvedWorkspaceId,
+          result.replacementTabIds,
+        );
+        if (!tabInsertionTarget) return replacedOrder;
+
+        const allTabIds = [
+          ...result.sessions.filter(s => !s.workspaceId).map(s => s.id),
+          ...result.workspaces.map(w => w.id),
+          ...logViews.map(lv => lv.id),
+          ...(tabInsertionTarget.additionalTabIds ?? []),
+        ];
+        return reorderWorkTabIds(
+          replacedOrder,
+          allTabIds,
+          sessionId,
+          tabInsertionTarget.tabId,
+          tabInsertionTarget.position,
+        );
+      });
+      if (result.activeTabId) setActiveTabId(result.activeTabId);
+      return result.sessions;
+    });
+  }, [logViews, setActiveTabId]);
+
   const reorderTabs = useCallback((
     draggedId: string,
     targetId: string,
@@ -896,39 +951,13 @@ export const useSessionState = () => {
   ) => {
     if (draggedId === targetId) return;
     
-    setTabOrder(prevTabOrder => {
-      const allTabIds = [...baseWorkTabIds, ...additionalTabIds];
-      const allTabIdSet = new Set(allTabIds);
-      
-      // Build current effective order: existing order + new tabs at end
-      const orderedIds = prevTabOrder.filter(id => allTabIdSet.has(id));
-      const orderedIdSet = new Set(orderedIds);
-      const newIds = allTabIds.filter(id => !orderedIdSet.has(id));
-      const currentOrder = [...orderedIds, ...newIds];
-      
-      const draggedIndex = currentOrder.indexOf(draggedId);
-      const targetIndex = currentOrder.indexOf(targetId);
-      
-      if (draggedIndex === -1 || targetIndex === -1) return prevTabOrder;
-      
-      // Remove dragged item first
-      currentOrder.splice(draggedIndex, 1);
-      
-      // Calculate new target index (adjusted after removal)
-      let newTargetIndex = targetIndex;
-      if (draggedIndex < targetIndex) {
-        newTargetIndex -= 1;
-      }
-      
-      // Insert at the correct position
-      if (position === 'after') {
-        newTargetIndex += 1;
-      }
-      
-      currentOrder.splice(newTargetIndex, 0, draggedId);
-      
-      return currentOrder;
-    });
+    setTabOrder(prevTabOrder => reorderWorkTabIds(
+      prevTabOrder,
+      [...baseWorkTabIds, ...additionalTabIds],
+      draggedId,
+      targetId,
+      position,
+    ));
   }, [baseWorkTabIds]);
 
   return {
@@ -942,6 +971,7 @@ export const useSessionState = () => {
     sessionRenameValue,
     setSessionRenameValue,
     startSessionRename,
+    renameSessionInline,
     submitSessionRename,
     resetSessionRename,
     workspaceRenameTarget,
@@ -962,6 +992,7 @@ export const useSessionState = () => {
     createWorkspaceFromTargets,
     createWorkspaceFromSessions,
     addSessionToWorkspace,
+    removeSessionFromWorkspace,
     appendHostToWorkspace,
     appendLocalTerminalToWorkspace,
     updateSplitSizes,

application/state/useSettingsState.ts

@@ -47,6 +47,7 @@ import {
   STORAGE_KEY_SHOW_SFTP_TAB,
   STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
+  STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
 } from '../../infrastructure/config/storageKeys';
 import { DEFAULT_UI_LOCALE, resolveSupportedLocale } from '../../infrastructure/config/i18n';
 import {
@@ -89,6 +90,7 @@ import {
   DEFAULT_SHOW_SFTP_TAB,
   DEFAULT_SHOW_HOST_TREE_SIDEBAR,
   DEFAULT_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
+  DEFAULT_DISABLE_TERMINAL_FONT_ZOOM,
   DEFAULT_SSH_DEBUG_LOGS_ENABLED,
   DEFAULT_TERMINAL_THEME,
   DEFAULT_THEME,
@@ -244,6 +246,10 @@ export const useSettingsState = () => {
     const stored = localStorageAdapter.readBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
     return stored ?? DEFAULT_SHELL_ONLY_TAB_NUMBER_SHORTCUTS;
   });
+  const [disableTerminalFontZoom, setDisableTerminalFontZoomState] = useState<boolean>(() => {
+    const stored = localStorageAdapter.readBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM);
+    return stored ?? DEFAULT_DISABLE_TERMINAL_FONT_ZOOM;
+  });
   const [sftpTransferConcurrency, setSftpTransferConcurrencyState] = useState<number>(() => {
     const stored = localStorageAdapter.readNumber(STORAGE_KEY_SFTP_TRANSFER_CONCURRENCY);
     return stored != null && stored >= 1 && stored <= 16 ? stored : 4;
@@ -343,7 +349,14 @@ export const useSettingsState = () => {
 
   const mergeIncomingTerminalSettings = useCallback((incoming: Partial<TerminalSettings>) => {
     setTerminalSettingsState((prev) => {
-      const next = normalizeTerminalSettings({ ...prev, ...incoming });
+      const merged: Partial<TerminalSettings> = { ...prev, ...incoming };
+      if (
+        !Object.prototype.hasOwnProperty.call(incoming, 'middleClickBehavior') &&
+        Object.prototype.hasOwnProperty.call(incoming, 'middleClickPaste')
+      ) {
+        delete merged.middleClickBehavior;
+      }
+      const next = normalizeTerminalSettings(merged);
       if (areTerminalSettingsEqual(prev, next)) {
         return prev;
       }
@@ -544,6 +557,8 @@ export const useSettingsState = () => {
     setShowHostTreeSidebarState(storedShowHostTreeSidebar ?? DEFAULT_SHOW_HOST_TREE_SIDEBAR);
     const storedShellOnlyTabNumberShortcuts = localStorageAdapter.readBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
     setShellOnlyTabNumberShortcutsState(storedShellOnlyTabNumberShortcuts ?? DEFAULT_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
+    const storedDisableTerminalFontZoom = localStorageAdapter.readBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM);
+    setDisableTerminalFontZoomState(storedDisableTerminalFontZoom ?? DEFAULT_DISABLE_TERMINAL_FONT_ZOOM);
 
     // Workspace focus style
     const storedFocusStyle = readStoredString(STORAGE_KEY_WORKSPACE_FOCUS_STYLE);
@@ -635,6 +650,7 @@ export const useSettingsState = () => {
     setSftpDefaultViewMode,
     setWorkspaceFocusStyleState,
     setShowHostTreeSidebarState,
+    setDisableTerminalFontZoomState,
     setSftpTransferConcurrencyState,
   });
 
@@ -661,7 +677,7 @@ export const useSettingsState = () => {
     terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
     sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
     sftpUseCompressedUpload, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-    showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts,
+    showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts, disableTerminalFontZoom,
     editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled,
     globalHotkeyEnabled, autoUpdateEnabled, windowOpacity,
     setTheme, setLightUiThemeId, setDarkUiThemeId, setAccentMode, setCustomAccent,
@@ -670,7 +686,7 @@ export const useSettingsState = () => {
     setFollowAppTerminalThemeState, setTerminalFontFamilyId, setTerminalFontSize,
     setSftpDoubleClickBehavior, setSftpAutoSync, setSftpShowHiddenFiles,
     setSftpUseCompressedUpload, setSftpAutoOpenSidebar, setSftpFollowTerminalCwd, setSftpDefaultViewMode,
-    setShowRecentHostsState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setShellOnlyTabNumberShortcutsState,
+    setShowRecentHostsState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setShellOnlyTabNumberShortcutsState, setDisableTerminalFontZoomState,
     setEditorWordWrapState, setSessionLogsEnabled, setSessionLogsDir, setSessionLogsFormat, setSessionLogsTimestampsEnabled, setSshDebugLogsEnabled,
     setGlobalHotkeyEnabled, setWindowOpacity, setAutoUpdateEnabled, setWorkspaceFocusStyleState,
     setSftpTransferConcurrencyState, applyIncomingCustomKeyBindings, mergeIncomingTerminalSettings,
@@ -791,6 +807,13 @@ export const useSettingsState = () => {
     notifySettingsChanged(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS, enabled);
   }, [notifySettingsChanged]);
 
+  const setDisableTerminalFontZoom = useCallback((enabled: boolean) => {
+    setDisableTerminalFontZoomState(enabled);
+    localStorageAdapter.writeBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM, enabled);
+    if (!persistMountedRef.current) return;
+    notifySettingsChanged(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM, enabled);
+  }, [notifySettingsChanged]);
+
   // Apply and persist custom CSS
   useEffect(() => {
     applyCustomCssToDocument(customCSS);
@@ -1031,6 +1054,8 @@ export const useSettingsState = () => {
     setShowHostTreeSidebar,
     shellOnlyTabNumberShortcuts,
     setShellOnlyTabNumberShortcuts,
+    disableTerminalFontZoom,
+    setDisableTerminalFontZoom,
     sftpTransferConcurrency,
     setSftpTransferConcurrency,
     // Editor Settings
@@ -1075,7 +1100,7 @@ export const useSettingsState = () => {
       terminalThemeId, terminalFontFamilyId, terminalFontSize, terminalSettings,
       customKeyBindings, editorWordWrap,
       sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles, sftpUseCompressedUpload, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-      showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts,
+      showRecentHosts, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, shellOnlyTabNumberShortcuts, disableTerminalFontZoom,
       customThemes, workspaceFocusStyle, sessionLogsTimestampsEnabled, sshDebugLogsEnabled,
     ]),
   };

application/state/useSftpState.ts

@@ -170,10 +170,21 @@ export const useSftpState = (
   useSftpSessionCleanup(sftpSessionsRef);
   useSftpFileWatch(options);
 
-  const { connect, disconnect, listLocalFiles, listRemoteFiles } = useSftpConnections({
+  const {
+    connect,
+    disconnect,
+    listLocalFiles,
+    listRemoteFiles,
+    hostKeyVerification,
+    rejectHostKeyVerification,
+    acceptHostKeyVerification,
+    acceptAndSaveHostKeyVerification,
+  } = useSftpConnections({
     hosts,
     keys,
     identities,
+    knownHosts: options?.knownHosts,
+    onAddKnownHost: options?.onAddKnownHost,
     terminalSettings: options?.terminalSettings,
     leftTabsRef,
     rightTabsRef,
@@ -402,6 +413,9 @@ export const useSftpState = (
     resolveConflict: resolveAnyConflict,
     getSftpIdForConnection,
     reportSessionError: handleSessionError,
+    rejectHostKeyVerification,
+    acceptHostKeyVerification,
+    acceptAndSaveHostKeyVerification,
   });
   methodsRef.current = {
     getFilteredFiles,
@@ -460,6 +474,9 @@ export const useSftpState = (
     resolveConflict: resolveAnyConflict,
     getSftpIdForConnection,
     reportSessionError: handleSessionError,
+    rejectHostKeyVerification,
+    acceptHostKeyVerification,
+    acceptAndSaveHostKeyVerification,
   };
 
   // Create stable method wrappers that call through methodsRef
@@ -532,6 +549,9 @@ export const useSftpState = (
     resolveConflict: (...args: Parameters<typeof resolveAnyConflict>) => methodsRef.current.resolveConflict(...args),
     getSftpIdForConnection: (...args: Parameters<typeof getSftpIdForConnection>) => methodsRef.current.getSftpIdForConnection(...args),
     reportSessionError: (...args: Parameters<typeof handleSessionError>) => methodsRef.current.reportSessionError(...args),
+    rejectHostKeyVerification: () => methodsRef.current.rejectHostKeyVerification(),
+    acceptHostKeyVerification: () => methodsRef.current.acceptHostKeyVerification(),
+    acceptAndSaveHostKeyVerification: () => methodsRef.current.acceptAndSaveHostKeyVerification(),
     activeFileWatchCountRef,
   }), [activeFileWatchCountRef]); // activeFileWatchCountRef is a stable ref
 
@@ -546,6 +566,7 @@ export const useSftpState = (
     transfers,
     activeTransfersCount,
     conflicts,
+    hostKeyVerification,
 
     // Stable methods - never change reference
     ...stableMethods,
@@ -566,6 +587,7 @@ export const useSftpState = (
     transfers,
     activeTransfersCount,
     conflicts,
+    hostKeyVerification,
     stableMethods,
   ]);
 };

application/state/useSystemManagerBackend.ts

@@ -0,0 +1,199 @@
+import { useCallback, useMemo } from 'react';
+import type { DockerContainerAction, DockerImageManageAction, TmuxManageAction } from '../../domain/systemManager/types';
+import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
+
+export function useSystemManagerBackend() {
+  const probeSystemCapabilities = useCallback(async (sessionId: string) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.probeSystemCapabilities) {
+      return { success: false as const, error: 'probeSystemCapabilities unavailable' };
+    }
+    return bridge.probeSystemCapabilities(sessionId);
+  }, []);
+
+  const listSystemProcesses = useCallback(async (sessionId: string) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.listSystemProcesses) {
+      return { success: false as const, error: 'listSystemProcesses unavailable' };
+    }
+    return bridge.listSystemProcesses(sessionId);
+  }, []);
+
+  const signalSystemProcess = useCallback(async (options: {
+    sessionId: string;
+    pid: number;
+    signal?: string;
+    nice?: number;
+  }) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.signalSystemProcess) {
+      return { success: false as const, error: 'signalSystemProcess unavailable' };
+    }
+    return bridge.signalSystemProcess(options);
+  }, []);
+
+  const listTmuxSessions = useCallback(async (sessionId: string) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.listTmuxSessions) {
+      return { success: false as const, error: 'listTmuxSessions unavailable' };
+    }
+    return bridge.listTmuxSessions(sessionId);
+  }, []);
+
+  const createTmuxSession = useCallback(async (options: {
+    sessionId: string;
+    name: string;
+    command?: string;
+  }) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.createTmuxSession) {
+      return { success: false as const, error: 'createTmuxSession unavailable' };
+    }
+    return bridge.createTmuxSession(options);
+  }, []);
+
+  const listTmuxWindows = useCallback(async (options: { sessionId: string; sessionName: string }) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.listTmuxWindows) {
+      return { success: false as const, error: 'listTmuxWindows unavailable' };
+    }
+    return bridge.listTmuxWindows(options);
+  }, []);
+
+  const listTmuxPanes = useCallback(async (options: {
+    sessionId: string;
+    sessionName: string;
+    windowIndex: number;
+  }) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.listTmuxPanes) {
+      return { success: false as const, error: 'listTmuxPanes unavailable' };
+    }
+    return bridge.listTmuxPanes(options);
+  }, []);
+
+  const listTmuxClients = useCallback(async (options: { sessionId: string; sessionName?: string }) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.listTmuxClients) {
+      return { success: false as const, error: 'listTmuxClients unavailable' };
+    }
+    return bridge.listTmuxClients(options);
+  }, []);
+
+  const tmuxAction = useCallback(async (options: { sessionId: string } & TmuxManageAction) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.tmuxAction) {
+      return { success: false as const, error: 'tmuxAction unavailable' };
+    }
+    return bridge.tmuxAction(options);
+  }, []);
+
+  const listDockerContainers = useCallback(async (sessionId: string) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.listDockerContainers) {
+      return { success: false as const, error: 'listDockerContainers unavailable' };
+    }
+    return bridge.listDockerContainers(sessionId);
+  }, []);
+
+  const listDockerImages = useCallback(async (sessionId: string) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.listDockerImages) {
+      return { success: false as const, error: 'listDockerImages unavailable' };
+    }
+    return bridge.listDockerImages(sessionId);
+  }, []);
+
+  const getDockerStats = useCallback(async (options: { sessionId: string; ids?: string[] }) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.getDockerStats) {
+      return { success: false as const, error: 'getDockerStats unavailable' };
+    }
+    return bridge.getDockerStats(options);
+  }, []);
+
+  const dockerInspect = useCallback(async (options: { sessionId: string; containerId: string }) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.dockerInspect) {
+      return { success: false as const, error: 'dockerInspect unavailable' };
+    }
+    return bridge.dockerInspect(options);
+  }, []);
+
+  const dockerImageInspect = useCallback(async (options: { sessionId: string; imageId: string }) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.dockerImageInspect) {
+      return { success: false as const, error: 'dockerImageInspect unavailable' };
+    }
+    return bridge.dockerImageInspect(options);
+  }, []);
+
+  const dockerAction = useCallback(async (options: {
+    sessionId: string;
+    containerId: string;
+    action: DockerContainerAction;
+    newName?: string;
+  }) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.dockerAction) {
+      return { success: false as const, error: 'dockerAction unavailable' };
+    }
+    return bridge.dockerAction(options);
+  }, []);
+
+  const dockerImageAction = useCallback(async (options: { sessionId: string } & DockerImageManageAction) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.dockerImageAction) {
+      return { success: false as const, error: 'dockerImageAction unavailable' };
+    }
+    return bridge.dockerImageAction(options);
+  }, []);
+
+  const openTerminalPopup = useCallback(async (
+    payload: Parameters<NonNullable<NetcattyBridge['openTerminalPopup']>>[0],
+  ) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.openTerminalPopup) {
+      return { success: false as const, error: 'openTerminalPopup unavailable' };
+    }
+    return bridge.openTerminalPopup(payload);
+  }, []);
+
+  return useMemo(() => ({
+    probeSystemCapabilities,
+    listSystemProcesses,
+    signalSystemProcess,
+    listTmuxSessions,
+    createTmuxSession,
+    listTmuxWindows,
+    listTmuxPanes,
+    listTmuxClients,
+    tmuxAction,
+    listDockerContainers,
+    listDockerImages,
+    getDockerStats,
+    dockerInspect,
+    dockerImageInspect,
+    dockerAction,
+    dockerImageAction,
+    openTerminalPopup,
+  }), [
+    probeSystemCapabilities,
+    listSystemProcesses,
+    signalSystemProcess,
+    listTmuxSessions,
+    createTmuxSession,
+    listTmuxWindows,
+    listTmuxPanes,
+    listTmuxClients,
+    tmuxAction,
+    listDockerContainers,
+    listDockerImages,
+    getDockerStats,
+    dockerInspect,
+    dockerImageInspect,
+    dockerAction,
+    dockerImageAction,
+    openTerminalPopup,
+  ]);
+}

application/state/useTerminalBackend.ts

@@ -132,6 +132,11 @@ export const useTerminalBackend = () => {
     return bridge?.onConnectionReuseFallback?.(cb);
   }, []);
 
+  const onWindowFullScreenChanged = useCallback((cb: (isFullscreen: boolean) => void) => {
+    const bridge = netcattyBridge.get();
+    return bridge?.onWindowFullScreenChanged?.(cb);
+  }, []);
+
   const onHostKeyVerification = useCallback((cb: Parameters<NonNullable<NetcattyBridge["onHostKeyVerification"]>>[0]) => {
     const bridge = netcattyBridge.get();
     return bridge?.onHostKeyVerification?.(cb);
@@ -170,6 +175,84 @@ export const useTerminalBackend = () => {
     return bridge.listSerialPorts();
   }, []);
 
+  const serialYmodemAvailable = useCallback(() => {
+    const bridge = netcattyBridge.get();
+    return !!bridge?.sendSerialYmodem;
+  }, []);
+
+  const serialYmodemReceiveAvailable = useCallback(() => {
+    const bridge = netcattyBridge.get();
+    return !!bridge?.receiveSerialYmodem;
+  }, []);
+
+  const selectFileAvailable = useCallback(() => {
+    const bridge = netcattyBridge.get();
+    return !!bridge?.selectFile;
+  }, []);
+
+  const selectDirectoryAvailable = useCallback(() => {
+    const bridge = netcattyBridge.get();
+    return !!bridge?.selectDirectory;
+  }, []);
+
+  const sendSerialYmodem = useCallback(async (sessionId: string, filePath: string) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.sendSerialYmodem) return { success: false, error: 'sendSerialYmodem unavailable' };
+    return bridge.sendSerialYmodem(sessionId, filePath);
+  }, []);
+
+  const receiveSerialYmodem = useCallback(async (sessionId: string, destinationDir: string) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.receiveSerialYmodem) return { success: false, error: 'receiveSerialYmodem unavailable' };
+    return bridge.receiveSerialYmodem(sessionId, destinationDir);
+  }, []);
+
+  const selectFile = useCallback(async (
+    title?: string,
+    defaultPath?: string,
+    filters?: Array<{ name: string; extensions: string[] }>,
+  ) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.selectFile) return null;
+    return bridge.selectFile(title, defaultPath, filters);
+  }, []);
+
+  const selectDirectory = useCallback(async (title?: string, defaultPath?: string) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.selectDirectory) return null;
+    return bridge.selectDirectory(title, defaultPath);
+  }, []);
+
+  const startZmodemDragDropUpload = useCallback(async (
+    sessionId: string,
+    files: Array<{
+      path?: string;
+      name: string;
+      remoteName: string;
+      data?: ArrayBuffer;
+    }>,
+    uploadCommand?: string,
+  ) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.startZmodemDragDropUpload) {
+      return { success: false, error: "startZmodemDragDropUpload unavailable" };
+    }
+    return bridge.startZmodemDragDropUpload(sessionId, files, uploadCommand);
+  }, []);
+
+  const cancelZmodem = useCallback((sessionId: string, options?: { interrupt?: boolean }) => {
+    const bridge = netcattyBridge.get();
+    bridge?.cancelZmodem?.(sessionId, options);
+  }, []);
+
+  const onZmodemEvent = useCallback((
+    sessionId: string,
+    cb: Parameters<NonNullable<NetcattyBridge["onZmodemEvent"]>>[1],
+  ) => {
+    const bridge = netcattyBridge.get();
+    return bridge?.onZmodemEvent?.(sessionId, cb) ?? (() => {});
+  }, []);
+
   const getSessionPwd = useCallback(async (sessionId: string, options?: { allowHomeFallback?: boolean }) => {
     const bridge = netcattyBridge.get();
     if (!bridge?.getSessionPwd) return { success: false, error: 'getSessionPwd unavailable' };
@@ -224,6 +307,17 @@ export const useTerminalBackend = () => {
       startLocalSession,
       startSerialSession,
       listSerialPorts,
+      serialYmodemAvailable,
+      serialYmodemReceiveAvailable,
+      selectFileAvailable,
+      selectDirectoryAvailable,
+      sendSerialYmodem,
+      receiveSerialYmodem,
+      selectFile,
+      selectDirectory,
+      startZmodemDragDropUpload,
+      cancelZmodem,
+      onZmodemEvent,
       execCommand,
       getSessionPwd,
       getSessionRemoteInfo,
@@ -240,6 +334,7 @@ export const useTerminalBackend = () => {
       onTelnetAutoLoginCancelled,
       onChainProgress,
       onConnectionReuseFallback,
+      onWindowFullScreenChanged,
       onHostKeyVerification,
       respondHostKeyVerification,
       openExternal,
@@ -260,6 +355,17 @@ export const useTerminalBackend = () => {
       startLocalSession,
       startSerialSession,
       listSerialPorts,
+      serialYmodemAvailable,
+      serialYmodemReceiveAvailable,
+      selectFileAvailable,
+      selectDirectoryAvailable,
+      sendSerialYmodem,
+      receiveSerialYmodem,
+      selectFile,
+      selectDirectory,
+      startZmodemDragDropUpload,
+      cancelZmodem,
+      onZmodemEvent,
       execCommand,
       getSessionPwd,
       getSessionRemoteInfo,
@@ -276,6 +382,7 @@ export const useTerminalBackend = () => {
       onTelnetAutoLoginCancelled,
       onChainProgress,
       onConnectionReuseFallback,
+      onWindowFullScreenChanged,
       onHostKeyVerification,
       respondHostKeyVerification,
       openExternal,

application/state/useTerminalPopupWindow.ts

@@ -0,0 +1,21 @@
+import { useCallback } from 'react';
+import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
+import type { TerminalPopupPayload } from '../../domain/systemManager/types';
+
+export function useTerminalPopupWindow() {
+  const close = useCallback(async () => {
+    await netcattyBridge.get()?.windowClose?.();
+  }, []);
+
+  const setWindowTitle = useCallback(async (title: string) => {
+    await netcattyBridge.get()?.setWindowTitle?.(title);
+  }, []);
+
+  const onPopupConfig = useCallback((cb: (payload: TerminalPopupPayload) => void) => {
+    const bridge = netcattyBridge.get();
+    if (!bridge?.onTerminalPopupConfig) return () => {};
+    return bridge.onTerminalPopupConfig(cb);
+  }, []);
+
+  return { close, setWindowTitle, onPopupConfig };
+}

application/state/useVaultState.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-import { normalizeDistroId, sanitizeHost } from "../../domain/host";
+import { migrateHostsFromLegacyLineTimestamps, normalizeDistroId, sanitizeHost } from "../../domain/host";
 import { sanitizeGroupConfig } from "../../domain/groupConfig";
 import { normalizeKnownHosts } from "../../domain/knownHosts";
 import {
@@ -33,8 +33,12 @@ import {
   STORAGE_KEY_SHELL_HISTORY,
   STORAGE_KEY_SNIPPET_PACKAGES,
   STORAGE_KEY_SNIPPETS,
+  STORAGE_KEY_TERM_SETTINGS,
 } from "../../infrastructure/config/storageKeys";
 import { localStorageAdapter } from "../../infrastructure/persistence/localStorageAdapter";
+import { mergeGlobalHistoryOnAppend, sanitizeGlobalHistoryEntries } from "../../domain/globalHistory";
+import { getNextVaultOrder, normalizeVaultOrder } from "../../domain/vaultOrder";
+import { loadSanitizedShellHistory } from "./shellHistoryPersistence";
 import {
   decryptGroupConfigs,
   decryptHosts,
@@ -89,6 +93,7 @@ const migrateKey = (key: Partial<SSHKey>): SSHKey => {
       ((key.certificate ? "certificate" : "key") as KeyCategory),
     created: key.created || Date.now(),
     filePath: key.filePath,
+    order: key.order,
   };
 };
 
@@ -132,6 +137,11 @@ const pruneConnectionLogsForStorage = (logs: ConnectionLog[]): ConnectionLog[] =
   return changed ? next : logs;
 };
 
+const readLegacyLineTimestampsEnabled = (): boolean => {
+  const stored = localStorageAdapter.read<Record<string, unknown>>(STORAGE_KEY_TERM_SETTINGS);
+  return stored?.showLineTimestamps === true;
+};
+
 export const useVaultState = () => {
   const [isInitialized, setIsInitialized] = useState(false);
   const [hosts, setHosts] = useState<Host[]>([]);
@@ -167,7 +177,7 @@ export const useVaultState = () => {
   const groupConfigsReadSeq = useRef(0);
 
   const updateHosts = useCallback((data: Host[]) => {
-    const cleaned = data.map(sanitizeHost);
+    const cleaned = normalizeVaultOrder(data.map(sanitizeHost));
     setHosts(cleaned);
     const ver = ++hostsWriteVersion.current;
     return encryptHosts(cleaned).then((enc) => {
@@ -177,9 +187,10 @@ export const useVaultState = () => {
   }, []);
 
   const updateKeys = useCallback((data: SSHKey[]) => {
-    setKeys(data);
+    const cleaned = normalizeVaultOrder(data);
+    setKeys(cleaned);
     const ver = ++keysWriteVersion.current;
-    return encryptKeys(data).then((enc) => {
+    return encryptKeys(cleaned).then((enc) => {
       if (ver === keysWriteVersion.current)
         localStorageAdapter.write(STORAGE_KEY_KEYS, enc);
     });
@@ -210,8 +221,9 @@ export const useVaultState = () => {
       category: (draft.category || 'key') as KeyCategory,
       created: Date.now(),
       filePath: draft.filePath,
+      order: getNextVaultOrder(keys),
     };
-    const updated = [...keys, newKey];
+    const updated = normalizeVaultOrder([...keys, newKey]);
     setKeys(updated);
     const ver = ++keysWriteVersion.current;
     void encryptKeys(updated).then((enc) => {
@@ -222,26 +234,29 @@ export const useVaultState = () => {
   }, [keys]);
 
   const updateIdentities = useCallback((data: Identity[]) => {
-    setIdentities(data);
+    const cleaned = normalizeVaultOrder(data);
+    setIdentities(cleaned);
     const ver = ++identitiesWriteVersion.current;
-    return encryptIdentities(data).then((enc) => {
+    return encryptIdentities(cleaned).then((enc) => {
       if (ver === identitiesWriteVersion.current)
         localStorageAdapter.write(STORAGE_KEY_IDENTITIES, enc);
     });
   }, []);
 
   const updateProxyProfiles = useCallback((data: ProxyProfile[]) => {
-    setProxyProfiles(data);
+    const cleaned = normalizeVaultOrder(data);
+    setProxyProfiles(cleaned);
     const ver = ++proxyProfilesWriteVersion.current;
-    return encryptProxyProfiles(data).then((enc) => {
+    return encryptProxyProfiles(cleaned).then((enc) => {
       if (ver === proxyProfilesWriteVersion.current)
         localStorageAdapter.write(STORAGE_KEY_PROXY_PROFILES, enc);
     });
   }, []);
 
   const updateSnippets = useCallback((data: Snippet[]) => {
-    setSnippets(data);
-    localStorageAdapter.write(STORAGE_KEY_SNIPPETS, data);
+    const cleaned = normalizeVaultOrder(data);
+    setSnippets(cleaned);
+    localStorageAdapter.write(STORAGE_KEY_SNIPPETS, cleaned);
   }, []);
 
   const updateSnippetPackages = useCallback((data: string[]) => {
@@ -252,11 +267,39 @@ export const useVaultState = () => {
   const updateCustomGroups = useCallback((data: string[]) => {
     setCustomGroups(data);
     localStorageAdapter.write(STORAGE_KEY_GROUPS, data);
-  }, []);
+
+    const groupOrderByPath = new Map<string, number>(
+      data.map((path, index) => [path, (index + 1) * 1000]),
+    );
+    const existingConfigByPath = new Map<string, GroupConfig>(
+      groupConfigs.map((config) => [config.path, config]),
+    );
+    const orderedConfigs = data.map((path) => {
+      const existing = existingConfigByPath.get(path);
+      const base: GroupConfig = existing ? { ...existing } : { path };
+      return sanitizeGroupConfig({
+        ...base,
+        path,
+        order: groupOrderByPath.get(path),
+      });
+    });
+    const retainedConfigs = groupConfigs.filter((config) => !groupOrderByPath.has(config.path));
+    const cleanedGroupConfigs = normalizeVaultOrder([
+      ...orderedConfigs,
+      ...retainedConfigs.map(sanitizeGroupConfig),
+    ]);
+    setGroupConfigs(cleanedGroupConfigs);
+    const ver = ++groupConfigsWriteVersion.current;
+    void encryptGroupConfigs(cleanedGroupConfigs).then((enc) => {
+      if (ver === groupConfigsWriteVersion.current)
+        localStorageAdapter.write(STORAGE_KEY_GROUP_CONFIGS, enc);
+    });
+  }, [groupConfigs]);
 
   const updateKnownHosts = useCallback((data: KnownHost[]) => {
-    setKnownHosts(data);
-    localStorageAdapter.write(STORAGE_KEY_KNOWN_HOSTS, data);
+    const cleaned = normalizeVaultOrder(data);
+    setKnownHosts(cleaned);
+    localStorageAdapter.write(STORAGE_KEY_KNOWN_HOSTS, cleaned);
   }, []);
 
   const updateManagedSources = useCallback((data: ManagedSource[]) => {
@@ -270,7 +313,7 @@ export const useVaultState = () => {
     // pingfang-sc / comic-sans-ms override from an older client would
     // sit in memory and re-persist with `fontFamilyOverride: true` until
     // the next reload. Mirrors updateHosts → sanitizeHost.
-    const cleaned = data.map(sanitizeGroupConfig);
+    const cleaned = normalizeVaultOrder(data.map(sanitizeGroupConfig));
     setGroupConfigs(cleaned);
     const ver = ++groupConfigsWriteVersion.current;
     return encryptGroupConfigs(cleaned).then((enc) => {
@@ -306,14 +349,9 @@ export const useVaultState = () => {
 
   const addShellHistoryEntry = useCallback(
     (entry: Omit<ShellHistoryEntry, "id" | "timestamp">) => {
-      const newEntry: ShellHistoryEntry = {
-        ...entry,
-        id: crypto.randomUUID(),
-        timestamp: Date.now(),
-      };
       setShellHistory((prev) => {
-        // Keep only the last 1000 entries
-        const updated = [newEntry, ...prev].slice(0, 1000);
+        const updated = mergeGlobalHistoryOnAppend(prev, entry);
+        if (updated === prev) return prev;
         localStorageAdapter.write(STORAGE_KEY_SHELL_HISTORY, updated);
         return updated;
       });
@@ -400,6 +438,7 @@ export const useVaultState = () => {
       group: "",
       tags: [],
       protocol: "ssh",
+      order: getNextVaultOrder(hosts),
     };
 
     // Update the known host to mark it as converted using functional update
@@ -413,7 +452,7 @@ export const useVaultState = () => {
 
     // Add to hosts using functional update
     setHosts((prevHosts) => {
-      const updated = [...prevHosts, sanitizeHost(newHost)];
+      const updated = normalizeVaultOrder([...prevHosts, sanitizeHost(newHost)]);
       const ver = ++hostsWriteVersion.current;
       encryptHosts(updated).then((enc) => {
         if (ver === hostsWriteVersion.current)
@@ -423,7 +462,7 @@ export const useVaultState = () => {
     });
 
     return newHost;
-  }, []);
+  }, [hosts]);
 
   useEffect(() => {
     const init = async () => {
@@ -437,7 +476,12 @@ export const useVaultState = () => {
           const ver = ++hostsWriteVersion.current;
           const decrypted = await decryptHosts(savedHosts);
           if (ver === hostsWriteVersion.current) {
-            const sanitized = decrypted.map(sanitizeHost);
+            const sanitized = normalizeVaultOrder(
+              migrateHostsFromLegacyLineTimestamps(
+                decrypted.map(sanitizeHost),
+                readLegacyLineTimestampsEnabled(),
+              ),
+            );
             setHosts(sanitized);
             encryptHosts(sanitized).then((enc) => {
               if (ver === hostsWriteVersion.current)
@@ -474,8 +518,9 @@ export const useVaultState = () => {
           const keyVer = ++keysWriteVersion.current;
           const decryptedKeys = await decryptKeys(migratedKeys);
           if (keyVer === keysWriteVersion.current) {
-            setKeys(decryptedKeys);
-            encryptKeys(decryptedKeys).then((enc) => {
+            const orderedKeys = normalizeVaultOrder(decryptedKeys);
+            setKeys(orderedKeys);
+            encryptKeys(orderedKeys).then((enc) => {
               if (keyVer === keysWriteVersion.current)
                 localStorageAdapter.write(STORAGE_KEY_KEYS, enc);
             });
@@ -493,8 +538,9 @@ export const useVaultState = () => {
           const idVer = ++identitiesWriteVersion.current;
           const decryptedIds = await decryptIdentities(savedIdentities);
           if (idVer === identitiesWriteVersion.current) {
-            setIdentities(decryptedIds);
-            encryptIdentities(decryptedIds).then((enc) => {
+            const orderedIdentities = normalizeVaultOrder(decryptedIds);
+            setIdentities(orderedIdentities);
+            encryptIdentities(orderedIdentities).then((enc) => {
               if (idVer === identitiesWriteVersion.current)
                 localStorageAdapter.write(STORAGE_KEY_IDENTITIES, enc);
             });
@@ -507,8 +553,9 @@ export const useVaultState = () => {
           const proxyVer = ++proxyProfilesWriteVersion.current;
           const decryptedProfiles = await decryptProxyProfiles(savedProxyProfiles);
           if (proxyVer === proxyProfilesWriteVersion.current) {
-            setProxyProfiles(decryptedProfiles);
-            encryptProxyProfiles(decryptedProfiles).then((enc) => {
+            const orderedProfiles = normalizeVaultOrder(decryptedProfiles);
+            setProxyProfiles(orderedProfiles);
+            encryptProxyProfiles(orderedProfiles).then((enc) => {
               if (proxyVer === proxyProfilesWriteVersion.current)
                 localStorageAdapter.write(STORAGE_KEY_PROXY_PROFILES, enc);
             });
@@ -523,7 +570,11 @@ export const useVaultState = () => {
           STORAGE_KEY_SNIPPET_PACKAGES,
         );
 
-        if (savedSnippets) setSnippets(savedSnippets);
+        if (savedSnippets) {
+          const orderedSnippets = normalizeVaultOrder(savedSnippets);
+          setSnippets(orderedSnippets);
+          localStorageAdapter.write(STORAGE_KEY_SNIPPETS, orderedSnippets);
+        }
         else updateSnippets(INITIAL_SNIPPETS);
 
         if (savedGroups) setCustomGroups(savedGroups);
@@ -540,17 +591,18 @@ export const useVaultState = () => {
         );
         if (savedKnownHosts) {
           const normalized = normalizeKnownHosts(savedKnownHosts);
-          setKnownHosts(normalized);
-          if (normalized !== savedKnownHosts) {
-            localStorageAdapter.write(STORAGE_KEY_KNOWN_HOSTS, normalized);
+          const orderedKnownHosts = normalizeVaultOrder(normalized);
+          setKnownHosts(orderedKnownHosts);
+          if (normalized !== savedKnownHosts || orderedKnownHosts !== normalized) {
+            localStorageAdapter.write(STORAGE_KEY_KNOWN_HOSTS, orderedKnownHosts);
           }
         }
 
         // Load shell history
-        const savedShellHistory = localStorageAdapter.read<ShellHistoryEntry[]>(
-          STORAGE_KEY_SHELL_HISTORY,
-        );
-        if (savedShellHistory) setShellHistory(savedShellHistory);
+        const savedShellHistory = loadSanitizedShellHistory();
+        if (savedShellHistory) {
+          setShellHistory(savedShellHistory);
+        }
 
         // Load connection logs
         const savedConnectionLogs = localStorageAdapter.read<ConnectionLog[]>(
@@ -570,7 +622,7 @@ export const useVaultState = () => {
           const gcVer = ++groupConfigsWriteVersion.current;
           const decryptedGC = await decryptGroupConfigs(savedGroupConfigs);
           if (gcVer === groupConfigsWriteVersion.current) {
-            const sanitizedGC = decryptedGC.map(sanitizeGroupConfig);
+            const sanitizedGC = normalizeVaultOrder(decryptedGC.map(sanitizeGroupConfig));
             setGroupConfigs(sanitizedGC);
             encryptGroupConfigs(sanitizedGC).then((enc) => {
               if (gcVer === groupConfigsWriteVersion.current)
@@ -605,7 +657,7 @@ export const useVaultState = () => {
           // Discard if a newer storage event arrived OR a local write occurred
           // during the decrypt (writeVersion would have advanced).
           if (seq === hostsReadSeq.current && writeAtStart === hostsWriteVersion.current)
-            setHosts(dec.map(sanitizeHost));
+            setHosts(normalizeVaultOrder(dec.map(sanitizeHost)));
         });
         return;
       }
@@ -624,7 +676,7 @@ export const useVaultState = () => {
         const writeAtStart = keysWriteVersion.current;
         decryptKeys(migratedKeys).then((dec) => {
           if (seq === keysReadSeq.current && writeAtStart === keysWriteVersion.current)
-            setKeys(dec);
+            setKeys(normalizeVaultOrder(dec));
         });
         return;
       }
@@ -636,7 +688,7 @@ export const useVaultState = () => {
         const writeAtStart = identitiesWriteVersion.current;
         decryptIdentities(next).then((dec) => {
           if (seq === identitiesReadSeq.current && writeAtStart === identitiesWriteVersion.current)
-            setIdentities(dec);
+            setIdentities(normalizeVaultOrder(dec));
         });
         return;
       }
@@ -648,14 +700,14 @@ export const useVaultState = () => {
         const writeAtStart = proxyProfilesWriteVersion.current;
         decryptProxyProfiles(next).then((dec) => {
           if (seq === proxyProfilesReadSeq.current && writeAtStart === proxyProfilesWriteVersion.current)
-            setProxyProfiles(dec);
+            setProxyProfiles(normalizeVaultOrder(dec));
         });
         return;
       }
 
       if (key === STORAGE_KEY_SNIPPETS) {
         const next = safeParse<Snippet[]>(event.newValue) ?? [];
-        setSnippets(next);
+        setSnippets(normalizeVaultOrder(next));
         return;
       }
 
@@ -673,12 +725,14 @@ export const useVaultState = () => {
 
       if (key === STORAGE_KEY_KNOWN_HOSTS) {
         const next = safeParse<KnownHost[]>(event.newValue) ?? [];
-        setKnownHosts(normalizeKnownHosts(next));
+        setKnownHosts(normalizeVaultOrder(normalizeKnownHosts(next)));
         return;
       }
 
       if (key === STORAGE_KEY_SHELL_HISTORY) {
-        const next = safeParse<ShellHistoryEntry[]>(event.newValue) ?? [];
+        const next = sanitizeGlobalHistoryEntries(
+          safeParse<ShellHistoryEntry[]>(event.newValue) ?? [],
+        );
         setShellHistory(next);
         return;
       }
@@ -702,7 +756,7 @@ export const useVaultState = () => {
         const writeAtStart = groupConfigsWriteVersion.current;
         decryptGroupConfigs(next).then((dec) => {
           if (seq === groupConfigsReadSeq.current && writeAtStart === groupConfigsWriteVersion.current)
-            setGroupConfigs(dec.map(sanitizeGroupConfig));
+            setGroupConfigs(normalizeVaultOrder(dec.map(sanitizeGroupConfig)));
         });
         return;
       }

application/state/useWindowControls.ts

@@ -1,6 +1,16 @@
 import { useCallback } from "react";
 import { netcattyBridge } from "../../infrastructure/services/netcattyBridge";
 
+export function subscribeWindowFullscreenChanged(
+  cb: (isFullscreen: boolean) => void,
+): () => void {
+  try {
+    return netcattyBridge.get()?.onWindowFullScreenChanged?.(cb) ?? (() => {});
+  } catch {
+    return () => {};
+  }
+}
+
 export const useWindowControls = () => {
   const notifyRendererReady = useCallback(() => {
     try {
@@ -45,10 +55,7 @@ export const useWindowControls = () => {
     return bridge?.windowIsFullscreen?.() ?? false;
   }, []);
 
-  const onFullscreenChanged = useCallback((cb: (isFullscreen: boolean) => void) => {
-    const bridge = netcattyBridge.get();
-    return bridge?.onWindowFullScreenChanged?.(cb) ?? (() => {});
-  }, []);
+  const onFullscreenChanged = useCallback(subscribeWindowFullscreenChanged, []);
 
   const onWindowCommandCloseRequested = useCallback((cb: () => void) => {
     const bridge = netcattyBridge.get();

application/state/vaultHostTreeActionsStore.ts

@@ -1,6 +1,7 @@
 import { useSyncExternalStore } from 'react';
 
 import type { Host } from '../../types';
+import type { VaultOrderPosition } from '../../domain/vaultOrder';
 
 export interface VaultHostTreeActions {
   onDeleteHost: (host: Host) => void;
@@ -16,6 +17,8 @@ export interface VaultHostTreeActions {
   cancelInlineHostEdit: () => void;
   moveHostToGroup: (hostId: string, groupPath: string | null) => void;
   moveGroup: (sourcePath: string, targetParent: string | null) => void;
+  reorderHost: (sourceHostId: string, targetHostId: string, position: VaultOrderPosition) => void;
+  reorderGroup: (sourcePath: string, targetPath: string, position: VaultOrderPosition) => boolean;
   managedGroupPaths?: Set<string>;
   onUnmanageGroup?: (groupPath: string) => void;
 }

application/syncPayload.test.ts

@@ -44,6 +44,7 @@ const {
   hasCloudSyncEntityData,
   hasMeaningfulCloudSyncData,
   shouldPromptCloudVaultRecovery,
+  SYNCABLE_SETTING_STORAGE_KEYS,
 } = await import("./syncPayload.ts");
 const storageKeys = await import("../infrastructure/config/storageKeys.ts");
 
@@ -124,6 +125,7 @@ test("buildSyncPayload includes AI configuration settings", () => {
   localStorage.setItem(storageKeys.STORAGE_KEY_AI_AGENT_MODEL_MAP, JSON.stringify({ codex: "gpt-test" }));
   localStorage.setItem(storageKeys.STORAGE_KEY_AI_AGENT_PROVIDER_MAP, JSON.stringify({ catty: "openai-main" }));
   localStorage.setItem(storageKeys.STORAGE_KEY_AI_WEB_SEARCH, JSON.stringify(webSearch));
+  localStorage.setItem(storageKeys.STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION, "false");
 
   const payload = buildSyncPayload(vault([]));
 
@@ -140,9 +142,18 @@ test("buildSyncPayload includes AI configuration settings", () => {
     agentModelMap: { codex: "gpt-test" },
     agentProviderMap: { catty: "openai-main" },
     webSearchConfig: webSearch,
+    showTerminalSelectionAction: false,
   });
 });
 
+test("terminal selection AI preference is syncable for auto-sync detection", () => {
+  assert.ok(
+    (SYNCABLE_SETTING_STORAGE_KEYS as readonly string[]).includes(
+      storageKeys.STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION,
+    ),
+  );
+});
+
 test("buildSyncPayload includes host tree sidebar visibility setting", () => {
   localStorage.setItem(storageKeys.STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR, "false");
 
@@ -215,6 +226,7 @@ test("applySyncPayload restores AI configuration settings", async () => {
         agentModelMap: { claude: "claude-test" },
         agentProviderMap: { catty: "anthropic-main" },
         webSearchConfig: webSearch,
+        showTerminalSelectionAction: false,
       },
     },
     syncedAt: 1,
@@ -234,6 +246,7 @@ test("applySyncPayload restores AI configuration settings", async () => {
   assert.deepEqual(JSON.parse(localStorage.getItem(storageKeys.STORAGE_KEY_AI_AGENT_MODEL_MAP)!), { claude: "claude-test" });
   assert.deepEqual(JSON.parse(localStorage.getItem(storageKeys.STORAGE_KEY_AI_AGENT_PROVIDER_MAP)!), { catty: "anthropic-main" });
   assert.deepEqual(JSON.parse(localStorage.getItem(storageKeys.STORAGE_KEY_AI_WEB_SEARCH)!), webSearch);
+  assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION), "false");
 });
 
 test("applySyncPayload restores host tree sidebar visibility setting", async () => {
@@ -529,6 +542,7 @@ test("buildSyncPayload includes syncable terminal options from settings", () =>
   localStorage.setItem(storageKeys.STORAGE_KEY_TERM_SETTINGS, JSON.stringify({
     terminalEmulationType: "vt100",
     altAsMeta: true,
+    middleClickBehavior: "context-menu",
     showServerStats: false,
     serverStatsRefreshInterval: 12,
     rendererType: "dom",
@@ -541,6 +555,7 @@ test("buildSyncPayload includes syncable terminal options from settings", () =>
   assert.deepEqual(payload.settings?.terminalSettings, {
     terminalEmulationType: "vt100",
     altAsMeta: true,
+    middleClickBehavior: "context-menu",
     showServerStats: false,
     serverStatsRefreshInterval: 12,
     rendererType: "dom",
@@ -696,6 +711,49 @@ test("applySyncPayload preserves host proxy references when group configs are ab
   assert.equal("groupConfigs" in imported, false);
 });
 
+test("applySyncPayload migrates legacy global line timestamps onto hosts", async () => {
+  let imported: Record<string, unknown> | null = null;
+  const payload: SyncPayload = {
+    hosts: [
+      {
+        id: "host-1",
+        label: "Inherited",
+        hostname: "example.com",
+        username: "root",
+        tags: [],
+        os: "linux",
+      },
+      {
+        id: "host-2",
+        label: "Explicit",
+        hostname: "example.net",
+        username: "root",
+        tags: [],
+        os: "linux",
+        showLineTimestamps: false,
+      },
+    ],
+    keys: [],
+    identities: [],
+    proxyProfiles: [],
+    snippets: [],
+    customGroups: [],
+    syncedAt: 1,
+    settings: { terminalSettings: { showLineTimestamps: true } },
+  };
+
+  await applySyncPayload(payload, {
+    importVaultData: (json) => {
+      imported = JSON.parse(json);
+    },
+  });
+
+  assert.ok(imported);
+  const hosts = imported.hosts as SyncPayload["hosts"];
+  assert.equal(hosts[0]?.showLineTimestamps, true);
+  assert.equal(hosts[1]?.showLineTimestamps, false);
+});
+
 test("applySyncPayload waits for async vault imports", async () => {
   let finished = false;
   const payload: SyncPayload = {
@@ -762,6 +820,42 @@ test("applySyncPayload writes incoming fallbackFont into local TERM_SETTINGS", a
   assert.equal(parsed.fallbackFont, "Sarasa Mono SC");
 });
 
+test("applySyncPayload lets legacy middle-click paste update the new middle-click behavior", async () => {
+  localStorage.setItem(
+    storageKeys.STORAGE_KEY_TERM_SETTINGS,
+    JSON.stringify({
+      scrollback: 2000,
+      middleClickBehavior: "paste",
+      middleClickPaste: true,
+    }),
+  );
+
+  const payload: SyncPayload = {
+    hosts: [],
+    keys: [],
+    identities: [],
+    snippets: [],
+    customGroups: [],
+    syncedAt: 1,
+    settings: {
+      terminalSettings: {
+        middleClickPaste: false,
+      },
+    },
+  } as SyncPayload;
+
+  await applySyncPayload(payload, {
+    importVaultData: () => {},
+  });
+
+  const raw = localStorage.getItem(storageKeys.STORAGE_KEY_TERM_SETTINGS);
+  assert.ok(raw, "TERM_SETTINGS should be written");
+  const parsed = JSON.parse(raw!);
+  assert.equal(parsed.scrollback, 2000);
+  assert.equal(parsed.middleClickBehavior, "disabled");
+  assert.equal(parsed.middleClickPaste, false);
+});
+
 test("applySyncPayload from legacy client (no fallbackFont) preserves local value", async () => {
   localStorage.setItem(
     storageKeys.STORAGE_KEY_TERM_SETTINGS,

application/syncPayload.ts

@@ -24,6 +24,7 @@ import {
   hasSyncPayloadEntityData,
   type SyncPayload,
 } from '../domain/sync';
+import { migrateHostsFromLegacyLineTimestamps } from '../domain/host';
 import {
   nextCustomKeyBindingsSyncVersion,
   parseCustomKeyBindingsStorageRecord,
@@ -31,6 +32,7 @@ import {
 } from '../domain/customKeyBindings';
 import { isEncryptedCredentialPlaceholder } from '../domain/credentials';
 import { localStorageAdapter } from '../infrastructure/persistence/localStorageAdapter';
+import { sanitizeQuickMessages } from '../infrastructure/ai/quickMessages';
 import { emitAIStateChanged } from './state/aiStateEvents';
 import { rehydrateGlobalSftpBookmarks } from './state/sftp/globalSftpBookmarks';
 import {
@@ -65,6 +67,7 @@ import {
   STORAGE_KEY_SHOW_SFTP_TAB,
   STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
+  STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
   STORAGE_KEY_WORKSPACE_FOCUS_STYLE,
   STORAGE_KEY_AI_PROVIDERS,
   STORAGE_KEY_AI_ACTIVE_PROVIDER,
@@ -79,6 +82,8 @@ import {
   STORAGE_KEY_AI_AGENT_MODEL_MAP,
   STORAGE_KEY_AI_AGENT_PROVIDER_MAP,
   STORAGE_KEY_AI_WEB_SEARCH,
+  STORAGE_KEY_AI_QUICK_MESSAGES,
+  STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION,
   STORAGE_KEY_PORT_FORWARDING,
 } from '../infrastructure/config/storageKeys';
 
@@ -190,11 +195,14 @@ const SYNCABLE_TERMINAL_KEYS = [
   'linePadding', 'cursorShape', 'cursorBlink', 'minimumContrastRatio',
   'altAsMeta', 'optionArrowWordJump', 'scrollOnInput', 'scrollOnOutput', 'scrollOnKeyPress', 'scrollOnPaste',
   'smoothScrolling',
-  'rightClickBehavior', 'copyOnSelect', 'middleClickPaste', 'wordSeparators',
+  'rightClickBehavior', 'middleClickBehavior', 'copyOnSelect', 'middleClickPaste', 'wordSeparators',
   'linkModifier', 'keywordHighlightEnabled', 'keywordHighlightRules',
   'keepaliveInterval', 'keepaliveCountMax', 'disableBracketedPaste', 'clearWipesScrollback',
-  'preserveSelectionOnInput', 'forcePromptNewLine', 'osc52Clipboard', 'showServerStats', 'showLineTimestamps',
-  'serverStatsRefreshInterval', 'rendererType',
+  'preserveSelectionOnInput', 'forcePromptNewLine', 'osc52Clipboard', 'showServerStats',
+  'serverStatsRefreshInterval',
+  'systemManagerProcessRefreshInterval', 'systemManagerTmuxRefreshInterval',
+  'systemManagerDockerListRefreshInterval', 'systemManagerDockerStatsRefreshInterval',
+  'rendererType',
   'autocompleteEnabled', 'autocompleteGhostText', 'autocompletePopupMenu',
   'autocompleteDebounceMs', 'autocompleteMinChars', 'autocompleteMaxSuggestions',
 ] as const;
@@ -244,6 +252,8 @@ export const SYNCABLE_SETTING_STORAGE_KEYS = [
   STORAGE_KEY_AI_AGENT_MODEL_MAP,
   STORAGE_KEY_AI_AGENT_PROVIDER_MAP,
   STORAGE_KEY_AI_WEB_SEARCH,
+  STORAGE_KEY_AI_QUICK_MESSAGES,
+  STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION,
 ] as const;
 
 const isRecord = (value: unknown): value is Record<string, unknown> =>
@@ -409,6 +419,8 @@ export function collectSyncableSettings(): SyncPayload['settings'] {
   if (showSftpTab != null) settings.showSftpTab = showSftpTab;
   const shellOnlyTabNumberShortcuts = localStorageAdapter.readBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
   if (shellOnlyTabNumberShortcuts != null) settings.shellOnlyTabNumberShortcuts = shellOnlyTabNumberShortcuts;
+  const disableTerminalFontZoom = localStorageAdapter.readBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM);
+  if (disableTerminalFontZoom != null) settings.disableTerminalFontZoom = disableTerminalFontZoom;
   const showHostTreeSidebar = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR);
   if (showHostTreeSidebar != null) settings.showHostTreeSidebar = showHostTreeSidebar;
   const workspaceFocusStyle = localStorageAdapter.readString(STORAGE_KEY_WORKSPACE_FOCUS_STYLE);
@@ -448,6 +460,12 @@ export function collectSyncableSettings(): SyncPayload['settings'] {
   if (agentProviderMap) ai.agentProviderMap = agentProviderMap;
   const webSearchConfig = readRecordSetting(STORAGE_KEY_AI_WEB_SEARCH);
   if (webSearchConfig) ai.webSearchConfig = stripDeviceBoundApiKey(webSearchConfig);
+  const quickMessages = readArraySetting(STORAGE_KEY_AI_QUICK_MESSAGES);
+  if (quickMessages) ai.quickMessages = sanitizeQuickMessages(quickMessages);
+  const showTerminalSelectionAction = localStorageAdapter.readBoolean(STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION);
+  if (showTerminalSelectionAction != null) {
+    ai.showTerminalSelectionAction = showTerminalSelectionAction;
+  }
   if (Object.keys(ai).length > 0) settings.ai = ai;
 
   return Object.keys(settings).length > 0 ? settings : undefined;
@@ -486,11 +504,27 @@ function applySyncableSettings(settings: NonNullable<SyncPayload['settings']>):
       try { existing = JSON.parse(raw); } catch { /* ignore */ }
     }
     const merged = { ...existing };
+    const hasIncomingMiddleClickBehavior = 'middleClickBehavior' in settings.terminalSettings;
+    const hasIncomingMiddleClickPaste = 'middleClickPaste' in settings.terminalSettings;
     for (const key of SYNCABLE_TERMINAL_KEYS) {
       if (key in settings.terminalSettings) {
         merged[key] = settings.terminalSettings[key];
       }
     }
+    if (hasIncomingMiddleClickBehavior) {
+      const behavior = settings.terminalSettings.middleClickBehavior;
+      if (
+        behavior === 'context-menu' ||
+        behavior === 'paste' ||
+        behavior === 'disabled'
+      ) {
+        merged.middleClickPaste = behavior === 'paste';
+      }
+    } else if (hasIncomingMiddleClickPaste) {
+      merged.middleClickBehavior = settings.terminalSettings.middleClickPaste === false
+        ? 'disabled'
+        : 'paste';
+    }
     localStorageAdapter.writeString(STORAGE_KEY_TERM_SETTINGS, JSON.stringify(merged));
   }
 
@@ -544,6 +578,9 @@ function applySyncableSettings(settings: NonNullable<SyncPayload['settings']>):
   if (settings.shellOnlyTabNumberShortcuts != null) {
     localStorageAdapter.writeBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS, settings.shellOnlyTabNumberShortcuts);
   }
+  if (settings.disableTerminalFontZoom != null) {
+    localStorageAdapter.writeBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM, settings.disableTerminalFontZoom);
+  }
   if (settings.showHostTreeSidebar != null) {
     localStorageAdapter.writeBoolean(STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR, settings.showHostTreeSidebar);
   }
@@ -582,6 +619,15 @@ function applySyncableSettings(settings: NonNullable<SyncPayload['settings']>):
         );
       }
     }
+    if (ai.quickMessages != null) {
+      localStorageAdapter.write(STORAGE_KEY_AI_QUICK_MESSAGES, sanitizeQuickMessages(ai.quickMessages));
+    }
+    if (ai.showTerminalSelectionAction != null) {
+      localStorageAdapter.writeBoolean(
+        STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION,
+        ai.showTerminalSelectionAction,
+      );
+    }
     // After all AI writes, reconcile per-agent bindings against the final
     // provider list. Sync payloads can land with a new `providers` set but
     // no `agentProviderMap`, or with a stale `agentProviderMap` that
@@ -622,6 +668,10 @@ function notifyAIStateAfterSync(ai: NonNullable<SyncPayload['settings']>['ai']):
     touched.push(STORAGE_KEY_AI_AGENT_MODEL_MAP);
   }
   if (ai.webSearchConfig !== undefined) touched.push(STORAGE_KEY_AI_WEB_SEARCH);
+  if (ai.quickMessages != null) touched.push(STORAGE_KEY_AI_QUICK_MESSAGES);
+  if (ai.showTerminalSelectionAction != null) {
+    touched.push(STORAGE_KEY_AI_SHOW_TERMINAL_SELECTION_ACTION);
+  }
   for (const key of touched) {
     emitAIStateChanged(key);
   }
@@ -714,10 +764,11 @@ function applyPayload(
   importers: SyncPayloadImporters,
   options: { includeLocalOnlyData: boolean },
 ): Promise<void> {
+  const legacyLineTimestampsEnabled = payload.settings?.terminalSettings?.showLineTimestamps === true;
   // Build the vault import object. Cloud sync intentionally ignores
   // local-only trust records even if legacy cloud snapshots still carry them.
   const vaultImport: Record<string, unknown> = {
-    hosts: payload.hosts,
+    hosts: migrateHostsFromLegacyLineTimestamps(payload.hosts, legacyLineTimestampsEnabled),
     keys: payload.keys,
     identities: payload.identities,
     proxyProfiles: payload.proxyProfiles,

components/AIChatPanelContent.tsx

@@ -2,6 +2,7 @@ import React, { type Dispatch, type SetStateAction } from 'react';
 import { History, Plus } from 'lucide-react';
 import type { AIPermissionMode, AISession, ChatMessage, DiscoveredAgent, ExternalAgentConfig, AgentModelPreset, ProviderConfig, UploadedFile } from '../infrastructure/ai/types';
 import type { UserSkillOption } from './ai/userSkillsState';
+import type { AIQuickMessage } from '../infrastructure/ai/quickMessages';
 import { Button } from './ui/button';
 import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';
 import AgentSelector from './ai/AgentSelector';
@@ -65,6 +66,7 @@ interface AIChatPanelContentProps {
   terminalSessions: TerminalSessionSummary[];
   selectedUserSkills: UserSkillOption[];
   userSkillOptions: UserSkillOption[];
+  quickMessages: AIQuickMessage[];
   addSelectedUserSkill: (slug: string) => void;
   removeSelectedUserSkill: (slug: string) => void;
   globalPermissionMode: AIPermissionMode;
@@ -112,6 +114,7 @@ export const AIChatPanelContent: React.FC<AIChatPanelContentProps> = ({
   terminalSessions,
   selectedUserSkills,
   userSkillOptions,
+  quickMessages,
   addSelectedUserSkill,
   removeSelectedUserSkill,
   globalPermissionMode,
@@ -263,6 +266,7 @@ export const AIChatPanelContent: React.FC<AIChatPanelContentProps> = ({
                 hosts={terminalSessions.map(s => ({ sessionId: s.sessionId, hostname: s.hostname, label: s.label, connected: s.connected }))}
                 selectedUserSkills={selectedUserSkills}
                 userSkills={userSkillOptions}
+                quickMessages={quickMessages}
                 onAddUserSkill={addSelectedUserSkill}
                 onRemoveUserSkill={removeSelectedUserSkill}
                 permissionMode={globalPermissionMode}

components/AIChatSidePanel.mountRetention.test.ts

@@ -3,6 +3,7 @@ import test from 'node:test';
 
 import type { AIDraft, AISession } from '../infrastructure/ai/types';
 import {
+  aiChatSidePanelPropsAreEqual,
   hasAIChatSidePanelRetainedContent,
   shouldKeepAIChatSidePanelMounted,
 } from './AIChatSidePanel.tsx';
@@ -100,3 +101,17 @@ test('hidden AI side panel is retained when it has session messages', () => {
 test('visible AI side panel is always mounted even when empty', () => {
   assert.equal(shouldKeepAIChatSidePanelMounted(baseProps({ isVisible: true })), true);
 });
+
+test('AI side panel re-renders when retained content becomes visible again', () => {
+  const hiddenProps = baseProps({
+    isVisible: false,
+    draftsByScope: {
+      'terminal:terminal-1': draft({ text: 'hello' }),
+    },
+  });
+
+  assert.equal(aiChatSidePanelPropsAreEqual(
+    hiddenProps,
+    { ...hiddenProps, isVisible: true },
+  ), false);
+});

components/AIChatSidePanel.tsx

@@ -1,6 +1,7 @@
 
 
 import React, { useCallback, useEffect, useDeferredValue, useMemo, useRef, useState } from 'react';
+import { Loader2 } from 'lucide-react';
 import { useI18n } from '../application/i18n/I18nProvider';
 import { useWindowControls } from '../application/state/useWindowControls';
 import type {
@@ -19,9 +20,11 @@ import {
   getNextSelectedUserSkillSlugsMap,
   type UserSkillOption,
 } from './ai/userSkillsState';
+import { subscribeUserSkillsStatusChanged } from './ai/userSkillsStatusEvents';
 import {
   applyDraftEntrySelection,
   applyHistorySessionSelection,
+  panelViewsEqual,
   resolveDisplayedPanelView,
   resolveDisplayedSession,
 } from './ai/aiPanelViewState';
@@ -47,13 +50,84 @@ import { canSendWithAgent, findEnabledExternalAgent } from './ai/agentSendEligib
 import { clearAllPendingApprovals } from '../infrastructure/ai/shared/approvalGate';
 import { useConversationExport } from './ai/hooks/useConversationExport';
 import type { AIChatSidePanelProps } from './AIChatSidePanel.types';
-import { generateId, isCopilotAgentConfig, modelPresetsContainId } from './AIChatSidePanelHelpers';
+import { generateId, modelPresetsContainId, shouldLoadSdkRuntimeModels } from './AIChatSidePanelHelpers';
 import { AIChatPanelContent } from './AIChatPanelContent';
 import {
   getAIPanelProfilerProps,
   profileAIPanelCalculation,
 } from './ai/aiPanelDiagnostics';
 
+type UserSkillsStatusResult = { ok: boolean; skills?: Array<{
+  id: string;
+  slug: string;
+  name: string;
+  description: string;
+  status: 'ready' | 'warning';
+}> } | null;
+type UserSkillsStatusLoadResult = UserSkillsStatusResult | undefined;
+
+const USER_SKILLS_STATUS_CACHE_TTL_MS = 60_000;
+let userSkillsStatusCache: {
+  version: number;
+  result: UserSkillsStatusResult;
+  updatedAt: number;
+} | null = null;
+let userSkillsStatusPromise: {
+  version: number;
+  promise: Promise<UserSkillsStatusLoadResult>;
+} | null = null;
+let userSkillsStatusCacheVersion = 0;
+
+function invalidateUserSkillsStatusCache() {
+  userSkillsStatusCacheVersion += 1;
+  userSkillsStatusCache = null;
+  userSkillsStatusPromise = null;
+}
+
+if (typeof window !== 'undefined') {
+  subscribeUserSkillsStatusChanged(invalidateUserSkillsStatusCache);
+}
+
+function loadUserSkillsStatus(
+  bridge: ReturnType<typeof getNetcattyBridge>,
+): Promise<UserSkillsStatusLoadResult> {
+  const requestVersion = userSkillsStatusCacheVersion;
+  if (!bridge?.aiUserSkillsGetStatus) {
+    userSkillsStatusCache = { version: requestVersion, result: null, updatedAt: Date.now() };
+    return Promise.resolve(null);
+  }
+
+  if (
+    userSkillsStatusCache
+    && userSkillsStatusCache.version === requestVersion
+    && Date.now() - userSkillsStatusCache.updatedAt < USER_SKILLS_STATUS_CACHE_TTL_MS
+  ) {
+    return Promise.resolve(userSkillsStatusCache.result);
+  }
+
+  if (!userSkillsStatusPromise || userSkillsStatusPromise.version !== requestVersion) {
+    const promise = bridge.aiUserSkillsGetStatus()
+      .then((result) => {
+        if (userSkillsStatusCacheVersion !== requestVersion) return undefined;
+        userSkillsStatusCache = { version: requestVersion, result, updatedAt: Date.now() };
+        return result;
+      })
+      .catch(() => {
+        if (userSkillsStatusCacheVersion !== requestVersion) return undefined;
+        userSkillsStatusCache = { version: requestVersion, result: null, updatedAt: Date.now() };
+        return null;
+      })
+      .finally(() => {
+        if (userSkillsStatusPromise?.version === requestVersion) {
+          userSkillsStatusPromise = null;
+        }
+      });
+    userSkillsStatusPromise = { version: requestVersion, promise };
+  }
+
+  return userSkillsStatusPromise.promise;
+}
+
 export function hasAIChatSidePanelRetainedContent(props: Pick<
   AIChatSidePanelProps,
   'activeSessionIdMap' | 'draftsByScope' | 'sessions' | 'scopeTargetId' | 'scopeType'
@@ -89,6 +163,49 @@ export function shouldKeepAIChatSidePanelMounted(props: AIChatSidePanelProps): b
   return isAIChatSessionStreaming(sessionId);
 }
 
+function shouldDelayAIChatSidePanelActivation(props: AIChatSidePanelProps): boolean {
+  if (!(props.isVisible ?? true)) return false;
+  const scopeKey = `${props.scopeType}:${props.scopeTargetId ?? ''}`;
+  const sessionId = props.activeSessionIdMap[scopeKey] ?? null;
+  if (isAIChatSessionStreaming(sessionId)) return false;
+  return !hasAIChatSidePanelRetainedContent(props);
+}
+
+function schedulePanelActivation(callback: () => void): () => void {
+  let timeoutId: number | null = null;
+  if (typeof requestAnimationFrame === 'function') {
+    const rafId = requestAnimationFrame(() => {
+      timeoutId = window.setTimeout(callback, 0);
+    });
+    return () => {
+      cancelAnimationFrame(rafId);
+      if (timeoutId !== null) window.clearTimeout(timeoutId);
+    };
+  }
+
+  timeoutId = window.setTimeout(callback, 0);
+  return () => {
+    if (timeoutId !== null) window.clearTimeout(timeoutId);
+  };
+}
+
+const AIChatSidePanelPreparing = React.memo(function AIChatSidePanelPreparing() {
+  const { t } = useI18n();
+  return (
+    <div className="flex h-full flex-col bg-background" data-section="ai-chat-panel-preparing">
+      <div className="shrink-0 border-b border-border/50 px-2.5 py-1.5">
+        <div className="h-8 w-36 rounded-md bg-muted/45" />
+      </div>
+      <div className="flex flex-1 items-center justify-center text-xs text-muted-foreground">
+        <div className="flex items-center gap-2">
+          <Loader2 size={14} className="animate-spin" />
+          {t('ai.chat.preparing')}
+        </div>
+      </div>
+    </div>
+  );
+});
+
 const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
   sessions,
   activeSessionIdMap,
@@ -125,6 +242,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
   commandBlocklist,
   maxIterations = 20,
   webSearchConfig,
+  quickMessages = [],
   scopeType,
   scopeTargetId,
   scopeHostIds,
@@ -139,6 +257,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
   const [showHistory, setShowHistory] = useState(false);
   const [runtimeAgentModelPresets, setRuntimeAgentModelPresets] = useState<Record<string, AgentModelPreset[]>>({});
   const [userSkillOptions, setUserSkillOptions] = useState<UserSkillOption[]>([]);
+  const [userSkillsStatusVersion, setUserSkillsStatusVersion] = useState(0);
   const { openSettingsWindow } = useWindowControls();
   const terminalSessionsRef = useRef(terminalSessions);
   terminalSessionsRef.current = terminalSessions;
@@ -252,7 +371,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
 
   useEffect(() => {
     if (!isVisible) return;
-    if (!explicitPanelView || normalizedPanelView === explicitPanelView) return;
+    if (!explicitPanelView || panelViewsEqual(normalizedPanelView, explicitPanelView)) return;
     showDraftView(scopeKey);
   }, [isVisible, normalizedPanelView, explicitPanelView, scopeKey, showDraftView]);
 
@@ -365,25 +484,25 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     };
 
     const bridge = getNetcattyBridge();
-    if (!bridge?.aiUserSkillsGetStatus) {
-      applyUserSkillsStatus(null);
-      return;
-    }
-
-    void bridge.aiUserSkillsGetStatus()
+    void loadUserSkillsStatus(bridge)
       .then((result) => {
         if (cancelled) return;
+        if (result === undefined) return;
         applyUserSkillsStatus(result);
       })
-      .catch(() => {
-        if (cancelled) return;
-        applyUserSkillsStatus(null);
-      });
+      .catch(() => {});
 
     return () => {
       cancelled = true;
     };
-  }, [isVisible, scopeKey, toolIntegrationMode, updateScopeDraft]);
+  }, [isVisible, scopeKey, toolIntegrationMode, updateScopeDraft, userSkillsStatusVersion]);
+
+  useEffect(() => {
+    const handleUserSkillsChanged = () => {
+      setUserSkillsStatusVersion((version) => version + 1);
+    };
+    return subscribeUserSkillsStatusChanged(handleUserSkillsChanged);
+  }, []);
 
   useEffect(() => {
     if (!isVisible) return;
@@ -481,18 +600,10 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     () => currentAgentId !== 'catty' ? externalAgents.find(a => a.id === currentAgentId) : undefined,
     [currentAgentId, externalAgents],
   );
-  const isCopilotExternalAgent = useMemo(
-    () => isCopilotAgentConfig(currentAgentConfig),
-    [currentAgentConfig],
-  );
   const isCodexManagedAgent = useMemo(
     () => currentAgentConfig ? matchesManagedAgentConfig(currentAgentConfig, 'codex') : false,
     [currentAgentConfig],
   );
-  const isClaudeManagedAgent = useMemo(
-    () => currentAgentConfig ? matchesManagedAgentConfig(currentAgentConfig, 'claude') : false,
-    [currentAgentConfig],
-  );
 
   const [codexConfigModel, setCodexConfigModel] = useState<string | null>(null);
   const [codexCustomConfigResolved, setCodexCustomConfigResolved] = useState(false);
@@ -529,7 +640,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     if (!isVisible) return;
     const sdkBackend = getExternalAgentSdkBackend(currentAgentConfig);
     if (!sdkBackend) return;
-    if (!isCopilotExternalAgent && !isClaudeManagedAgent && !isCodexManagedAgent) return;
+    if (!shouldLoadSdkRuntimeModels(currentAgentConfig) && !isCodexManagedAgent) return;
 
     const bridge = getNetcattyBridge();
     if (!bridge?.aiSdkAgentListModels) return;
@@ -569,7 +680,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     return () => {
       cancelled = true;
     };
-  }, [isVisible, currentAgentConfig, currentAgentId, isCopilotExternalAgent, isClaudeManagedAgent, isCodexManagedAgent, setAgentModel]);
+  }, [isVisible, currentAgentConfig, currentAgentId, isCodexManagedAgent, setAgentModel]);
 
   const hasCodexCustomConfig = codexCustomConfigResolved && isCodexManagedAgent;
 
@@ -859,22 +970,26 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     clearScopeDraft, showScopeSessionView, setActiveSessionId,
   ]);
 
-  const handleStop = useCallback(() => {
-    if (!activeSessionId) return;
-    const controller = abortControllersRef.current.get(activeSessionId);
+  const stopStreamingForSession = useCallback((sessionId: string) => {
+    const controller = abortControllersRef.current.get(sessionId);
     controller?.abort();
-    abortControllersRef.current.delete(activeSessionId);
-    setStreamingForScope(activeSessionId, false);
-    updateLastMessage(activeSessionId, msg => ({
+    abortControllersRef.current.delete(sessionId);
+    setStreamingForScope(sessionId, false);
+    updateLastMessage(sessionId, (msg) => ({
       ...msg,
       statusText: '',
       executionStatus: msg.executionStatus === 'running' ? 'cancelled' : msg.executionStatus,
     }));
-    clearAllPendingApprovals(activeSessionId);
+    clearAllPendingApprovals(sessionId);
     const bridge = getNetcattyBridge();
-    bridge?.aiCattyCancelExec?.(activeSessionId);
-    bridge?.aiSdkAgentCancel?.('', activeSessionId);
-  }, [activeSessionId, setStreamingForScope, updateLastMessage, abortControllersRef]);
+    bridge?.aiCattyCancelExec?.(sessionId);
+    bridge?.aiSdkAgentCancel?.('', sessionId);
+  }, [setStreamingForScope, updateLastMessage, abortControllersRef]);
+
+  const handleStop = useCallback(() => {
+    if (!activeSessionId) return;
+    stopStreamingForSession(activeSessionId);
+  }, [activeSessionId, stopStreamingForSession]);
 
   const handleSelectSession = useCallback(
     (sessionId: string) => {
@@ -890,9 +1005,43 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
   const handleDeleteSession = useCallback(
     (e: React.MouseEvent, sessionId: string) => {
       e.stopPropagation();
+      const deletingActiveSession =
+        activeSessionId === sessionId
+        || persistedSessionId === sessionId
+        || (
+          explicitPanelView?.mode === 'session'
+          && explicitPanelView.sessionId === sessionId
+        );
+      const deletingLastScopedSession =
+        historySessions.length === 1 && historySessions[0]?.id === sessionId;
+      const deletedSessionAgentId =
+        historySessions.find((session) => session.id === sessionId)?.agentId
+        ?? currentAgentId;
+
+      if (abortControllersRef.current.has(sessionId) || streamingSessionIds.has(sessionId)) {
+        stopStreamingForSession(sessionId);
+      }
+
       deleteSession(sessionId, scopeKey);
+
+      if (deletingActiveSession || deletingLastScopedSession) {
+        setShowHistory(false);
+        ensureScopeDraft(deletedSessionAgentId);
+      }
     },
-    [deleteSession, scopeKey],
+    [
+      activeSessionId,
+      abortControllersRef,
+      currentAgentId,
+      deleteSession,
+      ensureScopeDraft,
+      explicitPanelView,
+      historySessions,
+      persistedSessionId,
+      scopeKey,
+      stopStreamingForSession,
+      streamingSessionIds,
+    ],
   );
 
   const handleAgentChange = useCallback((agentId: string) => {
@@ -952,6 +1101,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
         terminalSessions={terminalSessions}
         selectedUserSkills={selectedUserSkills}
         userSkillOptions={userSkillOptions}
+        quickMessages={quickMessages}
         addSelectedUserSkill={addSelectedUserSkill}
         removeSelectedUserSkill={removeSelectedUserSkill}
         globalPermissionMode={globalPermissionMode}
@@ -998,9 +1148,10 @@ const AI_CHAT_SIDE_PANEL_AI_STATE_KEYS = [
   'commandBlocklist',
   'maxIterations',
   'webSearchConfig',
+  'quickMessages',
 ] as const satisfies readonly (keyof AIChatSidePanelProps)[];
 
-function aiChatSidePanelPropsAreEqual(
+export function aiChatSidePanelPropsAreEqual(
   prev: AIChatSidePanelProps,
   next: AIChatSidePanelProps,
 ): boolean {
@@ -1016,6 +1167,7 @@ function aiChatSidePanelPropsAreEqual(
   if (prev.scopeType !== next.scopeType) return false;
   if (prev.scopeTargetId !== next.scopeTargetId) return false;
   if (prev.scopeLabel !== next.scopeLabel) return false;
+  if ((prev.isVisible ?? true) !== (next.isVisible ?? true)) return false;
   if (prev.scopeHostIds !== next.scopeHostIds) return false;
   if (prev.terminalSessions !== next.terminalSessions) return false;
   if (prev.resolveExecutorContext !== next.resolveExecutorContext) return false;
@@ -1027,7 +1179,25 @@ function aiChatSidePanelPropsAreEqual(
 }
 
 const AIChatSidePanel = React.memo(function AIChatSidePanel(props: AIChatSidePanelProps) {
-  if (!shouldKeepAIChatSidePanelMounted(props)) return null;
+  const shouldKeepMounted = shouldKeepAIChatSidePanelMounted(props);
+  const shouldDelayActivation = shouldKeepMounted && shouldDelayAIChatSidePanelActivation(props);
+  const activationKey = `${props.scopeType}:${props.scopeTargetId ?? ''}`;
+  const [activationReady, setActivationReady] = useState(!shouldDelayActivation);
+
+  useEffect(() => {
+    if (!shouldDelayActivation) {
+      setActivationReady(true);
+      return undefined;
+    }
+
+    setActivationReady(false);
+    return schedulePanelActivation(() => setActivationReady(true));
+  }, [activationKey, shouldDelayActivation]);
+
+  if (!shouldKeepMounted) return null;
+  if (shouldDelayActivation && !activationReady) {
+    return <AIChatSidePanelPreparing />;
+  }
   // Keep hidden panels alive only when they contain real work (messages, draft
   // content, or an active stream). Empty hidden panels can drop their heavy
   // input/agent-picker subtree and remount cheaply when shown again.

components/AIChatSidePanel.types.ts

@@ -10,6 +10,7 @@ import type {
   ProviderConfig,
   WebSearchConfig,
 } from '../infrastructure/ai/types';
+import type { AIQuickMessage } from '../infrastructure/ai/quickMessages';
 import type { ExecutorContext } from '../infrastructure/ai/cattyAgent/executor';
 
 // -------------------------------------------------------------------
@@ -72,6 +73,9 @@ export interface AIChatSidePanelProps {
   // Web search
   webSearchConfig?: WebSearchConfig | null;
 
+  // Quick messages (slash prompts)
+  quickMessages?: AIQuickMessage[];
+
   // Context
   scopeType: 'terminal' | 'workspace';
   scopeTargetId?: string;

components/AIChatSidePanelHelpers.test.tsx

@@ -0,0 +1,35 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+
+import {
+  modelPresetsContainId,
+  shouldLoadSdkRuntimeModels,
+} from './AIChatSidePanelHelpers';
+import type { AgentModelPreset, ExternalAgentConfig } from '../infrastructure/ai/types';
+
+test('modelPresetsContainId matches plain and thinking-level model ids', () => {
+  const presets: AgentModelPreset[] = [
+    { id: 'gpt-5.5', name: 'GPT-5.5', thinkingLevels: ['low', 'high'] },
+    { id: 'claude-sonnet', name: 'Claude Sonnet' },
+  ];
+
+  assert.equal(modelPresetsContainId(presets, 'gpt-5.5/high'), true);
+  assert.equal(modelPresetsContainId(presets, 'claude-sonnet'), true);
+  assert.equal(modelPresetsContainId(presets, 'gpt-5.5/medium'), false);
+});
+
+test('shouldLoadSdkRuntimeModels includes SDK agents with model catalogs', () => {
+  const agent = (sdkBackend: string): ExternalAgentConfig => ({
+    id: `discovered_${sdkBackend}`,
+    name: sdkBackend,
+    command: sdkBackend,
+    enabled: true,
+    sdkBackend,
+  });
+
+  assert.equal(shouldLoadSdkRuntimeModels(agent('claude')), true);
+  assert.equal(shouldLoadSdkRuntimeModels(agent('copilot')), true);
+  assert.equal(shouldLoadSdkRuntimeModels(agent('codebuddy')), true);
+  assert.equal(shouldLoadSdkRuntimeModels(agent('codex')), false);
+  assert.equal(shouldLoadSdkRuntimeModels(undefined), false);
+});

components/AIChatSidePanelHelpers.ts

@@ -22,10 +22,17 @@ export function isCopilotAgentConfig(agent?: ExternalAgentConfig): boolean {
     getExternalAgentSdkBackend(agent),
   ]
     .filter((value): value is string => typeof value === 'string' && value.length > 0)
-    .map((value) => value.split('/').pop()?.toLowerCase() ?? value.toLowerCase());
+    // Split on both separators so Windows command paths (e.g. "...\\copilot.exe")
+    // reduce to their basename rather than staying as the full path.
+    .map((value) => value.split(/[\\/]/).pop()?.toLowerCase() ?? value.toLowerCase());
   return tokens.some((token) => token.includes('copilot'));
 }
 
+export function shouldLoadSdkRuntimeModels(agent?: ExternalAgentConfig): boolean {
+  const sdkBackend = getExternalAgentSdkBackend(agent);
+  return sdkBackend === 'claude' || sdkBackend === 'copilot' || sdkBackend === 'codebuddy';
+}
+
 export function generateId(): string {
   return `msg-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
 }

components/ConnectionLogsManager.test.tsx

@@ -0,0 +1,64 @@
+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 { ConnectionLog } from "../types.ts";
+import ConnectionLogsManager from "./ConnectionLogsManager.tsx";
+import { TooltipProvider } from "./ui/tooltip.tsx";
+
+const baseLog: ConnectionLog = {
+  id: "log-1",
+  hostId: "host-1",
+  hostLabel: "Database",
+  hostname: "db.example.com",
+  username: "root",
+  protocol: "ssh",
+  hostOs: "linux",
+  hostDistro: "ubuntu",
+  startTime: 1_700_000_000_000,
+  localUsername: "alice",
+  localHostname: "workstation",
+  saved: false,
+};
+
+const renderLogs = (log: ConnectionLog) =>
+  renderToStaticMarkup(
+    <I18nProvider locale="en">
+      <TooltipProvider>
+        <ConnectionLogsManager
+          logs={[log]}
+          hosts={[]}
+          onToggleSaved={() => {}}
+          onDelete={() => {}}
+          onClearUnsaved={() => {}}
+          onOpenLogView={() => {}}
+        />
+      </TooltipProvider>
+    </I18nProvider>,
+  );
+
+test("ConnectionLogsManager renders saved custom host icon snapshots", () => {
+  const markup = renderLogs({
+    ...baseLog,
+    hostIconMode: "custom",
+    hostIconId: "database",
+    hostIconColor: "blue",
+  });
+
+  assert.match(markup, /background-color:#2563EB/i);
+  assert.doesNotMatch(markup, /bg-\[#E95420\]/);
+});
+
+test("ConnectionLogsManager renders saved distro icon snapshots with custom colors", () => {
+  const markup = renderLogs({
+    ...baseLog,
+    hostIconMode: "auto",
+    hostIconColor: "violet",
+  });
+
+  assert.match(markup, /background-color:#7C3AED/i);
+  assert.match(markup, /src="\/distro\/ubuntu.svg"/);
+  assert.doesNotMatch(markup, /bg-\[#E95420\]/);
+});

components/ConnectionLogsManager.tsx

@@ -9,6 +9,7 @@ import {
 } from "lucide-react";
 import React, { memo, useCallback, useMemo, useState } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
+import { resolveHostIconAppearance } from "../domain/hostIcon";
 import { cn } from "../lib/utils";
 import { ConnectionLog, Host } from "../types";
 import { DistroAvatar } from "./DistroAvatar";
@@ -67,7 +68,12 @@ const LogItem = memo<LogItemProps>(({ log, onToggleSaved, onDelete, onClick }) =
     const { t, resolvedLocale } = useI18n();
     const isLocal = log.protocol === "local" || log.hostname === "localhost";
     const isSerial = log.protocol === "serial";
-    const hasPersistedHostIcon = !isLocal && !isSerial && !!log.hostDistro;
+    const customHostIcon = resolveHostIconAppearance({
+        iconMode: log.hostIconMode,
+        iconId: log.hostIconId,
+        iconColor: log.hostIconColor,
+    });
+    const hasPersistedHostIcon = !isLocal && !isSerial && (!!log.hostDistro || !!customHostIcon);
 
     return (
         <div
@@ -101,6 +107,9 @@ const LogItem = memo<LogItemProps>(({ log, onToggleSaved, onDelete, onClick }) =
                             os: log.hostOs ?? "linux",
                             distro: log.hostDistro,
                             distroMode: "auto",
+                            iconMode: log.hostIconMode,
+                            iconId: log.hostIconId,
+                            iconColor: log.hostIconColor,
                         }}
                         fallback={(log.hostOs ?? "linux")[0].toUpperCase()}
                         size="log"

components/DistroAvatar.test.tsx

@@ -0,0 +1,49 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+
+import { DistroAvatar } from "./DistroAvatar.tsx";
+import type { Host } from "../types.ts";
+
+const baseHost: Pick<Host, "distro" | "manualDistro" | "distroMode" | "os" | "protocol" | "iconMode" | "iconId" | "iconColor"> = {
+  os: "linux",
+  protocol: "ssh",
+};
+
+test("DistroAvatar renders custom host icon before distro color", () => {
+  const markup = renderToStaticMarkup(
+    <DistroAvatar
+      host={{ ...baseHost, distro: "ubuntu", iconMode: "custom", iconId: "database", iconColor: "blue" }}
+      fallback="DB"
+    />,
+  );
+
+  assert.match(markup, /background-color:#2563EB/i);
+  assert.doesNotMatch(markup, /bg-\[#E95420\]/);
+});
+
+test("DistroAvatar keeps serial hosts on the USB icon", () => {
+  const markup = renderToStaticMarkup(
+    <DistroAvatar
+      host={{ ...baseHost, protocol: "serial", iconMode: "custom", iconId: "database", iconColor: "blue" }}
+      fallback="S"
+    />,
+  );
+
+  assert.match(markup, /bg-amber-600/);
+  assert.doesNotMatch(markup, /background-color:#2563EB/i);
+});
+
+test("DistroAvatar keeps distro icon and applies custom palette color when icon mode is automatic", () => {
+  const markup = renderToStaticMarkup(
+    <DistroAvatar
+      host={{ ...baseHost, distro: "ubuntu", iconMode: "auto", iconId: "database", iconColor: "blue" }}
+      fallback="U"
+    />,
+  );
+
+  assert.match(markup, /background-color:#2563EB/i);
+  assert.match(markup, /src="\/distro\/ubuntu.svg"/);
+  assert.doesNotMatch(markup, /bg-\[#E95420\]/);
+});

components/DistroAvatar.tsx

@@ -1,8 +1,10 @@
 import { Server, Usb } from "lucide-react";
 import React, { memo } from "react";
 import { getEffectiveHostDistro } from "../domain/host";
+import { resolveHostIconAppearance, resolveHostIconColorAppearance } from "../domain/hostIcon";
 import { cn } from "../lib/utils";
 import { Host } from "../types";
+import { renderHostIconGlyph } from "./hostIconRenderer";
 
 export const DISTRO_LOGOS: Record<string, string> = {
   ubuntu: "/distro/ubuntu.svg",
@@ -19,6 +21,7 @@ export const DISTRO_LOGOS: Record<string, string> = {
   kali: "/distro/kali.svg",
   almalinux: "/distro/almalinux.svg",
   alinux: "/distro/alinux.svg",
+  openeuler: "/distro/openeuler.svg",
   // OS-level logos (used by local terminal tab icons)
   macos: "/distro/macos.svg",
   windows: "/distro/windows.svg",
@@ -50,6 +53,7 @@ export const DISTRO_COLORS: Record<string, string> = {
   kali: "bg-[#0F6DB3]",
   almalinux: "bg-[#173B66]",
   alinux: "bg-[#FF6A00]",
+  openeuler: "bg-[#002FA7]",
   // OS-level colors
   macos: "bg-[#333333]",
   windows: "bg-[#0078D4]",
@@ -69,7 +73,7 @@ export const DISTRO_COLORS: Record<string, string> = {
 
 type DistroAvatarProps = {
   host: Pick<Host, "distro" | "manualDistro" | "distroMode" | "os"> &
-    Partial<Pick<Host, "protocol">>;
+    Partial<Pick<Host, "protocol" | "iconMode" | "iconId" | "iconColor">>;
   fallback: string;
   className?: string;
   /** xs matches top tab bar icons (h-4 rounded rect) */
@@ -123,15 +127,33 @@ const DistroAvatarInner: React.FC<DistroAvatarProps> = ({
     );
   }
 
+  const customAppearance = resolveHostIconAppearance(host);
+  const customColor = resolveHostIconColorAppearance(host);
+  if (customAppearance) {
+    return (
+      <div
+        className={cn(
+          "shrink-0 rounded flex items-center justify-center text-white",
+          containerClass,
+          className,
+        )}
+        style={{ backgroundColor: customAppearance.colorHex }}
+      >
+        {renderHostIconGlyph(customAppearance.iconId, iconSize)}
+      </div>
+    );
+  }
+
   if (logo && !errored) {
     return (
       <div
         className={cn(
           "shrink-0 rounded flex items-center justify-center overflow-hidden",
           containerClass,
-          bg,
+          !customColor && bg,
           className,
         )}
+        style={customColor ? { backgroundColor: customColor.colorHex } : undefined}
       >
         <img
           src={logo}

components/HistorySidePanel.tsx

@@ -0,0 +1,554 @@
+/**
+ * HistorySidePanel — command history browser for the terminal side panel.
+ *
+ * Two scopes:
+ * - Host: remote shell history read from the focused session's history file.
+ * - Global: commands recorded locally as the user types across all sessions.
+ *
+ * Uses VariableSizeVirtualList for performance with large lists (up to 1000
+ * entries). Long commands are truncated in the list; click a row to expand the
+ * full text inline below that row.
+ */
+
+import {
+  Clipboard as ClipboardIcon,
+  FileCode,
+  Globe,
+  Play,
+  RefreshCw,
+  Search,
+  Terminal as TerminalIcon,
+} from 'lucide-react';
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useI18n } from '../application/i18n/I18nProvider';
+import { toGlobalHistoryDisplayEntries } from '../domain/globalHistory';
+import type { Host, RemoteHistoryEntry, ShellHistoryEntry } from '../domain/models';
+import { cn } from '../lib/utils';
+import type { RemoteHistoryHostState } from '../application/state/useRemoteHistoryState';
+import {
+  VariableSizeVirtualList,
+  type VariableSizeVirtualListHandle,
+} from './ui/VariableSizeVirtualList';
+import { Input } from './ui/input';
+
+export type HistoryPanelScope = 'host' | 'global';
+
+export interface HistorySidePanelProps {
+  focusedHost: Host | null;
+  focusedSessionId: string | null;
+  state: RemoteHistoryHostState;
+  globalEntries: ShellHistoryEntry[];
+  onFetch: (sessionId: string, hostId: string) => void;
+  /** Paste into the terminal without executing (no trailing Enter). */
+  onPasteToTerminal: (command: string) => void;
+  /** Write to the terminal and execute (append Enter). */
+  onRunInTerminal: (command: string) => void;
+  isVisible?: boolean;
+}
+
+const SUPPORTED_PROTOCOLS = new Set(['ssh', 'mosh', 'et']);
+const HISTORY_ROW_HEIGHT = 36;
+const HISTORY_ROW_WITH_HOST_HEIGHT = 46;
+const DETAIL_PADDING_Y = 12;
+const DETAIL_LINE_HEIGHT = 16;
+const DETAIL_MAX_COMMAND_LINES = 3;
+const DETAIL_TIMESTAMP_HEIGHT = 14;
+const DETAIL_HOST_LABEL_HEIGHT = 14;
+const DETAIL_ACTIONS_HEIGHT = 24;
+
+interface HistoryPanelEntry {
+  id: string;
+  command: string;
+  timestamp?: number;
+  hostLabel?: string;
+}
+
+function getDetailRowHeight(entry: HistoryPanelEntry): number {
+  const lineCount = Math.min(
+    entry.command.split('\n').length,
+    DETAIL_MAX_COMMAND_LINES,
+  );
+  const commandHeight = Math.max(lineCount, 1) * DETAIL_LINE_HEIGHT;
+  const timestampBlock = entry.timestamp ? DETAIL_TIMESTAMP_HEIGHT + 4 : 0;
+  const hostLabelBlock = entry.hostLabel ? DETAIL_HOST_LABEL_HEIGHT + 2 : 0;
+  return DETAIL_PADDING_Y + commandHeight + timestampBlock + hostLabelBlock + 4 + DETAIL_ACTIONS_HEIGHT;
+}
+
+type HistoryListRow =
+  | { type: 'entry'; entry: HistoryPanelEntry }
+  | { type: 'detail'; entry: HistoryPanelEntry };
+
+function buildHistoryListRows(
+  entries: HistoryPanelEntry[],
+  selectedEntryId: string | null,
+): HistoryListRow[] {
+  const rows: HistoryListRow[] = [];
+  for (const entry of entries) {
+    rows.push({ type: 'entry', entry });
+    if (selectedEntryId === entry.id) {
+      rows.push({ type: 'detail', entry });
+    }
+  }
+  return rows;
+}
+
+function remoteToPanelEntries(entries: RemoteHistoryEntry[]): HistoryPanelEntry[] {
+  return entries.map((entry) => ({
+    id: entry.id,
+    command: entry.command,
+    timestamp: entry.timestamp,
+  }));
+}
+
+const HistorySidePanelInner: React.FC<HistorySidePanelProps> = ({
+  focusedHost,
+  focusedSessionId,
+  state,
+  globalEntries,
+  onFetch,
+  onPasteToTerminal,
+  onRunInTerminal,
+  isVisible = true,
+}) => {
+  const { t } = useI18n();
+  const [scope, setScope] = useState<HistoryPanelScope>('host');
+  const [search, setSearch] = useState('');
+  const [selectedEntryId, setSelectedEntryId] = useState<string | null>(null);
+  const listRef = useRef<VariableSizeVirtualListHandle>(null);
+
+  const protocol = focusedHost?.protocol;
+  const isSupportedSession =
+    !!focusedHost && !!focusedSessionId && SUPPORTED_PROTOCOLS.has(String(protocol ?? 'ssh'));
+
+  useEffect(() => {
+    if (!isVisible || scope !== 'host' || !isSupportedSession || !focusedHost || !focusedSessionId) {
+      return;
+    }
+    if (state.loading) return;
+    if (state.fetchedAt != null || state.error) return;
+    onFetch(focusedSessionId, focusedHost.id);
+  }, [
+    isVisible,
+    scope,
+    isSupportedSession,
+    focusedHost,
+    focusedSessionId,
+    state.loading,
+    state.fetchedAt,
+    state.error,
+    onFetch,
+  ]);
+
+  const handleRefresh = useCallback(() => {
+    if (!focusedHost || !focusedSessionId) return;
+    onFetch(focusedSessionId, focusedHost.id);
+  }, [focusedHost, focusedSessionId, onFetch]);
+
+  useEffect(() => {
+    if (scope !== 'host') return;
+    setSelectedEntryId(null);
+    setSearch('');
+  }, [focusedHost?.id, scope]);
+
+  useEffect(() => {
+    setSelectedEntryId(null);
+  }, [scope]);
+
+  const sourceEntries = useMemo((): HistoryPanelEntry[] => {
+    if (scope === 'global') {
+      return toGlobalHistoryDisplayEntries(globalEntries);
+    }
+    return remoteToPanelEntries(state.entries);
+  }, [scope, globalEntries, state.entries]);
+
+  const filtered = useMemo((): HistoryPanelEntry[] => {
+    if (!search.trim()) return sourceEntries;
+    const q = search.toLowerCase();
+    return sourceEntries.filter(
+      (entry) =>
+        entry.command.toLowerCase().includes(q)
+        || entry.hostLabel?.toLowerCase().includes(q),
+    );
+  }, [sourceEntries, search]);
+
+  const listRows = useMemo(
+    () => buildHistoryListRows(filtered, selectedEntryId),
+    [filtered, selectedEntryId],
+  );
+
+  const handleSaveAsSnippet = useCallback((entry: HistoryPanelEntry) => {
+    window.dispatchEvent(
+      new CustomEvent('netcatty:snippets:add', {
+        detail: { command: entry.command },
+      }),
+    );
+  }, []);
+
+  const handleRowClick = useCallback((entryId: string) => {
+    setSelectedEntryId((current) => {
+      const next = current === entryId ? null : entryId;
+      if (next) {
+        requestAnimationFrame(() => {
+          const detailIndex = buildHistoryListRows(filtered, next).findIndex(
+            (row) => row.type === 'detail' && row.entry.id === next,
+          );
+          if (detailIndex >= 0) {
+            listRef.current?.scrollToIndex(detailIndex, 'auto');
+          }
+        });
+      }
+      return next;
+    });
+  }, [filtered]);
+
+  const getRowHeight = useCallback(
+    (row: HistoryListRow) => {
+      if (row.type === 'detail') return getDetailRowHeight(row.entry);
+      if (scope === 'global' && row.entry.hostLabel) return HISTORY_ROW_WITH_HOST_HEIGHT;
+      return HISTORY_ROW_HEIGHT;
+    },
+    [scope],
+  );
+
+  const labels = useMemo(
+    () => ({
+      paste: t('history.action.paste'),
+      run: t('history.action.run'),
+      save: t('history.action.saveAsSnippet'),
+    }),
+    [t],
+  );
+
+  const entryCount = sourceEntries.length;
+  const showHostEmpty = scope === 'host' && !focusedHost;
+  const showUnsupported = scope === 'host' && focusedHost && !isSupportedSession;
+  const showLoading = scope === 'host' && focusedHost && isSupportedSession && state.loading && state.entries.length === 0;
+  const showError = scope === 'host' && focusedHost && isSupportedSession && state.error;
+  const showNoRemoteHistory =
+    scope === 'host'
+    && focusedHost
+    && isSupportedSession
+    && !state.loading
+    && !state.error
+    && state.entries.length === 0;
+  const showNoGlobalHistory = scope === 'global' && globalEntries.length === 0;
+
+  if (!isVisible) return null;
+
+  return (
+    <div
+      className="h-full flex flex-col bg-background overflow-hidden"
+      data-section="history-panel"
+      data-history-scope={scope}
+    >
+      <div className="shrink-0 px-2 py-1.5 border-b border-border/50 flex items-center gap-1.5">
+        <div className="relative flex-1 min-w-0">
+          <Search
+            size={12}
+            className="absolute left-2 top-1/2 -translate-y-1/2 text-muted-foreground"
+          />
+          <Input
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+            placeholder={t('history.searchPlaceholder')}
+            className="h-7 pl-7 text-xs bg-muted/30 border-none"
+          />
+        </div>
+        {scope === 'host' && (
+          <button
+            type="button"
+            onClick={handleRefresh}
+            disabled={!isSupportedSession || state.loading}
+            title={t('history.action.refresh')}
+            aria-label={t('history.action.refresh')}
+            className="shrink-0 h-7 w-7 flex items-center justify-center rounded-md text-muted-foreground hover:text-foreground hover:bg-muted/60 transition-colors disabled:opacity-40 disabled:hover:text-muted-foreground disabled:hover:bg-transparent"
+          >
+            <RefreshCw size={14} className={cn(state.loading && 'animate-spin')} />
+          </button>
+        )}
+      </div>
+
+      <div className="shrink-0 flex items-center gap-2 px-3 py-1.5 text-[11px] text-muted-foreground border-b border-border/30 min-h-[28px]">
+        <div
+          className="inline-flex max-w-[calc(100%-3.5rem)] items-center gap-0.5"
+          role="tablist"
+          aria-label={t('history.scope.label')}
+        >
+          <ScopeTab
+            active={scope === 'host'}
+            label={focusedHost?.label ?? t('history.tab.host')}
+            icon={<TerminalIcon size={10} className="shrink-0" />}
+            onClick={() => setScope('host')}
+            className="max-w-[9rem]"
+          />
+          <ScopeTab
+            active={scope === 'global'}
+            label={t('history.tab.global')}
+            icon={<Globe size={10} className="shrink-0" />}
+            onClick={() => setScope('global')}
+          />
+        </div>
+        {entryCount > 0 && (
+          <span className="ml-auto shrink-0 opacity-70">
+            {t('history.meta.count', { count: entryCount })}
+          </span>
+        )}
+      </div>
+
+      <div className="flex-1 min-h-0">
+        {showHostEmpty && (
+          <EmptyState message={t('history.empty.noSession')} />
+        )}
+
+        {showUnsupported && (
+          <EmptyState message={t('history.empty.unsupportedProtocol')} />
+        )}
+
+        {showLoading && (
+          <div className="flex flex-col items-center justify-center py-10 px-4 text-muted-foreground text-center">
+            <RefreshCw size={20} className="opacity-60 mb-2 animate-spin" />
+            <span className="text-xs">{t('history.loading')}</span>
+          </div>
+        )}
+
+        {showError && (
+          <div className="px-3 py-4 text-xs text-center">
+            <div className="text-destructive mb-2">{state.error}</div>
+            <button
+              type="button"
+              onClick={handleRefresh}
+              className="text-primary hover:underline"
+            >
+              {t('history.action.retry')}
+            </button>
+          </div>
+        )}
+
+        {showNoRemoteHistory && (
+          <EmptyState message={t('history.empty.noHistory')} />
+        )}
+
+        {showNoGlobalHistory && (
+          <EmptyState message={t('history.empty.noGlobalHistory')} />
+        )}
+
+        {filtered.length === 0 && sourceEntries.length > 0 && (
+          <div className="px-3 py-4 text-xs text-muted-foreground italic text-center">
+            {t('common.noResultsFound')}
+          </div>
+        )}
+
+        {listRows.length > 0 && (
+          <VariableSizeVirtualList
+            ref={listRef}
+            items={listRows}
+            getItemHeight={getRowHeight}
+            getItemKey={(row, index) =>
+              row.type === 'entry' ? row.entry.id : `detail-${row.entry.id}-${index}`}
+            renderItem={(row) => {
+              if (row.type === 'detail') {
+                return (
+                  <HistoryDetailStrip
+                    entry={row.entry}
+                    labels={labels}
+                    onRun={() => onRunInTerminal(row.entry.command)}
+                    onPaste={() => onPasteToTerminal(row.entry.command)}
+                    onSave={() => handleSaveAsSnippet(row.entry)}
+                  />
+                );
+              }
+              return (
+                <HistoryRow
+                  entry={row.entry}
+                  isSelected={selectedEntryId === row.entry.id}
+                  showHostLabel={scope === 'global'}
+                  labels={labels}
+                  onSelect={() => handleRowClick(row.entry.id)}
+                  onRun={() => onRunInTerminal(row.entry.command)}
+                  onPaste={() => onPasteToTerminal(row.entry.command)}
+                  onSave={() => handleSaveAsSnippet(row.entry)}
+                />
+              );
+            }}
+          />
+        )}
+      </div>
+    </div>
+  );
+};
+
+const ScopeTab: React.FC<{
+  active: boolean;
+  label: string;
+  icon?: React.ReactNode;
+  onClick: () => void;
+  className?: string;
+}> = ({ active, label, icon, onClick, className }) => (
+  <button
+    type="button"
+    role="tab"
+    aria-selected={active}
+    onClick={onClick}
+    title={label}
+    className={cn(
+      'inline-flex items-center gap-1 rounded px-2 py-0.5 text-[10px] leading-4 transition-colors min-w-0 shrink whitespace-nowrap',
+      active
+        ? 'bg-muted text-foreground font-medium'
+        : 'text-muted-foreground hover:text-foreground',
+      className,
+    )}
+  >
+    {icon}
+    <span className="truncate">{label}</span>
+  </button>
+);
+
+const EmptyState: React.FC<{ message: string }> = ({ message }) => (
+  <div className="flex flex-col items-center justify-center py-10 px-4 text-muted-foreground text-center">
+    <TerminalIcon size={24} className="opacity-40 mb-2" />
+    <span className="text-xs">{message}</span>
+  </div>
+);
+
+interface HistoryDetailStripProps {
+  entry: HistoryPanelEntry;
+  labels: { paste: string; run: string; save: string };
+  onRun: () => void;
+  onPaste: () => void;
+  onSave: () => void;
+}
+
+const HistoryDetailStrip: React.FC<HistoryDetailStripProps> = memo(
+  ({ entry, labels, onRun, onPaste, onSave }) => (
+    <div
+      className="border-b border-border/40 bg-muted/20 px-3 py-1.5"
+      data-section="history-detail"
+    >
+      <div
+        className="font-mono text-[11px] leading-4 whitespace-pre-wrap break-words line-clamp-3 overflow-hidden"
+        style={{ overflowWrap: 'anywhere' }}
+      >
+        {entry.command}
+      </div>
+      <div className="flex items-center gap-1 mt-1 min-h-6">
+        <div className="flex-1 min-w-0">
+          {entry.hostLabel ? (
+            <span className="block text-[10px] text-muted-foreground truncate">
+              {entry.hostLabel}
+            </span>
+          ) : null}
+          {entry.timestamp ? (
+            <span className="block text-[10px] text-muted-foreground truncate">
+              {new Date(entry.timestamp).toLocaleString()}
+            </span>
+          ) : null}
+        </div>
+        <IconButton title={labels.run} onClick={onRun}>
+          <Play size={12} />
+        </IconButton>
+        <IconButton title={labels.paste} onClick={onPaste}>
+          <ClipboardIcon size={12} />
+        </IconButton>
+        <IconButton title={labels.save} onClick={onSave}>
+          <FileCode size={12} />
+        </IconButton>
+      </div>
+    </div>
+  ),
+);
+HistoryDetailStrip.displayName = 'HistoryDetailStrip';
+
+interface HistoryRowProps {
+  entry: HistoryPanelEntry;
+  isSelected: boolean;
+  showHostLabel: boolean;
+  labels: { paste: string; run: string; save: string };
+  onSelect: () => void;
+  onRun: () => void;
+  onPaste: () => void;
+  onSave: () => void;
+}
+
+const HistoryRow: React.FC<HistoryRowProps> = memo(
+  ({ entry, isSelected, showHostLabel, labels, onSelect, onRun, onPaste, onSave }) => {
+    const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+      if (event.target !== event.currentTarget) return;
+      if (event.key !== 'Enter' && event.key !== ' ') return;
+      event.preventDefault();
+      onSelect();
+    };
+
+    const handleMouseDown = (event: React.MouseEvent<HTMLDivElement>) => {
+      if (event.detail > 1) {
+        event.preventDefault();
+      }
+    };
+
+    const rowTitle = isSelected
+      ? undefined
+      : [entry.command, showHostLabel && entry.hostLabel ? entry.hostLabel : null]
+          .filter(Boolean)
+          .join('\n');
+
+    return (
+      <div
+        className={cn(
+          'group flex select-none items-center gap-2 px-3 h-full hover:bg-accent/50 transition-colors cursor-pointer',
+          isSelected && 'bg-accent/30',
+        )}
+        role="button"
+        tabIndex={0}
+        aria-expanded={isSelected}
+        title={rowTitle}
+        onClick={onSelect}
+        onKeyDown={handleKeyDown}
+        onMouseDown={handleMouseDown}
+      >
+        <div className="w-0 flex-1 min-w-0">
+          <div className="font-mono text-[11px] truncate whitespace-nowrap">
+            {entry.command}
+          </div>
+          {showHostLabel && entry.hostLabel ? (
+            <div className="text-[10px] text-muted-foreground truncate">
+              {entry.hostLabel}
+            </div>
+          ) : null}
+        </div>
+        <div
+          className="flex shrink-0 items-center gap-0.5 opacity-0 group-hover:opacity-100 focus-within:opacity-100"
+          onClick={(event) => event.stopPropagation()}
+        >
+          <IconButton title={labels.run} onClick={onRun}>
+            <Play size={12} />
+          </IconButton>
+          <IconButton title={labels.paste} onClick={onPaste}>
+            <ClipboardIcon size={12} />
+          </IconButton>
+          <IconButton title={labels.save} onClick={onSave}>
+            <FileCode size={12} />
+          </IconButton>
+        </div>
+      </div>
+    );
+  },
+);
+HistoryRow.displayName = 'HistoryRow';
+
+const IconButton: React.FC<{
+  title: string;
+  onClick: () => void;
+  children: React.ReactNode;
+}> = ({ title, onClick, children }) => (
+  <button
+    type="button"
+    title={title}
+    aria-label={title}
+    onClick={onClick}
+    className="h-6 w-6 flex items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-muted/70 transition-colors"
+  >
+    {children}
+  </button>
+);
+
+export const HistorySidePanel = memo(HistorySidePanelInner);
+HistorySidePanel.displayName = 'HistorySidePanel';

components/HostDetailsAdvancedSections.tsx

@@ -370,6 +370,12 @@ export const HostDetailsAdvancedSections: React.FC<HostDetailsAdvancedSectionsPr
           icon={<TerminalSquare size={14} className="text-muted-foreground" />}
           title={t("hostDetails.section.terminalBehavior")}
         >
+          <ToggleRow
+            label={t("hostDetails.lineTimestamps")}
+            hint={t("hostDetails.lineTimestamps.desc")}
+            enabled={!!form.showLineTimestamps}
+            onToggle={() => update("showLineTimestamps", !form.showLineTimestamps)}
+          />
           <HostDetailsSettingRow label={t("hostDetails.backspaceBehavior")}>
             <Select
               value={form.backspaceBehavior ?? "default"}

components/HostDetailsConnectionSections.tsx

@@ -3,6 +3,7 @@ import { ChevronDown, Eye, EyeOff, FileKey, FolderLock, FolderOpen, Key, KeyRoun
 import type { Host } from "../types";
 import { cn } from "../lib/utils";
 import { DistroAvatar } from "./DistroAvatar";
+import { HostIconPicker } from "./HostIconPicker";
 import { Button } from "./ui/button";
 import { Combobox } from "./ui/combobox";
 import { HostDetailsSection, HostDetailsSettingRow } from "./host-details";
@@ -71,6 +72,28 @@ export const HostDetailsConnectionSections: React.FC<HostDetailsConnectionSectio
           </div>
         </HostDetailsSection>
 
+        <HostDetailsSection
+          icon={<DistroAvatar host={form as Host} fallback="H" size="sm" />}
+          title={t("hostDetails.icon.title")}
+          hint={t("hostDetails.icon.desc")}
+        >
+          <HostIconPicker
+            iconMode={form.iconMode}
+            iconId={form.iconId}
+            iconColor={form.iconColor}
+            onChange={(next) => {
+              update("iconMode", next.iconMode);
+              update("iconId", next.iconId);
+              update("iconColor", next.iconColor);
+            }}
+            onReset={() => {
+              update("iconMode", undefined);
+              update("iconId", undefined);
+              update("iconColor", undefined);
+            }}
+          />
+        </HostDetailsSection>
+
         <HostDetailsSection
           icon={<KeyRound size={14} className="text-muted-foreground" />}
           title={t("hostDetails.section.portCredentials")}

components/HostDetailsPanel.proxyProfile.test.tsx

@@ -296,3 +296,19 @@ test("HostDetailsPanel does not offer to disable telnet when telnet is the prima
   assert.ok(telnetHeader);
   assert.doesNotMatch(telnetHeader[0], /hover:text-destructive/);
 });
+
+test("HostDetailsPanel shows host icon customization in the connection settings", () => {
+  const markup = renderHostDetails({
+    ...hostWithMissingProxyProfile,
+    proxyProfileId: undefined,
+    iconMode: "custom",
+    iconId: "database",
+    iconColor: "blue",
+  });
+
+  assert.match(markup, /Host Icon/);
+  assert.match(markup, /Database/);
+  assert.match(markup, /Violet/);
+  assert.match(markup, /Built-in icon replaces Linux Distribution/);
+  assert.match(markup, /IP or Hostname/);
+});

components/HostIconPicker.test.tsx

@@ -0,0 +1,70 @@
+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 { HostIconPicker } from "./HostIconPicker.tsx";
+import { TooltipProvider } from "./ui/tooltip.tsx";
+
+const renderPicker = (props: Partial<React.ComponentProps<typeof HostIconPicker>> = {}) =>
+  renderToStaticMarkup(
+    <I18nProvider locale="en">
+      <TooltipProvider>
+        <HostIconPicker
+          iconMode={props.iconMode}
+          iconId={props.iconId}
+          iconColor={props.iconColor}
+          onChange={() => {}}
+          onReset={() => {}}
+        />
+      </TooltipProvider>
+    </I18nProvider>,
+  );
+
+test("HostIconPicker renders automatic mode without selected custom defaults", () => {
+  const markup = renderPicker();
+
+  assert.match(markup, /Automatic/);
+  assert.doesNotMatch(markup, /aria-pressed="true"[^>]*Database/);
+});
+
+test("HostIconPicker renders custom choices and reset when custom", () => {
+  const markup = renderPicker({ iconMode: "custom", iconId: "database", iconColor: "blue" });
+
+  assert.match(markup, /Database/);
+  assert.match(markup, /Globe/);
+  assert.match(markup, /Show icon library/);
+  assert.doesNotMatch(markup, /Server settings/);
+  assert.match(markup, /grid-cols-5/);
+  assert.match(markup, /Blue/);
+  assert.match(markup, /Reset/);
+  assert.match(markup, /Built-in icon replaces Linux Distribution for this host/);
+});
+
+test("HostIconPicker shows two rows of color swatches in automatic mode", () => {
+  const markup = renderPicker({ iconMode: "auto", iconColor: "violet" });
+
+  assert.match(markup, /Violet/);
+  assert.match(markup, /grid-cols-8/);
+  assert.match(markup, /Use Linux Distribution icon and selected color/);
+});
+
+test("HostIconPicker does not expose image upload", () => {
+  const markup = renderPicker({ iconMode: "custom", iconId: "database", iconColor: "blue" });
+
+  assert.doesNotMatch(markup, /upload/i);
+  assert.doesNotMatch(markup, /choose file/i);
+});
+
+test("HostIconPicker normalizes invalid incoming custom values only for editing", () => {
+  const markup = renderPicker({
+    iconMode: "custom",
+    iconId: "bad" as React.ComponentProps<typeof HostIconPicker>["iconId"],
+    iconColor: "bad" as React.ComponentProps<typeof HostIconPicker>["iconColor"],
+  });
+
+  assert.match(markup, /Server/);
+  assert.match(markup, /Blue/);
+  assert.match(markup, /Built-in icon replaces Linux Distribution/);
+});

components/HostIconPicker.tsx

@@ -0,0 +1,164 @@
+import { RotateCcw } from "lucide-react";
+import React from "react";
+import { useI18n } from "../application/i18n/I18nProvider";
+import {
+  DEFAULT_HOST_ICON_COLOR,
+  DEFAULT_HOST_ICON_ID,
+  HOST_ICON_COLORS,
+  HOST_ICON_IDS,
+  isHostIconColorId,
+  isHostIconId,
+  normalizeHostIconSelection,
+} from "../domain/hostIcon";
+import type { HostIconColorId, HostIconId, HostIconMode } from "../domain/models";
+import { cn } from "../lib/utils";
+import { renderHostIconGlyph } from "./hostIconRenderer";
+import { Button } from "./ui/button";
+import { Tooltip, TooltipContent, TooltipTrigger } from "./ui/tooltip";
+
+type HostIconPickerProps = {
+  iconMode?: HostIconMode;
+  iconId?: HostIconId;
+  iconColor?: HostIconColorId;
+  onChange: (next: { iconMode?: HostIconMode; iconId?: HostIconId; iconColor?: HostIconColorId }) => void;
+  onReset: () => void;
+};
+
+export const HostIconPicker: React.FC<HostIconPickerProps> = ({
+  iconMode,
+  iconId,
+  iconColor,
+  onChange,
+  onReset,
+}) => {
+  const { t } = useI18n();
+  const [expanded, setExpanded] = React.useState(false);
+  const custom = iconMode === "custom";
+  const normalizedSelection = normalizeHostIconSelection({ iconMode, iconId, iconColor });
+  const selectedIconId = custom && isHostIconId(normalizedSelection.iconId)
+    ? normalizedSelection.iconId
+    : DEFAULT_HOST_ICON_ID;
+  const hasCustomColor = isHostIconColorId(normalizedSelection.iconColor);
+  const selectedColor = hasCustomColor ? normalizedSelection.iconColor : DEFAULT_HOST_ICON_COLOR;
+  const selectedColorHex =
+    HOST_ICON_COLORS.find((color) => color.id === selectedColor)?.hex || HOST_ICON_COLORS[0].hex;
+
+  const setCustom = () => onChange({ iconMode: "custom", iconId: selectedIconId, iconColor: selectedColor });
+  const updateIcon = (nextIconId: HostIconId) =>
+    onChange({ iconMode: "custom", iconId: nextIconId, iconColor: selectedColor });
+  const updateColor = (nextColor: HostIconColorId) => {
+    if (custom) {
+      onChange({ iconMode: "custom", iconId: selectedIconId, iconColor: nextColor });
+      return;
+    }
+    onChange({ iconMode: "auto", iconColor: nextColor });
+  };
+  const visibleIconIds = custom && !expanded ? HOST_ICON_IDS.slice(0, 10) : HOST_ICON_IDS;
+
+  return (
+    <div className="space-y-3">
+      <div className="flex items-center gap-2">
+        <Button
+          type="button"
+          variant={custom ? "ghost" : "secondary"}
+          size="sm"
+          className="h-8 flex-1"
+          onClick={onReset}
+        >
+          {t("hostDetails.icon.mode.auto")}
+        </Button>
+        <Button
+          type="button"
+          variant={custom ? "secondary" : "ghost"}
+          size="sm"
+          className="h-8 flex-1"
+          onClick={setCustom}
+        >
+          {t("hostDetails.icon.mode.custom")}
+        </Button>
+        {(custom || hasCustomColor) && (
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            className="h-8 w-8 shrink-0"
+            onClick={onReset}
+            aria-label={t("hostDetails.icon.reset")}
+          >
+            <RotateCcw size={14} />
+          </Button>
+        )}
+      </div>
+
+      {custom && (
+        <div className="space-y-2">
+          <div className="grid grid-cols-5 gap-2">
+            {visibleIconIds.map((optionIconId) => {
+              const selected = selectedIconId === optionIconId;
+              return (
+                <Tooltip key={optionIconId}>
+                  <TooltipTrigger asChild>
+                    <button
+                      type="button"
+                      aria-label={t(`hostDetails.icon.option.${optionIconId}`)}
+                      aria-pressed={selected}
+                      className={cn(
+                        "flex h-9 items-center justify-center rounded-md border text-muted-foreground transition-colors hover:bg-secondary",
+                        selected ? "border-primary bg-primary/10 text-primary" : "border-border/60 bg-background/60",
+                      )}
+                      onClick={() => updateIcon(optionIconId)}
+                    >
+                      {renderHostIconGlyph(optionIconId, "h-4 w-4")}
+                      <span className="sr-only">{t(`hostDetails.icon.option.${optionIconId}`)}</span>
+                    </button>
+                  </TooltipTrigger>
+                  <TooltipContent>{t(`hostDetails.icon.option.${optionIconId}`)}</TooltipContent>
+                </Tooltip>
+              );
+            })}
+          </div>
+          <Button
+            type="button"
+            variant="ghost"
+            size="sm"
+            className="h-7 w-full text-xs"
+            onClick={() => setExpanded((value) => !value)}
+          >
+            {t(expanded ? "hostDetails.icon.hideLibrary" : "hostDetails.icon.showLibrary")}
+          </Button>
+        </div>
+      )}
+
+      <div className="grid grid-cols-8 gap-2">
+        {HOST_ICON_COLORS.map((color) => {
+          const selected = hasCustomColor && selectedColor === color.id;
+          return (
+            <Tooltip key={color.id}>
+              <TooltipTrigger asChild>
+                <button
+                  type="button"
+                  aria-label={t(`hostDetails.icon.color.${color.id}`)}
+                  aria-pressed={selected}
+                  className={cn(
+                    "h-7 rounded-md border transition-transform hover:scale-105",
+                    selected ? "border-primary ring-2 ring-primary/30" : "border-border/60",
+                  )}
+                  style={{ backgroundColor: color.hex }}
+                  onClick={() => updateColor(color.id)}
+                >
+                  <span className="sr-only">{t(`hostDetails.icon.color.${color.id}`)}</span>
+                </button>
+              </TooltipTrigger>
+              <TooltipContent>{t(`hostDetails.icon.color.${color.id}`)}</TooltipContent>
+            </Tooltip>
+          );
+        })}
+      </div>
+
+      <div className="flex items-center gap-2 rounded-md border border-border/60 bg-secondary/40 px-2.5 py-2 text-xs text-muted-foreground">
+        <span className="h-4 w-4 rounded" style={{ backgroundColor: hasCustomColor ? selectedColorHex : undefined }} />
+        <span>{t(custom ? "hostDetails.icon.customOverridesDistro" : "hostDetails.icon.autoUsesDistro")}</span>
+      </div>
+    </div>
+  );
+};

components/HostTreeView.tsx

@@ -9,6 +9,7 @@ import { useVaultHostTreeActions } from '../application/state/vaultHostTreeActio
 import { useTreeExpandedState } from '../application/state/useTreeExpandedState';
 import { applyGroupDefaults, resolveGroupDefaults } from '../domain/groupConfig';
 import { resolveTelnetPort, resolveTelnetUsername, sanitizeHost } from '../domain/host';
+import { sortByVaultOrder } from '../domain/vaultOrder';
 import { STORAGE_KEY_VAULT_HOSTS_TREE_EXPANDED } from '../infrastructure/config/storageKeys';
 import { cn } from '../lib/utils';
 import { GroupConfig, GroupNode, Host } from '../types';
@@ -20,10 +21,24 @@ import { DistroAvatar } from './DistroAvatar';
 import { HostNotesIndicator } from './host/HostNotesIndicator';
 import { Button } from './ui/button';
 
+const getTreeGroupDropIntent = (
+  element: HTMLElement,
+  clientY: number,
+): 'before' | 'inside' | 'after' => {
+  const rect = element.getBoundingClientRect();
+  const edgeSize = Math.max(8, Math.min(14, rect.height * 0.28));
+  if (clientY <= rect.top + edgeSize) return 'before';
+  if (clientY >= rect.bottom - edgeSize) return 'after';
+  return 'inside';
+};
+
+const hasDragType = (dataTransfer: DataTransfer, type: string) =>
+  Array.from(dataTransfer.types).includes(type);
+
 interface HostTreeViewProps {
   groupTree: GroupNode[];
   hosts: Host[];
-  sortMode?: 'az' | 'za' | 'newest' | 'oldest' | 'group';
+  sortMode?: 'manual' | 'az' | 'za' | 'newest' | 'oldest' | 'group';
   expandedPaths?: Set<string>;
   onTogglePath?: (path: string) => void;
   onExpandAll?: (paths: string[]) => void;
@@ -55,7 +70,7 @@ interface HostTreeViewProps {
 interface TreeNodeProps {
   node: GroupNode;
   depth: number;
-  sortMode: 'az' | 'za' | 'newest' | 'oldest' | 'group';
+  sortMode: 'manual' | 'az' | 'za' | 'newest' | 'oldest' | 'group';
   expandedPaths: Set<string>;
   onToggle: (path: string) => void;
   onConnect: (host: Host) => void;
@@ -136,10 +151,26 @@ const TreeNode: React.FC<TreeNodeProps> = ({
   const childNodes = useMemo(() => {
     if (!node.children) return [];
     const nodes = Object.values(node.children) as unknown as GroupNode[];
+    const originalIndex = new Map(nodes.map((child, index) => [child.path, index]));
+    const orderByPath = new Map(
+      groupConfigs
+        .filter((config) => typeof config.order === 'number' && Number.isFinite(config.order))
+        .map((config) => [config.path, config.order as number]),
+    );
     return nodes.sort((a, b) => {
       switch (sortMode) {
         case 'za':
           return b.name.localeCompare(a.name);
+        case 'manual': {
+          const orderA = orderByPath.get(a.path);
+          const orderB = orderByPath.get(b.path);
+          const hasOrderA = typeof orderA === 'number' && Number.isFinite(orderA);
+          const hasOrderB = typeof orderB === 'number' && Number.isFinite(orderB);
+          if (hasOrderA && hasOrderB && orderA !== orderB) return orderA - orderB;
+          if (hasOrderA) return -1;
+          if (hasOrderB) return 1;
+          return (originalIndex.get(a.path) ?? 0) - (originalIndex.get(b.path) ?? 0);
+        }
         case 'newest':
         case 'oldest':
           // For groups, fall back to name sorting since groups don't have creation dates
@@ -149,10 +180,10 @@ const TreeNode: React.FC<TreeNodeProps> = ({
           return a.name.localeCompare(b.name);
       }
     });
-  }, [node.children, sortMode]);
+  }, [groupConfigs, node.children, sortMode]);
 
   const sortedHosts = useMemo(() => {
-    return [...node.hosts].sort((a, b) => {
+    const sorted = [...node.hosts].sort((a, b) => {
       switch (sortMode) {
         case 'az':
           return a.label.localeCompare(b.label);
@@ -162,10 +193,14 @@ const TreeNode: React.FC<TreeNodeProps> = ({
           return (b.createdAt || 0) - (a.createdAt || 0);
         case 'oldest':
           return (a.createdAt || 0) - (b.createdAt || 0);
+        case 'manual':
+          return 0;
         default:
           return a.label.localeCompare(b.label);
       }
     });
+    if (sortMode === 'manual') return sortByVaultOrder(sorted);
+    return sorted;
   }, [node.hosts, sortMode]);
 
   return (
@@ -184,7 +219,7 @@ const TreeNode: React.FC<TreeNodeProps> = ({
               <div
                 ref={groupRowRef}
                 className={cn(
-                  "flex items-center py-2 pr-3 text-sm font-medium cursor-pointer transition-colors select-none group hover:bg-secondary/60 rounded-lg",
+                  "vault-drop-indicator-row flex items-center py-2 pr-3 text-sm font-medium cursor-pointer transition-colors select-none group hover:bg-secondary/60 rounded-lg",
                   getDropTargetClasses?.(node.path),
                 )}
                 style={{ paddingLeft }}
@@ -199,6 +234,13 @@ const TreeNode: React.FC<TreeNodeProps> = ({
                 onDragOver={(e) => {
                   e.preventDefault();
                   e.stopPropagation();
+                  if (hasDragType(e.dataTransfer, "group-path")) {
+                    const intent = getTreeGroupDropIntent(e.currentTarget, e.clientY);
+                    if (intent !== "inside") {
+                      setDragOverDropTarget?.(null);
+                      return;
+                    }
+                  }
                   setDragOverDropTarget?.(node.path);
                 }}
                 onDragLeave={(e) => {
@@ -215,7 +257,9 @@ const TreeNode: React.FC<TreeNodeProps> = ({
                   const hostId = e.dataTransfer.getData("host-id");
                   const groupPath = e.dataTransfer.getData("group-path");
                   if (hostId) moveHostToGroup(hostId, node.path);
-                  if (groupPath) moveGroup(groupPath, node.path);
+                  if (groupPath && getTreeGroupDropIntent(e.currentTarget, e.clientY) === "inside") {
+                    moveGroup(groupPath, node.path);
+                  }
                 }}
               >
                 <div className="mr-2 flex-shrink-0 w-4 h-4 flex items-center justify-center">
@@ -402,7 +446,7 @@ const HostTreeItem: React.FC<HostTreeItemProps> = ({
       <ContextMenuTrigger>
         <div
           className={cn(
-            "flex items-center py-2 pr-3 text-sm cursor-pointer transition-colors select-none group hover:bg-secondary/40 rounded-lg",
+            "vault-drop-indicator-row flex items-center py-2 pr-3 text-sm cursor-pointer transition-colors select-none group hover:bg-secondary/40 rounded-lg",
             isSelected ? "bg-primary/10" : "",
           )}
           style={{ paddingLeft }}
@@ -562,7 +606,7 @@ export const HostTreeView: React.FC<HostTreeViewProps> = ({
   // Get ungrouped hosts (hosts without a group or with empty group) and sort them
   const ungroupedHosts = useMemo(() => {
     const hosts_without_group = hosts.filter(host => !host.group || host.group === '');
-    return hosts_without_group.sort((a, b) => {
+    const sorted = hosts_without_group.sort((a, b) => {
       switch (sortMode) {
         case 'az':
           return a.label.localeCompare(b.label);
@@ -572,10 +616,14 @@ export const HostTreeView: React.FC<HostTreeViewProps> = ({
           return (b.createdAt || 0) - (a.createdAt || 0);
         case 'oldest':
           return (a.createdAt || 0) - (b.createdAt || 0);
+        case 'manual':
+          return 0;
         default:
           return a.label.localeCompare(b.label);
       }
     });
+    if (sortMode === 'manual') return sortByVaultOrder(sorted);
+    return sorted;
   }, [hosts, sortMode]);
 
   // Sort group tree based on sort mode
@@ -584,6 +632,8 @@ export const HostTreeView: React.FC<HostTreeViewProps> = ({
       switch (sortMode) {
         case 'za':
           return b.name.localeCompare(a.name);
+        case 'manual':
+          return 0;
         case 'newest':
         case 'oldest':
           // For groups, fall back to name sorting since groups don't have creation dates

components/KeychainManager.tsx

@@ -13,10 +13,11 @@ import {
   Upload,
   UserPlus,
 } from "lucide-react";
-import React, { useCallback, useMemo, useState } from "react";
+import React, { useCallback, useMemo, useRef, useState } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { useStoredViewMode } from "../application/state/useStoredViewMode";
 import type { GroupConfig } from "../domain/models";
+import { reorderVaultItems, sortByVaultOrder } from "../domain/vaultOrder";
 import { STORAGE_KEY_VAULT_KEYS_VIEW_MODE } from "../infrastructure/config/storageKeys";
 import { logger } from "../lib/logger";
 import { cn } from "../lib/utils";
@@ -50,6 +51,7 @@ import {
   vaultHeaderIconButtonClass,
   vaultSectionTitleClass,
 } from "./vault/VaultPageHeader";
+import { useVaultItemReorder } from "./vault/vaultReorderDrag";
 
 // Import utilities and components from keychain module
 import {
@@ -80,8 +82,10 @@ interface KeychainManagerProps {
   managedSources?: ManagedSource[];
   onSave: (key: SSHKey) => void;
   onUpdate: (key: SSHKey) => void;
+  onReorderKeys?: (keys: SSHKey[]) => void;
   onDelete: (id: string) => void;
   onSaveIdentity?: (identity: Identity) => void;
+  onReorderIdentities?: (identities: Identity[]) => void;
   onDeleteIdentity?: (id: string) => void;
   onNewHost?: () => void;
   onSaveHost?: (host: Host) => void;
@@ -98,8 +102,10 @@ const KeychainManager: React.FC<KeychainManagerProps> = ({
   managedSources = [],
   onSave,
   onUpdate,
+  onReorderKeys,
   onDelete,
   onSaveIdentity,
+  onReorderIdentities,
   onDeleteIdentity,
   onNewHost: _onNewHost,
   onSaveHost,
@@ -147,6 +153,7 @@ const KeychainManager: React.FC<KeychainManagerProps> = ({
 
   const [showHostSelector, setShowHostSelector] = useState(false);
   const [isExporting, setIsExporting] = useState(false);
+  const listRef = useRef<HTMLDivElement | null>(null);
 
   // Export panel state
   const [exportLocation, setExportLocation] = useState(".ssh");
@@ -171,6 +178,27 @@ echo $3 >> "$FILE"`);
   const [showPassphrase, setShowPassphrase] = useState(false);
   const [isGenerating, setIsGenerating] = useState(false);
 
+  const keyReorder = useVaultItemReorder({
+    containerRef: listRef,
+    viewMode,
+    dragType: "key-id",
+    targetAttribute: "data-key-id",
+    disabled: !onReorderKeys || search.trim().length > 0,
+    onReorder: (sourceId, targetId, position) => {
+      onReorderKeys?.(reorderVaultItems(keys, sourceId, targetId, position));
+    },
+  });
+  const identityReorder = useVaultItemReorder({
+    containerRef: listRef,
+    viewMode,
+    dragType: "identity-id",
+    targetAttribute: "data-identity-id",
+    disabled: !onReorderIdentities || search.trim().length > 0,
+    onReorder: (sourceId, targetId, position) => {
+      onReorderIdentities?.(reorderVaultItems(identities, sourceId, targetId, position));
+    },
+  });
+
   const showError = useCallback((message: string, title = t("common.error")) => {
     toast.error(message, title);
   }, [t]);
@@ -204,18 +232,18 @@ echo $3 >> "$FILE"`);
       );
     }
 
-    return result;
+    return sortByVaultOrder(result);
   }, [keys, activeFilter, search]);
 
   // Filter identities based on search
   const filteredIdentities = useMemo(() => {
-    if (!search.trim()) return identities;
+    if (!search.trim()) return sortByVaultOrder(identities);
     const s = search.toLowerCase();
-    return identities.filter(
+    return sortByVaultOrder(identities.filter(
       (i) =>
         i.label.toLowerCase().includes(s) ||
         i.username.toLowerCase().includes(s),
-    );
+    ));
   }, [identities, search]);
 
   // Push a new panel onto the stack
@@ -675,7 +703,26 @@ echo $3 >> "$FILE"`);
         </VaultPageHeader>
 
         {/* Scrollable Content */}
-        <div className="flex-1 overflow-y-auto">
+        <div
+          ref={listRef}
+          className="flex-1 overflow-y-auto"
+          onDragOverCapture={(event) => {
+            keyReorder.handleDragOverCapture(event);
+            identityReorder.handleDragOverCapture(event);
+          }}
+          onDragOver={(event) => {
+            keyReorder.handleDragOver(event);
+            identityReorder.handleDragOver(event);
+          }}
+          onDropCapture={(event) => {
+            keyReorder.handleDropCapture(event);
+            identityReorder.handleDropCapture(event);
+          }}
+          onDragEndCapture={() => {
+            keyReorder.handleDragEndCapture();
+            identityReorder.handleDragEndCapture();
+          }}
+        >
           {/* Keys Section */}
           <div className="space-y-3 p-3">
           <div className="flex items-center justify-between">
@@ -729,6 +776,7 @@ echo $3 >> "$FILE"`);
                     (panel.type === "export" && panel.key.id === key.id)
                   }
                   isMac={isMacOS()}
+                  reorderProps={keyReorder.getItemReorderProps(key.id, `key:${key.id}`)}
                   onClick={() => openKeyView(key)}
                   onEdit={() => openKeyEdit(key)}
                   onExport={() => openKeyExport(key)}
@@ -768,6 +816,7 @@ echo $3 >> "$FILE"`);
                         panel.type === "identity" &&
                         panel.identity?.id === identity.id
                       }
+                      reorderProps={identityReorder.getItemReorderProps(identity.id, `identity:${identity.id}`)}
                       onClick={() => {
                         setPanelStack([{ type: "identity", identity }]);
                         setDraftIdentity({ ...identity });

components/KnownHostsManager.tsx

@@ -22,6 +22,7 @@ import { useI18n } from "../application/i18n/I18nProvider";
 import { useKnownHostsBackend } from "../application/state/useKnownHostsBackend";
 import { useStoredViewMode, ViewMode } from "../application/state/useStoredViewMode";
 import { fingerprintFromPublicKey } from "../domain/knownHosts";
+import { reorderVaultItems, sortByVaultOrder } from "../domain/vaultOrder";
 import { STORAGE_KEY_VAULT_KNOWN_HOSTS_VIEW_MODE } from "../infrastructure/config/storageKeys";
 import { logger } from "../lib/logger";
 import { cn } from "../lib/utils";
@@ -45,12 +46,14 @@ import {
   vaultHeaderSecondaryButtonClass,
 } from "./vault/VaultPageHeader";
 import { VaultEntityIcon, vaultPrimaryIconClass } from "./vault/VaultEntityIcon";
+import { useVaultItemReorder } from "./vault/vaultReorderDrag";
 
 interface KnownHostsManagerProps {
   knownHosts: KnownHost[];
   hosts: Host[];
   onSave: (knownHost: KnownHost) => void;
   onUpdate: (knownHost: KnownHost) => void;
+  onReorder: (knownHosts: KnownHost[]) => void;
   onDelete: (id: string) => void;
   onConvertToHost: (knownHost: KnownHost) => void;
   onImportFromFile: (hosts: KnownHost[]) => void;
@@ -115,12 +118,13 @@ interface HostItemProps {
   knownHost: KnownHost;
   converted: boolean;
   viewMode: ViewMode;
+  reorderProps?: React.HTMLAttributes<HTMLDivElement>;
   onDelete: (id: string) => void;
   onConvertToHost: (knownHost: KnownHost) => void;
 }
 
 const HostItem = React.memo<HostItemProps>(
-  ({ knownHost, converted, viewMode, onDelete, onConvertToHost }) => {
+  ({ knownHost, converted, viewMode, reorderProps, onDelete, onConvertToHost }) => {
     const { t } = useI18n();
     // Disabled to reduce log noise - uncomment for debugging
     // console.log('[HostItem] render:', knownHost.hostname);
@@ -129,9 +133,12 @@ const HostItem = React.memo<HostItemProps>(
         <ContextMenu>
           <ContextMenuTrigger asChild>
             <div
+              {...reorderProps}
               className={cn(
+                reorderProps && "vault-drop-indicator-row",
                 "group cursor-pointer soft-card elevate rounded-xl h-[68px] px-3 py-2",
                 converted && "opacity-60",
+                reorderProps?.className,
               )}
             >
               {/* Quick action buttons on hover */}
@@ -202,9 +209,12 @@ const HostItem = React.memo<HostItemProps>(
       <ContextMenu>
         <ContextMenuTrigger asChild>
           <div
+            {...reorderProps}
             className={cn(
+              reorderProps && "vault-drop-indicator-row",
               "group flex items-center gap-3 px-3 py-2 h-14 rounded-lg hover:bg-secondary/60 transition-colors cursor-pointer",
               converted && "opacity-60",
+              reorderProps?.className,
             )}
           >
             <VaultEntityIcon
@@ -263,6 +273,7 @@ const KnownHostsManager: React.FC<KnownHostsManagerProps> = ({
   hosts,
   onSave: _onSave,
   onUpdate: _onUpdate,
+  onReorder,
   onDelete,
   onConvertToHost,
   onImportFromFile,
@@ -277,9 +288,10 @@ const KnownHostsManager: React.FC<KnownHostsManagerProps> = ({
     STORAGE_KEY_VAULT_KNOWN_HOSTS_VIEW_MODE,
     "grid",
   );
-  const [sortMode, setSortMode] = useState<SortMode>("newest");
+  const [sortMode, setSortMode] = useState<SortMode>("manual");
   const fileInputRef = React.useRef<HTMLInputElement>(null);
   const hasScannedRef = React.useRef(false);
+  const listRef = React.useRef<HTMLDivElement | null>(null);
   const RENDER_LIMIT = 100; // Limit rendered items for performance
 
   // Define handleScanSystem before useEffect that depends on it
@@ -381,12 +393,14 @@ const KnownHostsManager: React.FC<KnownHostsManagerProps> = ({
           return b.discoveredAt - a.discoveredAt;
         case "oldest":
           return a.discoveredAt - b.discoveredAt;
+        case "manual":
+          return 0;
         default:
           return 0;
       }
     });
 
-    return result;
+    return sortMode === "manual" ? sortByVaultOrder(result) : result;
   }, [knownHosts, deferredSearch, sortMode]);
 
   // Limit rendered items for performance
@@ -461,6 +475,18 @@ const KnownHostsManager: React.FC<KnownHostsManagerProps> = ({
 
   const openFilePicker = useCallback(() => fileInputRef.current?.click(), []);
 
+  const knownHostReorder = useVaultItemReorder({
+    containerRef: listRef,
+    viewMode,
+    dragType: "known-host-id",
+    targetAttribute: "data-known-host-id",
+    disabled: deferredSearch.trim().length > 0,
+    onReorder: (sourceId, targetId, position) => {
+      onReorder(reorderVaultItems(knownHosts, sourceId, targetId, position));
+      setSortMode("manual");
+    },
+  });
+
   // Memoize the rendered list to prevent re-renders
   const renderedItems = useMemo(() => {
     return displayedHosts.map((knownHost) => (
@@ -469,6 +495,7 @@ const KnownHostsManager: React.FC<KnownHostsManagerProps> = ({
         knownHost={knownHost}
         converted={convertedMap.get(knownHost.id) || false}
         viewMode={viewMode}
+        reorderProps={knownHostReorder.getItemReorderProps(knownHost.id, `known:${knownHost.id}`)}
         onDelete={handleDelete}
         onConvertToHost={handleConvertToHost}
       />
@@ -479,6 +506,7 @@ const KnownHostsManager: React.FC<KnownHostsManagerProps> = ({
     viewMode,
     handleDelete,
     handleConvertToHost,
+    knownHostReorder,
   ]);
 
   return (
@@ -527,6 +555,7 @@ const KnownHostsManager: React.FC<KnownHostsManagerProps> = ({
           <SortDropdown
             value={sortMode}
             onChange={setSortMode}
+            modes={["manual", "az", "za", "newest", "oldest"]}
             className={vaultHeaderIconButtonClass}
           />
         </div>
@@ -565,12 +594,17 @@ const KnownHostsManager: React.FC<KnownHostsManagerProps> = ({
       {/* Content */}
       <ScrollArea className="flex-1">
         <div
+          ref={listRef}
           className={cn(
             "p-4",
             viewMode === "grid"
               ? "grid grid-cols-2 sm:grid-cols-3 xl:grid-cols-4 gap-3"
               : "flex flex-col gap-0",
           )}
+          onDragOverCapture={knownHostReorder.handleDragOverCapture}
+          onDragOver={knownHostReorder.handleDragOver}
+          onDropCapture={knownHostReorder.handleDropCapture}
+          onDragEndCapture={knownHostReorder.handleDragEndCapture}
         >
           {displayedHosts.length === 0 ? (
             <div

components/PortForwardingNew.tsx

@@ -9,7 +9,7 @@ import {
   Shuffle,
   Zap,
 } from "lucide-react";
-import React, { useCallback, useMemo, useState } from "react";
+import React, { useCallback, useMemo, useRef, useState } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { usePortForwardingState } from "../application/state/usePortForwardingState";
 import {
@@ -49,6 +49,7 @@ import {
   vaultHeaderSecondaryButtonClass,
   vaultSectionTitleClass,
 } from "./vault/VaultPageHeader";
+import { useVaultItemReorder } from "./vault/vaultReorderDrag";
 
 // Import components and utilities from port-forwarding module
 import {
@@ -111,6 +112,7 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
     updateRule,
     deleteRule,
     duplicateRule,
+    reorderRule,
     setRuleStatus,
     startTunnel,
     stopTunnel,
@@ -128,6 +130,16 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
     () => new Set(proxyProfiles.map((profile) => profile.id)),
     [proxyProfiles],
   );
+  const ruleListRef = useRef<HTMLDivElement | null>(null);
+
+  const ruleReorder = useVaultItemReorder({
+    containerRef: ruleListRef,
+    viewMode,
+    dragType: "rule-id",
+    targetAttribute: "data-rule-id",
+    disabled: search.trim().length > 0,
+    onReorder: reorderRule,
+  });
 
   const resolveEffectiveHost = useCallback(
     (host: Host): Host => {
@@ -684,7 +696,10 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
             {/* Sort mode toggle */}
             <SortDropdown
               value={sortMode}
-              onChange={setSortMode}
+              onChange={(mode) => {
+                if (mode !== "group") setSortMode(mode);
+              }}
+              modes={["manual", "az", "za", "newest", "oldest"]}
               className={vaultHeaderIconButtonClass}
             />
           </div>
@@ -714,11 +729,16 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
               </div>
 
               <div
+                ref={ruleListRef}
                 className={cn(
                   viewMode === "grid"
                     ? "grid gap-3 grid-cols-1 md:grid-cols-2 lg:grid-cols-3"
                     : "flex flex-col gap-2.5",
                 )}
+                onDragOverCapture={ruleReorder.handleDragOverCapture}
+                onDragOver={ruleReorder.handleDragOver}
+                onDropCapture={ruleReorder.handleDropCapture}
+                onDragEndCapture={ruleReorder.handleDragEndCapture}
               >
                 {filteredRules.map((rule) => (
                   <RuleCard
@@ -728,6 +748,7 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
                     viewMode={viewMode}
                     isSelected={selectedRuleId === rule.id}
                     isPending={pendingOperations.has(rule.id)}
+                    reorderProps={ruleReorder.getItemReorderProps(rule.id, `rule:${rule.id}`)}
                     onSelect={() => {
                       setSelectedRuleId(rule.id);
                       startEditRule(rule);

components/ProxyProfilesManager.tsx

@@ -13,7 +13,7 @@ import {
   SquareTerminal,
   Trash2,
 } from "lucide-react";
-import React, { useMemo, useState } from "react";
+import React, { useMemo, useRef, useState } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { useStoredViewMode } from "../application/state/useStoredViewMode";
 import {
@@ -22,6 +22,7 @@ import {
   isValidProxyPort,
   removeProxyProfileReferences,
 } from "../domain/proxyProfiles";
+import { reorderVaultItems, sortByVaultOrder } from "../domain/vaultOrder";
 import {
   STORAGE_KEY_VAULT_PROXY_PROFILES_VIEW_MODE,
 } from "../infrastructure/config/storageKeys";
@@ -67,6 +68,7 @@ import {
   vaultProxyHttpIconClass,
   vaultProxySocksIconClass,
 } from "./vault/VaultEntityIcon";
+import { useVaultItemReorder } from "./vault/vaultReorderDrag";
 
 interface ProxyProfilesManagerProps {
   proxyProfiles: ProxyProfile[];
@@ -130,6 +132,7 @@ interface ProxyProfileCardProps {
   usageCount: number;
   viewMode: ProxyProfilesViewMode;
   isSelected: boolean;
+  reorderProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
   onClick: () => void;
   onEdit: () => void;
   onDuplicate: () => void;
@@ -141,6 +144,7 @@ const ProxyProfileCard: React.FC<ProxyProfileCardProps> = ({
   usageCount,
   viewMode,
   isSelected,
+  reorderProps,
   onClick,
   onEdit,
   onDuplicate,
@@ -158,14 +162,17 @@ const ProxyProfileCard: React.FC<ProxyProfileCardProps> = ({
     <ContextMenu>
       <ContextMenuTrigger asChild>
         <button
+          {...reorderProps}
           type="button"
           aria-label={accessibleLabel}
           className={cn(
+            reorderProps && "vault-drop-indicator-row",
             "group w-full text-left focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none",
             viewMode === "grid"
               ? "soft-card elevate rounded-xl h-[68px] px-3 py-2"
               : "h-14 px-3 py-2 hover:bg-secondary/60 rounded-lg transition-colors",
             isSelected && "ring-2 ring-primary",
+            reorderProps?.className,
           )}
           onClick={onClick}
         >
@@ -224,6 +231,7 @@ export const ProxyProfilesManager: React.FC<ProxyProfilesManagerProps> = ({
     viewMode === "list" ? "list" : "grid";
   const [draft, setDraft] = useState<ProxyProfile | null>(null);
   const [deleteTarget, setDeleteTarget] = useState<ProxyProfile | null>(null);
+  const listRef = useRef<HTMLDivElement | null>(null);
 
   const usageByProfileId = useMemo(() => {
     const map = new Map<string, number>();
@@ -235,15 +243,26 @@ export const ProxyProfilesManager: React.FC<ProxyProfilesManagerProps> = ({
 
   const filteredProfiles = useMemo(() => {
     const q = search.trim().toLowerCase();
-    if (!q) return proxyProfiles;
-    return proxyProfiles.filter((profile) =>
+    const result = !q ? proxyProfiles : proxyProfiles.filter((profile) =>
       profile.label.toLowerCase().includes(q) ||
       profile.config.host.toLowerCase().includes(q) ||
       (profile.config.command || "").toLowerCase().includes(q) ||
       profile.config.type.toLowerCase().includes(q),
     );
+    return sortByVaultOrder(result);
   }, [proxyProfiles, search]);
 
+  const profileReorder = useVaultItemReorder({
+    containerRef: listRef,
+    viewMode: proxyProfilesViewMode,
+    dragType: "proxy-profile-id",
+    targetAttribute: "data-proxy-profile-id",
+    disabled: search.trim().length > 0,
+    onReorder: (sourceId, targetId, position) => {
+      onUpdateProxyProfiles(reorderVaultItems(proxyProfiles, sourceId, targetId, position));
+    },
+  });
+
   const updateDraftConfig = (field: keyof ProxyConfig, value: string | number) => {
     setDraft((prev) => {
       if (!prev) return prev;
@@ -397,7 +416,14 @@ export const ProxyProfilesManager: React.FC<ProxyProfilesManagerProps> = ({
             </div>
         </VaultPageHeader>
 
-        <div className="flex-1 overflow-y-auto">
+        <div
+          ref={listRef}
+          className="flex-1 overflow-y-auto"
+          onDragOverCapture={profileReorder.handleDragOverCapture}
+          onDragOver={profileReorder.handleDragOver}
+          onDropCapture={profileReorder.handleDropCapture}
+          onDragEndCapture={profileReorder.handleDragEndCapture}
+        >
           <div className="space-y-3 p-3">
             <div className="flex items-center justify-between">
               <h2 className={vaultSectionTitleClass}>
@@ -439,6 +465,7 @@ export const ProxyProfilesManager: React.FC<ProxyProfilesManagerProps> = ({
                     usageCount={usageByProfileId.get(profile.id) ?? 0}
                     viewMode={proxyProfilesViewMode}
                     isSelected={draft?.id === profile.id}
+                    reorderProps={profileReorder.getItemReorderProps(profile.id, `proxy:${profile.id}`)}
                     onClick={() => openEdit(profile)}
                     onEdit={() => openEdit(profile)}
                     onDuplicate={() => duplicateProfile(profile)}

components/QuickAddSnippetDialog.test.tsx

@@ -0,0 +1,22 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import { getQuickAddSnippetInitialCommand } from "./QuickAddSnippetDialog.tsx";
+
+test("quick add snippet event can prefill command", () => {
+  const event = {
+    detail: { command: "ls -la\npwd" },
+  } as CustomEvent<{ command?: string }>;
+
+  assert.equal(getQuickAddSnippetInitialCommand(event), "ls -la\npwd");
+});
+
+test("quick add snippet event defaults to an empty command", () => {
+  assert.equal(getQuickAddSnippetInitialCommand({} as Event), "");
+  assert.equal(
+    getQuickAddSnippetInitialCommand({
+      detail: { command: 123 },
+    } as unknown as Event),
+    "",
+  );
+});

components/QuickAddSnippetDialog.tsx

@@ -34,6 +34,11 @@ export interface QuickAddSnippetDialogProps {
   onCreatePackage?: (packagePath: string) => void;
 }
 
+export function getQuickAddSnippetInitialCommand(event: Event): string {
+  const detail = (event as CustomEvent<{ command?: unknown }>).detail;
+  return typeof detail?.command === 'string' ? detail.command : '';
+}
+
 export const QuickAddSnippetDialog: React.FC<QuickAddSnippetDialogProps> = ({
   snippets,
   packages,
@@ -54,10 +59,10 @@ export const QuickAddSnippetDialog: React.FC<QuickAddSnippetDialogProps> = ({
   // terminal-side ScriptsSidePanel + button. We reset form state on
   // every open so stale input from a previous cancel does not leak.
   useEffect(() => {
-    const handler = () => {
+    const handler = (event: Event) => {
       setEditing(null);
       setLabel('');
-      setCommand('');
+      setCommand(getQuickAddSnippetInitialCommand(event));
       setPackagePath('');
       setNoAutoRun(false);
       setOpen(true);