Merge branch 'binaricat:main' into main

docs: add Netcatty feature todo list
Merge pull request #1 from AkarinServer/feature/linux-build-support
2026-01-09 22:03:02 +08:00 · 2026-01-09 22:02:34 +08:00 · 2026-01-08 23:22:16 +08:00
214 changed files with 11765 additions and 34183 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npx tsc:*)"
+    ]
+  }
+}
--- a/.github/scripts/generate-release-note.js
+++ b/.github/scripts/generate-release-note.js
@@ -1,104 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-// Determine version priority:
-// 1. VERSION env variable
-// 2. Valid version tag (v1.2.3 format)
-// 3. Short commit ID (first 7 chars of GITHUB_SHA)
-// 4. package.json version as fallback
-function getVersion() {
-  if (process.env.VERSION) {
-    return process.env.VERSION;
-  }
-
-  const refName = process.env.GITHUB_REF_NAME;
-  // Check if refName is a valid version tag (e.g., v1.2.3)
-  if (refName && /^v\d+\.\d+\.\d+/.test(refName)) {
-    return refName.replace(/^v/, '');
-  }
-
-  // Use short commit ID
-  const sha = process.env.GITHUB_SHA;
-  if (sha) {
-    return sha.substring(0, 7);
-  }
-
-  // Fall back to package.json version
-  try {
-    const pkgPath = path.join(__dirname, '..', '..', 'package.json');
-    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-    return pkg.version;
-  } catch {
-    return '0.0.0';
-  }
-}
-
-const version = getVersion();
-const repo = process.env.GITHUB_REPOSITORY || 'binaricat/netcatty';
-// For tag releases, use the tag; for workflow_dispatch, create a tag from version
-const tag = (process.env.GITHUB_REF_NAME && /^v\d+\.\d+\.\d+/.test(process.env.GITHUB_REF_NAME))
-  ? process.env.GITHUB_REF_NAME
-  : `v${version}`;
-const baseUrl = `https://github.com/${repo}/releases/download/${tag}`;
-
-// Filename patterns based on electron-builder.config.cjs artifactName: '${productName}-${version}-${os}-${arch}.${ext}'
-const files = {
-  mac: {
-    arm64: `Netcatty-${version}-mac-arm64.dmg`,
-    x64: `Netcatty-${version}-mac-x64.dmg`
-  },
-  win: {
-    x64: `Netcatty-${version}-win-x64.exe`,
-    arm64: `Netcatty-${version}-win-arm64.exe`
-  },
-  linux: {
-    appimage: {
-      x64: `Netcatty-${version}-linux-x64.AppImage`,
-      arm64: `Netcatty-${version}-linux-arm64.AppImage`
-    },
-    deb: {
-      x64: `Netcatty-${version}-linux-x64.deb`,
-      arm64: `Netcatty-${version}-linux-arm64.deb`
-    },
-    rpm: {
-      x64: `Netcatty-${version}-linux-x64.rpm`,
-      arm64: `Netcatty-${version}-linux-arm64.rpm`
-    }
-  }
-};
-
-const badges = {
-  win: {
-    setup_x64: `[![Setup x64](https://img.shields.io/badge/Setup-x64-0078D6?style=flat-square&logo=windows)](${baseUrl}/${files.win.x64})`,
-    setup_arm64: `[![Setup arm64](https://img.shields.io/badge/Setup-arm64-0078D6?style=flat-square&logo=windows)](${baseUrl}/${files.win.arm64})`
-  },
-  mac: {
-    apple_silicon: `[![DMG Apple Silicon](https://img.shields.io/badge/DMG-Apple_Silicon-000000?style=flat-square&logo=apple)](${baseUrl}/${files.mac.arm64})`,
-    intel: `[![DMG Intel X64](https://img.shields.io/badge/DMG-Intel_X64-000000?style=flat-square&logo=apple)](${baseUrl}/${files.mac.x64})`
-  },
-  linux: {
-    appimage_x64: `[![AppImage x64](https://img.shields.io/badge/AppImage-x64-FCC624?style=flat-square&logo=linux)](${baseUrl}/${files.linux.appimage.x64})`,
-    appimage_arm64: `[![AppImage arm64](https://img.shields.io/badge/AppImage-arm64-FCC624?style=flat-square&logo=linux)](${baseUrl}/${files.linux.appimage.arm64})`,
-    deb_x64: `[![DebPackage x64](https://img.shields.io/badge/DebPackage-x64-A80030?style=flat-square&logo=debian)](${baseUrl}/${files.linux.deb.x64})`,
-    deb_arm64: `[![DebPackage arm64](https://img.shields.io/badge/DebPackage-arm64-A80030?style=flat-square&logo=debian)](${baseUrl}/${files.linux.deb.arm64})`,
-    rpm_x64: `[![RpmPackage x64](https://img.shields.io/badge/RpmPackage-x64-CC0000?style=flat-square&logo=redhat)](${baseUrl}/${files.linux.rpm.x64})`,
-    rpm_arm64: `[![RpmPackage arm64](https://img.shields.io/badge/RpmPackage-arm64-CC0000?style=flat-square&logo=redhat)](${baseUrl}/${files.linux.rpm.arm64})`
-  }
-};
-
-const content = `
-## Download based on your OS:
-
-| OS | Download |
-| :--- | :--- |
-| **Windows** | ${badges.win.setup_x64} ${badges.win.setup_arm64} |
-| **macOS** | ${badges.mac.apple_silicon} ${badges.mac.intel} |
-| **Linux** | ${badges.linux.appimage_x64} ${badges.linux.deb_x64} ${badges.linux.rpm_x64} <br> ${badges.linux.appimage_arm64} ${badges.linux.deb_arm64} ${badges.linux.rpm_arm64} |
-`;
-
-fs.writeFileSync('release_notes.md', content);
-console.log('Generated release_notes.md');
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,16 +37,11 @@ jobs:
      - name: Install deps
        run: npm ci

-      - name: Set version
+      - name: Set version from tag
+        if: startsWith(github.ref, 'refs/tags/v')
        shell: bash
        run: |
-          if [[ "$GITHUB_REF" == refs/tags/v* ]]; then
-            # Tag release: use version from tag
-            VERSION="${GITHUB_REF_NAME#v}"
-          else
-            # workflow_dispatch: use short commit ID
-            VERSION="${GITHUB_SHA:0:7}"
-          fi
+          VERSION="${GITHUB_REF_NAME#v}"
          echo "Setting version to ${VERSION}"
          npm pkg set version="${VERSION}"

@@ -75,12 +70,15 @@ jobs:
          name: netcatty-${{ matrix.os }}
          path: |
            release/*.dmg
+            release/*.zip
            release/*.exe
            release/*.msi
            release/*.AppImage
            release/*.deb
            release/*.rpm
            release/*.tar.gz
+            release/*.blockmap
+            release/latest*.yml
          if-no-files-found: ignore

  release:
@@ -103,23 +101,20 @@ jobs:
      - name: List artifacts
        run: ls -la artifacts/

-      - name: Generate Release Body
-        run: node .github/scripts/generate-release-note.js
-        env:
-          GITHUB_REF_NAME: ${{ github.ref_name }}
-          GITHUB_REPOSITORY: ${{ github.repository }}
-          GITHUB_SHA: ${{ github.sha }}
-
      - name: Create GitHub Release
        uses: softprops/action-gh-release@v2
        with:
-          body_path: release_notes.md
          files: |
            artifacts/*.dmg
+            artifacts/*.zip
            artifacts/*.exe
+            artifacts/*.msi
            artifacts/*.AppImage
            artifacts/*.deb
            artifacts/*.rpm
+            artifacts/*.tar.gz
+            artifacts/*.blockmap
+            artifacts/latest*.yml
          generate_release_notes: true
          fail_on_unmatched_files: false
          token: ${{ secrets.RELEASE_TOKEN }}
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -1,42 +0,0 @@
-name: Sync Upstream
-
-env:
-  UPSTREAM_URL: "https://github.com/binaricat/Netcatty.git"
-  UPSTREAM_BRANCH: "main"
-  TARGET_BRANCH: "main"
-
-on:
-  schedule:
-    - cron: '0 0 * * *'  # Run daily at midnight
-  workflow_dispatch:      # Allow manual trigger
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.TARGET_BRANCH }}
-          fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Configure Git
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Merge Upstream
-        run: |
-          echo "Adding upstream remote..."
-          git remote add upstream ${{ env.UPSTREAM_URL }}
-          git fetch upstream ${{ env.UPSTREAM_BRANCH }}
-          
-          echo "Merging upstream/${{ env.UPSTREAM_BRANCH }} into ${{ env.TARGET_BRANCH }}..."
-          # This will fail if there are conflicts, which is the desired behavior (notify user via failure)
-          git merge upstream/${{ env.UPSTREAM_BRANCH }} --no-edit
-          
-          echo "Pushing changes..."
-          git push origin ${{ env.TARGET_BRANCH }}
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,3 @@ coverage
 *.njsproj
 *.sln
 *.sw?
-
-# Claude Code local settings
-/.claude/settings.local.json
--- a/App.tsx
+++ b/App.tsx
@@ -1,16 +1,13 @@
 import React, { Suspense, lazy, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { activeTabStore, useActiveTabId, useIsSftpActive, useIsTerminalLayerVisible, useIsVaultActive } from './application/state/activeTabStore';
 import { useAutoSync } from './application/state/useAutoSync';
-import { useManagedSourceSync } from './application/state/useManagedSourceSync';
 import { usePortForwardingAutoStart } from './application/state/usePortForwardingAutoStart';
-import { usePortForwardingState } from './application/state/usePortForwardingState';
 import { useSessionState } from './application/state/useSessionState';
 import { useSettingsState } from './application/state/useSettingsState';
 import { useUpdateCheck } from './application/state/useUpdateCheck';
 import { useVaultState } from './application/state/useVaultState';
 import { useWindowControls } from './application/state/useWindowControls';
 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 { resolveHostAuth } from './domain/sshAuth';
@@ -22,17 +19,14 @@ import { Input } from './components/ui/input';
 import { Label } from './components/ui/label';
 import { ToastProvider, toast } from './components/ui/toast';
 import { VaultView, VaultSection } from './components/VaultView';
-import { KeyboardInteractiveModal, KeyboardInteractiveRequest } from './components/KeyboardInteractiveModal';
-import { PassphraseModal, PassphraseRequest } from './components/PassphraseModal';
 import { cn } from './lib/utils';
-import { ConnectionLog, Host, HostProtocol, SerialConfig, TerminalTheme } from './types';
+import { ConnectionLog, Host, HostProtocol, TerminalTheme } from './types';
 import { LogView as LogViewType } from './application/state/useSessionState';
 import type { SftpView as SftpViewComponent } from './components/SftpView';
 import type { TerminalLayer as TerminalLayerComponent } from './components/TerminalLayer';

 // Initialize fonts eagerly at app startup
 initializeFonts();
-initializeUIFonts();

 // Visibility container for VaultView - isolates isActive subscription
 const VaultViewContainer: React.FC<{ children: React.ReactNode }> = ({ children }) => {
@@ -87,9 +81,6 @@ const LazyProtocolSelectDialog = lazy(() => import('./components/ProtocolSelectD
 const LazyQuickSwitcher = lazy(() =>
  import('./components/QuickSwitcher').then((m) => ({ default: m.QuickSwitcher })),
 );
-const LazyCreateWorkspaceDialog = lazy(() =>
-  import('./components/CreateWorkspaceDialog').then((m) => ({ default: m.CreateWorkspaceDialog })),
-);

 const IS_DEV = import.meta.env.DEV;
 const HOTKEY_DEBUG =
@@ -154,16 +145,11 @@ function App({ settings }: { settings: SettingsState }) {
  const { t } = useI18n();

  const [isQuickSwitcherOpen, setIsQuickSwitcherOpen] = useState(false);
-  const [isCreateWorkspaceOpen, setIsCreateWorkspaceOpen] = useState(false);
  const [quickSearch, setQuickSearch] = useState('');
  // Protocol selection dialog state for QuickSwitcher
  const [protocolSelectHost, setProtocolSelectHost] = useState<Host | null>(null);
  // Navigation state for VaultView sections
  const [navigateToSection, setNavigateToSection] = useState<VaultSection | null>(null);
-  // Keyboard-interactive authentication queue (2FA/MFA) - queue-based to handle multiple concurrent sessions
-  const [keyboardInteractiveQueue, setKeyboardInteractiveQueue] = useState<KeyboardInteractiveRequest[]>([]);
-  // Passphrase request queue for encrypted SSH keys
-  const [passphraseQueue, setPassphraseQueue] = useState<PassphraseRequest[]>([]);

  const {
    theme,
@@ -178,9 +164,6 @@ function App({ settings }: { settings: SettingsState }) {
    hotkeyScheme,
    keyBindings,
    isHotkeyRecording,
-    sessionLogsEnabled,
-    sessionLogsDir,
-    sessionLogsFormat,
  } = settings;

  const {
@@ -193,7 +176,6 @@ function App({ settings }: { settings: SettingsState }) {
    knownHosts,
    shellHistory,
    connectionLogs,
-    managedSources,
    updateHosts,
    updateKeys,
    updateIdentities,
@@ -201,7 +183,6 @@ function App({ settings }: { settings: SettingsState }) {
    updateSnippetPackages,
    updateCustomGroups,
    updateKnownHosts,
-    updateManagedSources,
    addShellHistoryEntry,
    addConnectionLog,
    updateConnectionLog,
@@ -237,7 +218,6 @@ function App({ settings }: { settings: SettingsState }) {
    closeSession,
    closeWorkspace,
    updateSessionStatus,
-    createWorkspaceWithHosts,
    createWorkspaceFromSessions,
    addSessionToWorkspace,
    updateSplitSizes,
@@ -254,26 +234,11 @@ function App({ settings }: { settings: SettingsState }) {
    logViews,
    openLogView,
    closeLogView,
-    copySession,
  } = useSessionState();

  // isMacClient is used for window controls styling
  const isMacClient = typeof navigator !== 'undefined' && /Mac|Macintosh/.test(navigator.userAgent);

-  // Get port forwarding rules and import function
-  const { rules: portForwardingRules, importRules: importPortForwardingRules, startTunnel, stopTunnel } = usePortForwardingState();
-
-  const portForwardingRulesForSync = useMemo(
-    () =>
-      portForwardingRules.map((rule) => ({
-        ...rule,
-        status: "inactive",
-        error: undefined,
-        lastUsedAt: undefined,
-      })),
-    [portForwardingRules],
-  );
-
  // Auto-sync hook for cloud sync
  const { syncNow: handleSyncNow } = useAutoSync({
    hosts,
@@ -281,7 +246,7 @@ function App({ settings }: { settings: SettingsState }) {
    identities,
    snippets,
    customGroups,
-    portForwardingRules: portForwardingRulesForSync,
+    portForwardingRules: undefined, // TODO: Add port forwarding rules from usePortForwardingState
    knownHosts,
    onApplyPayload: (payload) => {
      importDataFromString(JSON.stringify({
@@ -291,19 +256,9 @@ function App({ settings }: { settings: SettingsState }) {
        snippets: payload.snippets,
        customGroups: payload.customGroups,
      }));
-
-      if (payload.portForwardingRules) {
-        importPortForwardingRules(payload.portForwardingRules);
-      }
    },
  });

-  const { clearAndRemoveSource, clearAndRemoveSources, unmanageSource } = useManagedSourceSync({
-    hosts,
-    managedSources,
-    onUpdateManagedSources: updateManagedSources,
-  });
-
  const handleSyncNowManual = useCallback(() => {
    return handleSyncNow({ trigger: 'manual' });
  }, [handleSyncNow]);
@@ -330,251 +285,12 @@ function App({ settings }: { settings: SettingsState }) {
    }
  }, [updateState.hasUpdate, updateState.latestRelease, t, openReleasePage, dismissUpdate]);

-  // Memoize keys for port forwarding to prevent unnecessary re-renders
-  const portForwardingKeys = useMemo(
-    () => keys.map((k) => ({ id: k.id, privateKey: k.privateKey })),
-    [keys]
-  );
-
  // Auto-start port forwarding rules on app launch
  usePortForwardingAutoStart({
    hosts,
-    keys: portForwardingKeys,
+    keys: keys.map((k) => ({ id: k.id, privateKey: k.privateKey })),
  });

-  // Sync tray menu data + handle tray actions
-  useEffect(() => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.updateTrayMenuData) return;
-
-    let cancelled = false;
-    const timer = setTimeout(() => {
-      if (cancelled) return;
-
-      const sessionsForTray = sessions.map((s) => {
-        const ws = s.workspaceId ? workspaces.find((w) => w.id === s.workspaceId) : undefined;
-        return {
-          id: s.id,
-          label: s.hostname,
-          hostLabel: s.hostLabel,
-          status: s.status,
-          workspaceId: s.workspaceId,
-          workspaceTitle: ws?.title,
-        };
-      });
-
-      void bridge.updateTrayMenuData({
-        sessions: sessionsForTray,
-        portForwardRules: portForwardingRules,
-      });
-    }, 250);
-
-    return () => {
-      cancelled = true;
-      clearTimeout(timer);
-    };
-  }, [sessions, portForwardingRules, workspaces]);
-
-  useEffect(() => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.onTrayFocusSession || !bridge?.onTrayTogglePortForward) return;
-
-    const unsubscribeFocus = bridge.onTrayFocusSession((sessionId) => {
-      // Find the session to check if it belongs to a workspace
-      const session = sessions.find((s) => s.id === sessionId);
-      if (session?.workspaceId) {
-        // Session is in a workspace - navigate to workspace and focus the session
-        setActiveTabId(session.workspaceId);
-        setWorkspaceFocusedSession(session.workspaceId, sessionId);
-      } else {
-        // Standalone session or session not found - just set tab
-        setActiveTabId(sessionId);
-      }
-    });
-
-    const unsubscribeToggle = bridge.onTrayTogglePortForward((ruleId, start) => {
-      const rule = portForwardingRules.find((r) => r.id === ruleId);
-      if (!rule) return;
-      const host = rule.hostId ? hosts.find((h) => h.id === rule.hostId) : undefined;
-      if (!host) {
-        toast.error(t("pf.error.hostNotFound"));
-        return;
-      }
-
-      const keysForPf = keys.map((k) => ({ id: k.id, privateKey: k.privateKey }));
-      if (start) {
-        void startTunnel(rule, host, keysForPf, (status, error) => {
-          if (status === "error" && error) toast.error(error);
-        }, rule.autoStart);
-      } else {
-        void stopTunnel(ruleId);
-      }
-    });
-
-    return () => {
-      unsubscribeFocus?.();
-      unsubscribeToggle?.();
-    };
-  }, [hosts, keys, portForwardingRules, sessions, setActiveTabId, setWorkspaceFocusedSession, startTunnel, stopTunnel, t]);
-
-  // Tray panel actions (from main process)
-  useEffect(() => {
-    const handlerJump = (sessionId: string) => {
-      // Find the session to check if it belongs to a workspace
-      const session = sessions.find((s) => s.id === sessionId);
-      if (session?.workspaceId) {
-        // Session is in a workspace - navigate to workspace and focus the session
-        setActiveTabId(session.workspaceId);
-        setWorkspaceFocusedSession(session.workspaceId, sessionId);
-      } else {
-        // Standalone session or session not found - just set tab
-        setActiveTabId(sessionId);
-      }
-    };
-
-    const handlerConnect = (hostId: string) => {
-      const host = hosts.find((h) => h.id === hostId);
-      if (!host) {
-        toast.error(t("pf.error.hostNotFound"));
-        return;
-      }
-
-      addConnectionLog({
-        hostId: host.id,
-        hostLabel: host.label,
-        hostname: host.hostname,
-        username: host.username,
-        localHostname: "",
-        saved: false,
-      });
-
-      connectToHost(host);
-    };
-
-    const bridge = netcattyBridge.get();
-    if (!bridge?.onTrayPanelJumpToSession || !bridge?.onTrayPanelConnectToHost) return;
-
-    const unsubscribeJump = bridge.onTrayPanelJumpToSession(handlerJump);
-    const unsubscribeConnect = bridge.onTrayPanelConnectToHost(handlerConnect);
-    return () => {
-      unsubscribeJump?.();
-      unsubscribeConnect?.();
-    };
-  }, [addConnectionLog, connectToHost, hosts, sessions, setActiveTabId, setWorkspaceFocusedSession, t]);
-
-  // Keyboard-interactive authentication (2FA/MFA) event listener
-  useEffect(() => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.onKeyboardInteractive) return;
-
-    const unsubscribe = bridge.onKeyboardInteractive((request) => {
-      console.log('[App] Keyboard-interactive request received:', request);
-      // Add to queue instead of replacing - supports multiple concurrent sessions
-      setKeyboardInteractiveQueue(prev => [...prev, {
-        requestId: request.requestId,
-        name: request.name,
-        instructions: request.instructions,
-        prompts: request.prompts,
-        hostname: request.hostname,
-        savedPassword: request.savedPassword,
-      }]);
-    });
-
-    return () => {
-      unsubscribe?.();
-    };
-  }, []);
-
-  // Handle keyboard-interactive submit
-  const handleKeyboardInteractiveSubmit = useCallback((requestId: string, responses: string[]) => {
-    const bridge = netcattyBridge.get();
-    if (bridge?.respondKeyboardInteractive) {
-      void bridge.respondKeyboardInteractive(requestId, responses, false);
-    }
-    // Remove from queue by requestId
-    setKeyboardInteractiveQueue(prev => prev.filter(r => r.requestId !== requestId));
-  }, []);
-
-  // Handle keyboard-interactive cancel
-  const handleKeyboardInteractiveCancel = useCallback((requestId: string) => {
-    const bridge = netcattyBridge.get();
-    if (bridge?.respondKeyboardInteractive) {
-      void bridge.respondKeyboardInteractive(requestId, [], true);
-    }
-    // Remove from queue by requestId
-    setKeyboardInteractiveQueue(prev => prev.filter(r => r.requestId !== requestId));
-  }, []);
-
-  // Passphrase request event listener for encrypted SSH keys
-  useEffect(() => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.onPassphraseRequest) return;
-
-    const unsubscribe = bridge.onPassphraseRequest((request) => {
-      console.log('[App] Passphrase request received:', request);
-      setPassphraseQueue(prev => [...prev, {
-        requestId: request.requestId,
-        keyPath: request.keyPath,
-        keyName: request.keyName,
-        hostname: request.hostname,
-      }]);
-    });
-
-    return () => {
-      unsubscribe?.();
-    };
-  }, []);
-
-  // Handle passphrase submit
-  const handlePassphraseSubmit = useCallback((requestId: string, passphrase: string) => {
-    const bridge = netcattyBridge.get();
-    if (bridge?.respondPassphrase) {
-      void bridge.respondPassphrase(requestId, passphrase, false);
-    }
-    setPassphraseQueue(prev => prev.filter(r => r.requestId !== requestId));
-  }, []);
-
-  // Handle passphrase cancel
-  const handlePassphraseCancel = useCallback((requestId: string) => {
-    const bridge = netcattyBridge.get();
-    if (bridge?.respondPassphrase) {
-      // Cancel = stop the entire passphrase flow
-      void bridge.respondPassphrase(requestId, '', true);
-    }
-    setPassphraseQueue(prev => prev.filter(r => r.requestId !== requestId));
-  }, []);
-
-  // Handle passphrase skip (skip this key, continue with others)
-  const handlePassphraseSkip = useCallback((requestId: string) => {
-    const bridge = netcattyBridge.get();
-    if (bridge?.respondPassphraseSkip) {
-      // Skip = skip this key but continue asking for others
-      void bridge.respondPassphraseSkip(requestId);
-    } else if (bridge?.respondPassphrase) {
-      // Fallback for older API
-      void bridge.respondPassphrase(requestId, '', false);
-    }
-    setPassphraseQueue(prev => prev.filter(r => r.requestId !== requestId));
-  }, []);
-
-  // Handle passphrase timeout (request expired on backend)
-  useEffect(() => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.onPassphraseTimeout) return;
-
-    const unsubscribe = bridge.onPassphraseTimeout((event) => {
-      console.log('[App] Passphrase request timed out:', event.requestId);
-      // Remove from queue - the modal will close automatically
-      setPassphraseQueue(prev => prev.filter(r => r.requestId !== event.requestId));
-      // Show a toast notification to inform user
-      toast.error('Passphrase request timed out. Please try connecting again.');
-    });
-
-    return () => {
-      unsubscribe?.();
-    };
-  }, []);
-
  // Debounce ref for moveFocus to prevent double-triggering when focus switches
  const lastMoveFocusTimeRef = useRef<number>(0);
  const MOVE_FOCUS_DEBOUNCE_MS = 200;
@@ -852,7 +568,7 @@ function App({ settings }: { settings: SettingsState }) {
        (h.group || '').toLowerCase().includes(term)
      )
      : hosts;
-    return filtered;
+    return filtered.slice(0, 8);
  }, [hosts, quickSearch, isQuickSwitcherOpen]);

  const handleDeleteHost = useCallback((hostId: string) => {
@@ -903,25 +619,6 @@ function App({ settings }: { settings: SettingsState }) {
  // Wrapper to connect to host with logging
  const handleConnectToHost = useCallback((host: Host) => {
    const { username, hostname: localHost } = systemInfoRef.current;
-
-    // Handle serial hosts separately
-    if (host.protocol === 'serial') {
-      const portName = host.hostname.split('/').pop() || host.hostname;
-      addConnectionLog({
-        hostId: host.id,
-        hostLabel: host.label || `Serial: ${portName}`,
-        hostname: host.hostname,
-        username: username,
-        protocol: 'serial',
-        startTime: Date.now(),
-        localUsername: username,
-        localHostname: localHost,
-        saved: false,
-      });
-      connectToHost(host);
-      return;
-    }
-
    const protocol = host.moshEnabled ? 'mosh' : (host.protocol || 'ssh');
    const resolvedAuth = resolveHostAuth({ host, keys, identities });
    addConnectionLog({
@@ -938,24 +635,6 @@ function App({ settings }: { settings: SettingsState }) {
    connectToHost(host);
  }, [addConnectionLog, connectToHost, identities, keys]);

-  // Wrapper to create serial session with logging
-  const handleConnectSerial = useCallback((config: SerialConfig) => {
-    const { username, hostname } = systemInfoRef.current;
-    const portName = config.path.split('/').pop() || config.path;
-    addConnectionLog({
-      hostId: '',
-      hostLabel: `Serial: ${portName}`,
-      hostname: config.path,
-      username: username,
-      protocol: 'serial',
-      startTime: Date.now(),
-      localUsername: username,
-      localHostname: hostname,
-      saved: false,
-    });
-    createSerialSession(config);
-  }, [addConnectionLog, createSerialSession]);
-
  // Handle terminal data capture when session exits
  const handleTerminalDataCapture = useCallback((sessionId: string, data: string) => {
    if (IS_DEV) console.log('[handleTerminalDataCapture] Called', { sessionId, dataLength: data.length });
@@ -989,32 +668,10 @@ function App({ settings }: { settings: SettingsState }) {
        terminalData: data,
      });
      if (IS_DEV) console.log('[handleTerminalDataCapture] Updated log with terminalData');
-
-      // Auto-save session log if enabled
-      if (sessionLogsEnabled && sessionLogsDir && data) {
-        import('./infrastructure/services/netcattyBridge').then(({ netcattyBridge }) => {
-          const bridge = netcattyBridge.get();
-          if (bridge?.autoSaveSessionLog) {
-            bridge.autoSaveSessionLog({
-              terminalData: data,
-              hostLabel: matchingLog.hostLabel,
-              hostname: matchingLog.hostname,
-              hostId: matchingLog.hostId,
-              startTime: matchingLog.startTime,
-              format: sessionLogsFormat,
-              directory: sessionLogsDir,
-            }).then(result => {
-              if (IS_DEV) console.log('[handleTerminalDataCapture] Auto-save result:', result);
-            }).catch(err => {
-              console.error('[handleTerminalDataCapture] Auto-save failed:', err);
-            });
-          }
-        });
-      }
    } else {
      if (IS_DEV) console.log('[handleTerminalDataCapture] No matching log found!');
    }
-  }, [sessions, connectionLogs, updateConnectionLog, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat]);
+  }, [sessions, connectionLogs, updateConnectionLog]);

  // Check if host has multiple protocols enabled
  const hasMultipleProtocols = useCallback((host: Host) => {
@@ -1091,7 +748,6 @@ function App({ settings }: { settings: SettingsState }) {
        isMacClient={isMacClient}
        onCloseSession={closeSession}
        onRenameSession={startSessionRename}
-        onCopySession={copySession}
        onRenameWorkspace={startWorkspaceRename}
        onCloseWorkspace={closeWorkspace}
        onCloseLogView={closeLogView}
@@ -1116,14 +772,11 @@ function App({ settings }: { settings: SettingsState }) {
            knownHosts={knownHosts}
            shellHistory={shellHistory}
            connectionLogs={connectionLogs}
-            managedSources={managedSources}
            sessions={sessions}
-            hotkeyScheme={hotkeyScheme}
-            keyBindings={keyBindings}
            onOpenSettings={handleOpenSettings}
            onOpenQuickSwitcher={handleOpenQuickSwitcher}
            onCreateLocalTerminal={handleCreateLocalTerminal}
-            onConnectSerial={handleConnectSerial}
+            onConnectSerial={createSerialSession}
            onDeleteHost={handleDeleteHost}
            onConnect={handleConnectToHost}
            onUpdateHosts={updateHosts}
@@ -1133,10 +786,6 @@ function App({ settings }: { settings: SettingsState }) {
            onUpdateSnippetPackages={updateSnippetPackages}
            onUpdateCustomGroups={updateCustomGroups}
            onUpdateKnownHosts={updateKnownHosts}
-            onUpdateManagedSources={updateManagedSources}
-            onClearAndRemoveManagedSource={clearAndRemoveSource}
-            onClearAndRemoveManagedSources={clearAndRemoveSources}
-            onUnmanageSource={unmanageSource}
            onConvertKnownHost={convertKnownHostToHost}
            onToggleConnectionLogSaved={toggleConnectionLogSaved}
            onDeleteConnectionLog={deleteConnectionLog}
@@ -1227,8 +876,8 @@ function App({ settings }: { settings: SettingsState }) {
              setQuickSearch('');
            }}
            onCreateWorkspace={() => {
+              // TODO: Implement workspace creation
              setIsQuickSwitcherOpen(false);
-              setIsCreateWorkspaceOpen(true);
            }}
            onClose={() => {
              setIsQuickSwitcherOpen(false);
@@ -1293,17 +942,6 @@ function App({ settings }: { settings: SettingsState }) {
        </DialogContent>
      </Dialog>

-      {isCreateWorkspaceOpen && (
-        <Suspense fallback={null}>
-          <LazyCreateWorkspaceDialog
-            isOpen={isCreateWorkspaceOpen}
-            onClose={() => setIsCreateWorkspaceOpen(false)}
-            hosts={hosts}
-            onCreate={createWorkspaceWithHosts}
-          />
-        </Suspense>
-      )}
-
      {/* Protocol Select Dialog for QuickSwitcher */}
      {protocolSelectHost && (
        <Suspense fallback={null}>
@@ -1314,27 +952,6 @@ function App({ settings }: { settings: SettingsState }) {
          />
        </Suspense>
      )}
-
-      {/* Global Keyboard-Interactive Authentication Modal (2FA/MFA) - processes queue */}
-      <KeyboardInteractiveModal
-        request={keyboardInteractiveQueue[0] || null}
-        onSubmit={handleKeyboardInteractiveSubmit}
-        onCancel={handleKeyboardInteractiveCancel}
-      />
-      {/* Indicator when more 2FA requests are pending */}
-      {keyboardInteractiveQueue.length > 1 && (
-        <div className="fixed bottom-4 right-4 z-50 bg-muted/90 backdrop-blur-sm text-sm px-3 py-1.5 rounded-full border shadow-sm">
-          {keyboardInteractiveQueue.length - 1} more pending
-        </div>
-      )}
-
-      {/* Global Passphrase Modal for encrypted SSH keys */}
-      <PassphraseModal
-        request={passphraseQueue[0] || null}
-        onSubmit={handlePassphraseSubmit}
-        onCancel={handlePassphraseCancel}
-        onSkip={handlePassphraseSkip}
-      />
    </div>
  );
 }
--- a/README.ja-JP.md
+++ b/README.ja-JP.md
@@ -5,19 +5,18 @@
 <h1 align="center">Netcatty</h1>

 <p align="center">
-  <strong>モダンな SSH クライアント、SFTP ブラウザ & ターミナルマネージャー</strong><br/>
-  <a href="https://netcatty.app"><strong>netcatty.app</strong></a>
+  <strong>モダンな SSH クライアント、SFTP ブラウザ & ターミナルマネージャー</strong>
 </p>

 <p align="center">
  Electron、React、xterm.js で構築された機能豊富な SSH ワークスペース。<br/>
-  分割ターミナル、Vault ビュー、SFTP ワークフロー、カスタムテーマ、キーワードハイライト — すべてが一つに。
+  ホスト管理、分割ターミナル、SFTP、ポートフォワーディング、クラウド同期 — すべてが一つに。
 </p>

 <p align="center">
  <a href="https://github.com/binaricat/Netcatty/releases/latest"><img alt="GitHub Release" src="https://img.shields.io/github/v/release/binaricat/Netcatty?style=for-the-badge&logo=github&label=Release"></a>
  &nbsp;
-  <a href="#"><img alt="Platform" src="https://img.shields.io/badge/Platform-macOS%20%7C%20Windows%20%7C%20Linux-blue?style=for-the-badge&logo=electron"></a>
+  <a href="#"><img alt="Platform" src="https://img.shields.io/badge/Platform-macOS%20%7C%20Windows-blue?style=for-the-badge&logo=electron"></a>
  &nbsp;
  <a href="LICENSE"><img alt="License" src="https://img.shields.io/badge/License-GPL--3.0-green?style=for-the-badge"></a>
 </p>
@@ -47,13 +46,15 @@
 # 目次 <!-- omit in toc -->

 - [Netcatty とは](#netcatty-とは)
- [なぜ Netcatty](#なぜ-netcatty)
 - [機能](#機能)
- [デモ](#デモ)
 - [スクリーンショット](#スクリーンショット)
-  - [メインウィンドウ](#メインウィンドウ)
-  - [Vault ビュー](#vault-ビュー)
-  - [分割ターミナル](#分割ターミナル)
+  - [ホスト管理](#ホスト管理)
+  - [ターミナル](#ターミナル)
+  - [SFTP](#sftp)
+  - [キーチェーン](#キーチェーン)
+  - [ポートフォワーディング](#ポートフォワーディング)
+  - [クラウド同期](#クラウド同期)
+  - [テーマとカスタマイズ](#テーマとカスタマイズ)
 - [対応ディストリビューション](#対応ディストリビューション)
 - [はじめに](#はじめに)
 - [ビルドとパッケージ](#ビルドとパッケージ)
@@ -69,119 +70,174 @@
 **Netcatty** は、複数のリモートサーバーを効率的に管理する必要がある開発者、システム管理者、DevOps エンジニア向けに設計された、モダンなクロスプラットフォーム SSH クライアントおよびターミナルマネージャーです。

 - **Netcatty は** PuTTY、Termius、SecureCRT、macOS Terminal.app の代替となる SSH 接続ツール
- **Netcatty は** 強力な SFTP クライアント（ドラッグ＆ドロップ + 内蔵エディタ）
+- **Netcatty は** デュアルペインファイルブラウザを備えた強力な SFTP クライアント
 - **Netcatty は** 分割ペイン、タブ、セッション管理を備えたターミナルワークスペース
- **Netcatty は** シェルの代替ではありません — SSH/Telnet/Mosh やローカル/シリアル経由でシェルに接続します（環境により異なります）
-
---
-
-<a name="なぜ-netcatty"></a>
-# なぜ Netcatty
-
-複数サーバーを日常的に扱うなら、Netcatty は「スピード」と「流れ」を重視した作りになっています：
-
- **ワークスペース中心** — 分割ペインで複数セッションを並行操作
- **Vault の見やすさ** — グリッド/リスト/ツリーで状況に合わせて切り替え
- **SFTP の作業感** — ドラッグ＆ドロップと内蔵エディタでサクッと編集
+- **Netcatty は** シェルの代替ではありません — SSH/Telnet またはローカルターミナル経由でリモートシェルに接続します

 ---

 <a name="機能"></a>
 # 機能

-### 🗂️ Vault
- **複数ビュー** — グリッド / リスト / ツリー
- **高速検索** — ホストやグループを素早く見つける
-
-### 🖥️ ターミナルワークスペース
+### 🖥️ ターミナルとセッション
+- **xterm.js ベースのターミナル**、GPU アクセラレーションレンダリング対応
 - **分割ペイン** — 水平・垂直分割でマルチタスク
- **セッション管理** — 複数の接続を並行して扱う
+- **タブ管理** — ドラッグ＆ドロップで並べ替え可能な複数セッション
+- **セッション永続化** — 再起動後もセッションを復元
+- **ブロードキャストモード** — 一度の入力で複数のターミナルに送信

-### 📁 SFTP + 内蔵エディタ
- **ファイル作業** — ドラッグ＆ドロップでアップロード/ダウンロード
- **その場で編集** — 内蔵エディタで小さな修正を素早く
+### 🔐 SSH クライアント
+- **SSH2 プロトコル**、完全な認証サポート
+- **パスワード＆キー認証**
+- **SSH 証明書**サポート
+- **ジャンプホスト / 踏み台サーバー** — 複数ホストを経由した接続
+- **プロキシサポート** — HTTP CONNECT および SOCKS5 プロキシ
+- **エージェント転送** — OpenSSH Agent および Pageant 対応
+- **環境変数** — ホストごとにカスタム環境変数を設定

-### 🎨 パーソナライズ
- **カスタムテーマ** — UI の見た目を好みに調整
- **キーワードハイライト** — ターミナル出力の強調表示ルールをカスタマイズ
+### 📁 SFTP
+- **デュアルペインファイルブラウザ** — ローカル ↔ リモート または リモート ↔ リモート
+- **ドラッグ＆ドロップ**ファイル転送
+- **キュー管理**でバッチ転送
+- **進捗追跡**、転送速度表示

---
+### 🔑 キーチェーン
+- **SSH キー生成** — RSA、ECDSA、ED25519
+- **既存キーのインポート** — PEM、OpenSSH 形式
+- **SSH 証明書**サポート
+- **アイデンティティ管理** — 再利用可能なユーザー名＋認証方式の組み合わせ
+- **公開鍵をエクスポート**してリモートホストへ

-<a name="デモ"></a>
-# デモ
+### 🔌 ポートフォワーディング
+- **ローカルフォワーディング** — リモートサービスをローカルに公開
+- **リモートフォワーディング** — ローカルサービスをリモートに公開
+- **ダイナミックフォワーディング** — SOCKS5 プロキシ
+- **ビジュアルトンネル管理**

-GIF で機能をさっと確認できます（素材は `screenshots/gifs/`）：
+### ☁️ クラウド同期
+- **エンドツーエンド暗号化同期** — デバイスを離れる前にデータを暗号化
+- **複数のプロバイダー** — GitHub Gist、S3 互換ストレージ、WebDAV、Google Drive、OneDrive
+- **ホスト、キー、スニペット、設定を同期**

-### Vault ビュー：グリッド / リスト / ツリー
-状況に合わせて見え方を切り替え。グリッドで全体像、リストで密度、ツリーで階層を扱えます。
-
-![Vault ビュー：グリッド/リスト/ツリー](screenshots/gifs/gird-list-tre-views.gif)
-
-### 分割ターミナル + セッション管理
-複数セッションを分割ペインで並べて作業。関連タスクを横並びにしてコンテキストスイッチを減らします。
-
-![分割ターミナル + セッション管理](screenshots/gifs/dual-terminal--split-manage.gif)
-
-### SFTP：ドラッグ＆ドロップ + 内蔵エディタ
-ドラッグ＆ドロップでファイルを移動し、内蔵エディタでそのまま編集できます。
-
-![SFTP：ドラッグ＆ドロップ + 内蔵エディタ](screenshots/gifs/sftpview-with-drag-and-built-in-editor.gif)
-
-### ドラッグでアップロード
-ファイルをそのままドロップしてアップロードを開始。ダイアログ操作を減らせます。
-
-![ドラッグでアップロード](screenshots/gifs/drag-file-upload.gif)
-
-### カスタムテーマ
-テーマを調整して自分の好みに合わせた見た目に。
-
-![カスタムテーマ](screenshots/gifs/custom-themes.gif)
-
-### キーワードハイライト
-重要な出力（エラー/警告/マーカーなど）を見つけやすくするために、ハイライトをカスタマイズできます。
-
-![キーワードハイライト](screenshots/gifs/custom-highlight.gif)
+### 🎨 テーマとカスタマイズ
+- **ライト＆ダークモード**
+- **カスタムアクセントカラー**
+- **50以上のターミナル配色**
+- **フォントカスタマイズ** — JetBrains Mono、Fira Code など
+- **多言語対応** — English、简体中文 など

 ---

 <a name="スクリーンショット"></a>
 # スクリーンショット

-<a name="メインウィンドウ"></a>
-## メインウィンドウ
+<a name="ホスト管理"></a>
+## ホスト管理

-メインウィンドウは、長時間の SSH 作業を前提に設計されています。セッション、ナビゲーション、主要ツールへ素早くアクセスできます。
+Vault ビューはすべての SSH 接続を管理するコマンドセンターです。右クリックメニューで階層的なグループを作成し、グループ間でホストをドラッグ、パンくずナビゲーションでホストツリーを素早く移動できます。各ホストは接続状態、OS アイコン、クイック接続ボタンを表示。グリッドとリストビューを切り替え、強力な検索で名前、ホスト名、タグ、グループでフィルタリングできます。

-![メインウィンドウ（ダーク）](screenshots/main-window-dark.png)
+**ダークモード**

-![メインウィンドウ（ライト）](screenshots/main-window-light.png)
+![ダークモード](screenshots/main-window-dark.png)

-<a name="vault-ビュー"></a>
-## Vault ビュー
+**ライトモード**

-作業に合わせて見え方を切り替え：グリッドで全体像、リストでスキャン、ツリーで整理と階層ナビゲーション。
+![ライトモード](screenshots/main-window-light.png)

-![Vault グリッドビュー](screenshots/vault_grid_view.png)
+**リストビュー**

-![Vault リストビュー](screenshots/vault_list_view.png)
+![リストビュー](screenshots/main-window-dark-list.png)

-![Vault ツリービュー（ダーク）](screenshots/treeview-dark.png)
+<a name="ターミナル"></a>
+## ターミナル

-![Vault ツリービュー（ライト）](screenshots/treeview-light.png)
+WebGL アクセラレーション対応の xterm.js ベースのターミナルで、スムーズでレスポンシブな体験を提供。ワークスペースを水平または垂直に分割して、複数のセッションを同時に監視。ブロードキャストモードを有効にすると、すべてのターミナルに一度にコマンドを送信できます — フリート管理に最適。テーマカスタマイズパネルでは、50以上の配色スキームをライブプレビュー、フォントサイズの調整、JetBrains Mono や Fira Code を含む複数のフォントファミリーを選択できます。

-<a name="分割ターミナル"></a>
-## 分割ターミナル
-
-分割ペインで複数のサーバー/タスクを同時に扱えます（例：デプロイ + ログ + 監視）。
+**分割ウィンドウ**

 ![分割ウィンドウ](screenshots/split-window.png)

+**テーマカスタマイズ**
+
+![テーマカスタマイズ](screenshots/terminal-theme-change.png)
+
+<a name="sftp"></a>
+## SFTP
+
+デュアルペイン SFTP ブラウザは、ローカルからリモート、リモートからリモートへのファイル転送をサポート。シングルクリックでディレクトリを移動、ペイン間でファイルをドラッグ＆ドロップ、転送進捗をリアルタイムで監視。インターフェースにはファイル権限、サイズ、変更日時を表示。複数の転送をキューに入れ、詳細な速度と進捗インジケーターで完了を確認。コンテキストメニューから名前変更、削除、ダウンロード、アップロード操作にすばやくアクセス。
+
+![SFTP ビュー](screenshots/sftp.png)
+
+<a name="キーチェーン"></a>
+## キーチェーン
+
+キーチェーンは SSH 認証情報を保管する安全な保管庫です。新しいキーを生成、既存のキーをインポート、エンタープライズ認証用の SSH 証明書を管理できます。
+
+| キータイプ | アルゴリズム | 推奨用途 |
+|----------|------------|---------|
+| **ED25519** | EdDSA | モダン、高速、最も安全（推奨） |
+| **ECDSA** | NIST P-256/384/521 | 高いセキュリティ、広くサポート |
+| **RSA** | RSA 2048/4096 | レガシー互換性、ユニバーサルサポート |
+| **証明書** | CA 署名 | エンタープライズ環境、短期認証 |
+
+**機能：**
+- 🔑 カスタマイズ可能なビット長でキーを生成
+- 📥 PEM/OpenSSH 形式のキーをインポート
+- 👤 再利用可能なアイデンティティを作成（ユーザー名＋認証方式）
+- 📤 ワンクリックで公開鍵をリモートホストにエクスポート
+
+![キーマネージャー](screenshots/key-manager.png)
+
+<a name="ポートフォワーディング"></a>
+## ポートフォワーディング
+
+直感的なビジュアルインターフェースで SSH トンネルをセットアップ。各トンネルはリアルタイムステータスを表示し、アクティブ、接続中、エラー状態を明確に示します。トンネル設定を保存してセッション間で素早く再利用。
+
+| タイプ | 方向 | ユースケース | 例 |
+|-------|-----|------------|---|
+| **ローカル** | リモート → ローカル | リモートサービスをローカルマシンでアクセス | リモート MySQL `3306` を `localhost:3306` に転送 |
+| **リモート** | ローカル → リモート | ローカルサービスをリモートサーバーと共有 | ローカル開発サーバーをリモートマシンに公開 |
+| **ダイナミック** | SOCKS5 プロキシ | SSH トンネル経由で安全にブラウジング | 暗号化された SSH 接続経由でインターネットをブラウズ |
+
+![ポートフォワーディング](screenshots/port-forwadring.png)
+
+<a name="クラウド同期"></a>
+## クラウド同期
+
+エンドツーエンド暗号化で、すべてのデバイス間でホスト、キー、スニペット、設定を同期。マスターパスワードがアップロード前にすべてのデータをローカルで暗号化 — クラウドプロバイダーは平文を見ることはありません。
+
+| プロバイダー | 最適な用途 | セットアップ複雑度 |
+|------------|----------|-----------------|
+| **GitHub Gist** | クイックセットアップ、バージョン履歴 | ⭐ 簡単 |
+| **Google Drive** | 個人利用、大容量ストレージ | ⭐ 簡単 |
+| **OneDrive** | Microsoft エコシステムユーザー | ⭐ 簡単 |
+| **S3 互換** | AWS、MinIO、Cloudflare R2、セルフホスト | ⭐⭐ 中程度 |
+| **WebDAV** | Nextcloud、ownCloud、セルフホスト | ⭐⭐ 中程度 |
+
+**同期対象：**
+- ✅ ホストと接続設定
+- ✅ SSH キーと証明書
+- ✅ アイデンティティと認証情報
+- ✅ スニペットとスクリプト
+- ✅ カスタムグループとタグ
+- ✅ ポートフォワーディングルール
+- ✅ アプリケーション設定
+
+![クラウド同期](screenshots/cloud-sync.png)
+
+<a name="テーマとカスタマイズ"></a>
+## テーマとカスタマイズ
+
+Netcatty を自分だけのものに。ライトモードとダークモードを切り替えたり、システム設定に従わせたり。好みに合わせてアクセントカラーを選択。アプリケーションは English や简体中文を含む複数の言語をサポートしており、コミュニティによる翻訳貢献を歓迎しています。クラウド同期を有効にすると、すべての設定がデバイス間で同期され、パーソナライズされた体験がどこでも利用できます。
+
+![テーマと国際化](screenshots/app-themes-i18n.png)
+
 ---

 <a name="対応ディストリビューション"></a>
 # 対応ディストリビューション

-Netcatty は接続したホストの OS を検出し、ホスト一覧でアイコンとして表示します：
+Netcatty は接続したホストの OS アイコンを自動的に検出・表示します：

 <p align="center">
  <img src="public/distro/ubuntu.svg" width="48" alt="Ubuntu" title="Ubuntu">
@@ -207,11 +263,11 @@ Netcatty は接続したホストの OS を検出し、ホスト一覧でアイ

 [GitHub Releases](https://github.com/binaricat/Netcatty/releases/latest) からお使いのプラットフォームに対応した最新版をダウンロードしてください。

-| OS | サポート状況 |
-| :--- | :--- |
-| **macOS** | Universal (x64 / arm64) |
-| **Windows** | x64 / arm64 |
-| **Linux** | x64 / arm64 |
+| プラットフォーム | アーキテクチャ | ステータス |
+|------------------|----------------|------------|
+| **macOS** | Apple Silicon (M1/M2/M3) | ✅ サポート |
+| **macOS** | Intel | ✅ サポート |
+| **Windows** | x64 | ✅ サポート |

 または [GitHub Releases](https://github.com/binaricat/Netcatty/releases) ですべてのリリースを参照してください。

@@ -273,7 +329,7 @@ npm run pack
 # 特定のプラットフォーム用にパッケージ
 npm run pack:mac     # macOS (DMG + ZIP)
 npm run pack:win     # Windows (NSIS インストーラー)
-npm run pack:linux   # Linux (AppImage + DEB + RPM)
+npm run pack:linux   # Linux (AppImage, deb, rpm)
 ```

 ---
@@ -283,7 +339,7 @@ npm run pack:linux   # Linux (AppImage + DEB + RPM)

 | カテゴリ | テクノロジー |
 |--------|------------|
-| フレームワーク | Electron 40 |
+| フレームワーク | Electron 39 |
 | フロントエンド | React 19, TypeScript |
 | ビルドツール | Vite 7 |
 | ターミナル | xterm.js 5 |
--- a/README.md
+++ b/README.md
@@ -5,13 +5,12 @@
 <h1 align="center">Netcatty</h1>

 <p align="center">
-  <strong>Modern SSH Client, SFTP Browser & Terminal Manager</strong><br/>
-  <a href="https://netcatty.app"><strong>netcatty.app</strong></a>
+  <strong>Modern SSH Client, SFTP Browser & Terminal Manager</strong>
 </p>

 <p align="center">
  A beautiful, feature-rich SSH workspace built with Electron, React, and xterm.js.<br/>
-  Split terminals, Vault views, SFTP workflows, custom themes, and keyword highlighting — all in one.
+  Host management, split terminals, SFTP, port forwarding, and cloud sync — all in one.
 </p>

 <p align="center">
@@ -47,13 +46,15 @@
 # Contents <!-- omit in toc -->

 - [What is Netcatty](#what-is-netcatty)
- [Why Netcatty](#why-netcatty)
 - [Features](#features)
- [Demos](#demos)
 - [Screenshots](#screenshots)
-  - [Main Window](#main-window)
-  - [Vault Views](#vault-views)
-  - [Split Terminals](#split-terminals)
+  - [Host Management](#host-management)
+  - [Terminal](#terminal)
+  - [SFTP](#sftp)
+  - [Keychain](#keychain)
+  - [Port Forwarding](#port-forwarding)
+  - [Cloud Sync](#cloud-sync)
+  - [Themes & Customization](#themes--customization)
 - [Supported Distros](#supported-distros)
 - [Getting Started](#getting-started)
 - [Build & Package](#build--package)
@@ -71,112 +72,166 @@
 - **Netcatty is** an alternative to PuTTY, Termius, SecureCRT, and macOS Terminal.app for SSH connections
 - **Netcatty is** a powerful SFTP client with dual-pane file browser
 - **Netcatty is** a terminal workspace with split panes, tabs, and session management
- **Netcatty supports** SSH, local terminal, Telnet, Mosh, and Serial connections (when available)
- **Netcatty is not** a shell replacement — it connects to shells via SSH/Telnet/Mosh or local/serial sessions
-
---
-
-<a name="why-netcatty"></a>
-# Why Netcatty
-
-If you regularly work with a fleet of servers, Netcatty is built for speed and flow:
-
- **Workspace-first** — split panes + tabs + session restore for “always-on” workflows
- **Vault organization** — grid/list/tree views with fast search and drag-friendly workflows
- **Serious SFTP** — built-in editor + drag & drop + smooth file operations
+- **Netcatty is not** a shell replacement — it connects to remote shells via SSH/Telnet or local terminals

 ---

 <a name="features"></a>
 # Features

-### 🗂️ Vault
- **Multiple views** — grid / list / tree
- **Fast search** — locate hosts and groups quickly
-
-### 🖥️ Terminal Workspaces
+### 🖥️ Terminal & Sessions
+- **xterm.js-based terminal** with GPU-accelerated rendering
 - **Split panes** — horizontal and vertical splits for multi-tasking
- **Session management** — run multiple connections side-by-side
+- **Tab management** — multiple sessions with drag-to-reorder
+- **Session persistence** — restore sessions on restart
+- **Broadcast mode** — type once, send to multiple terminals

-### 📁 SFTP + Built-in Editor
- **File workflows** — drag & drop uploads/downloads
- **Edit in place** — built-in editor for quick changes
+### 🔐 SSH Client
+- **SSH2 protocol** with full authentication support
+- **Password & key-based authentication**
+- **SSH certificates** support
+- **Jump hosts / Bastion** — chain through multiple hosts
+- **Proxy support** — HTTP CONNECT and SOCKS5 proxies
+- **Agent forwarding** — including OpenSSH Agent and Pageant
+- **Environment variables** — set custom env vars per host

-### 🎨 Personalization
- **Custom themes** — tune the app appearance to your taste
- **Keyword highlighting** — customize highlight rules for terminal output
+### 📁 SFTP
+- **Dual-pane file browser** — local ↔ remote or remote ↔ remote
+- **Drag & drop** file transfers
+- **Queue management** for batch transfers
+- **Progress tracking** with transfer speed

---
+### 🔑 Keychain
+- **Generate SSH keys** — RSA, ECDSA, ED25519
+- **Import existing keys** — PEM, OpenSSH formats
+- **SSH certificates** support
+- **Identity management** — reusable username + auth combinations
+- **Export public keys** to remote hosts

-<a name="demos"></a>
-# Demos
+### 🔌 Port Forwarding
+- **Local forwarding** — expose remote services locally
+- **Remote forwarding** — expose local services remotely
+- **Dynamic forwarding** — SOCKS5 proxy
+- **Visual tunnel management**

-GIF previews (stored in `screenshots/gifs/`), rendered inline on GitHub:
+### ☁️ Cloud Sync
+- **End-to-end encrypted sync** — your data is encrypted before leaving your device
+- **Multiple providers** — GitHub Gist, S3-compatible storage, WebDAV, Google Drive, OneDrive
+- **Sync hosts, keys, snippets, and settings**

-### Vault views: grid / list / tree
-Switch between different Vault views to match your workflow: overview in grid, dense scanning in list, and hierarchical navigation in tree.
-
-![Vault views: grid/list/tree](screenshots/gifs/gird-list-tre-views.gif)
-
-### Split terminals + session management
-Work in multiple sessions at once with split panes. Keep related tasks side-by-side and reduce context switching.
-
-![Split terminals + session management](screenshots/gifs/dual-terminal--split-manage.gif)
-
-### SFTP: drag & drop + built-in editor
-Move files with drag & drop, then edit quickly using the built-in editor without leaving the app.
-
-![SFTP: drag & drop + built-in editor](screenshots/gifs/sftpview-with-drag-and-built-in-editor.gif)
-
-### Drag file upload
-Drop files into the app to kick off uploads without hunting through dialogs.
-
-![Drag file upload](screenshots/gifs/drag-file-upload.gif)
-
-### Custom themes
-Make Netcatty yours: customize themes and UI appearance.
-
-![Custom themes](screenshots/gifs/custom-themes.gif)
-
-### Keyword highlighting
-Highlight important terminal output so errors, warnings, and key events stand out at a glance.
-
-![Keyword highlighting](screenshots/gifs/custom-highlight.gif)
+### 🎨 Themes & Customization
+- **Light & Dark mode**
+- **Custom accent colors**
+- **50+ terminal color schemes**
+- **Font customization** — JetBrains Mono, Fira Code, and more
+- **i18n support** — English, 简体中文, and more

 ---

 <a name="screenshots"></a>
 # Screenshots

-<a name="main-window"></a>
-## Main Window
+<a name="host-management"></a>
+## Host Management

-The main window is designed for long-running SSH workflows: quick access to sessions, navigation, and core tools in one place.
+The Vault view is your command center for managing all SSH connections. Create hierarchical groups with right-click context menus, drag hosts between groups, and use breadcrumb navigation to quickly traverse your host tree. Each host displays its connection status, OS icon, and quick-connect button. Switch between grid and list views based on your preference, and use the powerful search to filter hosts by name, hostname, tags, or group.

-![Main Window (Dark)](screenshots/main-window-dark.png)
+**Dark Mode**

-![Main Window (Light)](screenshots/main-window-light.png)
+![Dark Mode](screenshots/main-window-dark.png)

-<a name="vault-views"></a>
-## Vault Views
+**Light Mode**

-Organize and navigate your hosts using the view that best fits the moment: grid for overview, list for scanning, tree for structure.
+![Light Mode](screenshots/main-window-light.png)

-![Vault Grid View](screenshots/vault_grid_view.png)
+**List View**

-![Vault List View](screenshots/vault_list_view.png)
+![List View](screenshots/main-window-dark-list.png)

-![Vault Tree View (Dark)](screenshots/treeview-dark.png)
+<a name="terminal"></a>
+## Terminal

-![Vault Tree View (Light)](screenshots/treeview-light.png)
+Powered by xterm.js with WebGL acceleration, the terminal delivers a smooth, responsive experience. Split your workspace horizontally or vertically to monitor multiple sessions simultaneously. Enable broadcast mode to send commands to all terminals at once — perfect for fleet management. The theme customization panel offers 50+ color schemes with live preview, adjustable font size, and multiple font family options including JetBrains Mono and Fira Code.

-<a name="split-terminals"></a>
-## Split Terminals
-
-Split panes help you monitor multiple servers/services at the same time (deploy + logs + metrics) without juggling windows.
+**Split Windows**

 ![Split Windows](screenshots/split-window.png)

+**Theme Customization**
+
+![Theme Customization](screenshots/terminal-theme-change.png)
+
+<a name="sftp"></a>
+## SFTP
+
+The dual-pane SFTP browser supports local-to-remote and remote-to-remote file transfers. Navigate directories with single-click, drag files between panes, and monitor transfer progress in real-time. The interface shows file permissions, sizes, and modification dates. Queue multiple transfers and watch them complete with detailed speed and progress indicators. Context menus provide quick access to rename, delete, download, and upload operations.
+
+![SFTP View](screenshots/sftp.png)
+
+<a name="keychain"></a>
+## Keychain
+
+The Keychain is your secure vault for SSH credentials. Generate new keys, import existing ones, or manage SSH certificates for enterprise authentication.
+
+| Key Type | Algorithm | Recommended Use |
+|----------|-----------|----------------|
+| **ED25519** | EdDSA | Modern, fast, most secure (recommended) |
+| **ECDSA** | NIST P-256/384/521 | Good security, widely supported |
+| **RSA** | RSA 2048/4096 | Legacy compatibility, universal support |
+| **Certificate** | CA-signed | Enterprise environments, short-lived auth |
+
+**Features:**
+- 🔑 Generate keys with customizable bit lengths
+- 📥 Import PEM/OpenSSH format keys
+- 👤 Create reusable identities (username + auth method)
+- 📤 One-click export public keys to remote hosts
+
+![Key Manager](screenshots/key-manager.png)
+
+<a name="port-forwarding"></a>
+## Port Forwarding
+
+Set up SSH tunnels with an intuitive visual interface. Each tunnel shows real-time status with clear indicators for active, connecting, or error states. Save tunnel configurations for quick reuse across sessions.
+
+| Type | Direction | Use Case | Example |
+|------|-----------|----------|--------|
+| **Local** | Remote → Local | Access remote services on your machine | Forward remote MySQL `3306` to `localhost:3306` |
+| **Remote** | Local → Remote | Share local services with remote server | Expose local dev server to remote machine |
+| **Dynamic** | SOCKS5 Proxy | Secure browsing through SSH tunnel | Browse internet via encrypted SSH connection |
+
+![Port Forwarding](screenshots/port-forwadring.png)
+
+<a name="cloud-sync"></a>
+## Cloud Sync
+
+Keep your hosts, keys, snippets, and settings synchronized across all your devices with end-to-end encryption. Your master password encrypts all data locally before upload — the cloud provider never sees plaintext.
+
+| Provider | Best For | Setup Complexity |
+|----------|----------|------------------|
+| **GitHub Gist** | Quick setup, version history | ⭐ Easy |
+| **Google Drive** | Personal use, large storage | ⭐ Easy |
+| **OneDrive** | Microsoft ecosystem users | ⭐ Easy |
+| **S3-Compatible** | AWS, MinIO, Cloudflare R2, self-hosted | ⭐⭐ Medium |
+| **WebDAV** | Nextcloud, ownCloud, self-hosted | ⭐⭐ Medium |
+
+**What syncs:**
+- ✅ Hosts & connection settings
+- ✅ SSH keys & certificates
+- ✅ Identities & credentials
+- ✅ Snippets & scripts
+- ✅ Custom groups & tags
+- ✅ Port forwarding rules
+- ✅ Application preferences
+
+![Cloud Sync](screenshots/cloud-sync.png)
+
+<a name="themes--customization"></a>
+## Themes & Customization
+
+Make Netcatty truly yours with extensive customization options. Toggle between light and dark modes, or let the app follow your system preference. Pick any accent color to match your style. The application supports multiple languages including English and 简体中文, with more translations welcome via community contributions. All preferences sync across devices when cloud sync is enabled, so your personalized experience follows you everywhere.
+
+![Themes & i18n](screenshots/app-themes-i18n.png)
+
 ---

 <a name="supported-distros"></a>
@@ -199,6 +254,8 @@ Netcatty automatically detects and displays OS icons for connected hosts:
  <img src="public/distro/kali.svg" width="48" alt="Kali Linux" title="Kali Linux">
 </p>

+---
+
 <a name="getting-started"></a>
 # Getting Started

@@ -206,11 +263,11 @@ Netcatty automatically detects and displays OS icons for connected hosts:

 Download the latest release for your platform from [GitHub Releases](https://github.com/binaricat/Netcatty/releases/latest).

-| OS | Support |
-| :--- | :--- |
-| **macOS** | Universal (x64 / arm64) |
-| **Windows** | x64 / arm64 |
-| **Linux** | x64 / arm64 |
+| Platform | Architecture | Status |
+|----------|--------------|--------|
+| **macOS** | Apple Silicon (M1/M2/M3) | ✅ Supported |
+| **macOS** | Intel | ✅ Supported |
+| **Windows** | x64 | ✅ Supported |

 Or browse all releases at [GitHub Releases](https://github.com/binaricat/Netcatty/releases).

@@ -282,7 +339,7 @@ npm run pack:linux   # Linux (AppImage + DEB + RPM)

 | Category | Technology |
 |----------|------------|
-| Framework | Electron 40 |
+| Framework | Electron 39 |
 | Frontend | React 19, TypeScript |
 | Build Tool | Vite 7 |
 | Terminal | xterm.js 5 |
@@ -308,15 +365,6 @@ See [agents.md](agents.md) for architecture overview and coding conventions.

 ---

-<a name="contributors"></a>
-# Contributors
-
-Thanks to all the people who contribute!
-
-See: https://github.com/binaricat/Netcatty/graphs/contributors
-
---
-
 <a name="license"></a>
 # License

--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -5,19 +5,18 @@
 <h1 align="center">Netcatty</h1>

 <p align="center">
-  <strong>现代化 SSH 客户端、SFTP 浏览器 & 终端管理器</strong><br/>
-  <a href="https://netcatty.app"><strong>netcatty.app</strong></a>
+  <strong>现代化 SSH 客户端、SFTP 浏览器 & 终端管理器</strong>
 </p>

 <p align="center">
  一个基于 Electron、React 和 xterm.js 构建的功能丰富的 SSH 工作空间。<br/>
-  分屏终端、Vault 多视图、SFTP 工作流、自定义主题、关键词高亮 —— 一应俱全。
+  主机管理、分屏终端、SFTP、端口转发、云同步 —— 一应俱全。
 </p>

 <p align="center">
  <a href="https://github.com/binaricat/Netcatty/releases/latest"><img alt="GitHub Release" src="https://img.shields.io/github/v/release/binaricat/Netcatty?style=for-the-badge&logo=github&label=Release"></a>
  &nbsp;
-  <a href="#"><img alt="Platform" src="https://img.shields.io/badge/Platform-macOS%20%7C%20Windows%20%7C%20Linux-blue?style=for-the-badge&logo=electron"></a>
+  <a href="#"><img alt="Platform" src="https://img.shields.io/badge/Platform-macOS%20%7C%20Windows-blue?style=for-the-badge&logo=electron"></a>
  &nbsp;
  <a href="LICENSE"><img alt="License" src="https://img.shields.io/badge/License-GPL--3.0-green?style=for-the-badge"></a>
 </p>
@@ -47,13 +46,15 @@
 # 目录 <!-- omit in toc -->

 - [Netcatty 是什么](#netcatty-是什么)
- [为什么是 Netcatty](#为什么是-netcatty)
 - [功能特性](#功能特性)
- [演示](#演示)
 - [界面截图](#界面截图)
-  - [主界面](#主界面)
-  - [Vault 视图](#vault-视图)
-  - [分屏终端](#分屏终端)
+  - [主机管理](#主机管理)
+  - [终端](#终端)
+  - [SFTP](#sftp)
+  - [密钥管理](#密钥管理)
+  - [端口转发](#端口转发)
+  - [云同步](#云同步)
+  - [主题与定制](#主题与定制)
 - [支持的发行版](#支持的发行版)
 - [快速开始](#快速开始)
 - [构建与打包](#构建与打包)
@@ -71,118 +72,172 @@
 - **Netcatty 是** PuTTY、Termius、SecureCRT 和 macOS Terminal.app 的现代替代品
 - **Netcatty 是** 一个强大的 SFTP 客户端，支持双窗格文件浏览
 - **Netcatty 是** 一个终端工作空间，支持分屏、标签页和会话管理
- **Netcatty 支持** SSH、本地终端、Telnet、Mosh、串口（Serial）等连接方式（视环境而定）
- **Netcatty 不是** Shell 替代品 —— 它通过 SSH/Telnet/Mosh 或本地/串口会话连接到 Shell
-
---
-
-<a name="为什么是-netcatty"></a>
-# 为什么是 Netcatty
-
-如果你需要同时维护多台服务器，Netcatty 更像是“工作台”而不是单一终端：
-
- **以工作区为核心** —— 分屏 + 多会话并行，适合长期驻留的工作流
- **Vault 管理** —— 网格/列表/树形视图，配合搜索与拖拽更顺手
- **认真做的 SFTP** —— 内置编辑器 + 拖拽上传，文件操作更丝滑
+- **Netcatty 不是** Shell 替代品 —— 它通过 SSH/Telnet 或本地终端连接到远程 Shell

 ---

 <a name="功能特性"></a>
 # 功能特性

-### 🗂️ Vault
- **多种视图** —— 网格 / 列表 / 树形
- **快速搜索** —— 迅速定位主机与分组
+### 🖥️ 终端与会话
+- **基于 xterm.js 的终端**，支持 GPU 加速渲染
+- **分屏功能** —— 水平和垂直分割，多任务并行
+- **标签页管理** —— 多会话支持，拖拽排序
+- **会话持久化** —— 重启后恢复会话
+- **广播模式** —— 一次输入，发送到多个终端

-### 🖥️ 终端工作区
- **分屏** —— 水平/垂直分割，多任务并行
- **多会话管理** —— 多连接并排处理
+### 🔐 SSH 客户端
+- **SSH2 协议**，完整的认证支持
+- **密码和密钥认证**
+- **SSH 证书**支持
+- **跳板机 / 堡垒机** —— 多主机链式连接
+- **代理支持** —— HTTP CONNECT 和 SOCKS5 代理
+- **Agent 转发** —— 支持 OpenSSH Agent 和 Pageant
+- **环境变量** —— 为每个主机设置自定义环境变量

-### 📁 SFTP + 内置编辑器
- **文件工作流** —— 拖拽上传/下载更直观
- **就地编辑** —— 内置编辑器快速修改文件
+### 📁 SFTP
+- **双窗格文件浏览器** —— 本地 ↔ 远程 或 远程 ↔ 远程
+- **拖放传输** 文件
+- **队列管理** 批量传输
+- **进度跟踪** 显示传输速度

-### 🎨 个性化
- **自定义主题** —— 按喜好调整应用外观
- **关键词高亮** —— 自定义终端输出高亮规则
+### 🔑 密钥管理
+- **生成 SSH 密钥** —— RSA、ECDSA、ED25519
+- **导入已有密钥** —— PEM、OpenSSH 格式
+- **SSH 证书**支持
+- **身份管理** —— 可复用的用户名 + 认证方式组合
+- **导出公钥**到远程主机

---
+### 🔌 端口转发
+- **本地转发** —— 将远程服务暴露到本地
+- **远程转发** —— 将本地服务暴露到远程
+- **动态转发** —— SOCKS5 代理
+- **可视化隧道管理**

-<a name="演示"></a>
-# 演示
+### ☁️ 云同步
+- **端到端加密同步** —— 数据在离开设备前加密
+- **多种存储后端** —— GitHub Gist、S3 兼容存储、WebDAV、Google Drive、OneDrive
+- **同步主机、密钥、代码片段和设置**

-GIF 预览（素材均在 `screenshots/gifs/`），在 GitHub README 中可直接观看：
-
-### Vault 视图：网格 / 列表 / 树形
-根据不同场景自由切换视图：网格适合总览，列表适合密集浏览，树形适合层级导航与整理。
-
-![Vault 视图：网格/列表/树形](screenshots/gifs/gird-list-tre-views.gif)
-
-### 分屏终端 + 会话管理
-用分屏把多个会话并排放在同一个工作区里，降低来回切换窗口/标签页的成本。
-
-![分屏终端 + 会话管理](screenshots/gifs/dual-terminal--split-manage.gif)
-
-### SFTP：拖拽 + 内置编辑器
-通过拖拽完成文件传输，并用内置编辑器快速修改文件内容，不用来回切换工具。
-
-![SFTP：拖拽 + 内置编辑器](screenshots/gifs/sftpview-with-drag-and-built-in-editor.gif)
-
-### 拖拽文件上传
-把文件直接拖进应用即可触发上传流程，省去多层对话框与路径选择。
-
-![拖拽文件上传](screenshots/gifs/drag-file-upload.gif)
-
-### 自定义主题
-按自己的审美与习惯定制主题与界面外观，让日常使用更顺手。
-
-![自定义主题](screenshots/gifs/custom-themes.gif)
-
-### 关键词高亮
-让关键输出一眼可见：错误、告警或特定标记被高亮后更容易扫到与定位。
-
-![关键词高亮](screenshots/gifs/custom-highlight.gif)
+### 🎨 主题与定制
+- **浅色 & 深色模式**
+- **自定义强调色**
+- **50+ 终端配色方案**
+- **字体自定义** —— JetBrains Mono、Fira Code 等
+- **多语言支持** —— English、简体中文 等

 ---

 <a name="界面截图"></a>
 # 界面截图

-<a name="主界面"></a>
-## 主界面
+<a name="主机管理"></a>
+## 主机管理

-主界面围绕长期 SSH 工作流设计：把会话、导航和常用工具集中到同一处，减少切换成本。
+Vault 视图是管理所有 SSH 连接的控制中心。通过右键菜单创建层级分组，在分组间拖拽主机，使用面包屑导航快速遍历主机树。每个主机显示连接状态、操作系统图标和快速连接按钮。根据偏好在网格和列表视图之间切换，使用强大的搜索按名称、主机名、标签或分组过滤主机。

-![主界面（深色）](screenshots/main-window-dark.png)
+**深色模式**

-![主界面（浅色）](screenshots/main-window-light.png)
+![深色模式](screenshots/main-window-dark.png)

-<a name="vault-视图"></a>
-## Vault 视图
+**浅色模式**

-用更适合当前任务的方式管理与浏览主机：网格看全局，列表做筛选，树形做整理与层级导航。
+![浅色模式](screenshots/main-window-light.png)

-![Vault 网格视图](screenshots/vault_grid_view.png)
+**列表视图**

-![Vault 列表视图](screenshots/vault_list_view.png)
+![列表视图](screenshots/main-window-dark-list.png)

-![Vault 树形视图（深色）](screenshots/treeview-dark.png)
+<a name="终端"></a>
+## 终端

-![Vault 树形视图（浅色）](screenshots/treeview-light.png)
+基于 xterm.js 的 WebGL 加速终端，提供流畅、响应迅速的体验。水平或垂直分割工作区，同时监控多个会话。启用广播模式可一次向所有终端发送命令 —— 非常适合批量管理。主题定制面板提供 50+ 配色方案和实时预览、可调节字号以及多种字体选择，包括 JetBrains Mono 和 Fira Code。

-<a name="分屏终端"></a>
-## 分屏终端
-
-分屏适合同时处理多个任务（例如部署 + 日志 + 排障），不用频繁切换窗口。
+**分屏窗口**

 ![分屏窗口](screenshots/split-window.png)

+**主题定制**
+
+![主题定制](screenshots/terminal-theme-change.png)
+
+<a name="sftp"></a>
+## SFTP
+
+双窗格 SFTP 浏览器支持本地到远程和远程到远程的文件传输。单击导航目录，在窗格之间拖放文件，实时监控传输进度。界面显示文件权限、大小和修改日期。批量传输队列管理，详细的速度和进度指示器。右键菜单快速访问重命名、删除、下载和上传操作。
+
+![SFTP 视图](screenshots/sftp.png)
+
+<a name="密钥管理"></a>
+## 密钥管理
+
+密钥库是您存储 SSH 凭证的安全保险库。生成新密钥、导入已有密钥或管理企业认证的 SSH 证书。
+
+| 密钥类型 | 算法 | 推荐用途 |
+|---------|------|---------|
+| **ED25519** | EdDSA | 现代、快速、最安全（推荐） |
+| **ECDSA** | NIST P-256/384/521 | 安全性好、广泛支持 |
+| **RSA** | RSA 2048/4096 | 旧版兼容、通用支持 |
+| **证书** | CA 签名 | 企业环境、短期认证 |
+
+**功能：**
+- 🔑 生成可自定义位长的密钥
+- 📥 导入 PEM/OpenSSH 格式密钥
+- 👤 创建可复用身份（用户名 + 认证方式）
+- 📤 一键导出公钥到远程主机
+
+![密钥管理器](screenshots/key-manager.png)
+
+<a name="端口转发"></a>
+## 端口转发
+
+通过直观的可视化界面设置 SSH 隧道。每个隧道显示实时状态，清晰指示活动、连接中或错误状态。保存隧道配置以便跨会话快速复用。
+
+| 类型 | 方向 | 使用场景 | 示例 |
+|-----|-----|---------|-----|
+| **本地** | 远程 → 本地 | 在本机访问远程服务 | 将远程 MySQL `3306` 转发到 `localhost:3306` |
+| **远程** | 本地 → 远程 | 与远程服务器共享本地服务 | 将本地开发服务器暴露给远程机器 |
+| **动态** | SOCKS5 代理 | 通过 SSH 隧道安全浏览 | 通过加密 SSH 连接浏览互联网 |
+
+![端口转发](screenshots/port-forwadring.png)
+
+<a name="云同步"></a>
+## 云同步
+
+通过端到端加密在所有设备间同步主机、密钥、代码片段和设置。主密码在上传前本地加密所有数据 —— 云服务商永远看不到明文。
+
+| 服务商 | 最适合 | 配置复杂度 |
+|-------|-------|----------|
+| **GitHub Gist** | 快速设置、版本历史 | ⭐ 简单 |
+| **Google Drive** | 个人使用、大容量存储 | ⭐ 简单 |
+| **OneDrive** | 微软生态用户 | ⭐ 简单 |
+| **S3 兼容存储** | AWS、MinIO、Cloudflare R2、自托管 | ⭐⭐ 中等 |
+| **WebDAV** | Nextcloud、ownCloud、自托管 | ⭐⭐ 中等 |
+
+**同步内容：**
+- ✅ 主机与连接设置
+- ✅ SSH 密钥与证书
+- ✅ 身份与凭证
+- ✅ 代码片段与脚本
+- ✅ 自定义分组与标签
+- ✅ 端口转发规则
+- ✅ 应用程序偏好设置
+
+![云同步](screenshots/cloud-sync.png)
+
+<a name="主题与定制"></a>
+## 主题与定制
+
+让 Netcatty 真正属于你。在浅色和深色模式之间切换，或让应用跟随系统偏好。选择任意强调色来匹配你的风格。应用支持多种语言，包括 English 和简体中文，欢迎社区贡献更多翻译。启用云同步后，所有偏好设置都会跨设备同步，个性化体验随处可用。
+
+![主题与国际化](screenshots/app-themes-i18n.png)
+
 ---

 <a name="支持的发行版"></a>
 # 支持的发行版

-Netcatty 会自动识别并在主机列表中展示对应的系统图标：
+Netcatty 自动检测并显示已连接主机的操作系统图标：

 <p align="center">
  <img src="public/distro/ubuntu.svg" width="48" alt="Ubuntu" title="Ubuntu">
@@ -199,6 +254,8 @@ Netcatty 会自动识别并在主机列表中展示对应的系统图标：
  <img src="public/distro/kali.svg" width="48" alt="Kali Linux" title="Kali Linux">
 </p>

+---
+
 <a name="快速开始"></a>
 # 快速开始

@@ -206,11 +263,11 @@ Netcatty 会自动识别并在主机列表中展示对应的系统图标：

 从 [GitHub Releases](https://github.com/binaricat/Netcatty/releases/latest) 下载适合您平台的最新版本。

-| 操作系统 | 支持情况 |
-| :--- | :--- |
-| **macOS** | Universal (x64 / arm64) |
-| **Windows** | x64 / arm64 |
-| **Linux** | x64 / arm64 |
+| 平台 | 架构 | 状态 |
+|------|------|------|
+| **macOS** | Apple Silicon (M1/M2/M3) | ✅ 支持 |
+| **macOS** | Intel | ✅ 支持 |
+| **Windows** | x64 | ✅ 支持 |

 或在 [GitHub Releases](https://github.com/binaricat/Netcatty/releases) 浏览所有版本。

@@ -282,7 +339,7 @@ npm run pack:linux   # Linux (AppImage, deb, rpm)

 | 分类 | 技术 |
 |-----|-----|
-| 框架 | Electron 40 |
+| 框架 | Electron 39 |
 | 前端 | React 19, TypeScript |
 | 构建工具 | Vite 7 |
 | 终端 | xterm.js 5 |
@@ -308,15 +365,6 @@ npm run pack:linux   # Linux (AppImage, deb, rpm)

 ---

-<a name="贡献者"></a>
-# 贡献者
-
-感谢所有参与贡献的人！
-
-查看：https://github.com/binaricat/Netcatty/graphs/contributors
-
---
-
 <a name="开源协议"></a>
 # 开源协议

--- a/application/i18n/locales/en.ts
+++ b/application/i18n/locales/en.ts
@@ -39,7 +39,6 @@ const en: Messages = {
  'sort.za': 'Z-a',
  'sort.newest': 'Newest to oldest',
  'sort.oldest': 'Oldest to newest',
-  'sort.group': 'By group',
  'field.label': 'Label',
  'field.type': 'Type',
  'auth.keyType': 'Type {type}',
@@ -48,14 +47,11 @@ const en: Messages = {
  // Dialogs / prompts
  'confirm.deleteHost': 'Delete Host "{name}"?',
  'confirm.deleteIdentity': 'Delete Identity "{name}"?',
-  'dialog.createWorkspace.title': 'Create Workspace',
  'dialog.renameWorkspace.title': 'Rename workspace',
  'dialog.renameSession.title': 'Rename session',
  'field.name': 'Name',
-  'field.selectHosts': 'Select Hosts',
  'placeholder.workspaceName': 'Workspace name',
  'placeholder.sessionName': 'Session name',
-  'placeholder.searchHosts': 'Search hosts...',
  'toast.settingsUnavailable': 'Settings window is unavailable on this platform.',

  // Settings shell
@@ -81,52 +77,6 @@ const en: Messages = {
  'settings.system.clearResult': 'Deleted {deleted} file(s), {failed} failed.',
  'settings.system.tempDirectoryHint': 'Temporary files are created when opening remote files with external applications. They are automatically cleaned up when SFTP sessions close.',

-  // Settings > Session Logs
-  'settings.sessionLogs.title': 'Session Logs',
-  'settings.sessionLogs.description': 'Configure session log export and auto-save settings.',
-  'settings.sessionLogs.autoSave': 'Auto-Save',
-  'settings.sessionLogs.enableAutoSave': 'Enable auto-save',
-  'settings.sessionLogs.enableAutoSaveDesc': 'Automatically save session logs when terminal sessions end.',
-  'settings.sessionLogs.directory': 'Save Directory',
-  'settings.sessionLogs.noDirectory': 'No directory selected',
-  'settings.sessionLogs.browse': 'Browse',
-  'settings.sessionLogs.openFolder': 'Open folder',
-  'settings.sessionLogs.directoryHint': 'Logs will be organized by host in subdirectories.',
-  'settings.sessionLogs.format': 'Log Format',
-  'settings.sessionLogs.formatDesc': 'Choose the format for saved log files.',
-  'settings.sessionLogs.formatTxt': 'Plain Text (.txt)',
-  'settings.sessionLogs.formatRaw': 'Raw with ANSI (.log)',
-  'settings.sessionLogs.formatHtml': 'HTML (.html)',
-  'settings.sessionLogs.hint': 'Session logs capture all terminal output for troubleshooting and auditing purposes.',
-
-  // Settings > Global Hotkey (Quake Mode)
-  'settings.globalHotkey.title': 'Global Hotkey',
-  'settings.globalHotkey.toggleWindow': 'Toggle Window',
-  'settings.globalHotkey.toggleWindowDesc': 'Press a key combination to set a global shortcut for showing/hiding the window.',
-  'settings.globalHotkey.notSet': 'Not set',
-  'settings.globalHotkey.reset': 'Reset to default',
-  'settings.globalHotkey.closeToTray': 'Close to System Tray',
-  'settings.globalHotkey.closeToTrayDesc': 'When enabled, closing the window will minimize to the system tray instead of quitting.',
-  'settings.globalHotkey.hint': 'Global hotkey works system-wide to quickly show or hide the window (Quake-style terminal).',
-
-  // Tray Panel
-  'tray.openMainWindow': 'Open Main Window',
-  'tray.sessions': 'Sessions',
-  'tray.portForwarding': 'Port Forwarding',
-  'tray.status.connected': 'Connected',
-  'tray.status.connecting': 'Connecting',
-  'tray.status.disconnected': 'Disconnected',
-  'tray.status.active': 'Active',
-  'tray.status.inactive': 'Inactive',
-  'tray.status.error': 'Error',
-  'tray.recentHosts': 'Recent Hosts',
-  'tray.empty.title': 'Nothing here yet',
-  'tray.empty.subtitle': 'Go connect to a server, they miss you 🚀',
-
-  // Vault Sidebar
-  'vault.sidebar.collapse': 'Collapse sidebar',
-  'vault.sidebar.expand': 'Expand sidebar',
-
  // Settings > Application
  'settings.application.checkUpdates': 'Check for updates',
  'settings.application.reportProblem': 'Report a problem',
@@ -169,8 +119,6 @@ const en: Messages = {
    '/* Example: */\n.terminal { background: #1a1a2e !important; }\n:root { --radius: 0.25rem; }',
  'settings.appearance.language': 'Language',
  'settings.appearance.language.desc': 'Choose the UI language',
-  'settings.appearance.uiFont': 'Interface Font',
-  'settings.appearance.uiFont.desc': 'Choose the font for the application interface',

  // Settings > Terminal
  'settings.terminal.section.theme': 'Terminal Theme',
@@ -253,18 +201,6 @@ const en: Messages = {
  'settings.terminal.section.connection': 'Connection',
  'settings.terminal.connection.keepaliveInterval': 'Keepalive Interval',
  'settings.terminal.connection.keepaliveInterval.desc': 'How often (in seconds) to send SSH-level keepalive packets to server. Set to 0 to disable.',
-  'settings.terminal.section.serverStats': 'Server Stats (Linux)',
-  'settings.terminal.serverStats.show': 'Show Server Stats',
-  'settings.terminal.serverStats.show.desc': 'Display CPU, memory, and disk usage in the terminal statusbar (Linux servers only).',
-  'settings.terminal.serverStats.refreshInterval': 'Refresh Interval',
-  'settings.terminal.serverStats.refreshInterval.desc': 'How often to refresh server stats.',
-  'settings.terminal.serverStats.seconds': 'seconds',
-
-  // Settings > Terminal > Rendering
-  'settings.terminal.section.rendering': 'Rendering',
-  'settings.terminal.rendering.renderer': 'Renderer',
-  'settings.terminal.rendering.renderer.desc': 'Choose the terminal rendering technology. Auto will use Canvas on low-memory devices. Changes take effect on new terminal sessions.',
-  'settings.terminal.rendering.auto': 'Auto',

  // Settings > Shortcuts
  'settings.shortcuts.section.scheme': 'Hotkey Scheme',
@@ -281,7 +217,6 @@ const en: Messages = {
  'settings.shortcuts.category.terminal': 'Terminal',
  'settings.shortcuts.category.navigation': 'Navigation',
  'settings.shortcuts.category.app': 'App',
-  'settings.shortcuts.category.sftp': 'SFTP',

  // Context menus / common actions
  'action.newHost': 'New Host',
@@ -346,11 +281,6 @@ const en: Messages = {
  'vault.groups.createDialog.desc': 'Create a new group for organizing hosts.',
  'vault.groups.renameDialogTitle': 'Rename Group',
  'vault.groups.renameDialog.desc': 'Rename an existing group.',
-  'vault.groups.deleteDialogTitle': 'Delete Group',
-  'vault.groups.deleteDialog.desc': 'This will permanently delete the group and move all hosts to the root level.',
-  'vault.groups.deleteDialog.managedDesc': 'This is a managed SSH config group. Deleting it will also delete all hosts and unlink from the source file.',
-  'vault.groups.deleteDialog.deleteHosts': 'Also delete all hosts in this group',
-  'vault.groups.ungrouped': 'Ungrouped',
  'vault.groups.field.name': 'Group Name',
  'vault.groups.placeholder.example': 'e.g. Production',
  'vault.groups.parentLabel': 'Parent',
@@ -358,9 +288,6 @@ const en: Messages = {
  'vault.groups.errors.required': 'Group name is required.',
  'vault.groups.errors.invalidChars': "Group name cannot include '/' or '\\\\'.",

-  'vault.managedSource.unmanage': 'Unmanage',
-  'vault.managedSource.unmanageSuccess': 'Successfully unmanaged group',
-
  'vault.hosts.header.entries': '{count} entries',
  'vault.hosts.header.live': '{count} live',

@@ -369,26 +296,10 @@ const en: Messages = {
  'vault.hosts.connect': 'Connect',
  'vault.view.grid': 'Grid',
  'vault.view.list': 'List',
-  'vault.view.tree': 'Tree',
-  'vault.tree.expandAll': 'Expand All',
-  'vault.tree.collapseAll': 'Collapse All',
  'vault.hosts.newHost': 'New Host',
  'vault.hosts.newGroup': 'New Group',
  'vault.hosts.import': 'Import',
-  'vault.hosts.export': 'Export',
-  'vault.hosts.export.toast.success': 'Exported {count} hosts to CSV',
-  '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.copyCredentials': 'Copy Credentials',
-  'vault.hosts.copyCredentials.toast.success': 'Credentials copied to clipboard',
-  'vault.hosts.copyCredentials.toast.noPassword': 'No password saved for this host',
-  'vault.hosts.multiSelect': 'Multi-select',
-  'vault.hosts.selected': '{count} selected',
-  'vault.hosts.selectAll': 'Select All',
-  'vault.hosts.deselectAll': 'Deselect All',
-  'vault.hosts.deleteSelected': 'Delete ({count})',
-  'vault.hosts.deleteMultiple.success': 'Deleted {count} hosts',

  // Vault import
  'vault.import.title': 'Add data to your vault',
@@ -405,18 +316,6 @@ const en: Messages = {
  'vault.import.toast.summary':
    'Imported {count} hosts (skipped {skipped}, duplicates {duplicates}).',
  'vault.import.toast.firstIssue': 'First issue: {issue}',
-  'vault.import.sshConfig.chooseMode': 'Choose how to import your SSH config file.',
-  'vault.import.sshConfig.modeQuestion': 'How would you like to import?',
-  'vault.import.sshConfig.importOnly': 'Import Only',
-  'vault.import.sshConfig.importOnlyDesc': 'One-time import. Changes won\'t sync back to the file.',
-  'vault.import.sshConfig.managed': 'Managed Sync',
-  'vault.import.sshConfig.managedDesc': 'Keep in sync. Changes will be saved back to the file.',
-  'vault.import.sshConfig.managedGroup': 'ssh config',
-  'vault.import.sshConfig.managedSuccess': 'Imported {count} hosts. File is now managed.',
-  'vault.import.sshConfig.alreadyManaged': 'This file is already being managed.',
-  'vault.import.sshConfig.alreadyManagedDesc': 'This file is already managed under group "{group}". Remove the existing managed source first if you want to re-import.',
-  'vault.import.sshConfig.noFilePath': 'Cannot manage this file.',
-  'vault.import.sshConfig.noFilePathDesc': 'Unable to determine the file path. Managed sync requires access to the file system.',

  // Known Hosts
  'knownHosts.search.placeholder': 'Search known hosts...',
@@ -492,13 +391,6 @@ const en: Messages = {
  'pf.view.list': 'List',
  'pf.rule.summary.dynamic': 'SOCKS on {bindAddress}:{localPort}',
  'pf.rule.summary.default': '{bindAddress}:{localPort} -> {remoteHost}:{remotePort}',
-  'pf.tooltip.relayHost': 'Relay Host',
-  'pf.tooltip.hostLabel': 'Host',
-  'pf.tooltip.hostAddress': 'Address',
-  'pf.tooltip.noHost': 'No relay host configured',
-  'pf.tooltip.localDesc': 'Local port forwarding: Access remote services through SSH tunnel',
-  'pf.tooltip.remoteDesc': 'Remote port forwarding: Expose local services to remote host',
-  'pf.tooltip.dynamicDesc': 'Dynamic SOCKS proxy: Route traffic through SSH tunnel',
  'pf.deleteActive.title': 'Delete Active Port Forwarding?',
  'pf.deleteActive.desc': 'This port forwarding rule "{label}" is currently active. Deleting it will stop the tunnel first.',
  'pf.deleteActive.confirm': 'Stop and Delete',
@@ -507,7 +399,6 @@ const en: Messages = {

  // SFTP
  'sftp.newFolder': 'New Folder',
-  'sftp.newFile': 'New File',
  'sftp.filter': 'Filter',
  'sftp.filter.placeholder': 'Filter by filename...',
  'sftp.columns.name': 'Name',
@@ -516,12 +407,8 @@ const en: Messages = {
  'sftp.columns.kind': 'Kind',
  'sftp.columns.actions': 'Actions',
  'sftp.emptyDirectory': 'Empty directory',
-  'sftp.nav.up': 'Go up',
-  'sftp.nav.home': 'Go to home',
-  'sftp.nav.refresh': 'Refresh',
  'sftp.upload': 'Upload',
  'sftp.uploadFiles': 'Upload files',
-  'sftp.uploadFolder': 'Upload folder',
  'sftp.dragDropToUpload': 'Drag and drop files here to upload',
  'sftp.retry': 'Retry',
  'sftp.context.open': 'Open',
@@ -543,21 +430,14 @@ const en: Messages = {
  'sftp.status.uploading': 'Uploading...',
  'sftp.status.ready': 'Ready',
  'sftp.goUp': 'Go up',
-  'sftp.encoding.label': 'Filename Encoding',
-  'sftp.encoding.auto': 'Auto',
-  'sftp.encoding.utf8': 'UTF-8',
-  'sftp.encoding.gb18030': 'GB18030',
  'sftp.goHome': 'Go to home',
  'sftp.folderName': 'Folder name',
  'sftp.folderName.placeholder': 'Enter folder name',
-  'sftp.fileName': 'File name',
-  'sftp.fileName.placeholder': 'Enter file name',
  'sftp.prompt.newFolderName': 'New folder name?',
  'sftp.rename.title': 'Rename',
  'sftp.rename.newName': 'New name',
  'sftp.rename.placeholder': 'Enter new name',
  'sftp.confirm.deleteOne': 'Delete "{name}"?',
-  'sftp.deleteConfirm.single': 'Delete "{name}"?',
  'sftp.deleteConfirm.title': 'Delete {count} item(s)?',
  'sftp.deleteConfirm.desc': 'This action cannot be undone. The following will be deleted:',
  'sftp.error.loadFailed': 'Failed to load directory',
@@ -565,12 +445,6 @@ const en: Messages = {
  'sftp.error.uploadFailed': 'Upload failed',
  'sftp.error.deleteFailed': 'Delete failed',
  'sftp.error.createFolderFailed': 'Failed to create folder',
-  'sftp.error.createFileFailed': 'Failed to create file',
-  'sftp.error.invalidFileName': 'Filename contains invalid characters: {chars}',
-  'sftp.error.reservedName': 'This filename is reserved by the system',
-  'sftp.overwrite.title': 'File Already Exists',
-  'sftp.overwrite.desc': 'A file named "{name}" already exists. Do you want to replace it?',
-  'sftp.overwrite.confirm': 'Replace',
  'sftp.error.renameFailed': 'Failed to rename',
  'sftp.picker.title': 'Select Host',
  'sftp.picker.desc': 'Pick a host for the {side} pane',
@@ -607,12 +481,6 @@ const en: Messages = {
  'sftp.conflict.action.keepBoth': 'Keep Both',
  'sftp.conflict.action.replace': 'Replace',

-  // SFTP Upload Phases
-  'sftp.upload.phase.compressing': 'Compressing',
-  'sftp.upload.phase.uploading': 'Uploading',
-  'sftp.upload.phase.extracting': 'Extracting',
-  'sftp.upload.phase.compressed': 'Compressed',
-
  // SFTP File Opener
  'sftp.context.openWith': 'Open with...',
  'sftp.context.edit': 'Edit',
@@ -657,7 +525,7 @@ const en: Messages = {
  'settings.sftpFileAssociations.noAssociations': 'No file associations configured',
  'settings.sftpFileAssociations.remove': 'Remove',
  'settings.sftpFileAssociations.removeConfirm': 'Remove association for .{ext}?',
-
+  
  // Settings > SFTP Behavior
  'settings.sftp.doubleClickBehavior': 'Double-click behavior',
  'settings.sftp.doubleClickBehavior.desc': 'Choose the action when double-clicking a file in SFTP View',
@@ -665,7 +533,7 @@ const en: Messages = {
  'settings.sftp.doubleClickBehavior.transfer': 'Transfer to other pane',
  'settings.sftp.doubleClickBehavior.openDesc': 'Open the file in the default application',
  'settings.sftp.doubleClickBehavior.transferDesc': 'Transfer the file to the other pane\'s active host',
-
+  
  // Settings > SFTP Auto Sync
  'settings.sftp.autoSync': 'Auto-sync to remote',
  'settings.sftp.autoSync.desc': 'Automatically sync file changes back to the remote server when opening files with external applications',
@@ -674,45 +542,11 @@ const en: Messages = {
  'sftp.autoSync.success': 'File synced to remote: {fileName}',
  'sftp.autoSync.error': 'Failed to sync file: {error}',

-  // SFTP Folder Upload Progress
-  'sftp.upload.progress': 'Uploading {current} of {total} files...',
-  'sftp.upload.uploading': 'Uploading...',
-  'sftp.upload.compressing': 'Compressing...',
-  'sftp.upload.extracting': 'Extracting...',
-  'sftp.upload.scanning': 'Scanning files...',
-  'sftp.upload.completed': 'Completed',
-  'sftp.upload.compressed': 'Compressed Transfer',
-  'sftp.upload.currentFile': 'Current: {fileName}',
-  'sftp.upload.cancelled': 'Upload cancelled',
-  'sftp.upload.cancel': 'Cancel',
-
-  // SFTP Download
-  'sftp.download.completed': 'Downloaded',
-  'sftp.download.cancelled': 'Download cancelled',
-
-  // SFTP Reconnecting
-  'sftp.reconnecting.title': 'Reconnecting...',
-  'sftp.reconnecting.desc': 'Connection lost, attempting to reconnect',
-  'sftp.reconnected': 'Connection restored',
-  'sftp.error.reconnectFailed': 'Failed to reconnect. Please try again.',
-  'sftp.error.connectionLostManual': 'Connection lost. Please reconnect manually.',
-  'sftp.error.connectionLostReconnecting': 'Connection lost. Reconnecting...',
-  'sftp.error.sessionLost': 'SFTP session lost. Please reconnect.',
-
-  // Settings > SFTP Show Hidden Files
-  'settings.sftp.showHiddenFiles': 'Show hidden files',
-  'settings.sftp.showHiddenFiles.desc': 'Display files with the Windows hidden attribute in the SFTP file browser when browsing local Windows filesystem.',
-  'settings.sftp.showHiddenFiles.enable': 'Show hidden files',
-  'settings.sftp.showHiddenFiles.enableDesc': 'Display Windows hidden files when browsing local filesystem',
-
-  // Settings > SFTP Compressed Upload
-  'settings.sftp.compressedUpload': 'Folder Compression Transfer',
-  'settings.sftp.compressedUpload.desc': 'Compress folders before uploading to significantly reduce transfer time.',
-  'settings.sftp.compressedUpload.enable': 'Enable folder compression',
-  'settings.sftp.compressedUpload.enableDesc': 'Automatically compress folders using tar before transfer. Requires tar support on the server. Falls back to regular transfer if not available.',
-
  // Quick Switcher
  'qs.search.placeholder': 'Search hosts or tabs',
+  'qs.recentConnections': 'Recent connections',
+  'qs.createWorkspace': 'Create a workspace',
+  'qs.restore': 'Restore',
  'qs.jumpTo': 'Jump To',
  'qs.localTerminal': 'Local Terminal',

@@ -746,12 +580,6 @@ const en: Messages = {
  'hostDetails.section.address': 'Address',
  'hostDetails.hostname.placeholder': 'IP or Hostname',
  'hostDetails.section.general': 'General',
-  'hostDetails.section.sftp': 'SFTP Settings',
-  'hostDetails.sftp.sudo': 'Sudo Mode',
-  'hostDetails.sftp.sudo.desc': 'Automatically acquire Root privileges using stored password',
-  'hostDetails.sftp.sudo.passwordWarning': 'Sudo mode requires a password. Configure one above, or ensure the server allows passwordless sudo.',
-  'hostDetails.sftp.encoding': 'Filename Encoding',
-  'hostDetails.sftp.encoding.desc': 'Select the encoding used to decode and send SFTP filenames.',
  'hostDetails.label.placeholder': 'Label (e.g., Production Server)',
  'hostDetails.group.placeholder': 'Parent Group',
  'hostDetails.section.credentials': 'Credentials',
@@ -760,9 +588,6 @@ const en: Messages = {
  'hostDetails.section.mosh': 'Mosh',
  'hostDetails.username.placeholder': 'Username',
  'hostDetails.password.placeholder': 'Password',
-  'hostDetails.password.show': 'Show password',
-  'hostDetails.password.hide': 'Hide password',
-  'hostDetails.password.save': 'Save password',
  'hostDetails.identity.suggestions': 'Identities',
  'hostDetails.identity.missing': 'Identity not found',
  'hostDetails.credential.keyCertificate': 'Key, Certificate',
@@ -773,20 +598,16 @@ const en: Messages = {
  'hostDetails.keys.empty': 'No keys available',
  'hostDetails.certs.search': 'Search certificates...',
  'hostDetails.certs.empty': 'No certificates available',
-  'hostDetails.agentForwarding': 'Forward SSH Agent',
-  'hostDetails.agentForwarding.desc': 'Allow remote server to use your local SSH keys (e.g., for git operations)',
-  'hostDetails.agentForwarding.agentNotRunning': 'SSH Agent is not running',
-  'hostDetails.agentForwarding.agentNotRunningHint': 'Enable OpenSSH Authentication Agent service in Windows Services (services.msc) for agent forwarding to work.',
-  'hostDetails.section.agentForwarding': 'SSH Agent',
-  'hostDetails.jumpHosts': 'Proxy via Hosts',
+  'hostDetails.agentForwarding': 'Agent Forwarding',
+  'hostDetails.jumpHosts': 'Jump Hosts',
  'hostDetails.jumpHosts.hops': '{count} hop(s)',
  'hostDetails.jumpHosts.direct': 'Direct',
-  'hostDetails.jumpHosts.configure': 'Configure Proxy Hosts',
-  'hostDetails.proxy': 'Proxy via HTTP/SOCKS5',
+  'hostDetails.jumpHosts.configure': 'Configure Jump Hosts',
+  'hostDetails.proxy': 'Proxy',
  'hostDetails.proxy.none': 'None',
  'hostDetails.proxy.edit': 'Edit Proxy',
  'hostDetails.proxy.configure': 'Configure Proxy',
-  'hostDetails.proxyPanel.title': 'Proxy via HTTP/SOCKS5',
+  'hostDetails.proxyPanel.title': 'Proxy',
  'hostDetails.proxyPanel.hostPlaceholder': 'Proxy host',
  'hostDetails.proxyPanel.credentials': 'Credentials',
  'hostDetails.proxyPanel.usernamePlaceholder': 'Username',
@@ -827,12 +648,6 @@ const en: Messages = {
  'hostDetails.telnet.password': 'Telnet Password',
  'hostDetails.charset.placeholder': 'Charset (e.g. UTF-8)',
  'hostDetails.telnet.add': 'Add Telnet Protocol',
-  'hostDetails.tags': 'Tags',
-  'hostDetails.group': 'Group',
-  'hostDetails.selectGroup': 'Select Group',
-  'hostDetails.addTag': 'Add a tag...',
-  'hostDetails.createTag': 'Create tag',
-  'hostDetails.createGroup': 'Create group',

  // Host form (legacy modal)
  'hostForm.title.edit': 'Edit Host',
@@ -867,7 +682,7 @@ const en: Messages = {
  'logs.empty.title': 'No Connection Logs',
  'logs.empty.desc':
    'Your connection history will appear here when you connect to hosts or open local terminals.',
-  'logs.loadMore': 'Load {count} more logs',
+  'logs.showing': 'Showing {limit} of {total} logs.',
  'logs.ongoing': 'ongoing',
  'logs.localTerminal': 'Local Terminal',
  'logs.action.save': 'Save',
@@ -878,7 +693,6 @@ const en: Messages = {
  'logView.customizeAppearance': 'Customize appearance',
  'logView.appearance': 'Appearance',
  'logView.readOnly': 'Read-only',
-  'logView.export': 'Export',

  // Terminal toolbar / search / context menu / auth
  'terminal.toolbar.openSftp': 'Open SFTP',
@@ -896,36 +710,6 @@ const en: Messages = {
  'terminal.toolbar.focus': 'Focus',
  'terminal.toolbar.focusMode': 'Focus Mode',
  'terminal.toolbar.closeSession': 'Close session',
-  'terminal.toolbar.hostHighlight.title': 'Host Keyword Highlighting',
-  'terminal.toolbar.hostHighlight.noRules': 'No custom highlight rules defined for this host',
-  'terminal.toolbar.hostHighlight.addRule': 'Add New Rule',
-  'terminal.toolbar.hostHighlight.labelPlaceholder': 'Label (e.g., Error)',
-  'terminal.toolbar.hostHighlight.patternPlaceholder': 'Regex pattern (e.g., \\bfailed\\b)',
-  'terminal.toolbar.hostHighlight.invalidPattern': 'Invalid regex pattern',
-  'terminal.toolbar.hostHighlight.clearAll': 'Clear All',
-  'terminal.toolbar.hostHighlight.changeColor': 'Change highlight color for',
-  'terminal.toolbar.hostHighlight.selectColor': 'Select color for new rule',
-  'terminal.serverStats.cpu': 'CPU Usage',
-  'terminal.serverStats.cpuCores': 'CPU Core Usage',
-  'terminal.serverStats.memory': 'Memory Usage',
-  'terminal.serverStats.memoryDetails': 'Memory Details',
-  'terminal.serverStats.memUsed': 'Used',
-  'terminal.serverStats.memBuffers': 'Buffers',
-  'terminal.serverStats.memCached': 'Cache',
-  'terminal.serverStats.memFree': 'Free',
-  'terminal.serverStats.topProcesses': 'Top Processes by Memory',
-  'terminal.serverStats.disk': 'Disk Usage (Root)',
-  'terminal.serverStats.diskDetails': 'Mounted Disks',
-  'terminal.serverStats.network': 'Network Speed',
-  'terminal.serverStats.networkDetails': 'Network Interfaces',
-  'terminal.serverStats.noData': 'No data available',
-  'terminal.dragDrop.localTitle': 'Drop to Insert Paths',
-  'terminal.dragDrop.localMessage': 'File paths will be inserted into the terminal',
-  'terminal.dragDrop.remoteTitle': 'Drop to Upload Files',
-  'terminal.dragDrop.remoteMessage': 'Files will be uploaded via SFTP',
-  'terminal.dragDrop.notConnected': 'Cannot drop files - terminal is not connected',
-  'terminal.dragDrop.errorTitle': 'Drop Error',
-  'terminal.dragDrop.errorMessage': 'Failed to process dropped files',
  'terminal.search.placeholder': 'Search...',
  'terminal.search.noResults': 'No results',
  'terminal.search.prevMatch': 'Previous match (Shift+Enter)',
@@ -956,11 +740,6 @@ const en: Messages = {
  'terminal.connection.chainOf': 'Chain {current} of {total}',
  'terminal.connection.showLogs': 'Show logs',
  'terminal.connection.hideLogs': 'Hide logs',
-  'terminal.connection.protocol.ssh': 'SSH',
-  'terminal.connection.protocol.telnet': 'Telnet',
-  'terminal.connection.protocol.mosh': 'Mosh',
-  'terminal.connection.protocol.serial': 'Serial',
-  'terminal.connection.protocol.local': 'Local Shell',
  'terminal.themeModal.title': 'Terminal Appearance',
  'terminal.themeModal.tab.theme': 'Theme',
  'terminal.themeModal.tab.font': 'Font',
@@ -1222,7 +1001,6 @@ const en: Messages = {
  'tabs.closeLogViewAria': 'Close log view',
  'tabs.logPrefix': 'Log:',
  'tabs.logLocal': 'Local',
-  'tabs.copyTab': 'Copy Tab',
  'keychain.edit.labelRequired': 'Label *',
  'keychain.edit.keyLabelPlaceholder': 'Key label',
  'keychain.edit.privateKeyRequired': 'Private key *',
@@ -1274,23 +1052,6 @@ const en: Messages = {
  'snippets.packageDialog.placeholder': 'e.g. ops/maintenance',
  'snippets.packageDialog.hint': 'Use "/" to create nested packages.',

-  // Snippets Rename Dialog
-  'snippets.renameDialog.title': 'Rename Package',
-  'snippets.renameDialog.currentPath': 'Current path: {path}',
-  'snippets.renameDialog.placeholder': 'Enter new name',
-  'snippets.renameDialog.error.empty': 'Package name cannot be empty',
-  'snippets.renameDialog.error.duplicate': 'A package with this name already exists',
-  'snippets.renameDialog.error.invalidChars': 'Package name can only contain letters, numbers, hyphens, and underscores',
-
-  // Snippet Shortkey
-  'snippets.field.shortkey': 'Keyboard Shortcut',
-  'snippets.shortkey.placeholder': 'Click to set shortcut',
-  'snippets.shortkey.recording': 'Press a key combination...',
-  'snippets.shortkey.hint': 'Press this shortcut in terminal to quickly send the command.',
-  'snippets.shortkey.clear': 'Clear shortcut',
-  'snippets.shortkey.error.systemConflict': 'This shortcut conflicts with a system shortcut',
-  'snippets.shortkey.error.snippetConflict': 'This shortcut is already used by snippet: {name}',
-
  // Serial Port
  'serial.button': 'Serial',
  'serial.modal.title': 'Connect to Serial Port',
@@ -1300,12 +1061,11 @@ const en: Messages = {
  'serial.field.baudRate': 'Baud Rate',
  'serial.field.dataBits': 'Data Bits',
  'serial.field.stopBits': 'Stop Bits',
-  'serial.field.stopBits15Warning': '1.5 stop bits may not be supported on all Windows devices',
  'serial.field.parity': 'Parity',
  'serial.field.flowControl': 'Flow Control',
  'serial.noPorts': 'No serial ports detected. Connect a device and refresh.',
  'serial.field.customPort': 'Custom Port Path',
-  'serial.field.customPortPlaceholder': 'e.g. /dev/ttys001 or COM1',
+  'serial.field.customPortPlaceholder': 'e.g. /dev/ttys001',
  'serial.type.hardware': 'Hardware',
  'serial.type.pseudo': 'Pseudo Terminal',
  'serial.type.custom': 'Custom',
@@ -1322,39 +1082,6 @@ const en: Messages = {
  'serial.field.lineMode': 'Line Mode',
  'serial.field.lineModeDesc': 'Buffer input and send on Enter (instead of character-by-character)',
  'serial.connectionError': 'Failed to connect to serial port',
-  'serial.field.baudRatePlaceholder': 'Select or enter baud rate...',
-  'serial.field.baudRateEmpty': 'Enter a custom baud rate',
-  'serial.field.customBaudRate': 'Using custom baud rate',
-  'serial.field.saveConfig': 'Save Configuration',
-  'serial.field.saveConfigDesc': 'Save this serial configuration to hosts for quick access',
-  'serial.field.configLabel': 'Configuration Name',
-  'serial.field.configLabelPlaceholder': 'e.g. Arduino Uno',
-  'serial.connectAndSave': 'Connect & Save',
-  'serial.edit.title': 'Serial Port Settings',
-
-  // Keyboard Interactive Authentication (2FA/MFA)
-  'keyboard.interactive.title': 'Authentication Required',
-  'keyboard.interactive.desc': 'The server requires additional authentication.',
-  'keyboard.interactive.descWithHost': 'The server {hostname} requires additional authentication.',
-  'keyboard.interactive.response': 'Response',
-  'keyboard.interactive.enterCode': 'Enter verification code',
-  'keyboard.interactive.enterResponse': 'Enter response',
-  'keyboard.interactive.submit': 'Submit',
-  'keyboard.interactive.verifying': 'Verifying...',
-  'keyboard.interactive.fill': 'Fill',
-  'keyboard.interactive.fillSaved': 'Fill with saved password',
-  'keyboard.interactive.useSaved': 'Use saved',
-  'keyboard.interactive.useSavedPassword': 'Use saved password',
-
-  // Passphrase Modal for encrypted SSH keys
-  'passphrase.title': 'SSH Key Passphrase',
-  'passphrase.desc': 'Enter the passphrase for {keyName}',
-  'passphrase.descWithHost': 'Enter the passphrase for {keyName} to connect to {hostname}',
-  'passphrase.label': 'Passphrase',
-  'passphrase.keyPath': 'Key',
-  'passphrase.unlock': 'Unlock',
-  'passphrase.unlocking': 'Unlocking...',
-  'passphrase.skip': 'Skip',
 };

 export default en;
--- a/application/i18n/locales/zh-CN.ts
+++ b/application/i18n/locales/zh-CN.ts
@@ -27,7 +27,6 @@ const zhCN: Messages = {
  'sort.za': 'Z-a',
  'sort.newest': '从新到旧',
  'sort.oldest': '从旧到新',
-  'sort.group': '按分组',
  'field.label': 'Label',
  'field.type': '类型',
  'auth.keyType': '类型 {type}',
@@ -66,52 +65,6 @@ const zhCN: Messages = {
  'settings.system.clearResult': '已删除 {deleted} 个文件，{failed} 个失败。',
  'settings.system.tempDirectoryHint': '临时文件在使用外部应用打开远程文件时创建。SFTP 会话关闭时会自动清理。',

-  // Settings > Session Logs
-  'settings.sessionLogs.title': '会话日志',
-  'settings.sessionLogs.description': '配置会话日志导出和自动保存设置。',
-  'settings.sessionLogs.autoSave': '自动保存',
-  'settings.sessionLogs.enableAutoSave': '启用自动保存',
-  'settings.sessionLogs.enableAutoSaveDesc': '在终端会话结束时自动保存会话日志。',
-  'settings.sessionLogs.directory': '保存目录',
-  'settings.sessionLogs.noDirectory': '未选择目录',
-  'settings.sessionLogs.browse': '浏览',
-  'settings.sessionLogs.openFolder': '打开文件夹',
-  'settings.sessionLogs.directoryHint': '日志将按主机名组织在子目录中。',
-  'settings.sessionLogs.format': '日志格式',
-  'settings.sessionLogs.formatDesc': '选择保存日志文件的格式。',
-  'settings.sessionLogs.formatTxt': '纯文本 (.txt)',
-  'settings.sessionLogs.formatRaw': '原始格式 (.log)',
-  'settings.sessionLogs.formatHtml': 'HTML (.html)',
-  'settings.sessionLogs.hint': '会话日志用于记录终端输出，便于故障排查和审计。',
-
-  // Settings > Global Hotkey (Quake Mode)
-  'settings.globalHotkey.title': '全局快捷键',
-  'settings.globalHotkey.toggleWindow': '切换窗口',
-  'settings.globalHotkey.toggleWindowDesc': '按下组合键以设置显示/隐藏窗口的全局快捷键。',
-  'settings.globalHotkey.notSet': '未设置',
-  'settings.globalHotkey.reset': '恢复默认',
-  'settings.globalHotkey.closeToTray': '关闭时最小化到托盘',
-  'settings.globalHotkey.closeToTrayDesc': '启用后，关闭窗口将最小化到系统托盘而不是退出程序。',
-  'settings.globalHotkey.hint': '全局快捷键在系统范围内工作，可快速显示或隐藏窗口（下拉式终端风格）。',
-
-  // Tray Panel
-  'tray.openMainWindow': '打开主窗口',
-  'tray.sessions': '会话',
-  'tray.portForwarding': '端口转发',
-  'tray.status.connected': '已连接',
-  'tray.status.connecting': '连接中',
-  'tray.status.disconnected': '已断开',
-  'tray.status.active': '已启用',
-  'tray.status.inactive': '未启用',
-  'tray.status.error': '错误',
-  'tray.recentHosts': '最近连接的主机',
-  'tray.empty.title': '一切都很安静',
-  'tray.empty.subtitle': '去连接个服务器吧，它们想念你了 🚀',
-
-  // Vault Sidebar
-  'vault.sidebar.collapse': '收起侧边栏',
-  'vault.sidebar.expand': '展开侧边栏',
-
  // Settings > Application
  'settings.application.checkUpdates': '检查更新',
  'settings.application.reportProblem': '反馈问题',
@@ -153,8 +106,6 @@ const zhCN: Messages = {
    '/* 示例：*/\n.terminal { background: #1a1a2e !important; }\n:root { --radius: 0.25rem; }',
  'settings.appearance.language': '语言',
  'settings.appearance.language.desc': '选择界面语言',
-  'settings.appearance.uiFont': '界面字体',
-  'settings.appearance.uiFont.desc': '选择软件界面使用的字体',

  // Context menus / common actions
  'action.newHost': '新建主机',
@@ -213,11 +164,6 @@ const zhCN: Messages = {
  'vault.groups.createDialog.desc': '创建新的分组用于组织主机。',
  'vault.groups.renameDialogTitle': '重命名分组',
  'vault.groups.renameDialog.desc': '重命名已有分组。',
-  'vault.groups.deleteDialogTitle': '删除分组',
-  'vault.groups.deleteDialog.desc': '这将永久删除该分组并将所有主机移动到根级别。',
-  'vault.groups.deleteDialog.managedDesc': '这是一个托管的 SSH config 分组。删除后将同时删除所有主机并断开与源文件的连接。',
-  'vault.groups.deleteDialog.deleteHosts': '同时删除该分组下的所有主机',
-  'vault.groups.ungrouped': '未分组',
  'vault.groups.field.name': '分组名称',
  'vault.groups.placeholder.example': '例如：Production',
  'vault.groups.parentLabel': '父级',
@@ -225,9 +171,6 @@ const zhCN: Messages = {
  'vault.groups.errors.required': '分组名称不能为空。',
  'vault.groups.errors.invalidChars': "分组名称不能包含 '/' 或 '\\\\'.",

-  'vault.managedSource.unmanage': '取消托管',
-  'vault.managedSource.unmanageSuccess': '已取消托管分组',
-
  'vault.hosts.header.entries': '{count} 条',
  'vault.hosts.header.live': '{count} 个在线',

@@ -236,26 +179,10 @@ const zhCN: Messages = {
  'vault.hosts.connect': '连接',
  'vault.view.grid': '网格',
  'vault.view.list': '列表',
-  'vault.view.tree': '树形',
-  'vault.tree.expandAll': '展开全部',
-  'vault.tree.collapseAll': '折叠全部',
  'vault.hosts.newHost': '新建主机',
  'vault.hosts.newGroup': '新建分组',
  'vault.hosts.import': '导入',
-  'vault.hosts.export': '导出',
-  'vault.hosts.export.toast.success': '已导出 {count} 个主机到 CSV',
-  'vault.hosts.export.toast.successWithSkipped': '已导出 {count} 个主机到 CSV（跳过 {skipped} 个不支持的主机）',
-  'vault.hosts.export.toast.noHosts': '没有主机可导出',
  'vault.hosts.allHosts': '全部主机',
-  'vault.hosts.copyCredentials': '复制账密信息',
-  'vault.hosts.copyCredentials.toast.success': '账密信息已复制到剪贴板',
-  'vault.hosts.copyCredentials.toast.noPassword': '该主机未保存密码',
-  'vault.hosts.multiSelect': '多选',
-  'vault.hosts.selected': '已选择 {count} 项',
-  'vault.hosts.selectAll': '全选',
-  'vault.hosts.deselectAll': '取消全选',
-  'vault.hosts.deleteSelected': '删除 ({count})',
-  'vault.hosts.deleteMultiple.success': '已删除 {count} 个主机',

  // Vault import
  'vault.import.title': '添加数据到你的 Vault',
@@ -270,18 +197,6 @@ const zhCN: Messages = {
  'vault.import.toast.noNewHosts': '从 {format} 没有导入到新的主机。',
  'vault.import.toast.summary': '已导入 {count} 个主机（跳过 {skipped}，重复 {duplicates}）。',
  'vault.import.toast.firstIssue': '首个问题：{issue}',
-  'vault.import.sshConfig.chooseMode': '选择如何导入你的 SSH config 文件。',
-  'vault.import.sshConfig.modeQuestion': '你希望如何导入？',
-  'vault.import.sshConfig.importOnly': '仅导入',
-  'vault.import.sshConfig.importOnlyDesc': '一次性导入，修改不会同步回文件。',
-  'vault.import.sshConfig.managed': '托管同步',
-  'vault.import.sshConfig.managedDesc': '保持同步，修改会自动保存回文件。',
-  'vault.import.sshConfig.managedGroup': 'ssh config',
-  'vault.import.sshConfig.managedSuccess': '已导入 {count} 个主机，文件已托管。',
-  'vault.import.sshConfig.alreadyManaged': '该文件已被托管。',
-  'vault.import.sshConfig.alreadyManagedDesc': '该文件已在分组 "{group}" 下托管。如需重新导入，请先移除现有的托管源。',
-  'vault.import.sshConfig.noFilePath': '无法托管此文件。',
-  'vault.import.sshConfig.noFilePathDesc': '无法确定文件路径。托管同步需要访问文件系统。',

  // Known Hosts
  'knownHosts.search.placeholder': '搜索已知主机...',
@@ -349,7 +264,6 @@ const zhCN: Messages = {

  // SFTP
  'sftp.newFolder': '新建文件夹',
-  'sftp.newFile': '新建文件',
  'sftp.filter': '筛选',
  'sftp.filter.placeholder': '按文件名筛选...',
  'sftp.columns.name': '名称',
@@ -358,12 +272,8 @@ const zhCN: Messages = {
  'sftp.columns.kind': '类型',
  'sftp.columns.actions': '操作',
  'sftp.emptyDirectory': '空目录',
-  'sftp.nav.up': '返回上层',
-  'sftp.nav.home': '返回主目录',
-  'sftp.nav.refresh': '刷新',
  'sftp.upload': '上传',
  'sftp.uploadFiles': '上传文件',
-  'sftp.uploadFolder': '上传文件夹',
  'sftp.dragDropToUpload': '拖拽文件到这里上传',
  'sftp.retry': '重试',
  'sftp.context.open': '打开',
@@ -385,21 +295,14 @@ const zhCN: Messages = {
  'sftp.status.uploading': '上传中...',
  'sftp.status.ready': '就绪',
  'sftp.goUp': '上一级',
-  'sftp.encoding.label': '文件名编码',
-  'sftp.encoding.auto': '自动',
-  'sftp.encoding.utf8': 'UTF-8',
-  'sftp.encoding.gb18030': 'GB18030',
  'sftp.goHome': '返回主目录',
  'sftp.folderName': '文件夹名称',
  'sftp.folderName.placeholder': '输入文件夹名称',
-  'sftp.fileName': '文件名称',
-  'sftp.fileName.placeholder': '输入文件名称',
  'sftp.prompt.newFolderName': '新建文件夹名称？',
  'sftp.rename.title': '重命名',
  'sftp.rename.newName': '新名称',
  'sftp.rename.placeholder': '输入新名称',
  'sftp.confirm.deleteOne': '删除 "{name}"？',
-  'sftp.deleteConfirm.single': '删除 "{name}"？',
  'sftp.deleteConfirm.title': '删除 {count} 个项目？',
  'sftp.deleteConfirm.desc': '此操作不可撤销，将删除以下内容：',
  'sftp.error.loadFailed': '加载目录失败',
@@ -407,12 +310,6 @@ const zhCN: Messages = {
  'sftp.error.uploadFailed': '上传失败',
  'sftp.error.deleteFailed': '删除失败',
  'sftp.error.createFolderFailed': '创建文件夹失败',
-  'sftp.error.createFileFailed': '创建文件失败',
-  'sftp.error.invalidFileName': '文件名包含非法字符：{chars}',
-  'sftp.error.reservedName': '此文件名是系统保留名称',
-  'sftp.overwrite.title': '文件已存在',
-  'sftp.overwrite.desc': '名为"{name}"的文件已存在。是否要替换它？',
-  'sftp.overwrite.confirm': '替换',
  'sftp.error.renameFailed': '重命名失败',
  'sftp.picker.title': '选择主机',
  'sftp.picker.desc': '为{side}窗格选择主机',
@@ -432,6 +329,9 @@ const zhCN: Messages = {

  // Quick Switcher
  'qs.search.placeholder': '搜索主机或标签页',
+  'qs.recentConnections': '最近连接',
+  'qs.createWorkspace': '创建工作区',
+  'qs.restore': '恢复',
  'qs.jumpTo': '跳转到',
  'qs.localTerminal': '本地终端',

@@ -461,12 +361,6 @@ const zhCN: Messages = {
  'hostDetails.section.address': '地址',
  'hostDetails.hostname.placeholder': 'IP 或 主机名',
  'hostDetails.section.general': '通用',
-  'hostDetails.section.sftp': 'SFTP 设置',
-  'hostDetails.sftp.sudo': 'Sudo 提权模式',
-  'hostDetails.sftp.sudo.desc': '使用保存的密码自动获取 Root 权限',
-  'hostDetails.sftp.sudo.passwordWarning': 'Sudo 模式需要密码。请在上方配置密码，或确保服务器允许免密 sudo。',
-  'hostDetails.sftp.encoding': '文件名编码',
-  'hostDetails.sftp.encoding.desc': '选择用于解码和发送 SFTP 文件名的编码。',
  'hostDetails.label.placeholder': '名称（例如：Production Server）',
  'hostDetails.group.placeholder': '父级 Group',
  'hostDetails.section.credentials': '凭据',
@@ -475,9 +369,6 @@ const zhCN: Messages = {
  'hostDetails.section.mosh': 'Mosh',
  'hostDetails.username.placeholder': '用户名',
  'hostDetails.password.placeholder': '密码',
-  'hostDetails.password.show': '显示密码',
-  'hostDetails.password.hide': '隐藏密码',
-  'hostDetails.password.save': '保存密码',
  'hostDetails.identity.suggestions': '身份',
  'hostDetails.identity.missing': '身份不存在',
  'hostDetails.credential.keyCertificate': '密钥 / 证书',
@@ -488,16 +379,12 @@ const zhCN: Messages = {
  'hostDetails.keys.empty': '暂无密钥',
  'hostDetails.certs.search': '搜索证书…',
  'hostDetails.certs.empty': '暂无证书',
-  'hostDetails.agentForwarding': '转发 SSH 密钥',
-  'hostDetails.agentForwarding.desc': '允许远程服务器使用本地 SSH 密钥（例如用于 git 操作）',
-  'hostDetails.agentForwarding.agentNotRunning': 'SSH Agent 未运行',
-  'hostDetails.agentForwarding.agentNotRunningHint': '请在 Windows 服务管理器 (services.msc) 中启用 OpenSSH Authentication Agent 服务。',
-  'hostDetails.section.agentForwarding': 'SSH 代理',
-  'hostDetails.jumpHosts': '通过主机代理',
+  'hostDetails.agentForwarding': '代理转发',
+  'hostDetails.jumpHosts': '跳板主机',
  'hostDetails.jumpHosts.hops': '{count} 跳',
  'hostDetails.jumpHosts.direct': '直连',
-  'hostDetails.jumpHosts.configure': '配置代理主机',
-  'hostDetails.proxy': '通过 HTTP/SOCKS5 代理',
+  'hostDetails.jumpHosts.configure': '配置跳板主机',
+  'hostDetails.proxy': '代理',
  'hostDetails.proxy.none': '无',
  'hostDetails.proxy.edit': '编辑代理',
  'hostDetails.proxy.configure': '配置代理',
@@ -514,12 +401,6 @@ const zhCN: Messages = {
  'hostDetails.telnet.password': 'Telnet 密码',
  'hostDetails.charset.placeholder': '字符集（例如 UTF-8）',
  'hostDetails.telnet.add': '添加 Telnet 协议',
-  'hostDetails.tags': '标签',
-  'hostDetails.group': '分组',
-  'hostDetails.selectGroup': '选择分组',
-  'hostDetails.addTag': '添加标签...',
-  'hostDetails.createTag': '创建标签',
-  'hostDetails.createGroup': '创建分组',

  // Host form (legacy modal)
  'hostForm.title.edit': '编辑主机',
@@ -553,7 +434,7 @@ const zhCN: Messages = {
  'logs.table.saved': '收藏',
  'logs.empty.title': '暂无连接日志',
  'logs.empty.desc': '当你连接主机或打开本地终端后，这里会显示连接历史。',
-  'logs.loadMore': '加载更多 ({count} 条)',
+  'logs.showing': '显示 {limit}/{total} 条日志。',
  'logs.ongoing': '进行中',
  'logs.localTerminal': '本地终端',
  'logs.action.save': '收藏',
@@ -564,7 +445,6 @@ const zhCN: Messages = {
  'logView.customizeAppearance': '自定义外观',
  'logView.appearance': '外观',
  'logView.readOnly': '只读',
-  'logView.export': '导出',

  // Terminal toolbar / search / context menu / auth
  'terminal.toolbar.openSftp': '打开 SFTP',
@@ -582,36 +462,6 @@ const zhCN: Messages = {
  'terminal.toolbar.focus': '聚焦',
  'terminal.toolbar.focusMode': '聚焦模式',
  'terminal.toolbar.closeSession': '关闭会话',
-  'terminal.toolbar.hostHighlight.title': '主机关键字高亮',
-  'terminal.toolbar.hostHighlight.noRules': '此主机未定义自定义高亮规则',
-  'terminal.toolbar.hostHighlight.addRule': '添加新规则',
-  'terminal.toolbar.hostHighlight.labelPlaceholder': '标签（例如：错误）',
-  'terminal.toolbar.hostHighlight.patternPlaceholder': '正则表达式（例如：\\bfailed\\b）',
-  'terminal.toolbar.hostHighlight.invalidPattern': '无效的正则表达式',
-  'terminal.toolbar.hostHighlight.clearAll': '清除全部',
-  'terminal.toolbar.hostHighlight.changeColor': '更改高亮颜色',
-  'terminal.toolbar.hostHighlight.selectColor': '选择新规则的颜色',
-  'terminal.serverStats.cpu': 'CPU 使用率',
-  'terminal.serverStats.cpuCores': 'CPU 核心使用率',
-  'terminal.serverStats.memory': '内存使用',
-  'terminal.serverStats.memoryDetails': '内存详情',
-  'terminal.serverStats.memUsed': '已用',
-  'terminal.serverStats.memBuffers': '缓冲区',
-  'terminal.serverStats.memCached': '缓存',
-  'terminal.serverStats.memFree': '空闲',
-  'terminal.serverStats.topProcesses': '内存占用前十进程',
-  'terminal.serverStats.disk': '磁盘使用（根分区）',
-  'terminal.serverStats.diskDetails': '已挂载磁盘',
-  'terminal.serverStats.network': '网络速度',
-  'terminal.serverStats.networkDetails': '网络接口',
-  'terminal.serverStats.noData': '暂无数据',
-  'terminal.dragDrop.localTitle': '拖放以插入路径',
-  'terminal.dragDrop.localMessage': '文件路径将被插入到终端',
-  'terminal.dragDrop.remoteTitle': '拖放以上传文件',
-  'terminal.dragDrop.remoteMessage': '文件将通过 SFTP 上传',
-  'terminal.dragDrop.notConnected': '无法拖放文件 - 终端未连接',
-  'terminal.dragDrop.errorTitle': '拖放错误',
-  'terminal.dragDrop.errorMessage': '处理拖放文件失败',
  'terminal.search.placeholder': '搜索…',
  'terminal.search.noResults': '无结果',
  'terminal.search.prevMatch': '上一个匹配 (Shift+Enter)',
@@ -643,11 +493,6 @@ const zhCN: Messages = {
  'terminal.connection.chainOf': 'Chain {current} / {total}',
  'terminal.connection.showLogs': '显示日志',
  'terminal.connection.hideLogs': '隐藏日志',
-  'terminal.connection.protocol.ssh': 'SSH',
-  'terminal.connection.protocol.telnet': 'Telnet',
-  'terminal.connection.protocol.mosh': 'Mosh',
-  'terminal.connection.protocol.serial': '串口',
-  'terminal.connection.protocol.local': '本地终端',
  'terminal.themeModal.title': 'Terminal 外观',
  'terminal.themeModal.tab.theme': '主题',
  'terminal.themeModal.tab.font': '字体',
@@ -841,13 +686,6 @@ const zhCN: Messages = {
  'pf.view.list': '列表',
  'pf.rule.summary.dynamic': 'SOCKS 监听于 {bindAddress}:{localPort}',
  'pf.rule.summary.default': '{bindAddress}:{localPort} -> {remoteHost}:{remotePort}',
-  'pf.tooltip.relayHost': '中转主机',
-  'pf.tooltip.hostLabel': '主机',
-  'pf.tooltip.hostAddress': '地址',
-  'pf.tooltip.noHost': '未配置中转主机',
-  'pf.tooltip.localDesc': '本地端口转发：通过 SSH 隧道访问远程服务',
-  'pf.tooltip.remoteDesc': '远程端口转发：将本地服务暴露给远程主机',
-  'pf.tooltip.dynamicDesc': '动态 SOCKS 代理：通过 SSH 隧道转发流量',
  'pf.deleteActive.title': '删除正在运行的端口转发？',
  'pf.deleteActive.desc': '端口转发规则 "{label}" 当前正在运行。删除前将先关闭转发连接。',
  'pf.deleteActive.confirm': '关闭并删除',
@@ -875,12 +713,6 @@ const zhCN: Messages = {
  'sftp.conflict.action.keepBoth': '保留两者',
  'sftp.conflict.action.replace': '替换',

-  // SFTP Upload Phases
-  'sftp.upload.phase.compressing': '正在压缩',
-  'sftp.upload.phase.uploading': '正在上传',
-  'sftp.upload.phase.extracting': '正在解压',
-  'sftp.upload.phase.compressed': '压缩传输',
-
  // SFTP File Opener
  'sftp.context.openWith': '打开方式...',
  'sftp.context.edit': '编辑',
@@ -925,7 +757,7 @@ const zhCN: Messages = {
  'settings.sftpFileAssociations.noAssociations': '未配置文件关联',
  'settings.sftpFileAssociations.remove': '移除',
  'settings.sftpFileAssociations.removeConfirm': '确定移除 .{ext} 的关联吗？',
-
+  
  // Settings > SFTP Behavior
  'settings.sftp.doubleClickBehavior': '双击行为',
  'settings.sftp.doubleClickBehavior.desc': '选择在 SFTP 视图中双击文件时的操作',
@@ -933,7 +765,7 @@ const zhCN: Messages = {
  'settings.sftp.doubleClickBehavior.transfer': '传输到另一侧',
  'settings.sftp.doubleClickBehavior.openDesc': '使用默认应用程序打开文件',
  'settings.sftp.doubleClickBehavior.transferDesc': '将文件传输到另一窗格的活动主机',
-
+  
  // Settings > SFTP Auto Sync
  'settings.sftp.autoSync': '自动同步到远程',
  'settings.sftp.autoSync.desc': '使用外部应用程序打开文件时，自动将文件更改同步回远程服务器',
@@ -942,43 +774,6 @@ const zhCN: Messages = {
  'sftp.autoSync.success': '文件已同步到远程：{fileName}',
  'sftp.autoSync.error': '同步文件失败：{error}',

-  // SFTP Folder Upload Progress
-  'sftp.upload.progress': '正在上传 {current}/{total} 个文件...',
-  'sftp.upload.uploading': '正在上传...',
-  'sftp.upload.compressing': '正在压缩...',
-  'sftp.upload.extracting': '正在解压...',
-  'sftp.upload.scanning': '正在扫描文件...',
-  'sftp.upload.completed': '已完成',
-  'sftp.upload.compressed': '压缩传输',
-  'sftp.upload.currentFile': '当前: {fileName}',
-  'sftp.upload.cancelled': '上传已取消',
-  'sftp.upload.cancel': '取消',
-
-  // SFTP Download
-  'sftp.download.completed': '已下载',
-  'sftp.download.cancelled': '下载已取消',
-
-  // SFTP Reconnecting
-  'sftp.reconnecting.title': '正在重连...',
-  'sftp.reconnecting.desc': '连接已断开，正在尝试重新连接',
-  'sftp.reconnected': '连接已恢复',
-  'sftp.error.reconnectFailed': '重连失败，请重试。',
-  'sftp.error.connectionLostManual': '连接已断开，请手动重新连接。',
-  'sftp.error.connectionLostReconnecting': '连接已断开，正在重连...',
-  'sftp.error.sessionLost': 'SFTP 会话已断开，请重新连接。',
-
-  // Settings > SFTP Show Hidden Files
-  'settings.sftp.showHiddenFiles': '显示隐藏文件',
-  'settings.sftp.showHiddenFiles.desc': '在浏览本地 Windows 文件系统时，显示具有 Windows 隐藏属性的文件。',
-  'settings.sftp.showHiddenFiles.enable': '显示隐藏文件',
-  'settings.sftp.showHiddenFiles.enableDesc': '浏览本地文件系统时显示 Windows 隐藏文件',
-
-  // Settings > SFTP Compressed Upload
-  'settings.sftp.compressedUpload': '文件夹压缩传输',
-  'settings.sftp.compressedUpload.desc': '上传前压缩文件夹，可大幅减少传输时间。',
-  'settings.sftp.compressedUpload.enable': '启用文件夹压缩',
-  'settings.sftp.compressedUpload.enableDesc': '自动使用 tar 压缩文件夹后再传输。需要服务器支持 tar 命令，不支持时自动回退到普通传输。',
-
  // Settings > Terminal
  'settings.terminal.section.theme': '终端主题',
  'settings.terminal.themeModal.title': '选择主题',
@@ -1054,18 +849,6 @@ const zhCN: Messages = {
  'settings.terminal.section.connection': '连接',
  'settings.terminal.connection.keepaliveInterval': '会话保持间隔',
  'settings.terminal.connection.keepaliveInterval.desc': '向服务器发送 SSH 级别保活数据包的频率（秒）。设为 0 表示禁用。',
-  'settings.terminal.section.serverStats': '服务器状态（Linux）',
-  'settings.terminal.serverStats.show': '显示服务器状态',
-  'settings.terminal.serverStats.show.desc': '在终端状态栏显示 CPU、内存和磁盘使用情况（仅限 Linux 服务器）。',
-  'settings.terminal.serverStats.refreshInterval': '刷新间隔',
-  'settings.terminal.serverStats.refreshInterval.desc': '服务器状态刷新的频率。',
-  'settings.terminal.serverStats.seconds': '秒',
-
-  // Settings > Terminal > Rendering
-  'settings.terminal.section.rendering': '渲染',
-  'settings.terminal.rendering.renderer': '渲染器',
-  'settings.terminal.rendering.renderer.desc': '选择终端渲染技术。自动模式会在低内存设备上使用 Canvas。更改将在新终端会话中生效。',
-  'settings.terminal.rendering.auto': '自动',

  // Settings > Shortcuts
  'settings.shortcuts.section.scheme': '快捷键方案',
@@ -1082,7 +865,6 @@ const zhCN: Messages = {
  'settings.shortcuts.category.terminal': '终端',
  'settings.shortcuts.category.navigation': '导航',
  'settings.shortcuts.category.app': '应用',
-  'settings.shortcuts.category.sftp': 'SFTP',

  // Host Details (sub-panels)
  'hostDetails.proxyPanel.title': 'Proxy',
@@ -1208,7 +990,6 @@ const zhCN: Messages = {
  'tabs.closeLogViewAria': '关闭日志视图',
  'tabs.logPrefix': '日志：',
  'tabs.logLocal': '本地',
-  'tabs.copyTab': '复制标签页',
  'keychain.edit.labelRequired': 'Label *',
  'keychain.edit.keyLabelPlaceholder': '密钥 Label',
  'keychain.edit.privateKeyRequired': '私钥 *',
@@ -1260,23 +1041,6 @@ const zhCN: Messages = {
  'snippets.packageDialog.placeholder': '例如：ops/maintenance',
  'snippets.packageDialog.hint': '使用 "/" 创建嵌套代码包。',

-  // Snippets Rename Dialog
-  'snippets.renameDialog.title': '重命名代码包',
-  'snippets.renameDialog.currentPath': '当前路径：{path}',
-  'snippets.renameDialog.placeholder': '输入新名称',
-  'snippets.renameDialog.error.empty': '代码包名称不能为空',
-  'snippets.renameDialog.error.duplicate': '已存在同名的代码包',
-  'snippets.renameDialog.error.invalidChars': '代码包名称只能包含字母、数字、连字符和下划线',
-
-  // Snippet Shortkey
-  'snippets.field.shortkey': '快捷键',
-  'snippets.shortkey.placeholder': '点击设置快捷键',
-  'snippets.shortkey.recording': '请按下快捷键组合...',
-  'snippets.shortkey.hint': '在终端中按下此快捷键可快速发送命令。',
-  'snippets.shortkey.clear': '清除快捷键',
-  'snippets.shortkey.error.systemConflict': '此快捷键与系统快捷键冲突',
-  'snippets.shortkey.error.snippetConflict': '此快捷键已被代码片段使用：{name}',
-
  // Serial Port
  'serial.button': '串口',
  'serial.modal.title': '连接串口',
@@ -1286,12 +1050,11 @@ const zhCN: Messages = {
  'serial.field.baudRate': '波特率',
  'serial.field.dataBits': '数据位',
  'serial.field.stopBits': '停止位',
-  'serial.field.stopBits15Warning': '1.5 停止位在 Windows 下可能不被所有设备支持',
  'serial.field.parity': '校验位',
  'serial.field.flowControl': '流控制',
  'serial.noPorts': '未检测到串口设备。请连接设备后刷新。',
  'serial.field.customPort': '自定义串口路径',
-  'serial.field.customPortPlaceholder': '例如 /dev/ttys001 或 COM1',
+  'serial.field.customPortPlaceholder': '例如 /dev/ttys001',
  'serial.type.hardware': '硬件',
  'serial.type.pseudo': '虚拟终端',
  'serial.type.custom': '自定义',
@@ -1308,39 +1071,6 @@ const zhCN: Messages = {
  'serial.field.lineMode': '行模式',
  'serial.field.lineModeDesc': '缓冲输入，按回车后发送（而不是逐字符发送）',
  'serial.connectionError': '连接串口失败',
-  'serial.field.baudRatePlaceholder': '选择或输入波特率...',
-  'serial.field.baudRateEmpty': '输入自定义波特率',
-  'serial.field.customBaudRate': '使用自定义波特率',
-  'serial.field.saveConfig': '保存配置',
-  'serial.field.saveConfigDesc': '将此串口配置保存到主机列表以便快速访问',
-  'serial.field.configLabel': '配置名称',
-  'serial.field.configLabelPlaceholder': '例如 Arduino Uno',
-  'serial.connectAndSave': '连接并保存',
-  'serial.edit.title': '串口设置',
-
-  // Keyboard Interactive Authentication (2FA/MFA)
-  'keyboard.interactive.title': '需要验证',
-  'keyboard.interactive.desc': '服务器需要额外的身份验证。',
-  'keyboard.interactive.descWithHost': '服务器 {hostname} 需要额外的身份验证。',
-  'keyboard.interactive.response': '响应',
-  'keyboard.interactive.enterCode': '输入验证码',
-  'keyboard.interactive.enterResponse': '输入响应',
-  'keyboard.interactive.submit': '提交',
-  'keyboard.interactive.verifying': '验证中...',
-  'keyboard.interactive.fill': '填入',
-  'keyboard.interactive.fillSaved': '填入已保存的密码',
-  'keyboard.interactive.useSaved': '使用已保存',
-  'keyboard.interactive.useSavedPassword': '使用已保存的密码',
-
-  // Passphrase Modal for encrypted SSH keys
-  'passphrase.title': 'SSH 密钥密码',
-  'passphrase.desc': '请输入 {keyName} 的密码',
-  'passphrase.descWithHost': '请输入 {keyName} 的密码以连接到 {hostname}',
-  'passphrase.label': '密码',
-  'passphrase.keyPath': '密钥',
-  'passphrase.unlock': '解锁',
-  'passphrase.unlocking': '解锁中...',
-  'passphrase.skip': '跳过',
 };

 export default zhCN;
--- a/application/state/sftp/errors.ts
+++ b/application/state/sftp/errors.ts
@@ -1,34 +0,0 @@
-export const isSessionError = (err: unknown): boolean => {
-  if (!(err instanceof Error)) return false;
-  const msg = err.message.toLowerCase();
-  return (
-    msg.includes("session not found") ||
-    msg.includes("sftp session") ||
-    msg.includes("not found") ||
-    msg.includes("closed") ||
-    msg.includes("connection reset")
-  );
-};
-
-/**
- * Check if an error message indicates a fatal error that should stop the entire upload.
- * This includes session errors AND target directory deletion errors.
- */
-export const isFatalUploadError = (errorMessage: string): boolean => {
-  const msg = errorMessage.toLowerCase();
-  return (
-    // Session-related errors
-    msg.includes("session not found") ||
-    msg.includes("sftp session") ||
-    msg.includes("connection") ||
-    msg.includes("disconnected") ||
-    // Target directory was deleted during upload
-    msg.includes("no such file") ||
-    msg.includes("enoent") ||
-    msg.includes("does not exist") ||
-    msg.includes("write stream error") ||
-    // Directory was removed
-    msg.includes("directory not found") ||
-    msg.includes("not a directory")
-  );
-};
--- a/application/state/sftp/mockLocalFiles.ts
+++ b/application/state/sftp/mockLocalFiles.ts
@@ -1,454 +0,0 @@
-import { SftpFileEntry } from "../../../domain/models";
-import { formatDate } from "./utils";
-
-// Mock local file data for development (when backend is not available)
-export function buildMockLocalFiles(path: string): SftpFileEntry[] {
-  // Normalize path for matching (handle both Windows and Unix paths)
-  const normPath = path.replace(/\\/g, "/").replace(/\/$/, "") || "/";
-
-  const mockData: Record<string, SftpFileEntry[]> = {
-    // Unix-style paths
-    "/": [
-      {
-        name: "Users",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-      {
-        name: "Applications",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 172800000,
-        lastModifiedFormatted: formatDate(Date.now() - 172800000),
-      },
-      {
-        name: "System",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 259200000,
-        lastModifiedFormatted: formatDate(Date.now() - 259200000),
-      },
-    ],
-    "/Users": [
-      {
-        name: "damao",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 3600000,
-        lastModifiedFormatted: formatDate(Date.now() - 3600000),
-      },
-      {
-        name: "Shared",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-    ],
-    "/Users/damao": [
-      {
-        name: "Desktop",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 1800000,
-        lastModifiedFormatted: formatDate(Date.now() - 1800000),
-      },
-      {
-        name: "Documents",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 7200000,
-        lastModifiedFormatted: formatDate(Date.now() - 7200000),
-      },
-      {
-        name: "Downloads",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 3600000,
-        lastModifiedFormatted: formatDate(Date.now() - 3600000),
-      },
-      {
-        name: "Pictures",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 172800000,
-        lastModifiedFormatted: formatDate(Date.now() - 172800000),
-      },
-      {
-        name: "Projects",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 900000,
-        lastModifiedFormatted: formatDate(Date.now() - 900000),
-      },
-    ],
-    // Windows-style paths (normalized to forward slashes for matching)
-    "C:": [
-      {
-        name: "Users",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-      {
-        name: "Program Files",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 172800000,
-        lastModifiedFormatted: formatDate(Date.now() - 172800000),
-      },
-      {
-        name: "Windows",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 259200000,
-        lastModifiedFormatted: formatDate(Date.now() - 259200000),
-      },
-    ],
-    "C:/Users": [
-      {
-        name: "damao",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 3600000,
-        lastModifiedFormatted: formatDate(Date.now() - 3600000),
-      },
-      {
-        name: "Public",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-      {
-        name: "Default",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 172800000,
-        lastModifiedFormatted: formatDate(Date.now() - 172800000),
-      },
-    ],
-    "C:/Users/damao": [
-      {
-        name: "Desktop",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 1800000,
-        lastModifiedFormatted: formatDate(Date.now() - 1800000),
-      },
-      {
-        name: "Documents",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 7200000,
-        lastModifiedFormatted: formatDate(Date.now() - 7200000),
-      },
-      {
-        name: "Downloads",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 3600000,
-        lastModifiedFormatted: formatDate(Date.now() - 3600000),
-      },
-      {
-        name: "Pictures",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 172800000,
-        lastModifiedFormatted: formatDate(Date.now() - 172800000),
-      },
-      {
-        name: "Projects",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 900000,
-        lastModifiedFormatted: formatDate(Date.now() - 900000),
-      },
-    ],
-    "C:/Users/damao/Desktop": [
-      {
-        name: "Netcatty",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 300000,
-        lastModifiedFormatted: formatDate(Date.now() - 300000),
-      },
-      {
-        name: "notes.txt",
-        type: "file",
-        size: 2048,
-        sizeFormatted: "2 KB",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-      {
-        name: "screenshot.png",
-        type: "file",
-        size: 1048576,
-        sizeFormatted: "1 MB",
-        lastModified: Date.now() - 43200000,
-        lastModifiedFormatted: formatDate(Date.now() - 43200000),
-      },
-    ],
-    "C:/Users/damao/Desktop/Netcatty": [
-      {
-        name: "src",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 600000,
-        lastModifiedFormatted: formatDate(Date.now() - 600000),
-      },
-      {
-        name: "package.json",
-        type: "file",
-        size: 1536,
-        sizeFormatted: "1.5 KB",
-        lastModified: Date.now() - 3600000,
-        lastModifiedFormatted: formatDate(Date.now() - 3600000),
-      },
-      {
-        name: "README.md",
-        type: "file",
-        size: 4096,
-        sizeFormatted: "4 KB",
-        lastModified: Date.now() - 7200000,
-        lastModifiedFormatted: formatDate(Date.now() - 7200000),
-      },
-      {
-        name: "tsconfig.json",
-        type: "file",
-        size: 512,
-        sizeFormatted: "512 Bytes",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-    ],
-    "C:/Users/damao/Documents": [
-      {
-        name: "Work",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-      {
-        name: "Personal",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 172800000,
-        lastModifiedFormatted: formatDate(Date.now() - 172800000),
-      },
-      {
-        name: "report.pdf",
-        type: "file",
-        size: 2097152,
-        sizeFormatted: "2 MB",
-        lastModified: Date.now() - 259200000,
-        lastModifiedFormatted: formatDate(Date.now() - 259200000),
-      },
-    ],
-    "C:/Users/damao/Downloads": [
-      {
-        name: "installer.exe",
-        type: "file",
-        size: 52428800,
-        sizeFormatted: "50 MB",
-        lastModified: Date.now() - 3600000,
-        lastModifiedFormatted: formatDate(Date.now() - 3600000),
-      },
-      {
-        name: "archive.zip",
-        type: "file",
-        size: 10485760,
-        sizeFormatted: "10 MB",
-        lastModified: Date.now() - 7200000,
-        lastModifiedFormatted: formatDate(Date.now() - 7200000),
-      },
-      {
-        name: "document.pdf",
-        type: "file",
-        size: 524288,
-        sizeFormatted: "512 KB",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-    ],
-    "C:/Users/damao/Projects": [
-      {
-        name: "webapp",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 1800000,
-        lastModifiedFormatted: formatDate(Date.now() - 1800000),
-      },
-      {
-        name: "scripts",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 43200000,
-        lastModifiedFormatted: formatDate(Date.now() - 43200000),
-      },
-    ],
-    "/Users/damao/Desktop": [
-      {
-        name: "Netcatty",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 300000,
-        lastModifiedFormatted: formatDate(Date.now() - 300000),
-      },
-      {
-        name: "notes.txt",
-        type: "file",
-        size: 2048,
-        sizeFormatted: "2 KB",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-      {
-        name: "screenshot.png",
-        type: "file",
-        size: 1048576,
-        sizeFormatted: "1 MB",
-        lastModified: Date.now() - 43200000,
-        lastModifiedFormatted: formatDate(Date.now() - 43200000),
-      },
-    ],
-    "/Users/damao/Desktop/Netcatty": [
-      {
-        name: "src",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 600000,
-        lastModifiedFormatted: formatDate(Date.now() - 600000),
-      },
-      {
-        name: "package.json",
-        type: "file",
-        size: 1536,
-        sizeFormatted: "1.5 KB",
-        lastModified: Date.now() - 3600000,
-        lastModifiedFormatted: formatDate(Date.now() - 3600000),
-      },
-      {
-        name: "README.md",
-        type: "file",
-        size: 4096,
-        sizeFormatted: "4 KB",
-        lastModified: Date.now() - 7200000,
-        lastModifiedFormatted: formatDate(Date.now() - 7200000),
-      },
-      {
-        name: "tsconfig.json",
-        type: "file",
-        size: 512,
-        sizeFormatted: "512 Bytes",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-    ],
-    "/Users/damao/Documents": [
-      {
-        name: "Work",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-      {
-        name: "Personal",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 172800000,
-        lastModifiedFormatted: formatDate(Date.now() - 172800000),
-      },
-      {
-        name: "report.pdf",
-        type: "file",
-        size: 2097152,
-        sizeFormatted: "2 MB",
-        lastModified: Date.now() - 259200000,
-        lastModifiedFormatted: formatDate(Date.now() - 259200000),
-      },
-    ],
-    "/Users/damao/Downloads": [
-      {
-        name: "installer.exe",
-        type: "file",
-        size: 52428800,
-        sizeFormatted: "50 MB",
-        lastModified: Date.now() - 3600000,
-        lastModifiedFormatted: formatDate(Date.now() - 3600000),
-      },
-      {
-        name: "archive.zip",
-        type: "file",
-        size: 10485760,
-        sizeFormatted: "10 MB",
-        lastModified: Date.now() - 7200000,
-        lastModifiedFormatted: formatDate(Date.now() - 7200000),
-      },
-      {
-        name: "document.pdf",
-        type: "file",
-        size: 524288,
-        sizeFormatted: "512 KB",
-        lastModified: Date.now() - 86400000,
-        lastModifiedFormatted: formatDate(Date.now() - 86400000),
-      },
-    ],
-    "/Users/damao/Projects": [
-      {
-        name: "webapp",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 1800000,
-        lastModifiedFormatted: formatDate(Date.now() - 1800000),
-      },
-      {
-        name: "scripts",
-        type: "directory",
-        size: 0,
-        sizeFormatted: "--",
-        lastModified: Date.now() - 43200000,
-        lastModifiedFormatted: formatDate(Date.now() - 43200000),
-      },
-    ],
-  };
-  return mockData[normPath] || [];
-}
--- a/application/state/sftp/types.ts
+++ b/application/state/sftp/types.ts
@@ -1,55 +0,0 @@
-import { SftpConnection, SftpFileEntry, SftpFilenameEncoding } from "../../../domain/models";
-
-export interface SftpPane {
-  id: string;
-  connection: SftpConnection | null;
-  files: SftpFileEntry[];
-  loading: boolean;
-  reconnecting: boolean;
-  error: string | null;
-  selectedFiles: Set<string>;
-  filter: string;
-  filenameEncoding: SftpFilenameEncoding;
-}
-
-// Multi-tab state for left and right sides
-export interface SftpSideTabs {
-  tabs: SftpPane[];
-  activeTabId: string | null;
-}
-
-// Constants for empty placeholder pane IDs
-export const EMPTY_LEFT_PANE_ID = "__empty_left__";
-export const EMPTY_RIGHT_PANE_ID = "__empty_right__";
-
-export const createEmptyPane = (id?: string): SftpPane => ({
-  id: id || crypto.randomUUID(),
-  connection: null,
-  files: [],
-  loading: false,
-  reconnecting: false,
-  error: null,
-  selectedFiles: new Set(),
-  filter: "",
-  filenameEncoding: "auto",
-});
-
-// File watch event types
-export interface FileWatchSyncedEvent {
-  watchId: string;
-  localPath: string;
-  remotePath: string;
-  bytesWritten: number;
-}
-
-export interface FileWatchErrorEvent {
-  watchId: string;
-  localPath: string;
-  remotePath: string;
-  error: string;
-}
-
-export interface SftpStateOptions {
-  onFileWatchSynced?: (event: FileWatchSyncedEvent) => void;
-  onFileWatchError?: (event: FileWatchErrorEvent) => void;
-}
--- a/application/state/sftp/useSftpConnections.ts
+++ b/application/state/sftp/useSftpConnections.ts
@@ -1,427 +0,0 @@
-import { useCallback, useEffect, useRef } from "react";
-import type { MutableRefObject } from "react";
-import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-import type { Host, Identity, SftpConnection, SftpFileEntry, SftpFilenameEncoding, SSHKey } from "../../../domain/models";
-import type { SftpPane } from "./types";
-import { useSftpDirectoryListing } from "./useSftpDirectoryListing";
-import { useSftpHostCredentials } from "./useSftpHostCredentials";
-
-interface UseSftpConnectionsParams {
-  hosts: Host[];
-  keys: SSHKey[];
-  identities: Identity[];
-  leftTabsRef: MutableRefObject<{ tabs: SftpPane[]; activeTabId: string | null }>;
-  rightTabsRef: MutableRefObject<{ tabs: SftpPane[]; activeTabId: string | null }>;
-  leftTabs: { tabs: SftpPane[] };
-  rightTabs: { tabs: SftpPane[] };
-  leftPane: SftpPane;
-  rightPane: SftpPane;
-  setLeftTabs: React.Dispatch<React.SetStateAction<{ tabs: SftpPane[]; activeTabId: string | null }>>;
-  setRightTabs: React.Dispatch<React.SetStateAction<{ tabs: SftpPane[]; activeTabId: string | null }>>;
-  getActivePane: (side: "left" | "right") => SftpPane | null;
-  updateTab: (side: "left" | "right", tabId: string, updater: (prev: SftpPane) => SftpPane) => void;
-  navSeqRef: MutableRefObject<{ left: number; right: number }>;
-  dirCacheRef: MutableRefObject<Map<string, { files: SftpFileEntry[]; timestamp: number }>>;
-  sftpSessionsRef: MutableRefObject<Map<string, string>>;
-  lastConnectedHostRef: MutableRefObject<{ left: Host | "local" | null; right: Host | "local" | null }>;
-  reconnectingRef: MutableRefObject<{ left: boolean; right: boolean }>;
-  makeCacheKey: (connectionId: string, path: string, encoding?: SftpFilenameEncoding) => string;
-  clearCacheForConnection: (connectionId: string) => void;
-  createEmptyPane: (id?: string) => SftpPane;
-}
-
-interface UseSftpConnectionsResult {
-  connect: (side: "left" | "right", host: Host | "local") => Promise<void>;
-  disconnect: (side: "left" | "right") => Promise<void>;
-  listLocalFiles: (path: string) => Promise<SftpFileEntry[]>;
-  listRemoteFiles: (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => Promise<SftpFileEntry[]>;
-}
-
-export const useSftpConnections = ({
-  hosts,
-  keys,
-  identities,
-  leftTabsRef,
-  rightTabsRef,
-  leftTabs,
-  rightTabs: _rightTabs,
-  leftPane,
-  rightPane,
-  setLeftTabs,
-  setRightTabs,
-  getActivePane,
-  updateTab,
-  navSeqRef,
-  dirCacheRef,
-  sftpSessionsRef,
-  lastConnectedHostRef,
-  reconnectingRef,
-  makeCacheKey,
-  clearCacheForConnection,
-  createEmptyPane,
-}: UseSftpConnectionsParams): UseSftpConnectionsResult => {
-  const getHostCredentials = useSftpHostCredentials({ hosts, keys, identities });
-  const { listLocalFiles, listRemoteFiles } = useSftpDirectoryListing();
-
-  const connect = useCallback(
-    async (side: "left" | "right", host: Host | "local") => {
-      const setTabs = side === "left" ? setLeftTabs : setRightTabs;
-
-      let activeTabId: string | null = null;
-      const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
-
-      if (!sideTabs.activeTabId) {
-        const newPane = createEmptyPane();
-        activeTabId = newPane.id;
-        setTabs((prev) => ({
-          tabs: [...prev.tabs, newPane],
-          activeTabId: newPane.id,
-        }));
-      } else {
-        activeTabId = sideTabs.activeTabId;
-      }
-
-      if (!activeTabId) return;
-
-      const connectionId = `${side}-${Date.now()}`;
-
-      navSeqRef.current[side] += 1;
-      const connectRequestId = navSeqRef.current[side];
-
-      lastConnectedHostRef.current[side] = host;
-
-      const currentPane = getActivePane(side);
-      // Reset encoding to host's configured encoding or "auto" when connecting to a new host
-      // This ensures proper auto-detection works and respects host-level encoding settings
-      const filenameEncoding: SftpFilenameEncoding =
-        host === "local" ? "auto" : (host.sftpEncoding ?? "auto");
-
-      if (currentPane?.connection) {
-        clearCacheForConnection(currentPane.connection.id);
-      }
-      if (currentPane?.connection && !currentPane.connection.isLocal) {
-        const oldSftpId = sftpSessionsRef.current.get(currentPane.connection.id);
-        if (oldSftpId) {
-          try {
-            await netcattyBridge.get()?.closeSftp(oldSftpId);
-          } catch {
-            // Ignore errors when closing stale SFTP sessions
-          }
-          sftpSessionsRef.current.delete(currentPane.connection.id);
-        }
-      }
-
-      if (host === "local") {
-        let homeDir = await netcattyBridge.get()?.getHomeDir?.();
-        if (!homeDir) {
-          const isWindows = navigator.platform.toLowerCase().includes("win");
-          homeDir = isWindows ? "C:\\Users\\damao" : "/Users/damao";
-        }
-
-        const connection: SftpConnection = {
-          id: connectionId,
-          hostId: "local",
-          hostLabel: "Local",
-          isLocal: true,
-          status: "connected",
-          currentPath: homeDir,
-          homeDir,
-        };
-
-        updateTab(side, activeTabId, (prev) => ({
-          ...prev,
-          connection,
-          loading: true,
-          reconnecting: false,
-          error: null,
-          filenameEncoding, // Reset encoding for new connection
-        }));
-
-        try {
-          const files = await listLocalFiles(homeDir);
-          if (navSeqRef.current[side] !== connectRequestId) return;
-          dirCacheRef.current.set(makeCacheKey(connectionId, homeDir, filenameEncoding), {
-            files,
-            timestamp: Date.now(),
-          });
-          reconnectingRef.current[side] = false;
-          updateTab(side, activeTabId, (prev) => ({
-            ...prev,
-            files,
-            loading: false,
-            reconnecting: false,
-          }));
-        } catch (err) {
-          if (navSeqRef.current[side] !== connectRequestId) return;
-          reconnectingRef.current[side] = false;
-          updateTab(side, activeTabId, (prev) => ({
-            ...prev,
-            error: err instanceof Error ? err.message : "Failed to list directory",
-            loading: false,
-            reconnecting: false,
-          }));
-        }
-      } else {
-        const connection: SftpConnection = {
-          id: connectionId,
-          hostId: host.id,
-          hostLabel: host.label,
-          isLocal: false,
-          status: "connecting",
-          currentPath: "/",
-        };
-
-        updateTab(side, activeTabId, (prev) => ({
-          ...prev,
-          connection,
-          loading: true,
-          reconnecting: prev.reconnecting,
-          error: null,
-          files: prev.reconnecting ? prev.files : [],
-          filenameEncoding, // Reset encoding for new connection
-        }));
-
-        try {
-          const credentials = getHostCredentials(host);
-          const bridge = netcattyBridge.get();
-          const openSftp = bridge?.openSftp;
-          if (!openSftp) throw new Error("SFTP bridge unavailable");
-
-          const isAuthError = (err: unknown): boolean => {
-            if (!(err instanceof Error)) return false;
-            const msg = err.message.toLowerCase();
-            return (
-              msg.includes("authentication") ||
-              msg.includes("auth") ||
-              msg.includes("password") ||
-              msg.includes("permission denied")
-            );
-          };
-
-          const hasKey = !!credentials.privateKey;
-          const hasPassword = !!credentials.password;
-
-          let sftpId: string | undefined;
-          if (hasKey) {
-            try {
-              const keyFirstCredentials = {
-                sessionId: `sftp-${connectionId}`,
-                ...credentials,
-              };
-              if (!credentials.sudo) {
-                keyFirstCredentials.password = undefined;
-              }
-              sftpId = await openSftp(keyFirstCredentials);
-            } catch (err) {
-              if (hasPassword && isAuthError(err)) {
-                sftpId = await openSftp({
-                  sessionId: `sftp-${connectionId}`,
-                  ...credentials,
-                  privateKey: undefined,
-                  certificate: undefined,
-                  publicKey: undefined,
-                  keyId: undefined,
-                  keySource: undefined,
-                });
-              } else {
-                throw err;
-              }
-            }
-          } else {
-            sftpId = await openSftp({
-              sessionId: `sftp-${connectionId}`,
-              ...credentials,
-            });
-          }
-
-          if (!sftpId) throw new Error("Failed to open SFTP session");
-
-          sftpSessionsRef.current.set(connectionId, sftpId);
-
-          let startPath = "/";
-          const statSftp = netcattyBridge.get()?.statSftp;
-          if (statSftp) {
-            const candidates: string[] = [];
-            if (credentials.username === "root") {
-              candidates.push("/root");
-            } else if (credentials.username) {
-              candidates.push(`/home/${credentials.username}`);
-              candidates.push("/root");
-            } else {
-              candidates.push("/root");
-            }
-            for (const candidate of candidates) {
-              try {
-                const stat = await statSftp(sftpId, candidate, filenameEncoding);
-                if (stat?.type === "directory") {
-                  startPath = candidate;
-                  break;
-                }
-              } catch {
-                // Ignore missing/permission errors
-              }
-            }
-          } else {
-            if (credentials.username === "root") {
-              try {
-                const rootFiles = await netcattyBridge.get()?.listSftp(sftpId, "/root", filenameEncoding);
-                if (rootFiles) startPath = "/root";
-              } catch {
-                // Fallback path not available
-              }
-            } else if (credentials.username) {
-              try {
-                const homeFiles = await netcattyBridge.get()?.listSftp(
-                  sftpId,
-                  `/home/${credentials.username}`,
-                  filenameEncoding,
-                );
-                if (homeFiles) startPath = `/home/${credentials.username}`;
-              } catch {
-                // Fall through to /root check
-              }
-              if (startPath === "/") {
-                try {
-                  const rootFiles = await netcattyBridge.get()?.listSftp(sftpId, "/root", filenameEncoding);
-                  if (rootFiles) startPath = "/root";
-                } catch {
-                  // Fallback path not available
-                }
-              }
-            } else {
-              try {
-                const rootFiles = await netcattyBridge.get()?.listSftp(sftpId, "/root", filenameEncoding);
-                if (rootFiles) startPath = "/root";
-              } catch {
-                // Fallback path not available
-              }
-            }
-          }
-
-          const files = await listRemoteFiles(sftpId, startPath, filenameEncoding);
-          if (navSeqRef.current[side] !== connectRequestId) return;
-          dirCacheRef.current.set(makeCacheKey(connectionId, startPath, filenameEncoding), {
-            files,
-            timestamp: Date.now(),
-          });
-
-          reconnectingRef.current[side] = false;
-
-          updateTab(side, activeTabId, (prev) => ({
-            ...prev,
-            connection: prev.connection
-              ? {
-                  ...prev.connection,
-                  status: "connected",
-                  currentPath: startPath,
-                  homeDir: startPath,
-                }
-              : null,
-            files,
-            loading: false,
-            reconnecting: false,
-          }));
-        } catch (err) {
-          if (navSeqRef.current[side] !== connectRequestId) return;
-          reconnectingRef.current[side] = false;
-          updateTab(side, activeTabId, (prev) => ({
-            ...prev,
-            connection: prev.connection
-              ? {
-                  ...prev.connection,
-                  status: "error",
-                  error: err instanceof Error ? err.message : "Connection failed",
-                }
-              : null,
-            error: err instanceof Error ? err.message : "Connection failed",
-            loading: false,
-            reconnecting: false,
-          }));
-        }
-      }
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
-      getHostCredentials,
-      getActivePane,
-      updateTab,
-      clearCacheForConnection,
-      makeCacheKey,
-      listLocalFiles,
-      listRemoteFiles,
-    ],
-  );
-
-  const initialConnectDoneRef = useRef(false);
-
-  useEffect(() => {
-    if (!initialConnectDoneRef.current && leftTabs.tabs.length === 0) {
-      initialConnectDoneRef.current = true;
-      setTimeout(() => {
-        connect("left", "local");
-      }, 0);
-    }
-  }, [connect, leftTabs.tabs.length]);
-
-  useEffect(() => {
-    const attemptReconnect = async (side: "left" | "right") => {
-      const lastHost = lastConnectedHostRef.current[side];
-      if (lastHost && reconnectingRef.current[side]) {
-        await new Promise((resolve) => setTimeout(resolve, 1000));
-        if (reconnectingRef.current[side]) {
-          connect(side, lastHost);
-        }
-      }
-    };
-
-    if (leftPane.reconnecting && reconnectingRef.current.left) {
-      attemptReconnect("left");
-    }
-    if (rightPane.reconnecting && reconnectingRef.current.right) {
-      attemptReconnect("right");
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [leftPane.reconnecting, rightPane.reconnecting, connect]);
-
-  const disconnect = useCallback(
-    async (side: "left" | "right") => {
-      const pane = getActivePane(side);
-      const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
-      const activeTabId = sideTabs.activeTabId;
-
-      if (!pane || !activeTabId) return;
-
-      navSeqRef.current[side] += 1;
-
-      if (pane.connection) {
-        clearCacheForConnection(pane.connection.id);
-      }
-
-      reconnectingRef.current[side] = false;
-      lastConnectedHostRef.current[side] = null;
-
-      if (pane.connection && !pane.connection.isLocal) {
-        const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-        if (sftpId) {
-          try {
-            await netcattyBridge.get()?.closeSftp(sftpId);
-          } catch {
-            // Ignore errors when closing SFTP session during disconnect
-          }
-          sftpSessionsRef.current.delete(pane.connection.id);
-        }
-      }
-
-      updateTab(side, activeTabId, () => createEmptyPane(activeTabId));
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [getActivePane, clearCacheForConnection, updateTab],
-  );
-
-  return {
-    connect,
-    disconnect,
-    listLocalFiles,
-    listRemoteFiles,
-  };
-};
--- a/application/state/sftp/useSftpDirectoryListing.ts
+++ b/application/state/sftp/useSftpDirectoryListing.ts
@@ -1,63 +0,0 @@
-import { useCallback } from "react";
-import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-import type { SftpFileEntry, SftpFilenameEncoding } from "../../../domain/models";
-import { buildMockLocalFiles } from "./mockLocalFiles";
-import { formatFileSize, formatDate } from "./utils";
-
-export const useSftpDirectoryListing = () => {
-  const getMockLocalFiles = useCallback((path: string): SftpFileEntry[] => {
-    return buildMockLocalFiles(path);
-  }, []);
-
-  const listLocalFiles = useCallback(
-    async (path: string): Promise<SftpFileEntry[]> => {
-      const rawFiles = await netcattyBridge.get()?.listLocalDir?.(path);
-      if (!rawFiles) {
-        return getMockLocalFiles(path);
-      }
-
-      return rawFiles.map((f) => {
-        const size = parseInt(f.size) || 0;
-        const lastModified = new Date(f.lastModified).getTime();
-        return {
-          name: f.name,
-          type: f.type as "file" | "directory" | "symlink",
-          size,
-          sizeFormatted: formatFileSize(size),
-          lastModified,
-          lastModifiedFormatted: formatDate(lastModified),
-          linkTarget: f.linkTarget as "file" | "directory" | null | undefined,
-          hidden: f.hidden,
-        };
-      });
-    },
-    [getMockLocalFiles],
-  );
-
-  const listRemoteFiles = useCallback(
-    async (sftpId: string, path: string, encoding?: SftpFilenameEncoding): Promise<SftpFileEntry[]> => {
-      const rawFiles = await netcattyBridge.get()?.listSftp(sftpId, path, encoding);
-      if (!rawFiles) return [];
-
-      return rawFiles.map((f) => {
-        const size = parseInt(f.size) || 0;
-        const lastModified = new Date(f.lastModified).getTime();
-        return {
-          name: f.name,
-          type: f.type as "file" | "directory" | "symlink",
-          size,
-          sizeFormatted: formatFileSize(size),
-          lastModified,
-          lastModifiedFormatted: formatDate(lastModified),
-          linkTarget: f.linkTarget as "file" | "directory" | null | undefined,
-        };
-      });
-    },
-    [],
-  );
-
-  return {
-    listLocalFiles,
-    listRemoteFiles,
-  };
-};
--- a/application/state/sftp/useSftpExternalOperations.ts
+++ b/application/state/sftp/useSftpExternalOperations.ts
@@ -1,449 +0,0 @@
-import React, { useCallback, useRef, useMemo } from "react";
-import { TransferTask, TransferStatus } from "../../../domain/models";
-import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-import { logger } from "../../../lib/logger";
-import { SftpPane } from "./types";
-import { joinPath } from "./utils";
-import {
-  UploadController,
-  uploadFromDataTransfer,
-  UploadBridge,
-  UploadCallbacks,
-  UploadResult,
-  UploadTaskInfo,
-} from "../../../lib/uploadService";
-
-// Re-export UploadResult for external usage
-export type { UploadResult };
-
-interface UseSftpExternalOperationsParams {
-  getActivePane: (side: "left" | "right") => SftpPane | null;
-  refresh: (side: "left" | "right") => Promise<void>;
-  sftpSessionsRef: React.MutableRefObject<Map<string, string>>;
-  addExternalUpload?: (task: TransferTask) => void;
-  updateExternalUpload?: (taskId: string, updates: Partial<TransferTask>) => void;
-  dismissExternalUpload?: (taskId: string) => void;
-}
-
-interface SftpExternalOperationsResult {
-  readTextFile: (side: "left" | "right", filePath: string) => Promise<string>;
-  readBinaryFile: (side: "left" | "right", filePath: string) => Promise<ArrayBuffer>;
-  writeTextFile: (side: "left" | "right", filePath: string, content: string) => Promise<void>;
-  downloadToTempAndOpen: (
-    side: "left" | "right",
-    remotePath: string,
-    fileName: string,
-    appPath: string,
-    options?: { enableWatch?: boolean }
-  ) => Promise<{ localTempPath: string; watchId?: string }>;
-  uploadExternalFiles: (
-    side: "left" | "right",
-    dataTransfer: DataTransfer
-  ) => Promise<UploadResult[]>;
-  cancelExternalUpload: () => Promise<void>;
-  selectApplication: () => Promise<{ path: string; name: string } | null>;
-}
-
-export const useSftpExternalOperations = (
-  params: UseSftpExternalOperationsParams
-): SftpExternalOperationsResult => {
-  const { getActivePane, refresh, sftpSessionsRef, addExternalUpload, updateExternalUpload, dismissExternalUpload } = params;
-
-  // Upload controller for cancellation support
-  const uploadControllerRef = useRef<UploadController | null>(null);
-
-  const readTextFile = useCallback(
-    async (side: "left" | "right", filePath: string): Promise<string> => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) {
-        throw new Error("No connection available");
-      }
-
-      if (pane.connection.isLocal) {
-        const bridge = netcattyBridge.get();
-        if (bridge?.readLocalFile) {
-          const buffer = await bridge.readLocalFile(filePath);
-          return new TextDecoder().decode(buffer);
-        }
-        throw new Error("Local file reading not supported");
-      }
-
-      const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-      if (!sftpId) {
-        throw new Error("SFTP session not found");
-      }
-
-      const bridge = netcattyBridge.get();
-      if (!bridge) {
-        throw new Error("Bridge not available");
-      }
-
-      return await bridge.readSftp(sftpId, filePath, pane.filenameEncoding);
-    },
-    [getActivePane, sftpSessionsRef],
-  );
-
-  const readBinaryFile = useCallback(
-    async (side: "left" | "right", filePath: string): Promise<ArrayBuffer> => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) {
-        throw new Error("No connection available");
-      }
-
-      if (pane.connection.isLocal) {
-        const bridge = netcattyBridge.get();
-        if (bridge?.readLocalFile) {
-          return await bridge.readLocalFile(filePath);
-        }
-        throw new Error("Local file reading not supported");
-      }
-
-      const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-      if (!sftpId) {
-        throw new Error("SFTP session not found");
-      }
-
-      const bridge = netcattyBridge.get();
-      if (!bridge?.readSftpBinary) {
-        throw new Error("Binary file reading not supported");
-      }
-
-      return await bridge.readSftpBinary(sftpId, filePath, pane.filenameEncoding);
-    },
-    [getActivePane, sftpSessionsRef],
-  );
-
-  const writeTextFile = useCallback(
-    async (side: "left" | "right", filePath: string, content: string): Promise<void> => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) {
-        throw new Error("No connection available");
-      }
-
-      if (pane.connection.isLocal) {
-        const bridge = netcattyBridge.get();
-        if (bridge?.writeLocalFile) {
-          const data = new TextEncoder().encode(content);
-          await bridge.writeLocalFile(filePath, data.buffer);
-          return;
-        }
-        throw new Error("Local file writing not supported");
-      }
-
-      const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-      if (!sftpId) {
-        throw new Error("SFTP session not found");
-      }
-
-      const bridge = netcattyBridge.get();
-      if (!bridge) {
-        throw new Error("Bridge not available");
-      }
-
-      await bridge.writeSftp(sftpId, filePath, content, pane.filenameEncoding);
-    },
-    [getActivePane, sftpSessionsRef],
-  );
-
-  const downloadToTempAndOpen = useCallback(
-    async (
-      side: "left" | "right",
-      remotePath: string,
-      fileName: string,
-      appPath: string,
-      options?: { enableWatch?: boolean }
-    ): Promise<{ localTempPath: string; watchId?: string }> => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) {
-        throw new Error("No connection available");
-      }
-
-      const bridge = netcattyBridge.get();
-      if (!bridge?.downloadSftpToTemp || !bridge?.openWithApplication) {
-        throw new Error("System app opening not supported");
-      }
-
-      if (pane.connection.isLocal) {
-        await bridge.openWithApplication(remotePath, appPath);
-        return { localTempPath: remotePath };
-      }
-
-      const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-      if (!sftpId) {
-        throw new Error("SFTP session not found");
-      }
-
-      console.log("[SFTP] Downloading file to temp", { sftpId, remotePath, fileName });
-      const localTempPath = await bridge.downloadSftpToTemp(
-        sftpId,
-        remotePath,
-        fileName,
-        pane.filenameEncoding,
-      );
-      console.log("[SFTP] File downloaded to temp", { localTempPath });
-
-      if (bridge.registerTempFile) {
-        try {
-          await bridge.registerTempFile(sftpId, localTempPath);
-        } catch (err) {
-          console.warn("[SFTP] Failed to register temp file for cleanup:", err);
-        }
-      }
-
-      console.log("[SFTP] Opening with application", { localTempPath, appPath });
-      await bridge.openWithApplication(localTempPath, appPath);
-      console.log("[SFTP] Application launched");
-
-      let watchId: string | undefined;
-      console.log("[SFTP] Auto-sync enabled check", { enableWatch: options?.enableWatch, hasStartFileWatch: !!bridge.startFileWatch });
-      if (options?.enableWatch && bridge.startFileWatch) {
-        try {
-          console.log("[SFTP] Starting file watch", { localTempPath, remotePath, sftpId });
-          const result = await bridge.startFileWatch(
-            localTempPath,
-            remotePath,
-            sftpId,
-            pane.filenameEncoding,
-          );
-          watchId = result.watchId;
-          console.log("[SFTP] File watch started successfully", { watchId, localTempPath, remotePath });
-        } catch (err) {
-          console.warn("[SFTP] Failed to start file watch:", err);
-        }
-      } else {
-        console.log("[SFTP] File watching not enabled or not available");
-      }
-
-      return { localTempPath, watchId };
-    },
-    [getActivePane, sftpSessionsRef],
-  );
-
-  // Create upload callbacks that translate to TransferTask updates
-  const createUploadCallbacks = useCallback((
-    connectionId: string,
-    targetPath: string
-  ): UploadCallbacks => {
-    return {
-      onScanningStart: (taskId: string) => {
-        if (addExternalUpload) {
-          const scanningTask: TransferTask = {
-            id: taskId,
-            fileName: "Scanning files...",
-            sourcePath: "local",
-            targetPath,
-            sourceConnectionId: "external",
-            targetConnectionId: connectionId,
-            direction: "upload",
-            status: "pending" as TransferStatus,
-            totalBytes: 0,
-            transferredBytes: 0,
-            speed: 0,
-            startTime: Date.now(),
-            isDirectory: true,
-          };
-          addExternalUpload(scanningTask);
-        }
-      },
-      onScanningEnd: (taskId: string) => {
-        if (dismissExternalUpload) {
-          dismissExternalUpload(taskId);
-        }
-      },
-      onTaskCreated: (task: UploadTaskInfo) => {
-        if (addExternalUpload) {
-          const transferTask: TransferTask = {
-            id: task.id,
-            fileName: task.displayName,
-            sourcePath: "local",
-            targetPath: joinPath(targetPath, task.fileName),
-            sourceConnectionId: "external",
-            targetConnectionId: connectionId,
-            direction: "upload",
-            status: "transferring" as TransferStatus,
-            totalBytes: task.totalBytes,
-            transferredBytes: 0,
-            speed: 0,
-            startTime: Date.now(),
-            isDirectory: task.isDirectory,
-          };
-          addExternalUpload(transferTask);
-        }
-      },
-      onTaskProgress: (taskId: string, progress) => {
-        if (updateExternalUpload) {
-          updateExternalUpload(taskId, {
-            transferredBytes: progress.transferred,
-            speed: progress.speed,
-          });
-        }
-      },
-      onTaskCompleted: (taskId: string, totalBytes: number) => {
-        if (updateExternalUpload) {
-          updateExternalUpload(taskId, {
-            status: "completed" as TransferStatus,
-            endTime: Date.now(),
-            transferredBytes: totalBytes,
-            speed: 0,
-          });
-        }
-      },
-      onTaskFailed: (taskId: string, error: string) => {
-        if (updateExternalUpload) {
-          updateExternalUpload(taskId, {
-            status: "failed" as TransferStatus,
-            endTime: Date.now(),
-            error,
-            speed: 0,
-          });
-        }
-      },
-      onTaskCancelled: (taskId: string) => {
-        if (updateExternalUpload) {
-          updateExternalUpload(taskId, {
-            status: "cancelled" as TransferStatus,
-            endTime: Date.now(),
-            speed: 0,
-          });
-        }
-      },
-    };
-  }, [addExternalUpload, updateExternalUpload, dismissExternalUpload]);
-
-  // Create upload bridge that wraps netcattyBridge
-  const createUploadBridge = useMemo((): UploadBridge => {
-    const bridge = netcattyBridge.get();
-    return {
-      writeLocalFile: bridge?.writeLocalFile,
-      mkdirLocal: bridge?.mkdirLocal,
-      mkdirSftp: async (sftpId: string, path: string) => {
-        const b = netcattyBridge.get();
-        if (b?.mkdirSftp) {
-          await b.mkdirSftp(sftpId, path);
-        }
-      },
-      writeSftpBinary: bridge?.writeSftpBinary,
-      // Wrap writeSftpBinaryWithProgress to adapt UploadBridge interface to NetcattyBridge interface
-      // UploadBridge: (sftpId, path, data, taskId, onProgress, onComplete, onError)
-      // NetcattyBridge: (sftpId, path, content, transferId, encoding, onProgress, onComplete, onError)
-      writeSftpBinaryWithProgress: bridge?.writeSftpBinaryWithProgress
-        ? async (sftpId, path, data, taskId, onProgress, onComplete, onError) => {
-            const b = netcattyBridge.get();
-            if (!b?.writeSftpBinaryWithProgress) return undefined;
-            // Pass undefined for encoding to use session default, and forward callbacks
-            return b.writeSftpBinaryWithProgress(
-              sftpId,
-              path,
-              data,
-              taskId,
-              undefined, // encoding - use session default
-              onProgress,
-              onComplete,
-              onError
-            );
-          }
-        : undefined,
-      cancelSftpUpload: bridge?.cancelSftpUpload,
-      // Stream transfer for large files (avoids loading into memory)
-      startStreamTransfer: bridge?.startStreamTransfer
-        ? async (options, onProgress, onComplete, onError) => {
-            const b = netcattyBridge.get();
-            if (!b?.startStreamTransfer) {
-              return { transferId: options.transferId, error: 'Stream transfer not available' };
-            }
-            try {
-              const result = await b.startStreamTransfer(options, onProgress, onComplete, onError);
-              return result;
-            } catch (error) {
-              return {
-                transferId: options.transferId,
-                error: error instanceof Error ? error.message : String(error),
-              };
-            }
-          }
-        : undefined,
-      cancelTransfer: bridge?.cancelTransfer,
-    };
-  }, []);
-
-  const uploadExternalFiles = useCallback(
-    async (side: "left" | "right", dataTransfer: DataTransfer): Promise<UploadResult[]> => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) {
-        throw new Error("No active connection");
-      }
-
-      const bridge = netcattyBridge.get();
-      if (!bridge) {
-        throw new Error("Bridge not available");
-      }
-
-      const sftpId = pane.connection.isLocal
-        ? null
-        : sftpSessionsRef.current.get(pane.connection.id) || null;
-
-      if (!pane.connection.isLocal && !sftpId) {
-        throw new Error("SFTP session not found");
-      }
-
-      // Create a new upload controller for this upload
-      const controller = new UploadController();
-      uploadControllerRef.current = controller;
-
-      const callbacks = createUploadCallbacks(pane.connection.id, pane.connection.currentPath);
-
-      try {
-        const results = await uploadFromDataTransfer(
-          dataTransfer,
-          {
-            targetPath: pane.connection.currentPath,
-            sftpId,
-            isLocal: pane.connection.isLocal,
-            bridge: createUploadBridge,
-            joinPath,
-            callbacks,
-          },
-          controller
-        );
-
-        await refresh(side);
-        return results;
-      } catch (error) {
-        logger.error("[SFTP] Upload failed:", error);
-        throw error;
-      } finally {
-        uploadControllerRef.current = null;
-      }
-    },
-    [getActivePane, refresh, sftpSessionsRef, createUploadCallbacks, createUploadBridge],
-  );
-
-  const cancelExternalUpload = useCallback(async () => {
-    const controller = uploadControllerRef.current;
-    if (controller) {
-      logger.info("[SFTP] Cancelling external upload");
-      await controller.cancel();
-    }
-  }, []);
-
-  const selectApplication = useCallback(
-    async (): Promise<{ path: string; name: string } | null> => {
-      const bridge = netcattyBridge.get();
-      if (!bridge?.selectApplication) {
-        return null;
-      }
-      return await bridge.selectApplication();
-    },
-    [],
-  );
-
-  return {
-    readTextFile,
-    readBinaryFile,
-    writeTextFile,
-    downloadToTempAndOpen,
-    uploadExternalFiles,
-    cancelExternalUpload,
-    selectApplication,
-  };
-};
--- a/application/state/sftp/useSftpFileWatch.ts
+++ b/application/state/sftp/useSftpFileWatch.ts
@@ -1,27 +0,0 @@
-import { useEffect } from "react";
-import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-import type { FileWatchErrorEvent, FileWatchSyncedEvent, SftpStateOptions } from "./types";
-
-export const useSftpFileWatch = (options?: SftpStateOptions) => {
-  useEffect(() => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.onFileWatchSynced || !bridge?.onFileWatchError) return;
-
-    const unsubscribeSynced = bridge.onFileWatchSynced((payload: FileWatchSyncedEvent) => {
-      options?.onFileWatchSynced?.(payload);
-    });
-
-    const unsubscribeError = bridge.onFileWatchError((payload: FileWatchErrorEvent) => {
-      options?.onFileWatchError?.(payload);
-    });
-
-    return () => {
-      try {
-        unsubscribeSynced?.();
-        unsubscribeError?.();
-      } catch {
-        // ignore cleanup errors
-      }
-    };
-  }, [options]);
-};
--- a/application/state/sftp/useSftpHostCredentials.ts
+++ b/application/state/sftp/useSftpHostCredentials.ts
@@ -1,75 +0,0 @@
-import { useCallback } from "react";
-import type { Host, Identity, SSHKey } from "../../../domain/models";
-import { resolveHostAuth } from "../../../domain/sshAuth";
-
-interface UseSftpHostCredentialsParams {
-  hosts: Host[];
-  keys: SSHKey[];
-  identities: Identity[];
-}
-
-export const useSftpHostCredentials = ({
-  hosts,
-  keys,
-  identities,
-}: UseSftpHostCredentialsParams) =>
-  useCallback(
-    (host: Host): NetcattySSHOptions => {
-      const resolved = resolveHostAuth({ host, keys, identities });
-      const key = resolved.key || null;
-
-      const proxyConfig = host.proxyConfig
-        ? {
-            type: host.proxyConfig.type,
-            host: host.proxyConfig.host,
-            port: host.proxyConfig.port,
-            username: host.proxyConfig.username,
-            password: host.proxyConfig.password,
-          }
-        : undefined;
-
-      let jumpHosts: NetcattyJumpHost[] | undefined;
-      if (host.hostChain?.hostIds && host.hostChain.hostIds.length > 0) {
-        jumpHosts = host.hostChain.hostIds
-          .map((hostId) => hosts.find((h) => h.id === hostId))
-          .filter((h): h is Host => !!h)
-          .map((jumpHost) => {
-            const jumpAuth = resolveHostAuth({
-              host: jumpHost,
-              keys,
-              identities,
-            });
-            const jumpKey = jumpAuth.key;
-            return {
-              hostname: jumpHost.hostname,
-              port: jumpHost.port || 22,
-              username: jumpAuth.username || "root",
-              password: jumpAuth.password,
-              privateKey: jumpKey?.privateKey,
-              certificate: jumpKey?.certificate,
-              passphrase: jumpAuth.passphrase || jumpKey?.passphrase,
-              publicKey: jumpKey?.publicKey,
-              keyId: jumpAuth.keyId,
-              keySource: jumpKey?.source,
-              label: jumpHost.label,
-            };
-          });
-      }
-
-      return {
-        hostname: host.hostname,
-        username: resolved.username,
-        port: host.port || 22,
-        password: resolved.password,
-        privateKey: key?.privateKey,
-        certificate: key?.certificate,
-        publicKey: key?.publicKey,
-        keyId: resolved.keyId,
-        keySource: key?.source,
-        proxy: proxyConfig,
-        jumpHosts: jumpHosts && jumpHosts.length > 0 ? jumpHosts : undefined,
-        sudo: host.sftpSudo,
-      };
-    },
-    [hosts, identities, keys],
-  );
--- a/application/state/sftp/useSftpPaneActions.ts
+++ b/application/state/sftp/useSftpPaneActions.ts
@@ -1,624 +0,0 @@
-import { useCallback } from "react";
-import type { Host, SftpFileEntry, SftpFilenameEncoding } from "../../../domain/models";
-import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-import { logger } from "../../../lib/logger";
-import { SftpPane } from "./types";
-import { getParentPath, isNavigableDirectory, isWindowsRoot, joinPath } from "./utils";
-
-interface UseSftpPaneActionsParams {
-  getActivePane: (side: "left" | "right") => SftpPane | null;
-  updateTab: (side: "left" | "right", tabId: string, updater: (pane: SftpPane) => SftpPane) => void;
-  updateActiveTab: (side: "left" | "right", updater: (pane: SftpPane) => SftpPane) => void;
-  leftTabsRef: React.MutableRefObject<{ tabs: SftpPane[]; activeTabId: string | null }>;
-  rightTabsRef: React.MutableRefObject<{ tabs: SftpPane[]; activeTabId: string | null }>;
-  navSeqRef: React.MutableRefObject<{ left: number; right: number }>;
-  dirCacheRef: React.MutableRefObject<Map<string, { files: SftpFileEntry[]; timestamp: number }>>;
-  sftpSessionsRef: React.MutableRefObject<Map<string, string>>;
-  lastConnectedHostRef: React.MutableRefObject<{ left: Host | "local" | null; right: Host | "local" | null }>;
-  reconnectingRef: React.MutableRefObject<{ left: boolean; right: boolean }>;
-  makeCacheKey: (connectionId: string, path: string, encoding?: SftpFilenameEncoding) => string;
-  clearCacheForConnection: (connectionId: string) => void;
-  listLocalFiles: (path: string) => Promise<SftpFileEntry[]>;
-  listRemoteFiles: (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => Promise<SftpFileEntry[]>;
-  handleSessionError: (side: "left" | "right", error: Error) => void;
-  isSessionError: (err: unknown) => boolean;
-  dirCacheTtlMs: number;
-}
-
-interface UseSftpPaneActionsResult {
-  navigateTo: (side: "left" | "right", path: string, options?: { force?: boolean }) => Promise<void>;
-  refresh: (side: "left" | "right") => Promise<void>;
-  navigateUp: (side: "left" | "right") => Promise<void>;
-  openEntry: (side: "left" | "right", entry: SftpFileEntry) => Promise<void>;
-  toggleSelection: (side: "left" | "right", fileName: string, multiSelect: boolean) => void;
-  rangeSelect: (side: "left" | "right", fileNames: string[]) => void;
-  clearSelection: (side: "left" | "right") => void;
-  selectAll: (side: "left" | "right") => void;
-  setFilter: (side: "left" | "right", filter: string) => void;
-  getFilteredFiles: (pane: SftpPane) => SftpFileEntry[];
-  createDirectory: (side: "left" | "right", name: string) => Promise<void>;
-  createFile: (side: "left" | "right", name: string) => Promise<void>;
-  deleteFiles: (side: "left" | "right", fileNames: string[]) => Promise<void>;
-  deleteFilesAtPath: (
-    side: "left" | "right",
-    connectionId: string,
-    path: string,
-    fileNames: string[],
-  ) => Promise<void>;
-  renameFile: (side: "left" | "right", oldName: string, newName: string) => Promise<void>;
-  changePermissions: (side: "left" | "right", filePath: string, mode: string) => Promise<void>;
-}
-
-export const useSftpPaneActions = ({
-  getActivePane,
-  updateTab,
-  updateActiveTab,
-  leftTabsRef,
-  rightTabsRef,
-  navSeqRef,
-  dirCacheRef,
-  sftpSessionsRef,
-  lastConnectedHostRef,
-  reconnectingRef,
-  makeCacheKey,
-  clearCacheForConnection,
-  listLocalFiles,
-  listRemoteFiles,
-  handleSessionError,
-  isSessionError,
-  dirCacheTtlMs,
-}: UseSftpPaneActionsParams): UseSftpPaneActionsResult => {
-  const navigateTo = useCallback(
-    async (
-      side: "left" | "right",
-      path: string,
-      options?: { force?: boolean },
-    ) => {
-      console.log("[SFTP navigateTo] called", { side, path, force: options?.force });
-
-      const pane = getActivePane(side);
-      const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
-      const activeTabId = sideTabs.activeTabId;
-
-      console.log("[SFTP navigateTo] state check", {
-        paneId: pane?.id,
-        hasConnection: !!pane?.connection,
-        activeTabId,
-        currentPath: pane?.connection?.currentPath,
-      });
-
-      if (!pane?.connection || !activeTabId) {
-        console.log("[SFTP navigateTo] No pane/connection/activeTabId, returning early");
-        return;
-      }
-
-      const requestId = ++navSeqRef.current[side];
-      const cacheKey = makeCacheKey(pane.connection.id, path, pane.filenameEncoding);
-      const cached = options?.force
-        ? undefined
-        : dirCacheRef.current.get(cacheKey);
-
-      if (
-        cached &&
-        Date.now() - cached.timestamp < dirCacheTtlMs &&
-        cached.files
-      ) {
-        console.log("[SFTP navigateTo] Using cached files for path", { path, cacheKey });
-        updateTab(side, activeTabId, (prev) => ({
-          ...prev,
-          connection: prev.connection
-            ? { ...prev.connection, currentPath: path }
-            : null,
-          files: cached.files,
-          loading: false,
-          error: null,
-          selectedFiles: new Set(),
-        }));
-        return;
-      }
-
-      console.log("[SFTP navigateTo] Fetching files from server for path", { path });
-      updateTab(side, activeTabId, (prev) => ({ ...prev, loading: true, error: null }));
-
-      try {
-        let files: SftpFileEntry[];
-
-        if (pane.connection.isLocal) {
-          files = await listLocalFiles(path);
-        } else {
-          const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-          if (!sftpId) {
-            clearCacheForConnection(pane.connection.id);
-            updateTab(side, activeTabId, (prev) => ({
-              ...prev,
-              connection: null,
-              files: [],
-              loading: false,
-              reconnecting: false,
-              error: "SFTP session lost. Please reconnect.",
-              selectedFiles: new Set(),
-              filter: "",
-            }));
-            return;
-          }
-
-          try {
-            files = await listRemoteFiles(sftpId, path, pane.filenameEncoding);
-          } catch (err) {
-            if (isSessionError(err)) {
-              sftpSessionsRef.current.delete(pane.connection.id);
-              clearCacheForConnection(pane.connection.id);
-              updateTab(side, activeTabId, (prev) => ({
-                ...prev,
-                connection: null,
-                files: [],
-                loading: false,
-                reconnecting: false,
-                error: "SFTP session expired. Please reconnect.",
-                selectedFiles: new Set(),
-                filter: "",
-              }));
-              return;
-            }
-            throw err as Error;
-          }
-        }
-
-        if (navSeqRef.current[side] !== requestId) return;
-
-        dirCacheRef.current.set(cacheKey, {
-          files,
-          timestamp: Date.now(),
-        });
-
-        updateTab(side, activeTabId, (prev) => ({
-          ...prev,
-          connection: prev.connection
-            ? { ...prev.connection, currentPath: path }
-            : null,
-          files,
-          loading: false,
-          selectedFiles: new Set(),
-        }));
-      } catch (err) {
-        if (navSeqRef.current[side] !== requestId) return;
-        updateTab(side, activeTabId, (prev) => ({
-          ...prev,
-          error:
-            err instanceof Error ? err.message : "Failed to list directory",
-          loading: false,
-        }));
-      }
-    },
-    [
-      getActivePane,
-      updateTab,
-      leftTabsRef,
-      rightTabsRef,
-      navSeqRef,
-      dirCacheRef,
-      makeCacheKey,
-      dirCacheTtlMs,
-      listLocalFiles,
-      listRemoteFiles,
-      sftpSessionsRef,
-      clearCacheForConnection,
-      isSessionError,
-    ],
-  );
-
-  const refresh = useCallback(
-    async (side: "left" | "right") => {
-      const pane = getActivePane(side);
-      if (pane?.connection) {
-        await navigateTo(side, pane.connection.currentPath, { force: true });
-      } else if (!pane?.connection && pane?.error) {
-        const lastHost = lastConnectedHostRef.current[side];
-        if (lastHost && !reconnectingRef.current[side]) {
-          reconnectingRef.current[side] = true;
-          updateActiveTab(side, (prev) => ({
-            ...prev,
-            reconnecting: true,
-            error: "sftp.reconnecting.title",
-          }));
-        } else if (!lastHost) {
-          updateActiveTab(side, (prev) => ({
-            ...prev,
-            error: "sftp.error.connectionLostManual",
-          }));
-        }
-      }
-    },
-    [getActivePane, navigateTo, updateActiveTab, lastConnectedHostRef, reconnectingRef],
-  );
-
-  const navigateUp = useCallback(
-    async (side: "left" | "right") => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) return;
-
-      const currentPath = pane.connection.currentPath;
-      const isAtRoot = currentPath === "/" || isWindowsRoot(currentPath);
-
-      if (!isAtRoot) {
-        const parentPath = getParentPath(currentPath);
-        await navigateTo(side, parentPath);
-      }
-    },
-    [getActivePane, navigateTo],
-  );
-
-  const openEntry = useCallback(
-    async (side: "left" | "right", entry: SftpFileEntry) => {
-      console.log("[SFTP openEntry] called", { side, entryName: entry.name, entryType: entry.type });
-
-      const pane = getActivePane(side);
-      console.log("[SFTP openEntry] getActivePane result", {
-        paneId: pane?.id,
-        hasConnection: !!pane?.connection,
-        currentPath: pane?.connection?.currentPath,
-      });
-
-      if (!pane?.connection) {
-        console.log("[SFTP openEntry] No pane or connection, returning early");
-        return;
-      }
-
-      if (entry.name === "..") {
-        const currentPath = pane.connection.currentPath;
-        const isAtRoot = currentPath === "/" || isWindowsRoot(currentPath);
-        console.log("[SFTP openEntry] Navigating up from '..'", {
-          currentPath,
-          isAtRoot,
-          isWindowsRoot: isWindowsRoot(currentPath),
-        });
-
-        if (!isAtRoot) {
-          const parentPath = getParentPath(currentPath);
-          console.log("[SFTP openEntry] Calculated parent path", { currentPath, parentPath });
-          await navigateTo(side, parentPath);
-        } else {
-          console.log("[SFTP openEntry] Already at root, not navigating");
-        }
-        return;
-      }
-
-      if (isNavigableDirectory(entry)) {
-        const newPath = joinPath(pane.connection.currentPath, entry.name);
-        console.log("[SFTP openEntry] Navigating into directory", { currentPath: pane.connection.currentPath, entryName: entry.name, newPath });
-        await navigateTo(side, newPath);
-      }
-    },
-    [getActivePane, navigateTo],
-  );
-
-  const toggleSelection = useCallback(
-    (side: "left" | "right", fileName: string, multiSelect: boolean) => {
-      updateActiveTab(side, (prev) => {
-        const newSelection = new Set(multiSelect ? prev.selectedFiles : []);
-        if (newSelection.has(fileName)) {
-          newSelection.delete(fileName);
-        } else {
-          newSelection.add(fileName);
-        }
-        return { ...prev, selectedFiles: newSelection };
-      });
-    },
-    [updateActiveTab],
-  );
-
-  const rangeSelect = useCallback(
-    (side: "left" | "right", fileNames: string[]) => {
-      const newSelection = new Set<string>();
-      for (const name of fileNames) {
-        if (name && name !== "..") {
-          newSelection.add(name);
-        }
-      }
-
-      updateActiveTab(side, (prev) => ({ ...prev, selectedFiles: newSelection }));
-    },
-    [updateActiveTab],
-  );
-
-  const clearSelection = useCallback((side: "left" | "right") => {
-    updateActiveTab(side, (prev) => ({ ...prev, selectedFiles: new Set() }));
-  }, [updateActiveTab]);
-
-  const selectAll = useCallback(
-    (side: "left" | "right") => {
-      const pane = getActivePane(side);
-      if (!pane) return;
-
-      updateActiveTab(side, (prev) => ({
-        ...prev,
-        selectedFiles: new Set(
-          pane.files.filter((f) => f.name !== "..").map((f) => f.name),
-        ),
-      }));
-    },
-    [getActivePane, updateActiveTab],
-  );
-
-  const setFilter = useCallback((side: "left" | "right", filter: string) => {
-    updateActiveTab(side, (prev) => ({ ...prev, filter }));
-  }, [updateActiveTab]);
-
-  const getFilteredFiles = useCallback((pane: SftpPane): SftpFileEntry[] => {
-    const term = pane.filter.trim().toLowerCase();
-    if (!term) return pane.files;
-    return pane.files.filter(
-      (f) => f.name === ".." || f.name.toLowerCase().includes(term),
-    );
-  }, []);
-
-  const createDirectory = useCallback(
-    async (side: "left" | "right", name: string) => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) return;
-
-      const fullPath = joinPath(pane.connection.currentPath, name);
-
-      try {
-        if (pane.connection.isLocal) {
-          await netcattyBridge.get()?.mkdirLocal?.(fullPath);
-        } else {
-          const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-          if (!sftpId) {
-            handleSessionError(side, new Error("SFTP session not found"));
-            return;
-          }
-          await netcattyBridge.get()?.mkdirSftp(sftpId, fullPath, pane.filenameEncoding);
-        }
-        await refresh(side);
-      } catch (err) {
-        if (isSessionError(err)) {
-          handleSessionError(side, err as Error);
-          return;
-        }
-        throw err;
-      }
-    },
-    [getActivePane, refresh, handleSessionError, sftpSessionsRef, isSessionError],
-  );
-
-  const createFile = useCallback(
-    async (side: "left" | "right", name: string) => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) return;
-
-      const fullPath = joinPath(pane.connection.currentPath, name);
-
-      try {
-        if (pane.connection.isLocal) {
-          const bridge = netcattyBridge.get();
-          if (bridge?.writeLocalFile) {
-            const emptyBuffer = new ArrayBuffer(0);
-            await bridge.writeLocalFile(fullPath, emptyBuffer);
-          } else {
-            throw new Error("Local file writing not supported");
-          }
-        } else {
-          const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-          if (!sftpId) {
-            handleSessionError(side, new Error("SFTP session not found"));
-            return;
-          }
-          const bridge = netcattyBridge.get();
-          if (bridge?.writeSftpBinary) {
-            const emptyBuffer = new ArrayBuffer(0);
-            await bridge.writeSftpBinary(sftpId, fullPath, emptyBuffer, pane.filenameEncoding);
-          } else if (bridge?.writeSftp) {
-            await bridge.writeSftp(sftpId, fullPath, "", pane.filenameEncoding);
-          } else {
-            throw new Error("No write method available");
-          }
-        }
-        await refresh(side);
-      } catch (err) {
-        if (isSessionError(err)) {
-          handleSessionError(side, err as Error);
-          return;
-        }
-        throw err;
-      }
-    },
-    [getActivePane, refresh, handleSessionError, sftpSessionsRef, isSessionError],
-  );
-
-  const deleteFiles = useCallback(
-    async (side: "left" | "right", fileNames: string[]) => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) return;
-
-      try {
-        for (const name of fileNames) {
-          const fullPath = joinPath(pane.connection.currentPath, name);
-
-          if (pane.connection.isLocal) {
-            await netcattyBridge.get()?.deleteLocalFile?.(fullPath);
-          } else {
-            const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-            if (!sftpId) {
-              handleSessionError(side, new Error("SFTP session not found"));
-              return;
-            }
-            await netcattyBridge.get()?.deleteSftp?.(sftpId, fullPath, pane.filenameEncoding);
-          }
-        }
-        await refresh(side);
-      } catch (err) {
-        if (isSessionError(err)) {
-          handleSessionError(side, err as Error);
-          return;
-        }
-        throw err;
-      }
-    },
-    [getActivePane, refresh, handleSessionError, sftpSessionsRef, isSessionError],
-  );
-
-  const deleteFilesAtPath = useCallback(
-    async (
-      side: "left" | "right",
-      connectionId: string,
-      path: string,
-      fileNames: string[],
-    ) => {
-      const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
-      const pane = sideTabs.tabs.find((tab) => tab.connection?.id === connectionId);
-      if (!pane?.connection) {
-        throw new Error("Source pane is no longer available");
-      }
-      const bridge = netcattyBridge.get();
-      if (!bridge) {
-        throw new Error("Netcatty bridge not available");
-      }
-
-      try {
-        for (const name of fileNames) {
-          const fullPath = joinPath(path, name);
-
-          if (pane.connection.isLocal) {
-            if (!bridge.deleteLocalFile) {
-              throw new Error("Local delete unavailable");
-            }
-            await bridge.deleteLocalFile(fullPath);
-          } else {
-            const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-            if (!sftpId) {
-              const error = new Error("SFTP session not found");
-              handleSessionError(side, error);
-              throw error;
-            }
-            if (!bridge.deleteSftp) {
-              throw new Error("SFTP delete unavailable");
-            }
-            await bridge.deleteSftp(sftpId, fullPath, pane.filenameEncoding);
-          }
-        }
-
-        clearCacheForConnection(pane.connection.id);
-
-        if (sideTabs.activeTabId === pane.id && pane.connection.currentPath === path) {
-          await refresh(side);
-        } else {
-          updateTab(side, pane.id, (prev) => {
-            if (!prev.connection || prev.connection.id !== connectionId) return prev;
-            if (prev.connection.currentPath !== path) return prev;
-
-            const removeSet = new Set(fileNames);
-            const filteredFiles = prev.files.filter((file) => !removeSet.has(file.name));
-            const nextSelection = new Set(prev.selectedFiles);
-            for (const name of fileNames) {
-              nextSelection.delete(name);
-            }
-            return {
-              ...prev,
-              files: filteredFiles,
-              selectedFiles: nextSelection,
-            };
-          });
-        }
-      } catch (err) {
-        if (isSessionError(err)) {
-          handleSessionError(side, err as Error);
-          throw err;
-        }
-        throw err;
-      }
-    },
-    [
-      clearCacheForConnection,
-      handleSessionError,
-      isSessionError,
-      leftTabsRef,
-      refresh,
-      rightTabsRef,
-      sftpSessionsRef,
-      updateTab,
-    ],
-  );
-
-  const renameFile = useCallback(
-    async (side: "left" | "right", oldName: string, newName: string) => {
-      const pane = getActivePane(side);
-      if (!pane?.connection) return;
-
-      const oldPath = joinPath(pane.connection.currentPath, oldName);
-      const newPath = joinPath(pane.connection.currentPath, newName);
-
-      try {
-        if (pane.connection.isLocal) {
-          await netcattyBridge.get()?.renameLocalFile?.(oldPath, newPath);
-        } else {
-          const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-          if (!sftpId) {
-            handleSessionError(side, new Error("SFTP session not found"));
-            return;
-          }
-          await netcattyBridge.get()?.renameSftp?.(sftpId, oldPath, newPath, pane.filenameEncoding);
-        }
-        await refresh(side);
-      } catch (err) {
-        if (isSessionError(err)) {
-          handleSessionError(side, err as Error);
-          return;
-        }
-        throw err;
-      }
-    },
-    [getActivePane, refresh, handleSessionError, sftpSessionsRef, isSessionError],
-  );
-
-  const changePermissions = useCallback(
-    async (
-      side: "left" | "right",
-      filePath: string,
-      mode: string,
-    ) => {
-      const pane = getActivePane(side);
-      if (!pane?.connection || pane.connection.isLocal) {
-        logger.warn("Cannot change permissions on local files");
-        return;
-      }
-
-      const sftpId = sftpSessionsRef.current.get(pane.connection.id);
-      if (!sftpId || !netcattyBridge.get()?.chmodSftp) {
-        handleSessionError(side, new Error("SFTP session not found"));
-        return;
-      }
-
-      try {
-        await netcattyBridge.get()!.chmodSftp!(sftpId, filePath, mode, pane.filenameEncoding);
-        await refresh(side);
-      } catch (err) {
-        if (isSessionError(err)) {
-          handleSessionError(side, err as Error);
-          return;
-        }
-        logger.error("Failed to change permissions:", err);
-      }
-    },
-    [getActivePane, refresh, handleSessionError, sftpSessionsRef, isSessionError],
-  );
-
-  return {
-    navigateTo,
-    refresh,
-    navigateUp,
-    openEntry,
-    toggleSelection,
-    rangeSelect,
-    clearSelection,
-    selectAll,
-    setFilter,
-    getFilteredFiles,
-    createDirectory,
-    createFile,
-    deleteFiles,
-    deleteFilesAtPath,
-    renameFile,
-    changePermissions,
-  };
-};
--- a/application/state/sftp/useSftpSessionCleanup.ts
+++ b/application/state/sftp/useSftpSessionCleanup.ts
@@ -1,19 +0,0 @@
-import { useEffect } from "react";
-import type { MutableRefObject } from "react";
-import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-
-export const useSftpSessionCleanup = (sftpSessionsRef: MutableRefObject<Map<string, string>>) => {
-  useEffect(() => {
-    const sessionsRef = sftpSessionsRef.current;
-
-    return () => {
-      sessionsRef.forEach(async (sftpId) => {
-        try {
-          await netcattyBridge.get()?.closeSftp(sftpId);
-        } catch {
-          // Ignore errors when closing SFTP sessions during cleanup
-        }
-      });
-    };
-  }, [sftpSessionsRef]);
-};
--- a/application/state/sftp/useSftpSessionErrors.ts
+++ b/application/state/sftp/useSftpSessionErrors.ts
@@ -1,78 +0,0 @@
-import { useCallback } from "react";
-import type { MutableRefObject } from "react";
-import type { Host } from "../../../domain/models";
-import type { SftpPane } from "./types";
-
-interface UseSftpSessionErrorsParams {
-  getActivePane: (side: "left" | "right") => SftpPane | null;
-  leftTabsRef: MutableRefObject<{ tabs: SftpPane[]; activeTabId: string | null }>;
-  rightTabsRef: MutableRefObject<{ tabs: SftpPane[]; activeTabId: string | null }>;
-  updateActiveTab: (
-    side: "left" | "right",
-    updater: (prev: SftpPane) => SftpPane,
-  ) => void;
-  sftpSessionsRef: MutableRefObject<Map<string, string>>;
-  clearCacheForConnection: (connectionId: string) => void;
-  navSeqRef: MutableRefObject<{ left: number; right: number }>;
-  lastConnectedHostRef: MutableRefObject<{ left: Host | "local" | null; right: Host | "local" | null }>;
-  reconnectingRef: MutableRefObject<{ left: boolean; right: boolean }>;
-}
-
-export const useSftpSessionErrors = ({
-  getActivePane,
-  leftTabsRef,
-  rightTabsRef,
-  updateActiveTab,
-  sftpSessionsRef,
-  clearCacheForConnection,
-  navSeqRef,
-  lastConnectedHostRef,
-  reconnectingRef,
-}: UseSftpSessionErrorsParams) =>
-  useCallback(
-    (side: "left" | "right", _error: Error) => {
-      const pane = getActivePane(side);
-      const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
-
-      if (!pane || !sideTabs.activeTabId) return;
-
-      if (pane.connection) {
-        sftpSessionsRef.current.delete(pane.connection.id);
-        clearCacheForConnection(pane.connection.id);
-      }
-
-      navSeqRef.current[side] += 1;
-
-      const lastHost = lastConnectedHostRef.current[side];
-      if (lastHost && pane.files.length > 0 && !reconnectingRef.current[side]) {
-        reconnectingRef.current[side] = true;
-        updateActiveTab(side, (prev) => ({
-          ...prev,
-          reconnecting: true,
-          error: "sftp.error.connectionLostReconnecting",
-        }));
-      } else {
-        updateActiveTab(side, (prev) => ({
-          ...prev,
-          connection: null,
-          files: [],
-          loading: false,
-          reconnecting: false,
-          error: "sftp.error.sessionLost",
-          selectedFiles: new Set(),
-          filter: "",
-        }));
-      }
-    },
-    [
-      getActivePane,
-      leftTabsRef,
-      rightTabsRef,
-      updateActiveTab,
-      sftpSessionsRef,
-      clearCacheForConnection,
-      navSeqRef,
-      lastConnectedHostRef,
-      reconnectingRef,
-    ],
-  );
--- a/application/state/sftp/useSftpTabsState.ts
+++ b/application/state/sftp/useSftpTabsState.ts
@@ -1,247 +0,0 @@
-import React, { useCallback, useMemo, useRef, useState } from "react";
-import { createEmptyPane, EMPTY_LEFT_PANE_ID, EMPTY_RIGHT_PANE_ID, SftpPane, SftpSideTabs } from "./types";
-import { logger } from "../../../lib/logger";
-
-export interface SftpTabsState {
-  leftTabs: SftpSideTabs;
-  rightTabs: SftpSideTabs;
-  leftTabsRef: React.MutableRefObject<SftpSideTabs>;
-  rightTabsRef: React.MutableRefObject<SftpSideTabs>;
-  setLeftTabs: React.Dispatch<React.SetStateAction<SftpSideTabs>>;
-  setRightTabs: React.Dispatch<React.SetStateAction<SftpSideTabs>>;
-  leftPane: SftpPane;
-  rightPane: SftpPane;
-  getActivePane: (side: "left" | "right") => SftpPane | null;
-  updateTab: (side: "left" | "right", tabId: string, updater: (pane: SftpPane) => SftpPane) => void;
-  updateActiveTab: (side: "left" | "right", updater: (pane: SftpPane) => SftpPane) => void;
-  addTab: (side: "left" | "right") => string;
-  closeTab: (side: "left" | "right", tabId: string) => void;
-  selectTab: (side: "left" | "right", tabId: string) => void;
-  reorderTabs: (
-    side: "left" | "right",
-    draggedId: string,
-    targetId: string,
-    position: "before" | "after",
-  ) => void;
-  moveTabToOtherSide: (fromSide: "left" | "right", tabId: string) => void;
-  getTabsInfo: (side: "left" | "right") => Array<{
-    id: string;
-    label: string;
-    isLocal: boolean;
-    hostId: string | null;
-  }>;
-  getActiveTabId: (side: "left" | "right") => string | null;
-}
-
-export const useSftpTabsState = (): SftpTabsState => {
-  const [leftTabs, setLeftTabs] = useState<SftpSideTabs>({
-    tabs: [],
-    activeTabId: null,
-  });
-  const [rightTabs, setRightTabs] = useState<SftpSideTabs>({
-    tabs: [],
-    activeTabId: null,
-  });
-
-  const leftTabsRef = useRef(leftTabs);
-  const rightTabsRef = useRef(rightTabs);
-  leftTabsRef.current = leftTabs;
-  rightTabsRef.current = rightTabs;
-
-  const getActivePane = useCallback((side: "left" | "right"): SftpPane | null => {
-    const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
-    if (!sideTabs.activeTabId) return null;
-    return sideTabs.tabs.find((t) => t.id === sideTabs.activeTabId) || null;
-  }, []);
-
-  const leftPane = useMemo(() => {
-    const pane = leftTabs.activeTabId
-      ? leftTabs.tabs.find((t) => t.id === leftTabs.activeTabId)
-      : null;
-    return pane || createEmptyPane(EMPTY_LEFT_PANE_ID);
-  }, [leftTabs]);
-
-  const rightPane = useMemo(() => {
-    const pane = rightTabs.activeTabId
-      ? rightTabs.tabs.find((t) => t.id === rightTabs.activeTabId)
-      : null;
-    return pane || createEmptyPane(EMPTY_RIGHT_PANE_ID);
-  }, [rightTabs]);
-
-  const updateTab = useCallback(
-    (side: "left" | "right", tabId: string, updater: (pane: SftpPane) => SftpPane) => {
-      const setTabs = side === "left" ? setLeftTabs : setRightTabs;
-      setTabs((prev) => ({
-        ...prev,
-        tabs: prev.tabs.map((t) => (t.id === tabId ? updater(t) : t)),
-      }));
-    },
-    [],
-  );
-
-  const updateActiveTab = useCallback(
-    (side: "left" | "right", updater: (pane: SftpPane) => SftpPane) => {
-      const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
-      if (!sideTabs.activeTabId) return;
-      updateTab(side, sideTabs.activeTabId, updater);
-    },
-    [updateTab],
-  );
-
-  const addTab = useCallback(
-    (side: "left" | "right") => {
-      const newPane = createEmptyPane();
-      const setTabs = side === "left" ? setLeftTabs : setRightTabs;
-      setTabs((prev) => ({
-        tabs: [...prev.tabs, newPane],
-        activeTabId: newPane.id,
-      }));
-      return newPane.id;
-    },
-    [],
-  );
-
-  const closeTab = useCallback(
-    (side: "left" | "right", tabId: string) => {
-      const setTabs = side === "left" ? setLeftTabs : setRightTabs;
-      setTabs((prev) => {
-        const tabIndex = prev.tabs.findIndex((t) => t.id === tabId);
-        if (tabIndex === -1) return prev;
-
-        let newActiveTabId: string | null = null;
-        if (prev.tabs.length > 1) {
-          if (prev.activeTabId === tabId) {
-            const nextIndex = tabIndex < prev.tabs.length - 1 ? tabIndex + 1 : tabIndex - 1;
-            newActiveTabId = prev.tabs[nextIndex]?.id || null;
-          } else {
-            newActiveTabId = prev.activeTabId;
-          }
-        }
-
-        return {
-          tabs: prev.tabs.filter((t) => t.id !== tabId),
-          activeTabId: newActiveTabId,
-        };
-      });
-    },
-    [],
-  );
-
-  const selectTab = useCallback(
-    (side: "left" | "right", tabId: string) => {
-      const setTabs = side === "left" ? setLeftTabs : setRightTabs;
-      setTabs((prev) => ({
-        ...prev,
-        activeTabId: tabId,
-      }));
-    },
-    [],
-  );
-
-  const reorderTabs = useCallback(
-    (
-      side: "left" | "right",
-      draggedId: string,
-      targetId: string,
-      position: "before" | "after",
-    ) => {
-      const setTabs = side === "left" ? setLeftTabs : setRightTabs;
-      setTabs((prev) => {
-        const tabs = [...prev.tabs];
-        const draggedIndex = tabs.findIndex((t) => t.id === draggedId);
-        const targetIndex = tabs.findIndex((t) => t.id === targetId);
-
-        if (draggedIndex === -1 || targetIndex === -1) return prev;
-
-        const [draggedTab] = tabs.splice(draggedIndex, 1);
-        const insertIndex = position === "before" ? targetIndex : targetIndex + 1;
-        const adjustedIndex = draggedIndex < targetIndex ? insertIndex - 1 : insertIndex;
-        tabs.splice(adjustedIndex, 0, draggedTab);
-
-        return { ...prev, tabs };
-      });
-    },
-    [],
-  );
-
-  const moveTabToOtherSide = useCallback(
-    (fromSide: "left" | "right", tabId: string) => {
-      const sourceTabs = fromSide === "left" ? leftTabsRef.current : rightTabsRef.current;
-      const setSourceTabs = fromSide === "left" ? setLeftTabs : setRightTabs;
-      const setTargetTabs = fromSide === "left" ? setRightTabs : setLeftTabs;
-
-      const tabToMove = sourceTabs.tabs.find((t) => t.id === tabId);
-      if (!tabToMove) return;
-
-      logger.info("[SFTP] Moving tab to other side", {
-        fromSide,
-        toSide: fromSide === "left" ? "right" : "left",
-        tabId,
-        hostLabel: tabToMove.connection?.hostLabel,
-      });
-
-      setSourceTabs((prev) => {
-        const newTabs = prev.tabs.filter((t) => t.id !== tabId);
-        let newActiveTabId: string | null = null;
-        if (newTabs.length > 0) {
-          if (prev.activeTabId === tabId) {
-            newActiveTabId = newTabs[0].id;
-          } else {
-            newActiveTabId = prev.activeTabId;
-          }
-        }
-        return { tabs: newTabs, activeTabId: newActiveTabId };
-      });
-
-      setTargetTabs((prev) => ({
-        tabs: [...prev.tabs, tabToMove],
-        activeTabId: tabToMove.id,
-      }));
-    },
-    [],
-  );
-
-  const DEFAULT_TAB_LABEL = "New Tab";
-
-  const getTabsInfo = useCallback(
-    (side: "left" | "right") => {
-      const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
-      return sideTabs.tabs.map((pane) => ({
-        id: pane.id,
-        label: pane.connection?.hostLabel || DEFAULT_TAB_LABEL,
-        isLocal: pane.connection?.isLocal || false,
-        hostId: pane.connection?.hostId || null,
-      }));
-    },
-    [],
-  );
-
-  const getActiveTabId = useCallback(
-    (side: "left" | "right") => {
-      const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
-      return sideTabs.activeTabId;
-    },
-    [],
-  );
-
-  return {
-    leftTabs,
-    rightTabs,
-    leftTabsRef,
-    rightTabsRef,
-    setLeftTabs,
-    setRightTabs,
-    leftPane,
-    rightPane,
-    getActivePane,
-    updateTab,
-    updateActiveTab,
-    addTab,
-    closeTab,
-    selectTab,
-    reorderTabs,
-    moveTabToOtherSide,
-    getTabsInfo,
-    getActiveTabId,
-  };
-};
--- a/application/state/sftp/useSftpTransfers.ts
+++ b/application/state/sftp/useSftpTransfers.ts
@@ -1,878 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import {
-  FileConflict,
-  SftpFileEntry,
-  SftpFilenameEncoding,
-  TransferDirection,
-  TransferStatus,
-  TransferTask,
-} from "../../../domain/models";
-import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-import { logger } from "../../../lib/logger";
-import { SftpPane } from "./types";
-import { joinPath } from "./utils";
-
-interface UseSftpTransfersParams {
-  getActivePane: (side: "left" | "right") => SftpPane | null;
-  refresh: (side: "left" | "right") => Promise<void>;
-  sftpSessionsRef: React.MutableRefObject<Map<string, string>>;
-  listLocalFiles: (path: string) => Promise<SftpFileEntry[]>;
-  listRemoteFiles: (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => Promise<SftpFileEntry[]>;
-  handleSessionError: (side: "left" | "right", error: Error) => void;
-}
-
-interface UseSftpTransfersResult {
-  transfers: TransferTask[];
-  conflicts: FileConflict[];
-  activeTransfersCount: number;
-  startTransfer: (
-    sourceFiles: { name: string; isDirectory: boolean }[],
-    sourceSide: "left" | "right",
-    targetSide: "left" | "right",
-    options?: {
-      sourcePane?: SftpPane;
-      sourcePath?: string;
-      sourceConnectionId?: string;
-      onTransferComplete?: (result: TransferResult) => void | Promise<void>;
-    },
-  ) => Promise<TransferResult[]>;
-  addExternalUpload: (task: TransferTask) => void;
-  updateExternalUpload: (taskId: string, updates: Partial<TransferTask>) => void;
-  cancelTransfer: (transferId: string) => Promise<void>;
-  retryTransfer: (transferId: string) => Promise<void>;
-  clearCompletedTransfers: () => void;
-  dismissTransfer: (transferId: string) => void;
-  resolveConflict: (conflictId: string, action: "replace" | "skip" | "duplicate") => Promise<void>;
-}
-
-interface TransferResult {
-  id: string;
-  fileName: string;
-  originalFileName?: string;
-  status: TransferStatus;
-}
-
-export const useSftpTransfers = ({
-  getActivePane,
-  refresh,
-  sftpSessionsRef,
-  listLocalFiles,
-  listRemoteFiles,
-  handleSessionError,
-}: UseSftpTransfersParams): UseSftpTransfersResult => {
-  const [transfers, setTransfers] = useState<TransferTask[]>([]);
-  const [conflicts, setConflicts] = useState<FileConflict[]>([]);
-
-  const progressIntervalsRef = useRef<Map<string, NodeJS.Timeout>>(new Map());
-  // Track cancelled task IDs for checking during async operations
-  const cancelledTasksRef = useRef<Set<string>>(new Set());
-  const completionHandlersRef = useRef<Map<string, (result: TransferResult) => void | Promise<void>>>(new Map());
-
-  useEffect(() => {
-    const intervalsRef = progressIntervalsRef.current;
-    return () => {
-      intervalsRef.forEach((interval) => {
-        clearInterval(interval);
-      });
-      intervalsRef.clear();
-    };
-  }, []);
-
-  const startProgressSimulation = useCallback(
-    (taskId: string, estimatedBytes: number) => {
-      const existing = progressIntervalsRef.current.get(taskId);
-      if (existing) clearInterval(existing);
-
-      const baseSpeed = Math.max(50000, Math.min(500000, estimatedBytes / 10));
-      const variability = 0.3;
-
-      let transferred = 0;
-      const interval = setInterval(() => {
-        const speedFactor = 1 + (Math.random() - 0.5) * variability;
-        const chunkSize = Math.floor(baseSpeed * speedFactor * 0.1);
-        transferred = Math.min(transferred + chunkSize, estimatedBytes);
-
-        setTransfers((prev) =>
-          prev.map((t) => {
-            if (t.id !== taskId || t.status !== "transferring") return t;
-            return {
-              ...t,
-              transferredBytes: transferred,
-              totalBytes: estimatedBytes,
-              speed: chunkSize * 10,
-            };
-          }),
-        );
-
-        if (transferred >= estimatedBytes * 0.95) {
-          clearInterval(interval);
-          progressIntervalsRef.current.delete(taskId);
-        }
-      }, 100);
-
-      progressIntervalsRef.current.set(taskId, interval);
-    },
-    [],
-  );
-
-  const stopProgressSimulation = useCallback((taskId: string) => {
-    const interval = progressIntervalsRef.current.get(taskId);
-    if (interval) {
-      clearInterval(interval);
-      progressIntervalsRef.current.delete(taskId);
-    }
-  }, []);
-
-  const transferFile = async (
-    task: TransferTask,
-    sourceSftpId: string | null,
-    targetSftpId: string | null,
-    sourceIsLocal: boolean,
-    targetIsLocal: boolean,
-    sourceEncoding: SftpFilenameEncoding,
-    targetEncoding: SftpFilenameEncoding,
-    rootTaskId: string, // The original top-level task ID for cancellation checking
-  ): Promise<void> => {
-    // Check if task or root task was cancelled before starting
-    if (cancelledTasksRef.current.has(task.id) || cancelledTasksRef.current.has(rootTaskId)) {
-      throw new Error("Transfer cancelled");
-    }
-
-    if (netcattyBridge.get()?.startStreamTransfer) {
-      return new Promise((resolve, reject) => {
-        const options = {
-          transferId: task.id,
-          sourcePath: task.sourcePath,
-          targetPath: task.targetPath,
-          sourceType: sourceIsLocal ? ("local" as const) : ("sftp" as const),
-          targetType: targetIsLocal ? ("local" as const) : ("sftp" as const),
-          sourceSftpId: sourceSftpId || undefined,
-          targetSftpId: targetSftpId || undefined,
-          totalBytes: task.totalBytes || undefined,
-          sourceEncoding: sourceIsLocal ? undefined : sourceEncoding,
-          targetEncoding: targetIsLocal ? undefined : targetEncoding,
-        };
-
-        const onProgress = (
-          transferred: number,
-          total: number,
-          speed: number,
-        ) => {
-          setTransfers((prev) =>
-            prev.map((t) => {
-              if (t.id !== task.id) return t;
-              if (t.status === "cancelled") return t;
-              return {
-                ...t,
-                transferredBytes: transferred,
-                totalBytes: total || t.totalBytes,
-                speed,
-              };
-            }),
-          );
-        };
-
-        const onComplete = () => {
-          resolve();
-        };
-
-        const onError = (error: string) => {
-          reject(new Error(error));
-        };
-
-        netcattyBridge.require().startStreamTransfer!(
-          options,
-          onProgress,
-          onComplete,
-          onError,
-        ).catch(reject);
-      });
-    }
-
-    let content: ArrayBuffer | string;
-
-    if (sourceIsLocal) {
-      content =
-        (await netcattyBridge.get()?.readLocalFile?.(task.sourcePath)) ||
-        new ArrayBuffer(0);
-    } else if (sourceSftpId) {
-      if (netcattyBridge.get()?.readSftpBinary) {
-        content = await netcattyBridge.get()!.readSftpBinary!(
-          sourceSftpId,
-          task.sourcePath,
-          sourceEncoding,
-        );
-      } else {
-        content =
-          (await netcattyBridge.get()?.readSftp(sourceSftpId, task.sourcePath, sourceEncoding)) || "";
-      }
-    } else {
-      throw new Error("No source connection");
-    }
-
-    if (targetIsLocal) {
-      if (content instanceof ArrayBuffer) {
-        await netcattyBridge.get()?.writeLocalFile?.(task.targetPath, content);
-      } else {
-        const encoder = new TextEncoder();
-        await netcattyBridge.get()?.writeLocalFile?.(
-          task.targetPath,
-          encoder.encode(content).buffer,
-        );
-      }
-    } else if (targetSftpId) {
-      if (content instanceof ArrayBuffer && netcattyBridge.get()?.writeSftpBinary) {
-        await netcattyBridge.get()!.writeSftpBinary!(
-          targetSftpId,
-          task.targetPath,
-          content,
-          targetEncoding,
-        );
-      } else {
-        const text =
-          content instanceof ArrayBuffer
-            ? new TextDecoder().decode(content)
-            : content;
-        await netcattyBridge.get()?.writeSftp(targetSftpId, task.targetPath, text, targetEncoding);
-      }
-    } else {
-      throw new Error("No target connection");
-    }
-  };
-
-  const transferDirectory = async (
-    task: TransferTask,
-    sourceSftpId: string | null,
-    targetSftpId: string | null,
-    sourceIsLocal: boolean,
-    targetIsLocal: boolean,
-    sourceEncoding: SftpFilenameEncoding,
-    targetEncoding: SftpFilenameEncoding,
-    rootTaskId: string, // The original top-level task ID for cancellation checking
-  ) => {
-    // Check if task or root task was cancelled before starting
-    if (cancelledTasksRef.current.has(task.id) || cancelledTasksRef.current.has(rootTaskId)) {
-      throw new Error("Transfer cancelled");
-    }
-
-    if (targetIsLocal) {
-      await netcattyBridge.get()?.mkdirLocal?.(task.targetPath);
-    } else if (targetSftpId) {
-      await netcattyBridge.get()?.mkdirSftp(targetSftpId, task.targetPath, targetEncoding);
-    }
-
-    let files: SftpFileEntry[];
-    if (sourceIsLocal) {
-      files = await listLocalFiles(task.sourcePath);
-    } else if (sourceSftpId) {
-      files = await listRemoteFiles(sourceSftpId, task.sourcePath, sourceEncoding);
-    } else {
-      throw new Error("No source connection");
-    }
-
-    for (const file of files) {
-      if (file.name === "..") continue;
-
-      // Check if root task was cancelled during iteration
-      if (cancelledTasksRef.current.has(task.id) || cancelledTasksRef.current.has(rootTaskId)) {
-        throw new Error("Transfer cancelled");
-      }
-
-      const childTask: TransferTask = {
-        ...task,
-        id: crypto.randomUUID(),
-        fileName: file.name,
-        originalFileName: file.name,
-        sourcePath: joinPath(task.sourcePath, file.name),
-        targetPath: joinPath(task.targetPath, file.name),
-        isDirectory: file.type === "directory",
-        parentTaskId: task.id,
-      };
-
-      if (file.type === "directory") {
-        await transferDirectory(
-          childTask,
-          sourceSftpId,
-          targetSftpId,
-          sourceIsLocal,
-          targetIsLocal,
-          sourceEncoding,
-          targetEncoding,
-          rootTaskId,
-        );
-      } else {
-        await transferFile(
-          childTask,
-          sourceSftpId,
-          targetSftpId,
-          sourceIsLocal,
-          targetIsLocal,
-          sourceEncoding,
-          targetEncoding,
-          rootTaskId,
-        );
-      }
-    }
-  };
-
-  const processTransfer = async (
-    task: TransferTask,
-    sourcePane: SftpPane,
-    targetPane: SftpPane,
-    targetSide: "left" | "right",
-  ): Promise<TransferStatus> => {
-    const updateTask = (updates: Partial<TransferTask>) => {
-      setTransfers((prev) =>
-        prev.map((t) => (t.id === task.id ? { ...t, ...updates } : t)),
-      );
-    };
-
-    // Initialize encoding early to avoid temporal dead zone issues
-    const sourceEncoding: SftpFilenameEncoding = sourcePane.connection?.isLocal
-      ? "auto"
-      : sourcePane.filenameEncoding || "auto";
-    const targetEncoding: SftpFilenameEncoding = targetPane.connection?.isLocal
-      ? "auto"
-      : targetPane.filenameEncoding || "auto";
-
-    let actualFileSize = task.totalBytes;
-    if (!task.isDirectory && actualFileSize === 0) {
-      try {
-        const sourceSftpId = sourcePane.connection?.isLocal
-          ? null
-          : sftpSessionsRef.current.get(sourcePane.connection!.id);
-
-        if (sourcePane.connection?.isLocal) {
-          const stat = await netcattyBridge.get()?.statLocal?.(task.sourcePath);
-          if (stat) actualFileSize = stat.size;
-        } else if (sourceSftpId) {
-          const stat = await netcattyBridge.get()?.statSftp?.(
-            sourceSftpId,
-            task.sourcePath,
-            sourceEncoding,
-          );
-          if (stat) actualFileSize = stat.size;
-        }
-      } catch {
-        // Ignore stat errors
-      }
-    }
-
-    const estimatedSize =
-      actualFileSize > 0
-        ? actualFileSize
-        : task.isDirectory
-          ? 1024 * 1024
-          : 256 * 1024;
-
-    const hasStreamingTransfer = !!netcattyBridge.get()?.startStreamTransfer;
-
-    updateTask({
-      status: "transferring",
-      totalBytes: estimatedSize,
-      transferredBytes: 0,
-      startTime: Date.now(),
-    });
-
-    const sourceSftpId = sourcePane.connection?.isLocal
-      ? null
-      : sftpSessionsRef.current.get(sourcePane.connection!.id);
-    const targetSftpId = targetPane.connection?.isLocal
-      ? null
-      : sftpSessionsRef.current.get(targetPane.connection!.id);
-
-    if (!sourcePane.connection?.isLocal && !sourceSftpId) {
-      const sourceSide = targetSide === "left" ? "right" : "left";
-      handleSessionError(sourceSide, new Error("Source SFTP session lost"));
-      throw new Error("Source SFTP session not found");
-    }
-
-    if (!targetPane.connection?.isLocal && !targetSftpId) {
-      handleSessionError(targetSide, new Error("Target SFTP session lost"));
-      throw new Error("Target SFTP session not found");
-    }
-
-    let useSimulatedProgress = false;
-    if (!hasStreamingTransfer || task.isDirectory) {
-      useSimulatedProgress = true;
-      startProgressSimulation(task.id, estimatedSize);
-    }
-
-    try {
-      if (!task.skipConflictCheck && !task.isDirectory && targetPane.connection) {
-        let targetExists = false;
-        let existingStat: { size: number; mtime: number } | null = null;
-        let sourceStat: { size: number; mtime: number } | null = null;
-
-        try {
-          if (sourcePane.connection.isLocal) {
-            const stat = await netcattyBridge.get()?.statLocal?.(task.sourcePath);
-            if (stat) {
-              sourceStat = {
-                size: stat.size,
-                mtime: stat.lastModified || Date.now(),
-              };
-            }
-          } else if (sourceSftpId) {
-            const stat = await netcattyBridge.get()?.statSftp?.(
-              sourceSftpId,
-              task.sourcePath,
-              sourceEncoding,
-            );
-            if (stat) {
-              sourceStat = {
-                size: stat.size,
-                mtime: stat.lastModified || Date.now(),
-              };
-            }
-          }
-        } catch {
-          // ignore
-        }
-
-        try {
-          if (targetPane.connection.isLocal) {
-            const stat = await netcattyBridge.get()?.statLocal?.(task.targetPath);
-            if (stat) {
-              targetExists = true;
-              existingStat = {
-                size: stat.size,
-                mtime: stat.lastModified || Date.now(),
-              };
-            }
-          } else if (targetSftpId) {
-            const stat = await netcattyBridge.get()?.statSftp?.(
-              targetSftpId,
-              task.targetPath,
-              targetEncoding,
-            );
-            if (stat) {
-              targetExists = true;
-              existingStat = {
-                size: stat.size,
-                mtime: stat.lastModified || Date.now(),
-              };
-            }
-          }
-        } catch {
-          // ignore
-        }
-
-        if (targetExists && existingStat) {
-          stopProgressSimulation(task.id);
-
-          const newConflict: FileConflict = {
-            transferId: task.id,
-            fileName: task.fileName,
-            sourcePath: task.sourcePath,
-            targetPath: task.targetPath,
-            existingSize: existingStat.size,
-            newSize: sourceStat?.size || estimatedSize,
-            existingModified: existingStat.mtime,
-            newModified: sourceStat?.mtime || Date.now(),
-          };
-          setConflicts((prev) => [...prev, newConflict]);
-          updateTask({
-            status: "pending",
-            totalBytes: sourceStat?.size || estimatedSize,
-          });
-          return "pending";
-        }
-      }
-
-      if (task.isDirectory) {
-        await transferDirectory(
-          task,
-          sourceSftpId,
-          targetSftpId,
-          sourcePane.connection!.isLocal,
-          targetPane.connection!.isLocal,
-          sourceEncoding,
-          targetEncoding,
-          task.id, // rootTaskId - this is the top-level task
-        );
-      } else {
-        await transferFile(
-          task,
-          sourceSftpId,
-          targetSftpId,
-          sourcePane.connection!.isLocal,
-          targetPane.connection!.isLocal,
-          sourceEncoding,
-          targetEncoding,
-          task.id, // rootTaskId - this is the top-level task
-        );
-      }
-
-      if (useSimulatedProgress) {
-        stopProgressSimulation(task.id);
-      }
-
-      setTransfers((prev) =>
-        prev.map((t) => {
-          if (t.id !== task.id) return t;
-          return {
-            ...t,
-            status: "completed" as TransferStatus,
-            endTime: Date.now(),
-            transferredBytes: t.totalBytes,
-            speed: 0,
-          };
-        }),
-      );
-
-      await refresh(targetSide);
-      const completionHandler = completionHandlersRef.current.get(task.id);
-      if (completionHandler) {
-        try {
-          await completionHandler({
-            id: task.id,
-            fileName: task.fileName,
-            originalFileName: task.originalFileName ?? task.fileName,
-            status: "completed",
-          });
-        } finally {
-          completionHandlersRef.current.delete(task.id);
-        }
-      }
-      return "completed";
-    } catch (err) {
-      if (useSimulatedProgress) {
-        stopProgressSimulation(task.id);
-      }
-
-      // Check if this was a cancellation
-      const isCancelled = cancelledTasksRef.current.has(task.id) ||
-        (err instanceof Error && err.message === "Transfer cancelled");
-
-      if (isCancelled) {
-        // Don't update status - cancelTransfer already set it to cancelled
-        const completionHandler = completionHandlersRef.current.get(task.id);
-        if (completionHandler) {
-          try {
-            await completionHandler({
-              id: task.id,
-              fileName: task.fileName,
-              originalFileName: task.originalFileName ?? task.fileName,
-              status: "cancelled",
-            });
-          } finally {
-            completionHandlersRef.current.delete(task.id);
-          }
-        }
-        return "cancelled";
-      }
-
-      updateTask({
-        status: "failed",
-        error: err instanceof Error ? err.message : "Transfer failed",
-        endTime: Date.now(),
-        speed: 0,
-      });
-      const completionHandler = completionHandlersRef.current.get(task.id);
-      if (completionHandler) {
-        try {
-          await completionHandler({
-            id: task.id,
-            fileName: task.fileName,
-            originalFileName: task.originalFileName ?? task.fileName,
-            status: "failed",
-          });
-        } finally {
-          completionHandlersRef.current.delete(task.id);
-        }
-      }
-      return "failed";
-    }
-  };
-
-  const startTransfer = useCallback(
-    async (
-      sourceFiles: { name: string; isDirectory: boolean }[],
-      sourceSide: "left" | "right",
-    targetSide: "left" | "right",
-    options?: {
-      sourcePane?: SftpPane;
-      sourcePath?: string;
-      sourceConnectionId?: string;
-      onTransferComplete?: (result: TransferResult) => void | Promise<void>;
-    },
-  ) => {
-      const sourcePane = options?.sourcePane ?? getActivePane(sourceSide);
-      const targetPane = getActivePane(targetSide);
-
-      if (!sourcePane?.connection || !targetPane?.connection) return [];
-
-      const sourceEncoding: SftpFilenameEncoding = sourcePane.connection.isLocal
-        ? "auto"
-        : sourcePane.filenameEncoding || "auto";
-
-      const sourcePath = options?.sourcePath ?? sourcePane.connection.currentPath;
-      const targetPath = targetPane.connection.currentPath;
-      const sourceConnectionId = options?.sourceConnectionId ?? sourcePane.connection.id;
-
-      const sourceSftpId = sourcePane.connection.isLocal
-        ? null
-        : sftpSessionsRef.current.get(sourceConnectionId);
-
-      const newTasks: TransferTask[] = [];
-
-      for (const file of sourceFiles) {
-        const direction: TransferDirection =
-          sourcePane.connection!.isLocal && !targetPane.connection!.isLocal
-            ? "upload"
-            : !sourcePane.connection!.isLocal && targetPane.connection!.isLocal
-              ? "download"
-              : "remote-to-remote";
-
-        let fileSize = 0;
-        if (!file.isDirectory) {
-          try {
-            const fullPath = joinPath(sourcePath, file.name);
-            if (sourcePane.connection!.isLocal) {
-              const stat = await netcattyBridge.get()?.statLocal?.(fullPath);
-              if (stat) fileSize = stat.size;
-            } else if (sourceSftpId) {
-            const stat = await netcattyBridge.get()?.statSftp?.(
-              sourceSftpId,
-              fullPath,
-              sourceEncoding,
-            );
-              if (stat) fileSize = stat.size;
-            }
-          } catch {
-            // ignore
-          }
-        }
-
-        newTasks.push({
-          id: crypto.randomUUID(),
-          fileName: file.name,
-          originalFileName: file.name,
-          sourcePath: joinPath(sourcePath, file.name),
-          targetPath: joinPath(targetPath, file.name),
-          sourceConnectionId,
-          targetConnectionId: targetPane.connection!.id,
-          direction,
-          status: "pending" as TransferStatus,
-          totalBytes: fileSize,
-          transferredBytes: 0,
-          speed: 0,
-          startTime: Date.now(),
-          isDirectory: file.isDirectory,
-        });
-      }
-
-      setTransfers((prev) => [...prev, ...newTasks]);
-
-      if (options?.onTransferComplete) {
-        for (const task of newTasks) {
-          completionHandlersRef.current.set(task.id, options.onTransferComplete);
-        }
-      }
-
-      const results: TransferResult[] = [];
-
-      for (const task of newTasks) {
-        const status = await processTransfer(task, sourcePane, targetPane, targetSide);
-        results.push({
-          id: task.id,
-          fileName: task.fileName,
-          originalFileName: task.originalFileName ?? task.fileName,
-          status,
-        });
-      }
-
-      return results;
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [getActivePane, sftpSessionsRef],
-  );
-
-  const cancelTransfer = useCallback(
-    async (transferId: string) => {
-      // Add to cancelled set so async operations can check
-      cancelledTasksRef.current.add(transferId);
-
-      stopProgressSimulation(transferId);
-
-      setTransfers((prev) =>
-        prev.map((t) =>
-          t.id === transferId
-            ? {
-              ...t,
-              status: "cancelled" as TransferStatus,
-              endTime: Date.now(),
-            }
-            : t,
-        ),
-      );
-
-      setConflicts((prev) => prev.filter((c) => c.transferId !== transferId));
-
-      if (netcattyBridge.get()?.cancelTransfer) {
-        try {
-          await netcattyBridge.get()!.cancelTransfer!(transferId);
-        } catch (err) {
-          logger.warn("Failed to cancel transfer at backend:", err);
-        }
-      }
-
-      // Clean up cancelled task ID after a delay to ensure all async ops see it
-      setTimeout(() => {
-        cancelledTasksRef.current.delete(transferId);
-      }, 5000);
-    },
-    [stopProgressSimulation],
-  );
-
-  const retryTransfer = useCallback(
-    async (transferId: string) => {
-      const task = transfers.find((t) => t.id === transferId);
-      if (!task) return;
-
-      const sourceSide = task.sourceConnectionId.startsWith("left") ? "left" : "right";
-      const targetSide = task.targetConnectionId.startsWith("left") ? "left" : "right";
-      const sourcePane = getActivePane(sourceSide as "left" | "right");
-      const targetPane = getActivePane(targetSide as "left" | "right");
-
-      if (sourcePane?.connection && targetPane?.connection) {
-        setTransfers((prev) =>
-          prev.map((t) =>
-            t.id === transferId
-              ? { ...t, status: "pending" as TransferStatus, error: undefined }
-              : t,
-          ),
-        );
-        await processTransfer(task, sourcePane, targetPane, targetSide);
-      }
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- processTransfer is defined inline
-    [transfers, getActivePane],
-  );
-
-  const clearCompletedTransfers = useCallback(() => {
-    setTransfers((prev) =>
-      prev.filter((t) => t.status !== "completed" && t.status !== "cancelled"),
-    );
-  }, []);
-
-  const dismissTransfer = useCallback((transferId: string) => {
-    setTransfers((prev) => prev.filter((t) => t.id !== transferId));
-  }, []);
-
-  const addExternalUpload = useCallback((task: TransferTask) => {
-    // Filter out any pending scanning tasks before adding the new task.
-    // This ensures that even if dismissExternalUpload's state update hasn't been applied yet
-    // (due to React state batching), the scanning placeholder will still be removed.
-    setTransfers((prev) => [
-      ...prev.filter(t => !(t.status === "pending" && t.fileName === "Scanning files...")),
-      task
-    ]);
-  }, []);
-
-  const updateExternalUpload = useCallback((taskId: string, updates: Partial<TransferTask>) => {
-    setTransfers((prev) =>
-      prev.map((t) => (t.id === taskId ? { ...t, ...updates } : t)),
-    );
-  }, []);
-
-  const resolveConflict = useCallback(
-    async (conflictId: string, action: "replace" | "skip" | "duplicate") => {
-      const conflict = conflicts.find((c) => c.transferId === conflictId);
-      if (!conflict) return;
-
-      setConflicts((prev) => prev.filter((c) => c.transferId !== conflictId));
-
-      const task = transfers.find((t) => t.id === conflictId);
-      if (!task) return;
-
-      if (action === "skip") {
-        setTransfers((prev) =>
-          prev.map((t) =>
-            t.id === conflictId
-              ? { ...t, status: "cancelled" as TransferStatus }
-              : t,
-          ),
-        );
-        const completionHandler = completionHandlersRef.current.get(conflictId);
-        if (completionHandler) {
-          try {
-            await completionHandler({
-              id: task.id,
-              fileName: task.fileName,
-              originalFileName: task.originalFileName ?? task.fileName,
-              status: "cancelled",
-            });
-          } finally {
-            completionHandlersRef.current.delete(conflictId);
-          }
-        }
-        return;
-      }
-
-      let updatedTask = { ...task };
-
-      if (action === "duplicate") {
-        const ext = task.fileName.includes(".")
-          ? "." + task.fileName.split(".").pop()
-          : "";
-        const baseName = task.fileName.includes(".")
-          ? task.fileName.slice(0, task.fileName.lastIndexOf("."))
-          : task.fileName;
-        const newName = `${baseName} (copy)${ext}`;
-        const newTargetPath = task.targetPath.replace(task.fileName, newName);
-        updatedTask = {
-          ...task,
-          fileName: newName,
-          targetPath: newTargetPath,
-          skipConflictCheck: true,
-        };
-      } else if (action === "replace") {
-        updatedTask = {
-          ...task,
-          skipConflictCheck: true,
-        };
-      }
-
-      setTransfers((prev) =>
-        prev.map((t) =>
-          t.id === conflictId
-            ? { ...updatedTask, status: "pending" as TransferStatus }
-            : t,
-        ),
-      );
-
-      const sourceSide = updatedTask.sourceConnectionId.startsWith("left") ? "left" : "right";
-      const targetSide = updatedTask.targetConnectionId.startsWith("left") ? "left" : "right";
-      const sourcePane = getActivePane(sourceSide as "left" | "right");
-      const targetPane = getActivePane(targetSide as "left" | "right");
-
-      if (sourcePane?.connection && targetPane?.connection) {
-        setTimeout(async () => {
-          await processTransfer(updatedTask, sourcePane, targetPane, targetSide);
-        }, 100);
-      }
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- processTransfer is defined inline
-    [conflicts, transfers, getActivePane],
-  );
-
-  const activeTransfersCount = useMemo(() => transfers.filter(
-    (t) => t.status === "pending" || t.status === "transferring",
-  ).length, [transfers]);
-
-  return {
-    transfers,
-    conflicts,
-    activeTransfersCount,
-    startTransfer,
-    addExternalUpload,
-    updateExternalUpload,
-    cancelTransfer,
-    retryTransfer,
-    clearCompletedTransfers,
-    dismissTransfer,
-    resolveConflict,
-  };
-};
--- a/application/state/sftp/utils.ts
+++ b/application/state/sftp/utils.ts
@@ -1,90 +0,0 @@
-import { SftpFileEntry } from "../../../domain/models";
-
-export const formatFileSize = (bytes: number): string => {
-  if (bytes === 0) return "--";
-  const units = ["Bytes", "KB", "MB", "GB", "TB"];
-  const i = Math.floor(Math.log(bytes) / Math.log(1024));
-  const size = bytes / Math.pow(1024, i);
-  return `${size.toFixed(i === 0 ? 0 : 2)} ${units[i]}`;
-};
-
-export const formatDate = (timestamp: number): string => {
-  if (!timestamp) return "--";
-  const date = new Date(timestamp);
-  if (isNaN(date.getTime())) return "--";
-  const pad = (n: number) => n.toString().padStart(2, "0");
-  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
-};
-
-export const getFileExtension = (name: string): string => {
-  if (name === "..") return "folder";
-  const ext = name.split(".").pop()?.toLowerCase();
-  return ext || "file";
-};
-
-// Check if an entry is navigable like a directory (directories or symlinks pointing to directories)
-export const isNavigableDirectory = (entry: SftpFileEntry): boolean => {
-  return entry.type === "directory" || (entry.type === "symlink" && entry.linkTarget === "directory");
-};
-
-// Check if path is Windows-style
-export const isWindowsPath = (path: string): boolean => /^[A-Za-z]:/.test(path);
-
-const normalizeWindowsRoot = (path: string): string => {
-  const normalized = path.replace(/\//g, "\\");
-  if (/^[A-Za-z]:\\$/.test(normalized)) return normalized;
-  if (/^[A-Za-z]:$/.test(normalized)) return `${normalized}\\`;
-  return normalized;
-};
-
-export const isWindowsRoot = (path: string): boolean => {
-  if (!isWindowsPath(path)) return false;
-  return /^[A-Za-z]:\\?$/.test(path.replace(/\//g, "\\"));
-};
-
-export const joinPath = (base: string, name: string): string => {
-  if (isWindowsPath(base)) {
-    const normalizedBase = normalizeWindowsRoot(base).replace(/[\\/]+$/, "");
-    return `${normalizedBase}\\${name}`;
-  }
-  if (base === "/") return `/${name}`;
-  return `${base}/${name}`;
-};
-
-export const getParentPath = (path: string): string => {
-  console.log("[SFTP getParentPath] input", { path, isWindows: isWindowsPath(path) });
-
-  if (isWindowsPath(path)) {
-    const normalized = normalizeWindowsRoot(path).replace(/[\\]+$/, "");
-    const drive = normalized.slice(0, 2);
-    if (/^[A-Za-z]:$/.test(normalized) || /^[A-Za-z]:\\$/.test(normalized)) {
-      console.log("[SFTP getParentPath] Windows root, returning", { result: `${drive}\\` });
-      return `${drive}\\`;
-    }
-    const rest = normalized.slice(2).replace(/^[\\]+/, "");
-    const parts = rest ? rest.split(/[\\]+/).filter(Boolean) : [];
-    if (parts.length <= 1) {
-      console.log("[SFTP getParentPath] Windows near root, returning", { result: `${drive}\\` });
-      return `${drive}\\`;
-    }
-    parts.pop();
-    const result = `${drive}\\${parts.join("\\")}`;
-    console.log("[SFTP getParentPath] Windows result", { result });
-    return result;
-  }
-  if (path === "/") {
-    console.log("[SFTP getParentPath] Unix root, returning /");
-    return "/";
-  }
-  const parts = path.split("/").filter(Boolean);
-  console.log("[SFTP getParentPath] Unix parts before pop", { parts: [...parts] });
-  parts.pop();
-  const result = parts.length ? `/${parts.join("/")}` : "/";
-  console.log("[SFTP getParentPath] Unix result", { result, partsAfterPop: parts });
-  return result;
-};
-
-export const getFileName = (path: string): string => {
-  const parts = path.split(/[\\/]/).filter(Boolean);
-  return parts[parts.length - 1] || "";
-};
--- a/application/state/uiFontStore.ts
+++ b/application/state/uiFontStore.ts
@@ -1,207 +0,0 @@
-import { useSyncExternalStore } from 'react';
-import { UI_FONTS, withUiCjkFallback, type UIFont } from '../../infrastructure/config/uiFonts';
-
-/**
- * UI Font Store - singleton pattern using useSyncExternalStore
- * Fetches system fonts and combines with bundled fonts
- */
-type Listener = () => void;
-
-interface UIFontStoreState {
-  availableFonts: UIFont[];
-  isLoading: boolean;
-  isLoaded: boolean;
-  error: string | null;
-}
-
-/**
- * Type definition for Local Font Access API
- */
-interface LocalFontData {
-  family: string;
-}
-
-class UIFontStore {
-  private state: UIFontStoreState = {
-    availableFonts: UI_FONTS,
-    isLoading: false,
-    isLoaded: false,
-    error: null,
-  };
-  private listeners = new Set<Listener>();
-
-  getAvailableFonts = (): UIFont[] => this.state.availableFonts;
-  getIsLoading = (): boolean => this.state.isLoading;
-  getIsLoaded = (): boolean => this.state.isLoaded;
-
-  private notify = () => {
-    Promise.resolve().then(() => {
-      this.listeners.forEach(listener => listener());
-    });
-  };
-
-  private setState = (partial: Partial<UIFontStoreState>) => {
-    this.state = { ...this.state, ...partial };
-    this.notify();
-  };
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => this.listeners.delete(listener);
-  };
-
-  initialize = async (): Promise<void> => {
-    if (this.state.isLoaded || this.state.isLoading) {
-      return;
-    }
-
-    this.setState({ isLoading: true, error: null });
-
-    try {
-      const localFonts = await this.getLocalFonts();
-
-      // Use a Map to deduplicate by normalized font name
-      const fontMap = new Map<string, UIFont>();
-
-      // Add bundled fonts first (they have priority)
-      UI_FONTS.forEach(font => fontMap.set(font.id, font));
-
-      // Add local fonts with a distinct ID namespace
-      localFonts.forEach(font => {
-        const localId = `local-${font.id}`;
-        // Skip if a bundled font with similar name exists
-        if (!fontMap.has(font.id)) {
-          fontMap.set(localId, { ...font, id: localId });
-        }
-      });
-
-      this.setState({
-        availableFonts: Array.from(fontMap.values()),
-        isLoading: false,
-        isLoaded: true,
-      });
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : 'Failed to load local fonts';
-      console.warn('Failed to fetch local UI fonts, using defaults:', error);
-      this.setState({
-        availableFonts: UI_FONTS,
-        isLoading: false,
-        isLoaded: true,
-        error: errorMessage,
-      });
-    }
-  };
-
-  private async getLocalFonts(): Promise<UIFont[]> {
-    if (typeof window === 'undefined' || !('queryLocalFonts' in window)) {
-      return [];
-    }
-
-    try {
-      const queryLocalFonts = (window as unknown as { queryLocalFonts: () => Promise<LocalFontData[]> }).queryLocalFonts;
-      const fonts = await queryLocalFonts();
-
-      // Deduplicate by family name
-      const uniqueFamilies = new Set<string>();
-      const dedupedFonts = fonts.filter(f => {
-        if (uniqueFamilies.has(f.family)) return false;
-        uniqueFamilies.add(f.family);
-        return true;
-      });
-
-      // Map to UIFont structure
-      return dedupedFonts.map(f => ({
-        id: f.family.toLowerCase().replace(/\s+/g, '-'),
-        name: f.family,
-        family: withUiCjkFallback(`"${f.family}", system-ui`),
-      }));
-    } catch (error) {
-      console.warn('Failed to query local fonts:', error);
-      return [];
-    }
-  }
-
-  getFontById = (fontId: string): UIFont => {
-    const fonts = this.state.availableFonts;
-    const found = fonts.find(f => f.id === fontId);
-    if (found) return found;
-
-    // For local fonts that haven't been loaded yet, construct a fallback
-    // This handles the case when main window receives a local font ID before fonts are loaded
-    if (fontId.startsWith('local-')) {
-      const fontName = fontId
-        .replace(/^local-/, '')
-        .split('-')
-        .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-        .join(' ');
-      return {
-        id: fontId,
-        name: fontName,
-        family: withUiCjkFallback(`"${fontName}", system-ui`),
-      };
-    }
-
-    return fonts[0] || UI_FONTS[0];
-  };
-}
-
-// Singleton instance
-export const uiFontStore = new UIFontStore();
-
-/**
- * Get available UI fonts - triggers initialization on first use
- */
-export const useAvailableUIFonts = (): UIFont[] => {
-  if (!uiFontStore.getIsLoaded() && !uiFontStore.getIsLoading()) {
-    uiFontStore.initialize();
-  }
-
-  return useSyncExternalStore(
-    uiFontStore.subscribe,
-    uiFontStore.getAvailableFonts
-  );
-};
-
-/**
- * Get UI font loading state
- */
-export const useUIFontsLoading = (): boolean => {
-  return useSyncExternalStore(
-    uiFontStore.subscribe,
-    uiFontStore.getIsLoading
-  );
-};
-
-/**
- * Get UI font loaded state
- */
-export const useUIFontsLoaded = (): boolean => {
-  return useSyncExternalStore(
-    uiFontStore.subscribe,
-    uiFontStore.getIsLoaded
-  );
-};
-
-/**
- * Get UI font by ID with fallback
- */
-export const useUIFontById = (fontId: string): UIFont => {
-  const fonts = useAvailableUIFonts();
-  return fonts.find(f => f.id === fontId) || fonts[0] || UI_FONTS[0];
-};
-
-/**
- * Check if a font ID is valid
- */
-export const isValidUiFontId = (fontId: string): boolean => {
-  // Local fonts are always considered valid (they start with 'local-')
-  if (fontId.startsWith('local-')) return true;
-  return uiFontStore.getAvailableFonts().some(f => f.id === fontId);
-};
-
-/**
- * Initialize UI fonts eagerly
- */
-export const initializeUIFonts = (): void => {
-  uiFontStore.initialize();
-};
--- a/application/state/useApplicationBackend.ts
+++ b/application/state/useApplicationBackend.ts
@@ -7,12 +7,6 @@ export type ApplicationInfo = {
  platform: string;
 };

-export type SshAgentStatus = {
-  running: boolean;
-  startupType: string | null;
-  error: string | null;
-};
-
 export const useApplicationBackend = () => {
  const openExternal = useCallback(async (url: string) => {
    try {
@@ -33,12 +27,6 @@ export const useApplicationBackend = () => {
    return info ?? null;
  }, []);

-  const checkSshAgent = useCallback(async (): Promise<SshAgentStatus | null> => {
-    const bridge = netcattyBridge.get();
-    const status = await bridge?.checkSshAgent?.();
-    return status ?? null;
-  }, []);
-
-  return { openExternal, getApplicationInfo, checkSshAgent };
+  return { openExternal, getApplicationInfo };
 };

--- a/application/state/useCloudSync.ts
+++ b/application/state/useCloudSync.ts
@@ -358,8 +358,8 @@ export const useCloudSync = (): CloudSyncHook => {
    manager.setAutoSync(enabled, intervalMinutes);
  }, []);
  
-  const setDeviceName = useCallback((name: string) => {
-    manager.setDeviceName(name);
+  const setDeviceName = useCallback((_name: string) => {
+    // TODO: Add setDeviceName to CloudSyncManager if needed
  }, []);
  
  // ========== Utilities ==========
--- a/application/state/useKeychainBackend.ts
+++ b/application/state/useKeychainBackend.ts
@@ -15,8 +15,6 @@ export const useKeychainBackend = () => {
    privateKey?: string;
    command: string;
    timeout?: number;
-    enableKeyboardInteractive?: boolean;
-    sessionId?: string;
  }) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.execCommand) throw new Error("execCommand unavailable");
--- a/application/state/useManagedSourceSync.ts
+++ b/application/state/useManagedSourceSync.ts
@@ -1,383 +0,0 @@
-import { useCallback, useEffect, useRef } from "react";
-import { Host, ManagedSource } from "../../domain/models";
-import {
-  serializeHostsToSshConfig,
-  mergeWithExistingSshConfig,
-} from "../../domain/sshConfigSerializer";
-import { netcattyBridge } from "../../infrastructure/services/netcattyBridge";
-
-const MANAGED_BLOCK_BEGIN = "# BEGIN NETCATTY MANAGED - DO NOT EDIT THIS BLOCK";
-const MANAGED_BLOCK_END = "# END NETCATTY MANAGED";
-
-export interface UseManagedSourceSyncOptions {
-  hosts: Host[];
-  managedSources: ManagedSource[];
-  onUpdateManagedSources: (sources: ManagedSource[]) => void;
-}
-
-export const useManagedSourceSync = ({
-  hosts,
-  managedSources,
-  onUpdateManagedSources,
-}: UseManagedSourceSyncOptions) => {
-  const previousHostsRef = useRef<Host[]>([]);
-  const syncInProgressRef = useRef(false);
-  // Keep a ref to the latest managedSources to avoid stale closure issues
-  const managedSourcesRef = useRef(managedSources);
-  managedSourcesRef.current = managedSources;
-
-  const getManagedHostsForSource = useCallback(
-    (sourceId: string) => {
-      return hosts.filter((h) => h.managedSourceId === sourceId);
-    },
-    [hosts],
-  );
-
-  const readExistingFileContent = useCallback(
-    async (filePath: string): Promise<string | null> => {
-      const bridge = netcattyBridge.get();
-      if (!bridge?.readLocalFile) {
-        return null;
-      }
-      try {
-        const buffer = await bridge.readLocalFile(filePath);
-        const decoder = new TextDecoder();
-        return decoder.decode(buffer);
-      } catch {
-        // File might not exist yet
-        return null;
-      }
-    },
-    [],
-  );
-
-  const mergeWithExistingContent = useCallback(
-    (
-      existingContent: string | null,
-      managedHosts: Host[],
-      allHosts: Host[],
-    ): string => {
-      // Serialize the managed hosts
-      const managedContent = serializeHostsToSshConfig(managedHosts, allHosts);
-
-      if (!existingContent) {
-        // No existing file, just wrap the managed content
-        return `${MANAGED_BLOCK_BEGIN}\n${managedContent}${MANAGED_BLOCK_END}\n`;
-      }
-
-      const beginIndex = existingContent.indexOf(MANAGED_BLOCK_BEGIN);
-      const endIndex = existingContent.indexOf(MANAGED_BLOCK_END);
-
-      if (beginIndex === -1 || endIndex === -1 || endIndex < beginIndex) {
-        // No existing managed block - need to remove duplicate Host entries
-        // Build a set of hostnames/aliases that will be managed
-        const managedHostnameSet = new Set<string>();
-        for (const host of managedHosts) {
-          if (!host.protocol || host.protocol === "ssh") {
-            // Add both hostname and sanitized label (alias) for matching
-            managedHostnameSet.add(host.hostname.toLowerCase());
-            if (host.label) {
-              managedHostnameSet.add(host.label.replace(/\s/g, "").toLowerCase());
-            }
-          }
-        }
-
-        // Use mergeWithExistingSshConfig to filter out existing Host blocks
-        // that match our managed hosts, keeping preserved content outside markers
-        const mergedContent = mergeWithExistingSshConfig(
-          existingContent,
-          managedHosts,
-          managedHostnameSet,
-          allHosts,
-        );
-        return mergedContent;
-      }
-
-      // Replace the existing managed block
-      const before = existingContent.substring(0, beginIndex);
-      const after = existingContent.substring(endIndex + MANAGED_BLOCK_END.length);
-      return `${before}${MANAGED_BLOCK_BEGIN}\n${managedContent}${MANAGED_BLOCK_END}${after}`;
-    },
-    [],
-  );
-
-  const writeSshConfigToFile = useCallback(
-    async (source: ManagedSource, managedHosts: Host[]) => {
-      console.log(`[ManagedSourceSync] writeSshConfigToFile called for ${source.groupName}, hosts:`, managedHosts.length);
-
-      const bridge = netcattyBridge.get();
-      if (!bridge?.writeLocalFile) {
-        console.warn("[ManagedSourceSync] writeLocalFile not available");
-        return false;
-      }
-
-      try {
-        // Read existing file content to preserve non-managed parts
-        const existingContent = await readExistingFileContent(source.filePath);
-
-        // Merge with existing content, preserving non-managed parts and removing duplicates
-        const finalContent = mergeWithExistingContent(
-          existingContent,
-          managedHosts,
-          hosts,
-        );
-        console.log(`[ManagedSourceSync] Final content (${finalContent.length} chars)`);
-
-        const encoder = new TextEncoder();
-        const buffer = encoder.encode(finalContent);
-        console.log(`[ManagedSourceSync] Writing to ${source.filePath}`);
-
-        await bridge.writeLocalFile(source.filePath, buffer.buffer as ArrayBuffer);
-        console.log(`[ManagedSourceSync] Write successful`);
-        return true;
-      } catch (err) {
-        console.error("[ManagedSourceSync] Failed to write SSH config:", err);
-        return false;
-      }
-    },
-    [readExistingFileContent, mergeWithExistingContent, hosts],
-  );
-
-  const syncManagedSource = useCallback(
-    async (source: ManagedSource): Promise<{ sourceId: string; success: boolean }> => {
-      const managedHosts = getManagedHostsForSource(source.id);
-      const success = await writeSshConfigToFile(source, managedHosts);
-      return { sourceId: source.id, success };
-    },
-    [getManagedHostsForSource, writeSshConfigToFile],
-  );
-
-  const unmanageSource = useCallback(
-    (sourceId: string) => {
-      const updatedSources = managedSourcesRef.current.filter((s) => s.id !== sourceId);
-      onUpdateManagedSources(updatedSources);
-    },
-    [onUpdateManagedSources],
-  );
-
-  // Clear the managed block in the SSH config file and then remove the source
-  // This should be called before deleting a managed group to avoid stale entries
-  const clearAndRemoveSource = useCallback(
-    async (source: ManagedSource) => {
-      console.log(`[ManagedSourceSync] Clearing managed block for ${source.groupName}`);
-      // Write empty hosts list to clear the managed block
-      const success = await writeSshConfigToFile(source, []);
-      if (success) {
-        console.log(`[ManagedSourceSync] Managed block cleared, removing source`);
-      }
-      // Remove the source regardless of write success
-      const updatedSources = managedSourcesRef.current.filter((s) => s.id !== source.id);
-      onUpdateManagedSources(updatedSources);
-      return success;
-    },
-    [onUpdateManagedSources, writeSshConfigToFile],
-  );
-
-  // Clear and remove multiple sources atomically to avoid race conditions
-  // when multiple sources are removed concurrently
-  const clearAndRemoveSources = useCallback(
-    async (sources: ManagedSource[]) => {
-      if (sources.length === 0) return;
-
-      console.log(`[ManagedSourceSync] Clearing ${sources.length} managed blocks`);
-
-      // Clear all files in parallel
-      const results = await Promise.all(
-        sources.map(async (source) => {
-          const success = await writeSshConfigToFile(source, []);
-          return { sourceId: source.id, success };
-        })
-      );
-
-      const successCount = results.filter(r => r.success).length;
-      console.log(`[ManagedSourceSync] Cleared ${successCount}/${sources.length} managed blocks`);
-
-      // Remove all sources atomically in a single update
-      const sourceIdsToRemove = new Set(sources.map(s => s.id));
-      const updatedSources = managedSourcesRef.current.filter(
-        (s) => !sourceIdsToRemove.has(s.id)
-      );
-      onUpdateManagedSources(updatedSources);
-    },
-    [onUpdateManagedSources, writeSshConfigToFile],
-  );
-
-  const pendingSyncRef = useRef(false);
-  const checkAndSyncRef = useRef<() => void>(() => {});
-
-  const checkAndSync = useCallback(() => {
-    if (managedSources.length === 0) {
-      // Still update previousHostsRef so we have a baseline when sources are added
-      previousHostsRef.current = hosts;
-      return;
-    }
-
-    const prevHosts = previousHostsRef.current;
-    previousHostsRef.current = hosts;
-
-    // On initial sync (prevHosts empty), sync all sources that have managed hosts
-    const isInitialSync = prevHosts.length === 0;
-
-    const changedSourceIds = new Set<string>();
-
-    if (isInitialSync) {
-      // Initial sync: sync all sources that have hosts
-      for (const source of managedSources) {
-        const currManaged = hosts.filter((h) => h.managedSourceId === source.id);
-        if (currManaged.length > 0) {
-          changedSourceIds.add(source.id);
-        }
-      }
-    } else {
-      // Build maps for all hosts (for jump host lookup)
-      const prevHostMap = new Map<string, Host>(prevHosts.map((h) => [h.id, h]));
-      const currHostMap = new Map<string, Host>(hosts.map((h) => [h.id, h]));
-
-      // Index hosts by managedSourceId to avoid O(N*M) lookups
-      const prevHostsBySource = new Map<string, Host[]>();
-      for (const h of prevHosts) {
-        if (h.managedSourceId) {
-          let list = prevHostsBySource.get(h.managedSourceId);
-          if (!list) {
-            list = [];
-            prevHostsBySource.set(h.managedSourceId, list);
-          }
-          list.push(h);
-        }
-      }
-
-      const currHostsBySource = new Map<string, Host[]>();
-      for (const h of hosts) {
-        if (h.managedSourceId) {
-          let list = currHostsBySource.get(h.managedSourceId);
-          if (!list) {
-            list = [];
-            currHostsBySource.set(h.managedSourceId, list);
-          }
-          list.push(h);
-        }
-      }
-
-      // Helper to check if a host's SSH-relevant fields changed
-      const hostChanged = (prevHost: Host | undefined, currHost: Host | undefined): boolean => {
-        if (!prevHost || !currHost) return prevHost !== currHost;
-        return (
-          prevHost.hostname !== currHost.hostname ||
-          prevHost.port !== currHost.port ||
-          prevHost.username !== currHost.username ||
-          prevHost.label !== currHost.label
-        );
-      };
-
-      for (const source of managedSources) {
-        const prevManaged = prevHostsBySource.get(source.id) || [];
-        const currManaged = currHostsBySource.get(source.id) || [];
-
-        console.log(`[ManagedSourceSync] Source ${source.groupName}: prev=${prevManaged.length}, curr=${currManaged.length}`);
-
-        if (prevManaged.length !== currManaged.length) {
-          changedSourceIds.add(source.id);
-          continue;
-        }
-
-        const prevManagedMap = new Map<string, Host>(prevManaged.map((h) => [h.id, h]));
-        let sourceChanged = false;
-
-        for (const curr of currManaged) {
-          const prev = prevManagedMap.get(curr.id);
-          if (!prev) {
-            sourceChanged = true;
-            break;
-          }
-          // Compare hostChain arrays for ProxyJump changes
-          const prevChain = prev.hostChain?.hostIds || [];
-          const currChain = curr.hostChain?.hostIds || [];
-          const chainChanged =
-            prevChain.length !== currChain.length ||
-            prevChain.some((id, i) => id !== currChain[i]);
-
-          const hasChanged =
-            prev.hostname !== curr.hostname ||
-            prev.port !== curr.port ||
-            prev.username !== curr.username ||
-            prev.label !== curr.label ||
-            prev.group !== curr.group ||
-            prev.protocol !== curr.protocol ||
-            chainChanged;
-          if (hasChanged) {
-            sourceChanged = true;
-            break;
-          }
-
-          // Check if any referenced jump hosts changed (even if outside this managed source)
-          for (const jumpHostId of currChain) {
-            const prevJumpHost = prevHostMap.get(jumpHostId);
-            const currJumpHost = currHostMap.get(jumpHostId);
-            if (hostChanged(prevJumpHost, currJumpHost)) {
-              sourceChanged = true;
-              break;
-            }
-          }
-          if (sourceChanged) break;
-        }
-
-        if (sourceChanged) {
-          changedSourceIds.add(source.id);
-        }
-      }
-    }
-
-    if (changedSourceIds.size > 0) {
-      console.log(`[ManagedSourceSync] Syncing sources:`, Array.from(changedSourceIds));
-      syncInProgressRef.current = true;
-
-      Promise.all(
-        managedSources
-          .filter((s) => changedSourceIds.has(s.id))
-          .map(syncManagedSource),
-      ).then((results) => {
-        // Batch update lastSyncedAt for all successful syncs to avoid race conditions
-        const successfulSourceIds = new Set(
-          results.filter(r => r.success).map(r => r.sourceId)
-        );
-
-        if (successfulSourceIds.size > 0) {
-          const currentSources = managedSourcesRef.current;
-          const now = Date.now();
-          const updatedSources = currentSources.map((s) =>
-            successfulSourceIds.has(s.id) ? { ...s, lastSyncedAt: now } : s,
-          );
-          onUpdateManagedSources(updatedSources);
-        }
-      }).finally(() => {
-        syncInProgressRef.current = false;
-        // Check if there were changes during sync that need to be processed
-        // Use ref to get the latest checkAndSync to avoid stale closure
-        if (pendingSyncRef.current) {
-          pendingSyncRef.current = false;
-          checkAndSyncRef.current();
-        }
-      });
-    }
-  }, [hosts, managedSources, syncManagedSource, onUpdateManagedSources]);
-
-  // Keep ref updated with the latest checkAndSync
-  checkAndSyncRef.current = checkAndSync;
-
-  useEffect(() => {
-    if (syncInProgressRef.current) {
-      // Mark that we need to re-sync after current sync completes
-      pendingSyncRef.current = true;
-      return;
-    }
-    checkAndSync();
-  }, [hosts, managedSources, checkAndSync]);
-
-  return {
-    syncManagedSource,
-    unmanageSource,
-    clearAndRemoveSource,
-    clearAndRemoveSources,
-    getManagedHostsForSource,
-  };
-};
--- a/application/state/usePortForwardingAutoStart.ts
+++ b/application/state/usePortForwardingAutoStart.ts
@@ -76,14 +76,10 @@ export const usePortForwardingAutoStart = ({
    if (autoStartExecutedRef.current) return;
    if (hosts.length === 0) return;

-    // Mark as executed immediately to prevent duplicate runs
-    // (React StrictMode or dependency changes could cause re-runs)
-    autoStartExecutedRef.current = true;
-
    const runAutoStart = async () => {
      // First sync with backend to get any active tunnels
      await syncWithBackend();
-
+      
      // Load rules from storage
      const rules = localStorageAdapter.read<PortForwardingRule[]>(
        STORAGE_KEY_PORT_FORWARDING,
@@ -99,6 +95,8 @@ export const usePortForwardingAutoStart = ({
      });

      if (autoStartRules.length === 0) return;
+
+      autoStartExecutedRef.current = true;
      logger.info(`[PortForwardingAutoStart] Starting ${autoStartRules.length} auto-start rules`);

      // Start each auto-start rule
--- a/application/state/usePortForwardingState.ts
+++ b/application/state/usePortForwardingState.ts
@@ -9,6 +9,7 @@ import { localStorageAdapter } from "../../infrastructure/persistence/localStora
 import {
  clearReconnectTimer,
  getActiveConnection,
+  getActiveRuleIds,
  startPortForward,
  stopPortForward,
  syncWithBackend,
@@ -39,7 +40,6 @@ export interface UsePortForwardingStateResult {
  updateRule: (id: string, updates: Partial<PortForwardingRule>) => void;
  deleteRule: (id: string) => void;
  duplicateRule: (id: string) => void;
-  importRules: (rules: PortForwardingRule[]) => void;

  setRuleStatus: (
    id: string,
@@ -63,58 +63,8 @@ export interface UsePortForwardingStateResult {
  selectedRule: PortForwardingRule | undefined;
 }

-// Global Store State
-let globalRules: PortForwardingRule[] = [];
-let isInitialized = false;
-const listeners = new Set<(rules: PortForwardingRule[]) => void>();
-
-// Store Actions
-const notifyListeners = () => {
-  listeners.forEach((listener) => listener(globalRules));
-};
-
-const setGlobalRules = (newRules: PortForwardingRule[]) => {
-  globalRules = newRules;
-  notifyListeners();
-  localStorageAdapter.write(STORAGE_KEY_PORT_FORWARDING, newRules);
-};
-
-const normalizeRulesWithConnections = (rules: PortForwardingRule[]): PortForwardingRule[] => {
-  return rules.map((rule): PortForwardingRule => {
-    const connection = getActiveConnection(rule.id);
-    if (connection) {
-      return {
-        ...rule,
-        status: connection.status,
-        error: connection.error,
-      };
-    }
-
-    return {
-      ...rule,
-      status: "inactive" as const,
-      error: undefined,
-    };
-  });
-};
-
-// Initialization Logic
-const initializeStore = async () => {
-  if (isInitialized) return;
-  isInitialized = true;
-
-  await syncWithBackend();
-
-  const saved = localStorageAdapter.read<PortForwardingRule[]>(
-    STORAGE_KEY_PORT_FORWARDING,
-  );
-  if (saved && Array.isArray(saved)) {
-    setGlobalRules(normalizeRulesWithConnections(saved));
-  }
-};
-
 export const usePortForwardingState = (): UsePortForwardingStateResult => {
-  const [rules, setRules] = useState<PortForwardingRule[]>(globalRules);
+  const [rules, setRules] = useState<PortForwardingRule[]>([]);
  const [selectedRuleId, setSelectedRuleId] = useState<string | null>(null);
  const [viewMode, setViewMode] = useStoredViewMode(
    STORAGE_KEY_PF_VIEW_MODE,
@@ -131,50 +81,37 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
    localStorageAdapter.writeBoolean(STORAGE_KEY_PF_PREFER_FORM_MODE, prefer);
  }, []);

-  // Initialize store on mount (only once globally)
+  // Load rules from storage on mount and sync with backend
  useEffect(() => {
-    void initializeStore();
-  }, []);
-
-  // Subscribe to global store
-  useEffect(() => {
-    // If global state was updated before we subscribed (e.g. init finished), update local state
-    if (rules !== globalRules) {
-      setRules(globalRules);
-    }
-
-    const listener = (newRules: PortForwardingRule[]) => {
-      setRules(newRules);
-    };
-    listeners.add(listener);
-    return () => {
-      listeners.delete(listener);
-    };
-  }, [rules]);
-
-  // Listen for storage events for cross-window sync (main window <-> tray panel)
-  useEffect(() => {
-    const handleStorageChange = (e: StorageEvent) => {
-      // Only handle changes from our specific key
-      if (e.key !== STORAGE_KEY_PORT_FORWARDING) return;
-
-      // Parse the new value
-      if (e.newValue) {
-        try {
-          const newRules = JSON.parse(e.newValue) as PortForwardingRule[];
-          if (Array.isArray(newRules)) {
-            // Update global state without triggering another localStorage write
-            globalRules = normalizeRulesWithConnections(newRules);
-            notifyListeners();
+    const loadAndSync = async () => {
+      // First, sync with backend to get any active tunnels
+      await syncWithBackend();
+      
+      const saved = localStorageAdapter.read<PortForwardingRule[]>(
+        STORAGE_KEY_PORT_FORWARDING,
+      );
+      if (saved && Array.isArray(saved)) {
+        // Sync status with active connections in the service layer
+        const _activeRuleIds = getActiveRuleIds();
+        const withSyncedStatus = saved.map((r) => {
+          const conn = getActiveConnection(r.id);
+          if (conn) {
+            // This rule has an active connection, preserve its status
+            return { ...r, status: conn.status, error: conn.error };
          }
-        } catch {
-          // ignore parse errors
-        }
+          // No active connection, reset to inactive
+          return { ...r, status: "inactive" as const, error: undefined };
+        });
+        setRules(withSyncedStatus);
      }
    };
+    
+    void loadAndSync();
+  }, []);

-    window.addEventListener("storage", handleStorageChange);
-    return () => window.removeEventListener("storage", handleStorageChange);
+  // Persist rules to storage whenever they change
+  const persistRules = useCallback((updatedRules: PortForwardingRule[]) => {
+    localStorageAdapter.write(STORAGE_KEY_PORT_FORWARDING, updatedRules);
  }, []);

  const addRule = useCallback(
@@ -187,38 +124,47 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
        createdAt: Date.now(),
        status: "inactive",
      };
-      const updated = [...globalRules, newRule];
-      setGlobalRules(updated);
+      setRules((prev) => {
+        const updated = [...prev, newRule];
+        persistRules(updated);
+        return updated;
+      });
      setSelectedRuleId(newRule.id);
      return newRule;
    },
-    [],
+    [persistRules],
  );

  const updateRule = useCallback(
    (id: string, updates: Partial<PortForwardingRule>) => {
-      const updated = globalRules.map((r) =>
-        r.id === id ? { ...r, ...updates } : r,
-      );
-      setGlobalRules(updated);
+      setRules((prev) => {
+        const updated = prev.map((r) =>
+          r.id === id ? { ...r, ...updates } : r,
+        );
+        persistRules(updated);
+        return updated;
+      });
    },
-    [],
+    [persistRules],
  );

  const deleteRule = useCallback(
    (id: string) => {
-      const updated = globalRules.filter((r) => r.id !== id);
-      setGlobalRules(updated);
+      setRules((prev) => {
+        const updated = prev.filter((r) => r.id !== id);
+        persistRules(updated);
+        return updated;
+      });
      if (selectedRuleId === id) {
        setSelectedRuleId(null);
      }
    },
-    [selectedRuleId],
+    [selectedRuleId, persistRules],
  );

  const duplicateRule = useCallback(
    (id: string) => {
-      const original = globalRules.find((r) => r.id === id);
+      const original = rules.find((r) => r.id === id);
      if (!original) return;

      const copy: PortForwardingRule = {
@@ -230,31 +176,33 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
        error: undefined,
        lastUsedAt: undefined,
      };
-      const updated = [...globalRules, copy];
-      setGlobalRules(updated);
+      setRules((prev) => {
+        const updated = [...prev, copy];
+        persistRules(updated);
+        return updated;
+      });
      setSelectedRuleId(copy.id);
    },
-    [],
+    [rules, persistRules],
  );

-  const importRules = useCallback((newRules: PortForwardingRule[]) => {
-    setGlobalRules(normalizeRulesWithConnections(newRules));
-  }, []);
-
  const setRuleStatus = useCallback(
    (id: string, status: PortForwardingRule["status"], error?: string) => {
-      const updated = globalRules.map((r) => {
-        if (r.id !== id) return r;
-        return {
-          ...r,
-          status,
-          error,
-          lastUsedAt: status === "active" ? Date.now() : r.lastUsedAt,
-        };
+      setRules((prev) => {
+        const updated = prev.map((r) => {
+          if (r.id !== id) return r;
+          return {
+            ...r,
+            status,
+            error,
+            lastUsedAt: status === "active" ? Date.now() : r.lastUsedAt,
+          };
+        });
+        persistRules(updated);
+        return updated;
      });
-      setGlobalRules(updated);
    },
-    [],
+    [persistRules],
  );

  const startTunnel = useCallback(
@@ -347,7 +295,6 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
    updateRule,
    deleteRule,
    duplicateRule,
-    importRules,

    setRuleStatus,
    startTunnel,
--- a/application/state/useSessionState.ts
+++ b/application/state/useSessionState.ts
@@ -72,37 +72,6 @@ export const useSessionState = () => {
  }, [setActiveTabId]);

  const connectToHost = useCallback((host: Host) => {
-    // Handle serial hosts specially - use createSerialSession for them
-    if (host.protocol === 'serial') {
-      // Use stored serialConfig or construct from host data
-      const serialConfig: SerialConfig = host.serialConfig || {
-        path: host.hostname,
-        baudRate: host.port || 115200,
-        dataBits: 8,
-        stopBits: 1,
-        parity: 'none',
-        flowControl: 'none',
-        localEcho: false,
-        lineMode: false,
-      };
-      
-      const sessionId = crypto.randomUUID();
-      const portName = serialConfig.path.split('/').pop() || serialConfig.path;
-      const newSession: TerminalSession = {
-        id: sessionId,
-        hostId: host.id,
-        hostLabel: host.label || `Serial: ${portName}`,
-        hostname: serialConfig.path,
-        username: '',
-        status: 'connecting',
-        protocol: 'serial',
-        serialConfig: serialConfig,
-      };
-      setSessions(prev => [...prev, newSession]);
-      setActiveTabId(sessionId);
-      return;
-    }
-
    const newSession: TerminalSession = {
      id: crypto.randomUUID(),
      hostId: host.id,
@@ -286,69 +255,6 @@ export const useSessionState = () => {
    setWorkspaceRenameValue('');
  }, []);

-  const createWorkspaceWithHosts = useCallback((name: string, hosts: Host[]) => {
-    if (hosts.length === 0) return;
-
-    // Create sessions for each host
-    const newSessions: TerminalSession[] = hosts.map(host => {
-      // Handle serial hosts specially
-      if (host.protocol === 'serial') {
-        const serialConfig: SerialConfig = host.serialConfig || {
-          path: host.hostname,
-          baudRate: host.port || 115200,
-          dataBits: 8,
-          stopBits: 1,
-          parity: 'none',
-          flowControl: 'none',
-          localEcho: false,
-          lineMode: false,
-        };
-
-        const portName = serialConfig.path.split('/').pop() || serialConfig.path;
-        return {
-          id: crypto.randomUUID(),
-          hostId: host.id,
-          hostLabel: host.label || `Serial: ${portName}`,
-          hostname: serialConfig.path,
-          username: '',
-          status: 'connecting',
-          protocol: 'serial',
-          serialConfig: serialConfig,
-        };
-      }
-
-      return {
-        id: crypto.randomUUID(),
-        hostId: host.id,
-        hostLabel: host.label,
-        hostname: host.hostname,
-        username: host.username,
-        status: 'connecting',
-        protocol: host.protocol,
-        port: host.port,
-        moshEnabled: host.moshEnabled,
-      };
-    });
-
-    const sessionIds = newSessions.map(s => s.id);
-
-    // Create workspace
-    const workspace = createWorkspaceFromSessionIds(sessionIds, {
-      title: name,
-      viewMode: 'split',
-    });
-
-    // Assign workspaceId to sessions
-    const sessionsWithWorkspace = newSessions.map(s => ({
-      ...s,
-      workspaceId: workspace.id
-    }));
-
-    setSessions(prev => [...prev, ...sessionsWithWorkspace]);
-    setWorkspaces(prev => [...prev, workspace]);
-    setActiveTabId(workspace.id);
-  }, [setActiveTabId]);
-
  const createWorkspaceFromSessions = useCallback((
    baseSessionId: string,
    joiningSessionId: string,
@@ -610,31 +516,6 @@ export const useSessionState = () => {
    });
  }, [setActiveTabId]);

-  // Copy a session - creates a new session with the same host connection
-  const copySession = useCallback((sessionId: string) => {
-    setSessions(prevSessions => {
-      const session = prevSessions.find(s => s.id === sessionId);
-      if (!session) return prevSessions;
-
-      // Create a new session with the same connection info
-      const newSession: TerminalSession = {
-        id: crypto.randomUUID(),
-        hostId: session.hostId,
-        hostLabel: session.hostLabel,
-        hostname: session.hostname,
-        username: session.username,
-        status: 'connecting',
-        protocol: session.protocol,
-        port: session.port,
-        moshEnabled: session.moshEnabled,
-        serialConfig: session.serialConfig,
-      };
-
-      setActiveTabId(newSession.id);
-      return [...prevSessions, newSession];
-    });
-  }, [setActiveTabId]);
-
  // Toggle broadcast mode for a workspace
  const toggleBroadcast = useCallback((workspaceId: string) => {
    setBroadcastWorkspaceIds(prev => {
@@ -732,7 +613,6 @@ export const useSessionState = () => {
    closeSession,
    closeWorkspace,
    updateSessionStatus,
-    createWorkspaceWithHosts,
    createWorkspaceFromSessions,
    addSessionToWorkspace,
    updateSplitSizes,
@@ -751,7 +631,5 @@ export const useSessionState = () => {
    logViews,
    openLogView,
    closeLogView,
-    // Copy session
-    copySession,
  };
 };
--- a/application/state/useSettingsState.ts
+++ b/application/state/useSettingsState.ts
@@ -1,5 +1,5 @@
 import { useCallback,useEffect,useLayoutEffect,useMemo,useState } from 'react';
-import { SyncConfig, TerminalSettings, DEFAULT_TERMINAL_SETTINGS, HotkeyScheme, CustomKeyBindings, DEFAULT_KEY_BINDINGS, KeyBinding, UILanguage, SessionLogFormat } from '../../domain/models';
+import { SyncConfig, TerminalSettings, DEFAULT_TERMINAL_SETTINGS, HotkeyScheme, CustomKeyBindings, DEFAULT_KEY_BINDINGS, KeyBinding, UILanguage } from '../../domain/models';
 import {
 STORAGE_KEY_COLOR,
 STORAGE_KEY_SYNC,
@@ -16,23 +16,13 @@ STORAGE_KEY_UI_LANGUAGE,
 STORAGE_KEY_ACCENT_MODE,
 STORAGE_KEY_UI_THEME_LIGHT,
 STORAGE_KEY_UI_THEME_DARK,
-STORAGE_KEY_UI_FONT_FAMILY,
 STORAGE_KEY_SFTP_DOUBLE_CLICK_BEHAVIOR,
 STORAGE_KEY_SFTP_AUTO_SYNC,
-STORAGE_KEY_SFTP_SHOW_HIDDEN_FILES,
-STORAGE_KEY_SFTP_USE_COMPRESSED_UPLOAD,
-STORAGE_KEY_SESSION_LOGS_ENABLED,
-STORAGE_KEY_SESSION_LOGS_DIR,
-STORAGE_KEY_SESSION_LOGS_FORMAT,
-STORAGE_KEY_TOGGLE_WINDOW_HOTKEY,
-STORAGE_KEY_CLOSE_TO_TRAY,
 } from '../../infrastructure/config/storageKeys';
 import { DEFAULT_UI_LOCALE, resolveSupportedLocale } from '../../infrastructure/config/i18n';
 import { TERMINAL_THEMES } from '../../infrastructure/config/terminalThemes';
 import { DEFAULT_FONT_SIZE } from '../../infrastructure/config/fonts';
 import { DARK_UI_THEMES, LIGHT_UI_THEMES, UiThemeTokens, getUiThemeById } from '../../infrastructure/config/uiThemes';
-import { UI_FONTS, DEFAULT_UI_FONT_ID } from '../../infrastructure/config/uiFonts';
-import { uiFontStore, useUIFontsLoaded } from './uiFontStore';
 import { useAvailableFonts } from './fontStore';
 import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
 import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
@@ -51,12 +41,6 @@ const DEFAULT_HOTKEY_SCHEME: HotkeyScheme =
    : 'pc';
 const DEFAULT_SFTP_DOUBLE_CLICK_BEHAVIOR: 'open' | 'transfer' = 'open';
 const DEFAULT_SFTP_AUTO_SYNC = false;
-const DEFAULT_SFTP_SHOW_HIDDEN_FILES = false;
-const DEFAULT_SFTP_USE_COMPRESSED_UPLOAD = true;
-
-// Session Logs defaults
-const DEFAULT_SESSION_LOGS_ENABLED = false;
-const DEFAULT_SESSION_LOGS_FORMAT: SessionLogFormat = 'txt';

 const readStoredString = (key: string): string | null => {
  const raw = localStorageAdapter.readString(key);
@@ -84,14 +68,6 @@ const isValidUiThemeId = (theme: 'light' | 'dark', value: string): boolean => {
  return list.some((preset) => preset.id === value);
 };

-const isValidUiFontId = (value: string): boolean => {
-  // Local fonts are always considered valid
-  if (value.startsWith('local-')) return true;
-  // Check bundled fonts first, then check dynamically loaded fonts
-  return UI_FONTS.some((font) => font.id === value) ||
-         uiFontStore.getAvailableFonts().some((font) => font.id === value);
-};
-
 const applyThemeTokens = (
  theme: 'light' | 'dark',
  tokens: UiThemeTokens,
@@ -134,7 +110,6 @@ const applyThemeTokens = (

 export const useSettingsState = () => {
  const availableFonts = useAvailableFonts();
-  const uiFontsLoaded = useUIFontsLoaded();
  const [theme, setTheme] = useState<'dark' | 'light'>(() => {
    const stored = readStoredString(STORAGE_KEY_THEME);
    return stored && isValidTheme(stored) ? stored : DEFAULT_THEME;
@@ -157,10 +132,6 @@ export const useSettingsState = () => {
    const legacyColor = readStoredString(STORAGE_KEY_COLOR);
    return legacyColor && isValidHslToken(legacyColor) ? 'custom' : DEFAULT_ACCENT_MODE;
  });
-  const [uiFontFamilyId, setUiFontFamilyId] = useState<string>(() => {
-    const stored = readStoredString(STORAGE_KEY_UI_FONT_FAMILY);
-    return stored && isValidUiFontId(stored) ? stored : DEFAULT_UI_FONT_ID;
-  });
  const [syncConfig, setSyncConfig] = useState<SyncConfig | null>(() => localStorageAdapter.read<SyncConfig>(STORAGE_KEY_SYNC));
  const [terminalThemeId, setTerminalThemeId] = useState<string>(() => localStorageAdapter.readString(STORAGE_KEY_TERM_THEME) || DEFAULT_TERMINAL_THEME);
  const [terminalFontFamilyId, setTerminalFontFamilyId] = useState<string>(() => localStorageAdapter.readString(STORAGE_KEY_TERM_FONT_FAMILY) || DEFAULT_FONT_FAMILY);
@@ -196,47 +167,6 @@ export const useSettingsState = () => {
    const stored = readStoredString(STORAGE_KEY_SFTP_AUTO_SYNC);
    return stored === 'true' ? true : DEFAULT_SFTP_AUTO_SYNC;
  });
-  const [sftpShowHiddenFiles, setSftpShowHiddenFiles] = useState<boolean>(() => {
-    const stored = readStoredString(STORAGE_KEY_SFTP_SHOW_HIDDEN_FILES);
-    return stored === 'true' ? true : DEFAULT_SFTP_SHOW_HIDDEN_FILES;
-  });
-  const [sftpUseCompressedUpload, setSftpUseCompressedUpload] = useState<boolean>(() => {
-    const stored = readStoredString(STORAGE_KEY_SFTP_USE_COMPRESSED_UPLOAD);
-    // 兼容旧的设置值
-    if (stored === 'true' || stored === 'enabled' || stored === 'ask') return true;
-    if (stored === 'false' || stored === 'disabled') return false;
-    return DEFAULT_SFTP_USE_COMPRESSED_UPLOAD;
-  });
-
-  // Session Logs Settings
-  const [sessionLogsEnabled, setSessionLogsEnabled] = useState<boolean>(() => {
-    const stored = readStoredString(STORAGE_KEY_SESSION_LOGS_ENABLED);
-    return stored === 'true' ? true : DEFAULT_SESSION_LOGS_ENABLED;
-  });
-  const [sessionLogsDir, setSessionLogsDir] = useState<string>(() => {
-    return readStoredString(STORAGE_KEY_SESSION_LOGS_DIR) || '';
-  });
-  const [sessionLogsFormat, setSessionLogsFormat] = useState<SessionLogFormat>(() => {
-    const stored = readStoredString(STORAGE_KEY_SESSION_LOGS_FORMAT);
-    if (stored === 'txt' || stored === 'raw' || stored === 'html') return stored;
-    return DEFAULT_SESSION_LOGS_FORMAT;
-  });
-
-  // Global Toggle Window Settings (Quake Mode)
-  const [toggleWindowHotkey, setToggleWindowHotkey] = useState<string>(() => {
-    const stored = readStoredString(STORAGE_KEY_TOGGLE_WINDOW_HOTKEY);
-    if (stored !== null) return stored;
-    // Default: Ctrl+` (Control+backtick) - similar to VS Code terminal toggle
-    const isMac = typeof navigator !== 'undefined' && /Mac/i.test(navigator.platform);
-    return isMac ? '⌃ + `' : 'Ctrl + `';
-  });
-  const [closeToTray, setCloseToTray] = useState<boolean>(() => {
-    const stored = readStoredString(STORAGE_KEY_CLOSE_TO_TRAY);
-    // Default to true (enabled)
-    if (stored === null) return true;
-    return stored === 'true';
-  });
-  const [hotkeyRegistrationError, setHotkeyRegistrationError] = useState<string | null>(null);

  // Helper to notify other windows about settings changes via IPC
  const notifySettingsChanged = useCallback((key: string, value: unknown) => {
@@ -297,15 +227,6 @@ export const useSettingsState = () => {
    notifySettingsChanged(STORAGE_KEY_UI_LANGUAGE, uiLanguage);
  }, [uiLanguage, notifySettingsChanged]);

-  // Apply and persist UI font family
-  // Re-run when fonts finish loading to get correct family for local fonts
-  useLayoutEffect(() => {
-    const font = uiFontStore.getFontById(uiFontFamilyId);
-    document.documentElement.style.setProperty('--font-sans', font.family);
-    localStorageAdapter.writeString(STORAGE_KEY_UI_FONT_FAMILY, uiFontFamilyId);
-    notifySettingsChanged(STORAGE_KEY_UI_FONT_FAMILY, uiFontFamilyId);
-  }, [uiFontFamilyId, uiFontsLoaded, notifySettingsChanged]);
-
  // Listen for settings changes from other windows via IPC
 	  useEffect(() => {
 	    const bridge = netcattyBridge.get();
@@ -330,11 +251,6 @@ export const useSettingsState = () => {
      if (key === STORAGE_KEY_CUSTOM_CSS && typeof value === 'string') {
        syncCustomCssFromStorage();
      }
-      if (key === STORAGE_KEY_UI_FONT_FAMILY && typeof value === 'string') {
-        if (isValidUiFontId(value)) {
-          setUiFontFamilyId(value);
-        }
-      }
      if (key === STORAGE_KEY_TERM_THEME && typeof value === 'string') {
        setTerminalThemeId(value);
      }
@@ -421,11 +337,6 @@ export const useSettingsState = () => {
          setCustomCSS(e.newValue);
        }
      }
-      if (e.key === STORAGE_KEY_UI_FONT_FAMILY && e.newValue) {
-        if (isValidUiFontId(e.newValue) && e.newValue !== uiFontFamilyId) {
-          setUiFontFamilyId(e.newValue);
-        }
-      }
      if (e.key === STORAGE_KEY_HOTKEY_SCHEME && e.newValue) {
        const newScheme = e.newValue as HotkeyScheme;
        if (newScheme !== hotkeyScheme) {
@@ -487,25 +398,11 @@ export const useSettingsState = () => {
          setSftpAutoSync(newValue);
        }
      }
-      // Sync SFTP show hidden files setting from other windows
-      if (e.key === STORAGE_KEY_SFTP_SHOW_HIDDEN_FILES && e.newValue !== null) {
-        const newValue = e.newValue === 'true';
-        if (newValue !== sftpShowHiddenFiles) {
-          setSftpShowHiddenFiles(newValue);
-        }
-      }
-      // Sync SFTP compressed upload setting from other windows
-      if (e.key === STORAGE_KEY_SFTP_USE_COMPRESSED_UPLOAD && e.newValue !== null) {
-        const newValue = e.newValue === 'true' || e.newValue === 'enabled';
-        if (newValue !== sftpUseCompressedUpload) {
-          setSftpUseCompressedUpload(newValue);
-        }
-      }
    };

    window.addEventListener('storage', handleStorageChange);
    return () => window.removeEventListener('storage', handleStorageChange);
-  }, [theme, lightUiThemeId, darkUiThemeId, accentMode, customAccent, customCSS, uiFontFamilyId, hotkeyScheme, uiLanguage, terminalThemeId, terminalFontFamilyId, terminalFontSize, sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles, sftpUseCompressedUpload]);
+  }, [theme, lightUiThemeId, darkUiThemeId, accentMode, customAccent, customCSS, hotkeyScheme, uiLanguage, terminalThemeId, terminalFontFamilyId, terminalFontSize, sftpDoubleClickBehavior, sftpAutoSync]);

  useEffect(() => {
    localStorageAdapter.writeString(STORAGE_KEY_TERM_THEME, terminalThemeId);
@@ -568,77 +465,6 @@ export const useSettingsState = () => {
    notifySettingsChanged(STORAGE_KEY_SFTP_AUTO_SYNC, sftpAutoSync);
  }, [sftpAutoSync, notifySettingsChanged]);

-  // Persist SFTP show hidden files setting
-  useEffect(() => {
-    localStorageAdapter.writeString(STORAGE_KEY_SFTP_SHOW_HIDDEN_FILES, sftpShowHiddenFiles ? 'true' : 'false');
-    notifySettingsChanged(STORAGE_KEY_SFTP_SHOW_HIDDEN_FILES, sftpShowHiddenFiles);
-  }, [sftpShowHiddenFiles, notifySettingsChanged]);
-
-  // Persist SFTP compressed upload setting
-  useEffect(() => {
-    localStorageAdapter.writeString(STORAGE_KEY_SFTP_USE_COMPRESSED_UPLOAD, sftpUseCompressedUpload ? 'true' : 'false');
-    notifySettingsChanged(STORAGE_KEY_SFTP_USE_COMPRESSED_UPLOAD, sftpUseCompressedUpload);
-  }, [sftpUseCompressedUpload, notifySettingsChanged]);
-
-  // Persist Session Logs settings
-  useEffect(() => {
-    localStorageAdapter.writeString(STORAGE_KEY_SESSION_LOGS_ENABLED, sessionLogsEnabled ? 'true' : 'false');
-    notifySettingsChanged(STORAGE_KEY_SESSION_LOGS_ENABLED, sessionLogsEnabled);
-  }, [sessionLogsEnabled, notifySettingsChanged]);
-
-  useEffect(() => {
-    localStorageAdapter.writeString(STORAGE_KEY_SESSION_LOGS_DIR, sessionLogsDir);
-    notifySettingsChanged(STORAGE_KEY_SESSION_LOGS_DIR, sessionLogsDir);
-  }, [sessionLogsDir, notifySettingsChanged]);
-
-  useEffect(() => {
-    localStorageAdapter.writeString(STORAGE_KEY_SESSION_LOGS_FORMAT, sessionLogsFormat);
-    notifySettingsChanged(STORAGE_KEY_SESSION_LOGS_FORMAT, sessionLogsFormat);
-  }, [sessionLogsFormat, notifySettingsChanged]);
-
-  // Persist and sync toggle window hotkey setting
-  useEffect(() => {
-    localStorageAdapter.writeString(STORAGE_KEY_TOGGLE_WINDOW_HOTKEY, toggleWindowHotkey);
-    notifySettingsChanged(STORAGE_KEY_TOGGLE_WINDOW_HOTKEY, toggleWindowHotkey);
-    // Register/unregister the global hotkey in main process
-    const bridge = netcattyBridge.get();
-    if (bridge?.registerGlobalHotkey) {
-      if (toggleWindowHotkey) {
-        setHotkeyRegistrationError(null);
-        bridge
-          .registerGlobalHotkey(toggleWindowHotkey)
-          .then((result) => {
-            if (result?.success === false) {
-              console.warn('[GlobalHotkey] Hotkey registration failed:', result.error);
-              setHotkeyRegistrationError(result.error || 'Failed to register hotkey');
-            }
-          })
-          .catch((err) => {
-            console.warn('[GlobalHotkey] Failed to register hotkey:', err);
-            setHotkeyRegistrationError(err?.message || 'Failed to register hotkey');
-          });
-      } else {
-        setHotkeyRegistrationError(null);
-        bridge.unregisterGlobalHotkey?.().catch((err) => {
-          console.warn('[GlobalHotkey] Failed to unregister hotkey:', err);
-        });
-      }
-    }
-  }, [toggleWindowHotkey, notifySettingsChanged]);
-
-  // Persist and sync close to tray setting
-  useEffect(() => {
-    localStorageAdapter.writeString(STORAGE_KEY_CLOSE_TO_TRAY, closeToTray ? 'true' : 'false');
-    notifySettingsChanged(STORAGE_KEY_CLOSE_TO_TRAY, closeToTray);
-    // Update main process tray behavior
-    const bridge = netcattyBridge.get();
-    if (bridge?.setCloseToTray) {
-      bridge.setCloseToTray(closeToTray).catch((err) => {
-        console.warn('[SystemTray] Failed to set close-to-tray:', err);
-      });
-    }
-  }, [closeToTray, notifySettingsChanged]);
-
  // Get merged key bindings (defaults + custom overrides)
  const keyBindings = useMemo((): KeyBinding[] => {
    return DEFAULT_KEY_BINDINGS.map(binding => {
@@ -719,8 +545,6 @@ export const useSettingsState = () => {
    setAccentMode,
    customAccent,
    setCustomAccent,
-    uiFontFamilyId,
-    setUiFontFamilyId,
    syncConfig,
    updateSyncConfig,
    uiLanguage,
@@ -751,23 +575,6 @@ export const useSettingsState = () => {
    setSftpDoubleClickBehavior,
    sftpAutoSync,
    setSftpAutoSync,
-    sftpShowHiddenFiles,
-    setSftpShowHiddenFiles,
-    sftpUseCompressedUpload,
-    setSftpUseCompressedUpload,
    availableFonts,
-    // Session Logs
-    sessionLogsEnabled,
-    setSessionLogsEnabled,
-    sessionLogsDir,
-    setSessionLogsDir,
-    sessionLogsFormat,
-    setSessionLogsFormat,
-    // Global Toggle Window (Quake Mode)
-    toggleWindowHotkey,
-    setToggleWindowHotkey,
-    closeToTray,
-    setCloseToTray,
-    hotkeyRegistrationError,
  };
 };
--- a/application/state/useSftpBackend.ts
+++ b/application/state/useSftpBackend.ts
@@ -1,6 +1,6 @@
 import { useCallback } from "react";
 import { netcattyBridge } from "../../infrastructure/services/netcattyBridge";
-import type { RemoteFile, SftpFilenameEncoding } from "../../types";
+import type { RemoteFile } from "../../types";

 export const useSftpBackend = () => {
  const openSftp = useCallback(async (options: NetcattySSHOptions) => {
@@ -15,34 +15,34 @@ export const useSftpBackend = () => {
    return bridge.closeSftp(sftpId);
  }, []);

-  const listSftp = useCallback(async (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => {
+  const listSftp = useCallback(async (sftpId: string, path: string) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.listSftp) throw new Error("SFTP bridge unavailable");
-    return bridge.listSftp(sftpId, path, encoding);
+    return bridge.listSftp(sftpId, path);
  }, []);

-  const readSftp = useCallback(async (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => {
+  const readSftp = useCallback(async (sftpId: string, path: string) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.readSftp) throw new Error("SFTP bridge unavailable");
-    return bridge.readSftp(sftpId, path, encoding);
+    return bridge.readSftp(sftpId, path);
  }, []);

-  const readSftpBinary = useCallback(async (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => {
+  const readSftpBinary = useCallback(async (sftpId: string, path: string) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.readSftpBinary) throw new Error("readSftpBinary unavailable");
-    return bridge.readSftpBinary(sftpId, path, encoding);
+    return bridge.readSftpBinary(sftpId, path);
  }, []);

-  const writeSftp = useCallback(async (sftpId: string, path: string, content: string, encoding?: SftpFilenameEncoding) => {
+  const writeSftp = useCallback(async (sftpId: string, path: string, content: string) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.writeSftp) throw new Error("SFTP bridge unavailable");
-    return bridge.writeSftp(sftpId, path, content, encoding);
+    return bridge.writeSftp(sftpId, path, content);
  }, []);

-  const writeSftpBinary = useCallback(async (sftpId: string, path: string, content: ArrayBuffer, encoding?: SftpFilenameEncoding) => {
+  const writeSftpBinary = useCallback(async (sftpId: string, path: string, content: ArrayBuffer) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.writeSftpBinary) throw new Error("writeSftpBinary unavailable");
-    return bridge.writeSftpBinary(sftpId, path, content, encoding);
+    return bridge.writeSftpBinary(sftpId, path, content);
  }, []);

  const writeSftpBinaryWithProgress = useCallback(
@@ -51,7 +51,6 @@ export const useSftpBackend = () => {
      path: string,
      content: ArrayBuffer,
      transferId: string,
-      encoding?: SftpFilenameEncoding,
      onProgress?: (transferred: number, total: number, speed: number) => void,
      onComplete?: () => void,
      onError?: (error: string) => void,
@@ -63,7 +62,6 @@ export const useSftpBackend = () => {
        path,
        content,
        transferId,
-        encoding,
        onProgress,
        onComplete,
        onError,
@@ -72,34 +70,34 @@ export const useSftpBackend = () => {
    [],
  );

-  const mkdirSftp = useCallback(async (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => {
+  const mkdirSftp = useCallback(async (sftpId: string, path: string) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.mkdirSftp) throw new Error("mkdirSftp unavailable");
-    return bridge.mkdirSftp(sftpId, path, encoding);
+    return bridge.mkdirSftp(sftpId, path);
  }, []);

-  const deleteSftp = useCallback(async (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => {
+  const deleteSftp = useCallback(async (sftpId: string, path: string) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.deleteSftp) throw new Error("deleteSftp unavailable");
-    return bridge.deleteSftp(sftpId, path, encoding);
+    return bridge.deleteSftp(sftpId, path);
  }, []);

-  const renameSftp = useCallback(async (sftpId: string, oldPath: string, newPath: string, encoding?: SftpFilenameEncoding) => {
+  const renameSftp = useCallback(async (sftpId: string, oldPath: string, newPath: string) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.renameSftp) throw new Error("renameSftp unavailable");
-    return bridge.renameSftp(sftpId, oldPath, newPath, encoding);
+    return bridge.renameSftp(sftpId, oldPath, newPath);
  }, []);

-  const statSftp = useCallback(async (sftpId: string, path: string, encoding?: SftpFilenameEncoding) => {
+  const statSftp = useCallback(async (sftpId: string, path: string) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.statSftp) throw new Error("statSftp unavailable");
-    return bridge.statSftp(sftpId, path, encoding);
+    return bridge.statSftp(sftpId, path);
  }, []);

-  const chmodSftp = useCallback(async (sftpId: string, path: string, mode: string, encoding?: SftpFilenameEncoding) => {
+  const chmodSftp = useCallback(async (sftpId: string, path: string, mode: string) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.chmodSftp) throw new Error("chmodSftp unavailable");
-    return bridge.chmodSftp(sftpId, path, mode, encoding);
+    return bridge.chmodSftp(sftpId, path, mode);
  }, []);

  const listLocalDir = useCallback(async (path: string): Promise<RemoteFile[]> => {
@@ -170,12 +168,6 @@ export const useSftpBackend = () => {
    return bridge.cancelTransfer(transferId);
  }, []);

-  const cancelSftpUpload = useCallback(async (transferId: string) => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.cancelSftpUpload) return undefined;
-    return bridge.cancelSftpUpload(transferId);
-  }, []);
-
  const onTransferProgress = useCallback((transferId: string, cb: Parameters<NonNullable<NetcattyBridge["onTransferProgress"]>>[1]) => {
    const bridge = netcattyBridge.get();
    if (!bridge?.onTransferProgress) return undefined;
@@ -188,21 +180,12 @@ export const useSftpBackend = () => {
    return bridge.selectApplication();
  }, []);

-  const showSaveDialog = useCallback(async (
-    defaultPath: string,
-    filters?: Array<{ name: string; extensions: string[] }>
-  ) => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.showSaveDialog) return null;
-    return bridge.showSaveDialog(defaultPath, filters);
-  }, []);
-
  const downloadSftpToTempAndOpen = useCallback(async (
    sftpId: string,
    remotePath: string,
    fileName: string,
    appPath: string,
-    options?: { enableWatch?: boolean; encoding?: SftpFilenameEncoding }
+    options?: { enableWatch?: boolean }
  ): Promise<{ localTempPath: string; watchId?: string }> => {
    const bridge = netcattyBridge.get();
    if (!bridge?.downloadSftpToTemp || !bridge?.openWithApplication) {
@@ -211,7 +194,7 @@ export const useSftpBackend = () => {
    
    // Download the file to temp
    console.log("[SFTPBackend] Downloading file to temp", { sftpId, remotePath, fileName });
-    const tempPath = await bridge.downloadSftpToTemp(sftpId, remotePath, fileName, options?.encoding);
+    const tempPath = await bridge.downloadSftpToTemp(sftpId, remotePath, fileName);
    console.log("[SFTPBackend] File downloaded to temp", { tempPath });
    
    // Register temp file for cleanup when SFTP session closes (regardless of auto-sync setting)
@@ -234,7 +217,7 @@ export const useSftpBackend = () => {
    if (options?.enableWatch && bridge.startFileWatch) {
      try {
        console.log("[SFTPBackend] Starting file watch", { tempPath, remotePath, sftpId });
-        const result = await bridge.startFileWatch(tempPath, remotePath, sftpId, options?.encoding);
+        const result = await bridge.startFileWatch(tempPath, remotePath, sftpId);
        watchId = result.watchId;
        console.log("[SFTPBackend] File watch started successfully", { watchId, tempPath, remotePath });
      } catch (err) {
@@ -274,10 +257,9 @@ export const useSftpBackend = () => {

    startStreamTransfer,
    cancelTransfer,
-    cancelSftpUpload,
    onTransferProgress,
    selectApplication,
-    showSaveDialog,
    downloadSftpToTempAndOpen,
  };
 };
+
--- a/application/state/useSftpState.ts
+++ b/application/state/useSftpState.ts
--- a/application/state/useStoredBoolean.ts
+++ b/application/state/useStoredBoolean.ts
@@ -1,24 +0,0 @@
-import { useEffect, useState } from "react";
-import { localStorageAdapter } from "../../infrastructure/persistence/localStorageAdapter";
-
-/**
- * Hook for persisting a boolean value to localStorage.
- * @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
- */
-export const useStoredBoolean = (
-    storageKey: string,
-    fallback: boolean = false,
-) => {
-    const [value, setValue] = useState<boolean>(() => {
-        const stored = localStorageAdapter.readBoolean(storageKey);
-        return stored ?? fallback;
-    });
-
-    useEffect(() => {
-        localStorageAdapter.writeBoolean(storageKey, value);
-    }, [storageKey, value]);
-
-    return [value, setValue] as const;
-};
--- a/application/state/useStoredViewMode.ts
+++ b/application/state/useStoredViewMode.ts
@@ -1,10 +1,10 @@
 import { useEffect, useState } from "react";
 import { localStorageAdapter } from "../../infrastructure/persistence/localStorageAdapter";

-export type ViewMode = "grid" | "list" | "tree";
+export type ViewMode = "grid" | "list";

 const isViewMode = (value: string | null): value is ViewMode =>
-  value === "grid" || value === "list" || value === "tree";
+  value === "grid" || value === "list";

 export const useStoredViewMode = (
  storageKey: string,
--- a/application/state/useTerminalBackend.ts
+++ b/application/state/useTerminalBackend.ts
@@ -122,12 +122,6 @@ export const useTerminalBackend = () => {
    return bridge.getSessionPwd(sessionId);
  }, []);

-  const getServerStats = useCallback(async (sessionId: string) => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.getServerStats) return { success: false, error: 'getServerStats unavailable' };
-    return bridge.getServerStats(sessionId);
-  }, []);
-
  return {
    backendAvailable,
    telnetAvailable,
@@ -144,7 +138,6 @@ export const useTerminalBackend = () => {
    listSerialPorts,
    execCommand,
    getSessionPwd,
-    getServerStats,
    writeToSession,
    resizeSession,
    closeSession,
--- a/application/state/useTrayPanelBackend.ts
+++ b/application/state/useTrayPanelBackend.ts
@@ -1,66 +0,0 @@
-import { useCallback } from "react";
-import { netcattyBridge } from "../../infrastructure/services/netcattyBridge";
-
-export const useTrayPanelBackend = () => {
-  const hideTrayPanel = useCallback(async () => {
-    const bridge = netcattyBridge.get();
-    await bridge?.hideTrayPanel?.();
-  }, []);
-
-  const openMainWindow = useCallback(async () => {
-    const bridge = netcattyBridge.get();
-    await bridge?.openMainWindow?.();
-  }, []);
-
-  const jumpToSession = useCallback(async (sessionId: string) => {
-    const bridge = netcattyBridge.get();
-    await bridge?.jumpToSessionFromTrayPanel?.(sessionId);
-  }, []);
-
-  const connectToHostFromTrayPanel = useCallback(async (hostId: string) => {
-    const bridge = netcattyBridge.get();
-    await bridge?.connectToHostFromTrayPanel?.(hostId);
-  }, []);
-
-  const onTrayPanelCloseRequest = useCallback((callback: () => void) => {
-    const bridge = netcattyBridge.get();
-    return bridge?.onTrayPanelCloseRequest?.(callback);
-  }, []);
-
-  const onTrayPanelRefresh = useCallback((callback: () => void) => {
-    const bridge = netcattyBridge.get();
-    return bridge?.onTrayPanelRefresh?.(callback);
-  }, []);
-
-  const onTrayPanelMenuData = useCallback(
-    (
-      callback: (data: {
-        sessions?: Array<{ id: string; label: string; hostLabel: string; status: "connecting" | "connected" | "disconnected"; workspaceId?: string; workspaceTitle?: string }>;
-        portForwardRules?: Array<{
-          id: string;
-          label: string;
-          type: "local" | "remote" | "dynamic";
-          localPort: number;
-          remoteHost?: string;
-          remotePort?: number;
-          status: "inactive" | "connecting" | "active" | "error";
-          hostId?: string;
-        }>;
-      }) => void,
-    ) => {
-      const bridge = netcattyBridge.get();
-      return bridge?.onTrayPanelMenuData?.(callback);
-    },
-    [],
-  );
-
-  return {
-    hideTrayPanel,
-    openMainWindow,
-    jumpToSession,
-    connectToHostFromTrayPanel,
-    onTrayPanelCloseRequest,
-    onTrayPanelRefresh,
-    onTrayPanelMenuData,
-  };
-};
--- a/application/state/useTreeExpandedState.ts
+++ b/application/state/useTreeExpandedState.ts
@@ -1,47 +0,0 @@
-import { useEffect, useState } from "react";
-import { localStorageAdapter } from "../../infrastructure/persistence/localStorageAdapter";
-
-export const useTreeExpandedState = (storageKey: string) => {
-  const [expandedPaths, setExpandedPaths] = useState<Set<string>>(() => {
-    const stored = localStorageAdapter.readString(storageKey);
-    if (stored) {
-      try {
-        const paths = JSON.parse(stored) as string[];
-        return new Set(paths);
-      } catch {
-        return new Set();
-      }
-    }
-    return new Set();
-  });
-
-  useEffect(() => {
-    const pathsArray = Array.from(expandedPaths);
-    localStorageAdapter.writeString(storageKey, JSON.stringify(pathsArray));
-  }, [storageKey, expandedPaths]);
-
-  const togglePath = (path: string) => {
-    const newExpanded = new Set(expandedPaths);
-    if (newExpanded.has(path)) {
-      newExpanded.delete(path);
-    } else {
-      newExpanded.add(path);
-    }
-    setExpandedPaths(newExpanded);
-  };
-
-  const expandAll = (allPaths: string[]) => {
-    setExpandedPaths(new Set(allPaths));
-  };
-
-  const collapseAll = () => {
-    setExpandedPaths(new Set());
-  };
-
-  return {
-    expandedPaths,
-    togglePath,
-    expandAll,
-    collapseAll,
-  };
-};
--- a/application/state/useVaultState.ts
+++ b/application/state/useVaultState.ts
@@ -6,7 +6,6 @@ import {
  Identity,
  KeyCategory,
  KnownHost,
-  ManagedSource,
  ShellHistoryEntry,
  Snippet,
  SSHKey,
@@ -23,7 +22,6 @@ import {
  STORAGE_KEY_KEYS,
  STORAGE_KEY_KNOWN_HOSTS,
  STORAGE_KEY_LEGACY_KEYS,
-  STORAGE_KEY_MANAGED_SOURCES,
  STORAGE_KEY_SHELL_HISTORY,
  STORAGE_KEY_SNIPPET_PACKAGES,
  STORAGE_KEY_SNIPPETS,
@@ -97,7 +95,6 @@ export const useVaultState = () => {
  const [knownHosts, setKnownHosts] = useState<KnownHost[]>([]);
  const [shellHistory, setShellHistory] = useState<ShellHistoryEntry[]>([]);
  const [connectionLogs, setConnectionLogs] = useState<ConnectionLog[]>([]);
-  const [managedSources, setManagedSources] = useState<ManagedSource[]>([]);

  const updateHosts = useCallback((data: Host[]) => {
    const cleaned = data.map(sanitizeHost);
@@ -135,11 +132,6 @@ export const useVaultState = () => {
    localStorageAdapter.write(STORAGE_KEY_KNOWN_HOSTS, data);
  }, []);

-  const updateManagedSources = useCallback((data: ManagedSource[]) => {
-    setManagedSources(data);
-    localStorageAdapter.write(STORAGE_KEY_MANAGED_SOURCES, data);
-  }, []);
-
  const clearVaultData = useCallback(() => {
    updateHosts([]);
    updateKeys([]);
@@ -148,7 +140,6 @@ export const useVaultState = () => {
    updateSnippetPackages([]);
    updateCustomGroups([]);
    updateKnownHosts([]);
-    updateManagedSources([]);
    localStorageAdapter.remove(STORAGE_KEY_LEGACY_KEYS);
  }, [
    updateHosts,
@@ -158,7 +149,6 @@ export const useVaultState = () => {
    updateSnippetPackages,
    updateCustomGroups,
    updateKnownHosts,
-    updateManagedSources,
  ]);

  const addShellHistoryEntry = useCallback(
@@ -349,12 +339,6 @@ export const useVaultState = () => {
      STORAGE_KEY_CONNECTION_LOGS,
    );
    if (savedConnectionLogs) setConnectionLogs(savedConnectionLogs);
-
-    // Load managed sources
-    const savedManagedSources = localStorageAdapter.read<ManagedSource[]>(
-      STORAGE_KEY_MANAGED_SOURCES,
-    );
-    if (savedManagedSources) setManagedSources(savedManagedSources);
  }, [updateHosts, updateSnippets]);

  useEffect(() => {
@@ -423,12 +407,6 @@ export const useVaultState = () => {
      if (key === STORAGE_KEY_CONNECTION_LOGS) {
        const next = safeParse<ConnectionLog[]>(event.newValue) ?? [];
        setConnectionLogs(next);
-        return;
-      }
-
-      if (key === STORAGE_KEY_MANAGED_SOURCES) {
-        const next = safeParse<ManagedSource[]>(event.newValue) ?? [];
-        setManagedSources(next);
      }
    };

@@ -496,7 +474,6 @@ export const useVaultState = () => {
    knownHosts,
    shellHistory,
    connectionLogs,
-    managedSources,
    updateHosts,
    updateKeys,
    updateIdentities,
@@ -504,7 +481,6 @@ export const useVaultState = () => {
    updateSnippetPackages,
    updateCustomGroups,
    updateKnownHosts,
-    updateManagedSources,
    addShellHistoryEntry,
    clearShellHistory,
    addConnectionLog,
--- a/components/ConnectionLogsManager.tsx
+++ b/components/ConnectionLogsManager.tsx
@@ -4,10 +4,9 @@ import {
    Server,
    Terminal,
    Trash2,
-    Usb,
    User,
 } from "lucide-react";
-import React, { memo, useCallback, useMemo, useState } from "react";
+import React, { memo, useCallback, useMemo } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { cn } from "../lib/utils";
 import { ConnectionLog, Host } from "../types";
@@ -64,7 +63,6 @@ interface LogItemProps {
 const LogItem = memo<LogItemProps>(({ log, onToggleSaved, onDelete, onClick }) => {
    const { t, resolvedLocale } = useI18n();
    const isLocal = log.protocol === "local" || log.hostname === "localhost";
-    const isSerial = log.protocol === "serial";

    return (
        <div
@@ -94,14 +92,14 @@ const LogItem = memo<LogItemProps>(({ log, onToggleSaved, onDelete, onClick }) =
            <div className="flex items-center gap-2 flex-1 min-w-0">
                <div className={cn(
                    "h-8 w-8 rounded-lg flex items-center justify-center shrink-0",
-                    isSerial ? "bg-amber-500/10 text-amber-500" : isLocal ? "bg-emerald-500/10 text-emerald-500" : "bg-blue-500/10 text-blue-500"
+                    isLocal ? "bg-emerald-500/10 text-emerald-500" : "bg-blue-500/10 text-blue-500"
                )}>
-                    {isSerial ? <Usb size={14} /> : isLocal ? <Terminal size={14} /> : <Server size={14} />}
+                    {isLocal ? <Terminal size={14} /> : <Server size={14} />}
                </div>
                <div className="min-w-0">
                    <div className="text-sm font-medium truncate">{isLocal ? t("logs.localTerminal") : log.hostLabel}</div>
                    <div className="text-xs text-muted-foreground truncate">
-                        {isLocal ? "local" : isSerial ? `serial, ${log.hostname}` : `${log.protocol}, ${log.username}`}
+                        {isLocal ? "local" : `${log.protocol}, ${log.username}`}
                    </div>
                </div>
            </div>
@@ -149,11 +147,7 @@ const ConnectionLogsManager: React.FC<ConnectionLogsManagerProps> = ({
    onOpenLogView,
 }) => {
    const { t } = useI18n();
-    const INITIAL_RENDER_LIMIT = 30;
-    const LOAD_MORE_COUNT = 30;
-
-    // Track how many items to show
-    const [renderLimit, setRenderLimit] = useState(INITIAL_RENDER_LIMIT);
+    const RENDER_LIMIT = 100;

    // Sort logs by newest first
    const filteredLogs = useMemo(() => {
@@ -161,14 +155,10 @@ const ConnectionLogsManager: React.FC<ConnectionLogsManagerProps> = ({
    }, [logs]);

    const displayedLogs = useMemo(() => {
-        return filteredLogs.slice(0, renderLimit);
-    }, [filteredLogs, renderLimit]);
+        return filteredLogs.slice(0, RENDER_LIMIT);
+    }, [filteredLogs]);

-    const hasMore = filteredLogs.length > renderLimit;
-
-    const handleLoadMore = useCallback(() => {
-        setRenderLimit(prev => prev + LOAD_MORE_COUNT);
-    }, []);
+    const hasMore = filteredLogs.length > RENDER_LIMIT;

    const handleToggleSaved = useCallback(
        (id: string) => onToggleSaved(id),
@@ -230,12 +220,9 @@ const ConnectionLogsManager: React.FC<ConnectionLogsManagerProps> = ({
                        <>
                            {renderedItems}
                            {hasMore && (
-                                <button
-                                    onClick={handleLoadMore}
-                                    className="w-full py-3 text-sm text-primary hover:bg-secondary/50 transition-colors"
-                                >
-                                    {t("logs.loadMore", { count: Math.min(LOAD_MORE_COUNT, filteredLogs.length - renderLimit) })}
-                                </button>
+                                <div className="text-center py-4 text-sm text-muted-foreground">
+                                    {t("logs.showing", { limit: RENDER_LIMIT, total: filteredLogs.length })}
+                                </div>
                            )}
                        </>
                    )}
--- a/components/CreateWorkspaceDialog.tsx
+++ b/components/CreateWorkspaceDialog.tsx
@@ -1,143 +0,0 @@
-import { Search } from 'lucide-react';
-import React, { useMemo, useState, useEffect } from 'react';
-import { useI18n } from '../application/i18n/I18nProvider';
-import { Host } from '../types';
-import { DistroAvatar } from './DistroAvatar';
-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 { ScrollArea } from './ui/scroll-area';
-
-interface CreateWorkspaceDialogProps {
-  isOpen: boolean;
-  onClose: () => void;
-  hosts: Host[];
-  onCreate: (name: string, selectedHosts: Host[]) => void;
-}
-
-export const CreateWorkspaceDialog: React.FC<CreateWorkspaceDialogProps> = ({
-  isOpen,
-  onClose,
-  hosts,
-  onCreate,
-}) => {
-  const { t } = useI18n();
-  const [name, setName] = useState('');
-  const [search, setSearch] = useState('');
-  const [selectedHostIds, setSelectedHostIds] = useState<Set<string>>(new Set());
-
-  const filteredHosts = useMemo(() => {
-    if (!search.trim()) return hosts;
-    const term = search.toLowerCase();
-    return hosts.filter(h =>
-      h.label.toLowerCase().includes(term) ||
-      h.hostname.toLowerCase().includes(term) ||
-      (h.group || '').toLowerCase().includes(term)
-    );
-  }, [hosts, search]);
-
-  const toggleHost = (hostId: string) => {
-    setSelectedHostIds(prev => {
-      const next = new Set(prev);
-      if (next.has(hostId)) {
-        next.delete(hostId);
-      } else {
-        next.add(hostId);
-      }
-      return next;
-    });
-  };
-
-  const handleCreate = () => {
-    const selected = hosts.filter(h => selectedHostIds.has(h.id));
-    onCreate(name, selected);
-    onClose();
-  };
-
-  useEffect(() => {
-    if (isOpen) {
-        setName('');
-        setSearch('');
-        setSelectedHostIds(new Set());
-    }
-  }, [isOpen]);
-
-  return (
-    <Dialog open={isOpen} onOpenChange={(open) => !open && onClose()}>
-      <DialogContent className="max-w-md flex flex-col max-h-[80vh]">
-        <DialogHeader>
-          <DialogTitle>{t('dialog.createWorkspace.title', 'Create Workspace')}</DialogTitle>
-        </DialogHeader>
-
-        <div className="space-y-4 py-2 flex-1 flex flex-col min-h-0">
-          <div className="space-y-2">
-            <Label htmlFor="workspace-name">{t('field.name', 'Name')}</Label>
-            <Input
-              id="workspace-name"
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              placeholder={t('placeholder.workspaceName', 'Workspace Name')}
-              autoFocus
-            />
-          </div>
-
-          <div className="space-y-2 flex-1 flex flex-col min-h-0">
-            <Label>{t('field.selectHosts', 'Select Hosts')}</Label>
-            <div className="relative">
-                <Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
-                <Input
-                placeholder={t('placeholder.searchHosts', 'Search hosts...')}
-                value={search}
-                onChange={(e) => setSearch(e.target.value)}
-                className="pl-8"
-                />
-            </div>
-
-            <div className="border rounded-md flex-1 min-h-[200px]">
-                <ScrollArea className="h-full max-h-[300px]">
-                    <div className="p-2 space-y-1">
-                        {filteredHosts.length === 0 ? (
-                            <div className="text-center py-4 text-sm text-muted-foreground">
-                                {t('common.noResults', 'No hosts found')}
-                            </div>
-                        ) : (
-                            filteredHosts.map(host => {
-                                const isSelected = selectedHostIds.has(host.id);
-                                return (
-                                    <div
-                                        key={host.id}
-                                        className={`flex items-center gap-3 p-2 rounded-md cursor-pointer hover:bg-muted/50 ${isSelected ? 'bg-primary/10' : ''}`}
-                                        onClick={() => toggleHost(host.id)}
-                                    >
-                                        <div className={`h-4 w-4 border rounded flex items-center justify-center ${isSelected ? 'bg-primary border-primary' : 'border-muted-foreground'}`}>
-                                            {isSelected && <div className="h-2 w-2 bg-primary-foreground rounded-sm" />}
-                                        </div>
-                                        <DistroAvatar host={host} size="sm" fallback={host.label.slice(0, 2).toUpperCase()} />
-                                        <div className="flex-1 min-w-0">
-                                            <div className="font-medium truncate">{host.label}</div>
-                                            <div className="text-xs text-muted-foreground truncate">{host.hostname}</div>
-                                        </div>
-                                    </div>
-                                );
-                            })
-                        )}
-                    </div>
-                </ScrollArea>
-            </div>
-            <div className="text-xs text-muted-foreground text-right">
-                {selectedHostIds.size} {t('common.selected', 'selected')}
-            </div>
-          </div>
-        </div>
-
-        <DialogFooter>
-          <Button variant="ghost" onClick={onClose}>{t('common.cancel', 'Cancel')}</Button>
-          <Button onClick={handleCreate} disabled={!name.trim() || selectedHostIds.size === 0}>
-            {t('common.create', 'Create')}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};
--- a/components/DistroAvatar.tsx
+++ b/components/DistroAvatar.tsx
@@ -1,4 +1,4 @@
-import { Server, Usb } from "lucide-react";
+import { Server } from "lucide-react";
 import React, { memo } from "react";
 import { normalizeDistroId } from "../domain/host";
 import { cn } from "../lib/utils";
@@ -69,21 +69,6 @@ const DistroAvatarInner: React.FC<DistroAvatarProps> = ({
  const containerClass = sizeClasses[size];
  const iconSize = iconSizes[size];

-  // Show USB icon for serial hosts
-  if (host.protocol === 'serial') {
-    return (
-      <div
-        className={cn(
-          containerClass,
-          "flex items-center justify-center bg-amber-500/15 text-amber-500",
-          className,
-        )}
-      >
-        <Usb className={iconSize} />
-      </div>
-    );
-  }
-
  if (logo && !errored) {
    return (
      <div
--- a/components/GroupTreeItem.tsx
+++ b/components/GroupTreeItem.tsx
@@ -16,7 +16,6 @@ interface GroupTreeItemProps {
  onEditGroup: (path: string) => void;
  onNewHost: (path: string) => void;
  onNewSubfolder: (path: string) => void;
-  isManagedGroup?: (path: string) => boolean;
 }

 export const GroupTreeItem: React.FC<GroupTreeItemProps> = ({
--- a/components/HostDetailsPanel.tsx
+++ b/components/HostDetailsPanel.tsx
@@ -1,35 +1,24 @@
 import {
-  AlertTriangle,
  Check,
  ChevronDown,
-  Eye,
-  EyeOff,
-  FolderLock,
  FolderPlus,
-  Forward,
  Globe,
  Key,
-  KeyRound,
  Link2,
-  MapPin,
-  Palette,
  Plus,
-  Settings2,
  Shield,
  Tag,
  TerminalSquare,
  User,
  Variable,
-  Wifi,
  X,
 } from "lucide-react";
 import React, { useEffect, useMemo, useState, useCallback } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
-import { useApplicationBackend } from "../application/state/useApplicationBackend";
 import { TERMINAL_THEMES } from "../infrastructure/config/terminalThemes";
 import { MIN_FONT_SIZE, MAX_FONT_SIZE } from "../infrastructure/config/fonts";
 import { cn } from "../lib/utils";
-import { EnvVar, Host, Identity, ManagedSource, ProxyConfig, SSHKey } from "../types";
+import { EnvVar, Host, Identity, ProxyConfig, SSHKey } from "../types";
 import { DistroAvatar } from "./DistroAvatar";
 import ThemeSelectPanel from "./ThemeSelectPanel";
 import {
@@ -39,14 +28,11 @@ import {
 } from "./ui/aside-panel";
 import { Badge } from "./ui/badge";
 import { Button } from "./ui/button";
-import { Switch } from "./ui/switch";
 import { Card } from "./ui/card";
 import { Combobox, ComboboxOption, MultiCombobox } from "./ui/combobox";
 import { Input } from "./ui/input";
-import { Textarea } from "./ui/textarea";
 import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";
 import { ScrollArea } from "./ui/scroll-area";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select";

 // Import host-details sub-panels
 import {
@@ -71,7 +57,6 @@ interface HostDetailsPanelProps {
  availableKeys: SSHKey[];
  identities: Identity[];
  groups: string[];
-  managedSources?: ManagedSource[];
  allTags?: string[]; // All available tags for autocomplete
  allHosts?: Host[]; // All hosts for chain selection
  defaultGroup?: string | null; // Default group for new hosts (from current navigation)
@@ -86,7 +71,6 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
  availableKeys,
  identities,
  groups,
-  managedSources = [],
  allTags = [],
  allHosts = [],
  defaultGroup,
@@ -96,7 +80,6 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
  onCreateTag,
 }) => {
  const { t } = useI18n();
-  const { checkSshAgent } = useApplicationBackend();
  const [form, setForm] = useState<Host>(
    () =>
      initialData ||
@@ -109,6 +92,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
        protocol: "ssh",
        tags: [],
        os: "linux",
+        agentForwarding: false,
        authMethod: "password",
        charset: "UTF-8",
        theme: "Flexoki Dark",
@@ -128,29 +112,10 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
  // Identity suggestion dropdown state (popover anchored to username input)
  const [identitySuggestionsOpen, setIdentitySuggestionsOpen] = useState(false);

-  // Password visibility state
-  const [showPassword, setShowPassword] = useState(false);
-
  // New group creation state
  const [newGroupName, setNewGroupName] = useState("");
  const [newGroupParent, setNewGroupParent] = useState("");

-  // SSH Agent status for Windows (only checked when agentForwarding is enabled)
-  const [sshAgentStatus, setSshAgentStatus] = useState<{
-    running: boolean;
-    startupType: string | null;
-    error: string | null;
-  } | null>(null);
-
-  // Check SSH Agent status when agentForwarding is toggled on (Windows only)
-  useEffect(() => {
-    if (form.agentForwarding) {
-      checkSshAgent().then(setSshAgentStatus);
-    } else {
-      setSshAgentStatus(null);
-    }
-  }, [form.agentForwarding, checkSshAgent]);
-
  // Group input state for inline creation suggestion
  const [groupInputValue, setGroupInputValue] = useState(form.group || "");

@@ -172,8 +137,6 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
      }
      setForm(updatedData);
      setGroupInputValue(initialData.group || "");
-      // Reset password visibility when host changes for privacy
-      setShowPassword(false);
    }
  }, [initialData]);

@@ -254,51 +217,12 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
  };

  const handleSubmit = () => {
-    if (!form.hostname) return;
-    // If label is empty, use hostname as label
-    let finalLabel = form.label?.trim() || form.hostname;
-    const finalGroup = groupInputValue.trim() || form.group || "";
-
-    // Find the most specific (deepest) managed source that matches the group path
-    // This handles nested managed groups correctly by preferring exact matches
-    // and longer paths over shorter prefix matches
-    const targetManagedSource = managedSources
-      .filter(s => finalGroup === s.groupName || finalGroup.startsWith(s.groupName + "/"))
-      .sort((a, b) => b.groupName.length - a.groupName.length)[0];
-
-    // Only SSH hosts can be managed (SSH config only supports SSH protocol)
-    const canBeManaged = !form.protocol || form.protocol === "ssh";
-
-    // Strip spaces from label only if host can be managed and is in a managed group
-    // (SSH config requires no spaces in Host alias)
-    if (targetManagedSource && canBeManaged) {
-      finalLabel = finalLabel.replace(/\s/g, '');
-    }
-
-    // Determine managedSourceId:
-    // - Only SSH hosts can be managed (SSH config only supports SSH protocol)
-    // - If we found a matching managed source, use its id
-    // - If managedSources was not provided (empty array) and host already has managedSourceId, preserve it
-    // - Otherwise, clear it (host is not in a managed group)
-    let finalManagedSourceId: string | undefined;
-    if (targetManagedSource && canBeManaged) {
-      finalManagedSourceId = targetManagedSource.id;
-    } else if (managedSources.length === 0 && form.managedSourceId && canBeManaged) {
-      // managedSources not provided, preserve existing value
-      finalManagedSourceId = form.managedSourceId;
-    } else {
-      finalManagedSourceId = undefined;
-    }
-
+    if (!form.hostname || !form.label) return;
    const cleaned: Host = {
      ...form,
-      label: finalLabel,
-      group: finalGroup,
+      group: groupInputValue.trim() || form.group,
      tags: form.tags || [],
      port: form.port || 22,
-      // Clear password if savePassword is explicitly set to false
-      password: form.savePassword === false ? undefined : form.password,
-      managedSourceId: finalManagedSourceId,
    };
    onSave(cleaned);
  };
@@ -548,7 +472,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
          size="icon"
          className="h-8 w-8"
          onClick={handleSubmit}
-          disabled={!form.hostname}
+          disabled={!form.hostname || !form.label}
          aria-label={t("hostDetails.saveAria")}
        >
          <Check size={16} />
@@ -556,31 +480,37 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
      }
    >
      <AsidePanelContent>
-        <Card className="p-3 space-y-3 bg-card border-border/80">
+        <Card className="p-3 space-y-2 bg-card border-border/80">
+          <p className="text-xs font-semibold">
+            {t("hostDetails.section.address")}
+          </p>
          <div className="flex items-center gap-2">
-            <Settings2 size={14} className="text-muted-foreground" />
-            <p className="text-xs font-semibold">
-              {t("hostDetails.section.general")}
-            </p>
+            <DistroAvatar
+              host={form as Host}
+              fallback={
+                form.label?.slice(0, 2).toUpperCase() ||
+                form.hostname?.slice(0, 2).toUpperCase() ||
+                "H"
+              }
+              className="h-10 w-10"
+            />
+            <Input
+              placeholder={t("hostDetails.hostname.placeholder")}
+              value={form.hostname}
+              onChange={(e) => update("hostname", e.target.value)}
+              className="h-10 flex-1"
+            />
          </div>
+        </Card>
+
+        <Card className="p-3 space-y-3 bg-card border-border/80">
+          <p className="text-xs font-semibold">
+            {t("hostDetails.section.general")}
+          </p>
          <Input
            placeholder={t("hostDetails.label.placeholder")}
            value={form.label}
-            onChange={(e) => {
-              let value = e.target.value;
-              // Only strip spaces if the TARGET group belongs to a managed source
-              // (don't use form.managedSourceId as it reflects old state before group change)
-              const targetGroup = groupInputValue.trim() || form.group || "";
-              const willBeManaged = managedSources.some(s =>
-                targetGroup === s.groupName || targetGroup.startsWith(s.groupName + "/")
-              );
-              // Also check protocol - only SSH hosts can be managed
-              const canBeManaged = !form.protocol || form.protocol === "ssh";
-              if (willBeManaged && canBeManaged) {
-                value = value.replace(/\s/g, '');
-              }
-              update("label", value);
-            }}
+            onChange={(e) => update("label", e.target.value)}
            className="h-10"
          />

@@ -592,16 +522,12 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
            <Combobox
              options={groupOptions}
              value={form.group || ""}
-              onValueChange={(val) => {
-                update("group", val);
-                setGroupInputValue(val);
-              }}
+              onValueChange={(val) => update("group", val)}
              placeholder={t("hostDetails.group.placeholder")}
              allowCreate={true}
              onCreateNew={(val) => {
                onCreateGroup?.(val);
                update("group", val);
-                setGroupInputValue(val);
              }}
              createText="Create Group"
              triggerClassName="flex-1 h-10"
@@ -626,39 +552,10 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
          </div>
        </Card>

-        <Card className="p-3 space-y-2 bg-card border-border/80">
-          <div className="flex items-center gap-2">
-            <MapPin size={14} className="text-muted-foreground" />
-            <p className="text-xs font-semibold">
-              {t("hostDetails.section.address")}
-            </p>
-          </div>
-          <div className="flex items-center gap-2">
-            <DistroAvatar
-              host={form as Host}
-              fallback={
-                form.label?.slice(0, 2).toUpperCase() ||
-                form.hostname?.slice(0, 2).toUpperCase() ||
-                "H"
-              }
-              className="h-10 w-10"
-            />
-            <Input
-              placeholder={t("hostDetails.hostname.placeholder")}
-              value={form.hostname}
-              onChange={(e) => update("hostname", e.target.value)}
-              className="h-10 flex-1"
-            />
-          </div>
-        </Card>
-
        <Card className="p-3 space-y-3 bg-card border-border/80">
-          <div className="flex items-center gap-2">
-            <KeyRound size={14} className="text-muted-foreground" />
-            <p className="text-xs font-semibold">
-              {t("hostDetails.section.portCredentials")}
-            </p>
-          </div>
+          <p className="text-xs font-semibold">
+            {t("hostDetails.section.portCredentials")}
+          </p>
          <div className="flex items-center gap-2">
            <div className="flex-1 min-w-0 h-10 flex items-center gap-2 bg-secondary/70 border border-border/70 rounded-md px-3">
              <span className="text-xs text-muted-foreground">SSH on</span>
@@ -861,36 +758,13 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
            )}

            {!selectedIdentity && !form.identityId && (
-              <div className="relative">
-                <Input
-                  placeholder={t("hostDetails.password.placeholder")}
-                  type={showPassword ? "text" : "password"}
-                  value={form.password || ""}
-                  onChange={(e) => update("password", e.target.value)}
-                  className="h-10 pr-10"
-                />
-                <button
-                  type="button"
-                  onClick={() => setShowPassword(!showPassword)}
-                  className="absolute right-2 top-1/2 -translate-y-1/2 p-1 text-muted-foreground hover:text-foreground transition-colors"
-                  title={showPassword ? t("hostDetails.password.hide") : t("hostDetails.password.show")}
-                >
-                  {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}
-                </button>
-              </div>
-            )}
-
-            {/* Save Password toggle - shown when password is entered */}
-            {!selectedIdentity && !form.identityId && form.password && (
-              <div className="flex items-center justify-between py-1">
-                <span className="text-xs text-muted-foreground">
-                  {t("hostDetails.password.save")}
-                </span>
-                <Switch
-                  checked={form.savePassword ?? true}
-                  onCheckedChange={(val) => update("savePassword" as keyof Host, val)}
-                />
-              </div>
+              <Input
+                placeholder={t("hostDetails.password.placeholder")}
+                type="password"
+                value={form.password || ""}
+                onChange={(e) => update("password", e.target.value)}
+                className="h-10"
+              />
            )}

            {/* Selected credential display */}
@@ -1049,61 +923,9 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
        </Card>

        <Card className="p-3 space-y-3 bg-card border-border/80">
-          <div className="flex items-center gap-2">
-            <FolderLock size={14} className="text-muted-foreground" />
-            <p className="text-xs font-semibold">
-              {t("hostDetails.section.sftp")}
-            </p>
-          </div>
-          <div className="flex items-center justify-between">
-            <div className="space-y-0.5">
-              <div className="text-sm font-medium">
-                {t("hostDetails.sftp.sudo")}
-              </div>
-              <div className="text-xs text-muted-foreground">
-                {t("hostDetails.sftp.sudo.desc")}
-              </div>
-            </div>
-            <Switch
-              checked={form.sftpSudo || false}
-              onCheckedChange={(val) => update("sftpSudo", val)}
-            />
-          </div>
-          {form.sftpSudo && !form.password && !selectedIdentity?.password && (
-            <p className="text-xs text-amber-500">
-              {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>
-            <Select
-              value={form.sftpEncoding || "auto"}
-              onValueChange={(val) => update("sftpEncoding", val as Host["sftpEncoding"])}
-            >
-              <SelectTrigger className="h-8">
-                <SelectValue placeholder={t("sftp.encoding.label")} />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="auto">{t("sftp.encoding.auto")}</SelectItem>
-                <SelectItem value="utf-8">{t("sftp.encoding.utf8")}</SelectItem>
-                <SelectItem value="gb18030">{t("sftp.encoding.gb18030")}</SelectItem>
-              </SelectContent>
-            </Select>
-          </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" />
-            <p className="text-xs font-semibold">
-              {t("hostDetails.section.appearance")}
-            </p>
-          </div>
+          <p className="text-xs font-semibold">
+            {t("hostDetails.section.appearance")}
+          </p>

          {/* SSH Theme Selection */}
          <button
@@ -1190,10 +1012,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
        </Card>

        <Card className="p-3 space-y-3 bg-card border-border/80">
-          <div className="flex items-center gap-2">
-            <Wifi size={14} className="text-muted-foreground" />
-            <p className="text-xs font-semibold">{t("hostDetails.section.mosh")}</p>
-          </div>
+          <p className="text-xs font-semibold">{t("hostDetails.section.mosh")}</p>
          <ToggleRow
            label="Mosh"
            enabled={!!form.moshEnabled}
@@ -1201,109 +1020,75 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
          />
        </Card>

-        {/* Agent Forwarding */}
        <Card className="p-3 space-y-2 bg-card border-border/80">
-          <div className="flex items-center gap-2">
-            <Forward size={14} className="text-muted-foreground" />
-            <p className="text-xs font-semibold">{t("hostDetails.section.agentForwarding")}</p>
-          </div>
          <ToggleRow
            label={t("hostDetails.agentForwarding")}
            enabled={!!form.agentForwarding}
            onToggle={() => update("agentForwarding", !form.agentForwarding)}
          />
-          <p className="text-xs text-muted-foreground">
-            {t("hostDetails.agentForwarding.desc")}
-          </p>
-          {form.agentForwarding && sshAgentStatus && !sshAgentStatus.running && (
-            <div className="flex items-start gap-2 p-2 rounded-md bg-yellow-500/10 border border-yellow-500/20">
-              <AlertTriangle size={14} className="text-yellow-500 mt-0.5 flex-shrink-0" />
-              <div className="space-y-1">
-                <p className="text-xs text-yellow-600 dark:text-yellow-400 font-medium">
-                  {t("hostDetails.agentForwarding.agentNotRunning")}
-                </p>
-                <p className="text-xs text-muted-foreground">
-                  {t("hostDetails.agentForwarding.agentNotRunningHint")}
-                </p>
-              </div>
-            </div>
-          )}
        </Card>

-        {/* Proxy via Hosts (Jump Hosts / ProxyJump) */}
-        <Card className="p-3 space-y-2 bg-card border-border/80">
-          <div className="flex items-center justify-between">
-            <div className="flex items-center gap-2">
-              <Link2 size={14} className="text-muted-foreground" />
-              <p className="text-xs font-semibold">
-                {t("hostDetails.jumpHosts")}
-              </p>
+        {/* Host Chain Configuration - Only show when Agent Forwarding is enabled */}
+        {form.agentForwarding && (
+          <Card className="p-3 space-y-2 bg-card border-border/80">
+            <div className="flex items-center justify-between">
+              <div className="flex items-center gap-2">
+                <Link2 size={14} className="text-muted-foreground" />
+                <p className="text-xs font-semibold">
+                  {t("hostDetails.jumpHosts")}
+                </p>
+              </div>
+              {chainedHosts.length > 0 ? (
+                <Badge variant="secondary" className="text-xs">
+                  {t("hostDetails.jumpHosts.hops", { count: chainedHosts.length })}
+                </Badge>
+              ) : (
+                <Badge
+                  variant="outline"
+                  className="text-xs text-muted-foreground"
+                >
+                  {t("hostDetails.jumpHosts.direct")}
+                </Badge>
+              )}
            </div>
-            {chainedHosts.length > 0 ? (
-              <Badge variant="secondary" className="text-xs">
-                {t("hostDetails.jumpHosts.hops", { count: chainedHosts.length })}
-              </Badge>
-            ) : (
-              <Badge
-                variant="outline"
-                className="text-xs text-muted-foreground"
+            {chainedHosts.length > 0 && (
+              <button
+                className="w-full flex items-center gap-1 p-2 rounded-md bg-secondary/50 hover:bg-secondary transition-colors cursor-pointer"
+                onClick={() => setActiveSubPanel("chain")}
              >
-                {t("hostDetails.jumpHosts.direct")}
-              </Badge>
-            )}
-          </div>
-          {chainedHosts.length > 0 && (
-            <button
-              className="w-full flex flex-col items-start gap-1 p-2 rounded-md bg-secondary/50 hover:bg-secondary transition-colors cursor-pointer"
-              onClick={() => setActiveSubPanel("chain")}
-            >
-              <div className="w-full flex items-center justify-between">
-                <div className="flex items-center gap-1 min-w-0 flex-1">
-                  <Link2
-                    size={14}
-                    className="text-muted-foreground flex-shrink-0"
-                  />
-                  <span className="text-xs text-muted-foreground">
-                    {t("hostDetails.jumpHosts.hops", { count: chainedHosts.length })}
-                  </span>
-                </div>
+                <Link2
+                  size={14}
+                  className="text-muted-foreground flex-shrink-0"
+                />
+                <span className="text-sm truncate">
+                  {chainedHosts
+                    .slice(0, 3)
+                    .map((h) => h.hostname || h.label)
+                    .join(" -> ")}
+                  {chainedHosts.length > 3 && "..."}
+                </span>
                <X
                  size={14}
-                  className="text-muted-foreground hover:text-destructive flex-shrink-0"
+                  className="text-muted-foreground hover:text-destructive flex-shrink-0 ml-auto"
                  onClick={(e) => {
                    e.stopPropagation();
                    clearHostChain();
                  }}
                />
-              </div>
-              <div className="w-full space-y-1 pl-5">
-                {chainedHosts.slice(0, 5).map((h, idx) => (
-                  <div key={h.id} className="flex items-center gap-1 text-sm">
-                    <span className="text-muted-foreground">{idx + 1}.</span>
-                    <span className="truncate">
-                      {h.label !== h.hostname ? `${h.hostname} (${h.label})` : h.hostname}
-                    </span>
-                  </div>
-                ))}
-                {chainedHosts.length > 5 && (
-                  <div className="text-xs text-muted-foreground">
-                    +{chainedHosts.length - 5} more...
-                  </div>
-                )}
-              </div>
-            </button>
-          )}
-          {chainedHosts.length === 0 && (
-            <Button
-              variant="ghost"
-              className="w-full h-9 justify-start gap-2 text-sm"
-              onClick={() => setActiveSubPanel("chain")}
-            >
-              <Plus size={14} />
-              {t("hostDetails.jumpHosts.configure")}
-            </Button>
-          )}
-        </Card>
+              </button>
+            )}
+            {chainedHosts.length === 0 && (
+              <Button
+                variant="ghost"
+                className="w-full h-9 justify-start gap-2 text-sm"
+                onClick={() => setActiveSubPanel("chain")}
+              >
+                <Plus size={14} />
+                {t("hostDetails.jumpHosts.configure")}
+              </Button>
+            )}
+          </Card>
+        )}

        {/* Proxy Configuration */}
        <Card className="p-3 space-y-2 bg-card border-border/80">
@@ -1385,12 +1170,11 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
            <TerminalSquare size={14} className="text-muted-foreground" />
            <p className="text-xs font-semibold">{t("hostDetails.startupCommand")}</p>
          </div>
-          <Textarea
+          <Input
            placeholder={t("hostDetails.startupCommand.placeholder")}
            value={form.startupCommand || ""}
            onChange={(e) => update("startupCommand", e.target.value)}
-            className="min-h-[80px] font-mono text-sm"
-            rows={3}
+            className="h-9"
          />
          <p className="text-xs text-muted-foreground">
            {t("hostDetails.startupCommand.help")}
@@ -1532,7 +1316,7 @@ const HostDetailsPanel: React.FC<HostDetailsPanelProps> = ({
        <Button
          className="w-full h-10"
          onClick={handleSubmit}
-          disabled={!form.hostname}
+          disabled={!form.hostname || !form.label}
        >
          {t("common.save")}
        </Button>
--- a/components/HostForm.tsx
+++ b/components/HostForm.tsx
@@ -14,7 +14,6 @@ import {
 } from "./ui/dialog";
 import { Input } from "./ui/input";
 import { Label } from "./ui/label";
-import { Switch } from "./ui/switch";
 import {
  Select,
  SelectContent,
@@ -258,52 +257,6 @@ const HostForm: React.FC<HostFormProps> = ({
          </div>

          <div className="space-y-3 pt-2">
-            <div className="flex items-center justify-between space-x-2 border rounded-md p-3">
-              <div className="space-y-0.5">
-                <Label htmlFor="sftp-sudo" className="text-base">
-                  {t("hostDetails.sftp.sudo")}
-                </Label>
-                <p className="text-xs text-muted-foreground">
-                  {t("hostDetails.sftp.sudo.desc")}
-                </p>
-                {formData.sftpSudo && authType === "key" && (
-                  <p className="text-xs text-amber-500 mt-1">
-                    {t("hostDetails.sftp.sudo.passwordWarning")}
-                  </p>
-                )}
-              </div>
-              <Switch
-                id="sftp-sudo"
-                checked={formData.sftpSudo || false}
-                onCheckedChange={(checked) =>
-                  setFormData({ ...formData, sftpSudo: checked })
-                }
-              />
-            </div>
-            <div className="space-y-1">
-              <Label htmlFor="sftp-encoding">
-                {t("hostDetails.sftp.encoding")}
-              </Label>
-              <Select
-                value={formData.sftpEncoding || "auto"}
-                onValueChange={(val) =>
-                  setFormData({ ...formData, sftpEncoding: val as Host["sftpEncoding"] })
-                }
-              >
-                <SelectTrigger id="sftp-encoding">
-                  <SelectValue placeholder={t("sftp.encoding.label")} />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="auto">{t("sftp.encoding.auto")}</SelectItem>
-                  <SelectItem value="utf-8">{t("sftp.encoding.utf8")}</SelectItem>
-                  <SelectItem value="gb18030">{t("sftp.encoding.gb18030")}</SelectItem>
-                </SelectContent>
-              </Select>
-              <p className="text-xs text-muted-foreground">
-                {t("hostDetails.sftp.encoding.desc")}
-              </p>
-            </div>
-
            <Label>{t("hostForm.auth.method")}</Label>
            <div className="grid grid-cols-2 gap-4">
              <div
--- a/components/HostTreeView.tsx
+++ b/components/HostTreeView.tsx
@@ -1,501 +0,0 @@
-import { ChevronRight, FileSymlink, Folder, FolderOpen, Monitor, Server, Expand, Minimize2 } from 'lucide-react';
-import React, { useMemo } from 'react';
-import { useI18n } from '../application/i18n/I18nProvider';
-import { useTreeExpandedState } from '../application/state/useTreeExpandedState';
-import { sanitizeHost } from '../domain/host';
-import { STORAGE_KEY_VAULT_HOSTS_TREE_EXPANDED } from '../infrastructure/config/storageKeys';
-import { cn } from '../lib/utils';
-import { GroupNode, Host } from '../types';
-import { Collapsible, CollapsibleContent, CollapsibleTrigger } from './ui/collapsible';
-import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger } from './ui/context-menu';
-import { DistroAvatar } from './DistroAvatar';
-import { Button } from './ui/button';
-
-interface HostTreeViewProps {
-  groupTree: GroupNode[];
-  hosts: Host[];
-  sortMode?: 'az' | 'za' | 'newest' | 'oldest' | 'group';
-  expandedPaths?: Set<string>;
-  onTogglePath?: (path: string) => void;
-  onExpandAll?: (paths: string[]) => void;
-  onCollapseAll?: () => void;
-  onConnect: (host: Host) => void;
-  onEditHost: (host: Host) => void;
-  onDuplicateHost: (host: Host) => void;
-  onDeleteHost: (host: Host) => void;
-  onCopyCredentials: (host: Host) => void;
-  onNewHost: (groupPath?: string) => void;
-  onNewGroup: (parentPath?: string) => void;
-  onEditGroup: (groupPath: string) => void;
-  onDeleteGroup: (groupPath: string) => void;
-  moveHostToGroup: (hostId: string, groupPath: string | null) => void;
-  moveGroup: (sourcePath: string, targetPath: string) => void;
-  managedGroupPaths?: Set<string>;
-  onUnmanageGroup?: (groupPath: string) => void;
-}
-
-interface TreeNodeProps {
-  node: GroupNode;
-  depth: number;
-  sortMode: 'az' | 'za' | 'newest' | 'oldest' | 'group';
-  expandedPaths: Set<string>;
-  onToggle: (path: string) => void;
-  onConnect: (host: Host) => void;
-  onEditHost: (host: Host) => void;
-  onDuplicateHost: (host: Host) => void;
-  onDeleteHost: (host: Host) => void;
-  onCopyCredentials: (host: Host) => void;
-  onNewHost: (groupPath?: string) => void;
-  onNewGroup: (parentPath?: string) => void;
-  onEditGroup: (groupPath: string) => void;
-  onDeleteGroup: (groupPath: string) => void;
-  moveHostToGroup: (hostId: string, groupPath: string | null) => void;
-  moveGroup: (sourcePath: string, targetPath: string) => void;
-  managedGroupPaths?: Set<string>;
-  onUnmanageGroup?: (groupPath: string) => void;
-}
-
-const TreeNode: React.FC<TreeNodeProps> = ({
-  node,
-  depth,
-  sortMode,
-  expandedPaths,
-  onToggle,
-  onConnect,
-  onEditHost,
-  onDuplicateHost,
-  onDeleteHost,
-  onCopyCredentials,
-  onNewHost,
-  onNewGroup,
-  onEditGroup,
-  onDeleteGroup,
-  moveHostToGroup,
-  moveGroup,
-  managedGroupPaths,
-  onUnmanageGroup,
-}) => {
-  const { t } = useI18n();
-  const isExpanded = expandedPaths.has(node.path);
-  const hasChildren = node.children && Object.keys(node.children).length > 0;
-  const paddingLeft = `${depth * 20 + 12}px`;
-  const isManaged = managedGroupPaths?.has(node.path) ?? false;
-
-  const childNodes = useMemo(() => {
-    if (!node.children) return [];
-    const nodes = Object.values(node.children) as unknown as GroupNode[];
-    return nodes.sort((a, b) => {
-      switch (sortMode) {
-        case 'za':
-          return b.name.localeCompare(a.name);
-        case 'newest':
-        case 'oldest':
-          // For groups, fall back to name sorting since groups don't have creation dates
-          return a.name.localeCompare(b.name);
-        case 'az':
-        default:
-          return a.name.localeCompare(b.name);
-      }
-    });
-  }, [node.children, sortMode]);
-
-  const sortedHosts = useMemo(() => {
-    return [...node.hosts].sort((a, b) => {
-      switch (sortMode) {
-        case 'az':
-          return a.label.localeCompare(b.label);
-        case 'za':
-          return b.label.localeCompare(a.label);
-        case 'newest':
-          return (b.createdAt || 0) - (a.createdAt || 0);
-        case 'oldest':
-          return (a.createdAt || 0) - (b.createdAt || 0);
-        default:
-          return a.label.localeCompare(b.label);
-      }
-    });
-  }, [node.hosts, sortMode]);
-
-  return (
-    <div>
-      {/* Group Node */}
-      <Collapsible open={isExpanded} onOpenChange={() => onToggle(node.path)}>
-        <ContextMenu>
-          <ContextMenuTrigger>
-            <CollapsibleTrigger asChild>
-              <div
-                className={cn(
-                  "flex items-center py-2 pr-3 text-sm font-medium cursor-pointer transition-colors select-none group hover:bg-secondary/60 rounded-lg",
-                )}
-                style={{ paddingLeft }}
-                draggable
-                onDragStart={(e) => e.dataTransfer.setData("group-path", node.path)}
-                onDragOver={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                }}
-                onDrop={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  const hostId = e.dataTransfer.getData("host-id");
-                  const groupPath = e.dataTransfer.getData("group-path");
-                  if (hostId) moveHostToGroup(hostId, node.path);
-                  if (groupPath) moveGroup(groupPath, node.path);
-                }}
-              >
-                <div className="mr-2 flex-shrink-0 w-4 h-4 flex items-center justify-center">
-                  {(hasChildren || node.hosts.length > 0) && (
-                    <div className={cn("transition-transform duration-200", isExpanded ? "rotate-90" : "")}>
-                      <ChevronRight size={14} />
-                    </div>
-                  )}
-                </div>
-                <div className="mr-3 text-primary/80 group-hover:text-primary transition-colors">
-                  {isExpanded ? <FolderOpen size={18} /> : <Folder size={18} />}
-                </div>
-                <span className="truncate flex-1 font-semibold">{node.name}</span>
-                {isManaged && (
-                  <span className="inline-flex items-center gap-1 text-[10px] font-medium px-1.5 py-0.5 rounded bg-primary/15 text-primary shrink-0 mr-1.5">
-                    <FileSymlink size={10} />
-                    Managed
-                  </span>
-                )}
-                {(node.hosts.length > 0 || hasChildren) && (
-                  <span className="text-xs opacity-70 bg-background/50 px-2 py-0.5 rounded-full border border-border">
-                    {node.hosts.length}
-                  </span>
-                )}
-              </div>
-            </CollapsibleTrigger>
-          </ContextMenuTrigger>
-          <ContextMenuContent>
-            <ContextMenuItem onClick={() => onNewHost(node.path)}>
-              <Server className="mr-2 h-4 w-4" /> {t("vault.hosts.newHost")}
-            </ContextMenuItem>
-            <ContextMenuItem onClick={() => onNewGroup(node.path)}>
-              <Folder className="mr-2 h-4 w-4" /> {t("vault.hosts.newGroup")}
-            </ContextMenuItem>
-            <ContextMenuItem onClick={() => onEditGroup(node.path)}>
-              <FolderOpen className="mr-2 h-4 w-4" /> {t("vault.groups.rename")}
-            </ContextMenuItem>
-            <ContextMenuItem 
-              onClick={() => onDeleteGroup(node.path)}
-              className="text-destructive focus:text-destructive"
-            >
-              <FolderOpen className="mr-2 h-4 w-4" /> {t("vault.groups.delete")}
-            </ContextMenuItem>
-            {isManaged && onUnmanageGroup && (
-              <ContextMenuItem onClick={() => onUnmanageGroup(node.path)}>
-                <FileSymlink className="mr-2 h-4 w-4" /> {t("vault.managedSource.unmanage")}
-              </ContextMenuItem>
-            )}
-          </ContextMenuContent>
-        </ContextMenu>
-
-        <CollapsibleContent>
-          {/* Child Groups */}
-          {childNodes.map((child) => (
-            <TreeNode
-              key={child.path}
-              node={child}
-              depth={depth + 1}
-              sortMode={sortMode}
-              expandedPaths={expandedPaths}
-              onToggle={onToggle}
-              onConnect={onConnect}
-              onEditHost={onEditHost}
-              onDuplicateHost={onDuplicateHost}
-              onDeleteHost={onDeleteHost}
-              onCopyCredentials={onCopyCredentials}
-              onNewHost={onNewHost}
-              onNewGroup={onNewGroup}
-              onEditGroup={onEditGroup}
-              onDeleteGroup={onDeleteGroup}
-              moveHostToGroup={moveHostToGroup}
-              moveGroup={moveGroup}
-              managedGroupPaths={managedGroupPaths}
-              onUnmanageGroup={onUnmanageGroup}
-            />
-          ))}
-          
-          {/* Hosts in this group */}
-          {sortedHosts.map((host) => (
-            <HostTreeItem
-              key={host.id}
-              host={host}
-              depth={depth + 1}
-              onConnect={onConnect}
-              onEditHost={onEditHost}
-              onDuplicateHost={onDuplicateHost}
-              onDeleteHost={onDeleteHost}
-              onCopyCredentials={onCopyCredentials}
-              moveHostToGroup={moveHostToGroup}
-            />
-          ))}
-        </CollapsibleContent>
-      </Collapsible>
-    </div>
-  );
-};
-
-interface HostTreeItemProps {
-  host: Host;
-  depth: number;
-  onConnect: (host: Host) => void;
-  onEditHost: (host: Host) => void;
-  onDuplicateHost: (host: Host) => void;
-  onDeleteHost: (host: Host) => void;
-  onCopyCredentials: (host: Host) => void;
-  moveHostToGroup: (hostId: string, groupPath: string | null) => void;
-}
-
-const HostTreeItem: React.FC<HostTreeItemProps> = ({
-  host,
-  depth,
-  onConnect,
-  onEditHost,
-  onDuplicateHost,
-  onDeleteHost,
-  onCopyCredentials,
-  moveHostToGroup: _moveHostToGroup,
-}) => {
-  const { t } = useI18n();
-  const paddingLeft = `${depth * 20 + 12}px`;
-  const safeHost = sanitizeHost(host);
-  const tags = host.tags || [];
-  const isTelnet = host.protocol === 'telnet';
-  const displayUsername = isTelnet
-    ? (host.telnetUsername?.trim() || host.username?.trim() || '')
-    : (host.username?.trim() || '');
-  const displayPort = isTelnet
-    ? (host.telnetPort ?? host.port ?? 23)
-    : (host.port ?? 22);
-
-  return (
-    <ContextMenu>
-      <ContextMenuTrigger>
-        <div
-          className="flex items-center py-2 pr-3 text-sm cursor-pointer transition-colors select-none group hover:bg-secondary/40 rounded-lg"
-          style={{ paddingLeft }}
-          draggable
-          onDragStart={(e) => e.dataTransfer.setData("host-id", host.id)}
-          onClick={() => onConnect(safeHost)}
-        >
-          <div className="mr-2 flex-shrink-0 w-4 h-4" />
-          <div className="mr-3 flex-shrink-0">
-            <DistroAvatar host={host} fallback={(host.os || "L")[0].toUpperCase()} size="sm" />
-          </div>
-          <div className="flex-1 min-w-0">
-            <div className="font-medium truncate">{host.label}</div>
-            <div className="text-xs text-muted-foreground truncate">
-              {displayUsername}@{host.hostname}:{displayPort}
-            </div>
-          </div>
-          <div className="flex items-center gap-2 opacity-0 group-hover:opacity-100 transition-opacity">
-            {host.protocol && host.protocol !== 'ssh' && (
-              <span className="text-xs px-1.5 py-0.5 bg-primary/10 text-primary rounded">
-                {host.protocol.toUpperCase()}
-              </span>
-            )}
-            {tags.length > 0 && (
-              <span className="text-xs opacity-60">
-                {tags.slice(0, 2).join(', ')}
-                {tags.length > 2 && '...'}
-              </span>
-            )}
-          </div>
-        </div>
-      </ContextMenuTrigger>
-      <ContextMenuContent>
-        <ContextMenuItem onClick={() => onConnect(safeHost)}>
-          <Monitor className="mr-2 h-4 w-4" /> {t("vault.hosts.connect")}
-        </ContextMenuItem>
-        <ContextMenuItem onClick={() => onEditHost(host)}>
-          <Server className="mr-2 h-4 w-4" /> {t("action.edit")}
-        </ContextMenuItem>
-        <ContextMenuItem onClick={() => onDuplicateHost(host)}>
-          <Server className="mr-2 h-4 w-4" /> {t("action.duplicate")}
-        </ContextMenuItem>
-        <ContextMenuItem onClick={() => onCopyCredentials(host)}>
-          <Server className="mr-2 h-4 w-4" /> {t("vault.hosts.copyCredentials")}
-        </ContextMenuItem>
-        <ContextMenuItem 
-          onClick={() => onDeleteHost(host)}
-          className="text-destructive focus:text-destructive"
-        >
-          <Server className="mr-2 h-4 w-4" /> {t("action.delete")}
-        </ContextMenuItem>
-      </ContextMenuContent>
-    </ContextMenu>
-  );
-};
-
-export const HostTreeView: React.FC<HostTreeViewProps> = ({
-  groupTree,
-  hosts,
-  sortMode = 'az',
-  expandedPaths: externalExpandedPaths,
-  onTogglePath: externalOnTogglePath,
-  onExpandAll: externalOnExpandAll,
-  onCollapseAll: externalOnCollapseAll,
-  onConnect,
-  onEditHost,
-  onDuplicateHost,
-  onDeleteHost,
-  onCopyCredentials,
-  onNewHost,
-  onNewGroup,
-  onEditGroup,
-  onDeleteGroup,
-  moveHostToGroup,
-  moveGroup,
-  managedGroupPaths,
-  onUnmanageGroup,
-}) => {
-  const { t } = useI18n();
-  
-  // Use external state if provided, otherwise use local persistent state
-  const localTreeState = useTreeExpandedState(STORAGE_KEY_VAULT_HOSTS_TREE_EXPANDED);
-  
-  const expandedPaths = externalExpandedPaths || localTreeState.expandedPaths;
-  const togglePath = externalOnTogglePath || localTreeState.togglePath;
-  const expandAll = externalOnExpandAll || localTreeState.expandAll;
-  const collapseAll = externalOnCollapseAll || localTreeState.collapseAll;
-
-  // Get all possible group paths for expand/collapse all functionality
-  const getAllGroupPaths = (nodes: GroupNode[]): string[] => {
-    const paths: string[] = [];
-    const traverse = (nodeList: GroupNode[]) => {
-      nodeList.forEach(node => {
-        paths.push(node.path);
-        if (node.children) {
-          traverse(Object.values(node.children) as GroupNode[]);
-        }
-      });
-    };
-    traverse(nodes);
-    return paths;
-  };
-
-  const allGroupPaths = useMemo(() => getAllGroupPaths(groupTree), [groupTree]);
-
-  const handleExpandAll = () => {
-    expandAll(allGroupPaths);
-  };
-
-  const handleCollapseAll = () => {
-    collapseAll();
-  };
-
-  // Get ungrouped hosts (hosts without a group or with empty group) and sort them
-  const ungroupedHosts = useMemo(() => {
-    const hosts_without_group = hosts.filter(host => !host.group || host.group === '');
-    return hosts_without_group.sort((a, b) => {
-      switch (sortMode) {
-        case 'az':
-          return a.label.localeCompare(b.label);
-        case 'za':
-          return b.label.localeCompare(a.label);
-        case 'newest':
-          return (b.createdAt || 0) - (a.createdAt || 0);
-        case 'oldest':
-          return (a.createdAt || 0) - (b.createdAt || 0);
-        default:
-          return a.label.localeCompare(b.label);
-      }
-    });
-  }, [hosts, sortMode]);
-
-  // Sort group tree based on sort mode
-  const sortedGroupTree = useMemo(() => {
-    return [...groupTree].sort((a, b) => {
-      switch (sortMode) {
-        case 'za':
-          return b.name.localeCompare(a.name);
-        case 'newest':
-        case 'oldest':
-          // For groups, fall back to name sorting since groups don't have creation dates
-          return a.name.localeCompare(b.name);
-        case 'az':
-        default:
-          return a.name.localeCompare(b.name);
-      }
-    });
-  }, [groupTree, sortMode]);
-
-  return (
-    <div className="space-y-1">
-      {/* Expand/Collapse controls */}
-      {groupTree.length > 0 && (
-        <div className="flex items-center gap-2 mb-3 pb-2 border-b border-border/30">
-          <Button
-            variant="ghost"
-            size="sm"
-            onClick={handleExpandAll}
-            className="h-7 px-2 text-xs"
-          >
-            <Expand size={12} className="mr-1" />
-            {t("vault.tree.expandAll")}
-          </Button>
-          <Button
-            variant="ghost"
-            size="sm"
-            onClick={handleCollapseAll}
-            className="h-7 px-2 text-xs"
-          >
-            <Minimize2 size={12} className="mr-1" />
-            {t("vault.tree.collapseAll")}
-          </Button>
-        </div>
-      )}
-
-      {/* Group tree */}
-      {sortedGroupTree.map((node) => (
-        <TreeNode
-          key={node.path}
-          node={node}
-          depth={0}
-          sortMode={sortMode}
-          expandedPaths={expandedPaths}
-          onToggle={togglePath}
-          onConnect={onConnect}
-          onEditHost={onEditHost}
-          onDuplicateHost={onDuplicateHost}
-          onDeleteHost={onDeleteHost}
-          onCopyCredentials={onCopyCredentials}
-          onNewHost={onNewHost}
-          onNewGroup={onNewGroup}
-          onEditGroup={onEditGroup}
-          onDeleteGroup={onDeleteGroup}
-          moveHostToGroup={moveHostToGroup}
-          moveGroup={moveGroup}
-          managedGroupPaths={managedGroupPaths}
-          onUnmanageGroup={onUnmanageGroup}
-        />
-      ))}
-
-      {/* Ungrouped hosts at root level */}
-      {ungroupedHosts.map((host) => (
-        <HostTreeItem
-          key={host.id}
-          host={host}
-          depth={0}
-          onConnect={onConnect}
-          onEditHost={onEditHost}
-          onDuplicateHost={onDuplicateHost}
-          onDeleteHost={onDeleteHost}
-          onCopyCredentials={onCopyCredentials}
-          moveHostToGroup={moveHostToGroup}
-        />
-      ))}
-      
-      {/* Empty state */}
-      {ungroupedHosts.length === 0 && groupTree.length === 0 && (
-        <div className="text-center py-12 text-muted-foreground">
-          <Server size={48} className="mx-auto mb-4 opacity-50" />
-          <p className="text-sm">{t("vault.hosts.empty")}</p>
-        </div>
-      )}
-    </div>
-  );
-};
--- a/components/KeyboardInteractiveModal.tsx
+++ b/components/KeyboardInteractiveModal.tsx
@@ -1,200 +0,0 @@
-/**
- * Keyboard Interactive Authentication Modal
- * Global modal for handling SSH keyboard-interactive authentication (2FA/MFA)
- * This modal displays prompts from the SSH server and collects user responses.
- */
-import { Eye, EyeOff, KeyRound, Loader2 } from "lucide-react";
-import React, { useCallback, useEffect, useState } from "react";
-import { useI18n } from "../application/i18n/I18nProvider";
-import { Button } from "./ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "./ui/dialog";
-import { Input } from "./ui/input";
-import { Label } from "./ui/label";
-
-export interface KeyboardInteractivePrompt {
-  prompt: string;
-  echo: boolean;
-}
-
-export interface KeyboardInteractiveRequest {
-  requestId: string;
-  name: string;
-  instructions: string;
-  prompts: KeyboardInteractivePrompt[];
-  hostname?: string;
-  savedPassword?: string | null;
-}
-
-interface KeyboardInteractiveModalProps {
-  request: KeyboardInteractiveRequest | null;
-  onSubmit: (requestId: string, responses: string[]) => void;
-  onCancel: (requestId: string) => void;
-}
-
-export const KeyboardInteractiveModal: React.FC<KeyboardInteractiveModalProps> = ({
-  request,
-  onSubmit,
-  onCancel,
-}) => {
-  const { t } = useI18n();
-  const [responses, setResponses] = useState<string[]>([]);
-  const [showPasswords, setShowPasswords] = useState<boolean[]>([]);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  // Reset state when request changes
-  useEffect(() => {
-    if (request) {
-      setResponses(request.prompts.map(() => ""));
-      setShowPasswords(request.prompts.map(() => false));
-      setIsSubmitting(false);
-    }
-  }, [request]);
-
-  const handleResponseChange = useCallback((index: number, value: string) => {
-    setResponses((prev) => {
-      const updated = [...prev];
-      updated[index] = value;
-      return updated;
-    });
-  }, []);
-
-  const toggleShowPassword = useCallback((index: number) => {
-    setShowPasswords((prev) => {
-      const updated = [...prev];
-      updated[index] = !updated[index];
-      return updated;
-    });
-  }, []);
-
-  const handleSubmit = useCallback(() => {
-    if (!request || isSubmitting) return;
-    setIsSubmitting(true);
-    onSubmit(request.requestId, responses);
-  }, [request, responses, onSubmit, isSubmitting]);
-
-  const handleCancel = useCallback(() => {
-    if (!request) return;
-    onCancel(request.requestId);
-  }, [request, onCancel]);
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Enter" && !isSubmitting) {
-        e.preventDefault();
-        handleSubmit();
-      }
-    },
-    [handleSubmit, isSubmitting]
-  );
-
-  if (!request) return null;
-
-  const title = request.name?.trim() || t("keyboard.interactive.title");
-  const description =
-    request.instructions?.trim() ||
-    (request.hostname
-      ? t("keyboard.interactive.descWithHost", { hostname: request.hostname })
-      : t("keyboard.interactive.desc"));
-
-  return (
-    <Dialog open={!!request} onOpenChange={(open) => !open && handleCancel()}>
-      <DialogContent className="sm:max-w-[425px]" hideCloseButton>
-        <DialogHeader>
-          <div className="flex items-center gap-3 mb-2">
-            <div className="h-10 w-10 rounded-full bg-primary/10 flex items-center justify-center">
-              <KeyRound className="h-5 w-5 text-primary" />
-            </div>
-            <div>
-              <DialogTitle>{title}</DialogTitle>
-              <DialogDescription className="mt-1">
-                {description}
-              </DialogDescription>
-            </div>
-          </div>
-        </DialogHeader>
-
-        <div className="space-y-4 py-2">
-          {request.prompts.map((prompt, index) => {
-            const isPassword = !prompt.echo;
-            const showPassword = showPasswords[index];
-            // Clean up prompt text (remove trailing colon and whitespace)
-            const promptLabel = prompt.prompt.replace(/:\s*$/, "").trim();
-
-            return (
-              <div key={index} className="space-y-2">
-                <Label htmlFor={`ki-prompt-${index}`}>
-                  {promptLabel || t("keyboard.interactive.response")}
-                </Label>
-                <div className="relative">
-                  <Input
-                    id={`ki-prompt-${index}`}
-                    type={isPassword && !showPassword ? "password" : "text"}
-                    value={responses[index] || ""}
-                    onChange={(e) => handleResponseChange(index, e.target.value)}
-                    onKeyDown={handleKeyDown}
-                    placeholder=""
-                    className={isPassword ? "pr-10" : undefined}
-                    autoFocus={index === 0}
-                    disabled={isSubmitting}
-                  />
-                  {isPassword && (
-                    <button
-                      type="button"
-                      className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground disabled:opacity-50 p-1"
-                      onClick={() => toggleShowPassword(index)}
-                      disabled={isSubmitting}
-                    >
-                      {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}
-                    </button>
-                  )}
-                </div>
-                {/* Use saved password button - shown below input, right-aligned */}
-                {isPassword && request.savedPassword && !responses[index] && (
-                  <div className="flex justify-end">
-                    <button
-                      type="button"
-                      className="flex items-center gap-1 text-xs text-primary hover:text-primary/80 disabled:opacity-50"
-                      onClick={() => handleResponseChange(index, request.savedPassword!)}
-                      disabled={isSubmitting}
-                    >
-                      <KeyRound size={12} />
-                      <span>{t("keyboard.interactive.useSavedPassword")}</span>
-                    </button>
-                  </div>
-                )}
-              </div>
-            );
-          })}
-        </div>
-
-        <div className="flex items-center justify-between pt-2">
-          <Button
-            variant="secondary"
-            onClick={handleCancel}
-            disabled={isSubmitting}
-          >
-            {t("common.cancel")}
-          </Button>
-          <Button onClick={handleSubmit} disabled={isSubmitting}>
-            {isSubmitting ? (
-              <>
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-                {t("keyboard.interactive.verifying")}
-              </>
-            ) : (
-              t("keyboard.interactive.submit")
-            )}
-          </Button>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default KeyboardInteractiveModal;
--- a/components/KeychainManager.tsx
+++ b/components/KeychainManager.tsx
@@ -23,7 +23,6 @@ import { STORAGE_KEY_VAULT_KEYS_VIEW_MODE } from "../infrastructure/config/stora
 import { logger } from "../lib/logger";
 import { cn } from "../lib/utils";
 import { Host, Identity, KeyType, SSHKey } from "../types";
-import { ManagedSource } from "../domain/models";
 import { useKeychainBackend } from "../application/state/useKeychainBackend";
 import SelectHostPanel from "./SelectHostPanel";
 import {
@@ -69,7 +68,6 @@ interface KeychainManagerProps {
  identities?: Identity[];
  hosts?: Host[];
  customGroups?: string[];
-  managedSources?: ManagedSource[];
  onSave: (key: SSHKey) => void;
  onUpdate: (key: SSHKey) => void;
  onDelete: (id: string) => void;
@@ -85,7 +83,6 @@ const KeychainManager: React.FC<KeychainManagerProps> = ({
  identities = [],
  hosts = [],
  customGroups = [],
-  managedSources = [],
  onSave,
  onUpdate,
  onDelete,
@@ -916,8 +913,6 @@ echo $3 >> "$FILE"`);
              <ImportKeyPanel
                draftKey={draftKey}
                setDraftKey={setDraftKey}
-                showPassphrase={showPassphrase}
-                setShowPassphrase={setShowPassphrase}
                onImport={handleImport}
              />
            )}
@@ -1116,8 +1111,6 @@ echo $3 >> "$FILE"`);
                        privateKey: hostPrivateKey,
                        command,
                        timeout: 30000,
-                        enableKeyboardInteractive: true,
-                        sessionId: `export-key:${exportHost.id}:${panel.key.id}`,
                      });

                      // Check result - code 0, null, or undefined with no stderr is success
@@ -1289,7 +1282,6 @@ echo $3 >> "$FILE"`);
              onBack={() => setShowHostSelector(false)}
              onContinue={() => setShowHostSelector(false)}
              availableKeys={keys}
-              managedSources={managedSources}
              onSaveHost={onSaveHost}
              onCreateGroup={onCreateGroup}
            />
--- a/components/LogView.tsx
+++ b/components/LogView.tsx
@@ -2,7 +2,7 @@ import { Terminal as XTerm } from "@xterm/xterm";
 import { FitAddon } from "@xterm/addon-fit";
 import { WebglAddon } from "@xterm/addon-webgl";
 import "@xterm/xterm/css/xterm.css";
-import { FileText, Download, Palette, X } from "lucide-react";
+import { FileText, Palette, X } from "lucide-react";
 import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { cn } from "../lib/utils";
@@ -34,7 +34,6 @@ const LogViewComponent: React.FC<LogViewProps> = ({
    const fitAddonRef = useRef<FitAddon | null>(null);
    const [isReady, setIsReady] = useState(false);
    const [themeModalOpen, setThemeModalOpen] = useState(false);
-    const [isExporting, setIsExporting] = useState(false);

    // Use log's saved theme/fontSize or fall back to defaults
    const currentTheme = useMemo(() => {
@@ -68,30 +67,6 @@ const LogViewComponent: React.FC<LogViewProps> = ({
        onUpdateLog(log.id, { fontSize });
    }, [log.id, onUpdateLog]);

-    // Handle export
-    const handleExport = useCallback(async () => {
-        if (!log.terminalData || isExporting) return;
-
-        setIsExporting(true);
-        try {
-            const { netcattyBridge } = await import("../infrastructure/services/netcattyBridge");
-            const bridge = netcattyBridge.get();
-            if (bridge?.exportSessionLog) {
-                await bridge.exportSessionLog({
-                    terminalData: log.terminalData,
-                    hostLabel: log.hostLabel,
-                    hostname: log.hostname,
-                    startTime: log.startTime,
-                    format: 'txt',
-                });
-            }
-        } catch (err) {
-            console.error('Failed to export session log:', err);
-        } finally {
-            setIsExporting(false);
-        }
-    }, [log.terminalData, log.hostLabel, log.hostname, log.startTime, isExporting]);
-
    // Initialize terminal
    useEffect(() => {
        if (!containerRef.current || !isVisible) return;
@@ -241,21 +216,6 @@ const LogViewComponent: React.FC<LogViewProps> = ({
                    </div>
                </div>
                <div className="flex items-center gap-2">
-                    {/* Export button */}
-                    {log.terminalData && (
-                        <Button
-                            variant="ghost"
-                            size="sm"
-                            className="gap-1.5 h-8 px-2"
-                            onClick={handleExport}
-                            disabled={isExporting}
-                            title={t("logView.export")}
-                        >
-                            <Download size={14} />
-                            <span className="text-xs">{t("logView.export")}</span>
-                        </Button>
-                    )}
-
                    {/* Theme & font customization button */}
                    <Button
                        variant="ghost"
--- a/components/PassphraseModal.tsx
+++ b/components/PassphraseModal.tsx
@@ -1,169 +0,0 @@
-/**
- * Passphrase Modal
- * Modal for requesting passphrase for encrypted SSH keys
- */
-import { Eye, EyeOff, KeyRound, Loader2 } from "lucide-react";
-import React, { useCallback, useEffect, useState } from "react";
-import { useI18n } from "../application/i18n/I18nProvider";
-import { Button } from "./ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "./ui/dialog";
-import { Input } from "./ui/input";
-import { Label } from "./ui/label";
-
-export interface PassphraseRequest {
-  requestId: string;
-  keyPath: string;
-  keyName: string;
-  hostname?: string;
-}
-
-interface PassphraseModalProps {
-  request: PassphraseRequest | null;
-  onSubmit: (requestId: string, passphrase: string) => void;
-  onCancel: (requestId: string) => void;
-  onSkip?: (requestId: string) => void;
-}
-
-export const PassphraseModal: React.FC<PassphraseModalProps> = ({
-  request,
-  onSubmit,
-  onCancel,
-  onSkip,
-}) => {
-  const { t } = useI18n();
-  const [passphrase, setPassphrase] = useState("");
-  const [showPassphrase, setShowPassphrase] = useState(false);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  // Reset state when request changes
-  useEffect(() => {
-    if (request) {
-      setPassphrase("");
-      setShowPassphrase(false);
-      setIsSubmitting(false);
-    }
-  }, [request]);
-
-  const handleSubmit = useCallback(() => {
-    if (!request || isSubmitting || !passphrase) return;
-    setIsSubmitting(true);
-    onSubmit(request.requestId, passphrase);
-  }, [request, passphrase, onSubmit, isSubmitting]);
-
-  const handleCancel = useCallback(() => {
-    if (!request) return;
-    onCancel(request.requestId);
-  }, [request, onCancel]);
-
-  const handleSkip = useCallback(() => {
-    if (!request || !onSkip) return;
-    onSkip(request.requestId);
-  }, [request, onSkip]);
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Enter" && !isSubmitting && passphrase) {
-        e.preventDefault();
-        handleSubmit();
-      }
-    },
-    [handleSubmit, isSubmitting, passphrase]
-  );
-
-  if (!request) return null;
-
-  const keyDisplayName = request.keyName || request.keyPath.split("/").pop() || "SSH Key";
-
-  return (
-    <Dialog open={!!request} onOpenChange={(open) => !open && handleCancel()}>
-      <DialogContent className="sm:max-w-[425px]" hideCloseButton>
-        <DialogHeader>
-          <div className="flex items-center gap-3 mb-2">
-            <div className="h-10 w-10 rounded-full bg-primary/10 flex items-center justify-center">
-              <KeyRound className="h-5 w-5 text-primary" />
-            </div>
-            <div>
-              <DialogTitle>{t("passphrase.title")}</DialogTitle>
-              <DialogDescription className="mt-1">
-                {request.hostname
-                  ? t("passphrase.descWithHost", { keyName: keyDisplayName, hostname: request.hostname })
-                  : t("passphrase.desc", { keyName: keyDisplayName })}
-              </DialogDescription>
-            </div>
-          </div>
-        </DialogHeader>
-
-        <div className="space-y-4 py-2">
-          <div className="space-y-2">
-            <Label htmlFor="passphrase-input">
-              {t("passphrase.label")}
-            </Label>
-            <div className="relative">
-              <Input
-                id="passphrase-input"
-                type={showPassphrase ? "text" : "password"}
-                value={passphrase}
-                onChange={(e) => setPassphrase(e.target.value)}
-                onKeyDown={handleKeyDown}
-                placeholder=""
-                className="pr-10"
-                autoFocus
-                disabled={isSubmitting}
-              />
-              <button
-                type="button"
-                className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground disabled:opacity-50 p-1"
-                onClick={() => setShowPassphrase(!showPassphrase)}
-                disabled={isSubmitting}
-              >
-                {showPassphrase ? <EyeOff size={16} /> : <Eye size={16} />}
-              </button>
-            </div>
-            <p className="text-xs text-muted-foreground">
-              {t("passphrase.keyPath")}: <code className="text-xs">{request.keyPath}</code>
-            </p>
-          </div>
-        </div>
-
-        <div className="flex items-center justify-between pt-2">
-          <div className="flex gap-2">
-            <Button
-              variant="secondary"
-              onClick={handleCancel}
-              disabled={isSubmitting}
-            >
-              {t("common.cancel")}
-            </Button>
-            {onSkip && (
-              <Button
-                variant="ghost"
-                onClick={handleSkip}
-                disabled={isSubmitting}
-              >
-                {t("passphrase.skip")}
-              </Button>
-            )}
-          </div>
-          <Button onClick={handleSubmit} disabled={isSubmitting || !passphrase}>
-            {isSubmitting ? (
-              <>
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-                {t("passphrase.unlocking")}
-              </>
-            ) : (
-              t("passphrase.unlock")
-            )}
-          </Button>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default PassphraseModal;
--- a/components/PortForwardingNew.tsx
+++ b/components/PortForwardingNew.tsx
@@ -15,7 +15,6 @@ import { useI18n } from "../application/i18n/I18nProvider";
 import { usePortForwardingState } from "../application/state/usePortForwardingState";
 import {
  Host,
-  ManagedSource,
  PortForwardingRule,
  PortForwardingType,
  SSHKey,
@@ -65,7 +64,6 @@ interface PortForwardingProps {
  keys: SSHKey[];
  identities?: import('../domain/models').Identity[];
  customGroups: string[];
-  managedSources?: ManagedSource[];
  onNewHost?: () => void;
  onSaveHost?: (host: Host) => void;
  onCreateGroup?: (groupPath: string) => void;
@@ -76,7 +74,6 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
  keys,
  identities = [],
  customGroups: _customGroups,
-  managedSources = [],
  onNewHost: _onNewHost,
  onSaveHost,
  onCreateGroup: _onCreateGroup,
@@ -701,7 +698,6 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
                  <RuleCard
                    key={rule.id}
                    rule={rule}
-                    host={hosts.find((h) => h.id === rule.hostId)}
                    viewMode={viewMode}
                    isSelected={selectedRuleId === rule.id}
                    isPending={pendingOperations.has(rule.id)}
@@ -848,7 +844,6 @@ const PortForwarding: React.FC<PortForwardingProps> = ({
          onContinue={() => setShowHostSelector(false)}
          availableKeys={keys}
          identities={identities}
-          managedSources={managedSources}
          onSaveHost={onSaveHost}
          onCreateGroup={_onCreateGroup}
        />
--- a/components/QuickSwitcher.tsx
+++ b/components/QuickSwitcher.tsx
@@ -6,7 +6,7 @@ import {
  Terminal,
  TerminalSquare,
 } from "lucide-react";
-import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, { memo, useEffect, useRef, useState } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { Host, TerminalSession, Workspace } from "../types";
 import { KeyBinding } from "../domain/models";
@@ -17,45 +17,10 @@ type QuickSwitcherItem = {
  data?: Host | TerminalSession | Workspace;
 };
 import { DistroAvatar } from "./DistroAvatar";
+import { Button } from "./ui/button";
 import { Input } from "./ui/input";
 import { ScrollArea } from "./ui/scroll-area";

-// Compute once at module level
-const IS_MAC = typeof navigator !== 'undefined' && /Mac|iPhone|iPad/.test(navigator.platform);
-
-// Memoized host item component to prevent unnecessary re-renders
-const HostItem = memo(({
-  host,
-  isSelected,
-  onSelect,
-  onMouseEnter,
-}: {
-  host: Host;
-  isSelected: boolean;
-  onSelect: (host: Host) => void;
-  onMouseEnter: () => void;
-}) => (
-  <div
-    className={`flex items-center justify-between px-4 py-2.5 cursor-pointer transition-colors ${isSelected ? "bg-primary/15" : "hover:bg-muted/50"
-      }`}
-    onClick={() => onSelect(host)}
-    onMouseEnter={onMouseEnter}
-  >
-    <div className="flex items-center gap-3 min-w-0">
-      <DistroAvatar
-        host={host}
-        fallback={host.label.slice(0, 2).toUpperCase()}
-        size="sm"
-      />
-      <span className="text-sm font-medium truncate">{host.label}</span>
-    </div>
-    <div className="text-[11px] text-muted-foreground">
-      {host.group ? `Personal / ${host.group}` : "Personal"}
-    </div>
-  </div>
-));
-HostItem.displayName = "HostItem";
-
 interface QuickSwitcherProps {
  isOpen: boolean;
  query: string;
@@ -67,7 +32,7 @@ interface QuickSwitcherProps {
  onSelectTab: (tabId: string) => void;
  onClose: () => void;
  onCreateLocalTerminal?: () => void;
-  // onCreateWorkspace removed - feature not currently used
+  onCreateWorkspace?: () => void;
  keyBindings?: KeyBinding[];
 }

@@ -82,16 +47,19 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
  onSelectTab,
  onClose,
  onCreateLocalTerminal,
+  onCreateWorkspace,
  keyBindings,
 }) => {
  const { t } = useI18n();
  // Get hotkey display strings
-  const getHotkeyLabel = useCallback((actionId: string) => {
+  const isMac = typeof navigator !== 'undefined' && /Mac|iPhone|iPad/.test(navigator.platform);
+  const getHotkeyLabel = (actionId: string) => {
    const binding = keyBindings?.find(k => k.id === actionId);
    if (!binding) return '';
-    return IS_MAC ? binding.mac : binding.pc;
-  }, [keyBindings]);
+    return isMac ? binding.mac : binding.pc;
+  };
  const quickSwitchKey = getHotkeyLabel('quick-switch');
+  const [isFocused, setIsFocused] = useState(false);
  const [selectedIndex, setSelectedIndex] = useState(0);
  const inputRef = useRef<HTMLInputElement>(null);
  const containerRef = useRef<HTMLDivElement>(null);
@@ -99,6 +67,7 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
  // Reset state when opening
  useEffect(() => {
    if (isOpen) {
+      setIsFocused(false);
      setSelectedIndex(0);
      // Auto focus the input after a short delay
      setTimeout(() => {
@@ -124,17 +93,15 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
    return () => document.removeEventListener("mousedown", handleClickOutside);
  }, [isOpen, onClose]);

-  // Memoize orphan sessions
-  const orphanSessions = useMemo(
-    () => sessions.filter((s) => !s.workspaceId),
-    [sessions]
-  );
+  if (!isOpen) return null;

-  // Always show categorized view (Hosts/Tabs/Quick connect)
-  const showCategorized = true;
+  const showCategorized = isFocused || query.trim().length > 0;

-  // Memoize flat items list and index map
-  const { flatItems, itemIndexMap } = useMemo(() => {
+  // Get orphan sessions (sessions without workspace)
+  const orphanSessions = sessions.filter((s) => !s.workspaceId);
+
+  // Build categorized items for navigation
+  const buildFlatItems = () => {
    const items: QuickSwitcherItem[] = [];

    if (showCategorized) {
@@ -160,21 +127,10 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
      );
    }

-    // Build index map for O(1) lookup
-    const indexMap = new Map<string, number>();
-    items.forEach((item, idx) => {
-      indexMap.set(`${item.type}:${item.id}`, idx);
-    });
+    return items;
+  };

-    return { flatItems: items, itemIndexMap: indexMap };
-  }, [showCategorized, results, orphanSessions, workspaces]);
-
-  // O(1) index lookup
-  const getItemIndex = useCallback((type: string, id: string) => {
-    return itemIndexMap.get(`${type}:${id}`) ?? -1;
-  }, [itemIndexMap]);
-
-  if (!isOpen) return null;
+  const flatItems = buildFlatItems();

  const handleKeyDown = (e: React.KeyboardEvent) => {
    if (e.key === "ArrowDown") {
@@ -209,6 +165,40 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
    }
  };

+  // Helper to get item index in flat list
+  const getItemIndex = (type: string, id: string) => {
+    return flatItems.findIndex((item) => item.type === type && item.id === id);
+  };
+
+  const renderHostItem = (host: Host) => {
+    const idx = getItemIndex("host", host.id);
+    const isSelected = idx === selectedIndex;
+
+    return (
+      <div
+        key={host.id}
+        className={`flex items-center justify-between px-4 py-2.5 cursor-pointer transition-colors ${isSelected ? "bg-primary/15" : "hover:bg-muted/50"
+          }`}
+        onClick={() => {
+          onSelect(host);
+        }}
+        onMouseEnter={() => setSelectedIndex(idx)}
+      >
+        <div className="flex items-center gap-3 min-w-0">
+          <DistroAvatar
+            host={host}
+            fallback={host.label.slice(0, 2).toUpperCase()}
+            size="sm"
+          />
+          <span className="text-sm font-medium truncate">{host.label}</span>
+        </div>
+        <div className="text-[11px] text-muted-foreground">
+          {host.group ? `Personal / ${host.group}` : "Personal"}
+        </div>
+      </div>
+    );
+  };
+
  return (
    <div
      className="fixed inset-x-0 top-12 z-50 flex justify-center pt-2"
@@ -229,6 +219,7 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
              onQueryChange(e.target.value);
              setSelectedIndex(0);
            }}
+            onFocus={() => setIsFocused(true)}
            onKeyDown={handleKeyDown}
            placeholder={t("qs.search.placeholder")}
            className="flex-1 h-8 border-0 bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0 px-0 text-sm"
@@ -241,163 +232,193 @@ const QuickSwitcherInner: React.FC<QuickSwitcherProps> = ({
        </div>

        <ScrollArea className="flex-1 h-full">
-          {/* Categorized view: Hosts/Tabs/Quick connect */}
-          <div>
-            {/* Jump To hint */}
-            <div className="px-4 py-2 flex items-center gap-2">
-              <span className="text-xs text-muted-foreground">{t("qs.jumpTo")}</span>
-              {quickSwitchKey && (
-                <kbd className="text-[10px] text-muted-foreground bg-muted px-1 py-0.5 rounded">
-                  {quickSwitchKey.replace(/ \+ /g, '+')}
-                </kbd>
-              )}
+          {!showCategorized ? (
+            /* Default view: Recent connections with header */
+            <div>
+              <div className="px-4 py-2 flex items-center justify-between">
+                <span className="text-xs font-medium text-muted-foreground">
+                  {t("qs.recentConnections")}
+                </span>
+                <div className="flex items-center gap-2">
+                  <Button
+                    size="sm"
+                    variant="outline"
+                    className="h-6 px-2 text-[11px]"
+                    onClick={() => onCreateWorkspace?.()}
+                  >
+                    {t("qs.createWorkspace")}
+                  </Button>
+                  <Button
+                    size="sm"
+                    variant="outline"
+                    className="h-6 px-2 text-[11px]"
+                    disabled
+                  >
+                    {t("qs.restore")}
+                  </Button>
+                </div>
+              </div>
+              <div>
+                {results.length > 0 ? (
+                  results.map(renderHostItem)
+                ) : (
+                  <div className="px-4 py-6 text-sm text-muted-foreground text-center">
+                    No recent connections
+                  </div>
+                )}
+              </div>
            </div>
+          ) : (
+            /* Focused/searching view: Categorized items */
+            <div>
+              {/* Jump To hint */}
+              <div className="px-4 py-2 flex items-center gap-2">
+                <span className="text-xs text-muted-foreground">{t("qs.jumpTo")}</span>
+                {quickSwitchKey && (
+                  <kbd className="text-[10px] text-muted-foreground bg-muted px-1 py-0.5 rounded">
+                    {quickSwitchKey.replace(/ \+ /g, '+')}
+                  </kbd>
+                )}
+              </div>

-            {/* Hosts section */}
-            {results.length > 0 && (
+              {/* Hosts section */}
+              {results.length > 0 && (
+                <div>
+                  <div className="px-4 py-1.5">
+                    <span className="text-xs font-medium text-muted-foreground">
+                      Hosts
+                    </span>
+                  </div>
+                  {results.map(renderHostItem)}
+                </div>
+              )}
+
+              {/* Tabs section */}
              <div>
                <div className="px-4 py-1.5">
                  <span className="text-xs font-medium text-muted-foreground">
-                    Hosts
+                    Tabs
                  </span>
                </div>
-                {results.map((host) => (
-                  <HostItem
-                    key={host.id}
-                    host={host}
-                    isSelected={getItemIndex("host", host.id) === selectedIndex}
-                    onSelect={onSelect}
-                    onMouseEnter={() => setSelectedIndex(getItemIndex("host", host.id))}
-                  />
-                ))}
-              </div>
-            )}

-            {/* Tabs section */}
-            <div>
-              <div className="px-4 py-1.5">
-                <span className="text-xs font-medium text-muted-foreground">
-                  Tabs
-                </span>
-              </div>
+                {/* Built-in tabs */}
+                {["vault", "sftp"].map((tabId) => {
+                  const idx = getItemIndex("tab", tabId);
+                  const isSelected = idx === selectedIndex;
+                  const icon =
+                    tabId === "vault" ? (
+                      <Shield size={16} />
+                    ) : (
+                      <Folder size={16} />
+                    );
+                  const label = tabId === "vault" ? "Vaults" : "SFTP";

-              {/* Built-in tabs */}
-              {["vault", "sftp"].map((tabId) => {
-                const idx = getItemIndex("tab", tabId);
-                const isSelected = idx === selectedIndex;
-                const icon =
-                  tabId === "vault" ? (
-                    <Shield size={16} />
-                  ) : (
-                    <Folder size={16} />
+                  return (
+                    <div
+                      key={tabId}
+                      className={`flex items-center gap-3 px-4 py-2.5 cursor-pointer transition-colors ${isSelected ? "bg-primary/15" : "hover:bg-muted/50"
+                        }`}
+                      onClick={() => {
+                        onSelectTab(tabId);
+                        onClose();
+                      }}
+                      onMouseEnter={() => setSelectedIndex(idx)}
+                    >
+                      <div className="h-6 w-6 rounded flex items-center justify-center text-muted-foreground">
+                        {icon}
+                      </div>
+                      <span className="text-sm font-medium">{label}</span>
+                    </div>
                  );
-                const label = tabId === "vault" ? "Vaults" : "SFTP";
+                })}

-                return (
-                  <div
-                    key={tabId}
-                    className={`flex items-center gap-3 px-4 py-2.5 cursor-pointer transition-colors ${isSelected ? "bg-primary/15" : "hover:bg-muted/50"
-                      }`}
-                    onClick={() => {
-                      onSelectTab(tabId);
-                      onClose();
-                    }}
-                    onMouseEnter={() => setSelectedIndex(idx)}
-                  >
-                    <div className="h-6 w-6 rounded flex items-center justify-center text-muted-foreground">
-                      {icon}
+                {/* Workspaces */}
+                {workspaces.map((workspace) => {
+                  const idx = getItemIndex("workspace", workspace.id);
+                  const isSelected = idx === selectedIndex;
+
+                  return (
+                    <div
+                      key={workspace.id}
+                      className={`flex items-center gap-3 px-4 py-2.5 cursor-pointer transition-colors ${isSelected ? "bg-primary/15" : "hover:bg-muted/50"
+                        }`}
+                      onClick={() => {
+                        onSelectTab(workspace.id);
+                        onClose();
+                      }}
+                      onMouseEnter={() => setSelectedIndex(idx)}
+                    >
+                      <div className="h-6 w-6 rounded flex items-center justify-center text-muted-foreground">
+                        <LayoutGrid size={16} />
+                      </div>
+                      <span className="text-sm font-medium">
+                        {workspace.title}
+                      </span>
                    </div>
-                    <span className="text-sm font-medium">{label}</span>
-                  </div>
-                );
-              })}
+                  );
+                })}

-              {/* Workspaces */}
-              {workspaces.map((workspace) => {
-                const idx = getItemIndex("workspace", workspace.id);
-                const isSelected = idx === selectedIndex;
+                {/* Orphan sessions */}
+                {orphanSessions.map((session) => {
+                  const idx = getItemIndex("tab", session.id);
+                  const isSelected = idx === selectedIndex;

-                return (
-                  <div
-                    key={workspace.id}
-                    className={`flex items-center gap-3 px-4 py-2.5 cursor-pointer transition-colors ${isSelected ? "bg-primary/15" : "hover:bg-muted/50"
-                      }`}
-                    onClick={() => {
-                      onSelectTab(workspace.id);
-                      onClose();
-                    }}
-                    onMouseEnter={() => setSelectedIndex(idx)}
-                  >
-                    <div className="h-6 w-6 rounded flex items-center justify-center text-muted-foreground">
-                      <LayoutGrid size={16} />
+                  return (
+                    <div
+                      key={session.id}
+                      className={`flex items-center gap-3 px-4 py-2.5 cursor-pointer transition-colors ${isSelected ? "bg-primary/15" : "hover:bg-muted/50"
+                        }`}
+                      onClick={() => {
+                        onSelectTab(session.id);
+                        onClose();
+                      }}
+                      onMouseEnter={() => setSelectedIndex(idx)}
+                    >
+                      <div className="h-6 w-6 rounded flex items-center justify-center text-muted-foreground">
+                        <TerminalSquare size={16} />
+                      </div>
+                      <span className="text-sm font-medium">
+                        {session.hostLabel}
+                      </span>
                    </div>
-                    <span className="text-sm font-medium">
-                      {workspace.title}
-                    </span>
-                  </div>
-                );
-              })}
-
-              {/* Orphan sessions */}
-              {orphanSessions.map((session) => {
-                const idx = getItemIndex("tab", session.id);
-                const isSelected = idx === selectedIndex;
-
-                return (
-                  <div
-                    key={session.id}
-                    className={`flex items-center gap-3 px-4 py-2.5 cursor-pointer transition-colors ${isSelected ? "bg-primary/15" : "hover:bg-muted/50"
-                      }`}
-                    onClick={() => {
-                      onSelectTab(session.id);
-                      onClose();
-                    }}
-                    onMouseEnter={() => setSelectedIndex(idx)}
-                  >
-                    <div className="h-6 w-6 rounded flex items-center justify-center text-muted-foreground">
-                      <TerminalSquare size={16} />
-                    </div>
-                    <span className="text-sm font-medium">
-                      {session.hostLabel}
-                    </span>
-                  </div>
-                );
-              })}
-            </div>
-
-            {/* Quick connect section */}
-            <div>
-              <div className="px-4 py-1.5">
-                <span className="text-xs font-medium text-muted-foreground">
-                  Quick connect
-                </span>
+                  );
+                })}
              </div>

-              {/* Local Terminal */}
-              {onCreateLocalTerminal && (
-                <div
-                  className={`flex items-center gap-3 px-4 py-2.5 cursor-pointer transition-colors ${getItemIndex("action", "local-terminal") === selectedIndex
-                    ? "bg-primary/15"
-                    : "hover:bg-muted/50"
-                    }`}
-                  onClick={() => {
-                    onCreateLocalTerminal();
-                    onClose();
-                  }}
-                  onMouseEnter={() =>
-                    setSelectedIndex(getItemIndex("action", "local-terminal"))
-                  }
-                >
-                  <div className="h-6 w-6 rounded flex items-center justify-center text-muted-foreground">
-                    <Terminal size={16} />
-                  </div>
-                  <span className="text-sm font-medium">{t("qs.localTerminal")}</span>
+              {/* Quick connect section */}
+              <div>
+                <div className="px-4 py-1.5">
+                  <span className="text-xs font-medium text-muted-foreground">
+                    Quick connect
+                  </span>
                </div>
-              )}

-              {/* Serial removed (not supported) */}
+                {/* Local Terminal */}
+                {onCreateLocalTerminal && (
+                  <div
+                    className={`flex items-center gap-3 px-4 py-2.5 cursor-pointer transition-colors ${getItemIndex("action", "local-terminal") === selectedIndex
+                      ? "bg-primary/15"
+                      : "hover:bg-muted/50"
+                      }`}
+                    onClick={() => {
+                      onCreateLocalTerminal();
+                      onClose();
+                    }}
+                    onMouseEnter={() =>
+                      setSelectedIndex(getItemIndex("action", "local-terminal"))
+                    }
+                  >
+                    <div className="h-6 w-6 rounded flex items-center justify-center text-muted-foreground">
+                      <Terminal size={16} />
+                    </div>
+                    <span className="text-sm font-medium">{t("qs.localTerminal")}</span>
+                  </div>
+                )}
+
+                {/* Serial removed (not supported) */}
+              </div>
            </div>
-          </div>
+          )}
        </ScrollArea>
      </div>
    </div>
--- a/components/SFTPModal.tsx
+++ b/components/SFTPModal.tsx
--- a/components/SelectHostPanel.tsx
+++ b/components/SelectHostPanel.tsx
@@ -11,7 +11,6 @@ import React, { useMemo, useState } from "react";
 import { cn } from "../lib/utils";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { Host, SSHKey } from "../types";
-import { ManagedSource } from "../domain/models";
 import { DistroAvatar } from "./DistroAvatar";
 import HostDetailsPanel from "./HostDetailsPanel";
 import { Button } from "./ui/button";
@@ -32,7 +31,6 @@ interface SelectHostPanelProps {
  // Props for inline host creation
  availableKeys?: SSHKey[];
  identities?: import('../domain/models').Identity[];
-  managedSources?: ManagedSource[];
  onSaveHost?: (host: Host) => void;
  onCreateGroup?: (groupPath: string) => void;
  title?: string;
@@ -51,7 +49,6 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
  onNewHost,
  availableKeys = [],
  identities = [],
-  managedSources = [],
  onSaveHost,
  onCreateGroup,
  title,
@@ -66,26 +63,21 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
  const [selectedTags, setSelectedTags] = useState<string[]>([]);
  const [showNewHostPanel, setShowNewHostPanel] = useState(false);

-  const selectableHosts = useMemo(
-    () => hosts.filter((host) => host.protocol !== "serial"),
-    [hosts]
-  );
-
  // Get all unique tags from hosts
  const allTags = useMemo(() => {
    const tagSet = new Set<string>();
-    selectableHosts.forEach((h) => {
+    hosts.forEach((h) => {
      if (h.tags) {
        h.tags.forEach((tag) => tagSet.add(tag));
      }
    });
    return Array.from(tagSet).sort();
-  }, [selectableHosts]);
+  }, [hosts]);

  // Get unique group paths from both hosts and customGroups
  const allGroupPaths = useMemo(() => {
    const pathSet = new Set<string>();
-    selectableHosts.forEach((h) => {
+    hosts.forEach((h) => {
      if (h.group) {
        // Add all parent paths as well
        const parts = h.group.split("/");
@@ -96,7 +88,7 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
    });
    customGroups.forEach((g) => pathSet.add(g));
    return Array.from(pathSet).sort();
-  }, [selectableHosts, customGroups]);
+  }, [hosts, customGroups]);

  // Get groups at current level
  const groupsWithCounts = useMemo(() => {
@@ -110,7 +102,7 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
        const topLevel = path.split("/")[0];
        if (!seen.has(topLevel)) {
          seen.add(topLevel);
-          const count = selectableHosts.filter(
+          const count = hosts.filter(
            (h) =>
              h.group &&
              (h.group === topLevel || h.group.startsWith(`${topLevel}/`)),
@@ -124,7 +116,7 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
        const fullPath = `${prefix}${nextLevel}`;
        if (!seen.has(fullPath)) {
          seen.add(fullPath);
-          const count = selectableHosts.filter(
+          const count = hosts.filter(
            (h) =>
              h.group &&
              (h.group === fullPath || h.group.startsWith(`${fullPath}/`)),
@@ -135,11 +127,11 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
    });

    return groups;
-  }, [allGroupPaths, currentPath, selectableHosts]);
+  }, [allGroupPaths, currentPath, hosts]);

  // Get hosts at current level with filtering and sorting
  const filteredHosts = useMemo(() => {
-    let result = selectableHosts;
+    let result = hosts;

    // Filter by current path
    if (currentPath) {
@@ -185,7 +177,7 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
    });

    return result;
-  }, [selectableHosts, currentPath, searchQuery, selectedTags, sortMode]);
+  }, [hosts, currentPath, searchQuery, selectedTags, sortMode]);

  // Build breadcrumb from current path
  const breadcrumbs = useMemo(() => {
@@ -364,7 +356,7 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
                      <div className="flex-1 min-w-0">
                        <div className="font-medium">{host.label}</div>
                        <div className="text-xs text-muted-foreground truncate">
-                          {host.username}@{host.hostname}:{host.port || 22}
+                          {host.protocol || "ssh"}, {host.username}
                        </div>
                      </div>
                      {isSelected && (
@@ -395,7 +387,7 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
            if (onContinue) {
              onContinue();
            } else {
-              const host = selectableHosts.find((h) => selectedHostIds.includes(h.id));
+              const host = hosts.find((h) => selectedHostIds.includes(h.id));
              if (host) {
                onSelect(host);
              }
@@ -415,7 +407,6 @@ const SelectHostPanel: React.FC<SelectHostPanelProps> = ({
          availableKeys={availableKeys}
          identities={identities}
          groups={customGroups}
-          managedSources={managedSources}
          allHosts={hosts}
          onSave={(host) => {
            onSaveHost(host);
--- a/components/SerialConnectModal.tsx
+++ b/components/SerialConnectModal.tsx
@@ -2,11 +2,11 @@
 * Serial Port Connect Modal
 * Allows users to configure and connect to a serial port
 */
-import { ChevronDown, ChevronUp, Cpu, RefreshCw, Save, Usb } from 'lucide-react';
+import { ChevronDown, ChevronUp, Cpu, RefreshCw, Usb } from 'lucide-react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useI18n } from '../application/i18n/I18nProvider';
 import { useTerminalBackend } from '../application/state/useTerminalBackend';
-import type { Host, SerialConfig, SerialFlowControl, SerialParity } from '../domain/models';
+import type { SerialConfig, SerialFlowControl, SerialParity } from '../domain/models';
 import { cn } from '../lib/utils';
 import { Button } from './ui/button';
 import { Combobox, type ComboboxOption } from './ui/combobox';
@@ -18,7 +18,6 @@ import {
  DialogHeader,
  DialogTitle,
 } from './ui/dialog';
-import { Input } from './ui/input';
 import { Label } from './ui/label';
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from './ui/collapsible';

@@ -36,7 +35,6 @@ interface SerialConnectModalProps {
  open: boolean;
  onClose: () => void;
  onConnect: (config: SerialConfig) => void;
-  onSaveHost?: (host: Host) => void;
 }

 const BAUD_RATES = [300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600];
@@ -49,7 +47,6 @@ export const SerialConnectModal: React.FC<SerialConnectModalProps> = ({
  open,
  onClose,
  onConnect,
-  onSaveHost,
 }) => {
  const { t } = useI18n();
  const [ports, setPorts] = useState<SerialPort[]>([]);
@@ -66,10 +63,6 @@ export const SerialConnectModal: React.FC<SerialConnectModalProps> = ({
  const [localEcho, setLocalEcho] = useState(false);
  const [lineMode, setLineMode] = useState(false);

-  // Save configuration state
-  const [saveConfig, setSaveConfig] = useState(false);
-  const [configLabel, setConfigLabel] = useState('');
-
  const terminalBackend = useTerminalBackend();

  const loadPorts = useCallback(async () => {
@@ -94,14 +87,6 @@ export const SerialConnectModal: React.FC<SerialConnectModalProps> = ({
    }
  }, [open]); // eslint-disable-line react-hooks/exhaustive-deps

-  // Generate a default label when port is selected
-  useEffect(() => {
-    if (selectedPort && !configLabel) {
-      const portName = selectedPort.split('/').pop() || selectedPort;
-      setConfigLabel(`Serial: ${portName}`);
-    }
-  }, [selectedPort, configLabel]);
-
  const handleConnect = () => {
    if (!selectedPort) return;

@@ -116,26 +101,6 @@ export const SerialConnectModal: React.FC<SerialConnectModalProps> = ({
      lineMode,
    };

-    // Save as host if checkbox is checked and onSaveHost is provided
-    if (saveConfig && onSaveHost) {
-      const portName = selectedPort.split('/').pop() || selectedPort;
-      const host: Host = {
-        id: `serial-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`,
-        label: configLabel.trim() || `Serial: ${portName}`,
-        hostname: selectedPort,
-        // For serial hosts, port field stores baud rate as a numeric identifier.
-        // The full configuration is stored in serialConfig for actual connection.
-        port: baudRate,
-        username: '',
-        os: 'linux',
-        tags: ['serial'],
-        protocol: 'serial',
-        createdAt: Date.now(),
-        serialConfig: config, // Store full serial configuration for connection
-      };
-      onSaveHost(host);
-    }
-
    onConnect(config);
    onClose();
  };
@@ -149,17 +114,9 @@ export const SerialConnectModal: React.FC<SerialConnectModalProps> = ({
    }));
  }, [ports]);

-  // Validate: port path must start with /dev/ (Unix/macOS) or COM/\\.\COM (Windows)
-  const trimmedPort = selectedPort.trim();
-  const isPortValid =
-    trimmedPort.startsWith('/dev/') ||
-    /^COM\d+$/i.test(trimmedPort) ||
-    /^\\\\\.\\COM\d+$/i.test(trimmedPort);
-  // Allow custom baud rates as long as they are positive integers
-  const isBaudRateValid = Number.isInteger(baudRate) && baudRate > 0;
-
-  // Check if using 1.5 stop bits (limited Windows support)
-  const isStopBits15 = stopBits === 1.5;
+  // Validate: port path must start with /dev/
+  const isPortValid = selectedPort.trim().startsWith('/dev/');
+  const isBaudRateValid = BAUD_RATES.includes(baudRate);
  const isValid = isPortValid && isBaudRateValid;

  return (
@@ -214,28 +171,18 @@ export const SerialConnectModal: React.FC<SerialConnectModalProps> = ({
          {/* Baud Rate */}
          <div className="space-y-2">
            <Label htmlFor="baud-rate">{t('serial.field.baudRate')}</Label>
-            <Combobox
-              options={BAUD_RATES.map((rate) => ({
-                value: String(rate),
-                label: String(rate),
-              }))}
-              value={String(baudRate)}
-              onValueChange={(val) => {
-                const parsed = parseInt(val, 10);
-                if (!isNaN(parsed) && parsed > 0) {
-                  setBaudRate(parsed);
-                }
-              }}
-              placeholder={t('serial.field.baudRatePlaceholder')}
-              emptyText={t('serial.field.baudRateEmpty')}
-              allowCreate
-              createText={t('common.use')}
-            />
-            {baudRate > 0 && !BAUD_RATES.includes(baudRate) && (
-              <p className="text-xs text-muted-foreground">
-                {t('serial.field.customBaudRate')}
-              </p>
-            )}
+            <select
+              id="baud-rate"
+              value={baudRate}
+              onChange={(e) => setBaudRate(parseInt(e.target.value, 10))}
+              className="w-full h-10 px-3 rounded-md border border-input bg-background text-sm focus:outline-none focus:ring-2 focus:ring-ring"
+            >
+              {BAUD_RATES.map((rate) => (
+                <option key={rate} value={rate}>
+                  {rate}
+                </option>
+              ))}
+            </select>
          </div>

          {/* Advanced Options */}
@@ -289,11 +236,6 @@ export const SerialConnectModal: React.FC<SerialConnectModalProps> = ({
                      </option>
                    ))}
                  </select>
-                  {isStopBits15 && (
-                    <p className="text-xs text-yellow-500">
-                      {t('serial.field.stopBits15Warning')}
-                    </p>
-                  )}
                </div>
              </div>

@@ -371,40 +313,6 @@ export const SerialConnectModal: React.FC<SerialConnectModalProps> = ({
              </div>
            </CollapsibleContent>
          </Collapsible>
-
-          {/* Save Configuration */}
-          {onSaveHost && (
-            <div className="space-y-3 pt-2 border-t border-border/60">
-              <div className="flex items-center justify-between">
-                <div className="space-y-0.5">
-                  <Label htmlFor="save-config" className="text-sm font-medium cursor-pointer">
-                    {t('serial.field.saveConfig')}
-                  </Label>
-                  <p className="text-xs text-muted-foreground">
-                    {t('serial.field.saveConfigDesc')}
-                  </p>
-                </div>
-                <input
-                  type="checkbox"
-                  id="save-config"
-                  checked={saveConfig}
-                  onChange={(e) => setSaveConfig(e.target.checked)}
-                  className="h-4 w-4 rounded border-input"
-                />
-              </div>
-              {saveConfig && (
-                <div className="space-y-2">
-                  <Label htmlFor="config-label">{t('serial.field.configLabel')}</Label>
-                  <Input
-                    id="config-label"
-                    value={configLabel}
-                    onChange={(e) => setConfigLabel(e.target.value)}
-                    placeholder={t('serial.field.configLabelPlaceholder')}
-                  />
-                </div>
-              )}
-            </div>
-          )}
        </div>

        <DialogFooter>
@@ -412,12 +320,8 @@ export const SerialConnectModal: React.FC<SerialConnectModalProps> = ({
            {t('common.cancel')}
          </Button>
          <Button onClick={handleConnect} disabled={!isValid}>
-            {saveConfig ? (
-              <Save size={14} className="mr-2" />
-            ) : (
-              <Cpu size={14} className="mr-2" />
-            )}
-            {saveConfig ? t('serial.connectAndSave') : t('common.connect')}
+            <Cpu size={14} className="mr-2" />
+            {t('common.connect')}
          </Button>
        </DialogFooter>
      </DialogContent>
--- a/components/SerialHostDetailsPanel.tsx
+++ b/components/SerialHostDetailsPanel.tsx
@@ -1,415 +0,0 @@
-/**
- * Serial Host Details Panel
- * A dedicated editor for serial port hosts (distinct from SSH HostDetailsPanel)
- */
-import { ChevronDown, ChevronUp, Save, Tag, Usb } from 'lucide-react';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useI18n } from '../application/i18n/I18nProvider';
-import { useTerminalBackend } from '../application/state/useTerminalBackend';
-import type { Host, SerialConfig, SerialFlowControl, SerialParity } from '../domain/models';
-
-import { Button } from './ui/button';
-import { Combobox, ComboboxOption, MultiCombobox } from './ui/combobox';
-import { Input } from './ui/input';
-import { Label } from './ui/label';
-import { Collapsible, CollapsibleContent, CollapsibleTrigger } from './ui/collapsible';
-import {
-  AsidePanel,
-  AsidePanelContent,
-  AsidePanelFooter,
-} from './ui/aside-panel';
-
-interface SerialPort {
-  path: string;
-  manufacturer: string;
-  serialNumber: string;
-  vendorId: string;
-  productId: string;
-  pnpId: string;
-  type?: 'hardware' | 'pseudo' | 'custom';
-}
-
-interface SerialHostDetailsPanelProps {
-  initialData: Host;
-  allTags?: string[];
-  groups?: string[];
-  onSave: (host: Host) => void;
-  onCancel: () => void;
-}
-
-const BAUD_RATES = [300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600];
-const DATA_BITS: Array<5 | 6 | 7 | 8> = [5, 6, 7, 8];
-const STOP_BITS: Array<1 | 1.5 | 2> = [1, 1.5, 2];
-const PARITY_OPTIONS: SerialParity[] = ['none', 'even', 'odd', 'mark', 'space'];
-const FLOW_CONTROL_OPTIONS: SerialFlowControl[] = ['none', 'xon/xoff', 'rts/cts'];
-
-export const SerialHostDetailsPanel: React.FC<SerialHostDetailsPanelProps> = ({
-  initialData,
-  allTags = [],
-  groups = [],
-  onSave,
-  onCancel,
-}) => {
-  const { t } = useI18n();
-  const terminalBackend = useTerminalBackend();
-  const [ports, setPorts] = useState<SerialPort[]>([]);
-  const [isLoadingPorts, setIsLoadingPorts] = useState(false);
-  const [showAdvanced, setShowAdvanced] = useState(false);
-
-  // Form state
-  const [label, setLabel] = useState(initialData.label);
-  const [selectedPort, setSelectedPort] = useState(initialData.hostname || initialData.serialConfig?.path || '');
-  const [baudRate, setBaudRate] = useState(initialData.serialConfig?.baudRate || initialData.port || 115200);
-  const [dataBits, setDataBits] = useState<5 | 6 | 7 | 8>(initialData.serialConfig?.dataBits || 8);
-  const [stopBits, setStopBits] = useState<1 | 1.5 | 2>(initialData.serialConfig?.stopBits || 1);
-  const [parity, setParity] = useState<SerialParity>(initialData.serialConfig?.parity || 'none');
-  const [flowControl, setFlowControl] = useState<SerialFlowControl>(initialData.serialConfig?.flowControl || 'none');
-  const [localEcho, setLocalEcho] = useState(initialData.serialConfig?.localEcho || false);
-  const [lineMode, setLineMode] = useState(initialData.serialConfig?.lineMode || false);
-  const [tags, setTags] = useState<string[]>(initialData.tags || []);
-  const [group, setGroup] = useState(initialData.group || '');
-
-  const loadPorts = useCallback(async () => {
-    setIsLoadingPorts(true);
-    try {
-      const result = await terminalBackend.listSerialPorts();
-      setPorts(result);
-    } catch (err) {
-      console.error('[Serial] Failed to list ports:', err);
-    } finally {
-      setIsLoadingPorts(false);
-    }
-  }, [terminalBackend]);
-
-  useEffect(() => {
-    loadPorts();
-  }, [loadPorts]);
-
-  const handleSave = () => {
-    if (!selectedPort) return;
-
-    const config: SerialConfig = {
-      path: selectedPort,
-      baudRate,
-      dataBits,
-      stopBits,
-      parity,
-      flowControl,
-      localEcho,
-      lineMode,
-    };
-
-    const portName = selectedPort.split('/').pop() || selectedPort;
-    const updatedHost: Host = {
-      ...initialData,
-      label: label.trim() || `Serial: ${portName}`,
-      hostname: selectedPort,
-      port: baudRate,
-      tags,
-      group,
-      serialConfig: config,
-    };
-
-    onSave(updatedHost);
-  };
-
-  // Convert ports to Combobox options
-  const portOptions: ComboboxOption[] = useMemo(() => {
-    return ports.map((port) => ({
-      value: port.path,
-      label: port.path,
-      sublabel: port.manufacturer || undefined,
-    }));
-  }, [ports]);
-
-  // Tag options for MultiCombobox
-  const tagOptions: ComboboxOption[] = useMemo(() => {
-    const allUniqueTags = new Set([...allTags, ...tags]);
-    return Array.from(allUniqueTags).map((tag) => ({
-      value: tag,
-      label: tag,
-    }));
-  }, [allTags, tags]);
-
-  // Group options for Combobox
-  const groupOptions: ComboboxOption[] = useMemo(() => {
-    const allGroups = new Set(groups);
-    if (group && !allGroups.has(group)) {
-      allGroups.add(group);
-    }
-    return Array.from(allGroups).map((g) => ({
-      value: g,
-      label: g,
-    }));
-  }, [groups, group]);
-
-  // Validation
-  const trimmedPort = selectedPort.trim();
-  const isPortValid =
-    trimmedPort.startsWith('/dev/') ||
-    /^COM\d+$/i.test(trimmedPort) ||
-    /^\\\\\.\\COM\d+$/i.test(trimmedPort);
-  const isBaudRateValid = Number.isInteger(baudRate) && baudRate > 0;
-  const isValid = isPortValid && isBaudRateValid;
-
-  // Check if using 1.5 stop bits (limited Windows support)
-  const isStopBits15 = stopBits === 1.5;
-
-  return (
-    <AsidePanel
-      open={true}
-      onClose={onCancel}
-      title={t('serial.edit.title')}
-      subtitle={initialData.label}
-      className="z-40"
-    >
-      <AsidePanelContent>
-        {/* Label */}
-        <div className="space-y-2">
-          <Label htmlFor="serial-label">{t('serial.field.configLabel')}</Label>
-          <Input
-            id="serial-label"
-            value={label}
-            onChange={(e) => setLabel(e.target.value)}
-            placeholder={t('serial.field.configLabelPlaceholder')}
-          />
-        </div>
-
-        {/* Serial Port */}
-        <div className="space-y-2">
-          <div className="flex items-center justify-between">
-            <Label htmlFor="serial-port">{t('serial.field.port')}</Label>
-            <Button
-              variant="ghost"
-              size="sm"
-              onClick={loadPorts}
-              disabled={isLoadingPorts}
-              className="h-6 px-2 text-xs"
-            >
-              {t('common.refresh')}
-            </Button>
-          </div>
-          <Combobox
-            options={portOptions}
-            value={selectedPort}
-            onValueChange={setSelectedPort}
-            placeholder={t('serial.field.selectPort')}
-            emptyText={t('serial.noPorts')}
-            allowCreate
-            createText={t('common.use')}
-            icon={<Usb size={14} className="text-muted-foreground" />}
-          />
-          {!isPortValid && selectedPort && (
-            <p className="text-xs text-destructive">
-              {t('serial.field.customPortPlaceholder')}
-            </p>
-          )}
-        </div>
-
-        {/* Baud Rate */}
-        <div className="space-y-2">
-          <Label htmlFor="baud-rate">{t('serial.field.baudRate')}</Label>
-          <Combobox
-            options={BAUD_RATES.map((rate) => ({
-              value: String(rate),
-              label: String(rate),
-            }))}
-            value={String(baudRate)}
-            onValueChange={(val) => {
-              const parsed = parseInt(val, 10);
-              if (!isNaN(parsed) && parsed > 0) {
-                setBaudRate(parsed);
-              }
-            }}
-            placeholder={t('serial.field.baudRatePlaceholder')}
-            emptyText={t('serial.field.baudRateEmpty')}
-            allowCreate
-            createText={t('common.use')}
-          />
-          {baudRate > 0 && !BAUD_RATES.includes(baudRate) && (
-            <p className="text-xs text-muted-foreground">
-              {t('serial.field.customBaudRate')}
-            </p>
-          )}
-        </div>
-
-        {/* Tags */}
-        <div className="space-y-2">
-          <Label className="flex items-center gap-2">
-            <Tag size={14} />
-            {t('hostDetails.tags')}
-          </Label>
-          <MultiCombobox
-            options={tagOptions}
-            values={tags}
-            onValuesChange={setTags}
-            placeholder={t('hostDetails.addTag')}
-            allowCreate
-            createText={t('hostDetails.createTag')}
-          />
-        </div>
-
-        {/* Group */}
-        <div className="space-y-2">
-          <Label>{t('hostDetails.group')}</Label>
-          <Combobox
-            options={groupOptions}
-            value={group}
-            onValueChange={setGroup}
-            placeholder={t('hostDetails.selectGroup')}
-            allowCreate
-            createText={t('hostDetails.createGroup')}
-          />
-        </div>
-
-        {/* Advanced Options */}
-        <Collapsible open={showAdvanced} onOpenChange={setShowAdvanced}>
-          <CollapsibleTrigger asChild>
-            <Button
-              variant="ghost"
-              className="w-full justify-between h-9 px-0 hover:bg-transparent"
-            >
-              <span className="text-sm font-medium text-muted-foreground">
-                {t('common.advanced')}
-              </span>
-              {showAdvanced ? (
-                <ChevronUp size={14} className="text-muted-foreground" />
-              ) : (
-                <ChevronDown size={14} className="text-muted-foreground" />
-              )}
-            </Button>
-          </CollapsibleTrigger>
-          <CollapsibleContent className="space-y-4 pt-2">
-            {/* Data Bits */}
-            <div className="grid grid-cols-2 gap-4">
-              <div className="space-y-2">
-                <Label htmlFor="data-bits">{t('serial.field.dataBits')}</Label>
-                <select
-                  id="data-bits"
-                  value={dataBits}
-                  onChange={(e) => setDataBits(parseInt(e.target.value, 10) as 5 | 6 | 7 | 8)}
-                  className="w-full h-10 px-3 rounded-md border border-input bg-background text-sm focus:outline-none focus:ring-2 focus:ring-ring"
-                >
-                  {DATA_BITS.map((bits) => (
-                    <option key={bits} value={bits}>
-                      {bits}
-                    </option>
-                  ))}
-                </select>
-              </div>
-
-              {/* Stop Bits */}
-              <div className="space-y-2">
-                <Label htmlFor="stop-bits">{t('serial.field.stopBits')}</Label>
-                <select
-                  id="stop-bits"
-                  value={stopBits}
-                  onChange={(e) => setStopBits(parseFloat(e.target.value) as 1 | 1.5 | 2)}
-                  className="w-full h-10 px-3 rounded-md border border-input bg-background text-sm focus:outline-none focus:ring-2 focus:ring-ring"
-                >
-                  {STOP_BITS.map((bits) => (
-                    <option key={bits} value={bits}>
-                      {bits}
-                    </option>
-                  ))}
-                </select>
-                {isStopBits15 && (
-                  <p className="text-xs text-yellow-500">
-                    {t('serial.field.stopBits15Warning')}
-                  </p>
-                )}
-              </div>
-            </div>
-
-            {/* Parity */}
-            <div className="space-y-2">
-              <Label htmlFor="parity">{t('serial.field.parity')}</Label>
-              <select
-                id="parity"
-                value={parity}
-                onChange={(e) => setParity(e.target.value as SerialParity)}
-                className="w-full h-10 px-3 rounded-md border border-input bg-background text-sm focus:outline-none focus:ring-2 focus:ring-ring"
-              >
-                {PARITY_OPTIONS.map((option) => (
-                  <option key={option} value={option}>
-                    {t(`serial.parity.${option}`)}
-                  </option>
-                ))}
-              </select>
-            </div>
-
-            {/* Flow Control */}
-            <div className="space-y-2">
-              <Label htmlFor="flow-control">{t('serial.field.flowControl')}</Label>
-              <select
-                id="flow-control"
-                value={flowControl}
-                onChange={(e) => setFlowControl(e.target.value as SerialFlowControl)}
-                className="w-full h-10 px-3 rounded-md border border-input bg-background text-sm focus:outline-none focus:ring-2 focus:ring-ring"
-              >
-                {FLOW_CONTROL_OPTIONS.map((option) => (
-                  <option key={option} value={option}>
-                    {t(`serial.flowControl.${option}`)}
-                  </option>
-                ))}
-              </select>
-            </div>
-
-            {/* Terminal Options */}
-            <div className="space-y-3 pt-2 border-t border-border/60">
-              <div className="flex items-center justify-between">
-                <div className="space-y-0.5">
-                  <Label htmlFor="local-echo" className="text-sm font-medium cursor-pointer">
-                    {t('serial.field.localEcho')}
-                  </Label>
-                  <p className="text-xs text-muted-foreground">
-                    {t('serial.field.localEchoDesc')}
-                  </p>
-                </div>
-                <input
-                  type="checkbox"
-                  id="local-echo"
-                  checked={localEcho}
-                  onChange={(e) => setLocalEcho(e.target.checked)}
-                  className="h-4 w-4 rounded border-input"
-                />
-              </div>
-
-              <div className="flex items-center justify-between">
-                <div className="space-y-0.5">
-                  <Label htmlFor="line-mode" className="text-sm font-medium cursor-pointer">
-                    {t('serial.field.lineMode')}
-                  </Label>
-                  <p className="text-xs text-muted-foreground">
-                    {t('serial.field.lineModeDesc')}
-                  </p>
-                </div>
-                <input
-                  type="checkbox"
-                  id="line-mode"
-                  checked={lineMode}
-                  onChange={(e) => setLineMode(e.target.checked)}
-                  className="h-4 w-4 rounded border-input"
-                />
-              </div>
-            </div>
-          </CollapsibleContent>
-        </Collapsible>
-      </AsidePanelContent>
-
-      <AsidePanelFooter>
-        <div className="flex gap-2">
-          <Button variant="ghost" onClick={onCancel} className="flex-1">
-            {t('common.cancel')}
-          </Button>
-          <Button onClick={handleSave} disabled={!isValid} className="flex-1">
-            <Save size={14} className="mr-2" />
-            {t('common.save')}
-          </Button>
-        </div>
-      </AsidePanelFooter>
-    </AsidePanel>
-  );
-};
-
-export default SerialHostDetailsPanel;
--- a/components/SettingsPage.tsx
+++ b/components/SettingsPage.tsx
@@ -71,7 +71,7 @@ const SettingsPageContent: React.FC<{ settings: SettingsState }> = ({ settings }
    }, [closeSettingsWindow]);

    return (
-        <div className="h-screen flex flex-col bg-background text-foreground font-sans">
+        <div className="h-screen flex flex-col bg-background text-foreground">
            <div className="shrink-0 border-b border-border app-drag">
                <div className="flex items-center justify-between px-4 pt-3">
                    {isMac && <div className="h-6" />}
@@ -158,8 +158,6 @@ const SettingsPageContent: React.FC<{ settings: SettingsState }> = ({ settings }
                            setAccentMode={settings.setAccentMode}
                            customAccent={settings.customAccent}
                            setCustomAccent={settings.setCustomAccent}
-                            uiFontFamilyId={settings.uiFontFamilyId}
-                            setUiFontFamilyId={settings.setUiFontFamilyId}
                            uiLanguage={settings.uiLanguage}
                            setUiLanguage={settings.setUiLanguage}
                            customCSS={settings.customCSS}
@@ -203,21 +201,7 @@ const SettingsPageContent: React.FC<{ settings: SettingsState }> = ({ settings }
                        </React.Suspense>
                    )}

-                    {mountedTabs.has("system") && (
-                        <SettingsSystemTab
-                            sessionLogsEnabled={settings.sessionLogsEnabled}
-                            setSessionLogsEnabled={settings.setSessionLogsEnabled}
-                            sessionLogsDir={settings.sessionLogsDir}
-                            setSessionLogsDir={settings.setSessionLogsDir}
-                            sessionLogsFormat={settings.sessionLogsFormat}
-                            setSessionLogsFormat={settings.setSessionLogsFormat}
-                            toggleWindowHotkey={settings.toggleWindowHotkey}
-                            setToggleWindowHotkey={settings.setToggleWindowHotkey}
-                            closeToTray={settings.closeToTray}
-                            setCloseToTray={settings.setCloseToTray}
-                            hotkeyRegistrationError={settings.hotkeyRegistrationError}
-                        />
-                    )}
+                    {mountedTabs.has("system") && <SettingsSystemTab />}
                </div>
            </Tabs>
        </div>
--- a/components/SftpView.tsx
+++ b/components/SftpView.tsx
--- a/components/SnippetsManager.tsx
+++ b/components/SnippetsManager.tsx
@@ -1,11 +1,10 @@
-import { Check, ChevronDown, Clock, Copy, Edit2, FileCode, FolderPlus, Keyboard, LayoutGrid, List as ListIcon, Loader2, Package, Play, Plus, RotateCcw, Search, Trash2 } from 'lucide-react';
+import { Check, ChevronDown, Clock, Copy, Edit2, FileCode, FolderPlus, LayoutGrid, List as ListIcon, Loader2, Package, Play, Plus, Search, Trash2 } from 'lucide-react';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useI18n } from '../application/i18n/I18nProvider';
 import { useStoredViewMode } from '../application/state/useStoredViewMode';
 import { STORAGE_KEY_VAULT_SNIPPETS_VIEW_MODE } from '../infrastructure/config/storageKeys';
-import { cn, isMacPlatform } from '../lib/utils';
+import { cn } from '../lib/utils';
 import { Host, ShellHistoryEntry, Snippet, SSHKey } from '../types';
-import { HotkeyScheme, KeyBinding, keyEventToString, ManagedSource, matchesKeyBinding, parseKeyCombo } from '../domain/models';
 import { DistroAvatar } from './DistroAvatar';
 import SelectHostPanel from './SelectHostPanel';
 import { AsidePanel, AsidePanelContent } from './ui/aside-panel';
@@ -25,15 +24,12 @@ interface SnippetsManagerProps {
  hosts: Host[];
  customGroups?: string[];
  shellHistory: ShellHistoryEntry[];
-  hotkeyScheme: HotkeyScheme;
-  keyBindings: KeyBinding[];
  onSave: (snippet: Snippet) => void;
  onDelete: (id: string) => void;
  onPackagesChange: (packages: string[]) => void;
  onRunSnippet?: (snippet: Snippet, targetHosts: Host[]) => void;
  // Props for inline host creation
  availableKeys?: SSHKey[];
-  managedSources?: ManagedSource[];
  onSaveHost?: (host: Host) => void;
  onCreateGroup?: (groupPath: string) => void;
 }
@@ -48,14 +44,11 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
  hosts,
  customGroups = [],
  shellHistory,
-  hotkeyScheme,
-  keyBindings,
  onSave,
  onDelete,
  onPackagesChange,
  onRunSnippet,
  availableKeys = [],
-  managedSources = [],
  onSaveHost,
  onCreateGroup,
 }) => {
@@ -74,12 +67,6 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
  const [newPackageName, setNewPackageName] = useState('');
  const [isPackageDialogOpen, setIsPackageDialogOpen] = useState(false);

-  // Rename package state
-  const [isRenameDialogOpen, setIsRenameDialogOpen] = useState(false);
-  const [renamingPackagePath, setRenamingPackagePath] = useState<string | null>(null);
-  const [renamePackageName, setRenamePackageName] = useState('');
-  const [renameError, setRenameError] = useState('');
-
  // Search, sort, and view mode state
  const [search, setSearch] = useState('');
  const [viewMode, setViewMode] = useStoredViewMode(
@@ -93,187 +80,6 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
  const historyScrollRef = useRef<HTMLDivElement>(null);
  const [isLoadingMore, setIsLoadingMore] = useState(false);

-  // Shortkey recording state
-  const [isRecordingShortkey, setIsRecordingShortkey] = useState(false);
-  const [shortkeyError, setShortkeyError] = useState<string | null>(null);
-
-  const existingShortkeys = useMemo(() => (
-    snippets.filter(s => Boolean(s.shortkey) && s.id !== editingSnippet.id)
-  ), [snippets, editingSnippet.id]);
-
-  const isMac = useMemo(() => (
-    hotkeyScheme === 'mac' || (hotkeyScheme === 'disabled' && isMacPlatform())
-  ), [hotkeyScheme]);
-
-  const activeSystemBindings = useMemo(() => {
-    return keyBindings.flatMap((binding) => {
-      const entries: { binding: string; isMac: boolean }[] = [];
-      const macBinding = binding.mac;
-      const pcBinding = binding.pc;
-
-      if (hotkeyScheme === 'mac') {
-        if (macBinding && macBinding !== 'Disabled') {
-          entries.push({ binding: macBinding, isMac: true });
-        }
-        return entries;
-      }
-
-      if (hotkeyScheme === 'pc') {
-        if (pcBinding && pcBinding !== 'Disabled') {
-          entries.push({ binding: pcBinding, isMac: false });
-        }
-        return entries;
-      }
-
-      if (macBinding && macBinding !== 'Disabled') {
-        entries.push({ binding: macBinding, isMac: true });
-      }
-      if (pcBinding && pcBinding !== 'Disabled') {
-        entries.push({ binding: pcBinding, isMac: false });
-      }
-      return entries;
-    });
-  }, [hotkeyScheme, keyBindings]);
-
-  const buildKeyEventFromString = useCallback((keyString: string) => {
-    const parsed = parseKeyCombo(keyString);
-    if (!parsed) return null;
-
-    const modifiers = new Set(parsed.modifiers);
-    const key = parsed.key;
-    const normalizedKey = (() => {
-      switch (key) {
-        case 'Space':
-          return ' ';
-        case '↑':
-          return 'ArrowUp';
-        case '↓':
-          return 'ArrowDown';
-        case '←':
-          return 'ArrowLeft';
-        case '→':
-          return 'ArrowRight';
-        case 'Esc':
-          return 'Escape';
-        case '⌫':
-          return 'Backspace';
-        case 'Del':
-          return 'Delete';
-        case '↵':
-          return 'Enter';
-        case '⇥':
-          return 'Tab';
-        default:
-          return key.length === 1 ? key.toLowerCase() : key;
-      }
-    })();
-
-    return new KeyboardEvent('keydown', {
-      key: normalizedKey,
-      metaKey: modifiers.has('⌘') || modifiers.has('Win'),
-      ctrlKey: modifiers.has('⌃') || modifiers.has('Ctrl'),
-      altKey: modifiers.has('⌥') || modifiers.has('Alt'),
-      shiftKey: modifiers.has('Shift'),
-    });
-  }, []);
-
-  // Validate shortkey for conflicts (case-insensitive comparison)
-  const normalizeKeyString = useCallback((value: string) => (
-    value.toLowerCase().replace(/\s+/g, '')
-  ), []);
-
-  const validateShortkey = useCallback((key: string): string | null => {
-    if (!key) return null;
-    
-    const syntheticEvent = buildKeyEventFromString(key);
-    if (syntheticEvent) {
-      const conflictsSystem = activeSystemBindings.some(({ binding, isMac: bindingIsMac }) => (
-        matchesKeyBinding(syntheticEvent, binding, bindingIsMac)
-      ));
-      if (conflictsSystem) {
-        return t('snippets.shortkey.error.systemConflict');
-      }
-    }
-    
-    // Check other snippet shortcuts
-    if (syntheticEvent) {
-      for (const snippet of existingShortkeys) {
-        if (snippet.shortkey && matchesKeyBinding(syntheticEvent, snippet.shortkey, isMac)) {
-          return t('snippets.shortkey.error.snippetConflict', { name: snippet.label });
-        }
-      }
-    } else {
-      const normalizedKey = normalizeKeyString(key);
-      const conflictingSnippet = existingShortkeys.find(snippet => (
-        snippet.shortkey && normalizeKeyString(snippet.shortkey) === normalizedKey
-      ));
-      if (conflictingSnippet) {
-        return t('snippets.shortkey.error.snippetConflict', { name: conflictingSnippet.label });
-      }
-    }
-    
-    return null;
-  }, [
-    activeSystemBindings,
-    buildKeyEventFromString,
-    existingShortkeys,
-    isMac,
-    normalizeKeyString,
-    t,
-  ]);
-
-  // Handle shortkey recording
-  useEffect(() => {
-    if (!isRecordingShortkey) return;
-
-    const handleKeyDown = (e: KeyboardEvent) => {
-      e.preventDefault();
-      e.stopPropagation();
-
-      // Escape cancels recording
-      if (e.key === 'Escape') {
-        setIsRecordingShortkey(false);
-        setShortkeyError(null);
-        return;
-      }
-
-      // Skip pure modifier keys
-      if (['Meta', 'Control', 'Alt', 'Shift'].includes(e.key)) return;
-
-      const keyString = keyEventToString(e, isMac);
-      
-      // Validate the new shortkey
-      const error = validateShortkey(keyString);
-      if (error) {
-        setShortkeyError(error);
-        // Don't stop recording, let user try again
-        return;
-      }
-      
-      setShortkeyError(null);
-      setEditingSnippet(prev => ({ ...prev, shortkey: keyString }));
-      setIsRecordingShortkey(false);
-    };
-
-    const handleClick = () => {
-      setIsRecordingShortkey(false);
-      setShortkeyError(null);
-    };
-
-    // Delay adding click handler by 100ms to prevent the button click that
-    // initiated recording from immediately triggering the click handler
-    const timer = setTimeout(() => {
-      window.addEventListener('click', handleClick, true);
-    }, 100);
-
-    window.addEventListener('keydown', handleKeyDown, true);
-    return () => {
-      clearTimeout(timer);
-      window.removeEventListener('keydown', handleKeyDown, true);
-      window.removeEventListener('click', handleClick, true);
-    };
-  }, [isRecordingShortkey, isMac, validateShortkey]);
-
  const handleEdit = (snippet?: Snippet) => {
    if (snippet) {
      setEditingSnippet(snippet);
@@ -299,7 +105,6 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
        tags: editingSnippet.tags || [],
        package: editingSnippet.package || '',
        targets: targetSelection,
-        shortkey: editingSnippet.shortkey,
      });
      setRightPanelMode('none');
    }
@@ -339,60 +144,23 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({

  const displayedPackages = useMemo(() => {
    if (!selectedPackage) {
-      // Separate absolute paths (starting with /) from relative paths
-      const absolutePaths = packages.filter(p => p.startsWith('/'));
-      const relativePaths = packages.filter(p => !p.startsWith('/'));
-      
-      const results: { name: string; path: string; count: number }[] = [];
-      
-      // Process relative paths (traditional behavior)
-      const relativeRoots = relativePaths
+      const roots = packages
        .map((p) => p.split('/')[0])
-        .filter((name): name is string => Boolean(name) && name.length > 0);
-      
-      Array.from(new Set(relativeRoots)).forEach((name: string) => {
-        const path: string = name;
-        const count = snippets.filter((s) => {
-          const pkg = s.package || '';
-          return pkg === path || pkg.startsWith(path + '/');
-        }).length;
-        results.push({ name, path, count });
+        .filter(Boolean);
+      return Array.from(new Set(roots)).map((name) => {
+        const path = name;
+        const count = snippets.filter((s) => (s.package || '') === path).length;
+        return { name, path, count };
      });
-      
-      // Process absolute paths - show them as separate roots with "/" prefix
-      const absoluteRoots = absolutePaths
-        .map((p) => {
-          const cleanPath = p.substring(1); // Remove leading slash
-          const firstSegment = cleanPath.split('/')[0];
-          return firstSegment;
-        })
-        .filter((name): name is string => Boolean(name) && name.length > 0);
-      
-      Array.from(new Set(absoluteRoots)).forEach((name: string) => {
-        const path: string = `/${name}`;
-        const displayName: string = `/${name}`; // Show with leading slash to distinguish
-        const count = snippets.filter((s) => {
-          const pkg = s.package || '';
-          return pkg === path || pkg.startsWith(path + '/');
-        }).length;
-        results.push({ name: displayName, path, count });
-      });
-      
-      return results;
    }
-    
    const prefix = selectedPackage + '/';
    const children = packages
      .filter((p) => p.startsWith(prefix))
      .map((p) => p.replace(prefix, '').split('/')[0])
-      .filter((name): name is string => Boolean(name) && name.length > 0);
+      .filter(Boolean);
    return Array.from(new Set(children)).map((name) => {
      const path = `${selectedPackage}/${name}`;
-      // Count snippets in this package AND all nested packages
-      const count = snippets.filter((s) => {
-        const pkg = s.package || '';
-        return pkg === path || pkg.startsWith(path + '/');
-      }).length;
+      const count = snippets.filter((s) => (s.package || '') === path).length;
      return { name, path, count };
    });
  }, [packages, selectedPackage, snippets]);
@@ -423,76 +191,28 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({

  const breadcrumb = useMemo(() => {
    if (!selectedPackage) return [];
-    const isAbsolute = selectedPackage.startsWith('/');
    const parts = selectedPackage.split('/').filter(Boolean);
-    return parts.map((name, idx) => {
-      const pathSegments = parts.slice(0, idx + 1);
-      const path = isAbsolute ? `/${pathSegments.join('/')}` : pathSegments.join('/');
-      return { name, path };
-    });
+    return parts.map((name, idx) => ({ name, path: parts.slice(0, idx + 1).join('/') }));
  }, [selectedPackage]);

  const createPackage = () => {
    const name = newPackageName.trim();
    if (!name) return;
-    
-    // Allow leading slash and validate the rest - allow hyphens anywhere in package names
-    if (!/^\/?([\w-]+(\/[\w-]+)*)\/?$/.test(name)) {
-      // Could add toast notification here for invalid characters
-      return;
-    }
-    
-    // Normalize path construction to avoid double slashes
-    let full: string;
-    if (selectedPackage) {
-      // Strip leading slash from name when we're inside a package to avoid double slashes
-      const normalizedName = name.startsWith('/') ? name.substring(1) : name;
-      full = `${selectedPackage}/${normalizedName}`;
-    } else {
-      // At root level, preserve the leading slash if user intended it
-      full = name;
-    }
-
-    // Strip trailing slash to ensure consistent path handling
-    if (full.endsWith('/')) {
-      full = full.slice(0, -1);
-    }
-    
-    // Check for duplicate package names (case-insensitive)
-    const existingPackage = packages.find(p => p.toLowerCase() === full.toLowerCase());
-    if (existingPackage) {
-      // Could add toast notification here for duplicate package
-      return;
-    }
-    
-    onPackagesChange([...packages, full]);
+    const full = selectedPackage ? `${selectedPackage}/${name}` : name;
+    if (!packages.includes(full)) onPackagesChange([...packages, full]);
    setNewPackageName('');
    setIsPackageDialogOpen(false);
  };

  const deletePackage = (path: string) => {
-    // Remove the package and all its children
    const keep = packages.filter((p) => !(p === path || p.startsWith(path + '/')));
-    
-    // Move all snippets from deleted packages to root
    const updatedSnippets = snippets.map((s) => {
      if (!s.package) return s;
-      if (s.package === path || s.package.startsWith(path + '/')) {
-        return { ...s, package: '' };
-      }
+      if (s.package === path || s.package.startsWith(path + '/')) return { ...s, package: '' };
      return s;
    });
-    
-    // Update packages first, then save snippets
    onPackagesChange(keep);
-    
-    // Only save snippets that were actually modified
-    const modifiedSnippets = updatedSnippets.filter((s, index) => 
-      s.package !== snippets[index].package
-    );
-    modifiedSnippets.forEach(onSave);
-    
-    // Reset selected package if it was deleted
+    updatedSnippets.forEach(onSave);
    if (selectedPackage && (selectedPackage === path || selectedPackage.startsWith(path + '/'))) {
      setSelectedPackage(null);
    }
@@ -500,125 +220,24 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({

  const movePackage = (source: string, target: string | null) => {
    const name = source.split('/').pop() || '';
-    const isAbsolute = source.startsWith('/');
-    const newPath = target ? `${target}/${name}` : (isAbsolute ? `/${name}` : name);
+    const newPath = target ? `${target}/${name}` : name;
    if (newPath === source || newPath.startsWith(source + '/')) return;
-
-    // Check if target path already exists
-    if (packages.includes(newPath)) return;
-
    const updatedPackages = packages.map((p) => {
      if (p === source) return newPath;
-      // Use more precise replacement to avoid substring issues
-      if (p.startsWith(source + '/')) {
-        return newPath + p.substring(source.length);
-      }
+      if (p.startsWith(source + '/')) return p.replace(source, newPath);
      return p;
    });
-
    const updatedSnippets = snippets.map((s) => {
      if (!s.package) return s;
      if (s.package === source) return { ...s, package: newPath };
-      // Use more precise replacement to avoid substring issues
-      if (s.package.startsWith(source + '/')) {
-        return { ...s, package: newPath + s.package.substring(source.length) };
-      }
+      if (s.package.startsWith(source + '/')) return { ...s, package: s.package.replace(source, newPath) };
      return s;
    });
-
    onPackagesChange(Array.from(new Set(updatedPackages)));
    updatedSnippets.forEach(onSave);
    if (selectedPackage === source) setSelectedPackage(newPath);
  };

-  const openRenameDialog = (path: string) => {
-    const name = path.split('/').pop() || '';
-    setRenamingPackagePath(path);
-    setRenamePackageName(name);
-    setRenameError('');
-    setIsRenameDialogOpen(true);
-  };
-
-  const renamePackage = () => {
-    if (!renamingPackagePath) return;
-
-    const newName = renamePackageName.trim();
-
-    // Validate: empty name
-    if (!newName) {
-      setRenameError(t('snippets.renameDialog.error.empty'));
-      return;
-    }
-
-    // Validate: same rules as createPackage - only allow letters, numbers, hyphens, underscores
-    // Since we're renaming a single segment (no slashes allowed), use the segment-level pattern
-    if (!/^[\w-]+$/.test(newName)) {
-      setRenameError(t('snippets.renameDialog.error.invalidChars'));
-      return;
-    }
-
-    // Build new path
-    const parts = renamingPackagePath.split('/');
-    parts[parts.length - 1] = newName;
-    const newPath = parts.join('/');
-
-    // Validate: same name
-    if (newPath === renamingPackagePath) {
-      setIsRenameDialogOpen(false);
-      return;
-    }
-
-    // Validate: duplicate (case-insensitive)
-    const existingPackage = packages.find(p => p.toLowerCase() === newPath.toLowerCase());
-    if (existingPackage) {
-      setRenameError(t('snippets.renameDialog.error.duplicate'));
-      return;
-    }
-
-    // Update all packages with this path or nested under it
-    const updatedPackages = packages.map((p) => {
-      if (p === renamingPackagePath) return newPath;
-      if (p.startsWith(renamingPackagePath + '/')) {
-        return newPath + p.substring(renamingPackagePath.length);
-      }
-      return p;
-    });
-
-    // Update all snippets with this package or nested under it
-    const updatedSnippets = snippets.map((s) => {
-      if (!s.package) return s;
-      if (s.package === renamingPackagePath) return { ...s, package: newPath };
-      if (s.package.startsWith(renamingPackagePath + '/')) {
-        return { ...s, package: newPath + s.package.substring(renamingPackagePath.length) };
-      }
-      return s;
-    });
-
-    onPackagesChange(Array.from(new Set(updatedPackages)));
-    updatedSnippets.forEach(onSave);
-
-    // Update selected package if it was renamed
-    if (selectedPackage === renamingPackagePath) {
-      setSelectedPackage(newPath);
-    } else if (selectedPackage?.startsWith(renamingPackagePath + '/')) {
-      setSelectedPackage(newPath + selectedPackage.substring(renamingPackagePath.length));
-    }
-
-    // Update editingSnippet.package if it's in the renamed package (fixes stale state when editing)
-    if (editingSnippet.package) {
-      if (editingSnippet.package === renamingPackagePath) {
-        setEditingSnippet(prev => ({ ...prev, package: newPath }));
-      } else if (editingSnippet.package.startsWith(renamingPackagePath + '/')) {
-        setEditingSnippet(prev => ({
-          ...prev,
-          package: newPath + prev.package!.substring(renamingPackagePath.length)
-        }));
-      }
-    }
-
-    setIsRenameDialogOpen(false);
-  };
-
  const moveSnippet = (id: string, pkg: string | null) => {
    const sn = snippets.find((s) => s.id === id);
    if (!sn) return;
@@ -627,36 +246,11 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({

  // Package options for Combobox
  const packageOptions: ComboboxOption[] = useMemo(() => {
-    // Generate all possible parent paths for each package
-    const allPaths = new Set<string>();
-    
-    packages.forEach(pkg => {
-      // Add the full package path
-      allPaths.add(pkg);
-      
-      // Add all parent paths
-      const parts = pkg.split('/').filter(Boolean);
-      const isAbsolute = pkg.startsWith('/');
-      
-      for (let i = 1; i < parts.length; i++) {
-        const parentPath = (isAbsolute ? '/' : '') + parts.slice(0, i).join('/');
-        allPaths.add(parentPath);
-      }
-    });
-    
-    return Array.from(allPaths)
-      .sort((a, b) => {
-        // Sort by depth first (shorter paths first), then alphabetically
-        const depthA = (a.match(/\//g) || []).length;
-        const depthB = (b.match(/\//g) || []).length;
-        if (depthA !== depthB) return depthA - depthB;
-        return a.localeCompare(b);
-      })
-      .map(p => ({
-        value: p,
-        label: p.includes('/') ? p.split('/').pop()! : p,
-        sublabel: p.includes('/') ? p : undefined,
-      }));
+    return packages.map(p => ({
+      value: p,
+      label: p.includes('/') ? p.split('/').pop()! : p,
+      sublabel: p.includes('/') ? p : undefined,
+    }));
  }, [packages]);

  // Shell history lazy loading
@@ -716,7 +310,6 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
          onBack={handleTargetPickerBack}
          onContinue={handleTargetPickerBack}
          availableKeys={availableKeys}
-          managedSources={managedSources}
          onSaveHost={onSaveHost}
          onCreateGroup={onCreateGroup}
          title={t('snippets.targets.add')}
@@ -761,13 +354,7 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
              <Combobox
                options={packageOptions}
                value={editingSnippet.package || selectedPackage || ''}
-                onValueChange={(val) => {
-                  setEditingSnippet({ ...editingSnippet, package: val });
-                  // If selecting an implicit parent path, persist it to packages
-                  if (val && !packages.includes(val)) {
-                    onPackagesChange([...packages, val]);
-                  }
-                }}
+                onValueChange={(val) => setEditingSnippet({ ...editingSnippet, package: val })}
                placeholder={t('snippets.field.packagePlaceholder')}
                allowCreate={true}
                onCreateNew={(val) => {
@@ -792,50 +379,6 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
              />
            </Card>

-            {/* Shortkey */}
-            <Card className="p-3 space-y-2 bg-card border-border/80">
-              <div className="flex items-center justify-between">
-                <p className="text-xs font-semibold text-muted-foreground">{t('snippets.field.shortkey')}</p>
-                {editingSnippet.shortkey && (
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    className="h-6 px-2 text-xs"
-                    onClick={() => {
-                      setEditingSnippet(prev => ({ ...prev, shortkey: undefined }));
-                      setShortkeyError(null);
-                    }}
-                    title={t('snippets.shortkey.clear')}
-                  >
-                    <RotateCcw size={12} />
-                  </Button>
-                )}
-              </div>
-              <button
-                type="button"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  setIsRecordingShortkey(true);
-                  setShortkeyError(null);
-                }}
-                className={cn(
-                  "w-full h-10 px-3 text-sm font-mono rounded-lg border transition-colors flex items-center justify-center gap-2",
-                  isRecordingShortkey
-                    ? "border-primary bg-primary/10 animate-pulse"
-                    : "border-border hover:border-primary/50 bg-background"
-                )}
-              >
-                <Keyboard size={14} className="text-muted-foreground" />
-                {isRecordingShortkey
-                  ? t('snippets.shortkey.recording')
-                  : editingSnippet.shortkey || t('snippets.shortkey.placeholder')}
-              </button>
-              {shortkeyError && (
-                <p className="text-xs text-destructive">{shortkeyError}</p>
-              )}
-              <p className="text-[11px] text-muted-foreground">{t('snippets.shortkey.hint')}</p>
-            </Card>
-
            {/* Targets */}
            <Card className="p-3 space-y-3 bg-card border-border/80">
              <div className="flex items-center justify-between">
@@ -1022,12 +565,12 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({

        {!snippets.length && displayedPackages.length === 0 && (
          <div className="flex-1 flex items-center justify-center px-4">
-            <div className="flex flex-col items-center justify-center text-muted-foreground">
-              <div className="h-16 w-16 rounded-2xl bg-secondary/80 flex items-center justify-center mb-4">
-                <FileCode size={32} className="opacity-60" />
+            <div className="max-w-md w-full text-center space-y-3 py-12 rounded-2xl bg-secondary/60 border border-border/60 shadow-lg">
+              <div className="mx-auto h-12 w-12 rounded-xl bg-muted text-muted-foreground flex items-center justify-center">
+                <FileCode size={22} />
              </div>
-              <h3 className="text-lg font-semibold text-foreground mb-2">{t('snippets.empty.title')}</h3>
-              <p className="text-sm text-center max-w-sm">{t('snippets.empty.desc')}</p>
+              <div className="text-sm font-semibold text-foreground">{t('snippets.empty.title')}</div>
+              <div className="text-xs text-muted-foreground px-8">{t('snippets.empty.desc')}</div>
            </div>
          </div>
        )}
@@ -1081,7 +624,6 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
                    </ContextMenuTrigger>
                    <ContextMenuContent>
                      <ContextMenuItem onClick={() => setSelectedPackage(pkg.path)}>{t('action.open')}</ContextMenuItem>
-                      <ContextMenuItem onClick={() => openRenameDialog(pkg.path)}>{t('common.rename')}</ContextMenuItem>
                      <ContextMenuItem className="text-destructive" onClick={() => deletePackage(pkg.path)}>{t('action.delete')}</ContextMenuItem>
                    </ContextMenuContent>
                  </ContextMenu>
@@ -1125,11 +667,6 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
                              {snippet.command.replace(/\s+/g, ' ') || t('snippets.commandFallback')}
                            </div>
                          </div>
-                          {snippet.shortkey && (
-                            <div className="shrink-0 px-2 py-1 text-[10px] font-mono rounded border border-border bg-muted/50 text-muted-foreground">
-                              {snippet.shortkey}
-                            </div>
-                          )}
                          {viewMode === 'list' && (
                            <Button
                              variant="ghost"
@@ -1192,8 +729,6 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
                value={newPackageName}
                onChange={(e) => setNewPackageName(e.target.value)}
                onKeyDown={(e) => e.key === 'Enter' && createPackage()}
-                pattern="^/?([\w-]+(/[\w-]+)*)?/?$"
-                title="Package names can contain letters, numbers, hyphens, underscores, and forward slashes. Can optionally start with /"
              />
              <p className="text-[11px] text-muted-foreground">{t('snippets.packageDialog.hint')}</p>
            </div>
@@ -1207,40 +742,6 @@ const SnippetsManager: React.FC<SnippetsManagerProps> = ({
        </div>
      )}

-      {/* Rename Package Dialog */}
-      {isRenameDialogOpen && (
-        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
-          <Card className="w-full max-w-sm p-4 space-y-4">
-            <div>
-              <p className="text-sm font-semibold">{t('snippets.renameDialog.title')}</p>
-              <p className="text-xs text-muted-foreground">{t('snippets.renameDialog.currentPath', { path: renamingPackagePath })}</p>
-            </div>
-            <div className="space-y-2">
-              <Label>{t('field.name')}</Label>
-              <Input
-                autoFocus
-                placeholder={t('snippets.renameDialog.placeholder')}
-                value={renamePackageName}
-                onChange={(e) => {
-                  setRenamePackageName(e.target.value);
-                  setRenameError('');
-                }}
-                onKeyDown={(e) => e.key === 'Enter' && renamePackage()}
-              />
-              {renameError && (
-                <p className="text-[11px] text-destructive">{renameError}</p>
-              )}
-            </div>
-            <div className="flex justify-end gap-2">
-              <Button variant="ghost" onClick={() => setIsRenameDialogOpen(false)}>
-                {t('common.cancel')}
-              </Button>
-              <Button onClick={renamePackage}>{t('common.rename')}</Button>
-            </div>
-          </Card>
-        </div>
-      )}
-
      {/* Right Panel */}
      {renderRightPanel()}
    </div>
--- a/components/Terminal.tsx
+++ b/components/Terminal.tsx
@@ -3,9 +3,8 @@ import { FitAddon } from "@xterm/addon-fit";
 import { SerializeAddon } from "@xterm/addon-serialize";
 import { SearchAddon } from "@xterm/addon-search";
 import "@xterm/xterm/css/xterm.css";
-import { Cpu, HardDrive, Maximize2, MemoryStick, Radio, ArrowDownToLine, ArrowUpFromLine } from "lucide-react";
+import { Maximize2, Radio } from "lucide-react";
 import React, { memo, useEffect, useMemo, useRef, useState } from "react";
-import { flushSync } from "react-dom";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { logger } from "../lib/logger";
 import { cn } from "../lib/utils";
@@ -26,7 +25,6 @@ import { useTerminalBackend } from "../application/state/useTerminalBackend";
 import KnownHostConfirmDialog, { HostKeyInfo } from "./KnownHostConfirmDialog";
 import SFTPModal from "./SFTPModal";
 import { Button } from "./ui/button";
-import { HoverCard, HoverCardContent, HoverCardTrigger } from "./ui/hover-card";
 import { toast } from "./ui/toast";
 import { useAvailableFonts } from "../application/state/fontStore";
 import { TERMINAL_THEMES } from "../infrastructure/config/terminalThemes";
@@ -35,64 +33,13 @@ import { TerminalConnectionDialog } from "./terminal/TerminalConnectionDialog";
 import { TerminalToolbar } from "./terminal/TerminalToolbar";
 import { TerminalContextMenu } from "./terminal/TerminalContextMenu";
 import { TerminalSearchBar } from "./terminal/TerminalSearchBar";
+import { createHighlightProcessor } from "./terminal/keywordHighlight";
 import { createTerminalSessionStarters, type PendingAuth } from "./terminal/runtime/createTerminalSessionStarters";
 import { createXTermRuntime, type XTermRuntime } from "./terminal/runtime/createXTermRuntime";
 import { XTERM_PERFORMANCE_CONFIG } from "../infrastructure/config/xtermPerformance";
 import { useTerminalSearch } from "./terminal/hooks/useTerminalSearch";
 import { useTerminalContextActions } from "./terminal/hooks/useTerminalContextActions";
 import { useTerminalAuthState } from "./terminal/hooks/useTerminalAuthState";
-import { useServerStats } from "./terminal/hooks/useServerStats";
-import { extractDropEntries, getPathForFile, DropEntry } from "../lib/sftpFileUtils";
-
-/**
- * Extract unique root paths from drop entries for local terminal path insertion.
- * For nested files, extracts the root folder path; for single files, uses the full path.
- * Paths with spaces are quoted.
- */
-function extractRootPathsFromDropEntries(dropEntries: DropEntry[]): string[] {
-  const paths: string[] = [];
-  const seenPaths = new Set<string>();
-
-  for (const entry of dropEntries) {
-    if (!entry.file) continue;
-
-    const fullPath = getPathForFile(entry.file);
-    if (!fullPath) continue;
-
-    const pathParts = entry.relativePath.split('/');
-
-    if (pathParts.length > 1) {
-      // Nested file in a folder - extract the root folder path
-      const rootFolderName = pathParts[0];
-      const separator = fullPath.includes('\\') ? '\\' : '/';
-
-      // Find the position of the root folder name in the full path
-      const rootFolderIndex = fullPath.lastIndexOf(separator + rootFolderName + separator);
-      const altRootFolderIndex = fullPath.lastIndexOf(separator + rootFolderName);
-      const folderStartIndex = rootFolderIndex !== -1
-        ? rootFolderIndex + 1
-        : (altRootFolderIndex !== -1 ? altRootFolderIndex + 1 : -1);
-
-      if (folderStartIndex !== -1) {
-        const folderEndIndex = folderStartIndex + rootFolderName.length;
-        const folderPath = fullPath.substring(0, folderEndIndex);
-
-        if (!seenPaths.has(folderPath)) {
-          paths.push(folderPath.includes(' ') ? `"${folderPath}"` : folderPath);
-          seenPaths.add(folderPath);
-        }
-      }
-    } else {
-      // Single file (not in a folder)
-      if (!seenPaths.has(fullPath)) {
-        paths.push(fullPath.includes(' ') ? `"${fullPath}"` : fullPath);
-        seenPaths.add(fullPath);
-      }
-    }
-  }
-
-  return paths;
-}

 interface TerminalProps {
  host: Host;
@@ -140,19 +87,6 @@ interface TerminalProps {
  onBroadcastInput?: (data: string, sourceSessionId: string) => void;
 }

-// Helper function to format network speed (bytes/sec) to human-readable format
-function formatNetSpeed(bytesPerSec: number): string {
-  if (bytesPerSec < 1024) {
-    return `${bytesPerSec}B/s`;
-  } else if (bytesPerSec < 1024 * 1024) {
-    return `${(bytesPerSec / 1024).toFixed(1)}K/s`;
-  } else if (bytesPerSec < 1024 * 1024 * 1024) {
-    return `${(bytesPerSec / (1024 * 1024)).toFixed(1)}M/s`;
-  } else {
-    return `${(bytesPerSec / (1024 * 1024 * 1024)).toFixed(1)}G/s`;
-  }
-}
-
 const TerminalComponent: React.FC<TerminalProps> = ({
  host,
  keys,
@@ -193,8 +127,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
  onToggleBroadcast,
  onBroadcastInput,
 }) => {
-  // Timeout for connection - increased to 120s to allow time for keyboard-interactive (2FA) authentication
-  const CONNECTION_TIMEOUT = 120000;
+  const CONNECTION_TIMEOUT = 12000;
  const { t } = useI18n();
  const availableFonts = useAvailableFonts();
  const containerRef = useRef<HTMLDivElement>(null);
@@ -214,34 +147,13 @@ const TerminalComponent: React.FC<TerminalProps> = ({
  const terminalSettingsRef = useRef(terminalSettings);
  terminalSettingsRef.current = terminalSettings;

+  const highlightProcessorRef = useRef<(text: string) => string>((t) => t);
  useEffect(() => {
-    if (xtermRuntimeRef.current) {
-      // Merge global rules with host-level rules
-      // Host-level rules are appended to global rules, allowing hosts to add custom highlighting
-      const globalRules = terminalSettings?.keywordHighlightRules ?? [];
-      const hostRules = host?.keywordHighlightRules ?? [];
-
-      // Check if highlighting is enabled at either global or host level
-      const globalEnabled = terminalSettings?.keywordHighlightEnabled ?? false;
-      const hostEnabled = host?.keywordHighlightEnabled ?? false;
-
-      // Merge rules: include only rules from enabled sources
-      const mergedRules = [
-        ...(globalEnabled ? globalRules : []),
-        ...(hostEnabled ? hostRules : [])
-      ];
-
-      // Enable highlighting if either global or host-level is enabled
-      const isEnabled = globalEnabled || hostEnabled;
-
-      xtermRuntimeRef.current.keywordHighlighter.setRules(mergedRules, isEnabled);
-    }
-  }, [
-    terminalSettings?.keywordHighlightEnabled,
-    terminalSettings?.keywordHighlightRules,
-    host?.keywordHighlightEnabled,
-    host?.keywordHighlightRules
-  ]);
+    highlightProcessorRef.current = createHighlightProcessor(
+      terminalSettings?.keywordHighlightRules ?? [],
+      terminalSettings?.keywordHighlightEnabled ?? false,
+    );
+  }, [terminalSettings?.keywordHighlightEnabled, terminalSettings?.keywordHighlightRules]);

  const hotkeySchemeRef = useRef(hotkeyScheme);
  const keyBindingsRef = useRef(keyBindings);
@@ -255,10 +167,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
  isBroadcastEnabledRef.current = isBroadcastEnabled;
  onBroadcastInputRef.current = onBroadcastInput;

-  // Snippets ref for shortkey support in terminal
-  const snippetsRef = useRef(snippets);
-  snippetsRef.current = snippets;
-
  const terminalBackend = useTerminalBackend();
  const { resizeSession } = terminalBackend;

@@ -273,7 +181,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
  const [timeLeft, setTimeLeft] = useState(CONNECTION_TIMEOUT / 1000);
  const [isCancelling, setIsCancelling] = useState(false);
  const [showSFTP, setShowSFTP] = useState(false);
-  const [sftpInitialPath, setSftpInitialPath] = useState<string | undefined>(undefined);
  const [progressValue, setProgressValue] = useState(15);
  const [hasSelection, setHasSelection] = useState(false);

@@ -286,11 +193,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
    currentHostLabel: string;
  } | null>(null);

-  // Drag and drop state
-  const [isDraggingOver, setIsDraggingOver] = useState(false);
-  const dragCounterRef = useRef(0);
-  const [pendingUploadEntries, setPendingUploadEntries] = useState<DropEntry[]>([]);
-
  const terminalSearch = useTerminalSearch({ searchAddonRef, termRef });
  const {
    isSearchOpen,
@@ -303,19 +205,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
    handleCloseSearch,
  } = terminalSearch;

-  // Check if this is a local or serial connection (doesn't need connection dialog during connecting)
-  const isLocalConnection = host.protocol === "local";
-  const isSerialConnection = host.protocol === "serial";
-
-  // Server stats (CPU, Memory, Disk) for Linux servers
-  const { stats: serverStats } = useServerStats({
-    sessionId,
-    enabled: terminalSettings?.showServerStats ?? true,
-    refreshInterval: terminalSettings?.serverStatsRefreshInterval ?? 5,
-    isLinux: host.os === 'linux',
-    isConnected: status === 'connected',
-  });
-
  useEffect(() => {
    if (!error) {
      lastToastedErrorRef.current = null;
@@ -406,6 +295,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
    disposeExitRef,
    fitAddonRef,
    serializeAddonRef,
+    highlightProcessorRef,
    pendingAuthRef,
    updateStatus,
    setStatus,
@@ -449,7 +339,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
          onHotkeyActionRef,
          isBroadcastEnabledRef,
          onBroadcastInputRef,
-          snippetsRef,
          sessionId,
          statusRef,
          onCommandExecuted,
@@ -467,20 +356,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
        serializeAddonRef.current = runtime.serializeAddon;
        searchAddonRef.current = runtime.searchAddon;

-        // Apply merged keyword highlight rules immediately after runtime creation
-        // This fixes a timing issue where the useEffect for keyword highlighting
-        // runs before the runtime is created, causing host-level rules to be missed
-        const globalRules = terminalSettingsRef.current?.keywordHighlightRules ?? [];
-        const hostRules = host?.keywordHighlightRules ?? [];
-        const globalEnabled = terminalSettingsRef.current?.keywordHighlightEnabled ?? false;
-        const hostEnabled = host?.keywordHighlightEnabled ?? false;
-        const mergedRules = [
-          ...(globalEnabled ? globalRules : []),
-          ...(hostEnabled ? hostRules : [])
-        ];
-        const isEnabled = globalEnabled || hostEnabled;
-        runtime.keywordHighlighter.setRules(mergedRules, isEnabled);
-
        const term = runtime.term;

        if (host.protocol === "serial") {
@@ -549,11 +424,8 @@ const TerminalComponent: React.FC<TerminalProps> = ({
  useEffect(() => {
    if (status !== "connecting" || auth.needsAuth) return;

-    // Local terminal and serial connections don't need timeout/progress UI
-    if (isLocalConnection || isSerialConnection) return;
-
    // Only show SSH-specific scripted logs for SSH connections
-    const isSSH = host.protocol !== "telnet";
+    const isSSH = host.protocol !== "serial" && host.protocol !== "local" && host.protocol !== "telnet" && host.hostname !== "localhost";

    let stepTimer: ReturnType<typeof setInterval> | undefined;
    if (isSSH) {
@@ -650,18 +522,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
          | 700
          | 800
          | 900;
-        const resolvedFontWeightBold = (() => {
-          const fontFamily = termRef.current?.options.fontFamily || "";
-          if (typeof document === "undefined" || !document.fonts?.check) {
-            return terminalSettings.fontWeightBold;
-          }
-          const weightSpec = `${terminalSettings.fontWeightBold} ${effectiveFontSize}px ${fontFamily}`;
-          return document.fonts.check(weightSpec)
-            ? terminalSettings.fontWeightBold
-            : terminalSettings.fontWeight;
-        })();
-
-        termRef.current.options.fontWeightBold = resolvedFontWeightBold as
+        termRef.current.options.fontWeightBold = terminalSettings.fontWeightBold as
          | 100
          | 200
          | 300
@@ -737,27 +598,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
          logger.warn("Fit after fonts ready failed", err);
        }

-        if (terminalSettings && termRef.current) {
-          const fontFamily = termRef.current.options?.fontFamily || "";
-          const effectiveFontSize = host.fontSize || fontSize;
-          if (typeof document !== "undefined" && document.fonts?.check) {
-            const weightSpec = `${terminalSettings.fontWeightBold} ${effectiveFontSize}px ${fontFamily}`;
-            const resolvedBold = document.fonts.check(weightSpec)
-              ? terminalSettings.fontWeightBold
-              : terminalSettings.fontWeight;
-            termRef.current.options.fontWeightBold = resolvedBold as
-              | 100
-              | 200
-              | 300
-              | 400
-              | 500
-              | 600
-              | 700
-              | 800
-              | 900;
-          }
-        }
-
        const id = sessionRef.current;
        if (id && term) {
          try {
@@ -775,7 +615,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
    return () => {
      cancelled = true;
    };
-  }, [host.id, host.fontFamily, host.fontSize, fontFamilyId, fontSize, resizeSession, sessionId, terminalSettings]);
+  }, [host.id, sessionId, resizeSession]);

  useEffect(() => {
    if (!containerRef.current || !fitAddonRef.current) return;
@@ -892,34 +732,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
    termRef.current?.writeln("\r\n[No active SSH session]");
  };

-  const handleOpenSFTP = async () => {
-    // If SFTP is already open, toggle it off
-    if (showSFTP) {
-      setShowSFTP(false);
-      return;
-    }
-
-    // Try to get the current working directory from the terminal session
-    let initialPath: string | undefined = undefined;
-    if (sessionRef.current) {
-      try {
-        const result = await terminalBackend.getSessionPwd(sessionRef.current);
-        if (result.success && result.cwd) {
-          initialPath = result.cwd;
-        }
-      } catch {
-        // Silently fail and open SFTP without initial path
-      }
-    }
-
-    // Use flushSync to ensure initialPath state is committed before opening SFTP modal
-    // This prevents React's batching from causing the modal to open with stale/undefined initialPath
-    flushSync(() => {
-      setSftpInitialPath(initialPath);
-    });
-    setShowSFTP(true);
-  };
-
  const handleCancelConnect = () => {
    setIsCancelling(true);
    auth.setNeedsAuth(false);
@@ -985,95 +797,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
    }
  };

-  // Drag and drop handlers
-  const handleDragEnter = (e: React.DragEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    dragCounterRef.current++;
-    if (e.dataTransfer.types.includes('Files')) {
-      setIsDraggingOver(true);
-    }
-  };
-
-  const handleDragOver = (e: React.DragEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    if (e.dataTransfer.types.includes('Files')) {
-      e.dataTransfer.dropEffect = 'copy';
-    }
-  };
-
-  const handleDragLeave = (e: React.DragEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    dragCounterRef.current--;
-    if (dragCounterRef.current === 0) {
-      setIsDraggingOver(false);
-    }
-  };
-
-  const handleDrop = async (e: React.DragEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    dragCounterRef.current = 0;
-    setIsDraggingOver(false);
-
-    if (!e.dataTransfer.types.includes('Files')) {
-      return;
-    }
-
-    // Only handle drops on connected terminals
-    if (status !== 'connected') {
-      toast.error(t("terminal.dragDrop.notConnected"), t("terminal.dragDrop.errorTitle"));
-      return;
-    }
-
-    try {
-      const dropEntries = await extractDropEntries(e.dataTransfer);
-
-      if (dropEntries.length === 0) {
-        return;
-      }
-
-      if (isLocalConnection) {
-        // Local terminal: Insert absolute paths
-        const paths = extractRootPathsFromDropEntries(dropEntries);
-
-        if (paths.length > 0 && termRef.current && sessionRef.current) {
-          const pathsText = paths.join(' ');
-          // Write the paths to the terminal
-          terminalBackend.writeToSession(sessionRef.current, pathsText);
-          termRef.current.focus();
-        }
-      } else {
-        // Remote terminal: Trigger SFTP upload
-        // Get current working directory for SFTP initial path
-        let initialPath: string | undefined = undefined;
-        if (sessionRef.current) {
-          try {
-            const result = await terminalBackend.getSessionPwd(sessionRef.current);
-            if (result.success && result.cwd) {
-              initialPath = result.cwd;
-            }
-          } catch {
-            // Silently fail and open SFTP without initial path
-          }
-        }
-
-        setPendingUploadEntries(dropEntries);
-        // Use flushSync to ensure sftpInitialPath is updated synchronously
-        // before setShowSFTP(true) triggers the modal open
-        flushSync(() => {
-          setSftpInitialPath(initialPath);
-        });
-        setShowSFTP(true);
-      }
-    } catch (error) {
-      logger.error("Failed to handle file drop", error);
-      toast.error(t("terminal.dragDrop.errorMessage"), t("terminal.dragDrop.errorTitle"));
-    }
-  };
-
  const renderControls = (opts?: { showClose?: boolean }) => (
    <TerminalToolbar
      status={status}
@@ -1087,7 +810,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
      onUpdateTerminalFontSize={onUpdateTerminalFontSize}
      isScriptsOpen={isScriptsOpen}
      setIsScriptsOpen={setIsScriptsOpen}
-      onOpenSFTP={handleOpenSFTP}
+      onOpenSFTP={() => setShowSFTP((v) => !v)}
      onSnippetClick={handleSnippetClick}
      onUpdateHost={onUpdateHost}
      showClose={opts?.showClose}
@@ -1110,7 +833,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
    <TerminalContextMenu
      hasSelection={hasSelection}
      hotkeyScheme={hotkeyScheme}
-      keyBindings={keyBindings}
      rightClickBehavior={terminalSettings?.rightClickBehavior}
      onCopy={terminalContextActions.onCopy}
      onPaste={terminalContextActions.onPaste}
@@ -1121,34 +843,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
      onSplitVertical={onSplitVertical}
      onClose={inWorkspace ? () => onCloseSession?.(sessionId) : undefined}
    >
-      <div
-        className="relative h-full w-full flex overflow-hidden bg-gradient-to-br from-[#050910] via-[#06101a] to-[#0b1220]"
-        onDragEnter={handleDragEnter}
-        onDragOver={handleDragOver}
-        onDragLeave={handleDragLeave}
-        onDrop={handleDrop}
-      >
-        {/* Drag and drop overlay */}
-        {isDraggingOver && (
-          <div className="absolute inset-0 z-50 bg-blue-600/20 backdrop-blur-sm border-4 border-dashed border-blue-400 pointer-events-none flex items-center justify-center">
-            <div className="bg-background/90 backdrop-blur-md rounded-lg shadow-lg p-6 border border-border">
-              <div className="text-center">
-                <div className="text-lg font-semibold mb-2">
-                  {isLocalConnection
-                    ? t("terminal.dragDrop.localTitle")
-                    : t("terminal.dragDrop.remoteTitle")
-                  }
-                </div>
-                <div className="text-sm text-muted-foreground">
-                  {isLocalConnection
-                    ? t("terminal.dragDrop.localMessage")
-                    : t("terminal.dragDrop.remoteMessage")
-                  }
-                </div>
-              </div>
-            </div>
-          </div>
-        )}
+      <div className="relative h-full w-full flex overflow-hidden bg-gradient-to-br from-[#050910] via-[#06101a] to-[#0b1220]">
        <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]"
@@ -1172,266 +867,6 @@ const TerminalComponent: React.FC<TerminalProps> = ({
                )}
              />
            </div>
-            {/* Server Stats Display - Linux only */}
-            {host.os === 'linux' && terminalSettings?.showServerStats && status === 'connected' && serverStats.lastUpdated && (
-              <div className="flex items-center gap-2.5 ml-2 text-[10px] opacity-80 flex-nowrap overflow-hidden min-w-0">
-                {/* CPU with HoverCard for per-core details */}
-                <HoverCard openDelay={200} closeDelay={100}>
-                  <HoverCardTrigger asChild>
-                    <button
-                      className="flex items-center gap-0.5 hover:opacity-100 opacity-80 transition-opacity cursor-pointer flex-shrink-0"
-                      title={t("terminal.serverStats.cpu")}
-                    >
-                      <Cpu size={10} className="flex-shrink-0" />
-                      <span>
-                        {serverStats.cpu !== null ? `${serverStats.cpu}%` : '--'}
-                        {serverStats.cpuCores !== null && ` (${serverStats.cpuCores}C)`}
-                      </span>
-                    </button>
-                  </HoverCardTrigger>
-                  <HoverCardContent
-                    className="w-auto p-3"
-                    side="bottom"
-                    align="start"
-                    sideOffset={8}
-                  >
-                    <div className="text-xs space-y-2">
-                      <div className="font-medium text-sm mb-2">{t("terminal.serverStats.cpuCores")}</div>
-                      {serverStats.cpuPerCore.length > 0 ? (
-                        <div className="grid gap-1.5" style={{ gridTemplateColumns: `repeat(${Math.min(4, serverStats.cpuPerCore.length)}, 1fr)` }}>
-                          {serverStats.cpuPerCore.map((usage, index) => (
-                            <div key={index} className="flex flex-col items-center gap-1 min-w-[48px]">
-                              <div className="text-[10px] text-muted-foreground">Core {index}</div>
-                              <div className="w-full h-1.5 bg-muted rounded-full overflow-hidden">
-                                <div
-                                  className={cn(
-                                    "h-full rounded-full transition-all",
-                                    usage >= 90 ? "bg-red-500" : usage >= 70 ? "bg-amber-500" : "bg-emerald-500"
-                                  )}
-                                  style={{ width: `${usage}%` }}
-                                />
-                              </div>
-                              <div className={cn(
-                                "text-[11px] font-medium",
-                                usage >= 90 ? "text-red-400" : usage >= 70 ? "text-amber-400" : "text-emerald-400"
-                              )}>
-                                {usage}%
-                              </div>
-                            </div>
-                          ))}
-                        </div>
-                      ) : (
-                        <div className="text-muted-foreground">{t("terminal.serverStats.noData")}</div>
-                      )}
-                    </div>
-                  </HoverCardContent>
-                </HoverCard>
-                {/* Memory with HoverCard for htop-style bar and top processes */}
-                <HoverCard openDelay={200} closeDelay={100}>
-                  <HoverCardTrigger asChild>
-                    <button
-                      className="flex items-center gap-0.5 hover:opacity-100 opacity-80 transition-opacity cursor-pointer flex-shrink-0"
-                      title={t("terminal.serverStats.memory")}
-                    >
-                      <MemoryStick size={10} className="flex-shrink-0" />
-                      <span>
-                        {serverStats.memUsed !== null && serverStats.memTotal !== null
-                          ? `${(serverStats.memUsed / 1024).toFixed(1)}/${(serverStats.memTotal / 1024).toFixed(1)}G`
-                          : '--'}
-                      </span>
-                    </button>
-                  </HoverCardTrigger>
-                  <HoverCardContent
-                    className="w-auto p-3"
-                    side="bottom"
-                    align="start"
-                    sideOffset={8}
-                  >
-                    <div className="text-xs space-y-3 min-w-[280px]">
-                      <div className="font-medium text-sm">{t("terminal.serverStats.memoryDetails")}</div>
-                      {/* htop-style memory bar */}
-                      {serverStats.memTotal !== null && (
-                        <div className="space-y-1.5">
-                          <div className="w-full h-3 bg-muted rounded overflow-hidden flex">
-                            {/* Used (green) */}
-                            {serverStats.memUsed !== null && serverStats.memUsed > 0 && (
-                              <div
-                                className="h-full bg-emerald-500"
-                                style={{ width: `${(serverStats.memUsed / serverStats.memTotal) * 100}%` }}
-                                title={`${t("terminal.serverStats.memUsed")}: ${(serverStats.memUsed / 1024).toFixed(1)}G`}
-                              />
-                            )}
-                            {/* Buffers (blue) */}
-                            {serverStats.memBuffers !== null && serverStats.memBuffers > 0 && (
-                              <div
-                                className="h-full bg-blue-500"
-                                style={{ width: `${(serverStats.memBuffers / serverStats.memTotal) * 100}%` }}
-                                title={`${t("terminal.serverStats.memBuffers")}: ${(serverStats.memBuffers / 1024).toFixed(1)}G`}
-                              />
-                            )}
-                            {/* Cached (amber/orange) */}
-                            {serverStats.memCached !== null && serverStats.memCached > 0 && (
-                              <div
-                                className="h-full bg-amber-500"
-                                style={{ width: `${(serverStats.memCached / serverStats.memTotal) * 100}%` }}
-                                title={`${t("terminal.serverStats.memCached")}: ${(serverStats.memCached / 1024).toFixed(1)}G`}
-                              />
-                            )}
-                          </div>
-                          {/* Legend */}
-                          <div className="flex flex-wrap gap-x-3 gap-y-1 text-[10px]">
-                            <div className="flex items-center gap-1">
-                              <div className="w-2 h-2 rounded-sm bg-emerald-500" />
-                              <span>{t("terminal.serverStats.memUsed")}: {serverStats.memUsed !== null ? `${(serverStats.memUsed / 1024).toFixed(1)}G` : '--'}</span>
-                            </div>
-                            <div className="flex items-center gap-1">
-                              <div className="w-2 h-2 rounded-sm bg-blue-500" />
-                              <span>{t("terminal.serverStats.memBuffers")}: {serverStats.memBuffers !== null ? `${(serverStats.memBuffers / 1024).toFixed(1)}G` : '--'}</span>
-                            </div>
-                            <div className="flex items-center gap-1">
-                              <div className="w-2 h-2 rounded-sm bg-amber-500" />
-                              <span>{t("terminal.serverStats.memCached")}: {serverStats.memCached !== null ? `${(serverStats.memCached / 1024).toFixed(1)}G` : '--'}</span>
-                            </div>
-                            <div className="flex items-center gap-1">
-                              <div className="w-2 h-2 rounded-sm bg-muted border border-border" />
-                              <span>{t("terminal.serverStats.memFree")}: {serverStats.memFree !== null ? `${(serverStats.memFree / 1024).toFixed(1)}G` : '--'}</span>
-                            </div>
-                          </div>
-                        </div>
-                      )}
-                      {/* Top 10 processes */}
-                      {serverStats.topProcesses.length > 0 && (
-                        <div className="space-y-1.5">
-                          <div className="font-medium text-[11px] text-muted-foreground">{t("terminal.serverStats.topProcesses")}</div>
-                          <div className="space-y-0.5 max-h-[150px] overflow-y-auto">
-                            {serverStats.topProcesses.map((proc, index) => (
-                              <div key={index} className="flex items-center gap-2 text-[10px]">
-                                <span className="w-[32px] text-right text-muted-foreground">{proc.memPercent.toFixed(1)}%</span>
-                                <div className="flex-1 h-1 bg-muted rounded-full overflow-hidden">
-                                  <div
-                                    className="h-full bg-emerald-500 rounded-full"
-                                    style={{ width: `${Math.min(100, proc.memPercent * 2)}%` }}
-                                  />
-                                </div>
-                                <span className="flex-shrink-0 font-mono truncate max-w-[140px]" title={proc.command}>
-                                  {proc.command.split('/').pop()?.split(' ')[0] || proc.command}
-                                </span>
-                              </div>
-                            ))}
-                          </div>
-                        </div>
-                      )}
-                    </div>
-                  </HoverCardContent>
-                </HoverCard>
-                {/* Disk - with HoverCard for disk details */}
-                <HoverCard openDelay={200} closeDelay={100}>
-                  <HoverCardTrigger asChild>
-                    <button
-                      className="flex items-center gap-0.5 hover:opacity-100 opacity-80 transition-opacity cursor-pointer flex-shrink-0"
-                      title={t("terminal.serverStats.disk")}
-                    >
-                      <HardDrive size={10} className="flex-shrink-0" />
-                      <span className={cn(
-                        serverStats.diskPercent !== null && serverStats.diskPercent >= 90 && "text-red-400",
-                        serverStats.diskPercent !== null && serverStats.diskPercent >= 80 && serverStats.diskPercent < 90 && "text-amber-400"
-                      )}>
-                        {serverStats.diskUsed !== null && serverStats.diskTotal !== null && serverStats.diskPercent !== null
-                          ? `${serverStats.diskUsed}/${serverStats.diskTotal}G (${serverStats.diskPercent}%)`
-                          : serverStats.diskPercent !== null
-                            ? `${serverStats.diskPercent}%`
-                            : '--'}
-                      </span>
-                    </button>
-                  </HoverCardTrigger>
-                  <HoverCardContent
-                    className="w-auto p-3"
-                    side="bottom"
-                    align="start"
-                    sideOffset={8}
-                  >
-                    <div className="text-xs space-y-2">
-                      <div className="font-medium text-sm mb-2">{t("terminal.serverStats.diskDetails")}</div>
-                      {serverStats.disks.length > 0 ? (
-                        <div className="space-y-2 max-h-[200px] overflow-y-auto">
-                          {serverStats.disks.map((disk, index) => (
-                            <div key={index} className="flex flex-col gap-1 min-w-[180px]">
-                              <div className="flex items-center justify-between gap-4">
-                                <span className="text-[10px] text-muted-foreground font-mono truncate max-w-[120px]" title={disk.mountPoint}>
-                                  {disk.mountPoint}
-                                </span>
-                                <span className={cn(
-                                  "text-[11px] font-medium whitespace-nowrap",
-                                  disk.percent >= 90 ? "text-red-400" : disk.percent >= 80 ? "text-amber-400" : "text-emerald-400"
-                                )}>
-                                  {disk.used}/{disk.total}G ({disk.percent}%)
-                                </span>
-                              </div>
-                              <div className="w-full h-1.5 bg-muted rounded-full overflow-hidden">
-                                <div
-                                  className={cn(
-                                    "h-full rounded-full transition-all",
-                                    disk.percent >= 90 ? "bg-red-500" : disk.percent >= 80 ? "bg-amber-500" : "bg-emerald-500"
-                                  )}
-                                  style={{ width: `${disk.percent}%` }}
-                                />
-                              </div>
-                            </div>
-                          ))}
-                        </div>
-                      ) : (
-                        <div className="text-muted-foreground">{t("terminal.serverStats.noData")}</div>
-                      )}
-                    </div>
-                  </HoverCardContent>
-                </HoverCard>
-                {/* Network - with HoverCard for per-interface details */}
-                {serverStats.netInterfaces.length > 0 && (
-                  <HoverCard openDelay={200} closeDelay={100}>
-                    <HoverCardTrigger asChild>
-                      <button
-                        className="flex items-center gap-1 hover:opacity-100 opacity-80 transition-opacity cursor-pointer flex-shrink-0"
-                        title={t("terminal.serverStats.network")}
-                      >
-                        <ArrowDownToLine size={9} className="flex-shrink-0 text-emerald-400" />
-                        <span>{formatNetSpeed(serverStats.netRxSpeed)}</span>
-                        <ArrowUpFromLine size={9} className="flex-shrink-0 text-sky-400" />
-                        <span>{formatNetSpeed(serverStats.netTxSpeed)}</span>
-                      </button>
-                    </HoverCardTrigger>
-                    <HoverCardContent
-                      className="w-auto p-3"
-                      side="bottom"
-                      align="start"
-                      sideOffset={8}
-                    >
-                      <div className="text-xs space-y-2">
-                        <div className="font-medium text-sm mb-2">{t("terminal.serverStats.networkDetails")}</div>
-                        <div className="space-y-2 max-h-[200px] overflow-y-auto">
-                          {serverStats.netInterfaces.map((iface, index) => (
-                            <div key={index} className="flex items-center justify-between gap-4 min-w-[200px]">
-                              <span className="text-[10px] text-muted-foreground font-mono">
-                                {iface.name}
-                              </span>
-                              <div className="flex items-center gap-2">
-                                <span className="flex items-center gap-0.5 text-emerald-400">
-                                  <ArrowDownToLine size={9} />
-                                  {formatNetSpeed(iface.rxSpeed)}
-                                </span>
-                                <span className="flex items-center gap-0.5 text-sky-400">
-                                  <ArrowUpFromLine size={9} />
-                                  {formatNetSpeed(iface.txSpeed)}
-                                </span>
-                              </div>
-                            </div>
-                          ))}
-                        </div>
-                      </div>
-                    </HoverCardContent>
-                  </HoverCard>
-                )}
-              </div>
-            )}
            <div className="flex-1" />
            <div className="flex items-center gap-0.5 flex-shrink-0">
              {inWorkspace && onToggleBroadcast && (
@@ -1513,50 +948,47 @@ const TerminalComponent: React.FC<TerminalProps> = ({
            </div>
          )}

-          {/* Connection dialog: skip for local/serial during connecting phase, but show on error */}
-          {status !== "connected" && !needsHostKeyVerification && !(
-            (isLocalConnection || isSerialConnection) && status === "connecting"
-          ) && (
-              <TerminalConnectionDialog
-                host={host}
-                status={status}
-                error={error}
-                progressValue={progressValue}
-                chainProgress={chainProgress}
-                needsAuth={auth.needsAuth}
-                showLogs={showLogs}
-                _setShowLogs={setShowLogs}
-                keys={keys}
-                authProps={{
-                  authMethod: auth.authMethod,
-                  setAuthMethod: auth.setAuthMethod,
-                  authUsername: auth.authUsername,
-                  setAuthUsername: auth.setAuthUsername,
-                  authPassword: auth.authPassword,
-                  setAuthPassword: auth.setAuthPassword,
-                  authKeyId: auth.authKeyId,
-                  setAuthKeyId: auth.setAuthKeyId,
-                  authPassphrase: auth.authPassphrase,
-                  setAuthPassphrase: auth.setAuthPassphrase,
-                  showAuthPassphrase: auth.showAuthPassphrase,
-                  setShowAuthPassphrase: auth.setShowAuthPassphrase,
-                  showAuthPassword: auth.showAuthPassword,
-                  setShowAuthPassword: auth.setShowAuthPassword,
-                  authRetryMessage: auth.authRetryMessage,
-                  onSubmit: () => auth.submit(),
-                  onSubmitWithoutSave: () => auth.submit({ saveToHost: false }),
-                  onCancel: handleCancelConnect,
-                  isValid: auth.isValid,
-                }}
-                progressProps={{
-                  timeLeft,
-                  isCancelling,
-                  progressLogs,
-                  onCancel: handleCancelConnect,
-                  onRetry: handleRetry,
-                }}
-              />
-            )}
+          {status !== "connected" && !needsHostKeyVerification && (
+            <TerminalConnectionDialog
+              host={host}
+              status={status}
+              error={error}
+              progressValue={progressValue}
+              chainProgress={chainProgress}
+              needsAuth={auth.needsAuth}
+              showLogs={showLogs}
+              _setShowLogs={setShowLogs}
+              keys={keys}
+              authProps={{
+                authMethod: auth.authMethod,
+                setAuthMethod: auth.setAuthMethod,
+                authUsername: auth.authUsername,
+                setAuthUsername: auth.setAuthUsername,
+                authPassword: auth.authPassword,
+                setAuthPassword: auth.setAuthPassword,
+                authKeyId: auth.authKeyId,
+                setAuthKeyId: auth.setAuthKeyId,
+                authPassphrase: auth.authPassphrase,
+                setAuthPassphrase: auth.setAuthPassphrase,
+                showAuthPassphrase: auth.showAuthPassphrase,
+                setShowAuthPassphrase: auth.setShowAuthPassphrase,
+                showAuthPassword: auth.showAuthPassword,
+                setShowAuthPassword: auth.setShowAuthPassword,
+                authRetryMessage: auth.authRetryMessage,
+                onSubmit: () => auth.submit(),
+                onSubmitWithoutSave: () => auth.submit({ saveToHost: false }),
+                onCancel: handleCancelConnect,
+                isValid: auth.isValid,
+              }}
+              progressProps={{
+                timeLeft,
+                isCancelling,
+                progressLogs,
+                onCancel: handleCancelConnect,
+                onRetry: handleRetry,
+              }}
+            />
+          )}
        </div>

        <SFTPModal
@@ -1617,16 +1049,10 @@ const TerminalComponent: React.FC<TerminalProps> = ({
              keySource: resolvedAuth.key?.source,
              proxy: proxyConfig,
              jumpHosts: jumpHosts && jumpHosts.length > 0 ? jumpHosts : undefined,
-              sftpSudo: host.sftpSudo,
            };
          })()}
          open={showSFTP && status === "connected"}
-          onClose={() => {
-            setShowSFTP(false);
-            setPendingUploadEntries([]);
-          }}
-          initialPath={sftpInitialPath}
-          initialEntriesToUpload={pendingUploadEntries}
+          onClose={() => setShowSFTP(false)}
        />
      </div>
    </TerminalContextMenu>
--- a/components/TextEditorModal.tsx
+++ b/components/TextEditorModal.tsx
@@ -7,7 +7,7 @@ import {
  Search,
  X,
 } from 'lucide-react';
-import Editor, { type OnMount, loader, useMonaco } from '@monaco-editor/react';
+import Editor, { type OnMount, loader } from '@monaco-editor/react';
 import type * as Monaco from 'monaco-editor';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';

@@ -82,50 +82,6 @@ const languageIdToMonaco = (langId: string): string => {
  return mapping[langId] || 'plaintext';
 };

-// Convert HSL string "h s% l%" to hex color
-const hslToHex = (hslString: string): string => {
-  const parts = hslString.trim().split(/\s+/);
-  if (parts.length < 3) return '#1e1e1e';
-  const h = parseFloat(parts[0]) / 360;
-  const s = parseFloat(parts[1].replace('%', '')) / 100;
-  const l = parseFloat(parts[2].replace('%', '')) / 100;
-
-  const hue2rgb = (p: number, q: number, t: number) => {
-    if (t < 0) t += 1;
-    if (t > 1) t -= 1;
-    if (t < 1 / 6) return p + (q - p) * 6 * t;
-    if (t < 1 / 2) return q;
-    if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
-    return p;
-  };
-
-  let r: number, g: number, b: number;
-  if (s === 0) {
-    r = g = b = l;
-  } else {
-    const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-    const p = 2 * l - q;
-    r = hue2rgb(p, q, h + 1 / 3);
-    g = hue2rgb(p, q, h);
-    b = hue2rgb(p, q, h - 1 / 3);
-  }
-
-  const toHex = (x: number) => {
-    const hex = Math.round(x * 255).toString(16);
-    return hex.length === 1 ? '0' + hex : hex;
-  };
-
-  return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
-};
-
-// Get background color from CSS variable
-const getBackgroundColor = (): string => {
-  const bgValue = getComputedStyle(document.documentElement)
-    .getPropertyValue('--background')
-    .trim();
-  return bgValue ? hslToHex(bgValue) : '#1e1e1e';
-};
-
 export const TextEditorModal: React.FC<TextEditorModalProps> = ({
  open,
  onClose,
@@ -134,13 +90,12 @@ export const TextEditorModal: React.FC<TextEditorModalProps> = ({
  onSave,
 }) => {
  const { t } = useI18n();
-  const monaco = useMonaco();
  const [content, setContent] = useState(initialContent);
  const [saving, setSaving] = useState(false);
  const [hasChanges, setHasChanges] = useState(false);
  const [languageId, setLanguageId] = useState(() => getLanguageId(fileName));
  const editorRef = useRef<Monaco.editor.IStandaloneCodeEditor | null>(null);
-
+  
  // Ref to store the latest save function to avoid stale closure in keyboard shortcut
  const handleSaveRef = useRef<() => Promise<void>>(() => Promise.resolve());

@@ -149,49 +104,13 @@ export const TextEditorModal: React.FC<TextEditorModalProps> = ({
    document.documentElement.classList.contains('dark')
  );

-  // Track background color for custom theme
-  const [bgColor, setBgColor] = useState(() => getBackgroundColor());
-
-  // Custom theme name
-  const customThemeName = isDarkTheme ? 'netcatty-dark' : 'netcatty-light';
-
-  // Define and update custom Monaco themes based on UI background color
-  useEffect(() => {
-    if (!monaco) return;
-
-    // Define dark theme with custom background
-    monaco.editor.defineTheme('netcatty-dark', {
-      base: 'vs-dark',
-      inherit: true,
-      rules: [],
-      colors: {
-        'editor.background': bgColor,
-      },
-    });
-
-    // Define light theme with custom background
-    monaco.editor.defineTheme('netcatty-light', {
-      base: 'vs',
-      inherit: true,
-      rules: [],
-      colors: {
-        'editor.background': bgColor,
-      },
-    });
-
-    // Apply the current theme
-    monaco.editor.setTheme(customThemeName);
-  }, [monaco, isDarkTheme, bgColor, customThemeName]);
-
-  // Listen for theme changes via MutationObserver on <html> class and style
+  // Listen for theme changes via MutationObserver on <html> class
  useEffect(() => {
    const root = document.documentElement;
-    const updateTheme = () => {
+    const observer = new MutationObserver(() => {
      setIsDarkTheme(root.classList.contains('dark'));
-      setBgColor(getBackgroundColor());
-    };
-    const observer = new MutationObserver(updateTheme);
-    observer.observe(root, { attributes: true, attributeFilter: ['class', 'style'] });
+    });
+    observer.observe(root, { attributes: true, attributeFilter: ['class'] });
    return () => observer.disconnect();
  }, []);

@@ -266,6 +185,7 @@ export const TextEditorModal: React.FC<TextEditorModalProps> = ({

  const supportedLanguages = useMemo(() => getSupportedLanguages(), []);
  const monacoLanguage = useMemo(() => languageIdToMonaco(languageId), [languageId]);
+  const monacoTheme = isDarkTheme ? 'vs-dark' : 'light';
  const languageOptions = useMemo(
    () => supportedLanguages.map((lang) => ({ value: lang.id, label: lang.name })),
    [supportedLanguages],
@@ -345,7 +265,7 @@ export const TextEditorModal: React.FC<TextEditorModalProps> = ({
            value={content}
            onChange={handleEditorChange}
            onMount={handleEditorMount}
-            theme={customThemeName}
+            theme={monacoTheme}
            loading={
              <div className="absolute inset-0 flex items-center justify-center bg-background">
                <Loader2 size={32} className="animate-spin text-muted-foreground" />
--- a/components/TopTabs.tsx
+++ b/components/TopTabs.tsx
@@ -25,7 +25,6 @@ interface TopTabsProps {
  isMacClient: boolean;
  onCloseSession: (sessionId: string, e?: React.MouseEvent) => void;
  onRenameSession: (sessionId: string) => void;
-  onCopySession: (sessionId: string) => void;
  onRenameWorkspace: (workspaceId: string) => void;
  onCloseWorkspace: (workspaceId: string) => void;
  onCloseLogView: (logViewId: string) => void;
@@ -122,7 +121,6 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
  isMacClient,
  onCloseSession,
  onRenameSession,
-  onCopySession,
  onRenameWorkspace,
  onCloseWorkspace,
  onCloseLogView,
@@ -412,9 +410,6 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
              <ContextMenuItem onClick={() => onRenameSession(session.id)}>
                {t('common.rename')}
              </ContextMenuItem>
-              <ContextMenuItem onClick={() => onCopySession(session.id)}>
-                {t('tabs.copyTab')}
-              </ContextMenuItem>
              <ContextMenuItem className="text-destructive" onClick={() => onCloseSession(session.id)}>
                {t('common.close')}
              </ContextMenuItem>
--- a/components/TrayPanel.tsx
+++ b/components/TrayPanel.tsx
@@ -1,394 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { Button } from "./ui/button";
-import { useSessionState } from "../application/state/useSessionState";
-import { usePortForwardingState } from "../application/state/usePortForwardingState";
-import { useVaultState } from "../application/state/useVaultState";
-import { toast } from "./ui/toast";
-import { cn } from "../lib/utils";
-import { useI18n } from "../application/i18n/I18nProvider";
-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 { X, Maximize2, ChevronRight, ChevronDown } from "lucide-react";
-import { AppLogo } from "./AppLogo";
-
-const StatusDot: React.FC<{ status: "success" | "warning" | "error" | "neutral"; spinning?: boolean }> = ({
-  status,
-  spinning,
-}) => {
-  const color =
-    status === "success"
-      ? "bg-emerald-500"
-      : status === "warning"
-        ? "bg-amber-500"
-        : status === "error"
-          ? "bg-rose-500"
-          : "bg-zinc-500";
-
-  return (
-    <span
-      className={cn(
-        "inline-block h-2 w-2 rounded-full",
-        color,
-        spinning ? "animate-spin" : "",
-      )}
-    />
-  );
-};
-
-// Session type for workspace grouping
-type TraySession = {
-  id: string;
-  label: string;
-  hostLabel: string;
-  status: "connecting" | "connected" | "disconnected";
-  workspaceId?: string;
-  workspaceTitle?: string;
-};
-
-// Collapsible workspace group component
-const WorkspaceGroup: React.FC<{
-  workspaceId: string;
-  title: string;
-  sessions: TraySession[];
-  activeTabId: string | null;
-  jumpToSession: (sessionId: string) => Promise<void>;
-  t: (key: string) => string;
-}> = ({ workspaceId, title, sessions, activeTabId, jumpToSession, t }) => {
-  const [expanded, setExpanded] = useState(true);
-  const isAnyActive = sessions.some((s) => s.id === activeTabId) || activeTabId === workspaceId;
-
-  return (
-    <div>
-      <button
-        onClick={() => setExpanded(!expanded)}
-        className={cn(
-          "w-full text-left px-2 py-1.5 rounded hover:bg-muted flex items-center gap-1",
-          isAnyActive ? "bg-muted" : "",
-        )}
-      >
-        {expanded ? <ChevronDown size={14} className="text-muted-foreground" /> : <ChevronRight size={14} className="text-muted-foreground" />}
-        <span className="font-medium truncate">{title}</span>
-        <span className="ml-auto text-xs text-muted-foreground">{sessions.length}</span>
-      </button>
-      {expanded && (
-        <div className="ml-4 mt-0.5 space-y-0.5">
-          {sessions.map((s) => (
-            <button
-              key={s.id}
-              title={s.hostLabel || s.label}
-              onClick={() => {
-                // Jump to session (using session id)
-                void jumpToSession(s.id);
-              }}
-              className={cn(
-                "w-full text-left px-2 py-1 rounded hover:bg-muted flex items-center justify-between text-sm",
-                s.status === "connected" ? "" : "text-muted-foreground",
-                activeTabId === s.id ? "bg-muted/60" : "",
-              )}
-            >
-              <span className="flex items-center gap-2 min-w-0">
-                <StatusDot
-                  status={s.status === "connected" ? "success" : s.status === "connecting" ? "warning" : "error"}
-                  spinning={s.status === "connecting"}
-                />
-                <span className="truncate">{s.hostLabel || s.label}</span>
-              </span>
-              <span className="ml-2 text-xs text-muted-foreground">{t(`tray.status.${s.status}`)}</span>
-            </button>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-};
-
-const TrayPanelContent: React.FC = () => {
-  const { t } = useI18n();
-  const {
-    hideTrayPanel,
-    openMainWindow,
-    jumpToSession,
-    onTrayPanelCloseRequest,
-    onTrayPanelRefresh,
-    onTrayPanelMenuData,
-  } = useTrayPanelBackend();
-
-  const { hosts, keys } = useVaultState();
-  useSessionState();
-  const { rules: portForwardingRules, startTunnel, stopTunnel } = usePortForwardingState();
-  const activeTabId = useActiveTabId();
-
-  const [traySessions, setTraySessions] = useState<TraySession[]>([]);
-
-  const jumpableSessions = useMemo(
-    () => traySessions.filter((s) => s.status === "connected" || s.status === "connecting"),
-    [traySessions],
-  );
-
-  const activeSession = useMemo(() => {
-    if (!activeTabId) return null;
-    return traySessions.find((s) => s.id === activeTabId) || null;
-  }, [activeTabId, traySessions]);
-
-  useEffect(() => {
-    const unsubscribe = onTrayPanelMenuData?.((data) => {
-      setTraySessions(data.sessions || []);
-    });
-    return () => unsubscribe?.();
-  }, [onTrayPanelMenuData]);
-
-  useEffect(() => {
-    const unsubscribe = onTrayPanelRefresh?.(() => {
-      try {
-        window.dispatchEvent(new Event("storage"));
-      } catch {
-        // ignore
-      }
-    });
-    return () => unsubscribe?.();
-  }, [onTrayPanelRefresh]);
-
-  const keysForPf = useMemo(
-    () => keys.map((k) => ({ id: k.id, privateKey: k.privateKey })),
-    [keys],
-  );
-
-  const handleClose = useCallback(() => {
-    void hideTrayPanel();
-  }, [hideTrayPanel]);
-
-  useEffect(() => {
-    const onKeyDown = (e: KeyboardEvent) => {
-      if (e.key === "Escape") {
-        e.preventDefault();
-        handleClose();
-      }
-    };
-    window.addEventListener("keydown", onKeyDown);
-    return () => window.removeEventListener("keydown", onKeyDown);
-  }, [handleClose]);
-
-  useEffect(() => {
-    const onPointerDown = (e: PointerEvent) => {
-      const target = e.target;
-      if (!(target instanceof Node)) return;
-      if (document.body && !document.body.contains(target)) return;
-      // Ignore clicks on interactive elements inside the panel.
-      if (target instanceof HTMLElement && target.closest("button,a,input,select,textarea,[role='button']")) {
-        return;
-      }
-      // Clicking on background should close panel
-      const root = document.getElementById("tray-panel-root");
-      if (root && !root.contains(target)) {
-        handleClose();
-      }
-    };
-    window.addEventListener("pointerdown", onPointerDown, true);
-    return () => window.removeEventListener("pointerdown", onPointerDown, true);
-  }, [handleClose]);
-
-  useEffect(() => {
-    const unsubscribe = onTrayPanelCloseRequest(() => {
-      handleClose();
-    });
-    return () => unsubscribe?.();
-  }, [handleClose, onTrayPanelCloseRequest]);
-
-  const handleOpenMain = useCallback(() => {
-    void openMainWindow();
-  }, [openMainWindow]);
-
-  return (
-    <div id="tray-panel-root" className="w-full h-full bg-background/95 backdrop-blur border border-border/60 rounded-lg shadow-lg overflow-hidden">
-      <div className="px-3 py-2 border-b border-border/60 flex items-center justify-between app-no-drag">
-        <div className="flex items-center gap-2">
-          <AppLogo className="w-5 h-5" />
-          <span className="text-sm font-medium">Netcatty</span>
-        </div>
-        <div className="flex items-center gap-1">
-          <button
-            className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground"
-            onClick={handleOpenMain}
-            title={t("tray.openMainWindow")}
-          >
-            <Maximize2 size={14} />
-          </button>
-          <button
-            className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground"
-            onClick={handleClose}
-            title="Close"
-          >
-            <X size={14} />
-          </button>
-        </div>
-      </div>
-
-      <div className="p-2 space-y-3 text-sm">
-
-        {jumpableSessions.length > 0 && (() => {
-          // Group sessions by workspace
-          const workspaceGroups = new Map<string, { title: string; sessions: typeof jumpableSessions }>();
-          const soloSessions: typeof jumpableSessions = [];
-
-          jumpableSessions.forEach((s) => {
-            if (s.workspaceId) {
-              const existing = workspaceGroups.get(s.workspaceId);
-              if (existing) {
-                existing.sessions.push(s);
-              } else {
-                workspaceGroups.set(s.workspaceId, {
-                  title: s.workspaceTitle || "Workspace",
-                  sessions: [s],
-                });
-              }
-            } else {
-              soloSessions.push(s);
-            }
-          });
-
-          return (
-            <div>
-              <div className="px-2 py-1 text-xs text-muted-foreground">{t("tray.sessions")}</div>
-              <div className="space-y-1">
-                {/* Workspace groups */}
-                {Array.from(workspaceGroups.entries()).map(([wsId, group]) => (
-                  <WorkspaceGroup
-                    key={wsId}
-                    workspaceId={wsId}
-                    title={group.title}
-                    sessions={group.sessions}
-                    activeTabId={activeTabId}
-                    jumpToSession={jumpToSession}
-                    t={t}
-                  />
-                ))}
-                {/* Solo sessions */}
-                {soloSessions.map((s) => (
-                  <button
-                    key={s.id}
-                    title={s.hostLabel || s.label}
-                    onClick={() => {
-                      void jumpToSession(s.id);
-                    }}
-                    className={cn(
-                      "w-full text-left px-2 py-1.5 rounded hover:bg-muted flex items-center justify-between",
-                      s.status === "connected" ? "" : "text-muted-foreground",
-                      activeTabId === s.id ? "bg-muted" : "",
-                    )}
-                  >
-                    <span className="flex items-center gap-2 min-w-0">
-                      <StatusDot
-                        status={s.status === "connected" ? "success" : s.status === "connecting" ? "warning" : "error"}
-                        spinning={s.status === "connecting"}
-                      />
-                      <span className="truncate">{s.hostLabel || s.label}</span>
-                    </span>
-                    <span className="ml-2 text-xs text-muted-foreground">{t(`tray.status.${s.status}`)}</span>
-                  </button>
-                ))}
-              </div>
-            </div>
-          );
-        })()}
-
-        {activeSession && (
-          <div>
-            <div className="px-2 py-1 text-xs text-muted-foreground">Current</div>
-            <Button
-              variant="ghost"
-              className="w-full justify-start px-2 h-8"
-              title={activeSession.hostLabel || activeSession.label}
-              onClick={() => {
-                void jumpToSession(activeSession.id);
-              }}
-            >
-              <span className="truncate">{activeSession.hostLabel || activeSession.label}</span>
-            </Button>
-          </div>
-        )}
-
-        {portForwardingRules.length > 0 && (
-          <div>
-            <div className="px-2 py-1 text-xs text-muted-foreground">{t("tray.portForwarding")}</div>
-            <div className="space-y-1">
-              {portForwardingRules.map((rule) => {
-                const isConnecting = rule.status === "connecting";
-                const isActive = rule.status === "active";
-                const label = rule.label || (rule.type === "dynamic"
-                  ? `SOCKS:${rule.localPort}`
-                  : `${rule.localPort} → ${rule.remoteHost}:${rule.remotePort}`);
-
-                return (
-                  <button
-                    key={rule.id}
-                    disabled={isConnecting}
-                    title={label}
-                    onClick={() => {
-                      const host = rule.hostId ? hosts.find((h) => h.id === rule.hostId) : undefined;
-                      if (!host) {
-                        toast.error(t("pf.error.hostNotFound"));
-                        return;
-                      }
-                      if (isActive) {
-                        void stopTunnel(rule.id);
-                      } else {
-                        void startTunnel(rule, host, keysForPf, (status, error) => {
-                          if (status === "error" && error) toast.error(error);
-                        }, rule.autoStart);
-                      }
-                    }}
-                    className={cn(
-                      "w-full text-left px-2 py-1.5 rounded hover:bg-muted flex items-center justify-between",
-                      isConnecting ? "opacity-60" : "",
-                    )}
-                  >
-                    <span className="flex items-center gap-2 min-w-0">
-                      <StatusDot
-                        status={
-                          rule.status === "active"
-                            ? "success"
-                            : rule.status === "connecting"
-                              ? "warning"
-                              : rule.status === "error"
-                                ? "error"
-                                : "neutral"
-                        }
-                        spinning={rule.status === "connecting"}
-                      />
-                      <span className="truncate">{label}</span>
-                    </span>
-                    <span className="ml-2 text-xs text-muted-foreground">
-                      {t(`tray.status.${rule.status}`)}
-                    </span>
-                  </button>
-                );
-              })}
-            </div>
-          </div>
-        )}
-
-        {/* Empty state - show when nothing is active */}
-        {jumpableSessions.length === 0 && portForwardingRules.length === 0 && (
-          <div className="flex flex-col items-center justify-center py-8 text-center">
-            <span className="text-2xl mb-2">😴</span>
-            <span className="text-sm text-muted-foreground">{t("tray.empty.title")}</span>
-            <span className="text-xs text-muted-foreground/60 mt-1">{t("tray.empty.subtitle")}</span>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-const TrayPanel: React.FC = () => {
-  const settings = useSettingsState();
-  return (
-    <I18nProvider locale={settings.uiLanguage}>
-      <TrayPanelContent />
-    </I18nProvider>
-  );
-};
-
-export default TrayPanel;
--- a/components/VaultView.tsx
+++ b/components/VaultView.tsx
--- a/components/keychain/ExportKeyPanel.tsx
+++ b/components/keychain/ExportKeyPanel.tsx
@@ -97,8 +97,6 @@ export const ExportKeyPanel: React.FC<ExportKeyPanelProps> = ({
                privateKey: hostPrivateKey,
                command,
                timeout: 30000,
-                enableKeyboardInteractive: true,
-                sessionId: `export-key:${exportHost.id}:${keyItem.id}`,
            });

            // Check result
--- a/components/keychain/ImportKeyPanel.tsx
+++ b/components/keychain/ImportKeyPanel.tsx
@@ -2,7 +2,7 @@
 * Import Key Panel - Import existing SSH key
 */

-import { Eye, EyeOff, Upload } from 'lucide-react';
+import { Upload } from 'lucide-react';
 import React,{ useCallback,useRef } from 'react';
 import { useI18n } from '../../application/i18n/I18nProvider';
 import { SSHKey } from '../../types';
@@ -15,16 +15,12 @@ import { detectKeyType } from './utils';
 interface ImportKeyPanelProps {
    draftKey: Partial<SSHKey>;
    setDraftKey: (key: Partial<SSHKey>) => void;
-    showPassphrase: boolean;
-    setShowPassphrase: (show: boolean) => void;
    onImport: () => void;
 }

 export const ImportKeyPanel: React.FC<ImportKeyPanelProps> = ({
    draftKey,
    setDraftKey,
-    showPassphrase,
-    setShowPassphrase,
    onImport,
 }) => {
    const { t } = useI18n();
@@ -88,6 +84,7 @@ export const ImportKeyPanel: React.FC<ImportKeyPanelProps> = ({
            <input
                ref={fileInputRef}
                type="file"
+                accept=".pem,.key,.pub,.ppk,*"
                className="hidden"
                onChange={handleFileImport}
            />
@@ -136,41 +133,6 @@ export const ImportKeyPanel: React.FC<ImportKeyPanelProps> = ({
                />
            </div>

-            <div className="space-y-2">
-                <Label>{t('terminal.auth.passphrase')}</Label>
-                <div className="relative">
-                    <Input
-                        type={showPassphrase ? 'text' : 'password'}
-                        value={draftKey.passphrase || ''}
-                        onChange={e => setDraftKey({ ...draftKey, passphrase: e.target.value })}
-                        placeholder={t('keychain.generate.passphrasePlaceholder')}
-                        className="pr-10"
-                    />
-                    <Button
-                        type="button"
-                        variant="ghost"
-                        size="icon"
-                        className="absolute right-1 top-1/2 -translate-y-1/2 h-8 w-8"
-                        onClick={() => setShowPassphrase(!showPassphrase)}
-                    >
-                        {showPassphrase ? <EyeOff size={14} /> : <Eye size={14} />}
-                    </Button>
-                </div>
-            </div>
-
-            <div className="flex items-center gap-2">
-                <input
-                    type="checkbox"
-                    id="savePassphraseImport"
-                    checked={draftKey.savePassphrase || false}
-                    onChange={e => setDraftKey({ ...draftKey, savePassphrase: e.target.checked })}
-                    className="h-4 w-4 rounded border-border"
-                />
-                <Label htmlFor="savePassphraseImport" className="text-sm font-normal cursor-pointer">
-                    {t('keychain.generate.savePassphrase')}
-                </Label>
-            </div>
-
            <div
                className="border border-dashed border-border/80 rounded-xl p-4 text-center space-y-2 bg-background/60 transition-colors hover:border-primary/50"
                onDrop={handleDrop}
--- a/components/port-forwarding/RuleCard.tsx
+++ b/components/port-forwarding/RuleCard.tsx
@@ -5,18 +5,16 @@
 import { Copy,Loader2,Pencil,Play,Square,Trash2 } from 'lucide-react';
 import React from 'react';
 import { useI18n } from '../../application/i18n/I18nProvider';
-import { Host, PortForwardingRule } from '../../domain/models';
+import { PortForwardingRule } from '../../domain/models';
 import { cn } from '../../lib/utils';
 import { Button } from '../ui/button';
 import { ContextMenu,ContextMenuContent,ContextMenuItem,ContextMenuSeparator,ContextMenuTrigger } from '../ui/context-menu';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip';
 import { getStatusColor,getTypeColor } from './utils';

 export type ViewMode = 'grid' | 'list';

 export interface RuleCardProps {
    rule: PortForwardingRule;
-    host?: Host; // The relay host for this rule (for tooltip display)
    viewMode: ViewMode;
    isSelected: boolean;
    isPending: boolean;
@@ -30,7 +28,6 @@ export interface RuleCardProps {

 export const RuleCard: React.FC<RuleCardProps> = ({
    rule,
-    host,
    viewMode,
    isSelected,
    isPending,
@@ -77,39 +74,12 @@ export const RuleCard: React.FC<RuleCardProps> = ({
                                />
                            </div>
                            <div className="flex items-center gap-2 text-[11px] text-muted-foreground">
-                                <TooltipProvider delayDuration={300}>
-                                    <Tooltip>
-                                        <TooltipTrigger asChild>
-                                            <span className="truncate cursor-default">
-                                                {rule.type === 'dynamic'
-                                                    ? t('pf.rule.summary.dynamic', { bindAddress: rule.bindAddress, localPort: rule.localPort })
-                                                    : t('pf.rule.summary.default', { bindAddress: rule.bindAddress, localPort: rule.localPort, remoteHost: rule.remoteHost, remotePort: rule.remotePort })
-                                                }
-                                            </span>
-                                        </TooltipTrigger>
-                                        <TooltipContent side="bottom" align="start" className="max-w-xs">
-                                            <div className="space-y-1 text-xs">
-                                                {host ? (
-                                                    <>
-                                                        <div className="font-medium">{t('pf.tooltip.relayHost')}</div>
-                                                        <div>{t('pf.tooltip.hostLabel')}: {host.label}</div>
-                                                        <div>{t('pf.tooltip.hostAddress')}: {host.username}@{host.hostname}:{host.port}</div>
-                                                    </>
-                                                ) : (
-                                                    <div className="text-muted-foreground">{t('pf.tooltip.noHost')}</div>
-                                                )}
-                                                <div className="border-t border-border/40 pt-1 mt-1">
-                                                    {rule.type === 'dynamic'
-                                                        ? t('pf.tooltip.dynamicDesc')
-                                                        : rule.type === 'local'
-                                                            ? t('pf.tooltip.localDesc')
-                                                            : t('pf.tooltip.remoteDesc')
-                                                    }
-                                                </div>
-                                            </div>
-                                        </TooltipContent>
-                                    </Tooltip>
-                                </TooltipProvider>
+                                <span className="truncate">
+                                    {rule.type === 'dynamic'
+                                        ? t('pf.rule.summary.dynamic', { bindAddress: rule.bindAddress, localPort: rule.localPort })
+                                        : t('pf.rule.summary.default', { bindAddress: rule.bindAddress, localPort: rule.localPort, remoteHost: rule.remoteHost, remotePort: rule.remotePort })
+                                    }
+                                </span>
                            </div>
                        </div>
                        <div className="flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
--- a/components/settings/FontSelect.tsx
+++ b/components/settings/FontSelect.tsx
@@ -1,77 +0,0 @@
-import React from 'react';
-import * as SelectPrimitive from '@radix-ui/react-select';
-import { Check, ChevronDown, ChevronUp } from 'lucide-react';
-import { cn } from '../../lib/utils';
-import type { UIFont } from '../../infrastructure/config/uiFonts';
-
-interface FontSelectProps {
-  value: string;
-  fonts: UIFont[];
-  onChange: (value: string) => void;
-  className?: string;
-  disabled?: boolean;
-}
-
-export const FontSelect: React.FC<FontSelectProps> = ({
-  value,
-  fonts,
-  onChange,
-  className,
-  disabled,
-}) => {
-  const selectedFont = fonts.find(f => f.id === value);
-
-  return (
-    <SelectPrimitive.Root value={value} onValueChange={onChange} disabled={disabled}>
-      <SelectPrimitive.Trigger
-        className={cn(
-          'flex h-9 items-center justify-between rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
-          className
-        )}
-      >
-        <SelectPrimitive.Value>
-          <span style={{ fontFamily: selectedFont?.family }}>
-            {selectedFont?.name || value}
-          </span>
-        </SelectPrimitive.Value>
-        <SelectPrimitive.Icon asChild>
-          <ChevronDown className="ml-2 h-4 w-4 opacity-50" />
-        </SelectPrimitive.Icon>
-      </SelectPrimitive.Trigger>
-      <SelectPrimitive.Portal>
-        <SelectPrimitive.Content
-          className="z-[200000] max-h-80 min-w-[12rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1"
-          position="popper"
-          sideOffset={4}
-        >
-          <SelectPrimitive.ScrollUpButton className="flex cursor-default items-center justify-center py-1">
-            <ChevronUp className="h-4 w-4" />
-          </SelectPrimitive.ScrollUpButton>
-          <SelectPrimitive.Viewport className="p-1 h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]">
-            {fonts.map((font) => (
-              <SelectPrimitive.Item
-                key={font.id}
-                value={font.id}
-                className="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
-              >
-                <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-                  <SelectPrimitive.ItemIndicator>
-                    <Check className="h-4 w-4" />
-                  </SelectPrimitive.ItemIndicator>
-                </span>
-                <SelectPrimitive.ItemText>
-                  <span style={{ fontFamily: font.family }}>{font.name}</span>
-                </SelectPrimitive.ItemText>
-              </SelectPrimitive.Item>
-            ))}
-          </SelectPrimitive.Viewport>
-          <SelectPrimitive.ScrollDownButton className="flex cursor-default items-center justify-center py-1">
-            <ChevronDown className="h-4 w-4" />
-          </SelectPrimitive.ScrollDownButton>
-        </SelectPrimitive.Content>
-      </SelectPrimitive.Portal>
-    </SelectPrimitive.Root>
-  );
-};
-
-export default FontSelect;
--- a/components/settings/TerminalFontSelect.tsx
+++ b/components/settings/TerminalFontSelect.tsx
@@ -1,77 +0,0 @@
-import React from 'react';
-import * as SelectPrimitive from '@radix-ui/react-select';
-import { Check, ChevronDown, ChevronUp } from 'lucide-react';
-import { cn } from '../../lib/utils';
-import type { TerminalFont } from '../../infrastructure/config/fonts';
-
-interface TerminalFontSelectProps {
-  value: string;
-  fonts: TerminalFont[];
-  onChange: (value: string) => void;
-  className?: string;
-  disabled?: boolean;
-}
-
-export const TerminalFontSelect: React.FC<TerminalFontSelectProps> = ({
-  value,
-  fonts,
-  onChange,
-  className,
-  disabled,
-}) => {
-  const selectedFont = fonts.find(f => f.id === value);
-
-  return (
-    <SelectPrimitive.Root value={value} onValueChange={onChange} disabled={disabled}>
-      <SelectPrimitive.Trigger
-        className={cn(
-          'flex h-9 items-center justify-between rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
-          className
-        )}
-      >
-        <SelectPrimitive.Value>
-          <span style={{ fontFamily: selectedFont?.family }}>
-            {selectedFont?.name || value}
-          </span>
-        </SelectPrimitive.Value>
-        <SelectPrimitive.Icon asChild>
-          <ChevronDown className="ml-2 h-4 w-4 opacity-50" />
-        </SelectPrimitive.Icon>
-      </SelectPrimitive.Trigger>
-      <SelectPrimitive.Portal>
-        <SelectPrimitive.Content
-          className="z-[200000] max-h-80 min-w-[14rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1"
-          position="popper"
-          sideOffset={4}
-        >
-          <SelectPrimitive.ScrollUpButton className="flex cursor-default items-center justify-center py-1">
-            <ChevronUp className="h-4 w-4" />
-          </SelectPrimitive.ScrollUpButton>
-          <SelectPrimitive.Viewport className="p-1 h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]">
-            {fonts.map((font) => (
-              <SelectPrimitive.Item
-                key={font.id}
-                value={font.id}
-                className="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
-              >
-                <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-                  <SelectPrimitive.ItemIndicator>
-                    <Check className="h-4 w-4" />
-                  </SelectPrimitive.ItemIndicator>
-                </span>
-                <SelectPrimitive.ItemText>
-                  <span style={{ fontFamily: font.family }}>{font.name}</span>
-                </SelectPrimitive.ItemText>
-              </SelectPrimitive.Item>
-            ))}
-          </SelectPrimitive.Viewport>
-          <SelectPrimitive.ScrollDownButton className="flex cursor-default items-center justify-center py-1">
-            <ChevronDown className="h-4 w-4" />
-          </SelectPrimitive.ScrollDownButton>
-        </SelectPrimitive.Content>
-      </SelectPrimitive.Portal>
-    </SelectPrimitive.Root>
-  );
-};
-
-export default TerminalFontSelect;
--- a/components/settings/tabs/SettingsAppearanceTab.tsx
+++ b/components/settings/tabs/SettingsAppearanceTab.tsx
@@ -2,11 +2,9 @@ import React, { useCallback } from "react";
 import { Check, Moon, Palette, Sun } from "lucide-react";
 import { useI18n } from "../../../application/i18n/I18nProvider";
 import { DARK_UI_THEMES, LIGHT_UI_THEMES } from "../../../infrastructure/config/uiThemes";
-import { useAvailableUIFonts } from "../../../application/state/uiFontStore";
 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";

 export default function SettingsAppearanceTab(props: {
  theme: "dark" | "light";
@@ -19,15 +17,12 @@ export default function SettingsAppearanceTab(props: {
  setAccentMode: (mode: "theme" | "custom") => void;
  customAccent: string;
  setCustomAccent: (color: string) => void;
-  uiFontFamilyId: string;
-  setUiFontFamilyId: (fontId: string) => void;
  uiLanguage: string;
  setUiLanguage: (language: string) => void;
  customCSS: string;
  setCustomCSS: (css: string) => void;
 }) {
  const { t } = useI18n();
-  const availableUIFonts = useAvailableUIFonts();
  const {
    theme,
    setTheme,
@@ -39,8 +34,6 @@ export default function SettingsAppearanceTab(props: {
    setAccentMode,
    customAccent,
    setCustomAccent,
-    uiFontFamilyId,
-    setUiFontFamilyId,
    uiLanguage,
    setUiLanguage,
    customCSS,
@@ -137,17 +130,6 @@ export default function SettingsAppearanceTab(props: {
            className="w-40"
          />
        </SettingRow>
-        <SettingRow
-          label={t("settings.appearance.uiFont")}
-          description={t("settings.appearance.uiFont.desc")}
-        >
-          <FontSelect
-            value={uiFontFamilyId}
-            fonts={availableUIFonts}
-            onChange={(v) => setUiFontFamilyId(v)}
-            className="w-48"
-          />
-        </SettingRow>
      </div>

      <SectionHeader title={t("settings.appearance.uiTheme")} />
--- a/components/settings/tabs/SettingsFileAssociationsTab.tsx
+++ b/components/settings/tabs/SettingsFileAssociationsTab.tsx
@@ -29,7 +29,7 @@ const getOpenerLabel = (
 export default function SettingsFileAssociationsTab() {
  const { t } = useI18n();
  const { getAllAssociations, removeAssociation, setOpenerForExtension } = useSftpFileAssociations();
-  const { sftpDoubleClickBehavior, setSftpDoubleClickBehavior, sftpAutoSync, setSftpAutoSync, sftpShowHiddenFiles, setSftpShowHiddenFiles, sftpUseCompressedUpload, setSftpUseCompressedUpload } = useSettingsState();
+  const { sftpDoubleClickBehavior, setSftpDoubleClickBehavior, sftpAutoSync, setSftpAutoSync } = useSettingsState();
  const associations = getAllAssociations();
  const [editingExtension, setEditingExtension] = useState<string | null>(null);

@@ -173,86 +173,6 @@ export default function SettingsFileAssociationsTab() {
          </button>
        </div>

-        {/* Show hidden files section */}
-        <div className="space-y-4">
-          <SectionHeader title={t('settings.sftp.showHiddenFiles')} />
-          <p className="text-sm text-muted-foreground">
-            {t('settings.sftp.showHiddenFiles.desc')}
-          </p>
-          <button
-            onClick={() => setSftpShowHiddenFiles(!sftpShowHiddenFiles)}
-            className={cn(
-              "w-full text-left p-4 rounded-lg border-2 transition-colors",
-              sftpShowHiddenFiles
-                ? "border-primary bg-primary/5"
-                : "border-border hover:border-primary/50 hover:bg-secondary/50"
-            )}
-          >
-            <div className="flex items-start gap-3">
-              <div className={cn(
-                "h-5 w-5 rounded border-2 flex items-center justify-center mt-0.5 shrink-0",
-                sftpShowHiddenFiles
-                  ? "border-primary bg-primary"
-                  : "border-muted-foreground/30"
-              )}>
-                {sftpShowHiddenFiles && (
-                  <svg className="h-3 w-3 text-primary-foreground" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={3}>
-                    <path strokeLinecap="round" strokeLinejoin="round" d="M5 13l4 4L19 7" />
-                  </svg>
-                )}
-              </div>
-              <div className="space-y-1">
-                <Label className="font-medium cursor-pointer">
-                  {t('settings.sftp.showHiddenFiles.enable')}
-                </Label>
-                <p className="text-sm text-muted-foreground">
-                  {t('settings.sftp.showHiddenFiles.enableDesc')}
-                </p>
-              </div>
-            </div>
-          </button>
-        </div>
-
-        {/* Compressed folder upload section */}
-        <div className="space-y-4">
-          <SectionHeader title={t('settings.sftp.compressedUpload')} />
-          <p className="text-sm text-muted-foreground">
-            {t('settings.sftp.compressedUpload.desc')}
-          </p>
-          <button
-            onClick={() => setSftpUseCompressedUpload(!sftpUseCompressedUpload)}
-            className={cn(
-              "w-full text-left p-4 rounded-lg border-2 transition-colors",
-              sftpUseCompressedUpload
-                ? "border-primary bg-primary/5"
-                : "border-border hover:border-primary/50 hover:bg-secondary/50"
-            )}
-          >
-            <div className="flex items-start gap-3">
-              <div className={cn(
-                "h-5 w-5 rounded border-2 flex items-center justify-center mt-0.5 shrink-0",
-                sftpUseCompressedUpload
-                  ? "border-primary bg-primary"
-                  : "border-muted-foreground/30"
-              )}>
-                {sftpUseCompressedUpload && (
-                  <svg className="h-3 w-3 text-primary-foreground" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={3}>
-                    <path strokeLinecap="round" strokeLinejoin="round" d="M5 13l4 4L19 7" />
-                  </svg>
-                )}
-              </div>
-              <div className="space-y-1">
-                <Label className="font-medium cursor-pointer">
-                  {t('settings.sftp.compressedUpload.enable')}
-                </Label>
-                <p className="text-sm text-muted-foreground">
-                  {t('settings.sftp.compressedUpload.enableDesc')}
-                </p>
-              </div>
-            </div>
-          </button>
-        </div>
-
        {/* File associations section */}
        <div className="space-y-4">
          <SectionHeader title={t('settings.sftpFileAssociations.title')} />
--- a/components/settings/tabs/SettingsShortcutsTab.tsx
+++ b/components/settings/tabs/SettingsShortcutsTab.tsx
@@ -115,7 +115,7 @@ export default function SettingsShortcutsTab(props: {
    };
  }, [recordingBindingId, recordingScheme, setIsHotkeyRecording]);

-  const categories = useMemo(() => ["tabs", "terminal", "navigation", "app", "sftp"] as const, []);
+  const categories = useMemo(() => ["tabs", "terminal", "navigation", "app"] as const, []);

  return (
    <SettingsTabContent value="shortcuts">
--- a/components/settings/tabs/SettingsSystemTab.tsx
+++ b/components/settings/tabs/SettingsSystemTab.tsx
@@ -1,15 +1,12 @@
 /**
- * Settings System Tab - System information, temp file management, session logs, and global hotkey
+ * Settings System Tab - System information and temp file management
 */
-import { FileText, FolderOpen, HardDrive, Keyboard, RefreshCw, RotateCcw, Trash2 } from "lucide-react";
-import React, { useCallback, useEffect, useState } from "react";
+import { FolderOpen, HardDrive, RefreshCw, Trash2 } from "lucide-react";
+import { useCallback, useEffect, useState } from "react";
 import { useI18n } from "../../../application/i18n/I18nProvider";
 import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-import { SessionLogFormat, keyEventToString } from "../../../domain/models";
 import { TabsContent } from "../../ui/tabs";
 import { Button } from "../../ui/button";
-import { Toggle, Select, SettingRow } from "../settings-ui";
-import { cn } from "../../../lib/utils";

 interface TempDirInfo {
  path: string;
@@ -25,47 +22,18 @@ function formatBytes(bytes: number): string {
  return `${parseFloat((bytes / Math.pow(k, i)).toFixed(2))} ${sizes[i]}`;
 }

-interface SettingsSystemTabProps {
-  sessionLogsEnabled: boolean;
-  setSessionLogsEnabled: (enabled: boolean) => void;
-  sessionLogsDir: string;
-  setSessionLogsDir: (dir: string) => void;
-  sessionLogsFormat: SessionLogFormat;
-  setSessionLogsFormat: (format: SessionLogFormat) => void;
-  toggleWindowHotkey: string;
-  setToggleWindowHotkey: (hotkey: string) => void;
-  closeToTray: boolean;
-  setCloseToTray: (enabled: boolean) => void;
-  hotkeyRegistrationError: string | null;
-}
-
-const SettingsSystemTab: React.FC<SettingsSystemTabProps> = ({
-  sessionLogsEnabled,
-  setSessionLogsEnabled,
-  sessionLogsDir,
-  setSessionLogsDir,
-  sessionLogsFormat,
-  setSessionLogsFormat,
-  toggleWindowHotkey,
-  setToggleWindowHotkey,
-  closeToTray,
-  setCloseToTray,
-  hotkeyRegistrationError,
-}) => {
+const SettingsSystemTab: React.FC = () => {
  const { t } = useI18n();
-  const isMac = typeof navigator !== "undefined" && /Mac/i.test(navigator.platform);
-
+  
  const [tempDirInfo, setTempDirInfo] = useState<TempDirInfo | null>(null);
  const [isLoading, setIsLoading] = useState(false);
  const [isClearing, setIsClearing] = useState(false);
  const [clearResult, setClearResult] = useState<{ deletedCount: number; failedCount: number } | null>(null);
-  const [isRecordingHotkey, setIsRecordingHotkey] = useState(false);
-  const [hotkeyError, setHotkeyError] = useState<string | null>(null);

  const loadTempDirInfo = useCallback(async () => {
    const bridge = netcattyBridge.get();
    if (!bridge?.getTempDirInfo) return;
-
+    
    setIsLoading(true);
    try {
      const info = await bridge.getTempDirInfo();
@@ -84,7 +52,7 @@ const SettingsSystemTab: React.FC<SettingsSystemTabProps> = ({
  const handleClearTempFiles = useCallback(async () => {
    const bridge = netcattyBridge.get();
    if (!bridge?.clearTempDir) return;
-
+    
    setIsClearing(true);
    setClearResult(null);
    try {
@@ -105,87 +73,6 @@ const SettingsSystemTab: React.FC<SettingsSystemTabProps> = ({
    await bridge.openTempDir();
  }, [tempDirInfo]);

-  const handleSelectSessionLogsDir = useCallback(async () => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.selectSessionLogsDir) return;
-
-    try {
-      const result = await bridge.selectSessionLogsDir();
-      if (result.success && result.directory) {
-        setSessionLogsDir(result.directory);
-      }
-    } catch (err) {
-      console.error("[SettingsSystemTab] Failed to select directory:", err);
-    }
-  }, [setSessionLogsDir]);
-
-  const handleOpenSessionLogsDir = useCallback(async () => {
-    const bridge = netcattyBridge.get();
-    if (!sessionLogsDir || !bridge?.openSessionLogsDir) return;
-
-    try {
-      await bridge.openSessionLogsDir(sessionLogsDir);
-    } catch (err) {
-      console.error("[SettingsSystemTab] Failed to open directory:", err);
-    }
-  }, [sessionLogsDir]);
-
-  // Handle global toggle hotkey recording
-  const cancelHotkeyRecording = useCallback(() => {
-    setIsRecordingHotkey(false);
-  }, []);
-
-  const handleResetHotkey = useCallback(() => {
-    // Reset to default hotkey (Ctrl+` or ⌃+` on Mac)
-    const defaultHotkey = isMac ? '⌃ + `' : 'Ctrl + `';
-    setToggleWindowHotkey(defaultHotkey);
-    setHotkeyError(null);
-  }, [isMac, setToggleWindowHotkey]);
-
-  // Hotkey recording effect
-  useEffect(() => {
-    if (!isRecordingHotkey) return;
-
-    const handleKeyDown = (e: KeyboardEvent) => {
-      e.preventDefault();
-      e.stopPropagation();
-
-      if (e.key === "Escape") {
-        cancelHotkeyRecording();
-        return;
-      }
-
-      // Ignore modifier-only keys
-      if (["Meta", "Control", "Alt", "Shift"].includes(e.key)) return;
-
-      const keyString = keyEventToString(e, isMac);
-      setToggleWindowHotkey(keyString);
-      setHotkeyError(null);
-      cancelHotkeyRecording();
-    };
-
-    const handleClick = () => {
-      cancelHotkeyRecording();
-    };
-
-    const timer = setTimeout(() => {
-      window.addEventListener("click", handleClick, true);
-    }, 100);
-
-    window.addEventListener("keydown", handleKeyDown, true);
-    return () => {
-      clearTimeout(timer);
-      window.removeEventListener("keydown", handleKeyDown, true);
-      window.removeEventListener("click", handleClick, true);
-    };
-  }, [isRecordingHotkey, isMac, setToggleWindowHotkey, cancelHotkeyRecording]);
-
-  const formatOptions = [
-    { value: "txt", label: t("settings.sessionLogs.formatTxt") },
-    { value: "raw", label: t("settings.sessionLogs.formatRaw") },
-    { value: "html", label: t("settings.sessionLogs.formatHtml") },
-  ];
-
  return (
    <TabsContent
      value="system"
@@ -284,143 +171,6 @@ const SettingsSystemTab: React.FC<SettingsSystemTabProps> = ({
              {t("settings.system.tempDirectoryHint")}
            </p>
          </div>
-
-          {/* Session Logs Section */}
-          <div className="space-y-4">
-            <div className="flex items-center gap-2">
-              <FileText size={18} className="text-muted-foreground" />
-              <h3 className="text-base font-medium">{t("settings.sessionLogs.title")}</h3>
-            </div>
-
-            <div className="bg-muted/30 rounded-lg p-4 space-y-4">
-              {/* Enable Toggle */}
-              <SettingRow
-                label={t("settings.sessionLogs.enableAutoSave")}
-                description={t("settings.sessionLogs.enableAutoSaveDesc")}
-              >
-                <Toggle
-                  checked={sessionLogsEnabled}
-                  onChange={setSessionLogsEnabled}
-                />
-              </SettingRow>
-
-              {/* Directory Selection */}
-              <div className="space-y-2">
-                <div className="flex items-center gap-2">
-                  <span className="text-sm font-medium">{t("settings.sessionLogs.directory")}</span>
-                </div>
-                <div className="flex items-center gap-2">
-                  <div className="flex-1 min-w-0">
-                    <div className="bg-background border border-input rounded-md px-3 py-2 text-sm font-mono truncate">
-                      {sessionLogsDir || t("settings.sessionLogs.noDirectory")}
-                    </div>
-                  </div>
-                  <Button
-                    variant="outline"
-                    size="sm"
-                    onClick={handleSelectSessionLogsDir}
-                    className="shrink-0"
-                  >
-                    {t("settings.sessionLogs.browse")}
-                  </Button>
-                  {sessionLogsDir && (
-                    <Button
-                      variant="ghost"
-                      size="icon"
-                      onClick={handleOpenSessionLogsDir}
-                      className="shrink-0"
-                      title={t("settings.sessionLogs.openFolder")}
-                    >
-                      <FolderOpen size={16} />
-                    </Button>
-                  )}
-                </div>
-                <p className="text-xs text-muted-foreground">
-                  {t("settings.sessionLogs.directoryHint")}
-                </p>
-              </div>
-
-              {/* Format Selection */}
-              <SettingRow
-                label={t("settings.sessionLogs.format")}
-                description={t("settings.sessionLogs.formatDesc")}
-              >
-                <Select
-                  value={sessionLogsFormat}
-                  options={formatOptions}
-                  onChange={(val) => setSessionLogsFormat(val as SessionLogFormat)}
-                  className="w-32"
-                  disabled={!sessionLogsEnabled}
-                />
-              </SettingRow>
-            </div>
-
-            <p className="text-xs text-muted-foreground">
-              {t("settings.sessionLogs.hint")}
-            </p>
-          </div>
-
-          {/* Global Toggle Window Section (Quake Mode) */}
-          <div className="space-y-4">
-            <div className="flex items-center gap-2">
-              <Keyboard size={18} className="text-muted-foreground" />
-              <h3 className="text-base font-medium">{t("settings.globalHotkey.title")}</h3>
-            </div>
-
-            <div className="bg-muted/30 rounded-lg p-4 space-y-4">
-              {/* Toggle Window Hotkey */}
-              <SettingRow
-                label={t("settings.globalHotkey.toggleWindow")}
-                description={t("settings.globalHotkey.toggleWindowDesc")}
-              >
-                <div className="flex items-center gap-2">
-                  <button
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      setIsRecordingHotkey(true);
-                    }}
-                    className={cn(
-                      "px-3 py-1.5 text-sm font-mono rounded border transition-colors min-w-[100px] text-center",
-                      isRecordingHotkey
-                        ? "border-primary bg-primary/10 animate-pulse"
-                        : "border-border hover:border-primary/50",
-                    )}
-                  >
-                    {isRecordingHotkey
-                      ? t("settings.shortcuts.recording")
-                      : toggleWindowHotkey || t("settings.globalHotkey.notSet")}
-                  </button>
-                  {toggleWindowHotkey && (
-                    <button
-                      onClick={handleResetHotkey}
-                      className="p-1 hover:bg-muted rounded"
-                      title={t("settings.globalHotkey.reset")}
-                    >
-                      <RotateCcw size={14} />
-                    </button>
-                  )}
-                </div>
-              </SettingRow>
-              {(hotkeyError || hotkeyRegistrationError) && (
-                <p className="text-sm text-destructive">{hotkeyError || hotkeyRegistrationError}</p>
-              )}
-
-              {/* Close to Tray */}
-              <SettingRow
-                label={t("settings.globalHotkey.closeToTray")}
-                description={t("settings.globalHotkey.closeToTrayDesc")}
-              >
-                <Toggle
-                  checked={closeToTray}
-                  onChange={setCloseToTray}
-                />
-              </SettingRow>
-            </div>
-
-            <p className="text-xs text-muted-foreground">
-              {t("settings.globalHotkey.hint")}
-            </p>
-          </div>
        </div>
      </div>
    </TabsContent>
--- a/components/settings/tabs/SettingsTerminalTab.tsx
+++ b/components/settings/tabs/SettingsTerminalTab.tsx
@@ -17,7 +17,6 @@ import { Input } from "../../ui/input";
 import { Label } from "../../ui/label";
 import { SectionHeader, Select, SettingsTabContent, SettingRow, Toggle } from "../settings-ui";
 import { ThemeSelectModal } from "../ThemeSelectModal";
-import { TerminalFontSelect } from "../TerminalFontSelect";

 // Theme preview button component
 const ThemePreviewButton: React.FC<{
@@ -208,11 +207,11 @@ export default function SettingsTerminalTab(props: {
          label={t("settings.terminal.font.family")}
          description={t("settings.terminal.font.family.desc")}
        >
-          <TerminalFontSelect
+          <Select
            value={terminalFontFamilyId}
-            fonts={availableFonts}
+            options={availableFonts.map((f) => ({ value: f.id, label: f.name }))}
            onChange={(id) => setTerminalFontFamilyId(id)}
-            className="w-48"
+            className="w-40"
          />
        </SettingRow>

@@ -609,62 +608,6 @@ export default function SettingsTerminalTab(props: {
          />
        </SettingRow>
      </div>
-
-      <SectionHeader title={t("settings.terminal.section.serverStats")} />
-      <div className="space-y-0 divide-y divide-border rounded-lg border bg-card px-4">
-        <SettingRow
-          label={t("settings.terminal.serverStats.show")}
-          description={t("settings.terminal.serverStats.show.desc")}
-        >
-          <Toggle
-            checked={terminalSettings.showServerStats}
-            onChange={(v) => updateTerminalSetting("showServerStats", v)}
-          />
-        </SettingRow>
-
-        {terminalSettings.showServerStats && (
-          <SettingRow
-            label={t("settings.terminal.serverStats.refreshInterval")}
-            description={t("settings.terminal.serverStats.refreshInterval.desc")}
-          >
-            <div className="flex items-center gap-2">
-              <Input
-                type="number"
-                min={5}
-                max={300}
-                value={terminalSettings.serverStatsRefreshInterval}
-                onChange={(e) => {
-                  const val = parseInt(e.target.value) || 5;
-                  if (val >= 5 && val <= 300) {
-                    updateTerminalSetting("serverStatsRefreshInterval", val);
-                  }
-                }}
-                className="w-20"
-              />
-              <span className="text-sm text-muted-foreground">{t("settings.terminal.serverStats.seconds")}</span>
-            </div>
-          </SettingRow>
-        )}
-      </div>
-
-      <SectionHeader title={t("settings.terminal.section.rendering")} />
-      <div className="space-y-0 divide-y divide-border rounded-lg border bg-card px-4">
-        <SettingRow
-          label={t("settings.terminal.rendering.renderer")}
-          description={t("settings.terminal.rendering.renderer.desc")}
-        >
-          <Select
-            value={terminalSettings.rendererType}
-            options={[
-              { value: "auto", label: t("settings.terminal.rendering.auto") },
-              { value: "webgl", label: "WebGL" },
-              { value: "canvas", label: "Canvas" },
-            ]}
-            onChange={(v) => updateTerminalSetting("rendererType", v as "auto" | "webgl" | "canvas")}
-            className="w-32"
-          />
-        </SettingRow>
-      </div>
    </SettingsTabContent>
  );
 }
--- a/components/sftp-modal/SftpModalDialogs.tsx
+++ b/components/sftp-modal/SftpModalDialogs.tsx
@@ -1,139 +0,0 @@
-import React from "react";
-import { Loader2 } from "lucide-react";
-import { Button } from "../ui/button";
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "../ui/dialog";
-import { Input } from "../ui/input";
-import type { RemoteFile } from "../../types";
-
-interface PermissionsState {
-  owner: { read: boolean; write: boolean; execute: boolean };
-  group: { read: boolean; write: boolean; execute: boolean };
-  others: { read: boolean; write: boolean; execute: boolean };
-}
-
-interface SftpModalDialogsProps {
-  t: (key: string, params?: Record<string, unknown>) => string;
-  showRenameDialog: boolean;
-  setShowRenameDialog: (open: boolean) => void;
-  renameTarget: RemoteFile | null;
-  renameName: string;
-  setRenameName: (value: string) => void;
-  handleRename: () => void;
-  isRenaming: boolean;
-  showPermissionsDialog: boolean;
-  setShowPermissionsDialog: (open: boolean) => void;
-  permissionsTarget: RemoteFile | null;
-  permissions: PermissionsState;
-  togglePermission: (role: "owner" | "group" | "others", perm: "read" | "write" | "execute") => void;
-  getOctalPermissions: () => string;
-  getSymbolicPermissions: () => string;
-  handleSavePermissions: () => void;
-  isChangingPermissions: boolean;
-}
-
-export const SftpModalDialogs: React.FC<SftpModalDialogsProps> = ({
-  t,
-  showRenameDialog,
-  setShowRenameDialog,
-  renameTarget,
-  renameName,
-  setRenameName,
-  handleRename,
-  isRenaming,
-  showPermissionsDialog,
-  setShowPermissionsDialog,
-  permissionsTarget,
-  permissions,
-  togglePermission,
-  getOctalPermissions,
-  getSymbolicPermissions,
-  handleSavePermissions,
-  isChangingPermissions,
-}) => (
-  <>
-    <Dialog open={showRenameDialog} onOpenChange={setShowRenameDialog}>
-      <DialogContent className="sm:max-w-[400px]">
-        <DialogHeader>
-          <DialogTitle>{t("sftp.rename.title")}</DialogTitle>
-          <DialogDescription className="truncate">
-            {renameTarget?.name}
-          </DialogDescription>
-        </DialogHeader>
-        <div className="py-4">
-          <Input
-            value={renameName}
-            onChange={(e) => setRenameName(e.target.value)}
-            placeholder={t("sftp.rename.placeholder")}
-            onKeyDown={(e) => {
-              if (e.key === "Enter") handleRename();
-            }}
-            autoFocus
-          />
-        </div>
-        <DialogFooter>
-          <Button variant="outline" onClick={() => setShowRenameDialog(false)}>
-            {t("common.cancel")}
-          </Button>
-          <Button onClick={handleRename} disabled={isRenaming || !renameName.trim()}>
-            {isRenaming ? <Loader2 size={14} className="mr-2 animate-spin" /> : null}
-            {t("common.apply")}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-
-    <Dialog open={showPermissionsDialog} onOpenChange={setShowPermissionsDialog}>
-      <DialogContent className="sm:max-w-[400px]">
-        <DialogHeader>
-          <DialogTitle>{t("sftp.permissions.title")}</DialogTitle>
-          <DialogDescription className="truncate">
-            {permissionsTarget?.name}
-          </DialogDescription>
-        </DialogHeader>
-        <div className="space-y-4 py-4">
-          <div className="space-y-3">
-            {(["owner", "group", "others"] as const).map((role) => (
-              <div key={role} className="flex items-center gap-4">
-                <div className="w-16 text-sm font-medium">
-                  {t(`sftp.permissions.${role}`)}
-                </div>
-                <div className="flex gap-3">
-                  {(["read", "write", "execute"] as const).map((perm) => (
-                    <label key={perm} className="flex items-center gap-1.5 cursor-pointer">
-                      <input
-                        type="checkbox"
-                        checked={permissions[role][perm]}
-                        onChange={() => togglePermission(role, perm)}
-                        className="rounded border-border"
-                      />
-                      <span className="text-xs">
-                        {perm === "read" ? "R" : perm === "write" ? "W" : "X"}
-                      </span>
-                    </label>
-                  ))}
-                </div>
-              </div>
-            ))}
-          </div>
-          <div className="flex items-center justify-between pt-2 border-t border-border/60">
-            <div className="text-xs text-muted-foreground">
-              {t("sftp.permissions.octal")}: <span className="font-mono text-foreground">{getOctalPermissions()}</span>
-            </div>
-            <div className="text-xs text-muted-foreground">
-              {t("sftp.permissions.symbolic")}: <span className="font-mono text-foreground">{getSymbolicPermissions()}</span>
-            </div>
-          </div>
-        </div>
-        <DialogFooter>
-          <Button variant="outline" onClick={() => setShowPermissionsDialog(false)}>
-            {t("common.cancel")}
-          </Button>
-          <Button onClick={handleSavePermissions} disabled={isChangingPermissions}>
-            {isChangingPermissions ? <Loader2 size={14} className="mr-2 animate-spin" /> : null}
-            {t("common.apply")}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  </>
-);
--- a/components/sftp-modal/SftpModalFileList.tsx
+++ b/components/sftp-modal/SftpModalFileList.tsx
@@ -1,428 +0,0 @@
-import React from "react";
-import { Download, Edit2, Folder, FolderOpen, FolderUp, Link, Loader2, MoreHorizontal, Plus, RefreshCw, Shield, Trash2, Upload } from "lucide-react";
-import { cn } from "../../lib/utils";
-import type { RemoteFile } from "../../types";
-import { isKnownBinaryFile } from "../../lib/sftpFileUtils";
-import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuSeparator, ContextMenuTrigger } from "../ui/context-menu";
-import { Button } from "../ui/button";
-import { getFileIcon } from "./fileIcons";
-
-interface VisibleRow {
-  file: RemoteFile;
-  index: number;
-  top: number;
-}
-
-interface SftpModalFileListProps {
-  t: (key: string, params?: Record<string, unknown>) => string;
-  currentPath: string;
-  isLocalSession: boolean;
-  files: RemoteFile[];
-  selectedFiles: Set<string>;
-  dragActive: boolean;
-  loading: boolean;
-  loadingTextContent: boolean;
-  reconnecting: boolean;
-  columnWidths: { name: number; size: number; modified: number; actions: number };
-  sortField: "name" | "size" | "modified";
-  sortOrder: "asc" | "desc";
-  shouldVirtualize: boolean;
-  totalHeight: number;
-  visibleRows: VisibleRow[];
-  fileListRef: React.RefObject<HTMLDivElement>;
-  inputRef: React.RefObject<HTMLInputElement>;
-  folderInputRef: React.RefObject<HTMLInputElement>;
-  handleSort: (field: "name" | "size" | "modified") => void;
-  handleResizeStart: (field: string, e: React.MouseEvent) => void;
-  handleFileListScroll: (e: React.UIEvent<HTMLDivElement>) => void;
-  handleDrag: (e: React.DragEvent) => void;
-  handleDrop: (e: React.DragEvent) => void;
-  handleFileClick: (file: RemoteFile, index: number, e: React.MouseEvent) => void;
-  handleFileDoubleClick: (file: RemoteFile) => void;
-  handleDownload: (file: RemoteFile) => void;
-  handleDelete: (file: RemoteFile) => void;
-  handleOpenFile: (file: RemoteFile) => void;
-  openFileOpenerDialog: (file: RemoteFile) => void;
-  handleEditFile: (file: RemoteFile) => void;
-  openRenameDialog: (file: RemoteFile) => void;
-  openPermissionsDialog: (file: RemoteFile) => void;
-  handleNavigate: (path: string) => void;
-  handleCreateFolder: () => void;
-  handleCreateFile: () => void;
-  handleDownloadSelected: () => void;
-  handleDeleteSelected: () => void;
-  loadFiles: (path: string, options?: { force?: boolean }) => void;
-  formatBytes: (bytes: number | string) => string;
-  formatDate: (dateStr: string | number | undefined) => string;
-}
-
-export const SftpModalFileList: React.FC<SftpModalFileListProps> = ({
-  t,
-  currentPath,
-  isLocalSession,
-  files,
-  selectedFiles,
-  dragActive,
-  loading,
-  loadingTextContent,
-  reconnecting,
-  columnWidths,
-  sortField,
-  sortOrder,
-  shouldVirtualize,
-  totalHeight,
-  visibleRows,
-  fileListRef,
-  inputRef,
-  folderInputRef,
-  handleSort,
-  handleResizeStart,
-  handleFileListScroll,
-  handleDrag,
-  handleDrop,
-  handleFileClick,
-  handleFileDoubleClick,
-  handleDownload,
-  handleDelete,
-  handleOpenFile,
-  openFileOpenerDialog,
-  handleEditFile,
-  openRenameDialog,
-  openPermissionsDialog,
-  handleNavigate,
-  handleCreateFolder,
-  handleCreateFile,
-  handleDownloadSelected,
-  handleDeleteSelected,
-  loadFiles,
-  formatBytes,
-  formatDate,
-}) => (
-  <>
-    <div
-      className="shrink-0 bg-muted/80 backdrop-blur-sm border-b border-border/60 px-4 py-2 flex items-center text-xs font-medium text-muted-foreground select-none"
-      style={{
-        display: "grid",
-        gridTemplateColumns: `${columnWidths.name}% ${columnWidths.size}% ${columnWidths.modified}% ${columnWidths.actions}%`,
-      }}
-    >
-      <div
-        className="flex items-center gap-1 cursor-pointer hover:text-foreground relative pr-2"
-        onClick={() => handleSort("name")}
-      >
-        <span>{t("sftp.columns.name")}</span>
-        {sortField === "name" && (
-          <span className="text-primary">{sortOrder === "asc" ? "^" : "v"}</span>
-        )}
-        <div
-          className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-primary/50 transition-colors"
-          onMouseDown={(e) => handleResizeStart("name", e)}
-        />
-      </div>
-      <div
-        className="flex items-center gap-1 cursor-pointer hover:text-foreground relative pr-2"
-        onClick={() => handleSort("size")}
-      >
-        <span>{t("sftp.columns.size")}</span>
-        {sortField === "size" && (
-          <span className="text-primary">{sortOrder === "asc" ? "^" : "v"}</span>
-        )}
-        <div
-          className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-primary/50 transition-colors"
-          onMouseDown={(e) => handleResizeStart("size", e)}
-        />
-      </div>
-      <div
-        className="flex items-center gap-1 cursor-pointer hover:text-foreground relative pr-2"
-        onClick={() => handleSort("modified")}
-      >
-        <span>{t("sftp.columns.modified")}</span>
-        {sortField === "modified" && (
-          <span className="text-primary">{sortOrder === "asc" ? "^" : "v"}</span>
-        )}
-        <div
-          className="absolute right-0 top-0 bottom-0 w-1 cursor-col-resize hover:bg-primary/50 transition-colors"
-          onMouseDown={(e) => handleResizeStart("modified", e)}
-        />
-      </div>
-      <div className="text-right">{t("sftp.columns.actions")}</div>
-    </div>
-
-    <div
-      ref={fileListRef}
-      className={cn(
-        "flex-1 min-h-0 overflow-y-auto relative",
-        dragActive && "bg-primary/5 ring-2 ring-inset ring-primary",
-      )}
-      onScroll={handleFileListScroll}
-      onDragEnter={handleDrag}
-      onDragLeave={handleDrag}
-      onDragOver={handleDrag}
-      onDrop={handleDrop}
-    >
-      {dragActive && (
-        <div className="absolute inset-0 flex items-center justify-center pointer-events-none z-10">
-          <div className="bg-background/95 p-6 rounded-xl shadow-lg border-2 border-dashed border-primary text-primary font-medium flex flex-col items-center gap-2">
-            <Upload size={32} />
-            <span>{t("sftp.dropFilesHere")}</span>
-          </div>
-        </div>
-      )}
-
-      {loading && files.length === 0 && (
-        <div className="absolute inset-0 flex items-center justify-center bg-background/80">
-          <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
-        </div>
-      )}
-
-      {loadingTextContent && (
-        <div className="absolute inset-0 flex items-center justify-center bg-background/80 z-20">
-          <div className="flex flex-col items-center gap-2">
-            <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
-            <span className="text-sm text-muted-foreground">
-              {t("sftp.status.loading")}
-            </span>
-          </div>
-        </div>
-      )}
-
-      {reconnecting && (
-        <div className="absolute inset-0 flex items-center justify-center bg-background/80 backdrop-blur-sm z-20">
-          <div className="flex flex-col items-center gap-3 p-6 rounded-xl bg-secondary/90 border border-border/60 shadow-lg">
-            <Loader2 className="h-8 w-8 animate-spin text-primary" />
-            <div className="text-center">
-              <div className="text-sm font-medium">{t("sftp.reconnecting.title")}</div>
-              <div className="text-xs text-muted-foreground mt-1">
-                {t("sftp.reconnecting.desc")}
-              </div>
-            </div>
-          </div>
-        </div>
-      )}
-
-      {files.length === 0 && !loading && (
-        <div className="flex flex-col items-center justify-center h-full text-muted-foreground">
-          <Folder size={48} className="mb-3 opacity-50" />
-          <div className="text-sm font-medium">{t("sftp.emptyDirectory")}</div>
-          <div className="text-xs mt-1">{t("sftp.dragDropToUpload")}</div>
-        </div>
-      )}
-
-      <ContextMenu>
-        <ContextMenuTrigger asChild>
-          <div
-            className={shouldVirtualize ? "relative" : "divide-y divide-border/30"}
-            style={shouldVirtualize ? { height: totalHeight } : undefined}
-          >
-            {visibleRows.map(({ file, index: idx, top }) => {
-              const isNavigableDirectory =
-                file.type === "directory" ||
-                (file.type === "symlink" && file.linkTarget === "directory");
-              const isDownloadableFile =
-                file.type === "file" ||
-                (file.type === "symlink" && file.linkTarget === "file");
-              const isParentEntry = file.name === "..";
-
-              return (
-                <ContextMenu key={file.name}>
-                  <ContextMenuTrigger>
-                    <div
-                      data-sftp-modal-row="true"
-                      className={cn(
-                        "px-4 py-2.5 items-center hover:bg-muted/50 cursor-pointer transition-colors text-sm",
-                        selectedFiles.has(file.name) && !isParentEntry && "bg-primary/10",
-                        shouldVirtualize ? "absolute left-0 right-0 border-b border-border/30" : "",
-                      )}
-                      style={
-                        shouldVirtualize
-                          ? {
-                            top,
-                            display: "grid",
-                            gridTemplateColumns: `${columnWidths.name}% ${columnWidths.size}% ${columnWidths.modified}% ${columnWidths.actions}%`,
-                          }
-                          : {
-                            display: "grid",
-                            gridTemplateColumns: `${columnWidths.name}% ${columnWidths.size}% ${columnWidths.modified}% ${columnWidths.actions}%`,
-                          }
-                      }
-                      onClick={(e) => handleFileClick(file, idx, e)}
-                      onDoubleClick={() => handleFileDoubleClick(file)}
-                    >
-                      <div className="flex items-center gap-3 min-w-0">
-                        <div className="relative shrink-0 h-7 w-7 flex items-center justify-center">
-                          {getFileIcon(
-                            file.name,
-                            isNavigableDirectory,
-                            file.type === "symlink" && !isNavigableDirectory,
-                          )}
-                          {file.type === "symlink" && (
-                            <Link
-                              size={10}
-                              className="absolute -bottom-0.5 -right-0.5 text-muted-foreground"
-                              aria-hidden="true"
-                            />
-                          )}
-                        </div>
-                        <span
-                          className={cn(
-                            "truncate font-medium",
-                            file.type === "symlink" && "italic pr-1",
-                          )}
-                        >
-                          {file.name}
-                          {file.type === "symlink" && (
-                            <span className="sr-only"> (symbolic link)</span>
-                          )}
-                        </span>
-                      </div>
-                      <div className="text-xs text-muted-foreground">
-                        {isNavigableDirectory ? "--" : formatBytes(file.size)}
-                      </div>
-                      <div className="text-xs text-muted-foreground truncate">
-                        {formatDate(file.lastModified)}
-                      </div>
-                      <div className="flex items-center justify-end gap-1">
-                        {isDownloadableFile && (
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            className="h-7 w-7"
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              handleDownload(file);
-                            }}
-                            title={t("sftp.context.download")}
-                          >
-                            <Download size={14} />
-                          </Button>
-                        )}
-                        {!isParentEntry && (
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            className="h-7 w-7 hover:text-destructive"
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              handleDelete(file);
-                            }}
-                            title={t("sftp.context.delete")}
-                          >
-                            <Trash2 size={14} />
-                          </Button>
-                        )}
-                      </div>
-                    </div>
-                  </ContextMenuTrigger>
-                  <ContextMenuContent>
-                    {isParentEntry ? (
-                      <ContextMenuItem
-                        onClick={() => {
-                          const segments = currentPath.split("/").filter(Boolean);
-                          segments.pop();
-                          const parentPath =
-                            segments.length === 0 ? "/" : `/${segments.join("/")}`;
-                          handleNavigate(parentPath);
-                        }}
-                      >
-                        {t("sftp.context.open")}
-                      </ContextMenuItem>
-                    ) : (
-                      <>
-                        {isNavigableDirectory && (
-                          <ContextMenuItem
-                            onClick={() =>
-                              handleNavigate(
-                                currentPath === "/"
-                                  ? `/${file.name}`
-                                  : `${currentPath}/${file.name}`,
-                              )
-                            }
-                          >
-                            <FolderOpen size={14} className="mr-2" />
-                            {t("sftp.context.open")}
-                          </ContextMenuItem>
-                        )}
-                        {isDownloadableFile && (
-                          <>
-                            <ContextMenuItem onClick={() => handleOpenFile(file)}>
-                              <FolderOpen size={14} className="mr-2" />
-                              {t("sftp.context.open")}
-                            </ContextMenuItem>
-                            <ContextMenuItem onClick={() => openFileOpenerDialog(file)}>
-                              <MoreHorizontal size={14} className="mr-2" />
-                              {t("sftp.context.openWith")}
-                            </ContextMenuItem>
-                            {!isKnownBinaryFile(file.name) && (
-                              <ContextMenuItem onClick={() => handleEditFile(file)}>
-                                <Edit2 size={14} className="mr-2" />
-                                {t("sftp.context.edit")}
-                              </ContextMenuItem>
-                            )}
-                            <ContextMenuSeparator />
-                            <ContextMenuItem onClick={() => handleDownload(file)}>
-                              <Download size={14} className="mr-2" />
-                              {t("sftp.context.download")}
-                            </ContextMenuItem>
-                          </>
-                        )}
-                        <ContextMenuItem onClick={() => openRenameDialog(file)}>
-                          <Edit2 size={14} className="mr-2" />
-                          {t("sftp.context.rename")}
-                        </ContextMenuItem>
-                        {!isLocalSession && (
-                          <ContextMenuItem onClick={() => openPermissionsDialog(file)}>
-                            <Shield size={14} className="mr-2" />
-                            {t("sftp.context.permissions")}
-                          </ContextMenuItem>
-                        )}
-                        <ContextMenuItem
-                          className="text-destructive"
-                          onClick={() => handleDelete(file)}
-                        >
-                          <Trash2 size={14} className="mr-2" />
-                          {t("sftp.context.delete")}
-                        </ContextMenuItem>
-                      </>
-                    )}
-                  </ContextMenuContent>
-                </ContextMenu>
-              );
-            })}
-          </div>
-        </ContextMenuTrigger>
-        <ContextMenuContent>
-          <ContextMenuItem onClick={handleCreateFolder}>
-            <Plus className="h-4 w-4 mr-2" /> {t("sftp.newFolder")}
-          </ContextMenuItem>
-          <ContextMenuItem onClick={handleCreateFile}>
-            <Plus className="h-4 w-4 mr-2" /> {t("sftp.newFile")}
-          </ContextMenuItem>
-          <ContextMenuItem onClick={() => inputRef.current?.click()}>
-            <Upload className="h-4 w-4 mr-2" /> {t("sftp.uploadFiles")}
-          </ContextMenuItem>
-          <ContextMenuItem onClick={() => folderInputRef.current?.click()}>
-            <FolderUp className="h-4 w-4 mr-2" /> {t("sftp.uploadFolder")}
-          </ContextMenuItem>
-          <ContextMenuItem onClick={() => loadFiles(currentPath, { force: true })}>
-            <RefreshCw className="h-4 w-4 mr-2" /> {t("sftp.context.refresh")}
-          </ContextMenuItem>
-          {selectedFiles.size > 0 && (
-            <>
-              <ContextMenuItem onClick={handleDownloadSelected}>
-                <Download className="h-4 w-4 mr-2" />
-                {t("sftp.context.downloadSelected", { count: selectedFiles.size })}
-              </ContextMenuItem>
-              <ContextMenuItem
-                className="text-destructive"
-                onClick={handleDeleteSelected}
-              >
-                <Trash2 className="h-4 w-4 mr-2" />
-                {t("sftp.context.deleteSelected", { count: selectedFiles.size })}
-              </ContextMenuItem>
-            </>
-          )}
-        </ContextMenuContent>
-      </ContextMenu>
-    </div>
-  </>
-);
--- a/components/sftp-modal/SftpModalFooter.tsx
+++ b/components/sftp-modal/SftpModalFooter.tsx
@@ -1,61 +0,0 @@
-import React from "react";
-import { Download, Trash2 } from "lucide-react";
-import { Button } from "../ui/button";
-import type { RemoteFile } from "../../types";
-
-interface SftpModalFooterProps {
-  t: (key: string, params?: Record<string, unknown>) => string;
-  files: RemoteFile[];
-  selectedFiles: Set<string>;
-  loading: boolean;
-  uploading: boolean;
-  onDownloadSelected: () => void;
-  onDeleteSelected: () => void;
-}
-
-export const SftpModalFooter: React.FC<SftpModalFooterProps> = ({
-  t,
-  files,
-  selectedFiles,
-  loading,
-  uploading,
-  onDownloadSelected,
-  onDeleteSelected,
-}) => (
-  <div className="px-4 py-2 border-t border-border/60 flex items-center justify-between text-xs text-muted-foreground bg-muted/30 flex-shrink-0">
-    <span>
-      {t("sftp.itemsCount", { count: files.length })}
-      {selectedFiles.size > 0 && (
-        <>
-          <span className="mx-2">|</span>
-          <span className="text-primary">
-            {t("sftp.selectedCount", { count: selectedFiles.size })}
-          </span>
-          <Button
-            variant="ghost"
-            size="sm"
-            className="h-5 px-2 ml-2 text-xs text-primary hover:text-primary"
-            onClick={onDownloadSelected}
-          >
-            <Download size={10} className="mr-1" /> {t("sftp.context.download")}
-          </Button>
-          <Button
-            variant="ghost"
-            size="sm"
-            className="h-5 px-2 text-xs text-destructive hover:text-destructive"
-            onClick={onDeleteSelected}
-          >
-            <Trash2 size={10} className="mr-1" /> {t("sftp.context.delete")}
-          </Button>
-        </>
-      )}
-    </span>
-    <span>
-      {loading
-        ? t("sftp.status.loading")
-        : uploading
-          ? t("sftp.status.uploading")
-          : t("sftp.status.ready")}
-    </span>
-  </div>
-);
--- a/components/sftp-modal/SftpModalHeader.tsx
+++ b/components/sftp-modal/SftpModalHeader.tsx
@@ -1,355 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { ArrowUp, Check, ChevronRight, FilePlus, FolderPlus, FolderUp, Home, Languages, MoreHorizontal, RefreshCw, Upload } from "lucide-react";
-import { cn } from "../../lib/utils";
-import type { Host, SftpFilenameEncoding } from "../../types";
-import { DistroAvatar } from "../DistroAvatar";
-import { Button } from "../ui/button";
-import { DialogHeader, DialogTitle } from "../ui/dialog";
-import { Input } from "../ui/input";
-import { Popover, PopoverClose, PopoverContent, PopoverTrigger } from "../ui/popover";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip";
-
-interface BreadcrumbPart {
-  part: string;
-  originalIndex: number;
-}
-
-interface SftpModalHeaderProps {
-  t: (key: string, params?: Record<string, unknown>) => string;
-  host: Host;
-  credentials: { username?: string; hostname: string; port?: number };
-  showEncoding: boolean;
-  filenameEncoding: SftpFilenameEncoding;
-  onFilenameEncodingChange: (encoding: SftpFilenameEncoding) => void;
-  currentPath: string;
-  isEditingPath: boolean;
-  editingPathValue: string;
-  setEditingPathValue: (value: string) => void;
-  handlePathSubmit: () => void;
-  handlePathKeyDown: (e: React.KeyboardEvent) => void;
-  handlePathDoubleClick: () => void;
-  isAtRoot: boolean;
-  rootLabel: string;
-  isRefreshing: boolean;
-  onUp: () => void;
-  onHome: () => void;
-  onRefresh: () => void;
-  visibleBreadcrumbs: BreadcrumbPart[];
-  hiddenBreadcrumbs: BreadcrumbPart[];
-  needsBreadcrumbTruncation: boolean;
-  breadcrumbs: string[];
-  onBreadcrumbSelect: (index: number) => void;
-  onRootSelect: () => void;
-  inputRef: React.RefObject<HTMLInputElement>;
-  folderInputRef: React.RefObject<HTMLInputElement>;
-  pathInputRef: React.RefObject<HTMLInputElement>;
-  uploading: boolean;
-  onTriggerUpload: () => void;
-  onTriggerFolderUpload: () => void;
-  onCreateFolder: () => void;
-  onCreateFile: () => void;
-  onFileSelect: (e: React.ChangeEvent<HTMLInputElement>) => void;
-  onFolderSelect: (e: React.ChangeEvent<HTMLInputElement>) => void;
-}
-
-export const SftpModalHeader: React.FC<SftpModalHeaderProps> = ({
-  t,
-  host,
-  credentials,
-  showEncoding,
-  filenameEncoding,
-  onFilenameEncodingChange,
-  currentPath,
-  isEditingPath,
-  editingPathValue,
-  setEditingPathValue,
-  handlePathSubmit,
-  handlePathKeyDown,
-  handlePathDoubleClick,
-  isAtRoot,
-  rootLabel,
-  isRefreshing,
-  onUp,
-  onHome,
-  onRefresh,
-  visibleBreadcrumbs,
-  hiddenBreadcrumbs,
-  needsBreadcrumbTruncation,
-  breadcrumbs,
-  onBreadcrumbSelect,
-  onRootSelect,
-  inputRef,
-  folderInputRef,
-  pathInputRef,
-  uploading,
-  onTriggerUpload,
-  onTriggerFolderUpload,
-  onCreateFolder,
-  onCreateFile,
-  onFileSelect,
-  onFolderSelect,
-}) => {
-  // Delay tooltip activation to prevent flickering when modal opens
-  const [tooltipsReady, setTooltipsReady] = useState(false);
-  const [openTooltip, setOpenTooltip] = useState<string | null>(null);
-
-  useEffect(() => {
-    const timer = setTimeout(() => setTooltipsReady(true), 500);
-    return () => clearTimeout(timer);
-  }, []);
-
-  const handleTooltipOpenChange = (id: string) => (open: boolean) => {
-    if (!tooltipsReady) return;
-    setOpenTooltip(open ? id : null);
-  };
-
-  return (
-    <>
-      <DialogHeader className="px-4 py-3 border-b border-border/60 flex-shrink-0">
-        <div className="flex items-center gap-3 pr-8">
-          <DistroAvatar
-            host={host}
-            fallback={host.label.slice(0, 2).toUpperCase()}
-            className="h-8 w-8"
-          />
-          <div className="flex-1 min-w-0">
-            <DialogTitle className="text-sm font-semibold">
-              {host.label}
-            </DialogTitle>
-            <div className="text-xs text-muted-foreground font-mono">
-              {credentials.username || "root"}@{credentials.hostname}:
-              {credentials.port || 22}
-            </div>
-          </div>
-        </div>
-      </DialogHeader>
-
-      <TooltipProvider delayDuration={500} skipDelayDuration={800} disableHoverableContent>
-        <div className="px-4 py-2 border-b border-border/60 flex items-center gap-2 flex-shrink-0 bg-muted/30">
-          <Tooltip open={openTooltip === 'up'} onOpenChange={handleTooltipOpenChange('up')}>
-            <TooltipTrigger asChild>
-              <Button
-                variant="ghost"
-                size="icon"
-                className="h-7 w-7"
-                onClick={onUp}
-                disabled={isAtRoot}
-              >
-                <ArrowUp size={14} />
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent>{t("sftp.nav.up")}</TooltipContent>
-          </Tooltip>
-          <Tooltip open={openTooltip === 'home'} onOpenChange={handleTooltipOpenChange('home')}>
-            <TooltipTrigger asChild>
-              <Button
-                variant="ghost"
-                size="icon"
-                className="h-7 w-7"
-                onClick={onHome}
-              >
-                <Home size={14} />
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent>{t("sftp.nav.home")}</TooltipContent>
-          </Tooltip>
-          <Tooltip open={openTooltip === 'refresh'} onOpenChange={handleTooltipOpenChange('refresh')}>
-            <TooltipTrigger asChild>
-              <Button
-                variant="ghost"
-                size="icon"
-                className="h-7 w-7"
-                onClick={onRefresh}
-              >
-                <RefreshCw
-                  size={14}
-                  className={cn(isRefreshing && "animate-spin")}
-                />
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent>{t("sftp.nav.refresh")}</TooltipContent>
-          </Tooltip>
-          {showEncoding && (
-            <Popover>
-              <Tooltip open={openTooltip === 'encoding'} onOpenChange={handleTooltipOpenChange('encoding')}>
-                <TooltipTrigger asChild>
-                  <PopoverTrigger asChild>
-                    <Button
-                      variant="ghost"
-                      size="icon"
-                      className="h-7 w-7"
-                    >
-                      <Languages size={14} />
-                    </Button>
-                  </PopoverTrigger>
-                </TooltipTrigger>
-                <TooltipContent>{t("sftp.encoding.label")}</TooltipContent>
-              </Tooltip>
-              <PopoverContent className="w-36 p-1" align="start">
-                {(["auto", "utf-8", "gb18030"] as const).map((encoding) => (
-                  <PopoverClose asChild key={encoding}>
-                    <button
-                      className={cn(
-                        "w-full flex items-center gap-2 px-2 py-1.5 text-sm rounded-sm hover:bg-secondary transition-colors",
-                        filenameEncoding === encoding && "bg-secondary"
-                      )}
-                      onClick={() => onFilenameEncodingChange(encoding)}
-                    >
-                      <Check
-                        size={14}
-                        className={cn(
-                          "shrink-0",
-                          filenameEncoding === encoding ? "opacity-100" : "opacity-0"
-                        )}
-                      />
-                      {t(`sftp.encoding.${encoding === "utf-8" ? "utf8" : encoding}`)}
-                    </button>
-                  </PopoverClose>
-                ))}
-              </PopoverContent>
-            </Popover>
-          )}
-
-          <div className="flex items-center gap-1 text-sm flex-1 min-w-0 overflow-hidden">
-            {isEditingPath ? (
-              <Input
-                ref={pathInputRef}
-                value={editingPathValue}
-                onChange={(e) => setEditingPathValue(e.target.value)}
-                onBlur={handlePathSubmit}
-                onKeyDown={handlePathKeyDown}
-                className="h-7 text-sm bg-background"
-                autoFocus
-              />
-            ) : (
-              <div
-                className="flex items-center gap-1 flex-1 min-w-0 cursor-text hover:bg-secondary/50 rounded px-1 py-0.5 transition-colors"
-                onDoubleClick={handlePathDoubleClick}
-                title={currentPath}
-              >
-                <button
-                  className="text-muted-foreground hover:text-foreground px-1 shrink-0"
-                  onClick={onRootSelect}
-                >
-                  {rootLabel}
-                </button>
-                {visibleBreadcrumbs.map(({ part, originalIndex }, displayIdx) => {
-                  const isLast = originalIndex === breadcrumbs.length - 1;
-                  const showEllipsisBefore =
-                    needsBreadcrumbTruncation && displayIdx === 1;
-
-                  return (
-                    <React.Fragment key={originalIndex}>
-                      {showEllipsisBefore && (
-                        <>
-                          <ChevronRight
-                            size={12}
-                            className="text-muted-foreground flex-shrink-0"
-                          />
-                          <span
-                            className="text-muted-foreground px-1 shrink-0 flex items-center cursor-default"
-                            title={`${t("sftp.showHiddenPaths")}: ${hiddenBreadcrumbs
-                              .map((h) => h.part)
-                              .join(" > ")}`}
-                          >
-                            <MoreHorizontal size={14} />
-                          </span>
-                        </>
-                      )}
-                      <ChevronRight
-                        size={12}
-                        className="text-muted-foreground flex-shrink-0"
-                      />
-                      <button
-                        className={cn(
-                          "text-muted-foreground hover:text-foreground truncate px-1 max-w-[100px]",
-                          isLast && "text-foreground font-medium",
-                        )}
-                        onClick={() => onBreadcrumbSelect(originalIndex)}
-                        title={part}
-                      >
-                        {part}
-                      </button>
-                    </React.Fragment>
-                  );
-                })}
-              </div>
-            )}
-          </div>
-
-          <div className="flex items-center gap-1 ml-auto">
-            <Tooltip open={openTooltip === 'upload'} onOpenChange={handleTooltipOpenChange('upload')}>
-              <TooltipTrigger asChild>
-                <Button
-                  variant="outline"
-                  size="icon"
-                  className="h-7 w-7"
-                  onClick={onTriggerUpload}
-                  disabled={uploading}
-                >
-                  <Upload size={14} />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent>{t("sftp.upload")}</TooltipContent>
-            </Tooltip>
-            <Tooltip open={openTooltip === 'uploadFolder'} onOpenChange={handleTooltipOpenChange('uploadFolder')}>
-              <TooltipTrigger asChild>
-                <Button
-                  variant="outline"
-                  size="icon"
-                  className="h-7 w-7"
-                  onClick={onTriggerFolderUpload}
-                  disabled={uploading}
-                >
-                  <FolderUp size={14} />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent>{t("sftp.uploadFolder")}</TooltipContent>
-            </Tooltip>
-            <Tooltip open={openTooltip === 'newFolder'} onOpenChange={handleTooltipOpenChange('newFolder')}>
-              <TooltipTrigger asChild>
-                <Button
-                  variant="outline"
-                  size="icon"
-                  className="h-7 w-7"
-                  onClick={onCreateFolder}
-                >
-                  <FolderPlus size={14} />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent>{t("sftp.newFolder")}</TooltipContent>
-            </Tooltip>
-            <Tooltip open={openTooltip === 'newFile'} onOpenChange={handleTooltipOpenChange('newFile')}>
-              <TooltipTrigger asChild>
-                <Button
-                  variant="outline"
-                  size="icon"
-                  className="h-7 w-7"
-                  onClick={onCreateFile}
-                >
-                  <FilePlus size={14} />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent>{t("sftp.newFile")}</TooltipContent>
-            </Tooltip>
-            <input
-              type="file"
-              className="hidden"
-              ref={inputRef}
-              onChange={onFileSelect}
-              multiple
-            />
-            <input
-              type="file"
-              className="hidden"
-              ref={folderInputRef}
-              onChange={onFolderSelect}
-              webkitdirectory=""
-              multiple
-            />
-          </div>
-        </div>
-      </TooltipProvider>
-    </>
-  );
-};
--- a/components/sftp-modal/SftpModalUploadTasks.tsx
+++ b/components/sftp-modal/SftpModalUploadTasks.tsx
@@ -1,223 +0,0 @@
-import React from "react";
-import { Download, Loader2, Upload, X, XCircle } from "lucide-react";
-import { cn } from "../../lib/utils";
-import { Button } from "../ui/button";
-
-interface TransferTask {
-  id: string;
-  fileName: string;
-  totalBytes: number;
-  transferredBytes: number;
-  progress: number;
-  speed: number;
-  status: "pending" | "uploading" | "downloading" | "completed" | "failed" | "cancelled";
-  error?: string;
-  direction: "upload" | "download";
-}
-
-interface SftpModalUploadTasksProps {
-  tasks: TransferTask[];
-  t: (key: string, params?: Record<string, unknown>) => string;
-  onCancel?: () => void;
-  onCancelTask?: (taskId: string) => void;
-  onDismiss?: (taskId: string) => void;
-}
-
-export const SftpModalUploadTasks: React.FC<SftpModalUploadTasksProps> = ({ tasks, t, onCancel, onCancelTask, onDismiss }) => {
-  if (tasks.length === 0) return null;
-
-  // Helper function to get localized display name for compressed uploads
-  const getDisplayName = (task: TransferTask) => {
-    // Check for explicit phase marker format: "folderName|phase"
-    // This is the format sent by uploadService.ts for compressed uploads
-    if (task.fileName.includes('|')) {
-      const pipeIndex = task.fileName.lastIndexOf('|');
-      const baseName = task.fileName.substring(0, pipeIndex);
-      const phase = task.fileName.substring(pipeIndex + 1);
-
-      if (phase === 'compressing' || phase === 'extracting' || phase === 'uploading' || phase === 'compressed') {
-        const phaseLabel = t(`sftp.upload.phase.${phase}`);
-        return `${baseName} (${phaseLabel})`;
-      }
-    }
-
-    // Check for exact matches of phase status strings (legacy support)
-    if (task.fileName === t('sftp.upload.compressing') || task.fileName === 'Compressing...' || task.fileName === 'Compressing') {
-      return t('sftp.upload.compressing');
-    }
-    if (task.fileName === t('sftp.upload.extracting') || task.fileName === 'Extracting...' || task.fileName === 'Extracting') {
-      return t('sftp.upload.extracting');
-    }
-    if (task.fileName === t('sftp.upload.scanning') || task.fileName === 'Scanning files...' || task.fileName === 'Scanning files') {
-      return t('sftp.upload.scanning');
-    }
-
-    // Check if this is a compressed upload task (legacy format)
-    if (task.fileName.includes('(compressed)')) {
-      const baseName = task.fileName.replace(' (compressed)', '');
-      return `${baseName} (${t('sftp.upload.compressed')})`;
-    }
-
-    return task.fileName;
-  };
-
-  return (
-    <div className="border-t border-border/60 bg-secondary/50 flex-shrink-0">
-      <div className="max-h-40 overflow-y-auto overflow-x-hidden">
-        {tasks.map((task) => {
-          const formatSpeed = (bytesPerSec: number) => {
-            if (bytesPerSec <= 0) return "";
-            if (bytesPerSec >= 1024 * 1024)
-              return `${(bytesPerSec / (1024 * 1024)).toFixed(1)} MB/s`;
-            if (bytesPerSec >= 1024)
-              return `${(bytesPerSec / 1024).toFixed(1)} KB/s`;
-            return `${Math.round(bytesPerSec)} B/s`;
-          };
-
-          const formatBytes = (bytes: number) => {
-            if (bytes === 0) return "0 B";
-            if (bytes >= 1024 * 1024)
-              return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
-            if (bytes >= 1024) return `${(bytes / 1024).toFixed(1)} KB`;
-            return `${bytes} B`;
-          };
-
-          const remainingBytes = task.totalBytes - task.transferredBytes;
-          const remainingTime =
-            task.speed > 0 ? Math.ceil(remainingBytes / task.speed) : 0;
-          const remainingStr =
-            remainingTime > 60
-              ? `~${Math.ceil(remainingTime / 60)}m left`
-              : remainingTime > 0
-                ? `~${remainingTime}s left`
-                : "";
-
-          return (
-            <div
-              key={task.id}
-              className="px-4 py-2.5 flex items-center gap-3 border-b border-border/30 last:border-b-0"
-            >
-              <div className="shrink-0">
-                {(task.status === "uploading" || task.status === "downloading") && (
-                  <Loader2 size={14} className="animate-spin text-primary" />
-                )}
-                {task.status === "pending" && (
-                  task.direction === "download"
-                    ? <Download size={14} className="text-muted-foreground animate-pulse" />
-                    : <Upload size={14} className="text-muted-foreground animate-pulse" />
-                )}
-                {task.status === "completed" && (
-                  task.direction === "download"
-                    ? <Download size={14} className="text-green-500" />
-                    : <Upload size={14} className="text-green-500" />
-                )}
-                {task.status === "failed" && (
-                  <XCircle size={14} className="text-destructive" />
-                )}
-                {task.status === "cancelled" && (
-                  <XCircle size={14} className="text-muted-foreground" />
-                )}
-              </div>
-              <div className="flex-1 min-w-0">
-                <div className="flex items-center gap-2">
-                  <span className="text-xs font-medium truncate">
-                    {getDisplayName(task)}
-                  </span>
-                  {(task.status === "uploading" || task.status === "downloading") && task.speed > 0 && (
-                    <span className="text-[10px] text-primary font-mono shrink-0">
-                      {formatSpeed(task.speed)}
-                    </span>
-                  )}
-                  {(task.status === "uploading" || task.status === "downloading") && remainingStr && (
-                    <span className="text-[10px] text-muted-foreground shrink-0">
-                      {remainingStr}
-                    </span>
-                  )}
-                </div>
-                {(task.status === "uploading" || task.status === "downloading" || task.status === "pending") && (
-                  <div className="mt-1.5 flex items-center gap-2">
-                    <div className="flex-1 h-1.5 bg-secondary rounded-full overflow-hidden">
-                      <div
-                        className={cn(
-                          "h-full rounded-full transition-all duration-150",
-                          task.status === "pending"
-                            ? "bg-muted-foreground/50 animate-pulse w-full"
-                            : "bg-primary",
-                        )}
-                        style={{
-                          width:
-                            task.status === "uploading" || task.status === "downloading"
-                              ? `${task.progress}%`
-                              : undefined,
-                        }}
-                      />
-                    </div>
-                    <span className="text-[10px] text-muted-foreground font-mono shrink-0 w-8 text-right">
-                      {task.status === "uploading" || task.status === "downloading" ? `${Math.round(task.progress)}%` : "..."}
-                    </span>
-                  </div>
-                )}
-                {(task.status === "uploading" || task.status === "downloading") && task.totalBytes > 0 && (
-                  <div className="text-[10px] text-muted-foreground mt-0.5 font-mono">
-                    {formatBytes(task.transferredBytes)} / {formatBytes(task.totalBytes)}
-                  </div>
-                )}
-                {task.status === "completed" && (
-                  <div className="text-[10px] text-green-600 mt-0.5">
-                    {t(task.direction === "download" ? "sftp.download.completed" : "sftp.upload.completed")} - {formatBytes(task.totalBytes)}
-                  </div>
-                )}
-                {task.status === "cancelled" && (
-                  <div className="text-[10px] text-muted-foreground mt-0.5">
-                    {t(task.direction === "download" ? "sftp.download.cancelled" : "sftp.upload.cancelled")}
-                  </div>
-                )}
-                {task.status === "failed" && task.error && (
-                  <div className="text-[10px] text-destructive truncate mt-0.5">
-                    {task.error}
-                  </div>
-                )}
-              </div>
-              <div className="shrink-0 flex items-center gap-1">
-                {task.status === "pending" && (
-                  <span className="text-[10px] text-muted-foreground">
-                    {t("sftp.task.waiting")}
-                  </span>
-                )}
-                {(task.status === "uploading" || task.status === "downloading" || task.status === "pending") && (onCancelTask || onCancel) && (
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    className="h-6 w-6 text-destructive hover:text-destructive"
-                    onClick={() => {
-                      // For download tasks or when onCancelTask is available, use task-specific cancel
-                      if (onCancelTask) {
-                        onCancelTask(task.id);
-                      } else if (onCancel) {
-                        onCancel();
-                      }
-                    }}
-                    title={t("sftp.action.cancel")}
-                  >
-                    <X size={12} />
-                  </Button>
-                )}
-                {(task.status === "completed" || task.status === "failed" || task.status === "cancelled") && onDismiss && (
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    className="h-6 w-6 text-muted-foreground hover:text-foreground"
-                    onClick={() => onDismiss(task.id)}
-                    title={t("sftp.action.dismiss")}
-                  >
-                    <X size={12} />
-                  </Button>
-                )}
-              </div>
-            </div>
-          );
-        })}
-      </div>
-    </div>
-  );
-};
--- a/components/sftp-modal/fileIcons.tsx
+++ b/components/sftp-modal/fileIcons.tsx
@@ -1,149 +0,0 @@
-import {
-  Database,
-  ExternalLink,
-  File,
-  FileArchive,
-  FileAudio,
-  FileCode,
-  FileImage,
-  FileSpreadsheet,
-  FileText,
-  FileType,
-  FileVideo,
-  Folder,
-  Globe,
-  Lock,
-  Settings,
-  Terminal,
-} from "lucide-react";
-import React from "react";
-
-export const getFileIcon = (fileName: string, isDirectory: boolean, isSymlink?: boolean) => {
-  if (isDirectory)
-    return (
-      <Folder
-        size={18}
-        fill="currentColor"
-        fillOpacity={0.2}
-        className="text-blue-400"
-      />
-    );
-
-  if (isSymlink) {
-    return <ExternalLink size={18} className="text-cyan-500" />;
-  }
-
-  const ext = fileName.split(".").pop()?.toLowerCase() || "";
-
-  if (["doc", "docx", "rtf", "odt"].includes(ext))
-    return <FileText size={18} className="text-blue-500" />;
-  if (["xls", "xlsx", "csv", "ods"].includes(ext))
-    return <FileSpreadsheet size={18} className="text-green-500" />;
-  if (["ppt", "pptx", "odp"].includes(ext))
-    return <FileType size={18} className="text-orange-500" />;
-  if (["pdf"].includes(ext))
-    return <FileText size={18} className="text-red-500" />;
-
-  if (["js", "jsx", "ts", "tsx", "mjs", "cjs"].includes(ext))
-    return <FileCode size={18} className="text-yellow-500" />;
-  if (["py", "pyc", "pyw"].includes(ext))
-    return <FileCode size={18} className="text-blue-400" />;
-  if (["sh", "bash", "zsh", "fish", "bat", "cmd", "ps1"].includes(ext))
-    return <Terminal size={18} className="text-green-400" />;
-  if (["c", "cpp", "h", "hpp", "cc", "cxx"].includes(ext))
-    return <FileCode size={18} className="text-blue-600" />;
-  if (["java", "class", "jar"].includes(ext))
-    return <FileCode size={18} className="text-orange-600" />;
-  if (["go"].includes(ext))
-    return <FileCode size={18} className="text-cyan-500" />;
-  if (["rs"].includes(ext))
-    return <FileCode size={18} className="text-orange-400" />;
-  if (["rb"].includes(ext))
-    return <FileCode size={18} className="text-red-400" />;
-  if (["php"].includes(ext))
-    return <FileCode size={18} className="text-purple-500" />;
-  if (["html", "htm", "xhtml"].includes(ext))
-    return <Globe size={18} className="text-orange-500" />;
-  if (["css", "scss", "sass", "less"].includes(ext))
-    return <FileCode size={18} className="text-blue-500" />;
-  if (["vue", "svelte"].includes(ext))
-    return <FileCode size={18} className="text-green-500" />;
-
-  if (["json", "json5"].includes(ext))
-    return <FileCode size={18} className="text-yellow-600" />;
-  if (["xml", "xsl", "xslt"].includes(ext))
-    return <FileCode size={18} className="text-orange-400" />;
-  if (["yml", "yaml"].includes(ext))
-    return <Settings size={18} className="text-pink-400" />;
-  if (["toml", "ini", "conf", "cfg", "config"].includes(ext))
-    return <Settings size={18} className="text-gray-400" />;
-  if (["env"].includes(ext))
-    return <Lock size={18} className="text-yellow-500" />;
-  if (["sql", "sqlite", "db"].includes(ext))
-    return <Database size={18} className="text-blue-400" />;
-
-  if (
-    [
-      "jpg",
-      "jpeg",
-      "png",
-      "gif",
-      "bmp",
-      "webp",
-      "svg",
-      "ico",
-      "tiff",
-      "tif",
-      "heic",
-      "heif",
-      "avif",
-    ].includes(ext)
-  )
-    return <FileImage size={18} className="text-purple-400" />;
-
-  if (
-    [
-      "mp4",
-      "mkv",
-      "avi",
-      "mov",
-      "wmv",
-      "flv",
-      "webm",
-      "m4v",
-      "3gp",
-      "mpeg",
-      "mpg",
-    ].includes(ext)
-  )
-    return <FileVideo size={18} className="text-pink-500" />;
-
-  if (
-    ["mp3", "wav", "flac", "aac", "ogg", "m4a", "wma", "opus", "aiff"].includes(
-      ext,
-    )
-  )
-    return <FileAudio size={18} className="text-green-400" />;
-
-  if (
-    [
-      "zip",
-      "rar",
-      "7z",
-      "tar",
-      "gz",
-      "bz2",
-      "xz",
-      "tgz",
-      "tbz2",
-      "lz",
-      "lzma",
-      "cab",
-      "iso",
-      "dmg",
-    ].includes(ext)
-  )
-    return <FileArchive size={18} className="text-yellow-600" />;
-
-  return <File size={18} className="text-muted-foreground" />;
-};
--- a/components/sftp-modal/hooks/useSftpModalCreateDelete.ts
+++ b/components/sftp-modal/hooks/useSftpModalCreateDelete.ts
@@ -1,108 +0,0 @@
-import { useCallback } from "react";
-import type { RemoteFile } from "../../../types";
-import { toast } from "../../ui/toast";
-
-interface UseSftpModalCreateDeleteParams {
-  currentPath: string;
-  isLocalSession: boolean;
-  joinPath: (base: string, name: string) => string;
-  ensureSftp: () => Promise<string>;
-  loadFiles: (path: string, options?: { force?: boolean }) => Promise<void>;
-  deleteLocalFile: (path: string) => Promise<void>;
-  deleteSftp: (sftpId: string, path: string) => Promise<void>;
-  mkdirLocal: (path: string) => Promise<void>;
-  mkdirSftp: (sftpId: string, path: string) => Promise<void>;
-  writeLocalFile: (path: string, data: ArrayBuffer) => Promise<void>;
-  writeSftpBinary: (sftpId: string, path: string, data: ArrayBuffer) => Promise<void>;
-  writeSftp: (sftpId: string, path: string, data: string) => Promise<void>;
-  t: (key: string, params?: Record<string, unknown>) => string;
-}
-
-interface UseSftpModalCreateDeleteResult {
-  handleDelete: (file: RemoteFile) => Promise<void>;
-  handleCreateFolder: () => Promise<void>;
-  handleCreateFile: () => Promise<void>;
-}
-
-export const useSftpModalCreateDelete = ({
-  currentPath,
-  isLocalSession,
-  joinPath,
-  ensureSftp,
-  loadFiles,
-  deleteLocalFile,
-  deleteSftp,
-  mkdirLocal,
-  mkdirSftp,
-  writeLocalFile,
-  writeSftpBinary,
-  writeSftp,
-  t,
-}: UseSftpModalCreateDeleteParams): UseSftpModalCreateDeleteResult => {
-  const handleDelete = useCallback(
-    async (file: RemoteFile) => {
-      if (file.name === "..") return;
-      if (!confirm(t("sftp.deleteConfirm.single", { name: file.name }))) return;
-
-      try {
-        const fullPath = joinPath(currentPath, file.name);
-        if (isLocalSession) {
-          await deleteLocalFile(fullPath);
-        } else {
-          await deleteSftp(await ensureSftp(), fullPath);
-        }
-        await loadFiles(currentPath, { force: true });
-      } catch (e) {
-        toast.error(
-          e instanceof Error ? e.message : t("sftp.error.deleteFailed"),
-          "SFTP",
-        );
-      }
-    },
-    [currentPath, deleteLocalFile, deleteSftp, ensureSftp, isLocalSession, joinPath, loadFiles, t],
-  );
-
-  const handleCreateFolder = useCallback(async () => {
-    const folderName = prompt(t("sftp.prompt.newFolderName"));
-    if (!folderName) return;
-    try {
-      const fullPath = joinPath(currentPath, folderName);
-      if (isLocalSession) {
-        await mkdirLocal(fullPath);
-      } else {
-        await mkdirSftp(await ensureSftp(), fullPath);
-      }
-      await loadFiles(currentPath, { force: true });
-    } catch (e) {
-      toast.error(
-        e instanceof Error ? e.message : t("sftp.error.createFolderFailed"),
-        "SFTP",
-      );
-    }
-  }, [currentPath, ensureSftp, isLocalSession, joinPath, loadFiles, mkdirLocal, mkdirSftp, t]);
-
-  const handleCreateFile = useCallback(async () => {
-    const fileName = prompt(t("sftp.fileName.placeholder"));
-    if (!fileName) return;
-    try {
-      const fullPath = joinPath(currentPath, fileName);
-      if (isLocalSession) {
-        await writeLocalFile(fullPath, new ArrayBuffer(0));
-      } else {
-        try {
-          await writeSftpBinary(await ensureSftp(), fullPath, new ArrayBuffer(0));
-        } catch {
-          await writeSftp(await ensureSftp(), fullPath, "");
-        }
-      }
-      await loadFiles(currentPath, { force: true });
-    } catch (e) {
-      toast.error(
-        e instanceof Error ? e.message : t("sftp.error.createFileFailed"),
-        "SFTP",
-      );
-    }
-  }, [currentPath, ensureSftp, isLocalSession, joinPath, loadFiles, t, writeLocalFile, writeSftp, writeSftpBinary]);
-
-  return { handleDelete, handleCreateFolder, handleCreateFile };
-};
--- a/components/sftp-modal/hooks/useSftpModalFileActions.ts
+++ b/components/sftp-modal/hooks/useSftpModalFileActions.ts
@@ -1,252 +0,0 @@
-import type { RemoteFile } from "../../../types";
-import { useSftpModalCreateDelete } from "./useSftpModalCreateDelete";
-import { useSftpModalRename } from "./useSftpModalRename";
-import { useSftpModalPermissions } from "./useSftpModalPermissions";
-import { useSftpModalTextEditor } from "./useSftpModalTextEditor";
-import { useSftpModalFileOpener } from "./useSftpModalFileOpener";
-import type { FileOpenerType, SystemAppInfo } from "../../../lib/sftpFileUtils";
-
-interface UseSftpModalFileActionsParams {
-  currentPath: string;
-  isLocalSession: boolean;
-  joinPath: (base: string, name: string) => string;
-  ensureSftp: () => Promise<string>;
-  loadFiles: (path: string, options?: { force?: boolean }) => Promise<void>;
-  readLocalFile: (path: string) => Promise<ArrayBuffer>;
-  readSftp: (sftpId: string, path: string) => Promise<string>;
-  writeLocalFile: (path: string, data: ArrayBuffer) => Promise<void>;
-  writeSftp: (sftpId: string, path: string, data: string) => Promise<void>;
-  writeSftpBinary: (sftpId: string, path: string, data: ArrayBuffer) => Promise<void>;
-  deleteLocalFile: (path: string) => Promise<void>;
-  deleteSftp: (sftpId: string, path: string) => Promise<void>;
-  mkdirLocal: (path: string) => Promise<void>;
-  mkdirSftp: (sftpId: string, path: string) => Promise<void>;
-  renameSftp: (sftpId: string, oldPath: string, newPath: string) => Promise<void>;
-  chmodSftp: (sftpId: string, path: string, permissions: string) => Promise<void>;
-  statSftp: (sftpId: string, path: string) => Promise<{ permissions?: string }>;
-  t: (key: string, params?: Record<string, unknown>) => string;
-  sftpAutoSync: boolean;
-  getOpenerForFile: (name: string) => { openerType: FileOpenerType; systemApp?: SystemAppInfo } | null;
-  setOpenerForExtension: (ext: string, openerType: FileOpenerType, systemApp?: SystemAppInfo) => void;
-  downloadSftpToTempAndOpen: (sftpId: string, path: string, fileName: string, appPath: string, opts: { enableWatch: boolean }) => Promise<void>;
-  selectApplication: () => Promise<{ path: string; name: string } | null>;
-}
-
-interface UseSftpModalFileActionsResult {
-  handleDelete: (file: RemoteFile) => Promise<void>;
-  handleCreateFolder: () => Promise<void>;
-  handleCreateFile: () => Promise<void>;
-  showRenameDialog: boolean;
-  setShowRenameDialog: (open: boolean) => void;
-  renameTarget: RemoteFile | null;
-  renameName: string;
-  setRenameName: (value: string) => void;
-  isRenaming: boolean;
-  openRenameDialog: (file: RemoteFile) => void;
-  handleRename: () => Promise<void>;
-  showPermissionsDialog: boolean;
-  setShowPermissionsDialog: (open: boolean) => void;
-  permissionsTarget: RemoteFile | null;
-  permissions: {
-    owner: { read: boolean; write: boolean; execute: boolean };
-    group: { read: boolean; write: boolean; execute: boolean };
-    others: { read: boolean; write: boolean; execute: boolean };
-  };
-  isChangingPermissions: boolean;
-  openPermissionsDialog: (file: RemoteFile) => Promise<void>;
-  togglePermission: (role: "owner" | "group" | "others", perm: "read" | "write" | "execute") => void;
-  getOctalPermissions: () => string;
-  getSymbolicPermissions: () => string;
-  handleSavePermissions: () => Promise<void>;
-  showFileOpenerDialog: boolean;
-  setShowFileOpenerDialog: (open: boolean) => void;
-  fileOpenerTarget: RemoteFile | null;
-  setFileOpenerTarget: (target: RemoteFile | null) => void;
-  openFileOpenerDialog: (file: RemoteFile) => void;
-  handleFileOpenerSelect: (
-    openerType: FileOpenerType,
-    setAsDefault: boolean,
-    systemApp?: SystemAppInfo,
-  ) => Promise<void>;
-  handleSelectSystemApp: () => Promise<SystemAppInfo | null>;
-  showTextEditor: boolean;
-  setShowTextEditor: (open: boolean) => void;
-  textEditorTarget: RemoteFile | null;
-  setTextEditorTarget: (target: RemoteFile | null) => void;
-  textEditorContent: string;
-  setTextEditorContent: (value: string) => void;
-  loadingTextContent: boolean;
-  handleEditFile: (file: RemoteFile) => Promise<void>;
-  handleSaveTextFile: (content: string) => Promise<void>;
-  handleOpenFile: (file: RemoteFile) => Promise<void>;
-}
-
-export const useSftpModalFileActions = ({
-  currentPath,
-  isLocalSession,
-  joinPath,
-  ensureSftp,
-  loadFiles,
-  readLocalFile,
-  readSftp,
-  writeLocalFile,
-  writeSftp,
-  writeSftpBinary,
-  deleteLocalFile,
-  deleteSftp,
-  mkdirLocal,
-  mkdirSftp,
-  renameSftp,
-  chmodSftp,
-  statSftp,
-  t,
-  sftpAutoSync,
-  getOpenerForFile,
-  setOpenerForExtension,
-  downloadSftpToTempAndOpen,
-  selectApplication,
-}: UseSftpModalFileActionsParams): UseSftpModalFileActionsResult => {
-  const { handleDelete, handleCreateFolder, handleCreateFile } =
-    useSftpModalCreateDelete({
-      currentPath,
-      isLocalSession,
-      joinPath,
-      ensureSftp,
-      loadFiles,
-      deleteLocalFile,
-      deleteSftp,
-      mkdirLocal,
-      mkdirSftp,
-      writeLocalFile,
-      writeSftpBinary,
-      writeSftp,
-      t,
-    });
-
-  const {
-    showRenameDialog,
-    setShowRenameDialog,
-    renameTarget,
-    renameName,
-    setRenameName,
-    isRenaming,
-    openRenameDialog,
-    handleRename,
-  } = useSftpModalRename({
-    currentPath,
-    isLocalSession,
-    joinPath,
-    ensureSftp,
-    loadFiles,
-    renameSftp,
-    t,
-  });
-
-  const {
-    showPermissionsDialog,
-    setShowPermissionsDialog,
-    permissionsTarget,
-    permissions,
-    isChangingPermissions,
-    openPermissionsDialog,
-    togglePermission,
-    getOctalPermissions,
-    getSymbolicPermissions,
-    handleSavePermissions,
-  } = useSftpModalPermissions({
-    currentPath,
-    isLocalSession,
-    joinPath,
-    ensureSftp,
-    loadFiles,
-    chmodSftp,
-    statSftp,
-    t,
-  });
-
-  const {
-    showTextEditor,
-    setShowTextEditor,
-    textEditorTarget,
-    setTextEditorTarget,
-    textEditorContent,
-    setTextEditorContent,
-    loadingTextContent,
-    handleEditFile,
-    handleSaveTextFile,
-  } = useSftpModalTextEditor({
-    currentPath,
-    isLocalSession,
-    joinPath,
-    ensureSftp,
-    readLocalFile,
-    readSftp,
-    writeLocalFile,
-    writeSftp,
-    t,
-  });
-
-  const {
-    showFileOpenerDialog,
-    setShowFileOpenerDialog,
-    fileOpenerTarget,
-    setFileOpenerTarget,
-    openFileOpenerDialog,
-    handleOpenFile,
-    handleFileOpenerSelect,
-    handleSelectSystemApp,
-  } = useSftpModalFileOpener({
-    currentPath,
-    isLocalSession,
-    joinPath,
-    ensureSftp,
-    sftpAutoSync,
-    getOpenerForFile,
-    setOpenerForExtension,
-    downloadSftpToTempAndOpen,
-    selectApplication,
-    t,
-    handleEditFile,
-  });
-
-  return {
-    handleDelete,
-    handleCreateFolder,
-    handleCreateFile,
-    showRenameDialog,
-    setShowRenameDialog,
-    renameTarget,
-    renameName,
-    setRenameName,
-    isRenaming,
-    openRenameDialog,
-    handleRename,
-    showPermissionsDialog,
-    setShowPermissionsDialog,
-    permissionsTarget,
-    permissions,
-    isChangingPermissions,
-    openPermissionsDialog,
-    togglePermission,
-    getOctalPermissions,
-    getSymbolicPermissions,
-    handleSavePermissions,
-    showFileOpenerDialog,
-    setShowFileOpenerDialog,
-    fileOpenerTarget,
-    setFileOpenerTarget,
-    openFileOpenerDialog,
-    handleFileOpenerSelect,
-    handleSelectSystemApp,
-    showTextEditor,
-    setShowTextEditor,
-    textEditorTarget,
-    setTextEditorTarget,
-    textEditorContent,
-    setTextEditorContent,
-    loadingTextContent,
-    handleEditFile,
-    handleSaveTextFile,
-    handleOpenFile,
-  };
-};
--- a/components/sftp-modal/hooks/useSftpModalFileOpener.ts
+++ b/components/sftp-modal/hooks/useSftpModalFileOpener.ts
@@ -1,154 +0,0 @@
-import { useCallback, useState } from "react";
-import type { RemoteFile } from "../../../types";
-import { toast } from "../../ui/toast";
-import { getFileExtension, FileOpenerType, SystemAppInfo } from "../../../lib/sftpFileUtils";
-
-interface UseSftpModalFileOpenerParams {
-  currentPath: string;
-  isLocalSession: boolean;
-  joinPath: (base: string, name: string) => string;
-  ensureSftp: () => Promise<string>;
-  sftpAutoSync: boolean;
-  getOpenerForFile: (name: string) => { openerType: FileOpenerType; systemApp?: SystemAppInfo } | null;
-  setOpenerForExtension: (ext: string, openerType: FileOpenerType, systemApp?: SystemAppInfo) => void;
-  downloadSftpToTempAndOpen: (sftpId: string, path: string, fileName: string, appPath: string, opts: { enableWatch: boolean }) => Promise<void>;
-  selectApplication: () => Promise<{ path: string; name: string } | null>;
-  t: (key: string, params?: Record<string, unknown>) => string;
-  handleEditFile: (file: RemoteFile) => Promise<void>;
-}
-
-interface UseSftpModalFileOpenerResult {
-  showFileOpenerDialog: boolean;
-  setShowFileOpenerDialog: (open: boolean) => void;
-  fileOpenerTarget: RemoteFile | null;
-  setFileOpenerTarget: (target: RemoteFile | null) => void;
-  openFileOpenerDialog: (file: RemoteFile) => void;
-  handleOpenFile: (file: RemoteFile) => Promise<void>;
-  handleFileOpenerSelect: (
-    openerType: FileOpenerType,
-    setAsDefault: boolean,
-    systemApp?: SystemAppInfo,
-  ) => Promise<void>;
-  handleSelectSystemApp: () => Promise<SystemAppInfo | null>;
-}
-
-export const useSftpModalFileOpener = ({
-  currentPath,
-  isLocalSession,
-  joinPath,
-  ensureSftp,
-  sftpAutoSync,
-  getOpenerForFile,
-  setOpenerForExtension,
-  downloadSftpToTempAndOpen,
-  selectApplication,
-  t,
-  handleEditFile,
-}: UseSftpModalFileOpenerParams): UseSftpModalFileOpenerResult => {
-  const [showFileOpenerDialog, setShowFileOpenerDialog] = useState(false);
-  const [fileOpenerTarget, setFileOpenerTarget] = useState<RemoteFile | null>(null);
-
-  const openFileOpenerDialog = useCallback((file: RemoteFile) => {
-    setFileOpenerTarget(file);
-    setShowFileOpenerDialog(true);
-  }, []);
-
-  const handleOpenFile = useCallback(async (file: RemoteFile) => {
-    const savedOpener = getOpenerForFile(file.name);
-
-    if (savedOpener) {
-      if (savedOpener.openerType === "builtin-editor") {
-        await handleEditFile(file);
-      } else if (savedOpener.openerType === "system-app" && savedOpener.systemApp) {
-        try {
-          const fullPath = joinPath(currentPath, file.name);
-          if (isLocalSession) {
-            const bridge = (window as unknown as { netcatty?: NetcattyBridge }).netcatty;
-            if (bridge?.openWithApplication) {
-              await bridge.openWithApplication(fullPath, savedOpener.systemApp.path);
-            }
-          } else {
-            const sftpId = await ensureSftp();
-            await downloadSftpToTempAndOpen(
-              sftpId,
-              fullPath,
-              file.name,
-              savedOpener.systemApp.path,
-              { enableWatch: sftpAutoSync },
-            );
-          }
-        } catch (e) {
-          toast.error(
-            e instanceof Error ? e.message : t("sftp.error.openFailed"),
-            "SFTP",
-          );
-        }
-      }
-    } else {
-      openFileOpenerDialog(file);
-    }
-  }, [currentPath, downloadSftpToTempAndOpen, ensureSftp, getOpenerForFile, handleEditFile, isLocalSession, joinPath, openFileOpenerDialog, sftpAutoSync, t]);
-
-  const handleFileOpenerSelect = useCallback(
-    async (openerType: FileOpenerType, setAsDefault: boolean, systemApp?: SystemAppInfo) => {
-      if (!fileOpenerTarget) return;
-
-      if (setAsDefault) {
-        const ext = getFileExtension(fileOpenerTarget.name);
-        setOpenerForExtension(ext, openerType, systemApp);
-      }
-
-      setShowFileOpenerDialog(false);
-
-      if (openerType === "builtin-editor") {
-        await handleEditFile(fileOpenerTarget);
-      } else if (openerType === "system-app" && systemApp) {
-        try {
-          const fullPath = joinPath(currentPath, fileOpenerTarget.name);
-          if (isLocalSession) {
-            const bridge = (window as unknown as { netcatty?: NetcattyBridge }).netcatty;
-            if (bridge?.openWithApplication) {
-              await bridge.openWithApplication(fullPath, systemApp.path);
-            }
-          } else {
-            const sftpId = await ensureSftp();
-            await downloadSftpToTempAndOpen(
-              sftpId,
-              fullPath,
-              fileOpenerTarget.name,
-              systemApp.path,
-              { enableWatch: sftpAutoSync },
-            );
-          }
-        } catch (e) {
-          toast.error(
-            e instanceof Error ? e.message : t("sftp.error.openFailed"),
-            "SFTP",
-          );
-        }
-      }
-
-      setFileOpenerTarget(null);
-    },
-    [currentPath, downloadSftpToTempAndOpen, ensureSftp, fileOpenerTarget, handleEditFile, isLocalSession, joinPath, sftpAutoSync, setOpenerForExtension, t],
-  );
-
-  const handleSelectSystemApp = useCallback(async (): Promise<SystemAppInfo | null> => {
-    const result = await selectApplication();
-    if (result) {
-      return { path: result.path, name: result.name };
-    }
-    return null;
-  }, [selectApplication]);
-
-  return {
-    showFileOpenerDialog,
-    setShowFileOpenerDialog,
-    fileOpenerTarget,
-    setFileOpenerTarget,
-    openFileOpenerDialog,
-    handleOpenFile,
-    handleFileOpenerSelect,
-    handleSelectSystemApp,
-  };
-};
--- a/components/sftp-modal/hooks/useSftpModalKeyboardShortcuts.ts
+++ b/components/sftp-modal/hooks/useSftpModalKeyboardShortcuts.ts
@@ -1,155 +0,0 @@
-/**
- * useSftpModalKeyboardShortcuts
- * 
- * Hook that handles keyboard shortcuts for SFTPModal operations.
- * Supports select all, rename, delete, refresh, and new folder.
- * Note: Copy/Cut/Paste are not supported in the modal as it's a single-pane view.
- */
-
-import { useCallback, useEffect } from "react";
-import { KeyBinding, matchesKeyBinding } from "../../../domain/models";
-import type { RemoteFile } from "../../../types";
-
-// SFTP Modal action names that we handle (subset of main SFTP actions)
-const SFTP_MODAL_ACTIONS = new Set([
-  "sftpSelectAll",
-  "sftpRename",
-  "sftpDelete",
-  "sftpRefresh",
-  "sftpNewFolder",
-]);
-
-interface UseSftpModalKeyboardShortcutsParams {
-  keyBindings: KeyBinding[];
-  hotkeyScheme: "disabled" | "mac" | "pc";
-  open: boolean;
-  files: RemoteFile[];
-  visibleFiles: RemoteFile[];
-  selectedFiles: Set<string>;
-  setSelectedFiles: (files: Set<string>) => void;
-  onRefresh: () => void;
-  onRename?: (file: RemoteFile) => void;
-  onDelete?: (fileNames: string[]) => void;
-  onNewFolder?: () => void;
-}
-
-/**
- * Check if a keyboard event matches any SFTP action
- */
-const matchSftpAction = (
-  e: KeyboardEvent,
-  keyBindings: KeyBinding[],
-  isMac: boolean
-): { action: string; binding: KeyBinding } | null => {
-  for (const binding of keyBindings) {
-    if (binding.category !== "sftp") continue;
-    const keyStr = isMac ? binding.mac : binding.pc;
-    if (matchesKeyBinding(e, keyStr, isMac)) {
-      return { action: binding.action, binding };
-    }
-  }
-  return null;
-};
-
-export const useSftpModalKeyboardShortcuts = ({
-  keyBindings,
-  hotkeyScheme,
-  open,
-  files,
-  visibleFiles,
-  selectedFiles,
-  setSelectedFiles,
-  onRefresh,
-  onRename,
-  onDelete,
-  onNewFolder,
-}: UseSftpModalKeyboardShortcutsParams) => {
-  const handleKeyDown = useCallback(
-    (e: KeyboardEvent) => {
-      // Skip if shortcuts are disabled or modal is not open
-      if (hotkeyScheme === "disabled" || !open) return;
-
-      // Skip if focus is on an input element
-      const target = e.target as HTMLElement;
-      if (
-        target.tagName === "INPUT" ||
-        target.tagName === "TEXTAREA" ||
-        target.isContentEditable
-      ) {
-        return;
-      }
-
-      const isMac = hotkeyScheme === "mac";
-      const matched = matchSftpAction(e, keyBindings, isMac);
-      if (!matched) return;
-
-      const { action } = matched;
-      if (!SFTP_MODAL_ACTIONS.has(action)) return;
-
-      // Prevent default behavior
-      e.preventDefault();
-      e.stopPropagation();
-
-      switch (action) {
-        case "sftpSelectAll": {
-          // Select all files
-          const allFileNames = new Set(
-            visibleFiles.filter((f) => f.name !== "..").map((f) => f.name)
-          );
-          setSelectedFiles(allFileNames);
-          break;
-        }
-
-        case "sftpRename": {
-          // Trigger rename for the first selected file
-          const selectedArray = Array.from(selectedFiles);
-          if (selectedArray.length !== 1) return;
-          const file = files.find((f) => f.name === selectedArray[0]);
-          if (file && onRename) {
-            onRename(file);
-          }
-          break;
-        }
-
-        case "sftpDelete": {
-          // Delete selected files
-          const selectedArray = Array.from(selectedFiles);
-          if (selectedArray.length === 0) return;
-          onDelete?.(selectedArray);
-          break;
-        }
-
-        case "sftpRefresh": {
-          // Refresh file list
-          onRefresh();
-          break;
-        }
-
-        case "sftpNewFolder": {
-          // Create new folder
-          onNewFolder?.();
-          break;
-        }
-      }
-    },
-    [
-      hotkeyScheme,
-      open,
-      files,
-      visibleFiles,
-      selectedFiles,
-      setSelectedFiles,
-      onRefresh,
-      onRename,
-      onDelete,
-      onNewFolder,
-      keyBindings,
-    ]
-  );
-
-  useEffect(() => {
-    // Use capture phase to intercept before other handlers
-    window.addEventListener("keydown", handleKeyDown, true);
-    return () => window.removeEventListener("keydown", handleKeyDown, true);
-  }, [handleKeyDown]);
-};
--- a/components/sftp-modal/hooks/useSftpModalPath.ts
+++ b/components/sftp-modal/hooks/useSftpModalPath.ts
@@ -1,135 +0,0 @@
-import React, { useCallback, useMemo, useRef, useState } from "react";
-import { breadcrumbPathAt, getBreadcrumbs, getRootPath, getWindowsDrive, isWindowsPath } from "../pathUtils";
-
-interface UseSftpModalPathParams {
-  currentPath: string;
-  isLocalSession: boolean;
-  localHomePath: string | null;
-  onNavigate: (path: string) => void;
-  maxVisibleBreadcrumbParts?: number;
-}
-
-interface UseSftpModalPathResult {
-  isEditingPath: boolean;
-  editingPathValue: string;
-  setEditingPathValue: (value: string) => void;
-  pathInputRef: React.RefObject<HTMLInputElement>;
-  handlePathDoubleClick: () => void;
-  handlePathSubmit: () => void;
-  handlePathKeyDown: (e: React.KeyboardEvent) => void;
-  breadcrumbs: string[];
-  visibleBreadcrumbs: { part: string; originalIndex: number }[];
-  hiddenBreadcrumbs: { part: string; originalIndex: number }[];
-  needsBreadcrumbTruncation: boolean;
-  breadcrumbPathAtForIndex: (index: number) => string;
-  rootLabel: string;
-  rootPath: string;
-}
-
-export const useSftpModalPath = ({
-  currentPath,
-  isLocalSession,
-  localHomePath,
-  onNavigate,
-  maxVisibleBreadcrumbParts = 4,
-}: UseSftpModalPathParams): UseSftpModalPathResult => {
-  const [isEditingPath, setIsEditingPath] = useState(false);
-  const [editingPathValue, setEditingPathValue] = useState("");
-  const pathInputRef = useRef<HTMLInputElement>(null);
-
-  const handlePathDoubleClick = () => {
-    setEditingPathValue(currentPath);
-    setIsEditingPath(true);
-    setTimeout(() => pathInputRef.current?.select(), 0);
-  };
-
-  const handlePathSubmit = () => {
-    const fallbackPath = localHomePath || getRootPath(currentPath, isLocalSession);
-    const newPath = editingPathValue.trim() || fallbackPath;
-    setIsEditingPath(false);
-    if (newPath !== currentPath) {
-      if (isLocalSession) {
-        onNavigate(newPath);
-      } else {
-        onNavigate(newPath.startsWith("/") ? newPath : `/${newPath}`);
-      }
-    }
-  };
-
-  const handlePathKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === "Enter") {
-      handlePathSubmit();
-    } else if (e.key === "Escape") {
-      setIsEditingPath(false);
-    }
-  };
-
-  const breadcrumbs = useMemo(
-    () => getBreadcrumbs(currentPath, isLocalSession),
-    [currentPath, isLocalSession],
-  );
-
-  const { visibleBreadcrumbs, hiddenBreadcrumbs, needsBreadcrumbTruncation } =
-    useMemo(() => {
-      if (breadcrumbs.length <= maxVisibleBreadcrumbParts) {
-        return {
-          visibleBreadcrumbs: breadcrumbs.map((part, idx) => ({ part, originalIndex: idx })),
-          hiddenBreadcrumbs: [] as { part: string; originalIndex: number }[],
-          needsBreadcrumbTruncation: false,
-        };
-      }
-
-      const firstPart = [{ part: breadcrumbs[0], originalIndex: 0 }];
-      const lastPartsCount = maxVisibleBreadcrumbParts - 1;
-      const lastParts = breadcrumbs.slice(-lastPartsCount).map((part, idx) => ({
-        part,
-        originalIndex: breadcrumbs.length - lastPartsCount + idx,
-      }));
-      const hidden = breadcrumbs.slice(1, -lastPartsCount).map((part, idx) => ({
-        part,
-        originalIndex: idx + 1,
-      }));
-
-      return {
-        visibleBreadcrumbs: [...firstPart, ...lastParts],
-        hiddenBreadcrumbs: hidden,
-        needsBreadcrumbTruncation: true,
-      };
-    }, [breadcrumbs, maxVisibleBreadcrumbParts]);
-
-  const breadcrumbPathAtForIndex = useCallback(
-    (index: number) =>
-      breadcrumbPathAt(breadcrumbs, index, currentPath, isLocalSession),
-    [breadcrumbs, currentPath, isLocalSession],
-  );
-
-  const rootLabel = useMemo(
-    () =>
-      isLocalSession && isWindowsPath(currentPath)
-        ? getWindowsDrive(currentPath) ?? "C:"
-        : "/",
-    [currentPath, isLocalSession],
-  );
-
-  const rootPath = useMemo(
-    () => getRootPath(currentPath, isLocalSession),
-    [currentPath, isLocalSession],
-  );
-
-  return {
-    isEditingPath,
-    editingPathValue,
-    setEditingPathValue,
-    pathInputRef,
-    handlePathDoubleClick,
-    handlePathSubmit,
-    handlePathKeyDown,
-    breadcrumbs,
-    visibleBreadcrumbs,
-    hiddenBreadcrumbs,
-    needsBreadcrumbTruncation,
-    breadcrumbPathAtForIndex,
-    rootLabel,
-    rootPath,
-  };
-};
--- a/components/sftp-modal/hooks/useSftpModalPermissions.ts
+++ b/components/sftp-modal/hooks/useSftpModalPermissions.ts
@@ -1,189 +0,0 @@
-import { useCallback, useState } from "react";
-import type { RemoteFile } from "../../../types";
-import { toast } from "../../ui/toast";
-
-interface UseSftpModalPermissionsParams {
-  currentPath: string;
-  isLocalSession: boolean;
-  joinPath: (base: string, name: string) => string;
-  ensureSftp: () => Promise<string>;
-  loadFiles: (path: string, options?: { force?: boolean }) => Promise<void>;
-  chmodSftp: (sftpId: string, path: string, permissions: string) => Promise<void>;
-  statSftp: (sftpId: string, path: string) => Promise<{ permissions?: string }>;
-  t: (key: string, params?: Record<string, unknown>) => string;
-}
-
-interface PermissionsState {
-  owner: { read: boolean; write: boolean; execute: boolean };
-  group: { read: boolean; write: boolean; execute: boolean };
-  others: { read: boolean; write: boolean; execute: boolean };
-}
-
-interface UseSftpModalPermissionsResult {
-  showPermissionsDialog: boolean;
-  setShowPermissionsDialog: (open: boolean) => void;
-  permissionsTarget: RemoteFile | null;
-  permissions: PermissionsState;
-  isChangingPermissions: boolean;
-  openPermissionsDialog: (file: RemoteFile) => Promise<void>;
-  togglePermission: (role: "owner" | "group" | "others", perm: "read" | "write" | "execute") => void;
-  getOctalPermissions: () => string;
-  getSymbolicPermissions: () => string;
-  handleSavePermissions: () => Promise<void>;
-}
-
-export const useSftpModalPermissions = ({
-  currentPath,
-  isLocalSession,
-  joinPath,
-  ensureSftp,
-  loadFiles,
-  chmodSftp,
-  statSftp,
-  t,
-}: UseSftpModalPermissionsParams): UseSftpModalPermissionsResult => {
-  const [showPermissionsDialog, setShowPermissionsDialog] = useState(false);
-  const [permissionsTarget, setPermissionsTarget] = useState<RemoteFile | null>(null);
-  const [permissions, setPermissions] = useState<PermissionsState>({
-    owner: { read: false, write: false, execute: false },
-    group: { read: false, write: false, execute: false },
-    others: { read: false, write: false, execute: false },
-  });
-  const [isChangingPermissions, setIsChangingPermissions] = useState(false);
-
-  const parsePermissions = useCallback((perms: string | undefined) => {
-    const defaultPerms = {
-      owner: { read: false, write: false, execute: false },
-      group: { read: false, write: false, execute: false },
-      others: { read: false, write: false, execute: false },
-    };
-    if (!perms) return defaultPerms;
-
-    if (/^[0-7]{3,4}$/.test(perms)) {
-      const octal = perms.length === 4 ? perms.slice(1) : perms;
-      const ownerBits = parseInt(octal[0], 10);
-      const groupBits = parseInt(octal[1], 10);
-      const othersBits = parseInt(octal[2], 10);
-      return {
-        owner: {
-          read: (ownerBits & 4) !== 0,
-          write: (ownerBits & 2) !== 0,
-          execute: (ownerBits & 1) !== 0,
-        },
-        group: {
-          read: (groupBits & 4) !== 0,
-          write: (groupBits & 2) !== 0,
-          execute: (groupBits & 1) !== 0,
-        },
-        others: {
-          read: (othersBits & 4) !== 0,
-          write: (othersBits & 2) !== 0,
-          execute: (othersBits & 1) !== 0,
-        },
-      };
-    }
-
-    const pStr = perms.length === 10 ? perms.slice(1) : perms;
-    if (pStr.length >= 9) {
-      return {
-        owner: {
-          read: pStr[0] === "r",
-          write: pStr[1] === "w",
-          execute: pStr[2] === "x" || pStr[2] === "s",
-        },
-        group: {
-          read: pStr[3] === "r",
-          write: pStr[4] === "w",
-          execute: pStr[5] === "x" || pStr[5] === "s",
-        },
-        others: {
-          read: pStr[6] === "r",
-          write: pStr[7] === "w",
-          execute: pStr[8] === "x" || pStr[8] === "t",
-        },
-      };
-    }
-    return defaultPerms;
-  }, []);
-
-  const openPermissionsDialog = useCallback(async (file: RemoteFile) => {
-    if (isLocalSession) {
-      toast.error("Permissions not available for local files", "SFTP");
-      return;
-    }
-    setPermissionsTarget(file);
-
-    let permsStr = file.permissions;
-    try {
-      const fullPath = joinPath(currentPath, file.name);
-      const stat = await statSftp(await ensureSftp(), fullPath);
-      if (stat.permissions) {
-        permsStr = stat.permissions;
-      }
-    } catch (e) {
-      console.warn("Failed to fetch file permissions:", e);
-    }
-
-    setPermissions(parsePermissions(permsStr));
-    setShowPermissionsDialog(true);
-  }, [currentPath, ensureSftp, isLocalSession, joinPath, parsePermissions, statSftp]);
-
-  const togglePermission = useCallback(
-    (role: "owner" | "group" | "others", perm: "read" | "write" | "execute") => {
-      setPermissions((prev) => ({
-        ...prev,
-        [role]: { ...prev[role], [perm]: !prev[role][perm] },
-      }));
-    },
-    [],
-  );
-
-  const getOctalPermissions = useCallback(() => {
-    const getNum = (p: { read: boolean; write: boolean; execute: boolean }) =>
-      (p.read ? 4 : 0) + (p.write ? 2 : 0) + (p.execute ? 1 : 0);
-    return `${getNum(permissions.owner)}${getNum(permissions.group)}${getNum(permissions.others)}`;
-  }, [permissions]);
-
-  const getSymbolicPermissions = useCallback(() => {
-    const getSym = (p: { read: boolean; write: boolean; execute: boolean }) =>
-      `${p.read ? "r" : "-"}${p.write ? "w" : "-"}${p.execute ? "x" : "-"}`;
-    return (
-      getSym(permissions.owner) +
-      getSym(permissions.group) +
-      getSym(permissions.others)
-    );
-  }, [permissions]);
-
-  const handleSavePermissions = useCallback(async () => {
-    if (!permissionsTarget || isChangingPermissions) return;
-    setIsChangingPermissions(true);
-    try {
-      const fullPath = joinPath(currentPath, permissionsTarget.name);
-      await chmodSftp(await ensureSftp(), fullPath, getOctalPermissions());
-      setShowPermissionsDialog(false);
-      setPermissionsTarget(null);
-      await loadFiles(currentPath, { force: true });
-      toast.success(t("sftp.permissions.success"), "SFTP");
-    } catch (e) {
-      toast.error(
-        e instanceof Error ? e.message : t("sftp.permissions.failed"),
-        "SFTP",
-      );
-    } finally {
-      setIsChangingPermissions(false);
-    }
-  }, [chmodSftp, currentPath, ensureSftp, getOctalPermissions, isChangingPermissions, joinPath, loadFiles, permissionsTarget, t]);
-
-  return {
-    showPermissionsDialog,
-    setShowPermissionsDialog,
-    permissionsTarget,
-    permissions,
-    isChangingPermissions,
-    openPermissionsDialog,
-    togglePermission,
-    getOctalPermissions,
-    getSymbolicPermissions,
-    handleSavePermissions,
-  };
-};
--- a/components/sftp-modal/hooks/useSftpModalRename.ts
+++ b/components/sftp-modal/hooks/useSftpModalRename.ts
@@ -1,85 +0,0 @@
-import { useCallback, useState } from "react";
-import type { RemoteFile } from "../../../types";
-import { toast } from "../../ui/toast";
-
-interface UseSftpModalRenameParams {
-  currentPath: string;
-  isLocalSession: boolean;
-  joinPath: (base: string, name: string) => string;
-  ensureSftp: () => Promise<string>;
-  loadFiles: (path: string, options?: { force?: boolean }) => Promise<void>;
-  renameSftp: (sftpId: string, oldPath: string, newPath: string) => Promise<void>;
-  t: (key: string, params?: Record<string, unknown>) => string;
-}
-
-interface UseSftpModalRenameResult {
-  showRenameDialog: boolean;
-  setShowRenameDialog: (open: boolean) => void;
-  renameTarget: RemoteFile | null;
-  renameName: string;
-  setRenameName: (value: string) => void;
-  isRenaming: boolean;
-  openRenameDialog: (file: RemoteFile) => void;
-  handleRename: () => Promise<void>;
-}
-
-export const useSftpModalRename = ({
-  currentPath,
-  isLocalSession,
-  joinPath,
-  ensureSftp,
-  loadFiles,
-  renameSftp,
-  t,
-}: UseSftpModalRenameParams): UseSftpModalRenameResult => {
-  const [showRenameDialog, setShowRenameDialog] = useState(false);
-  const [renameTarget, setRenameTarget] = useState<RemoteFile | null>(null);
-  const [renameName, setRenameName] = useState("");
-  const [isRenaming, setIsRenaming] = useState(false);
-
-  const openRenameDialog = useCallback((file: RemoteFile) => {
-    setRenameTarget(file);
-    setRenameName(file.name);
-    setShowRenameDialog(true);
-  }, []);
-
-  const handleRename = useCallback(async () => {
-    if (!renameTarget || !renameName.trim() || isRenaming) return;
-    if (renameName.trim() === renameTarget.name) {
-      setShowRenameDialog(false);
-      return;
-    }
-    setIsRenaming(true);
-    try {
-      const oldPath = joinPath(currentPath, renameTarget.name);
-      const newPath = joinPath(currentPath, renameName.trim());
-      if (isLocalSession) {
-        toast.error("Local rename not implemented", "SFTP");
-      } else {
-        await renameSftp(await ensureSftp(), oldPath, newPath);
-      }
-      setShowRenameDialog(false);
-      setRenameTarget(null);
-      setRenameName("");
-      await loadFiles(currentPath, { force: true });
-    } catch (e) {
-      toast.error(
-        e instanceof Error ? e.message : t("sftp.error.renameFailed"),
-        "SFTP",
-      );
-    } finally {
-      setIsRenaming(false);
-    }
-  }, [currentPath, ensureSftp, isLocalSession, joinPath, loadFiles, renameName, renameSftp, renameTarget, t, isRenaming]);
-
-  return {
-    showRenameDialog,
-    setShowRenameDialog,
-    renameTarget,
-    renameName,
-    setRenameName,
-    isRenaming,
-    openRenameDialog,
-    handleRename,
-  };
-};
--- a/components/sftp-modal/hooks/useSftpModalSelection.ts
+++ b/components/sftp-modal/hooks/useSftpModalSelection.ts
@@ -1,99 +0,0 @@
-import React, { useCallback, useRef } from "react";
-import type { RemoteFile } from "../../../types";
-
-interface UseSftpModalSelectionParams {
-  files: RemoteFile[];
-  setSelectedFiles: (value: Set<string> | ((prev: Set<string>) => Set<string>)) => void;
-  currentPath: string;
-  joinPath: (base: string, name: string) => string;
-  onNavigate: (path: string) => void;
-  onOpenFile: (file: RemoteFile) => void;
-  onNavigateUp: () => void;
-}
-
-interface UseSftpModalSelectionResult {
-  handleFileClick: (file: RemoteFile, index: number, e: React.MouseEvent) => void;
-  handleFileDoubleClick: (file: RemoteFile) => void;
-}
-
-export const useSftpModalSelection = ({
-  files,
-  setSelectedFiles,
-  currentPath,
-  joinPath,
-  onNavigate,
-  onOpenFile,
-  onNavigateUp,
-}: UseSftpModalSelectionParams): UseSftpModalSelectionResult => {
-  const lastSelectedIndexRef = useRef<number | null>(null);
-
-  const handleFileClick = useCallback(
-    (file: RemoteFile, index: number, e: React.MouseEvent) => {
-      if (file.name === "..") return;
-
-      if (file.type === "directory") {
-        if (e.shiftKey && lastSelectedIndexRef.current !== null) {
-          const start = Math.min(lastSelectedIndexRef.current, index);
-          const end = Math.max(lastSelectedIndexRef.current, index);
-          const newSelection = new Set<string>();
-          for (let i = start; i <= end; i++) {
-            if (files[i] && files[i].type !== "directory") {
-              newSelection.add(files[i].name);
-            }
-          }
-          setSelectedFiles(newSelection);
-        } else if (e.ctrlKey || e.metaKey) {
-          setSelectedFiles((prev) => {
-            const next = new Set(prev);
-            return next;
-          });
-        }
-        return;
-      }
-
-      if (e.shiftKey && lastSelectedIndexRef.current !== null) {
-        const start = Math.min(lastSelectedIndexRef.current, index);
-        const end = Math.max(lastSelectedIndexRef.current, index);
-        const newSelection = new Set<string>();
-        for (let i = start; i <= end; i++) {
-          if (files[i] && files[i].type !== "directory") {
-            newSelection.add(files[i].name);
-          }
-        }
-        setSelectedFiles(newSelection);
-      } else if (e.ctrlKey || e.metaKey) {
-        setSelectedFiles((prev) => {
-          const next = new Set(prev);
-          if (next.has(file.name)) {
-            next.delete(file.name);
-          } else {
-            next.add(file.name);
-          }
-          return next;
-        });
-        lastSelectedIndexRef.current = index;
-      } else {
-        setSelectedFiles(new Set([file.name]));
-        lastSelectedIndexRef.current = index;
-      }
-    },
-    [files, setSelectedFiles],
-  );
-
-  const handleFileDoubleClick = useCallback(
-    (file: RemoteFile) => {
-      if (file.name === "..") {
-        onNavigateUp();
-        return;
-      }
-      if (file.type === "directory" || (file.type === "symlink" && file.linkTarget === "directory")) {
-        onNavigate(joinPath(currentPath, file.name));
-      } else {
-        onOpenFile(file);
-      }
-    },
-    [currentPath, joinPath, onNavigate, onNavigateUp, onOpenFile],
-  );
-
-  return { handleFileClick, handleFileDoubleClick };
-};
--- a/components/sftp-modal/hooks/useSftpModalSession.ts
+++ b/components/sftp-modal/hooks/useSftpModalSession.ts
@@ -1,392 +0,0 @@
-import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
-import type { Host, RemoteFile } from "../../../types";
-import { logger } from "../../../lib/logger";
-import { toast } from "../../ui/toast";
-
-interface UseSftpModalSessionParams {
-  open: boolean;
-  host: Host;
-  credentials: {
-    username?: string;
-    hostname: string;
-    port?: number;
-    password?: string;
-    privateKey?: string;
-    certificate?: string;
-    passphrase?: string;
-    publicKey?: string;
-    keyId?: string;
-    keySource?: "generated" | "imported";
-    proxy?: NetcattyProxyConfig;
-    jumpHosts?: NetcattyJumpHost[];
-    sftpSudo?: boolean;
-  };
-  initialPath?: string;
-  isLocalSession: boolean;
-  t: (key: string, params?: Record<string, unknown>) => string;
-  openSftp: (params: {
-    sessionId: string;
-    hostname: string;
-    username: string;
-    port: number;
-    password?: string;
-    privateKey?: string;
-    certificate?: string;
-    passphrase?: string;
-    publicKey?: string;
-    keyId?: string;
-    keySource?: "generated" | "imported";
-    proxy?: NetcattyProxyConfig;
-    jumpHosts?: NetcattyJumpHost[];
-    sudo?: boolean;
-  }) => Promise<string>;
-  closeSftp: (sftpId: string) => Promise<void>;
-  listSftp: (sftpId: string, path: string) => Promise<RemoteFile[]>;
-  listLocalDir: (path: string) => Promise<RemoteFile[]>;
-  getHomeDir: () => Promise<string | null>;
-  onClearSelection: () => void;
-}
-
-interface UseSftpModalSessionResult {
-  currentPath: string;
-  setCurrentPath: (path: string) => void;
-  files: RemoteFile[];
-  setFiles: (files: RemoteFile[]) => void;
-  loading: boolean;
-  setLoading: (loading: boolean) => void;
-  reconnecting: boolean;
-  ensureSftp: () => Promise<string>;
-  loadFiles: (path: string, options?: { force?: boolean }) => Promise<void>;
-  closeSftpSession: () => Promise<void>;
-  localHomeRef: React.MutableRefObject<string | null>;
-}
-
-export const useSftpModalSession = ({
-  open,
-  host,
-  credentials,
-  initialPath,
-  isLocalSession,
-  t,
-  openSftp,
-  closeSftp,
-  listSftp,
-  listLocalDir,
-  getHomeDir,
-  onClearSelection,
-}: UseSftpModalSessionParams): UseSftpModalSessionResult => {
-  const [currentPath, setCurrentPath] = useState("/");
-  const [files, setFiles] = useState<RemoteFile[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [reconnecting, setReconnecting] = useState(false);
-  const sftpIdRef = useRef<string | null>(null);
-  const initializedRef = useRef(false);
-  const lastInitialPathRef = useRef<string | undefined>(undefined);
-  const localHomeRef = useRef<string | null>(null);
-
-  const reconnectingRef = useRef(false);
-  const reconnectAttemptsRef = useRef(0);
-  const MAX_RECONNECT_ATTEMPTS = 3;
-
-  const DIR_CACHE_TTL_MS = 10_000;
-  const dirCacheRef = useRef<
-    Map<string, { files: RemoteFile[]; timestamp: number }>
-  >(new Map());
-  const loadSeqRef = useRef(0);
-
-  const ensureSftp = useCallback(async () => {
-    if (isLocalSession) throw new Error("Local session does not use SFTP");
-    if (sftpIdRef.current) return sftpIdRef.current;
-    const sftpId = await openSftp({
-      sessionId: `sftp-modal-${host.id}`,
-      hostname: credentials.hostname,
-      username: credentials.username || "root",
-      port: credentials.port || 22,
-      password: credentials.password,
-      privateKey: credentials.privateKey,
-      certificate: credentials.certificate,
-      passphrase: credentials.passphrase,
-      publicKey: credentials.publicKey,
-      keyId: credentials.keyId,
-      keySource: credentials.keySource,
-      proxy: credentials.proxy,
-      jumpHosts: credentials.jumpHosts,
-      sudo: credentials.sftpSudo,
-    });
-    sftpIdRef.current = sftpId;
-    return sftpId;
-  }, [
-    isLocalSession,
-    host.id,
-    credentials.hostname,
-    credentials.username,
-    credentials.port,
-    credentials.password,
-    credentials.privateKey,
-    credentials.certificate,
-    credentials.passphrase,
-    credentials.publicKey,
-    credentials.keyId,
-    credentials.keySource,
-    credentials.proxy,
-    credentials.jumpHosts,
-    credentials.sftpSudo,
-    openSftp,
-  ]);
-
-  const closeSftpSession = useCallback(async () => {
-    if (!isLocalSession && sftpIdRef.current) {
-      try {
-        await closeSftp(sftpIdRef.current);
-      } catch {
-        // Silently ignore close errors - connection may already be closed
-      }
-    }
-    sftpIdRef.current = null;
-  }, [closeSftp, isLocalSession]);
-
-  const isSessionError = useCallback((err: unknown): boolean => {
-    if (!(err instanceof Error)) return false;
-    const msg = err.message.toLowerCase();
-    return (
-      msg.includes("session not found") ||
-      msg.includes("sftp session") ||
-      msg.includes("not found") ||
-      msg.includes("closed") ||
-      msg.includes("connection reset") ||
-      msg.includes("write after end") ||
-      msg.includes("no response") ||
-      msg.includes("client disconnected")
-    );
-  }, []);
-
-  const handleSessionError = useCallback(async () => {
-    if (reconnectingRef.current) return;
-    reconnectingRef.current = true;
-    setReconnecting(true);
-    reconnectAttemptsRef.current = 0;
-
-    while (reconnectAttemptsRef.current < MAX_RECONNECT_ATTEMPTS) {
-      try {
-        reconnectAttemptsRef.current += 1;
-        if (sftpIdRef.current) {
-          try {
-            await closeSftp(sftpIdRef.current);
-          } catch {
-            // ignore
-          }
-          sftpIdRef.current = null;
-        }
-        await ensureSftp();
-        reconnectingRef.current = false;
-        setReconnecting(false);
-        return;
-      } catch (err) {
-        logger.warn(
-          `[SFTP] Reconnect attempt ${reconnectAttemptsRef.current} failed`,
-          err,
-        );
-        if (reconnectAttemptsRef.current >= MAX_RECONNECT_ATTEMPTS) {
-          reconnectingRef.current = false;
-          setReconnecting(false);
-          toast.error(t("sftp.error.reconnectFailed"), "SFTP");
-          return;
-        }
-        await new Promise((resolve) => setTimeout(resolve, 1000));
-      }
-    }
-  }, [closeSftp, ensureSftp, t]);
-
-  const loadFiles = useCallback(
-    async (path: string, options?: { force?: boolean }) => {
-      const requestId = ++loadSeqRef.current;
-      setLoading(true);
-      onClearSelection();
-
-      try {
-        if (isLocalSession) {
-          const list = await listLocalDir(path);
-          if (requestId === loadSeqRef.current) {
-            setFiles(list);
-          }
-          return;
-        }
-
-        const cacheKey = `${host.id}::${path}`;
-        const cached = dirCacheRef.current.get(cacheKey);
-        const isFresh =
-          cached && Date.now() - cached.timestamp < DIR_CACHE_TTL_MS;
-        if (cached && isFresh && !options?.force) {
-          setFiles(cached.files);
-          return;
-        }
-
-        const sftpId = await ensureSftp();
-        const list = await listSftp(sftpId, path);
-        if (requestId !== loadSeqRef.current) return;
-        setFiles(list);
-        dirCacheRef.current.set(cacheKey, {
-          files: list,
-          timestamp: Date.now(),
-        });
-      } catch (e) {
-        if (!isLocalSession && isSessionError(e) && files.length > 0) {
-          logger.info("[SFTP] Session lost, attempting to reconnect...");
-          handleSessionError();
-          return;
-        }
-
-        logger.error("Failed to load files", e);
-        toast.error(
-          e instanceof Error ? e.message : t("sftp.error.loadFailed"),
-          "SFTP",
-        );
-        setFiles([]);
-      } finally {
-        if (loadSeqRef.current === requestId) {
-          setLoading(false);
-        }
-      }
-    },
-    [ensureSftp, host.id, isLocalSession, listLocalDir, listSftp, t, isSessionError, handleSessionError, files.length, onClearSelection],
-  );
-
-  useLayoutEffect(() => {
-    if (!open) return;
-    const cacheKey = `${host.id}::${currentPath}`;
-    const cached = dirCacheRef.current.get(cacheKey);
-    const isFresh = cached && Date.now() - cached.timestamp < DIR_CACHE_TTL_MS;
-    if (!isFresh) {
-      setFiles([]);
-      onClearSelection();
-    }
-  }, [currentPath, host.id, onClearSelection, open]);
-
-  useEffect(() => {
-    if (open) {
-      if (!initializedRef.current || lastInitialPathRef.current !== initialPath) {
-        initializedRef.current = true;
-        lastInitialPathRef.current = initialPath;
-        onClearSelection();
-        setLoading(true);
-
-        if (isLocalSession) {
-          (async () => {
-            const homePath = await getHomeDir();
-            localHomeRef.current = homePath ?? null;
-            const startPath = initialPath || homePath || "/";
-            try {
-              const list = await listLocalDir(startPath);
-              setCurrentPath(startPath);
-              setFiles(list);
-              dirCacheRef.current.set(`${host.id}::${startPath}`, {
-                files: list,
-                timestamp: Date.now(),
-              });
-            } catch (e) {
-              toast.error(
-                e instanceof Error ? e.message : t("sftp.error.loadFailed"),
-                "SFTP",
-              );
-            } finally {
-              setLoading(false);
-            }
-          })();
-          return;
-        }
-
-        (async () => {
-          const homePath = await getHomeDir();
-          localHomeRef.current = homePath ?? null;
-          if (initialPath) {
-            try {
-              const sftpId = await ensureSftp();
-              const list = await listSftp(sftpId, initialPath);
-              setCurrentPath(initialPath);
-              setFiles(list);
-              dirCacheRef.current.set(`${host.id}::${initialPath}`, {
-                files: list,
-                timestamp: Date.now(),
-              });
-              setLoading(false);
-              return;
-            } catch {
-              logger.warn(
-                `[SFTP] Initial path ${initialPath} not accessible, falling back to home`,
-              );
-            }
-          }
-
-          try {
-            const sftpId = await ensureSftp();
-            const list = await listSftp(sftpId, homePath || "/");
-            setCurrentPath(homePath || "/");
-            setFiles(list);
-            dirCacheRef.current.set(`${host.id}::${homePath || "/"}`, {
-              files: list,
-              timestamp: Date.now(),
-            });
-            setLoading(false);
-          } catch {
-            logger.warn(`[SFTP] Home ${homePath} not accessible, using /`);
-            try {
-              const sftpId = await ensureSftp();
-              const list = await listSftp(sftpId, "/");
-              setCurrentPath("/");
-              setFiles(list);
-              dirCacheRef.current.set(`${host.id}::/`, {
-                files: list,
-                timestamp: Date.now(),
-              });
-            } catch (e) {
-              logger.error("[SFTP] Failed to load root directory", e);
-              toast.error(t("sftp.error.loadFailed"), "SFTP");
-            } finally {
-              setLoading(false);
-            }
-          }
-        })();
-        return;
-      }
-      void loadFiles(currentPath);
-    } else {
-      loadSeqRef.current += 1;
-      void closeSftpSession();
-      initializedRef.current = false;
-    }
-  }, [
-    closeSftpSession,
-    currentPath,
-    ensureSftp,
-    getHomeDir,
-    host.id,
-    initialPath,
-    isLocalSession,
-    listLocalDir,
-    listSftp,
-    loadFiles,
-    onClearSelection,
-    open,
-    t,
-  ]);
-
-  useEffect(() => {
-    return () => {
-      void closeSftpSession();
-    };
-  }, [closeSftpSession]);
-
-  return {
-    currentPath,
-    setCurrentPath,
-    files,
-    setFiles,
-    loading,
-    setLoading,
-    reconnecting,
-    ensureSftp,
-    loadFiles,
-    closeSftpSession,
-    localHomeRef,
-  };
-};
--- a/components/sftp-modal/hooks/useSftpModalSorting.ts
+++ b/components/sftp-modal/hooks/useSftpModalSorting.ts
@@ -1,76 +0,0 @@
-import React, { useCallback, useRef, useState } from "react";
-
-export type SortField = "name" | "size" | "modified";
-export type SortOrder = "asc" | "desc";
-
-interface UseSftpModalSortingResult {
-  sortField: SortField;
-  sortOrder: SortOrder;
-  columnWidths: { name: number; size: number; modified: number; actions: number };
-  handleSort: (field: SortField) => void;
-  handleResizeStart: (field: string, e: React.MouseEvent) => void;
-}
-
-export const useSftpModalSorting = (): UseSftpModalSortingResult => {
-  const [sortField, setSortField] = useState<SortField>("name");
-  const [sortOrder, setSortOrder] = useState<SortOrder>("asc");
-  const [columnWidths, setColumnWidths] = useState({
-    name: 45,
-    size: 15,
-    modified: 25,
-    actions: 15,
-  });
-
-  const resizingRef = useRef<{
-    field: string;
-    startX: number;
-    startWidth: number;
-  } | null>(null);
-
-  const handleSort = (field: SortField) => {
-    if (sortField === field) {
-      setSortOrder((prev) => (prev === "asc" ? "desc" : "asc"));
-    } else {
-      setSortField(field);
-      setSortOrder("asc");
-    }
-  };
-
-  const handleResizeMove = useCallback((e: MouseEvent) => {
-    if (!resizingRef.current) return;
-    const diff = e.clientX - resizingRef.current.startX;
-    const newWidth = Math.max(
-      10,
-      Math.min(60, resizingRef.current.startWidth + diff / 5),
-    );
-    setColumnWidths((prev) => ({
-      ...prev,
-      [resizingRef.current!.field]: newWidth,
-    }));
-  }, []);
-
-  const handleResizeEnd = useCallback(() => {
-    resizingRef.current = null;
-    document.removeEventListener("mousemove", handleResizeMove);
-    document.removeEventListener("mouseup", handleResizeEnd);
-  }, [handleResizeMove]);
-
-  const handleResizeStart = (field: string, e: React.MouseEvent) => {
-    e.preventDefault();
-    resizingRef.current = {
-      field,
-      startX: e.clientX,
-      startWidth: columnWidths[field as keyof typeof columnWidths],
-    };
-    document.addEventListener("mousemove", handleResizeMove);
-    document.addEventListener("mouseup", handleResizeEnd);
-  };
-
-  return {
-    sortField,
-    sortOrder,
-    columnWidths,
-    handleSort,
-    handleResizeStart,
-  };
-};
--- a/components/sftp-modal/hooks/useSftpModalTextEditor.ts
+++ b/components/sftp-modal/hooks/useSftpModalTextEditor.ts
@@ -1,87 +0,0 @@
-import { useCallback, useState } from "react";
-import type { RemoteFile } from "../../../types";
-import { toast } from "../../ui/toast";
-
-interface UseSftpModalTextEditorParams {
-  currentPath: string;
-  isLocalSession: boolean;
-  joinPath: (base: string, name: string) => string;
-  ensureSftp: () => Promise<string>;
-  readLocalFile: (path: string) => Promise<ArrayBuffer>;
-  readSftp: (sftpId: string, path: string) => Promise<string>;
-  writeLocalFile: (path: string, data: ArrayBuffer) => Promise<void>;
-  writeSftp: (sftpId: string, path: string, data: string) => Promise<void>;
-  t: (key: string, params?: Record<string, unknown>) => string;
-}
-
-interface UseSftpModalTextEditorResult {
-  showTextEditor: boolean;
-  setShowTextEditor: (open: boolean) => void;
-  textEditorTarget: RemoteFile | null;
-  setTextEditorTarget: (target: RemoteFile | null) => void;
-  textEditorContent: string;
-  setTextEditorContent: (value: string) => void;
-  loadingTextContent: boolean;
-  handleEditFile: (file: RemoteFile) => Promise<void>;
-  handleSaveTextFile: (content: string) => Promise<void>;
-}
-
-export const useSftpModalTextEditor = ({
-  currentPath,
-  isLocalSession,
-  joinPath,
-  ensureSftp,
-  readLocalFile,
-  readSftp,
-  writeLocalFile,
-  writeSftp,
-  t,
-}: UseSftpModalTextEditorParams): UseSftpModalTextEditorResult => {
-  const [showTextEditor, setShowTextEditor] = useState(false);
-  const [textEditorTarget, setTextEditorTarget] = useState<RemoteFile | null>(null);
-  const [textEditorContent, setTextEditorContent] = useState("");
-  const [loadingTextContent, setLoadingTextContent] = useState(false);
-
-  const handleEditFile = useCallback(async (file: RemoteFile) => {
-    try {
-      setLoadingTextContent(true);
-      setTextEditorTarget(file);
-      const fullPath = joinPath(currentPath, file.name);
-      const content = isLocalSession
-        ? await readLocalFile(fullPath).then((buf) => new TextDecoder().decode(buf))
-        : await readSftp(await ensureSftp(), fullPath);
-      setTextEditorContent(content);
-      setShowTextEditor(true);
-    } catch (e) {
-      toast.error(
-        e instanceof Error ? e.message : t("sftp.error.loadFailed"),
-        "SFTP",
-      );
-    } finally {
-      setLoadingTextContent(false);
-    }
-  }, [currentPath, ensureSftp, isLocalSession, joinPath, readLocalFile, readSftp, t]);
-
-  const handleSaveTextFile = useCallback(async (content: string) => {
-    if (!textEditorTarget) return;
-    const fullPath = joinPath(currentPath, textEditorTarget.name);
-    if (isLocalSession) {
-      const encoder = new TextEncoder();
-      await writeLocalFile(fullPath, encoder.encode(content).buffer);
-    } else {
-      await writeSftp(await ensureSftp(), fullPath, content);
-    }
-  }, [currentPath, ensureSftp, isLocalSession, joinPath, textEditorTarget, writeLocalFile, writeSftp]);
-
-  return {
-    showTextEditor,
-    setShowTextEditor,
-    textEditorTarget,
-    setTextEditorTarget,
-    textEditorContent,
-    setTextEditorContent,
-    loadingTextContent,
-    handleEditFile,
-    handleSaveTextFile,
-  };
-};
--- a/components/sftp-modal/hooks/useSftpModalTransfers.ts
+++ b/components/sftp-modal/hooks/useSftpModalTransfers.ts
@@ -1,829 +0,0 @@
-import React, { useCallback, useState, useRef, useMemo } from "react";
-import type { RemoteFile } from "../../../types";
-import { toast } from "../../ui/toast";
-import {
-  UploadController,
-  uploadFromDataTransfer,
-  uploadFromFileList,
-  uploadEntriesDirect,
-  UploadBridge,
-  UploadCallbacks,
-  UploadTaskInfo,
-  UploadProgress,
-} from "../../../lib/uploadService";
-import { DropEntry } from "../../../lib/sftpFileUtils";
-
-interface TransferTask {
-  id: string;
-  fileName: string;
-  status: "pending" | "uploading" | "downloading" | "completed" | "failed" | "cancelled";
-  progress: number;
-  totalBytes: number;
-  transferredBytes: number;
-  speed: number;
-  startTime: number;
-  error?: string;
-  isDirectory?: boolean;
-  fileCount?: number;
-  completedCount?: number;
-  direction: "upload" | "download";
-}
-
-// Keep UploadTask as alias for backwards compatibility
-type UploadTask = TransferTask;
-
-interface UseSftpModalTransfersParams {
-  currentPath: string;
-  isLocalSession: boolean;
-  joinPath: (base: string, name: string) => string;
-  ensureSftp: () => Promise<string>;
-  loadFiles: (path: string, options?: { force?: boolean }) => Promise<void>;
-  readLocalFile: (path: string) => Promise<ArrayBuffer>;
-  readSftp: (sftpId: string, path: string) => Promise<string>;
-  writeLocalFile: (path: string, data: ArrayBuffer) => Promise<void>;
-  writeSftpBinaryWithProgress: (
-    sftpId: string,
-    path: string,
-    data: ArrayBuffer,
-    taskId: string,
-    onProgress: (transferred: number, total: number, speed: number) => void,
-    onComplete: () => void,
-    onError: (error: string) => void,
-  ) => Promise<{ success: boolean; transferId: string; cancelled?: boolean }>;
-  writeSftpBinary: (sftpId: string, path: string, data: ArrayBuffer) => Promise<void>;
-  writeSftp: (sftpId: string, path: string, data: string) => Promise<void>;
-  mkdirLocal: (path: string) => Promise<void>;
-  mkdirSftp: (sftpId: string, path: string) => Promise<void>;
-  cancelSftpUpload?: (taskId: string) => Promise<unknown>;
-  startStreamTransfer?: (
-    options: {
-      transferId: string;
-      sourcePath: string;
-      targetPath: string;
-      sourceType: 'local' | 'sftp';
-      targetType: 'local' | 'sftp';
-      sourceSftpId?: string;
-      targetSftpId?: string;
-      totalBytes?: number;
-    },
-    onProgress?: (transferred: number, total: number, speed: number) => void,
-    onComplete?: () => void,
-    onError?: (error: string) => void
-  ) => Promise<{ transferId: string; totalBytes?: number; error?: string }>;
-  cancelTransfer?: (transferId: string) => Promise<void>;
-  showSaveDialog?: (defaultPath: string, filters?: Array<{ name: string; extensions: string[] }>) => Promise<string | null>;
-  setLoading: (loading: boolean) => void;
-  t: (key: string, params?: Record<string, unknown>) => string;
-  useCompressedUpload?: boolean; // Enable compressed folder uploads
-}
-
-interface UseSftpModalTransfersResult {
-  uploading: boolean;
-  uploadTasks: UploadTask[];
-  dragActive: boolean;
-  handleDownload: (file: RemoteFile) => Promise<void>;
-  handleUploadMultiple: (fileList: FileList) => Promise<void>;
-  handleUploadFromDrop: (dataTransfer: DataTransfer) => Promise<void>;
-  handleUploadEntries: (entries: DropEntry[]) => Promise<void>;
-  handleFileSelect: (e: React.ChangeEvent<HTMLInputElement>) => void;
-  handleFolderSelect: (e: React.ChangeEvent<HTMLInputElement>) => void;
-  handleDrag: (e: React.DragEvent) => void;
-  handleDrop: (e: React.DragEvent) => void;
-  cancelUpload: () => Promise<void>;
-  cancelTask: (taskId: string) => Promise<void>;
-  dismissTask: (taskId: string) => void;
-}
-
-export const useSftpModalTransfers = ({
-  currentPath,
-  isLocalSession,
-  joinPath,
-  ensureSftp,
-  loadFiles,
-  readLocalFile,
-  writeLocalFile,
-  writeSftpBinaryWithProgress,
-  writeSftpBinary,
-  mkdirLocal,
-  mkdirSftp,
-  cancelSftpUpload,
-  startStreamTransfer,
-  cancelTransfer,
-  showSaveDialog,
-  setLoading,
-  t,
-  useCompressedUpload = false,
-}: UseSftpModalTransfersParams): UseSftpModalTransfersResult => {
-  const [uploading, setUploading] = useState(false);
-  const [uploadTasks, setUploadTasks] = useState<UploadTask[]>([]);
-  const [dragActive, setDragActive] = useState(false);
-
-  // Upload controller for cancellation support
-  const uploadControllerRef = useRef<UploadController | null>(null);
-
-  // Cached SFTP ID to avoid multiple calls to ensureSftp
-  const cachedSftpIdRef = useRef<string | null>(null);
-
-  // Track cancelled transfer IDs to detect cancellation in bridge wrapper
-  const cancelledTransferIdsRef = useRef<Set<string>>(new Set());
-
-  // Create upload bridge that adapts the modal's functions to the service interface
-  const createUploadBridge = useMemo((): UploadBridge => {
-    return {
-      writeLocalFile,
-      mkdirLocal,
-      mkdirSftp: async (sftpId: string, path: string) => {
-        await mkdirSftp(sftpId, path);
-      },
-      writeSftpBinary: async (sftpId: string, path: string, data: ArrayBuffer) => {
-        await writeSftpBinary(sftpId, path, data);
-      },
-      writeSftpBinaryWithProgress: async (
-        sftpId: string,
-        path: string,
-        data: ArrayBuffer,
-        taskId: string,
-        onProgress: (transferred: number, total: number, speed: number) => void,
-        onComplete?: () => void,
-        onError?: (error: string) => void
-      ) => {
-        try {
-          const result = await writeSftpBinaryWithProgress(
-            sftpId,
-            path,
-            data,
-            taskId,
-            onProgress,
-            onComplete || (() => { }),
-            onError || (() => { })
-          );
-          
-          // Check if this transfer was cancelled
-          const wasCancelled = cancelledTransferIdsRef.current.has(taskId);
-          if (wasCancelled) {
-            cancelledTransferIdsRef.current.delete(taskId);
-          }
-          return { success: result.success, transferId: result.transferId, cancelled: wasCancelled || result.cancelled };
-        } catch (error) {
-          // Check if this was a user-initiated cancellation
-          const wasCancelled = cancelledTransferIdsRef.current.has(taskId);
-          if (wasCancelled) {
-            cancelledTransferIdsRef.current.delete(taskId);
-            return { success: false, transferId: taskId, cancelled: true };
-          }
-          // Real error - propagate it by re-throwing
-          throw error;
-        }
-      },
-      cancelSftpUpload,
-      startStreamTransfer: startStreamTransfer ? async (
-        options,
-        onProgress,
-        onComplete,
-        onError
-      ) => {
-        try {
-          const result = await startStreamTransfer(options, onProgress, onComplete, onError);
-          const wasCancelled = cancelledTransferIdsRef.current.has(options.transferId);
-          if (wasCancelled) {
-            cancelledTransferIdsRef.current.delete(options.transferId);
-          }
-          // Handle case where result might be undefined (bridge not available)
-          if (!result) {
-            return { transferId: options.transferId, error: 'Stream transfer not available' };
-          }
-          return { ...result, cancelled: wasCancelled };
-        } catch (error) {
-          const wasCancelled = cancelledTransferIdsRef.current.has(options.transferId);
-          if (wasCancelled) {
-            cancelledTransferIdsRef.current.delete(options.transferId);
-            return { transferId: options.transferId, cancelled: true };
-          }
-          return { transferId: options.transferId, error: error instanceof Error ? error.message : String(error) };
-        }
-      } : undefined,
-      cancelTransfer,
-    };
-  }, [writeLocalFile, mkdirLocal, mkdirSftp, writeSftpBinary, writeSftpBinaryWithProgress, cancelSftpUpload, startStreamTransfer, cancelTransfer]);
-
-  // Create upload callbacks
-  const createUploadCallbacks = useCallback((): UploadCallbacks => {
-    return {
-      onScanningStart: (taskId: string) => {
-        const scanningTask: UploadTask = {
-          id: taskId,
-          fileName: t("sftp.upload.scanning"),
-          status: "pending",
-          progress: 0,
-          totalBytes: 0,
-          transferredBytes: 0,
-          speed: 0,
-          startTime: Date.now(),
-          isDirectory: true,
-          direction: "upload",
-        };
-        setUploadTasks(prev => [...prev, scanningTask]);
-      },
-      onScanningEnd: (taskId: string) => {
-        setUploadTasks(prev => prev.filter(t => t.id !== taskId));
-      },
-      onTaskCreated: (task: UploadTaskInfo) => {
-        const uploadTask: UploadTask = {
-          id: task.id,
-          fileName: task.displayName,
-          status: "pending",
-          progress: 0,
-          totalBytes: task.totalBytes,
-          transferredBytes: 0,
-          speed: 0,
-          startTime: Date.now(),
-          isDirectory: task.isDirectory,
-          direction: "upload",
-        };
-        setUploadTasks(prev => [...prev, uploadTask]);
-      },
-      onTaskProgress: (taskId: string, progress: UploadProgress) => {
-        setUploadTasks(prev =>
-          prev.map(task => {
-            if (task.id !== taskId) return task;
-
-            // Don't update progress if task is already completed, failed, or cancelled
-            if (task.status === "completed" || task.status === "failed" || task.status === "cancelled") {
-              return task;
-            }
-            
-            return {
-              ...task,
-              status: "uploading" as const,
-              progress: progress.percent,
-              transferredBytes: progress.transferred,
-              speed: progress.speed,
-            };
-          })
-        );
-      },
-      onTaskCompleted: (taskId: string, totalBytes: number) => {
-        setUploadTasks(prev =>
-          prev.map(task =>
-            task.id === taskId
-              ? {
-                ...task,
-                status: "completed" as const,
-                progress: 100,
-                transferredBytes: totalBytes,
-                speed: 0,
-              }
-              : task
-          )
-        );
-      },
-      onTaskFailed: (taskId: string, error: string) => {
-        setUploadTasks(prev =>
-          prev.map(task =>
-            task.id === taskId
-              ? {
-                ...task,
-                status: "failed" as const,
-                speed: 0,
-                error,
-              }
-              : task
-          )
-        );
-      },
-      onTaskCancelled: (taskId: string) => {
-        setUploadTasks(prev =>
-          prev.map(task =>
-            task.id === taskId
-              ? {
-                ...task,
-                status: "cancelled" as const,
-                speed: 0,
-              }
-              : task
-          )
-        );
-      },
-      onTaskNameUpdate: (taskId: string, newName: string) => {
-        // Parse the phase format: "folderName|phase"
-        let displayName = newName;
-        if (newName.includes('|')) {
-          const [folderName, phase] = newName.split('|');
-          const phaseLabel = phase === 'compressing' ? t('sftp.upload.phase.compressing')
-            : phase === 'extracting' ? t('sftp.upload.phase.extracting')
-            : phase === 'uploading' ? t('sftp.upload.phase.uploading')
-            : t('sftp.upload.phase.compressed');
-          displayName = `${folderName} (${phaseLabel})`;
-        }
-        setUploadTasks(prev =>
-          prev.map(task =>
-            task.id === taskId
-              ? {
-                ...task,
-                fileName: displayName,
-              }
-              : task
-          )
-        );
-      },
-    };
-  }, [t]);
-
-  // Helper function to perform upload with compression setting from user preference
-  const performUpload = useCallback(async (
-    files: FileList | File[],
-    useCompressed: boolean
-  ): Promise<void> => {
-    if (files.length === 0) return;
-
-    setUploading(true);
-
-    // Get SFTP ID for remote sessions
-    let sftpId: string | null = null;
-    if (!isLocalSession) {
-      sftpId = await ensureSftp();
-      cachedSftpIdRef.current = sftpId;
-    }
-
-    // Create controller for cancellation
-    const controller = new UploadController();
-    uploadControllerRef.current = controller;
-
-    const callbacks = createUploadCallbacks();
-
-    try {
-      await uploadFromFileList(
-        files,
-        {
-          targetPath: currentPath,
-          sftpId,
-          isLocal: isLocalSession,
-          bridge: createUploadBridge,
-          joinPath,
-          callbacks,
-          useCompressedUpload: useCompressed,
-        },
-        controller
-      );
-
-      await loadFiles(currentPath, { force: true });
-    } catch (error) {
-      toast.error(
-        error instanceof Error ? error.message : t("sftp.error.uploadFailed"),
-        "SFTP"
-      );
-    } finally {
-      // Upload process is complete - clear uploading state and controller
-      setUploading(false);
-      uploadControllerRef.current = null;
-      cachedSftpIdRef.current = null;
-    }
-  }, [currentPath, createUploadBridge, createUploadCallbacks, ensureSftp, isLocalSession, joinPath, loadFiles, t]);
-
-  const handleDownload = useCallback(
-    async (file: RemoteFile) => {
-      try {
-        const fullPath = joinPath(currentPath, file.name);
-
-        // For local files, use blob download (file is already on local filesystem)
-        if (isLocalSession) {
-          setLoading(true);
-          const content = await readLocalFile(fullPath);
-          const blob = new Blob([content], { type: "application/octet-stream" });
-          const url = URL.createObjectURL(blob);
-          const a = document.createElement("a");
-          a.href = url;
-          a.download = file.name;
-          document.body.appendChild(a);
-          a.click();
-          document.body.removeChild(a);
-          URL.revokeObjectURL(url);
-          return;
-        }
-
-        // For remote SFTP files, use streaming download with save dialog
-        if (!showSaveDialog || !startStreamTransfer) {
-          toast.error(t("sftp.error.downloadFailed"), "SFTP");
-          return;
-        }
-
-        // Show save dialog to get target path
-        const targetPath = await showSaveDialog(file.name);
-        if (!targetPath) {
-          // User cancelled the save dialog
-          return;
-        }
-
-        const sftpId = await ensureSftp();
-        const transferId = `download-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-        const fileSize = typeof file.size === 'number' ? file.size : parseInt(file.size, 10) || 0;
-
-        // Create download task for progress display
-        const downloadTask: TransferTask = {
-          id: transferId,
-          fileName: file.name,
-          status: "downloading",
-          progress: 0,
-          totalBytes: fileSize,
-          transferredBytes: 0,
-          speed: 0,
-          startTime: Date.now(),
-          direction: "download",
-        };
-        setUploadTasks(prev => [...prev, downloadTask]);
-
-        // Track if this download was cancelled or error was handled
-        let wasCancelled = false;
-        let errorHandled = false;
-
-        const result = await startStreamTransfer(
-          {
-            transferId,
-            sourcePath: fullPath,
-            targetPath,
-            sourceType: 'sftp',
-            targetType: 'local',
-            sourceSftpId: sftpId,
-            totalBytes: fileSize,
-          },
-          // onProgress
-          (transferred, total, speed) => {
-            setUploadTasks(prev =>
-              prev.map(task =>
-                task.id === transferId
-                  ? {
-                      ...task,
-                      transferredBytes: transferred,
-                      totalBytes: total,
-                      progress: total > 0 ? Math.round((transferred / total) * 100) : 0,
-                      speed,
-                    }
-                  : task
-              )
-            );
-          },
-          // onComplete
-          () => {
-            setUploadTasks(prev =>
-              prev.map(task =>
-                task.id === transferId
-                  ? { ...task, status: "completed" as const, progress: 100 }
-                  : task
-              )
-            );
-            toast.success(`${t("sftp.context.download")}: ${file.name}`, "SFTP");
-          },
-          // onError
-          (error) => {
-            errorHandled = true;
-            // Check if this is a cancellation error
-            if (error.includes('cancelled') || error.includes('canceled')) {
-              wasCancelled = true;
-              setUploadTasks(prev =>
-                prev.map(task =>
-                  task.id === transferId
-                    ? { ...task, status: "cancelled" as const, speed: 0 }
-                    : task
-                )
-              );
-            } else {
-              setUploadTasks(prev =>
-                prev.map(task =>
-                  task.id === transferId
-                    ? { ...task, status: "failed" as const, error }
-                    : task
-                )
-              );
-              toast.error(error, "SFTP");
-            }
-          }
-        );
-
-        // Check if bridge doesn't support streaming (returns undefined)
-        if (result === undefined) {
-          // Remove the pending task and show error
-          setUploadTasks(prev => prev.filter(task => task.id !== transferId));
-          toast.error(t("sftp.error.downloadFailed"), "SFTP");
-          return;
-        }
-
-        // Handle result - check for cancellation in result.error as well
-        // (backend may set error without calling onError callback)
-        if (result?.error) {
-          const isCancelError = result.error.includes('cancelled') || result.error.includes('canceled');
-          if (isCancelError) {
-            // Mark as cancelled if not already done by onError
-            if (!wasCancelled) {
-              setUploadTasks(prev =>
-                prev.map(task =>
-                  task.id === transferId
-                    ? { ...task, status: "cancelled" as const, speed: 0 }
-                    : task
-                )
-              );
-            }
-            // Don't show error for cancellation
-            return;
-          }
-          // For non-cancel errors, only show toast if onError didn't already handle it
-          if (!errorHandled) {
-            setUploadTasks(prev =>
-              prev.map(task =>
-                task.id === transferId
-                  ? { ...task, status: "failed" as const, error: result.error }
-                  : task
-              )
-            );
-            toast.error(result.error, "SFTP");
-          }
-        }
-      } catch (e) {
-        toast.error(
-          e instanceof Error ? e.message : t("sftp.error.downloadFailed"),
-          "SFTP",
-        );
-      } finally {
-        setLoading(false);
-      }
-    },
-    [currentPath, ensureSftp, isLocalSession, joinPath, readLocalFile, setLoading, showSaveDialog, startStreamTransfer, t],
-  );
-
-
-
-  const handleUploadMultiple = useCallback(
-    async (fileList: FileList) => {
-      if (fileList.length === 0) return;
-
-      // Use compressed upload if enabled in settings (auto-fallback is handled in uploadService)
-      await performUpload(fileList, useCompressedUpload);
-    },
-    [performUpload, useCompressedUpload],
-  );
-
-  const handleUploadFromDrop = useCallback(
-    async (dataTransfer: DataTransfer) => {
-      setUploading(true);
-
-      // Get SFTP ID for remote sessions
-      let sftpId: string | null = null;
-      if (!isLocalSession) {
-        sftpId = await ensureSftp();
-        cachedSftpIdRef.current = sftpId;
-      }
-
-      // Create controller for cancellation
-      const controller = new UploadController();
-      uploadControllerRef.current = controller;
-
-      const callbacks = createUploadCallbacks();
-
-      try {
-        await uploadFromDataTransfer(
-          dataTransfer,
-          {
-            targetPath: currentPath,
-            sftpId,
-            isLocal: isLocalSession,
-            bridge: createUploadBridge,
-            joinPath,
-            callbacks,
-            useCompressedUpload,
-          },
-          controller
-        );
-
-        await loadFiles(currentPath, { force: true });
-      } catch (error) {
-        toast.error(
-          error instanceof Error ? error.message : t("sftp.error.uploadFailed"),
-          "SFTP"
-        );
-      } finally {
-        // Upload process is complete - clear uploading state and controller
-        setUploading(false);
-        uploadControllerRef.current = null;
-        cachedSftpIdRef.current = null;
-      }
-    },
-    [currentPath, createUploadBridge, createUploadCallbacks, ensureSftp, isLocalSession, joinPath, loadFiles, t, useCompressedUpload],
-  );
-
-  // Handle upload from DropEntry array (used for drag-and-drop to terminal)
-  const handleUploadEntries = useCallback(
-    async (entries: DropEntry[]) => {
-      if (entries.length === 0) return;
-
-      setUploading(true);
-
-      // Get SFTP ID for remote sessions
-      let sftpId: string | null = null;
-      if (!isLocalSession) {
-        sftpId = await ensureSftp();
-        cachedSftpIdRef.current = sftpId;
-      }
-
-      // Create controller for cancellation
-      const controller = new UploadController();
-      uploadControllerRef.current = controller;
-
-      const callbacks = createUploadCallbacks();
-
-      try {
-        await uploadEntriesDirect(
-          entries,
-          {
-            targetPath: currentPath,
-            sftpId,
-            isLocal: isLocalSession,
-            bridge: createUploadBridge,
-            joinPath,
-            callbacks,
-            useCompressedUpload,
-          },
-          controller
-        );
-
-        await loadFiles(currentPath, { force: true });
-      } catch (error) {
-        toast.error(
-          error instanceof Error ? error.message : t("sftp.error.uploadFailed"),
-          "SFTP"
-        );
-      } finally {
-        // Upload process is complete - clear uploading state and controller
-        setUploading(false);
-        uploadControllerRef.current = null;
-        cachedSftpIdRef.current = null;
-      }
-    },
-    [currentPath, createUploadBridge, createUploadCallbacks, ensureSftp, isLocalSession, joinPath, loadFiles, t, useCompressedUpload],
-  );
-
-  // Handle upload from File array (used by file input after copying files)
-  const handleUploadFromFiles = useCallback(
-    async (files: File[]) => {
-      if (files.length === 0) return;
-
-      // Use compressed upload if enabled in settings (auto-fallback is handled in uploadService)
-      await performUpload(files, useCompressedUpload);
-    },
-    [performUpload, useCompressedUpload],
-  );
-
-  const handleFileSelect = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      if (e.target.files && e.target.files.length > 0) {
-        // Copy the files before clearing the input, because clearing the input
-        // will also clear the FileList reference
-        const files = Array.from(e.target.files);
-        // Clear input first to allow selecting the same files again
-        e.target.value = "";
-        // Now start the upload with the copied files
-        void handleUploadFromFiles(files);
-      } else {
-        e.target.value = "";
-      }
-    },
-    [handleUploadFromFiles],
-  );
-
-  const handleFolderSelect = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      if (e.target.files && e.target.files.length > 0) {
-        // Copy the files before clearing the input, because clearing the input
-        // will also clear the FileList reference
-        const files = Array.from(e.target.files);
-        // Clear input first to allow selecting the same folder again
-        e.target.value = "";
-        // Now start the upload with the copied files
-        void handleUploadFromFiles(files);
-      } else {
-        e.target.value = "";
-      }
-    },
-    [handleUploadFromFiles],
-  );
-
-  const handleDrag = useCallback((e: React.DragEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    if (e.type === "dragenter" || e.type === "dragover") {
-      setDragActive(true);
-    } else if (e.type === "dragleave") {
-      setDragActive(false);
-    }
-  }, []);
-
-  const handleDrop = useCallback(
-    (e: React.DragEvent) => {
-      e.preventDefault();
-      e.stopPropagation();
-      setDragActive(false);
-      if (e.dataTransfer.items && e.dataTransfer.items.length > 0) {
-        void handleUploadFromDrop(e.dataTransfer);
-      }
-    },
-    [handleUploadFromDrop],
-  );
-
-  const cancelUpload = useCallback(async () => {
-    const controller = uploadControllerRef.current;
-    if (controller) {
-      // Mark all active transfer IDs as cancelled before calling cancel
-      const activeIds = controller.getActiveTransferIds();
-      for (const id of activeIds) {
-        cancelledTransferIdsRef.current.add(id);
-      }
-      await controller.cancel();
-    }
-
-    // Always clear all uploading/pending tasks immediately, even without controller
-    setUploadTasks(prev => {
-      const hasActiveTasks = prev.some(t => t.status === "uploading" || t.status === "pending");
-      if (!hasActiveTasks) {
-        return prev;
-      }
-
-      return prev.map(task =>
-        task.status === "uploading" || task.status === "pending"
-          ? { ...task, status: "cancelled" as const, speed: 0 }
-          : task
-      );
-    });
-
-    // Also reset uploading state
-    setUploading(false);
-  }, []);
-
-  // Cancel a specific task (works for both uploads and downloads)
-  const cancelTask = useCallback(async (taskId: string) => {
-    // Find the task to determine its type
-    const task = uploadTasks.find(t => t.id === taskId);
-    if (!task) return;
-
-    if (task.direction === "download") {
-      // For download tasks, cancel only this specific transfer
-      if (cancelTransfer) {
-        try {
-          await cancelTransfer(taskId);
-        } catch {
-          // Ignore cancellation errors
-        }
-      }
-      // Mark task as cancelled
-      setUploadTasks(prev =>
-        prev.map(t =>
-          t.id === taskId
-            ? { ...t, status: "cancelled" as const, speed: 0 }
-            : t
-        )
-      );
-    } else {
-      // For upload tasks, cancel the entire upload batch
-      // because controller.cancel() cancels all active uploads
-      const controller = uploadControllerRef.current;
-      if (controller) {
-        // Mark all active transfer IDs as cancelled before calling cancel
-        const activeIds = controller.getActiveTransferIds();
-        for (const id of activeIds) {
-          cancelledTransferIdsRef.current.add(id);
-        }
-        await controller.cancel();
-      }
-
-      // Mark ALL uploading/pending tasks as cancelled (not just the clicked one)
-      setUploadTasks(prev =>
-        prev.map(t =>
-          t.status === "uploading" || t.status === "pending"
-            ? { ...t, status: "cancelled" as const, speed: 0 }
-            : t
-        )
-      );
-
-      // Reset uploading state
-      setUploading(false);
-    }
-  }, [uploadTasks, cancelTransfer]);
-
-  const dismissTask = useCallback((taskId: string) => {
-    setUploadTasks(prev => prev.filter(t => t.id !== taskId));
-  }, []);
-
-  return {
-    uploading,
-    uploadTasks,
-    dragActive,
-    handleDownload,
-    handleUploadMultiple,
-    handleUploadFromDrop,
-    handleUploadEntries,
-    handleFileSelect,
-    handleFolderSelect,
-    handleDrag,
-    handleDrop,
-    cancelUpload,
-    cancelTask,
-    dismissTask,
-  };
-};
--- a/components/sftp-modal/hooks/useSftpModalVirtualList.ts
+++ b/components/sftp-modal/hooks/useSftpModalVirtualList.ts
@@ -1,123 +0,0 @@
-import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
-import type { RemoteFile } from "../../../types";
-
-interface UseSftpModalVirtualListParams {
-  open: boolean;
-  sortedFiles: RemoteFile[];
-}
-
-interface UseSftpModalVirtualListResult {
-  fileListRef: React.RefObject<HTMLDivElement>;
-  rowHeight: number;
-  handleFileListScroll: (e: React.UIEvent<HTMLDivElement>) => void;
-  shouldVirtualize: boolean;
-  totalHeight: number;
-  visibleRows: { file: RemoteFile; index: number; top: number }[];
-}
-
-export const useSftpModalVirtualList = ({
-  open,
-  sortedFiles,
-}: UseSftpModalVirtualListParams): UseSftpModalVirtualListResult => {
-  const fileListRef = useRef<HTMLDivElement>(null);
-  const scrollFrameRef = useRef<number | null>(null);
-  const [scrollTop, setScrollTop] = useState(0);
-  const [viewportHeight, setViewportHeight] = useState(0);
-  const [rowHeight, setRowHeight] = useState(40);
-
-  useLayoutEffect(() => {
-    const container = fileListRef.current;
-    if (!container || !open) return;
-    const update = () => setViewportHeight(container.clientHeight);
-    update();
-    const raf = window.requestAnimationFrame(update);
-    const resizeObserver = new ResizeObserver(update);
-    resizeObserver.observe(container);
-    return () => {
-      resizeObserver.disconnect();
-      window.cancelAnimationFrame(raf);
-    };
-  }, [open, sortedFiles.length]);
-
-  useLayoutEffect(() => {
-    const container = fileListRef.current;
-    if (!container || !open || sortedFiles.length === 0) return;
-    const raf = window.requestAnimationFrame(() => {
-      const rowElement = container.querySelector(
-        '[data-sftp-modal-row="true"]',
-      ) as HTMLElement | null;
-      if (!rowElement) return;
-      const nextHeight = Math.round(rowElement.getBoundingClientRect().height);
-      if (nextHeight && Math.abs(nextHeight - rowHeight) > 1) {
-        setRowHeight(nextHeight);
-      }
-    });
-    return () => window.cancelAnimationFrame(raf);
-  }, [open, rowHeight, sortedFiles.length]);
-
-  useEffect(() => {
-    return () => {
-      if (scrollFrameRef.current !== null) {
-        window.cancelAnimationFrame(scrollFrameRef.current);
-      }
-    };
-  }, []);
-
-  const handleFileListScroll = useCallback(
-    (e: React.UIEvent<HTMLDivElement>) => {
-      const nextTop = e.currentTarget.scrollTop;
-      if (scrollFrameRef.current !== null) return;
-      scrollFrameRef.current = window.requestAnimationFrame(() => {
-        scrollFrameRef.current = null;
-        setScrollTop(nextTop);
-      });
-    },
-    [],
-  );
-
-  const { shouldVirtualize, totalHeight, visibleRows } = useMemo(() => {
-    const overscan = 6;
-    const canVirtualize = open && viewportHeight > 0 && rowHeight > 0;
-    const shouldVirtualizeLocal = canVirtualize && sortedFiles.length > 50;
-    const totalHeightLocal = shouldVirtualizeLocal
-      ? sortedFiles.length * rowHeight
-      : 0;
-    const startIndex = shouldVirtualizeLocal
-      ? Math.max(0, Math.floor(scrollTop / rowHeight) - overscan)
-      : 0;
-    const endIndex = shouldVirtualizeLocal
-      ? Math.min(
-        sortedFiles.length - 1,
-        Math.ceil((scrollTop + viewportHeight) / rowHeight) + overscan,
-      )
-      : sortedFiles.length - 1;
-    const visibleRowsLocal = shouldVirtualizeLocal
-      ? sortedFiles
-        .slice(startIndex, endIndex + 1)
-        .map((file, idx) => ({
-          file,
-          index: startIndex + idx,
-          top: (startIndex + idx) * rowHeight,
-        }))
-      : sortedFiles.map((file, index) => ({
-        file,
-        index,
-        top: 0,
-      }));
-
-    return {
-      shouldVirtualize: shouldVirtualizeLocal,
-      totalHeight: totalHeightLocal,
-      visibleRows: visibleRowsLocal,
-    };
-  }, [open, rowHeight, scrollTop, sortedFiles, viewportHeight]);
-
-  return {
-    fileListRef,
-    rowHeight,
-    handleFileListScroll,
-    shouldVirtualize,
-    totalHeight,
-    visibleRows,
-  };
-};
--- a/components/sftp-modal/pathUtils.ts
+++ b/components/sftp-modal/pathUtils.ts
@@ -1,83 +0,0 @@
-export const isWindowsPath = (path: string): boolean => /^[A-Za-z]:/.test(path);
-
-export const normalizeWindowsRoot = (path: string): string => {
-  const normalized = path.replace(/\//g, "\\");
-  if (/^[A-Za-z]:\\$/.test(normalized)) return normalized;
-  if (/^[A-Za-z]:$/.test(normalized)) return `${normalized}\\`;
-  return normalized;
-};
-
-export const joinPath = (base: string, name: string, isLocalSession: boolean): string => {
-  if (isLocalSession && isWindowsPath(base)) {
-    const normalizedBase = normalizeWindowsRoot(base).replace(/[\\/]+$/, "");
-    return `${normalizedBase}\\${name}`;
-  }
-  if (base === "/") return `/${name}`;
-  return `${base}/${name}`;
-};
-
-export const isRootPath = (path: string, isLocalSession: boolean): boolean => {
-  if (isLocalSession && isWindowsPath(path)) {
-    return /^[A-Za-z]:\\?$/.test(path.replace(/\//g, "\\"));
-  }
-  return path === "/";
-};
-
-export const getParentPath = (path: string, isLocalSession: boolean): string => {
-  if (isLocalSession && isWindowsPath(path)) {
-    const normalized = normalizeWindowsRoot(path).replace(/[\\]+$/, "");
-    const drive = normalized.slice(0, 2);
-    if (/^[A-Za-z]:$/.test(normalized) || /^[A-Za-z]:\\$/.test(normalized)) {
-      return `${drive}\\`;
-    }
-    const rest = normalized.slice(2).replace(/^[\\]+/, "");
-    const parts = rest ? rest.split(/[\\]+/).filter(Boolean) : [];
-    if (parts.length <= 1) return `${drive}\\`;
-    parts.pop();
-    return `${drive}\\${parts.join("\\")}`;
-  }
-  if (path === "/") return "/";
-  const parts = path.split("/").filter(Boolean);
-  parts.pop();
-  return parts.length ? `/${parts.join("/")}` : "/";
-};
-
-export const getRootPath = (path: string, isLocalSession: boolean): string => {
-  if (isLocalSession && isWindowsPath(path)) {
-    const drive = path.replace(/\//g, "\\").slice(0, 2);
-    return `${drive}\\`;
-  }
-  return "/";
-};
-
-export const getWindowsDrive = (path: string): string | null => {
-  if (!isWindowsPath(path)) return null;
-  const normalized = path.replace(/\//g, "\\");
-  return /^[A-Za-z]:/.test(normalized) ? normalized.slice(0, 2) : null;
-};
-
-export const getBreadcrumbs = (path: string, isLocalSession: boolean): string[] => {
-  if (isLocalSession && isWindowsPath(path)) {
-    const normalized = normalizeWindowsRoot(path).replace(/[\\]+$/, "");
-    const rest = normalized.slice(2).replace(/^[\\]+/, "");
-    const parts = rest ? rest.split(/[\\]+/).filter(Boolean) : [];
-    return parts;
-  }
-  return path === "/" ? [] : path.split("/").filter(Boolean);
-};
-
-export const breadcrumbPathAt = (
-  breadcrumbs: string[],
-  idx: number,
-  currentPath: string,
-  isLocalSession: boolean,
-): string => {
-  if (isLocalSession) {
-    const drive = getWindowsDrive(currentPath);
-    if (drive) {
-      const rest = breadcrumbs.slice(0, idx + 1).join("\\");
-      return rest ? `${drive}\\${rest}` : `${drive}\\`;
-    }
-  }
-  return "/" + breadcrumbs.slice(0, idx + 1).join("/");
-};
--- a/components/sftp-modal/utils.ts
+++ b/components/sftp-modal/utils.ts
@@ -1,16 +0,0 @@
-export const formatBytes = (bytes: number | string): string => {
-  const numBytes = typeof bytes === "string" ? parseInt(bytes, 10) : bytes;
-  if (isNaN(numBytes) || numBytes === 0) return "0 B";
-  const units = ["B", "KB", "MB", "GB", "TB"];
-  const i = Math.floor(Math.log(numBytes) / Math.log(1024));
-  const size = numBytes / Math.pow(1024, i);
-  return `${size.toFixed(i === 0 ? 0 : 1)} ${units[i]}`;
-};
-
-export const formatDate = (dateStr: string | number | undefined): string => {
-  if (!dateStr) return "--";
-  const date = typeof dateStr === "number" ? new Date(dateStr) : new Date(dateStr);
-  if (isNaN(date.getTime())) return String(dateStr);
-  const pad = (value: number) => value.toString().padStart(2, "0");
-  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
-};
--- a/components/sftp/SftpContext.tsx
+++ b/components/sftp/SftpContext.tsx
@@ -7,7 +7,7 @@
 */

 import React, { createContext, useContext, useMemo, useSyncExternalStore } from "react";
-import { Host, SftpFileEntry, SftpFilenameEncoding } from "../../types";
+import { Host, SftpFileEntry } from "../../types";

 // Types for the context
 export interface SftpPaneCallbacks {
@@ -16,14 +16,12 @@ export interface SftpPaneCallbacks {
    onNavigateTo: (path: string) => void;
    onNavigateUp: () => void;
    onRefresh: () => void;
-    onSetFilenameEncoding: (encoding: SftpFilenameEncoding) => void;
    onOpenEntry: (entry: SftpFileEntry) => void;
    onToggleSelection: (fileName: string, multiSelect: boolean) => void;
    onRangeSelect: (fileNames: string[]) => void;
    onClearSelection: () => void;
    onSetFilter: (filter: string) => void;
    onCreateDirectory: (name: string) => Promise<void>;
-    onCreateFile: (name: string) => Promise<void>;
    onDeleteFiles: (fileNames: string[]) => Promise<void>;
    onRenameFile: (oldName: string, newName: string) => Promise<void>;
    onCopyToOtherPane: (files: { name: string; isDirectory: boolean }[]) => void;
@@ -33,9 +31,6 @@ export interface SftpPaneCallbacks {
    onEditFile?: (entry: SftpFileEntry) => void;
    onOpenFile?: (entry: SftpFileEntry) => void;
    onOpenFileWith?: (entry: SftpFileEntry) => void;  // Always show opener dialog
-    onDownloadFile?: (entry: SftpFileEntry) => void;  // Download to local filesystem
-    // External file upload (supports folders via DataTransfer)
-    onUploadExternalFiles?: (dataTransfer: DataTransfer) => Promise<void>;
 }

 export interface SftpDragCallbacks {
@@ -96,9 +91,6 @@ export interface SftpContextValue {
    // Callbacks for each side
    leftCallbacks: SftpPaneCallbacks;
    rightCallbacks: SftpPaneCallbacks;
-
-    // Settings
-    showHiddenFiles: boolean;
 }

 const SftpContext = createContext<SftpContextValue | null>(null);
@@ -132,19 +124,12 @@ export const useSftpHosts = () => {
    return context.hosts;
 };

-// Hook to get showHiddenFiles setting
-export const useSftpShowHiddenFiles = (): boolean => {
-    const context = useSftpContext();
-    return context.showHiddenFiles;
-};
-
 interface SftpContextProviderProps {
    hosts: Host[];
    draggedFiles: { name: string; isDirectory: boolean; side: "left" | "right" }[] | null;
    dragCallbacks: SftpDragCallbacks;
    leftCallbacks: SftpPaneCallbacks;
    rightCallbacks: SftpPaneCallbacks;
-    showHiddenFiles: boolean;
    children: React.ReactNode;
 }

@@ -154,7 +139,6 @@ export const SftpContextProvider: React.FC<SftpContextProviderProps> = ({
    dragCallbacks,
    leftCallbacks,
    rightCallbacks,
-    showHiddenFiles,
    children,
 }) => {
    // Memoize the context value to prevent unnecessary re-renders
@@ -166,9 +150,8 @@ export const SftpContextProvider: React.FC<SftpContextProviderProps> = ({
            dragCallbacks,
            leftCallbacks,
            rightCallbacks,
-            showHiddenFiles,
        }),
-        [hosts, draggedFiles, dragCallbacks, leftCallbacks, rightCallbacks, showHiddenFiles],
+        [hosts, draggedFiles, dragCallbacks, leftCallbacks, rightCallbacks],
    );

    return <SftpContext.Provider value={value}>{children}</SftpContext.Provider>;
--- a/components/sftp/SftpHostPicker.tsx
+++ b/components/sftp/SftpHostPicker.tsx
@@ -38,11 +38,9 @@ const SftpHostPickerInner: React.FC<SftpHostPickerProps> = ({
    const filteredHosts = useMemo(() => {
        const term = hostSearch.trim().toLowerCase();
        return hosts.filter(h =>
-            // Filter out serial hosts - SFTP is not supported for serial connections
-            h.protocol !== "serial" &&
-            (!term ||
+            !term ||
            h.label.toLowerCase().includes(term) ||
-            h.hostname.toLowerCase().includes(term))
+            h.hostname.toLowerCase().includes(term)
        ).sort((a, b) => a.label.localeCompare(b.label));
    }, [hosts, hostSearch]);
    const sideLabel = side === 'left' ? t('common.left') : t('common.right');
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
TachibanaLolo	ec04334a21	Merge branch 'binaricat:main' into main Some checks failed build-packages / build-macos-latest (push) Has been cancelled Details build-packages / build-ubuntu-latest (push) Has been cancelled Details build-packages / build-windows-latest (push) Has been cancelled Details build-packages / release (push) Has been cancelled Details	2026-01-09 22:03:02 +08:00
TachibanaLolo	57e3641ec5	docs: add Netcatty feature todo list	2026-01-09 22:02:34 +08:00
TachibanaLolo	8258ad6e95	Merge pull request #1 from AkarinServer/feature/linux-build-support feat: add linux build support (x64/arm64)	2026-01-08 23:22:16 +08:00