feat: custom keywords and colors in keyword highlighting (#597 )

* feat: support custom keywords and colors in global keyword highlighting (#590) Add ability to create custom keyword highlight rules in global settings (Settings > Terminal > Keyword Highlighting): - Per-rule enable/disable toggle for both built-in and custom rules - Add custom rules with label, regex pattern, and color picker - Delete custom rules (built-in rules cannot be deleted) - Pattern validation with error feedback - Custom rules sync across devices via cloud sync - i18n support (en, zh-CN) Built-in categories (Error, Warning, OK, Info, Debug, URL/IP/MAC) are preserved and cannot be deleted, only toggled and recolored. Closes #590 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: use dialog modal for adding custom keyword highlight rules Replace inline form with a proper modal dialog: - Button opens dialog instead of showing inline inputs - Dialog has label+color, regex pattern, and live preview - Reset and Add buttons side by side in footer area - Add common.add i18n key (en, zh-CN) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * ui: unify button styles in keyword highlight section Both buttons now use ghost variant with equal flex-1 width for a cleaner, balanced layout. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * ui: fix keyword highlight rule list alignment - Add placeholder spacer (w-5) for built-in rules to match delete button width on custom rules, keeping color pickers aligned - Move regex pattern to second line for custom rules - Use block+truncate for label and pattern text Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * ui: hide regex, show edit/delete icons after label for custom rules - Remove regex pattern display from rule list - Add pencil (edit) and trash (delete) icons after custom rule label, visible on hover - Edit opens the same dialog pre-filled with rule data - Dialog supports both add and edit modes with appropriate titles/buttons Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * ui: remove toggle dots, simplify edit/delete to plain icons - Remove the red enable/disable dot button from all rules - Replace Button wrappers with plain Lucide icons for edit/delete (no hover background, just cursor pointer) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: preserve multi-pattern rules on edit, keep disabled state on reset - Editing a custom rule now preserves patterns beyond the first one - Reset to default colors no longer force-enables disabled rules Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: replace all patterns on edit instead of preserving hidden ones When editing a custom rule, save only the single user-visible pattern rather than silently keeping extra patterns the user cannot see. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: preserve regex whitespace and multi-pattern rules on edit - Stop trimming regex patterns on save (only trim for empty check) - If pattern field unchanged during edit, preserve all original patterns so changing just label/color doesn't drop extra regexes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: preserve additional patterns when editing custom rule When editing, replace only the first pattern (the one shown in the dialog) and keep any additional patterns intact to prevent data loss for multi-pattern rules from sync or import. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
fix: remove remaining isImmersive reference in useImmersiveMode
2026-04-01 15:05:18 +08:00 · 2026-04-01 13:57:30 +08:00 · 2026-04-01 13:49:03 +08:00 · 2026-04-01 13:11:51 +08:00 · 2026-04-01 13:10:52 +08:00 · 2026-04-01 13:09:02 +08:00
52 changed files with 4370 additions and 666 deletions
--- a/App.tsx
+++ b/App.tsx
@@ -14,6 +14,7 @@ import { initializeFonts } from './application/state/fontStore';
 import { initializeUIFonts } from './application/state/uiFontStore';
 import { I18nProvider, useI18n } from './application/i18n/I18nProvider';
 import { matchesKeyBinding } from './domain/models';
+import { resolveGroupDefaults, applyGroupDefaults } from './domain/groupConfig';
 import { resolveHostAuth } from './domain/sshAuth';
 import { resolveHostTerminalThemeId } from './domain/terminalAppearance';
 import { collectSessionIds } from './domain/workspace';
@@ -200,7 +201,6 @@ function App({ settings }: { settings: SettingsState }) {
    sessionLogsDir,
    sessionLogsFormat,
    reapplyCurrentTheme,
-    immersiveMode,
    workspaceFocusStyle,
  } = settings;

@@ -239,8 +239,11 @@ function App({ settings }: { settings: SettingsState }) {
    deleteConnectionLog,
    clearUnsavedConnectionLogs,
    updateHostDistro,
+    updateHostLastConnected,
    convertKnownHostToHost,
    importDataFromString,
+    groupConfigs,
+    updateGroupConfigs,
  } = useVaultState();

  const {
@@ -305,6 +308,8 @@ function App({ settings }: { settings: SettingsState }) {
    () => new Map(sessions.map((session) => [session.id, session])),
    [sessions],
  );
+  const sessionByIdRef = useRef(sessionById);
+  sessionByIdRef.current = sessionById;
  const workspaceById = useMemo(
    () => new Map(workspaces.map((workspace) => [workspace.id, workspace])),
    [workspaces],
@@ -352,7 +357,6 @@ function App({ settings }: { settings: SettingsState }) {
  }, [activeTabId, currentTerminalTheme, hostById, sessionById, themeById, workspaceById]);

  useImmersiveMode({
-    isImmersive: immersiveMode,
    activeTabId,
    activeTerminalTheme,
    restoreOriginalTheme: reapplyCurrentTheme,
@@ -382,6 +386,7 @@ function App({ settings }: { settings: SettingsState }) {
    snippetPackages,
    portForwardingRules: portForwardingRulesForSync,
    knownHosts,
+    groupConfigs,
    settingsVersion: settings.settingsVersion,
    onApplyPayload: (payload) => {
      applySyncPayload(payload, {
@@ -426,7 +431,8 @@ function App({ settings }: { settings: SettingsState }) {
    }

    if (start) {
-      void startTunnel(rule, host, hosts, keys, identities, (status, error) => {
+      const effectiveHost = resolveEffectiveHost(host);
+      void startTunnel(rule, effectiveHost, hosts, keys, identities, (status, error) => {
        if (status === "error" && error) toast.error(error);
      }, rule.autoStart);
      return;
@@ -441,10 +447,12 @@ function App({ settings }: { settings: SettingsState }) {
      return;
    }

+    const effectiveHost = resolveEffectiveHost(host);
+
    const { username, hostname: localHost } = systemInfoRef.current;
-    if (host.protocol === 'serial') {
+    if (effectiveHost.protocol === 'serial') {
      const portName = host.hostname.split('/').pop() || host.hostname;
-      const sessionId = connectToHost(host);
+      const sessionId = connectToHost(effectiveHost);
      addConnectionLog({
        sessionId,
        hostId: host.id,
@@ -460,9 +468,9 @@ function App({ settings }: { settings: SettingsState }) {
      return;
    }

-    const protocol = host.moshEnabled ? 'mosh' : (host.protocol || 'ssh');
-    const resolvedAuth = resolveHostAuth({ host, keys, identities });
-    const sessionId = connectToHost(host);
+    const protocol = effectiveHost.moshEnabled ? 'mosh' : (effectiveHost.protocol || 'ssh');
+    const resolvedAuth = resolveHostAuth({ host: effectiveHost, keys, identities });
+    const sessionId = connectToHost(effectiveHost);
    addConnectionLog({
      sessionId,
      hostId: host.id,
@@ -611,6 +619,7 @@ function App({ settings }: { settings: SettingsState }) {
    hosts,
    keys,
    identities,
+    groupConfigs,
  });

  // Sync tray menu data + handle tray actions
@@ -1032,6 +1041,9 @@ function App({ settings }: { settings: SettingsState }) {
  }, [hosts, updateHosts, t]);

  // System info for connection logs
+  const hostsRef = useRef(hosts);
+  hostsRef.current = hosts;
+
  const systemInfoRef = useRef<{ username: string; hostname: string }>({
    username: 'user',
    hostname: 'localhost',
@@ -1070,14 +1082,22 @@ function App({ settings }: { settings: SettingsState }) {
    });
  }, [addConnectionLog, createLocalTerminalWithCurrentShell]);

+  const resolveEffectiveHost = useCallback((host: Host): Host => {
+    if (!host.group) return host;
+    const groupDefaults = resolveGroupDefaults(host.group, groupConfigs);
+    return applyGroupDefaults(host, groupDefaults);
+  }, [groupConfigs]);
+
  // Wrapper to connect to host with logging
  const handleConnectToHost = useCallback((host: Host) => {
    const { username, hostname: localHost } = systemInfoRef.current;

+    const effectiveHost = resolveEffectiveHost(host);
+
    // Handle serial hosts separately
-    if (host.protocol === 'serial') {
+    if (effectiveHost.protocol === 'serial') {
      const portName = host.hostname.split('/').pop() || host.hostname;
-      const sessionId = connectToHost(host);
+      const sessionId = connectToHost(effectiveHost);
      addConnectionLog({
        sessionId,
        hostId: host.id,
@@ -1093,9 +1113,9 @@ function App({ settings }: { settings: SettingsState }) {
      return;
    }

-    const protocol = host.moshEnabled ? 'mosh' : (host.protocol || 'ssh');
-    const resolvedAuth = resolveHostAuth({ host, keys, identities });
-    const sessionId = connectToHost(host);
+    const protocol = effectiveHost.moshEnabled ? 'mosh' : (effectiveHost.protocol || 'ssh');
+    const resolvedAuth = resolveHostAuth({ host: effectiveHost, keys, identities });
+    const sessionId = connectToHost(effectiveHost);
    addConnectionLog({
      sessionId,
      hostId: host.id,
@@ -1108,7 +1128,18 @@ function App({ settings }: { settings: SettingsState }) {
      localHostname: localHost,
      saved: false,
    });
-  }, [addConnectionLog, connectToHost, identities, keys]);
+  }, [addConnectionLog, connectToHost, resolveEffectiveHost, identities, keys]);
+
+  // Wrap updateSessionStatus to track lastConnectedAt on successful connection
+  const handleSessionStatusChange = useCallback((sessionId: string, status: TerminalSession['status']) => {
+    updateSessionStatus(sessionId, status);
+    if (status === 'connected') {
+      const session = sessionByIdRef.current.get(sessionId);
+      if (session?.hostId) {
+        updateHostLastConnected(session.hostId);
+      }
+    }
+  }, [updateSessionStatus, updateHostLastConnected]);

  // Wrapper to create serial session with logging
  const handleConnectSerial = useCallback((config: SerialConfig, options?: { charset?: string }) => {
@@ -1162,24 +1193,25 @@ function App({ settings }: { settings: SettingsState }) {
    }
  }, [sessions, connectionLogs, updateConnectionLog]);

-  // Check if host has multiple protocols enabled
+  // Check if host has multiple protocols enabled (using effective/resolved host)
  const hasMultipleProtocols = useCallback((host: Host) => {
+    const effective = resolveEffectiveHost(host);
    let count = 0;
    // SSH is always available as base protocol (unless explicitly set to something else)
-    if (host.protocol === 'ssh' || !host.protocol) count++;
+    if (effective.protocol === 'ssh' || !effective.protocol) count++;
    // Mosh adds another option
-    if (host.moshEnabled) count++;
+    if (effective.moshEnabled) count++;
    // Telnet adds another option
-    if (host.telnetEnabled) count++;
+    if (effective.telnetEnabled) count++;
    // If protocol is explicitly telnet (not ssh), count it
-    if (host.protocol === 'telnet' && !host.telnetEnabled) count++;
+    if (effective.protocol === 'telnet' && !effective.telnetEnabled) count++;
    return count > 1;
-  }, []);
+  }, [resolveEffectiveHost]);

  // Handle host connect with protocol selection (used by QuickSwitcher)
  const handleHostConnectWithProtocolCheck = useCallback((host: Host) => {
    if (hasMultipleProtocols(host)) {
-      setProtocolSelectHost(host);
+      setProtocolSelectHost(resolveEffectiveHost(host));
      setIsQuickSwitcherOpen(false);
      setQuickSearch('');
    } else {
@@ -1187,7 +1219,7 @@ function App({ settings }: { settings: SettingsState }) {
      setIsQuickSwitcherOpen(false);
      setQuickSearch('');
    }
-  }, [hasMultipleProtocols, handleConnectToHost]);
+  }, [hasMultipleProtocols, handleConnectToHost, resolveEffectiveHost]);

  // Handle protocol selection from dialog
  const handleProtocolSelect = useCallback((protocol: HostProtocol, port: number) => {
@@ -1278,7 +1310,7 @@ function App({ settings }: { settings: SettingsState }) {
  }, []);

  return (
-    <div className={cn("flex flex-col h-screen text-foreground font-sans netcatty-shell", immersiveMode && activeTerminalTheme && "immersive-transition")} onContextMenu={handleRootContextMenu}>
+    <div className={cn("flex flex-col h-screen text-foreground font-sans netcatty-shell", activeTerminalTheme && "immersive-transition")} onContextMenu={handleRootContextMenu}>
      <TopTabs
        theme={resolvedTheme}
        hosts={hosts}
@@ -1299,7 +1331,7 @@ function App({ settings }: { settings: SettingsState }) {
        onToggleTheme={handleToggleTheme}
        onOpenSettings={handleOpenSettings}
        onSyncNow={handleSyncNowManual}
-        isImmersiveActive={immersiveMode && activeTerminalTheme !== null}
+        isImmersiveActive={activeTerminalTheme !== null}
        onStartSessionDrag={setDraggingSessionId}
        onEndSessionDrag={handleEndSessionDrag}
        onReorderTabs={reorderTabs}
@@ -1329,6 +1361,8 @@ function App({ settings }: { settings: SettingsState }) {
            onConnectSerial={handleConnectSerial}
            onDeleteHost={handleDeleteHost}
            onConnect={handleConnectToHost}
+            groupConfigs={groupConfigs}
+            onUpdateGroupConfigs={updateGroupConfigs}
            onUpdateHosts={updateHosts}
            onUpdateKeys={updateKeys}
            onUpdateIdentities={updateIdentities}
@@ -1355,6 +1389,7 @@ function App({ settings }: { settings: SettingsState }) {
          hosts={hosts}
          keys={keys}
          identities={identities}
+          groupConfigs={groupConfigs}
          updateHosts={updateHosts}
          sftpDefaultViewMode={sftpDefaultViewMode}
          sftpDoubleClickBehavior={sftpDoubleClickBehavior}
@@ -1369,6 +1404,7 @@ function App({ settings }: { settings: SettingsState }) {

        <TerminalLayerMount
          hosts={hosts}
+          groupConfigs={groupConfigs}
          keys={keys}
          identities={identities}
          snippets={snippets}
@@ -1388,7 +1424,7 @@ function App({ settings }: { settings: SettingsState }) {
          onUpdateTerminalFontFamilyId={setTerminalFontFamilyId}
          onUpdateTerminalFontSize={setTerminalFontSize}
          onCloseSession={closeSession}
-          onUpdateSessionStatus={updateSessionStatus}
+          onUpdateSessionStatus={handleSessionStatusChange}
          onUpdateHostDistro={updateHostDistro}
          onUpdateHost={(host) => updateHosts(hosts.map(h => h.id === host.id ? host : h))}
          onAddKnownHost={(kh) => updateKnownHosts([...knownHosts, kh])}
--- a/application/i18n/locales/en.ts
+++ b/application/i18n/locales/en.ts
@@ -21,6 +21,7 @@ const en: Messages = {
  'common.clear': 'Clear',
  'common.optional': 'Optional',
  'common.selectPlaceholder': 'Select...',
+  'common.add': 'Add',
  'common.rename': 'Rename',
  'common.refresh': 'Refresh',
  'common.continue': 'Continue',
@@ -196,6 +197,9 @@ const en: Messages = {
  'settings.application.github.subtitle': 'Source code',
  'settings.application.whatsNew': "What's new",
  'settings.application.whatsNew.subtitle': 'Show release notes',
+  'settings.vault.title': 'Vault',
+  'settings.vault.showRecentHosts': 'Show recently connected hosts',
+  'settings.vault.showRecentHostsDesc': 'Display a section of recently connected hosts at the top of the vault',

  // Update notifications
  'update.available.title': 'Update Available',
@@ -231,9 +235,6 @@ const en: Messages = {
  'settings.appearance.themeColor.desc': 'Pick a preset palette for each theme',
  'settings.appearance.themeColor.light': 'Light palette',
  'settings.appearance.themeColor.dark': 'Dark palette',
-  'settings.appearance.immersiveMode': 'Immersive Mode',
-  'settings.appearance.immersiveMode.desc':
-    'When enabled, the UI chrome (tab bar, sidebar, status bar) adapts its colors to match the active terminal theme for a visually cohesive experience.',
  'settings.appearance.customCss': 'Custom CSS',
  'settings.appearance.customCss.desc':
    'Add custom CSS to personalize the app appearance. Changes apply immediately.',
@@ -327,6 +328,14 @@ const en: Messages = {
  'settings.terminal.scrollback.rows': 'Number of rows *',
  'settings.terminal.keywordHighlight.title': 'Keyword highlighting',
  'settings.terminal.keywordHighlight.resetColors': 'Reset to default colors',
+  'settings.terminal.keywordHighlight.addCustom': 'Add Custom Rule',
+  'settings.terminal.keywordHighlight.editCustom': 'Edit Rule',
+  'settings.terminal.keywordHighlight.labelField': 'Label & Color',
+  'settings.terminal.keywordHighlight.labelPlaceholder': 'Label (e.g., Down)',
+  'settings.terminal.keywordHighlight.patternField': 'Regex Pattern',
+  'settings.terminal.keywordHighlight.patternPlaceholder': 'Regex (e.g., \\bdown\\b)',
+  'settings.terminal.keywordHighlight.invalidPattern': 'Invalid regex pattern',
+  'settings.terminal.keywordHighlight.preview': 'Preview',
  'settings.terminal.section.localShell': 'Local Shell',
  'settings.terminal.localShell.shell': 'Shell executable',
  'settings.terminal.localShell.shell.desc': 'Path to the shell executable (e.g., /bin/zsh, pwsh.exe). Leave empty for system default.',
@@ -461,8 +470,24 @@ const en: Messages = {
  'vault.groups.placeholder.example': 'e.g. Production',
  'vault.groups.parentLabel': 'Parent',
  'vault.groups.pathLabel': 'Path',
+  'vault.groups.settings': 'Group Settings',
+  'vault.groups.details': 'Group Details',
+  'vault.groups.details.general': 'General',
+  'vault.groups.details.ssh': 'SSH',
+  'vault.groups.details.telnet': 'Telnet',
+  'vault.groups.details.advanced': 'Advanced',
+  'vault.groups.details.appearance': 'Appearance',
+  'vault.groups.details.mosh': 'Mosh',
+  'vault.groups.details.parentGroup': 'Parent Group',
+  'vault.groups.details.none': 'None',
+  'vault.groups.details.inherited': 'Inherited from group',
+  'vault.groups.details.addProtocol': 'Add Protocol',
+  'vault.groups.details.removeProtocol': 'Remove Protocol',
+  'vault.groups.details.fontFamily': 'Font Family',
+  'vault.groups.details.fontSize': 'Font Size',
  'vault.groups.errors.required': 'Group name is required.',
  'vault.groups.errors.invalidChars': "Group name cannot include '/' or '\\\\'.",
+  'vault.groups.errors.duplicatePath': 'A group with this name already exists at this location.',

  'vault.managedSource.unmanage': 'Unmanage',
  'vault.managedSource.unmanageSuccess': 'Successfully unmanaged group',
@@ -486,6 +511,10 @@ const en: Messages = {
  'vault.hosts.export.toast.successWithSkipped': 'Exported {count} hosts to CSV ({skipped} unsupported hosts skipped)',
  'vault.hosts.export.toast.noHosts': 'No hosts to export',
  'vault.hosts.allHosts': 'All hosts',
+  'vault.hosts.pinned': 'Pinned',
+  'vault.hosts.recentlyConnected': 'Recently Connected',
+  'vault.hosts.pinToTop': 'Pin to Top',
+  'vault.hosts.unpin': 'Unpin',
  'vault.hosts.copyCredentials': 'Copy Credentials',
  'vault.hosts.copyCredentials.toast.success': 'Credentials copied to clipboard',
  'vault.hosts.copyCredentials.toast.noPassword': 'No password saved for this host',
--- a/application/i18n/locales/zh-CN.ts
+++ b/application/i18n/locales/zh-CN.ts
@@ -13,6 +13,7 @@ const zhCN: Messages = {
  'common.connect': '连接',
  'common.terminal': '终端',
  'common.create': '创建',
+  'common.add': '添加',
  'common.rename': '重命名',
  'common.refresh': '刷新',
  'common.continue': '继续',
@@ -180,6 +181,9 @@ const zhCN: Messages = {
  'settings.application.github.subtitle': '源代码',
  'settings.application.whatsNew': '更新内容',
  'settings.application.whatsNew.subtitle': '查看发布说明',
+  'settings.vault.title': '主机库',
+  'settings.vault.showRecentHosts': '显示最近连接的主机',
+  'settings.vault.showRecentHostsDesc': '在主机列表顶部显示最近连接过的主机',

  // Update notifications
  'update.available.title': '发现新版本',
@@ -215,9 +219,6 @@ const zhCN: Messages = {
  'settings.appearance.themeColor.desc': '为浅色与深色主题选择预设配色',
  'settings.appearance.themeColor.light': '浅色主题',
  'settings.appearance.themeColor.dark': '深色主题',
-  'settings.appearance.immersiveMode': '沉浸模式',
-  'settings.appearance.immersiveMode.desc':
-    '启用后，UI 外观（标签栏、侧边栏、状态栏）会自动适配当前终端主题的配色，营造视觉一体化的沉浸体验。',
  'settings.appearance.customCss': '自定义 CSS',
  'settings.appearance.customCss.desc': '使用自定义 CSS 个性化界面，修改会立即生效。',
  'settings.appearance.customCss.placeholder':
@@ -294,8 +295,24 @@ const zhCN: Messages = {
  'vault.groups.placeholder.example': '例如：Production',
  'vault.groups.parentLabel': '父级',
  'vault.groups.pathLabel': '路径',
+  'vault.groups.settings': '分组设置',
+  'vault.groups.details': '分组详情',
+  'vault.groups.details.general': '常规',
+  'vault.groups.details.ssh': 'SSH',
+  'vault.groups.details.telnet': 'Telnet',
+  'vault.groups.details.advanced': '高级',
+  'vault.groups.details.appearance': '外观',
+  'vault.groups.details.mosh': 'Mosh',
+  'vault.groups.details.parentGroup': '父分组',
+  'vault.groups.details.none': '无',
+  'vault.groups.details.inherited': '继承自分组',
+  'vault.groups.details.addProtocol': '添加协议',
+  'vault.groups.details.removeProtocol': '移除协议',
+  'vault.groups.details.fontFamily': '字体',
+  'vault.groups.details.fontSize': '字号',
  'vault.groups.errors.required': '分组名称不能为空。',
  'vault.groups.errors.invalidChars': "分组名称不能包含 '/' 或 '\\\\'.",
+  'vault.groups.errors.duplicatePath': '该位置已存在同名分组。',

  'vault.managedSource.unmanage': '取消托管',
  'vault.managedSource.unmanageSuccess': '已取消托管分组',
@@ -319,6 +336,10 @@ const zhCN: Messages = {
  'vault.hosts.export.toast.successWithSkipped': '已导出 {count} 个主机到 CSV（跳过 {skipped} 个不支持的主机）',
  'vault.hosts.export.toast.noHosts': '没有主机可导出',
  'vault.hosts.allHosts': '全部主机',
+  'vault.hosts.pinned': '已置顶',
+  'vault.hosts.recentlyConnected': '最近连接',
+  'vault.hosts.pinToTop': '置顶',
+  'vault.hosts.unpin': '取消置顶',
  'vault.hosts.copyCredentials': '复制账密信息',
  'vault.hosts.copyCredentials.toast.success': '账密信息已复制到剪贴板',
  'vault.hosts.copyCredentials.toast.noPassword': '该主机未保存密码',
@@ -1283,6 +1304,14 @@ const zhCN: Messages = {
  'settings.terminal.scrollback.rows': '行数 *',
  'settings.terminal.keywordHighlight.title': '关键字高亮',
  'settings.terminal.keywordHighlight.resetColors': '重置为默认颜色',
+  'settings.terminal.keywordHighlight.addCustom': '添加自定义规则',
+  'settings.terminal.keywordHighlight.editCustom': '编辑规则',
+  'settings.terminal.keywordHighlight.labelField': '标签与颜色',
+  'settings.terminal.keywordHighlight.labelPlaceholder': '标签（如 Down）',
+  'settings.terminal.keywordHighlight.patternField': '正则表达式',
+  'settings.terminal.keywordHighlight.patternPlaceholder': '正则表达式（如 \\bdown\\b）',
+  'settings.terminal.keywordHighlight.invalidPattern': '无效的正则表达式',
+  'settings.terminal.keywordHighlight.preview': '预览',
  'settings.terminal.section.localShell': '本地 Shell',
  'settings.terminal.localShell.shell': 'Shell 可执行文件',
  'settings.terminal.localShell.shell.desc': 'Shell 可执行文件的路径（例如 /bin/zsh、pwsh.exe）。留空使用系统默认。',
--- a/application/state/useAutoSync.ts
+++ b/application/state/useAutoSync.ts
@@ -32,6 +32,7 @@ interface AutoSyncConfig {
  snippetPackages?: SyncPayload['snippetPackages'];
  portForwardingRules?: SyncPayload['portForwardingRules'];
  knownHosts?: SyncPayload['knownHosts'];
+  groupConfigs?: SyncPayload['groupConfigs'];
  /** Opaque token that changes whenever a synced setting changes. */
  settingsVersion?: number;

@@ -95,6 +96,7 @@ export const useAutoSync = (config: AutoSyncConfig) => {
      snippetPackages: config.snippetPackages,
      portForwardingRules: effectivePFRules,
      knownHosts: effectiveKnownHosts,
+      groupConfigs: config.groupConfigs,
    };
  }, [
    config.hosts,
@@ -105,6 +107,7 @@ export const useAutoSync = (config: AutoSyncConfig) => {
    config.snippetPackages,
    config.portForwardingRules,
    config.knownHosts,
+    config.groupConfigs,
  ]);

  // Build sync payload
--- a/application/state/useImmersiveMode.ts
+++ b/application/state/useImmersiveMode.ts
@@ -151,12 +151,10 @@ function removeImmersiveStyle() {
 // ---------------------------------------------------------------------------

 export function useImmersiveMode({
-  isImmersive,
  activeTabId,
  activeTerminalTheme,
  restoreOriginalTheme,
 }: {
-  isImmersive: boolean;
  activeTabId: string;
  activeTerminalTheme: TerminalTheme | null;
  restoreOriginalTheme: () => void;
@@ -170,18 +168,18 @@ export function useImmersiveMode({

  // APPLY: useLayoutEffect — runs before paint, O(1) Map lookup, single DOM write
  useLayoutEffect(() => {
-    if (isImmersive && isTerminalTab && activeTerminalTheme) {
+    if (isTerminalTab && activeTerminalTheme) {
      const fp = themeFingerprint(activeTerminalTheme);
      if (appliedFpRef.current === fp) return;
      overrideActiveRef.current = true;
      appliedFpRef.current = fp;
      applyImmersiveStyle(getImmersiveCss(activeTerminalTheme), activeTerminalTheme.type === 'dark', activeTerminalTheme.colors.background);
    }
-  }, [isImmersive, isTerminalTab, activeTerminalTheme]);
+  }, [isTerminalTab, activeTerminalTheme]);

  // RESTORE: useEffect — runs after paint, with fade overlay
  useEffect(() => {
-    if (isImmersive && isTerminalTab && activeTerminalTheme) return;
+    if (isTerminalTab && activeTerminalTheme) return;
    if (!overrideActiveRef.current) return;
    overrideActiveRef.current = false;
    appliedFpRef.current = null;
@@ -198,7 +196,7 @@ export function useImmersiveMode({
    });
    const fallback = setTimeout(() => { if (overlay.parentNode) overlay.remove(); }, 400);
    return () => { clearTimeout(fallback); if (overlay.parentNode) overlay.remove(); };
-  }, [isImmersive, isTerminalTab, activeTerminalTheme, restoreOriginalTheme]);
+  }, [isTerminalTab, activeTerminalTheme, restoreOriginalTheme]);

  // Cleanup on unmount
  useEffect(() => {
--- a/application/state/usePortForwardingAutoStart.ts
+++ b/application/state/usePortForwardingAutoStart.ts
@@ -4,7 +4,8 @@
 * when the application starts, not when the user navigates to the port forwarding page.
 */
 import { useCallback, useEffect, useRef } from "react";
-import { Host, Identity, PortForwardingRule, SSHKey } from "../../domain/models";
+import { GroupConfig, Host, Identity, PortForwardingRule, SSHKey } from "../../domain/models";
+import { resolveGroupDefaults, applyGroupDefaults } from "../../domain/groupConfig";
 import { STORAGE_KEY_PORT_FORWARDING } from "../../infrastructure/config/storageKeys";
 import { localStorageAdapter } from "../../infrastructure/persistence/localStorageAdapter";
 import {
@@ -19,6 +20,7 @@ export interface UsePortForwardingAutoStartOptions {
  hosts: Host[];
  keys: SSHKey[];
  identities: Identity[];
+  groupConfigs: GroupConfig[];
 }

 /**
@@ -29,11 +31,13 @@ export const usePortForwardingAutoStart = ({
  hosts,
  keys,
  identities,
+  groupConfigs,
 }: UsePortForwardingAutoStartOptions): void => {
  const autoStartExecutedRef = useRef(false);
  const hostsRef = useRef<Host[]>(hosts);
  const keysRef = useRef<SSHKey[]>(keys);
  const identitiesRef = useRef<Identity[]>(identities);
+  const groupConfigsRef = useRef<GroupConfig[]>(groupConfigs);

  const isHostAuthReady = useCallback((host: Host, seen = new Set<string>()): boolean => {
    if (!host || seen.has(host.id)) return true;
@@ -73,6 +77,16 @@ export const usePortForwardingAutoStart = ({
    identitiesRef.current = identities;
  }, [identities]);

+  useEffect(() => {
+    groupConfigsRef.current = groupConfigs;
+  }, [groupConfigs]);
+
+  const resolveEffectiveHost = useCallback((host: Host): Host => {
+    if (!host.group) return host;
+    const defaults = resolveGroupDefaults(host.group, groupConfigsRef.current);
+    return applyGroupDefaults(host, defaults);
+  }, []);
+
  // Set up the reconnect callback
  useEffect(() => {
    const handleReconnect = async (
@@ -89,11 +103,12 @@ export const usePortForwardingAutoStart = ({
        return { success: false, error: "Rule or host not found" };
      }

-      const host = hostsRef.current.find((h) => h.id === rule.hostId);
-      if (!host) {
+      const rawHost = hostsRef.current.find((h) => h.id === rule.hostId);
+      if (!rawHost) {
        return { success: false, error: "Host not found" };
      }

+      const host = resolveEffectiveHost(rawHost);
      return startPortForward(rule, host, hostsRef.current, keysRef.current, identitiesRef.current, onStatusChange, true);
    };

@@ -101,7 +116,7 @@ export const usePortForwardingAutoStart = ({
    return () => {
      setReconnectCallback(null);
    };
-  }, []);
+  }, [resolveEffectiveHost]);

  // Auto-start rules on app launch
  useEffect(() => {
@@ -146,8 +161,9 @@ export const usePortForwardingAutoStart = ({

      // Start each auto-start rule
      for (const rule of autoStartRules) {
-        const host = hosts.find((h) => h.id === rule.hostId);
-        if (host) {
+        const rawHost = hosts.find((h) => h.id === rule.hostId);
+        if (rawHost) {
+          const host = resolveEffectiveHost(rawHost);
          void startPortForward(
            rule,
            host,
@@ -180,5 +196,5 @@ export const usePortForwardingAutoStart = ({
    };

    void runAutoStart();
-  }, [hosts, identities, isHostAuthReady, keys]);
+  }, [hosts, identities, isHostAuthReady, keys, resolveEffectiveHost]);
 };
--- a/application/state/useSettingsState.ts
+++ b/application/state/useSettingsState.ts
@@ -33,7 +33,7 @@ import {
  STORAGE_KEY_GLOBAL_HOTKEY_ENABLED,
  STORAGE_KEY_AUTO_UPDATE_ENABLED,
  STORAGE_KEY_WORKSPACE_FOCUS_STYLE,
-  STORAGE_KEY_IMMERSIVE_MODE,
+
 } from '../../infrastructure/config/storageKeys';
 import { DEFAULT_UI_LOCALE, resolveSupportedLocale } from '../../infrastructure/config/i18n';
 import { TERMINAL_THEMES } from '../../infrastructure/config/terminalThemes';
@@ -125,7 +125,7 @@ const applyThemeTokens = (
  accentOverride: string,
 ) => {
  const root = window.document.documentElement;
-  // If immersive mode is active (style tag present), it owns the dark/light class — don't override
+  // If immersive override is active (style tag present), it owns the dark/light class — don't override
  if (!document.getElementById('netcatty-immersive-override')) {
    root.classList.remove('light', 'dark');
    root.classList.add(resolvedTheme);
@@ -340,20 +340,6 @@ export const useSettingsState = () => {
    }
  }, []);

-  const [immersiveMode, setImmersiveModeState] = useState<boolean>(() => {
-    const stored = localStorageAdapter.readString(STORAGE_KEY_IMMERSIVE_MODE);
-    if (stored === null || stored === '') {
-      // Persist default so collectSyncableSettings() can include it
-      localStorageAdapter.writeString(STORAGE_KEY_IMMERSIVE_MODE, 'true');
-      return true;
-    }
-    return stored === 'true';
-  });
-  const setImmersiveMode = useCallback((enabled: boolean) => {
-    setImmersiveModeState(enabled);
-    localStorageAdapter.writeString(STORAGE_KEY_IMMERSIVE_MODE, String(enabled));
-    notifySettingsChanged(STORAGE_KEY_IMMERSIVE_MODE, enabled);
-  }, [notifySettingsChanged]);

  const setSftpTransferConcurrency = useCallback((value: number) => {
    const clamped = Math.max(1, Math.min(16, Math.round(value)));
@@ -465,21 +451,13 @@ export const useSettingsState = () => {
    const storedDefaultViewMode = readStoredString(STORAGE_KEY_SFTP_DEFAULT_VIEW_MODE);
    if (storedDefaultViewMode === 'list' || storedDefaultViewMode === 'tree') setSftpDefaultViewMode(storedDefaultViewMode);

-    // Immersive mode
-    const storedImmersive = readStoredString(STORAGE_KEY_IMMERSIVE_MODE);
-    if (storedImmersive === 'true' || storedImmersive === 'false') {
-      const val = storedImmersive === 'true';
-      setImmersiveModeState(val);
-      notifySettingsChanged(STORAGE_KEY_IMMERSIVE_MODE, val);
-    }
-
    // Workspace focus style
    const storedFocusStyle = readStoredString(STORAGE_KEY_WORKSPACE_FOCUS_STYLE);
    if (storedFocusStyle === 'dim' || storedFocusStyle === 'border') setWorkspaceFocusStyleState(storedFocusStyle);

    // Custom terminal themes
    customThemeStore.loadFromStorage();
-  }, [syncAppearanceFromStorage, syncCustomCssFromStorage, setTerminalSettings, notifySettingsChanged]);
+  }, [syncAppearanceFromStorage, syncCustomCssFromStorage, setTerminalSettings]);

  useLayoutEffect(() => {
    const tokens = getUiThemeById(resolvedTheme, resolvedTheme === 'dark' ? darkUiThemeId : lightUiThemeId).tokens;
@@ -625,9 +603,6 @@ export const useSettingsState = () => {
          setSftpDefaultViewMode((prev) => (prev === value ? prev : value));
        }
      }
-      if (key === STORAGE_KEY_IMMERSIVE_MODE && typeof value === 'boolean') {
-        setImmersiveModeState((prev) => (prev === value ? prev : value));
-      }
      if (key === STORAGE_KEY_WORKSPACE_FOCUS_STYLE && (value === 'dim' || value === 'border')) {
        setWorkspaceFocusStyleState((prev) => (prev === value ? prev : value));
      }
@@ -671,7 +646,7 @@ export const useSettingsState = () => {
    sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
    sftpUseCompressedUpload, sftpAutoOpenSidebar, sftpDefaultViewMode,
    editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat,
-    globalHotkeyEnabled, autoUpdateEnabled, immersiveMode,
+    globalHotkeyEnabled, autoUpdateEnabled,
  });
  settingsSnapshotRef.current = {
    theme, lightUiThemeId, darkUiThemeId, accentMode, customAccent,
@@ -680,7 +655,7 @@ export const useSettingsState = () => {
    sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
    sftpUseCompressedUpload, sftpAutoOpenSidebar, sftpDefaultViewMode,
    editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat,
-    globalHotkeyEnabled, autoUpdateEnabled, immersiveMode,
+    globalHotkeyEnabled, autoUpdateEnabled,
  };

  // Listen for storage changes from other windows (cross-window sync)
@@ -849,13 +824,6 @@ export const useSettingsState = () => {
          setAutoUpdateEnabled(newValue);
        }
      }
-      // Sync immersive mode from other windows
-      if (e.key === STORAGE_KEY_IMMERSIVE_MODE && e.newValue !== null) {
-        const newValue = e.newValue === 'true';
-        if (newValue !== s.immersiveMode) {
-          setImmersiveModeState(newValue);
-        }
-      }
      // Sync workspace focus style from other windows
      if (e.key === STORAGE_KEY_WORKSPACE_FOCUS_STYLE && e.newValue !== null) {
        if (e.newValue === 'dim' || e.newValue === 'border') {
@@ -1247,8 +1215,6 @@ export const useSettingsState = () => {
    setGlobalHotkeyEnabled,
    rehydrateAllFromStorage,
    reapplyCurrentTheme,
-    immersiveMode,
-    setImmersiveMode,
    workspaceFocusStyle,
    setWorkspaceFocusStyle,
    // Opaque version that changes when any synced setting changes, used by useAutoSync.
@@ -1259,7 +1225,7 @@ export const useSettingsState = () => {
      terminalThemeId, terminalFontFamilyId, terminalFontSize, terminalSettings,
      customKeyBindings, editorWordWrap,
      sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles, sftpUseCompressedUpload, sftpAutoOpenSidebar, sftpDefaultViewMode,
-      customThemes, immersiveMode, workspaceFocusStyle,
+      customThemes, workspaceFocusStyle,
    ]),
  };
 };
--- a/application/state/useStoredBoolean.ts
+++ b/application/state/useStoredBoolean.ts
@@ -1,8 +1,10 @@
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { localStorageAdapter } from "../../infrastructure/persistence/localStorageAdapter";

 /**
 * Hook for persisting a boolean value to localStorage.
+ * Syncs across components in the same window via a custom event,
+ * and across windows via the native storage event.
 * @param storageKey - The key to use for localStorage
 * @param fallback - The default value if no stored value exists (defaults to false)
 * @returns A tuple of [value, setValue] similar to useState
@@ -16,9 +18,38 @@ export const useStoredBoolean = (
        return stored ?? fallback;
    });

-    useEffect(() => {
-        localStorageAdapter.writeBoolean(storageKey, value);
-    }, [storageKey, value]);
+    const setAndPersist = useCallback((next: boolean | ((prev: boolean) => boolean)) => {
+        setValue((prev) => {
+            const resolved = typeof next === "function" ? next(prev) : next;
+            localStorageAdapter.writeBoolean(storageKey, resolved);
+            // Notify other same-window consumers
+            window.dispatchEvent(
+                new CustomEvent("stored-boolean-change", { detail: { key: storageKey, value: resolved } }),
+            );
+            return resolved;
+        });
+    }, [storageKey]);

-    return [value, setValue] as const;
+    useEffect(() => {
+        // Sync from other components in the same window
+        const handleCustom = (e: Event) => {
+            const { key, value: newValue } = (e as CustomEvent).detail;
+            if (key === storageKey) setValue(newValue);
+        };
+        // Sync from other windows
+        const handleStorage = (e: StorageEvent) => {
+            if (e.key === storageKey) {
+                const stored = localStorageAdapter.readBoolean(storageKey);
+                setValue(stored ?? fallback);
+            }
+        };
+        window.addEventListener("stored-boolean-change", handleCustom);
+        window.addEventListener("storage", handleStorage);
+        return () => {
+            window.removeEventListener("stored-boolean-change", handleCustom);
+            window.removeEventListener("storage", handleStorage);
+        };
+    }, [storageKey, fallback]);
+
+    return [value, setAndPersist] as const;
 };
--- a/application/state/useVaultState.ts
+++ b/application/state/useVaultState.ts
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { normalizeDistroId, sanitizeHost } from "../../domain/host";
 import {
  ConnectionLog,
+  GroupConfig,
  Host,
  Identity,
  KeyCategory,
@@ -17,6 +18,7 @@ import {
 } from "../../infrastructure/config/defaultData";
 import {
  STORAGE_KEY_CONNECTION_LOGS,
+  STORAGE_KEY_GROUP_CONFIGS,
  STORAGE_KEY_GROUPS,
  STORAGE_KEY_HOSTS,
  STORAGE_KEY_IDENTITIES,
@@ -30,9 +32,11 @@ import {
 } from "../../infrastructure/config/storageKeys";
 import { localStorageAdapter } from "../../infrastructure/persistence/localStorageAdapter";
 import {
+  decryptGroupConfigs,
  decryptHosts,
  decryptIdentities,
  decryptKeys,
+  encryptGroupConfigs,
  encryptHosts,
  encryptIdentities,
  encryptKeys,
@@ -46,6 +50,7 @@ type ExportableVaultData = {
  customGroups: string[];
  snippetPackages?: string[];
  knownHosts?: KnownHost[];
+  groupConfigs?: GroupConfig[];
 };

 type LegacyKeyRecord = Record<string, unknown> & { id?: string; source?: string };
@@ -107,6 +112,7 @@ export const useVaultState = () => {
  const [shellHistory, setShellHistory] = useState<ShellHistoryEntry[]>([]);
  const [connectionLogs, setConnectionLogs] = useState<ConnectionLog[]>([]);
  const [managedSources, setManagedSources] = useState<ManagedSource[]>([]);
+  const [groupConfigs, setGroupConfigs] = useState<GroupConfig[]>([]);

  // Write-version counters prevent out-of-order async writes from overwriting
  // newer data.  Each update bumps the counter; the .then() callback only
@@ -114,6 +120,7 @@ export const useVaultState = () => {
  const hostsWriteVersion = useRef(0);
  const keysWriteVersion = useRef(0);
  const identitiesWriteVersion = useRef(0);
+  const groupConfigsWriteVersion = useRef(0);

  // Read-sequence counters for cross-window storage events.  Each incoming
  // event bumps the counter; the async decrypt callback only applies state if
@@ -122,6 +129,7 @@ export const useVaultState = () => {
  const hostsReadSeq = useRef(0);
  const keysReadSeq = useRef(0);
  const identitiesReadSeq = useRef(0);
+  const groupConfigsReadSeq = useRef(0);

  const updateHosts = useCallback((data: Host[]) => {
    const cleaned = data.map(sanitizeHost);
@@ -176,6 +184,15 @@ export const useVaultState = () => {
    localStorageAdapter.write(STORAGE_KEY_MANAGED_SOURCES, data);
  }, []);

+  const updateGroupConfigs = useCallback((data: GroupConfig[]) => {
+    setGroupConfigs(data);
+    const ver = ++groupConfigsWriteVersion.current;
+    encryptGroupConfigs(data).then((enc) => {
+      if (ver === groupConfigsWriteVersion.current)
+        localStorageAdapter.write(STORAGE_KEY_GROUP_CONFIGS, enc);
+    });
+  }, []);
+
  const clearVaultData = useCallback(() => {
    updateHosts([]);
    updateKeys([]);
@@ -185,6 +202,7 @@ export const useVaultState = () => {
    updateCustomGroups([]);
    updateKnownHosts([]);
    updateManagedSources([]);
+    updateGroupConfigs([]);
    localStorageAdapter.remove(STORAGE_KEY_LEGACY_KEYS);
  }, [
    updateHosts,
@@ -195,6 +213,7 @@ export const useVaultState = () => {
    updateCustomGroups,
    updateKnownHosts,
    updateManagedSources,
+    updateGroupConfigs,
  ]);

  const addShellHistoryEntry = useCallback(
@@ -430,6 +449,20 @@ export const useVaultState = () => {
        STORAGE_KEY_MANAGED_SOURCES,
      );
      if (savedManagedSources) setManagedSources(savedManagedSources);
+
+      // Load group configs
+      const savedGroupConfigs = localStorageAdapter.read<GroupConfig[]>(STORAGE_KEY_GROUP_CONFIGS);
+      if (savedGroupConfigs) {
+        const gcVer = ++groupConfigsWriteVersion.current;
+        const decryptedGC = await decryptGroupConfigs(savedGroupConfigs);
+        if (gcVer === groupConfigsWriteVersion.current) {
+          setGroupConfigs(decryptedGC);
+          encryptGroupConfigs(decryptedGC).then((enc) => {
+            if (gcVer === groupConfigsWriteVersion.current)
+              localStorageAdapter.write(STORAGE_KEY_GROUP_CONFIGS, enc);
+          });
+        }
+      }
    };

    init();
@@ -529,6 +562,19 @@ export const useVaultState = () => {
      if (key === STORAGE_KEY_MANAGED_SOURCES) {
        const next = safeParse<ManagedSource[]>(event.newValue) ?? [];
        setManagedSources(next);
+        return;
+      }
+
+      if (key === STORAGE_KEY_GROUP_CONFIGS) {
+        const next = safeParse<GroupConfig[]>(event.newValue) ?? [];
+        ++groupConfigsWriteVersion.current;
+        const seq = ++groupConfigsReadSeq.current;
+        const writeAtStart = groupConfigsWriteVersion.current;
+        decryptGroupConfigs(next).then((dec) => {
+          if (seq === groupConfigsReadSeq.current && writeAtStart === groupConfigsWriteVersion.current)
+            setGroupConfigs(dec);
+        });
+        return;
      }
    };

@@ -536,6 +582,20 @@ export const useVaultState = () => {
    return () => window.removeEventListener("storage", handleStorage);
  }, []);

+  const updateHostLastConnected = useCallback((hostId: string) => {
+    setHosts((prev) => {
+      const next = prev.map((h) =>
+        h.id === hostId ? { ...h, lastConnectedAt: Date.now() } : h,
+      );
+      const ver = ++hostsWriteVersion.current;
+      encryptHosts(next).then((enc) => {
+        if (ver === hostsWriteVersion.current)
+          localStorageAdapter.write(STORAGE_KEY_HOSTS, enc);
+      });
+      return next;
+    });
+  }, []);
+
  const updateHostDistro = useCallback((hostId: string, distro: string) => {
    const normalized = normalizeDistroId(distro);
    setHosts((prev) => {
@@ -560,8 +620,9 @@ export const useVaultState = () => {
      customGroups,
      snippetPackages,
      knownHosts,
+      groupConfigs,
    }),
-    [hosts, keys, identities, snippets, customGroups, snippetPackages, knownHosts],
+    [hosts, keys, identities, snippets, customGroups, snippetPackages, knownHosts, groupConfigs],
  );

  const importData = useCallback(
@@ -573,6 +634,7 @@ export const useVaultState = () => {
      if (payload.customGroups) updateCustomGroups(payload.customGroups);
      if (payload.snippetPackages) updateSnippetPackages(payload.snippetPackages);
      if (payload.knownHosts) updateKnownHosts(payload.knownHosts);
+      if (Array.isArray(payload.groupConfigs)) updateGroupConfigs(payload.groupConfigs);
    },
    [
      updateHosts,
@@ -582,6 +644,7 @@ export const useVaultState = () => {
      updateCustomGroups,
      updateSnippetPackages,
      updateKnownHosts,
+      updateGroupConfigs,
    ],
  );

@@ -604,6 +667,7 @@ export const useVaultState = () => {
    shellHistory,
    connectionLogs,
    managedSources,
+    groupConfigs,
    updateHosts,
    updateKeys,
    updateIdentities,
@@ -612,6 +676,7 @@ export const useVaultState = () => {
    updateCustomGroups,
    updateKnownHosts,
    updateManagedSources,
+    updateGroupConfigs,
    addShellHistoryEntry,
    clearShellHistory,
    addConnectionLog,
@@ -620,6 +685,7 @@ export const useVaultState = () => {
    deleteConnectionLog,
    clearUnsavedConnectionLogs,
    updateHostDistro,
+    updateHostLastConnected,
    convertKnownHostToHost,
    exportData,
    importDataFromString,
--- a/application/syncPayload.ts
+++ b/application/syncPayload.ts
@@ -8,6 +8,7 @@
 */

 import type {
+  GroupConfig,
  Host,
  Identity,
  KnownHost,
@@ -41,7 +42,7 @@ import {
  STORAGE_KEY_SFTP_AUTO_OPEN_SIDEBAR,
  STORAGE_KEY_SFTP_GLOBAL_BOOKMARKS,
  STORAGE_KEY_CUSTOM_THEMES,
-  STORAGE_KEY_IMMERSIVE_MODE,
+  STORAGE_KEY_SHOW_RECENT_HOSTS,
 } from '../infrastructure/config/storageKeys';

 // ---------------------------------------------------------------------------
@@ -57,6 +58,7 @@ export interface SyncableVaultData {
  customGroups: string[];
  snippetPackages?: string[];
  knownHosts: KnownHost[];
+  groupConfigs?: GroupConfig[];
 }

 /** Callbacks used by `applySyncPayload` to import data into local state. */
@@ -168,9 +170,9 @@ export function collectSyncableSettings(): SyncPayload['settings'] {
  const globalBookmarks = localStorageAdapter.read<SftpBookmark[]>(STORAGE_KEY_SFTP_GLOBAL_BOOKMARKS);
  if (globalBookmarks && Array.isArray(globalBookmarks)) settings.sftpGlobalBookmarks = globalBookmarks;

-  // Immersive mode
-  const immersive = localStorageAdapter.readString(STORAGE_KEY_IMMERSIVE_MODE);
-  if (immersive === 'true' || immersive === 'false') settings.immersiveMode = immersive === 'true';
+
+  const showRecent = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_RECENT_HOSTS);
+  if (showRecent != null) settings.showRecentHosts = showRecent;

  return Object.keys(settings).length > 0 ? settings : undefined;
 }
@@ -234,8 +236,8 @@ function applySyncableSettings(settings: NonNullable<SyncPayload['settings']>):
  // SFTP Bookmarks (global only)
  if (settings.sftpGlobalBookmarks != null) localStorageAdapter.write(STORAGE_KEY_SFTP_GLOBAL_BOOKMARKS, settings.sftpGlobalBookmarks);

-  // Immersive mode
-  if (settings.immersiveMode != null) localStorageAdapter.writeString(STORAGE_KEY_IMMERSIVE_MODE, String(settings.immersiveMode));
+  // Immersive mode (legacy — always enabled, ignore incoming value)
+  if (settings.showRecentHosts != null) localStorageAdapter.writeBoolean(STORAGE_KEY_SHOW_RECENT_HOSTS, settings.showRecentHosts);
 }

 // ---------------------------------------------------------------------------
@@ -261,6 +263,7 @@ export function buildSyncPayload(
    customGroups: vault.customGroups,
    snippetPackages: vault.snippetPackages,
    knownHosts: vault.knownHosts,
+    groupConfigs: vault.groupConfigs,
    portForwardingRules,
    settings: collectSyncableSettings(),
    syncedAt: Date.now(),
@@ -294,6 +297,9 @@ export function applySyncPayload(
  if (payload.knownHosts !== undefined) {
    vaultImport.knownHosts = payload.knownHosts;
  }
+  if (Array.isArray(payload.groupConfigs)) {
+    vaultImport.groupConfigs = payload.groupConfigs;
+  }

  importers.importVaultData(JSON.stringify(vaultImport));

--- a/components/GroupDetailsPanel.tsx
+++ b/components/GroupDetailsPanel.tsx
--- a/components/HostDetailsPanel.tsx
+++ b/components/HostDetailsPanel.tsx
@@ -99,6 +99,7 @@ interface HostDetailsPanelProps {
  onCancel: () => void;
  onCreateGroup?: (groupPath: string) => void; // Callback to create a new group
  onCreateTag?: (tag: string) => void; // Callback to create a new tag
+  groupDefaults?: Partial<import('../domain/models').GroupConfig>;
 }

 const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
@@ -116,6 +117,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
  onCancel,
  onCreateGroup,
  onCreateTag,
+  groupDefaults,
 }) => {
  const { t } = useI18n();
  const { checkSshAgent } = useApplicationBackend();
@@ -126,13 +128,13 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
        id: crypto.randomUUID(),
        label: "",
        hostname: "",
-        port: 22,
-        username: "root",
+        port: groupDefaults?.port ? undefined : 22,
+        username: groupDefaults?.username ? "" : "root",
        protocol: "ssh",
        tags: [],
        os: "linux",
        authMethod: "password",
-        charset: "UTF-8",
+        charset: groupDefaults?.charset ? undefined : "UTF-8",
        distroMode: "auto",
        createdAt: Date.now(),
        group: defaultGroup || undefined, // Pre-fill with current navigation group
@@ -282,12 +284,10 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
  };

  const removeHostFromChain = (index: number) => {
-    setForm((prev) => ({
-      ...prev,
-      hostChain: {
-        hostIds: (prev.hostChain?.hostIds || []).filter((_, i) => i !== index),
-      },
-    }));
+    setForm((prev) => {
+      const ids = (prev.hostChain?.hostIds || []).filter((_, i) => i !== index);
+      return { ...prev, hostChain: ids.length > 0 ? { hostIds: ids } : undefined };
+    });
  };

  const clearHostChain = useCallback(() => {
@@ -313,12 +313,10 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
  };

  const removeEnvVar = (index: number) => {
-    setForm((prev) => ({
-      ...prev,
-      environmentVariables: (prev.environmentVariables || []).filter(
-        (_, i) => i !== index,
-      ),
-    }));
+    setForm((prev) => {
+      const filtered = (prev.environmentVariables || []).filter((_, i) => i !== index);
+      return { ...prev, environmentVariables: filtered.length > 0 ? filtered : undefined };
+    });
  };

  const handleSubmit = () => {
@@ -363,7 +361,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
      label: finalLabel,
      group: finalGroup,
      tags: form.tags || [],
-      port: form.port || 22,
+      port: form.port ?? (groupDefaults?.port ? undefined : 22),
      // Clear password if savePassword is explicitly set to false
      password: form.savePassword === false ? undefined : form.password,
      managedSourceId: finalManagedSourceId,
@@ -752,8 +750,9 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
              <div className="ml-auto w-1/2 min-w-0 flex items-center gap-2 justify-end">
                <Input
                  type="number"
-                  value={form.port}
-                  onChange={(e) => update("port", Number(e.target.value))}
+                  value={form.port ?? ""}
+                  onChange={(e) => update("port", e.target.value ? Number(e.target.value) : undefined)}
+                  placeholder={groupDefaults?.port ? String(groupDefaults.port) : "22"}
                  className="h-8 flex-1 min-w-0 text-center"
                />
                <span className="text-xs text-muted-foreground">
@@ -805,7 +804,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
                if (!hasIdentities) {
                  return (
                    <Input
-                      placeholder={t("hostDetails.username.placeholder")}
+                      placeholder={groupDefaults?.username || t("hostDetails.username.placeholder")}
                      value={form.username}
                      onChange={(e) => update("username", e.target.value)}
                      className="h-10"
@@ -824,7 +823,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
                    <PopoverTrigger asChild>
                      <div className="relative">
                        <Input
-                          placeholder={t("hostDetails.username.placeholder")}
+                          placeholder={groupDefaults?.username || t("hostDetails.username.placeholder")}
                          value={form.username}
                          onChange={(e) => {
                            const next = e.target.value;
@@ -1263,18 +1262,20 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
              {t("hostDetails.sftp.sudo.passwordWarning")}
            </p>
          )}
-          <div className="space-y-1">
-            <div className="text-sm font-medium">
-              {t("hostDetails.sftp.encoding")}
-            </div>
-            <div className="text-xs text-muted-foreground">
-              {t("hostDetails.sftp.encoding.desc")}
+          <div className="flex items-center justify-between gap-4">
+            <div className="space-y-0.5">
+              <div className="text-sm font-medium">
+                {t("hostDetails.sftp.encoding")}
+              </div>
+              <div className="text-xs text-muted-foreground">
+                {t("hostDetails.sftp.encoding.desc")}
+              </div>
            </div>
            <Select
              value={form.sftpEncoding || "auto"}
              onValueChange={(val) => update("sftpEncoding", val as Host["sftpEncoding"])}
            >
-              <SelectTrigger className="h-8">
+              <SelectTrigger className="h-8 w-28">
                <SelectValue placeholder={t("sftp.encoding.label")} />
              </SelectTrigger>
              <SelectContent>
@@ -1286,6 +1287,111 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
          </div>
        </Card>

+        {form.os === "linux" && (
+          <Card className="p-3 space-y-3 bg-card border-border/80">
+            <div className="flex items-center gap-2">
+              <img src="/distro/linux.svg" alt="Linux" className="h-3.5 w-3.5 opacity-70 dark:invert" />
+              <p className="text-xs font-semibold">{t("hostDetails.distro.title")}</p>
+            </div>
+            <p className="text-xs text-muted-foreground">{t("hostDetails.distro.desc")}</p>
+
+            <div className="grid gap-2 md:grid-cols-2">
+              <div className="space-y-1">
+                <span className="text-xs text-muted-foreground">{t("hostDetails.distro.mode")}</span>
+                <Select
+                  value={form.distroMode || "auto"}
+                  onValueChange={(val) => handleDistroModeChange(val as "auto" | "manual")}
+                >
+                  <SelectTrigger className="h-8" aria-label={t("hostDetails.distro.mode")}>
+                    <span className="truncate whitespace-nowrap pr-2 text-left">
+                      {form.distroMode === "manual"
+                        ? t("hostDetails.distro.mode.manual")
+                        : t("hostDetails.distro.mode.auto")}
+                    </span>
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="auto">{t("hostDetails.distro.mode.auto")}</SelectItem>
+                    <SelectItem value="manual">{t("hostDetails.distro.mode.manual")}</SelectItem>
+                  </SelectContent>
+                </Select>
+              </div>
+
+              {form.distroMode === "manual" ? (
+                <div className="space-y-1">
+                  <span className="text-xs text-muted-foreground">{t("hostDetails.distro.manualLabel")}</span>
+                  <Select
+                    value={form.manualDistro}
+                    onValueChange={(val) => update("manualDistro", val)}
+                  >
+                    <SelectTrigger className="h-8" aria-label={t("hostDetails.distro.manualLabel")}>
+                      {(() => {
+                        const selectedOption = distroOptions.find((option) => option.value === form.manualDistro);
+                        return selectedOption ? (
+                          <div className="flex min-w-0 items-center gap-2 pr-2">
+                            <div
+                              className={cn(
+                                "flex h-4 w-4 shrink-0 items-center justify-center overflow-hidden rounded-[2px]",
+                                selectedOption.bgClass,
+                              )}
+                            >
+                              {selectedOption.icon ? (
+                                <img
+                                  src={selectedOption.icon}
+                                  alt={selectedOption.label}
+                                  className="h-3 w-3 object-contain invert brightness-0"
+                                />
+                              ) : (
+                                <div className="h-2 w-2 rounded-full bg-white/70" />
+                              )}
+                            </div>
+                            <span className="truncate whitespace-nowrap">{selectedOption.label}</span>
+                          </div>
+                        ) : (
+                          <SelectValue placeholder={t("hostDetails.distro.unknown")} />
+                        );
+                      })()}
+                    </SelectTrigger>
+                    <SelectContent className="min-w-[14rem]">
+                      {distroOptions.map((option) => (
+                        <SelectItem key={option.value} value={option.value}>
+                          <div className="flex items-center gap-2">
+                            <div
+                              className={cn(
+                                "flex h-4 w-4 shrink-0 items-center justify-center overflow-hidden rounded-[2px]",
+                                option.bgClass,
+                              )}
+                            >
+                              {option.icon ? (
+                                <img
+                                  src={option.icon}
+                                  alt={option.label}
+                                  className="h-3 w-3 object-contain invert brightness-0"
+                                />
+                              ) : (
+                                <div className="h-2 w-2 rounded-full bg-white/70" />
+                              )}
+                            </div>
+                            <span className="whitespace-nowrap">{option.label}</span>
+                          </div>
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+              ) : (
+                <div className="space-y-1">
+                  <span className="text-xs text-muted-foreground">{t("hostDetails.distro.detectedLabel")}</span>
+                  <div className="flex h-8 items-center rounded-md border border-border/60 bg-background/50 px-3 text-sm">
+                    {effectiveFormDistro
+                      ? getDistroOptionLabel(effectiveFormDistro)
+                      : t("hostDetails.distro.unknown")}
+                  </div>
+                </div>
+              )}
+            </div>
+          </Card>
+        )}
+
        <Card className="p-3 space-y-3 bg-card border-border/80">
          <div className="flex items-center gap-2">
            <Palette size={14} className="text-muted-foreground" />
@@ -1294,113 +1400,6 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
            </p>
          </div>

-          {form.os === "linux" && (
-            <div className="space-y-2 rounded-lg border border-border/70 bg-secondary/30 p-3">
-              <div className="flex items-start gap-2">
-                <Globe size={14} className="mt-0.5 text-muted-foreground" />
-                <div className="space-y-0.5">
-                  <p className="text-xs font-semibold">{t("hostDetails.distro.title")}</p>
-                  <p className="text-xs text-muted-foreground">{t("hostDetails.distro.desc")}</p>
-                </div>
-              </div>
-
-              <div className="grid gap-2 md:grid-cols-2">
-                <div className="space-y-1">
-                  <span className="text-xs text-muted-foreground">{t("hostDetails.distro.mode")}</span>
-                  <Select
-                    value={form.distroMode || "auto"}
-                    onValueChange={(val) => handleDistroModeChange(val as "auto" | "manual")}
-                  >
-                    <SelectTrigger className="h-8" aria-label={t("hostDetails.distro.mode")}>
-                      <span className="truncate whitespace-nowrap pr-2 text-left">
-                        {form.distroMode === "manual"
-                          ? t("hostDetails.distro.mode.manual")
-                          : t("hostDetails.distro.mode.auto")}
-                      </span>
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="auto">{t("hostDetails.distro.mode.auto")}</SelectItem>
-                      <SelectItem value="manual">{t("hostDetails.distro.mode.manual")}</SelectItem>
-                    </SelectContent>
-                  </Select>
-                </div>
-
-                {form.distroMode === "manual" ? (
-                  <div className="space-y-1">
-                    <span className="text-xs text-muted-foreground">{t("hostDetails.distro.manualLabel")}</span>
-                    <Select
-                      value={form.manualDistro}
-                      onValueChange={(val) => update("manualDistro", val)}
-                    >
-                      <SelectTrigger className="h-8" aria-label={t("hostDetails.distro.manualLabel")}>
-                        {(() => {
-                          const selectedOption = distroOptions.find((option) => option.value === form.manualDistro);
-                          return selectedOption ? (
-                            <div className="flex min-w-0 items-center gap-2 pr-2">
-                              <div
-                                className={cn(
-                                  "flex h-4 w-4 shrink-0 items-center justify-center overflow-hidden rounded-[2px]",
-                                  selectedOption.bgClass,
-                                )}
-                              >
-                                {selectedOption.icon ? (
-                                  <img
-                                    src={selectedOption.icon}
-                                    alt={selectedOption.label}
-                                    className="h-3 w-3 object-contain invert brightness-0"
-                                  />
-                                ) : (
-                                  <div className="h-2 w-2 rounded-full bg-white/70" />
-                                )}
-                              </div>
-                              <span className="truncate whitespace-nowrap">{selectedOption.label}</span>
-                            </div>
-                          ) : (
-                            <SelectValue placeholder={t("hostDetails.distro.unknown")} />
-                          );
-                        })()}
-                      </SelectTrigger>
-                      <SelectContent className="min-w-[14rem]">
-                        {distroOptions.map((option) => (
-                          <SelectItem key={option.value} value={option.value}>
-                            <div className="flex items-center gap-2">
-                              <div
-                                className={cn(
-                                  "flex h-4 w-4 shrink-0 items-center justify-center overflow-hidden rounded-[2px]",
-                                  option.bgClass,
-                                )}
-                              >
-                                {option.icon ? (
-                                  <img
-                                    src={option.icon}
-                                    alt={option.label}
-                                    className="h-3 w-3 object-contain invert brightness-0"
-                                  />
-                                ) : (
-                                  <div className="h-2 w-2 rounded-full bg-white/70" />
-                                )}
-                              </div>
-                              <span className="whitespace-nowrap">{option.label}</span>
-                            </div>
-                          </SelectItem>
-                        ))}
-                      </SelectContent>
-                    </Select>
-                  </div>
-                ) : (
-                  <div className="space-y-1">
-                    <span className="text-xs text-muted-foreground">{t("hostDetails.distro.detectedLabel")}</span>
-                    <div className="flex h-8 items-center rounded-md border border-border/60 bg-background/50 px-3 text-sm">
-                      {effectiveFormDistro
-                        ? getDistroOptionLabel(effectiveFormDistro)
-                        : t("hostDetails.distro.unknown")}
-                    </div>
-                  </div>
-                )}
-              </div>
-            </div>
-          )}
-
          {/* SSH Theme Selection */}
          <button
            type="button"
@@ -1755,7 +1754,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
                className="text-muted-foreground hover:text-destructive flex-shrink-0 ml-auto"
                onClick={(e) => {
                  e.stopPropagation();
-                  setForm((prev) => ({ ...prev, environmentVariables: [] }));
+                  setForm((prev) => ({ ...prev, environmentVariables: undefined }));
                }}
              />
            </button>
@@ -1778,7 +1777,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
            <p className="text-xs font-semibold">{t("hostDetails.startupCommand")}</p>
          </div>
          <Textarea
-            placeholder={t("hostDetails.startupCommand.placeholder")}
+            placeholder={groupDefaults?.startupCommand || t("hostDetails.startupCommand.placeholder")}
            value={form.startupCommand || ""}
            onChange={(e) => update("startupCommand", e.target.value)}
            className="min-h-[80px] font-mono text-sm"
@@ -1842,7 +1841,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({

            {/* Telnet Charset */}
            <Input
-              placeholder={t("hostDetails.charset.placeholder")}
+              placeholder={groupDefaults?.charset || t("hostDetails.charset.placeholder")}
              value={form.charset || "UTF-8"}
              onChange={(e) => update("charset", e.target.value)}
              className="h-10"
--- a/components/HostTreeView.tsx
+++ b/components/HostTreeView.tsx
@@ -1,4 +1,4 @@
-import { CheckSquare, ChevronRight, FileSymlink, Folder, FolderOpen, Monitor, Server, Square, Expand, Minimize2 } from 'lucide-react';
+import { CheckSquare, ChevronRight, Edit2, FileSymlink, Folder, FolderOpen, Monitor, Server, Square, Expand, Minimize2 } from 'lucide-react';
 import React, { useMemo } from 'react';
 import { useI18n } from '../application/i18n/I18nProvider';
 import { useTreeExpandedState } from '../application/state/useTreeExpandedState';
@@ -32,6 +32,7 @@ interface HostTreeViewProps {
  moveGroup: (sourcePath: string, targetPath: string) => void;
  managedGroupPaths?: Set<string>;
  onUnmanageGroup?: (groupPath: string) => void;
+
  isMultiSelectMode?: boolean;
  selectedHostIds?: Set<string>;
  toggleHostSelection?: (hostId: string) => void;
@@ -56,6 +57,7 @@ interface TreeNodeProps {
  moveGroup: (sourcePath: string, targetPath: string) => void;
  managedGroupPaths?: Set<string>;
  onUnmanageGroup?: (groupPath: string) => void;
+
  isMultiSelectMode?: boolean;
  selectedHostIds?: Set<string>;
  toggleHostSelection?: (hostId: string) => void;
@@ -81,6 +83,7 @@ const TreeNode: React.FC<TreeNodeProps> = ({
  moveGroup,
  managedGroupPaths,
  onUnmanageGroup,
+
  isMultiSelectMode,
  selectedHostIds,
  toggleHostSelection,
@@ -176,6 +179,15 @@ const TreeNode: React.FC<TreeNodeProps> = ({
                    {hostsCountInNode}
                  </span>
                )}
+                <button
+                  className="h-7 w-7 flex items-center justify-center rounded-md hover:bg-secondary/80 transition-colors opacity-0 group-hover:opacity-100 shrink-0"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    onEditGroup(node.path);
+                  }}
+                >
+                  <Edit2 size={13} />
+                </button>
              </div>
            </CollapsibleTrigger>
          </ContextMenuTrigger>
@@ -226,6 +238,7 @@ const TreeNode: React.FC<TreeNodeProps> = ({
              moveGroup={moveGroup}
              managedGroupPaths={managedGroupPaths}
              onUnmanageGroup={onUnmanageGroup}
+
              isMultiSelectMode={isMultiSelectMode}
              selectedHostIds={selectedHostIds}
              toggleHostSelection={toggleHostSelection}
@@ -244,6 +257,7 @@ const TreeNode: React.FC<TreeNodeProps> = ({
              onDeleteHost={onDeleteHost}
              onCopyCredentials={onCopyCredentials}
              moveHostToGroup={moveHostToGroup}
+
              isMultiSelectMode={isMultiSelectMode}
              selectedHostIds={selectedHostIds}
              toggleHostSelection={toggleHostSelection}
@@ -264,6 +278,7 @@ interface HostTreeItemProps {
  onDeleteHost: (host: Host) => void;
  onCopyCredentials: (host: Host) => void;
  moveHostToGroup: (hostId: string, groupPath: string | null) => void;
+
  isMultiSelectMode?: boolean;
  selectedHostIds?: Set<string>;
  toggleHostSelection?: (hostId: string) => void;
@@ -278,6 +293,7 @@ const HostTreeItem: React.FC<HostTreeItemProps> = ({
  onDeleteHost,
  onCopyCredentials,
  moveHostToGroup: _moveHostToGroup,
+
  isMultiSelectMode,
  selectedHostIds,
  toggleHostSelection,
@@ -348,6 +364,15 @@ const HostTreeItem: React.FC<HostTreeItemProps> = ({
                {tags.length > 2 && '...'}
              </span>
            )}
+            <button
+              className="h-7 w-7 flex items-center justify-center rounded-md hover:bg-secondary/80 transition-colors"
+              onClick={(e) => {
+                e.stopPropagation();
+                onEditHost(host);
+              }}
+            >
+              <Edit2 size={13} />
+            </button>
          </div>
        </div>
      </ContextMenuTrigger>
@@ -364,7 +389,7 @@ const HostTreeItem: React.FC<HostTreeItemProps> = ({
        <ContextMenuItem onClick={() => onCopyCredentials(host)}>
          <Server className="mr-2 h-4 w-4" /> {t("vault.hosts.copyCredentials")}
        </ContextMenuItem>
-        <ContextMenuItem 
+        <ContextMenuItem
          onClick={() => onDeleteHost(host)}
          className="text-destructive focus:text-destructive"
        >
@@ -396,6 +421,7 @@ export const HostTreeView: React.FC<HostTreeViewProps> = ({
  moveGroup,
  managedGroupPaths,
  onUnmanageGroup,
+
  isMultiSelectMode,
  selectedHostIds,
  toggleHostSelection,
--- a/components/PortForwardingNew.tsx
+++ b/components/PortForwardingNew.tsx
@@ -14,12 +14,14 @@ import React, { useCallback, useState } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { usePortForwardingState } from "../application/state/usePortForwardingState";
 import {
+  GroupConfig,
  Host,
  ManagedSource,
  PortForwardingRule,
  PortForwardingType,
  SSHKey,
 } from "../domain/models";
+import { resolveGroupDefaults, applyGroupDefaults } from "../domain/groupConfig";
 import { cn } from "../lib/utils";
 import SelectHostPanel from "./SelectHostPanel";
 import {
@@ -66,6 +68,7 @@ interface PortForwardingProps {
  identities?: import('../domain/models').Identity[];
  customGroups: string[];
  managedSources?: ManagedSource[];
+  groupConfigs?: GroupConfig[];
  onNewHost?: () => void;
  onSaveHost?: (host: Host) => void;
  onCreateGroup?: (groupPath: string) => void;
@@ -77,6 +80,7 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
  identities = [],
  customGroups: _customGroups,
  managedSources = [],
+  groupConfigs = [],
  onNewHost: _onNewHost,
  onSaveHost,
  onCreateGroup: _onCreateGroup,
@@ -113,8 +117,8 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
  // Start a port forwarding tunnel
  const handleStartTunnel = useCallback(
    async (rule: PortForwardingRule) => {
-      const _host = hosts.find((h) => h.id === rule.hostId);
-      if (!_host) {
+      const _rawHost = hosts.find((h) => h.id === rule.hostId);
+      if (!_rawHost) {
        setRuleStatus(rule.id, "error", t("pf.error.hostNotFound"));
        toast.error(
          t("pf.error.hostNotFound"),
@@ -123,6 +127,10 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
        return;
      }

+      const _host = _rawHost.group
+        ? applyGroupDefaults(_rawHost, resolveGroupDefaults(_rawHost.group, groupConfigs))
+        : _rawHost;
+
      setPendingOperations((prev) => new Set([...prev, rule.id]));
      let errorShown = false;

@@ -161,7 +169,7 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
        });
      }
    },
-    [hosts, identities, keys, setRuleStatus, startTunnel, t],
+    [hosts, identities, keys, groupConfigs, setRuleStatus, startTunnel, t],
  );

  // Stop a port forwarding tunnel
--- a/components/SettingsPage.tsx
+++ b/components/SettingsPage.tsx
@@ -113,6 +113,7 @@ const SettingsSyncTabWithVault: React.FC<{ onSettingsApplied?: () => void }> = (
        customGroups,
        snippetPackages,
        knownHosts,
+        groupConfigs,
        importDataFromString,
        clearVaultData,
    } = useVaultState();
@@ -132,8 +133,8 @@ const SettingsSyncTabWithVault: React.FC<{ onSettingsApplied?: () => void }> = (
    );

    const vault = useMemo(
-        () => ({ hosts, keys, identities, snippets, customGroups, snippetPackages, knownHosts }),
-        [hosts, keys, identities, snippets, customGroups, snippetPackages, knownHosts],
+        () => ({ hosts, keys, identities, snippets, customGroups, snippetPackages, knownHosts, groupConfigs }),
+        [hosts, keys, identities, snippets, customGroups, snippetPackages, knownHosts, groupConfigs],
    );

    return (
@@ -154,10 +155,6 @@ const SettingsPageContent: React.FC<{ settings: SettingsState }> = ({ settings }
    const { updateState, checkNow, installUpdate, openReleasePage, startDownload, isUpdateDemoMode } = useUpdateCheck({ autoUpdateEnabled: settings.autoUpdateEnabled });
    const [activeTab, setActiveTab] = useState("application");
    const [mountedTabs, setMountedTabs] = useState(() => new Set(["application"]));
-    const isImmersive = settings.immersiveMode;
-    const toggleImmersive = useCallback(() => {
-        settings.setImmersiveMode(!isImmersive);
-    }, [settings, isImmersive]);

    useEffect(() => {
        notifyRendererReady();
@@ -285,8 +282,6 @@ const SettingsPageContent: React.FC<{ settings: SettingsState }> = ({ settings }
                            setUiLanguage={settings.setUiLanguage}
                            customCSS={settings.customCSS}
                            setCustomCSS={settings.setCustomCSS}
-                            isImmersive={isImmersive}
-                            onToggleImmersive={toggleImmersive}
                        />
                    )}

--- a/components/SftpView.tsx
+++ b/components/SftpView.tsx
@@ -25,6 +25,7 @@ import { useRenderTracker } from "../lib/useRenderTracker";
 import { cn } from "../lib/utils";
 import { useInstantThemeSwitch } from "../lib/useInstantThemeSwitch";
 import { Host, Identity, SSHKey } from "../types";
+import { resolveGroupDefaults, applyGroupDefaults } from "../domain/groupConfig";
 import { useSftpFileAssociations } from "../application/state/useSftpFileAssociations";
 import { toast } from "./ui/toast";

@@ -51,6 +52,7 @@ interface SftpViewProps {
  hosts: Host[];
  keys: SSHKey[];
  identities: Identity[];
+  groupConfigs?: import('../domain/models').GroupConfig[];
  updateHosts: (hosts: Host[]) => void;
  sftpDefaultViewMode: "list" | "tree";
  sftpDoubleClickBehavior: "open" | "transfer";
@@ -67,6 +69,7 @@ const SftpViewInner: React.FC<SftpViewProps> = ({
  hosts,
  keys,
  identities,
+  groupConfigs = [],
  updateHosts,
  sftpDefaultViewMode,
  sftpDoubleClickBehavior,
@@ -104,7 +107,17 @@ const SftpViewInner: React.FC<SftpViewProps> = ({
    defaultShowHiddenFiles: sftpShowHiddenFiles,
  }), [fileWatchHandlers, sftpUseCompressedUpload, sftpShowHiddenFiles]);

-  const sftp = useSftpState(hosts, keys, identities, sftpOptions);
+  // Pre-resolve group defaults so SFTP connections inherit group config
+  const effectiveHosts = useMemo(() =>
+    hosts.map(h => {
+      if (!h.group) return h;
+      const defaults = resolveGroupDefaults(h.group, groupConfigs);
+      return applyGroupDefaults(h, defaults);
+    }),
+    [hosts, groupConfigs],
+  );
+
+  const sftp = useSftpState(effectiveHosts, keys, identities, sftpOptions);

  // Get backend helpers for file downloads and local filesystem writes.
  const {
@@ -471,6 +484,7 @@ const sftpViewAreEqual = (prev: SftpViewProps, next: SftpViewProps): boolean =>
  prev.hosts === next.hosts &&
  prev.keys === next.keys &&
  prev.identities === next.identities &&
+  prev.groupConfigs === next.groupConfigs &&
  prev.sftpDefaultViewMode === next.sftpDefaultViewMode &&
  prev.sftpDoubleClickBehavior === next.sftpDoubleClickBehavior &&
  prev.sftpAutoSync === next.sftpAutoSync &&
--- a/components/Terminal.tsx
+++ b/components/Terminal.tsx
@@ -44,6 +44,8 @@ import { TerminalToolbar } from "./terminal/TerminalToolbar";
 import { TerminalComposeBar } from "./terminal/TerminalComposeBar";
 import { TerminalContextMenu } from "./terminal/TerminalContextMenu";
 import { TerminalSearchBar } from "./terminal/TerminalSearchBar";
+import { ZmodemProgressIndicator } from "./terminal/ZmodemProgressIndicator";
+import { useZmodemTransfer } from "./terminal/hooks/useZmodemTransfer";
 import { createTerminalSessionStarters, type PendingAuth } from "./terminal/runtime/createTerminalSessionStarters";
 import { createXTermRuntime, type XTermRuntime } from "./terminal/runtime/createXTermRuntime";
 import { XTERM_PERFORMANCE_CONFIG } from "../infrastructure/config/xtermPerformance";
@@ -500,6 +502,27 @@ const TerminalComponent: React.FC<TerminalProps> = ({
    isVisible,
  });

+  const zmodem = useZmodemTransfer(sessionId);
+
+  const zmodemToastedRef = useRef(false);
+  useEffect(() => {
+    if (zmodem.active) {
+      zmodemToastedRef.current = false;
+      return;
+    }
+    if (zmodemToastedRef.current) return;
+    if (zmodem.error) {
+      zmodemToastedRef.current = true;
+      toast.error(zmodem.error, 'ZMODEM');
+    } else if (zmodem.filename) {
+      zmodemToastedRef.current = true;
+      toast.success(
+        `${zmodem.transferType === 'upload' ? 'Uploaded' : 'Downloaded'}: ${zmodem.filename}`,
+        'ZMODEM',
+      );
+    }
+  }, [zmodem.active, zmodem.error, zmodem.filename, zmodem.transferType]);
+
  useEffect(() => {
    if (!error) {
      lastToastedErrorRef.current = null;
@@ -1092,6 +1115,26 @@ const TerminalComponent: React.FC<TerminalProps> = ({
    return () => clearTimeout(timer);
  }, [inWorkspace, isVisible]);

+  // When search bar opens/closes, re-fit terminal and maintain scroll position
+  useEffect(() => {
+    const term = termRef.current;
+    if (!term || !fitAddonRef.current) return;
+    const buffer = term.buffer.active;
+    const wasAtBottom = buffer.viewportY >= buffer.baseY;
+    const prevViewportY = buffer.viewportY;
+    const timer = setTimeout(() => {
+      safeFit({ force: true, requireVisible: true });
+      requestAnimationFrame(() => {
+        if (wasAtBottom) {
+          term.scrollToBottom();
+        } else {
+          term.scrollToLine(prevViewportY);
+        }
+      });
+    }, 0);
+    return () => clearTimeout(timer);
+  }, [isSearchOpen]);
+
  useEffect(() => {
    const shouldAutoFocus = isVisible && termRef.current && (!inWorkspace || isFocusMode);
    if (shouldAutoFocus) {
@@ -1549,7 +1592,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
        )}
        <div className="absolute left-0 right-0 top-0 z-20 pointer-events-none">
          <div
-            className="flex items-center gap-1 px-2 py-0.5 backdrop-blur-md pointer-events-auto min-w-0 border-b-[0.5px]"
+            className="flex items-center gap-1 px-2 py-0.5 backdrop-blur-md pointer-events-auto min-w-0"
            style={{
              backgroundColor: 'var(--terminal-ui-bg)',
              color: 'var(--terminal-ui-fg)',
@@ -2048,6 +2091,22 @@ const TerminalComponent: React.FC<TerminalProps> = ({
                }}
              />
            )}
+
+          {/* ZMODEM transfer progress indicator */}
+          {zmodem.active && (
+            <div className="absolute bottom-4 right-4 z-[25] pointer-events-auto">
+              <ZmodemProgressIndicator
+                transferType={zmodem.transferType}
+                filename={zmodem.filename}
+                transferred={zmodem.transferred}
+                total={zmodem.total}
+                fileIndex={zmodem.fileIndex}
+                fileCount={zmodem.fileCount}
+                finalizing={zmodem.finalizing}
+                onCancel={zmodem.cancel}
+              />
+            </div>
+          )}
        </div>

        {/* Compose Bar (solo sessions only; workspace uses TerminalLayer's global bar) */}
--- a/components/TerminalLayer.tsx
+++ b/components/TerminalLayer.tsx
@@ -29,7 +29,8 @@ import { useStoredNumber } from '../application/state/useStoredNumber';
 import { STORAGE_KEY_SIDE_PANEL_WIDTH } from '../infrastructure/config/storageKeys';
 import { buildCacheKey } from '../application/state/sftp/sharedRemoteHostCache';
 import type { DropEntry } from '../lib/sftpFileUtils';
-import { Host, Identity, KnownHost, SSHKey, Snippet, TerminalSession, TerminalTheme, Workspace, WorkspaceNode } from '../types';
+import { GroupConfig, Host, Identity, KnownHost, SSHKey, Snippet, TerminalSession, TerminalTheme, Workspace, WorkspaceNode } from '../types';
+import { resolveGroupDefaults, applyGroupDefaults } from '../domain/groupConfig';
 import { DistroAvatar } from './DistroAvatar';
 import Terminal from './Terminal';
 import { SftpSidePanel } from './SftpSidePanel';
@@ -338,6 +339,7 @@ AIChatPanelsHost.displayName = 'AIChatPanelsHost';

 interface TerminalLayerProps {
  hosts: Host[];
+  groupConfigs: GroupConfig[];
  keys: SSHKey[];
  identities: Identity[];
  snippets: Snippet[];
@@ -391,6 +393,7 @@ interface TerminalLayerProps {

 const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
  hosts,
+  groupConfigs,
  keys,
  identities,
  snippets,
@@ -770,8 +773,14 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
  const sessionHostsMap = useMemo(() => {
    const map = new Map<string, Host>();
    for (const session of sessions) {
-      const existingHost = hostMap.get(session.hostId);
-      if (existingHost) {
+      const rawHost = hostMap.get(session.hostId);
+      if (rawHost) {
+        // Apply group config defaults so Terminal sees the merged host
+        const groupDefaults = rawHost.group
+          ? resolveGroupDefaults(rawHost.group, groupConfigs)
+          : {};
+        const existingHost = applyGroupDefaults(rawHost, groupDefaults);
+
        const protocol = session.protocol ?? existingHost.protocol;
        const port = session.port ?? existingHost.port;
        const moshEnabled = session.moshEnabled ?? existingHost.moshEnabled;
@@ -808,7 +817,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
      }
    }
    return map;
-  }, [sessions, hostMap]);
+  }, [sessions, hostMap, groupConfigs]);
  const sessionChainHostsMap = useMemo(() => {
    const map = new Map<string, Host[]>();
    for (const session of sessions) {
@@ -817,12 +826,19 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
      map.set(
        session.id,
        host.hostChain.hostIds
-          .map((hostId) => hostMap.get(hostId))
+          .map((hostId) => {
+            const rawChainHost = hostMap.get(hostId);
+            if (!rawChainHost) return undefined;
+            const chainGroupDefaults = rawChainHost.group
+              ? resolveGroupDefaults(rawChainHost.group, groupConfigs)
+              : {};
+            return applyGroupDefaults(rawChainHost, chainGroupDefaults);
+          })
          .filter((value): value is Host => Boolean(value)),
      );
    }
    return map;
-  }, [sessions, sessionHostsMap, hostMap]);
+  }, [sessions, sessionHostsMap, hostMap, groupConfigs]);

  const validTerminalTabIds = useMemo(() => {
    const ids = new Set<string>();
@@ -1368,7 +1384,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
  const focusedFontSizeOverridden = hasHostFontSizeOverride(focusedHost);
  const activeTopTabsThemeId = activeSidePanelTab === 'theme' && previewTargetSessionId
    ? (activeThemePreviewId ?? focusedThemeId)
-    : null;
+    : (isVisible ? focusedThemeId : null);
  const appliedPreviewSessionRef = useRef<string | null>(null);
  const customThemes = useCustomThemes();
  const applyTerminalPreviewVars = useCallback((sessionId: string | null, themeId: string | null) => {
@@ -1460,9 +1476,9 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
  }, [activeTopTabsThemeId, applyTopTabsPreviewVars]);

  useEffect(() => {
+    const panelOpen = activeSidePanelTab === 'theme' && !!previewTargetSessionId;
    const shouldKeepPreview =
-      activeSidePanelTab === 'theme' &&
-      !!previewTargetSessionId &&
+      panelOpen &&
      !!themePreview.targetSessionId &&
      !!themePreview.themeId;

@@ -1473,8 +1489,6 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
      clearTerminalPreviewVars(appliedSessionId);
      appliedPreviewSessionRef.current = null;
    }
-    clearTopTabsPreviewVars();
-
    if (themePreview.targetSessionId || themePreview.themeId) {
      setThemePreview({ targetSessionId: null, themeId: null });
    }
--- a/components/ThemeList.tsx
+++ b/components/ThemeList.tsx
@@ -0,0 +1,124 @@
+/**
+ * Shared theme list component used by both ThemeSelectPanel and ThemeSelectModal
+ */
+import React, { memo, useMemo } from 'react';
+import { Check } from 'lucide-react';
+import { useI18n } from '../application/i18n/I18nProvider';
+import { TERMINAL_THEMES } from '../infrastructure/config/terminalThemes';
+import { useCustomThemes } from '../application/state/customThemeStore';
+import { cn } from '../lib/utils';
+import { TerminalTheme } from '../types';
+
+// Memoized theme item component
+export const ThemeItem = memo(({
+    theme,
+    isSelected,
+    onSelect
+}: {
+    theme: TerminalTheme;
+    isSelected: boolean;
+    onSelect: (id: string) => void;
+}) => (
+    <button
+        onClick={() => onSelect(theme.id)}
+        className={cn(
+            'w-full flex items-center gap-3 px-3 py-2.5 text-left transition-all',
+            isSelected
+                ? 'bg-primary/10'
+                : 'hover:bg-muted'
+        )}
+    >
+        {/* Color swatch preview */}
+        <div
+            className="w-12 h-8 rounded-[4px] flex-shrink-0 flex flex-col justify-center items-start pl-1.5 gap-0.5 border border-border/50"
+            style={{ backgroundColor: theme.colors.background }}
+        >
+            <div className="h-1 w-4 rounded-full" style={{ backgroundColor: theme.colors.green }} />
+            <div className="h-1 w-6 rounded-full" style={{ backgroundColor: theme.colors.blue }} />
+            <div className="h-1 w-3 rounded-full" style={{ backgroundColor: theme.colors.yellow }} />
+        </div>
+        <div className="flex-1 min-w-0">
+            <div className={cn('text-sm font-medium truncate', isSelected ? 'text-primary' : 'text-foreground')}>
+                {theme.name}
+            </div>
+            <div className="text-[10px] text-muted-foreground capitalize">{theme.type}</div>
+        </div>
+        {isSelected && (
+            <Check size={16} className="text-primary flex-shrink-0" />
+        )}
+    </button>
+));
+ThemeItem.displayName = 'ThemeItem';
+
+interface ThemeListProps {
+    selectedThemeId: string;
+    onSelect: (themeId: string) => void;
+}
+
+export const ThemeList: React.FC<ThemeListProps> = ({ selectedThemeId, onSelect }) => {
+    const { t } = useI18n();
+    const customThemes = useCustomThemes();
+
+    const { darkThemes, lightThemes } = useMemo(() => {
+        const dark = TERMINAL_THEMES.filter(t => t.type === 'dark');
+        const light = TERMINAL_THEMES.filter(t => t.type === 'light');
+        return { darkThemes: dark, lightThemes: light };
+    }, []);
+
+    return (
+        <>
+            {/* Dark Themes Section */}
+            <div className="mb-4">
+                <div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-2 font-semibold px-3">
+                    {t('settings.terminal.themeModal.darkThemes')}
+                </div>
+                <div className="space-y-1">
+                    {darkThemes.map(theme => (
+                        <ThemeItem
+                            key={theme.id}
+                            theme={theme}
+                            isSelected={selectedThemeId === theme.id}
+                            onSelect={onSelect}
+                        />
+                    ))}
+                </div>
+            </div>
+
+            {/* Light Themes Section */}
+            <div>
+                <div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-2 font-semibold px-3">
+                    {t('settings.terminal.themeModal.lightThemes')}
+                </div>
+                <div className="space-y-1">
+                    {lightThemes.map(theme => (
+                        <ThemeItem
+                            key={theme.id}
+                            theme={theme}
+                            isSelected={selectedThemeId === theme.id}
+                            onSelect={onSelect}
+                        />
+                    ))}
+                </div>
+            </div>
+
+            {/* Custom Themes Section */}
+            {customThemes.length > 0 && (
+                <div className="mt-4">
+                    <div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-2 font-semibold px-3">
+                        {t('terminal.customTheme.section')}
+                    </div>
+                    <div className="space-y-1">
+                        {customThemes.map(theme => (
+                            <ThemeItem
+                                key={theme.id}
+                                theme={theme}
+                                isSelected={selectedThemeId === theme.id}
+                                onSelect={onSelect}
+                            />
+                        ))}
+                    </div>
+                </div>
+            )}
+        </>
+    );
+};
--- a/components/ThemeSelectPanel.tsx
+++ b/components/ThemeSelectPanel.tsx
@@ -1,13 +1,10 @@
-import React, { useMemo, useState } from 'react';
-import { TERMINAL_THEMES } from '../infrastructure/config/terminalThemes';
-import { useCustomThemes } from '../application/state/customThemeStore';
-import { cn } from '../lib/utils';
-import { TerminalTheme } from '../types';
+import React from 'react';
 import {
    AsidePanel,
    AsidePanelContent,
 } from './ui/aside-panel';
 import { ScrollArea } from './ui/scroll-area';
+import { ThemeList } from './ThemeList';

 interface ThemeSelectPanelProps {
    open: boolean;
@@ -18,40 +15,6 @@ interface ThemeSelectPanelProps {
    showBackButton?: boolean;
 }

-// Mini terminal preview component
-const TerminalPreview: React.FC<{ theme: TerminalTheme; isSelected: boolean }> = ({
-    theme,
-    isSelected
-}) => {
-    return (
-        <div
-            className={cn(
-                "w-16 h-10 rounded-md overflow-hidden border-2 flex-shrink-0",
-                isSelected ? "border-primary" : "border-transparent"
-            )}
-            style={{ backgroundColor: theme.colors.background }}
-        >
-            <div className="p-1 text-[4px] font-mono leading-tight" style={{ color: theme.colors.foreground }}>
-                <div>
-                    <span style={{ color: theme.colors.green }}>$</span>{' '}
-                    <span style={{ color: theme.colors.cyan }}>ls</span>
-                </div>
-                <div className="flex gap-0.5 flex-wrap">
-                    <span style={{ color: theme.colors.blue }}>dir/</span>
-                    <span style={{ color: theme.colors.green }}>file</span>
-                </div>
-                <div>
-                    <span style={{ color: theme.colors.green }}>$</span>{' '}
-                    <span
-                        className="inline-block w-1 h-1.5"
-                        style={{ backgroundColor: theme.colors.cursor }}
-                    />
-                </div>
-            </div>
-        </div>
-    );
-};
-
 const ThemeSelectPanel: React.FC<ThemeSelectPanelProps> = ({
    open,
    selectedThemeId,
@@ -60,51 +23,6 @@ const ThemeSelectPanel: React.FC<ThemeSelectPanelProps> = ({
    onBack,
    showBackButton = true,
 }) => {
-    // Reserved for future hover preview feature
-    const [_hoveredThemeId, setHoveredThemeId] = useState<string | null>(null);
-
-    const customThemes = useCustomThemes();
-
-    // All themes combined
-    const allThemes = useMemo(() => {
-        return [...TERMINAL_THEMES, ...customThemes];
-    }, [customThemes]);
-
-    const renderThemeItem = (theme: TerminalTheme) => {
-        const isSelected = theme.id === selectedThemeId;
-
-        return (
-            <button
-                key={theme.id}
-                className={cn(
-                    "w-full flex items-center gap-3 px-3 py-2.5 rounded-lg transition-colors text-left",
-                    isSelected
-                        ? "bg-primary/10"
-                        : "hover:bg-secondary/50"
-                )}
-                onClick={() => onSelect(theme.id)}
-                onMouseEnter={() => setHoveredThemeId(theme.id)}
-                onMouseLeave={() => setHoveredThemeId(null)}
-            >
-                <TerminalPreview theme={theme} isSelected={isSelected} />
-                <div className="flex-1 min-w-0">
-                    <div className={cn(
-                        "text-sm font-medium truncate",
-                        isSelected && "text-primary"
-                    )}>
-                        {theme.name}
-                    </div>
-                    {theme.id === 'netcatty-dark' && (
-                        <div className="text-xs text-muted-foreground">Default</div>
-                    )}
-                    {theme.id === 'netcatty-light' && (
-                        <div className="text-xs text-muted-foreground">Light mode</div>
-                    )}
-                </div>
-            </button>
-        );
-    };
-
    return (
        <AsidePanel
            open={open}
@@ -116,8 +34,10 @@ const ThemeSelectPanel: React.FC<ThemeSelectPanelProps> = ({
            <AsidePanelContent className="p-0">
                <ScrollArea className="h-full">
                    <div className="py-2">
-                        {/* All themes in a single list */}
-                        {allThemes.map(renderThemeItem)}
+                        <ThemeList
+                            selectedThemeId={selectedThemeId || ''}
+                            onSelect={onSelect}
+                        />
                    </div>
                </ScrollArea>
            </AsidePanelContent>
--- a/components/TopTabs.tsx
+++ b/components/TopTabs.tsx
@@ -522,7 +522,7 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
                {activeTabId === session.id && (
                  <div
                    className="absolute top-0 left-0 right-0 h-[2px]"
-                    style={{ backgroundColor: 'var(--top-tabs-fg, hsl(var(--foreground)))' }}
+                    style={{ backgroundColor: 'var(--top-tabs-accent, hsl(var(--accent)))' }}
                  />
                )}
                {/* Drop indicator line - before */}
@@ -621,7 +621,7 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
                {isActive && (
                  <div
                    className="absolute top-0 left-0 right-0 h-[2px]"
-                    style={{ backgroundColor: 'var(--top-tabs-fg, hsl(var(--foreground)))' }}
+                    style={{ backgroundColor: 'var(--top-tabs-accent, hsl(var(--accent)))' }}
                  />
                )}
                {/* Drop indicator line - before */}
--- a/components/TrayPanel.tsx
+++ b/components/TrayPanel.tsx
@@ -10,6 +10,7 @@ import { I18nProvider } from "../application/i18n/I18nProvider";
 import { useSettingsState } from "../application/state/useSettingsState";
 import { useTrayPanelBackend } from "../application/state/useTrayPanelBackend";
 import { useActiveTabId } from "../application/state/activeTabStore";
+import { resolveGroupDefaults, applyGroupDefaults } from "../domain/groupConfig";
 import { X, Maximize2, ChevronRight, ChevronDown, Power } from "lucide-react";
 import { AppLogo } from "./AppLogo";

@@ -116,7 +117,7 @@ const TrayPanelContent: React.FC = () => {
    onTrayPanelMenuData,
  } = useTrayPanelBackend();

-  const { hosts, keys, identities } = useVaultState();
+  const { hosts, keys, identities, groupConfigs } = useVaultState();
  useSessionState();
  const { rules: portForwardingRules, startTunnel, stopTunnel } = usePortForwardingState();
  const activeTabId = useActiveTabId();
@@ -326,14 +327,17 @@ const TrayPanelContent: React.FC = () => {
                    disabled={isConnecting}
                    title={label}
                    onClick={() => {
-                      const host = rule.hostId ? hosts.find((h) => h.id === rule.hostId) : undefined;
-                      if (!host) {
+                      const rawHost = rule.hostId ? hosts.find((h) => h.id === rule.hostId) : undefined;
+                      if (!rawHost) {
                        toast.error(t("pf.error.hostNotFound"));
                        return;
                      }
                      if (isActive) {
                        void stopTunnel(rule.id);
                      } else {
+                        const host = rawHost.group
+                          ? applyGroupDefaults(rawHost, resolveGroupDefaults(rawHost.group, groupConfigs))
+                          : rawHost;
                        void startTunnel(rule, host, hosts, keys, identities, (status, error) => {
                          if (status === "error" && error) toast.error(error);
                        }, rule.autoStart);
--- a/components/VaultView.tsx
+++ b/components/VaultView.tsx
@@ -4,6 +4,7 @@ import {
  CheckSquare,
  ChevronDown,
  ClipboardCopy,
+  Clock,
  Copy,
  Download,
  Edit2,
@@ -15,11 +16,13 @@ import {
  LayoutGrid,
  List,
  Network,
+  Pin,
  Plug,
  Plus,
  Search,
  Settings,
  Square,
+  Star,
  TerminalSquare,
  Trash2,
  Upload,
@@ -27,19 +30,21 @@ import {
  X,
  Zap,
 } from "lucide-react";
-import React, { Suspense, lazy, memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, { Suspense, lazy, memo, startTransition, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { useStoredViewMode } from "../application/state/useStoredViewMode";
 import { useStoredBoolean } from "../application/state/useStoredBoolean";
 import { useTreeExpandedState } from "../application/state/useTreeExpandedState";
+import { resolveGroupDefaults, applyGroupDefaults } from "../domain/groupConfig";
 import { getEffectiveHostDistro, sanitizeHost } from "../domain/host";
 import { importVaultHostsFromText, exportHostsToCsvWithStats } from "../domain/vaultImport";
 import type { VaultImportFormat } from "../domain/vaultImport";
-import { STORAGE_KEY_VAULT_HOSTS_VIEW_MODE, STORAGE_KEY_VAULT_HOSTS_TREE_EXPANDED, STORAGE_KEY_VAULT_SIDEBAR_COLLAPSED } from "../infrastructure/config/storageKeys";
+import { STORAGE_KEY_VAULT_HOSTS_VIEW_MODE, STORAGE_KEY_VAULT_HOSTS_TREE_EXPANDED, STORAGE_KEY_VAULT_SIDEBAR_COLLAPSED, STORAGE_KEY_SHOW_RECENT_HOSTS } from "../infrastructure/config/storageKeys";
 import { cn } from "../lib/utils";
 import { useInstantThemeSwitch } from "../lib/useInstantThemeSwitch";
 import {
  ConnectionLog,
+  GroupConfig,
  GroupNode,
  Host,
  HostProtocol,
@@ -54,6 +59,7 @@ import {
 } from "../types";
 import { AppLogo } from "./AppLogo";
 import { DistroAvatar } from "./DistroAvatar";
+import GroupDetailsPanel from "./GroupDetailsPanel";
 import HostDetailsPanel from "./HostDetailsPanel";
 import { HostTreeView } from "./HostTreeView";
 import KeychainManager from "./KeychainManager";
@@ -135,6 +141,8 @@ interface VaultViewProps {
  onClearUnsavedConnectionLogs: () => void;
  onOpenLogView: (log: ConnectionLog) => void;
  onRunSnippet?: (snippet: Snippet, targetHosts: Host[]) => void;
+  groupConfigs: GroupConfig[];
+  onUpdateGroupConfigs: (configs: GroupConfig[]) => void;
  // Optional: navigate to a specific section on mount or when changed
  navigateToSection?: VaultSection | null;
  onNavigateToSectionHandled?: () => void;
@@ -179,11 +187,15 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
  onClearUnsavedConnectionLogs,
  onOpenLogView,
  onRunSnippet,
+  groupConfigs,
+  onUpdateGroupConfigs,
  navigateToSection,
  onNavigateToSectionHandled,
 }) => {
  const { t } = useI18n();
  const rootRef = useRef<HTMLDivElement>(null);
+  const hostsRef = useRef(hosts);
+  hostsRef.current = hosts;
  const [currentSection, setCurrentSection] = useState<VaultSection>("hosts");
  const [search, setSearch] = useState("");
  const [selectedGroupPath, setSelectedGroupPath] = useState<string | null>(
@@ -210,6 +222,13 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
    false,
  );

+  const [isBreadcrumbDragOver, setIsBreadcrumbDragOver] = useState(false);
+
+  const [showRecentHosts, _setShowRecentHosts] = useStoredBoolean(
+    STORAGE_KEY_SHOW_RECENT_HOSTS,
+    true,
+  );
+
  // Handle external navigation requests
  useEffect(() => {
    if (navigateToSection) {
@@ -234,6 +253,17 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
  const [editingHost, setEditingHost] = useState<Host | null>(null);
  const [newHostGroupPath, setNewHostGroupPath] = useState<string | null>(null);

+  // Group panel state
+  const [isGroupPanelOpen, setIsGroupPanelOpen] = useState(false);
+  const [editingGroupPath, setEditingGroupPath] = useState<string | null>(null);
+
+  // Compute inherited group defaults for the host being edited
+  const editingHostGroupDefaults = useMemo(() => {
+    const group = editingHost?.group || newHostGroupPath || selectedGroupPath;
+    if (!group) return undefined;
+    return resolveGroupDefaults(group, groupConfigs);
+  }, [editingHost, newHostGroupPath, selectedGroupPath, groupConfigs]);
+
  // Quick connect state
  const [quickConnectTarget, setQuickConnectTarget] = useState<{
    hostname: string;
@@ -278,30 +308,37 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
    [isSearchQuickConnect, handleConnectClick],
  );

-  // Check if host has multiple protocols enabled
+  // Check if host has multiple protocols enabled (using effective/resolved host)
  const hasMultipleProtocols = useCallback((host: Host) => {
+    const effective = host.group
+      ? applyGroupDefaults(host, resolveGroupDefaults(host.group, groupConfigs))
+      : host;
    let count = 0;
    // SSH is always available as base protocol (unless explicitly set to something else)
-    if (host.protocol === "ssh" || !host.protocol) count++;
+    if (effective.protocol === "ssh" || !effective.protocol) count++;
    // Mosh adds another option
-    if (host.moshEnabled) count++;
+    if (effective.moshEnabled) count++;
    // Telnet adds another option
-    if (host.telnetEnabled) count++;
+    if (effective.telnetEnabled) count++;
    // If protocol is explicitly telnet (not ssh), count it
-    if (host.protocol === "telnet" && !host.telnetEnabled) count++;
+    if (effective.protocol === "telnet" && !effective.telnetEnabled) count++;
    return count > 1;
-  }, []);
+  }, [groupConfigs]);

  // Handle host connect with protocol selection
  const handleHostConnect = useCallback(
    (host: Host) => {
      if (hasMultipleProtocols(host)) {
-        setProtocolSelectHost(host);
+        // Pass effective host to protocol dialog so it shows correct ports/protocols
+        const effective = host.group
+          ? applyGroupDefaults(host, resolveGroupDefaults(host.group, groupConfigs))
+          : host;
+        setProtocolSelectHost(effective);
      } else {
        onConnect(host);
      }
    },
-    [hasMultipleProtocols, onConnect],
+    [hasMultipleProtocols, onConnect, groupConfigs],
  );

  // Handle protocol selection
@@ -342,12 +379,16 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
  );

  const handleNewHost = useCallback(() => {
+    setIsGroupPanelOpen(false);
+    setEditingGroupPath(null);
    setEditingHost(null);
    setNewHostGroupPath(null);
    setIsHostPanelOpen(true);
  }, []);

  const handleEditHost = useCallback((host: Host) => {
+    setIsGroupPanelOpen(false);
+    setEditingGroupPath(null);
    setEditingHost(host);
    setIsHostPanelOpen(true);
  }, []);
@@ -359,6 +400,8 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
      id: crypto.randomUUID(),
      label: `${host.label} (${t('action.copy')})`,
      createdAt: Date.now(),
+      pinned: undefined,
+      lastConnectedAt: undefined,
    };
    // Open the edit panel with the duplicated host for modification
    setEditingHost(duplicatedHost);
@@ -398,38 +441,42 @@ const VaultViewInner: React.FC<VaultViewProps> = ({

  // Copy host credentials to clipboard
  const handleCopyCredentials = useCallback((host: Host) => {
+    // Apply group defaults so inherited credentials are included
+    const effective = host.group
+      ? applyGroupDefaults(host, resolveGroupDefaults(host.group, groupConfigs))
+      : host;
    // Only use telnet-specific port and credentials when protocol is explicitly telnet
    // Don't treat telnetEnabled as primary - that's just an optional protocol
-    const isTelnet = host.protocol === "telnet";
+    const isTelnet = effective.protocol === "telnet";

    const defaultPort = isTelnet ? 23 : 22;
    const effectivePort = isTelnet
-      ? (host.telnetPort ?? host.port ?? 23)
-      : (host.port ?? 22);
+      ? (effective.telnetPort ?? effective.port ?? 23)
+      : (effective.port ?? 22);

    // Bracket IPv6 addresses when appending non-default port
    let address: string;
    if (effectivePort !== defaultPort) {
-      const isIPv6 = host.hostname.includes(":") && !host.hostname.startsWith("[");
-      const hostname = isIPv6 ? `[${host.hostname}]` : host.hostname;
+      const isIPv6 = effective.hostname.includes(":") && !effective.hostname.startsWith("[");
+      const hostname = isIPv6 ? `[${effective.hostname}]` : effective.hostname;
      address = `${hostname}:${effectivePort}`;
    } else {
-      address = host.hostname;
+      address = effective.hostname;
    }

    // Resolve credentials from identity if configured, otherwise use host credentials
    // For telnet hosts, use telnet-specific credentials
-    const identity = host.identityId
-      ? identities.find((i) => i.id === host.identityId)
+    const identity = effective.identityId
+      ? identities.find((i) => i.id === effective.identityId)
      : undefined;

    const username = isTelnet
-      ? (host.telnetUsername?.trim() || host.username?.trim())
-      : (identity?.username?.trim() || host.username?.trim());
+      ? (effective.telnetUsername?.trim() || effective.username?.trim())
+      : (identity?.username?.trim() || effective.username?.trim());

    const password = isTelnet
-      ? (host.telnetPassword || host.password)
-      : (identity?.password || host.password);
+      ? (effective.telnetPassword || effective.password)
+      : (identity?.password || effective.password);

    if (!password) {
      toast.warning(t('vault.hosts.copyCredentials.toast.noPassword'));
@@ -440,7 +487,19 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
    navigator.clipboard.writeText(text).then(() => {
      toast.success(t('vault.hosts.copyCredentials.toast.success'));
    });
-  }, [identities, t]);
+  }, [identities, groupConfigs, t]);
+
+  const [lastPinnedId, setLastPinnedId] = useState<string | null>(null);
+  const toggleHostPinned = useCallback((hostId: string) => {
+    const host = hostsRef.current.find((h) => h.id === hostId);
+    const isPinning = host && !host.pinned;
+    startTransition(() => {
+      onUpdateHosts(hostsRef.current.map((h) =>
+        h.id === hostId ? { ...h, pinned: !h.pinned } : h
+      ));
+    });
+    setLastPinnedId(isPinning ? hostId : null);
+  }, [onUpdateHosts]);

  const toggleHostSelection = useCallback((hostId: string) => {
    setSelectedHostIds(prev => {
@@ -826,6 +885,63 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
    return filtered;
  }, [hosts, selectedGroupPath, search, selectedTags, sortMode]);

+  // Pinned hosts for root-level display (not inside a subgroup)
+  // Respects active search and tag filters
+  const pinnedHosts = useMemo(() => {
+    if (selectedGroupPath) return [];
+    let filtered = hosts.filter((h) => h.pinned);
+    if (search.trim()) {
+      const s = search.toLowerCase();
+      filtered = filtered.filter(
+        (h) =>
+          h.label.toLowerCase().includes(s) ||
+          h.hostname.toLowerCase().includes(s) ||
+          h.tags.some((t) => t.toLowerCase().includes(s)),
+      );
+    }
+    if (selectedTags.length > 0) {
+      filtered = filtered.filter((h) =>
+        selectedTags.some((t) => h.tags?.includes(t)),
+      );
+    }
+    return filtered.sort((a, b) => a.label.localeCompare(b.label));
+  }, [hosts, selectedGroupPath, search, selectedTags]);
+
+  // Recently connected hosts for root-level display
+  // Respects active search and tag filters
+  const recentHosts = useMemo(() => {
+    if (selectedGroupPath) return [];
+    let filtered = hosts.filter((h) => h.lastConnectedAt);
+    if (search.trim()) {
+      const s = search.toLowerCase();
+      filtered = filtered.filter(
+        (h) =>
+          h.label.toLowerCase().includes(s) ||
+          h.hostname.toLowerCase().includes(s) ||
+          h.tags.some((t) => t.toLowerCase().includes(s)),
+      );
+    }
+    if (selectedTags.length > 0) {
+      filtered = filtered.filter((h) =>
+        selectedTags.some((t) => h.tags?.includes(t)),
+      );
+    }
+    return filtered
+      .sort((a, b) => (b.lastConnectedAt || 0) - (a.lastConnectedAt || 0))
+      .slice(0, 20);
+  }, [hosts, selectedGroupPath, search, selectedTags]);
+
+  // IDs of hosts already shown in Pinned/Recent sections at root level,
+  // so the main host list can exclude them to avoid duplicates.
+  const pinnedRecentIds = useMemo(() => {
+    const ids = new Set<string>();
+    for (const h of pinnedHosts) ids.add(h.id);
+    if (showRecentHosts) {
+      for (const h of recentHosts) ids.add(h.id);
+    }
+    return ids;
+  }, [pinnedHosts, recentHosts, showRecentHosts]);
+
  // For tree view: apply search, tag filter, and sorting, but not group filtering
  const treeViewHosts = useMemo(() => {
    let filtered = hosts;
@@ -1118,6 +1234,68 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
    setIsRenameGroupOpen(false);
  };

+  const handleEditGroupConfig = useCallback((groupPath: string) => {
+    setIsHostPanelOpen(false);
+    setEditingHost(null);
+    setEditingGroupPath(groupPath);
+    setIsGroupPanelOpen(true);
+  }, []);
+
+  const handleSaveGroupConfig = useCallback((config: GroupConfig, _newName?: string, _newParent?: string | null) => {
+    const oldPath = editingGroupPath!;
+    const newPath = config.path; // Panel already computed the correct path
+
+    // Validate no duplicate path on rename/reparent
+    if (newPath !== oldPath && customGroups.includes(newPath)) {
+      toast.error(t('vault.groups.errors.duplicatePath'));
+      return;
+    }
+
+    // Save config (use new path)
+    const updatedConfigs = [...groupConfigs.filter(c => c.path !== oldPath), config];
+
+    // Handle path change (rename or parent change)
+    if (newPath !== oldPath) {
+      // Update groups, hosts, managed sources, and configs for path change
+      const updatedGroups = customGroups.map((g) => {
+        if (g === oldPath) return newPath;
+        if (g.startsWith(oldPath + '/')) return newPath + g.slice(oldPath.length);
+        return g;
+      });
+      const updatedHosts = hosts.map((h) => {
+        const g = h.group || '';
+        if (g === oldPath) return { ...h, group: newPath };
+        if (g.startsWith(oldPath + '/')) return { ...h, group: newPath + g.slice(oldPath.length) };
+        return h;
+      });
+      const updatedManagedSources = managedSources.map((s) => {
+        if (s.groupName === oldPath) return { ...s, groupName: newPath };
+        if (s.groupName.startsWith(oldPath + '/')) return { ...s, groupName: newPath + s.groupName.slice(oldPath.length) };
+        return s;
+      });
+      if (updatedManagedSources.some((s, i) => s !== managedSources[i])) {
+        onUpdateManagedSources(updatedManagedSources);
+      }
+      onUpdateCustomGroups(Array.from(new Set(updatedGroups)));
+      onUpdateHosts(updatedHosts);
+      // Update child config paths too
+      const finalConfigs = updatedConfigs.map(c => {
+        if (c.path.startsWith(oldPath + '/')) return { ...c, path: newPath + c.path.slice(oldPath.length) };
+        return c;
+      });
+      onUpdateGroupConfigs(finalConfigs);
+      if (selectedGroupPath === oldPath) setSelectedGroupPath(newPath);
+      if (selectedGroupPath?.startsWith(oldPath + '/')) {
+        setSelectedGroupPath(newPath + selectedGroupPath.slice(oldPath.length));
+      }
+    } else {
+      onUpdateGroupConfigs(updatedConfigs);
+    }
+
+    setIsGroupPanelOpen(false);
+    setEditingGroupPath(null);
+  }, [groupConfigs, editingGroupPath, customGroups, hosts, managedSources, selectedGroupPath, onUpdateGroupConfigs, onUpdateCustomGroups, onUpdateHosts, onUpdateManagedSources, t]);
+
  const deleteGroupPath = async (path: string, deleteHosts: boolean = false) => {
    const keepGroups = customGroups.filter(
      (g) => !(g === path || g.startsWith(path + "/")),
@@ -1172,6 +1350,13 @@ const VaultViewInner: React.FC<VaultViewProps> = ({

    onUpdateCustomGroups(keepGroups);
    onUpdateHosts(keepHosts);
+    // Remove configs for deleted group and its children
+    const updatedGroupConfigs = groupConfigs.filter(
+      (c) => c.path !== path && !c.path.startsWith(path + '/')
+    );
+    if (updatedGroupConfigs.length !== groupConfigs.length) {
+      onUpdateGroupConfigs(updatedGroupConfigs);
+    }
    if (
      selectedGroupPath &&
      (selectedGroupPath === path || selectedGroupPath.startsWith(path + "/"))
@@ -1184,23 +1369,27 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
    const name = sourcePath.split("/").filter(Boolean).pop() || "";
    const newPath = targetParent ? `${targetParent}/${name}` : name;
    if (newPath === sourcePath || newPath.startsWith(sourcePath + "/")) return;
+    if (customGroups.includes(newPath)) {
+      toast.error(t('vault.groups.errors.duplicatePath'));
+      return;
+    }
    const updatedGroups = customGroups.map((g) => {
      if (g === sourcePath) return newPath;
-      if (g.startsWith(sourcePath + "/")) return g.replace(sourcePath, newPath);
+      if (g.startsWith(sourcePath + "/")) return newPath + g.slice(sourcePath.length);
      return g;
    });
    const updatedHosts = hosts.map((h) => {
      const g = h.group || "";
      if (g === sourcePath) return { ...h, group: newPath };
      if (g.startsWith(sourcePath + "/"))
-        return { ...h, group: g.replace(sourcePath, newPath) };
+        return { ...h, group: newPath + g.slice(sourcePath.length) };
      return h;
    });
    // Update managed sources if any match the moved group path
    const updatedManagedSources = managedSources.map((s) => {
      if (s.groupName === sourcePath) return { ...s, groupName: newPath };
      if (s.groupName.startsWith(sourcePath + "/"))
-        return { ...s, groupName: s.groupName.replace(sourcePath, newPath) };
+        return { ...s, groupName: newPath + s.groupName.slice(sourcePath.length) };
      return s;
    });
    if (updatedManagedSources.some((s, i) => s !== managedSources[i])) {
@@ -1208,6 +1397,16 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
    }
    onUpdateCustomGroups(Array.from(new Set(updatedGroups)));
    onUpdateHosts(updatedHosts);
+    // Update group configs for moved paths
+    const updatedGroupConfigs = groupConfigs.map((c) => {
+      if (c.path === sourcePath) return { ...c, path: newPath };
+      if (c.path.startsWith(sourcePath + '/'))
+        return { ...c, path: newPath + c.path.slice(sourcePath.length) };
+      return c;
+    });
+    if (updatedGroupConfigs.some((c, i) => c !== groupConfigs[i])) {
+      onUpdateGroupConfigs(updatedGroupConfigs);
+    }
    if (
      selectedGroupPath &&
      (selectedGroupPath === sourcePath ||
@@ -1639,8 +1838,24 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                  {viewMode !== "tree" && (
                    <div className="flex items-center gap-2 text-sm font-semibold">
                      <button
-                        className="text-primary hover:underline"
+                        className={cn(
+                          "text-primary hover:underline transition-all rounded px-1 -mx-1",
+                          isBreadcrumbDragOver && "ring-2 ring-primary bg-primary/10",
+                        )}
                        onClick={() => setSelectedGroupPath(null)}
+                        onDragOver={(e) => {
+                          e.preventDefault();
+                          setIsBreadcrumbDragOver(true);
+                        }}
+                        onDragLeave={() => setIsBreadcrumbDragOver(false)}
+                        onDrop={(e) => {
+                          e.preventDefault();
+                          setIsBreadcrumbDragOver(false);
+                          const groupPath = e.dataTransfer.getData("group-path");
+                          const hostId = e.dataTransfer.getData("host-id");
+                          if (groupPath) moveGroup(groupPath, null);
+                          if (hostId) moveHostToGroup(hostId, null);
+                        }}
                      >
                        {t("vault.hosts.allHosts")}
                      </button>
@@ -1674,6 +1889,201 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                          })}
                    </div>
                  )}
+                  {/* Pinned hosts section - only at root level */}
+                  {viewMode !== "tree" && !selectedGroupPath && pinnedHosts.length > 0 && (
+                    <section className="space-y-2 mb-4">
+                      <h3 className="text-sm font-semibold text-muted-foreground inline-flex items-center gap-1.5">
+                        <Pin size={14} className="shrink-0 -translate-y-[1px]" />
+                        {t("vault.hosts.pinned")}
+                      </h3>
+                      <div className={cn(
+                        viewMode === "grid"
+                          ? "grid gap-3 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4"
+                          : "flex flex-col gap-0",
+                      )}>
+                        {pinnedHosts.map((host) => {
+                          const safeHost = sanitizeHost(host);
+                          const effectiveDistro = getEffectiveHostDistro(safeHost);
+                          const distroBadge = {
+                            text: (safeHost.os || "L")[0].toUpperCase(),
+                            label: effectiveDistro || safeHost.os || "Linux",
+                          };
+                          return (
+                            <ContextMenu key={host.id}>
+                              <ContextMenuTrigger>
+                                <div
+                                  className={cn(
+                                    "group cursor-pointer relative",
+                                    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",
+                                  )}
+                                  style={lastPinnedId === host.id ? { animation: "pop-in 0.4s cubic-bezier(0.34, 1.56, 0.64, 1) both" } : undefined}
+                                  onAnimationEnd={() => { if (lastPinnedId === host.id) setLastPinnedId(null); }}
+                                  draggable={!isMultiSelectMode}
+                                  onDragStart={(e) => {
+                                    e.dataTransfer.effectAllowed = "move";
+                                    e.dataTransfer.setData("host-id", host.id);
+                                  }}
+                                  onClick={() => {
+                                    if (isMultiSelectMode) {
+                                      toggleHostSelection(host.id);
+                                    } else {
+                                      handleHostConnect(safeHost);
+                                    }
+                                  }}
+                                >
+                                  {viewMode === "grid" && (
+                                    <Star size={10} className="absolute top-1.5 right-1.5 text-amber-400 fill-amber-400" />
+                                  )}
+                                  <div className="flex items-center gap-3 h-full">
+                                    {isMultiSelectMode && (
+                                      <div className="shrink-0">
+                                        {selectedHostIds.has(host.id) ? (
+                                          <CheckSquare size={18} className="text-primary" />
+                                        ) : (
+                                          <Square size={18} className="text-muted-foreground" />
+                                        )}
+                                      </div>
+                                    )}
+                                    <DistroAvatar host={safeHost} fallback={distroBadge.text} />
+                                    <div className="min-w-0 flex flex-col justify-center gap-0.5 flex-1">
+                                      <span className="text-sm font-semibold truncate leading-5">
+                                        {safeHost.label}
+                                      </span>
+                                      <div className="text-[11px] text-muted-foreground font-mono truncate leading-4">
+                                        {safeHost.username}@{safeHost.hostname}
+                                      </div>
+                                    </div>
+                                    <Button
+                                      variant="ghost"
+                                      size="icon"
+                                      className="h-8 w-8 opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
+                                      onClick={(e) => {
+                                        e.stopPropagation();
+                                        handleEditHost(host);
+                                      }}
+                                    >
+                                      <Edit2 size={14} />
+                                    </Button>
+                                  </div>
+                                </div>
+                              </ContextMenuTrigger>
+                              <ContextMenuContent>
+                                <ContextMenuItem onClick={() => handleHostConnect(host)}>
+                                  <Plug className="mr-2 h-4 w-4" /> {t('vault.hosts.connect')}
+                                </ContextMenuItem>
+                                <ContextMenuItem onClick={() => handleEditHost(host)}>
+                                  <Edit2 className="mr-2 h-4 w-4" /> {t('action.edit')}
+                                </ContextMenuItem>
+                                <ContextMenuItem onClick={() => toggleHostPinned(host.id)}>
+                                  <Pin className="mr-2 h-4 w-4" /> {t('vault.hosts.unpin')}
+                                </ContextMenuItem>
+                                <ContextMenuItem className="text-destructive" onClick={() => onDeleteHost(host.id)}>
+                                  <Trash2 className="mr-2 h-4 w-4" /> {t('action.delete')}
+                                </ContextMenuItem>
+                              </ContextMenuContent>
+                            </ContextMenu>
+                          );
+                        })}
+                      </div>
+                    </section>
+                  )}
+                  {/* Recently Connected section - only at root level, toggleable */}
+                  {viewMode !== "tree" && !selectedGroupPath && showRecentHosts && recentHosts.length > 0 && (
+                    <section className="space-y-2 mb-4">
+                      <h3 className="text-sm font-semibold text-muted-foreground inline-flex items-center gap-1.5">
+                        <Clock size={14} className="shrink-0 -translate-y-[1px]" />
+                        {t("vault.hosts.recentlyConnected")}
+                      </h3>
+                      <div className={cn(
+                        viewMode === "grid"
+                          ? "grid gap-3 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4"
+                          : "flex flex-col gap-0",
+                      )}>
+                        {recentHosts.map((host) => {
+                          const safeHost = sanitizeHost(host);
+                          const effectiveDistro = getEffectiveHostDistro(safeHost);
+                          const distroBadge = {
+                            text: (safeHost.os || "L")[0].toUpperCase(),
+                            label: effectiveDistro || safeHost.os || "Linux",
+                          };
+                          return (
+                            <ContextMenu key={host.id}>
+                              <ContextMenuTrigger>
+                                <div
+                                  className={cn(
+                                    "group cursor-pointer relative",
+                                    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",
+                                  )}
+                                  draggable={!isMultiSelectMode}
+                                  onDragStart={(e) => {
+                                    e.dataTransfer.effectAllowed = "move";
+                                    e.dataTransfer.setData("host-id", host.id);
+                                  }}
+                                  onClick={() => {
+                                    if (isMultiSelectMode) {
+                                      toggleHostSelection(host.id);
+                                    } else {
+                                      handleHostConnect(safeHost);
+                                    }
+                                  }}
+                                >
+                                  <div className="flex items-center gap-3 h-full">
+                                    {isMultiSelectMode && (
+                                      <div className="shrink-0">
+                                        {selectedHostIds.has(host.id) ? (
+                                          <CheckSquare size={18} className="text-primary" />
+                                        ) : (
+                                          <Square size={18} className="text-muted-foreground" />
+                                        )}
+                                      </div>
+                                    )}
+                                    <DistroAvatar host={safeHost} fallback={distroBadge.text} />
+                                    <div className="min-w-0 flex flex-col justify-center gap-0.5 flex-1">
+                                      <span className="text-sm font-semibold truncate leading-5">
+                                        {safeHost.label}
+                                      </span>
+                                      <div className="text-[11px] text-muted-foreground font-mono truncate leading-4">
+                                        {safeHost.username}@{safeHost.hostname}
+                                      </div>
+                                    </div>
+                                    <Button
+                                      variant="ghost"
+                                      size="icon"
+                                      className="h-8 w-8 opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
+                                      onClick={(e) => {
+                                        e.stopPropagation();
+                                        handleEditHost(host);
+                                      }}
+                                    >
+                                      <Edit2 size={14} />
+                                    </Button>
+                                  </div>
+                                </div>
+                              </ContextMenuTrigger>
+                              <ContextMenuContent>
+                                <ContextMenuItem onClick={() => handleHostConnect(host)}>
+                                  <Plug className="mr-2 h-4 w-4" /> {t('vault.hosts.connect')}
+                                </ContextMenuItem>
+                                <ContextMenuItem onClick={() => handleEditHost(host)}>
+                                  <Edit2 className="mr-2 h-4 w-4" /> {t('action.edit')}
+                                </ContextMenuItem>
+                                <ContextMenuItem onClick={() => toggleHostPinned(host.id)}>
+                                  <Pin className="mr-2 h-4 w-4" /> {host.pinned ? t('vault.hosts.unpin') : t('vault.hosts.pinToTop')}
+                                </ContextMenuItem>
+                                <ContextMenuItem className="text-destructive" onClick={() => onDeleteHost(host.id)}>
+                                  <Trash2 className="mr-2 h-4 w-4" /> {t('action.delete')}
+                                </ContextMenuItem>
+                              </ContextMenuContent>
+                            </ContextMenu>
+                          );
+                        })}
+                      </div>
+                    </section>
+                  )}
                  {viewMode !== "tree" && displayedGroups.length > 0 && (
                    <div className="flex items-center justify-between">
                      <h3 className="text-sm font-semibold text-muted-foreground">
@@ -1756,6 +2166,17 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                    {t("vault.groups.hostsCount", { count: node.totalHostCount ?? node.hosts.length })}
                                  </div>
                                </div>
+                                <Button
+                                  variant="ghost"
+                                  size="icon"
+                                  className="h-8 w-8 opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
+                                  onClick={(e) => {
+                                    e.stopPropagation();
+                                    handleEditGroupConfig(node.path);
+                                  }}
+                                >
+                                  <Edit2 size={14} />
+                                </Button>
                              </div>
                            </div>
                          </ContextMenuTrigger>
@@ -1770,14 +2191,9 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                              <FolderPlus className="mr-2 h-4 w-4" /> {t("vault.groups.newSubgroup")}
                            </ContextMenuItem>
                            <ContextMenuItem
-                              onClick={() => {
-                                setRenameTargetPath(node.path);
-                                setRenameGroupName(node.name);
-                                setRenameGroupError(null);
-                                setIsRenameGroupOpen(true);
-                              }}
+                              onClick={() => handleEditGroupConfig(node.path)}
                            >
-                              <Edit2 className="mr-2 h-4 w-4" /> {t("vault.groups.rename")}
+                              <Edit2 className="mr-2 h-4 w-4" /> {t("vault.groups.settings")}
                            </ContextMenuItem>
                            <ContextMenuItem
                              className="text-destructive"
@@ -1867,6 +2283,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                      onDuplicateHost={handleDuplicateHost}
                      onDeleteHost={(host) => onDeleteHost(host.id)}
                      onCopyCredentials={handleCopyCredentials}
+
                      onNewHost={(groupPath) => {
                        setEditingHost(null);
                        setNewHostGroupPath(groupPath || null);
@@ -1877,13 +2294,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                        setNewFolderName("");
                        setIsNewFolderOpen(true);
                      }}
-                      onEditGroup={(groupPath) => {
-                        setRenameTargetPath(groupPath);
-                        const groupName = groupPath.split('/').pop() || '';
-                        setRenameGroupName(groupName);
-                        setRenameGroupError(null);
-                        setIsRenameGroupOpen(true);
-                      }}
+                      onEditGroup={(groupPath) => handleEditGroupConfig(groupPath)}
                      onDeleteGroup={(groupPath) => {
                        setDeleteTargetPath(groupPath);
                        setIsDeleteGroupOpen(true);
@@ -1906,7 +2317,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                {group.name || t("vault.groups.ungrouped")}
                              </span>
                              <span className="text-xs text-muted-foreground/60">
-                                ({group.hosts.length})
+                                ({selectedGroupPath ? group.hosts.length : group.hosts.filter((h) => !pinnedRecentIds.has(h.id)).length})
                              </span>
                            </div>
                            <div
@@ -1916,7 +2327,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                  : "flex flex-col gap-0",
                              )}
                            >
-                              {group.hosts.map((host) => {
+                              {group.hosts.filter((h) => selectedGroupPath || !pinnedRecentIds.has(h.id)).map((host) => {
                                const safeHost = sanitizeHost(host);
                                const effectiveDistro = getEffectiveHostDistro(safeHost);
                                const distroBadge = {
@@ -1928,7 +2339,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                    <ContextMenuTrigger>
                                      <div
                                        className={cn(
-                                          "group cursor-pointer",
+                                          "group cursor-pointer relative",
                                          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",
@@ -1946,6 +2357,9 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                          }
                                        }}
                                      >
+                                        {host.pinned && viewMode === "grid" && (
+                                          <Star size={10} className="absolute top-1.5 right-1.5 text-amber-400 fill-amber-400" />
+                                        )}
                                        <div className="flex items-center gap-3 h-full">
                                          {isMultiSelectMode && (
                                            <div
@@ -1981,21 +2395,17 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                              {safeHost.username}@{safeHost.hostname}
                                            </div>
                                          </div>
-                                          {viewMode === "list" && (
-                                            <>
-                                              <Button
-                                                variant="ghost"
-                                                size="icon"
-                                                className="h-8 w-8 opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
-                                                onClick={(e) => {
-                                                  e.stopPropagation();
-                                                  handleEditHost(host);
-                                                }}
-                                              >
-                                                <Edit2 size={14} />
-                                              </Button>
-                                            </>
-                                          )}
+                                          <Button
+                                            variant="ghost"
+                                            size="icon"
+                                            className="h-8 w-8 opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
+                                            onClick={(e) => {
+                                              e.stopPropagation();
+                                              handleEditHost(host);
+                                            }}
+                                          >
+                                            <Edit2 size={14} />
+                                          </Button>
                                        </div>
                                      </div>
                                    </ContextMenuTrigger>
@@ -2020,6 +2430,9 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                      >
                                        <ClipboardCopy className="mr-2 h-4 w-4" /> {t('vault.hosts.copyCredentials')}
                                      </ContextMenuItem>
+                                      <ContextMenuItem onClick={() => toggleHostPinned(host.id)}>
+                                        <Pin className="mr-2 h-4 w-4" /> {host.pinned ? t('vault.hosts.unpin') : t('vault.hosts.pinToTop')}
+                                      </ContextMenuItem>
                                      <ContextMenuItem
                                        className="text-destructive"
                                        onClick={() => onDeleteHost(host.id)}
@@ -2055,7 +2468,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                          : "flex flex-col gap-0",
                      )}
                    >
-                      {displayedHosts.map((host) => {
+                      {displayedHosts.filter((h) => selectedGroupPath || !pinnedRecentIds.has(h.id)).map((host) => {
                          const safeHost = sanitizeHost(host);
                          const effectiveDistro = getEffectiveHostDistro(safeHost);
                          const distroBadge = {
@@ -2067,7 +2480,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                              <ContextMenuTrigger>
                                <div
                                  className={cn(
-                                    "group cursor-pointer",
+                                    "group cursor-pointer relative",
                                    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",
@@ -2085,6 +2498,9 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                    }
                                  }}
                                >
+                                  {host.pinned && viewMode === "grid" && (
+                                    <Star size={10} className="absolute top-1.5 right-1.5 text-amber-400 fill-amber-400" />
+                                  )}
                                  <div className="flex items-center gap-3 h-full">
                                    {isMultiSelectMode && (
                                      <div
@@ -2120,21 +2536,17 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                        {safeHost.username}@{safeHost.hostname}
                                      </div>
                                    </div>
-                                    {viewMode === "list" && (
-                                      <>
-                                        <Button
-                                          variant="ghost"
-                                          size="icon"
-                                          className="h-8 w-8 opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
-                                          onClick={(e) => {
-                                            e.stopPropagation();
-                                            handleEditHost(host);
-                                          }}
-                                        >
-                                          <Edit2 size={14} />
-                                        </Button>
-                                      </>
-                                    )}
+                                    <Button
+                                      variant="ghost"
+                                      size="icon"
+                                      className="h-8 w-8 opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
+                                      onClick={(e) => {
+                                        e.stopPropagation();
+                                        handleEditHost(host);
+                                      }}
+                                    >
+                                      <Edit2 size={14} />
+                                    </Button>
                                  </div>
                                </div>
                              </ContextMenuTrigger>
@@ -2159,6 +2571,9 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
                                >
                                  <ClipboardCopy className="mr-2 h-4 w-4" /> {t('vault.hosts.copyCredentials')}
                                </ContextMenuItem>
+                                <ContextMenuItem onClick={() => toggleHostPinned(host.id)}>
+                                  <Pin className="mr-2 h-4 w-4" /> {host.pinned ? t('vault.hosts.unpin') : t('vault.hosts.pinToTop')}
+                                </ContextMenuItem>
                                <ContextMenuItem
                                  className="text-destructive"
                                  onClick={() => onDeleteHost(host.id)}
@@ -2268,6 +2683,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
            identities={identities}
            customGroups={customGroups}
            managedSources={managedSources}
+            groupConfigs={groupConfigs}
            onSaveHost={(host) => onUpdateHosts([...hosts, host])}
            onCreateGroup={(groupPath) =>
              onUpdateCustomGroups(
@@ -2299,6 +2715,26 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
        )}
      </div>

+      {/* Group Details Panel */}
+      {currentSection === "hosts" && isGroupPanelOpen && editingGroupPath && (
+        <GroupDetailsPanel
+          key={editingGroupPath}
+          groupPath={editingGroupPath}
+          config={groupConfigs.find(c => c.path === editingGroupPath)}
+          availableKeys={keys}
+          identities={identities}
+          allHosts={hosts}
+          groups={allGroupPaths}
+          terminalThemeId={terminalThemeId}
+          terminalFontSize={terminalFontSize}
+          onSave={handleSaveGroupConfig}
+          onCancel={() => {
+            setIsGroupPanelOpen(false);
+            setEditingGroupPath(null);
+          }}
+        />
+      )}
+
      {/* Host Details Panel - positioned at VaultView root level for correct top alignment */}
      {currentSection === "hosts" && isHostPanelOpen && editingHost?.protocol !== 'serial' && (
        <HostDetailsPanel
@@ -2312,6 +2748,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
          defaultGroup={editingHost ? undefined : (newHostGroupPath || selectedGroupPath)}
          terminalThemeId={terminalThemeId}
          terminalFontSize={terminalFontSize}
+          groupDefaults={editingHostGroupDefaults}
          onSave={(host) => {
            // Check if host already exists in the list (for updates vs. new/duplicate)
            const hostExists = hosts.some((h) => h.id === host.id);
@@ -2578,6 +3015,7 @@ const vaultViewAreEqual = (
    prev.connectionLogs === next.connectionLogs &&
    prev.sessions === next.sessions &&
    prev.managedSources === next.managedSources &&
+    prev.groupConfigs === next.groupConfigs &&
    prev.terminalThemeId === next.terminalThemeId &&
    prev.terminalFontSize === next.terminalFontSize;

--- a/components/host-details/ChainPanel.tsx
+++ b/components/host-details/ChainPanel.tsx
@@ -2,14 +2,15 @@
 * Host Chain Sub-Panel
 * Panel for configuring SSH jump host chain
 */
-import { ArrowDown,Plus,X } from 'lucide-react';
-import React from 'react';
+import { ArrowDown,Plus,Search,X } from 'lucide-react';
+import React, { useMemo, useState } from 'react';
 import { useI18n } from '../../application/i18n/I18nProvider';
 import { Host } from '../../types';
 import { DistroAvatar } from '../DistroAvatar';
 import { AsidePanel } from '../ui/aside-panel';
 import { Button } from '../ui/button';
 import { Card } from '../ui/card';
+import { Input } from '../ui/input';
 import { ScrollArea } from '../ui/scroll-area';

 export interface ChainPanelProps {
@@ -38,6 +39,14 @@ export const ChainPanel: React.FC<ChainPanelProps> = ({
    onCancel,
 }) => {
    const { t } = useI18n();
+    const [searchQuery, setSearchQuery] = useState('');
+    const filteredHosts = useMemo(() => {
+        if (!searchQuery.trim()) return availableHostsForChain;
+        const q = searchQuery.toLowerCase();
+        return availableHostsForChain.filter(
+            (host) => host.label.toLowerCase().includes(q) || host.hostname.toLowerCase().includes(q)
+        );
+    }, [availableHostsForChain, searchQuery]);
    return (
        <AsidePanel
            open={true}
@@ -52,16 +61,7 @@ export const ChainPanel: React.FC<ChainPanelProps> = ({
            }
        >
            <ScrollArea className="flex-1">
-                <div className="p-4 space-y-4">
-                    <Card className="p-3 space-y-3 bg-card border-border/80">
-                        <p className="text-xs text-muted-foreground">
-                            {t('hostDetails.chain.desc', { host: formLabel || formHostname })}
-                        </p>
-                        <Button className="w-full h-10" onClick={() => { }}>
-                            <Plus size={14} className="mr-2" /> {t('hostDetails.chain.addHost')}
-                        </Button>
-                    </Card>
-
+                <div className="p-4 space-y-4 w-0 min-w-full">
                    {/* Chain visualization */}
                    <div className="space-y-2">
                        {chainedHosts.map((host, index) => (
@@ -73,7 +73,7 @@ export const ChainPanel: React.FC<ChainPanelProps> = ({
                                )}
                                <div className="flex items-center gap-2 p-2 rounded-lg border border-border/60 bg-card">
                                    <DistroAvatar host={host} fallback={host.label.slice(0, 2).toUpperCase()} className="h-8 w-8" />
-                                    <span className="text-sm font-medium flex-1">{host.label || host.hostname}</span>
+                                    <span className="text-sm font-medium flex-1 min-w-0 truncate">{host.label || host.hostname}</span>
                                    <Button
                                        variant="ghost"
                                        size="icon"
@@ -110,11 +110,20 @@ export const ChainPanel: React.FC<ChainPanelProps> = ({
                    {availableHostsForChain.length > 0 && (
                        <Card className="p-3 bg-card border-border/80">
                            <p className="text-xs font-semibold text-muted-foreground mb-2">{t('hostDetails.chain.availableHosts')}</p>
+                            <div className="relative mb-2">
+                                <Search size={14} className="absolute left-2.5 top-1/2 -translate-y-1/2 text-muted-foreground" />
+                                <Input
+                                    value={searchQuery}
+                                    onChange={(e) => setSearchQuery(e.target.value)}
+                                    placeholder={t('common.searchPlaceholder')}
+                                    className="h-8 pl-8 text-sm"
+                                />
+                            </div>
                            <div className="space-y-1">
-                                {availableHostsForChain.map((host) => (
+                                {filteredHosts.map((host) => (
                                    <button
                                        key={host.id}
-                                        className="w-full flex items-center gap-2 p-2 rounded-md hover:bg-secondary transition-colors text-left"
+                                        className="w-full flex items-center gap-2 p-2 rounded-md hover:bg-secondary transition-colors text-left overflow-hidden"
                                        onClick={() => onAddHost(host.id)}
                                    >
                                        <DistroAvatar host={host} fallback={host.label.slice(0, 2).toUpperCase()} className="h-8 w-8" />
--- a/components/settings/ThemeSelectModal.tsx
+++ b/components/settings/ThemeSelectModal.tsx
@@ -3,55 +3,12 @@
 * A modal dialog for selecting terminal themes in settings
 */

-import React, { memo, useCallback, useMemo } from 'react';
+import React, { useCallback } from 'react';
 import { createPortal } from 'react-dom';
-import { Check, Palette, X } from 'lucide-react';
+import { Palette, X } from 'lucide-react';
 import { useI18n } from '../../application/i18n/I18nProvider';
-import { TERMINAL_THEMES, TerminalThemeConfig } from '../../infrastructure/config/terminalThemes';
-import { useCustomThemes } from '../../application/state/customThemeStore';
 import { Button } from '../ui/button';
-import { cn } from '../../lib/utils';
-
-// Memoized theme item component to prevent unnecessary re-renders
-const ThemeItem = memo(({
-    theme,
-    isSelected,
-    onSelect
-}: {
-    theme: TerminalThemeConfig;
-    isSelected: boolean;
-    onSelect: (id: string) => void;
-}) => (
-    <button
-        onClick={() => onSelect(theme.id)}
-        className={cn(
-            'w-full flex items-center gap-3 px-3 py-2.5 rounded-lg text-left transition-all',
-            isSelected
-                ? 'bg-primary/15 ring-1 ring-primary'
-                : 'hover:bg-muted'
-        )}
-    >
-        {/* Color swatch preview */}
-        <div
-            className="w-12 h-8 rounded-md flex-shrink-0 flex flex-col justify-center items-start pl-1.5 gap-0.5 border border-border/50"
-            style={{ backgroundColor: theme.colors.background }}
-        >
-            <div className="h-1 w-4 rounded-full" style={{ backgroundColor: theme.colors.green }} />
-            <div className="h-1 w-6 rounded-full" style={{ backgroundColor: theme.colors.blue }} />
-            <div className="h-1 w-3 rounded-full" style={{ backgroundColor: theme.colors.yellow }} />
-        </div>
-        <div className="flex-1 min-w-0">
-            <div className={cn('text-sm font-medium truncate', isSelected ? 'text-primary' : 'text-foreground')}>
-                {theme.name}
-            </div>
-            <div className="text-[10px] text-muted-foreground capitalize">{theme.type}</div>
-        </div>
-        {isSelected && (
-            <Check size={16} className="text-primary flex-shrink-0" />
-        )}
-    </button>
-));
-ThemeItem.displayName = 'ThemeItem';
+import { ThemeList } from '../ThemeList';

 interface ThemeSelectModalProps {
    open: boolean;
@@ -68,15 +25,6 @@ export const ThemeSelectModal: React.FC<ThemeSelectModalProps> = ({
 }) => {
    const { t } = useI18n();

-    // Group themes by type
-    const { darkThemes, lightThemes } = useMemo(() => {
-        const dark = TERMINAL_THEMES.filter(t => t.type === 'dark');
-        const light = TERMINAL_THEMES.filter(t => t.type === 'light');
-        return { darkThemes: dark, lightThemes: light };
-    }, []);
-
-    const customThemes = useCustomThemes();
-
    // Handle theme selection - select and close
    const handleThemeSelect = useCallback((themeId: string) => {
        onSelect(themeId);
@@ -134,58 +82,10 @@ export const ThemeSelectModal: React.FC<ThemeSelectModalProps> = ({

                {/* Theme List */}
                <div className="flex-1 min-h-0 overflow-y-auto p-4">
-                    {/* Dark Themes Section */}
-                    <div className="mb-4">
-                        <div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-2 font-semibold px-1">
-                            {t('settings.terminal.themeModal.darkThemes')}
-                        </div>
-                        <div className="space-y-1">
-                            {darkThemes.map(theme => (
-                                <ThemeItem
-                                    key={theme.id}
-                                    theme={theme}
-                                    isSelected={selectedThemeId === theme.id}
-                                    onSelect={handleThemeSelect}
-                                />
-                            ))}
-                        </div>
-                    </div>
-
-                    {/* Light Themes Section */}
-                    <div>
-                        <div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-2 font-semibold px-1">
-                            {t('settings.terminal.themeModal.lightThemes')}
-                        </div>
-                        <div className="space-y-1">
-                            {lightThemes.map(theme => (
-                                <ThemeItem
-                                    key={theme.id}
-                                    theme={theme}
-                                    isSelected={selectedThemeId === theme.id}
-                                    onSelect={handleThemeSelect}
-                                />
-                            ))}
-                        </div>
-                    </div>
-
-                    {/* Custom Themes Section */}
-                    {customThemes.length > 0 && (
-                        <div className="mt-4">
-                            <div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-2 font-semibold px-1">
-                                {t('terminal.customTheme.section')}
-                            </div>
-                            <div className="space-y-1">
-                                {customThemes.map(theme => (
-                                    <ThemeItem
-                                        key={theme.id}
-                                        theme={theme}
-                                        isSelected={selectedThemeId === theme.id}
-                                        onSelect={handleThemeSelect}
-                                    />
-                                ))}
-                            </div>
-                        </div>
-                    )}
+                    <ThemeList
+                        selectedThemeId={selectedThemeId}
+                        onSelect={handleThemeSelect}
+                    />
                </div>

                {/* Footer */}
--- a/components/settings/tabs/SettingsAppearanceTab.tsx
+++ b/components/settings/tabs/SettingsAppearanceTab.tsx
@@ -7,6 +7,8 @@ import { SUPPORTED_UI_LOCALES } from "../../../infrastructure/config/i18n";
 import { cn } from "../../../lib/utils";
 import { SectionHeader, SettingsTabContent, SettingRow, Toggle, Select } from "../settings-ui";
 import { FontSelect } from "../FontSelect";
+import { STORAGE_KEY_SHOW_RECENT_HOSTS } from "../../../infrastructure/config/storageKeys";
+import { useStoredBoolean } from "../../../application/state/useStoredBoolean";

 export default function SettingsAppearanceTab(props: {
  theme: "dark" | "light" | "system";
@@ -25,8 +27,6 @@ export default function SettingsAppearanceTab(props: {
  setUiLanguage: (language: string) => void;
  customCSS: string;
  setCustomCSS: (css: string) => void;
-  isImmersive?: boolean;
-  onToggleImmersive?: () => void;
 }) {
  const { t } = useI18n();
  const availableUIFonts = useAvailableUIFonts();
@@ -47,10 +47,13 @@ export default function SettingsAppearanceTab(props: {
    setUiLanguage,
    customCSS,
    setCustomCSS,
-    isImmersive,
-    onToggleImmersive,
  } = props;

+  const [showRecentHosts, setShowRecentHosts] = useStoredBoolean(
+    STORAGE_KEY_SHOW_RECENT_HOSTS,
+    true,
+  );
+
  const getHslStyle = useCallback((hsl: string) => ({ backgroundColor: `hsl(${hsl})` }), []);

  const hexToHsl = useCallback((hex: string) => {
@@ -258,16 +261,13 @@ export default function SettingsAppearanceTab(props: {
        </SettingRow>
      </div>

-      <SectionHeader title={t("settings.appearance.immersiveMode")} />
+      <SectionHeader title={t("settings.vault.title")} />
      <div className="space-y-0 divide-y divide-border rounded-lg border bg-card px-4">
        <SettingRow
-          label={t("settings.appearance.immersiveMode")}
-          description={t("settings.appearance.immersiveMode.desc")}
+          label={t('settings.vault.showRecentHosts')}
+          description={t('settings.vault.showRecentHostsDesc')}
        >
-          <Toggle
-            checked={!!isImmersive}
-            onChange={() => onToggleImmersive?.()}
-          />
+          <Toggle checked={showRecentHosts} onChange={setShowRecentHosts} />
        </SettingRow>
      </div>

--- a/components/settings/tabs/SettingsTerminalTab.tsx
+++ b/components/settings/tabs/SettingsTerminalTab.tsx
@@ -7,7 +7,7 @@ import type {
  TerminalEmulationType,
  TerminalSettings,
 } from "../../../domain/models";
-import { DEFAULT_KEYWORD_HIGHLIGHT_RULES } from "../../../domain/models";
+import { DEFAULT_KEYWORD_HIGHLIGHT_RULES, type KeywordHighlightRule } from "../../../domain/models";
 import { useI18n } from "../../../application/i18n/I18nProvider";
 import { MAX_FONT_SIZE, MIN_FONT_SIZE, type TerminalFont } from "../../../infrastructure/config/fonts";
 import { TERMINAL_THEMES } from "../../../infrastructure/config/terminalThemes";
@@ -15,6 +15,7 @@ import { customThemeStore, useCustomThemes } from "../../../application/state/cu
 import { parseItermcolors } from "../../../infrastructure/parsers/itermcolorsParser";
 import { cn } from "../../../lib/utils";
 import { Button } from "../../ui/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "../../ui/dialog";
 import { Input } from "../../ui/input";
 import { Label } from "../../ui/label";
 import { SectionHeader, Select, SettingsTabContent, SettingRow, Toggle } from "../settings-ui";
@@ -23,6 +24,193 @@ import { TerminalFontSelect } from "../TerminalFontSelect";
 import { CustomThemeModal } from "../../terminal/CustomThemeModal";
 import type { TerminalTheme } from "../../../domain/models";

+// Keyword highlight rules editor for global settings
+const DEFAULT_NEW_RULE_COLOR = '#F87171';
+
+const AddCustomRuleDialog: React.FC<{
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  editRule?: KeywordHighlightRule | null;
+  onAdd: (rule: KeywordHighlightRule) => void;
+}> = ({ open, onOpenChange, editRule, onAdd }) => {
+  const { t } = useI18n();
+  const [label, setLabel] = useState('');
+  const [pattern, setPattern] = useState('');
+  const [color, setColor] = useState(DEFAULT_NEW_RULE_COLOR);
+  const [patternError, setPatternError] = useState<string | null>(null);
+
+  const reset = () => { setLabel(''); setPattern(''); setColor(DEFAULT_NEW_RULE_COLOR); setPatternError(null); };
+
+  // Populate form when editing
+  useEffect(() => {
+    if (open && editRule) {
+      setLabel(editRule.label);
+      setPattern(editRule.patterns[0] || '');
+      setColor(editRule.color);
+      setPatternError(null);
+    } else if (!open) {
+      reset();
+    }
+  }, [open, editRule]);
+
+  const handleSubmit = () => {
+    if (!label.trim() || !pattern.trim()) return;
+    try { new RegExp(pattern, 'gi'); } catch {
+      setPatternError(t('settings.terminal.keywordHighlight.invalidPattern'));
+      return;
+    }
+    // When editing, replace only the first pattern and keep any additional ones
+    const patterns = editRule
+      ? [pattern, ...editRule.patterns.slice(1)]
+      : [pattern];
+    onAdd({ id: editRule?.id ?? crypto.randomUUID(), label: label.trim(), patterns, color, enabled: editRule?.enabled ?? true });
+    reset();
+    onOpenChange(false);
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={(v) => { if (!v) reset(); onOpenChange(v); }}>
+      <DialogContent className="sm:max-w-[400px]">
+        <DialogHeader>
+          <DialogTitle>{editRule ? t('settings.terminal.keywordHighlight.editCustom') : t('settings.terminal.keywordHighlight.addCustom')}</DialogTitle>
+        </DialogHeader>
+        <div className="space-y-3 py-2">
+          <div className="space-y-1.5">
+            <Label className="text-xs">{t('settings.terminal.keywordHighlight.labelField')}</Label>
+            <div className="flex gap-2">
+              <Input
+                placeholder={t('settings.terminal.keywordHighlight.labelPlaceholder')}
+                value={label}
+                onChange={(e) => setLabel(e.target.value)}
+                className="flex-1"
+              />
+              <label className="relative flex-shrink-0">
+                <input type="color" value={color} onChange={(e) => setColor(e.target.value)} className="sr-only" />
+                <span className="block w-9 h-9 rounded-md cursor-pointer border border-border/50 hover:border-border" style={{ backgroundColor: color }} />
+              </label>
+            </div>
+          </div>
+          <div className="space-y-1.5">
+            <Label className="text-xs">{t('settings.terminal.keywordHighlight.patternField')}</Label>
+            <Input
+              placeholder={t('settings.terminal.keywordHighlight.patternPlaceholder')}
+              value={pattern}
+              onChange={(e) => { setPattern(e.target.value); if (patternError) setPatternError(null); }}
+              onKeyDown={(e) => { if (e.key === 'Enter') handleSubmit(); }}
+              className={cn("font-mono", patternError && "border-destructive")}
+            />
+            {patternError && <div className="text-xs text-destructive">{patternError}</div>}
+          </div>
+          {label.trim() && pattern.trim() && !patternError && (
+            <div className="flex items-center gap-2 p-2 rounded-md bg-muted/50">
+              <span className="text-xs text-muted-foreground">{t('settings.terminal.keywordHighlight.preview')}:</span>
+              <span className="text-sm font-medium" style={{ color }}>{label}</span>
+            </div>
+          )}
+        </div>
+        <DialogFooter>
+          <Button variant="outline" onClick={() => { reset(); onOpenChange(false); }}>{t('common.cancel')}</Button>
+          <Button onClick={handleSubmit} disabled={!label.trim() || !pattern.trim()}>{editRule ? t('common.save') : t('common.add')}</Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+const KeywordHighlightRulesEditor: React.FC<{
+  rules: KeywordHighlightRule[];
+  onChange: (rules: KeywordHighlightRule[]) => void;
+}> = ({ rules, onChange }) => {
+  const { t } = useI18n();
+  const [addDialogOpen, setAddDialogOpen] = useState(false);
+  const [editingRule, setEditingRule] = useState<KeywordHighlightRule | null>(null);
+
+  const isBuiltIn = (id: string) => DEFAULT_KEYWORD_HIGHLIGHT_RULES.some((r) => r.id === id);
+
+  return (
+    <div className="space-y-2.5">
+      {rules.map((rule) => {
+        const custom = !isBuiltIn(rule.id);
+        return (
+          <div key={rule.id} className="flex items-center gap-2 group">
+            <div className="flex-1 min-w-0 flex items-center gap-1.5">
+              <span className={cn("text-sm truncate", !rule.enabled && "text-muted-foreground line-through")} style={rule.enabled ? { color: rule.color } : undefined}>
+                {rule.label}
+              </span>
+              {custom && (
+                <>
+                  <Pencil
+                    size={10}
+                    className="flex-shrink-0 opacity-0 group-hover:opacity-100 transition-opacity text-muted-foreground cursor-pointer"
+                    onClick={() => { setEditingRule(rule); setAddDialogOpen(true); }}
+                  />
+                  <Trash2
+                    size={10}
+                    className="flex-shrink-0 opacity-0 group-hover:opacity-100 transition-opacity text-muted-foreground cursor-pointer"
+                    onClick={() => onChange(rules.filter((r) => r.id !== rule.id))}
+                  />
+                </>
+              )}
+            </div>
+            <label className="relative flex-shrink-0">
+              <input
+                type="color"
+                value={rule.color}
+                onChange={(e) => onChange(rules.map((r) => r.id === rule.id ? { ...r, color: e.target.value } : r))}
+                className="sr-only"
+              />
+              <span
+                className="block w-8 h-5 rounded cursor-pointer border border-border/50 hover:border-border transition-colors"
+                style={{ backgroundColor: rule.color }}
+              />
+            </label>
+          </div>
+        );
+      })}
+
+      <div className="flex pt-2 mt-2 border-t border-border/50">
+        <Button
+          variant="ghost"
+          size="sm"
+          className="flex-1 text-muted-foreground hover:text-foreground"
+          onClick={() => setAddDialogOpen(true)}
+        >
+          <Plus size={14} className="mr-1.5" />
+          {t('settings.terminal.keywordHighlight.addCustom')}
+        </Button>
+        <Button
+          variant="ghost"
+          size="sm"
+          className="flex-1 text-muted-foreground hover:text-foreground"
+          onClick={() => {
+            onChange(rules.map((rule) => {
+              const def = DEFAULT_KEYWORD_HIGHLIGHT_RULES.find((r) => r.id === rule.id);
+              return def ? { ...rule, color: def.color } : rule;
+            }));
+          }}
+        >
+          <RotateCcw size={14} className="mr-1.5" />
+          {t("settings.terminal.keywordHighlight.resetColors")}
+        </Button>
+      </div>
+
+      <AddCustomRuleDialog
+        open={addDialogOpen}
+        onOpenChange={(v) => { setAddDialogOpen(v); if (!v) setEditingRule(null); }}
+        editRule={editingRule}
+        onAdd={(rule) => {
+          if (editingRule) {
+            onChange(rules.map((r) => r.id === editingRule.id ? rule : r));
+          } else {
+            onChange([...rules, rule]);
+          }
+          setEditingRule(null);
+        }}
+      />
+    </div>
+  );
+};
+
 // Theme preview button component
 const ThemePreviewButton: React.FC<{
  theme: (typeof TERMINAL_THEMES)[0];
@@ -694,47 +882,10 @@ export default function SettingsTerminalTab(props: {
          />
        </div>
        {terminalSettings.keywordHighlightEnabled && (
-          <div className="space-y-2.5">
-            {terminalSettings.keywordHighlightRules.map((rule) => (
-              <div key={rule.id} className="flex items-center justify-between">
-                <span className="text-sm" style={{ color: rule.color }}>
-                  {rule.label}
-                </span>
-                <label className="relative">
-                  <input
-                    type="color"
-                    value={rule.color}
-                    onChange={(e) => {
-                      const newRules = terminalSettings.keywordHighlightRules.map((r) =>
-                        r.id === rule.id ? { ...r, color: e.target.value } : r,
-                      );
-                      updateTerminalSetting("keywordHighlightRules", newRules);
-                    }}
-                    className="sr-only"
-                  />
-                  <span
-                    className="block w-10 h-6 rounded-md cursor-pointer border border-border/50 hover:border-border transition-colors"
-                    style={{ backgroundColor: rule.color }}
-                  />
-                </label>
-              </div>
-            ))}
-            <Button
-              variant="ghost"
-              size="sm"
-              className="w-full mt-3 text-muted-foreground hover:text-foreground"
-              onClick={() => {
-                const resetRules = terminalSettings.keywordHighlightRules.map((rule) => {
-                  const defaultRule = DEFAULT_KEYWORD_HIGHLIGHT_RULES.find((r) => r.id === rule.id);
-                  return defaultRule ? { ...rule, color: defaultRule.color } : rule;
-                });
-                updateTerminalSetting("keywordHighlightRules", resetRules);
-              }}
-            >
-              <RotateCcw size={14} className="mr-2" />
-              {t("settings.terminal.keywordHighlight.resetColors")}
-            </Button>
-          </div>
+          <KeywordHighlightRulesEditor
+            rules={terminalSettings.keywordHighlightRules}
+            onChange={(rules) => updateTerminalSetting("keywordHighlightRules", rules)}
+          />
        )}
      </div>

--- a/components/terminal/ZmodemProgressIndicator.tsx
+++ b/components/terminal/ZmodemProgressIndicator.tsx
@@ -0,0 +1,79 @@
+import { ArrowDownToLine, ArrowUpFromLine, X } from 'lucide-react';
+import React from 'react';
+
+interface ZmodemProgressIndicatorProps {
+  transferType: 'upload' | 'download' | null;
+  filename: string | null;
+  transferred: number;
+  total: number;
+  fileIndex: number;
+  fileCount: number;
+  finalizing: boolean;
+  onCancel: () => void;
+}
+
+function formatBytes(bytes: number): string {
+  if (bytes <= 0) return '0 B';
+  const k = 1024;
+  const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
+  const i = Math.min(Math.floor(Math.log(bytes) / Math.log(k)), sizes.length - 1);
+  return `${(bytes / Math.pow(k, i)).toFixed(1)} ${sizes[i]}`;
+}
+
+export const ZmodemProgressIndicator: React.FC<ZmodemProgressIndicatorProps> = ({
+  transferType,
+  filename,
+  transferred,
+  total,
+  fileIndex,
+  fileCount,
+  finalizing,
+  onCancel,
+}) => {
+  const percent = total > 0 ? Math.min(100, Math.round((transferred / total) * 100)) : 0;
+  const Icon = transferType === 'upload' ? ArrowUpFromLine : ArrowDownToLine;
+  const label = finalizing ? 'Waiting for remote...' : transferType === 'upload' ? 'Uploading' : 'Downloading';
+  const fileInfo = fileCount > 0 ? ` (${fileIndex + 1}/${fileCount})` : '';
+
+  return (
+    <div
+      className="flex items-center gap-2.5 px-3 py-2 rounded-lg shadow-lg backdrop-blur-sm min-w-[240px] max-w-[360px]"
+      style={{
+        backgroundColor: 'color-mix(in srgb, var(--terminal-ui-bg, #000000) 90%, transparent)',
+        border: '1px solid color-mix(in srgb, var(--terminal-ui-fg, #ffffff) 15%, var(--terminal-ui-bg, #000000))',
+        color: 'var(--terminal-ui-fg, #ffffff)',
+      }}
+      onClick={(e) => e.stopPropagation()}
+      onMouseDown={(e) => e.stopPropagation()}
+    >
+      <Icon className="h-4 w-4 flex-shrink-0 opacity-60" />
+      <div className="flex-1 min-w-0">
+        <div className="flex items-center justify-between gap-2 mb-1">
+          <span className="text-xs font-medium truncate">
+            {filename || label}{fileInfo}
+          </span>
+          <span className="text-[10px] opacity-60 flex-shrink-0">{percent}%</span>
+        </div>
+        <div className="w-full h-1 rounded-full overflow-hidden" style={{ backgroundColor: 'color-mix(in srgb, var(--terminal-ui-fg, #ffffff) 10%, transparent)' }}>
+          <div
+            className="h-full rounded-full transition-all duration-150"
+            style={{
+              width: `${percent}%`,
+              backgroundColor: transferType === 'upload' ? '#3b82f6' : '#22c55e',
+            }}
+          />
+        </div>
+        <div className="text-[10px] opacity-50 mt-0.5">
+          {formatBytes(transferred)} / {formatBytes(total)}
+        </div>
+      </div>
+      <button
+        onClick={onCancel}
+        className="flex-shrink-0 p-1 rounded transition-colors hover:bg-white/10"
+        title="Cancel transfer (Ctrl+C)"
+      >
+        <X className="h-3.5 w-3.5 opacity-60" />
+      </button>
+    </div>
+  );
+};
--- a/components/terminal/autocomplete/useTerminalAutocomplete.ts
+++ b/components/terminal/autocomplete/useTerminalAutocomplete.ts
@@ -943,15 +943,15 @@ function resolveAutocompleteCwd(
  if (os === "windows") return fallbackCwd;

  const normalizedWord = currentWord.trim().replace(/^['"]/, "");
-  const isRelativePathWord = normalizedWord.length > 0 &&
-    !normalizedWord.startsWith("/") &&
-    !normalizedWord.startsWith("~/") &&
-    !normalizedWord.startsWith("-");

-  if (!isRelativePathWord) {
+  // Absolute or home-relative paths don't depend on cwd
+  if (normalizedWord.startsWith("/") || normalizedWord.startsWith("~/")) {
    return fallbackCwd;
  }

+  // For empty word (e.g. "cd ") and relative paths, try prompt-based cwd
+  // extraction which reflects the current visible prompt — more up-to-date
+  // than fallbackCwd when OSC 7 is not supported.
  const promptCwd = extractPosixCwdFromPrompt(promptText);
  return chooseAutocompleteCwd(promptCwd, fallbackCwd);
 }
@@ -963,15 +963,16 @@ function chooseAutocompleteCwd(
  if (!promptCwd) return fallbackCwd;
  if (!fallbackCwd) return promptCwd;

-  if (promptCwd.startsWith("/")) {
+  // Prompt cwd is extracted from the currently visible prompt, so it tracks
+  // directory changes even when OSC 7 is not supported. Prefer it over
+  // fallbackCwd (which may be stale from initial connection) whenever it
+  // looks like a usable path.
+  if (promptCwd.startsWith("/") || promptCwd === "~" || promptCwd.startsWith("~/")) {
    return promptCwd;
  }

-  if (promptCwd === "~" || promptCwd.startsWith("~/")) {
-    return fallbackCwd;
-  }
-
-  return promptCwd;
+  // Bare directory name (e.g. "xunlong") can't be used as a path — fallback
+  return fallbackCwd;
 }

 function extractPosixCwdFromPrompt(promptText: string): string | undefined {
--- a/components/terminal/hooks/useZmodemTransfer.ts
+++ b/components/terminal/hooks/useZmodemTransfer.ts
@@ -0,0 +1,102 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { netcattyBridge } from '../../../infrastructure/services/netcattyBridge';
+
+export interface ZmodemTransferState {
+  active: boolean;
+  transferType: 'upload' | 'download' | null;
+  filename: string | null;
+  transferred: number;
+  total: number;
+  fileIndex: number;
+  fileCount: number;
+  finalizing: boolean;
+  error: string | null;
+}
+
+const initialState: ZmodemTransferState = {
+  active: false,
+  transferType: null,
+  filename: null,
+  transferred: 0,
+  total: 0,
+  fileIndex: 0,
+  fileCount: 0,
+  finalizing: false,
+  error: null,
+};
+
+export function useZmodemTransfer(sessionId: string | null) {
+  const [state, setState] = useState<ZmodemTransferState>(initialState);
+  const disposeRef = useRef<(() => void) | null>(null);
+
+  const disposeExitRef = useRef<(() => void) | null>(null);
+
+  useEffect(() => {
+    if (!sessionId) return;
+
+    const bridge = netcattyBridge.get();
+    if (!bridge?.onZmodemEvent) return;
+
+    disposeRef.current = bridge.onZmodemEvent(sessionId, (event) => {
+      switch (event.type) {
+        case 'detect':
+          setState({
+            active: true,
+            transferType: event.transferType ?? null,
+            filename: null,
+            transferred: 0,
+            total: 0,
+            fileIndex: 0,
+            fileCount: 0,
+            error: null,
+          });
+          break;
+        case 'progress':
+          setState((prev) => ({
+            ...prev,
+            active: true,
+            transferType: event.transferType ?? prev.transferType,
+            filename: event.filename ?? prev.filename,
+            transferred: event.transferred ?? prev.transferred,
+            total: event.total ?? prev.total,
+            fileIndex: event.fileIndex ?? prev.fileIndex,
+            fileCount: event.fileCount ?? prev.fileCount,
+            finalizing: !!((event as Record<string, unknown>).finalizing),
+          }));
+          break;
+        case 'complete':
+          setState((prev) => ({ ...prev, active: false }));
+          break;
+        case 'error':
+          setState((prev) => ({
+            ...prev,
+            active: false,
+            error: event.error ?? 'Unknown error',
+          }));
+          break;
+      }
+    });
+
+    // If the session exits mid-transfer (disconnect, shell exit, etc.),
+    // reset state so the progress indicator doesn't stay stuck.
+    disposeExitRef.current = bridge.onSessionExit(sessionId, () => {
+      setState(initialState);
+    });
+
+    return () => {
+      disposeRef.current?.();
+      disposeRef.current = null;
+      disposeExitRef.current?.();
+      disposeExitRef.current = null;
+      setState(initialState);
+    };
+  }, [sessionId]);
+
+  const cancel = useCallback(() => {
+    if (!sessionId) return;
+    const bridge = netcattyBridge.get();
+    bridge?.cancelZmodem?.(sessionId);
+  }, [sessionId]);
+
+  return { ...state, cancel };
+}
--- a/components/terminal/runtime/createTerminalSessionStarters.ts
+++ b/components/terminal/runtime/createTerminalSessionStarters.ts
@@ -172,7 +172,7 @@ const attachSessionToTerminal = (
  term: XTerm,
  id: string,
  opts?: {
-    onExitMessage?: (evt: { exitCode?: number; signal?: number }) => string;
+    onExitMessage?: (evt: { exitCode?: number; signal?: number; error?: string; reason?: string }) => string;
    onConnected?: () => void;
    // For serial: convert lone LF to CRLF to avoid "staircase effect"
    convertLfToCrlf?: boolean;
@@ -209,6 +209,9 @@ const attachSessionToTerminal = (

  ctx.disposeExitRef.current = ctx.terminalBackend.onSessionExit(id, (evt) => {
    ctx.updateStatus("disconnected");
+    if (evt.error) {
+      ctx.setError(evt.error);
+    }
    term.writeln(opts?.onExitMessage?.(evt) ?? "\r\n[session closed]");

    if (ctx.onTerminalDataCapture && ctx.serializeAddonRef.current) {
--- a/components/ui/aside-panel.tsx
+++ b/components/ui/aside-panel.tsx
@@ -101,8 +101,8 @@ export const AsidePanelContent: React.FC<{ children: ReactNode; className?: stri
    className,
 }) => {
    return (
-        <ScrollArea className={cn("flex-1 min-w-0", className)}>
-            <div className="p-4 space-y-4 min-w-0 overflow-x-hidden">
+        <ScrollArea className={cn("flex-1 min-w-0 [&>[data-radix-scroll-area-viewport]>div]:!block [&>[data-radix-scroll-area-viewport]>div]:!min-w-0", className)}>
+            <div className="p-4 space-y-4 min-w-0 overflow-hidden">
                {children}
            </div>
        </ScrollArea>
--- a/domain/credentials.ts
+++ b/domain/credentials.ts
@@ -88,5 +88,17 @@ export const findSyncPayloadEncryptedCredentialPaths = (
    }
  });

+  payload.groupConfigs?.forEach((config, index) => {
+    if (isEncryptedCredentialPlaceholder(config.password)) {
+      issues.push(`groupConfigs[${index}].password`);
+    }
+    if (isEncryptedCredentialPlaceholder(config.telnetPassword)) {
+      issues.push(`groupConfigs[${index}].telnetPassword`);
+    }
+    if (isEncryptedCredentialPlaceholder(config.proxyConfig?.password)) {
+      issues.push(`groupConfigs[${index}].proxyConfig.password`);
+    }
+  });
+
  return issues;
 };
--- a/domain/groupConfig.ts
+++ b/domain/groupConfig.ts
@@ -0,0 +1,51 @@
+import type { GroupConfig, Host } from './models';
+
+/**
+ * Resolve merged group defaults by walking the ancestor chain.
+ * For group "A/B/C", merges configs from A, A/B, A/B/C (child overrides parent).
+ */
+export function resolveGroupDefaults(
+  groupPath: string,
+  groupConfigs: GroupConfig[],
+): Partial<GroupConfig> {
+  const configMap = new Map(groupConfigs.map((c) => [c.path, c]));
+  const parts = groupPath.split('/').filter(Boolean);
+  const merged: Record<string, unknown> = {};
+
+  for (let i = 0; i < parts.length; i++) {
+    const ancestorPath = parts.slice(0, i + 1).join('/');
+    const config = configMap.get(ancestorPath);
+    if (config) {
+      for (const [key, value] of Object.entries(config)) {
+        if (key !== 'path' && value !== undefined) {
+          merged[key] = value;
+        }
+      }
+    }
+  }
+  return merged as Partial<GroupConfig>;
+}
+
+const INHERITABLE_KEYS: (keyof GroupConfig)[] = [
+  'username', 'password', 'savePassword', 'authMethod', 'identityId', 'identityFileId', 'identityFilePaths',
+  'port', 'protocol', 'agentForwarding', 'proxyConfig', 'hostChain', 'startupCommand',
+  'legacyAlgorithms', 'environmentVariables', 'charset', 'moshEnabled', 'moshServerPath',
+  'telnetEnabled', 'telnetPort', 'telnetUsername', 'telnetPassword',
+  'theme', 'themeOverride', 'fontFamily', 'fontFamilyOverride', 'fontSize', 'fontSizeOverride',
+];
+
+/**
+ * Apply group defaults to a host. Only fills in fields the host doesn't already have.
+ * Returns a new host object — does NOT mutate the original.
+ */
+export function applyGroupDefaults(host: Host, groupDefaults: Partial<GroupConfig>): Host {
+  const effective = { ...host };
+  for (const key of INHERITABLE_KEYS) {
+    const hostValue = (host as unknown as Record<string, unknown>)[key];
+    const groupValue = (groupDefaults as unknown as Record<string, unknown>)[key];
+    if ((hostValue === undefined || hostValue === '' || hostValue === null) && groupValue !== undefined) {
+      (effective as unknown as Record<string, unknown>)[key] = groupValue;
+    }
+  }
+  return effective;
+}
--- a/domain/models.ts
+++ b/domain/models.ts
@@ -62,7 +62,7 @@ export interface Host {
  id: string;
  label: string;
  hostname: string;
-  port: number;
+  port?: number;
  username: string;
  // Optional reference to a reusable identity (username + auth) stored in Keychain.
  identityId?: string;
@@ -120,6 +120,10 @@ export interface Host {
  // Local SSH key file paths (from SSH config IdentityFile or user-added)
  // Resolved at connection time — the app reads the file content when connecting.
  identityFilePaths?: string[];
+  // Pin host to top of All hosts view for quick access
+  pinned?: boolean;
+  // Timestamp of last successful connection, used for Recently Connected section
+  lastConnectedAt?: number;
 }

 export type KeyType = 'RSA' | 'ECDSA' | 'ED25519';
@@ -178,6 +182,39 @@ export interface GroupNode {
  totalHostCount?: number;
 }

+/** Default configuration for a group. Hosts in this group inherit these values when not explicitly set. */
+export interface GroupConfig {
+  path: string;
+  username?: string;
+  password?: string;
+  savePassword?: boolean;
+  authMethod?: 'password' | 'key' | 'certificate';
+  identityId?: string;
+  identityFileId?: string;
+  identityFilePaths?: string[];
+  port?: number;
+  protocol?: 'ssh' | 'telnet';
+  agentForwarding?: boolean;
+  proxyConfig?: ProxyConfig;
+  hostChain?: HostChainConfig;
+  startupCommand?: string;
+  legacyAlgorithms?: boolean;
+  environmentVariables?: EnvVar[];
+  charset?: string;
+  moshEnabled?: boolean;
+  moshServerPath?: string;
+  telnetEnabled?: boolean;
+  telnetPort?: number;
+  telnetUsername?: string;
+  telnetPassword?: string;
+  theme?: string;
+  themeOverride?: boolean;
+  fontFamily?: string;
+  fontFamilyOverride?: boolean;
+  fontSize?: number;
+  fontSizeOverride?: boolean;
+}
+
 export interface SyncConfig {
  gistId: string;
  githubToken: string;
--- a/domain/sync.ts
+++ b/domain/sync.ts
@@ -165,6 +165,9 @@ export interface SyncPayload {
  customGroups: string[];
  snippetPackages?: string[];

+  // Group configs (connection defaults per host group)
+  groupConfigs?: import('./models').GroupConfig[];
+
  // Port forwarding rules
  portForwardingRules?: import('./models').PortForwardingRule[];
  
@@ -201,6 +204,8 @@ export interface SyncPayload {
    sftpGlobalBookmarks?: import('./models').SftpBookmark[];
    // Immersive mode
    immersiveMode?: boolean;
+    // Vault: show recently connected hosts
+    showRecentHosts?: boolean;
  };

  // Sync metadata
--- a/domain/syncMerge.ts
+++ b/domain/syncMerge.ts
@@ -384,8 +384,17 @@ export function mergeSyncPayloads(
    remote.portForwardingRules ?? [],
  );

+  // Merge group configs (keyed by path — wrap with virtual id for entity merge)
+  type GCWithId = import('./models').GroupConfig & { id: string };
+  const wrapGC = (arr: import('./models').GroupConfig[] | undefined): GCWithId[] =>
+    (arr ?? []).map(gc => ({ ...gc, id: gc.path }));
+  const unwrapGC = (arr: GCWithId[]): import('./models').GroupConfig[] =>
+    arr.map(({ id: _id, ...rest }) => rest as import('./models').GroupConfig);
+  const groupConfigsResult = mergeEntityArrays(wrapGC(b.groupConfigs), wrapGC(local.groupConfigs), wrapGC(remote.groupConfigs));
+
  // Aggregate stats
-  const entityResults = [hosts, keys, identities, snippets, knownHosts, portForwardingRules];
+  const entityResults: Pick<EntityMergeResult<unknown>, 'added' | 'deleted' | 'modified' | 'conflicts'>[] =
+    [hosts, keys, identities, snippets, knownHosts, portForwardingRules, groupConfigsResult];
  for (const r of entityResults) {
    summary.added.local += r.added.local;
    summary.added.remote += r.added.remote;
@@ -430,6 +439,7 @@ export function mergeSyncPayloads(
    snippetPackages,
    knownHosts: knownHosts.merged,
    portForwardingRules: portForwardingRules.merged,
+    groupConfigs: unwrapGC(groupConfigsResult.merged),
    settings,
    syncedAt: Date.now(),
  };
--- a/electron/bridges/ai/shellUtils.cjs
+++ b/electron/bridges/ai/shellUtils.cjs
@@ -7,7 +7,7 @@
 "use strict";

 const { execFileSync } = require("node:child_process");
-const { existsSync } = require("node:fs");
+const { existsSync, statSync } = require("node:fs");
 const path = require("node:path");

 // ── ANSI / URL regexes ──
@@ -93,7 +93,11 @@ function normalizeCliPathForPlatform(filePath) {
  if (!normalized) return null;

  if (process.platform !== "win32") {
-    return existsSync(normalized) ? normalized : null;
+    // Reject directories (e.g. /Applications/Codex.app) — must be a file
+    try {
+      if (existsSync(normalized) && statSync(normalized).isFile()) return normalized;
+    } catch { /* stat failed */ }
+    return null;
  }

  const ext = path.extname(normalized).toLowerCase();
--- a/electron/bridges/aiBridge.cjs
+++ b/electron/bridges/aiBridge.cjs
@@ -1453,9 +1453,12 @@ function registerHandlers(ipcMain) {
        const result = await runCommand(probeCmd, probeArgs, { env: shellEnv });
        version = (result.stdout || result.stderr || "").trim().split("\n")[0];
      } catch {
-        version = "";
+        // --version failed: not a valid CLI executable (e.g. .app bundle)
+        continue;
      }

+      if (!version) continue;
+
      const { resolveAcp: _unused, ...agentInfo } = agent;
      agents.push({
        ...agentInfo,
@@ -1494,7 +1497,12 @@ function registerHandlers(ipcMain) {
      const result = await runCommand(resolvedPath, ["--version"], { env: shellEnv });
      version = (result.stdout || result.stderr || "").trim().split("\n")[0];
    } catch {
-      version = "";
+      // --version failed: not a valid CLI executable
+      return { path: resolvedPath, version: null, available: false };
+    }
+
+    if (!version) {
+      return { path: resolvedPath, version: null, available: false };
    }

    return { path: resolvedPath, version, available: true };
--- a/electron/bridges/sshBridge.cjs
+++ b/electron/bridges/sshBridge.cjs
@@ -24,6 +24,7 @@ const {
 } = require("./sshAuthHelper.cjs");
 const sessionLogStreamManager = require("./sessionLogStreamManager.cjs");
 const { trackSessionIdlePrompt } = require("./ai/shellUtils.cjs");
+const { createZmodemSentry } = require("./zmodemHelper.cjs");

 // Default SSH key names in priority order (preferred keys tried first)
 const PREFERRED_KEY_NAMES = ["id_ed25519", "id_ecdsa", "id_rsa"];
@@ -410,9 +411,9 @@ async function connectThroughChain(event, options, jumpHosts, targetHost, target
        username: jump.username || 'root',
        readyTimeout: 120000, // 2 minutes to allow for keyboard-interactive (2FA/MFA)
        // Use user-configured keepalive interval from options (in seconds -> convert to ms)
-        // If 0 or not provided, use 10000ms as default
-        keepaliveInterval: options.keepaliveInterval && options.keepaliveInterval > 0 ? options.keepaliveInterval * 1000 : 10000,
-        keepaliveCountMax: 3,
+        // 0 = disabled (no keepalive packets sent)
+        keepaliveInterval: options.keepaliveInterval > 0 ? options.keepaliveInterval * 1000 : 0,
+        keepaliveCountMax: options.keepaliveInterval > 0 ? 3 : 0,
        // Enable keyboard-interactive authentication (required for 2FA/MFA)
        tryKeyboard: true,
        algorithms: buildAlgorithms(options.legacyAlgorithms),
@@ -680,9 +681,9 @@ async function startSSHSession(event, options) {
      // `readyTimeout` covers the entire connection + authentication flow in ssh2.
      readyTimeout: 20000, // Fast failure for non-interactive auth
      // Use user-configured keepalive interval (in seconds -> convert to ms)
-      // If 0 or not provided, use 10000ms as default
-      keepaliveInterval: options.keepaliveInterval && options.keepaliveInterval > 0 ? options.keepaliveInterval * 1000 : 10000,
-      keepaliveCountMax: 3,
+      // 0 = disabled (no keepalive packets sent)
+      keepaliveInterval: options.keepaliveInterval > 0 ? options.keepaliveInterval * 1000 : 0,
+      keepaliveCountMax: options.keepaliveInterval > 0 ? 3 : 0,
      // Enable keyboard-interactive authentication (required for 2FA/MFA)
      tryKeyboard: true,
      algorithms: buildAlgorithms(options.legacyAlgorithms),
@@ -1246,15 +1247,36 @@ async function startSSHSession(event, options) {
              }
            };

+            const sshZmodemSentry = createZmodemSentry({
+              sessionId,
+              onData(buf) {
+                const decoder = getSessionDecoder(sessionId, "stdout");
+                const decoded = decoder.write(buf);
+                trackSessionIdlePrompt(session, decoded);
+                bufferData(decoded);
+                sessionLogStreamManager.appendData(sessionId, decoded);
+              },
+              writeToRemote(buf) {
+                try { return stream.write(buf); } catch { return true; /* ignore */ }
+              },
+              interruptRemote() {
+                try { stream.signal?.("INT"); } catch { /* ignore */ }
+              },
+              getWebContents() {
+                return event.sender;
+              },
+              label: "SSH",
+            });
+            session.zmodemSentry = sshZmodemSentry;
+
            stream.on("data", (data) => {
-              const decoder = getSessionDecoder(sessionId, "stdout");
-              const decoded = decoder.write(data);
-              trackSessionIdlePrompt(session, decoded);
-              bufferData(decoded);
-              sessionLogStreamManager.appendData(sessionId, decoded);
+              // data is Buffer from ssh2 — feed raw bytes to ZMODEM sentry.
+              // In normal mode, sentry's onData callback handles decoding and buffering.
+              sshZmodemSentry.consume(data);
            });

            stream.stderr?.on("data", (data) => {
+              // stderr is not used for ZMODEM — decode normally
              const decoder = getSessionDecoder(sessionId, "stderr");
              const decoded = decoder.write(data);
              bufferData(decoded);
@@ -1294,6 +1316,7 @@ async function startSSHSession(event, options) {
                } else {
                  safeSend(contents, "netcatty:exit", { sessionId, exitCode: streamExitCode, reason: streamExited ? "exited" : "closed" });
                }
+                sessions.get(sessionId)?.zmodemSentry?.cancel();
                sessions.delete(sessionId);
                sessionEncodings.delete(sessionId);
                sessionDecoders.delete(sessionId);
@@ -1362,6 +1385,7 @@ async function startSSHSession(event, options) {
        sendProgress(totalHops, totalHops, options.hostname, 'error', err.message);
        safeSend(contents, "netcatty:exit", { sessionId, exitCode: 1, error: err.message, reason: "error" });
        sessionLogStreamManager.stopStream(sessionId);
+        sessions.get(sessionId)?.zmodemSentry?.cancel();
        sessions.delete(sessionId);
        sessionEncodings.delete(sessionId);
        sessionDecoders.delete(sessionId);
@@ -1382,6 +1406,7 @@ async function startSSHSession(event, options) {
        sendProgress(totalHops, totalHops, options.hostname, 'error', err.message);
        safeSend(contents, "netcatty:exit", { sessionId, exitCode: 1, error: err.message, reason: "timeout" });
        sessionLogStreamManager.stopStream(sessionId);
+        sessions.get(sessionId)?.zmodemSentry?.cancel();
        sessions.delete(sessionId);
        sessionEncodings.delete(sessionId);
        sessionDecoders.delete(sessionId);
@@ -1412,6 +1437,7 @@ async function startSSHSession(event, options) {
          }
        }
        sessionLogStreamManager.stopStream(sessionId);
+        sessions.get(sessionId)?.zmodemSentry?.cancel();
        sessions.delete(sessionId);
        sessionEncodings.delete(sessionId);
        sessionDecoders.delete(sessionId);
@@ -1886,7 +1912,14 @@ async function listSessionDir(_event, payload) {
      : dirPath.startsWith("~/")
        ? `"$HOME/${tildePathSuffix}"`
        : `'${safePath}'`;
-    const cmd = `find ${pathExpr} -mindepth 1 -maxdepth 1 -exec sh -c '
+    // When dirPath is relative (not absolute and not ~/...), exec channels default
+    // to the user's home directory. Resolve the interactive shell's actual cwd first
+    // so that relative paths like "." or "src" are resolved correctly.
+    const needsCwdResolve = !dirPath.startsWith('/') && dirPath !== '~' && !dirPath.startsWith('~/');
+    const cwdResolveCmd = needsCwdResolve
+      ? `_sc_p=$(ps --ppid $PPID -o pid=,comm= 2>/dev/null | awk -v self=$$ '$1!=self && $2~/^(ba|z|fi|k|da)?sh$/{pid=$1}END{print pid}'); [ -z "$_sc_p" ] && _sc_p=$(ps -e -o pid=,ppid=,comm= 2>/dev/null | awk -v pp=$PPID -v self=$$ '$1!=self && $2==pp && $3~/^(ba|z|fi|k|da)?sh$/{pid=$1}END{print pid}'); [ -n "$_sc_p" ] && { _sc_d=$(readlink /proc/$_sc_p/cwd 2>/dev/null); [ -n "$_sc_d" ] && cd "$_sc_d" 2>/dev/null; }; `
+      : '';
+    const cmd = `${cwdResolveCmd}find ${pathExpr} -mindepth 1 -maxdepth 1 -exec sh -c '
      prefix="$1"
      folders_only="$2"
      limit="$3"
--- a/electron/bridges/terminalBridge.cjs
+++ b/electron/bridges/terminalBridge.cjs
@@ -14,6 +14,7 @@ const { SerialPort } = require("serialport");
 const sessionLogStreamManager = require("./sessionLogStreamManager.cjs");
 const { detectShellKind } = require("./ai/ptyExec.cjs");
 const { trackSessionIdlePrompt } = require("./ai/shellUtils.cjs");
+const { createZmodemSentry } = require("./zmodemHelper.cjs");

 // Shared references
 let sessions = null;
@@ -286,6 +287,7 @@ function startLocalSession(event, payload) {
    rows: payload?.rows || 24,
    env,
    cwd,
+    encoding: null, // Return Buffer for ZMODEM binary support
  });
  
  const session = {
@@ -329,11 +331,40 @@ function startLocalSession(event, payload) {
  });
  session.flushPendingData = flushLocal;

-  proc.onData((data) => {
-    trackSessionIdlePrompt(session, data);
-    bufferLocalData(data);
-    sessionLogStreamManager.appendData(sessionId, data);
-  });
+  // On Windows, node-pty ignores encoding: null and still emits UTF-8
+  // strings, making raw-byte ZMODEM impossible for local PTY sessions.
+  // Only wire up the sentry on platforms where encoding: null works.
+  if (process.platform !== "win32") {
+    const localDecoder = new StringDecoder("utf8");
+    const zmodemSentry = createZmodemSentry({
+      sessionId,
+      onData(buf) {
+        const str = localDecoder.write(buf);
+        if (!str) return;
+        trackSessionIdlePrompt(session, str);
+        bufferLocalData(str);
+        sessionLogStreamManager.appendData(sessionId, str);
+      },
+      writeToRemote(buf) {
+        try { return proc.write(buf); } catch { return true; }
+      },
+      getWebContents() {
+        return electronModule.webContents.fromId(session.webContentsId);
+      },
+      label: "Local",
+    });
+    session.zmodemSentry = zmodemSentry;
+
+    proc.onData((data) => {
+      zmodemSentry.consume(data);
+    });
+  } else {
+    proc.onData((data) => {
+      trackSessionIdlePrompt(session, data);
+      bufferLocalData(data);
+      sessionLogStreamManager.appendData(sessionId, data);
+    });
+  }

  proc.onExit((evt) => {
    flushLocal();
@@ -535,19 +566,57 @@ async function startTelnetSession(event, options) {
      contents?.send("netcatty:data", { sessionId, data });
    });

+    const telnetZmodemSentry = createZmodemSentry({
+      sessionId,
+      onData(buf) {
+        const decoded = telnetDecoder.write(buf);
+        if (!decoded) return;
+        const session = sessions.get(sessionId);
+        if (session) trackSessionIdlePrompt(session, decoded);
+        bufferTelnetData(decoded);
+        sessionLogStreamManager.appendData(sessionId, decoded);
+      },
+      writeToRemote(buf) {
+        // Escape 0xFF bytes as 0xFF 0xFF per Telnet spec so binary
+        // ZMODEM data passes through without being treated as IAC.
+        try {
+          let hasFF = false;
+          for (let i = 0; i < buf.length; i++) {
+            if (buf[i] === 0xff) { hasFF = true; break; }
+          }
+          if (hasFF) {
+            const escaped = [];
+            for (let i = 0; i < buf.length; i++) {
+              escaped.push(buf[i]);
+              if (buf[i] === 0xff) escaped.push(0xff);
+            }
+            return socket.write(Buffer.from(escaped));
+          } else {
+            return socket.write(buf);
+          }
+        } catch { return true; }
+      },
+      getWebContents() {
+        return electronModule.webContents.fromId(telnetWebContentsId);
+      },
+      label: "Telnet",
+    });
+    // Attach sentry to session once created (connect callback runs after this)
+    const attachTelnetSentry = () => {
+      const session = sessions.get(sessionId);
+      if (session) session.zmodemSentry = telnetZmodemSentry;
+    };
+    socket.once('connect', attachTelnetSentry);
+
    socket.on('data', (data) => {
      const session = sessions.get(sessionId);
      if (!session) return;

+      // Always run Telnet negotiation — even during ZMODEM, the Telnet
+      // layer still escapes 0xFF as IAC IAC and sends control sequences.
      const cleanData = handleTelnetNegotiation(data);
-
      if (cleanData.length > 0) {
-        const decoded = telnetDecoder.write(cleanData);
-        if (decoded) {
-          trackSessionIdlePrompt(session, decoded);
-          bufferTelnetData(decoded);
-          sessionLogStreamManager.appendData(sessionId, decoded);
-        }
+        telnetZmodemSentry.consume(cleanData);
      }
    });

@@ -562,6 +631,7 @@ async function startTelnetSession(event, options) {
        sessionLogStreamManager.stopStream(sessionId);
        const session = sessions.get(sessionId);
        if (session) {
+          session.zmodemSentry?.cancel();
          const contents = electronModule.webContents.fromId(session.webContentsId);
          contents?.send("netcatty:exit", { sessionId, exitCode: 1, error: err.message, reason: "error" });
        }
@@ -577,6 +647,7 @@ async function startTelnetSession(event, options) {
      sessionLogStreamManager.stopStream(sessionId);
      const session = sessions.get(sessionId);
      if (session) {
+        session.zmodemSentry?.cancel();
        const contents = electronModule.webContents.fromId(session.webContentsId);
        contents?.send("netcatty:exit", { sessionId, exitCode: hadError ? 1 : 0, reason: hadError ? "error" : "closed" });
      }
@@ -645,6 +716,7 @@ async function startMoshSession(event, options) {
      rows,
      env,
      cwd: os.homedir(),
+      encoding: null, // Return Buffer for ZMODEM binary support
    });

    const session = {
@@ -682,11 +754,37 @@ async function startMoshSession(event, options) {
    });
    session.flushPendingData = flushMosh;

-    proc.onData((data) => {
-      trackSessionIdlePrompt(session, data);
-      bufferMoshData(data);
-      sessionLogStreamManager.appendData(sessionId, data);
-    });
+    if (process.platform !== "win32") {
+      const moshDecoder = new StringDecoder("utf8");
+      const moshZmodemSentry = createZmodemSentry({
+        sessionId,
+        onData(buf) {
+          const str = moshDecoder.write(buf);
+          if (!str) return;
+          trackSessionIdlePrompt(session, str);
+          bufferMoshData(str);
+          sessionLogStreamManager.appendData(sessionId, str);
+        },
+        writeToRemote(buf) {
+          try { return proc.write(buf); } catch { return true; }
+        },
+        getWebContents() {
+          return electronModule.webContents.fromId(session.webContentsId);
+        },
+        label: "Mosh",
+      });
+      session.zmodemSentry = moshZmodemSentry;
+
+      proc.onData((data) => {
+        moshZmodemSentry.consume(data);
+      });
+    } else {
+      proc.onData((data) => {
+        trackSessionIdlePrompt(session, data);
+        bufferMoshData(data);
+        sessionLogStreamManager.appendData(sessionId, data);
+      });
+    }

    proc.onExit((evt) => {
      flushMosh();
@@ -790,17 +888,33 @@ async function startSerialSession(event, options) {
          });
        }

-        serialPort.on('data', (data) => {
-          const decoded = serialDecoder.write(data);
-          if (decoded) {
+        const serialZmodemSentry = createZmodemSentry({
+          sessionId,
+          onData(buf) {
+            const decoded = serialDecoder.write(buf);
+            if (!decoded) return;
            const contents = electronModule.webContents.fromId(session.webContentsId);
            contents?.send("netcatty:data", { sessionId, data: decoded });
            sessionLogStreamManager.appendData(sessionId, decoded);
-          }
+          },
+          writeToRemote(buf) {
+            try { return serialPort.write(buf); } catch { return true; }
+          },
+          getWebContents() {
+            return electronModule.webContents.fromId(session.webContentsId);
+          },
+          label: "Serial",
+        });
+        session.zmodemSentry = serialZmodemSentry;
+
+        serialPort.on('data', (data) => {
+          // data is already Buffer from serialport — feed to sentry
+          serialZmodemSentry.consume(data);
        });

        serialPort.on('error', (err) => {
          console.error(`[Serial] Port error: ${err.message}`);
+          session.zmodemSentry?.cancel();
          sessionLogStreamManager.stopStream(sessionId);
          const contents = electronModule.webContents.fromId(session.webContentsId);
          contents?.send("netcatty:exit", { sessionId, exitCode: 1, error: err.message, reason: "error" });
@@ -809,6 +923,7 @@ async function startSerialSession(event, options) {

        serialPort.on('close', () => {
          console.log(`[Serial] Port closed`);
+          session.zmodemSentry?.cancel();
          sessionLogStreamManager.stopStream(sessionId);
          const contents = electronModule.webContents.fromId(session.webContentsId);
          contents?.send("netcatty:exit", { sessionId, exitCode: 0, reason: "closed" });
@@ -830,7 +945,15 @@ async function startSerialSession(event, options) {
 function writeToSession(event, payload) {
  const session = sessions.get(payload.sessionId);
  if (!session) return;
-  
+
+  // During ZMODEM transfer, block terminal input (Ctrl+C cancels the transfer)
+  if (session.zmodemSentry?.isActive()) {
+    if (payload.data === '\x03') {
+      session.zmodemSentry.cancel();
+    }
+    return;
+  }
+
  try {
    if (session.stream) {
      session.stream.write(payload.data);
@@ -887,6 +1010,7 @@ function closeSession(event, payload) {
  if (!session) return;
  
  try {
+    session.zmodemSentry?.cancel();
    session.flushPendingData?.();
    if (session.stream) {
      session.stream.close();
@@ -999,6 +1123,7 @@ function cleanupAllSessions() {
  console.log(`[Terminal] Cleaning up ${sessions.size} sessions before quit`);
  for (const [sessionId, session] of sessions) {
    try {
+      session.zmodemSentry?.cancel();
      if (session.stream) {
        session.stream.close();
        session.conn?.end();
--- a/electron/bridges/windowManager.cjs
+++ b/electron/bridges/windowManager.cjs
@@ -675,6 +675,11 @@ async function createWindow(electronModule, options) {

  mainWindow = win;

+  // Clear reference when the main window is destroyed
+  win.on('closed', () => {
+    if (mainWindow === win) mainWindow = null;
+  });
+
  // Log renderer crashes for diagnostics (skip normal clean exits)
  win.webContents.on("render-process-gone", (_event, details) => {
    if (details?.reason === "clean-exit") return;
@@ -917,6 +922,7 @@ async function openSettingsWindow(electronModule, options, { showOnLoad = true }
  }

  const win = new BrowserWindow({
+    title: "netcatty Settings",
    width: settingsWidth,
    height: settingsHeight,
    ...(settingsX !== undefined && settingsY !== undefined ? { x: settingsX, y: settingsY } : {}),
@@ -1042,6 +1048,9 @@ async function openSettingsWindow(electronModule, options, { showOnLoad = true }
    settingsWindow = null;
  });

+  // Prevent HTML <title> from overriding the window title
+  win.on('page-title-updated', (e) => { e.preventDefault(); });
+
  // Load the settings page
  const settingsPath = '/#/settings';

--- a/electron/bridges/zmodemHelper.cjs
+++ b/electron/bridges/zmodemHelper.cjs
@@ -0,0 +1,794 @@
+/**
+ * ZMODEM Helper - Provides ZMODEM file transfer support for terminal sessions.
+ *
+ * Architecture: ZMODEM detection and transfer runs entirely in the main process.
+ * The Sentry wraps the raw data stream and routes data either to the normal
+ * string-based terminal pipeline (via `to_terminal`) or to the ZMODEM protocol
+ * handler.  This avoids any changes to the IPC / preload / renderer data path.
+ *
+ * The renderer is only notified for progress display via lightweight IPC events.
+ */
+
+const Zmodem = require("zmodem.js");
+const fs = require("node:fs");
+const path = require("node:path");
+
+// Lazy-load electron to avoid issues when requiring from non-electron contexts
+let _electron = null;
+function getElectron() {
+  if (!_electron) _electron = require("electron");
+  return _electron;
+}
+
+/**
+ * Create a ZMODEM sentry that wraps a session's data stream.
+ *
+ * All raw data from the PTY / SSH stream / socket should be fed into
+ * `consume()`.  The sentry transparently calls `onData(str)` for normal
+ * terminal output and handles ZMODEM transfers internally.
+ *
+ * @param {object} opts
+ * @param {string} opts.sessionId
+ * @param {(data: Buffer) => void} opts.onData
+ *   Called with raw bytes during normal (non-ZMODEM) operation.
+ *   The caller is responsible for charset-aware decoding (UTF-8, iconv, etc.).
+ * @param {(buf: Buffer) => void} opts.writeToRemote
+ *   Write raw bytes back to the remote side (PTY / SSH stream / socket).
+ * @param {() => import('electron').WebContents | null} opts.getWebContents
+ *   Returns the Electron WebContents for sending progress IPC events.
+ * @param {string} [opts.label]
+ *   Human-readable label for log messages (e.g. "Local", "SSH").
+ * @returns {ZmodemSentryWrapper}
+ */
+function createZmodemSentry(opts) {
+  const {
+    sessionId,
+    onData,
+    writeToRemote,
+    getWebContents,
+    interruptRemote,
+    label = "Session",
+  } = opts;
+
+  let active = false;
+  let currentZSession = null;
+  let _needsDrain = false;
+  const pendingEchoes = [];
+  let pendingTerminalSuppression = null;
+  let cancelInterruptTimer = null;
+  let ignoreDetectionUntil = 0;
+  // After aborting, suppress incoming data briefly so residual ZMODEM
+  // protocol bytes from the remote don't flood the terminal as garbage.
+  let cooldownUntil = 0;
+  const COOLDOWN_MS = 2000;
+  const ECHO_TTL_MS = 1500;
+  const ECHO_MAX_BYTES = 256;
+
+  function prunePendingEchoes(now = Date.now()) {
+    while (pendingEchoes.length && pendingEchoes[0].expiresAt <= now) {
+      pendingEchoes.shift();
+    }
+  }
+
+  function rememberOutgoingEcho(octets) {
+    const buf = Buffer.from(octets);
+    if (!buf.length || buf.length > ECHO_MAX_BYTES) return;
+    prunePendingEchoes();
+    pendingEchoes.push({
+      buf,
+      expiresAt: Date.now() + ECHO_TTL_MS,
+    });
+  }
+
+  function stripEchoedOutgoingData(data) {
+    if (!pendingEchoes.length) return data;
+
+    prunePendingEchoes();
+
+    let buf = Buffer.isBuffer(data) ? data : Buffer.from(data);
+    let mutated = false;
+
+    while (pendingEchoes.length && buf.length) {
+      const nextEcho = pendingEchoes[0].buf;
+      if (buf.length < nextEcho.length) break;
+      if (!buf.subarray(0, nextEcho.length).equals(nextEcho)) break;
+
+      mutated = true;
+      buf = buf.subarray(nextEcho.length);
+      pendingEchoes.shift();
+    }
+
+    return mutated ? buf : data;
+  }
+
+  function stripPendingTerminalSuppression(data) {
+    if (!pendingTerminalSuppression?.length) return data;
+
+    let buf = Buffer.isBuffer(data) ? data : Buffer.from(data);
+    const fullMatchAt = buf.indexOf(pendingTerminalSuppression);
+    if (fullMatchAt !== -1) {
+      buf = Buffer.concat([
+        buf.subarray(0, fullMatchAt),
+        buf.subarray(fullMatchAt + pendingTerminalSuppression.length),
+      ]);
+      pendingTerminalSuppression = null;
+      return buf;
+    }
+
+    const maxMatch = Math.min(pendingTerminalSuppression.length, buf.length);
+    let matchLen = 0;
+    while (matchLen < maxMatch && buf[matchLen] === pendingTerminalSuppression[matchLen]) {
+      matchLen += 1;
+    }
+
+    if (!matchLen) return buf;
+
+    buf = buf.subarray(matchLen);
+    pendingTerminalSuppression = matchLen === pendingTerminalSuppression.length
+      ? null
+      : pendingTerminalSuppression.subarray(matchLen);
+
+    return buf;
+  }
+
+  function stripVisibleZmodemHeaders(data) {
+    let buf = Buffer.isBuffer(data) ? data : Buffer.from(data);
+    let searchFrom = 0;
+
+    while (searchFrom < buf.length) {
+      const prefixAt = buf.indexOf(Buffer.from([0x2a, 0x2a, 0x18, 0x42]), searchFrom);
+      if (prefixAt === -1) break;
+
+      const minHeaderLength = 20;
+      if (buf.length - prefixAt < minHeaderLength) break;
+
+      let isHexHeader = true;
+      for (let i = 0; i < 14; i += 1) {
+        const byte = buf[prefixAt + 4 + i];
+        const isHexDigit =
+          (byte >= 0x30 && byte <= 0x39) ||
+          (byte >= 0x41 && byte <= 0x46) ||
+          (byte >= 0x61 && byte <= 0x66);
+        if (!isHexDigit) {
+          isHexHeader = false;
+          break;
+        }
+      }
+
+      if (!isHexHeader) {
+        searchFrom = prefixAt + 1;
+        continue;
+      }
+
+      let headerLength = 18;
+      if (buf[prefixAt + 18] === 0x0d && buf[prefixAt + 19] === 0x0a) {
+        headerLength = 20;
+        if (buf[prefixAt + 20] === 0x11) {
+          headerLength = 21;
+        }
+      }
+
+      buf = Buffer.concat([
+        buf.subarray(0, prefixAt),
+        buf.subarray(prefixAt + headerLength),
+      ]);
+      searchFrom = prefixAt;
+    }
+
+    return buf;
+  }
+
+  function looksLikeResidualZmodemData(data) {
+    const buf = Buffer.isBuffer(data) ? data : Buffer.from(data);
+    if (!buf.length) return true;
+
+    for (const byte of buf) {
+      const isResidualControl =
+        byte === 0x18 || // CAN / ZDLE
+        byte === 0x08 || // backspace from abort sequence
+        byte === 0x11 || // XON
+        byte === 0x13 || // XOFF
+        byte === 0x0d ||
+        byte === 0x0a;
+      if (isResidualControl) continue;
+      return false;
+    }
+
+    return true;
+  }
+
+  function sendExtraAbortBytes() {
+    try {
+      writeToRemote(Buffer.from([0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18]));
+    } catch {
+      /* ignore */
+    }
+  }
+
+  function scheduleRemoteInterruptAfterCancel(transferRole) {
+    if (cancelInterruptTimer) {
+      clearTimeout(cancelInterruptTimer);
+      cancelInterruptTimer = null;
+    }
+
+    if (transferRole !== "send") return;
+    ignoreDetectionUntil = Date.now() + 300;
+
+    try { interruptRemote?.(); } catch { /* ignore */ }
+
+    // Some rz builds (notably Debian's lrzsz) can stay attached to the tty
+    // after a protocol cancel. Follow up with Ctrl+C so the remote shell
+    // reliably regains control. If rz is already gone, this just refreshes
+    // the prompt like a normal interactive interrupt.
+    cancelInterruptTimer = setTimeout(() => {
+      cancelInterruptTimer = null;
+      try { interruptRemote?.(); } catch { /* ignore */ }
+      try { writeToRemote(Buffer.from("\x03")); } catch { /* ignore */ }
+    }, 120);
+  }
+
+  function isIgnorableSendKeepaliveError(errMsg) {
+    return Boolean(
+      active &&
+      currentZSession?.type === "send" &&
+      !currentZSession?._sending_file &&
+      errMsg.includes("Unhandled header: ZRINIT")
+    );
+  }
+
+  function isIgnorableSendResumePingError(errMsg) {
+    return Boolean(
+      active &&
+      currentZSession?.type === "send" &&
+      !currentZSession?._sending_file &&
+      currentZSession?._next_header_handler?.ZRINIT &&
+      errMsg.includes("Unhandled header: ZRPOS")
+    );
+  }
+
+
+  const sentry = new Zmodem.Sentry({
+    to_terminal(octets) {
+      // Normal data – pass raw bytes to the caller for charset-aware decoding.
+      let sanitizedOctets = stripPendingTerminalSuppression(Buffer.from(octets));
+      sanitizedOctets = stripVisibleZmodemHeaders(sanitizedOctets);
+      if (!sanitizedOctets.length) return;
+      onData(sanitizedOctets);
+    },
+
+    sender(octets) {
+      // ZMODEM protocol bytes – send raw to remote.
+      rememberOutgoingEcho(octets);
+      const ok = writeToRemote(Buffer.from(octets));
+      // Track backpressure: if stream.write() returned false, the
+      // kernel TCP buffer is full.  The upload loop should pause.
+      if (ok === false) _needsDrain = true;
+    },
+
+    on_detect(detection) {
+      if (active) {
+        console.warn(`[ZMODEM][${label}] Detection while transfer active; denying`);
+        detection.deny();
+        return;
+      }
+      if (Date.now() < ignoreDetectionUntil) {
+        console.log(`[ZMODEM][${label}] Ignoring stray detection during cancel grace window`);
+        detection.deny();
+        return;
+      }
+      active = true;
+      const zsession = detection.confirm();
+      currentZSession = zsession;
+      pendingTerminalSuppression = zsession.type === "receive"
+        ? Buffer.from(Zmodem.Header.build("ZRQINIT").to_hex())
+        : zsession._last_ZRINIT?.to_hex
+          ? Buffer.from(zsession._last_ZRINIT.to_hex())
+          : null;
+
+      const contents = getWebContents();
+      const transferType = zsession.type === "send" ? "upload" : "download";
+
+      console.log(`[ZMODEM][${label}] Detected ${transferType} for session ${sessionId}`);
+
+      safeSend(contents, "netcatty:zmodem:detect", {
+        sessionId,
+        transferType,
+      });
+
+      // Provide a drain helper so the upload loop can pause when the
+      // underlying transport's write buffer is full.
+      const transferOpts = {
+        ...opts,
+        waitForDrain: () => {
+          if (!_needsDrain) return Promise.resolve();
+          _needsDrain = false;
+          // Yield to the event loop so Node can flush buffered writes to
+          // the kernel.  Using setImmediate (not setTimeout) avoids any
+          // fixed delay — we resume as soon as the I/O phase completes.
+          return new Promise((resolve) => setImmediate(resolve));
+        },
+      };
+      handleTransfer(zsession, transferType, transferOpts)
+        .then(() => {
+          // Only act if this is still the active session (not replaced by a new one)
+          if (currentZSession !== zsession) return;
+          console.log(`[ZMODEM][${label}] Transfer completed for session ${sessionId}`);
+          safeSend(contents, "netcatty:zmodem:complete", { sessionId });
+        })
+        .catch((err) => {
+          if (currentZSession !== zsession) return;
+          console.error(`[ZMODEM][${label}] Transfer error:`, err.message || err);
+          try { zsession.abort(); } catch { /* ignore */ }
+          safeSend(contents, "netcatty:zmodem:error", {
+            sessionId,
+            error: String(err.message || err),
+          });
+        })
+        .finally(() => {
+          // Only clear state if this is still the active session
+          if (currentZSession === zsession) {
+            active = false;
+            currentZSession = null;
+          }
+        });
+    },
+
+    on_retract() {
+      // False positive – sentry automatically resumes passthrough.
+    },
+  });
+
+  return {
+    /**
+     * Feed raw bytes from the session into the sentry.
+     * @param {Buffer|Uint8Array} data
+     */
+    consume(data) {
+      // During cooldown after abort, unconditionally suppress all incoming
+      // data.  sz can stream large amounts of file data that's still in
+      // SSH/TCP buffers after we send CAN; checking content doesn't help
+      // because the residual data contains arbitrary printable bytes.
+      if (cooldownUntil) {
+        const now = Date.now();
+        if (now < cooldownUntil) {
+          // Keep sending CAN in case earlier ones were lost in the flood
+          if (now - (cooldownUntil - COOLDOWN_MS) > 200) {
+            sendExtraAbortBytes();
+          }
+          return; // drop everything during cooldown
+        }
+        cooldownUntil = 0;
+        // After cooldown, let this chunk through — it's likely the shell prompt
+      }
+
+      try {
+        const sanitizedData = stripEchoedOutgoingData(data);
+        if (!sanitizedData.length) return;
+        sentry.consume(sanitizedData);
+      } catch (err) {
+        const errMsg = String(err.message || err);
+        console.error(`[ZMODEM][${label}] Sentry consume error:`, errMsg);
+
+        const wasActive = active;
+
+        // lrzsz's `rz` may resend ZRINIT while we're waiting for the user
+        // to choose files. zmodem.js doesn't model that pre-offer keepalive,
+        // but the repeated header is harmless, so ignore it and keep waiting.
+        if (isIgnorableSendKeepaliveError(errMsg)) {
+          console.log(`[ZMODEM][${label}] Ignoring repeated pre-offer ZRINIT`);
+          return;
+        }
+
+        // Some receivers emit a final ZRPOS ping right before they send the
+        // post-file ZRINIT. If that ping is processed a beat late, zmodem.js
+        // complains even though the transfer can continue normally.
+        if (isIgnorableSendResumePingError(errMsg)) {
+          console.log(`[ZMODEM][${label}] Ignoring late post-file ZRPOS`);
+          return;
+        }
+
+        // ZFIN/OO mismatch: the file transfer completed (ZFIN exchanged)
+        // but the shell prompt arrived before the "OO" end marker.  This
+        // is common over SSH because sz exits and the shell resumes before
+        // the "OO" acknowledgement is sent.  Treat as successful transfer.
+        // Do NOT abort() here — that sends CAN bytes to the remote shell.
+        // Instead, manually clean up the sentry's internal session state.
+        if (wasActive && errMsg.includes("ZFIN") && errMsg.includes("OO")) {
+          console.log(`[ZMODEM][${label}] ZFIN/OO mismatch — treating as success`);
+          if (currentZSession) {
+            try { currentZSession._on_session_end(); } catch { /* ignore */ }
+          }
+          active = false;
+          currentZSession = null;
+          safeSend(getWebContents(), "netcatty:zmodem:complete", { sessionId });
+          try { sentry.consume(data); } catch { /* ignore */ }
+          return;
+        }
+
+        // For all other errors, abort and send extra CAN sequences to
+        // ensure the remote rz/sz process stops transmitting.
+        if (currentZSession) {
+          try { currentZSession.abort(); } catch { /* ignore */ }
+        }
+        sendExtraAbortBytes();
+        // Follow up with Ctrl+C after a short delay to kill rz/sz on
+        // Debian and other systems where it stays attached after CAN.
+        setTimeout(() => {
+          try { writeToRemote(Buffer.from("\x03")); } catch { /* ignore */ }
+        }, 150);
+
+        active = false;
+        currentZSession = null;
+        // Enter cooldown: discard incoming data briefly while the remote
+        // processes our CAN sequence and stops sending ZMODEM frames.
+        cooldownUntil = Date.now() + COOLDOWN_MS;
+
+        if (wasActive) {
+          safeSend(getWebContents(), "netcatty:zmodem:error", {
+            sessionId,
+            error: errMsg,
+          });
+        }
+      }
+    },
+
+    /** Whether a ZMODEM transfer is currently in progress. */
+    isActive() {
+      return active;
+    },
+
+    /** Cancel the current ZMODEM transfer. */
+    cancel() {
+      if (currentZSession) {
+        const transferRole = currentZSession.type;
+        console.log(`[ZMODEM][${label}] Cancelling transfer for session ${sessionId}`);
+        try { currentZSession.abort(); } catch { /* ignore */ }
+        sendExtraAbortBytes();
+        active = false;
+        currentZSession = null;
+        cooldownUntil = Date.now() + COOLDOWN_MS;
+        scheduleRemoteInterruptAfterCancel(transferRole);
+        safeSend(getWebContents(), "netcatty:zmodem:error", {
+          sessionId,
+          error: "Transfer cancelled",
+        });
+      }
+    },
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Shared helpers (module-level, usable from handleUpload / handleDownload)
+// ---------------------------------------------------------------------------
+
+/**
+ * Race a promise against a timeout.  If the promise doesn't settle within
+ * `ms`, resolve with undefined instead of hanging forever.  This prevents
+ * zmodem.js internal promises (xfer.end, zsession.close) from blocking
+ * indefinitely after cancel/abort.
+ */
+function withTimeout(promise, ms) {
+  let timer;
+  return Promise.race([
+    promise,
+    new Promise((_, reject) => {
+      timer = setTimeout(() => reject(new Error("ZMODEM handshake timeout")), ms);
+    }),
+  ]).finally(() => clearTimeout(timer));
+}
+
+/**
+ * Send CAN bytes + delayed Ctrl-C to kill the remote rz/sz process.
+ * Used from dialog-cancel paths that run outside the sentry closure.
+ */
+function abortRemoteProcess(writeToRemote) {
+  try { writeToRemote(Buffer.from([0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18])); } catch { /* ignore */ }
+  setTimeout(() => {
+    try { writeToRemote(Buffer.from("\x03")); } catch { /* ignore */ }
+  }, 150);
+}
+
+// ---------------------------------------------------------------------------
+// Transfer handlers
+// ---------------------------------------------------------------------------
+
+async function handleTransfer(zsession, transferType, opts) {
+  if (transferType === "upload") {
+    await handleUpload(zsession, opts);
+  } else {
+    await handleDownload(zsession, opts);
+  }
+}
+
+/**
+ * Upload files to the remote (remote executed `rz`).
+ */
+async function handleUpload(zsession, opts) {
+  const { sessionId, getWebContents } = opts;
+  const contents = getWebContents();
+  const { BrowserWindow, dialog } = getElectron();
+  const yieldToIO = () => new Promise((resolve) => setImmediate(resolve));
+
+  const win = contents ? BrowserWindow.fromWebContents(contents) : null;
+  const result = await dialog.showOpenDialog(win || undefined, {
+    properties: ["openFile", "multiSelections"],
+    title: "Select files to upload (ZMODEM)",
+  });
+
+  if (result.canceled || !result.filePaths.length) {
+    try { zsession.abort(); } catch { /* ignore */ }
+    abortRemoteProcess(opts.writeToRemote);
+    throw new Error("Transfer cancelled");
+  }
+
+  const filePaths = result.filePaths;
+  const fileStats = filePaths.map((fp) => fs.statSync(fp));
+
+  for (let i = 0; i < filePaths.length; i++) {
+    const filePath = filePaths[i];
+    const stat = fileStats[i];
+    const name = path.basename(filePath);
+
+    safeSend(contents, "netcatty:zmodem:progress", {
+      sessionId,
+      filename: name,
+      transferred: 0,
+      total: stat.size,
+      fileIndex: i,
+      fileCount: filePaths.length,
+      transferType: "upload",
+    });
+
+    let bytesRemaining = 0;
+    for (let j = i; j < fileStats.length; j++) bytesRemaining += fileStats[j].size;
+
+    const xfer = await zsession.send_offer({
+      name,
+      size: stat.size,
+      mtime: new Date(stat.mtimeMs),
+      files_remaining: filePaths.length - i,
+      bytes_remaining: bytesRemaining,
+    });
+
+    if (!xfer) {
+      // Receiver skipped this file
+      continue;
+    }
+
+    // Read and send in chunks
+    const CHUNK_SIZE = 64 * 1024; // Leave room for inbound ZMODEM control frames
+    const fd = fs.openSync(filePath, "r");
+    const buf = Buffer.alloc(CHUNK_SIZE);
+    let sent = 0;
+
+    try {
+      while (true) {
+        const bytesRead = fs.readSync(fd, buf, 0, CHUNK_SIZE);
+        if (bytesRead === 0) break;
+
+        // zmodem.js send() is synchronous and triggers writeToRemote via
+        // the sentry's sender callback.  Yield after each chunk so the
+        // event loop can flush buffered writes and process inbound control
+        // frames, preventing unbounded memory growth on slow links.
+        xfer.send(new Uint8Array(buf.buffer, buf.byteOffset, bytesRead));
+        sent += bytesRead;
+
+        safeSend(contents, "netcatty:zmodem:progress", {
+          sessionId,
+          filename: name,
+          transferred: sent,
+          total: stat.size,
+          fileIndex: i,
+          fileCount: filePaths.length,
+          transferType: "upload",
+        });
+
+        // Wait for transport to drain if its buffer is full, then yield
+        // so inbound ZMODEM control frames can be processed.
+        if (opts.waitForDrain) await opts.waitForDrain();
+        await yieldToIO();
+      }
+      // All data written to Node.js buffer — but TCP may still be
+      // flushing to the remote.  Show "finalizing" state while we
+      // wait for the remote to acknowledge.
+      safeSend(contents, "netcatty:zmodem:progress", {
+        sessionId,
+        filename: name,
+        transferred: stat.size,
+        total: stat.size,
+        fileIndex: i,
+        fileCount: filePaths.length,
+        transferType: "upload",
+        finalizing: true,
+      });
+      await withTimeout(xfer.end(), 120000);
+    } finally {
+      fs.closeSync(fd);
+    }
+  }
+
+  await withTimeout(zsession.close(), 120000);
+}
+
+/**
+ * Download files from the remote (remote executed `sz <file>`).
+ */
+async function handleDownload(zsession, opts) {
+  const { sessionId, getWebContents } = opts;
+  const contents = getWebContents();
+  const { BrowserWindow, dialog } = getElectron();
+
+  const win = contents ? BrowserWindow.fromWebContents(contents) : null;
+  let fileIndex = 0;
+  const pendingStreams = [];
+  const pendingOffers = [];
+  let lastProgressTime = 0;
+  let downloadDir = null;
+  let rejectSession = () => {};
+
+  const processOffer = (xfer, reject) => {
+    if (!downloadDir) {
+      pendingOffers.push(xfer);
+      return;
+    }
+
+    const detail = xfer.get_details();
+    // Sanitize filename to prevent path traversal attacks
+    const rawName = detail.name || `untitled_${Date.now()}`;
+    const name = path.basename(rawName);
+    const size = detail.size || 0;
+    const savePath = path.join(downloadDir, name);
+    const currentIndex = fileIndex++;
+
+    safeSend(contents, "netcatty:zmodem:progress", {
+      sessionId,
+      filename: name,
+      transferred: 0,
+      total: size,
+      fileIndex: currentIndex,
+      fileCount: -1, // unknown total until session ends
+      transferType: "download",
+    });
+
+    // Avoid overwriting existing files — append (1), (2), etc.
+    let finalPath = savePath;
+    if (fs.existsSync(savePath)) {
+      const ext = path.extname(name);
+      const base = path.basename(name, ext);
+      let n = 1;
+      do {
+        finalPath = path.join(downloadDir, `${base} (${n})${ext}`);
+        n++;
+      } while (fs.existsSync(finalPath));
+    }
+
+    const ws = fs.createWriteStream(finalPath);
+    let received = 0;
+    let writeAborted = false;
+
+    // Track pending write streams (and paths) for cleanup at session end
+    pendingStreams.push({ stream: ws, path: finalPath, completed: false });
+
+    ws.on("error", (err) => {
+      writeAborted = true;
+      console.error(`[ZMODEM] Write stream error for ${name}:`, err.message);
+      ws.destroy();
+      reject(err);
+    });
+
+    xfer.accept({
+      on_input(payload) {
+        if (writeAborted) return;
+        const chunk = Buffer.from(payload);
+        ws.write(chunk);
+        received += chunk.length;
+
+        // Throttle progress IPC to ~10 updates/sec to avoid
+        // overwhelming the renderer on fast links.
+        const now = Date.now();
+        if (now - lastProgressTime >= 100) {
+          lastProgressTime = now;
+          safeSend(contents, "netcatty:zmodem:progress", {
+            sessionId,
+            filename: name,
+            transferred: received,
+            total: size,
+            fileIndex: currentIndex,
+            fileCount: -1,
+            transferType: "download",
+          });
+        }
+      },
+    }).catch((err) => {
+      ws.destroy();
+      reject(err);
+    });
+
+    xfer.on("complete", () => {
+      const entry = pendingStreams.find((e) => e.stream === ws);
+      if (entry) entry.completed = true;
+      ws.end();
+    });
+  };
+
+  const sessionPromise = new Promise((resolve, reject) => {
+    rejectSession = reject;
+    zsession.on("offer", (xfer) => {
+      try {
+        processOffer(xfer, reject);
+      } catch (err) {
+        reject(err);
+      }
+    });
+
+    // Wait for all write streams to finish flushing before resolving.
+    // If a stream never received end() (e.g. transfer was cancelled),
+    // destroy it so the fd is released and finish/close can fire.
+    zsession.on("session_end", async () => {
+      try {
+        await Promise.all(
+          pendingStreams.map((entry) => {
+            const { stream: s, path: filePath, completed } = entry;
+            if (s.writableFinished) {
+              // Delete partial files that never completed
+              if (!completed) {
+                try { fs.unlinkSync(filePath); } catch { /* ignore */ }
+              }
+              return Promise.resolve();
+            }
+            if (!s.writableEnded) s.destroy();
+            return new Promise((r) => {
+              s.on("close", () => {
+                // Clean up partial downloads
+                if (!completed) {
+                  try { fs.unlinkSync(filePath); } catch { /* ignore */ }
+                }
+                r();
+              });
+            });
+          })
+        );
+      } catch { /* ignore — error handler already called reject */ }
+      resolve();
+    });
+  });
+
+  // Start the session BEFORE showing the dialog so lrzsz doesn't
+  // time out waiting for ZRINIT while the user browses for a folder.
+  zsession.start();
+
+  const result = await dialog.showOpenDialog(win || undefined, {
+    properties: ["openDirectory", "createDirectory"],
+    title: "Select download directory (ZMODEM)",
+  });
+
+  if (result.canceled || !result.filePaths.length) {
+    try { zsession.abort(); } catch { /* ignore */ }
+    abortRemoteProcess(opts.writeToRemote);
+    void sessionPromise.catch(() => {});
+    throw new Error("Transfer cancelled");
+  }
+
+  downloadDir = result.filePaths[0];
+  while (pendingOffers.length) {
+    processOffer(pendingOffers.shift(), rejectSession);
+  }
+
+  await sessionPromise;
+}
+
+// ---------------------------------------------------------------------------
+// Utilities
+// ---------------------------------------------------------------------------
+
+function safeSend(contents, channel, data) {
+  try {
+    if (contents && !contents.isDestroyed()) {
+      contents.send(channel, data);
+    }
+  } catch {
+    // WebContents may have been destroyed between the check and the send
+  }
+}
+
+module.exports = { createZmodemSentry };
--- a/electron/main.cjs
+++ b/electron/main.cjs
@@ -318,8 +318,8 @@ function registerAppProtocol() {

 function focusMainWindow() {
  try {
-    const wins = BrowserWindow.getAllWindows();
-    const win = wins && wins.length ? wins[0] : null;
+    const mainWin = getWindowManager().getMainWindow?.();
+    const win = mainWin && !mainWin.isDestroyed?.() ? mainWin : null;
    if (!win) return false;

    // Check if the webContents has crashed or been destroyed
@@ -505,6 +505,14 @@ const registerBridges = (win) => {
  aiBridge.registerHandlers(ipcMain);
  crashLogBridge.registerHandlers(ipcMain);

+  // ZMODEM cancel handler
+  ipcMain.on("netcatty:zmodem:cancel", (_event, payload) => {
+    const session = sessions.get(payload.sessionId);
+    if (session?.zmodemSentry) {
+      session.zmodemSentry.cancel();
+    }
+  });
+
  // Fig autocomplete spec loader — uses dynamic import() since @withfig/autocomplete is ESM
  ipcMain.handle("netcatty:figspec:list", async () => {
    try {
@@ -1066,12 +1074,11 @@ if (!gotLock) {
      } catch {}

      if (focusMainWindow()) return;
-      if (BrowserWindow.getAllWindows().length === 0) {
-        void createWindow().catch((err) => {
-          console.error("[Main] Failed to create window on activate:", err);
-          showStartupError(err);
-        });
-      }
+      // Main window doesn't exist — create it even if other windows (e.g. settings) are open
+      void createWindow().catch((err) => {
+        console.error("[Main] Failed to create window on activate:", err);
+        showStartupError(err);
+      });
    });
  });

--- a/electron/preload.cjs
+++ b/electron/preload.cjs
@@ -8,6 +8,7 @@ const transferCompleteListeners = new Map();
 const transferErrorListeners = new Map();
 const transferCancelledListeners = new Map();
 const chainProgressListeners = new Map();
+const zmodemListeners = new Map();
 const sftpConnectionProgressListeners = new Set();
 const authFailedListeners = new Map();
 const languageChangeListeners = new Set();
@@ -109,6 +110,28 @@ function _deliverToListeners(sessionId, data) {
  });
 }

+// ZMODEM file transfer events
+ipcRenderer.on("netcatty:zmodem:detect", (_event, payload) => {
+  const set = zmodemListeners.get(payload.sessionId);
+  if (!set) return;
+  set.forEach((cb) => { try { cb({ type: "detect", ...payload }); } catch {} });
+});
+ipcRenderer.on("netcatty:zmodem:progress", (_event, payload) => {
+  const set = zmodemListeners.get(payload.sessionId);
+  if (!set) return;
+  set.forEach((cb) => { try { cb({ type: "progress", ...payload }); } catch {} });
+});
+ipcRenderer.on("netcatty:zmodem:complete", (_event, payload) => {
+  const set = zmodemListeners.get(payload.sessionId);
+  if (!set) return;
+  set.forEach((cb) => { try { cb({ type: "complete", ...payload }); } catch {} });
+});
+ipcRenderer.on("netcatty:zmodem:error", (_event, payload) => {
+  const set = zmodemListeners.get(payload.sessionId);
+  if (!set) return;
+  set.forEach((cb) => { try { cb({ type: "error", ...payload }); } catch {} });
+});
+
 ipcRenderer.on("netcatty:data", (_event, payload) => {
  const set = dataListeners.get(payload.sessionId);
  if (!set) return;
@@ -153,6 +176,7 @@ ipcRenderer.on("netcatty:exit", (_event, payload) => {
  }
  dataListeners.delete(payload.sessionId);
  exitListeners.delete(payload.sessionId);
+  zmodemListeners.delete(payload.sessionId);
  const pendingTimer = _mcpFlushTimers.get(payload.sessionId);
  if (pendingTimer) {
    clearTimeout(pendingTimer);
@@ -569,6 +593,14 @@ const api = {
  },
  setSessionEncoding: (sessionId, encoding) =>
    ipcRenderer.invoke("netcatty:ssh:setEncoding", { sessionId, encoding }),
+  onZmodemEvent: (sessionId, cb) => {
+    if (!zmodemListeners.has(sessionId)) zmodemListeners.set(sessionId, new Set());
+    zmodemListeners.get(sessionId).add(cb);
+    return () => zmodemListeners.get(sessionId)?.delete(cb);
+  },
+  cancelZmodem: (sessionId) => {
+    ipcRenderer.send("netcatty:zmodem:cancel", { sessionId });
+  },
  onSessionData: (sessionId, cb) => {
    if (!dataListeners.has(sessionId)) dataListeners.set(sessionId, new Set());
    dataListeners.get(sessionId).add(cb);
--- a/global.d.ts
+++ b/global.d.ts
@@ -263,6 +263,23 @@ declare global {
    writeToSession(sessionId: string, data: string): void;
    resizeSession(sessionId: string, cols: number, rows: number): void;
    closeSession(sessionId: string): void;
+    // ZMODEM file transfer
+    onZmodemEvent?(
+      sessionId: string,
+      cb: (event: {
+        type: 'detect' | 'progress' | 'complete' | 'error';
+        sessionId: string;
+        transferType?: 'upload' | 'download';
+        filename?: string;
+        transferred?: number;
+        total?: number;
+        fileIndex?: number;
+        fileCount?: number;
+        finalizing?: boolean;
+        error?: string;
+      }) => void
+    ): () => void;
+    cancelZmodem?(sessionId: string): void;
    onSessionData(sessionId: string, cb: (data: string) => void): () => void;
    onSessionExit(
      sessionId: string,
--- a/index.css
+++ b/index.css
@@ -78,6 +78,28 @@
      opacity: 1;
    }
  }
+
+}
+
+@keyframes pop-in {
+  0% {
+    opacity: 0;
+    transform: scale(0.82) translateY(6px);
+  }
+  45% {
+    opacity: 1;
+    transform: scale(1.06) translateY(-2px);
+  }
+  72% {
+    transform: scale(0.97) translateY(1px);
+  }
+  88% {
+    transform: scale(1.01);
+  }
+  100% {
+    opacity: 1;
+    transform: scale(1) translateY(0);
+  }
 }

 :root {
@@ -337,7 +359,7 @@ body {

 /* Dim terminal text in unfocused workspace panes (default) */
 .workspace-pane:not(:focus-within) .xterm-screen {
-  opacity: 0.65;
+  opacity: 0.82;
 }
 /* Border-style focus indicator (opt-in via data attribute) */
 [data-workspace-focus="border"] .workspace-pane:not(:focus-within) .xterm-screen {
--- a/infrastructure/config/storageKeys.ts
+++ b/infrastructure/config/storageKeys.ts
@@ -108,6 +108,12 @@ export const STORAGE_KEY_WORKSPACE_FOCUS_STYLE = 'netcatty_workspace_focus_style
 // Immersive Mode
 export const STORAGE_KEY_IMMERSIVE_MODE = 'netcatty_immersive_mode_v1';

+// Vault: Show Recently Connected hosts section
+export const STORAGE_KEY_SHOW_RECENT_HOSTS = 'netcatty_show_recent_hosts_v1';
+
+// Group Configurations (default settings inherited by hosts)
+export const STORAGE_KEY_GROUP_CONFIGS = 'netcatty_group_configs_v1';
+
 // Side Panel
 export const STORAGE_KEY_SIDE_PANEL_WIDTH = 'netcatty_side_panel_width';

--- a/infrastructure/config/terminalThemes.ts
+++ b/infrastructure/config/terminalThemes.ts
@@ -1677,5 +1677,329 @@ export const TERMINAL_THEMES: TerminalTheme[] = [
      brightCyan: '#83c092',
      brightWhite: '#5c6d64'
    }
-  }
+  },
+  {
+    id: 'github-dark',
+    name: 'GitHub Dark',
+    type: 'dark',
+    colors: {
+      background: '#0d1117',
+      foreground: '#e6edf3',
+      cursor: '#2f81f7',
+      selection: '#264f78',
+      black: '#484f58',
+      red: '#ff7b72',
+      green: '#3fb950',
+      yellow: '#d29922',
+      blue: '#58a6ff',
+      magenta: '#bc8cff',
+      cyan: '#39c5cf',
+      white: '#b1bac4',
+      brightBlack: '#6e7681',
+      brightRed: '#ffa198',
+      brightGreen: '#56d364',
+      brightYellow: '#e3b341',
+      brightBlue: '#79c0ff',
+      brightMagenta: '#d2a8ff',
+      brightCyan: '#56d4dd',
+      brightWhite: '#ffffff',
+    }
+  },
+  {
+    id: 'github-light',
+    name: 'GitHub Light',
+    type: 'light',
+    colors: {
+      background: '#ffffff',
+      foreground: '#1f2328',
+      cursor: '#0969da',
+      selection: '#add6ff',
+      black: '#24292f',
+      red: '#cf222e',
+      green: '#116329',
+      yellow: '#4d2d00',
+      blue: '#0969da',
+      magenta: '#8250df',
+      cyan: '#1b7c83',
+      white: '#6e7781',
+      brightBlack: '#57606a',
+      brightRed: '#a40e26',
+      brightGreen: '#1a7f37',
+      brightYellow: '#633c01',
+      brightBlue: '#218bff',
+      brightMagenta: '#a475f9',
+      brightCyan: '#3192aa',
+      brightWhite: '#8c959f',
+    }
+  },
+  {
+    id: 'ubuntu',
+    name: 'Ubuntu',
+    type: 'dark',
+    colors: {
+      background: '#300a24',
+      foreground: '#eeeeec',
+      cursor: '#bbbbbb',
+      selection: '#b5d5ff',
+      black: '#2e3436',
+      red: '#cc0000',
+      green: '#4e9a06',
+      yellow: '#c4a000',
+      blue: '#3465a4',
+      magenta: '#75507b',
+      cyan: '#06989a',
+      white: '#d3d7cf',
+      brightBlack: '#555753',
+      brightRed: '#ef2929',
+      brightGreen: '#8ae234',
+      brightYellow: '#fce94f',
+      brightBlue: '#729fcf',
+      brightMagenta: '#ad7fa8',
+      brightCyan: '#34e2e2',
+      brightWhite: '#eeeeec',
+    }
+  },
+  {
+    id: 'one-dark-pro',
+    name: 'One Dark Pro',
+    type: 'dark',
+    colors: {
+      background: '#282c34',
+      foreground: '#abb2bf',
+      cursor: '#528bff',
+      selection: '#3e4452',
+      black: '#3f4451',
+      red: '#e05561',
+      green: '#8cc265',
+      yellow: '#d18f52',
+      blue: '#4aa5f0',
+      magenta: '#c162de',
+      cyan: '#42b3c2',
+      white: '#d7dae0',
+      brightBlack: '#4f5666',
+      brightRed: '#ff616e',
+      brightGreen: '#a5e075',
+      brightYellow: '#f0a45d',
+      brightBlue: '#4dc4ff',
+      brightMagenta: '#de73ff',
+      brightCyan: '#4cd1e0',
+      brightWhite: '#e6e6e6',
+    }
+  },
+  {
+    id: 'horizon-dark',
+    name: 'Horizon',
+    type: 'dark',
+    colors: {
+      background: '#1c1e26',
+      foreground: '#d5d8da',
+      cursor: '#6c6f93',
+      selection: '#6c6f93',
+      black: '#16161c',
+      red: '#e95678',
+      green: '#29d398',
+      yellow: '#fab795',
+      blue: '#26bbd9',
+      magenta: '#ee64ac',
+      cyan: '#59e1e3',
+      white: '#d5d8da',
+      brightBlack: '#6c6f93',
+      brightRed: '#ec6a88',
+      brightGreen: '#3fdaa4',
+      brightYellow: '#fbc3a7',
+      brightBlue: '#3fc4de',
+      brightMagenta: '#f075b5',
+      brightCyan: '#6be4e6',
+      brightWhite: '#ffffff',
+    }
+  },
+  {
+    id: 'palenight',
+    name: 'Palenight',
+    type: 'dark',
+    colors: {
+      background: '#292d3e',
+      foreground: '#bfc7d5',
+      cursor: '#ffcc00',
+      selection: '#7580b8',
+      black: '#292d3e',
+      red: '#ff5572',
+      green: '#a9c77d',
+      yellow: '#ffcb6b',
+      blue: '#82aaff',
+      magenta: '#c792ea',
+      cyan: '#89ddff',
+      white: '#d0d0d0',
+      brightBlack: '#676e95',
+      brightRed: '#ff5572',
+      brightGreen: '#c3e88d',
+      brightYellow: '#ffcb6b',
+      brightBlue: '#82aaff',
+      brightMagenta: '#c792ea',
+      brightCyan: '#89ddff',
+      brightWhite: '#ffffff',
+    }
+  },
+  {
+    id: 'panda',
+    name: 'Panda',
+    type: 'dark',
+    colors: {
+      background: '#292a2b',
+      foreground: '#e6e6e6',
+      cursor: '#ff4b82',
+      selection: '#454647',
+      black: '#757575',
+      red: '#ff2c6d',
+      green: '#19f9d8',
+      yellow: '#ffb86c',
+      blue: '#45a9f9',
+      magenta: '#ff75b5',
+      cyan: '#b084eb',
+      white: '#cdcdcd',
+      brightBlack: '#757575',
+      brightRed: '#ff2c6d',
+      brightGreen: '#19f9d8',
+      brightYellow: '#ffcc95',
+      brightBlue: '#6fc1ff',
+      brightMagenta: '#ff9ac1',
+      brightCyan: '#bcaafe',
+      brightWhite: '#e6e6e6',
+    }
+  },
+  {
+    id: 'snazzy',
+    name: 'Snazzy',
+    type: 'dark',
+    colors: {
+      background: '#1e1f29',
+      foreground: '#ebece6',
+      cursor: '#e4e4e4',
+      selection: '#81aec6',
+      black: '#000000',
+      red: '#fc4346',
+      green: '#50fb7c',
+      yellow: '#f0fb8c',
+      blue: '#49baff',
+      magenta: '#fc4cb4',
+      cyan: '#8be9fe',
+      white: '#ededec',
+      brightBlack: '#555555',
+      brightRed: '#fc4346',
+      brightGreen: '#50fb7c',
+      brightYellow: '#f0fb8c',
+      brightBlue: '#49baff',
+      brightMagenta: '#fc4cb4',
+      brightCyan: '#8be9fe',
+      brightWhite: '#ededec',
+    }
+  },
+  {
+    id: 'synthwave-84',
+    name: "Synthwave '84",
+    type: 'dark',
+    colors: {
+      background: '#262335',
+      foreground: '#f0eff1',
+      cursor: '#72f1b8',
+      selection: '#463465',
+      black: '#241b30',
+      red: '#fe4450',
+      green: '#72f1b8',
+      yellow: '#fede5d',
+      blue: '#03edf9',
+      magenta: '#ff7edb',
+      cyan: '#03edf9',
+      white: '#f0eff1',
+      brightBlack: '#7f7094',
+      brightRed: '#fe4450',
+      brightGreen: '#72f1b8',
+      brightYellow: '#f9f972',
+      brightBlue: '#aa54f9',
+      brightMagenta: '#ff7edb',
+      brightCyan: '#03edf9',
+      brightWhite: '#f2f2e3',
+    }
+  },
+  {
+    id: 'vesper',
+    name: 'Vesper',
+    type: 'dark',
+    colors: {
+      background: '#101010',
+      foreground: '#ffffff',
+      cursor: '#acb1ab',
+      selection: '#988049',
+      black: '#101010',
+      red: '#f5a191',
+      green: '#90b99f',
+      yellow: '#e6b99d',
+      blue: '#aca1cf',
+      magenta: '#e29eca',
+      cyan: '#ea83a5',
+      white: '#a0a0a0',
+      brightBlack: '#7e7e7e',
+      brightRed: '#ff8080',
+      brightGreen: '#99ffe4',
+      brightYellow: '#ffc799',
+      brightBlue: '#b9aeda',
+      brightMagenta: '#ecaad6',
+      brightCyan: '#f591b2',
+      brightWhite: '#ffffff',
+    }
+  },
+  {
+    id: 'kanso-dark',
+    name: 'Kanso Dark',
+    type: 'dark',
+    colors: {
+      background: '#090e13',
+      foreground: '#c5c9c7',
+      cursor: '#c5c9c7',
+      selection: '#393b44',
+      black: '#0d0c0c',
+      red: '#c4746e',
+      green: '#8a9a7b',
+      yellow: '#c4b28a',
+      blue: '#8ba4b0',
+      magenta: '#a292a3',
+      cyan: '#8ea4a2',
+      white: '#c8c093',
+      brightBlack: '#a4a7a4',
+      brightRed: '#e46876',
+      brightGreen: '#87a987',
+      brightYellow: '#e6c384',
+      brightBlue: '#7fbbb3',
+      brightMagenta: '#938aa9',
+      brightCyan: '#7aa89f',
+      brightWhite: '#c5c9c7',
+    }
+  },
+  {
+    id: 'kanso-light',
+    name: 'Kanso Light',
+    type: 'light',
+    colors: {
+      background: '#f2f1ef',
+      foreground: '#22262d',
+      cursor: '#22262d',
+      selection: '#e2e1df',
+      black: '#22262d',
+      red: '#c84053',
+      green: '#6f894e',
+      yellow: '#77713f',
+      blue: '#4d699b',
+      magenta: '#b35b79',
+      cyan: '#597b75',
+      white: '#545464',
+      brightBlack: '#6d6f6e',
+      brightRed: '#d7474b',
+      brightGreen: '#6e915f',
+      brightYellow: '#836f4a',
+      brightBlue: '#6693bf',
+      brightMagenta: '#624c83',
+      brightCyan: '#5e857a',
+      brightWhite: '#43436c',
+    }
+  },
 ];
--- a/infrastructure/persistence/secureFieldAdapter.ts
+++ b/infrastructure/persistence/secureFieldAdapter.ts
@@ -9,7 +9,7 @@
 * function degrades to a no-op — values pass through unmodified.
 */

-import type { Host, Identity, SSHKey } from "../../domain/models";
+import type { GroupConfig, Host, Identity, SSHKey } from "../../domain/models";
 import type { ProviderConnection, S3Config, WebDAVConfig } from "../../domain/sync";
 import { netcattyBridge } from "../services/netcattyBridge";

@@ -91,6 +91,38 @@ export async function decryptIdentitySecrets(identity: Identity): Promise<Identi
  return out;
 }

+// ---------------------------------------------------------------------------
+// GroupConfig
+// ---------------------------------------------------------------------------
+
+export async function encryptGroupConfigSecrets(config: GroupConfig): Promise<GroupConfig> {
+  const out = { ...config };
+  out.password = await encryptField(out.password);
+  out.telnetPassword = await encryptField(out.telnetPassword);
+  if (out.proxyConfig?.password) {
+    out.proxyConfig = { ...out.proxyConfig, password: await encryptField(out.proxyConfig.password) };
+  }
+  return out;
+}
+
+export async function decryptGroupConfigSecrets(config: GroupConfig): Promise<GroupConfig> {
+  const out = { ...config };
+  out.password = await decryptField(out.password);
+  out.telnetPassword = await decryptField(out.telnetPassword);
+  if (out.proxyConfig?.password) {
+    out.proxyConfig = { ...out.proxyConfig, password: await decryptField(out.proxyConfig.password) };
+  }
+  return out;
+}
+
+export function encryptGroupConfigs(configs: GroupConfig[]): Promise<GroupConfig[]> {
+  return Promise.all(configs.map(encryptGroupConfigSecrets));
+}
+
+export function decryptGroupConfigs(configs: GroupConfig[]): Promise<GroupConfig[]> {
+  return Promise.all(configs.map(decryptGroupConfigSecrets));
+}
+
 // ---------------------------------------------------------------------------
 // Provider Connection (Cloud Sync)
 // ---------------------------------------------------------------------------
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,6 +57,7 @@
        "use-stick-to-bottom": "^1.1.3",
        "uuid": "^13.0.0",
        "webdav": "^5.8.0",
+        "zmodem.js": "^0.1.10",
        "zod": "^4.3.6"
      },
      "devDependencies": {
@@ -8282,6 +8283,18 @@
        "buffer": "^5.1.0"
      }
    },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "license": "Apache-2.0",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/cross-dirname": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz",
@@ -16276,6 +16289,15 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/zmodem.js": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/zmodem.js/-/zmodem.js-0.1.10.tgz",
+      "integrity": "sha512-Z1DWngunZ/j3BmIzSJpFZVNV73iHkj89rxXX4IciJdU9ga3nZ7rJ5LkfjV/QDsKhc7bazDWTTJCLJ+iRXD82dw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "crc-32": "^1.1.1"
+      }
+    },
    "node_modules/zod": {
      "version": "4.3.6",
      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
    "use-stick-to-bottom": "^1.1.3",
    "uuid": "^13.0.0",
    "webdav": "^5.8.0",
+    "zmodem.js": "^0.1.10",
    "zod": "^4.3.6"
  },
  "devDependencies": {